[gentoo-commits] gentoo-x86 commit in x11-libs/libSM: metadata.xml ChangeLog libSM-1.1.1.ebuild

[gentoo-commits] gentoo-x86 commit in x11-libs/libSM: metadata.xml ChangeLog libSM-1.1.1.ebuild

[Michael Haubenwallner (haubi)]

haubi       09/09/30 09:58:55

  Modified:             metadata.xml ChangeLog libSM-1.1.1.ebuild
  Log:
  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)

Revision  Changes    Path
1.2                  x11-libs/libSM/metadata.xml

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/libSM/metadata.xml?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/libSM/metadata.xml?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/libSM/metadata.xml?r1=1.1&r2=1.2

Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/libSM/metadata.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- metadata.xml	9 Sep 2005 08:10:47 -0000	1.1
+++ metadata.xml	30 Sep 2009 09:58:54 -0000	1.2
@@ -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>



1.70                 x11-libs/libSM/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/libSM/ChangeLog?rev=1.70&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/libSM/ChangeLog?rev=1.70&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/libSM/ChangeLog?r1=1.69&r2=1.70

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/libSM/ChangeLog,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- ChangeLog	14 Aug 2009 09:14:57 -0000	1.69
+++ ChangeLog	30 Sep 2009 09:58:54 -0000	1.70
@@ -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)



1.4                  x11-libs/libSM/libSM-1.1.1.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/libSM/libSM-1.1.1.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/libSM/libSM-1.1.1.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/libSM/libSM-1.1.1.ebuild?r1=1.3&r2=1.4

Index: libSM-1.1.1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/libSM/libSM-1.1.1.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- libSM-1.1.1.ebuild	14 Aug 2009 09:14:57 -0000	1.3
+++ libSM-1.1.1.ebuild	30 Sep 2009 09:58:54 -0000	1.4
@@ -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
 }