Bug #285868: Change openrc dep to make it not downgrade BL2 users to BL1 _or_ upgrade BL1 users to BL2. This should have the same effect as || ( =sys-apps/baselayout-1* >=sys-apps/openrc-0.4 ) without the bad side effect.

Package-Manager: portage-2.2_rc48/cvs/Linux x86_64

19 files changed, 65 insertions, 63 deletions

diff --git a/sys-fs/lvm2/ChangeLog b/sys-fs/lvm2/ChangeLog
index 2665d543c162..8b41385417e5 100644
--- a/sys-fs/lvm2/ChangeLog
+++ b/sys-fs/lvm2/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for sys-fs/lvm2
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/ChangeLog,v 1.176 2009/10/27 15:34:07 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/ChangeLog,v 1.177 2009/11/04 07:20:25 robbat2 Exp $
+
+  04 Nov 2009; Robin H. Johnson <robbat2@gentoo.org> lvm2-2.02.36.ebuild,
+  lvm2-2.02.37.ebuild, lvm2-2.02.39.ebuild, lvm2-2.02.42.ebuild,
+  lvm2-2.02.45.ebuild, lvm2-2.02.45-r1.ebuild, lvm2-2.02.45-r2.ebuild,
+  lvm2-2.02.48.ebuild, lvm2-2.02.48-r1.ebuild, lvm2-2.02.48-r2.ebuild,
+  lvm2-2.02.49.ebuild, lvm2-2.02.49-r1.ebuild, lvm2-2.02.49-r2.ebuild,
+  lvm2-2.02.49-r3.ebuild, lvm2-2.02.51.ebuild, lvm2-2.02.51-r1.ebuild,
+  lvm2-2.02.51-r2.ebuild:
+  Bug #285868: Change openrc dep to make it not downgrade BL2 users to BL1
+  _or_ upgrade BL1 users to BL2. This should have the same effect as (
+  =sys-apps/baselayout-1* >=sys-apps/openrc-0.4 ) without the bad side
+  effect.
 
 *lvm2-2.02.51-r2 (27 Oct 2009)
 
diff --git a/sys-fs/lvm2/Manifest b/sys-fs/lvm2/Manifest
index a9753427f369..747832cfe472 100644
--- a/sys-fs/lvm2/Manifest
+++ b/sys-fs/lvm2/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 1.02.22-dmeventd.initd 536 RMD160 2f65a288b735035e6b2451c71ab432a525b19b3a SHA1 5413ad7eaf63a5e7c52f1b21138422f9e4fd6186 SHA256 c9dcee15ce55961e5df7928c350ae1c6db6e78c30d87f7fafa6ba4b016dd9191
 AUX 64-device-mapper.rules-1.02.22-r5 1010 RMD160 3dbb70b60b0c86a77fb9d0e8a0a9cd16a7dd03cc SHA1 fec62b9d4357fe4160e3d017c103767b6c9bf232 SHA256 7c92c2ff3c8dee6588ac51f8367a7b4bcb31d42f2d306ed08ce01be809b9ffcd
 AUX 64-device-mapper.rules-1.02.49-r2 1104 RMD160 61acc7a3f39313df82a82fd4062e8eb10ee384cf SHA1 c6c6fa203982fcfaf11b4c9e4e79c5dd19dda6c3 SHA256 8fb11cac5757f16f67a62e3ee6ec7d986ee77fa020da7589142ac7efd6d24ac2
@@ -50,29 +47,22 @@ DIST LVM2.2.02.51.tgz 790458 RMD160 7ca55e29c6d780b4b052b07eeabbd731a034721f SHA
 EBUILD lvm2-2.01.13.ebuild 1470 RMD160 125ecf8a32609d67876e16afa155aa256bdc22ee SHA1 95c96a2158c40bc325da6eeaded050e9e426a0e5 SHA256 b3ee4c923da035604cdf69673c12824c7b74a1716550496ce38d9281d39fa6ef
 EBUILD lvm2-2.02.33-r1.ebuild 4527 RMD160 d7c43a570f25beaf431634f43b6558c2bcd428d7 SHA1 cbedf70a586f9243306d11892e053c657c71c65b SHA256 76653135b9146bd626e590088d699cbfdf03f1eb6564679749d6f6443f4c2b61
 EBUILD lvm2-2.02.33.ebuild 4498 RMD160 300f760b96ffa1edf4a66d5fb7c5aabdbd4d72db SHA1 38347fcebff8361fae71c3dac14be67b7b9840db SHA256 d68b8b39547a132b639a4e55df9aec29a5bd46038c3d65e5114cfcfb7c2e3783
-EBUILD lvm2-2.02.36.ebuild 4573 RMD160 90bc115bd006769f59471f8effad993f0ebd4757 SHA1 af285bb63daf77ab3fe23f37b99ae7c88430278a SHA256 f76d11d69ea3830ece2be3f29617dec7f1fa0f71248e3b09ffb3672fed72dd06
-EBUILD lvm2-2.02.37.ebuild 4699 RMD160 c2e47820391919f146660a9615a9a3bb55679cc2 SHA1 96ffbff770172c82cef531be2fd94ed6a347d0b4 SHA256 507b715e7b4b10ad91054a86d39489ee326ecb17883f63db1f9cdd060391a32b
-EBUILD lvm2-2.02.39.ebuild 4762 RMD160 2f9cd1fbc475666e805ebc902ddaa0cc535f56d6 SHA1 2c1f6786e72c80ac7b577295059719e8eb728cd5 SHA256 b59bd6ce0140a0205f107e7e7addd852fb35c81f1fede4911b40d1de67584b09
-EBUILD lvm2-2.02.42.ebuild 4762 RMD160 a0da2341eb5ceb3f25ef3a94571e8363054f87c0 SHA1 df0132dd3462c2b38fc454287062f92dffd107e1 SHA256 9cbb8ee894ec4810a21b19f3e633dfdcc78f96cbe29b147a06e0521117a9ed5e
-EBUILD lvm2-2.02.45-r1.ebuild 5772 RMD160 a0e15380fa246ddaf3a2bb9d694512f19ebd6c89 SHA1 6f5ee2f388bbc91bfd3d9000934febdd4fe530bc SHA256 98b9853c5782932957b192bc0da43fc8fd27807707aa5f732bc6b97dfcefe750
-EBUILD lvm2-2.02.45-r2.ebuild 5913 RMD160 524d26b5ed1aabf61c2078bbae3592e04f0c85b0 SHA1 8f15a8d22fed863253b5b028718223e2890e7f24 SHA256 c6bb8439335c0ddb0716527c2c288066f3c882d079e3da9543b301cbcc1bf35b
-EBUILD lvm2-2.02.45.ebuild 5806 RMD160 b7989a8b5af8d1442ee4b405eec309d5b7d6d1e0 SHA1 ef83ab2162563343bd8e0f01db28d169db580906 SHA256 06346c808ca37fa10423827e241de63a94e6132e921757ced14729d1e02913b9
-EBUILD lvm2-2.02.48-r1.ebuild 6239 RMD160 7165f2ea7f27ea9733b2c853da369666b7a62b2e SHA1 3cfb8826bd6a79dc0fbbbded8837760e01c2335a SHA256 1758cc1a9576b04785585caf7cffd05343f99dae095a7e9663bfab3f8dbd3dda
-EBUILD lvm2-2.02.48-r2.ebuild 6372 RMD160 0b21fa8243398d0f5f3940d2bc78082c2c695e57 SHA1 9db35bf619538c0a0e2695dab5260e8eb79ae355 SHA256 545da868d77e9595b4f012456de2c689659797c8f43a2f584df444463668d731
-EBUILD lvm2-2.02.48.ebuild 6084 RMD160 726b088067c7a686a6a5ccedb0369703a380e3b5 SHA1 1bddf835713607ced8094e33753cf24d2bfb9ef0 SHA256 cfb9c307cbb3be4f4c0199f1a7f79590f1fbc75aaf508d97cc03ed9cf6390bd8
-EBUILD lvm2-2.02.49-r1.ebuild 6434 RMD160 3be23497f1fa3ad9b84640888f7508e83b8444b9 SHA1 79b6297472556e3473f9367c17704fbd8177b315 SHA256 95807311a5c9e485af1df95e64b4388661d3736c8ee091d7754e0eef4d779ac2
-EBUILD lvm2-2.02.49-r2.ebuild 6462 RMD160 27bcee11fc674f3dc8720f780d6af8b52d4a5609 SHA1 730dd132190ad4bef6251aa4e2cfc94d9691ecfb SHA256 9abd6b6199279ab0cbc997279e3a5cced4843f3969bad6c6857c8a5f759043b7
-EBUILD lvm2-2.02.49-r3.ebuild 6403 RMD160 ca3b4adaaf7a8647be7efc9cb9997563e520e4fe SHA1 bc733e76a2e20fd103755c11227f0fd28989f5cf SHA256 9ad461f254c63bf70d655632b3683184ad27b67efbe9b9424fa64161c61d37c6
-EBUILD lvm2-2.02.49.ebuild 6369 RMD160 8857f34c703bd35f4ea8ce13f2519813b030e300 SHA1 9484881248a0777821dbf78991c8f175e0fdffec SHA256 b001fb878e5190bb06b8edc86ee18ffa235597c8fd17ed27ea4f19f07fcc8824
-EBUILD lvm2-2.02.51-r1.ebuild 6457 RMD160 65b18a7c03fdedb94b59749952bd16308f0259a0 SHA1 0fff4f3569ee36c20f89554b6476c2715ba8ceba SHA256 89e06c8795c2b46724a062933825e4dec0aead88c45ac8781b17052d8b80bd2f
-EBUILD lvm2-2.02.51-r2.ebuild 6577 RMD160 0635db5a1ffce0b71f4d43ba2b42bfd8e61f43c4 SHA1 53f16ad43a44884b6a4ec53e6388b7cb645b1e76 SHA256 33aa46e643819b45586d7153ec950b9aa0b391b17611bf6e31eb6cf080d004f5
-EBUILD lvm2-2.02.51.ebuild 6405 RMD160 604372e41b7371a3784e669b00677e36a7acdd65 SHA1 9620d57c5e7c28f2a09c2e0d2aa8fb92a5d498f1 SHA256 39b3193c165c75d6f4dcf4d6ebac5e2535d68323800f8600aa278ed979f5623d
-MISC ChangeLog 30039 RMD160 7bfb25829fa40c4c3b56f372897c17b99d37b910 SHA1 eb4c9641dd5f8cebe746711286963ff0c118e930 SHA256 29905b93c9871da454ec69a4b13641fbb778486951a560d55bd594aadfe9327c
+EBUILD lvm2-2.02.36.ebuild 4542 RMD160 a7011a86645fac59b409103f693ecc4e8f9849a4 SHA1 d59f6059952bfa8a173f520e17b90e41d72218d6 SHA256 7cd6d1d55699f41b63486bbaba5560cf0e5b98dcf64959587d50ab406d93dee6
+EBUILD lvm2-2.02.37.ebuild 4669 RMD160 36b3421a400df444c5a3997f94e1bcbb2935871e SHA1 100196a9b7b678ffc4d50684acd336886ad650d5 SHA256 b2958a675f555c076b93ccf8cef205a4392d42d2f8a9298eea341fbd22450317
+EBUILD lvm2-2.02.39.ebuild 4731 RMD160 25b79aaf701ab823842d38ec7cfcb65131b847fc SHA1 75347407042cb91bc6895eb1a5a5c0188c78abbc SHA256 87da72560d341d32e4260cff586bae5a8c89a288a13a6160dd6d7b09cb6e2a46
+EBUILD lvm2-2.02.42.ebuild 4731 RMD160 725f3cefae073ee36b7f32a86451fc2c26634487 SHA1 d99ba7606d955316723993b0fa84847375c93e85 SHA256 f05eebf29f4c693586cf3d623f3281845f2b530f604f0fc323a38c686db75323
+EBUILD lvm2-2.02.45-r1.ebuild 5741 RMD160 298259b0aaab97c699641e0016449a0716b8d270 SHA1 774399af79463baab87f369ef7734ed940cb6148 SHA256 6b139fdf5bbd5d68ecd98dcdfba23b4b50f8ff37a2bbbd1799a71a3c2f151373
+EBUILD lvm2-2.02.45-r2.ebuild 5882 RMD160 606c3812a9fdbc72bf0fa93dcb2755dc573c4778 SHA1 9458b5f51ffe759982943a9ac5c2d0597214b93f SHA256 e6a3b1f16859ae55e5b36d490ff975f4657eca143b1c29764cb387dda2e276a4
+EBUILD lvm2-2.02.45.ebuild 5775 RMD160 4a838011ce1428b601a4a2390617c58571513b0e SHA1 1aa9def2b1c0d9fb9a3de02010df412a64318e65 SHA256 59bf8cd1748a691ef67dbaad81115aba45804b256dee2f14e6ccc67fdca816d8
+EBUILD lvm2-2.02.48-r1.ebuild 6208 RMD160 96037ec1402d2ebfc72bd0c0dd16eb3868f03bb5 SHA1 97de7820c6b4cb2b363c163a98bc25ed10921720 SHA256 5fb8c434e6ca47d6a720f951c47f6172852e3c72bbc3910fb4c7d25a98590afd
+EBUILD lvm2-2.02.48-r2.ebuild 6341 RMD160 82a218faa0a7c0ccab467bad577a966baffc2e6c SHA1 10d423fa0ecb0dbe4ad2748221350c8de79aadd5 SHA256 2a90dcc87bb481dca8b7120c0ed1d4d49003d799ab51d3da856b0cfc1873f827
+EBUILD lvm2-2.02.48.ebuild 6053 RMD160 950d369b9c0f731dd1710073c240335233b15072 SHA1 a8c811bbe5134ded9f22afeb0f32a00635725a19 SHA256 ee0cce31e50904fa2f687dcd1726dee4d6e90cc31002a1917446a6144ba84e3c
+EBUILD lvm2-2.02.49-r1.ebuild 6403 RMD160 08428b7737465270d7609c4b9eb96f11d5e3b3bd SHA1 19b58f66c109c25bfca77ab422592690df781352 SHA256 6848cb7dc284ca835646e8224df617e426bbf4f919b857c58cd150d2295ea6df
+EBUILD lvm2-2.02.49-r2.ebuild 6431 RMD160 7a260be0af552bfd8f2e5218ffb7fa7d035dbc18 SHA1 76e407ee20014d92e8e833f80ebc1ee332963c1a SHA256 737712a15c251064fe4e06e833b08b98b0f5ba62c02c82028c51077394ac2c5f
+EBUILD lvm2-2.02.49-r3.ebuild 6372 RMD160 24323e1b0e54d9a0b90d1089ef13d38a35ff5e8f SHA1 24dfb5d77ea676712df1bddd23ed3814fae0945c SHA256 784e2f6f0bb4c7083523a9b4cf995bb0eed2c283ba7b740f304bdab969357d00
+EBUILD lvm2-2.02.49.ebuild 6338 RMD160 9d5c898a0eee19d4d9a751db817f6cef9b8e803a SHA1 d4e4fcb39b6a844aaa622b265d9ff658aeba2e90 SHA256 ebb8b0c905b5d5d54984ed4336b3a969dba515766c59307021e7d7d8775322ce
+EBUILD lvm2-2.02.51-r1.ebuild 6430 RMD160 7b0b41df9daee6a1bbe8e6af2a9957bcb13e21d8 SHA1 39e2aab6069efd6e2f40856909bd2e5ad608127a SHA256 443f80392ccb144fbda86c43d633fa6b1a4ad39e43e06135d7590e887865fb89
+EBUILD lvm2-2.02.51-r2.ebuild 6549 RMD160 3823de88752a6418c2bb2957150d7d46de64585f SHA1 3cff105519292eeee8b463739939a38946701076 SHA256 711d60ed892b25dbeb7c0432a7ef178ee18976698a9e4a67c3af305fc0ed78a9
+EBUILD lvm2-2.02.51.ebuild 6374 RMD160 d78f74edba8bcd89132674476865ff5aebdf0727 SHA1 0841e2a6941720864cb2400a539055ea00b4daca SHA256 d06c72cf94bffdad5df089d214f1a288de2d1d8c709ddf53b353660a221fa847
+MISC ChangeLog 30719 RMD160 cb3ef48bb5836deb9f7c3957ec710275fc920680 SHA1 8c18c4f0802d0c22bbfa46705d4af1099eb6e9f0 SHA256 6c274a9dcaa6c69e30ffcde6422f44a32c31232a2079a5756366840c2e2d3464
 MISC metadata.xml 792 RMD160 f60db9169ee273ca2f97fa5e69d4e5329e988164 SHA1 42f85f30477c65a164a11e172db7e250f442dca5 SHA256 87ced5a3a6102985f7c2a619dd52f65e62ae916f8921c8e7115a25452cd44b7f
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.13 (GNU/Linux)
-
-iEYEARECAAYFAkrnIQYACgkQt2vP6XvVdOd7VQCgpbxHrBrk4wlgOQoPEhW+X74d
-RaoAoKzLdh2fmoELMqvufRcZtZqO5Faa
-=PZOr
------END PGP SIGNATURE-----
diff --git a/sys-fs/lvm2/lvm2-2.02.36.ebuild b/sys-fs/lvm2/lvm2-2.02.36.ebuild
index df87c78b49a6..3bdb7268f768 100644
--- a/sys-fs/lvm2/lvm2-2.02.36.ebuild
+++ b/sys-fs/lvm2/lvm2-2.02.36.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/lvm2-2.02.36.ebuild,v 1.10 2009/09/18 02:05:33 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/lvm2-2.02.36.ebuild,v 1.11 2009/11/04 07:20:25 robbat2 Exp $
 
 EAPI=1
 inherit eutils multilib
@@ -21,7 +21,7 @@ DEPEND=">=sys-fs/device-mapper-1.02.24
 			cman? ( >=sys-cluster/cman-1.01.00 ) )"
 
 RDEPEND="${DEPEND}
-	|| ( =sys-apps/baselayout-1* >=sys-apps/openrc-0.4 )
+	!<sys-apps/openrc-0.4
 	!sys-fs/lvm-user
 	!sys-fs/clvm"
 
diff --git a/sys-fs/lvm2/lvm2-2.02.37.ebuild b/sys-fs/lvm2/lvm2-2.02.37.ebuild
index d3dcf736b5df..4a6af6862581 100644
--- a/sys-fs/lvm2/lvm2-2.02.37.ebuild
+++ b/sys-fs/lvm2/lvm2-2.02.37.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/lvm2-2.02.37.ebuild,v 1.9 2009/09/18 02:05:33 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/lvm2-2.02.37.ebuild,v 1.10 2009/11/04 07:20:25 robbat2 Exp $
 
 EAPI=1
 inherit eutils multilib
@@ -21,7 +21,7 @@ DEPEND=">=sys-fs/device-mapper-1.02.26
 			cman? ( >=sys-cluster/cman-1.01.00 ) )"
 
 RDEPEND="${DEPEND}
-	|| ( =sys-apps/baselayout-1* >=sys-apps/openrc-0.4 )
+	!<sys-apps/openrc-0.4
 	!sys-fs/lvm-user
 	!sys-fs/clvm"
 
diff --git a/sys-fs/lvm2/lvm2-2.02.39.ebuild b/sys-fs/lvm2/lvm2-2.02.39.ebuild
index 9ebf2fbb3693..1f93647af2a1 100644
--- a/sys-fs/lvm2/lvm2-2.02.39.ebuild
+++ b/sys-fs/lvm2/lvm2-2.02.39.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/lvm2-2.02.39.ebuild,v 1.7 2009/09/18 02:05:33 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/lvm2-2.02.39.ebuild,v 1.8 2009/11/04 07:20:25 robbat2 Exp $
 
 EAPI=1
 inherit eutils multilib
@@ -21,7 +21,7 @@ DEPEND=">=sys-fs/device-mapper-1.02.27
 			cman? ( >=sys-cluster/cman-1.01.00 ) )"
 
 RDEPEND="${DEPEND}
-	|| ( =sys-apps/baselayout-1* >=sys-apps/openrc-0.4 )
+	!<sys-apps/openrc-0.4
 	!sys-fs/lvm-user
 	!sys-fs/clvm"
 
diff --git a/sys-fs/lvm2/lvm2-2.02.42.ebuild b/sys-fs/lvm2/lvm2-2.02.42.ebuild
index 4ff650495491..6a6c922ab055 100644
--- a/sys-fs/lvm2/lvm2-2.02.42.ebuild
+++ b/sys-fs/lvm2/lvm2-2.02.42.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/lvm2-2.02.42.ebuild,v 1.6 2009/09/18 02:05:33 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/lvm2-2.02.42.ebuild,v 1.7 2009/11/04 07:20:25 robbat2 Exp $
 
 EAPI=1
 inherit eutils multilib
@@ -21,7 +21,7 @@ DEPEND=">=sys-fs/device-mapper-1.02.28
 			cman? ( >=sys-cluster/cman-1.01.00 ) )"
 
 RDEPEND="${DEPEND}
-	|| ( =sys-apps/baselayout-1* >=sys-apps/openrc-0.4 )
+	!<sys-apps/openrc-0.4
 	!sys-fs/lvm-user
 	!sys-fs/clvm"
 
diff --git a/sys-fs/lvm2/lvm2-2.02.45-r1.ebuild b/sys-fs/lvm2/lvm2-2.02.45-r1.ebuild
index ee3275fe9aac..3d052f84a6eb 100644
--- a/sys-fs/lvm2/lvm2-2.02.45-r1.ebuild
+++ b/sys-fs/lvm2/lvm2-2.02.45-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/lvm2-2.02.45-r1.ebuild,v 1.4 2009/09/18 02:05:33 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/lvm2-2.02.45-r1.ebuild,v 1.5 2009/11/04 07:20:25 robbat2 Exp $
 
 EAPI=1
 inherit eutils multilib toolchain-funcs
@@ -21,7 +21,7 @@ DEPEND="!sys-fs/device-mapper
 		cman? ( >=sys-cluster/cman-1.01.00 ) )"
 
 RDEPEND="${DEPEND}
-	|| ( =sys-apps/baselayout-1* >=sys-apps/openrc-0.4 )
+	!<sys-apps/openrc-0.4
 	!sys-fs/lvm-user
 	!sys-fs/clvm"
 
diff --git a/sys-fs/lvm2/lvm2-2.02.45-r2.ebuild b/sys-fs/lvm2/lvm2-2.02.45-r2.ebuild
index 12c7123298e2..ce510173fac5 100644
--- a/sys-fs/lvm2/lvm2-2.02.45-r2.ebuild
+++ b/sys-fs/lvm2/lvm2-2.02.45-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/lvm2-2.02.45-r2.ebuild,v 1.4 2009/09/18 02:05:33 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/lvm2-2.02.45-r2.ebuild,v 1.5 2009/11/04 07:20:25 robbat2 Exp $
 
 EAPI=1
 inherit eutils multilib toolchain-funcs
@@ -21,7 +21,7 @@ DEPEND="!sys-fs/device-mapper
 		cman? ( =sys-cluster/cman-2* ) )"
 
 RDEPEND="${DEPEND}
-	|| ( =sys-apps/baselayout-1* >=sys-apps/openrc-0.4 )
+	!<sys-apps/openrc-0.4
 	!sys-fs/lvm-user
 	!sys-fs/clvm"
 
diff --git a/sys-fs/lvm2/lvm2-2.02.45.ebuild b/sys-fs/lvm2/lvm2-2.02.45.ebuild
index f8341bf1c431..c696b360f6f6 100644
--- a/sys-fs/lvm2/lvm2-2.02.45.ebuild
+++ b/sys-fs/lvm2/lvm2-2.02.45.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/lvm2-2.02.45.ebuild,v 1.10 2009/09/18 02:05:33 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/lvm2-2.02.45.ebuild,v 1.11 2009/11/04 07:20:25 robbat2 Exp $
 
 EAPI=1
 inherit eutils multilib toolchain-funcs
@@ -21,7 +21,7 @@ DEPEND="!sys-fs/device-mapper
 		cman? ( >=sys-cluster/cman-1.01.00 ) )"
 
 RDEPEND="${DEPEND}
-	|| ( =sys-apps/baselayout-1* >=sys-apps/openrc-0.4 )
+	!<sys-apps/openrc-0.4
 	!sys-fs/lvm-user
 	!sys-fs/clvm"
 
diff --git a/sys-fs/lvm2/lvm2-2.02.48-r1.ebuild b/sys-fs/lvm2/lvm2-2.02.48-r1.ebuild
index 926d3345109f..2fdbd9f89483 100644
--- a/sys-fs/lvm2/lvm2-2.02.48-r1.ebuild
+++ b/sys-fs/lvm2/lvm2-2.02.48-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/lvm2-2.02.48-r1.ebuild,v 1.4 2009/09/18 02:05:33 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/lvm2-2.02.48-r1.ebuild,v 1.5 2009/11/04 07:20:25 robbat2 Exp $
 
 EAPI=1
 inherit eutils multilib toolchain-funcs
@@ -21,7 +21,7 @@ DEPEND="!sys-fs/device-mapper
 		cman? ( =sys-cluster/cman-2* ) )"
 
 RDEPEND="${DEPEND}
-	|| ( =sys-apps/baselayout-1* >=sys-apps/openrc-0.4 )
+	!<sys-apps/openrc-0.4
 	!sys-fs/lvm-user
 	!sys-fs/clvm"
 
diff --git a/sys-fs/lvm2/lvm2-2.02.48-r2.ebuild b/sys-fs/lvm2/lvm2-2.02.48-r2.ebuild
index 17d92d240007..3d0b2c9eec67 100644
--- a/sys-fs/lvm2/lvm2-2.02.48-r2.ebuild
+++ b/sys-fs/lvm2/lvm2-2.02.48-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/lvm2-2.02.48-r2.ebuild,v 1.3 2009/09/18 02:05:33 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/lvm2-2.02.48-r2.ebuild,v 1.4 2009/11/04 07:20:25 robbat2 Exp $
 
 EAPI=2
 inherit eutils multilib toolchain-funcs autotools
@@ -21,7 +21,7 @@ DEPEND="!!sys-fs/device-mapper
 		cman? ( =sys-cluster/cman-2* ) )"
 
 RDEPEND="${DEPEND}
-	|| ( =sys-apps/baselayout-1* >=sys-apps/openrc-0.4 )
+	!<sys-apps/openrc-0.4
 	!!sys-fs/lvm-user
 	!!sys-fs/clvm"
 
diff --git a/sys-fs/lvm2/lvm2-2.02.48.ebuild b/sys-fs/lvm2/lvm2-2.02.48.ebuild
index b3cb8b173478..4196de57d29c 100644
--- a/sys-fs/lvm2/lvm2-2.02.48.ebuild
+++ b/sys-fs/lvm2/lvm2-2.02.48.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/lvm2-2.02.48.ebuild,v 1.5 2009/09/18 02:05:33 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/lvm2-2.02.48.ebuild,v 1.6 2009/11/04 07:20:25 robbat2 Exp $
 
 EAPI=1
 inherit eutils multilib toolchain-funcs
@@ -21,7 +21,7 @@ DEPEND="!sys-fs/device-mapper
 		cman? ( =sys-cluster/cman-2* ) )"
 
 RDEPEND="${DEPEND}
-	|| ( =sys-apps/baselayout-1* >=sys-apps/openrc-0.4 )
+	!<sys-apps/openrc-0.4
 	!sys-fs/lvm-user
 	!sys-fs/clvm"
 
diff --git a/sys-fs/lvm2/lvm2-2.02.49-r1.ebuild b/sys-fs/lvm2/lvm2-2.02.49-r1.ebuild
index af96210bef1d..d2c8aaae210a 100644
--- a/sys-fs/lvm2/lvm2-2.02.49-r1.ebuild
+++ b/sys-fs/lvm2/lvm2-2.02.49-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/lvm2-2.02.49-r1.ebuild,v 1.3 2009/09/18 02:05:33 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/lvm2-2.02.49-r1.ebuild,v 1.4 2009/11/04 07:20:25 robbat2 Exp $
 
 EAPI=2
 inherit eutils multilib toolchain-funcs autotools
@@ -21,7 +21,7 @@ DEPEND="!!sys-fs/device-mapper
 		cman? ( =sys-cluster/cman-2* ) )"
 
 RDEPEND="${DEPEND}
-	|| ( =sys-apps/baselayout-1* >=sys-apps/openrc-0.4 )
+	!<sys-apps/openrc-0.4
 	!!sys-fs/lvm-user
 	!!sys-fs/clvm"
 
diff --git a/sys-fs/lvm2/lvm2-2.02.49-r2.ebuild b/sys-fs/lvm2/lvm2-2.02.49-r2.ebuild
index 509fc7236d4f..11f831b99494 100644
--- a/sys-fs/lvm2/lvm2-2.02.49-r2.ebuild
+++ b/sys-fs/lvm2/lvm2-2.02.49-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/lvm2-2.02.49-r2.ebuild,v 1.3 2009/09/18 02:05:33 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/lvm2-2.02.49-r2.ebuild,v 1.4 2009/11/04 07:20:25 robbat2 Exp $
 
 EAPI=2
 inherit eutils multilib toolchain-funcs autotools
@@ -21,7 +21,7 @@ DEPEND="!!sys-fs/device-mapper
 		cman? ( =sys-cluster/cman-2* ) )"
 
 RDEPEND="${DEPEND}
-	|| ( =sys-apps/baselayout-1* >=sys-apps/openrc-0.4 )
+	!<sys-apps/openrc-0.4
 	!!sys-fs/lvm-user
 	!!sys-fs/clvm
 	>=sys-apps/util-linux-2.16"
diff --git a/sys-fs/lvm2/lvm2-2.02.49-r3.ebuild b/sys-fs/lvm2/lvm2-2.02.49-r3.ebuild
index a55f460fff3e..011c4bfeed88 100644
--- a/sys-fs/lvm2/lvm2-2.02.49-r3.ebuild
+++ b/sys-fs/lvm2/lvm2-2.02.49-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/lvm2-2.02.49-r3.ebuild,v 1.2 2009/09/18 02:05:33 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/lvm2-2.02.49-r3.ebuild,v 1.3 2009/11/04 07:20:25 robbat2 Exp $
 
 EAPI=2
 inherit eutils multilib toolchain-funcs autotools
@@ -21,7 +21,7 @@ DEPEND="!!sys-fs/device-mapper
 		cman? ( =sys-cluster/cman-2* ) )"
 
 RDEPEND="${DEPEND}
-	|| ( =sys-apps/baselayout-1* >=sys-apps/openrc-0.4 )
+	!<sys-apps/openrc-0.4
 	!!sys-fs/lvm-user
 	!!sys-fs/clvm
 	>=sys-apps/util-linux-2.16"
diff --git a/sys-fs/lvm2/lvm2-2.02.49.ebuild b/sys-fs/lvm2/lvm2-2.02.49.ebuild
index ad8fa2c898d3..a6e35039ace0 100644
--- a/sys-fs/lvm2/lvm2-2.02.49.ebuild
+++ b/sys-fs/lvm2/lvm2-2.02.49.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/lvm2-2.02.49.ebuild,v 1.3 2009/09/18 02:05:33 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/lvm2-2.02.49.ebuild,v 1.4 2009/11/04 07:20:25 robbat2 Exp $
 
 EAPI=2
 inherit eutils multilib toolchain-funcs autotools
@@ -21,7 +21,7 @@ DEPEND="!!sys-fs/device-mapper
 		cman? ( =sys-cluster/cman-2* ) )"
 
 RDEPEND="${DEPEND}
-	|| ( =sys-apps/baselayout-1* >=sys-apps/openrc-0.4 )
+	!<sys-apps/openrc-0.4
 	!!sys-fs/lvm-user
 	!!sys-fs/clvm"
 
diff --git a/sys-fs/lvm2/lvm2-2.02.51-r1.ebuild b/sys-fs/lvm2/lvm2-2.02.51-r1.ebuild
index af1dde519da6..cb948788c940 100644
--- a/sys-fs/lvm2/lvm2-2.02.51-r1.ebuild
+++ b/sys-fs/lvm2/lvm2-2.02.51-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/lvm2-2.02.51-r1.ebuild,v 1.4 2009/10/21 08:32:00 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/lvm2-2.02.51-r1.ebuild,v 1.5 2009/11/04 07:20:25 robbat2 Exp $
 
 EAPI=2
 inherit eutils multilib toolchain-funcs autotools
@@ -21,7 +21,7 @@ DEPEND="!!sys-fs/device-mapper
 		cman? ( =sys-cluster/cman-2* ) )"
 
 RDEPEND="${DEPEND}
-	|| ( =sys-apps/baselayout-1* >=sys-apps/openrc-0.4 )
+	!<sys-apps/openrc-0.4
 	!!sys-fs/lvm-user
 	!!sys-fs/clvm
 	>=sys-apps/util-linux-2.16"
diff --git a/sys-fs/lvm2/lvm2-2.02.51-r2.ebuild b/sys-fs/lvm2/lvm2-2.02.51-r2.ebuild
index 856d87958d69..e2539cc859a8 100644
--- a/sys-fs/lvm2/lvm2-2.02.51-r2.ebuild
+++ b/sys-fs/lvm2/lvm2-2.02.51-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/lvm2-2.02.51-r2.ebuild,v 1.1 2009/10/27 15:34:07 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/lvm2-2.02.51-r2.ebuild,v 1.2 2009/11/04 07:20:25 robbat2 Exp $
 
 EAPI=2
 inherit eutils multilib toolchain-funcs autotools
@@ -21,7 +21,7 @@ DEPEND="!!sys-fs/device-mapper
 		cman? ( =sys-cluster/cman-2* ) )"
 
 RDEPEND="${DEPEND}
-	|| ( =sys-apps/baselayout-1* >=sys-apps/openrc-0.4 )
+	!<sys-apps/openrc-0.4
 	!!sys-fs/lvm-user
 	!!sys-fs/clvm
 	>=sys-apps/util-linux-2.16"
diff --git a/sys-fs/lvm2/lvm2-2.02.51.ebuild b/sys-fs/lvm2/lvm2-2.02.51.ebuild
index a74aff529e5e..86a44c5869f5 100644
--- a/sys-fs/lvm2/lvm2-2.02.51.ebuild
+++ b/sys-fs/lvm2/lvm2-2.02.51.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/lvm2-2.02.51.ebuild,v 1.3 2009/09/18 02:05:33 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/lvm2-2.02.51.ebuild,v 1.4 2009/11/04 07:20:25 robbat2 Exp $
 
 EAPI=2
 inherit eutils multilib toolchain-funcs autotools
@@ -21,7 +21,7 @@ DEPEND="!!sys-fs/device-mapper
 		cman? ( =sys-cluster/cman-2* ) )"
 
 RDEPEND="${DEPEND}
-	|| ( =sys-apps/baselayout-1* >=sys-apps/openrc-0.4 )
+	!<sys-apps/openrc-0.4
 	!!sys-fs/lvm-user
 	!!sys-fs/clvm
 	>=sys-apps/util-linux-2.16"