summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Haubenwallner <haubi@gentoo.org>2009-09-30 09:58:54 +0000
committerMichael Haubenwallner <haubi@gentoo.org>2009-09-30 09:58:54 +0000
commite839f97b63589c99feded5ea6e49bc144802281a (patch)
treee5947cf43ce1c35b9f579ea1c4948cb93393d5ea
parentRemove old revdep-rebuild suggestion (diff)
downloadgentoo-2-e839f97b63589c99feded5ea6e49bc144802281a.tar.gz
gentoo-2-e839f97b63589c99feded5ea6e49bc144802281a.tar.bz2
gentoo-2-e839f97b63589c99feded5ea6e49bc144802281a.zip
libSM-1.1.1: add local IUSE=+uuid (with eapi 2 bump) for bug#230981
(Portage version: 2.1.6.13/cvs/Linux x86_64)
-rw-r--r--x11-libs/libSM/ChangeLog6
-rw-r--r--x11-libs/libSM/libSM-1.1.1.ebuild14
-rw-r--r--x11-libs/libSM/metadata.xml5
3 files changed, 20 insertions, 5 deletions
diff --git a/x11-libs/libSM/ChangeLog b/x11-libs/libSM/ChangeLog
index 66a698ac5315..88ed24dc3aab 100644
--- a/x11-libs/libSM/ChangeLog
+++ b/x11-libs/libSM/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for x11-libs/libSM
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libSM/ChangeLog,v 1.69 2009/08/14 09:14:57 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libSM/ChangeLog,v 1.70 2009/09/30 09:58:54 haubi Exp $
+
+ 30 Sep 2009; Michael Haubenwallner <haubi@gentoo.org> libSM-1.1.1.ebuild,
+ metadata.xml:
+ add local IUSE=+uuid (with eapi 2 bump) for bug#230981
14 Aug 2009; Rémi Cardona <remi@gentoo.org> libSM-1.1.1.ebuild:
up libICE dep to 1.0.5 (fixes bug #281360)
diff --git a/x11-libs/libSM/libSM-1.1.1.ebuild b/x11-libs/libSM/libSM-1.1.1.ebuild
index 8b44f5cbf8cd..8da821ea0d62 100644
--- a/x11-libs/libSM/libSM-1.1.1.ebuild
+++ b/x11-libs/libSM/libSM-1.1.1.ebuild
@@ -1,25 +1,31 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libSM/libSM-1.1.1.ebuild,v 1.3 2009/08/14 09:14:57 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libSM/libSM-1.1.1.ebuild,v 1.4 2009/09/30 09:58:54 haubi Exp $
# Must be before x-modular eclass is inherited
#SNAPSHOT="yes"
+EAPI="2"
+
inherit x-modular
DESCRIPTION="X.Org SM library"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="ipv6 elibc_FreeBSD"
+IUSE="ipv6 +uuid elibc_FreeBSD"
RDEPEND=">=x11-libs/libICE-1.0.5
x11-libs/xtrans
x11-proto/xproto
- !elibc_FreeBSD? (
+ uuid? (
+ !elibc_FreeBSD? (
|| ( >=sys-apps/util-linux-2.16 <sys-libs/e2fsprogs-libs-1.41.8 )
+ )
)"
DEPEND="${RDEPEND}"
pkg_setup() {
- CONFIGURE_OPTIONS="$(use_enable ipv6)"
+ CONFIGURE_OPTIONS="$(use_enable ipv6) $(use_with uuid libuuid)"
+ # do not use uuid even if available in libc (like on FreeBSD)
+ use uuid || export ac_cv_func_uuid_create=no
}
diff --git a/x11-libs/libSM/metadata.xml b/x11-libs/libSM/metadata.xml
index 01c4c004e735..8b3fa73a30b0 100644
--- a/x11-libs/libSM/metadata.xml
+++ b/x11-libs/libSM/metadata.xml
@@ -2,4 +2,9 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>x11</herd>
+<use>
+ <flag name="uuid">Use UUID for session identification instead of IP address
+ and system time.
+ </flag>
+</use>
</pkgmetadata>