* [gentoo-commits] proj/gnome:gnome-next commit in: dev-python/pygobject/files/, dev-python/pygobject/
@ 2011-08-14 20:43 Alexandre Restovtsev
0 siblings, 0 replies; 2+ messages in thread
From: Alexandre Restovtsev @ 2011-08-14 20:43 UTC (permalink / raw
To: gentoo-commits
commit: dfcfc755e3ade34be68e11581754bd13940fd781
Author: Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Sun Aug 14 19:14:42 2011 +0000
Commit: Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Sun Aug 14 20:21:24 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=dfcfc755
dev-python/pygobject: add 2.90.1 for gobject-introspection-1.29.x support
Add a version of pygobject that supports gobject-introspection-1.29.x,
since many (all?) python applications using gi from pygobject-2.28. fail
at runtime when gobject-introspection-1.29.x is installed. (Note: this
behavior may warrant a blocker, but need to think hard about whether/how
to implement such a blocker while leaving an upgrade path clear.)
Upstream recommends installing pygobject-2.28.x *without* introspection
in parallel with pygobject-2.90.1 (which *only* uses introspection); see
https://bugzilla.gnome.org/show_bug.cgi?id=642048#c9 and
http://www.daa.com.au/pipermail/pygtk/2011-August/019920.html
Therefore, we add pygobject-2.90.1 as slot 3, and make the introspection
flag in slot 2 pull in slot 3 as PDEPEND. Note that getting rid of the
introspection USE flag in slot 2 cannot be done in the short term due to
the number of packages that check for it.
Unfortunately, one side effect of this is that we have to RESTRICT test
in slot 2, since tests don't run without introspection. Need to think of
how to work around this issue.
And in 2.90.1, tests are also RESTRICTed for now because they require
gobject-introspection-1.29.16 (not released yet).
---
.../pygobject-2.28.3-disable-failing-tests.patch | 55 ++++++++
.../pygobject-2.28.3-fix-codegen-location.patch | 64 +++++++++
.../files/pygobject-2.28.3-make_check.patch | 76 +++++++++++
...t-2.28.3-support_multiple_python_versions.patch | 103 +++++++++++++++
| 28 ++++
.../files/pygobject-2.90.1-make_check.patch | 72 ++++++++++
.../pygobject-2.90.1-rename-doc-directories.patch | 67 ++++++++++
...t-2.90.1-support_multiple_python_versions.patch | 75 +++++++++++
dev-python/pygobject/pygobject-2.28.6-r50.ebuild | 138 ++++++++++++++++++++
dev-python/pygobject/pygobject-2.90.1.ebuild | 131 +++++++++++++++++++
10 files changed, 809 insertions(+), 0 deletions(-)
diff --git a/dev-python/pygobject/files/pygobject-2.28.3-disable-failing-tests.patch b/dev-python/pygobject/files/pygobject-2.28.3-disable-failing-tests.patch
new file mode 100644
index 0000000..86a66dd
--- /dev/null
+++ b/dev-python/pygobject/files/pygobject-2.28.3-disable-failing-tests.patch
@@ -0,0 +1,55 @@
+From df94ec3795c1efaf3eab9207c957e3ea5744971b Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue <eva@gentoo.org>
+Date: Fri, 8 Apr 2011 16:23:37 +0200
+Subject: [PATCH 4/4] Disable tests that fail
+
+---
+ tests/test_gio.py | 4 ++--
+ tests/test_overrides.py | 4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/tests/test_gio.py b/tests/test_gio.py
+index e14eddf..9c645f5 100644
+--- a/tests/test_gio.py
++++ b/tests/test_gio.py
+@@ -1007,7 +1007,7 @@ class TestVfs(unittest.TestCase):
+ class TestVolume(unittest.TestCase):
+ def setUp(self):
+ self.monitor = gio.volume_monitor_get()
+-
++"""
+ def testVolumeEnumerate(self):
+ volumes = self.monitor.get_volumes()
+ self.failUnless(isinstance(volumes, list))
+@@ -1018,7 +1018,7 @@ class TestVolume(unittest.TestCase):
+ for id in ids:
+ if id is not None:
+ self.failUnless(isinstance(id, str))
+-
++"""
+ class TestFileInputStream(unittest.TestCase):
+ def setUp(self):
+ self._f = open("file.txt", "w+")
+diff --git a/tests/test_overrides.py b/tests/test_overrides.py
+index 3421c3a..9de1a7f 100644
+--- a/tests/test_overrides.py
++++ b/tests/test_overrides.py
+@@ -322,13 +322,13 @@ class TestPango(unittest.TestCase):
+ desc = Pango.FontDescription('monospace')
+ self.assertEquals(desc.get_family(), 'monospace')
+ self.assertEquals(desc.get_variant(), Pango.Variant.NORMAL)
+-
++"""
+ def test_layout(self):
+ self.assertRaises(TypeError, Pango.Layout)
+ context = Pango.Context()
+ layout = Pango.Layout(context)
+ self.assertEquals(layout.get_context(), context)
+-
++"""
+ class TestGdk(unittest.TestCase):
+
+ def test_constructor(self):
+--
+1.7.4.1
+
diff --git a/dev-python/pygobject/files/pygobject-2.28.3-fix-codegen-location.patch b/dev-python/pygobject/files/pygobject-2.28.3-fix-codegen-location.patch
new file mode 100644
index 0000000..44440a5
--- /dev/null
+++ b/dev-python/pygobject/files/pygobject-2.28.3-fix-codegen-location.patch
@@ -0,0 +1,64 @@
+From b3e852d29bfd1e90f7e0da409fd0ae36cc01675a Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue <eva@gentoo.org>
+Date: Fri, 8 Apr 2011 15:36:35 +0200
+Subject: [PATCH 1/3] Move codegen to a non-private directory
+
+---
+ codegen/Makefile.am | 2 +-
+ codegen/pygobject-codegen-2.0.in | 3 ++-
+ pygobject-2.0.pc.in | 3 ++-
+ 3 files changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/codegen/Makefile.am b/codegen/Makefile.am
+index f9886eb..d714ff2 100644
+--- a/codegen/Makefile.am
++++ b/codegen/Makefile.am
+@@ -2,7 +2,7 @@ PLATFORM_VERSION = 2.0
+
+ bin_SCRIPTS = pygobject-codegen-$(PLATFORM_VERSION)
+
+-codegendir = $(pkgdatadir)/$(PLATFORM_VERSION)/codegen
++codegendir = $(pyexecdir)/gtk-2.0/codegen
+
+ codegen_SCRIPTS = \
+ code-coverage.py \
+diff --git a/codegen/pygobject-codegen-2.0.in b/codegen/pygobject-codegen-2.0.in
+index c5c912e..c04451b 100644
+--- a/codegen/pygobject-codegen-2.0.in
++++ b/codegen/pygobject-codegen-2.0.in
+@@ -1,9 +1,10 @@
+ #!/bin/sh
+
+ prefix=@prefix@
++exec_prefix=@exec_prefix@
+ datarootdir=@datarootdir@
+ datadir=@datadir@
+-codegendir=${datadir}/pygobject/2.0/codegen
++codegendir=@pyexecdir@/gtk-2.0/codegen
+
+ PYTHONPATH=$codegendir
+ export PYTHONPATH
+diff --git a/pygobject-2.0.pc.in b/pygobject-2.0.pc.in
+index a47b685..0d1a811 100644
+--- a/pygobject-2.0.pc.in
++++ b/pygobject-2.0.pc.in
+@@ -4,6 +4,7 @@ includedir=@includedir@
+ datarootdir=@datarootdir@
+ datadir=@datadir@
+ libdir=@libdir@
++pyexecdir=@pyexecdir@
+
+ # you can use the --variable=pygtkincludedir argument to
+ # pkg-config to get this value. You might want to use this to
+@@ -12,7 +13,7 @@ pygtkincludedir=${includedir}/pygtk-2.0
+ fixxref=${datadir}/pygobject/xsl/fixxref.py
+ pygdocs=${datadir}/gtk-doc/html/pygobject
+ defsdir=${datadir}/pygobject/2.0/defs
+-codegendir=${datadir}/pygobject/2.0/codegen
++codegendir=${pyexecdir}/gtk-2.0/codegen
+ overridesdir=@pyexecdir@/gi/overrides
+
+ Name: PyGObject
+--
+1.7.4.1
+
diff --git a/dev-python/pygobject/files/pygobject-2.28.3-make_check.patch b/dev-python/pygobject/files/pygobject-2.28.3-make_check.patch
new file mode 100644
index 0000000..45c04b9
--- /dev/null
+++ b/dev-python/pygobject/files/pygobject-2.28.3-make_check.patch
@@ -0,0 +1,76 @@
+From b5c4b8b97a1ccb9a4c63ab726ea9c84d81ef51ca Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue <eva@gentoo.org>
+Date: Fri, 5 Nov 2010 23:39:08 +0100
+Subject: [PATCH 2/3] Do not build tests unless needed
+
+---
+ tests/Makefile.am | 12 +++++-------
+ tests/runtests.py | 2 ++
+ 2 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/tests/Makefile.am b/tests/Makefile.am
+index bad15f0..5b0859a 100644
+--- a/tests/Makefile.am
++++ b/tests/Makefile.am
+@@ -1,7 +1,7 @@
+ CLEANFILES =
+-noinst_LTLIBRARIES =
++check_LTLIBRARIES =
+ if ENABLE_INTROSPECTION
+-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)
+@@ -46,7 +46,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
+ endif
+
+-noinst_LTLIBRARIES += testhelper.la
++check_LTLIBRARIES += testhelper.la
+
+ testhelper_la_CFLAGS = -I$(top_srcdir)/gobject -I$(top_srcdir)/glib $(PYTHON_INCLUDES) $(GLIB_CFLAGS)
+ testhelper_la_LDFLAGS = -module -avoid-version
+@@ -66,8 +66,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 \
+@@ -109,7 +107,7 @@ EXTRA_DIST = \
+ EXTRA_DIST += $(TEST_FILES_STATIC) $(TEST_FILES_GI) $(TEST_FILES_GIO)
+
+ 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= \
+@@ -121,7 +119,7 @@ RUN_TESTS_ENV_VARS= \
+ RUN_TESTS_LAUNCH=$(RUN_TESTS_ENV_VARS) $(DBUS_LAUNCH) $(EXEC_NAME) $(PYTHON) $(srcdir)/runtests.py
+
+ # run tests in separately to avoid loading static and introspection bindings in the same process
+-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)
+ if BUILD_GIO
+diff --git a/tests/runtests.py b/tests/runtests.py
+index 2bb8637..4107bcf 100644
+--- a/tests/runtests.py
++++ b/tests/runtests.py
+@@ -6,6 +6,8 @@ import sys
+
+ import unittest
+
++# Some tests fail with translated messages.
++os.environ["LC_ALL"] = "C"
+
+ # force untranslated messages, as we check for them in some tests
+ os.environ['LC_MESSAGES'] = 'C'
+--
+1.7.4.1
+
diff --git a/dev-python/pygobject/files/pygobject-2.28.3-support_multiple_python_versions.patch b/dev-python/pygobject/files/pygobject-2.28.3-support_multiple_python_versions.patch
new file mode 100644
index 0000000..65d881a
--- /dev/null
+++ b/dev-python/pygobject/files/pygobject-2.28.3-support_multiple_python_versions.patch
@@ -0,0 +1,103 @@
+From 2f75378f3c56f245cabdcd2c52b561dbb878db2d Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue <eva@gentoo.org>
+Date: Fri, 8 Apr 2011 15:43:39 +0200
+Subject: [PATCH 3/3] Enable support to build against multiple version of python
+
+---
+ codegen/pygobject-codegen-2.0.in | 2 +-
+ gi/Makefile.am | 2 +-
+ gio/Makefile.am | 2 +-
+ glib/Makefile.am | 10 +++++-----
+ gobject/Makefile.am | 2 +-
+ 5 files changed, 9 insertions(+), 9 deletions(-)
+
+diff --git a/codegen/pygobject-codegen-2.0.in b/codegen/pygobject-codegen-2.0.in
+index c04451b..194e5ba 100644
+--- a/codegen/pygobject-codegen-2.0.in
++++ b/codegen/pygobject-codegen-2.0.in
+@@ -4,7 +4,7 @@ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+ datarootdir=@datarootdir@
+ datadir=@datadir@
+-codegendir=@pyexecdir@/gtk-2.0/codegen
++codegendir=$(@PYTHON@ -c "from distutils import sysconfig; print sysconfig.get_python_lib(1, 0, prefix='@exec_prefix@')")/gtk-2.0/codegen
+
+ PYTHONPATH=$codegendir
+ export PYTHONPATH
+diff --git a/gi/Makefile.am b/gi/Makefile.am
+index 31f6c79..8690522 100644
+--- a/gi/Makefile.am
++++ b/gi/Makefile.am
+@@ -25,7 +25,7 @@ _gi_la_LDFLAGS = \
+ -export-symbols-regex "init_gi|PyInit__gi"
+ _gi_la_LIBADD = \
+ $(GI_LIBS) \
+- $(top_builddir)/glib/libpyglib-2.0-@PYTHON_BASENAME@.la
++ $(top_builddir)/glib/libpyglib-2.0-@PYTHON_BASENAME@@PYTHON_VERSION@.la
+ _gi_la_SOURCES = \
+ pygi-repository.c \
+ pygi-repository.h \
+diff --git a/gio/Makefile.am b/gio/Makefile.am
+index 6b3eb57..00e1c54 100644
+--- a/gio/Makefile.am
++++ b/gio/Makefile.am
+@@ -67,7 +67,7 @@ EXTRA_DIST += $(GIO_DEFS) $(GIO_OVERRIDES)
+ 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 \
+diff --git a/glib/Makefile.am b/glib/Makefile.am
+index e210318..df39687 100644
+--- a/glib/Makefile.am
++++ b/glib/Makefile.am
+@@ -4,7 +4,7 @@ INCLUDES = $(PYTHON_INCLUDES) $(GLIB_CFLAGS) -DPY_SSIZE_T_CLEAN
+ 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)
+
+@@ -19,9 +19,9 @@ if PLATFORM_WIN32
+ 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 @@ libpyglib_2_0_@PYTHON_BASENAME@_la_SOURCES = \
+
+ _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 \
+diff --git a/gobject/Makefile.am b/gobject/Makefile.am
+index 7208329..3f9ad8e 100644
+--- a/gobject/Makefile.am
++++ b/gobject/Makefile.am
+@@ -35,7 +35,7 @@ _gobject_la_LDFLAGS = $(common_ldflags) -export-symbols-regex "_gobject|PyInit__
+ _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 \
+--
+1.7.4.1
+
--git a/dev-python/pygobject/files/pygobject-2.90.1-dsextras.py.patch b/dev-python/pygobject/files/pygobject-2.90.1-dsextras.py.patch
new file mode 100644
index 0000000..ff3ae7e
--- /dev/null
+++ b/dev-python/pygobject/files/pygobject-2.90.1-dsextras.py.patch
@@ -0,0 +1,28 @@
+From c13d63ffa55cf03bc8fa37f19961714d7386a69a Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gmail.com>
+Date: Sun, 14 Aug 2011 14:37:41 -0400
+Subject: [PATCH] Drop dsextras.py (it's installed by pygobject-2.28.x)
+
+---
+ Makefile.am | 5 -----
+ 1 files changed, 0 insertions(+), 5 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 3b8b6fe..e696cea 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -56,11 +56,6 @@ INCLUDES = -I$(top_srcdir)/gobject $(PYTHON_INCLUDES) $(GLIB_CFLAGS)
+ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = pygobject-$(PLATFORM_VERSION).pc
+
+-# python modules
+-pkgpyexecdir = $(pyexecdir)/gtk-2.0
+-pkgpyexec_PYTHON = dsextras.py
+-pkgpyexec_LTLIBRARIES =
+-
+ # python
+ pyexec_LTLIBRARIES =
+
+--
+1.7.6
+
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 0000000..c2e80d6
--- /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 <eva@gentoo.org>
+Date: Fri, 5 Nov 2010 23:39:08 +0100
+Subject: [PATCH 2/3] Do not build tests unless needed
+
+[Alexandre Rostovtsev <tetromino@gmail.com>: 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 <testfiles>")
+ sys.exit(0)
diff --git a/dev-python/pygobject/files/pygobject-2.90.1-rename-doc-directories.patch b/dev-python/pygobject/files/pygobject-2.90.1-rename-doc-directories.patch
new file mode 100644
index 0000000..3dabca5
--- /dev/null
+++ b/dev-python/pygobject/files/pygobject-2.90.1-rename-doc-directories.patch
@@ -0,0 +1,67 @@
+From 662425742f5f93bf2cc5e774d5d49a20ea6dd989 Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gmail.com>
+Date: Sun, 14 Aug 2011 15:36:20 -0400
+Subject: [PATCH] Rename doc directories to prevent file collisions with
+ 2.28.x
+
+---
+ docs/Makefile.am | 8 ++++----
+ docs/reference/pygobject-ref.xml | 2 +-
+ 2 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/docs/Makefile.am b/docs/Makefile.am
+index ad68613..4fa30a9 100644
+--- a/docs/Makefile.am
++++ b/docs/Makefile.am
+@@ -20,7 +20,7 @@ HTML_FILES = \
+ html/gobject-functions.html \
+ html/index.html \
+ html/index.sgml \
+- html/pygobject.devhelp \
++ html/pygobject-3.0.devhelp \
+ html/pygobject-introduction.html
+
+
+@@ -52,7 +52,7 @@ XSL_FILES = \
+ # so the date is newer then the files in HTML_FILES
+ FIXXREF = xsl/fixxref.py
+
+-TARGET_DIR = $(datadir)/gtk-doc/html/pygobject
++TARGET_DIR = $(datadir)/gtk-doc/html/pygobject-3.0
+ CSSdir = $(TARGET_DIR)
+ CSS_DATA = $(CSS_FILES)
+
+@@ -75,7 +75,7 @@ uninstall-local:
+ rm -f $(DESTDIR)$(TARGET_DIR)/*
+
+
+-XSLdir = $(datadir)/pygobject/xsl
++XSLdir = $(datadir)/pygobject-3.0/xsl
+ XSL_DATA = $(XSL_FILES) $(FIXXREF)
+
+ EXTRA_DIST = \
+@@ -102,7 +102,7 @@ CLEANFILES = reference/builddate.xml $(HTML_FILES)
+ $(HTML_FILES): $(XML_FILES) $(XSL_FILES)
+ @xsltproc --nonet --xinclude -o $(BUILDDIR)/html/ \
+ --path $(BUILDDIR)/reference:$(srcdir)/reference \
+- --stringparam gtkdoc.bookname "pygobject" \
++ --stringparam gtkdoc.bookname "pygobject-3.0" \
+ --stringparam gtkdoc.version ${REF_VERSION} \
+ $(srcdir)/xsl/ref-html-style.xsl \
+ $(srcdir)/reference/pygobject-ref.xml
+diff --git a/docs/reference/pygobject-ref.xml b/docs/reference/pygobject-ref.xml
+index ee90a55..1f39690 100644
+--- a/docs/reference/pygobject-ref.xml
++++ b/docs/reference/pygobject-ref.xml
+@@ -9,7 +9,7 @@
+ <book id="pygobject-reference" xmlns:xi="http://www.w3.org/2001/XInclude">
+ <bookinfo>
+ <pubdate>&builddate;</pubdate>
+- <title>PyGObject Reference Manual</title>
++ <title>PyGObject 3.0 Reference Manual</title>
+ <edition>for version &version;</edition>
+ <releaseinfo>for PyGObject version &version;</releaseinfo>
+ <abstract>
+--
+1.7.6
+
diff --git a/dev-python/pygobject/files/pygobject-2.90.1-support_multiple_python_versions.patch b/dev-python/pygobject/files/pygobject-2.90.1-support_multiple_python_versions.patch
new file mode 100644
index 0000000..18ce706
--- /dev/null
+++ b/dev-python/pygobject/files/pygobject-2.90.1-support_multiple_python_versions.patch
@@ -0,0 +1,75 @@
+From 712f9f95c1bc1a75b5bf877a8cd882760512a84b Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue <eva@gentoo.org>
+Date: Fri, 8 Apr 2011 15:43:39 +0200
+Subject: [PATCH] Enable support to build against multiple version of python
+
+---
+ gi/Makefile.am | 2 +-
+ gi/_glib/Makefile.am | 10 +++++-----
+ gi/_gobject/Makefile.am | 2 +-
+ 3 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/gi/Makefile.am b/gi/Makefile.am
+index ee5eb00..86bff1b 100644
+--- a/gi/Makefile.am
++++ b/gi/Makefile.am
+@@ -27,7 +27,7 @@ _gi_la_LDFLAGS = \
+ -export-symbols-regex "init_gi|PyInit__gi"
+ _gi_la_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_SOURCES = \
+ pygi-repository.c \
+ pygi-repository.h \
+diff --git a/gi/_glib/Makefile.am b/gi/_glib/Makefile.am
+index fcea61d..013f7ad 100644
+--- a/gi/_glib/Makefile.am
++++ b/gi/_glib/Makefile.am
+@@ -1,7 +1,7 @@
+ AUTOMAKE_OPTIONS = 1.7
+ INCLUDES = $(PYTHON_INCLUDES) $(GLIB_CFLAGS) -DPY_SSIZE_T_CLEAN
+
+-lib_LTLIBRARIES = libpyglib-gi-2.0-@PYTHON_BASENAME@.la
++lib_LTLIBRARIES = libpyglib-gi-2.0-@PYTHON_BASENAME@@PYTHON_VERSION@.la
+
+ pkgpyexecdir = $(pyexecdir)
+
+@@ -16,9 +16,9 @@ if PLATFORM_WIN32
+ common_ldflags += -no-undefined
+ endif
+
+-libpyglib_gi_2_0_@PYTHON_BASENAME@_la_CFLAGS = $(GLIB_CFLAGS)
+-libpyglib_gi_2_0_@PYTHON_BASENAME@_la_LIBADD = $(GLIB_LIBS) $(FFI_LIBS)
+-libpyglib_gi_2_0_@PYTHON_BASENAME@_la_SOURCES = \
++libpyglib_gi_2_0_@PYTHON_BASENAME@@PYTHON_VERSION@_la_CFLAGS = $(GLIB_CFLAGS)
++libpyglib_gi_2_0_@PYTHON_BASENAME@@PYTHON_VERSION@_la_LIBADD = $(GLIB_LIBS) $(FFI_LIBS)
++libpyglib_gi_2_0_@PYTHON_BASENAME@@PYTHON_VERSION@_la_SOURCES = \
+ pyglib.c \
+ pyglib.h \
+ pyglib-private.h \
+@@ -26,7 +26,7 @@ libpyglib_gi_2_0_@PYTHON_BASENAME@_la_SOURCES = \
+
+ _glib_la_CFLAGS = $(GLIB_CFLAGS)
+ _glib_la_LDFLAGS = $(common_ldflags) -export-symbols-regex "_glib|PyInit__glib"
+-_glib_la_LIBADD = $(GLIB_LIBS) $(PYTHON_LIBS) libpyglib-gi-2.0-@PYTHON_BASENAME@.la
++_glib_la_LIBADD = $(GLIB_LIBS) $(PYTHON_LIBS) libpyglib-gi-2.0-@PYTHON_BASENAME@@PYTHON_VERSION@.la
+ _glib_la_SOURCES = \
+ glibmodule.c \
+ pygiochannel.c \
+diff --git a/gi/_gobject/Makefile.am b/gi/_gobject/Makefile.am
+index 7e15d4c..a901fe0 100644
+--- a/gi/_gobject/Makefile.am
++++ b/gi/_gobject/Makefile.am
+@@ -30,7 +30,7 @@ _gobject_la_LIBADD = \
+ $(GLIB_LIBS) \
+ $(FFI_LIBS) \
+ $(PYTHON_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_SOURCES = \
+ gobjectmodule.c \
+--
+1.7.6
+
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 0000000..e686150
--- /dev/null
+++ b/dev-python/pygobject/pygobject-2.28.6-r50.ebuild
@@ -0,0 +1,138 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="3"
+GCONF_DEBUG="no"
+GNOME_TARBALL_SUFFIX="xz"
+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}
+ !<dev-python/pygtk-2.13"
+# Use slot 3 for introspection support per upstream recommendation
+# (see https://bugzilla.gnome.org/show_bug.cgi?id=642048#c9);
+# keep introspection USE flag in slot 2 for backward compatibility for now.
+PDEPEND="introspection? ( dev-python/pygobject:3 )"
+
+pkg_setup() {
+ DOCS="AUTHORS ChangeLog* NEWS README"
+ # --disable-introspection because we use slot 3 for introspection support
+ G2CONF="${G2CONF}
+ --disable-dependency-tracking
+ --disable-introspection
+ $(use_enable doc docs)
+ $(use_enable cairo)
+ $(use_with libffi ffi)"
+}
+
+src_prepare() {
+ gnome2_src_prepare
+
+ # Fix FHS compliance, see upstream bug #535524
+ epatch "${FILESDIR}/${PN}-2.28.3-fix-codegen-location.patch"
+
+ # Do not build tests if unneeded, bug #226345
+ epatch "${FILESDIR}/${PN}-2.28.3-make_check.patch"
+
+ # Support installation for multiple Python versions, upstream bug #648292
+ epatch "${FILESDIR}/${PN}-2.28.3-support_multiple_python_versions.patch"
+
+ # Disable tests that fail
+ epatch "${FILESDIR}/${PN}-2.28.3-disable-failing-tests.patch"
+
+ # disable pyc compiling
+ ln -sfn $(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
+}
+
+# FIXME: With python multiple ABI support, tests return 1 even when they pass
+src_test() {
+ unset DBUS_SESSION_BUS_ADDRESS
+
+ testing() {
+ XDG_CACHE_HOME="${T}/$(PYTHON --ABI)"
+ Xemake check PYTHON=$(PYTHON -a)
+ }
+ 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
+
+ sed "s:/usr/bin/python:/usr/bin/python2:" \
+ -i "${ED}"/usr/bin/pygobject-codegen-2.0 \
+ || die "Fix usage of python interpreter"
+
+ if use examples; then
+ insinto /usr/share/doc/${P}
+ doins -r examples || die "doins failed"
+ 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 glib gobject gtk-2.0 pygtk.py
+}
+
+pkg_postrm() {
+ python_mod_cleanup glib gobject 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
+}
diff --git a/dev-python/pygobject/pygobject-2.90.1.ebuild b/dev-python/pygobject/pygobject-2.90.1.ebuild
new file mode 100644
index 0000000..ad6d56b
--- /dev/null
+++ b/dev-python/pygobject/pygobject-2.90.1.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="3"
+GCONF_DEBUG="no"
+GNOME_TARBALL_SUFFIX="xz"
+GNOME2_LA_PUNT="yes"
+SUPPORT_PYTHON_ABIS="1"
+# XXX: is this still true?
+# 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="3"
+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 +cairo examples libffi test +threads"
+RESTRICT="test" # FIXME: tests require >=gobject-introspection-1.29.17
+
+COMMON_DEPEND=">=dev-libs/glib-2.24.0:2
+ >=dev-libs/gobject-introspection-0.10.2
+ cairo? ( >=dev-python/pycairo-1.10.0 )
+ libffi? ( virtual/libffi )"
+DEPEND="${COMMON_DEPEND}
+ doc? (
+ app-text/docbook-xml-dtd:4.1.2
+ 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"
+
+# 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}
+ !<dev-python/pygtk-2.13
+ !!<dev-python/pygobject-2.28.6-r50:2[introspection]"
+
+pkg_setup() {
+ DOCS="AUTHORS ChangeLog* NEWS README"
+ G2CONF="${G2CONF}
+ --disable-dependency-tracking
+ $(use_enable doc docs)
+ $(use_enable cairo)
+ $(use_with libffi ffi)
+ $(use_enable threads thread)"
+}
+
+src_prepare() {
+ gnome2_src_prepare
+
+ # Drop site-packages/gtk-2.0/dsextras.py, it's installed by slot 2
+ epatch "${FILESDIR}/${PN}-2.90.1-dsextras.py.patch"
+
+ # Do not build tests if unneeded, bug #226345
+ epatch "${FILESDIR}/${PN}-2.90.1-make_check.patch"
+
+ # Support installation for multiple Python versions, upstream bug #648292
+ epatch "${FILESDIR}/${PN}-2.90.1-support_multiple_python_versions.patch"
+
+ # Rename doc directories to prevent file collision with slot 2
+ epatch "${FILESDIR}/${PN}-2.90.1-rename-doc-directories.patch"
+ if [[ ${PV} != 9999 ]]; then
+ # rename and sed pre-built docs so devhelp can display them correctly
+ mv docs/html/pygobject.devhelp docs/html/pygobject-3.0.devhelp || die
+ sed -e 's:PyGObject Reference Manual:PyGObject 3.0 Reference Manual:' \
+ -e 's:name="pygobject":name="pygobject-3.0":' \
+ -i docs/html/pygobject-3.0.devhelp || die
+ sed -e 's:href="pygobject/:href="pygobject-3.0/:g' \
+ -i docs/html/index.sgml || die
+ fi
+
+ # Disable tests that fail
+ #epatch "${FILESDIR}/${PN}-2.28.3-disable-failing-tests.patch"
+
+ # disable pyc compiling
+ ln -sfn $(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
+}
+
+# FIXME: With python multiple ABI support, tests return 1 even when they pass
+src_test() {
+ unset DBUS_SESSION_BUS_ADDRESS
+
+ testing() {
+ XDG_CACHE_HOME="${T}/$(PYTHON --ABI)"
+ Xemake check PYTHON=$(PYTHON -a)
+ }
+ python_execute_function -s testing
+}
+
+src_install() {
+ python_execute_function -s gnome2_src_install
+ python_clean_installation_image
+
+ if use examples; then
+ insinto /usr/share/doc/${P}
+ doins -r examples || die "doins failed"
+ fi
+}
+
+pkg_postinst() {
+ python_mod_optimize gi
+}
+
+pkg_postrm() {
+ python_mod_cleanup gi
+}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] proj/gnome:gnome-next commit in: dev-python/pygobject/files/, dev-python/pygobject/
@ 2011-09-26 2:51 Alexandre Restovtsev
0 siblings, 0 replies; 2+ messages in thread
From: Alexandre Restovtsev @ 2011-09-26 2:51 UTC (permalink / raw
To: gentoo-commits
commit: 2050b2b30349f70f0b4fc66570788aa0feadf201
Author: Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Mon Sep 26 02:44:42 2011 +0000
Commit: Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Mon Sep 26 02:49:02 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=2050b2b3
dev-python/pygobject: 2.90.3 → 3.0.0
Version bump. Drop dsextras patch (applied upstream) and doc renaming
patch (now irrelevant, since the documentation is no longer built or
installed at all). Update python version patch for makefile changes.
Update dependencies.
---
| 28 -------
.../pygobject-2.90.1-rename-doc-directories.patch | 67 ---------------
...t-2.90.1-support_multiple_python_versions.patch | 75 -----------------
...ct-3.0.0-support_multiple_python_versions.patch | 85 ++++++++++++++++++++
...object-2.90.3.ebuild => pygobject-3.0.0.ebuild} | 31 ++-----
5 files changed, 93 insertions(+), 193 deletions(-)
diff --git a/dev-python/pygobject/files/pygobject-2.90.1-dsextras.py.patch b/dev-python/pygobject/files/pygobject-2.90.1-dsextras.py.patch
deleted file mode 100644
index ff3ae7e..0000000
--- a/dev-python/pygobject/files/pygobject-2.90.1-dsextras.py.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From c13d63ffa55cf03bc8fa37f19961714d7386a69a Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gmail.com>
-Date: Sun, 14 Aug 2011 14:37:41 -0400
-Subject: [PATCH] Drop dsextras.py (it's installed by pygobject-2.28.x)
-
----
- Makefile.am | 5 -----
- 1 files changed, 0 insertions(+), 5 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index 3b8b6fe..e696cea 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -56,11 +56,6 @@ INCLUDES = -I$(top_srcdir)/gobject $(PYTHON_INCLUDES) $(GLIB_CFLAGS)
- pkgconfigdir = $(libdir)/pkgconfig
- pkgconfig_DATA = pygobject-$(PLATFORM_VERSION).pc
-
--# python modules
--pkgpyexecdir = $(pyexecdir)/gtk-2.0
--pkgpyexec_PYTHON = dsextras.py
--pkgpyexec_LTLIBRARIES =
--
- # python
- pyexec_LTLIBRARIES =
-
---
-1.7.6
-
diff --git a/dev-python/pygobject/files/pygobject-2.90.1-rename-doc-directories.patch b/dev-python/pygobject/files/pygobject-2.90.1-rename-doc-directories.patch
deleted file mode 100644
index 3dabca5..0000000
--- a/dev-python/pygobject/files/pygobject-2.90.1-rename-doc-directories.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From 662425742f5f93bf2cc5e774d5d49a20ea6dd989 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gmail.com>
-Date: Sun, 14 Aug 2011 15:36:20 -0400
-Subject: [PATCH] Rename doc directories to prevent file collisions with
- 2.28.x
-
----
- docs/Makefile.am | 8 ++++----
- docs/reference/pygobject-ref.xml | 2 +-
- 2 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/docs/Makefile.am b/docs/Makefile.am
-index ad68613..4fa30a9 100644
---- a/docs/Makefile.am
-+++ b/docs/Makefile.am
-@@ -20,7 +20,7 @@ HTML_FILES = \
- html/gobject-functions.html \
- html/index.html \
- html/index.sgml \
-- html/pygobject.devhelp \
-+ html/pygobject-3.0.devhelp \
- html/pygobject-introduction.html
-
-
-@@ -52,7 +52,7 @@ XSL_FILES = \
- # so the date is newer then the files in HTML_FILES
- FIXXREF = xsl/fixxref.py
-
--TARGET_DIR = $(datadir)/gtk-doc/html/pygobject
-+TARGET_DIR = $(datadir)/gtk-doc/html/pygobject-3.0
- CSSdir = $(TARGET_DIR)
- CSS_DATA = $(CSS_FILES)
-
-@@ -75,7 +75,7 @@ uninstall-local:
- rm -f $(DESTDIR)$(TARGET_DIR)/*
-
-
--XSLdir = $(datadir)/pygobject/xsl
-+XSLdir = $(datadir)/pygobject-3.0/xsl
- XSL_DATA = $(XSL_FILES) $(FIXXREF)
-
- EXTRA_DIST = \
-@@ -102,7 +102,7 @@ CLEANFILES = reference/builddate.xml $(HTML_FILES)
- $(HTML_FILES): $(XML_FILES) $(XSL_FILES)
- @xsltproc --nonet --xinclude -o $(BUILDDIR)/html/ \
- --path $(BUILDDIR)/reference:$(srcdir)/reference \
-- --stringparam gtkdoc.bookname "pygobject" \
-+ --stringparam gtkdoc.bookname "pygobject-3.0" \
- --stringparam gtkdoc.version ${REF_VERSION} \
- $(srcdir)/xsl/ref-html-style.xsl \
- $(srcdir)/reference/pygobject-ref.xml
-diff --git a/docs/reference/pygobject-ref.xml b/docs/reference/pygobject-ref.xml
-index ee90a55..1f39690 100644
---- a/docs/reference/pygobject-ref.xml
-+++ b/docs/reference/pygobject-ref.xml
-@@ -9,7 +9,7 @@
- <book id="pygobject-reference" xmlns:xi="http://www.w3.org/2001/XInclude">
- <bookinfo>
- <pubdate>&builddate;</pubdate>
-- <title>PyGObject Reference Manual</title>
-+ <title>PyGObject 3.0 Reference Manual</title>
- <edition>for version &version;</edition>
- <releaseinfo>for PyGObject version &version;</releaseinfo>
- <abstract>
---
-1.7.6
-
diff --git a/dev-python/pygobject/files/pygobject-2.90.1-support_multiple_python_versions.patch b/dev-python/pygobject/files/pygobject-2.90.1-support_multiple_python_versions.patch
deleted file mode 100644
index 18ce706..0000000
--- a/dev-python/pygobject/files/pygobject-2.90.1-support_multiple_python_versions.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From 712f9f95c1bc1a75b5bf877a8cd882760512a84b Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Fri, 8 Apr 2011 15:43:39 +0200
-Subject: [PATCH] Enable support to build against multiple version of python
-
----
- gi/Makefile.am | 2 +-
- gi/_glib/Makefile.am | 10 +++++-----
- gi/_gobject/Makefile.am | 2 +-
- 3 files changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/gi/Makefile.am b/gi/Makefile.am
-index ee5eb00..86bff1b 100644
---- a/gi/Makefile.am
-+++ b/gi/Makefile.am
-@@ -27,7 +27,7 @@ _gi_la_LDFLAGS = \
- -export-symbols-regex "init_gi|PyInit__gi"
- _gi_la_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_SOURCES = \
- pygi-repository.c \
- pygi-repository.h \
-diff --git a/gi/_glib/Makefile.am b/gi/_glib/Makefile.am
-index fcea61d..013f7ad 100644
---- a/gi/_glib/Makefile.am
-+++ b/gi/_glib/Makefile.am
-@@ -1,7 +1,7 @@
- AUTOMAKE_OPTIONS = 1.7
- INCLUDES = $(PYTHON_INCLUDES) $(GLIB_CFLAGS) -DPY_SSIZE_T_CLEAN
-
--lib_LTLIBRARIES = libpyglib-gi-2.0-@PYTHON_BASENAME@.la
-+lib_LTLIBRARIES = libpyglib-gi-2.0-@PYTHON_BASENAME@@PYTHON_VERSION@.la
-
- pkgpyexecdir = $(pyexecdir)
-
-@@ -16,9 +16,9 @@ if PLATFORM_WIN32
- common_ldflags += -no-undefined
- endif
-
--libpyglib_gi_2_0_@PYTHON_BASENAME@_la_CFLAGS = $(GLIB_CFLAGS)
--libpyglib_gi_2_0_@PYTHON_BASENAME@_la_LIBADD = $(GLIB_LIBS) $(FFI_LIBS)
--libpyglib_gi_2_0_@PYTHON_BASENAME@_la_SOURCES = \
-+libpyglib_gi_2_0_@PYTHON_BASENAME@@PYTHON_VERSION@_la_CFLAGS = $(GLIB_CFLAGS)
-+libpyglib_gi_2_0_@PYTHON_BASENAME@@PYTHON_VERSION@_la_LIBADD = $(GLIB_LIBS) $(FFI_LIBS)
-+libpyglib_gi_2_0_@PYTHON_BASENAME@@PYTHON_VERSION@_la_SOURCES = \
- pyglib.c \
- pyglib.h \
- pyglib-private.h \
-@@ -26,7 +26,7 @@ libpyglib_gi_2_0_@PYTHON_BASENAME@_la_SOURCES = \
-
- _glib_la_CFLAGS = $(GLIB_CFLAGS)
- _glib_la_LDFLAGS = $(common_ldflags) -export-symbols-regex "_glib|PyInit__glib"
--_glib_la_LIBADD = $(GLIB_LIBS) $(PYTHON_LIBS) libpyglib-gi-2.0-@PYTHON_BASENAME@.la
-+_glib_la_LIBADD = $(GLIB_LIBS) $(PYTHON_LIBS) libpyglib-gi-2.0-@PYTHON_BASENAME@@PYTHON_VERSION@.la
- _glib_la_SOURCES = \
- glibmodule.c \
- pygiochannel.c \
-diff --git a/gi/_gobject/Makefile.am b/gi/_gobject/Makefile.am
-index 7e15d4c..a901fe0 100644
---- a/gi/_gobject/Makefile.am
-+++ b/gi/_gobject/Makefile.am
-@@ -30,7 +30,7 @@ _gobject_la_LIBADD = \
- $(GLIB_LIBS) \
- $(FFI_LIBS) \
- $(PYTHON_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_SOURCES = \
- gobjectmodule.c \
---
-1.7.6
-
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 0000000..f0fab7f
--- /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 <eva@gentoo.org>
+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.90.3.ebuild b/dev-python/pygobject/pygobject-3.0.0.ebuild
similarity index 74%
rename from dev-python/pygobject/pygobject-2.90.3.ebuild
rename to dev-python/pygobject/pygobject-3.0.0.ebuild
index f5aa30a..5916ddc 100644
--- a/dev-python/pygobject/pygobject-2.90.3.ebuild
+++ b/dev-python/pygobject/pygobject-3.0.0.ebuild
@@ -23,22 +23,23 @@ HOMEPAGE="http://www.pygtk.org/"
LICENSE="LGPL-2.1"
SLOT="3"
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 +cairo examples test +threads"
+IUSE="+cairo examples test +threads" # doc
COMMON_DEPEND=">=dev-libs/glib-2.24.0:2
- >=dev-libs/gobject-introspection-0.10.2
+ >=dev-libs/gobject-introspection-1.29
virtual/libffi
cairo? ( >=dev-python/pycairo-1.10.0 )"
DEPEND="${COMMON_DEPEND}
- doc? (
- app-text/docbook-xml-dtd:4.1.2
- dev-libs/libxslt
- >=app-text/docbook-xsl-stylesheets-1.70.1 )
test? (
media-fonts/font-cursor-misc
media-fonts/font-misc-misc
>=dev-libs/gobject-introspection-1.29.17 )
>=dev-util/pkgconfig-0.12"
+# docs disabled for now per upstream default since they are very out of date
+# doc? (
+# app-text/docbook-xml-dtd:4.1.2
+# dev-libs/libxslt
+# >=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,
@@ -55,7 +56,6 @@ pkg_setup() {
G2CONF="${G2CONF}
--disable-dependency-tracking
--with-ffi
- $(use_enable doc docs)
$(use_enable cairo)
$(use_enable threads thread)"
}
@@ -63,26 +63,11 @@ pkg_setup() {
src_prepare() {
gnome2_src_prepare
- # Drop site-packages/gtk-2.0/dsextras.py, it's installed by slot 2
- epatch "${FILESDIR}/${PN}-2.90.1-dsextras.py.patch"
-
# Do not build tests if unneeded, bug #226345
epatch "${FILESDIR}/${PN}-2.90.1-make_check.patch"
# Support installation for multiple Python versions, upstream bug #648292
- epatch "${FILESDIR}/${PN}-2.90.1-support_multiple_python_versions.patch"
-
- # Rename doc directories to prevent file collision with slot 2
- epatch "${FILESDIR}/${PN}-2.90.1-rename-doc-directories.patch"
- if [[ ${PV} != 9999 ]]; then
- # rename and sed pre-built docs so devhelp can display them correctly
- mv docs/html/pygobject.devhelp docs/html/pygobject-3.0.devhelp || die
- sed -e 's:PyGObject Reference Manual:PyGObject 3.0 Reference Manual:' \
- -e 's:name="pygobject":name="pygobject-3.0":' \
- -i docs/html/pygobject-3.0.devhelp || die
- sed -e 's:href="pygobject/:href="pygobject-3.0/:g' \
- -i docs/html/index.sgml || die
- fi
+ epatch "${FILESDIR}/${PN}-3.0.0-support_multiple_python_versions.patch"
# Disable tests that fail
#epatch "${FILESDIR}/${PN}-2.28.3-disable-failing-tests.patch"
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-09-26 2:52 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-08-14 20:43 [gentoo-commits] proj/gnome:gnome-next commit in: dev-python/pygobject/files/, dev-python/pygobject/ Alexandre Restovtsev
-- strict thread matches above, loose matches on Subject: below --
2011-09-26 2:51 Alexandre Restovtsev
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox