x11-libs/libX11: drop old ebuilds

Package-Manager: portage-2.2_rc46/cvs/Linux i686

10 files changed, 9 insertions, 273 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/Manifest b/x11-libs/libX11/Manifest
index 377d9d4efdea..0cee0731098b 100644
--- a/x11-libs/libX11/Manifest
+++ b/x11-libs/libX11/Manifest
@@ -1,20 +1,8 @@
-AUX libX11-1.1.2-XGetMotionEvents-order-fix.patch 405 RMD160 811390446d70bacfec06cfe2b243ea5420bb23a3 SHA1 ffb6009f5365d902f2c2d63c210a4655cf7cf779 SHA256 65eb3ec5598d88e10b2cc5f79f5c5a0d77bc04140f02da749862587cf240ba9b
-AUX libX11-1.1.2-XimGetWindowEventmask-fix.patch 1099 RMD160 c1177dfd4cbfa470fc98ab9a8a3aeaa8548d1177 SHA1 5135d7772f0b755e508c735612104b8d32f4a519 SHA256 ac8ecbf83fe6af7085b4fd9335c03fbaf3e73791f17a1b74631ce43eb5b1d878
-AUX libX11-1.1.3-xcb-locking.patch 966 RMD160 59f9bc11591454bea86e30574866d070dafcd3fb SHA1 3a0838317ba656aec70732353fccc38e26d466b6 SHA256 944357ec53cb862f7b4b7dfe16f876adfa5a1f5ad35bdd0f74d11ae7dc3ecab2
-DIST libX11-1.1.2.tar.bz2 1523644 RMD160 c722e1eaa04a3d753660496d4e527b695c68db38 SHA1 7190d36389eb7903831cd9541d919f55ac5098e9 SHA256 b77e4fd2bbd4092e7e78d0964760ad8ab160caccd4bc6d7d0c87a23febaea85e
-DIST libX11-1.1.3.tar.bz2 1526958 RMD160 fcb8d5d31befa0ae227210dc7274c17b30c37fad SHA1 235f69172b262f874d2a2d7bd17e8197aea5b767 SHA256 4a2f566e2ea5dd955c875cb8fa9c18dd725324fc5cf4e23c803442e31ab8917a
-DIST libX11-1.1.4.tar.bz2 1576030 RMD160 42776389986e0b158f703a9b88fdf95bb5095d1f SHA1 e91092e22c3b48371c3549afba1b6a457acb2d7e SHA256 bdbd6d239435c1736f5c532b12e8078761db8db5f37ab3195fe11c3e5b692c1c
 DIST libX11-1.1.5.tar.bz2 1585005 RMD160 78567a999640851e7daba1ab44603ec099d0b619 SHA1 b703cb7c97e5aa35bf04a8df798e128ae16cf0d0 SHA256 da9272900e41615e9c5dc25d84730b8966da6f5c8f4c40418dca2ad040fc8b82
-DIST libX11-1.2.1.tar.bz2 1798407 RMD160 1207c7a9430751e25a758163dd47b07bf18c6ab7 SHA1 8e58c3d9070cd164a960dc89b20cf0e35bade8c8 SHA256 d172e5a401a2607f4ff145db4e8e09c193a1980bbb2c5c7f824e61ee3fdfdff3
 DIST libX11-1.2.2.tar.bz2 1876770 RMD160 6032ed99cbd6df8e92ae7cf319bf220bc5768054 SHA1 7962063e124856f8a36afd760a934e6e429f036b SHA256 11768553fa3c56441894ffc703a14a753ba07b5090fe496afbfec4d2dbf9ce80
 DIST libX11-1.3.tar.bz2 1900752 RMD160 00b0bb40df8bb2c97214b1f927846b24e1eda3d5 SHA1 af8f65b5e64de7bc6f5a780e042518a490c949cf SHA256 34656d022ff2f94430b534612821428fe15ade028d86a42907958167f2e497ac
-EBUILD libX11-1.1.2-r1.ebuild 1048 RMD160 12c2b305336d42b929b6af15f936ad0671d75a29 SHA1 9e5222a65cca2d8b72c5c5187fd0b1545d40c377 SHA256 317b33a2d0e665d726ef033a2909c4045530c3d62a5a7af612cd7db86a867b81
-EBUILD libX11-1.1.3-r1.ebuild 986 RMD160 31e375627f9382c769e4752cedb51daaa65d6d88 SHA1 57057a8b4beac5ba0b1652d7593b25898157a28f SHA256 e94e1a0817740c46c1ef86bdd296d2c3b9e7241a6b92ca3c4563373c4056a54e
-EBUILD libX11-1.1.3.ebuild 916 RMD160 58cdc6e3cae7c946fd538ca49659fbb53b60d336 SHA1 ad9e9e0a2c35e7e555776a43d05c1be565280343 SHA256 33ab096875d428e205b2e6764eceeb264484aee67054debf15cbb73cee1f6697
-EBUILD libX11-1.1.4.ebuild 1200 RMD160 357fa59415635eff5626838e62de103a8ea0c5b7 SHA1 8d7e3ced0b7a336ff3e91b6da6d73c975b54d22e SHA256 41bd7036e248845b97b680582772b95030dfee72efdca96c1ef040541f60fd71
 EBUILD libX11-1.1.5.ebuild 1198 RMD160 89ff9233cdd9354ecaecb739c3e6693511238d16 SHA1 dc241e3e3fa5f7cea88aaf0f3436cb14d2d59373 SHA256 5b71cb9acb67ad2ce0e172cb8a4f66e280ab347941dc0e7ce28579a8c0fc2e97
-EBUILD libX11-1.2.1.ebuild 1210 RMD160 390f33897db882ac4f3f1a56f35d2d045db04f6b SHA1 872ead24ac0e00d21ca31088d907f3a75cd28589 SHA256 1d490bd7fe3cb5735efe1dcb4ec992a236597131986d42bd0a4019964ca15fa9
 EBUILD libX11-1.2.2.ebuild 1208 RMD160 2b8c21699a084003763f0f1241face4c710ad37f SHA1 9c82e29214a733437890dbdeac17bda0f0139e79 SHA256 3d90b154f1fbaf5a00a486b2cc965452b222bf8b0eed04c69eff1f29f1b504bd
 EBUILD libX11-1.3.ebuild 1208 RMD160 65dfc67971f6bb0e4f87a43f58098993219f3cc3 SHA1 e1ab43ad8d19b9e80601e113e90ebc2a1c58840a SHA256 900d2164aade087509f2a8a8ecbf0ef414fe22a7f573d2b7a0ddcba78a829578
-MISC ChangeLog 16616 RMD160 ac20ac2f1356cfdac2ed1ec832a3ae4a8aa33809 SHA1 63aa36b133217baa0a2527ea6da3c19f3fe03f80 SHA256 dfae674819b740a9bea5bb02dee07c90498833d107223f60a7245d348b6320ba
+MISC ChangeLog 16951 RMD160 8c43e6f8ca60ea864013dc3993aebdf5f477e6c5 SHA1 e5adedc98697a13604fc1b817238e309f0299740 SHA256 190db9442dac0db6d8ebe080c24059132a6e86b703ddd468b5d8b82fab859ca2
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
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
-}