summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'x11-libs')
-rw-r--r--x11-libs/libX11/ChangeLog9
-rw-r--r--x11-libs/libX11/files/1.0.99.2-xcb_callback_fix.patch23
-rw-r--r--x11-libs/libX11/files/CVE-2006-5397.patch10
-rw-r--r--x11-libs/libX11/files/digest-libX11-1.0.33
-rw-r--r--x11-libs/libX11/files/digest-libX11-1.0.3-r23
-rw-r--r--x11-libs/libX11/files/digest-libX11-1.1.1-r13
-rw-r--r--x11-libs/libX11/files/digest-libX11-1.1.23
-rw-r--r--x11-libs/libX11/files/libX11-1.0.1-setuid.diff17
-rw-r--r--x11-libs/libX11/files/xorg-libX11-1.1.1-xinitimage.diff87
-rw-r--r--x11-libs/libX11/libX11-1.0.3-r2.ebuild41
-rw-r--r--x11-libs/libX11/libX11-1.0.3.ebuild38
-rw-r--r--x11-libs/libX11/libX11-1.1.1-r1.ebuild33
-rw-r--r--x11-libs/libX11/libX11-1.1.2.ebuild31
-rw-r--r--x11-libs/libXaw/ChangeLog5
-rw-r--r--x11-libs/libXaw/files/digest-libXaw-1.0.23
-rw-r--r--x11-libs/libXaw/libXaw-1.0.2.ebuild34
-rw-r--r--x11-libs/libXcomposite/ChangeLog8
-rw-r--r--x11-libs/libXcomposite/files/digest-libXcomposite-0.33
-rw-r--r--x11-libs/libXcomposite/files/digest-libXcomposite-0.3-r13
-rw-r--r--x11-libs/libXcomposite/files/digest-libXcomposite-0.3.13
-rw-r--r--x11-libs/libXcomposite/files/digest-libXcomposite-0.3.23
-rw-r--r--x11-libs/libXcomposite/files/drop-extra-unlockdisplay.patch10
-rw-r--r--x11-libs/libXcomposite/libXcomposite-0.3-r1.ebuild19
-rw-r--r--x11-libs/libXcomposite/libXcomposite-0.3.1.ebuild17
-rw-r--r--x11-libs/libXcomposite/libXcomposite-0.3.2.ebuild17
-rw-r--r--x11-libs/libXcomposite/libXcomposite-0.3.ebuild17
-rw-r--r--x11-libs/libXcursor/ChangeLog6
-rw-r--r--x11-libs/libXcursor/files/digest-libXcursor-1.1.73
-rw-r--r--x11-libs/libXcursor/libXcursor-1.1.7.ebuild21
-rw-r--r--x11-libs/libXfont/ChangeLog8
-rw-r--r--x11-libs/libXfont/files/digest-libXfont-1.2.23
-rw-r--r--x11-libs/libXfont/files/digest-libXfont-1.2.2-r13
-rw-r--r--x11-libs/libXfont/files/digest-libXfont-1.2.7-r13
-rw-r--r--x11-libs/libXfont/files/digest-libXfont-1.2.83
-rw-r--r--x11-libs/libXfont/files/xorg-libXfont-1.2.7-bdf-fontdir.diff51
-rw-r--r--x11-libs/libXfont/libXfont-1.2.2-r1.ebuild36
-rw-r--r--x11-libs/libXfont/libXfont-1.2.2.ebuild34
-rw-r--r--x11-libs/libXfont/libXfont-1.2.7-r1.ebuild36
-rw-r--r--x11-libs/libXfont/libXfont-1.2.8.ebuild34
-rw-r--r--x11-libs/libXfontcache/ChangeLog7
-rw-r--r--x11-libs/libXfontcache/files/digest-libXfontcache-1.0.23
-rw-r--r--x11-libs/libXfontcache/files/digest-libXfontcache-1.0.33
-rw-r--r--x11-libs/libXfontcache/files/fix_shadow_manpages.patch19
-rw-r--r--x11-libs/libXfontcache/libXfontcache-1.0.2.ebuild17
-rw-r--r--x11-libs/libXfontcache/libXfontcache-1.0.3.ebuild17
-rw-r--r--x11-libs/libXi/ChangeLog7
-rw-r--r--x11-libs/libXi/files/digest-libXi-1.0.13
-rw-r--r--x11-libs/libXi/files/digest-libXi-1.0.1-r13
-rw-r--r--x11-libs/libXi/files/digest-libXi-1.1.03
-rw-r--r--x11-libs/libXi/files/digest-libXi-1.1.13
-rw-r--r--x11-libs/libXi/files/fix-bad-unlock.patch529
-rw-r--r--x11-libs/libXi/libXi-1.0.1-r1.ebuild20
-rw-r--r--x11-libs/libXi/libXi-1.0.1.ebuild18
-rw-r--r--x11-libs/libXi/libXi-1.1.0.ebuild25
-rw-r--r--x11-libs/libXi/libXi-1.1.1.ebuild25
-rw-r--r--x11-libs/libXpm/ChangeLog5
-rw-r--r--x11-libs/libXpm/files/digest-libXpm-3.5.53
-rw-r--r--x11-libs/libXpm/libXpm-3.5.5.ebuild18
-rw-r--r--x11-libs/libXrandr/ChangeLog7
-rw-r--r--x11-libs/libXrandr/files/digest-libXrandr-1.1.13
-rw-r--r--x11-libs/libXrandr/files/digest-libXrandr-1.1.1-r13
-rw-r--r--x11-libs/libXrandr/files/digest-libXrandr-1.1.23
-rw-r--r--x11-libs/libXrandr/files/drop-extra-unlockdisplay.patch15
-rw-r--r--x11-libs/libXrandr/libXrandr-1.1.1-r1.ebuild22
-rw-r--r--x11-libs/libXrandr/libXrandr-1.1.1.ebuild20
-rw-r--r--x11-libs/libXrandr/libXrandr-1.1.2.ebuild20
-rw-r--r--x11-libs/libXrender/ChangeLog6
-rw-r--r--x11-libs/libXrender/files/digest-libXrender-0.9.13
-rw-r--r--x11-libs/libXrender/libXrender-0.9.1.ebuild17
-rw-r--r--x11-libs/libXtst/ChangeLog6
-rw-r--r--x11-libs/libXtst/files/digest-libXtst-1.0.13
-rw-r--r--x11-libs/libXtst/libXtst-1.0.1.ebuild18
72 files changed, 63 insertions, 1495 deletions
diff --git a/x11-libs/libX11/ChangeLog b/x11-libs/libX11/ChangeLog
index dcd2abc3da0e..904fb28daa79 100644
--- a/x11-libs/libX11/ChangeLog
+++ b/x11-libs/libX11/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for x11-libs/libX11
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libX11/ChangeLog,v 1.82 2007/09/28 04:20:49 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libX11/ChangeLog,v 1.83 2007/10/09 09:27:34 dberkholz Exp $
+
+ 09 Oct 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+ -files/1.0.99.2-xcb_callback_fix.patch, -files/libX11-1.0.1-setuid.diff,
+ -files/xorg-libX11-1.1.1-xinitimage.diff, -files/CVE-2006-5397.patch,
+ -libX11-1.0.3.ebuild, -libX11-1.0.3-r2.ebuild, -libX11-1.1.1-r1.ebuild,
+ -libX11-1.1.2.ebuild:
+ Drop old ebuilds.
28 Sep 2007; Joshua Kinard <kumba@gentoo.org> libX11-1.1.2-r1.ebuild:
Stable on mips, per #191615.
diff --git a/x11-libs/libX11/files/1.0.99.2-xcb_callback_fix.patch b/x11-libs/libX11/files/1.0.99.2-xcb_callback_fix.patch
deleted file mode 100644
index f805c17ac614..000000000000
--- a/x11-libs/libX11/files/1.0.99.2-xcb_callback_fix.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-commit 941f02ede63baa46f93ed8abccebe76fb29c0789
-Author: Lars Knoll <lars@trolltech.com>
-Date: Wed Nov 8 12:17:41 2006 -0800
-
- Don't hold the display lock around callbacks to the application.
-
- This fixes an XCB locking assertion failure, particularly with emacs.
-
-diff --git a/src/FilterEv.c b/src/FilterEv.c
-index 0117291..9fa1887 100644
---- a/src/FilterEv.c
-+++ b/src/FilterEv.c
-@@ -96,9 +96,9 @@ XFilterEvent(ev, window)
- if (win == p->window) {
- if ((mask & p->event_mask) ||
- (ev->type >= p->start_type && ev->type <= p->end_type)) {
-+ UnlockDisplay(ev->xany.display);
- ret = (*(p->filter))(ev->xany.display, p->window, ev,
- p->client_data);
-- UnlockDisplay(ev->xany.display);
- return(ret);
- }
- }
diff --git a/x11-libs/libX11/files/CVE-2006-5397.patch b/x11-libs/libX11/files/CVE-2006-5397.patch
deleted file mode 100644
index 3742665f8fba..000000000000
--- a/x11-libs/libX11/files/CVE-2006-5397.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- modules/im/ximcp/imLcIm.c 2006-06-29 20:41:44.000000000 -0600
-+++ modules/im/ximcp/imLcIm.c 2006-11-02 17:32:26.000000000 -0700
-@@ -617,7 +617,6 @@
- }
- #endif
-
-- fp = _XFopenFile (name, "r");
- if (! (fp = _XFopenFile (name, "r"))) {
- if (tmpcachedir)
- Xfree (tmpcachedir);
diff --git a/x11-libs/libX11/files/digest-libX11-1.0.3 b/x11-libs/libX11/files/digest-libX11-1.0.3
deleted file mode 100644
index 12c8959efbd3..000000000000
--- a/x11-libs/libX11/files/digest-libX11-1.0.3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 60b787a812c92d33f71860e4e19cb59d libX11-1.0.3.tar.bz2 1449835
-RMD160 285a878a8ec9ecbd86e67897ca15ce96c994f38a libX11-1.0.3.tar.bz2 1449835
-SHA256 fb42f2400c3709a0c2c17f27cc4a902c191ebd6228c70698891bf3a13ea5b3ac libX11-1.0.3.tar.bz2 1449835
diff --git a/x11-libs/libX11/files/digest-libX11-1.0.3-r2 b/x11-libs/libX11/files/digest-libX11-1.0.3-r2
deleted file mode 100644
index 12c8959efbd3..000000000000
--- a/x11-libs/libX11/files/digest-libX11-1.0.3-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 60b787a812c92d33f71860e4e19cb59d libX11-1.0.3.tar.bz2 1449835
-RMD160 285a878a8ec9ecbd86e67897ca15ce96c994f38a libX11-1.0.3.tar.bz2 1449835
-SHA256 fb42f2400c3709a0c2c17f27cc4a902c191ebd6228c70698891bf3a13ea5b3ac libX11-1.0.3.tar.bz2 1449835
diff --git a/x11-libs/libX11/files/digest-libX11-1.1.1-r1 b/x11-libs/libX11/files/digest-libX11-1.1.1-r1
deleted file mode 100644
index 3770fe4a802b..000000000000
--- a/x11-libs/libX11/files/digest-libX11-1.1.1-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 848b80f77b20ae1fa5c882bbfa531ebc libX11-1.1.1.tar.bz2 1426405
-RMD160 99c2d2bd6823c09667dffa5e4265924e93e76eef libX11-1.1.1.tar.bz2 1426405
-SHA256 5359db57793430429786b648ac570d4ab205797306e049bf1e8675250af21541 libX11-1.1.1.tar.bz2 1426405
diff --git a/x11-libs/libX11/files/digest-libX11-1.1.2 b/x11-libs/libX11/files/digest-libX11-1.1.2
deleted file mode 100644
index c5e04ff282c9..000000000000
--- a/x11-libs/libX11/files/digest-libX11-1.1.2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 710bf38a9477a5a1b235bc94f1d0593c libX11-1.1.2.tar.bz2 1523644
-RMD160 c722e1eaa04a3d753660496d4e527b695c68db38 libX11-1.1.2.tar.bz2 1523644
-SHA256 b77e4fd2bbd4092e7e78d0964760ad8ab160caccd4bc6d7d0c87a23febaea85e libX11-1.1.2.tar.bz2 1523644
diff --git a/x11-libs/libX11/files/libX11-1.0.1-setuid.diff b/x11-libs/libX11/files/libX11-1.0.1-setuid.diff
deleted file mode 100644
index 5325fa437ae5..000000000000
--- a/x11-libs/libX11/files/libX11-1.0.1-setuid.diff
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/src/xlibi18n/lcFile.c b/src/xlibi18n/lcFile.c
-index f8b3404..bb1ee20 100644
---- a/src/xlibi18n/lcFile.c
-+++ b/src/xlibi18n/lcFile.c
-@@ -269,7 +269,11 @@ #else
- if (seteuid(0) != 0) {
- priv = 0;
- } else {
-- seteuid(oldeuid);
-+ if (seteuid(oldeuid) == -1) {
-+ /* XXX ouch, coudn't get back to original uid
-+ what can we do ??? */
-+ _exit(127);
-+ }
- priv = 1;
- }
- #endif
diff --git a/x11-libs/libX11/files/xorg-libX11-1.1.1-xinitimage.diff b/x11-libs/libX11/files/xorg-libX11-1.1.1-xinitimage.diff
deleted file mode 100644
index 2ba968d9fc19..000000000000
--- a/x11-libs/libX11/files/xorg-libX11-1.1.1-xinitimage.diff
+++ /dev/null
@@ -1,87 +0,0 @@
-diff --git a/src/ImUtil.c b/src/ImUtil.c
-index 83fd030..9e667bb 100644
---- a/src/ImUtil.c
-+++ b/src/ImUtil.c
-@@ -327,12 +327,13 @@ XImage *XCreateImage (dpy, visual, depth
- {
- register XImage *image;
- int bits_per_pixel = 1;
-+ int min_bytes_per_line;
-
- if (depth == 0 || depth > 32 ||
- (format != XYBitmap && format != XYPixmap && format != ZPixmap) ||
- (format == XYBitmap && depth != 1) ||
- (xpad != 8 && xpad != 16 && xpad != 32) ||
-- offset < 0 || image_bytes_per_line < 0)
-+ offset < 0)
- return (XImage *) NULL;
- if ((image = (XImage *) Xcalloc(1, (unsigned) sizeof(XImage))) == NULL)
- return (XImage *) NULL;
-@@ -363,16 +364,21 @@ XImage *XCreateImage (dpy, visual, depth
- /*
- * compute per line accelerator.
- */
-- if (image_bytes_per_line == 0)
- {
- if (format == ZPixmap)
-- image->bytes_per_line =
-+ min_bytes_per_line =
- ROUNDUP((bits_per_pixel * width), image->bitmap_pad);
- else
-- image->bytes_per_line =
-+ min_bytes_per_line =
- ROUNDUP((width + offset), image->bitmap_pad);
- }
-- else image->bytes_per_line = image_bytes_per_line;
-+ if (image_bytes_per_line == 0) {
-+ image->bytes_per_line = min_bytes_per_line;
-+ } else if (image_bytes_per_line < min_bytes_per_line) {
-+ return 0;
-+ } else {
-+ image->bytes_per_line = image_bytes_per_line;
-+ }
-
- image->bits_per_pixel = bits_per_pixel;
- image->obdata = NULL;
-@@ -384,7 +390,11 @@ XImage *XCreateImage (dpy, visual, depth
- Status XInitImage (image)
- XImage *image;
- {
-+ int min_bytes_per_line;
-+
- if (image->depth == 0 || image->depth > 32 ||
-+ image->bits_per_pixel > 32 || image->bitmap_unit > 32 ||
-+ image->bits_per_pixel < 0 || image->bitmap_unit < 0 ||
- (image->format != XYBitmap &&
- image->format != XYPixmap &&
- image->format != ZPixmap) ||
-@@ -392,21 +402,24 @@ Status XInitImage (image)
- (image->bitmap_pad != 8 &&
- image->bitmap_pad != 16 &&
- image->bitmap_pad != 32) ||
-- image->xoffset < 0 || image->bytes_per_line < 0)
-+ image->xoffset < 0)
- return 0;
-
- /*
- * compute per line accelerator.
- */
-- if (image->bytes_per_line == 0)
-- {
- if (image->format == ZPixmap)
-- image->bytes_per_line =
-+ min_bytes_per_line =
- ROUNDUP((image->bits_per_pixel * image->width),
- image->bitmap_pad);
- else
-- image->bytes_per_line =
-+ min_bytes_per_line =
- ROUNDUP((image->width + image->xoffset), image->bitmap_pad);
-+
-+ if (image->bytes_per_line == 0) {
-+ image->bytes_per_line = min_bytes_per_line;
-+ } else if (image->bytes_per_line < min_bytes_per_line) {
-+ return 0;
- }
-
- _XInitImageFuncPtrs (image);
diff --git a/x11-libs/libX11/libX11-1.0.3-r2.ebuild b/x11-libs/libX11/libX11-1.0.3-r2.ebuild
deleted file mode 100644
index 78708e00f043..000000000000
--- a/x11-libs/libX11/libX11-1.0.3-r2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libX11/libX11-1.0.3-r2.ebuild,v 1.1 2007/04/05 06:54:21 dberkholz 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"
-
-RDEPEND=">=x11-libs/xtrans-1.0.1
- x11-libs/libXau
- x11-libs/libXdmcp
- x11-proto/kbproto
- x11-proto/inputproto
- >=x11-proto/xproto-7.0.6"
-DEPEND="${RDEPEND}
- x11-proto/xf86bigfontproto
- x11-proto/bigreqsproto
- x11-proto/xextproto
- x11-proto/xcmiscproto
- >=x11-misc/util-macros-0.99.0_p20051007"
-
-CONFIGURE_OPTIONS="$(use_enable ipv6)"
-# xorg really doesn't like xlocale disabled.
-# $(use_enable nls xlocale)
-
-PATCHES="${FILESDIR}/CVE-2006-5397.patch
- ${FILESDIR}/xorg-libX11-1.1.1-xinitimage.diff"
-
-src_install() {
- x-modular_src_install
-
- local ENVD="10libx11"
- echo "LDPATH=\"/usr/lib\"" > "${T}"/${ENVD}
- doenvd "${T}"/${ENVD}
-}
diff --git a/x11-libs/libX11/libX11-1.0.3.ebuild b/x11-libs/libX11/libX11-1.0.3.ebuild
deleted file mode 100644
index 55d8a8068b1a..000000000000
--- a/x11-libs/libX11/libX11-1.0.3.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libX11/libX11-1.0.3.ebuild,v 1.14 2007/02/04 18:23:48 joshuabaergen 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"
-
-RDEPEND=">=x11-libs/xtrans-1.0.1
- x11-libs/libXau
- x11-libs/libXdmcp
- x11-proto/kbproto
- x11-proto/inputproto
- >=x11-proto/xproto-7.0.6"
-DEPEND="${RDEPEND}
- x11-proto/xf86bigfontproto
- x11-proto/bigreqsproto
- x11-proto/xextproto
- x11-proto/xcmiscproto
- >=x11-misc/util-macros-0.99.0_p20051007"
-
-CONFIGURE_OPTIONS="$(use_enable ipv6)"
-# xorg really doesn't like xlocale disabled.
-# $(use_enable nls xlocale)
-
-src_install() {
- x-modular_src_install
-
- local ENVD="10libx11"
- echo "LDPATH=\"/usr/lib\"" > "${T}"/${ENVD}
- doenvd "${T}"/${ENVD}
-}
diff --git a/x11-libs/libX11/libX11-1.1.1-r1.ebuild b/x11-libs/libX11/libX11-1.1.1-r1.ebuild
deleted file mode 100644
index aba1eafa6684..000000000000
--- a/x11-libs/libX11/libX11-1.1.1-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libX11/libX11-1.1.1-r1.ebuild,v 1.10 2007/06/24 22:29:56 vapier 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"
-
-CONFIGURE_OPTIONS="$(use_enable ipv6)
- $(use_with xcb)"
-# xorg really doesn't like xlocale disabled.
-# $(use_enable nls xlocale)
-
-PATCHES="${FILESDIR}/xorg-libX11-1.1.1-xinitimage.diff"
diff --git a/x11-libs/libX11/libX11-1.1.2.ebuild b/x11-libs/libX11/libX11-1.1.2.ebuild
deleted file mode 100644
index eeceef932ba2..000000000000
--- a/x11-libs/libX11/libX11-1.1.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2007 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.ebuild,v 1.1 2007/06/05 23:40:23 joshuabaergen 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"
-
-CONFIGURE_OPTIONS="$(use_enable ipv6)
- $(use_with xcb)"
-# xorg really doesn't like xlocale disabled.
-# $(use_enable nls xlocale)
diff --git a/x11-libs/libXaw/ChangeLog b/x11-libs/libXaw/ChangeLog
index 599a4a5fd7fd..d8d1fe0f4a73 100644
--- a/x11-libs/libXaw/ChangeLog
+++ b/x11-libs/libXaw/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for x11-libs/libXaw
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXaw/ChangeLog,v 1.42 2007/09/08 07:41:21 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXaw/ChangeLog,v 1.43 2007/10/09 09:36:29 dberkholz Exp $
+
+ 09 Oct 2007; Donnie Berkholz <dberkholz@gentoo.org>; -libXaw-1.0.2.ebuild:
+ Drop old ebuilds.
*libXaw-1.0.4 (08 Sep 2007)
diff --git a/x11-libs/libXaw/files/digest-libXaw-1.0.2 b/x11-libs/libXaw/files/digest-libXaw-1.0.2
deleted file mode 100644
index a3420c316974..000000000000
--- a/x11-libs/libXaw/files/digest-libXaw-1.0.2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 27dc85f84ac78eb619f72a0805a323f4 libXaw-1.0.2.tar.bz2 524107
-RMD160 f2beb04f1edd8cdfcb1b4045e4b0b335c7d468df libXaw-1.0.2.tar.bz2 524107
-SHA256 579f332cb01c2bee5fc75bdfbf0e6b5c57ce3d1849936ae4c540564b2168556a libXaw-1.0.2.tar.bz2 524107
diff --git a/x11-libs/libXaw/libXaw-1.0.2.ebuild b/x11-libs/libXaw/libXaw-1.0.2.ebuild
deleted file mode 100644
index aeea59e8928f..000000000000
--- a/x11-libs/libXaw/libXaw-1.0.2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXaw/libXaw-1.0.2.ebuild,v 1.11 2006/10/01 16:47:31 dberkholz Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-inherit x-modular
-
-DESCRIPTION="X.Org Xaw library"
-
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE="xprint"
-
-RDEPEND="x11-libs/libX11
- x11-libs/libXt
- x11-libs/libXmu
- x11-libs/libXpm
- x11-proto/xproto
- xprint? ( x11-libs/libXp )"
-DEPEND="${RDEPEND}
- sys-apps/ed"
-
-CONFIGURE_OPTIONS="$(use_enable xprint xaw8)"
-
-pkg_setup() {
- # No such function yet
- # x-modular_pkg_setup
-
- # (#125465) Broken with Bdirect support
- filter-flags -Wl,-Bdirect
- filter-ldflags -Bdirect
- filter-ldflags -Wl,-Bdirect
-}
diff --git a/x11-libs/libXcomposite/ChangeLog b/x11-libs/libXcomposite/ChangeLog
index 9bc1d04b436a..0cc4a7a59d29 100644
--- a/x11-libs/libXcomposite/ChangeLog
+++ b/x11-libs/libXcomposite/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for x11-libs/libXcomposite
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXcomposite/ChangeLog,v 1.46 2007/09/29 10:22:39 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXcomposite/ChangeLog,v 1.47 2007/10/09 09:29:51 dberkholz Exp $
+
+ 09 Oct 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+ -files/drop-extra-unlockdisplay.patch, -libXcomposite-0.3.ebuild,
+ -libXcomposite-0.3-r1.ebuild, -libXcomposite-0.3.1.ebuild,
+ -libXcomposite-0.3.2.ebuild:
+ Drop old ebuilds.
29 Sep 2007; Raúl Porcel <armin76@gentoo.org> libXcomposite-0.4.0.ebuild:
sparc stable wrt #191615
diff --git a/x11-libs/libXcomposite/files/digest-libXcomposite-0.3 b/x11-libs/libXcomposite/files/digest-libXcomposite-0.3
deleted file mode 100644
index d4543f70cf7b..000000000000
--- a/x11-libs/libXcomposite/files/digest-libXcomposite-0.3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 135d4b02d63c59178922cea8765a24c1 libXcomposite-0.3.tar.bz2 218916
-RMD160 4dda230431ba4666104ea84944a61b70e7f23cf4 libXcomposite-0.3.tar.bz2 218916
-SHA256 455f042df4de2bea0f69d7b5efb9be0717fc069ce3222e922707e5a639ea116e libXcomposite-0.3.tar.bz2 218916
diff --git a/x11-libs/libXcomposite/files/digest-libXcomposite-0.3-r1 b/x11-libs/libXcomposite/files/digest-libXcomposite-0.3-r1
deleted file mode 100644
index d4543f70cf7b..000000000000
--- a/x11-libs/libXcomposite/files/digest-libXcomposite-0.3-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 135d4b02d63c59178922cea8765a24c1 libXcomposite-0.3.tar.bz2 218916
-RMD160 4dda230431ba4666104ea84944a61b70e7f23cf4 libXcomposite-0.3.tar.bz2 218916
-SHA256 455f042df4de2bea0f69d7b5efb9be0717fc069ce3222e922707e5a639ea116e libXcomposite-0.3.tar.bz2 218916
diff --git a/x11-libs/libXcomposite/files/digest-libXcomposite-0.3.1 b/x11-libs/libXcomposite/files/digest-libXcomposite-0.3.1
deleted file mode 100644
index 0c049fa0624e..000000000000
--- a/x11-libs/libXcomposite/files/digest-libXcomposite-0.3.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 a80650d660486ea7bb2e5fd84a83799a libXcomposite-0.3.1.tar.bz2 221073
-RMD160 a62753ff8751d56070c93ffa180eb0cd834f2350 libXcomposite-0.3.1.tar.bz2 221073
-SHA256 d42b59d3c38dae5e4fec375d12e56e7a5764ba10e8b8ec70f9ce951fc9cec72b libXcomposite-0.3.1.tar.bz2 221073
diff --git a/x11-libs/libXcomposite/files/digest-libXcomposite-0.3.2 b/x11-libs/libXcomposite/files/digest-libXcomposite-0.3.2
deleted file mode 100644
index cb91bb0e0522..000000000000
--- a/x11-libs/libXcomposite/files/digest-libXcomposite-0.3.2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 50dd31bed383280433404a405d3dcf8f libXcomposite-0.3.2.tar.bz2 219562
-RMD160 5aff4466c921b2191cbd9a1a302f955445614560 libXcomposite-0.3.2.tar.bz2 219562
-SHA256 22a541727fffc0f23823fc09f0830f3cd555edfa50c5dceac9b0ee9ae8519263 libXcomposite-0.3.2.tar.bz2 219562
diff --git a/x11-libs/libXcomposite/files/drop-extra-unlockdisplay.patch b/x11-libs/libXcomposite/files/drop-extra-unlockdisplay.patch
deleted file mode 100644
index 73345b129dfb..000000000000
--- a/x11-libs/libXcomposite/files/drop-extra-unlockdisplay.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/Xcomposite.c
-+++ src/Xcomposite.c
-@@ -235,8 +235,6 @@ XCompositeQueryVersion (Display *dpy,
- XCompositeCheckExtension (dpy, info, 0);
- *major_versionp = info->major_version;
- *minor_versionp = info->minor_version;
-- UnlockDisplay (dpy);
-- SyncHandle ();
- return 1;
- }
diff --git a/x11-libs/libXcomposite/libXcomposite-0.3-r1.ebuild b/x11-libs/libXcomposite/libXcomposite-0.3-r1.ebuild
deleted file mode 100644
index cd180b7c7bac..000000000000
--- a/x11-libs/libXcomposite/libXcomposite-0.3-r1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXcomposite/libXcomposite-0.3-r1.ebuild,v 1.1 2006/10/13 04:08:51 joshuabaergen Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-inherit x-modular
-
-DESCRIPTION="X.Org Xcomposite library"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-RDEPEND="x11-libs/libX11
- x11-libs/libXfixes
- x11-libs/libXext
- >=x11-proto/compositeproto-0.3
- x11-proto/xproto"
-DEPEND="${RDEPEND}"
-
-PATCHES="${FILESDIR}/drop-extra-unlockdisplay.patch"
diff --git a/x11-libs/libXcomposite/libXcomposite-0.3.1.ebuild b/x11-libs/libXcomposite/libXcomposite-0.3.1.ebuild
deleted file mode 100644
index 5a1624848956..000000000000
--- a/x11-libs/libXcomposite/libXcomposite-0.3.1.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXcomposite/libXcomposite-0.3.1.ebuild,v 1.10 2007/06/24 22:35:55 vapier Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-inherit x-modular
-
-DESCRIPTION="X.Org Xcomposite library"
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sh sparc x86 ~x86-fbsd"
-RDEPEND="x11-libs/libX11
- x11-libs/libXfixes
- x11-libs/libXext
- >=x11-proto/compositeproto-0.3
- x11-proto/xproto"
-DEPEND="${RDEPEND}"
diff --git a/x11-libs/libXcomposite/libXcomposite-0.3.2.ebuild b/x11-libs/libXcomposite/libXcomposite-0.3.2.ebuild
deleted file mode 100644
index 01100c4b2471..000000000000
--- a/x11-libs/libXcomposite/libXcomposite-0.3.2.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXcomposite/libXcomposite-0.3.2.ebuild,v 1.1 2007/05/05 15:55:07 joshuabaergen Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-inherit x-modular
-
-DESCRIPTION="X.Org Xcomposite library"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-RDEPEND="x11-libs/libX11
- x11-libs/libXfixes
- x11-libs/libXext
- >=x11-proto/compositeproto-0.3
- x11-proto/xproto"
-DEPEND="${RDEPEND}"
diff --git a/x11-libs/libXcomposite/libXcomposite-0.3.ebuild b/x11-libs/libXcomposite/libXcomposite-0.3.ebuild
deleted file mode 100644
index 4ab2a5dd7e2d..000000000000
--- a/x11-libs/libXcomposite/libXcomposite-0.3.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXcomposite/libXcomposite-0.3.ebuild,v 1.10 2006/10/01 16:59:29 dberkholz Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-inherit x-modular
-
-DESCRIPTION="X.Org Xcomposite library"
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sh sparc x86 ~x86-fbsd"
-RDEPEND="x11-libs/libX11
- x11-libs/libXfixes
- x11-libs/libXext
- >=x11-proto/compositeproto-0.3
- x11-proto/xproto"
-DEPEND="${RDEPEND}"
diff --git a/x11-libs/libXcursor/ChangeLog b/x11-libs/libXcursor/ChangeLog
index 59f98dd2de81..608a33d24ae6 100644
--- a/x11-libs/libXcursor/ChangeLog
+++ b/x11-libs/libXcursor/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for x11-libs/libXcursor
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXcursor/ChangeLog,v 1.47 2007/09/08 07:42:11 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXcursor/ChangeLog,v 1.48 2007/10/09 09:35:34 dberkholz Exp $
+
+ 09 Oct 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+ -libXcursor-1.1.7.ebuild:
+ Drop old ebuilds.
*libXcursor-1.1.9 (08 Sep 2007)
diff --git a/x11-libs/libXcursor/files/digest-libXcursor-1.1.7 b/x11-libs/libXcursor/files/digest-libXcursor-1.1.7
deleted file mode 100644
index 15907d6a02fe..000000000000
--- a/x11-libs/libXcursor/files/digest-libXcursor-1.1.7
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 893b488b3c1462ac44f852590a0a47f3 libXcursor-1.1.7.tar.bz2 224251
-RMD160 945fa948e58a36256eb56980f78ff3929dc50e9e libXcursor-1.1.7.tar.bz2 224251
-SHA256 43571d93d7d59092e07d89fcc06572a06175e7a6f0d3d966558e7f9f5b0f8102 libXcursor-1.1.7.tar.bz2 224251
diff --git a/x11-libs/libXcursor/libXcursor-1.1.7.ebuild b/x11-libs/libXcursor/libXcursor-1.1.7.ebuild
deleted file mode 100644
index 8d6578faf641..000000000000
--- a/x11-libs/libXcursor/libXcursor-1.1.7.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXcursor/libXcursor-1.1.7.ebuild,v 1.8 2006/09/10 09:11:12 vapier Exp $
-
-# Must be before x-modular eclass is inherited
-# SNAPSHOT="yes"
-
-inherit x-modular
-
-DESCRIPTION="X.Org Xcursor library"
-
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-
-RDEPEND="x11-libs/libXrender
- x11-libs/libXfixes
- x11-libs/libX11
- x11-proto/xproto"
-DEPEND="${RDEPEND}"
-
-CONFIGURE_OPTIONS="--with-icondir=/usr/share/cursors/xorg-x11
- --with-cursorpath=~/.cursors:~/.icons:/usr/local/share/cursors/xorg-x11:/usr/local/share/cursors:/usr/local/share/icons:/usr/local/share/pixmaps:/usr/share/cursors/xorg-x11:/usr/share/cursors:/usr/share/pixmaps/xorg-x11:/usr/share/icons:/usr/share/pixmaps"
diff --git a/x11-libs/libXfont/ChangeLog b/x11-libs/libXfont/ChangeLog
index 5cab84dc1f2a..56a3f0be5180 100644
--- a/x11-libs/libXfont/ChangeLog
+++ b/x11-libs/libXfont/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for x11-libs/libXfont
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXfont/ChangeLog,v 1.76 2007/09/10 03:27:13 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXfont/ChangeLog,v 1.77 2007/10/09 09:25:40 dberkholz Exp $
+
+ 09 Oct 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+ -files/xorg-libXfont-1.2.7-bdf-fontdir.diff, -libXfont-1.2.2.ebuild,
+ -libXfont-1.2.2-r1.ebuild, -libXfont-1.2.7-r1.ebuild,
+ -libXfont-1.2.8.ebuild:
+ Drop old ebuilds.
10 Sep 2007; Jeroen Roovers <jer@gentoo.org> libXfont-1.3.0.ebuild:
Stable for HPPA (bug #191615).
diff --git a/x11-libs/libXfont/files/digest-libXfont-1.2.2 b/x11-libs/libXfont/files/digest-libXfont-1.2.2
deleted file mode 100644
index dd8a1ccd0799..000000000000
--- a/x11-libs/libXfont/files/digest-libXfont-1.2.2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 ea2bf3d122e4491ba589e8fd3576f0a1 libXfont-1.2.2.tar.bz2 597652
-RMD160 dacca74fe5cd882bcd6cceac4963f8cd8b4938d6 libXfont-1.2.2.tar.bz2 597652
-SHA256 fb2f8c2ec321b4e38a65df4eaabffa1192ed8e19408e81be20cdcfc3e98b7487 libXfont-1.2.2.tar.bz2 597652
diff --git a/x11-libs/libXfont/files/digest-libXfont-1.2.2-r1 b/x11-libs/libXfont/files/digest-libXfont-1.2.2-r1
deleted file mode 100644
index dd8a1ccd0799..000000000000
--- a/x11-libs/libXfont/files/digest-libXfont-1.2.2-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 ea2bf3d122e4491ba589e8fd3576f0a1 libXfont-1.2.2.tar.bz2 597652
-RMD160 dacca74fe5cd882bcd6cceac4963f8cd8b4938d6 libXfont-1.2.2.tar.bz2 597652
-SHA256 fb2f8c2ec321b4e38a65df4eaabffa1192ed8e19408e81be20cdcfc3e98b7487 libXfont-1.2.2.tar.bz2 597652
diff --git a/x11-libs/libXfont/files/digest-libXfont-1.2.7-r1 b/x11-libs/libXfont/files/digest-libXfont-1.2.7-r1
deleted file mode 100644
index 22da72b72889..000000000000
--- a/x11-libs/libXfont/files/digest-libXfont-1.2.7-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 2f2085310f75900044d9dcd469637d26 libXfont-1.2.7.tar.bz2 573915
-RMD160 33e2688d1e3490d8b588ca2304b3d4068568dcae libXfont-1.2.7.tar.bz2 573915
-SHA256 2f8c004c0b914d460e6fd2b48d8b425cf4778d415467fc1f1d938b200462d18b libXfont-1.2.7.tar.bz2 573915
diff --git a/x11-libs/libXfont/files/digest-libXfont-1.2.8 b/x11-libs/libXfont/files/digest-libXfont-1.2.8
deleted file mode 100644
index 74e4c676d6db..000000000000
--- a/x11-libs/libXfont/files/digest-libXfont-1.2.8
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 83b8e21f6ee22512a8f72ba51e2d74f6 libXfont-1.2.8.tar.bz2 583236
-RMD160 da08bf640890b630072fba768a8a64fc2ae94d0b libXfont-1.2.8.tar.bz2 583236
-SHA256 374a2ca12f62a4d9f09a17a34765a5289cefa9db7f9f0913e1c3731b4088aad8 libXfont-1.2.8.tar.bz2 583236
diff --git a/x11-libs/libXfont/files/xorg-libXfont-1.2.7-bdf-fontdir.diff b/x11-libs/libXfont/files/xorg-libXfont-1.2.7-bdf-fontdir.diff
deleted file mode 100644
index 6894406eb2a4..000000000000
--- a/x11-libs/libXfont/files/xorg-libXfont-1.2.7-bdf-fontdir.diff
+++ /dev/null
@@ -1,51 +0,0 @@
-diff --git a/src/bitmap/bdfread.c b/src/bitmap/bdfread.c
-index acb77e9..a6f0c1e 100644
---- a/src/bitmap/bdfread.c
-+++ b/src/bitmap/bdfread.c
-@@ -65,6 +65,12 @@ #include <X11/fonts/fontutil.h>
- #include <X11/fonts/bitmap.h>
- #include <X11/fonts/bdfint.h>
-
-+#if HAVE_STDINT_H
-+#include <stdint.h>
-+#elif !defined(INT32_MAX)
-+#define INT32_MAX 0x7fffffff
-+#endif
-+
- #define INDICES 256
- #define MAXENCODING 0xFFFF
- #define BDFLINELEN 1024
-@@ -288,6 +294,11 @@ bdfReadCharacters(FontFilePtr file, Font
- bdfError("invalid number of CHARS in BDF file\n");
- return (FALSE);
- }
-+ if (nchars > INT32_MAX / sizeof(CharInfoRec)) {
-+ bdfError("Couldn't allocate pCI (%d*%d)\n", nchars,
-+ sizeof(CharInfoRec));
-+ goto BAILOUT;
-+ }
- ci = (CharInfoPtr) xalloc(nchars * sizeof(CharInfoRec));
- if (!ci) {
- bdfError("Couldn't allocate pCI (%d*%d)\n", nchars,
-diff --git a/src/fontfile/fontdir.c b/src/fontfile/fontdir.c
-index aae1f2e..cf68a54 100644
---- a/src/fontfile/fontdir.c
-+++ b/src/fontfile/fontdir.c
-@@ -38,9 +38,17 @@ #endif
- #include <X11/fonts/fntfilst.h>
- #include <X11/keysym.h>
-
-+#if HAVE_STDINT_H
-+#include <stdint.h>
-+#elif !defined(INT32_MAX)
-+#define INT32_MAX 0x7fffffff
-+#endif
-+
- Bool
- FontFileInitTable (FontTablePtr table, int size)
- {
-+ if (size < 0 || (size > INT32_MAX/sizeof(FontEntryRec)))
-+ return FALSE;
- if (size)
- {
- table->entries = (FontEntryPtr) xalloc(sizeof(FontEntryRec) * size);
diff --git a/x11-libs/libXfont/libXfont-1.2.2-r1.ebuild b/x11-libs/libXfont/libXfont-1.2.2-r1.ebuild
deleted file mode 100644
index 4fe70497f265..000000000000
--- a/x11-libs/libXfont/libXfont-1.2.2-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXfont/libXfont-1.2.2-r1.ebuild,v 1.2 2007/04/05 06:58:43 dberkholz Exp $
-
-# Must be before x-modular eclass is inherited
-# SNAPSHOT="yes"
-
-inherit x-modular flag-o-matic
-
-DESCRIPTION="X.Org Xfont library"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="ipv6"
-
-RDEPEND="x11-libs/xtrans
- x11-libs/libfontenc
- x11-proto/xproto
- x11-proto/fontsproto
- >=media-libs/freetype-2"
-DEPEND="${RDEPEND}
- x11-proto/fontcacheproto"
-
-CONFIGURE_OPTIONS="$(use_enable ipv6)
- --with-encodingsdir=/usr/share/fonts/encodings"
-
-PATCHES="${FILESDIR}/xorg-${PN}-1.2.7-bdf-fontdir.diff"
-
-pkg_setup() {
- # No such function yet
- # x-modular_pkg_setup
-
- # (#125465) Broken with Bdirect support
- filter-flags -Wl,-Bdirect
- filter-ldflags -Bdirect
- filter-ldflags -Wl,-Bdirect
-}
diff --git a/x11-libs/libXfont/libXfont-1.2.2.ebuild b/x11-libs/libXfont/libXfont-1.2.2.ebuild
deleted file mode 100644
index 0c54e789efec..000000000000
--- a/x11-libs/libXfont/libXfont-1.2.2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXfont/libXfont-1.2.2.ebuild,v 1.3 2007/01/28 20:51:28 eroyf Exp $
-
-# Must be before x-modular eclass is inherited
-# SNAPSHOT="yes"
-
-inherit x-modular flag-o-matic
-
-DESCRIPTION="X.Org Xfont library"
-
-KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE="ipv6"
-
-RDEPEND="x11-libs/xtrans
- x11-libs/libfontenc
- x11-proto/xproto
- x11-proto/fontsproto
- >=media-libs/freetype-2"
-DEPEND="${RDEPEND}
- x11-proto/fontcacheproto"
-
-CONFIGURE_OPTIONS="$(use_enable ipv6)
- --with-encodingsdir=/usr/share/fonts/encodings"
-
-pkg_setup() {
- # No such function yet
- # x-modular_pkg_setup
-
- # (#125465) Broken with Bdirect support
- filter-flags -Wl,-Bdirect
- filter-ldflags -Bdirect
- filter-ldflags -Wl,-Bdirect
-}
diff --git a/x11-libs/libXfont/libXfont-1.2.7-r1.ebuild b/x11-libs/libXfont/libXfont-1.2.7-r1.ebuild
deleted file mode 100644
index 1923d9d3afbd..000000000000
--- a/x11-libs/libXfont/libXfont-1.2.7-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXfont/libXfont-1.2.7-r1.ebuild,v 1.9 2007/06/24 22:51:02 vapier Exp $
-
-# Must be before x-modular eclass is inherited
-# SNAPSHOT="yes"
-
-inherit x-modular flag-o-matic
-
-DESCRIPTION="X.Org Xfont library"
-
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE="ipv6"
-
-RDEPEND="x11-libs/xtrans
- x11-libs/libfontenc
- x11-proto/xproto
- x11-proto/fontsproto
- >=media-libs/freetype-2"
-DEPEND="${RDEPEND}
- x11-proto/fontcacheproto"
-
-CONFIGURE_OPTIONS="$(use_enable ipv6)
- --with-encodingsdir=/usr/share/fonts/encodings"
-
-PATCHES="${FILESDIR}/xorg-${P}-bdf-fontdir.diff"
-
-pkg_setup() {
- # No such function yet
- # x-modular_pkg_setup
-
- # (#125465) Broken with Bdirect support
- filter-flags -Wl,-Bdirect
- filter-ldflags -Bdirect
- filter-ldflags -Wl,-Bdirect
-}
diff --git a/x11-libs/libXfont/libXfont-1.2.8.ebuild b/x11-libs/libXfont/libXfont-1.2.8.ebuild
deleted file mode 100644
index a4c31cfda385..000000000000
--- a/x11-libs/libXfont/libXfont-1.2.8.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXfont/libXfont-1.2.8.ebuild,v 1.2 2007/06/24 04:13:41 kumba Exp $
-
-# Must be before x-modular eclass is inherited
-# SNAPSHOT="yes"
-
-inherit x-modular flag-o-matic
-
-DESCRIPTION="X.Org Xfont library"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="ipv6"
-
-RDEPEND="x11-libs/xtrans
- x11-libs/libfontenc
- x11-proto/xproto
- x11-proto/fontsproto
- >=media-libs/freetype-2"
-DEPEND="${RDEPEND}
- x11-proto/fontcacheproto"
-
-CONFIGURE_OPTIONS="$(use_enable ipv6)
- --with-encodingsdir=/usr/share/fonts/encodings"
-
-pkg_setup() {
- # No such function yet
- # x-modular_pkg_setup
-
- # (#125465) Broken with Bdirect support
- filter-flags -Wl,-Bdirect
- filter-ldflags -Bdirect
- filter-ldflags -Wl,-Bdirect
-}
diff --git a/x11-libs/libXfontcache/ChangeLog b/x11-libs/libXfontcache/ChangeLog
index ee1339423f54..d739897b668c 100644
--- a/x11-libs/libXfontcache/ChangeLog
+++ b/x11-libs/libXfontcache/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for x11-libs/libXfontcache
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXfontcache/ChangeLog,v 1.36 2007/08/07 13:11:29 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXfontcache/ChangeLog,v 1.37 2007/10/09 09:34:41 dberkholz Exp $
+
+ 09 Oct 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+ -files/fix_shadow_manpages.patch, -libXfontcache-1.0.2.ebuild,
+ -libXfontcache-1.0.3.ebuild:
+ Drop old ebuilds.
07 Aug 2007; Gustavo Zacarias <gustavoz@gentoo.org>
libXfontcache-1.0.4.ebuild:
diff --git a/x11-libs/libXfontcache/files/digest-libXfontcache-1.0.2 b/x11-libs/libXfontcache/files/digest-libXfontcache-1.0.2
deleted file mode 100644
index 352d6fbc5488..000000000000
--- a/x11-libs/libXfontcache/files/digest-libXfontcache-1.0.2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 837d84166ae0dad5dc896f24206a92a5 libXfontcache-1.0.2.tar.bz2 221935
-RMD160 cb4f0123b19cc4d8484a29bf8a6f5610c125cbbb libXfontcache-1.0.2.tar.bz2 221935
-SHA256 f43414d3cd62cf543f46ada41a75732e504551fc3cf852130ee92155020a945e libXfontcache-1.0.2.tar.bz2 221935
diff --git a/x11-libs/libXfontcache/files/digest-libXfontcache-1.0.3 b/x11-libs/libXfontcache/files/digest-libXfontcache-1.0.3
deleted file mode 100644
index cf67e6d56ee6..000000000000
--- a/x11-libs/libXfontcache/files/digest-libXfontcache-1.0.3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 a21c8f8b89cdc7fe1780d45bb6b82c13 libXfontcache-1.0.3.tar.bz2 227480
-RMD160 712dbc8440d4e4f9e3a9a496264cc8806dbe1e5f libXfontcache-1.0.3.tar.bz2 227480
-SHA256 6b1cfdb4415cd3cd255785c847d905557e809b03951b30b3d722b76c0dbc5aea libXfontcache-1.0.3.tar.bz2 227480
diff --git a/x11-libs/libXfontcache/files/fix_shadow_manpages.patch b/x11-libs/libXfontcache/files/fix_shadow_manpages.patch
deleted file mode 100644
index 80c10b3b16c0..000000000000
--- a/x11-libs/libXfontcache/files/fix_shadow_manpages.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -u -r1.5 -r1.6
---- man/Makefile.am 2005/12/06 22:48:43 1.5
-+++ man/Makefile.am 2006/02/12 18:19:21 1.6
-@@ -27,6 +27,8 @@
-
- libmandir = $(LIB_MAN_DIR)
-
-+LIB_MAN_DIR_SUFFIX = $(LIB_MAN_DIR:@mandir@/man%=%)
-+
- libman_PRE = Xfontcache.man
-
- BUILT_SOURCES = shadows.DONE
-@@ -69,5 +71,5 @@
- shadows.DONE:
- -rm -f $(Xfontcache_shadows:=.@LIB_MAN_SUFFIX@)
- (for i in $(Xfontcache_shadows:=.@LIB_MAN_SUFFIX@) ; do \
-- echo .so man$(LIB_MAN_SUFFIX)/Xfontcache.$(LIB_MAN_SUFFIX) > $$i; \
-+ echo .so man$(LIB_MAN_DIR_SUFFIX)/Xfontcache.$(LIB_MAN_SUFFIX) > $$i; \
- done)
diff --git a/x11-libs/libXfontcache/libXfontcache-1.0.2.ebuild b/x11-libs/libXfontcache/libXfontcache-1.0.2.ebuild
deleted file mode 100644
index 88d6893780c8..000000000000
--- a/x11-libs/libXfontcache/libXfontcache-1.0.2.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXfontcache/libXfontcache-1.0.2.ebuild,v 1.7 2006/10/01 17:00:23 dberkholz Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-inherit x-modular
-
-DESCRIPTION="X.Org Xfontcache library"
-
-KEYWORDS="alpha amd64 arm mips ppc ppc64 s390 sh sparc x86"
-
-RDEPEND="x11-libs/libX11
- x11-libs/libXext"
-DEPEND="${RDEPEND}
- x11-proto/fontcacheproto"
diff --git a/x11-libs/libXfontcache/libXfontcache-1.0.3.ebuild b/x11-libs/libXfontcache/libXfontcache-1.0.3.ebuild
deleted file mode 100644
index d56ade38c1e1..000000000000
--- a/x11-libs/libXfontcache/libXfontcache-1.0.3.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXfontcache/libXfontcache-1.0.3.ebuild,v 1.1 2006/10/22 18:02:42 joshuabaergen Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-inherit x-modular
-
-DESCRIPTION="X.Org Xfontcache library"
-
-KEYWORDS="~alpha ~amd64 ~arm ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-
-RDEPEND="x11-libs/libX11
- x11-libs/libXext"
-DEPEND="${RDEPEND}
- x11-proto/fontcacheproto"
diff --git a/x11-libs/libXi/ChangeLog b/x11-libs/libXi/ChangeLog
index 729d93816c23..4ae5e69571be 100644
--- a/x11-libs/libXi/ChangeLog
+++ b/x11-libs/libXi/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for x11-libs/libXi
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXi/ChangeLog,v 1.50 2007/09/29 10:19:35 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXi/ChangeLog,v 1.51 2007/10/09 09:24:35 dberkholz Exp $
+
+ 09 Oct 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+ -files/fix-bad-unlock.patch, -libXi-1.0.1.ebuild, -libXi-1.0.1-r1.ebuild,
+ -libXi-1.1.0.ebuild, -libXi-1.1.1.ebuild:
+ Drop old ebuilds.
29 Sep 2007; Raúl Porcel <armin76@gentoo.org> libXi-1.1.2.ebuild:
sparc stable wrt #191615
diff --git a/x11-libs/libXi/files/digest-libXi-1.0.1 b/x11-libs/libXi/files/digest-libXi-1.0.1
deleted file mode 100644
index ddf607d16b20..000000000000
--- a/x11-libs/libXi/files/digest-libXi-1.0.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 0efe6758c98257edb009551eac53fcfb libXi-1.0.1.tar.bz2 246058
-RMD160 29e67e44b91ce16d11741b5e053bfacf7e78be1e libXi-1.0.1.tar.bz2 246058
-SHA256 d08fb359d827d5ec89caa103bc4c679c713e98c9e02da0cfd9149e12a4adda8f libXi-1.0.1.tar.bz2 246058
diff --git a/x11-libs/libXi/files/digest-libXi-1.0.1-r1 b/x11-libs/libXi/files/digest-libXi-1.0.1-r1
deleted file mode 100644
index ddf607d16b20..000000000000
--- a/x11-libs/libXi/files/digest-libXi-1.0.1-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 0efe6758c98257edb009551eac53fcfb libXi-1.0.1.tar.bz2 246058
-RMD160 29e67e44b91ce16d11741b5e053bfacf7e78be1e libXi-1.0.1.tar.bz2 246058
-SHA256 d08fb359d827d5ec89caa103bc4c679c713e98c9e02da0cfd9149e12a4adda8f libXi-1.0.1.tar.bz2 246058
diff --git a/x11-libs/libXi/files/digest-libXi-1.1.0 b/x11-libs/libXi/files/digest-libXi-1.1.0
deleted file mode 100644
index e36f6427d47e..000000000000
--- a/x11-libs/libXi/files/digest-libXi-1.1.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 c25abbe604029855eb11a3a75fb1f386 libXi-1.1.0.tar.bz2 246381
-RMD160 a3d9d1a14b426c1716a251f59db404d2462c395a libXi-1.1.0.tar.bz2 246381
-SHA256 0f90d7e27d8a7d6bccf9350b6283ffe122e5347fa51d4ea9055653b297339989 libXi-1.1.0.tar.bz2 246381
diff --git a/x11-libs/libXi/files/digest-libXi-1.1.1 b/x11-libs/libXi/files/digest-libXi-1.1.1
deleted file mode 100644
index 140b3ecd0476..000000000000
--- a/x11-libs/libXi/files/digest-libXi-1.1.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 f749dc9ed3a983694b330a8aa45d4533 libXi-1.1.1.tar.bz2 244748
-RMD160 e70eaf04d19f25b9ecacfbbe6ca636c4b220ad52 libXi-1.1.1.tar.bz2 244748
-SHA256 1a0b8e1ef58488fcddb3c6c6aa0c96f05dd24b858b23b1cf5b198f27e1b80580 libXi-1.1.1.tar.bz2 244748
diff --git a/x11-libs/libXi/files/fix-bad-unlock.patch b/x11-libs/libXi/files/fix-bad-unlock.patch
deleted file mode 100644
index 4bc1a533381a..000000000000
--- a/x11-libs/libXi/files/fix-bad-unlock.patch
+++ /dev/null
@@ -1,529 +0,0 @@
-diff --git a/src/XExtInt.c b/src/XExtInt.c
-index e5baccb..aa838ef 100644
---- a/src/XExtInt.c
-+++ b/src/XExtInt.c
-@@ -207,7 +207,7 @@ _XiCheckExtInit(dpy, version_index)
- return (-1);
- }
- ((XInputData *) info->data)->vers =
-- _XiGetExtensionVersion(dpy, "XInputExtension");
-+ _XiGetExtensionVersion(dpy, "XInputExtension", info);
- }
-
- if (versions[version_index].major_version > Dont_Check) {
-diff --git a/src/XGetVers.c b/src/XGetVers.c
-index 1f4fd7a..ef41fea 100644
---- a/src/XGetVers.c
-+++ b/src/XGetVers.c
-@@ -64,9 +64,10 @@ XExtensionVersion *
- XGetExtensionVersion(register Display * dpy, _Xconst char *name)
- {
- XExtensionVersion *ext;
-+ XExtDisplayInfo *info = XInput_find_display(dpy);
-
- LockDisplay(dpy);
-- ext = _XiGetExtensionVersion(dpy, name);
-+ ext = _XiGetExtensionVersion(dpy, name, info);
- if (ext != (XExtensionVersion *) NoSuchExtension) {
- UnlockDisplay(dpy);
- SyncHandle();
-@@ -75,12 +76,11 @@ XGetExtensionVersion(register Display *
- }
-
- XExtensionVersion *
--_XiGetExtensionVersion(register Display * dpy, _Xconst char *name)
-+_XiGetExtensionVersion(register Display * dpy, _Xconst char *name, XExtDisplayInfo *info)
- {
- xGetExtensionVersionReq *req;
- xGetExtensionVersionReply rep;
- XExtensionVersion *ext;
-- XExtDisplayInfo *info = XInput_find_display(dpy);
-
- if (_XiCheckExtInit(dpy, Dont_Check) == -1)
- return ((XExtensionVersion *) NoSuchExtension);
-diff --git a/src/XIint.h b/src/XIint.h
-index ba965a6..ae6d33f 100644
---- a/src/XIint.h
-+++ b/src/XIint.h
-@@ -12,6 +12,6 @@ extern XExtDisplayInfo *XInput_find_disp
-
- extern int _XiCheckExtInit(Display *, int);
-
--extern XExtensionVersion *_XiGetExtensionVersion(Display *, _Xconst char *);
-+extern XExtensionVersion *_XiGetExtensionVersion(Display *, _Xconst char *, XExtDisplayInfo *);
-
- #endif
-diff --git a/src/XAllowDv.c b/src/XAllowDv.c
-index 94a27ca..7fd2a07 100644
---- a/src/XAllowDv.c
-+++ b/src/XAllowDv.c
-@@ -71,7 +71,7 @@ XAllowDeviceEvents(dpy, dev, event_mode,
- XExtDisplayInfo *info = XInput_find_display(dpy);
-
- LockDisplay(dpy);
-- if (_XiCheckExtInit(dpy, XInput_Initial_Release) == -1)
-+ if (_XiCheckExtInit(dpy, XInput_Initial_Release, info) == -1)
- return (NoSuchExtension);
-
- GetReq(AllowDeviceEvents, req);
-diff --git a/src/XChgDCtl.c b/src/XChgDCtl.c
-index a196523..9e71475 100644
---- a/src/XChgDCtl.c
-+++ b/src/XChgDCtl.c
-@@ -74,7 +74,7 @@ XChangeDeviceControl(dpy, dev, control,
- XExtDisplayInfo *info = XInput_find_display(dpy);
-
- LockDisplay(dpy);
-- if (_XiCheckExtInit(dpy, XInput_Add_XChangeDeviceControl) == -1)
-+ if (_XiCheckExtInit(dpy, XInput_Add_XChangeDeviceControl, info) == -1)
- return (NoSuchExtension);
-
- GetReq(ChangeDeviceControl, req);
-diff --git a/src/XChgFCtl.c b/src/XChgFCtl.c
-index 32c7b24..e499b41 100644
---- a/src/XChgFCtl.c
-+++ b/src/XChgFCtl.c
-@@ -73,7 +73,7 @@ XChangeFeedbackControl(dpy, dev, mask, f
- XExtDisplayInfo *info = XInput_find_display(dpy);
-
- LockDisplay(dpy);
-- if (_XiCheckExtInit(dpy, XInput_Initial_Release) == -1)
-+ if (_XiCheckExtInit(dpy, XInput_Initial_Release, info) == -1)
- return (NoSuchExtension);
-
- GetReq(ChangeFeedbackControl, req);
-diff --git a/src/XChgKMap.c b/src/XChgKMap.c
-index d0a334f..73de754 100644
---- a/src/XChgKMap.c
-+++ b/src/XChgKMap.c
-@@ -74,7 +74,7 @@ XChangeDeviceKeyMapping(dpy, dev, first,
- XExtDisplayInfo *info = XInput_find_display(dpy);
-
- LockDisplay(dpy);
-- if (_XiCheckExtInit(dpy, XInput_Initial_Release) == -1)
-+ if (_XiCheckExtInit(dpy, XInput_Initial_Release, info) == -1)
- return (NoSuchExtension);
-
- GetReq(ChangeDeviceKeyMapping, req);
-diff --git a/src/XChgKbd.c b/src/XChgKbd.c
-index feba239..1b01207 100644
---- a/src/XChgKbd.c
-+++ b/src/XChgKbd.c
-@@ -70,7 +70,7 @@ XChangeKeyboardDevice(dpy, dev)
- XExtDisplayInfo *info = XInput_find_display(dpy);
-
- LockDisplay(dpy);
-- if (_XiCheckExtInit(dpy, XInput_Initial_Release) == -1)
-+ if (_XiCheckExtInit(dpy, XInput_Initial_Release, info) == -1)
- return (NoSuchExtension);
-
- GetReq(ChangeKeyboardDevice, req);
-diff --git a/src/XChgPnt.c b/src/XChgPnt.c
-index 9e0a617..6123398 100644
---- a/src/XChgPnt.c
-+++ b/src/XChgPnt.c
-@@ -72,7 +72,7 @@ XChangePointerDevice(dpy, dev, xaxis, ya
- XExtDisplayInfo *info = XInput_find_display(dpy);
-
- LockDisplay(dpy);
-- if (_XiCheckExtInit(dpy, XInput_Initial_Release) == -1)
-+ if (_XiCheckExtInit(dpy, XInput_Initial_Release, info) == -1)
- return (NoSuchExtension);
-
- GetReq(ChangePointerDevice, req);
-diff --git a/src/XChgProp.c b/src/XChgProp.c
-index 6939cb3..0c7377f 100644
---- a/src/XChgProp.c
-+++ b/src/XChgProp.c
-@@ -73,7 +73,7 @@ XChangeDeviceDontPropagateList(dpy, wind
- XExtDisplayInfo *info = XInput_find_display(dpy);
-
- LockDisplay(dpy);
-- if (_XiCheckExtInit(dpy, XInput_Initial_Release) == -1)
-+ if (_XiCheckExtInit(dpy, XInput_Initial_Release, info) == -1)
- return (NoSuchExtension);
-
- GetReq(ChangeDeviceDontPropagateList, req);
-diff --git a/src/XCloseDev.c b/src/XCloseDev.c
-index 71e792a..ca19860 100644
---- a/src/XCloseDev.c
-+++ b/src/XCloseDev.c
-@@ -69,7 +69,7 @@ XCloseDevice(dpy, dev)
- XExtDisplayInfo *info = XInput_find_display(dpy);
-
- LockDisplay(dpy);
-- if (_XiCheckExtInit(dpy, XInput_Initial_Release) == -1)
-+ if (_XiCheckExtInit(dpy, XInput_Initial_Release, info) == -1)
- return (NoSuchExtension);
-
- GetReq(CloseDevice, req);
-diff --git a/src/XDevBell.c b/src/XDevBell.c
-index 276a1b8..73f2e35 100644
---- a/src/XDevBell.c
-+++ b/src/XDevBell.c
-@@ -71,7 +71,7 @@ XDeviceBell(dpy, dev, feedbackclass, fee
- XExtDisplayInfo *info = XInput_find_display(dpy);
-
- LockDisplay(dpy);
-- if (_XiCheckExtInit(dpy, XInput_Add_XDeviceBell) == -1)
-+ if (_XiCheckExtInit(dpy, XInput_Add_XDeviceBell, info) == -1)
- return (NoSuchExtension);
-
- GetReq(DeviceBell, req);
-diff --git a/src/XExtInt.c b/src/XExtInt.c
-index aa838ef..b7297dc 100644
---- a/src/XExtInt.c
-+++ b/src/XExtInt.c
-@@ -191,12 +191,12 @@ _xidevicebusy(dpy, error)
- */
-
- int
--_XiCheckExtInit(dpy, version_index)
-+_XiCheckExtInit(dpy, version_index, info)
- register Display *dpy;
- register int version_index;
-+ XExtDisplayInfo *info;
- {
- XExtensionVersion *ext;
-- XExtDisplayInfo *info = XInput_find_display(dpy);
-
- XInputCheckExtension(dpy, info, -1);
-
-diff --git a/src/XGMotion.c b/src/XGMotion.c
-index abcc06a..daa8792 100644
---- a/src/XGMotion.c
-+++ b/src/XGMotion.c
-@@ -85,7 +85,7 @@ Time stop;
- XExtDisplayInfo *info = XInput_find_display(dpy);
-
- LockDisplay(dpy);
-- if (_XiCheckExtInit(dpy, XInput_Initial_Release) == -1)
-+ if (_XiCheckExtInit(dpy, XInput_Initial_Release, info) == -1)
- return ((XDeviceTimeCoord *) NoSuchExtension);
-
- GetReq(GetDeviceMotionEvents, req);
-diff --git a/src/XGetBMap.c b/src/XGetBMap.c
-index 1eaaa23..15cad74 100644
---- a/src/XGetBMap.c
-+++ b/src/XGetBMap.c
-@@ -81,7 +81,7 @@ XGetDeviceButtonMapping(dpy, device, map
- xGetDeviceButtonMappingReply rep;
-
- LockDisplay(dpy);
-- if (_XiCheckExtInit(dpy, XInput_Initial_Release) == -1)
-+ if (_XiCheckExtInit(dpy, XInput_Initial_Release, info) == -1)
- return (NoSuchExtension);
- GetReq(GetDeviceButtonMapping, req);
-
-diff --git a/src/XGetDCtl.c b/src/XGetDCtl.c
-index 139f7e7..8d034bf 100644
---- a/src/XGetDCtl.c
-+++ b/src/XGetDCtl.c
-@@ -78,7 +78,7 @@ XGetDeviceControl(dpy, dev, control)
- XExtDisplayInfo *info = XInput_find_display(dpy);
-
- LockDisplay(dpy);
-- if (_XiCheckExtInit(dpy, XInput_Add_XChangeDeviceControl) == -1)
-+ if (_XiCheckExtInit(dpy, XInput_Add_XChangeDeviceControl, info) == -1)
- return ((XDeviceControl *) NoSuchExtension);
-
- GetReq(GetDeviceControl, req);
-diff --git a/src/XGetFCtl.c b/src/XGetFCtl.c
-index 0101fc0..af4578c 100644
---- a/src/XGetFCtl.c
-+++ b/src/XGetFCtl.c
-@@ -78,7 +78,7 @@ XGetFeedbackControl(dpy, dev, num_feedba
- XExtDisplayInfo *info = XInput_find_display(dpy);
-
- LockDisplay(dpy);
-- if (_XiCheckExtInit(dpy, XInput_Initial_Release) == -1)
-+ if (_XiCheckExtInit(dpy, XInput_Initial_Release, info) == -1)
- return ((XFeedbackState *) NoSuchExtension);
-
- GetReq(GetFeedbackControl, req);
-diff --git a/src/XGetKMap.c b/src/XGetKMap.c
-index 59f6f93..0381e86 100644
---- a/src/XGetKMap.c
-+++ b/src/XGetKMap.c
-@@ -76,7 +76,7 @@ #endif
- XExtDisplayInfo *info = XInput_find_display(dpy);
-
- LockDisplay(dpy);
-- if (_XiCheckExtInit(dpy, XInput_Initial_Release) == -1)
-+ if (_XiCheckExtInit(dpy, XInput_Initial_Release, info) == -1)
- return ((KeySym *) NoSuchExtension);
-
- GetReq(GetDeviceKeyMapping, req);
-diff --git a/src/XGetMMap.c b/src/XGetMMap.c
-index 4a8c32f..ef92281 100644
---- a/src/XGetMMap.c
-+++ b/src/XGetMMap.c
-@@ -72,7 +72,7 @@ XGetDeviceModifierMapping(dpy, dev)
- XExtDisplayInfo *info = XInput_find_display(dpy);
-
- LockDisplay(dpy);
-- if (_XiCheckExtInit(dpy, XInput_Initial_Release) == -1)
-+ if (_XiCheckExtInit(dpy, XInput_Initial_Release, info) == -1)
- return ((XModifierKeymap *) NoSuchExtension);
-
- GetReq(GetDeviceModifierMapping, req);
-diff --git a/src/XGetProp.c b/src/XGetProp.c
-index 0ea8ceb..71d844b 100644
---- a/src/XGetProp.c
-+++ b/src/XGetProp.c
-@@ -75,7 +75,7 @@ Window window;
- XExtDisplayInfo *info = XInput_find_display(dpy);
-
- LockDisplay(dpy);
-- if (_XiCheckExtInit(dpy, XInput_Initial_Release) == -1)
-+ if (_XiCheckExtInit(dpy, XInput_Initial_Release, info) == -1)
- return ((XEventClass *) NoSuchExtension);
-
- GetReq(GetDeviceDontPropagateList, req);
-diff --git a/src/XGetVers.c b/src/XGetVers.c
-index ef41fea..d3c765a 100644
---- a/src/XGetVers.c
-+++ b/src/XGetVers.c
-@@ -82,7 +82,7 @@ _XiGetExtensionVersion(register Display
- xGetExtensionVersionReply rep;
- XExtensionVersion *ext;
-
-- if (_XiCheckExtInit(dpy, Dont_Check) == -1)
-+ if (_XiCheckExtInit(dpy, Dont_Check, info) == -1)
- return ((XExtensionVersion *) NoSuchExtension);
-
- GetReq(GetExtensionVersion, req);
-diff --git a/src/XGrDvBut.c b/src/XGrDvBut.c
-index fbc26ba..6e35099 100644
---- a/src/XGrDvBut.c
-+++ b/src/XGrDvBut.c
-@@ -80,7 +80,7 @@ XGrabDeviceButton(dpy, dev, button, modi
- XExtDisplayInfo *info = XInput_find_display(dpy);
-
- LockDisplay(dpy);
-- if (_XiCheckExtInit(dpy, XInput_Initial_Release) == -1)
-+ if (_XiCheckExtInit(dpy, XInput_Initial_Release, info) == -1)
- return (NoSuchExtension);
-
- GetReq(GrabDeviceButton, req);
-diff --git a/src/XGrDvKey.c b/src/XGrDvKey.c
-index 6731e2c..1389753 100644
---- a/src/XGrDvKey.c
-+++ b/src/XGrDvKey.c
-@@ -80,7 +80,7 @@ XGrabDeviceKey(dpy, dev, key, modifiers,
- XExtDisplayInfo *info = XInput_find_display(dpy);
-
- LockDisplay(dpy);
-- if (_XiCheckExtInit(dpy, XInput_Initial_Release) == -1)
-+ if (_XiCheckExtInit(dpy, XInput_Initial_Release, info) == -1)
- return (NoSuchExtension);
-
- GetReq(GrabDeviceKey, req);
-diff --git a/src/XGrabDev.c b/src/XGrabDev.c
-index 536e369..92f1c11 100644
---- a/src/XGrabDev.c
-+++ b/src/XGrabDev.c
-@@ -78,7 +78,7 @@ XGrabDevice(dpy, dev, grab_window, owner
- XExtDisplayInfo *info = XInput_find_display(dpy);
-
- LockDisplay(dpy);
-- if (_XiCheckExtInit(dpy, XInput_Initial_Release) == -1)
-+ if (_XiCheckExtInit(dpy, XInput_Initial_Release, info) == -1)
- return (NoSuchExtension);
-
- GetReq(GrabDevice, req);
-diff --git a/src/XGtFocus.c b/src/XGtFocus.c
-index 08cebd9..4e63918 100644
---- a/src/XGtFocus.c
-+++ b/src/XGtFocus.c
-@@ -73,7 +73,7 @@ XGetDeviceFocus(dpy, dev, focus, revert_
- XExtDisplayInfo *info = XInput_find_display(dpy);
-
- LockDisplay(dpy);
-- if (_XiCheckExtInit(dpy, XInput_Initial_Release) == -1)
-+ if (_XiCheckExtInit(dpy, XInput_Initial_Release, info) == -1)
- return (NoSuchExtension);
-
- GetReq(GetDeviceFocus, req);
-diff --git a/src/XGtSelect.c b/src/XGtSelect.c
-index 0f63caf..9f596fd 100644
---- a/src/XGtSelect.c
-+++ b/src/XGtSelect.c
-@@ -76,7 +76,7 @@ XGetSelectedExtensionEvents(dpy, w, this
- XExtDisplayInfo *info = XInput_find_display(dpy);
-
- LockDisplay(dpy);
-- if (_XiCheckExtInit(dpy, XInput_Initial_Release) == -1)
-+ if (_XiCheckExtInit(dpy, XInput_Initial_Release, info) == -1)
- return (NoSuchExtension);
- GetReq(GetSelectedExtensionEvents, req);
-
-diff --git a/src/XIint.h b/src/XIint.h
-index ae6d33f..f35619c 100644
---- a/src/XIint.h
-+++ b/src/XIint.h
-@@ -10,7 +10,7 @@ #define _XIINT_H_
-
- extern XExtDisplayInfo *XInput_find_display(Display *);
-
--extern int _XiCheckExtInit(Display *, int);
-+extern int _XiCheckExtInit(Display *, int, XExtDisplayInfo *);
-
- extern XExtensionVersion *_XiGetExtensionVersion(Display *, _Xconst char *, XExtDisplayInfo *);
-
-diff --git a/src/XListDev.c b/src/XListDev.c
-index ea9aa62..b9a617d 100644
---- a/src/XListDev.c
-+++ b/src/XListDev.c
-@@ -82,7 +82,7 @@ XListInputDevices(dpy, ndevices)
- XExtDisplayInfo *info = XInput_find_display(dpy);
-
- LockDisplay(dpy);
-- if (_XiCheckExtInit(dpy, XInput_Initial_Release) == -1)
-+ if (_XiCheckExtInit(dpy, XInput_Initial_Release, info) == -1)
- return ((XDeviceInfo *) NULL);
-
- GetReq(ListInputDevices, req);
-diff --git a/src/XOpenDev.c b/src/XOpenDev.c
-index ed168a6..d220330 100644
---- a/src/XOpenDev.c
-+++ b/src/XOpenDev.c
-@@ -72,7 +72,7 @@ XOpenDevice(dpy, id)
- XExtDisplayInfo *info = XInput_find_display(dpy);
-
- LockDisplay(dpy);
-- if (_XiCheckExtInit(dpy, XInput_Initial_Release) == -1)
-+ if (_XiCheckExtInit(dpy, XInput_Initial_Release, info) == -1)
- return ((XDevice *) NoSuchExtension);
-
- GetReq(OpenDevice, req);
-diff --git a/src/XQueryDv.c b/src/XQueryDv.c
-index a3a75f2..540f224 100644
---- a/src/XQueryDv.c
-+++ b/src/XQueryDv.c
-@@ -76,7 +76,7 @@ XQueryDeviceState(dpy, dev)
- XExtDisplayInfo *info = XInput_find_display(dpy);
-
- LockDisplay(dpy);
-- if (_XiCheckExtInit(dpy, XInput_Initial_Release) == -1)
-+ if (_XiCheckExtInit(dpy, XInput_Initial_Release, info) == -1)
- return ((XDeviceState *) NoSuchExtension);
-
- GetReq(QueryDeviceState, req);
-diff --git a/src/XSelect.c b/src/XSelect.c
-index b23829a..af0fb84 100644
---- a/src/XSelect.c
-+++ b/src/XSelect.c
-@@ -71,7 +71,7 @@ XSelectExtensionEvent(dpy, w, event_list
- XExtDisplayInfo *info = XInput_find_display(dpy);
-
- LockDisplay(dpy);
-- if (_XiCheckExtInit(dpy, XInput_Initial_Release) == -1)
-+ if (_XiCheckExtInit(dpy, XInput_Initial_Release, info) == -1)
- return (NoSuchExtension);
- GetReq(SelectExtensionEvent, req);
-
-diff --git a/src/XSetBMap.c b/src/XSetBMap.c
-index bdfe501..cad6976 100644
---- a/src/XSetBMap.c
-+++ b/src/XSetBMap.c
-@@ -75,7 +75,7 @@ XSetDeviceButtonMapping(dpy, device, map
- XExtDisplayInfo *info = XInput_find_display(dpy);
-
- LockDisplay(dpy);
-- if (_XiCheckExtInit(dpy, XInput_Initial_Release) == -1)
-+ if (_XiCheckExtInit(dpy, XInput_Initial_Release, info) == -1)
- return (NoSuchExtension);
- GetReq(SetDeviceButtonMapping, req);
- req->reqType = info->codes->major_opcode;
-diff --git a/src/XSetDVal.c b/src/XSetDVal.c
-index 6b382f1..43702b0 100644
---- a/src/XSetDVal.c
-+++ b/src/XSetDVal.c
-@@ -74,7 +74,7 @@ XSetDeviceValuators(dpy, dev, valuators,
- XExtDisplayInfo *info = XInput_find_display(dpy);
-
- LockDisplay(dpy);
-- if (_XiCheckExtInit(dpy, XInput_Add_XSetDeviceValuators) == -1)
-+ if (_XiCheckExtInit(dpy, XInput_Add_XSetDeviceValuators, info) == -1)
- return (NoSuchExtension);
-
- GetReq(SetDeviceValuators, req);
-diff --git a/src/XSetMMap.c b/src/XSetMMap.c
-index b0838f6..1077433 100644
---- a/src/XSetMMap.c
-+++ b/src/XSetMMap.c
-@@ -72,7 +72,7 @@ XSetDeviceModifierMapping(dpy, dev, modm
- XExtDisplayInfo *info = XInput_find_display(dpy);
-
- LockDisplay(dpy);
-- if (_XiCheckExtInit(dpy, XInput_Initial_Release) == -1)
-+ if (_XiCheckExtInit(dpy, XInput_Initial_Release, info) == -1)
- return (NoSuchExtension);
-
- GetReqExtra(SetDeviceModifierMapping, mapSize, req);
-diff --git a/src/XSetMode.c b/src/XSetMode.c
-index 278c4ff..94e2b3d 100644
---- a/src/XSetMode.c
-+++ b/src/XSetMode.c
-@@ -71,7 +71,7 @@ XSetDeviceMode(dpy, dev, mode)
- XExtDisplayInfo *info = XInput_find_display(dpy);
-
- LockDisplay(dpy);
-- if (_XiCheckExtInit(dpy, XInput_Initial_Release) == -1)
-+ if (_XiCheckExtInit(dpy, XInput_Initial_Release, info) == -1)
- return (NoSuchExtension);
-
- GetReq(SetDeviceMode, req);
-diff --git a/src/XSndExEv.c b/src/XSndExEv.c
-index 6d65745..71431cd 100644
---- a/src/XSndExEv.c
-+++ b/src/XSndExEv.c
-@@ -81,7 +81,7 @@ XSendExtensionEvent(dpy, dev, dest, prop
- XExtDisplayInfo *info = XInput_find_display(dpy);
-
- LockDisplay(dpy);
-- if (_XiCheckExtInit(dpy, XInput_Initial_Release) == -1)
-+ if (_XiCheckExtInit(dpy, XInput_Initial_Release, info) == -1)
- return (NoSuchExtension);
-
- /* call through display to find proper conversion routine */
-diff --git a/src/XUngrDev.c b/src/XUngrDev.c
-index ecc8887..70ba03d 100644
---- a/src/XUngrDev.c
-+++ b/src/XUngrDev.c
-@@ -70,7 +70,7 @@ XUngrabDevice(dpy, dev, time)
- XExtDisplayInfo *info = XInput_find_display(dpy);
-
- LockDisplay(dpy);
-- if (_XiCheckExtInit(dpy, XInput_Initial_Release) == -1)
-+ if (_XiCheckExtInit(dpy, XInput_Initial_Release, info) == -1)
- return (NoSuchExtension);
-
- GetReq(UngrabDevice, req);
-diff --git a/src/XUngrDvB.c b/src/XUngrDvB.c
-index 07f2c3f..77dbe77 100644
---- a/src/XUngrDvB.c
-+++ b/src/XUngrDvB.c
-@@ -73,7 +73,7 @@ XUngrabDeviceButton(dpy, dev, button, mo
- XExtDisplayInfo *info = XInput_find_display(dpy);
-
- LockDisplay(dpy);
-- if (_XiCheckExtInit(dpy, XInput_Initial_Release) == -1)
-+ if (_XiCheckExtInit(dpy, XInput_Initial_Release, info) == -1)
- return (NoSuchExtension);
- GetReq(UngrabDeviceButton, req);
-
-diff --git a/src/XUngrDvK.c b/src/XUngrDvK.c
-index e9e4cdf..0ae3178 100644
---- a/src/XUngrDvK.c
-+++ b/src/XUngrDvK.c
-@@ -73,7 +73,7 @@ XUngrabDeviceKey(dpy, dev, key, modifier
- XExtDisplayInfo *info = XInput_find_display(dpy);
-
- LockDisplay(dpy);
-- if (_XiCheckExtInit(dpy, XInput_Initial_Release) == -1)
-+ if (_XiCheckExtInit(dpy, XInput_Initial_Release, info) == -1)
- return (NoSuchExtension);
- GetReq(UngrabDeviceKey, req);
-
diff --git a/x11-libs/libXi/libXi-1.0.1-r1.ebuild b/x11-libs/libXi/libXi-1.0.1-r1.ebuild
deleted file mode 100644
index 29d83f2b9783..000000000000
--- a/x11-libs/libXi/libXi-1.0.1-r1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXi/libXi-1.0.1-r1.ebuild,v 1.1 2006/10/16 03:11:52 joshuabaergen Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-inherit x-modular
-
-DESCRIPTION="X.Org Xi library"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-
-RDEPEND="x11-libs/libX11
- x11-libs/libXext"
-DEPEND="${RDEPEND}
- x11-proto/xproto
- x11-proto/inputproto"
-
-PATCHES="${FILESDIR}/fix-bad-unlock.patch"
diff --git a/x11-libs/libXi/libXi-1.0.1.ebuild b/x11-libs/libXi/libXi-1.0.1.ebuild
deleted file mode 100644
index ee004b68dbbc..000000000000
--- a/x11-libs/libXi/libXi-1.0.1.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXi/libXi-1.0.1.ebuild,v 1.9 2006/10/01 17:00:51 dberkholz Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-inherit x-modular
-
-DESCRIPTION="X.Org Xi library"
-
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-
-RDEPEND="x11-libs/libX11
- x11-libs/libXext"
-DEPEND="${RDEPEND}
- x11-proto/xproto
- x11-proto/inputproto"
diff --git a/x11-libs/libXi/libXi-1.1.0.ebuild b/x11-libs/libXi/libXi-1.1.0.ebuild
deleted file mode 100644
index c3dc1b809b7e..000000000000
--- a/x11-libs/libXi/libXi-1.1.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXi/libXi-1.1.0.ebuild,v 1.11 2007/06/24 22:37:26 vapier Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-inherit x-modular
-
-DESCRIPTION="X.Org Xi library"
-
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-
-RDEPEND="x11-libs/libX11
- x11-libs/libXext"
-DEPEND="${RDEPEND}
- x11-proto/xproto
- >=x11-proto/inputproto-1.4"
-
-pkg_postinst() {
- x-modular_pkg_postinst
-
- ewarn "Some special keys and keyboard layouts may stop working."
- ewarn "To fix them, recompile xorg-server."
-}
diff --git a/x11-libs/libXi/libXi-1.1.1.ebuild b/x11-libs/libXi/libXi-1.1.1.ebuild
deleted file mode 100644
index c37f53c3043c..000000000000
--- a/x11-libs/libXi/libXi-1.1.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXi/libXi-1.1.1.ebuild,v 1.2 2007/08/07 13:04:07 gustavoz Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-inherit x-modular
-
-DESCRIPTION="X.Org Xi library"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~x86-fbsd"
-
-RDEPEND="x11-libs/libX11
- x11-libs/libXext"
-DEPEND="${RDEPEND}
- x11-proto/xproto
- >=x11-proto/inputproto-1.4"
-
-pkg_postinst() {
- x-modular_pkg_postinst
-
- ewarn "Some special keys and keyboard layouts may stop working."
- ewarn "To fix them, recompile xorg-server."
-}
diff --git a/x11-libs/libXpm/ChangeLog b/x11-libs/libXpm/ChangeLog
index 2d62ee3d54df..9a36baf1a2b0 100644
--- a/x11-libs/libXpm/ChangeLog
+++ b/x11-libs/libXpm/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for x11-libs/libXpm
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXpm/ChangeLog,v 1.39 2007/09/08 07:45:14 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXpm/ChangeLog,v 1.40 2007/10/09 09:33:35 dberkholz Exp $
+
+ 09 Oct 2007; Donnie Berkholz <dberkholz@gentoo.org>; -libXpm-3.5.5.ebuild:
+ Drop old ebuilds.
*libXpm-3.5.7 (08 Sep 2007)
diff --git a/x11-libs/libXpm/files/digest-libXpm-3.5.5 b/x11-libs/libXpm/files/digest-libXpm-3.5.5
deleted file mode 100644
index d0cf9bc78e1d..000000000000
--- a/x11-libs/libXpm/files/digest-libXpm-3.5.5
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 2b897e6a41dafa0716c197df308fbf0c libXpm-3.5.5.tar.bz2 348411
-RMD160 2919e7eb4fae249b1d8fc019c9dc4a59aebb21fe libXpm-3.5.5.tar.bz2 348411
-SHA256 c7ca908814e2f38d65edcfa359b1b05e992a3392081ab38c400616d36ef98913 libXpm-3.5.5.tar.bz2 348411
diff --git a/x11-libs/libXpm/libXpm-3.5.5.ebuild b/x11-libs/libXpm/libXpm-3.5.5.ebuild
deleted file mode 100644
index 8454338fd123..000000000000
--- a/x11-libs/libXpm/libXpm-3.5.5.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXpm/libXpm-3.5.5.ebuild,v 1.8 2006/08/19 14:38:51 vapier Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-inherit x-modular
-
-DESCRIPTION="X.Org Xpm library"
-
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-
-RDEPEND="x11-libs/libX11
- x11-libs/libXt
- x11-libs/libXext"
-DEPEND="${RDEPEND}
- x11-proto/xproto"
diff --git a/x11-libs/libXrandr/ChangeLog b/x11-libs/libXrandr/ChangeLog
index 1494a01e6db5..6488d3e74af4 100644
--- a/x11-libs/libXrandr/ChangeLog
+++ b/x11-libs/libXrandr/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for x11-libs/libXrandr
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXrandr/ChangeLog,v 1.42 2007/09/08 07:46:10 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXrandr/ChangeLog,v 1.43 2007/10/09 09:28:42 dberkholz Exp $
+
+ 09 Oct 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+ -files/drop-extra-unlockdisplay.patch, -libXrandr-1.1.1.ebuild,
+ -libXrandr-1.1.1-r1.ebuild, -libXrandr-1.1.2.ebuild:
+ Drop old ebuilds.
*libXrandr-1.2.2 (08 Sep 2007)
diff --git a/x11-libs/libXrandr/files/digest-libXrandr-1.1.1 b/x11-libs/libXrandr/files/digest-libXrandr-1.1.1
deleted file mode 100644
index f7c5c3e30a2d..000000000000
--- a/x11-libs/libXrandr/files/digest-libXrandr-1.1.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 000374333b982ff13b30c2fc49ac41f8 libXrandr-1.1.1.tar.bz2 231984
-RMD160 90377bb35682dd4fc0c171b92ad4fcb5efa10dfe libXrandr-1.1.1.tar.bz2 231984
-SHA256 4ffb4ca0af47eb88a1a4643acbae1c2257ce7a6b237f71e0a2ef14b81f396562 libXrandr-1.1.1.tar.bz2 231984
diff --git a/x11-libs/libXrandr/files/digest-libXrandr-1.1.1-r1 b/x11-libs/libXrandr/files/digest-libXrandr-1.1.1-r1
deleted file mode 100644
index f7c5c3e30a2d..000000000000
--- a/x11-libs/libXrandr/files/digest-libXrandr-1.1.1-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 000374333b982ff13b30c2fc49ac41f8 libXrandr-1.1.1.tar.bz2 231984
-RMD160 90377bb35682dd4fc0c171b92ad4fcb5efa10dfe libXrandr-1.1.1.tar.bz2 231984
-SHA256 4ffb4ca0af47eb88a1a4643acbae1c2257ce7a6b237f71e0a2ef14b81f396562 libXrandr-1.1.1.tar.bz2 231984
diff --git a/x11-libs/libXrandr/files/digest-libXrandr-1.1.2 b/x11-libs/libXrandr/files/digest-libXrandr-1.1.2
deleted file mode 100644
index 15d4ac104f91..000000000000
--- a/x11-libs/libXrandr/files/digest-libXrandr-1.1.2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 962946952a01650bb43206043a3c0e12 libXrandr-1.1.2.tar.bz2 235234
-RMD160 0bef3ed77b1e477d8e012d87704ee253ba5ee9ec libXrandr-1.1.2.tar.bz2 235234
-SHA256 ba5adedc37da835a5c9e5a5d457dce13feead64fc364bc4719c41720ca0a3c50 libXrandr-1.1.2.tar.bz2 235234
diff --git a/x11-libs/libXrandr/files/drop-extra-unlockdisplay.patch b/x11-libs/libXrandr/files/drop-extra-unlockdisplay.patch
deleted file mode 100644
index b8cb8537d515..000000000000
--- a/x11-libs/libXrandr/files/drop-extra-unlockdisplay.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- src/Xrandr.c
-+++ src/Xrandr.c
-@@ -390,11 +390,11 @@ Status XRRQueryVersion (Display *dpy,
- xrri->major_version = rep.majorVersion;
- xrri->minor_version = rep.minorVersion;
- xrri->has_rates = _XRRHasRates (xrri->major_version, xrri->minor_version);
-+ UnlockDisplay (dpy);
-+ SyncHandle ();
- }
- *major_versionp = xrri->major_version;
- *minor_versionp = xrri->minor_version;
-- UnlockDisplay (dpy);
-- SyncHandle ();
- return 1;
- }
diff --git a/x11-libs/libXrandr/libXrandr-1.1.1-r1.ebuild b/x11-libs/libXrandr/libXrandr-1.1.1-r1.ebuild
deleted file mode 100644
index dc0696053ba1..000000000000
--- a/x11-libs/libXrandr/libXrandr-1.1.1-r1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXrandr/libXrandr-1.1.1-r1.ebuild,v 1.1 2006/10/13 04:11:14 joshuabaergen Exp $
-
-# Must be before x-modular eclass is inherited
-# SNAPSHOT="yes"
-
-inherit x-modular
-
-DESCRIPTION="X.Org Xrandr library"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-
-RDEPEND="x11-libs/libX11
- x11-libs/libXext
- x11-libs/libXrender
- x11-proto/randrproto
- x11-proto/xproto"
-DEPEND="${RDEPEND}
- x11-proto/renderproto"
-
-PATCHES="${FILESDIR}/drop-extra-unlockdisplay.patch"
diff --git a/x11-libs/libXrandr/libXrandr-1.1.1.ebuild b/x11-libs/libXrandr/libXrandr-1.1.1.ebuild
deleted file mode 100644
index 19e1272d5897..000000000000
--- a/x11-libs/libXrandr/libXrandr-1.1.1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXrandr/libXrandr-1.1.1.ebuild,v 1.8 2006/09/10 09:11:12 vapier Exp $
-
-# Must be before x-modular eclass is inherited
-# SNAPSHOT="yes"
-
-inherit x-modular
-
-DESCRIPTION="X.Org Xrandr library"
-
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-
-RDEPEND="x11-libs/libX11
- x11-libs/libXext
- x11-libs/libXrender
- x11-proto/randrproto
- x11-proto/xproto"
-DEPEND="${RDEPEND}
- x11-proto/renderproto"
diff --git a/x11-libs/libXrandr/libXrandr-1.1.2.ebuild b/x11-libs/libXrandr/libXrandr-1.1.2.ebuild
deleted file mode 100644
index f1ff75f601e5..000000000000
--- a/x11-libs/libXrandr/libXrandr-1.1.2.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXrandr/libXrandr-1.1.2.ebuild,v 1.1 2006/10/22 18:04:03 joshuabaergen Exp $
-
-# Must be before x-modular eclass is inherited
-# SNAPSHOT="yes"
-
-inherit x-modular
-
-DESCRIPTION="X.Org Xrandr library"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-
-RDEPEND="x11-libs/libX11
- x11-libs/libXext
- x11-libs/libXrender
- x11-proto/randrproto
- x11-proto/xproto"
-DEPEND="${RDEPEND}
- x11-proto/renderproto"
diff --git a/x11-libs/libXrender/ChangeLog b/x11-libs/libXrender/ChangeLog
index 802a7a755ca6..a73016f2c202 100644
--- a/x11-libs/libXrender/ChangeLog
+++ b/x11-libs/libXrender/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for x11-libs/libXrender
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXrender/ChangeLog,v 1.42 2007/09/08 07:49:21 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXrender/ChangeLog,v 1.43 2007/10/09 09:32:42 dberkholz Exp $
+
+ 09 Oct 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+ -libXrender-0.9.1.ebuild:
+ Drop old ebuilds.
08 Sep 2007; Donnie Berkholz <dberkholz@gentoo.org>;
-libXrender-0.9.3.ebuild:
diff --git a/x11-libs/libXrender/files/digest-libXrender-0.9.1 b/x11-libs/libXrender/files/digest-libXrender-0.9.1
deleted file mode 100644
index bf22a1a3f1f7..000000000000
--- a/x11-libs/libXrender/files/digest-libXrender-0.9.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 220e15bb5e0ae23b6af99dd2e0b70a7f libXrender-0.9.1.tar.bz2 240508
-RMD160 94ce1f31b308ffed3e95377ceaede7ce84cc6f23 libXrender-0.9.1.tar.bz2 240508
-SHA256 e62dd180aa09da94ea08873794157bd73adc8646949db8b11ac3f89236b2de8a libXrender-0.9.1.tar.bz2 240508
diff --git a/x11-libs/libXrender/libXrender-0.9.1.ebuild b/x11-libs/libXrender/libXrender-0.9.1.ebuild
deleted file mode 100644
index e2f2e0e2bc62..000000000000
--- a/x11-libs/libXrender/libXrender-0.9.1.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXrender/libXrender-0.9.1.ebuild,v 1.9 2007/02/04 18:25:53 joshuabaergen Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-inherit x-modular
-
-DESCRIPTION="X.Org Xrender library"
-
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-
-RDEPEND="x11-libs/libX11
- x11-proto/renderproto
- x11-proto/xproto"
-DEPEND="${RDEPEND}"
diff --git a/x11-libs/libXtst/ChangeLog b/x11-libs/libXtst/ChangeLog
index 7e8040d6bbd3..184bebd3f2b4 100644
--- a/x11-libs/libXtst/ChangeLog
+++ b/x11-libs/libXtst/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for x11-libs/libXtst
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXtst/ChangeLog,v 1.37 2007/09/29 10:20:42 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXtst/ChangeLog,v 1.38 2007/10/09 09:31:51 dberkholz Exp $
+
+ 09 Oct 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+ -libXtst-1.0.1.ebuild:
+ Drop old ebuilds.
29 Sep 2007; Raúl Porcel <armin76@gentoo.org> libXtst-1.0.2.ebuild:
sparc stable wrt #191615
diff --git a/x11-libs/libXtst/files/digest-libXtst-1.0.1 b/x11-libs/libXtst/files/digest-libXtst-1.0.1
deleted file mode 100644
index 2ba179c00841..000000000000
--- a/x11-libs/libXtst/files/digest-libXtst-1.0.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 0ba567531ff9ac1ff9da0653f8a161b3 libXtst-1.0.1.tar.bz2 212511
-RMD160 39d0f978ddadfc0bca1f8dd26ffe5d6be6f04062 libXtst-1.0.1.tar.bz2 212511
-SHA256 7348de3c303075df4457b15b47e75096d909e9ffada80773c660bb956ceea882 libXtst-1.0.1.tar.bz2 212511
diff --git a/x11-libs/libXtst/libXtst-1.0.1.ebuild b/x11-libs/libXtst/libXtst-1.0.1.ebuild
deleted file mode 100644
index 7d7a1c4a1e4e..000000000000
--- a/x11-libs/libXtst/libXtst-1.0.1.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXtst/libXtst-1.0.1.ebuild,v 1.16 2007/09/11 21:00:33 dberkholz Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-inherit x-modular
-
-DESCRIPTION="X.Org Xtst library"
-
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-
-RDEPEND="x11-libs/libX11
- x11-proto/recordproto
- x11-libs/libXext"
-DEPEND="${RDEPEND}
- x11-proto/inputproto"