1 |
darkside 11/01/27 16:48:02 |
2 |
|
3 |
Modified: ChangeLog libSM-1.2.0.ebuild |
4 |
Log: |
5 |
Push Gentoo Prefix changes from x11 overlay, as approved |
6 |
|
7 |
(Portage version: 2.1.9.35/cvs/Linux i686) |
8 |
|
9 |
Revision Changes Path |
10 |
1.85 x11-libs/libSM/ChangeLog |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/libSM/ChangeLog?rev=1.85&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/libSM/ChangeLog?rev=1.85&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/libSM/ChangeLog?r1=1.84&r2=1.85 |
15 |
|
16 |
Index: ChangeLog |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/x11-libs/libSM/ChangeLog,v |
19 |
retrieving revision 1.84 |
20 |
retrieving revision 1.85 |
21 |
diff -u -r1.84 -r1.85 |
22 |
--- ChangeLog 31 Dec 2010 19:59:19 -0000 1.84 |
23 |
+++ ChangeLog 27 Jan 2011 16:48:02 -0000 1.85 |
24 |
@@ -1,6 +1,9 @@ |
25 |
# ChangeLog for x11-libs/libSM |
26 |
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libSM/ChangeLog,v 1.84 2010/12/31 19:59:19 jer Exp $ |
28 |
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
29 |
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libSM/ChangeLog,v 1.85 2011/01/27 16:48:02 darkside Exp $ |
30 |
+ |
31 |
+ 27 Jan 2011; Jeremy Olexa <darkside@g.o> libSM-1.2.0.ebuild: |
32 |
+ Push Gentoo Prefix changes from x11 overlay, as approved |
33 |
|
34 |
31 Dec 2010; Jeroen Roovers <jer@g.o> libSM-1.2.0.ebuild: |
35 |
Stable for HPPA (bug #344827). |
36 |
|
37 |
|
38 |
|
39 |
1.8 x11-libs/libSM/libSM-1.2.0.ebuild |
40 |
|
41 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/libSM/libSM-1.2.0.ebuild?rev=1.8&view=markup |
42 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/libSM/libSM-1.2.0.ebuild?rev=1.8&content-type=text/plain |
43 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/libSM/libSM-1.2.0.ebuild?r1=1.7&r2=1.8 |
44 |
|
45 |
Index: libSM-1.2.0.ebuild |
46 |
=================================================================== |
47 |
RCS file: /var/cvsroot/gentoo-x86/x11-libs/libSM/libSM-1.2.0.ebuild,v |
48 |
retrieving revision 1.7 |
49 |
retrieving revision 1.8 |
50 |
diff -u -r1.7 -r1.8 |
51 |
--- libSM-1.2.0.ebuild 31 Dec 2010 19:59:19 -0000 1.7 |
52 |
+++ libSM-1.2.0.ebuild 27 Jan 2011 16:48:02 -0000 1.8 |
53 |
@@ -1,21 +1,21 @@ |
54 |
-# Copyright 1999-2010 Gentoo Foundation |
55 |
+# Copyright 1999-2011 Gentoo Foundation |
56 |
# Distributed under the terms of the GNU General Public License v2 |
57 |
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libSM/libSM-1.2.0.ebuild,v 1.7 2010/12/31 19:59:19 jer Exp $ |
58 |
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libSM/libSM-1.2.0.ebuild,v 1.8 2011/01/27 16:48:02 darkside Exp $ |
59 |
|
60 |
EAPI=3 |
61 |
inherit xorg-2 |
62 |
|
63 |
DESCRIPTION="X.Org SM library" |
64 |
|
65 |
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd" |
66 |
+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" |
67 |
IUSE="doc ipv6 +uuid" |
68 |
|
69 |
RDEPEND="x11-libs/libICE |
70 |
x11-libs/xtrans |
71 |
x11-proto/xproto |
72 |
- !elibc_FreeBSD? ( |
73 |
+ !elibc_FreeBSD? ( !elibc_IRIX? ( !elibc_SunOS? ( |
74 |
uuid? ( >=sys-apps/util-linux-2.16 ) |
75 |
- )" |
76 |
+ ) ) )" |
77 |
DEPEND="${RDEPEND} |
78 |
doc? ( app-text/xmlto )" |
79 |
|
80 |
@@ -29,4 +29,14 @@ |
81 |
--without-fop" |
82 |
# do not use uuid even if available in libc (like on FreeBSD) |
83 |
use uuid || export ac_cv_func_uuid_create=no |
84 |
+ # solaris hack |
85 |
+ if use uuid && |
86 |
+ [[ ${CHOST} == *-solaris* ]] && |
87 |
+ [[ ! -d ${EROOT}/usr/include/uuid ]] && |
88 |
+ [[ -d ${ROOT}/usr/include/uuid ]] |
89 |
+ then |
90 |
+ # ${ROOT} is proper here |
91 |
+ export LIBUUID_CFLAGS="-I${ROOT}/usr/include/uuid" |
92 |
+ export LIBUUID_LIBS="-luuid" |
93 |
+ fi |
94 |
} |