From: Alexandre Rostovtsev Date: Wed, 19 Oct 2011 01:23:24 +0000 (+0000) Subject: New pygobject:3 (and compatible 2.28.6-r50), moved from the gnome overlay. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d85ee09c99d85c28f0a32e9c240980ecee1fbaed;p=gentoo.git New pygobject:3 (and compatible 2.28.6-r50), moved from the gnome overlay. Package-Manager: portage-2.2.0_alpha69/cvs/Linux x86_64 --- diff --git a/dev-python/pygobject/ChangeLog b/dev-python/pygobject/ChangeLog index 343128baad81..aa8cc6a05a93 100644 --- a/dev-python/pygobject/ChangeLog +++ b/dev-python/pygobject/ChangeLog @@ -1,6 +1,20 @@ # ChangeLog for dev-python/pygobject # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/pygobject/ChangeLog,v 1.125 2011/10/05 17:13:42 xarthisius Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/pygobject/ChangeLog,v 1.126 2011/10/19 01:23:24 tetromino Exp $ + +*pygobject-3.0.1 (19 Oct 2011) +*pygobject-2.28.6-r50 (19 Oct 2011) + + 19 Oct 2011; Alexandre Rostovtsev + +pygobject-2.28.6-r50.ebuild, +files/pygobject-2.90.1-make_check.patch, + +files/pygobject-3.0.0-support_multiple_python_versions.patch, + +pygobject-3.0.1.ebuild: + New pygobject:3, moved from the gnome overlay. Per upstream decision, + pygobject:2 (starting with 2.28.6-r50) will only be installing the "classic" + glib and gobject bindings; the new introspection-based bindings will be + provided only by pygobject:3. See + http://www.daa.com.au/pipermail/pygtk/2011-August/019920.html for a brief + introduction to pygobject:3 porting. 05 Oct 2011; Kacper Kowalik pygobject-2.28.6.ebuild: ppc/ppc64 stable wrt #369909 diff --git a/dev-python/pygobject/Manifest b/dev-python/pygobject/Manifest index 69bf10d888f4..bb4333efe2bb 100644 --- a/dev-python/pygobject/Manifest +++ b/dev-python/pygobject/Manifest @@ -1,5 +1,5 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 +Hash: SHA256 AUX pygobject-2.15.4-fix-codegen-location.patch 1519 RMD160 e4721ae2d9a2d05e3b129627c762acf177521974 SHA1 02e9446db952de3b934a264ce77648d2cd5c6d97 SHA256 6ab22def2c57a4dd44dedc787cb660dc326a62b518c3dc747fbe600ca2c20b8c AUX pygobject-2.18.0-support_multiple_python_versions.patch 2349 RMD160 054080d2a62b466ffe2ba9e182e5e796c652161f SHA1 d1ac7d308cb82caab4a5c56256ebd53b13cb9a3b SHA256 d66bcf31acf8b310ad346b9803d5e41d9840cfbca3c62d19b5c99f605c58066d @@ -12,18 +12,21 @@ AUX pygobject-2.28.3-disable-failing-tests.patch 1782 RMD160 fbb40f7ef721cd5f7f0 AUX pygobject-2.28.3-fix-codegen-location.patch 1948 RMD160 be495b6c8fe0123eda3bf4985899e2606b5746f5 SHA1 995170208849e6a8710e3024386f83f9984ba46c SHA256 eb16a71a8e3f45e965797ca99cc5d079b13a0f74dafc7976806d09ccd1f30476 AUX pygobject-2.28.3-make_check.patch 2705 RMD160 e59fee5df0cbb89c0d64aabdd5eb3033da0f3d80 SHA1 38e945ff7ba5ba1cd59493dfe88f6657317a6c6c SHA256 91ddf8f2d1d767f771b91568c1d669019cf4e302baf1dd2eeed4b41ff7cb75b6 AUX pygobject-2.28.3-support_multiple_python_versions.patch 3938 RMD160 2cc8e5c1d278ff7285a02b596b2cb285e011cc5a SHA1 8c6a215cc3d5e142db9dae5644fe27ced2da5b52 SHA256 7269f232a9b4ffe1c920c610796cb8f1dc5bcdc5cd5d03ebc7045f45d5f5d089 +AUX pygobject-2.90.1-make_check.patch 2572 RMD160 15fa252864308469a9d84ed3d0195fe38b329127 SHA1 a3daba6e1cd7b15663c6cae862236abd876a50aa SHA256 e665baf786eb565cd095ca1651a696264b112dcbc534593c4fa3da2d4e3b2ddf +AUX pygobject-3.0.0-support_multiple_python_versions.patch 2794 RMD160 3dd6dfc06063d7eca37c02a08b15c7d3c5615a12 SHA1 56311e3c80ff768d1f88ef635cae34441532cc1e SHA256 ee1e3182dadd4e585179916e4cff3836d2e4464663667a8f5afcf5949d3c000c DIST pygobject-2.26.0.tar.bz2 808427 RMD160 dd164d29232509f729fe7f766b18d1985eca73f6 SHA1 d091412760d44477e76ae995125c8fc5a15eae74 SHA256 5554acff9c27b647144143b0459359864e4a6f2ff62c7ba21cf310ad755cf7c7 DIST pygobject-2.28.6.tar.xz 747248 RMD160 4bc5e8546a5029d3d6b154629ab3fa4023d96bef SHA1 b1749ba806499f4c2780dbd1cbb363aaf1f41e78 SHA256 fb8a1d4f665130a125011659bd347c7339c944232163dbb9a34fd0686577adb8 +DIST pygobject-3.0.1.tar.xz 543732 RMD160 304e569d428197bbf3770a9dd9e14cba6437c3e9 SHA1 fb8ad95378d5d479545a9796f99fe94d28bc76e6 SHA256 ccb2cc765c11724fd3025569a7a7a72bf7c981365107ff5bd15499640d6adda1 EBUILD pygobject-2.26.0-r1.ebuild 3830 RMD160 66b0a34cc3dc97a812b5cc835634bbe4d137d411 SHA1 7b0112d2c3b69558bce8caece2699a6257308708 SHA256 24921120355c7e64502a581d8e798f16c954eb87bbd9a143b81d19ccbc44d17b +EBUILD pygobject-2.28.6-r50.ebuild 4158 RMD160 015a82e027864e4b6ad976640894bd87a0d1e3b1 SHA1 7196915ec1be32885c4a81a510470ca9dbb1a1e5 SHA256 04b3eeae83e2e266e6ef7e124b2af90b38780aa9faf417277873b4dc25a73219 EBUILD pygobject-2.28.6.ebuild 3826 RMD160 e821b108974957b88dfbea5826e8385a388cad8a SHA1 f926c7ed403b1ea736d1457a35d6841a11520bf3 SHA256 d5bfbd58c4cb81100b62de1becf9ae8e0a674cb540d55077ac4878ab66b2f37e -MISC ChangeLog 18846 RMD160 4a89cb2b3543f990a3c0ea1118d181824bb69c2a SHA1 40713cc19f7e518cc327a0ae812a1911d9e25f3a SHA256 83a25d2d15801f9ba79db76ac2c38b6cfec227b88c04743f1026206ba443cf5b +EBUILD pygobject-3.0.1.ebuild 3121 RMD160 5bb78edde15b9946f48f35518fb1ac0431ae625a SHA1 9342c7a230702d5fe19e8d5163d4f320e5e3c758 SHA256 2c6f36e3ede787e166fe9a2a873c37cc04a2bdfbe7e444fa265911180d7f94d2 +MISC ChangeLog 19515 RMD160 3ec21aa7219ffec6608dbcac339783e81d76afef SHA1 48f21c8fbbfaac0997d0517094105c3d0792ecdd SHA256 18358dff5ae46524cabfbd86458ed9441aa062c9660756490a445bb8550ac8df MISC metadata.xml 291 RMD160 2226a820b502bdd20583331e1601bb9cd04f96be SHA1 f5d19f3ae1f337179858f1818fc195a20ad7e4d9 SHA256 5a3c7fa667eaf9da2744f966afc82db0a4a45cc642157b8224104f17bdb4af5c -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iJwEAQECAAYFAk6MkEwACgkQIiMqcbOVdxRkjAP/cSbyhHZq5TKg0dO3eTMxZz9o -fcFkOZITjreimgoW2fpvx2keZMIQVY28+F7BzN+sEm6hD+yLN5dhm8qSnbBptKDF -1OJzZ8pv0425iRX+XoI+u0BjK451coCQq3lHOQWVHxWWcIDI8Rq04eKki7Fz4MpP -vcyIA4BaMvm1VRtHHIE= -=kulm +iF4EAREIAAYFAk6eJtgACgkQdjK8w9WeBnAhbAEAkX3KTM5sZkKpIZ0P6abbT9WB +FR3wVI7stXTDbOXu/dEA/2GFYyGSbVE+YrLxv7ObJQaIkyA3uYadM0cIH3NDdklH +=wEPX -----END PGP SIGNATURE----- diff --git a/dev-python/pygobject/files/pygobject-2.90.1-make_check.patch b/dev-python/pygobject/files/pygobject-2.90.1-make_check.patch new file mode 100644 index 000000000000..c2e80d69a9e5 --- /dev/null +++ b/dev-python/pygobject/files/pygobject-2.90.1-make_check.patch @@ -0,0 +1,72 @@ +From b5c4b8b97a1ccb9a4c63ab726ea9c84d81ef51ca Mon Sep 17 00:00:00 2001 +From: Gilles Dartiguelongue +Date: Fri, 5 Nov 2010 23:39:08 +0100 +Subject: [PATCH 2/3] Do not build tests unless needed + +[Alexandre Rostovtsev : port to 2.90.1] +--- + tests/Makefile.am | 10 ++++------ + tests/runtests.py | 3 +++ + 2 files changed, 7 insertions(+), 6 deletions(-) + +diff --git a/tests/Makefile.am b/tests/Makefile.am +index 4ec6477..c52cb9d 100644 +--- a/tests/Makefile.am ++++ b/tests/Makefile.am +@@ -1,5 +1,5 @@ + CLEANFILES = +-noinst_LTLIBRARIES = libregress.la libgimarshallingtests.la ++check_LTLIBRARIES = libregress.la libgimarshallingtests.la + + nodist_libregress_la_SOURCES = $(GI_DATADIR)/tests/regress.c $(GI_DATADIR)/tests/regress.h + libregress_la_CFLAGS = $(GIO_CFLAGS) $(PYCAIRO_CFLAGS) +@@ -43,7 +43,7 @@ gschemas.compiled: org.gnome.test.gschema.xml + + CLEANFILES += Regress-1.0.gir Regress-1.0.typelib GIMarshallingTests-1.0.gir GIMarshallingTests-1.0.typelib gschemas.compiled + +-noinst_LTLIBRARIES += testhelper.la ++check_LTLIBRARIES += testhelper.la + + testhelper_la_CFLAGS = -I$(top_srcdir)/gi/_gobject -I$(top_srcdir)/gi/_glib $(PYTHON_INCLUDES) $(GLIB_CFLAGS) + testhelper_la_LDFLAGS = -module -avoid-version +@@ -63,8 +63,6 @@ testhelper.la: $(testhelper_la_OBJECTS) $(testhelper_la_DEPENDENCIES) + test -L $@ || $(LN_S) .libs/$@ $@ + + +-all: $(LTLIBRARIES:.la=.so) +- + TEST_FILES_STATIC = \ + test_gobject.py \ + test_interface.py \ +@@ -97,7 +95,7 @@ EXTRA_DIST = \ + EXTRA_DIST += $(TEST_FILES_STATIC) $(TEST_FILES_GI) + + clean-local: +- rm -f $(LTLIBRARIES:.la=.so) file.txt~ ++ rm -f $(check_LTLIBRARIES:.la=.so) file.txt~ + + DBUS_LAUNCH=$(shell which dbus-launch) + RUN_TESTS_ENV_VARS= \ +@@ -108,7 +106,7 @@ RUN_TESTS_ENV_VARS= \ + TESTS_BUILDDIR=$(builddir) + RUN_TESTS_LAUNCH=$(RUN_TESTS_ENV_VARS) $(DBUS_LAUNCH) $(EXEC_NAME) $(PYTHON) $(srcdir)/runtests.py + +-check-local: $(LTLIBRARIES:.la=.so) Regress-1.0.typelib GIMarshallingTests-1.0.typelib gschemas.compiled ++check-local: $(check_LTLIBRARIES:.la=.so) Regress-1.0.typelib GIMarshallingTests-1.0.typelib gschemas.compiled + TEST_FILES="$(TEST_FILES_STATIC)" $(RUN_TESTS_LAUNCH) + TEST_FILES="$(TEST_FILES_GI)" $(RUN_TESTS_LAUNCH) + +diff --git a/tests/runtests.py b/tests/runtests.py +index 2a8ecf4..dc9fb03 100755 +--- a/tests/runtests.py ++++ b/tests/runtests.py +@@ -7,6 +7,9 @@ import sys + + import unittest + ++# Some tests fail with translated messages. ++os.environ["LC_ALL"] = "C" ++ + if '--help' in sys.argv: + print("Usage: ./runtests.py ") + sys.exit(0) diff --git a/dev-python/pygobject/files/pygobject-3.0.0-support_multiple_python_versions.patch b/dev-python/pygobject/files/pygobject-3.0.0-support_multiple_python_versions.patch new file mode 100644 index 000000000000..f0fab7f7ba7f --- /dev/null +++ b/dev-python/pygobject/files/pygobject-3.0.0-support_multiple_python_versions.patch @@ -0,0 +1,85 @@ +From 228ce7f0f99d2f5fa7d4ac86784d4e81032f9a3a Mon Sep 17 00:00:00 2001 +From: Gilles Dartiguelongue +Date: Fri, 8 Apr 2011 15:43:39 +0200 +Subject: [PATCH 2/3] Enable support to build against multiple version of + python + +--- + gi/Makefile.am | 2 +- + gi/_glib/Makefile.am | 14 +++++++------- + gi/_gobject/Makefile.am | 2 +- + 3 files changed, 9 insertions(+), 9 deletions(-) + +diff --git a/gi/Makefile.am b/gi/Makefile.am +index 0584cc9..9abb61d 100644 +--- a/gi/Makefile.am ++++ b/gi/Makefile.am +@@ -83,7 +83,7 @@ _gi_la_CPPFLAGS = \ + _gi_la_LIBADD = \ + $(extension_libadd) \ + $(GI_LIBS) \ +- $(top_builddir)/gi/_glib/libpyglib-gi-2.0-@PYTHON_BASENAME@.la ++ $(top_builddir)/gi/_glib/libpyglib-gi-2.0-@PYTHON_BASENAME@@PYTHON_VERSION@.la + _gi_la_LDFLAGS = \ + $(extension_ldflags) \ + -export-symbols-regex "init_gi|PyInit__gi" +diff --git a/gi/_glib/Makefile.am b/gi/_glib/Makefile.am +index 3cf2593..eaa0ce9 100644 +--- a/gi/_glib/Makefile.am ++++ b/gi/_glib/Makefile.am +@@ -27,24 +27,24 @@ pyglib_PYTHON = \ + __init__.py \ + option.py + +-lib_LTLIBRARIES = libpyglib-gi-2.0-@PYTHON_BASENAME@.la ++lib_LTLIBRARIES = libpyglib-gi-2.0-@PYTHON_BASENAME@@PYTHON_VERSION@.la + +-libpyglib_gi_2_0_@PYTHON_BASENAME@_la_SOURCES = \ ++libpyglib_gi_2_0_@PYTHON_BASENAME@@PYTHON_VERSION@_la_SOURCES = \ + pyglib.c \ + pyglib.h \ + pyglib-private.h \ + pyglib-python-compat.h +-libpyglib_gi_2_0_@PYTHON_BASENAME@_la_CPPFLAGS = \ ++libpyglib_gi_2_0_@PYTHON_BASENAME@@PYTHON_VERSION@_la_CPPFLAGS = \ + $(extension_cppflags) +-libpyglib_gi_2_0_@PYTHON_BASENAME@_la_CFLAGS = \ ++libpyglib_gi_2_0_@PYTHON_BASENAME@@PYTHON_VERSION@_la_CFLAGS = \ + $(GLIB_CFLAGS) +-libpyglib_gi_2_0_@PYTHON_BASENAME@_la_LIBADD = \ ++libpyglib_gi_2_0_@PYTHON_BASENAME@@PYTHON_VERSION@_la_LIBADD = \ + $(extension_libadd) \ + $(FFI_LIBS) \ + $(GLIB_LIBS) + + if OS_WIN32 +-libpyglib_gi_2_0_@PYTHON_BASENAME@_la_LDFLAGS = \ ++libpyglib_gi_2_0_@PYTHON_BASENAME@@PYTHON_VERSION@_la_LDFLAGS = \ + -no-undefined + endif + +@@ -73,7 +73,7 @@ _glib_la_CPPFLAGS = \ + _glib_la_LIBADD = \ + $(extension_libadd) \ + $(GLIB_LIBS) \ +- libpyglib-gi-2.0-@PYTHON_BASENAME@.la ++ libpyglib-gi-2.0-@PYTHON_BASENAME@@PYTHON_VERSION@.la + _glib_la_LDFLAGS = \ + $(extension_ldflags) \ + -export-symbols-regex "_glib|PyInit__glib" +diff --git a/gi/_gobject/Makefile.am b/gi/_gobject/Makefile.am +index 6bddcf7..023907f 100644 +--- a/gi/_gobject/Makefile.am ++++ b/gi/_gobject/Makefile.am +@@ -65,7 +65,7 @@ _gobject_la_LIBADD = \ + $(extension_libadd) \ + $(GLIB_LIBS) \ + $(FFI_LIBS) \ +- $(top_builddir)/gi/_glib/libpyglib-gi-2.0-@PYTHON_BASENAME@.la ++ $(top_builddir)/gi/_glib/libpyglib-gi-2.0-@PYTHON_BASENAME@@PYTHON_VERSION@.la + _gobject_la_LDFLAGS = \ + $(extension_ldflags) \ + -export-symbols-regex "_gobject|PyInit__gobject" +-- +1.7.6.1 + diff --git a/dev-python/pygobject/pygobject-2.28.6-r50.ebuild b/dev-python/pygobject/pygobject-2.28.6-r50.ebuild new file mode 100644 index 000000000000..7b37afae442c --- /dev/null +++ b/dev-python/pygobject/pygobject-2.28.6-r50.ebuild @@ -0,0 +1,140 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-python/pygobject/pygobject-2.28.6-r50.ebuild,v 1.1 2011/10/19 01:23:24 tetromino Exp $ + +EAPI="3" +GCONF_DEBUG="no" +GNOME_TARBALL_SUFFIX="xz" +GNOME2_LA_PUNT="yes" +SUPPORT_PYTHON_ABIS="1" +# pygobject is partially incompatible with Python 3. +# PYTHON_DEPEND="2:2.6 3:3.1" +# RESTRICT_PYTHON_ABIS="2.4 2.5 3.0 *-jython" +PYTHON_DEPEND="2:2.6" +RESTRICT_PYTHON_ABIS="2.4 2.5 3.* *-jython" + +# XXX: Is the alternatives stuff needed anymore? +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 ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +IUSE="doc examples +introspection libffi test" +# FIXME: tests require introspection support, but we can't enable introspection, +# or we get file collisions with slot 3 :/ +RESTRICT="test" + +COMMON_DEPEND=">=dev-libs/glib-2.24.0:2 + libffi? ( virtual/libffi )" +DEPEND="${COMMON_DEPEND} + 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" +RDEPEND="${COMMON_DEPEND} + !=app-text/docbook-xsl-stylesheets-1.70.1 ) + +# We now disable introspection support in slot 2 per upstream recommendation +# (see https://bugzilla.gnome.org/show_bug.cgi?id=642048#c9); however, +# older versions of slot 2 installed their own site-packages/gi, and +# slot 3 will collide with them. +RDEPEND="${COMMON_DEPEND} + !