summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sys-fs/evms/ChangeLog7
-rw-r--r--sys-fs/evms/evms-2.5.5-r10.ebuild4
-rw-r--r--sys-fs/evms/evms-2.5.5-r5.ebuild6
3 files changed, 11 insertions, 6 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/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* )