Set SUPPORT_PYTHON_ABIS (bug #282857).

Package-Manager: portage-14166-svn/cvs/Linux x86_64

4 files changed, 190 insertions, 3 deletions

diff --git a/dev-python/pygobject/ChangeLog b/dev-python/pygobject/ChangeLog
index 9c3c1b2031a2..a33edfe5ca81 100644
--- a/dev-python/pygobject/ChangeLog
+++ b/dev-python/pygobject/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-python/pygobject
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pygobject/ChangeLog,v 1.75 2009/08/26 12:45:10 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygobject/ChangeLog,v 1.76 2009/08/27 18:34:35 arfrever Exp $
+
+*pygobject-2.18.0-r1 (27 Aug 2009)
+
+  27 Aug 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  +pygobject-2.18.0-r1.ebuild,
+  +files/pygobject-2.18.0-support_multiple_python_versions.patch:
+  Set SUPPORT_PYTHON_ABIS (bug #282857).
 
   26 Aug 2009; Tobias Klausmann <klausman@gentoo.org>
   pygobject-2.18.0.ebuild:
diff --git a/dev-python/pygobject/Manifest b/dev-python/pygobject/Manifest
index 12eaea400dd7..5dbc57374721 100644
--- a/dev-python/pygobject/Manifest
+++ b/dev-python/pygobject/Manifest
@@ -3,6 +3,7 @@ AUX pygobject-2.14.2-libffi.patch 796 RMD160 0aa01f1d2cdf602ab127658bd838f55a8db
 AUX pygobject-2.15.4-fix-codegen-location.patch 1519 RMD160 e4721ae2d9a2d05e3b129627c762acf177521974 SHA1 02e9446db952de3b934a264ce77648d2cd5c6d97 SHA256 6ab22def2c57a4dd44dedc787cb660dc326a62b518c3dc747fbe600ca2c20b8c
 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 1962 RMD160 6940925406af1074234019b831dc589b2652e948 SHA1 548b0e5cf45f5515a4bbadde190eb53b78fc391d SHA256 2e41b1120555ef72fd05a7b167e9dde7030af2f1c6dc4c9c721a54f0a1dc0817
 DIST pygobject-2.14.0.tar.bz2 360630 RMD160 71702329535680a813a36e05823d1968cb453b25 SHA1 f6867330c2a2d70ddb81807823e7515f55ddda23 SHA256 3a5919703f71c2d7059d02f03dc6566cbe86c6efb09a16730b7cdb4b0fbef9e8
 DIST pygobject-2.14.2.tar.bz2 366808 RMD160 c9894695d745a9d859f3edfb9e2946ad8b4fec3d SHA1 e891c3f1ad0d6f737d6c51b9be3eb363f7d11cbc SHA256 79c5d3ab8f072f1d0b102b2bd6410b0dc383a008b5efad1750d8b6dadfde8c6e
 DIST pygobject-2.15.4.tar.bz2 477302 RMD160 eecbf4a7969a7a81a50cf6e2b52d53d7d72d6b4e SHA1 dfc3f04a27243ac4c386bfd19e4c383dd419d040 SHA256 c746693328bfed7838a1f3bfac41b13d7f39a81ac961559cd0daf700fc677da7
@@ -15,6 +16,7 @@ EBUILD pygobject-2.15.4.ebuild 2186 RMD160 49d3a224ca0a05e605c05f0da58c5f5da5105
 EBUILD pygobject-2.16.0.ebuild 2295 RMD160 03069f9f486c6e21d32a9ce5c0d7098197df814c SHA1 8c0f2c1fb4f4c8de181e08740fbb6bf4a86509b6 SHA256 989117c44b877704dc96b3e61b9869c8365a472862c123b65601e0f2c93862c6
 EBUILD pygobject-2.16.1-r1.ebuild 2191 RMD160 69e472fb5e6fed2a29e3ef0adcd288791298b415 SHA1 3119f2852aa3ff9220af26560076809ae69f0e3d SHA256 1236fd892a156d5c549ca5171aa8fc57447596319fc168d14c0a1c7a2dcf5d60
 EBUILD pygobject-2.16.1.ebuild 2284 RMD160 035b3fe2fa009485734c8618d701c195f8c5c594 SHA1 bbe684b63e42890a71c3b61d7faba17a61187864 SHA256 c44843fe43db7350c23d4f2d9112be8f91967939b73fca5482be5cc76a78814e
+EBUILD pygobject-2.18.0-r1.ebuild 3120 RMD160 1c647641b94226aa53de2796bed44d167def2c70 SHA1 d8029268feb6e8fa4adcbe3a4e8f0692957ffec3 SHA256 394099ea347236b1a60ac04460b984e32c2fcb8162865c29fd7b743e5ac5c7a1
 EBUILD pygobject-2.18.0.ebuild 2476 RMD160 ecedc3cde9d293f8fe77fcc74817953bef2b81d1 SHA1 ce1d395cd17d325e6cf44eb43898c8cb5d655f0b SHA256 8a5061124b8218bed16e71b1764e1be333ddef029c7a8c76733fb245c588569f
-MISC ChangeLog 10300 RMD160 fad3bda926223c58c3145e392d3439f9333a60e3 SHA1 f1cfde8686503e5e41f831ee627a3f2560a88800 SHA256 ba1018ec78f3c4259d9d27d1c4dcedc65d362fb3ee3fbd6d818450bb93eac9c3
-MISC metadata.xml 263 RMD160 aa9b8ada798575f5d2b94042357d5ed59f4b1cbf SHA1 0843ae5e9b5a9a0ea54f4c79539bf781522e9b10 SHA256 993400d5ee19f0bd67c463d999d24e4184e8c077b4e535adf6a00678ced0c46c
+MISC ChangeLog 10548 RMD160 79de8120945c6e798c999aba5068ceee620129ee SHA1 c4bbf0d3f00662047624cc12fc4df68c2aca638f SHA256 f5617c3688ca2340e4defa18d8e7ac658b486ff01d03ba8926ae89bf2e48ee4e
+MISC metadata.xml 282 RMD160 32fd779b50e24af15b5d30862d362cef786e2930 SHA1 6603342ce4d848c26dd1a585eeebc1b84198f2fa SHA256 116a6827697ff69c8f1971077502e9fa2b0d2fd23e57c97d4b54b3d1495597ca
diff --git a/dev-python/pygobject/files/pygobject-2.18.0-support_multiple_python_versions.patch b/dev-python/pygobject/files/pygobject-2.18.0-support_multiple_python_versions.patch
new file mode 100644
index 000000000000..dd640c3837e5
--- /dev/null
+++ b/dev-python/pygobject/files/pygobject-2.18.0-support_multiple_python_versions.patch
@@ -0,0 +1,55 @@
+--- gio/Makefile.am
++++ gio/Makefile.am
+@@ -56,7 +56,7 @@
+ gio.c: $(GIO_DEFS) $(GIO_OVERRIDES)
+ _gio_la_CFLAGS = $(GIO_CFLAGS)
+ _gio_la_LDFLAGS = $(common_ldflags) -export-symbols-regex init_gio
+-_gio_la_LIBADD = $(GIO_LIBS) $(top_builddir)/glib/libpyglib-2.0-@PYTHON_BASENAME@.la
++_gio_la_LIBADD = $(GIO_LIBS) $(top_builddir)/glib/libpyglib-2.0-@PYTHON_BASENAME@@PYTHON_VERSION@.la
+ _gio_la_SOURCES = \
+ 	giomodule.c \
+ 	pygio-utils.c \
+--- glib/Makefile.am
++++ glib/Makefile.am
+@@ -4,7 +4,7 @@
+ pkgincludedir = $(includedir)/pygtk-2.0
+ pkginclude_HEADERS = pyglib.h
+ 
+-lib_LTLIBRARIES = libpyglib-2.0-@PYTHON_BASENAME@.la
++lib_LTLIBRARIES = libpyglib-2.0-@PYTHON_BASENAME@@PYTHON_VERSION@.la
+ 
+ pkgpyexecdir = $(pyexecdir)/gtk-2.0
+ 
+@@ -19,9 +19,9 @@
+ common_ldflags += -no-undefined
+ endif
+ 
+-libpyglib_2_0_@PYTHON_BASENAME@_la_CFLAGS = $(GLIB_CFLAGS)
+-libpyglib_2_0_@PYTHON_BASENAME@_la_LIBADD = $(GLIB_LIBS) $(FFI_LIBS)
+-libpyglib_2_0_@PYTHON_BASENAME@_la_SOURCES = 	\
++libpyglib_2_0_@PYTHON_BASENAME@@PYTHON_VERSION@_la_CFLAGS = $(GLIB_CFLAGS)
++libpyglib_2_0_@PYTHON_BASENAME@@PYTHON_VERSION@_la_LIBADD = $(GLIB_LIBS) $(FFI_LIBS)
++libpyglib_2_0_@PYTHON_BASENAME@@PYTHON_VERSION@_la_SOURCES = 	\
+ 	pyglib.c		\
+ 	pyglib.h		\
+ 	pyglib-private.h 	\
+@@ -29,7 +29,7 @@
+ 
+ _glib_la_CFLAGS = $(GLIB_CFLAGS)
+ _glib_la_LDFLAGS = $(common_ldflags) -export-symbols-regex "_glib|PyInit__glib"
+-_glib_la_LIBADD = $(GLIB_LIBS) libpyglib-2.0-@PYTHON_BASENAME@.la
++_glib_la_LIBADD = $(GLIB_LIBS) libpyglib-2.0-@PYTHON_BASENAME@@PYTHON_VERSION@.la
+ _glib_la_SOURCES = 	 	\
+ 	glibmodule.c	 	\
+ 	pygiochannel.c 	 	\
+--- gobject/Makefile.am
++++ gobject/Makefile.am
+@@ -42,7 +42,7 @@
+ _gobject_la_LIBADD = \
+ 	$(GLIB_LIBS) \
+ 	$(FFI_LIBS) \
+-	$(top_builddir)/glib/libpyglib-2.0-@PYTHON_BASENAME@.la
++	$(top_builddir)/glib/libpyglib-2.0-@PYTHON_BASENAME@@PYTHON_VERSION@.la
+ _gobject_la_SOURCES =           \
+         gobjectmodule.c         \
+         pygboxed.c              \
diff --git a/dev-python/pygobject/pygobject-2.18.0-r1.ebuild b/dev-python/pygobject/pygobject-2.18.0-r1.ebuild
new file mode 100644
index 000000000000..9f016d946675
--- /dev/null
+++ b/dev-python/pygobject/pygobject-2.18.0-r1.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygobject/pygobject-2.18.0-r1.ebuild,v 1.1 2009/08/27 18:34:35 arfrever Exp $
+
+EAPI="2"
+SUPPORT_PYTHON_ABIS="1"
+
+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 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="doc examples libffi test"
+
+RDEPEND=">=dev-lang/python-2.4.4-r5
+	>=dev-libs/glib-2.16
+	!<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"
+
+RESTRICT_PYTHON_ABIS="3*"
+
+DOCS="AUTHORS ChangeLog* NEWS README"
+
+pkg_setup() {
+	G2CONF="${G2CONF}
+		--disable-dependency-tracking
+		$(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}"/${P}-make_check.patch
+
+	# Do not install files twice, bug #279813
+	epatch "${FILESDIR}/${P}-automake111.patch"
+
+	# Support installation for multiple Python versions
+	epatch "${FILESDIR}/${P}-support_multiple_python_versions.patch"
+
+	# needed to build on a libtool-1 system, bug #255542
+	rm m4/lt* m4/libtool.m4 ltmain.sh
+
+	# 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() {
+	installation() {
+		gnome2_src_install
+		mv "${D}usr/bin/pygobject-codegen-2.0" "${D}usr/bin/pygobject-codegen-2.0-${PYTHON_ABI}"
+		mv "${D}$(python_get_sitedir)/pygtk.py" "${D}$(python_get_sitedir)/pygtk.py-2.0"
+		mv "${D}$(python_get_sitedir)/pygtk.pth" "${D}$(python_get_sitedir)/pygtk.pth-2.0"
+	}
+	python_execute_function -s installation
+
+	if use examples; then
+		insinto /usr/share/doc/${P}
+		doins -r examples
+	fi
+
+}
+
+pkg_postinst() {
+	python_need_rebuild
+
+	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
+
+	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
+}