Add libdir to pkg-config file for cross-compiling.

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

4 files changed, 127 insertions, 8 deletions

diff --git a/dev-python/pygtk/ChangeLog b/dev-python/pygtk/ChangeLog
index e315a23eceb4..cda8b6519d81 100644
--- a/dev-python/pygtk/ChangeLog
+++ b/dev-python/pygtk/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/pygtk
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pygtk/ChangeLog,v 1.262 2011/10/05 17:14:33 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygtk/ChangeLog,v 1.263 2011/11/10 22:34:48 vapier Exp $
+
+*pygtk-2.24.0-r2 (10 Nov 2011)
+
+  10 Nov 2011; Mike Frysinger <vapier@gentoo.org>
+  +files/pygtk-2.14.1-libdir-pc.patch, +pygtk-2.24.0-r2.ebuild:
+  Add libdir to pkg-config file for cross-compiling.
 
   05 Oct 2011; Kacper Kowalik <xarthisius@gentoo.org> pygtk-2.24.0-r1.ebuild:
   ppc/ppc64 stable wrt #369909
diff --git a/dev-python/pygtk/Manifest b/dev-python/pygtk/Manifest
index ccf81baf8d0b..f555ed68b27a 100644
--- a/dev-python/pygtk/Manifest
+++ b/dev-python/pygtk/Manifest
@@ -1,7 +1,8 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX pygtk-2.13.0-fix-codegen-location.patch 507 RMD160 30b49791ac11da80efae1ef0f3c7ccbb72fc82f9 SHA1 dc7d975fe4ebd95afba79cac6276c73f55a9961b SHA256 f446a7b3e3ac76a9ab594738b1fbf9105c1ca17e8053b1a8712a966e9cfe54d0
+AUX pygtk-2.14.1-libdir-pc.patch 284 RMD160 e76bfe61963c6e1e86ab52a4412c3888e77c75bb SHA1 09afec27b75b4c73c5aff0a9c9ea3f5892a0f1e2 SHA256 bdb29e2491558f8b10ed91ce85b0b05c4d300db4f9ef066e4220c97d202d14be
 AUX pygtk-2.22.0-disable-broken-tests.patch 1981 RMD160 79857fd2c32e818096eb13f64b67c6860d58d04c SHA1 013b874f4aed3fd5cf923145c08dd4bb1bed8b7a SHA256 9423ad98dd62aa11ef392c969676c99efc6b94609c06b8d32b0e96bef6d442ba
 AUX pygtk-2.22.0-wakeupfd-fix.patch 891 RMD160 31335487eee841295bd4e5cf8741ed42a168a216 SHA1 2f4be3b01fe9a2065c19aa08f5e3086c5c6aceb6 SHA256 97453082977367e710af789f7119819e376630aa1fd40f521d7bff95bc9b9958
 DIST pygtk-2.22.0.tar.bz2 2285379 RMD160 98fb89d32f36c97cc51bf4eb1aa38699bf010c8e SHA1 6a180d0c9ed19179662f51decb150b2c98cc9362 SHA256 4acf0ef2bde8574913c40ee4a43d9c4f43bb77b577b67147271b534501a54cc8
@@ -10,14 +11,13 @@ DIST pygtk-2.24.0.tar.bz2 2361097 RMD160 33f597def646261483cbbf5491aeb27bf0d22ea
 EBUILD pygtk-2.22.0-r1.ebuild 2758 RMD160 035cd450a214ce777d141ceece048e751050c257 SHA1 b76c96c2a585fdc66fb6def6d248b32c8265e408 SHA256 703dbe8d97f0b61eb5dac1c596825468a16f7f0b25b28b9e83165c7f7a487b8b
 EBUILD pygtk-2.23.2.ebuild 2546 RMD160 75709cf163c6766324e93818a26bf096efd623e9 SHA1 886363b86e9ae6adf7c437ff39748d9ea54ceb3d SHA256 85be250bac03ec387294c375a6773403cf2fac1485b3951889cc2a6491356078
 EBUILD pygtk-2.24.0-r1.ebuild 2576 RMD160 69e707ffdab297c03f17588cef3fe5827312a974 SHA1 d5f5a2d56cab864a887785e3009573edfe9f1ca6 SHA256 fbe23b2a69bb2c13aba47009e6f41f65205f46bb47fe7c79df0108d07316bf2a
-MISC ChangeLog 33364 RMD160 1338df9a1ed4d07a75575b82dfc8e0d2aba3aa68 SHA1 eb6ac0821d7b1b5fbc557f3ee11446e59d730a1b SHA256 378bfce5ba965a02ca59d7b7a388618d4c924a311f5ed167b51460cb1e9c0646
+EBUILD pygtk-2.24.0-r2.ebuild 2633 RMD160 a6141a29fcdbea9e98e4f622220cd3e4e36fdf73 SHA1 501b5fb1aee58e799a6245b2c4ebb59874ae7688 SHA256 9039b4db5850651f0f858703374a575f1033a06a4cb2133ba10b1f76aa0f0dc7
+MISC ChangeLog 33560 RMD160 9c7257c8ca6e3ee6c53783e737bd8a0fce529ebb SHA1 924152fea9aa3a4347b28b5ed8673020190926f6 SHA256 6cf21490cfbef415190bdcb9ab0cccb414d74ccc70fb3d878ff419b776bca9bb
 MISC metadata.xml 934 RMD160 5160cf3a201fe5209f575b0633ba8dd40d7b5ed5 SHA1 e62fb7156a43df5b3380a77f9ad7616130075f7d SHA256 6a0af6b71bbaca6634e59f933775fbf76053472b54ff3989bf26a065a4c9c426
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iJwEAQECAAYFAk6MkIAACgkQIiMqcbOVdxQY9AQAhWfKLMrzc3rN6PWAlIGmcbWE
-Ihclr94l9A1k/V3ZEcz3F8Qqqr9gdo8WTxYssL2+jhF/PEvVbW39aQ8eXhFO9BS8
-/30O7JdssvOkccEW1df4uDDQk9JbWpWX59jTskwTbNnSmbZdXGUIEwxJEdQ+rDnV
-Xf4mg1cRQuY114tJOIE=
-=704K
+iF4EAREIAAYFAk68UY8ACgkQaC/OocHi7Jb+DgD/RssLW8NZCE6vTSkeeewiM+2I
+BnAeOPDufi8ym+fQj6gA/irDxbaShQyifq62P8DhZd0hT9YmOqnT5/JQIDDcA3Ay
+=uzZ7
 -----END PGP SIGNATURE-----
diff --git a/dev-python/pygtk/files/pygtk-2.14.1-libdir-pc.patch b/dev-python/pygtk/files/pygtk-2.14.1-libdir-pc.patch
new file mode 100644
index 000000000000..d943e952a421
--- /dev/null
+++ b/dev-python/pygtk/files/pygtk-2.14.1-libdir-pc.patch
@@ -0,0 +1,12 @@
+https://bugzilla.gnome.org/show_bug.cgi?id=663421
+
+--- a/pygtk-2.0.pc.in
++++ b/pygtk-2.0.pc.in
+@@ -12,6 +12,7 @@
+ includedir=@includedir@
+ datarootdir=@datarootdir@
+ datadir=@datadir@
++libdir=@libdir@
+ pyexecdir=@pyexecdir@
+ 
+ # you can use the --variable=pygtkincludedir argument to
diff --git a/dev-python/pygtk/pygtk-2.24.0-r2.ebuild b/dev-python/pygtk/pygtk-2.24.0-r2.ebuild
new file mode 100644
index 000000000000..c12edd38bc36
--- /dev/null
+++ b/dev-python/pygtk/pygtk-2.24.0-r2.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygtk/pygtk-2.24.0-r2.ebuild,v 1.1 2011/11/10 22:34:48 vapier Exp $
+
+EAPI="3"
+GCONF_DEBUG="no"
+PYTHON_DEPEND="2:2.6"
+SUPPORT_PYTHON_ABIS="1"
+# dev-python/pycairo does not support Python 2.4 / 2.5.
+RESTRICT_PYTHON_ABIS="2.4 2.5 3.* *-jython"
+PYTHON_EXPORT_PHASE_FUNCTIONS="1"
+
+inherit alternatives autotools eutils flag-o-matic gnome.org python virtualx
+
+DESCRIPTION="GTK+2 bindings for Python"
+HOMEPAGE="http://www.pygtk.org/"
+
+LICENSE="LGPL-2.1"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc examples test"
+
+RDEPEND=">=dev-libs/glib-2.8:2
+	>=x11-libs/pango-1.16
+	>=dev-libs/atk-1.12
+	>=x11-libs/gtk+-2.24:2
+	>=dev-python/pycairo-1.0.2
+	>=dev-python/pygobject-2.21.3:2
+	dev-python/numpy
+	>=gnome-base/libglade-2.5:2.0
+"
+DEPEND="${RDEPEND}
+	doc? (
+		dev-libs/libxslt
+		>=app-text/docbook-xsl-stylesheets-1.70.1 )
+	>=dev-util/pkgconfig-0.9"
+
+src_prepare() {
+	# Fix declaration of codegen in .pc
+	epatch "${FILESDIR}/${PN}-2.13.0-fix-codegen-location.patch"
+	epatch "${FILESDIR}/${PN}-2.14.1-libdir-pc.patch"
+
+	# Disable pyc compiling
+	mv "${S}"/py-compile "${S}"/py-compile.orig
+	ln -s $(type -P true) "${S}"/py-compile
+
+	AT_M4DIR="m4" eautoreconf
+
+	python_copy_sources
+}
+
+src_configure() {
+	use hppa && append-flags -ffunction-sections
+	python_src_configure \
+		$(use_enable doc docs) \
+		--with-glade \
+		--enable-thread
+}
+
+src_test() {
+	unset DBUS_SESSION_BUS_ADDRESS
+
+	testing() {
+		cd tests
+		export XDG_CONFIG_HOME="${T}/$(PYTHON --ABI)"
+		Xemake check-local
+	}
+	python_execute_function -s testing
+}
+
+src_install() {
+	python_src_install
+	python_clean_installation_image
+	dodoc AUTHORS ChangeLog INSTALL MAPPING NEWS README THREADS TODO || die
+
+	if use examples; then
+		rm examples/Makefile*
+		insinto /usr/share/doc/${PF}
+		doins -r examples || die
+	fi
+}
+
+pkg_postinst() {
+	python_mod_optimize gtk-2.0
+
+	create_symlinks() {
+		alternatives_auto_makesym $(python_get_sitedir)/pygtk.py pygtk.py-[0-9].[0-9]
+		alternatives_auto_makesym $(python_get_sitedir)/pygtk.pth pygtk.pth-[0-9].[0-9]
+	}
+	python_execute_function create_symlinks
+}
+
+pkg_postrm() {
+	python_mod_cleanup gtk-2.0
+
+	create_symlinks() {
+		alternatives_auto_makesym $(python_get_sitedir)/pygtk.py pygtk.py-[0-9].[0-9]
+		alternatives_auto_makesym $(python_get_sitedir)/pygtk.pth pygtk.pth-[0-9].[0-9]
+	}
+	python_execute_function create_symlinks
+}