Fix device-mapper dep for new lvm2, see bug #265599

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

9 files changed, 55 insertions, 41 deletions

diff --git a/sys-fs/cryptsetup/ChangeLog b/sys-fs/cryptsetup/ChangeLog
index 4e4d219f17a7..04712da06160 100644
--- a/sys-fs/cryptsetup/ChangeLog
+++ b/sys-fs/cryptsetup/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-fs/cryptsetup
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/ChangeLog,v 1.62 2008/10/05 21:01:33 vapier Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/ChangeLog,v 1.63 2009/04/10 16:51:56 caleb Exp $
+
+  10 Apr 2009; Caleb Tennis <caleb@gentoo.org> cryptsetup-0.1-r3.ebuild,
+  cryptsetup-1.0.5.ebuild, cryptsetup-1.0.5-r1.ebuild,
+  cryptsetup-1.0.6.ebuild, cryptsetup-1.0.6-r1.ebuild,
+  cryptsetup-1.0.6-r2.ebuild:
+  Fix device-mapper dep for new lvm2, bug #265599
 
 *cryptsetup-1.0.6-r2 (05 Oct 2008)
 
diff --git a/sys-fs/cryptsetup/Manifest b/sys-fs/cryptsetup/Manifest
index 6aa35b6e8ff1..17a03c454c0a 100644
--- a/sys-fs/cryptsetup/Manifest
+++ b/sys-fs/cryptsetup/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 1.0.5-dm-crypt-start.sh 8298 RMD160 858f607fe1a2036430f972dbbc643c178baf96f7 SHA1 00c7380894d30842c01ef18ed3e14114cf1da36b SHA256 8c9f4a502dfb20e1a6c656a9563da539dbe8d1aeeb3517bc34bf14a7d301f201
 AUX 1.0.5-dm-crypt-stop.sh 1022 RMD160 c74d4fffec325378bb008b28c4225b67577c1d1b SHA1 d7b18d4d4845540baecdde373942cc8966c3d5e3 SHA256 42015047c708aa73eae615559ff76c9c8948a5d01fba68f64c5432e30ec799a4
 AUX 1.0.5-dmcrypt.confd 3029 RMD160 c84d92a58923ce88a60ab1e8fcc88910b0689df6 SHA1 b006d7f31773842e7247b2df0fe1735aac87ec59 SHA256 b5ea27a1034dda22b287422097e30e99a0673bd6a3148e38b1c2310bdcc28280
@@ -16,18 +13,11 @@ AUX dm-crypt-stop.sh 1290 RMD160 ccd5c5f25b01a6c80228609c97d4e25136098ff6 SHA1 0
 DIST cryptsetup-0.1.tar.bz2 249013 RMD160 0657a5750e32e059e3a2ad10b3de0027d616442b SHA1 b371113b266e4cdffe36fd9e3be753e4adc9f766 SHA256 421c9eb1771f8e3f61eb1b21843032b4f30f6b2cfac66a800980a2b65bdad5b7
 DIST cryptsetup-1.0.5.tar.bz2 322394 RMD160 99d9b0090b297b1bc2c72c064f091c8b2f322f70 SHA1 3e275fa67e761f6ed229ecfe831dd8a7da4be4b4 SHA256 4bab529afa00cafde3bc5df2769578c88438f80c5152d4257cd0e86986f95bc4
 DIST cryptsetup-1.0.6.tar.bz2 405713 RMD160 7ec056cf80fd25a782d3f6cc345858cf4ea988ec SHA1 dd45ad6a29c2e9af83c2c1525b02d7af88ab7212 SHA256 df7fda80cfa01f063caf39140287a47d018dfe056fc71a3ba605e690ff0183fd
-EBUILD cryptsetup-0.1-r3.ebuild 1848 RMD160 ab2a236dfcb09a467f602367f5cb8e28555e1020 SHA1 4b904a2dfd6705c7bd6867b7bd3a9510afac0fec SHA256 57dd618549e23f288750e7554f3451afcb884e312f5b466d9736092761389b5c
-EBUILD cryptsetup-1.0.5-r1.ebuild 2871 RMD160 991cfc3016b2578b6ecbb2e36667fac31655b138 SHA1 a6259827aaacf8e4f32dfab319c78311c6fe6d3b SHA256 72be5b9e87581ca582ad8ede01de1565f903c755c129d92741fa1f502a0a756b
-EBUILD cryptsetup-1.0.5.ebuild 2635 RMD160 348a8f48117645af91272201349a2198daaf2116 SHA1 32eacb42ec736c356805a99d45bc02fcec84f815 SHA256 5bb814e1c56265b3537ff6a26afc8ee487dd2d586523d1931feaa2b1ea58033e
-EBUILD cryptsetup-1.0.6-r1.ebuild 2976 RMD160 240b9c8982e869f63e753c49e7ddb9c52e87ef86 SHA1 a7f9e5b94be5cfbb84c9c6bc5e83c8f2b02770d1 SHA256 76c71efac4133ab45b1ef510ea6eed62fd64d0f94e24fcc165f47128b0976dc3
-EBUILD cryptsetup-1.0.6-r2.ebuild 3016 RMD160 43d773e1a7af17e4b284f9c30642be03e54db9cf SHA1 53892bdd99869ca648e4bbb6ba534db5bb3fb53c SHA256 a2ea6827935457c20c186ecd0297ca9fc8f83218d4bced50517ee129d905c047
-EBUILD cryptsetup-1.0.6.ebuild 2835 RMD160 73a6e2495148a35b1253311028b6e68814444f57 SHA1 261ff44776fe4f4ad4e569bcb967bc190e428c7e SHA256 560d8a11c05eea764f671384e52f308b0d8a746efbd429c8b894ab14e860591d
-MISC ChangeLog 8662 RMD160 adbbc01b60c1037af84df02413ee1afa64f10cf2 SHA1 a84a2a8e28e946d3145e46d75a3c8e3e09e7dc14 SHA256 34076d1a2bfec53052de55c21452f09f189f068e5c467db06f4946d809c835ac
+EBUILD cryptsetup-0.1-r3.ebuild 1882 RMD160 cba167af414ab6349b172c5c8d6449ba7228458a SHA1 f9a70a151fdd2cb7e3591514f583c066e4899c0b SHA256 ffee91a66e88d879e3f6bfee3ab97e97b6735315e0d9c81d8b2ec005dcf8d473
+EBUILD cryptsetup-1.0.5-r1.ebuild 2904 RMD160 c258d8524878e09cfb7f378380d2609282eb6e3b SHA1 817a5a8462ba2fde68b0a20255e29d7a043c3a47 SHA256 15f9d7ea62a627fccec2b8fdda155904923f18f7e7dc83f864b44c9d7a13aaba
+EBUILD cryptsetup-1.0.5.ebuild 2668 RMD160 c3ba025527a8af2f197a234d81222e51394561ef SHA1 0a4235aa2058ff9cfdb1ba149803290cb486a8e4 SHA256 08362343bf08e06f4ce5e480e94522974a9c65a4cc15dee7b3e6befe3da68f9e
+EBUILD cryptsetup-1.0.6-r1.ebuild 3009 RMD160 44167d72bf991fa28edfe06d56ba2c67d3609b93 SHA1 b0bc73699d64587d87d8f03411ad1d991c12ed5e SHA256 3e52f8592d7052a973e1d272e53c73c40a8be3e9c87d261a1d69d33f3486bfc9
+EBUILD cryptsetup-1.0.6-r2.ebuild 3049 RMD160 16df1d1cead21ff00bae153bf62b9bbeac528412 SHA1 85be28b0d8503ea4ebb2d7f9e631f023f480de84 SHA256 c88a34b8d0bf39fa98a9398e5b30d8e2ef45427a4cb40bede461235efa88c851
+EBUILD cryptsetup-1.0.6.ebuild 2868 RMD160 22f4698188e55194f3f5855fa90715267d71b3c4 SHA1 193ecb86971795371e1cb23cc9db83a88d5e5412 SHA256 980e9910567940b98797a4dae041a4fbed1eab679d528ee2a77e1802d226f053
+MISC ChangeLog 8925 RMD160 451782410fac468612e5c9a57cb89a7d90c52113 SHA1 b6af2ae68da455397da4859508e0a0550c5c4785 SHA256 a6c6b98160c705e89260b63a545e57e3b96ff8855760bc790c3f864829519fa4
 MISC metadata.xml 239 RMD160 81512c49e64b6e70c7b746ba09d3e6fce4c7bc89 SHA1 c4085a72e46fe6bcea5bdff780007791eae6db4b SHA256 aebd5282fb892100f348eba1ed27edd27e7296356897c6f5314674f8abb4b51a
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkk7PtwACgkQ67wieSYcaxemoQCgijdM09solGLCt9+Ybgnn1+nq
-vfwAoJHFwQncIeqp9gln5/ZsZvlgcJKI
-=s+64
------END PGP SIGNATURE-----
diff --git a/sys-fs/cryptsetup/cryptsetup-0.1-r3.ebuild b/sys-fs/cryptsetup/cryptsetup-0.1-r3.ebuild
index f91abaa17de5..3d7b1512b6a2 100644
--- a/sys-fs/cryptsetup/cryptsetup-0.1-r3.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-0.1-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/cryptsetup-0.1-r3.ebuild,v 1.12 2008/03/26 03:37:41 ricmm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/cryptsetup-0.1-r3.ebuild,v 1.13 2009/04/10 16:51:56 caleb Exp $
 
 inherit linux-info multilib eutils
 
@@ -13,7 +13,10 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
 IUSE=""
 
-RDEPEND=">=sys-fs/device-mapper-1.00.07-r1
+RDEPEND="|| (
+		>=sys-fs/lvm2-2.02.45
+		>=sys-fs/device-mapper-1.00.07-r1
+	)
 	!sys-fs/cryptsetup-luks"
 DEPEND="dev-libs/popt
 	>=dev-libs/libgcrypt-1.1.42
diff --git a/sys-fs/cryptsetup/cryptsetup-1.0.5-r1.ebuild b/sys-fs/cryptsetup/cryptsetup-1.0.5-r1.ebuild
index 907c527866b5..fa69fb5033e6 100644
--- a/sys-fs/cryptsetup/cryptsetup-1.0.5-r1.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-1.0.5-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/cryptsetup-1.0.5-r1.ebuild,v 1.14 2008/12/07 03:11:17 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/cryptsetup-1.0.5-r1.ebuild,v 1.15 2009/04/10 16:51:56 caleb Exp $
 
 inherit linux-info eutils flag-o-matic multilib
 
@@ -13,7 +13,10 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
 IUSE="dynamic nls selinux"
 
-DEPEND=">=sys-fs/device-mapper-1.00.07-r1
+DEPEND="|| (
+		>=sys-fs/lvm2-2.02.45
+		>=sys-fs/device-mapper-1.00.07-r1
+	)
 	>=dev-libs/libgcrypt-1.1.42
 	>=dev-libs/libgpg-error-1.0-r1
 	>=dev-libs/popt-1.7
diff --git a/sys-fs/cryptsetup/cryptsetup-1.0.5.ebuild b/sys-fs/cryptsetup/cryptsetup-1.0.5.ebuild
index 04b6c7a7a2e5..3f8ce830c4d6 100644
--- a/sys-fs/cryptsetup/cryptsetup-1.0.5.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-1.0.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/cryptsetup-1.0.5.ebuild,v 1.6 2008/12/07 03:11:17 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/cryptsetup-1.0.5.ebuild,v 1.7 2009/04/10 16:51:56 caleb Exp $
 
 inherit linux-info eutils flag-o-matic multilib
 
@@ -13,7 +13,10 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="dynamic nls selinux"
 
-DEPEND=">=sys-fs/device-mapper-1.00.07-r1
+DEPEND="|| (
+		>=sys-fs/lvm2-2.02.45
+		>=sys-fs/device-mapper-1.00.07-r1
+	)
 	>=dev-libs/libgcrypt-1.1.42
 	>=dev-libs/libgpg-error-1.0-r1
 	>=dev-libs/popt-1.7
diff --git a/sys-fs/cryptsetup/cryptsetup-1.0.6-r1.ebuild b/sys-fs/cryptsetup/cryptsetup-1.0.6-r1.ebuild
index f86523b86ac5..b25c18bc50d3 100644
--- a/sys-fs/cryptsetup/cryptsetup-1.0.6-r1.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-1.0.6-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/cryptsetup-1.0.6-r1.ebuild,v 1.4 2008/12/07 03:11:17 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/cryptsetup-1.0.6-r1.ebuild,v 1.5 2009/04/10 16:51:56 caleb Exp $
 
 inherit linux-info eutils flag-o-matic multilib
 
@@ -13,7 +13,10 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="dynamic nls selinux"
 
-DEPEND=">=sys-fs/device-mapper-1.00.07-r1
+DEPEND="|| (
+		>=sys-fs/lvm2-2.02.45
+		>=sys-fs/device-mapper-1.00.07-r1
+	)
 	>=dev-libs/libgcrypt-1.1.42
 	>=dev-libs/libgpg-error-1.0-r1
 	>=dev-libs/popt-1.7
diff --git a/sys-fs/cryptsetup/cryptsetup-1.0.6-r2.ebuild b/sys-fs/cryptsetup/cryptsetup-1.0.6-r2.ebuild
index c78deefa491b..8ab4f345acd2 100644
--- a/sys-fs/cryptsetup/cryptsetup-1.0.6-r2.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-1.0.6-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/cryptsetup-1.0.6-r2.ebuild,v 1.3 2008/12/07 03:11:17 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/cryptsetup-1.0.6-r2.ebuild,v 1.4 2009/04/10 16:51:56 caleb Exp $
 
 inherit linux-info eutils flag-o-matic multilib
 
@@ -13,7 +13,10 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="dynamic nls selinux"
 
-DEPEND=">=sys-fs/device-mapper-1.00.07-r1
+DEPEND="|| (
+		>=sys-fs/lvm2-2.02.45
+		>=sys-fs/device-mapper-1.00.07-r1
+	)
 	>=dev-libs/libgcrypt-1.1.42
 	>=dev-libs/libgpg-error-1.0-r1
 	>=dev-libs/popt-1.7
diff --git a/sys-fs/cryptsetup/cryptsetup-1.0.6.ebuild b/sys-fs/cryptsetup/cryptsetup-1.0.6.ebuild
index 62d152560286..c1a7140d2a7b 100644
--- a/sys-fs/cryptsetup/cryptsetup-1.0.6.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-1.0.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/cryptsetup-1.0.6.ebuild,v 1.3 2008/12/07 03:11:17 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/cryptsetup-1.0.6.ebuild,v 1.4 2009/04/10 16:51:56 caleb Exp $
 
 inherit linux-info eutils flag-o-matic multilib
 
@@ -13,7 +13,10 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="dynamic nls selinux"
 
-DEPEND=">=sys-fs/device-mapper-1.00.07-r1
+DEPEND="|| (
+		>=sys-fs/lvm2-2.02.45
+		>=sys-fs/device-mapper-1.00.07-r1
+	)
 	>=dev-libs/libgcrypt-1.1.42
 	>=dev-libs/libgpg-error-1.0-r1
 	>=dev-libs/popt-1.7
diff --git a/sys-fs/multipath-tools/Manifest b/sys-fs/multipath-tools/Manifest
index aeb981438f74..a0b259abd40c 100644
--- a/sys-fs/multipath-tools/Manifest
+++ b/sys-fs/multipath-tools/Manifest
@@ -7,8 +7,8 @@ AUX multipath-tools-0.4.8-build.patch 9529 RMD160 a7cfcbe99242de7de1281ba4c525e3
 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
-EBUILD multipath-tools-0.4.7-r1.ebuild 1588 RMD160 a9661a850dc935efb19549c05716a2913c602b99 SHA1 2026a7c940317964d97a40695ea9b6329abee0b8 SHA256 ee1e8d69a3f80df481cc440bec59334d9e9408d0e3152da0c569660ad61149fb
-EBUILD multipath-tools-0.4.7-r2.ebuild 1632 RMD160 db125e4044c74bbe914c3e74a45569859522d0b1 SHA1 ad6d4b1c9f1e55da156abe7d36daebcd1690aee3 SHA256 bd2fb24e3e7da524f62ce86885f6a38c8e6064f6e901c1db80556f315c327701
-EBUILD multipath-tools-0.4.8.ebuild 2313 RMD160 ba32bb3b37fa3f8510d17a13fc34e8b2b7f69fd5 SHA1 454332b8cc93d360362c9c5580f28e4ef6f47809 SHA256 92e2a5139f1282e58e67114f656a96e8408e6c2e5fd5417d8a695071f3608128
-MISC ChangeLog 4041 RMD160 515e30ded54ebc08ecc1f5bcde943fa53ae45411 SHA1 d39c410e5a58bfe2ceccc37c8b1a6f2abb8b5fad SHA256 3fc9db59d27b569ed6e54f2f1b152d9d991db0a5bdd66abd69c6b07d3a73b386
+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.ebuild 2346 RMD160 d77f5a35341b85c62f3b02033c0d1351fc436295 SHA1 f62739a1e5bcb4ead6f0abec65a95c41d8ac0b3e SHA256 e2c63fafbdb8d5557a37407454225c5a9f5493379497d5196732a0c2758a67dc
+MISC ChangeLog 4243 RMD160 a1cf8b097bea61d68e7373fc60babb278f10a2b6 SHA1 62c7f60b5d1212fae9133796abce971046e07913 SHA256 e3717d5ce10869df9e6256c4e4158e3dfbc87ee374e3b8ddbc411d8ae91ec803
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92