Add missing readline depepend, and drop ncurses linkage since it's only there for readline.

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

5 files changed, 97 insertions, 20 deletions

diff --git a/sys-fs/lvm2/Manifest b/sys-fs/lvm2/Manifest
index 473a8ce47823..79dab995aff7 100644
--- a/sys-fs/lvm2/Manifest
+++ b/sys-fs/lvm2/Manifest
@@ -48,21 +48,19 @@ EBUILD lvm2-2.02.67.ebuild 8252 RMD160 9da463656087e984efe4adecdc6649ba05068d5f
 EBUILD lvm2-2.02.70-r1.ebuild 8470 RMD160 7c11815d265b3303750b7046a4125dd34e1cd5f9 SHA1 550847924c0162a852bf6cbd94e836fcadb21213 SHA256 478ee7870d4ef032ee835bcd473358773e57ee652b90827c8737eec5af812833
 EBUILD lvm2-2.02.70.ebuild 8401 RMD160 3493a62e42f11e3afc16ed8f2c185c9885f6c811 SHA1 9bc476b6f607c6bac0263202dc6a7dbb5d06fee9 SHA256 83a2c5435ec9f38dfc2ef053471654b09788f3f492649667b1a2f319a87e5989
 EBUILD lvm2-2.02.72.ebuild 8543 RMD160 d7aaa248cf358f7ecf725827aa8c5f338ce7440f SHA1 8eb86aa99a6091e24d30c11c0e17b1199c5675de SHA256 ade20e3822a14f3bcd12e40295805a9e9500acbcaade6fbcd04976fa82e47242
-EBUILD lvm2-2.02.73-r1.ebuild 8701 RMD160 31387683e7df7f8fbe58fd3660407dc688de30ef SHA1 9f421a1e8536ee7cf5b62f042b2235a99a223c92 SHA256 242b55077351d5e19ce0b33594d60d4f0a39255cad8af79dab8908e59155fc07
+EBUILD lvm2-2.02.73-r1.ebuild 8730 RMD160 a110751de6260bf7ea62c2b4743e45244a91df50 SHA1 9b178fda1e0e5f9899f916c6a6473db965d4b97f SHA256 8201a02c78ee04e837acf6b2edb61242c66b58a0dc4d5f6c68ff7df86ab26549
 EBUILD lvm2-2.02.73.ebuild 8614 RMD160 257fc6784c5c027f487dad7e3c5e4e8fc077976d SHA1 e41bcb1e550b5077b56bb67b36989d13f4fe9d7f SHA256 a09f80dfb1008a9299a7db74c085512ea911ea32690fbc4d76bbdf875556b1e5
-EBUILD lvm2-2.02.74.ebuild 8706 RMD160 495c5b9bc446eabfb6e485e9c010effc24358623 SHA1 814c9db645c74500b6e84d057b3b97e1f937b1c2 SHA256 f85a1bb5cff58280af40e37fea329ecbe6a3c7760d8987cef827a0bb68a3a8fb
-EBUILD lvm2-2.02.83.ebuild 8726 RMD160 63e4b84622f240b67fe877957563de0e068c3647 SHA1 d8fefdc661cd86febfd9454f9e2087b1596665e5 SHA256 cc18cdd6d63e6ca445fc470a054e887740f3d91c2235e13a631bb38a52a108e2
-EBUILD lvm2-2.02.84.ebuild 8797 RMD160 524b85dedef94030590e4bc6a5b9b2e9f31a6633 SHA1 3e4edeccee6693ed15d4f80260d8d492c960c5fb SHA256 d973bd93ea11ae47fac023841668e0563c3a3921560a62d49a9d5f9cdf1d134e
-EBUILD lvm2-2.02.85.ebuild 8923 RMD160 eaa7f57b4731f5487476b3d38356e6dd2f1cc705 SHA1 8ec6247acd6c4cae6a78993902165df41494aaf0 SHA256 639c2b26ab8565604c9d25ed4c4d54d2406e1e6d136a4cf41082be6cc5cd5ca2
-EBUILD lvm2-2.02.88.ebuild 8014 RMD160 71fcadd58ea2a8cbd2ddd6aac67df3360d9543eb SHA1 81ac610c6dfbd2c45aa3f11b8f000f635d7a4b93 SHA256 e9193ad5bd11bef84bbab51687e6a1f95bc0f82134d612768e76590c1f72fee2
-MISC ChangeLog 45956 RMD160 6c1623181617ebb03b9227e72e0ddc29af5ab162 SHA1 981e14576fc423cfe03fe581016a9c0a31ce6455 SHA256 bb89840d7abcb854ed00ba50b37d7c1ee53a560eb27af1cd2f280c6781317c86
+EBUILD lvm2-2.02.74.ebuild 8738 RMD160 fd30f6c74f877b0a48bd448a8bf7b7ee55c9b6db SHA1 e4b9228cfa89c3ee1e7011fdc239e259b408865f SHA256 a3fc757fe6acf355888eb8774b8ae058366e31112beb8927503387b5c3c1c1f6
+EBUILD lvm2-2.02.83.ebuild 8758 RMD160 a717dcac25dd320ce22a6a41cec15cfb59750a36 SHA1 445f619f6c0f70771ad3d4613c42a37916f9d346 SHA256 0f6c83acec608b214260a03b935303eb133c8b190e66e3776fbc9d3ae7d0925e
+EBUILD lvm2-2.02.84.ebuild 8829 RMD160 e1f78f060b830a274c355b45124a184813f40c3d SHA1 a2e16de8321676d335b4b6a69be7b01605de733f SHA256 a55c14664e90d073cb19792202dfc1e45f844f3b32f4d0c7754258376b3ba76f
+EBUILD lvm2-2.02.85.ebuild 8955 RMD160 100596f7f188ecb53be60b72a40926d51ce5224e SHA1 200147bb99956d18a097fcf1fa55b552faebf0d5 SHA256 a285d9a9ff5eab6ce0ae5226b6531dadab9f949ef48032bdda4fc4b3a2b6cbbe
+EBUILD lvm2-2.02.88.ebuild 8046 RMD160 490e60d5a6cc749ceef23cee8d2258727f455def SHA1 4a7c4b408ae93d2c7a4292eaf7040a6eace4350a SHA256 5d2993220b1dd333ac4032f660a0aa005025c82cd2570dec573088dd7b21a03b
+MISC ChangeLog 46182 RMD160 fa9e2b842513a03b705563cd843b706873647e31 SHA1 c331793af26bd16f2d3de6b2e0bef7cb545c3e50 SHA256 2830486892d30cb11208f98d405c642aba994e6c1dbd87310e5a3a9443b93752
 MISC metadata.xml 770 RMD160 10cadeecb8b77288ca9ae9dec2b485f5c1a33ba1 SHA1 950857278b8208a02b256f317a6687b446279a8d SHA256 b0994914cb1d6028fd0d0545c4e6d534797d20e7a40eea5d827afa836e0ea1eb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iJwEAQEIAAYFAk59s3EACgkQfXuS5UK5QB0cpAQAnRcJ28BgXXK5bxz3e0t8gSJn
-3M58AgrGlbg5Cf7AeWJhGzUqRYL6yg+EXMQSfcmHznmwQ1t0carlva7xMC6CLCKO
-twtdNocdjnWNK/NduvZMQcCvqutqRftFNCHc3pyjFZInv6mOGcOkwd59I9gZb63W
-hpPHXc1akq80Jlaj6Q4=
-=PWuS
+iF4EAREIAAYFAk7VsqMACgkQaC/OocHi7JaW+wD9GZ57Z13ppLP1YZEYAUtITQuY
++1TEGGtty+46Pj7WAX0BAJYny4IxuxHwj1k/clPcAU43I020Rlm+kvlV6pQMYJJL
+=mVQH
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/multipath-tools/ChangeLog b/sys-fs/multipath-tools/ChangeLog
index 6c1a5d901bd1..56a108c6447a 100644
--- a/sys-fs/multipath-tools/ChangeLog
+++ b/sys-fs/multipath-tools/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-fs/multipath-tools
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/multipath-tools/ChangeLog,v 1.37 2011/08/06 08:12:30 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/multipath-tools/ChangeLog,v 1.38 2011/11/30 04:30:50 vapier Exp $
+
+*multipath-tools-0.4.9-r3 (30 Nov 2011)
+
+  30 Nov 2011; Mike Frysinger <vapier@gentoo.org>
+  +multipath-tools-0.4.9-r3.ebuild, files/multipath-tools-0.4.9-build.patch:
+  Add missing readline depepend, and drop ncurses linkage since it's only
+  there for readline.
 
   06 Aug 2011; Samuli Suominen <ssuominen@gentoo.org>
   multipath-tools-0.4.8.ebuild, multipath-tools-0.4.8-r1.ebuild,
diff --git a/sys-fs/multipath-tools/Manifest b/sys-fs/multipath-tools/Manifest
index 614c8320c70a..7bc73951e448 100644
--- a/sys-fs/multipath-tools/Manifest
+++ b/sys-fs/multipath-tools/Manifest
@@ -13,7 +13,7 @@ AUX multipath-tools-0.4.8-r1-kpartx.patch 7076 RMD160 a5933b1a143fb7817e991a4a26
 AUX multipath-tools-0.4.8-socket-cve-2009-0115.patch 848 RMD160 4e4298b87c60546b0d9ffad54f2070f386e34625 SHA1 2dbc4afd69df4d5227d9090e00e5b7d041eb1ae9 SHA256 2ed8234f7d37fbc4cd77dcf77e71de3bdbcca2bef6726e1f1a99d46878ac3a04
 AUX multipath-tools-0.4.8-udev-scsi_id-changes.patch 4125 RMD160 e7f6feca014bf462c0580caabedc73152e423e3c SHA1 bd8b5f30b0cbda8a3d15b3a2383812d58a5d7ced SHA256 dca166caf506ea496f7cb883a98d1b5b1c77f5a91afa343e1ddc27d2a89ef0e3
 AUX multipath-tools-0.4.9-buffer-overflows.patch 993 RMD160 095c502f5df6bc11d933a73c4b01e22ec039b5b5 SHA1 713c5238c0953ea52c2577357eb4928c5f574ff0 SHA256 1f9ca1d26fee69dc7d5c1b65a835d23e1b8dd8de6fd3678faf3e7b499611d15d
-AUX multipath-tools-0.4.9-build.patch 4883 RMD160 0355cc7b6056404947b4ff8af3e287aa6259a9a2 SHA1 8e985a34a2d96d66c49a5fd56735f0d38e2fb18c SHA256 b543d2e012b0baedf959e4ccb097d8299bd721a5f543c82f2be01728fa2851a2
+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
@@ -25,12 +25,13 @@ EBUILD multipath-tools-0.4.8-r1.ebuild 2779 RMD160 a55cc868ed8b8f5828fbb0933de6a
 EBUILD multipath-tools-0.4.8.ebuild 2336 RMD160 fa7d183ad6c1609fc30291d969380b46a902d807 SHA1 74be5fd61b425431a491fe02a11921eb618fe030 SHA256 5cea0e666f4b2091b2205b677b92ececba1fdd1654768fdf3623ba2f9d49055c
 EBUILD multipath-tools-0.4.9-r1.ebuild 2454 RMD160 04efb847332a75d4ab21870ac77fb38234ef9971 SHA1 06f71d6f4a5c7c6ee2136851a4ec24fa7ea75b9c SHA256 7cde59dccb5ea57d6dd8bba16c20079243036b0c044cf61648a043b6c128139e
 EBUILD multipath-tools-0.4.9-r2.ebuild 1983 RMD160 e54ea15c214c4413d894246980bb9c201bac9c2b SHA1 a09ab793ca0e7d4ca9d8921a699cacd65c974f6a SHA256 9cbad7258b0a7778e0c4fbd87a8647187ca10f98cf6d12e848ea287c915d61ae
-MISC ChangeLog 7180 RMD160 edc30aa82c8bb2c89dd3eafc9c41121fd1a2c412 SHA1 d1bac5ebc664d0631eb1a528fa5e3cd1bc343f31 SHA256 bb8ddf0ad18b8d7bebe389e6b38dc429e4d1cccc90796ab9275916fc8020b972
+EBUILD multipath-tools-0.4.9-r3.ebuild 1999 RMD160 5cb9c087183749f407713e1770b255475dd2eabb SHA1 a1dcd6bac98a4f9ae8c75c1c8919fe0b70eee187 SHA256 4790b7dc623e0fb4f9029567ec18e821b7ee9144e8f138c27c691fa3eb070e81
+MISC ChangeLog 7442 RMD160 42acda86623c273e665761fd5c5530e4d31416e4 SHA1 f6a8259f654c3c6fe103e88aa5ca28614411dae5 SHA256 fb1b7061c0780f3c1ef8861a754a8bd03408a0be8b7db8b44916d3c436f6f241
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk489rAACgkQXkR9YqOcLPFeRAD/VSCi1ZRopCwwMpTK/CA2w3GS
-8G+mifQl8w4DIjreAbUBAKRubsrf45lvMDYoIwTdQS5wqSaY8DOKRUUXuOjuISF7
-=iVbR
+iF4EAREIAAYFAk7VsYIACgkQaC/OocHi7JbqIAD+L2rAvc/S2xrqbLsg1oOACNzK
+UUued3sDSBdAkAK07HgA/3gZI7t2TP+Bc4bJfv6w+R5rBAt15vv5gSEM6aO/WXXv
+=c3gp
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/multipath-tools/files/multipath-tools-0.4.9-build.patch b/sys-fs/multipath-tools/files/multipath-tools-0.4.9-build.patch
index c6196f73b579..336f3468ab10 100644
--- a/sys-fs/multipath-tools/files/multipath-tools-0.4.9-build.patch
+++ b/sys-fs/multipath-tools/files/multipath-tools-0.4.9-build.patch
@@ -107,7 +107,7 @@
  CFLAGS += -I$(multipathdir)
 -LDFLAGS += -lpthread -ldevmapper -lreadline -lncurses -ldl \
 -	   -lmultipath -L$(multipathdir)
-+LIBS = -lpthread -ldevmapper -lreadline -lncurses -ldl \
++LIBS = -lpthread -ldevmapper -lreadline -ldl \
 +	   -L$(multipathdir) -lmultipath
  
  #
diff --git a/sys-fs/multipath-tools/multipath-tools-0.4.9-r3.ebuild b/sys-fs/multipath-tools/multipath-tools-0.4.9-r3.ebuild
new file mode 100644
index 000000000000..55c3e251707b
--- /dev/null
+++ b/sys-fs/multipath-tools/multipath-tools-0.4.9-r3.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2011 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.9-r3.ebuild,v 1.1 2011/11/30 04:30:50 vapier Exp $
+
+EAPI="2"
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Device mapper target autoconfig"
+HOMEPAGE="http://christophe.varoqui.free.fr/"
+SRC_URI="http://christophe.varoqui.free.fr/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND="|| (
+		>=sys-fs/lvm2-2.02.45
+		>=sys-fs/device-mapper-1.00.19-r1
+	)
+	>=sys-fs/udev-124
+	dev-libs/libaio
+	sys-libs/readline
+	!<sys-apps/baselayout-2"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}"
+
+src_prepare() {
+	 epatch "${FILESDIR}"/${PN}-0.4.9-build.patch
+	 epatch "${FILESDIR}"/${PN}-0.4.9-buffer-overflows.patch
+	 epatch "${FILESDIR}"/${PN}-0.4.8-kparted-ext-partitions.patch
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" || die
+}
+
+src_install() {
+	dodir /sbin /usr/share/man/man8
+	emake DESTDIR="${D}" install || die
+
+	insinto /etc
+	newins "${S}"/multipath.conf.annotated multipath.conf
+	fperms 644 /etc/udev/rules.d/65-multipath.rules
+	fperms 644 /etc/udev/rules.d/66-kpartx.rules
+	newinitd "${FILESDIR}"/rc-multipathd multipathd || die
+	newinitd "${FILESDIR}"/multipath.rc multipath || die
+
+	dodoc multipath.conf.* AUTHOR ChangeLog FAQ README TODO
+	docinto kpartx
+	dodoc kpartx/ChangeLog kpartx/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/65-multipath.rules" \
+			> "${D}"/etc/dev.d/block/multipath.dev
+	fi
+}
+
+pkg_postinst() {
+	elog "If you need multipath on your system, you must"
+	elog "add 'multipath' into your boot runlevel!"
+}