x11-proto/xextproto: bump to 7.0.5 with patch from git

Package-Manager: portage-2.2_rc33/cvs/Linux i686

4 files changed, 77 insertions, 2 deletions

diff --git a/x11-proto/xextproto/ChangeLog b/x11-proto/xextproto/ChangeLog
index 8d0c263562d0..35cc8e984e53 100644
--- a/x11-proto/xextproto/ChangeLog
+++ b/x11-proto/xextproto/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-proto/xextproto
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-proto/xextproto/ChangeLog,v 1.37 2009/05/15 14:44:40 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-proto/xextproto/ChangeLog,v 1.38 2009/05/23 17:29:57 remi Exp $
+
+*xextproto-7.0.5 (23 May 2009)
+
+  23 May 2009; Rémi Cardona <remi@gentoo.org>
+  +files/7.0.5-dont-pull-in-Xmd-h-in-Xge-h.patch, +xextproto-7.0.5.ebuild:
+  bump to 7.0.5 with patch from git
 
   15 May 2009; Raúl Porcel <armin76@gentoo.org> xextproto-7.0.4.ebuild:
   arm/m68k/s390 stable
diff --git a/x11-proto/xextproto/Manifest b/x11-proto/xextproto/Manifest
index bce5bb45687c..02d7e77be482 100644
--- a/x11-proto/xextproto/Manifest
+++ b/x11-proto/xextproto/Manifest
@@ -1,8 +1,11 @@
+AUX 7.0.5-dont-pull-in-Xmd-h-in-Xge-h.patch 1410 RMD160 6a7f0b6179878c7a0cbaca4ad71567f2025d842b SHA1 89cdc7fbf0f442d932b06cc2aadccbf7f6a3681d SHA256 2682d24f5a3cd08dd6f0017bc9cc3078b3b9984a5de3a1ec5a701e1a34b99103
 DIST xextproto-7.0.2.tar.bz2 68323 RMD160 d1f6132065cc41d622cbce967a087f2f8e4d2a0e SHA1 724c82cb9f393ae3cf71a178c328608b17ccccac SHA256 53f3039ae769b08bd139d4474a7debe0b6f24048e7c514c835c8a1880f11e0d9
 DIST xextproto-7.0.3.tar.bz2 71648 RMD160 a39e2c42fec5fa7b6e5ac7517c8645dcfc1347a6 SHA1 4a59150f0d9400f3997df542828834969a2c4842 SHA256 3972428e3651c9159aff655c9c794728520c3ce3d66ac219ec5243d5d73d4db4
 DIST xextproto-7.0.4.tar.bz2 79268 RMD160 7290fcb45132b6a876d564bbbc6c023268e034f4 SHA1 cb5d78633eb909f706cf5904910083471c53089d SHA256 e27f723f4218908be96c28a8e0e740e9b31a00c97dad6aaa9a57b79fc0295614
+DIST xextproto-7.0.5.tar.bz2 80831 RMD160 52cbe5751387665050cb5d871d6376a8cc22c7ce SHA1 d62e704039e7c647da66c9a6531ebdede37dace8 SHA256 d33e1f3c96daad78667b2dfc14a1ce2ee3bdce19409f82cd5ede6c696ca5b042
 EBUILD xextproto-7.0.2.ebuild 494 RMD160 59f1b092fb56d6806b2e47285ff591da4b06a8d9 SHA1 2b9448a59b9fe6c594fc8c7f14b7115b5cd66e41 SHA256 df63757b84f88d862c1f1b05aaff6e024d68a65c0a1f983ed8da96dffef076c2
 EBUILD xextproto-7.0.3.ebuild 506 RMD160 2c514577620ae5454a1d4479586d121966dfa9e0 SHA1 2cec3e8003bd46b198deb288eee7d36e5be25d56 SHA256 9241c0b924b0a5430777d7cac2e5dd3979dcc4ab51461372532a04d8eb3a8929
 EBUILD xextproto-7.0.4.ebuild 498 RMD160 1ec6762b5f93305fee9ce951bc86b7520081383f SHA1 9b521ee55fa343112c300c3633060afee6055f28 SHA256 9b3d54e45c8c132ffff486066063f0e4236c01c03f407f6726a89265a4055500
-MISC ChangeLog 4481 RMD160 ce90b9326ff73b932523d15df8338ea3d4f4dca2 SHA1 4bb573c2dc5820a77b519e0c8fd99902a37b6d8e SHA256 fc5e7ac01e4329e40078f48bcb20537350e1c19cfd3a10dca44376bd230a0be4
+EBUILD xextproto-7.0.5.ebuild 573 RMD160 22ab720509fffb8a05c55f32e88e3b036179d3c3 SHA1 6eb221f64b06d52a90960fafd4646057d977e9e9 SHA256 804aab2f232fa269e31ee87bd9087e944dd186ce0e957976dffb67abaf296a74
+MISC ChangeLog 4669 RMD160 462e7cff0d9f599b4ce58624b2e580fc3c6bfc6a SHA1 f346f878ad811667d346b5babf5e12cf7ae88fe5 SHA256 4695eafc0f3d5962cfef3416b20fefbdc989bcab6328b65aa37ab99ac36c340c
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
diff --git a/x11-proto/xextproto/files/7.0.5-dont-pull-in-Xmd-h-in-Xge-h.patch b/x11-proto/xextproto/files/7.0.5-dont-pull-in-Xmd-h-in-Xge-h.patch
new file mode 100644
index 000000000000..98a9e976cca3
--- /dev/null
+++ b/x11-proto/xextproto/files/7.0.5-dont-pull-in-Xmd-h-in-Xge-h.patch
@@ -0,0 +1,46 @@
+From 7629def0733b82687f2879095451d72e42e13db7 Mon Sep 17 00:00:00 2001
+From: James Cloos <cloos@jhcloos.com>
+Date: Sat, 28 Mar 2009 18:20:38 +0000
+Subject: C sucks: define XEventClass in terms of unsigned int, not CARD32.
+
+Apparently pulling in Xmd.h here breaks qt, since they both define an
+INT32 type (and incompatible ones even, since Xmd's is unsigned long on
+ILP32 because whoever wrote Xmd.h is a C novice).
+
+(Based on inputproto commit b5cbe2d93f6c0129b8f29da97778f6d1b15c38f9.
+Patch submitted to xorg@ in <20090117121713.46bf3332@family.dyweni.com>.)
+---
+diff --git a/Xge.h b/Xge.h
+index cc03ece..51382ff 100644
+--- a/Xge.h
++++ b/Xge.h
+@@ -30,7 +30,6 @@
+ #ifndef _XGE_H_
+ #define _XGE_H_
+ 
+-#include <X11/Xmd.h>
+ #include <X11/Xlib.h>
+ #include <X11/Xfuncproto.h>
+ 
+@@ -39,12 +38,15 @@ _XFUNCPROTOBEGIN
+ /**
+  * Generic Event mask. 
+  * To be used whenever a list of masks per extension has to be provided.
++ *
++ * But, don't actually use the CARD{8,16,32} types.  We can't get them them
++ * defined here without polluting the namespace.
+  */
+ typedef struct {
+-    CARD8       extension;
+-    CARD8       pad0;
+-    CARD16      pad1;
+-    CARD32      evmask;
++    unsigned char       extension;
++    unsigned char       pad0;
++    unsigned short      pad1;
++    unsigned int      evmask;
+ } XGenericEventMask;
+ 
+ Bool XGEQueryExtension(Display* dpy, int *event_basep, int *err_basep);
+--
+cgit v0.8.2
diff --git a/x11-proto/xextproto/xextproto-7.0.5.ebuild b/x11-proto/xextproto/xextproto-7.0.5.ebuild
new file mode 100644
index 000000000000..baf705d8a54a
--- /dev/null
+++ b/x11-proto/xextproto/xextproto-7.0.5.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-proto/xextproto/xextproto-7.0.5.ebuild,v 1.1 2009/05/23 17:29:57 remi Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+
+inherit x-modular
+
+DESCRIPTION="X.Org XExt protocol headers"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+
+IUSE=""
+DEPEND="x11-proto/inputproto"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+"${FILESDIR}/${PV}-dont-pull-in-Xmd-h-in-Xge-h.patch"
+)