1 |
darkside 11/01/27 16:50:29 |
2 |
|
3 |
Modified: ChangeLog libX11-1.4.1.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.161 x11-libs/libX11/ChangeLog |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/libX11/ChangeLog?rev=1.161&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/libX11/ChangeLog?rev=1.161&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/libX11/ChangeLog?r1=1.160&r2=1.161 |
15 |
|
16 |
Index: ChangeLog |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/x11-libs/libX11/ChangeLog,v |
19 |
retrieving revision 1.160 |
20 |
retrieving revision 1.161 |
21 |
diff -u -r1.160 -r1.161 |
22 |
--- ChangeLog 15 Jan 2011 17:41:55 -0000 1.160 |
23 |
+++ ChangeLog 27 Jan 2011 16:50:29 -0000 1.161 |
24 |
@@ -1,6 +1,11 @@ |
25 |
# ChangeLog for x11-libs/libX11 |
26 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libX11/ChangeLog,v 1.160 2011/01/15 17:41:55 scarabeus Exp $ |
28 |
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libX11/ChangeLog,v 1.161 2011/01/27 16:50:29 darkside Exp $ |
29 |
+ |
30 |
+ 27 Jan 2011; Jeremy Olexa <darkside@g.o> |
31 |
+ +files/libX11-1.1.4-aix-pthread.patch, +files/libX11-1.1.5-solaris.patch, |
32 |
+ +files/libX11-1.1.5-winnt-private.patch, libX11-1.4.1.ebuild: |
33 |
+ Push Gentoo Prefix changes from x11 overlay, as approved |
34 |
|
35 |
*libX11-1.4.1 (15 Jan 2011) |
36 |
|
37 |
|
38 |
|
39 |
|
40 |
1.2 x11-libs/libX11/libX11-1.4.1.ebuild |
41 |
|
42 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/libX11/libX11-1.4.1.ebuild?rev=1.2&view=markup |
43 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/libX11/libX11-1.4.1.ebuild?rev=1.2&content-type=text/plain |
44 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/libX11/libX11-1.4.1.ebuild?r1=1.1&r2=1.2 |
45 |
|
46 |
Index: libX11-1.4.1.ebuild |
47 |
=================================================================== |
48 |
RCS file: /var/cvsroot/gentoo-x86/x11-libs/libX11/libX11-1.4.1.ebuild,v |
49 |
retrieving revision 1.1 |
50 |
retrieving revision 1.2 |
51 |
diff -u -r1.1 -r1.2 |
52 |
--- libX11-1.4.1.ebuild 15 Jan 2011 17:41:55 -0000 1.1 |
53 |
+++ libX11-1.4.1.ebuild 27 Jan 2011 16:50:29 -0000 1.2 |
54 |
@@ -1,13 +1,13 @@ |
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/libX11/libX11-1.4.1.ebuild,v 1.1 2011/01/15 17:41:55 scarabeus Exp $ |
58 |
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libX11/libX11-1.4.1.ebuild,v 1.2 2011/01/27 16:50:29 darkside Exp $ |
59 |
|
60 |
EAPI=3 |
61 |
inherit xorg-2 toolchain-funcs flag-o-matic |
62 |
|
63 |
DESCRIPTION="X.Org X11 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 ~x86-fbsd ppc-aix ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" |
67 |
IUSE="doc ipv6 test" |
68 |
|
69 |
RDEPEND=">=x11-libs/libxcb-1.1.92 |
70 |
@@ -21,6 +21,12 @@ |
71 |
doc? ( app-text/xmlto ) |
72 |
test? ( dev-lang/perl )" |
73 |
|
74 |
+PATCHES=( |
75 |
+ "${FILESDIR}"/${PN}-1.1.4-aix-pthread.patch |
76 |
+ "${FILESDIR}"/${PN}-1.1.5-winnt-private.patch |
77 |
+ "${FILESDIR}"/${PN}-1.1.5-solaris.patch |
78 |
+) |
79 |
+ |
80 |
pkg_setup() { |
81 |
xorg-2_pkg_setup |
82 |
CONFIGURE_OPTIONS=" |
83 |
@@ -31,6 +37,11 @@ |
84 |
" |
85 |
} |
86 |
|
87 |
+src_configure() { |
88 |
+ [[ ${CHOST} == *-interix* ]] && export ac_cv_func_poll=no |
89 |
+ xorg-2_src_configure |
90 |
+} |
91 |
+ |
92 |
src_compile() { |
93 |
# [Cross-Compile Love] Disable {C,LD}FLAGS and redefine CC= for 'makekeys' |
94 |
( filter-flags -m* ; cd src/util && make CC=$(tc-getBUILD_CC) CFLAGS="${CFLAGS}" LDFLAGS="" clean all) |