summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2008-08-23 14:21:50 +0000
committerAlexis Ballier <aballier@gentoo.org>2008-08-23 14:21:50 +0000
commit6bd704b5e14430a7b60955ae6785b8669ad4b79e (patch)
treef783d00c0e1a15399c1876506958f85b22be3128 /x11-libs/libSM
parentVersion bump (diff)
downloadgentoo-2-6bd704b5e14430a7b60955ae6785b8669ad4b79e.tar.gz
gentoo-2-6bd704b5e14430a7b60955ae6785b8669ad4b79e.tar.bz2
gentoo-2-6bd704b5e14430a7b60955ae6785b8669ad4b79e.zip
e2fsprogs-libs now provides libuuid, change the dep to || with e2fsprogs, bug #234988.
(Portage version: 2.2_rc8/cvs/Linux 2.6.26.3 x86_64)
Diffstat (limited to 'x11-libs/libSM')
-rw-r--r--x11-libs/libSM/ChangeLog6
-rw-r--r--x11-libs/libSM/libSM-1.1.0.ebuild4
2 files changed, 7 insertions, 3 deletions
diff --git a/x11-libs/libSM/ChangeLog b/x11-libs/libSM/ChangeLog
index a7ecfc3dc8df..bd391c4398e0 100644
--- a/x11-libs/libSM/ChangeLog
+++ b/x11-libs/libSM/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for x11-libs/libSM
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libSM/ChangeLog,v 1.54 2008/07/08 03:53:33 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libSM/ChangeLog,v 1.55 2008/08/23 14:21:50 aballier Exp $
+
+ 23 Aug 2008; Alexis Ballier <aballier@gentoo.org> libSM-1.1.0.ebuild:
+ e2fsprogs-libs now provides libuuid, change the dep to || with e2fsprogs,
+ bug #234988.
08 Jul 2008; Donnie Berkholz <dberkholz@gentoo.org>; libSM-1.1.0.ebuild:
(#230981) Add sys-fs/e2fsprogs to RDEPEND for libuuid.
diff --git a/x11-libs/libSM/libSM-1.1.0.ebuild b/x11-libs/libSM/libSM-1.1.0.ebuild
index 021348653222..69ff3d4ed11e 100644
--- a/x11-libs/libSM/libSM-1.1.0.ebuild
+++ b/x11-libs/libSM/libSM-1.1.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libSM/libSM-1.1.0.ebuild,v 1.2 2008/07/08 03:53:33 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libSM/libSM-1.1.0.ebuild,v 1.3 2008/08/23 14:21:50 aballier Exp $
# Must be before x-modular eclass is inherited
#SNAPSHOT="yes"
@@ -15,7 +15,7 @@ IUSE="ipv6"
RDEPEND="x11-libs/libICE
x11-libs/xtrans
x11-proto/xproto
- sys-fs/e2fsprogs"
+ || ( sys-libs/e2fsprogs-libs sys-fs/e2fsprogs )"
DEPEND="${RDEPEND}"
CONFIGURE_OPTIONS="$(use_enable ipv6)"