Bump to RC2. Mainly adds xcb-related and compose fixes.

(Portage version: 2.1.2_rc1-r2)
 (Unsigned Manifest commit)

6 files changed, 12 insertions, 199 deletions

diff --git a/x11-libs/libX11/Manifest b/x11-libs/libX11/Manifest
index 59d27d5338ac..5a63520090c9 100644
--- a/x11-libs/libX11/Manifest
+++ b/x11-libs/libX11/Manifest
@@ -1,14 +1,10 @@
-AUX 1.0.99.1-xcb-xkb-fixes.patch 3127 RMD160 5a03057cddf791cc5e79d9d9333d278db09fe518 SHA1 47a6dd49bd96a6d167d7167fde15e58024529658 SHA256 afbde2746338922c015fb9ecff436aee18ca70e398eba824b7c0180432262ab4
-MD5 89479837b399b631187960547e6df0f7 files/1.0.99.1-xcb-xkb-fixes.patch 3127
-RMD160 5a03057cddf791cc5e79d9d9333d278db09fe518 files/1.0.99.1-xcb-xkb-fixes.patch 3127
-SHA256 afbde2746338922c015fb9ecff436aee18ca70e398eba824b7c0180432262ab4 files/1.0.99.1-xcb-xkb-fixes.patch 3127
 AUX libX11-1.0.1-setuid.diff 420 RMD160 ef71b233e75c840f3a9a8c6ae94518bd085b878c SHA1 6e2b6a43d394a474b8b731abb8d811625845421c SHA256 449fea81081687314061e465ce6586ad0f41d8dd5b0370dc0ab1ef318407a903
 MD5 4b14554b64e4a8b1ec3c2b85cb5199b6 files/libX11-1.0.1-setuid.diff 420
 RMD160 ef71b233e75c840f3a9a8c6ae94518bd085b878c files/libX11-1.0.1-setuid.diff 420
 SHA256 449fea81081687314061e465ce6586ad0f41d8dd5b0370dc0ab1ef318407a903 files/libX11-1.0.1-setuid.diff 420
 DIST libX11-1.0.1.tar.bz2 1419629 RMD160 a4a2a1c7499ceeb29efa4357aa5b4529416e732d SHA1 af207d7eaa59c08d2e9bd8313ebc906b203c26d5 SHA256 f99e4ce6d8e3b8833957978fe22223897b0e636c83580f2b07eff0388eb75294
 DIST libX11-1.0.3.tar.bz2 1449835 RMD160 285a878a8ec9ecbd86e67897ca15ce96c994f38a SHA1 ec0493d3669862a9a4f9955532e3bd73b0806be1 SHA256 fb42f2400c3709a0c2c17f27cc4a902c191ebd6228c70698891bf3a13ea5b3ac
-DIST libX11-1.0.99.1.tar.bz2 1422144 RMD160 ae7a4ba107efdc9acb573ffff025312100af366e SHA1 6f6a2c05359c557207c49a2ddfec53a54c6a8610 SHA256 66fc9b1f59100ca9cc7fa4dd8840fb28b1e968ef3e5ad34e178fca1de373fdcf
+DIST libX11-1.0.99.2.tar.bz2 1421714 RMD160 1c9d280cc3f0b5f08f26bedecd9875e4d0a74981 SHA1 fac2945814988defec2a7213270f1ff07f5c9510 SHA256 8d9f00f627bf70e835e191e2e0403d2420ec0482cbead4ea96acabce6c340bda
 EBUILD libX11-1.0.1-r1.ebuild 1022 RMD160 ac36eefd98961828940993b0336de7b57f6e13e2 SHA1 247c66f6eea57c37997a0cf9a154ad2d2a28c198 SHA256 a75340f1b1e3257a06e3835d080bda1c93b200e6ba009746d4093af7da56f225
 MD5 d3450fbbb9541009c197ee68497c9a78 libX11-1.0.1-r1.ebuild 1022
 RMD160 ac36eefd98961828940993b0336de7b57f6e13e2 libX11-1.0.1-r1.ebuild 1022
@@ -17,18 +13,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.1-r1.ebuild 965 RMD160 ab13a22d791b7c2478352a32ee7af55677eacac3 SHA1 e0adb329cdc7c30b6082782b0a39891ca1a97547 SHA256 d7ef480977fa8f1a946dd83bd3ead4da57c80fe078ef699bf4073b94552ca16a
-MD5 ad68ffed60036528efb9a8acbff03b73 libX11-1.0.99.1-r1.ebuild 965
-RMD160 ab13a22d791b7c2478352a32ee7af55677eacac3 libX11-1.0.99.1-r1.ebuild 965
-SHA256 d7ef480977fa8f1a946dd83bd3ead4da57c80fe078ef699bf4073b94552ca16a libX11-1.0.99.1-r1.ebuild 965
-EBUILD libX11-1.0.99.1.ebuild 913 RMD160 ba938b2a5cfc46a3b9f1601bad740903c2375d76 SHA1 b8b4df1bc5cdd854b63848930a82abcaaf306c11 SHA256 8d97c4422f2f589ff019a9168d5f919dcef111ca758de6c8913d62a562652801
-MD5 7ec245f7c35450ce605a46ecd622ebf5 libX11-1.0.99.1.ebuild 913
-RMD160 ba938b2a5cfc46a3b9f1601bad740903c2375d76 libX11-1.0.99.1.ebuild 913
-SHA256 8d97c4422f2f589ff019a9168d5f919dcef111ca758de6c8913d62a562652801 libX11-1.0.99.1.ebuild 913
-MISC ChangeLog 7930 RMD160 3ab4b1c1654d7ece29cb254e1e037d5ee096bb8e SHA1 7e11c7d6aa70710789cc3e8c8b174461f1b504ff SHA256 0bf3000203f575d25868d5926bca3f425962a71b211d4d8c8d1e6f3dafce25d2
-MD5 0e0066c17b2365197accdec061353db4 ChangeLog 7930
-RMD160 3ab4b1c1654d7ece29cb254e1e037d5ee096bb8e ChangeLog 7930
-SHA256 0bf3000203f575d25868d5926bca3f425962a71b211d4d8c8d1e6f3dafce25d2 ChangeLog 7930
+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 8202 RMD160 0261eee81b36222c53a3a6c148c3dece7ccf0704 SHA1 a595aeb3b0757daf21d0dda80dbfa471aeb6c72a SHA256 08f2a1b62dc572eb3b35de8f3faf1c66d06fff0035a7ed86b1d3bb3450794835
+MD5 80dd93640f8b75fe00645cbabcf9f6a7 ChangeLog 8202
+RMD160 0261eee81b36222c53a3a6c148c3dece7ccf0704 ChangeLog 8202
+SHA256 08f2a1b62dc572eb3b35de8f3faf1c66d06fff0035a7ed86b1d3bb3450794835 ChangeLog 8202
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
 MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 metadata.xml 156
@@ -39,9 +31,6 @@ SHA256 383a58011d7a56f6beda376134a47cb5e5a9791d62285351190c5b7813d63b9b files/di
 MD5 c2605996befd61bca63d1e5086050b82 files/digest-libX11-1.0.3 244
 RMD160 94a7b21c7a2ee6f64f727e6717fee436c2c488f0 files/digest-libX11-1.0.3 244
 SHA256 01a16adda21f478b9664fa0c138e6bcce7e0fbbe8e27237874f7f340f7b3ee7b files/digest-libX11-1.0.3 244
-MD5 615704d8c31ea02155267f9d21bdba45 files/digest-libX11-1.0.99.1 253
-RMD160 ab7dbb86c5ad99d3d4a8b4db321e9aab8d82d653 files/digest-libX11-1.0.99.1 253
-SHA256 f90afb6b9d96e880678afd07f0e146d1d9b9b028cf70657f983a45aca7b2dd5d files/digest-libX11-1.0.99.1 253
-MD5 615704d8c31ea02155267f9d21bdba45 files/digest-libX11-1.0.99.1-r1 253
-RMD160 ab7dbb86c5ad99d3d4a8b4db321e9aab8d82d653 files/digest-libX11-1.0.99.1-r1 253
-SHA256 f90afb6b9d96e880678afd07f0e146d1d9b9b028cf70657f983a45aca7b2dd5d files/digest-libX11-1.0.99.1-r1 253
+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
diff --git a/x11-libs/libX11/files/1.0.99.1-xcb-xkb-fixes.patch b/x11-libs/libX11/files/1.0.99.1-xcb-xkb-fixes.patch
deleted file mode 100644
index 5bf095cc5738..000000000000
--- a/x11-libs/libX11/files/1.0.99.1-xcb-xkb-fixes.patch
+++ /dev/null
@@ -1,106 +0,0 @@
-diff --git a/src/xkb/XKBGeom.c b/src/xkb/XKBGeom.c
-index 02b03ba..fa652b2 100644
---- a/src/xkb/XKBGeom.c
-+++ b/src/xkb/XKBGeom.c
-@@ -632,21 +632,27 @@ XkbGetGeometry(Display *dpy,XkbDescPtr x
- {
- xkbGetGeometryReq	*req;
- xkbGetGeometryReply	 rep;
-+Status			 status;
- 
-     if ( (!xkb) || (dpy->flags & XlibDisplayNoXkb) ||
- 	(!dpy->xkb_info && !XkbUseExtension(dpy,NULL,NULL)))
- 	return BadAccess;
-     
-+    LockDisplay(dpy);
-     GetReq(kbGetGeometry, req);
-     req->reqType = dpy->xkb_info->codes->major_opcode;
-     req->xkbReqType = X_kbGetGeometry;
-     req->deviceSpec = xkb->device_spec;
-     req->name= None;
-     if (!_XReply(dpy, (xReply *)&rep, 0, xFalse))
--	return BadImplementation;
--    if (!rep.found)
--	return BadName;
--    return _XkbReadGetGeometryReply(dpy,&rep,xkb,NULL);
-+	status = BadImplementation;
-+    else if (!rep.found)
-+	status = BadName;
-+    else
-+	status = _XkbReadGetGeometryReply(dpy,&rep,xkb,NULL);
-+    UnlockDisplay(dpy);
-+    SyncHandle();
-+    return status;
- }
- 
- Status
-@@ -654,20 +660,26 @@ XkbGetNamedGeometry(Display *dpy,XkbDesc
- {
- xkbGetGeometryReq	*req;
- xkbGetGeometryReply	 rep;
-+Status			 status;
- 
-     if ( (name==None) || (dpy->flags & XlibDisplayNoXkb) ||
- 	(!dpy->xkb_info && !XkbUseExtension(dpy,NULL,NULL)) )
- 	return BadAccess;
-     
-+    LockDisplay(dpy);
-     GetReq(kbGetGeometry, req);
-     req->reqType = dpy->xkb_info->codes->major_opcode;
-     req->xkbReqType = X_kbGetGeometry;
-     req->deviceSpec = xkb->device_spec;
-     req->name= (CARD32)name;
-     if ((!_XReply(dpy, (xReply *)&rep, 0, xFalse))||(!rep.found))
--	return BadImplementation;
--    if (!rep.found)
--	return BadName;
--    return _XkbReadGetGeometryReply(dpy,&rep,xkb,NULL);
-+	status = BadImplementation;
-+    else if (!rep.found)
-+	status = BadName;
-+    else
-+	status = _XkbReadGetGeometryReply(dpy,&rep,xkb,NULL);
-+    UnlockDisplay(dpy);
-+    SyncHandle();
-+    return status;
- }
- 
-diff --git a/src/xkb/XKBGetMap.c b/src/xkb/XKBGetMap.c
-index 777f7cc..59e9962 100644
---- a/src/xkb/XKBGetMap.c
-+++ b/src/xkb/XKBGetMap.c
-@@ -823,8 +823,8 @@ XkbGetMapChanges(Display *dpy,XkbDescPtr
- 	req->firstVModMapKey = changes->first_vmodmap_key;
- 	req->nVModMapKeys = changes->num_vmodmap_keys;
- 	status= _XkbHandleGetMapReply(dpy, xkb);
--	SyncHandle();
- 	UnlockDisplay(dpy);
-+	SyncHandle();
- 	return status;
-     }
-     UnlockDisplay(dpy);
-diff --git a/src/xkb/XKBSetGeom.c b/src/xkb/XKBSetGeom.c
-index e070623..8e4d8b1 100644
---- a/src/xkb/XKBSetGeom.c
-+++ b/src/xkb/XKBSetGeom.c
-@@ -446,6 +446,7 @@ Status ret;
- 	(!dpy->xkb_info && !XkbUseExtension(dpy,NULL,NULL)))
- 	return BadAccess;
-     
-+    LockDisplay(dpy);
-     GetReq(kbSetGeometry, req);
-     req->reqType = dpy->xkb_info->codes->major_opcode;
-     req->xkbReqType = X_kbSetGeometry;
-diff --git a/src/xkb/XKBleds.c b/src/xkb/XKBleds.c
-index 89ab2e9..865342c 100644
---- a/src/xkb/XKBleds.c
-+++ b/src/xkb/XKBleds.c
-@@ -228,6 +228,8 @@ XkbGetNamedDeviceIndicator(	Display *		d
- 	SyncHandle();
- 	return False;
-     }
-+    UnlockDisplay(dpy);
-+    SyncHandle();
-     if ((!rep.found)||(!rep.supported))
- 	return False;
-     if (pNdxRtrn!=NULL)
diff --git a/x11-libs/libX11/files/digest-libX11-1.0.99.1 b/x11-libs/libX11/files/digest-libX11-1.0.99.1
deleted file mode 100644
index c0fdfac85db2..000000000000
--- a/x11-libs/libX11/files/digest-libX11-1.0.99.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 c7478cff2fe70f56a4f0ac503a0900df libX11-1.0.99.1.tar.bz2 1422144
-RMD160 ae7a4ba107efdc9acb573ffff025312100af366e libX11-1.0.99.1.tar.bz2 1422144
-SHA256 66fc9b1f59100ca9cc7fa4dd8840fb28b1e968ef3e5ad34e178fca1de373fdcf libX11-1.0.99.1.tar.bz2 1422144
diff --git a/x11-libs/libX11/files/digest-libX11-1.0.99.1-r1 b/x11-libs/libX11/files/digest-libX11-1.0.99.1-r1
deleted file mode 100644
index c0fdfac85db2..000000000000
--- a/x11-libs/libX11/files/digest-libX11-1.0.99.1-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 c7478cff2fe70f56a4f0ac503a0900df libX11-1.0.99.1.tar.bz2 1422144
-RMD160 ae7a4ba107efdc9acb573ffff025312100af366e libX11-1.0.99.1.tar.bz2 1422144
-SHA256 66fc9b1f59100ca9cc7fa4dd8840fb28b1e968ef3e5ad34e178fca1de373fdcf libX11-1.0.99.1.tar.bz2 1422144
diff --git a/x11-libs/libX11/libX11-1.0.99.1-r1.ebuild b/x11-libs/libX11/libX11-1.0.99.1-r1.ebuild
deleted file mode 100644
index 128d49b01940..000000000000
--- a/x11-libs/libX11/libX11-1.0.99.1-r1.ebuild
+++ /dev/null
@@ -1,33 +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.1-r1.ebuild,v 1.1 2006/10/12 19:26:58 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 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)
-
-PATCHES="${FILESDIR}/${PV}-xcb-xkb-fixes.patch"
diff --git a/x11-libs/libX11/libX11-1.0.99.1.ebuild b/x11-libs/libX11/libX11-1.0.99.1.ebuild
deleted file mode 100644
index 1df9751772ea..000000000000
--- a/x11-libs/libX11/libX11-1.0.99.1.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.1.ebuild,v 1.1 2006/10/09 01:58:51 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 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)