summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDonnie Berkholz <dberkholz@gentoo.org>2007-10-09 09:27:35 +0000
committerDonnie Berkholz <dberkholz@gentoo.org>2007-10-09 09:27:35 +0000
commit6190da27931d89410fa57cefcbe94e083da7814d (patch)
tree6cc57ea40b7d0eead81399ef9618cc00c022b1f5 /x11-libs/libX11
parentDrop old ebuilds. (diff)
downloadgentoo-2-6190da27931d89410fa57cefcbe94e083da7814d.tar.gz
gentoo-2-6190da27931d89410fa57cefcbe94e083da7814d.tar.bz2
gentoo-2-6190da27931d89410fa57cefcbe94e083da7814d.zip
Drop old ebuilds.
(Portage version: 2.1.3.12)
Diffstat (limited to 'x11-libs/libX11')
-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
13 files changed, 8 insertions, 293 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)