Version bump for xorg-server 1.7.

Package-Manager: portage-2.2_rc41/cvs/Linux x86_64

7 files changed, 95 insertions, 20 deletions

diff --git a/x11-libs/libX11/ChangeLog b/x11-libs/libX11/ChangeLog
index dad064541c10..566e13782a66 100644
--- a/x11-libs/libX11/ChangeLog
+++ b/x11-libs/libX11/ChangeLog
@@ -1,6 +1,11 @@
 # 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.116 2009/09/30 20:06:34 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libX11/ChangeLog,v 1.117 2009/10/03 15:08:02 scarabeus Exp $
+
+*libX11-1.3 (03 Oct 2009)
+
+  03 Oct 2009; Tomáš Chvátal <scarabeus@gentoo.org> +libX11-1.3.ebuild:
+  Version bump for xorg-server 1.7.
 
   30 Sep 2009; Samuli Suominen <ssuominen@gentoo.org> libX11-1.2.2.ebuild:
   amd64 stable wrt #282290
diff --git a/x11-libs/libX11/libX11-1.3.ebuild b/x11-libs/libX11/libX11-1.3.ebuild
new file mode 100644
index 000000000000..f465aaad0a00
--- /dev/null
+++ b/x11-libs/libX11/libX11-1.3.ebuild
@@ -0,0 +1,44 @@
+# 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
+}
diff --git a/x11-libs/libXScrnSaver/ChangeLog b/x11-libs/libXScrnSaver/ChangeLog
index f7f900b5f344..b255b6868a92 100644
--- a/x11-libs/libXScrnSaver/ChangeLog
+++ b/x11-libs/libXScrnSaver/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-libs/libXScrnSaver
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXScrnSaver/ChangeLog,v 1.58 2009/09/24 07:24:19 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXScrnSaver/ChangeLog,v 1.59 2009/10/03 15:10:55 scarabeus Exp $
+
+*libXScrnSaver-1.2.0 (03 Oct 2009)
+
+  03 Oct 2009; Tomáš Chvátal <scarabeus@gentoo.org>
+  +libXScrnSaver-1.2.0.ebuild:
+  Version bump for xorg-server 1.7.
 
   24 Sep 2009; Rémi Cardona <remi@gentoo.org> libXScrnSaver-1.1.3.ebuild:
   add missing scrnsaverproto dep (fixes bug #227901)
diff --git a/x11-libs/libXScrnSaver/libXScrnSaver-1.2.0.ebuild b/x11-libs/libXScrnSaver/libXScrnSaver-1.2.0.ebuild
new file mode 100644
index 000000000000..2e7a13d7f14e
--- /dev/null
+++ b/x11-libs/libXScrnSaver/libXScrnSaver-1.2.0.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXScrnSaver/libXScrnSaver-1.2.0.ebuild,v 1.1 2009/10/03 15:10:55 scarabeus Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+
+inherit x-modular
+
+DESCRIPTION="X.Org XScrnSaver library"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXext"
+DEPEND="${RDEPEND}
+	>=x11-proto/scrnsaverproto-1.2"
diff --git a/x11-libs/libXext/ChangeLog b/x11-libs/libXext/ChangeLog
index b72f75145495..71330e797060 100644
--- a/x11-libs/libXext/ChangeLog
+++ b/x11-libs/libXext/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-libs/libXext
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXext/ChangeLog,v 1.58 2009/09/30 19:59:23 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXext/ChangeLog,v 1.59 2009/10/03 15:15:52 scarabeus Exp $
+
+*libXext-1.1 (03 Oct 2009)
+
+  03 Oct 2009; Tomáš Chvátal <scarabeus@gentoo.org>
+  -libXext-1.0.3.ebuild, +libXext-1.1.ebuild:
+  Version bump for xorg-server 1.7.
 
   30 Sep 2009; Samuli Suominen <ssuominen@gentoo.org> libXext-1.0.5.ebuild:
   amd64 stable wrt #282290
diff --git a/x11-libs/libXext/libXext-1.0.3.ebuild b/x11-libs/libXext/libXext-1.0.3.ebuild
deleted file mode 100644
index e09e81f85420..000000000000
--- a/x11-libs/libXext/libXext-1.0.3.ebuild
+++ /dev/null
@@ -1,17 +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/libXext/libXext-1.0.3.ebuild,v 1.12 2009/05/05 07:07:09 ssuominen Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-inherit x-modular
-
-DESCRIPTION="X.Org Xext library"
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND="x11-libs/libX11
-	x11-proto/xextproto"
-DEPEND="${RDEPEND}
-	x11-proto/xproto"
diff --git a/x11-libs/libXext/libXext-1.1.ebuild b/x11-libs/libXext/libXext-1.1.ebuild
new file mode 100644
index 000000000000..6e8c14af564f
--- /dev/null
+++ b/x11-libs/libXext/libXext-1.1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit x-modular
+
+DESCRIPTION="X.Org Xext library"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND=">=x11-libs/libX11-1.2"
+DEPEND="${RDEPEND}
+	>=x11-proto/xextproto-7.1
+	>=x11-proto/xproto-7.0.16"