x11-libs/libX11: drop old ebuilds

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

9 files changed, 8 insertions, 260 deletions

diff --git a/x11-libs/libX11/ChangeLog b/x11-libs/libX11/ChangeLog
index c4465f120c4a..59748679b9ed 100644
--- a/x11-libs/libX11/ChangeLog
+++ b/x11-libs/libX11/ChangeLog
@@ -1,6 +1,13 @@
 # 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.120 2009/10/11 10:58:42 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libX11/ChangeLog,v 1.121 2009/10/18 20:06:51 remi Exp $
+
+  18 Oct 2009; Rémi Cardona <remi@gentoo.org> -libX11-1.1.2-r1.ebuild,
+  -files/libX11-1.1.2-XGetMotionEvents-order-fix.patch,
+  -files/libX11-1.1.2-XimGetWindowEventmask-fix.patch, -libX11-1.1.3.ebuild,
+  -libX11-1.1.3-r1.ebuild, -files/libX11-1.1.3-xcb-locking.patch,
+  -libX11-1.1.4.ebuild, -libX11-1.2.1.ebuild:
+  drop old ebuilds
 
   11 Oct 2009; nixnut <nixnut@gentoo.org> libX11-1.2.2.ebuild:
   ppc stable #282290
diff --git a/x11-libs/libX11/files/libX11-1.1.2-XGetMotionEvents-order-fix.patch b/x11-libs/libX11/files/libX11-1.1.2-XGetMotionEvents-order-fix.patch
deleted file mode 100644
index 75e886384f17..000000000000
--- a/x11-libs/libX11/files/libX11-1.1.2-XGetMotionEvents-order-fix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/src/GetMoEv.c b/src/GetMoEv.c
-index 2aa6c1a..dac1bfc 100644
---- a/src/GetMoEv.c
-+++ b/src/GetMoEv.c
-@@ -33,9 +33,9 @@ in this Software without prior written authorization from The Open Group.
- 
- XTimeCoord *XGetMotionEvents(
-     register Display *dpy,
-+    Window w,
-     Time start, 
-     Time stop,
--    Window w,
-     int *nEvents)  /* RETURN */
- {       
-     xGetMotionEventsReply rep;
diff --git a/x11-libs/libX11/files/libX11-1.1.2-XimGetWindowEventmask-fix.patch b/x11-libs/libX11/files/libX11-1.1.2-XimGetWindowEventmask-fix.patch
deleted file mode 100644
index fbd51e7a6bb3..000000000000
--- a/x11-libs/libX11/files/libX11-1.1.2-XimGetWindowEventmask-fix.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From: Jamey Sharp <jamey@minilop.net>
-Date: Sun, 10 Jun 2007 23:19:59 +0000 (-0700)
-Subject: Fix locking in _XimGetWindowEventmask.
-X-Git-Url: http://gitweb.freedesktop.org/?p=xorg/lib/libX11.git;a=commitdiff;h=c2f88cdf5cd9c94b77e5bfdac572b5ac06ab4aa8
-
-Fix locking in _XimGetWindowEventmask.
-
-Now that XFilterEvent drops the Display lock before invoking callback
-functions, _XimGetWindowEventmask is called without the lock held. So
-when it called _XGetWindowAttributes, a variant of XGetWindowAttributes
-that does not lock the Display, Xlib/XCB would assert:
-
-xcb_xlib.c:50: xcb_xlib_unlock: Assertion `c->xlib.lock' failed.
-
-Should fix Gentoo #156367, Ubuntu #87947, Debian #427296. And others?
----
-
---- a/modules/im/ximcp/imDefLkup.c
-+++ b/modules/im/ximcp/imDefLkup.c
-@@ -466,7 +466,7 @@ _XimGetWindowEventmask(
-     Xim			im = (Xim )ic->core.im;
-     XWindowAttributes	atr;
- 
--    if (!_XGetWindowAttributes(im->core.display, ic->core.focus_window, &atr))
-+    if (!XGetWindowAttributes(im->core.display, ic->core.focus_window, &atr))
- 	return 0;
-     return (EVENTMASK)atr.your_event_mask;
- }
diff --git a/x11-libs/libX11/files/libX11-1.1.3-xcb-locking.patch b/x11-libs/libX11/files/libX11-1.1.3-xcb-locking.patch
deleted file mode 100644
index 78845d34c2fb..000000000000
--- a/x11-libs/libX11/files/libX11-1.1.3-xcb-locking.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-commit e02e4ccafcaf3eb8993152dfcbfbee0240ea2db2
-Author: Adam Jackson <ajax@redhat.com>
-Date:   Sun Feb 24 20:00:43 2008 -0500
-
-    Bug #14029: Don't LockDisplay() recursively.
-    
-    See also Red Hat bugzilla #326461.
-
-diff --git a/src/xkb/XKBBind.c b/src/xkb/XKBBind.c
-index e190d00..4dc9265 100644
---- a/src/xkb/XKBBind.c
-+++ b/src/xkb/XKBBind.c
-@@ -368,7 +368,6 @@ XkbRefreshKeyboardMapping(register XkbMapNotifyEvent *event)
- 	     changes= xkbi->changes;
- 	else bzero(&changes,sizeof(changes));
- 	XkbNoteMapChanges(&changes,event,XKB_XLIB_MAP_MASK);
--	LockDisplay(dpy);
- 	if ((rtrn=XkbGetMapChanges(dpy,xkbi->desc,&changes))!=Success) {
- #ifdef DEBUG
- 	    fprintf(stderr,"Internal Error! XkbGetMapChanges failed:\n");
-@@ -379,7 +378,6 @@ XkbRefreshKeyboardMapping(register XkbMapNotifyEvent *event)
- 	    xkbi->flags&= ~XkbMapPending;
- 	    bzero(&xkbi->changes,sizeof(XkbMapChangesRec));
- 	}
--	UnlockDisplay(dpy);
- 	return rtrn;
-     }
-     return BadMatch;
\ No newline at end of file
diff --git a/x11-libs/libX11/libX11-1.1.2-r1.ebuild b/x11-libs/libX11/libX11-1.1.2-r1.ebuild
deleted file mode 100644
index d5559f1a9f93..000000000000
--- a/x11-libs/libX11/libX11-1.1.2-r1.ebuild
+++ /dev/null
@@ -1,36 +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.1.2-r1.ebuild,v 1.12 2009/05/05 07:32:46 ssuominen Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-inherit x-modular
-
-DESCRIPTION="X.Org X11 library"
-
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE="ipv6 xcb"
-RDEPEND=">=x11-libs/xtrans-1.0.1
-	x11-libs/libXau
-	x11-libs/libXdmcp
-	x11-proto/kbproto
-	>=x11-proto/xproto-7.0.6
-	xcb? ( >=x11-libs/libxcb-1.0 )"
-DEPEND="${RDEPEND}
-	x11-proto/xf86bigfontproto
-	x11-proto/bigreqsproto
-	x11-proto/inputproto
-	x11-proto/xextproto
-	x11-proto/xcmiscproto
-	>=x11-misc/util-macros-0.99.0_p20051007"
-
-pkg_setup() {
-	CONFIGURE_OPTIONS="$(use_enable ipv6)
-		$(use_with xcb)"
-	# xorg really doesn't like xlocale disabled.
-	# $(use_enable nls xlocale)
-}
-
-PATCHES=("${FILESDIR}/libX11-1.1.2-XGetMotionEvents-order-fix.patch
-	${FILESDIR}/libX11-1.1.2-XimGetWindowEventmask-fix.patch")
diff --git a/x11-libs/libX11/libX11-1.1.3-r1.ebuild b/x11-libs/libX11/libX11-1.1.3-r1.ebuild
deleted file mode 100644
index d4c265c9eee9..000000000000
--- a/x11-libs/libX11/libX11-1.1.3-r1.ebuild
+++ /dev/null
@@ -1,35 +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.1.3-r1.ebuild,v 1.3 2009/05/05 07:32:46 ssuominen Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-inherit x-modular
-
-DESCRIPTION="X.Org X11 library"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="ipv6 xcb"
-RDEPEND=">=x11-libs/xtrans-1.0.1
-	x11-libs/libXau
-	x11-libs/libXdmcp
-	x11-proto/kbproto
-	>=x11-proto/xproto-7.0.6
-	xcb? ( >=x11-libs/libxcb-1.0 )"
-DEPEND="${RDEPEND}
-	x11-proto/xf86bigfontproto
-	x11-proto/bigreqsproto
-	x11-proto/inputproto
-	x11-proto/xextproto
-	x11-proto/xcmiscproto
-	>=x11-misc/util-macros-0.99.0_p20051007"
-
-pkg_setup() {
-	CONFIGURE_OPTIONS="$(use_enable ipv6)
-		$(use_with xcb)"
-	# xorg really doesn't like xlocale disabled.
-	# $(use_enable nls xlocale)
-}
-
-PATCHES=("${FILESDIR}/libX11-1.1.3-xcb-locking.patch")
diff --git a/x11-libs/libX11/libX11-1.1.3.ebuild b/x11-libs/libX11/libX11-1.1.3.ebuild
deleted file mode 100644
index a95d3b2c4554..000000000000
--- a/x11-libs/libX11/libX11-1.1.3.ebuild
+++ /dev/null
@@ -1,33 +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.1.3.ebuild,v 1.9 2009/05/04 15:09:18 ssuominen Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-inherit x-modular
-
-DESCRIPTION="X.Org X11 library"
-
-KEYWORDS="alpha amd64 arm ~hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE="ipv6 xcb"
-RDEPEND=">=x11-libs/xtrans-1.0.1
-	x11-libs/libXau
-	x11-libs/libXdmcp
-	x11-proto/kbproto
-	>=x11-proto/xproto-7.0.6
-	xcb? ( >=x11-libs/libxcb-1.0 )"
-DEPEND="${RDEPEND}
-	x11-proto/xf86bigfontproto
-	x11-proto/bigreqsproto
-	x11-proto/inputproto
-	x11-proto/xextproto
-	x11-proto/xcmiscproto
-	>=x11-misc/util-macros-0.99.0_p20051007"
-
-pkg_setup() {
-	CONFIGURE_OPTIONS="$(use_enable ipv6)
-		$(use_with xcb)"
-	# xorg really doesn't like xlocale disabled.
-	# $(use_enable nls xlocale)
-}
diff --git a/x11-libs/libX11/libX11-1.1.4.ebuild b/x11-libs/libX11/libX11-1.1.4.ebuild
deleted file mode 100644
index b8ff9601168e..000000000000
--- a/x11-libs/libX11/libX11-1.1.4.ebuild
+++ /dev/null
@@ -1,40 +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.1.4.ebuild,v 1.12 2009/05/04 15:09:18 ssuominen Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-inherit x-modular toolchain-funcs flag-o-matic
-
-DESCRIPTION="X.Org X11 library"
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE="ipv6 xcb"
-RDEPEND=">=x11-libs/xtrans-1.0.1
-	x11-libs/libXau
-	x11-libs/libXdmcp
-	x11-proto/kbproto
-	>=x11-proto/xproto-7.0.6
-	xcb? ( >=x11-libs/libxcb-1.0 )"
-DEPEND="${RDEPEND}
-	x11-proto/xf86bigfontproto
-	x11-proto/bigreqsproto
-	x11-proto/inputproto
-	x11-proto/xextproto
-	x11-proto/xcmiscproto
-	>=x11-misc/util-macros-0.99.0_p20051007"
-
-pkg_setup() {
-	CONFIGURE_OPTIONS="$(use_enable ipv6)
-		$(use_with xcb)"
-	# xorg really doesn't like xlocale disabled.
-	# $(use_enable nls xlocale)
-}
-
-x-modular_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/libX11/libX11-1.2.1.ebuild b/x11-libs/libX11/libX11-1.2.1.ebuild
deleted file mode 100644
index 4cf55935c625..000000000000
--- a/x11-libs/libX11/libX11-1.2.1.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.2.1.ebuild,v 1.1 2009/06/07 21:47:14 remi 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 ~m68k ~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
-}