| 1 |
commit: 422783f5d8f22ba18c144bbebd74a0c49881a83f |
| 2 |
Author: Chi-Thanh Christopher Nguyen <chithanh <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Mar 4 20:46:47 2012 +0000 |
| 4 |
Commit: Chi-Thanh Christopher Nguyen <chithanh <AT> cs <DOT> tu-berlin <DOT> de> |
| 5 |
CommitDate: Sun Mar 4 20:46:47 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=422783f5 |
| 7 |
|
| 8 |
x11-libs/libSM: sync keywords and darwin uuid fix with portage |
| 9 |
|
| 10 |
--- |
| 11 |
x11-libs/libSM/libSM-9999.ebuild | 50 ++++++++++++++++++++++--------------- |
| 12 |
1 files changed, 30 insertions(+), 20 deletions(-) |
| 13 |
|
| 14 |
diff --git a/x11-libs/libSM/libSM-9999.ebuild b/x11-libs/libSM/libSM-9999.ebuild |
| 15 |
index f45a1cf..79957a7 100644 |
| 16 |
--- a/x11-libs/libSM/libSM-9999.ebuild |
| 17 |
+++ b/x11-libs/libSM/libSM-9999.ebuild |
| 18 |
@@ -1,6 +1,6 @@ |
| 19 |
# Copyright 1999-2011 Gentoo Foundation |
| 20 |
# Distributed under the terms of the GNU General Public License v2 |
| 21 |
-# $Header: $ |
| 22 |
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libSM/libSM-1.2.0.ebuild,v 1.14 2011/12/19 09:13:17 grobian Exp $ |
| 23 |
|
| 24 |
EAPI=4 |
| 25 |
|
| 26 |
@@ -9,37 +9,47 @@ inherit xorg-2 |
| 27 |
|
| 28 |
DESCRIPTION="X.Org SM library" |
| 29 |
|
| 30 |
-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" |
| 31 |
+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" |
| 32 |
IUSE="ipv6 +uuid" |
| 33 |
|
| 34 |
RDEPEND=">=x11-libs/libICE-1.0.5 |
| 35 |
x11-libs/xtrans |
| 36 |
x11-proto/xproto |
| 37 |
- !elibc_FreeBSD? ( !elibc_IRIX? ( !elibc_SunOS? ( |
| 38 |
+ !elibc_FreeBSD? ( !elibc_SunOS? ( |
| 39 |
uuid? ( >=sys-apps/util-linux-2.16 ) |
| 40 |
- ) ) )" |
| 41 |
+ ) )" |
| 42 |
DEPEND="${RDEPEND}" |
| 43 |
|
| 44 |
pkg_setup() { |
| 45 |
+ local withuuid=$(use_with uuid libuuid) |
| 46 |
xorg-2_pkg_setup |
| 47 |
|
| 48 |
- XORG_CONFIGURE_OPTIONS=( |
| 49 |
- $(use_enable ipv6) |
| 50 |
- $(use_enable doc docs) |
| 51 |
- $(use_with doc xmlto) |
| 52 |
- $(use_with uuid libuuid) |
| 53 |
- --without-fop |
| 54 |
- ) |
| 55 |
# do not use uuid even if available in libc (like on FreeBSD) |
| 56 |
use uuid || export ac_cv_func_uuid_create=no |
| 57 |
- # solaris hack |
| 58 |
- if use uuid && |
| 59 |
- [[ ${CHOST} == *-solaris* ]] && |
| 60 |
- [[ ! -d ${EROOT}/usr/include/uuid ]] && |
| 61 |
- [[ -d ${ROOT}/usr/include/uuid ]] |
| 62 |
- then |
| 63 |
- # ${ROOT} is proper here |
| 64 |
- export LIBUUID_CFLAGS="-I${ROOT}/usr/include/uuid" |
| 65 |
- export LIBUUID_LIBS="-luuid" |
| 66 |
+ |
| 67 |
+ if use uuid ; then |
| 68 |
+ case ${CHOST} in |
| 69 |
+ *-solaris*|*-darwin*) |
| 70 |
+ if [[ ! -d ${EROOT}usr/include/uuid ]] && |
| 71 |
+ [[ -d ${ROOT}usr/include/uuid ]] |
| 72 |
+ then |
| 73 |
+ # Solaris and Darwin have uuid provided by the host |
| 74 |
+ # system. Since util-linux's version is based on this |
| 75 |
+ # version, and on Darwin actually breaks host headers when |
| 76 |
+ # installed, we can "pretend" for libSM we have libuuid |
| 77 |
+ # installed, while in fact we don't |
| 78 |
+ withuuid="--without-libuuid" |
| 79 |
+ export HAVE_LIBUUID=yes |
| 80 |
+ export LIBUUID_CFLAGS="-I${ROOT}usr/include/uuid" |
| 81 |
+ # Darwin has uuid in libSystem |
| 82 |
+ [[ ${CHOST} == *-solaris* ]] && export LIBUUID_LIBS="-luuid" |
| 83 |
+ fi |
| 84 |
+ ;; |
| 85 |
+ esac |
| 86 |
fi |
| 87 |
+ XORG_CONFIGURE_OPTIONS="$(use_enable ipv6) |
| 88 |
+ $(use_enable doc docs) |
| 89 |
+ $(use_with doc xmlto) |
| 90 |
+ ${withuuid} |
| 91 |
+ --without-fop" |
| 92 |
} |
Archives