Fix device-mapper dep for new lvm2, see bug #265599

(Portage version: 2.1.6.11/cvs/Linux i686)

7 files changed, 44 insertions, 20 deletions

diff --git a/sys-fs/cryptsetup/ChangeLog b/sys-fs/cryptsetup/ChangeLog
index 4e4d219f17a7..04712da06160 100644
--- a/sys-fs/cryptsetup/ChangeLog
+++ b/sys-fs/cryptsetup/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-fs/cryptsetup
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/ChangeLog,v 1.62 2008/10/05 21:01:33 vapier Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/ChangeLog,v 1.63 2009/04/10 16:51:56 caleb Exp $
+
+  10 Apr 2009; Caleb Tennis <caleb@gentoo.org> cryptsetup-0.1-r3.ebuild,
+  cryptsetup-1.0.5.ebuild, cryptsetup-1.0.5-r1.ebuild,
+  cryptsetup-1.0.6.ebuild, cryptsetup-1.0.6-r1.ebuild,
+  cryptsetup-1.0.6-r2.ebuild:
+  Fix device-mapper dep for new lvm2, bug #265599
 
 *cryptsetup-1.0.6-r2 (05 Oct 2008)
 
diff --git a/sys-fs/cryptsetup/cryptsetup-0.1-r3.ebuild b/sys-fs/cryptsetup/cryptsetup-0.1-r3.ebuild
index f91abaa17de5..3d7b1512b6a2 100644
--- a/sys-fs/cryptsetup/cryptsetup-0.1-r3.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-0.1-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/cryptsetup-0.1-r3.ebuild,v 1.12 2008/03/26 03:37:41 ricmm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/cryptsetup-0.1-r3.ebuild,v 1.13 2009/04/10 16:51:56 caleb Exp $
 
 inherit linux-info multilib eutils
 
@@ -13,7 +13,10 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
 IUSE=""
 
-RDEPEND=">=sys-fs/device-mapper-1.00.07-r1
+RDEPEND="|| (
+		>=sys-fs/lvm2-2.02.45
+		>=sys-fs/device-mapper-1.00.07-r1
+	)
 	!sys-fs/cryptsetup-luks"
 DEPEND="dev-libs/popt
 	>=dev-libs/libgcrypt-1.1.42
diff --git a/sys-fs/cryptsetup/cryptsetup-1.0.5-r1.ebuild b/sys-fs/cryptsetup/cryptsetup-1.0.5-r1.ebuild
index 907c527866b5..fa69fb5033e6 100644
--- a/sys-fs/cryptsetup/cryptsetup-1.0.5-r1.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-1.0.5-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/cryptsetup-1.0.5-r1.ebuild,v 1.14 2008/12/07 03:11:17 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/cryptsetup-1.0.5-r1.ebuild,v 1.15 2009/04/10 16:51:56 caleb Exp $
 
 inherit linux-info eutils flag-o-matic multilib
 
@@ -13,7 +13,10 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
 IUSE="dynamic nls selinux"
 
-DEPEND=">=sys-fs/device-mapper-1.00.07-r1
+DEPEND="|| (
+		>=sys-fs/lvm2-2.02.45
+		>=sys-fs/device-mapper-1.00.07-r1
+	)
 	>=dev-libs/libgcrypt-1.1.42
 	>=dev-libs/libgpg-error-1.0-r1
 	>=dev-libs/popt-1.7
diff --git a/sys-fs/cryptsetup/cryptsetup-1.0.5.ebuild b/sys-fs/cryptsetup/cryptsetup-1.0.5.ebuild
index 04b6c7a7a2e5..3f8ce830c4d6 100644
--- a/sys-fs/cryptsetup/cryptsetup-1.0.5.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-1.0.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/cryptsetup-1.0.5.ebuild,v 1.6 2008/12/07 03:11:17 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/cryptsetup-1.0.5.ebuild,v 1.7 2009/04/10 16:51:56 caleb Exp $
 
 inherit linux-info eutils flag-o-matic multilib
 
@@ -13,7 +13,10 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="dynamic nls selinux"
 
-DEPEND=">=sys-fs/device-mapper-1.00.07-r1
+DEPEND="|| (
+		>=sys-fs/lvm2-2.02.45
+		>=sys-fs/device-mapper-1.00.07-r1
+	)
 	>=dev-libs/libgcrypt-1.1.42
 	>=dev-libs/libgpg-error-1.0-r1
 	>=dev-libs/popt-1.7
diff --git a/sys-fs/cryptsetup/cryptsetup-1.0.6-r1.ebuild b/sys-fs/cryptsetup/cryptsetup-1.0.6-r1.ebuild
index f86523b86ac5..b25c18bc50d3 100644
--- a/sys-fs/cryptsetup/cryptsetup-1.0.6-r1.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-1.0.6-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/cryptsetup-1.0.6-r1.ebuild,v 1.4 2008/12/07 03:11:17 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/cryptsetup-1.0.6-r1.ebuild,v 1.5 2009/04/10 16:51:56 caleb Exp $
 
 inherit linux-info eutils flag-o-matic multilib
 
@@ -13,7 +13,10 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="dynamic nls selinux"
 
-DEPEND=">=sys-fs/device-mapper-1.00.07-r1
+DEPEND="|| (
+		>=sys-fs/lvm2-2.02.45
+		>=sys-fs/device-mapper-1.00.07-r1
+	)
 	>=dev-libs/libgcrypt-1.1.42
 	>=dev-libs/libgpg-error-1.0-r1
 	>=dev-libs/popt-1.7
diff --git a/sys-fs/cryptsetup/cryptsetup-1.0.6-r2.ebuild b/sys-fs/cryptsetup/cryptsetup-1.0.6-r2.ebuild
index c78deefa491b..8ab4f345acd2 100644
--- a/sys-fs/cryptsetup/cryptsetup-1.0.6-r2.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-1.0.6-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/cryptsetup-1.0.6-r2.ebuild,v 1.3 2008/12/07 03:11:17 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/cryptsetup-1.0.6-r2.ebuild,v 1.4 2009/04/10 16:51:56 caleb Exp $
 
 inherit linux-info eutils flag-o-matic multilib
 
@@ -13,7 +13,10 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="dynamic nls selinux"
 
-DEPEND=">=sys-fs/device-mapper-1.00.07-r1
+DEPEND="|| (
+		>=sys-fs/lvm2-2.02.45
+		>=sys-fs/device-mapper-1.00.07-r1
+	)
 	>=dev-libs/libgcrypt-1.1.42
 	>=dev-libs/libgpg-error-1.0-r1
 	>=dev-libs/popt-1.7
diff --git a/sys-fs/cryptsetup/cryptsetup-1.0.6.ebuild b/sys-fs/cryptsetup/cryptsetup-1.0.6.ebuild
index 62d152560286..c1a7140d2a7b 100644
--- a/sys-fs/cryptsetup/cryptsetup-1.0.6.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-1.0.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/cryptsetup-1.0.6.ebuild,v 1.3 2008/12/07 03:11:17 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/cryptsetup-1.0.6.ebuild,v 1.4 2009/04/10 16:51:56 caleb Exp $
 
 inherit linux-info eutils flag-o-matic multilib
 
@@ -13,7 +13,10 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="dynamic nls selinux"
 
-DEPEND=">=sys-fs/device-mapper-1.00.07-r1
+DEPEND="|| (
+		>=sys-fs/lvm2-2.02.45
+		>=sys-fs/device-mapper-1.00.07-r1
+	)
 	>=dev-libs/libgcrypt-1.1.42
 	>=dev-libs/libgpg-error-1.0-r1
 	>=dev-libs/popt-1.7