Add a locking fix from upstream. Fixes more issues when xcb is enabled.

Package-Manager: portage-2.1.2_rc1-r6

diff --git a/x11-libs/libX11/Manifest b/x11-libs/libX11/Manifest
index b06933f4ec7b80668f3eaaa9b08ce378071f6468..4e3955a3e6fec9b430660acea25aa2ae25cd08b6 100644 (file)
--- a/x11-libs/libX11/Manifest
+++ b/x11-libs/libX11/Manifest
@@ -1,3 +1,7 @@
+AUX 1.0.99.2-xcb_callback_fix.patch 744 RMD160 5ac5520006cbb0e366ef4e81a8a1347d6756cdec SHA1 f24bb68004265a91650cfaff47149be6e8046312 SHA256 f8e9b4b37442aa736abc485171aeb63603bd1c6788e94ebe8cefbb5a89f892b8
+MD5 a60d40f7777b5aa8a81695d9d826cdde files/1.0.99.2-xcb_callback_fix.patch 744
+RMD160 5ac5520006cbb0e366ef4e81a8a1347d6756cdec files/1.0.99.2-xcb_callback_fix.patch 744
+SHA256 f8e9b4b37442aa736abc485171aeb63603bd1c6788e94ebe8cefbb5a89f892b8 files/1.0.99.2-xcb_callback_fix.patch 744
 AUX CVE-2006-5397.patch 296 RMD160 ea981004de4b539bc68545771a5e5b00e7f839de SHA1 da592b1cfd0eb7a0a2010cf4f9f016a10e40dc79 SHA256 35811c9174a2747a090e233a6e8588df6e2675b4a73bb4d9e9452ca3882e8d40
 MD5 a0f818494f1f9fa316a7dde11a80158b files/CVE-2006-5397.patch 296
 RMD160 ea981004de4b539bc68545771a5e5b00e7f839de files/CVE-2006-5397.patch 296
@@ -21,14 +25,14 @@ EBUILD libX11-1.0.3.ebuild 992 RMD160 ea902f97363a90db32e7b83d17a3142583059e39 S
 MD5 18edcc8f7292bd5132463bfc33c6751b libX11-1.0.3.ebuild 992
 RMD160 ea902f97363a90db32e7b83d17a3142583059e39 libX11-1.0.3.ebuild 992
 SHA256 762276b3ce0a1c4bbc1835186bd55758f468ba0700158845b26d04c4b981e980 libX11-1.0.3.ebuild 992
-EBUILD libX11-1.0.99.2.ebuild 917 RMD160 9a198f35fc6dab798692bd9a1e73c02cc1c92b72 SHA1 c92acef3817fcd1a8f6f5db7181494bce28a6962 SHA256 2fcb03c8e7dd69c15abef378c4753898828ae9faeb18462436f1b82230cb09cb
-MD5 173f86f731b6ed259b561aa3d3baf766 libX11-1.0.99.2.ebuild 917
-RMD160 9a198f35fc6dab798692bd9a1e73c02cc1c92b72 libX11-1.0.99.2.ebuild 917
-SHA256 2fcb03c8e7dd69c15abef378c4753898828ae9faeb18462436f1b82230cb09cb libX11-1.0.99.2.ebuild 917
-MISC ChangeLog 8412 RMD160 c78e9643b2c3b045a1c2852ce94fe6abac89e7e5 SHA1 71a1f6adc3c5ae8aac5e8a8939e539296427104c SHA256 2f8e203e1216e54a57a3b21d948240991aa0fb62577b0a04ac2203c6919e1be9
-MD5 42f4784ba00d63fe33f28171e0b57260 ChangeLog 8412
-RMD160 c78e9643b2c3b045a1c2852ce94fe6abac89e7e5 ChangeLog 8412
-SHA256 2f8e203e1216e54a57a3b21d948240991aa0fb62577b0a04ac2203c6919e1be9 ChangeLog 8412
+EBUILD libX11-1.0.99.2-r1.ebuild 1012 RMD160 d616263699f0497668f1055c0cfa0b19e45f34cf SHA1 5a1250fcfad0dff5a70eee53773395fc2eb807ae SHA256 6b4a58dbae7b2a2bdfebc033c659b037dd0afad27bffe369ba84c8716d80d9f6
+MD5 b7574119fd74eb4d2466425aa54b0101 libX11-1.0.99.2-r1.ebuild 1012
+RMD160 d616263699f0497668f1055c0cfa0b19e45f34cf libX11-1.0.99.2-r1.ebuild 1012
+SHA256 6b4a58dbae7b2a2bdfebc033c659b037dd0afad27bffe369ba84c8716d80d9f6 libX11-1.0.99.2-r1.ebuild 1012
+MISC ChangeLog 8677 RMD160 50ba8a63389aea986167c3099292c6b0bbec035c SHA1 f711dd1eddc3e513a81550fa5535e5c8fe5ed300 SHA256 8ccf46716452e312153f613a90037b54b78b30ef8e74891fb300fc0dc3e19c82
+MD5 377fa3dfda8d0630c6203a33dffc60e1 ChangeLog 8677
+RMD160 50ba8a63389aea986167c3099292c6b0bbec035c ChangeLog 8677
+SHA256 8ccf46716452e312153f613a90037b54b78b30ef8e74891fb300fc0dc3e19c82 ChangeLog 8677
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
 MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 metadata.xml 156
@@ -42,6 +46,6 @@ SHA256 01a16adda21f478b9664fa0c138e6bcce7e0fbbe8e27237874f7f340f7b3ee7b files/di
 MD5 c2605996befd61bca63d1e5086050b82 files/digest-libX11-1.0.3-r1 244
 RMD160 94a7b21c7a2ee6f64f727e6717fee436c2c488f0 files/digest-libX11-1.0.3-r1 244
 SHA256 01a16adda21f478b9664fa0c138e6bcce7e0fbbe8e27237874f7f340f7b3ee7b files/digest-libX11-1.0.3-r1 244
-MD5 f94e6f7863fd048cce1fe982fe34df22 files/digest-libX11-1.0.99.2 253
-RMD160 cf40e3ce2692d730428cea7414511fcb7c333f0a files/digest-libX11-1.0.99.2 253
-SHA256 1524eb41051b8b2dcfaec0d330463c4fc86ddc61e6a451225a6a9dfa86d2f971 files/digest-libX11-1.0.99.2 253
+MD5 f94e6f7863fd048cce1fe982fe34df22 files/digest-libX11-1.0.99.2-r1 253
+RMD160 cf40e3ce2692d730428cea7414511fcb7c333f0a files/digest-libX11-1.0.99.2-r1 253
+SHA256 1524eb41051b8b2dcfaec0d330463c4fc86ddc61e6a451225a6a9dfa86d2f971 files/digest-libX11-1.0.99.2-r1 253

diff --git a/x11-libs/libX11/files/digest-libX11-1.0.99.2 b/x11-libs/libX11/files/digest-libX11-1.0.99.2
deleted file mode 100644 (file)
index c27ad21..0000000
--- a/x11-libs/libX11/files/digest-libX11-1.0.99.2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 dd6926633daaf267ef39ad4f23622529 libX11-1.0.99.2.tar.bz2 1421714
-RMD160 1c9d280cc3f0b5f08f26bedecd9875e4d0a74981 libX11-1.0.99.2.tar.bz2 1421714
-SHA256 8d9f00f627bf70e835e191e2e0403d2420ec0482cbead4ea96acabce6c340bda libX11-1.0.99.2.tar.bz2 1421714

diff --git a/x11-libs/libX11/libX11-1.0.99.2.ebuild b/x11-libs/libX11/libX11-1.0.99.2.ebuild
deleted file mode 100644 (file)
index 45eaede..0000000
--- a/x11-libs/libX11/libX11-1.0.99.2.ebuild
+++ /dev/null
@@ -1,31 +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/libX11/libX11-1.0.99.2.ebuild,v 1.1 2006/11/03 06:38:24 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/inputproto
-       >=x11-proto/xproto-7.0.6
-       xcb? ( >=x11-libs/libxcb-0.9.92 )"
-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)
-       $(use_with xcb)"
-# xorg really doesn't like xlocale disabled.
-# $(use_enable nls xlocale)