Version bump. Drop old. Sync with upstream configure.ac literaly.

(Portage version: 2.2_rc46/cvs/Linux x86_64)

3 files changed, 13 insertions, 50 deletions

diff --git a/x11-libs/libX11/ChangeLog b/x11-libs/libX11/ChangeLog
index f6d2d25bdd54..82a4bad3ef83 100644
--- a/x11-libs/libX11/ChangeLog
+++ b/x11-libs/libX11/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-libs/libX11
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libX11/ChangeLog,v 1.122 2009/10/18 20:09:18 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libX11/ChangeLog,v 1.123 2009/10/25 20:42:00 scarabeus Exp $
+
+*libX11-1.3.2 (25 Oct 2009)
+
+  25 Oct 2009; Tomáš Chvátal <scarabeus@gentoo.org> -libX11-1.3.ebuild,
+  -libX11-1.3.1.ebuild, +libX11-1.3.2.ebuild:
+  Version bump. Drop old. Sync with upstream configure.ac literaly.
 
 *libX11-1.3.1 (18 Oct 2009)
 
diff --git a/x11-libs/libX11/libX11-1.3.1.ebuild b/x11-libs/libX11/libX11-1.3.2.ebuild
index ada151735c13..a3929d9744d7 100644
--- a/x11-libs/libX11/libX11-1.3.1.ebuild
+++ b/x11-libs/libX11/libX11-1.3.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libX11/libX11-1.3.1.ebuild,v 1.1 2009/10/18 20:09:18 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libX11/libX11-1.3.2.ebuild,v 1.1 2009/10/25 20:42:00 scarabeus Exp $
 
 EAPI="1"
 
@@ -9,17 +9,18 @@ inherit x-modular 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="ipv6 +xcb"
+IUSE="ipv6 test +xcb"
 
 RDEPEND=">=x11-libs/xtrans-1.2.3
 	x11-proto/kbproto
-	>=x11-proto/xproto-7.0.15
-	xcb? ( >=x11-libs/libxcb-1.2 )
+	>=x11-proto/xproto-7.0.13
+	xcb? ( >=x11-libs/libxcb-1.1.92 )
 	!xcb? (
 		x11-libs/libXau
 		x11-libs/libXdmcp
 	)"
 DEPEND="${RDEPEND}
+	test? ( dev-lang/perl )
 	x11-proto/xf86bigfontproto
 	xcb? (
 		x11-proto/bigreqsproto
@@ -30,7 +31,7 @@ DEPEND="${RDEPEND}
 
 pkg_setup() {
 	CONFIGURE_OPTIONS="$(use_enable ipv6)
-		$(use_with xcb)"
+		$(use_with xcb) $(use_with test perl)"
 	# xorg really doesn't like xlocale disabled.
 	# $(use_enable nls xlocale)
 }
diff --git a/x11-libs/libX11/libX11-1.3.ebuild b/x11-libs/libX11/libX11-1.3.ebuild
deleted file mode 100644
index f465aaad0a00..000000000000
--- a/x11-libs/libX11/libX11-1.3.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libX11/libX11-1.3.ebuild,v 1.1 2009/10/03 15:08:02 scarabeus Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-EAPI="1"
-
-inherit x-modular 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="ipv6 +xcb"
-
-RDEPEND=">=x11-libs/xtrans-1.2.3
-	x11-proto/kbproto
-	>=x11-proto/xproto-7.0.15
-	xcb? ( >=x11-libs/libxcb-1.2 )
-	!xcb? (
-		x11-libs/libXau
-		x11-libs/libXdmcp
-	)"
-DEPEND="${RDEPEND}
-	x11-proto/xf86bigfontproto
-	x11-proto/bigreqsproto
-	x11-proto/inputproto
-	x11-proto/xextproto
-	x11-proto/xcmiscproto
-	>=x11-misc/util-macros-1.2.1"
-
-pkg_setup() {
-	CONFIGURE_OPTIONS="$(use_enable ipv6)
-		$(use_with xcb)"
-	# xorg really doesn't like xlocale disabled.
-	# $(use_enable nls xlocale)
-}
-
-src_compile() {
-	x-modular_src_configure
-	# [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)
-	x-modular_src_make
-}