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)

8 files changed, 29 insertions, 23 deletions

diff --git a/sys-block/parted/ChangeLog b/sys-block/parted/ChangeLog
index 1c7692f5e5e8..81a417825988 100644
--- a/sys-block/parted/ChangeLog
+++ b/sys-block/parted/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-block/parted
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/parted/ChangeLog,v 1.26 2012/12/16 19:32:29 armin76 Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-block/parted/ChangeLog,v 1.27 2013/04/09 09:59:44 ssuominen Exp $
+
+  09 Apr 2013; Samuli Suominen <ssuominen@gentoo.org> parted-2.3.ebuild,
+  parted-2.3-r1.ebuild, parted-2.3-r2.ebuild, parted-2.4.ebuild,
+  parted-3.0.ebuild, parted-3.1.ebuild, parted-3.1-r1.ebuild:
+  Remove sys-fs/device-mapper from || () syntax in favour of sys-fs/lvm2 wrt
+  #461382
 
   16 Dec 2012; Raúl Porcel <armin76@gentoo.org> parted-3.1-r1.ebuild:
   Re-add ~alpha/~ia64/~s390/~sh/~sparc wrt #443048
diff --git a/sys-block/parted/parted-2.3-r1.ebuild b/sys-block/parted/parted-2.3-r1.ebuild
index 136d702dccdd..a2d705501515 100644
--- a/sys-block/parted/parted-2.3-r1.ebuild
+++ b/sys-block/parted/parted-2.3-r1.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-block/parted/parted-2.3-r1.ebuild,v 1.3 2012/05/03 04:46:47 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-block/parted/parted-2.3-r1.ebuild,v 1.4 2013/04/09 09:59:44 ssuominen Exp $
 
 EAPI="3"
 
@@ -25,7 +25,7 @@ RDEPEND="
 	nls? ( >=sys-devel/gettext-0.12.1-r2 )
 	readline? ( >=sys-libs/readline-5.2 )
 	selinux? ( sys-libs/libselinux )
-	device-mapper? ( || ( >=sys-fs/lvm2-2.02.45 sys-fs/device-mapper ) )
+	device-mapper? ( >=sys-fs/lvm2-2.02.45 )
 "
 DEPEND="
 	${RDEPEND}
diff --git a/sys-block/parted/parted-2.3-r2.ebuild b/sys-block/parted/parted-2.3-r2.ebuild
index 60fca285b3a5..92698cc67ea1 100644
--- a/sys-block/parted/parted-2.3-r2.ebuild
+++ b/sys-block/parted/parted-2.3-r2.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-block/parted/parted-2.3-r2.ebuild,v 1.2 2012/05/03 04:46:47 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-block/parted/parted-2.3-r2.ebuild,v 1.3 2013/04/09 09:59:44 ssuominen Exp $
 
 EAPI="3"
 
@@ -25,7 +25,7 @@ RDEPEND="
 	nls? ( >=sys-devel/gettext-0.12.1-r2 )
 	readline? ( >=sys-libs/readline-5.2 )
 	selinux? ( sys-libs/libselinux )
-	device-mapper? ( || ( >=sys-fs/lvm2-2.02.45 sys-fs/device-mapper ) )
+	device-mapper? ( >=sys-fs/lvm2-2.02.45 )
 "
 DEPEND="
 	${RDEPEND}
diff --git a/sys-block/parted/parted-2.3.ebuild b/sys-block/parted/parted-2.3.ebuild
index dd5ee6d483c4..f2665e3a34c2 100644
--- a/sys-block/parted/parted-2.3.ebuild
+++ b/sys-block/parted/parted-2.3.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-block/parted/parted-2.3.ebuild,v 1.3 2012/05/03 04:46:47 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-block/parted/parted-2.3.ebuild,v 1.4 2013/04/09 09:59:44 ssuominen Exp $
 
 EAPI="2"
 
@@ -25,7 +25,7 @@ RDEPEND="
 	nls? ( >=sys-devel/gettext-0.12.1-r2 )
 	readline? ( >=sys-libs/readline-5.2 )
 	selinux? ( sys-libs/libselinux )
-	device-mapper? ( || ( >=sys-fs/lvm2-2.02.45 sys-fs/device-mapper ) )
+	device-mapper? ( >=sys-fs/lvm2-2.02.45 )
 "
 DEPEND="
 	${RDEPEND}
diff --git a/sys-block/parted/parted-2.4.ebuild b/sys-block/parted/parted-2.4.ebuild
index b3205f782371..23496e090bfc 100644
--- a/sys-block/parted/parted-2.4.ebuild
+++ b/sys-block/parted/parted-2.4.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-block/parted/parted-2.4.ebuild,v 1.2 2012/05/03 04:46:47 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-block/parted/parted-2.4.ebuild,v 1.3 2013/04/09 09:59:44 ssuominen Exp $
 
 EAPI="3"
 
@@ -25,7 +25,7 @@ RDEPEND="
 	nls? ( >=sys-devel/gettext-0.12.1-r2 )
 	readline? ( >=sys-libs/readline-5.2 )
 	selinux? ( sys-libs/libselinux )
-	device-mapper? ( || ( >=sys-fs/lvm2-2.02.45 sys-fs/device-mapper ) )
+	device-mapper? ( >=sys-fs/lvm2-2.02.45 )
 "
 DEPEND="
 	${RDEPEND}
diff --git a/sys-block/parted/parted-3.0.ebuild b/sys-block/parted/parted-3.0.ebuild
index 481ecfc71680..023ca4813e9c 100644
--- a/sys-block/parted/parted-3.0.ebuild
+++ b/sys-block/parted/parted-3.0.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-block/parted/parted-3.0.ebuild,v 1.9 2012/05/03 04:46:47 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-block/parted/parted-3.0.ebuild,v 1.10 2013/04/09 09:59:44 ssuominen Exp $
 
 EAPI="3"
 
@@ -25,7 +25,7 @@ RDEPEND="
 	nls? ( >=sys-devel/gettext-0.12.1-r2 )
 	readline? ( >=sys-libs/readline-5.2 )
 	selinux? ( sys-libs/libselinux )
-	device-mapper? ( || ( >=sys-fs/lvm2-2.02.45 sys-fs/device-mapper ) )
+	device-mapper? ( >=sys-fs/lvm2-2.02.45 )
 "
 DEPEND="
 	${RDEPEND}
diff --git a/sys-block/parted/parted-3.1-r1.ebuild b/sys-block/parted/parted-3.1-r1.ebuild
index b957f40eb9f9..ac98d7d035d5 100644
--- a/sys-block/parted/parted-3.1-r1.ebuild
+++ b/sys-block/parted/parted-3.1-r1.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-block/parted/parted-3.1-r1.ebuild,v 1.4 2012/12/16 19:32:29 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-block/parted/parted-3.1-r1.ebuild,v 1.5 2013/04/09 09:59:44 ssuominen Exp $
 
 EAPI="4"
 
@@ -25,7 +25,7 @@ RDEPEND="
 	nls? ( >=sys-devel/gettext-0.12.1-r2 )
 	readline? ( >=sys-libs/readline-5.2 )
 	selinux? ( sys-libs/libselinux )
-	device-mapper? ( || ( >=sys-fs/lvm2-2.02.45 sys-fs/device-mapper ) )
+	device-mapper? ( >=sys-fs/lvm2-2.02.45 )
 "
 DEPEND="
 	${RDEPEND}
diff --git a/sys-block/parted/parted-3.1.ebuild b/sys-block/parted/parted-3.1.ebuild
index 4ec5dd7eed31..df3bfee3e63e 100644
--- a/sys-block/parted/parted-3.1.ebuild
+++ b/sys-block/parted/parted-3.1.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-block/parted/parted-3.1.ebuild,v 1.8 2012/06/17 16:20:52 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-block/parted/parted-3.1.ebuild,v 1.9 2013/04/09 09:59:44 ssuominen Exp $
 
 EAPI="4"
 
@@ -25,7 +25,7 @@ RDEPEND="
 	nls? ( >=sys-devel/gettext-0.12.1-r2 )
 	readline? ( >=sys-libs/readline-5.2 )
 	selinux? ( sys-libs/libselinux )
-	device-mapper? ( || ( >=sys-fs/lvm2-2.02.45 sys-fs/device-mapper ) )
+	device-mapper? ( >=sys-fs/lvm2-2.02.45 )
 "
 DEPEND="
 	${RDEPEND}