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

(Portage version: 2.2.0_alpha171/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)

4 files changed, 14 insertions, 12 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/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}