Version bump. Remove old.

Package-Manager: portage-2.1.6.13/cvs/Linux i686

4 files changed, 19 insertions, 48 deletions

diff --git a/dev-libs/libisofs/ChangeLog b/dev-libs/libisofs/ChangeLog
index 6dfe106bacba..65dcca690509 100644
--- a/dev-libs/libisofs/ChangeLog
+++ b/dev-libs/libisofs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/libisofs
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libisofs/ChangeLog,v 1.50 2010/01/14 02:32:02 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libisofs/ChangeLog,v 1.51 2010/01/20 17:56:13 billie Exp $
+
+*libisofs-0.6.26 (20 Jan 2010)
+
+  20 Jan 2010; Daniel Pielmeier <billie@gentoo.org> -libisofs-0.6.12.ebuild,
+  -libisofs-0.6.22.ebuild, +libisofs-0.6.26.ebuild:
+  Version bump. Remove old.
 
   14 Jan 2010; Jeroen Roovers <jer@gentoo.org> libisofs-0.6.24.ebuild:
   Stable for HPPA (bug #287526).
diff --git a/dev-libs/libisofs/Manifest b/dev-libs/libisofs/Manifest
index bc5a21606933..0371a8d08128 100644
--- a/dev-libs/libisofs/Manifest
+++ b/dev-libs/libisofs/Manifest
@@ -1,11 +1,9 @@
-DIST libisofs-0.6.12.tar.gz 543544 RMD160 932895d2950b02354253b73efe0fc31cc19f000d SHA1 87ac64529d069ad25eb940888ee9f83b6c226374 SHA256 467da647e185cf843a24cd11c7283440d9618390784605cbc98de1fdac7d75a4
 DIST libisofs-0.6.20.tar.gz 619741 RMD160 b23ee127662e9d13d56bb9df0f25b2d9c1f9c019 SHA1 67683d7a9ef2ed5c5501173747a03402054e20cb SHA256 846472765a31cf5e5fa20732008c32cbc64a98057038a593a6861f33ed6748dd
-DIST libisofs-0.6.22.tar.gz 637862 RMD160 95db007e28fe1a122b0c9339f1bb6cbd9890dc84 SHA1 2d0237d8a0b2c98da23e9ac64713145eef581ee5 SHA256 8a31b9533545ce36b1b2088160b380c7e2e292aef7b3ed20967f3dc5085fa4f6
 DIST libisofs-0.6.24.tar.gz 644159 RMD160 fb0c2128b304d9459f65436befe4478faa819db2 SHA1 128ac46cc734b8dd1d0cd1e4b618c2336b53a2e1 SHA256 60aea7f9b6e07d44fb3d24e8bc33cb512058ca6c28f26fdf100e95b0443b25d1
-EBUILD libisofs-0.6.12.ebuild 706 RMD160 e4eef62d17896ac3390bb35e239ebc9197970155 SHA1 139cfa87ca46c793a9b36bf31cfcc2cbfe84093d SHA256 1699d1fb8f56c1e096762af56b64ddf7c2f7f8772fb19c0afba1f4ea9585bf16
+DIST libisofs-0.6.26.tar.gz 642483 RMD160 377d10ac646e163aacf5e9a8b53e2228585b411f SHA1 4fbaf6443bb6e3f98c165d1b7ffcadb4169c261b SHA256 eba603fbecb7895e1a89ffb72eda3e88af9319028775371464a0494bf16b5b05
 EBUILD libisofs-0.6.20-r1.ebuild 1494 RMD160 17412db0858524320e0defa5b403514e18523f03 SHA1 42643caaf21b49d45a241df11c15bc851a39dd3b SHA256 aa83004bfc7c785a08f38e6bb7a92e0c637dda764209cf8b121b428fcd8657b8
-EBUILD libisofs-0.6.22.ebuild 1497 RMD160 d1d1160afd9907d625a4e3cd538f00e7f3c256df SHA1 076609bb160c5b30f4acae298864fa0086c7956b SHA256 344cb4c283843cad9eb258e158d6b7396d3953c8551219e3d21e57a4583e5afd
 EBUILD libisofs-0.6.24-r1.ebuild 1129 RMD160 02298e8ed9c2a03f286493aa0db2f32a1ae5f13d SHA1 5b9779f7966f29c7ef6e76ad2c50910199129cb2 SHA256 f9c51eb370c84df6f9ddfe80b8950e7a25a5a43e1ae76180aec1751e4d7dd9c6
 EBUILD libisofs-0.6.24.ebuild 1489 RMD160 7c5062b3bdee243140f31ef9c33b2e5e2b6e5b9e SHA1 103171a2b476002ad19c21fffa72922d82d9bce8 SHA256 6247bf7fe0b70e8736b0413a575ea9e8feed5aefa045f0aa12c916fce3facee4
-MISC ChangeLog 6947 RMD160 d6254a94a373e79d40d332832e37cd01447f4ccc SHA1 7785bd0f476bf7a0b877ca2ff4974fada0b27015 SHA256 6d09e36cd8a0696564301e9935c8af7f7db4ef63ed0e9f6af4a93fbe9aec3226
+EBUILD libisofs-0.6.26.ebuild 1126 RMD160 e65e4cb0c155df4f402a4af4feb17c235dd92f19 SHA1 19e99c73e4fd63ab67d70b0c03f7e1e23687fd6c SHA256 7fc06673118ba948b8f3d6b3fe5acd52542f4cd4fd2e55852740a17e7b928ebd
+MISC ChangeLog 7140 RMD160 2f735df276e9d5364bf1f37e60ad850245593845 SHA1 96e1fe629274882da13cb1533004381f383f075a SHA256 18cee1fdcd87f508d10123b0fde91693f257297e8aebe3b047f73b749d04cfe7
 MISC metadata.xml 166 RMD160 02ca0a5d9279c1b52c3887f5a1f52f3feb002af9 SHA1 b9fccc7c24aa717c30efef068fd544a692f264f6 SHA256 ce62d1e5b04e01d03a732ee6d33b3d500810de8e55af4a527c970e5b475735d8
diff --git a/dev-libs/libisofs/libisofs-0.6.12.ebuild b/dev-libs/libisofs/libisofs-0.6.12.ebuild
deleted file mode 100644
index 6a8672efca33..000000000000
--- a/dev-libs/libisofs/libisofs-0.6.12.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libisofs/libisofs-0.6.12.ebuild,v 1.4 2009/03/19 13:15:45 ranger Exp $
-
-DESCRIPTION="libisofs is an open-source library for reading, mastering and writing optical discs."
-HOMEPAGE="http://libburnia-project.org/"
-SRC_URI="http://files.libburnia-project.org/releases/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE=""
-
-RESTRICT="test"
-
-RDEPEND=">=dev-libs/libburn-0.4.2"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS README NEWS Roadmap TODO
-}
diff --git a/dev-libs/libisofs/libisofs-0.6.22.ebuild b/dev-libs/libisofs/libisofs-0.6.26.ebuild
index cd29d14f061b..ee99744fbb81 100644
--- a/dev-libs/libisofs/libisofs-0.6.22.ebuild
+++ b/dev-libs/libisofs/libisofs-0.6.26.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libisofs/libisofs-0.6.22.ebuild,v 1.1 2009/09/02 17:45:43 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libisofs/libisofs-0.6.26.ebuild,v 1.1 2010/01/20 17:56:13 billie Exp $
 
 EAPI=2
 
@@ -12,23 +12,12 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~x86"
 IUSE="acl xattr zlib"
-#IUSE="test"
-
-# http://libburnia-project.org/ticket/147#comment:4
-# Currently the tests are outdated. The time needed to repair the problematic code
-# in test_rockridge.c would be better invested in re-arranging the test suit
-# around the official libisofs API. Everybody seems busy with other things,
-# though.
-#
-# So it is best to disable test/test until its fate is decided.
-RESTRICT="test"
 
 RDEPEND="acl? ( virtual/acl )
 	xattr? ( sys-apps/attr )
 	zlib? ( sys-libs/zlib )"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
-#	test? ( >=dev-util/cunit-2.1 )"
 
 src_configure() {
 	econf --disable-static \
@@ -37,13 +26,14 @@ src_configure() {
 	$(use_enable zlib)
 }
 
-src_test() {
-	emake check || die "building tests failed"
-	test/test || die "running tests failed"
-}
-
 src_install() {
 	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS README NEWS Roadmap TODO
+
+	dodoc AUTHORS NEWS README Roadmap TODO || die "dodoc failed"
+
+	cd "${S}"/doc
+	dodoc checksums.txt susp_aaip_2_0.txt susp_aaip_isofs_names.txt Tutorial \
+		zisofs_format.txt || die "dodoc failed"
+
 	find "${D}" -name '*.la' -exec rm -rf '{}' '+' || die "la removal failed"
 }