Version bump. Fix cross compilation, bug 464514.

(Portage version: 2.2.1/cvs/Linux x86_64, unsigned Manifest commit)

5 files changed, 68 insertions, 161 deletions

diff --git a/x11-libs/libX11/ChangeLog b/x11-libs/libX11/ChangeLog
index 3e789b88af49..2748d44c4a47 100644
--- a/x11-libs/libX11/ChangeLog
+++ b/x11-libs/libX11/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-libs/libX11
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libX11/ChangeLog,v 1.207 2013/08/02 19:26:42 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libX11/ChangeLog,v 1.208 2013/09/11 20:47:31 chithanh Exp $
+
+*libX11-1.6.2 (11 Sep 2013)
+
+  11 Sep 2013; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  +libX11-1.6.2.ebuild, -libX11-1.4.1.ebuild, -libX11-1.4.3.ebuild,
+  -libX11-1.4.4.ebuild:
+  Version bump. Fix cross compilation, bug 464514.
 
 *libX11-1.6.1 (02 Aug 2013)
 
diff --git a/x11-libs/libX11/libX11-1.4.1.ebuild b/x11-libs/libX11/libX11-1.4.1.ebuild
deleted file mode 100644
index 31ddf0d2cddf..000000000000
--- a/x11-libs/libX11/libX11-1.4.1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# 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.1.ebuild,v 1.9 2011/03/05 17:53:20 xarthisius Exp $
-
-EAPI=3
-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 ~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="doc ipv6 test"
-
-RDEPEND=">=x11-libs/libxcb-1.1.92
-	x11-libs/xtrans
-	x11-proto/xf86bigfontproto
-	x11-proto/inputproto
-	x11-proto/kbproto
-	x11-proto/xextproto
-	>=x11-proto/xproto-7.0.13"
-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="
-		$(use_with doc xmlto)
-		$(use_enable doc specs)
-		$(use_enable ipv6)
-		--without-fop
-	"
-}
-
-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)
-	xorg-2_src_compile
-}
diff --git a/x11-libs/libX11/libX11-1.4.3.ebuild b/x11-libs/libX11/libX11-1.4.3.ebuild
deleted file mode 100644
index 4261d8b14d4a..000000000000
--- a/x11-libs/libX11/libX11-1.4.3.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# 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.3.ebuild,v 1.8 2011/07/15 17:00:53 xarthisius Exp $
-
-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 ~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"
-DEPEND="${RDEPEND}
-	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="
-		$(use_with doc xmlto)
-		$(use_enable doc specs)
-		$(use_enable ipv6)
-		--without-fop
-	"
-}
-
-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'
-	if tc-is-cross-compiler; then
-		(
-			filter-flags -m*
-			emake -C "${AUTOTOOLS_BUILD_DIR}"/src/util CC=$(tc-getBUILD_CC) CFLAGS="${CFLAGS}" LDFLAGS="" clean all || die
-		)
-	fi
-	xorg-2_src_compile
-}
diff --git a/x11-libs/libX11/libX11-1.4.4.ebuild b/x11-libs/libX11/libX11-1.4.4.ebuild
deleted file mode 100644
index 02cd139f5a5a..000000000000
--- a/x11-libs/libX11/libX11-1.4.4.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libX11/libX11-1.4.4.ebuild,v 1.10 2012/04/26 18:57:55 aballier Exp $
-
-EAPI=4
-
-XORG_DOC=doc
-XORG_EAUTORECONF=yes
-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 ~ppc-aix ~amd64-fbsd ~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.17
-	x11-proto/xf86bigfontproto
-	x11-proto/inputproto
-	x11-proto/kbproto
-	x11-proto/xextproto"
-DEPEND="${RDEPEND}
-	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
-	XORG_CONFIGURE_OPTIONS=(
-		$(use_with doc xmlto)
-		$(use_enable doc specs)
-		$(use_enable ipv6)
-		--without-fop
-	)
-}
-
-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'
-	if tc-is-cross-compiler; then
-		(
-			filter-flags -m*
-			emake -C "${AUTOTOOLS_BUILD_DIR}"/src/util CC=$(tc-getBUILD_CC) CFLAGS="${CFLAGS}" LDFLAGS="" clean all || die
-		)
-	fi
-	xorg-2_src_compile
-}
diff --git a/x11-libs/libX11/libX11-1.6.2.ebuild b/x11-libs/libX11/libX11-1.6.2.ebuild
new file mode 100644
index 000000000000..d94c6940e01f
--- /dev/null
+++ b/x11-libs/libX11/libX11-1.6.2.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libX11/libX11-1.6.2.ebuild,v 1.1 2013/09/11 20:47:31 chithanh Exp $
+
+EAPI=5
+
+XORG_DOC=doc
+# needs automake-1.14 without eautoreconf
+XORG_EAUTORECONF=yes
+XORG_MULTILIB=yes
+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 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~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="ipv6 test"
+
+RDEPEND=">=x11-libs/libxcb-1.8.1[${MULTILIB_USEDEP}]
+	x11-libs/xtrans
+	>=x11-proto/xproto-7.0.17[${MULTILIB_USEDEP}]
+	x11-proto/xf86bigfontproto[${MULTILIB_USEDEP}]
+	x11-proto/inputproto[${MULTILIB_USEDEP}]
+	x11-proto/kbproto[${MULTILIB_USEDEP}]
+	x11-proto/xextproto[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}
+	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
+)
+
+src_configure() {
+	XORG_CONFIGURE_OPTIONS=(
+		$(use_with doc xmlto)
+		$(use_enable doc specs)
+		$(use_enable ipv6)
+		--without-fop
+	)
+
+	[[ ${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'
+	if tc-is-cross-compiler; then
+		(
+			filter-flags -m*
+			multilib_for_best_abi run_in_build_dir \
+				emake -C src/util \
+				CC=$(tc-getBUILD_CC) \
+				CFLAGS="${CFLAGS}" \
+				LDFLAGS="" \
+				clean all || die
+		)
+	fi
+	xorg-2_src_compile
+}