missed 2 files

Package-Manager: portage-2.2.0_alpha100/cvs/Linux x86_64

4 files changed, 11 insertions, 130 deletions

diff --git a/sys-fs/multipath-tools/ChangeLog b/sys-fs/multipath-tools/ChangeLog
index a7d2d6291c36..d297ae88b547 100644
--- a/sys-fs/multipath-tools/ChangeLog
+++ b/sys-fs/multipath-tools/ChangeLog
@@ -1,10 +1,11 @@
 # ChangeLog for sys-fs/multipath-tools
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/multipath-tools/ChangeLog,v 1.39 2012/04/20 19:43:21 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/multipath-tools/ChangeLog,v 1.40 2012/04/20 19:45:21 ssuominen Exp $
 
   20 Apr 2012; Samuli Suominen <ssuominen@gentoo.org>
   -files/multipath-tools-0.4.7-build.patch,
-  -files/multipath-tools-0.4.7-udev-rules.patch, -multipath-tools-0.4.8.ebuild,
+  -files/multipath-tools-0.4.7-udev-rules.patch, -multipath-tools-0.4.7-r1.ebuild,
+  -multipath-tools-0.4.7-r2.ebuild, -multipath-tools-0.4.8.ebuild,
   -multipath-tools-0.4.9-r1.ebuild, -multipath-tools-0.4.9-r2.ebuild,
   -files/init.d-multipath:
   old
diff --git a/sys-fs/multipath-tools/Manifest b/sys-fs/multipath-tools/Manifest
index 6a67edb88fbd..a85b9bfa4e17 100644
--- a/sys-fs/multipath-tools/Manifest
+++ b/sys-fs/multipath-tools/Manifest
@@ -13,23 +13,20 @@ AUX multipath-tools-0.4.9-buffer-overflows.patch 993 RMD160 095c502f5df6bc11d933
 AUX multipath-tools-0.4.9-build.patch 4873 RMD160 5f110ad0c0b9d3cfb841b24897c5a9212066ae46 SHA1 ff4ec298ad2bf2e66dfc3d8597109a35398901ec SHA256 5b2719644e01a364b1dd3982f3d9e74d582a604c66baa897445d9e097c2bdad8
 AUX multipath.rc 622 RMD160 8c0ac06f0d6cf18dfe499487120a7e963bc82444 SHA1 54eb3e4f1aaefe7e5b32a78d7f97cecdc6b1996e SHA256 9b68396afda8114610058d456318dc201a4d8799fb1d0504538e34966a7fd3d8
 AUX rc-multipathd 517 RMD160 9963ca90fa08c6631b7768df7fb99414de53343d SHA1 a2c7c8c8836360ca208bfa82c406419c16045be2 SHA256 d96e3d7ca1edbbbc92f1336d4c340f1b516e71c49c85e990e3f4063c1b5db241
-DIST multipath-tools-0.4.7.tar.bz2 139312 RMD160 b9ecd84e01e03fe631e9ee9953ea7dbadb04c01d SHA1 c78e53ec5934180e37f376348d5ef5db790f3689 SHA256 1b48684c9ce956bb2294640a92f1da8ddea4e991e4d7b974697660de5e44a9d7
 DIST multipath-tools-0.4.8.tar.bz2 160706 RMD160 18a6f2c8180516c67bc7c634133218213cfa7dfc SHA1 aadc7c7ed072c3df2e32c64a2ab1ba7fac850d7a SHA256 b76d93d244f51e328969203366939d4336c89bd572e275d6a0d50d0bc8b4cd23
 DIST multipath-tools-0.4.9.tar.bz2 169180 RMD160 54b178ad23cefceb6b42131bd7079c226c568a0d SHA1 e2263033934f9073962e7e54b42824355291f19f SHA256 8d44c8815144b5589cc3e604cb3fc16c76a028aef08aa1bec334ff70bf9ac712
-EBUILD multipath-tools-0.4.7-r1.ebuild 1624 RMD160 d57ed47bf52f1943db5010bbd959097ad65c4d5c SHA1 66b461c473d26be477918eed3bb63be66e3893b5 SHA256 e9ce5c4681dfe45848ff222c36e5ec38fb01abfe3ef1120396820a07835fd59d
-EBUILD multipath-tools-0.4.7-r2.ebuild 1666 RMD160 cb1022eff5a6e32af02f73ee07de3b20482c978d SHA1 77f0adf406a16412679fc0b8258411466785c318 SHA256 c918d16867c229178ffdae654cd56566b29d19b53335ab40f73c13d20e7b7c83
 EBUILD multipath-tools-0.4.8-r1.ebuild 2779 RMD160 a55cc868ed8b8f5828fbb0933de6a3292fbd8db3 SHA1 6e4e825ff7789a36ec617edd45634bf5404d2418 SHA256 caa5b8d68141b82919d29cb05f1af70c48c7e6ccba5c5931c08ea19886925c0f
 EBUILD multipath-tools-0.4.9-r3.ebuild 1999 RMD160 5cb9c087183749f407713e1770b255475dd2eabb SHA1 a1dcd6bac98a4f9ae8c75c1c8919fe0b70eee187 SHA256 4790b7dc623e0fb4f9029567ec18e821b7ee9144e8f138c27c691fa3eb070e81
-MISC ChangeLog 7727 RMD160 819b07f4e63a5d91e10df5c760a9a81c97ad9bf6 SHA1 8bb311dee684db5a9a731beb298579f99004b698 SHA256 1815bbae53a9e42088ecdb74d43eb33556444cfd34877718a2776a3ccfc2880f
+MISC ChangeLog 7797 RMD160 14745b185623cadd89b1cd4a44f9168522e67de8 SHA1 e07cfc710f9c80508207c1ba35dddbdd6b09a17c SHA256 f6fc23ed071b21ad9b02fb66460ac54e601710e6354555fc13bd9391489ae380
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPkbv7AAoJEEdUh39IaPFNMyAH/jmRj1IBP3gqhle7kfKjALtE
-c3uVOCaqhm7raWd8TDUthcm7bPZfDcw6m3vkcQr5oBf75WR2ELjrUofcEPxFAFBi
-c9x5LntV3apkHhswh4lmRxHia4otCGE209dEKAu1DKGli7zf1cs2qO79O66CBz+Z
-9dglz4CFljJOmjSBloYk0a3l57UqAlMOqKnWPfd2x9kEicR9HK09cvH4WIA3uKBq
-yogfo4CkYL9idseioBS39xovF6bS2mA/DORn+8x41mx+SeENB91Q2Ov6VYuInfLS
-hOwJUnQKHGwKzBET+XEQ5GtJ8Ie0Aoy0uimmllIRwpaX61G1YoPldGVktWDQnVA=
-=mbqD
+iQEcBAEBAgAGBQJPkbxyAAoJEEdUh39IaPFNwaoH/Rrc4DntsGdVVL3lhb5r/TfM
+W7Oc1ujAE2SLA/CWdoUiy+Jv9DavFGumRbvnPUGJz4dyWpzbzTOaTTtwCP7PawCy
+XxJCv6prV1rM4Ge4QZHq2pvdlnYzKJEMxGuN6KBa0QhaELrKkFCKVHZ10unopjtq
+wYE1jzhtXIDJnAkU4hSQLrBZhJd64fWkALryLSFefIwT0zKM71W1cRXbBhU0BBkR
+kY22aRgtg/OpCk3IuQXWZSyII+p8zMTgXbwC3jcz6BQazEAUTMUi3jN4G7L4AS9L
+DC4thDMMdx8SjSqc2KjYizTs9cu7lAZuH72onn6HYboN4fS3BmHg/k7pqVhEh9Y=
+=Zt+I
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/multipath-tools/multipath-tools-0.4.7-r1.ebuild b/sys-fs/multipath-tools/multipath-tools-0.4.7-r1.ebuild
deleted file mode 100644
index 358a6514e4d1..000000000000
--- a/sys-fs/multipath-tools/multipath-tools-0.4.7-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/multipath-tools/multipath-tools-0.4.7-r1.ebuild,v 1.2 2009/04/10 16:54:46 caleb Exp $
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Device mapper target autoconfig"
-HOMEPAGE="http://christophe.varoqui.free.fr/wiki/wakka.php?wiki=Home"
-SRC_URI="http://christophe.varoqui.free.fr/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="|| (
-		>=sys-fs/lvm2-2.02.45
-		>=sys-fs/device-mapper-1.00.19-r1
-	)
-	sys-fs/udev
-	sys-fs/sysfsutils"
-DEPEND="${RDEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-build.patch
-}
-
-src_compile() {
-	emake -j1 CC=$(tc-getCC) || die "emake failed"
-}
-
-src_install() {
-	dodir /sbin /usr/share/man/man8
-	make DESTDIR="${D}" install || die "install failed"
-
-	insinto /etc
-	newins "${S}"/multipath.conf.annotated multipath.conf
-	fperms 644 /etc/udev/rules.d/40-multipath.rules
-	newinitd "${FILESDIR}"/rc-multipathd multipathd
-
-	dodoc AUTHOR ChangeLog FAQ README TODO
-	docinto dmadm; dodoc README
-	docinto kpartx; dodoc ChangeLog README
-}
-
-pkg_preinst() {
-	# The dev.d script was previously wrong and is now removed (the udev rules
-	# file does the job instead), but it won't be removed from live systems due
-	# to cfgprotect.
-	# This should help out a little...
-	if [[ -e ${ROOT}/etc/dev.d/block/multipath.dev ]] ; then
-		mkdir -p "${D}"/etc/dev.d/block
-		echo "# Please delete this file. It is obsoleted by /etc/udev/rules.d/40-multipath.rules" \
-			> "${D}"/etc/dev.d/block/multipath.dev
-	fi
-}
diff --git a/sys-fs/multipath-tools/multipath-tools-0.4.7-r2.ebuild b/sys-fs/multipath-tools/multipath-tools-0.4.7-r2.ebuild
deleted file mode 100644
index 02b6f232a1d5..000000000000
--- a/sys-fs/multipath-tools/multipath-tools-0.4.7-r2.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/multipath-tools/multipath-tools-0.4.7-r2.ebuild,v 1.4 2009/04/10 16:54:46 caleb Exp $
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Device mapper target autoconfig"
-HOMEPAGE="http://christophe.varoqui.free.fr/wiki/wakka.php?wiki=Home"
-SRC_URI="http://christophe.varoqui.free.fr/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="|| (
-		>=sys-fs/lvm2-2.02.45
-		>=sys-fs/device-mapper-1.00.19-r1
-	)
-	sys-fs/udev
-	sys-fs/sysfsutils"
-DEPEND="${RDEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-build.patch
-	epatch "${FILESDIR}"/${P}-udev-rules.patch
-}
-
-src_compile() {
-	emake -j1 CC=$(tc-getCC) || die "emake failed"
-}
-
-src_install() {
-	dodir /sbin /usr/share/man/man8
-	make DESTDIR="${D}" install || die "install failed"
-
-	insinto /etc
-	newins "${S}"/multipath.conf.annotated multipath.conf
-	fperms 644 /etc/udev/rules.d/40-multipath.rules
-	newinitd "${FILESDIR}"/rc-multipathd multipathd
-
-	dodoc AUTHOR ChangeLog FAQ README TODO
-	docinto dmadm; dodoc README
-	docinto kpartx; dodoc ChangeLog README
-}
-
-pkg_preinst() {
-	# The dev.d script was previously wrong and is now removed (the udev rules
-	# file does the job instead), but it won't be removed from live systems due
-	# to cfgprotect.
-	# This should help out a little...
-	if [[ -e ${ROOT}/etc/dev.d/block/multipath.dev ]] ; then
-		mkdir -p "${D}"/etc/dev.d/block
-		echo "# Please delete this file. It is obsoleted by /etc/udev/rules.d/40-multipath.rules" \
-			> "${D}"/etc/dev.d/block/multipath.dev
-	fi
-}