Change device-mapper dep to split since it's now integrated in latest lvm2. Bug #265599

(Portage version: 2.1.6.11/cvs/Linux i686)

4 files changed, 25 insertions, 11 deletions

diff --git a/sys-apps/parted/ChangeLog b/sys-apps/parted/ChangeLog
index 9dc3ae7ec5f7..a9f2163f3d2f 100644
--- a/sys-apps/parted/ChangeLog
+++ b/sys-apps/parted/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/parted
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/parted/ChangeLog,v 1.130 2008/08/23 06:16:27 cardoe Exp $
+# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/parted/ChangeLog,v 1.131 2009/04/10 12:18:17 caleb Exp $
+
+  10 Apr 2009; Caleb Tennis <caleb@gentoo.org> parted-1.8.6.ebuild,
+  parted-1.8.7.ebuild, parted-1.8.8.ebuild:
+  change device-mapper dep to split since it's now integrated in latest
+  lvm2. Bug #265599
 
   23 Aug 2008; Doug Goldstein <cardoe@gentoo.org> metadata.xml:
   add GLEP 56 USE flag desc from use.local.desc
diff --git a/sys-apps/parted/parted-1.8.6.ebuild b/sys-apps/parted/parted-1.8.6.ebuild
index 76e346d0a325..e85a4dc7933c 100644
--- a/sys-apps/parted/parted-1.8.6.ebuild
+++ b/sys-apps/parted/parted-1.8.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/parted/parted-1.8.6.ebuild,v 1.8 2007/08/20 20:36:24 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/parted/parted-1.8.6.ebuild,v 1.9 2009/04/10 12:18:17 caleb Exp $
 
 DESCRIPTION="Create, destroy, resize, check, copy partitions and file systems"
 HOMEPAGE="http://www.gnu.org/software/parted"
@@ -18,7 +18,10 @@ DEPEND=">=sys-fs/e2fsprogs-1.27
 	nls? ( >=sys-devel/gettext-0.12.1-r2 )
 	readline? ( >=sys-libs/readline-4.1-r4 )
 	selinux? ( sys-libs/libselinux )
-	device-mapper? ( sys-fs/device-mapper )"
+	device-mapper? ( || (
+		>=sys-fs/lvm2-2.02.45
+		sys-fs/device-mapper )
+	)"
 
 src_compile() {
 	econf \
diff --git a/sys-apps/parted/parted-1.8.7.ebuild b/sys-apps/parted/parted-1.8.7.ebuild
index dde69a520f43..7d0be2e82f25 100644
--- a/sys-apps/parted/parted-1.8.7.ebuild
+++ b/sys-apps/parted/parted-1.8.7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/parted/parted-1.8.7.ebuild,v 1.1 2007/07/31 21:08:01 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/parted/parted-1.8.7.ebuild,v 1.2 2009/04/10 12:18:17 caleb Exp $
 
 DESCRIPTION="Create, destroy, resize, check, copy partitions and file systems"
 HOMEPAGE="http://www.gnu.org/software/parted"
@@ -18,7 +18,10 @@ DEPEND=">=sys-fs/e2fsprogs-1.27
 	nls? ( >=sys-devel/gettext-0.12.1-r2 )
 	readline? ( >=sys-libs/readline-4.1-r4 )
 	selinux? ( sys-libs/libselinux )
-	device-mapper? ( sys-fs/device-mapper )"
+	device-mapper? ( || (
+		>=sys-fs/lvm2-2.02.45
+		sys-fs/device-mapper )
+	)"
 
 src_compile() {
 	econf \
diff --git a/sys-apps/parted/parted-1.8.8.ebuild b/sys-apps/parted/parted-1.8.8.ebuild
index ea8ad10cb5c8..ac84db97d590 100644
--- a/sys-apps/parted/parted-1.8.8.ebuild
+++ b/sys-apps/parted/parted-1.8.8.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/parted/parted-1.8.8.ebuild,v 1.13 2007/12/11 10:42:44 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/parted/parted-1.8.8.ebuild,v 1.14 2009/04/10 12:18:17 caleb Exp $
 
 inherit eutils
 
@@ -20,7 +20,10 @@ DEPEND=">=sys-fs/e2fsprogs-1.27
 	nls? ( >=sys-devel/gettext-0.12.1-r2 )
 	readline? ( >=sys-libs/readline-5.2 )
 	selinux? ( sys-libs/libselinux )
-	device-mapper? ( sys-fs/device-mapper )"
+	device-mapper? ( || (
+		>=sys-fs/lvm2-2.02.45
+		sys-fs/device-mapper )
+	)"
 
 src_unpack() {
 	unpack ${A}