Add pkg-config libdir update from upstream for cross-compiling.

Package-Manager: portage-2.2.0_alpha72/cvs/Linux x86_64

4 files changed, 96 insertions, 2 deletions

diff --git a/x11-proto/xcb-proto/ChangeLog b/x11-proto/xcb-proto/ChangeLog
index a3787f65f9b0..ceb8f51215c8 100644
--- a/x11-proto/xcb-proto/ChangeLog
+++ b/x11-proto/xcb-proto/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-proto/xcb-proto
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-proto/xcb-proto/ChangeLog,v 1.62 2011/02/14 14:30:54 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-proto/xcb-proto/ChangeLog,v 1.63 2011/11/10 16:44:47 vapier Exp $
+
+*xcb-proto-1.6-r2 (10 Nov 2011)
+
+  10 Nov 2011; Mike Frysinger <vapier@gentoo.org> +files/1.6-libdir-pc.patch,
+  +xcb-proto-1.6-r2.ebuild:
+  Add pkg-config libdir update from upstream for cross-compiling.
 
   14 Feb 2011; Kacper Kowalik <xarthisius@gentoo.org>
   xcb-proto-1.6-r1.ebuild:
diff --git a/x11-proto/xcb-proto/Manifest b/x11-proto/xcb-proto/Manifest
index c2dbaad48455..23b205a14880 100644
--- a/x11-proto/xcb-proto/Manifest
+++ b/x11-proto/xcb-proto/Manifest
@@ -1,5 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX 1.6-fix_negative.patch 499 RMD160 3eefe90dfae305b472b289d522361eee036a8c54 SHA1 9c2008fc0b70ba8b832074549e9b53f5b3b91250 SHA256 c4587a19ba6f1659cf10c1238f8d5a5e7c63cd049525384590f9b695d5244c3b
+AUX 1.6-libdir-pc.patch 886 RMD160 6a8c0963ff23e245f946b4fbbfa0e3df738b6d98 SHA1 c369ebc82385a1bf755a199d1619262ac014cda9 SHA256 b89543824c17400d6f3cb8b2c9cd177f0c41359291a55815bb507e6eea972f2c
 DIST xcb-proto-1.6.tar.bz2 92829 RMD160 61ffea8c3ab4b745f04eccc10c64f7f1c356692c SHA1 e82418557c7f59f29da9ec18e0906d6d78e3a164 SHA256 f52bc1159b12496f002404eb5793c01277b20c82cb72c5ff076d7b25da9b5ca2
 EBUILD xcb-proto-1.6-r1.ebuild 1146 RMD160 505abf150d24ebe80fa830848d7a9447540c89a4 SHA1 28c092346a0bb71a841ac71ec4be0a1436eaff0c SHA256 a25352df38a1a2b02799b72458f83903259178d568017530f73a6fa17c8fc8f9
-MISC ChangeLog 7293 RMD160 52512f35651840364c1a98947f9e6dc2281a0777 SHA1 478cba34db3da4d2d6430c7bde1dcfdd5162977d SHA256 5735bf7f219c8e8df855547e788fd168722f0bd6ed335426c7aa6fcd6168c5fa
+EBUILD xcb-proto-1.6-r2.ebuild 1189 RMD160 68f5e0d3e5be776b72fca09cdfa9608b59b50520 SHA1 95e3a991b151e0e8979fdfc4dcd8e4460c8cd7aa SHA256 0ab650980d7644cd9d278d1413321d5fcc8290863f2f8260e34124198f8707e2
+MISC ChangeLog 7495 RMD160 ae0812333390fadd685f16cfeff0b636679ad401 SHA1 c7d49c92b7716d9a5958d9f04f04a16649525b21 SHA256 0ccbb0039eb524290ac6e48b314797c8638ff75cf9d55e16aeac731387dc8184
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iF4EAREIAAYFAk67/4YACgkQaC/OocHi7JaxbAEAgYu73omDRISg4Bd+s5GjXoOf
+2flMdbW7Xw9ZA0Q5GlMA/jGh7hImxFYrZOTUUfmK6BVzuw5Te4LGIYSBL4ERuxDB
+=ctMB
+-----END PGP SIGNATURE-----
diff --git a/x11-proto/xcb-proto/files/1.6-libdir-pc.patch b/x11-proto/xcb-proto/files/1.6-libdir-pc.patch
new file mode 100644
index 000000000000..f28fe9f8985d
--- /dev/null
+++ b/x11-proto/xcb-proto/files/1.6-libdir-pc.patch
@@ -0,0 +1,32 @@
+taken from upstream git
+
+From 7365eac2ee69125eed33d08a2a179dc99f201090 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Tue, 8 Nov 2011 16:56:03 -0500
+Subject: [PATCH] add libdir/exec_prefix to xcb-xproto.pc
+
+If we want to base other paths off of exec_prefix or libdir (like the
+python path), we can't because the xcb-proto.pc.in file omits those
+variables.  Add them so people can leverage them in their own builds.
+
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ xcb-proto.pc.in |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/xcb-proto.pc.in b/xcb-proto.pc.in
+index 6cbcf27..d312e6e 100644
+--- a/xcb-proto.pc.in
++++ b/xcb-proto.pc.in
+@@ -1,6 +1,8 @@
+ prefix=@prefix@
++exec_prefix=@exec_prefix@
+ datarootdir=@datarootdir@
+ datadir=@datadir@
++libdir=@libdir@
+ xcbincludedir=@xcbincludedir@
+ pythondir=@pythondir@
+ 
+-- 
+1.7.6.1
+
diff --git a/x11-proto/xcb-proto/xcb-proto-1.6-r2.ebuild b/x11-proto/xcb-proto/xcb-proto-1.6-r2.ebuild
new file mode 100644
index 000000000000..ee2a38b3b595
--- /dev/null
+++ b/x11-proto/xcb-proto/xcb-proto-1.6-r2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-proto/xcb-proto/xcb-proto-1.6-r2.ebuild,v 1.1 2011/11/10 16:44:47 vapier Exp $
+
+EAPI=3
+PYTHON_DEPEND="2:2.5"
+
+inherit python xorg-2
+
+DESCRIPTION="X C-language Bindings protocol headers"
+HOMEPAGE="http://xcb.freedesktop.org/"
+EGIT_REPO_URI="git://anongit.freedesktop.org/git/xcb/proto"
+[[ ${PV} != 9999* ]] && \
+	SRC_URI="http://xcb.freedesktop.org/dist/${P}.tar.bz2"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+PATCHES=(
+	"${FILESDIR}/1.6-fix_negative.patch"
+	"${FILESDIR}/1.6-libdir-pc.patch"
+)
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-libs/libxml2"
+
+pkg_setup() {
+	python_set_active_version 2
+}
+
+src_install() {
+	xorg-2_src_install
+	python_clean_installation_image
+}
+
+pkg_postinst() {
+	python_mod_optimize xcbgen
+	ewarn "Please rebuild both libxcb and xcb-util if you are upgrading from version 1.6"
+}
+
+pkg_postrm() {
+	python_mod_cleanup xcbgen
+}