Remove sys-fs/device-mapper from || () syntax in favour of sys-fs/lvm2 wrt #461382

Package-Manager: portage-2.2.0_alpha171/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

5 files changed, 32 insertions, 16 deletions

diff --git a/sys-fs/dmraid/ChangeLog b/sys-fs/dmraid/ChangeLog
index eef3446742dc..5e7faf8a71e7 100644
--- a/sys-fs/dmraid/ChangeLog
+++ b/sys-fs/dmraid/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-fs/dmraid
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/dmraid/ChangeLog,v 1.33 2013/02/02 23:12:24 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/dmraid/ChangeLog,v 1.34 2013/04/09 09:53:57 ssuominen Exp $
+
+  09 Apr 2013; Samuli Suominen <ssuominen@gentoo.org> dmraid-1.0.0_rc14.ebuild,
+  dmraid-1.0.0_rc15.ebuild, dmraid-1.0.0_rc16-r3.ebuild:
+  Remove sys-fs/device-mapper from || () syntax in favour of sys-fs/lvm2 wrt
+  #461382
 
   02 Feb 2013; Agostino Sarubbo <ago@gentoo.org> dmraid-1.0.0_rc16-r3.ebuild:
   Add ~arm, wrt bug #449220
diff --git a/sys-fs/dmraid/Manifest b/sys-fs/dmraid/Manifest
index 6def3772b6b6..63444bb029df 100644
--- a/sys-fs/dmraid/Manifest
+++ b/sys-fs/dmraid/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX dmraid-1.0.0_rc15-devsk-isw.patch 723 SHA256 fa7f184b8f76812fbc379265a2e5563cf0242bdf381f8485e4ea781b7172fd43 SHA512 c270134917c7305c7b9e5f09d451c8dfd022e134cfc59ea3aadf5c20543476287e6bc1fcd3ea2950d32f7f3f08247d4094f1758235919db3e9e9edaaf7aabe25 WHIRLPOOL 4a56f0dc3d1d9c2fa12a4371fe6a5c76f9047bf041a2302cc1f106fc01b212adeb070a780812f26fa035094501dbb8ed368a4b45ac3daaade055565b89d11ecf
 AUX dmraid-1.0.0_rc15-undo-p-rename.patch 531 SHA256 5eb8d6b268249fe3ef9e184376dfc04a2b8cffb4204c41d69480f3ae09caa670 SHA512 b5b93d49e716c585284dfd89fe4651fd5bb6921196a053797aeec9cf5654f11da7b2ed1ad93f2df15fd3ef47c95efd67aeecc196fcfd3feb22f7903ad103a8c6 WHIRLPOOL 0343c2619499c43478438081c751c2e23133d39a45ef12e2fb6664babf6e4d1e385f07714cc487603e8b0962f2a0314bb56bc0df81c179e51d7013df94222102
 AUX dmraid-1.0.0_rc16-as-needed2.patch 429 SHA256 d66d681b126c3fbdd34a177436b6ee7f925403467b65ce688bd957cfd28560ee SHA512 663b779261c30d5aa40184da10f56243a1ed4faaa9f387ff85dc4c7ebee2e5375bd78fdf43ce8d1952f17460b7e802cf5053971ea4fc652777fb70b569e8ea0e WHIRLPOOL 5d6a0586f25789bc5ab5e80e1ca571bf0e4153d55113d72d7b82098d9915e1c289a0f74c7c762976e043affbac9d31912e7bd6868f01063753d1f81925f685cf
@@ -8,8 +11,19 @@ AUX dmraid-destdir-fix.patch 902 SHA256 4a275211bd2036ceec2181e1ac1bc4d14d522cb2
 DIST dmraid-1.0.0.rc14.tar.bz2 164234 SHA256 a777354d6d69a9b58d84966cc7b37bc3f5c89539f885ad25fd874ed1c388fbec SHA512 0804e1bf91f4707b8845affeb987e68c5a85d97119af27ddba2927c87735a59b86b1fec4f03ac0fbdcde89d779d77e21cab4e6936dd1a82b53a0d8b16eb59768 WHIRLPOOL c5612139d3f24be710fb8e6d51eb6ebe0847dcf804c0c0ba1a5f3142a2680de2b33bfae74bbf3cff704b0da5d9d273c432906f1b7fd46e1057b8ef53cc89ca1e
 DIST dmraid-1.0.0.rc15.tar.bz2 190475 SHA256 30847258b7f946ed908e79af4058bbf2c9a3791728b8231f7c490ca601566c05
 DIST dmraid-1.0.0.rc16-3.tar.bz2 232743 SHA256 93421bd169d71ff5e7d2db95b62b030bfa205a12010b6468dcdef80337d6fbd8 SHA512 7c45e5117adc52fc2094b1b2bad4f4c518a46317a2196611966d72085ba3587c4ac8d1080f9d934888c01788f2b2d3d621c6f0d3e2a023c0fb1f9f3fa7fc127e WHIRLPOOL 87915ea0013766da8a9722b437bfe146b4b2c7560a7814ac6caab92054ddc3b4b59ceb4d413609d5eaab92b5cee67886ade7924455f1dba19f1b8dabc25d3498
-EBUILD dmraid-1.0.0_rc14.ebuild 2217 SHA256 27e053c77811dcb7b7e520b1c1a1f3205d8ad378fb1e8d6d79d5cfdae18f76af SHA512 6d4151f39f34cf1940f51cf340a1912097e18bd7fde13f2411daf1e5135a5bfe7b076c647e0ca019adb28cd970f87f40a7414dd36f454839b838dd881dfb1351 WHIRLPOOL 650b039be62de90bfd1204009176b28726f2a41a31f0c2be3158bdf723f30bf23b28a3ea1d3e2a68bc992084538045b892461ad024b10bdadf5004d4a617315d
-EBUILD dmraid-1.0.0_rc15.ebuild 2230 SHA256 ce4b1b44478ec559825af94b51ee4d9a8941a17e82d24b379ee396ec709119b2 SHA512 fcf25e1917bd2c4c73f1214a022a8816ef98a7f4ea932a4c215482adea8047ac2b7a89f81efaccf7e1bab8e40acddcf1ebc9bc731618835c3dc9b02537b2dac9 WHIRLPOOL 446f561f17c894b7fd5b1c75985d2cc07925dced9a7c1c819d98fb564b040a47958dbefd9473b658f2e539e8392f079a892b0a33a71ea15e5e163748be12eca2
-EBUILD dmraid-1.0.0_rc16-r3.ebuild 3246 SHA256 8868e52b332c889e3b85dae4109d5225ddf3751bd45dc2a4b4837bf32ba0ca30 SHA512 7cd53ecb0007e2fdea390c4244153cca24a4263b910e6487b55b962ce9269241bcd5e8d4886bb0f04f82fcd53cd88334b02730cb3e85d181264cecd72185194a WHIRLPOOL 004b61295d0ec10e5baa02894c7cbf793c8cd7ed8bbaedc53f9863e7188034d4d97679141a2b00eb43e03cb7e95809d0cbf0ce1509971954c566f9cafac34eeb
-MISC ChangeLog 6496 SHA256 88ef424d95a69b028efa6ffbcbf0c844b60e73363aa527ea6fe552758bb4b79c SHA512 7587ceaa4bd1ceb342fa2f670dc84c7c003a20d8af20710e55d17ae4ad8c3db774f5c1aeae6d022b4450e48a65ccc648410013de1da81a9bd8e48d5523024f7d WHIRLPOOL bcbcb0b0bc50b8c86f5932edf7b6df564f897aca4c095ec2236df566f18087f9460a0a610d686f875aa840fc9562f04e39ab81a4a16a351e2e934bf71bc226c9
+EBUILD dmraid-1.0.0_rc14.ebuild 2190 SHA256 a907228a4ee0239fb327bbc71c7333f00674cf7670170293e0aea62c9f0c0458 SHA512 eedc771b58df5ac0cd80ae011cc1ba9749b2bf1786b6aaa1a1ccd441e22a3846ac9f42c8b05ff703218e6484a3b62d262402aa3e7c37d0c9d0649e5b8f48ebb8 WHIRLPOOL 10fe225893501fb66b4b62307babb72eba7d9a2f225b49638510c6e6a687d3f799b22ba3738ffd6a4508de56999f7832880c288048a1e0308bad542ac61e85db
+EBUILD dmraid-1.0.0_rc15.ebuild 2203 SHA256 37bf27a70ef56e23c9a72437cfecb26b4e4f3f7b3c8ba1ef971ac9bbb5e62cd5 SHA512 48393b6d16af0b489d13e5376663b61699e0058241c3a4798c11830a30eea0310540cbae6bda09d72c8f0eb3d042847ff4c2af3407eda42f9cb5011f10abd7ba WHIRLPOOL 49313505c35afa90dd844152251fcb9ba59019b6c145b11f1f3830289dcdd9ae697fd4c60c63827f81adbafb7702152ba83942ef650a9189cd32fad2bd0ba46c
+EBUILD dmraid-1.0.0_rc16-r3.ebuild 3223 SHA256 787e48e9858a6795687b25ecbc64eddea917c95ee8072706578c2c87757d26a5 SHA512 9723cc91183be6333461f0663eda971998d68fc11535684b4f969bc0994d793de604ab7ca2aae5108e707a589c5c1e848d90fc56e62cac5525bd6be7b53f416b WHIRLPOOL 51882f85d1fcd4fce6391018d614c5d7ddf6b37d64b0b5b995f897b4e0f964adcb0bf1d73494e012c9f9ffa8922953c8e683f5de340eecb853dace094e4418e5
+MISC ChangeLog 6727 SHA256 298dbd7bde43976a849d31aecc1fc8a4a2d363d6dded967388c3f7623b337ce2 SHA512 2079f78cac7df2d5acb48595928bab3ec31044ca722c867302c28f730e4d1accebd08b3f5188bcb3c64c4a29f5596574e9fc8bca5a3762fc654513cdcf593b3c WHIRLPOOL 32fe89c157286431e15903db84ee63ef924868cdbad40415286a00db11702f2fdd21971cc8d1c666778cae77e03bdfa4b39b86976dc318bf954c31f67f30f75d
 MISC metadata.xml 755 SHA256 591b8a7af76f3ae419d525f4f527a753edcbb2ad6365f0567d693ee29ea8d66b SHA512 d809919145c449a429a2aaf6c4cc9743526eb027aa73e4d2d8276113be1d23504596be8bd0609fb6b86b66da2262d2ac5cfae5b2d9034d3367768db931977824 WHIRLPOOL f31aa451fec1b31efcc371554417dedd58c285a247a309ea0d148902bff1d1ec073d9f9f98dbdcf178dace168cc2349df4ebf1bff8b9b51b8421be2a4b25ad0a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBCAAGBQJRY+U2AAoJEEdUh39IaPFN9SoH/1plkyes26UFYibSgZxaOsqo
+T9m1KXO9LP1zzfGvyQ7KMfNbNRey3SWIH0Ws9nCjRH/kU0W93h2UM6AR+kEEpQ7W
+2O3yRIP/Rz5lWrK/zYt68l8hDLQVHJ/Hm3lv+ZDLhTAvZunUqt0wLF7BwYRCUmQJ
+F9i1WjgzbiSWlbFrnYpz8rIk3c7iEnwVBSn8HIdTfyuzPILEaeOodF3S5PBFMEFF
+VrVboGLntC6OxWmJzuXgKmacn8v39gb0/No+DdeIMJYF32g6N/tFOWXX7lUaGID/
+JrIxd2ZumjcAZZrwHP9pSwDpEBFu8YV3pemgkYwOHz3eNeMfNYSSTmkHq9jhTko=
+=YEhG
+-----END PGP SIGNATURE-----
diff --git a/sys-fs/dmraid/dmraid-1.0.0_rc14.ebuild b/sys-fs/dmraid/dmraid-1.0.0_rc14.ebuild
index eaa0c898ea7e..3a1350f4a2ef 100644
--- a/sys-fs/dmraid/dmraid-1.0.0_rc14.ebuild
+++ b/sys-fs/dmraid/dmraid-1.0.0_rc14.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/dmraid/dmraid-1.0.0_rc14.ebuild,v 1.6 2012/05/24 02:51:41 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/dmraid/dmraid-1.0.0_rc14.ebuild,v 1.7 2013/04/09 09:53:57 ssuominen Exp $
 
 inherit linux-info flag-o-matic eutils
 
@@ -16,8 +16,7 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="static selinux"
 
-DEPEND="|| ( >=sys-fs/lvm2-2.02.45
-		sys-fs/device-mapper )
+DEPEND=">=sys-fs/lvm2-2.02.45
 	selinux? ( sys-libs/libselinux
 		   sys-libs/libsepol )"
 S=${WORKDIR}/${PN}/${MY_PV}
diff --git a/sys-fs/dmraid/dmraid-1.0.0_rc15.ebuild b/sys-fs/dmraid/dmraid-1.0.0_rc15.ebuild
index 89fa79feca6e..b9b37898bc06 100644
--- a/sys-fs/dmraid/dmraid-1.0.0_rc15.ebuild
+++ b/sys-fs/dmraid/dmraid-1.0.0_rc15.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/dmraid/dmraid-1.0.0_rc15.ebuild,v 1.5 2012/05/24 02:51:41 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/dmraid/dmraid-1.0.0_rc15.ebuild,v 1.6 2013/04/09 09:53:57 ssuominen Exp $
 
 inherit linux-info flag-o-matic eutils
 
@@ -15,8 +15,7 @@ SLOT="0"
 KEYWORDS="~amd64 ppc ~x86"
 IUSE="static selinux"
 
-DEPEND="|| ( >=sys-fs/lvm2-2.02.45
-		sys-fs/device-mapper )
+DEPEND=">=sys-fs/lvm2-2.02.45
 	selinux? ( sys-libs/libselinux
 		   sys-libs/libsepol )"
 RDEPEND="${DEPEND}"
diff --git a/sys-fs/dmraid/dmraid-1.0.0_rc16-r3.ebuild b/sys-fs/dmraid/dmraid-1.0.0_rc16-r3.ebuild
index b00821ef6435..2dd5fcdf6b40 100644
--- a/sys-fs/dmraid/dmraid-1.0.0_rc16-r3.ebuild
+++ b/sys-fs/dmraid/dmraid-1.0.0_rc16-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/dmraid/dmraid-1.0.0_rc16-r3.ebuild,v 1.9 2013/02/02 23:12:24 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/dmraid/dmraid-1.0.0_rc16-r3.ebuild,v 1.10 2013/04/09 09:53:57 ssuominen Exp $
 
 EAPI=5
 
@@ -18,8 +18,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="dietlibc intel_led klibc led mini static"
 REQUIRED_USE="klibc? ( !dietlibc )"
 
-RDEPEND="|| ( >=sys-fs/lvm2-2.02.45
-		sys-fs/device-mapper )
+RDEPEND=">=sys-fs/lvm2-2.02.45
 	klibc? ( dev-libs/klibc )
 	dietlibc? ( dev-libs/dietlibc )"
 DEPEND="${RDEPEND}