synced x11-libs/libxcb with portage tree

6 files changed, 10 insertions, 172 deletions

diff --git a/x11-libs/libxcb/ChangeLog b/x11-libs/libxcb/ChangeLog
deleted file mode 100644
index cce77517b..000000000
--- a/x11-libs/libxcb/ChangeLog
+++ /dev/null
@@ -1,88 +0,0 @@
-# ChangeLog for x11-libs/libxcb
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libxcb/ChangeLog,v 1.22 2008/07/30 22:38:05 dberkholz Exp $
-
-*libxcb-1.1.90.1 (30 Jul 2008)
-
-  30 Jul 2008; Donnie Berkholz <dberkholz@gentoo.org>;
-  +libxcb-1.1.90.1.ebuild:
-  Bump. Adds support for XInput and SELinux extensions, the
-  language-dependent parts of a Python parser, and other bugfixes.
-
-  07 Nov 2007; Donnie Berkholz <dberkholz@gentoo.org>; libxcb-1.1.ebuild:
-  Add a post-installation notice about the new sloppy locking.
-
-  07 Nov 2007; Donnie Berkholz <dberkholz@gentoo.org>; libxcb-1.1.ebuild:
-  Add USE=doc flag to skip the API docs.
-
-*libxcb-1.1 (07 Nov 2007)
-
-  07 Nov 2007; Donnie Berkholz <dberkholz@gentoo.org>; +libxcb-1.1.ebuild:
-  Bump. Adds that variable everyone's been clamoring for to stop apps from
-  dying: set LIBXCB_ALLOW_SLOPPY_LOCK to avoid aborting. Also has a number of
-  important bugfixes.
-
-  07 Nov 2007; Donnie Berkholz <dberkholz@gentoo.org>; libxcb-1.0.ebuild:
-  Update dep to pull in xcb-proto of the same version.
-
-  24 Jun 2007; Joshua Kinard <kumba@gentoo.org> libxcb-1.0.ebuild:
-  Stable on mips, per #175465.
-
-  21 Apr 2007; Joshua Baergen <joshuabaergen@gentoo.org>
-  -libxcb-0.9.93.ebuild:
-  Drop release candidate.
-
-  18 Apr 2007; Jose Luis Rivero <yoswink@gentoo.org> libxcb-1.0.ebuild:
-  Stable on alpha wrt security bug #172752
-
-  17 Apr 2007; Donnie Berkholz <dberkholz@gentoo.org>; libxcb-0.9.93.ebuild,
-  libxcb-1.0.ebuild:
-  (#174639) Update HOMEPAGE.
-
-  13 Apr 2007; Tobias Scherbaum <dertobi123@gentoo.org> libxcb-1.0.ebuild:
-  ppc stable, bug #172752
-
-  11 Apr 2007; Jeroen Roovers <jer@gentoo.org> libxcb-1.0.ebuild:
-  Stable for HPPA (bug #172752).
-
-  11 Apr 2007; Raúl Porcel <armin76@gentoo.org> libxcb-1.0.ebuild:
-  ia64 stable wrt security bug 172752
-
-  11 Apr 2007; Peter Weller <welp@gentoo.org> libxcb-1.0.ebuild:
-  Stable on amd64
-
-  11 Apr 2007; Markus Rothe <corsair@gentoo.org> libxcb-1.0.ebuild:
-  Stable on ppc64; bug #172752
-
-  22 Mar 2007; Gustavo Zacarias <gustavoz@gentoo.org> libxcb-1.0.ebuild:
-  Stable on sparc
-
-  21 Mar 2007; Christian Faulhammer <opfer@gentoo.org> libxcb-1.0.ebuild:
-  stable x86, security bug 170208
-
-  24 Nov 2006; Diego Pettenò <flameeyes@gentoo.org> libxcb-1.0.ebuild:
-  Add ~x86-fbsd keyword.
-
-  24 Nov 2006; Donnie Berkholz <dberkholz@gentoo.org>; libxcb-1.0.ebuild:
-  Dep on dev-libs/libpthread-stubs.
-
-*libxcb-1.0 (24 Nov 2006)
-
-  24 Nov 2006; Donnie Berkholz <dberkholz@gentoo.org>; +libxcb-1.0.ebuild:
-  Bump.
-
-  03 Nov 2006; Diego Pettenò <flameeyes@gentoo.org> libxcb-0.9.93.ebuild:
-  Remove ~x86-fbsd keyword as this release does not work correctly.
-
-*libxcb-0.9.93 (03 Nov 2006)
-
-  03 Nov 2006; Joshua Baergen <joshuabaergen@gentoo.org>
-  -libxcb-0.9.92.ebuild, +libxcb-0.9.93.ebuild:
-  Bump for XCB1.0RC3.
-
-*libxcb-0.9.92 (09 Oct 2006)
-
-  09 Oct 2006; Donnie Berkholz <dberkholz@gentoo.org>; +metadata.xml,
-  +libxcb-0.9.92.ebuild:
-  Add X C-language Bindings library.
-
diff --git a/x11-libs/libxcb/Manifest b/x11-libs/libxcb/Manifest
index 04cadbff8..074ebab46 100644
--- a/x11-libs/libxcb/Manifest
+++ b/x11-libs/libxcb/Manifest
@@ -1,9 +1,7 @@
-AUX xcb-0001-Receive-selected-replies-in-event-queue.patch 1656 RMD160 3e277074b725be7f7df358427b43a795b81803cf SHA1 f7e026aeb67d429184700facc10a161fe10d60fc SHA256 54b82f190833f57bd6980a84e0d6bd99f1bc351261b22ee595e5c05447fb5db2
-AUX xcb-0002-Use-XCB_QUEUE_BUFFER_SIZE-for-added-queue-declaration.patch 651 RMD160 5d89c5f538329a337a7276542d31b497935c98a9 SHA1 11cbc0184504f37a607d6d2d97fc9528afda5078 SHA256 678560113fa3229f7e83ca64a0d6a20c897a735fe1aa0df80e871a1f10d70c11
 DIST libxcb-1.1.90.1.tar.bz2 475250 RMD160 3e0639b4348fb8041b970d64ef28f23080c29884 SHA1 5d34433f5cb7febac9b3713c1549f53357fdeef7 SHA256 7ccd862a295562412e9fe75cb83cc593db5c88d162b3ce1f7a326dd116381e88
+DIST libxcb-1.1.tar.bz2 442755 RMD160 1c8c1d83ec71f7d1906373a679906615d9440f01 SHA1 b27c7eb86fd2ea43cea83cadcf20cc77abf5defe SHA256 338b9cb7886b49a5674881cd929def07449e47ffcc1886f4363359883c82d93f
 DIST libxcb-1.2.tar.bz2 323667 RMD160 0a1d18c44edf7696a5f4d079dfb6b7a98faf933c SHA1 12be595ce1e26da3b63e6a17a47ab9392259f10f SHA256 4fe14659ed0c5ceacec25ad6067a9521f85852280bc39c0375f5000ab133cb3f
-EBUILD libxcb-1.1.90.1.ebuild 1245 RMD160 f8253a4bb01f90013957bb1349f566e106f68d03 SHA1 809b032868cad51e3c02a68c6d05fac92146003e SHA256 1c6ed784adbc6f1c77b000cd0d81a1ec712794493c3d7de831c2694fb6faaa46
+EBUILD libxcb-1.1.90.1.ebuild 1264 RMD160 c94861b01695189d0af53e4f2625a37e08b7c865 SHA1 94434e80797ab57d73f63f058ce46f106cfe8095 SHA256 6cefb9b9dac3e08d975648aef1b31c9f8c74909354a6745a788e7396ad44724b
+EBUILD libxcb-1.1.ebuild 1189 RMD160 3554dc14241839cd994c05cbd34c025f18d1f49d SHA1 3450e55da3cd7c3aff78ffc347fcae29224bd9d4 SHA256 ad882bcfc5e18d95b87cf97be47c2c87dfae11ba820034dc59dbb69405461118
 EBUILD libxcb-1.2.ebuild 1103 RMD160 2e898971e18a50ab9f61594c38e688fedda4bed3 SHA1 e250c4abbd968ee31a7d2f88187897c8c3827991 SHA256 699386a97abcad90819a318c2669e487761aac4d63886665fd80ddb1a7758d35
 EBUILD libxcb-9999.ebuild 1143 RMD160 8173f8a4f36a87a419aa217f88e053190c65e376 SHA1 88bb1650741e8f074950bf3ae07681b4529b2e1e SHA256 008883d6f3a6d54b471020963bad589b7f571969a9b5c375b54e9a0b60d47b86
-MISC ChangeLog 3042 RMD160 e192a02f61e04f9b129aac7cf5fb7ce3082994d5 SHA1 b3a5b2d0fe0df7af18306940a1863a979592b903 SHA256 702460212ffa1ed36d3cb9ae661934cb306ca4a562e923480c599fd417ecf814
-MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
diff --git a/x11-libs/libxcb/files/xcb-0001-Receive-selected-replies-in-event-queue.patch b/x11-libs/libxcb/files/xcb-0001-Receive-selected-replies-in-event-queue.patch
deleted file mode 100644
index 5d6c034f7..000000000
--- a/x11-libs/libxcb/files/xcb-0001-Receive-selected-replies-in-event-queue.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 5e9cdc3321f6f273ae1844e7bee2e6ba6072243f Mon Sep 17 00:00:00 2001
-From: Jamey Sharp <jamey@minilop.net>
-Date: Thu, 18 Sep 2008 16:47:04 -0700
-Subject: [PATCH] Receive selected replies in event queue.
-
-Commit by Josh Triplett and Jamey Sharp.
----
- src/xcb_in.c |    5 +++--
- src/xcbext.h |    3 ++-
- 2 files changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/src/xcb_in.c b/src/xcb_in.c
-index f613772..2e32719 100644
---- a/src/xcb_in.c
-+++ b/src/xcb_in.c
-@@ -183,8 +183,9 @@ static int read_packet(xcb_connection_t *c)
-         ((xcb_generic_event_t *) buf)->full_sequence = c->in.request_read;
- 
-     /* reply, or checked error */
--    if( genrep.response_type == XCB_REPLY ||
--       (genrep.response_type == XCB_ERROR && pend && (pend->flags & XCB_REQUEST_CHECKED)))
-+    if(!(pend && (pend->flags & XCB_REQUEST_QUEUE_RESPONSE)) &&
-+       ((pend && (pend->flags & XCB_REQUEST_CHECKED) && genrep.response_type == XCB_ERROR) ||
-+        genrep.response_type == XCB_REPLY))
-     {
-         reader_list *reader;
-         struct reply_list *cur = malloc(sizeof(struct reply_list));
-diff --git a/src/xcbext.h b/src/xcbext.h
-index 01dd590..856ad3d 100644
---- a/src/xcbext.h
-+++ b/src/xcbext.h
-@@ -54,7 +54,8 @@ typedef struct {
- enum xcb_send_request_flags_t {
-     XCB_REQUEST_CHECKED = 1 << 0,
-     XCB_REQUEST_RAW = 1 << 1,
--    XCB_REQUEST_DISCARD_REPLY = 1 << 2
-+    XCB_REQUEST_DISCARD_REPLY = 1 << 2,
-+    XCB_REQUEST_QUEUE_RESPONSE = 1 << 3 /* Put the response in the event queue */
- };
- 
- unsigned int xcb_send_request(xcb_connection_t *c, int flags, struct iovec *vector, const xcb_protocol_request_t *request);
--- 
-1.6.0.2.307.gc427.dirty
-
diff --git a/x11-libs/libxcb/files/xcb-0002-Use-XCB_QUEUE_BUFFER_SIZE-for-added-queue-declaration.patch b/x11-libs/libxcb/files/xcb-0002-Use-XCB_QUEUE_BUFFER_SIZE-for-added-queue-declaration.patch
deleted file mode 100644
index 3d9f3abaa..000000000
--- a/x11-libs/libxcb/files/xcb-0002-Use-XCB_QUEUE_BUFFER_SIZE-for-added-queue-declaration.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From dca6cedea507095525fa0e606a7dc80dc970f3a7 Mon Sep 17 00:00:00 2001
-From: James Cloos <cloos@jhcloos.com>
-Date: Sat, 1 Nov 2008 12:01:45 -0400
-Subject: [PATCH] Use XCB_QUEUE_BUFFER_SIZE for added queue[] declaration
-
----
- src/xcbint.h |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/src/xcbint.h b/src/xcbint.h
-index dac0a61..6cac8e3 100644
---- a/src/xcbint.h
-+++ b/src/xcbint.h
-@@ -112,7 +112,7 @@ typedef struct _xcb_in {
-     pthread_cond_t event_cond;
-     int reading;
- 
--    char queue[4096];
-+    char queue[XCB_QUEUE_BUFFER_SIZE];
-     int queue_len;
- 
-     uint64_t request_expected;
--- 
-1.6.0.2.307.gc427.dirty
-
diff --git a/x11-libs/libxcb/libxcb-1.1.90.1.ebuild b/x11-libs/libxcb/libxcb-1.1.90.1.ebuild
index 37f8b55cf..e1e9370e9 100644
--- a/x11-libs/libxcb/libxcb-1.1.90.1.ebuild
+++ b/x11-libs/libxcb/libxcb-1.1.90.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libxcb/libxcb-1.1.90.1.ebuild,v 1.1 2008/07/30 22:38:05 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libxcb/libxcb-1.1.90.1.ebuild,v 1.2 2009/05/04 17:06:59 ssuominen Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -23,9 +23,11 @@ DEPEND="${RDEPEND}
 	dev-libs/libxslt
 	>=x11-proto/xcb-proto-1.2"
 
-CONFIGURE_OPTIONS="$(use_enable doc build-docs)
-	$(use_enable selinux xselinux)
-	--enable-xinput"
+pkg_setup() {
+	CONFIGURE_OPTIONS="$(use_enable doc build-docs)
+		$(use_enable selinux xselinux)
+		--enable-xinput"
+}
 
 pkg_postinst() {
 	x-modular_pkg_postinst
diff --git a/x11-libs/libxcb/metadata.xml b/x11-libs/libxcb/metadata.xml
deleted file mode 100644
index 01c4c004e..000000000
--- a/x11-libs/libxcb/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>x11</herd>
-</pkgmetadata>