Cleanup. Fixes bug #160031.

Package-Manager: portage-2.1.2.3

6 files changed, 19 insertions, 118 deletions

diff --git a/net-fs/am-utils/ChangeLog b/net-fs/am-utils/ChangeLog
index 132ad6ab4774..06eb024e4c30 100644
--- a/net-fs/am-utils/ChangeLog
+++ b/net-fs/am-utils/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-fs/am-utils
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/am-utils/ChangeLog,v 1.26 2007/03/26 08:18:17 antarus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/am-utils/ChangeLog,v 1.27 2007/04/06 22:23:39 betelgeuse Exp $
+
+  06 Apr 2007; Petteri Räty <betelgeuse@gentoo.org>
+  -am-utils-6.0.9-r1.ebuild, -am-utils-6.0.10.ebuild:
+  Cleanup. Fixes bug #160031.
 
   26 Mar 2007; Alec Warner <antarus@gentoo.org> am-utils-6.0.9-r1.ebuild,
   am-utils-6.0.10.ebuild, am-utils-6.1.3.ebuild, am-utils-6.1.4.ebuild:
diff --git a/net-fs/am-utils/Manifest b/net-fs/am-utils/Manifest
index c4f904270bbd..4b0c6043786e 100644
--- a/net-fs/am-utils/Manifest
+++ b/net-fs/am-utils/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX am-utils-6.0.10-parallel-build.patch 2323 RMD160 4c84b291c744749e9c135ab27fa3ae36a8d34660 SHA1 1ffb7b08ffff20c695e5b921a5fca4b33ff5eaa5 SHA256 c65ba75087864dc70e6d2e0b0003007797a7331d40ed2eb5de4611fe24efa7b0
 MD5 be507ff6c41cb6a4a15be900320c8429 files/am-utils-6.0.10-parallel-build.patch 2323
 RMD160 4c84b291c744749e9c135ab27fa3ae36a8d34660 files/am-utils-6.0.10-parallel-build.patch 2323
@@ -22,18 +25,8 @@ AUX amd.rc 544 RMD160 f734749c7d6ed58da47daed1a9943e2572e946ba SHA1 0a841995badf
 MD5 b3377608b057b265eda754cea94bb69e files/amd.rc 544
 RMD160 f734749c7d6ed58da47daed1a9943e2572e946ba files/amd.rc 544
 SHA256 e2d20553f51deca7d05a475d20e008351cf4f6075a8f99e3e0b78c5d3a806bad files/amd.rc 544
-DIST am-utils-6.0.10.tar.gz 1650526 RMD160 97b15054b35d66e0e90ce65c830fbee02d71c728 SHA1 d48023dbb4600cfb84331c147e745f57cc3c5832 SHA256 c50c7cb6135801ec86aab61b9f9803a702fcd12f2f0da5a1312bad999c2d2e76
-DIST am-utils-6.0.9.tar.gz 1471542 RMD160 4f2b70004aaf78330c8d15dd6ca5baf47582aa4e SHA1 836f1debd958d4b40e2e787f9436164bae346db7 SHA256 7301200d8ddb2fd3ac08502348cc96063a13149e60e2dae991794c0e1846a340
 DIST am-utils-6.1.3.tar.gz 1892542 RMD160 f8ddc9a51feb6ade2871e77c01d62d1fbf6b2c8b SHA1 6e2245510a79568eda0773eb60bed740ea5abb42 SHA256 a7af65520079ec87ed127a3356bb089bb3b1454d20269b430b0cce33fbfabe00
 DIST am-utils-6.1.4.tar.gz 1913151 RMD160 1dcd526ebdcb0cd08731e1da0846323a9690fcdc SHA1 2da88936e04eb6b4216d3d8766e11ec923b81389 SHA256 62c44a9635ffa0bedbf03692358102c84f72fb2cab49f5599133e3056ba415f5
-EBUILD am-utils-6.0.10.ebuild 1062 RMD160 6dc183ef6cf428954d71e4e2be90cdd03c6280bb SHA1 b0ea0f2a940dc69113857c0690d9e47de909df76 SHA256 f5f7ac1695e55516043125954ca93ddb97126e4ad6206a2196d8ce73db2eda6c
-MD5 dfa1aa5fa2d0b46d6f3f65ad41c20c0b am-utils-6.0.10.ebuild 1062
-RMD160 6dc183ef6cf428954d71e4e2be90cdd03c6280bb am-utils-6.0.10.ebuild 1062
-SHA256 f5f7ac1695e55516043125954ca93ddb97126e4ad6206a2196d8ce73db2eda6c am-utils-6.0.10.ebuild 1062
-EBUILD am-utils-6.0.9-r1.ebuild 1024 RMD160 f6594f27e512919229738db06a02ca87d2e94f1f SHA1 422b4507f6c380cf4399983a9f9b9356a0dbb874 SHA256 71843c4152a5c20d1dff7bf00edfa4369c2b77b199ea8b2406474177ecc17f5f
-MD5 d646132d324a6d06169f20e356f7b795 am-utils-6.0.9-r1.ebuild 1024
-RMD160 f6594f27e512919229738db06a02ca87d2e94f1f am-utils-6.0.9-r1.ebuild 1024
-SHA256 71843c4152a5c20d1dff7bf00edfa4369c2b77b199ea8b2406474177ecc17f5f am-utils-6.0.9-r1.ebuild 1024
 EBUILD am-utils-6.1.3.ebuild 810 RMD160 5c69b2703e4d8323778126446b243a225cbe454a SHA1 e06423dcc5fef5f005f6d351f81848e80736dbd6 SHA256 1c080f9f5fbc0ca2f04d16256bf47bc38d14630b1f9e3555bff07f7bbdd0aa52
 MD5 8631b8a17e7d6f64a9c0c2f604ceb5ff am-utils-6.1.3.ebuild 810
 RMD160 5c69b2703e4d8323778126446b243a225cbe454a am-utils-6.1.3.ebuild 810
@@ -42,23 +35,24 @@ EBUILD am-utils-6.1.4.ebuild 982 RMD160 0c7a1aab747580861774dd473f8a0259942397d7
 MD5 cc4ecbe41677454f76352b2d0decacc3 am-utils-6.1.4.ebuild 982
 RMD160 0c7a1aab747580861774dd473f8a0259942397d7 am-utils-6.1.4.ebuild 982
 SHA256 4f667e289c7e83ad5663476068b651b0b28b253ea686443f94a2280ade673e38 am-utils-6.1.4.ebuild 982
-MISC ChangeLog 3507 RMD160 6a5f2af80210cc37aae28d2a68153f6bbcb01512 SHA1 7a5e63dc7a793ade7802e7c9a992e1076b21c57e SHA256 be7310200a872da45e336801a1d278fccdb0244fc16176ae91288c7a2fd8540d
-MD5 23acc54801a310597dcf9e04284e6d9b ChangeLog 3507
-RMD160 6a5f2af80210cc37aae28d2a68153f6bbcb01512 ChangeLog 3507
-SHA256 be7310200a872da45e336801a1d278fccdb0244fc16176ae91288c7a2fd8540d ChangeLog 3507
+MISC ChangeLog 3648 RMD160 b9b91e1dc93163b54c6db7a9e9b46fb52603e156 SHA1 3d5a92eeb00468e2fe7828d7a2b5e54ed3e24c77 SHA256 6f68f51e12498e54124e5c4b5b1365835119402d5297b2bd6a13e847a808d520
+MD5 5b97dd7ef6628d65d7ee5e44d426ca46 ChangeLog 3648
+RMD160 b9b91e1dc93163b54c6db7a9e9b46fb52603e156 ChangeLog 3648
+SHA256 6f68f51e12498e54124e5c4b5b1365835119402d5297b2bd6a13e847a808d520 ChangeLog 3648
 MISC metadata.xml 159 RMD160 8e0977b9abd90afe9e1d5c1326823a5726f6e2a4 SHA1 33f35324ce730e28838be228d9ee4e4dd1bab1e5 SHA256 562c59615c028ffa088de789b3a792fd4cbbbfe71628ddd6a55d3b176becbc6b
 MD5 a3dd8511b8874ce1b494dce2472c709c metadata.xml 159
 RMD160 8e0977b9abd90afe9e1d5c1326823a5726f6e2a4 metadata.xml 159
 SHA256 562c59615c028ffa088de789b3a792fd4cbbbfe71628ddd6a55d3b176becbc6b metadata.xml 159
-MD5 5e4007f0a22e6e7458573ec1bbfea414 files/digest-am-utils-6.0.10 250
-RMD160 616ac8251fec686d13a548a9dc93f23e157ffe99 files/digest-am-utils-6.0.10 250
-SHA256 f4e4e13066a1fca45e218f5a20be84ce0918c8559d1862db91857ea26b72dd40 files/digest-am-utils-6.0.10 250
-MD5 9a06610bab7159bd4e51509362bf1f02 files/digest-am-utils-6.0.9-r1 247
-RMD160 e1f32baacc3321a879b484524ca32564ab8c30ac files/digest-am-utils-6.0.9-r1 247
-SHA256 065b0e79617e916fd58e5c946f4eab091e920afb41853e0d3a4088c52b22c408 files/digest-am-utils-6.0.9-r1 247
 MD5 546ea0c6b82fca57e79040714048a62b files/digest-am-utils-6.1.3 247
 RMD160 d477cb3145da91ed3007fa7c8ded1f7e94ebb72c files/digest-am-utils-6.1.3 247
 SHA256 e2410de28df1bd4eec56b4251676540f843cbc080ff8820ab051f2e311422c2d files/digest-am-utils-6.1.3 247
 MD5 c81abd8fbc9d9b9c53369790936799c3 files/digest-am-utils-6.1.4 247
 RMD160 06f09d1ae612122d90f2278c8f0bb8d7dcb05681 files/digest-am-utils-6.1.4 247
 SHA256 d7f35a05812f4f604ff3d6c52414ff275708f4fe2dfac32a4919381fe6eb4581 files/digest-am-utils-6.1.4 247
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.3 (GNU/Linux)
+
+iD8DBQFGFshqcxLzpIGCsLQRAqPaAJ95ZkoF56YdAx4hfr2RcRYvyQJbtACfbLjd
+wPSsOGGWWwe/6ZKEMLHjLps=
+=goda
+-----END PGP SIGNATURE-----
diff --git a/net-fs/am-utils/am-utils-6.0.10.ebuild b/net-fs/am-utils/am-utils-6.0.10.ebuild
deleted file mode 100644
index d1fb9b9a832d..000000000000
--- a/net-fs/am-utils/am-utils-6.0.10.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/am-utils/am-utils-6.0.10.ebuild,v 1.4 2007/03/26 08:18:17 antarus Exp $
-
-inherit eutils
-
-DESCRIPTION="amd automounter and utilities"
-HOMEPAGE="http://www.am-utils.org/"
-SRC_URI="ftp://ftp.am-utils.org/pub/am-utils/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha ~amd64 ia64 ~ppc ~x86"
-IUSE="ldap"
-
-RDEPEND="ldap? ( >=net-nds/openldap-1.2 )"
-DEPEND="${RDEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/${P}-parallel-build.patch
-
-	# Rerun autotools
-	einfo "Regenerating autotools files..."
-	libtoolize --copy --force && \
-	aclocal && \
-	autoconf && \
-	automake || die "autotools failed"
-}
-
-src_compile() {
-	econf \
-		$(use_with ldap) \
-		--sysconfdir=/etc/amd \
-		|| die "configure failed"
-	emake || die "make failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-
-	insinto /etc/amd
-	doins "${FILESDIR}"/amd.{conf,net}
-	newinitd "${FILESDIR}/amd.rc" amd
-}
diff --git a/net-fs/am-utils/am-utils-6.0.9-r1.ebuild b/net-fs/am-utils/am-utils-6.0.9-r1.ebuild
deleted file mode 100644
index b6523ca75477..000000000000
--- a/net-fs/am-utils/am-utils-6.0.9-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/am-utils/am-utils-6.0.9-r1.ebuild,v 1.13 2007/03/26 08:18:17 antarus Exp $
-
-inherit eutils
-
-DESCRIPTION="amd automounter and utilities"
-HOMEPAGE="http://www.am-utils.org/"
-SRC_URI="ftp://ftp.am-utils.org/pub/am-utils/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="ldap"
-
-RDEPEND="ldap? ( >=net-nds/openldap-1.2 )"
-DEPEND="${RDEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/am-utils-gdbm.patch
-	libtoolize --copy --force && \
-	aclocal && \
-	autoconf && \
-	automake || die "autotools failed"
-}
-
-src_compile() {
-	econf \
-		$(use_with ldap) \
-		--sysconfdir=/etc/amd \
-		|| die "configure failed"
-	# does not build in parallel #67136
-	emake -j1 || die "make failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-
-	insinto /etc/amd
-	doins "${FILESDIR}"/amd.{conf,net}
-	newinitd "${FILESDIR}/amd.rc" amd
-}
diff --git a/net-fs/am-utils/files/digest-am-utils-6.0.10 b/net-fs/am-utils/files/digest-am-utils-6.0.10
deleted file mode 100644
index 097befef6a9f..000000000000
--- a/net-fs/am-utils/files/digest-am-utils-6.0.10
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 ec26df84e2ef9d55c9e6ea3c648788d4 am-utils-6.0.10.tar.gz 1650526
-RMD160 97b15054b35d66e0e90ce65c830fbee02d71c728 am-utils-6.0.10.tar.gz 1650526
-SHA256 c50c7cb6135801ec86aab61b9f9803a702fcd12f2f0da5a1312bad999c2d2e76 am-utils-6.0.10.tar.gz 1650526
diff --git a/net-fs/am-utils/files/digest-am-utils-6.0.9-r1 b/net-fs/am-utils/files/digest-am-utils-6.0.9-r1
deleted file mode 100644
index eb53e8773377..000000000000
--- a/net-fs/am-utils/files/digest-am-utils-6.0.9-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 1e288b8485c09a126e2bea4029602265 am-utils-6.0.9.tar.gz 1471542
-RMD160 4f2b70004aaf78330c8d15dd6ca5baf47582aa4e am-utils-6.0.9.tar.gz 1471542
-SHA256 7301200d8ddb2fd3ac08502348cc96063a13149e60e2dae991794c0e1846a340 am-utils-6.0.9.tar.gz 1471542