Fix automagic introspection, remove libtool-1 hack since libtool-2 has been stable for a long time

Package-Manager: portage-2.1.9.10/cvs/Linux x86_64

4 files changed, 154 insertions, 2 deletions

diff --git a/dev-python/pygobject/ChangeLog b/dev-python/pygobject/ChangeLog
index 5480c9e8abf3..1de10c096540 100644
--- a/dev-python/pygobject/ChangeLog
+++ b/dev-python/pygobject/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-python/pygobject
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pygobject/ChangeLog,v 1.99 2010/09/10 21:43:20 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygobject/ChangeLog,v 1.100 2010/09/26 11:41:01 nirbheek Exp $
+
+*pygobject-2.20.0-r1 (26 Sep 2010)
+
+  26 Sep 2010; <nirbheek@gentoo.org> +pygobject-2.20.0-r1.ebuild,
+  +files/pygobject-2.20.0-automagic-introspection.patch:
+  Fix automagic introspection, remove libtool-1 hack since libtool-2 has
+  been stable for a long time
 
   10 Sep 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
   pygobject-2.20.0.ebuild:
diff --git a/dev-python/pygobject/Manifest b/dev-python/pygobject/Manifest
index 6b3ce76eac6d..bc3078848dc3 100644
--- a/dev-python/pygobject/Manifest
+++ b/dev-python/pygobject/Manifest
@@ -2,8 +2,10 @@ AUX pygobject-2.15.4-fix-codegen-location.patch 1519 RMD160 e4721ae2d9a2d05e3b12
 AUX pygobject-2.18.0-automake111.patch 323 RMD160 182ea96cbb8fe28a93add0ef3dfd7710777615d8 SHA1 96c22e5bb8f07ea117248f4c8ca580474938c7af SHA256 4a94e9ca2a421a923c522ad4132c8988f22e74949f0361e231b6ba0ca813bc57
 AUX pygobject-2.18.0-make_check.patch 1589 RMD160 a2657fb299055620a745cb704ea3de289cdf8d63 SHA1 64ada13e6ac91845353855ed694ed951f63f583b SHA256 df43cef258567f824753caa0ba3a8d2820f729dac5ecba0d9fbf39a6f4861c4a
 AUX pygobject-2.18.0-support_multiple_python_versions.patch 2349 RMD160 054080d2a62b466ffe2ba9e182e5e796c652161f SHA1 d1ac7d308cb82caab4a5c56256ebd53b13cb9a3b SHA256 d66bcf31acf8b310ad346b9803d5e41d9840cfbca3c62d19b5c99f605c58066d
+AUX pygobject-2.20.0-automagic-introspection.patch 867 RMD160 13c58bcba041b93fa15c9eccdbc0d5f77b06617e SHA1 e1d97790a492f246695c68c9a69c7a1435c4262f SHA256 208bbc1d6c0f6baf03bf51b37fa450c69cde1d65c77b402c83bd742f11754cda
 AUX pygobject-2.20.0-tmpdir-makefile.patch 1817 RMD160 6e2032012f65a74ed140f777e0e7d5addfbc5c1f SHA1 ea47d992fed96f2cea63543232cc3b9ed9e160a9 SHA256 88245480666f05f302a6abd3ef52d8e3a581a2842774f52a484a02d2ea389699
 DIST pygobject-2.20.0.tar.bz2 666287 RMD160 5e3a8c976b3047b0dd9c492c8344ccd0ca77d3fd SHA1 a5954262051f376983bef6cc0e3fd1b0ca1824f7 SHA256 41e923a3f4426a3e19f6d154c424e3dac6f39defca77af602ac6272ce270fa81
+EBUILD pygobject-2.20.0-r1.ebuild 3302 RMD160 525f5e08f0029426737c479f3c891614f5576156 SHA1 9e1336ba1e35dd1da6d342d7d59f1f3a27781a01 SHA256 a6aace5d0b0171d5ead7fa65e6c3bff544eee5da53ae12e8091d15f9305ebf0b
 EBUILD pygobject-2.20.0.ebuild 3240 RMD160 c109a5308d1034b84053b5639d70902862778ac3 SHA1 260cf60d3c41dd4789f55cf56eb077cd4e9b5b0c SHA256 ac2a4c61dd2af6a1ba4889056422fa2d57143f8f4aabea1d051fd134094644ed
-MISC ChangeLog 14078 RMD160 56ea19f822c9d2be9c6be099d2297b6bc312b01c SHA1 9ca1ff0f1478ccb7226ddf5a918965ad939e030f SHA256 4b406fb55425b9fbc416eecbc5a78f914017e6bc8dfa9437f87e8601b0bc3e94
+MISC ChangeLog 14342 RMD160 758ffbbbd599a00770cdba0b4297b79e15779765 SHA1 28146d3e6d98e3fd7b5a313f474221a4b9158593 SHA256 6d6dc7ad37794b0f12d94f92f34564904cbf1db4ffd0597c2c66eb60755508ac
 MISC metadata.xml 282 RMD160 32fd779b50e24af15b5d30862d362cef786e2930 SHA1 6603342ce4d848c26dd1a585eeebc1b84198f2fa SHA256 116a6827697ff69c8f1971077502e9fa2b0d2fd23e57c97d4b54b3d1495597ca
diff --git a/dev-python/pygobject/files/pygobject-2.20.0-automagic-introspection.patch b/dev-python/pygobject/files/pygobject-2.20.0-automagic-introspection.patch
new file mode 100644
index 000000000000..0d50925683e9
--- /dev/null
+++ b/dev-python/pygobject/files/pygobject-2.20.0-automagic-introspection.patch
@@ -0,0 +1,20 @@
+--- configure.ac
++++ configure.ac
+@@ -201,8 +201,15 @@
+ fi
+ 
+ dnl gobject_introspection
+-PKG_CHECK_MODULES(GOBJECT_INTROSPECTION, gobject-introspection-1.0 >= gobject_introspection_required_version,
+-	have_gobject_introspection=true, have_gobject_introspection=false)
++AC_ARG_ENABLE(introspection,
++  AC_HELP_STRING([--enable-introspection], [Use introspection information]),
++  enable_introspection=$enableval,
++  enable_introspection=yes)
++have_gobject_introspection=false
++if test "$enable_introspection" = yes; then
++    PKG_CHECK_MODULES(GOBJECT_INTROSPECTION, gobject-introspection-1.0 >= gobject_introspection_required_version,
++        have_gobject_introspection=true, have_gobject_introspection=false)
++fi
+ AC_SUBST(GOBJECT_INTROSPECTION_CFLAGS)
+ AC_SUBST(GOBJECT_INTROSPECTION_LIBS)
+ AM_CONDITIONAL(BUILD_GOBJECT_INTROSPECTION, $have_gobject_introspection)
diff --git a/dev-python/pygobject/pygobject-2.20.0-r1.ebuild b/dev-python/pygobject/pygobject-2.20.0-r1.ebuild
new file mode 100644
index 000000000000..c280928c5c0c
--- /dev/null
+++ b/dev-python/pygobject/pygobject-2.20.0-r1.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygobject/pygobject-2.20.0-r1.ebuild,v 1.1 2010/09/26 11:41:01 nirbheek Exp $
+
+EAPI="2"
+SUPPORT_PYTHON_ABIS="1"
+PYTHON_DEPEND="2:2.5"
+RESTRICT_PYTHON_ABIS="2.4 3.*"
+
+inherit alternatives autotools gnome2 python virtualx
+
+DESCRIPTION="GLib's GObject library 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 ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc examples libffi test"
+
+# FIXME: add introspection support
+RDEPEND=">=dev-libs/glib-2.20
+	!<dev-python/pygtk-2.13
+	libffi? ( virtual/libffi )"
+DEPEND="${RDEPEND}
+	doc? ( dev-libs/libxslt >=app-text/docbook-xsl-stylesheets-1.70.1 )
+	test? ( media-fonts/font-cursor-misc media-fonts/font-misc-misc )
+	>=dev-util/pkgconfig-0.12.0"
+
+DOCS="AUTHORS ChangeLog* NEWS README"
+
+pkg_setup() {
+	G2CONF="${G2CONF}
+		--disable-dependency-tracking
+		--disable-introspection
+		$(use_enable doc docs)
+		$(use_with libffi ffi)"
+}
+
+src_prepare() {
+	gnome2_src_prepare
+
+	# Fix FHS compliance, see upstream bug #535524
+	epatch "${FILESDIR}/${PN}-2.15.4-fix-codegen-location.patch"
+
+	# Do not build tests if unneeded, bug #226345
+	epatch "${FILESDIR}/${PN}-2.18.0-make_check.patch"
+
+	# Support installation for multiple Python versions
+	epatch "${FILESDIR}/${PN}-2.18.0-support_multiple_python_versions.patch"
+
+	# Fix compilation with distcc, bug #299680
+	epatch "${FILESDIR}/${PN}-2.20.0-tmpdir-makefile.patch"
+
+	# Fix automagic introspection, not needed 2.21 onwards
+	epatch "${FILESDIR}/${P}-automagic-introspection.patch"
+
+	# disable pyc compiling
+	mv py-compile py-compile.orig
+	ln -s $(type -P true) py-compile
+
+	eautoreconf
+
+	python_copy_sources
+}
+
+src_configure() {
+	python_execute_function -s gnome2_src_configure
+}
+
+src_compile() {
+	python_execute_function -d -s
+}
+
+src_test() {
+	unset DBUS_SESSION_BUS_ADDRESS
+
+	testing() {
+		if has ${PYTHON_ABI} 2.4 2.5; then
+			einfo "Skipping tests with Python ${PYTHON_ABI}. dev-python/pycairo supports only Python >=2.6."
+			return 0
+		fi
+
+		Xemake check
+	}
+	python_execute_function -s testing
+}
+
+src_install() {
+	[[ -z ${ED} ]] && local ED="${D}"
+	installation() {
+		gnome2_src_install
+		mv "${ED}$(python_get_sitedir)/pygtk.py" "${ED}$(python_get_sitedir)/pygtk.py-2.0"
+		mv "${ED}$(python_get_sitedir)/pygtk.pth" "${ED}$(python_get_sitedir)/pygtk.pth-2.0"
+	}
+	python_execute_function -s installation
+
+	python_clean_installation_image
+
+	if use examples; then
+		insinto /usr/share/doc/${P}
+		doins -r examples
+	fi
+}
+
+pkg_postinst() {
+	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
+
+	python_mod_optimize gtk-2.0 pygtk.py
+}
+
+pkg_postrm() {
+	python_mod_cleanup gtk-2.0 pygtk.py
+
+	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
+}