* [gentoo-commits] proj/x11:master commit in: x11-libs/libSM/
@ 2011-02-20 12:20 Tomas Chvatal
0 siblings, 0 replies; 6+ messages in thread
From: Tomas Chvatal @ 2011-02-20 12:20 UTC (permalink / raw
To: gentoo-commits
commit: 1921e96bdd68391e5385059216600d626ca4234d
Author: Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 20 12:17:43 2011 +0000
Commit: Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
CommitDate: Sun Feb 20 12:20:23 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=1921e96b
[x11-libs/libSM] sync with main tree.
---
x11-libs/libSM/libSM-9999.ebuild | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/x11-libs/libSM/libSM-9999.ebuild b/x11-libs/libSM/libSM-9999.ebuild
index 350fbfd..2808b93 100644
--- a/x11-libs/libSM/libSM-9999.ebuild
+++ b/x11-libs/libSM/libSM-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-EAPI=4
+EAPI=3
inherit xorg-2
DESCRIPTION="X.Org SM library"
@@ -10,13 +10,14 @@ DESCRIPTION="X.Org SM library"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE="doc ipv6 +uuid"
-RDEPEND="x11-libs/libICE
+RDEPEND=">=x11-libs/libICE-1.0.5
x11-libs/xtrans
x11-proto/xproto
!elibc_FreeBSD? ( !elibc_IRIX? ( !elibc_SunOS? (
uuid? ( >=sys-apps/util-linux-2.16 )
) ) )"
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+ doc? ( app-text/xmlto )"
pkg_setup() {
xorg-2_pkg_setup
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/x11:master commit in: x11-libs/libSM/
@ 2011-04-15 19:04 Michał Górny
0 siblings, 0 replies; 6+ messages in thread
From: Michał Górny @ 2011-04-15 19:04 UTC (permalink / raw
To: gentoo-commits
commit: daab8ec69d16aa8aee8b096d5318b9f1b12a037f
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 15 18:32:34 2011 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Apr 15 18:32:34 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=daab8ec6
x11-libs/libSM: Migrate to XORG_CONFIGURE_OPTIONS.
(Portage version: 2.2.0_alpha29_p5/git/Linux x86_64, signed Manifest commit with key 05DE07BB)
---
x11-libs/libSM/libSM-9999.ebuild | 6 ++++--
x11-libs/libSM/metadata.xml | 10 ++++++++++
2 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/x11-libs/libSM/libSM-9999.ebuild b/x11-libs/libSM/libSM-9999.ebuild
index e545841..f45a1cf 100644
--- a/x11-libs/libSM/libSM-9999.ebuild
+++ b/x11-libs/libSM/libSM-9999.ebuild
@@ -23,11 +23,13 @@ DEPEND="${RDEPEND}"
pkg_setup() {
xorg-2_pkg_setup
- CONFIGURE_OPTIONS="$(use_enable ipv6)
+ XORG_CONFIGURE_OPTIONS=(
+ $(use_enable ipv6)
$(use_enable doc docs)
$(use_with doc xmlto)
$(use_with uuid libuuid)
- --without-fop"
+ --without-fop
+ )
# do not use uuid even if available in libc (like on FreeBSD)
use uuid || export ac_cv_func_uuid_create=no
# solaris hack
diff --git a/x11-libs/libSM/metadata.xml b/x11-libs/libSM/metadata.xml
new file mode 100644
index 0000000..8b3fa73
--- /dev/null
+++ b/x11-libs/libSM/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!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>
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/x11:master commit in: x11-libs/libSM/
@ 2012-03-04 20:46 Chi-Thanh Christopher Nguyen
0 siblings, 0 replies; 6+ messages in thread
From: Chi-Thanh Christopher Nguyen @ 2012-03-04 20:46 UTC (permalink / raw
To: gentoo-commits
commit: 422783f5d8f22ba18c144bbebd74a0c49881a83f
Author: Chi-Thanh Christopher Nguyen <chithanh <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 4 20:46:47 2012 +0000
Commit: Chi-Thanh Christopher Nguyen <chithanh <AT> cs <DOT> tu-berlin <DOT> de>
CommitDate: Sun Mar 4 20:46:47 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=422783f5
x11-libs/libSM: sync keywords and darwin uuid fix with portage
---
x11-libs/libSM/libSM-9999.ebuild | 50 ++++++++++++++++++++++---------------
1 files changed, 30 insertions(+), 20 deletions(-)
diff --git a/x11-libs/libSM/libSM-9999.ebuild b/x11-libs/libSM/libSM-9999.ebuild
index f45a1cf..79957a7 100644
--- a/x11-libs/libSM/libSM-9999.ebuild
+++ b/x11-libs/libSM/libSM-9999.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libSM/libSM-1.2.0.ebuild,v 1.14 2011/12/19 09:13:17 grobian Exp $
EAPI=4
@@ -9,37 +9,47 @@ inherit xorg-2
DESCRIPTION="X.Org SM library"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE="ipv6 +uuid"
RDEPEND=">=x11-libs/libICE-1.0.5
x11-libs/xtrans
x11-proto/xproto
- !elibc_FreeBSD? ( !elibc_IRIX? ( !elibc_SunOS? (
+ !elibc_FreeBSD? ( !elibc_SunOS? (
uuid? ( >=sys-apps/util-linux-2.16 )
- ) ) )"
+ ) )"
DEPEND="${RDEPEND}"
pkg_setup() {
+ local withuuid=$(use_with uuid libuuid)
xorg-2_pkg_setup
- XORG_CONFIGURE_OPTIONS=(
- $(use_enable ipv6)
- $(use_enable doc docs)
- $(use_with doc xmlto)
- $(use_with uuid libuuid)
- --without-fop
- )
# do not use uuid even if available in libc (like on FreeBSD)
use uuid || export ac_cv_func_uuid_create=no
- # solaris hack
- if use uuid &&
- [[ ${CHOST} == *-solaris* ]] &&
- [[ ! -d ${EROOT}/usr/include/uuid ]] &&
- [[ -d ${ROOT}/usr/include/uuid ]]
- then
- # ${ROOT} is proper here
- export LIBUUID_CFLAGS="-I${ROOT}/usr/include/uuid"
- export LIBUUID_LIBS="-luuid"
+
+ if use uuid ; then
+ case ${CHOST} in
+ *-solaris*|*-darwin*)
+ if [[ ! -d ${EROOT}usr/include/uuid ]] &&
+ [[ -d ${ROOT}usr/include/uuid ]]
+ then
+ # Solaris and Darwin have uuid provided by the host
+ # system. Since util-linux's version is based on this
+ # version, and on Darwin actually breaks host headers when
+ # installed, we can "pretend" for libSM we have libuuid
+ # installed, while in fact we don't
+ withuuid="--without-libuuid"
+ export HAVE_LIBUUID=yes
+ export LIBUUID_CFLAGS="-I${ROOT}usr/include/uuid"
+ # Darwin has uuid in libSystem
+ [[ ${CHOST} == *-solaris* ]] && export LIBUUID_LIBS="-luuid"
+ fi
+ ;;
+ esac
fi
+ XORG_CONFIGURE_OPTIONS="$(use_enable ipv6)
+ $(use_enable doc docs)
+ $(use_with doc xmlto)
+ ${withuuid}
+ --without-fop"
}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/x11:master commit in: x11-libs/libSM/
@ 2012-03-04 20:51 Chi-Thanh Christopher Nguyen
0 siblings, 0 replies; 6+ messages in thread
From: Chi-Thanh Christopher Nguyen @ 2012-03-04 20:51 UTC (permalink / raw
To: gentoo-commits
commit: c8b453ed7d71fd287fbb29f6c6a8bf414a6e37d6
Author: Chi-Thanh Christopher Nguyen <chithanh <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 4 20:51:02 2012 +0000
Commit: Chi-Thanh Christopher Nguyen <chithanh <AT> cs <DOT> tu-berlin <DOT> de>
CommitDate: Sun Mar 4 20:51:02 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=c8b453ed
x11-libs/libSM: whoops, committ most current version of the ebuild
---
x11-libs/libSM/libSM-9999.ebuild | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/x11-libs/libSM/libSM-9999.ebuild b/x11-libs/libSM/libSM-9999.ebuild
index 79957a7..5ef32f9 100644
--- a/x11-libs/libSM/libSM-9999.ebuild
+++ b/x11-libs/libSM/libSM-9999.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libSM/libSM-1.2.0.ebuild,v 1.14 2011/12/19 09:13:17 grobian Exp $
+# $Header: $
EAPI=4
@@ -47,9 +47,11 @@ pkg_setup() {
;;
esac
fi
- XORG_CONFIGURE_OPTIONS="$(use_enable ipv6)
+ XORG_CONFIGURE_OPTIONS=(
+ $(use_enable ipv6)
$(use_enable doc docs)
$(use_with doc xmlto)
${withuuid}
- --without-fop"
+ --without-fop
+ )
}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/x11:master commit in: x11-libs/libSM/
@ 2013-03-08 4:51 Michał Górny
0 siblings, 0 replies; 6+ messages in thread
From: Michał Górny @ 2013-03-08 4:51 UTC (permalink / raw
To: gentoo-commits
commit: 3c87809f56b431b3ea1506bbe78a0541a64f4ee8
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 8 04:51:45 2013 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Mar 8 04:51:45 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=3c87809f
x11-libs/libSM: sync to gx86.
---
x11-libs/libSM/libSM-9999.ebuild | 14 ++++++--------
1 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/x11-libs/libSM/libSM-9999.ebuild b/x11-libs/libSM/libSM-9999.ebuild
index 80d6ffa..7ccf9d3 100644
--- a/x11-libs/libSM/libSM-9999.ebuild
+++ b/x11-libs/libSM/libSM-9999.ebuild
@@ -10,8 +10,8 @@ inherit xorg-2
DESCRIPTION="X.Org SM library"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE="ipv6 +uuid"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE="doc ipv6 +uuid"
RDEPEND=">=x11-libs/libICE-1.0.5[${MULTILIB_USEDEP}]
x11-libs/xtrans
@@ -19,15 +19,15 @@ RDEPEND=">=x11-libs/libICE-1.0.5[${MULTILIB_USEDEP}]
!elibc_FreeBSD? ( !elibc_SunOS? (
uuid? (
>=sys-apps/util-linux-2.16
- abi_x86_32? (
- app-emulation/emul-linux-x86-baselibs[development]
- )
+ amd64? ( abi_x86_32? (
+ app-emulation/emul-linux-x86-baselibs[development] ) )
)
) )"
DEPEND="${RDEPEND}"
-src_configure() {
+pkg_setup() {
local withuuid=$(use_with uuid libuuid)
+ xorg-2_pkg_setup
# do not use uuid even if available in libc (like on FreeBSD)
use uuid || export ac_cv_func_uuid_create=no
@@ -52,7 +52,6 @@ src_configure() {
;;
esac
fi
-
XORG_CONFIGURE_OPTIONS=(
$(use_enable ipv6)
$(use_enable doc docs)
@@ -60,5 +59,4 @@ src_configure() {
${withuuid}
--without-fop
)
- xorg-2_src_configure
}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/x11:master commit in: x11-libs/libSM/
@ 2014-05-03 7:24 Michał Górny
0 siblings, 0 replies; 6+ messages in thread
From: Michał Górny @ 2014-05-03 7:24 UTC (permalink / raw
To: gentoo-commits
commit: e4cdfb02e97fdd8f56ecd408ea0f8b1b78b28a6f
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat May 3 07:24:44 2014 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat May 3 07:24:44 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=e4cdfb02
x11-libs/libSM: Depend on multilib util-linux. Sync the conditionals with gx86.
Package-Manager: portage-2.2.10
---
x11-libs/libSM/libSM-9999.ebuild | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/x11-libs/libSM/libSM-9999.ebuild b/x11-libs/libSM/libSM-9999.ebuild
index 9b43cb1..9f3db9d 100644
--- a/x11-libs/libSM/libSM-9999.ebuild
+++ b/x11-libs/libSM/libSM-9999.ebuild
@@ -16,13 +16,9 @@ IUSE="doc ipv6 +uuid"
RDEPEND=">=x11-libs/libICE-1.0.5[${MULTILIB_USEDEP}]
x11-libs/xtrans
x11-proto/xproto[${MULTILIB_USEDEP}]
- !elibc_FreeBSD? ( !elibc_SunOS? (
- uuid? (
- >=sys-apps/util-linux-2.16
- amd64? ( abi_x86_32? (
- app-emulation/emul-linux-x86-baselibs[development] ) )
- )
- ) )"
+ !elibc_FreeBSD? ( !elibc_SunOS? ( !elibc_Darwin? (
+ uuid? ( >=sys-apps/util-linux-2.24.1-r3[${MULTILIB_USEDEP}] )
+ ) ) )"
DEPEND="${RDEPEND}"
src_configure() {
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2014-05-03 7:24 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-03-08 4:51 [gentoo-commits] proj/x11:master commit in: x11-libs/libSM/ Michał Górny
-- strict thread matches above, loose matches on Subject: below --
2014-05-03 7:24 Michał Górny
2012-03-04 20:51 Chi-Thanh Christopher Nguyen
2012-03-04 20:46 Chi-Thanh Christopher Nguyen
2011-04-15 19:04 Michał Górny
2011-02-20 12:20 Tomas Chvatal
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox