Bug #284953 - device-mapper was merged with LVM as of 2.02.45, so depend on either.

Package-Manager: portage-2.2_rc40/cvs/Linux x86_64

4 files changed, 14 insertions, 9 deletions

diff --git a/sys-fs/evms/ChangeLog b/sys-fs/evms/ChangeLog
index 924e0a01bf46..e838eee77007 100644
--- a/sys-fs/evms/ChangeLog
+++ b/sys-fs/evms/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-fs/evms
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/evms/ChangeLog,v 1.92 2009/03/12 17:16:03 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/evms/ChangeLog,v 1.93 2009/09/14 20:14:21 robbat2 Exp $
+
+  14 Sep 2009; Robin H. Johnson <robbat2@gentoo.org> evms-2.5.5-r5.ebuild,
+  evms-2.5.5-r10.ebuild:
+  Bug #284953 - device-mapper was merged with LVM as of 2.02.45, so depend
+  on either.
 
   12 Mar 2009; Tiziano Müller <dev-zero@gentoo.org> evms-2.5.5-r10.ebuild:
   Tarball has been update to include a patch to fix bug #260717 (compilation
diff --git a/sys-fs/evms/Manifest b/sys-fs/evms/Manifest
index b2d135aeec5c..35b6dffc0660 100644
--- a/sys-fs/evms/Manifest
+++ b/sys-fs/evms/Manifest
@@ -22,7 +22,7 @@ AUX evms.initd-2.5.5-r9 603 RMD160 c922481a7462949bb9adc7ff7accf06f0cc57c8d SHA1
 AUX evms2-start.sh 382 RMD160 cf01c2e95b62d8a87421b8a927a364b662fdc6a6 SHA1 e72088c592acc899b283a82369b7043ccb9c6893 SHA256 8bdb33c568037600c2317b251b9f7aecac1221970a9139baad5d08a97c01e3f1
 DIST evms-2.5.5.tar.gz 2286321 RMD160 716d6b34f48f6f7a3f5f4627bc4a2c34957607f7 SHA1 8c679e958398a299f7b3c76f4dd552d6bf35a28b SHA256 9dbfaac148d822068ba883f6533935e03ae5cfc9fdf8836dea6aee99c859307c
 DIST evms-patches-2.5.5-2.tbz2 8395 RMD160 a2e66a2e7cb1a8a6fab2be4b7e29dbef7f5fc6a1 SHA1 abc552afacfde6569f7b0ac095e6382e7943997c SHA256 8428627784d70ee198c4eed99ba030033d5dc6821173517d80c17891822e5797
-EBUILD evms-2.5.5-r10.ebuild 5408 RMD160 c98b9ed78a97b0391180fe721de4171d4dbbf5e6 SHA1 51c9759e2b859dad0ce432f2e0e83ffa489957b3 SHA256 6fa1992a4c6c12edd14f757fa2c4b31e92003e8dc0117480e00d3621360c5f65
-EBUILD evms-2.5.5-r5.ebuild 4892 RMD160 4e998bb4a476dd841f624f4bf51d0f78d9724716 SHA1 cd0fb789199199050b320debcb53f2cbc4f693b9 SHA256 4a96bd738031df807ea56a3b4e8e63c13998e8cd64262233151ea894488b9a82
-MISC ChangeLog 18180 RMD160 43f15e0e83253c6e7812e7259a65c7a525ca1d24 SHA1 b1af9510f8b9ce01bf2f062ed8aa7d62ea44cf2c SHA256 34564a555584f645390803073f2714bb0cdfc891a61daecd128cb4ef550a805f
+EBUILD evms-2.5.5-r10.ebuild 5436 RMD160 e2c34ebd4f4890a83e8f01c5d853626c9339d2a1 SHA1 185c9bea7d297561d411afffaa3038ad217cce34 SHA256 6ead9dac99e8c108d426b0da85a37d46ee3a9b7586c824b64c7950d5be6a5264
+EBUILD evms-2.5.5-r5.ebuild 4919 RMD160 13bf00961fc8b2469515548fbf3a3d6e9d0c7368 SHA1 4a959fd7a23728d95eac8f2462f55dad143fb4e5 SHA256 b2f7aedaf93f4489f9a928dce6dcc549a6ed49370f2a0f0e3fa77773a2a1ea19
+MISC ChangeLog 18368 RMD160 e1ea5f493a67150a29800d0d5c638089448bbc37 SHA1 5d8389d0bf193bb9b23efc606334d248bc088dbc SHA256 4d2a514b52b5832623764a0bcd20f46a8340ba824cba2f6ae96a848121c35f34
 MISC metadata.xml 515 RMD160 327b123e22ca5b253f14debdc2aa8634762a5a97 SHA1 f7dcda50a94a640c47876e57950010a2c3a898cc SHA256 33e0cd2191f5b27a21d1a1ca93db919ef7d023be6294ec51603bf0c083ddf29d
diff --git a/sys-fs/evms/evms-2.5.5-r10.ebuild b/sys-fs/evms/evms-2.5.5-r10.ebuild
index 1e87e9be5756..e8e6c9d7e688 100644
--- a/sys-fs/evms/evms-2.5.5-r10.ebuild
+++ b/sys-fs/evms/evms-2.5.5-r10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/evms/evms-2.5.5-r10.ebuild,v 1.11 2009/03/12 17:16:03 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/evms/evms-2.5.5-r10.ebuild,v 1.12 2009/09/14 20:14:21 robbat2 Exp $
 
 inherit eutils flag-o-matic multilib toolchain-funcs autotools linux-info
 
@@ -19,7 +19,7 @@ IUSE="debug gtk hb hb2 ncurses nls"
 #EVMS uses libuuid from e2fsprogs
 RDEPEND="virtual/libc
 	sys-fs/e2fsprogs
-	sys-fs/device-mapper
+	|| ( >=sys-fs/lvm2-2.02.45 sys-fs/device-mapper )
 	>=sys-apps/baselayout-1.9.4-r6
 	gtk? ( =x11-libs/gtk+-1* =dev-libs/glib-1* )
 	hb? ( !hb2? ( =sys-cluster/heartbeat-1* ) )
diff --git a/sys-fs/evms/evms-2.5.5-r5.ebuild b/sys-fs/evms/evms-2.5.5-r5.ebuild
index a8f590453c11..d168934f4897 100644
--- a/sys-fs/evms/evms-2.5.5-r5.ebuild
+++ b/sys-fs/evms/evms-2.5.5-r5.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-fs/evms/evms-2.5.5-r5.ebuild,v 1.9 2007/04/06 20:32:39 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/evms/evms-2.5.5-r5.ebuild,v 1.10 2009/09/14 20:14:21 robbat2 Exp $
 
 WANT_AUTOMAKE="latest"
 WANT_AUTOCONF="latest"
@@ -19,7 +19,7 @@ IUSE="debug gtk ncurses nls"
 #EVMS uses libuuid from e2fsprogs
 RDEPEND="virtual/libc
 	sys-fs/e2fsprogs
-	sys-fs/device-mapper
+	|| ( >=sys-fs/lvm2-2.02.45 sys-fs/device-mapper )
 	>=sys-apps/baselayout-1.9.4-r6
 	gtk? ( =x11-libs/gtk+-1*
 		=dev-libs/glib-1* )