diff options
author | Tomas Chvatal <scarabeus@gentoo.org> | 2011-03-18 18:29:08 +0000 |
---|---|---|
committer | Tomas Chvatal <scarabeus@gentoo.org> | 2011-03-18 18:29:08 +0000 |
commit | f9f1a3c94549410a3c746ee42c6ae9379be51a40 (patch) | |
tree | 0a3fc20623068934faf51bf466d589072eb5347b /x11-libs/libX11 | |
parent | Drop unused patches. (diff) | |
download | gentoo-2-f9f1a3c94549410a3c746ee42c6ae9379be51a40.tar.gz gentoo-2-f9f1a3c94549410a3c746ee42c6ae9379be51a40.tar.bz2 gentoo-2-f9f1a3c94549410a3c746ee42c6ae9379be51a40.zip |
Version bump. Drop older.
(Portage version: 2.2.0_alpha26/cvs/Linux x86_64)
Diffstat (limited to 'x11-libs/libX11')
-rw-r--r-- | x11-libs/libX11/ChangeLog | 8 | ||||
-rw-r--r-- | x11-libs/libX11/libX11-1.4.2.ebuild (renamed from x11-libs/libX11/libX11-1.4.0.ebuild) | 26 |
2 files changed, 26 insertions, 8 deletions
diff --git a/x11-libs/libX11/ChangeLog b/x11-libs/libX11/ChangeLog index 292e5f4c6cb2..ac42227aadfc 100644 --- a/x11-libs/libX11/ChangeLog +++ b/x11-libs/libX11/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for x11-libs/libX11 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/libX11/ChangeLog,v 1.169 2011/03/05 17:53:20 xarthisius Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/libX11/ChangeLog,v 1.170 2011/03/18 18:29:08 scarabeus Exp $ + +*libX11-1.4.2 (18 Mar 2011) + + 18 Mar 2011; Tomáš Chvátal <scarabeus@gentoo.org> -libX11-1.4.0.ebuild, + +libX11-1.4.2.ebuild: + Version bump. Drop older. 05 Mar 2011; Kacper Kowalik <xarthisius@gentoo.org> libX11-1.4.1.ebuild: ppc64 stable wrt #354237 diff --git a/x11-libs/libX11/libX11-1.4.0.ebuild b/x11-libs/libX11/libX11-1.4.2.ebuild index 75844fd21235..22ba190c9161 100644 --- a/x11-libs/libX11/libX11-1.4.0.ebuild +++ b/x11-libs/libX11/libX11-1.4.2.ebuild @@ -1,26 +1,33 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/libX11/libX11-1.4.0.ebuild,v 1.7 2011/02/12 19:43:07 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/libX11/libX11-1.4.2.ebuild,v 1.1 2011/03/18 18:29:08 scarabeus Exp $ -EAPI=3 +EAPI=4 + +XORG_DOC=doc inherit xorg-2 toolchain-funcs flag-o-matic DESCRIPTION="X.Org X11 library" -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ~ppc ppc64 s390 sh sparc x86 ~x86-fbsd" -IUSE="doc ipv6 test" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~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" +IUSE="ipv6 test" RDEPEND=">=x11-libs/libxcb-1.1.92 x11-libs/xtrans + >=x11-proto/xproto-7.0.13 x11-proto/xf86bigfontproto x11-proto/inputproto x11-proto/kbproto - x11-proto/xextproto - >=x11-proto/xproto-7.0.13" + x11-proto/xextproto" DEPEND="${RDEPEND} - doc? ( app-text/xmlto ) test? ( dev-lang/perl )" +PATCHES=( + "${FILESDIR}"/${PN}-1.1.4-aix-pthread.patch + "${FILESDIR}"/${PN}-1.1.5-winnt-private.patch + "${FILESDIR}"/${PN}-1.1.5-solaris.patch +) + pkg_setup() { xorg-2_pkg_setup CONFIGURE_OPTIONS=" @@ -31,6 +38,11 @@ pkg_setup() { " } +src_configure() { + [[ ${CHOST} == *-interix* ]] && export ac_cv_func_poll=no + xorg-2_src_configure +} + src_compile() { # [Cross-Compile Love] Disable {C,LD}FLAGS and redefine CC= for 'makekeys' ( filter-flags -m* ; cd src/util && make CC=$(tc-getBUILD_CC) CFLAGS="${CFLAGS}" LDFLAGS="" clean all) |