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

(Portage version: 2.2.0_alpha72/cvs/Linux x86_64)

3 files changed, 120 insertions, 1 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/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
+}