* [gentoo-commits] proj/gnome:master commit in: dev-python/pygobject/files/, dev-python/pygobject/
@ 2011-03-12 3:12 Nirbheek Chauhan
0 siblings, 0 replies; 9+ messages in thread
From: Nirbheek Chauhan @ 2011-03-12 3:12 UTC (permalink / raw
To: gentoo-commits
commit: d5124ea6f97bfac0c11df697c8a44c86908905b2
Author: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 12 01:39:18 2011 +0000
Commit: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Sat Mar 12 03:03:56 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=d5124ea6
dev-python/pygobject: 2.27.0 → 2.28.0
---
...ygobject-2.26.0-disable-non-working-tests.patch | 190 --------------------
.../pygobject/files/pygobject-2.26.0-nocrash.patch | 12 --
.../pygobject-2.28.0-disable-failing-tests.patch | 20 ++
...=> pygobject-2.28.0-fix-codegen-location.patch} | 2 +-
...eck.patch => pygobject-2.28.0-make_check.patch} | 68 ++++----
...-2.28.0-support_multiple_python_versions.patch} | 37 +++--
...bject-2.27.0.ebuild => pygobject-2.28.0.ebuild} | 96 +++++-----
7 files changed, 123 insertions(+), 302 deletions(-)
diff --git a/dev-python/pygobject/files/pygobject-2.26.0-disable-non-working-tests.patch b/dev-python/pygobject/files/pygobject-2.26.0-disable-non-working-tests.patch
deleted file mode 100644
index a4110ca..0000000
--- a/dev-python/pygobject/files/pygobject-2.26.0-disable-non-working-tests.patch
+++ /dev/null
@@ -1,190 +0,0 @@
-From db9817a5da879c8a783beadcf3c88fc8686b937f Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Sat, 6 Nov 2010 00:47:33 +0100
-Subject: [PATCH] Disable non-working tests
-
----
- tests/test_gio.py | 15 ------
- tests/test_overrides.py | 126 -----------------------------------------------
- 2 files changed, 0 insertions(+), 141 deletions(-)
-
-diff --git a/tests/test_gio.py b/tests/test_gio.py
-index 7c8251e..e668574 100644
---- a/tests/test_gio.py
-+++ b/tests/test_gio.py
-@@ -1004,21 +1004,6 @@ class TestVfs(unittest.TestCase):
- result = self.vfs.get_supported_uri_schemes()
- self.failUnless(type(result), [])
-
--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))
-- for v in volumes:
-- if v is not None:
-- ids = v.enumerate_identifiers()
-- self.failUnless(isinstance(ids, list))
-- 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 b1e3617..df2897c 100644
---- a/tests/test_overrides.py
-+++ b/tests/test_overrides.py
-@@ -110,87 +110,6 @@ class TestGtk(unittest.TestCase):
- self.assertEquals(a,cmp)
- action.activate()
-
-- def test_builder(self):
-- self.assertEquals(Gtk.Builder, overrides.Gtk.Builder)
--
-- class SignalTest(GObject.GObject):
-- __gtype_name__ = "GIOverrideSignalTest"
-- __gsignals__ = {
-- "test-signal": (GObject.SIGNAL_RUN_FIRST,
-- GObject.TYPE_NONE,
-- []),
-- }
--
--
-- class SignalCheck:
-- def __init__(self):
-- self.sentinel = 0
--
-- def on_signal_1(self, *args):
-- self.sentinel += 1
--
-- def on_signal_3(self, *args):
-- self.sentinel += 3
--
-- signal_checker = SignalCheck()
-- builder = Gtk.Builder()
--
-- # add object1 to the builder
-- builder.add_from_string(
--"""
--<interface>
-- <object class="GIOverrideSignalTest" id="object1">
-- <signal name="test-signal" handler="on_signal_1" />
-- </object>
--</interface>
--""")
--
-- # only add object3 to the builder
-- builder.add_objects_from_string(
--"""
--<interface>
-- <object class="GIOverrideSignalTest" id="object2">
-- <signal name="test-signal" handler="on_signal_2" />
-- </object>
-- <object class="GIOverrideSignalTest" id="object3">
-- <signal name="test-signal" handler="on_signal_3" />
-- </object>
-- <object class="GIOverrideSignalTest" id="object4">
-- <signal name="test-signal" handler="on_signal_4" />
-- </object>
--</interface>
--
--""",
-- ['object3'])
--
-- # hook up signals
-- builder.connect_signals(signal_checker)
--
-- # call their notify signals and check sentinel
-- objects = builder.get_objects()
-- self.assertEquals(len(objects), 2)
-- for obj in objects:
-- obj.emit('test-signal')
--
-- self.assertEquals(signal_checker.sentinel, 4)
--
-- def test_dialog(self):
-- self.assertEquals(Gtk.Dialog, overrides.Gtk.Dialog)
-- dialog = Gtk.Dialog (title='Foo',
-- flags=Gtk.DialogFlags.MODAL,
-- buttons=('test-button1', 1))
--
-- dialog.add_buttons ('test-button2', 2, Gtk.STOCK_CLOSE, Gtk.ResponseType.CLOSE)
--
-- self.assertEquals('Foo', dialog.get_title())
-- self.assertTrue(dialog.get_modal())
-- button = dialog.get_widget_for_response (1)
-- self.assertEquals('test-button1', button.get_label())
-- button = dialog.get_widget_for_response (2)
-- self.assertEquals('test-button2', button.get_label())
-- button = dialog.get_widget_for_response (Gtk.ResponseType.CLOSE)
-- self.assertEquals(Gtk.STOCK_CLOSE, button.get_label())
--
- class TestClass(GObject.GObject):
- __gtype_name__ = "GIOverrideTreeAPITest"
-
-@@ -237,28 +156,6 @@ class TestGtk(unittest.TestCase):
-
- self.assertEquals(i, 99)
-
-- def test_list_store(self):
-- list_store = Gtk.ListStore(int, str, 'GIOverrideTreeAPITest')
-- for i in range(100):
-- label = 'this is row #%d' % i
-- testobj = TestGtk.TestClass(self, i, label)
-- parent = list_store.append((i, label, testobj))
--
-- self.assertEquals(len(list_store), 100)
--
-- # walk the list to see if the values were stored correctly
-- i = 0
-- (has_more, treeiter) = list_store.get_iter_first()
--
-- while has_more:
-- i = list_store.get_value(treeiter, 0)
-- s = list_store.get_value(treeiter, 1)
-- obj = list_store.get_value(treeiter, 2)
-- obj.check(i, s)
-- has_more = list_store.iter_next(treeiter)
--
-- self.assertEquals(i, 99)
--
- def test_tree_view_column(self):
- cell = Gtk.CellRendererText()
- column = Gtk.TreeViewColumn(title='This is just a test',
-@@ -266,29 +163,6 @@ class TestGtk(unittest.TestCase):
- text=0,
- style=2)
-
-- def test_text_buffer(self):
-- self.assertEquals(Gtk.TextBuffer, overrides.Gtk.TextBuffer)
-- buffer = Gtk.TextBuffer()
-- tag = buffer.create_tag ('title', font = 'Sans 18')
--
-- self.assertEquals(tag.props.name, 'title')
-- self.assertEquals(tag.props.font, 'Sans 18')
--
-- (start, end) = buffer.get_bounds()
--
-- buffer.insert(end, 'HelloHello')
-- buffer.insert(end, ' Bob')
--
-- cursor_iter = end.copy()
-- cursor_iter.backward_chars(9)
-- buffer.place_cursor(cursor_iter)
-- buffer.insert_at_cursor(' Jane ')
--
-- (start, end) = buffer.get_bounds()
-- text = buffer.get_text(start, end, False)
--
-- self.assertEquals(text, 'Hello Jane Hello Bob')
--
- def test_buttons(self):
- self.assertEquals(Gtk.Button, overrides.Gtk.Button)
-
---
-1.7.3.1
-
diff --git a/dev-python/pygobject/files/pygobject-2.26.0-nocrash.patch b/dev-python/pygobject/files/pygobject-2.26.0-nocrash.patch
deleted file mode 100644
index 8698b7e..0000000
--- a/dev-python/pygobject/files/pygobject-2.26.0-nocrash.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff '--exclude-from=/home/dang/.scripts/diffrc' -up -ruN pygobject-2.26.0.orig/gi/pygi.h pygobject-2.26.0/gi/pygi.h
---- pygobject-2.26.0.orig/gi/pygi.h 2010-09-14 11:53:21.000000000 -0400
-+++ pygobject-2.26.0/gi/pygi.h 2010-11-08 08:16:13.360808932 -0500
-@@ -152,7 +152,7 @@ static inline PyObject *
- pygi_get_property_value (PyGObject *instance,
- const gchar *attr_name)
- {
-- return -1;
-+ return NULL;
- }
-
- static inline gint
diff --git a/dev-python/pygobject/files/pygobject-2.28.0-disable-failing-tests.patch b/dev-python/pygobject/files/pygobject-2.28.0-disable-failing-tests.patch
new file mode 100644
index 0000000..e460a8d
--- /dev/null
+++ b/dev-python/pygobject/files/pygobject-2.28.0-disable-failing-tests.patch
@@ -0,0 +1,20 @@
+diff --git a/tests/test_overrides.py b/tests/test_overrides.py
+index 9234d96..2ab750f 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):
diff --git a/dev-python/pygobject/files/pygobject-2.15.4-fix-codegen-location.patch b/dev-python/pygobject/files/pygobject-2.28.0-fix-codegen-location.patch
similarity index 97%
rename from dev-python/pygobject/files/pygobject-2.15.4-fix-codegen-location.patch
rename to dev-python/pygobject/files/pygobject-2.28.0-fix-codegen-location.patch
index 8882cd0..d487650 100644
--- a/dev-python/pygobject/files/pygobject-2.15.4-fix-codegen-location.patch
+++ b/dev-python/pygobject/files/pygobject-2.28.0-fix-codegen-location.patch
@@ -45,6 +45,6 @@
defsdir=${datadir}/pygobject/2.0/defs
-codegendir=${datadir}/pygobject/2.0/codegen
+codegendir=${pyexecdir}/gtk-2.0/codegen
+ overridesdir=@pyexecdir@/gi/overrides
Name: PyGObject
- Description: Python bindings for GObject
diff --git a/dev-python/pygobject/files/pygobject-2.26.0-make_check.patch b/dev-python/pygobject/files/pygobject-2.28.0-make_check.patch
similarity index 52%
rename from dev-python/pygobject/files/pygobject-2.26.0-make_check.patch
rename to dev-python/pygobject/files/pygobject-2.28.0-make_check.patch
index 37eba72..c1f9e03 100644
--- a/dev-python/pygobject/files/pygobject-2.26.0-make_check.patch
+++ b/dev-python/pygobject/files/pygobject-2.28.0-make_check.patch
@@ -1,15 +1,20 @@
-From 21893ae2b466fcf64645e73173a27200e99c0701 Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Fri, 5 Nov 2010 23:39:08 +0100
-Subject: [PATCH] Do not build tests unless needed
+Do not build tests unless needed, fix tests with introspection
----
- tests/Makefile.am | 12 +++++-------
- tests/runtests.py | 2 ++
- 2 files changed, 7 insertions(+), 7 deletions(-)
+https://bugs.gentoo.org/226345
+https://bugzilla.gnome.org/show_bug.cgi?id=642624
-diff --git a/tests/Makefile.am b/tests/Makefile.am
-index 77bc020..49416b0 100644
+---
+--- a/tests/runtests.py
++++ b/tests/runtests.py
+@@ -5,6 +5,8 @@ import glob
+
+ import unittest
+
++# Some tests fail with translated messages.
++os.environ["LC_ALL"] = "C"
+
+ # Load tests.
+ if 'TEST_NAMES' in os.environ:
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,7 +1,7 @@
@@ -22,8 +27,8 @@ index 77bc020..49416b0 100644
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 @@ GIMarshallingTests-1.0.typelib: GIMarshallingTests-1.0.gir Makefile
- CLEANFILES += Regress-1.0.gir Regress-1.0.typelib GIMarshallingTests-1.0.gir GIMarshallingTests-1.0.typelib
+@@ -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
@@ -31,41 +36,30 @@ index 77bc020..49416b0 100644
testhelper_la_CFLAGS = -I$(top_srcdir)/gobject -I$(top_srcdir)/glib $(PYTHON_INCLUDES) $(GLIB_CFLAGS)
testhelper_la_LDFLAGS = -module -avoid-version
-@@ -63,8 +63,6 @@ testhelper.la: $(testhelper_la_OBJECTS) $(testhelper_la_DEPENDENCIES)
+@@ -66,8 +66,6 @@ testhelper.la: $(testhelper_la_OBJECTS) $(testhelper_la_DEPENDENCIES)
test -L $@ || $(LN_S) .libs/$@ $@
-all: $(LTLIBRARIES:.la=.so)
-
- TEST_FILES = \
+ TEST_FILES_STATIC = \
test_gobject.py \
test_interface.py \
-@@ -104,10 +102,10 @@ EXTRA_DIST = \
- EXTRA_DIST += $(TEST_FILES)
+@@ -101,7 +99,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~
-
--check-local: $(LTLIBRARIES:.la=.so) Regress-1.0.typelib GIMarshallingTests-1.0.typelib
-+check-local: $(check_LTLIBRARIES:.la=.so) Regress-1.0.typelib GIMarshallingTests-1.0.typelib
- TEST_FILES="$(TEST_FILES)" PYTHONPATH=$(top_builddir):$(top_builddir)/tests:$${PYTHONPATH:+:$$PYTHONPATH} LD_LIBRARY_PATH=$(builddir)/.libs:$$LD_LIBRARY_PATH GI_TYPELIB_PATH=$(builddir) $(EXEC_NAME) $(PYTHON) $(srcdir)/runtests.py
-
- check.gdb:
-diff --git a/tests/runtests.py b/tests/runtests.py
-index d99f0cc..89e2084 100644
---- a/tests/runtests.py
-+++ b/tests/runtests.py
-@@ -5,6 +5,8 @@ import glob
-
- import unittest
-
-+# Some tests fail with translated messages.
-+os.environ["LC_ALL"] = "C"
-
- # Load tests.
- if 'TEST_NAMES' in os.environ:
---
-1.7.3.1
+ DBUS_LAUNCH=$(shell which dbus-launch)
+ RUN_TESTS_ENV_VARS= \
+@@ -111,7 +109,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) @ENABLE_INTROSPECTION_TRUE@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/dev-python/pygobject/files/pygobject-2.18.0-support_multiple_python_versions.patch b/dev-python/pygobject/files/pygobject-2.28.0-support_multiple_python_versions.patch
similarity index 75%
rename from dev-python/pygobject/files/pygobject-2.18.0-support_multiple_python_versions.patch
rename to dev-python/pygobject/files/pygobject-2.28.0-support_multiple_python_versions.patch
index b27d408..8cccdc9 100644
--- a/dev-python/pygobject/files/pygobject-2.18.0-support_multiple_python_versions.patch
+++ b/dev-python/pygobject/files/pygobject-2.28.0-support_multiple_python_versions.patch
@@ -1,5 +1,5 @@
---- codegen/pygobject-codegen-2.0.in
-+++ codegen/pygobject-codegen-2.0.in
+--- a/codegen/pygobject-codegen-2.0.in
++++ b/codegen/pygobject-codegen-2.0.in
@@ -4,7 +4,7 @@
exec_prefix=@exec_prefix@
datarootdir=@datarootdir@
@@ -9,9 +9,20 @@
PYTHONPATH=$codegendir
export PYTHONPATH
---- gio/Makefile.am
-+++ gio/Makefile.am
-@@ -56,7 +56,7 @@
+--- a/gi/Makefile.am
++++ b/gi/Makefile.am
+@@ -26,7 +26,7 @@
+ _gi_la_LIBADD = \
+ $(GI_LIBS) \
+ $(PYTHON_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 \
+--- a/gio/Makefile.am
++++ b/gio/Makefile.am
+@@ -67,7 +67,7 @@
gio.c: $(GIO_DEFS) $(GIO_OVERRIDES)
_gio_la_CFLAGS = $(GIO_CFLAGS)
_gio_la_LDFLAGS = $(common_ldflags) -export-symbols-regex init_gio
@@ -20,8 +31,8 @@
_gio_la_SOURCES = \
giomodule.c \
pygio-utils.c \
---- glib/Makefile.am
-+++ glib/Makefile.am
+--- a/glib/Makefile.am
++++ b/glib/Makefile.am
@@ -4,7 +4,7 @@
pkgincludedir = $(includedir)/pygtk-2.0
pkginclude_HEADERS = pyglib.h
@@ -29,17 +40,17 @@
-lib_LTLIBRARIES = libpyglib-2.0-@PYTHON_BASENAME@.la
+lib_LTLIBRARIES = libpyglib-2.0-@PYTHON_BASENAME@@PYTHON_VERSION@.la
- pkgpyexecdir = $(pyexecdir)/gtk-2.0
+ pkgpyexecdir = $(pyexecdir)
@@ -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_LIBADD = $(GLIB_LIBS) $(FFI_LIBS) $(PYTHON_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_LIBADD = $(GLIB_LIBS) $(FFI_LIBS) $(PYTHON_LIBS)
+libpyglib_2_0_@PYTHON_BASENAME@@PYTHON_VERSION@_la_SOURCES = \
pyglib.c \
pyglib.h \
@@ -53,9 +64,9 @@
_glib_la_SOURCES = \
glibmodule.c \
pygiochannel.c \
---- gobject/Makefile.am
-+++ gobject/Makefile.am
-@@ -42,7 +42,7 @@
+--- a/gobject/Makefile.am
++++ b/gobject/Makefile.am
+@@ -35,7 +35,7 @@
_gobject_la_LIBADD = \
$(GLIB_LIBS) \
$(FFI_LIBS) \
diff --git a/dev-python/pygobject/pygobject-2.27.0.ebuild b/dev-python/pygobject/pygobject-2.28.0.ebuild
similarity index 50%
rename from dev-python/pygobject/pygobject-2.27.0.ebuild
rename to dev-python/pygobject/pygobject-2.28.0.ebuild
index 6cb9163..0cc3487 100644
--- a/dev-python/pygobject/pygobject-2.27.0.ebuild
+++ b/dev-python/pygobject/pygobject-2.28.0.ebuild
@@ -1,13 +1,15 @@
-# Copyright 1999-2010 Gentoo Foundation
+# 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.26.0-r1.ebuild,v 1.2 2010/12/21 21:48:56 eva Exp $
EAPI="2"
GCONF_DEBUG="no"
-SUPPORT_PYTHON_ABIS="1"
-PYTHON_DEPEND="2:2.5"
-RESTRICT_PYTHON_ABIS="2.4 3.*"
+#SUPPORT_PYTHON_ABIS="1"
+PYTHON_DEPEND="2:2.6"
+# Supports Python 3, but needs pycairo-3 support too
+#RESTRICT_PYTHON_ABIS="2.4 2.5 3.*"
+# XXX: Is the alternatives stuff needed anymore?
inherit alternatives autotools gnome2 python virtualx
DESCRIPTION="GLib's GObject library bindings for Python"
@@ -16,13 +18,13 @@ 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 cairo examples +introspection libffi test"
+IUSE="doc +cairo examples +introspection libffi test"
-RDEPEND=">=dev-libs/glib-2.22.4:2
+RDEPEND=">=dev-libs/glib-2.24.0:2
!<dev-python/pygtk-2.13
introspection? (
- >=dev-libs/gobject-introspection-0.9.5
- cairo? ( >=dev-python/pycairo-1.0.2 ) )
+ >=dev-libs/gobject-introspection-0.10.2
+ cairo? ( >=dev-python/pycairo-1.2.0 ) )
libffi? ( virtual/libffi )"
DEPEND="${RDEPEND}
doc? (
@@ -49,59 +51,54 @@ src_prepare() {
# XXX: These patches need to be double-checked
# Fix FHS compliance, see upstream bug #535524
- epatch "${FILESDIR}/${PN}-2.15.4-fix-codegen-location.patch"
+ epatch "${FILESDIR}/${PN}-2.28.0-fix-codegen-location.patch"
# Do not build tests if unneeded, bug #226345
- epatch "${FILESDIR}/${PN}-2.26.0-make_check.patch"
+ epatch "${FILESDIR}/${PN}-2.28.0-make_check.patch"
# Support installation for multiple Python versions
- epatch "${FILESDIR}/${PN}-2.18.0-support_multiple_python_versions.patch"
+ epatch "${FILESDIR}/${PN}-2.28.0-support_multiple_python_versions.patch"
- # Disable non-working tests
- #epatch "${FILESDIR}/${PN}-2.26.0-disable-non-working-tests.patch"
+ # Disable tests that fail
+ epatch "${FILESDIR}/${PN}-2.28.0-disable-failing-tests.patch"
# disable pyc compiling
- mv py-compile py-compile.orig
- ln -s $(type -P true) py-compile
+ ln -sfn $(type -P true) py-compile
eautoreconf
- python_copy_sources
+# python_copy_sources
}
-src_configure() {
- python_execute_function -s gnome2_src_configure
-}
+#src_configure() {
+# python_execute_function -s gnome2_src_configure
+#}
-src_compile() {
- python_execute_function -d -s
-}
+#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() {
- 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
-
+ #testing() {
XDG_CACHE_HOME="${T}/$(PYTHON --ABI)"
Xemake check PYTHON=$(PYTHON -a)
- }
- python_execute_function -s testing
+ #}
+ #python_execute_function -s testing
}
src_install() {
[[ -z ${ED} ]] && local ED="${D}"
- installation() {
+# 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
+ mv "${ED}$(python_get_sitedir)"/pygtk.py{,-2.0} || die
+ mv "${ED}$(python_get_sitedir)"/pygtk.pth{,-2.0} || die
+# }
+# python_execute_function -s installation
- python_clean_installation_image
+# python_clean_installation_image
sed "s:/usr/bin/python:/usr/bin/python2:" \
-i "${ED}"/usr/bin/pygobject-codegen-2.0 \
@@ -114,21 +111,22 @@ src_install() {
}
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
+# 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_need_rebuild
+ python_mod_optimize "$(python_get_sitedir)"/{gtk-2.0,pygtk.py}
}
pkg_postrm() {
- python_mod_cleanup gtk-2.0 pygtk.py
+ python_mod_cleanup "$(python_get_sitedir)"/{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
+# 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
}
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: dev-python/pygobject/files/, dev-python/pygobject/
@ 2011-04-01 11:45 Nirbheek Chauhan
0 siblings, 0 replies; 9+ messages in thread
From: Nirbheek Chauhan @ 2011-04-01 11:45 UTC (permalink / raw
To: gentoo-commits
commit: bab291738c843e2fbcfa74b7e704b46b60da3279
Author: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 1 11:42:39 2011 +0000
Commit: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Fri Apr 1 11:42:39 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=bab29173
dev-python/pygobject: 2.28.0 → 2.28.3
---
...-2.28.3-support_multiple_python_versions.patch} | 33 +++++++++++--------
...bject-2.28.0.ebuild => pygobject-2.28.3.ebuild} | 2 +-
2 files changed, 20 insertions(+), 15 deletions(-)
diff --git a/dev-python/pygobject/files/pygobject-2.28.0-support_multiple_python_versions.patch b/dev-python/pygobject/files/pygobject-2.28.3-support_multiple_python_versions.patch
similarity index 63%
rename from dev-python/pygobject/files/pygobject-2.28.0-support_multiple_python_versions.patch
rename to dev-python/pygobject/files/pygobject-2.28.3-support_multiple_python_versions.patch
index 8cccdc9..844f271 100644
--- a/dev-python/pygobject/files/pygobject-2.28.0-support_multiple_python_versions.patch
+++ b/dev-python/pygobject/files/pygobject-2.28.3-support_multiple_python_versions.patch
@@ -1,5 +1,6 @@
---- a/codegen/pygobject-codegen-2.0.in
-+++ b/codegen/pygobject-codegen-2.0.in
+diff -Naur pygobject-2.28.3/codegen/pygobject-codegen-2.0.in pygobject-2.28.3.new/codegen/pygobject-codegen-2.0.in
+--- pygobject-2.28.3/codegen/pygobject-codegen-2.0.in 2011-04-01 17:10:13.820719508 +0530
++++ pygobject-2.28.3.new/codegen/pygobject-codegen-2.0.in 2011-04-01 17:08:07.464719548 +0530
@@ -4,7 +4,7 @@
exec_prefix=@exec_prefix@
datarootdir=@datarootdir@
@@ -9,19 +10,21 @@
PYTHONPATH=$codegendir
export PYTHONPATH
---- a/gi/Makefile.am
-+++ b/gi/Makefile.am
-@@ -26,7 +26,7 @@
+diff -Naur pygobject-2.28.3/gi/Makefile.am pygobject-2.28.3.new/gi/Makefile.am
+--- pygobject-2.28.3/gi/Makefile.am 2011-03-22 00:02:10.000000000 +0530
++++ pygobject-2.28.3.new/gi/Makefile.am 2011-04-01 17:08:49.836719533 +0530
+@@ -25,7 +25,7 @@
+ -export-symbols-regex "init_gi|PyInit__gi"
_gi_la_LIBADD = \
$(GI_LIBS) \
- $(PYTHON_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 \
---- a/gio/Makefile.am
-+++ b/gio/Makefile.am
+diff -Naur pygobject-2.28.3/gio/Makefile.am pygobject-2.28.3.new/gio/Makefile.am
+--- pygobject-2.28.3/gio/Makefile.am 2011-03-23 03:04:52.000000000 +0530
++++ pygobject-2.28.3.new/gio/Makefile.am 2011-04-01 17:08:07.468719548 +0530
@@ -67,7 +67,7 @@
gio.c: $(GIO_DEFS) $(GIO_OVERRIDES)
_gio_la_CFLAGS = $(GIO_CFLAGS)
@@ -31,8 +34,9 @@
_gio_la_SOURCES = \
giomodule.c \
pygio-utils.c \
---- a/glib/Makefile.am
-+++ b/glib/Makefile.am
+diff -Naur pygobject-2.28.3/glib/Makefile.am pygobject-2.28.3.new/glib/Makefile.am
+--- pygobject-2.28.3/glib/Makefile.am 2011-03-23 03:04:52.000000000 +0530
++++ pygobject-2.28.3.new/glib/Makefile.am 2011-04-01 17:09:16.336719519 +0530
@@ -4,7 +4,7 @@
pkgincludedir = $(includedir)/pygtk-2.0
pkginclude_HEADERS = pyglib.h
@@ -47,10 +51,10 @@
endif
-libpyglib_2_0_@PYTHON_BASENAME@_la_CFLAGS = $(GLIB_CFLAGS)
--libpyglib_2_0_@PYTHON_BASENAME@_la_LIBADD = $(GLIB_LIBS) $(FFI_LIBS) $(PYTHON_LIBS)
+-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) $(PYTHON_LIBS)
++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 \
@@ -64,8 +68,9 @@
_glib_la_SOURCES = \
glibmodule.c \
pygiochannel.c \
---- a/gobject/Makefile.am
-+++ b/gobject/Makefile.am
+diff -Naur pygobject-2.28.3/gobject/Makefile.am pygobject-2.28.3.new/gobject/Makefile.am
+--- pygobject-2.28.3/gobject/Makefile.am 2011-03-23 03:04:52.000000000 +0530
++++ pygobject-2.28.3.new/gobject/Makefile.am 2011-04-01 17:08:07.471719548 +0530
@@ -35,7 +35,7 @@
_gobject_la_LIBADD = \
$(GLIB_LIBS) \
diff --git a/dev-python/pygobject/pygobject-2.28.0.ebuild b/dev-python/pygobject/pygobject-2.28.3.ebuild
similarity index 98%
rename from dev-python/pygobject/pygobject-2.28.0.ebuild
rename to dev-python/pygobject/pygobject-2.28.3.ebuild
index 854ae96..9d93a65 100644
--- a/dev-python/pygobject/pygobject-2.28.0.ebuild
+++ b/dev-python/pygobject/pygobject-2.28.3.ebuild
@@ -58,7 +58,7 @@ src_prepare() {
epatch "${FILESDIR}/${PN}-2.28.0-make_check.patch"
# Support installation for multiple Python versions
- epatch "${FILESDIR}/${PN}-2.28.0-support_multiple_python_versions.patch"
+ epatch "${FILESDIR}/${PN}-2.28.3-support_multiple_python_versions.patch"
# Disable tests that fail
epatch "${FILESDIR}/${PN}-2.28.0-disable-failing-tests.patch"
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: dev-python/pygobject/files/, dev-python/pygobject/
@ 2011-04-10 18:04 Gilles Dartiguelongue
0 siblings, 0 replies; 9+ messages in thread
From: Gilles Dartiguelongue @ 2011-04-10 18:04 UTC (permalink / raw
To: gentoo-commits
commit: 1ca108b16fcc4efb0e3a2906994ffc4a640f11f5
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 8 14:54:21 2011 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sun Apr 10 18:03:00 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=1ca108b1
dev-python/pygobject: QAed
* Regenerate all patches against git repo
* Re-enable mutliple python version support
* Disable a gio test that was failing, even with gvfs 1.8
(Portage version: 2.2.0_alpha29/git/Linux x86_64, RepoMan options: --force, signed Manifest commit with key C6085806)
---
.../pygobject-2.28.0-disable-failing-tests.patch | 20 ------
.../pygobject-2.28.0-fix-codegen-location.patch | 50 ---------------
.../pygobject-2.28.3-disable-failing-tests.patch | 55 +++++++++++++++++
.../pygobject-2.28.3-fix-codegen-location.patch | 64 +++++++++++++++++++
...eck.patch => pygobject-2.28.3-make_check.patch} | 51 +++++++++------
...t-2.28.3-support_multiple_python_versions.patch | 65 +++++++++++++-------
dev-python/pygobject/pygobject-2.28.3.ebuild | 65 +++++++++----------
7 files changed, 224 insertions(+), 146 deletions(-)
diff --git a/dev-python/pygobject/files/pygobject-2.28.0-disable-failing-tests.patch b/dev-python/pygobject/files/pygobject-2.28.0-disable-failing-tests.patch
deleted file mode 100644
index e460a8d..0000000
--- a/dev-python/pygobject/files/pygobject-2.28.0-disable-failing-tests.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/tests/test_overrides.py b/tests/test_overrides.py
-index 9234d96..2ab750f 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):
diff --git a/dev-python/pygobject/files/pygobject-2.28.0-fix-codegen-location.patch b/dev-python/pygobject/files/pygobject-2.28.0-fix-codegen-location.patch
deleted file mode 100644
index d487650..0000000
--- a/dev-python/pygobject/files/pygobject-2.28.0-fix-codegen-location.patch
+++ /dev/null
@@ -1,50 +0,0 @@
----
- Fix FHS compliance of codegen
-
- codegen/Makefile.am | 2 +-
- codegen/pygtk-codegen-2.0.in | 3 ++-
- pygtk-2.0.pc.in | 2 +-
- 3 files changed, 4 insertions(+), 3 deletions(-)
-
---- a/codegen/Makefile.am 2007-11-01 12:20:22.000000000 -0400
-+++ b/codegen/Makefile.am 2008-05-28 22:21:04.000000000 -0400
-@@ -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_PYTHON = \
- __init__.py \
---- a/codegen/pygobject-codegen-2.0.in 2007-11-01 12:20:22.000000000 -0400
-+++ b/codegen/pygobject-codegen-2.0.in 2008-05-28 22:24:38.000000000 -0400
-@@ -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
---- a/pygobject-2.0.pc.in 2007-11-01 12:20:22.000000000 -0400
-+++ b/pygobject-2.0.pc.in 2008-05-28 22:21:04.000000000 -0400
-@@ -4,6 +4,7 @@
- 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,5 +12,5 @@
- defsdir=${datadir}/pygobject/2.0/defs
--codegendir=${datadir}/pygobject/2.0/codegen
-+codegendir=${pyexecdir}/gtk-2.0/codegen
- overridesdir=@pyexecdir@/gi/overrides
-
- Name: PyGObject
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.0-make_check.patch b/dev-python/pygobject/files/pygobject-2.28.3-make_check.patch
similarity index 66%
rename from dev-python/pygobject/files/pygobject-2.28.0-make_check.patch
rename to dev-python/pygobject/files/pygobject-2.28.3-make_check.patch
index c1f9e03..45c04b9 100644
--- a/dev-python/pygobject/files/pygobject-2.28.0-make_check.patch
+++ b/dev-python/pygobject/files/pygobject-2.28.3-make_check.patch
@@ -1,20 +1,15 @@
-Do not build tests unless needed, fix tests with introspection
-
-https://bugs.gentoo.org/226345
-https://bugzilla.gnome.org/show_bug.cgi?id=642624
+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
---
---- a/tests/runtests.py
-+++ b/tests/runtests.py
-@@ -5,6 +5,8 @@ import glob
-
- import unittest
-
-+# Some tests fail with translated messages.
-+os.environ["LC_ALL"] = "C"
-
- # Load tests.
- if 'TEST_NAMES' in os.environ:
+ 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 @@
@@ -45,8 +40,8 @@ https://bugzilla.gnome.org/show_bug.cgi?id=642624
TEST_FILES_STATIC = \
test_gobject.py \
test_interface.py \
-@@ -101,7 +99,7 @@ EXTRA_DIST = \
- EXTRA_DIST += $(TEST_FILES_STATIC) $(TEST_FILES_GI)
+@@ -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~
@@ -54,12 +49,28 @@ https://bugzilla.gnome.org/show_bug.cgi?id=642624
DBUS_LAUNCH=$(shell which dbus-launch)
RUN_TESTS_ENV_VARS= \
-@@ -111,7 +109,7 @@ 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) @ENABLE_INTROSPECTION_TRUE@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
index 844f271..65d881a 100644
--- 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
@@ -1,7 +1,21 @@
-diff -Naur pygobject-2.28.3/codegen/pygobject-codegen-2.0.in pygobject-2.28.3.new/codegen/pygobject-codegen-2.0.in
---- pygobject-2.28.3/codegen/pygobject-codegen-2.0.in 2011-04-01 17:10:13.820719508 +0530
-+++ pygobject-2.28.3.new/codegen/pygobject-codegen-2.0.in 2011-04-01 17:08:07.464719548 +0530
-@@ -4,7 +4,7 @@
+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@
@@ -10,10 +24,11 @@ diff -Naur pygobject-2.28.3/codegen/pygobject-codegen-2.0.in pygobject-2.28.3.ne
PYTHONPATH=$codegendir
export PYTHONPATH
-diff -Naur pygobject-2.28.3/gi/Makefile.am pygobject-2.28.3.new/gi/Makefile.am
---- pygobject-2.28.3/gi/Makefile.am 2011-03-22 00:02:10.000000000 +0530
-+++ pygobject-2.28.3.new/gi/Makefile.am 2011-04-01 17:08:49.836719533 +0530
-@@ -25,7 +25,7 @@
+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) \
@@ -22,10 +37,11 @@ diff -Naur pygobject-2.28.3/gi/Makefile.am pygobject-2.28.3.new/gi/Makefile.am
_gi_la_SOURCES = \
pygi-repository.c \
pygi-repository.h \
-diff -Naur pygobject-2.28.3/gio/Makefile.am pygobject-2.28.3.new/gio/Makefile.am
---- pygobject-2.28.3/gio/Makefile.am 2011-03-23 03:04:52.000000000 +0530
-+++ pygobject-2.28.3.new/gio/Makefile.am 2011-04-01 17:08:07.468719548 +0530
-@@ -67,7 +67,7 @@
+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
@@ -34,10 +50,11 @@ diff -Naur pygobject-2.28.3/gio/Makefile.am pygobject-2.28.3.new/gio/Makefile.am
_gio_la_SOURCES = \
giomodule.c \
pygio-utils.c \
-diff -Naur pygobject-2.28.3/glib/Makefile.am pygobject-2.28.3.new/glib/Makefile.am
---- pygobject-2.28.3/glib/Makefile.am 2011-03-23 03:04:52.000000000 +0530
-+++ pygobject-2.28.3.new/glib/Makefile.am 2011-04-01 17:09:16.336719519 +0530
-@@ -4,7 +4,7 @@
+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
@@ -46,7 +63,7 @@ diff -Naur pygobject-2.28.3/glib/Makefile.am pygobject-2.28.3.new/glib/Makefile.
pkgpyexecdir = $(pyexecdir)
-@@ -19,9 +19,9 @@
+@@ -19,9 +19,9 @@ if PLATFORM_WIN32
common_ldflags += -no-undefined
endif
@@ -59,7 +76,7 @@ diff -Naur pygobject-2.28.3/glib/Makefile.am pygobject-2.28.3.new/glib/Makefile.
pyglib.c \
pyglib.h \
pyglib-private.h \
-@@ -29,7 +29,7 @@
+@@ -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"
@@ -68,10 +85,11 @@ diff -Naur pygobject-2.28.3/glib/Makefile.am pygobject-2.28.3.new/glib/Makefile.
_glib_la_SOURCES = \
glibmodule.c \
pygiochannel.c \
-diff -Naur pygobject-2.28.3/gobject/Makefile.am pygobject-2.28.3.new/gobject/Makefile.am
---- pygobject-2.28.3/gobject/Makefile.am 2011-03-23 03:04:52.000000000 +0530
-+++ pygobject-2.28.3.new/gobject/Makefile.am 2011-04-01 17:08:07.471719548 +0530
-@@ -35,7 +35,7 @@
+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) \
@@ -80,3 +98,6 @@ diff -Naur pygobject-2.28.3/gobject/Makefile.am pygobject-2.28.3.new/gobject/Mak
_gobject_la_SOURCES = \
gobjectmodule.c \
pygboxed.c \
+--
+1.7.4.1
+
diff --git a/dev-python/pygobject/pygobject-2.28.3.ebuild b/dev-python/pygobject/pygobject-2.28.3.ebuild
index 9d93a65..0a07449 100644
--- a/dev-python/pygobject/pygobject-2.28.3.ebuild
+++ b/dev-python/pygobject/pygobject-2.28.3.ebuild
@@ -2,12 +2,12 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-python/pygobject/pygobject-2.26.0-r1.ebuild,v 1.2 2010/12/21 21:48:56 eva Exp $
-EAPI="2"
+EAPI="3"
GCONF_DEBUG="no"
-#SUPPORT_PYTHON_ABIS="1"
+SUPPORT_PYTHON_ABIS="1"
PYTHON_DEPEND="2:2.6"
-# Supports Python 3, but needs pycairo-3 support too
-#RESTRICT_PYTHON_ABIS="2.4 2.5 3.*"
+# FIXME: Supports Python 3, but needs pycairo-3 support too
+RESTRICT_PYTHON_ABIS="2.4 2.5 3.*"
# XXX: Is the alternatives stuff needed anymore?
inherit alternatives autotools gnome2 python virtualx
@@ -49,57 +49,55 @@ pkg_setup() {
src_prepare() {
gnome2_src_prepare
- # XXX: These patches need to be double-checked
-
# Fix FHS compliance, see upstream bug #535524
- epatch "${FILESDIR}/${PN}-2.28.0-fix-codegen-location.patch"
+ epatch "${FILESDIR}/${PN}-2.28.3-fix-codegen-location.patch"
# Do not build tests if unneeded, bug #226345
- epatch "${FILESDIR}/${PN}-2.28.0-make_check.patch"
+ epatch "${FILESDIR}/${PN}-2.28.3-make_check.patch"
# Support installation for multiple Python versions
epatch "${FILESDIR}/${PN}-2.28.3-support_multiple_python_versions.patch"
# Disable tests that fail
- epatch "${FILESDIR}/${PN}-2.28.0-disable-failing-tests.patch"
+ epatch "${FILESDIR}/${PN}-2.28.3-disable-failing-tests.patch"
# disable pyc compiling
ln -sfn $(type -P true) py-compile
eautoreconf
-# python_copy_sources
+ python_copy_sources
}
-#src_configure() {
-# python_execute_function -s gnome2_src_configure
-#}
+src_configure() {
+ python_execute_function -s gnome2_src_configure
+}
-#src_compile() {
-# python_execute_function -d -s
-#}
+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() {
+ testing() {
XDG_CACHE_HOME="${T}/$(PYTHON --ABI)"
Xemake check PYTHON=$(PYTHON -a)
- #}
- #python_execute_function -s testing
+ }
+ python_execute_function -s testing
}
src_install() {
[[ -z ${ED} ]] && local ED="${D}"
-# installation() {
+ installation() {
gnome2_src_install
- mv "${ED}$(python_get_sitedir)"/pygtk.py{,-2.0} || die
- mv "${ED}$(python_get_sitedir)"/pygtk.pth{,-2.0} || die
-# }
-# python_execute_function -s installation
+ 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
+ python_clean_installation_image
sed "s:/usr/bin/python:/usr/bin/python2:" \
-i "${ED}"/usr/bin/pygobject-codegen-2.0 \
@@ -112,22 +110,21 @@ src_install() {
}
pkg_postinst() {
-# create_symlinks() {
+ 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_execute_function create_symlinks
- python_need_rebuild
- python_mod_optimize "$(python_get_sitedir)"/{gtk-2.0,pygtk.py}
+ python_mod_optimize gtk-2.0 pygtk.py
}
pkg_postrm() {
- python_mod_cleanup "$(python_get_sitedir)"/{gtk-2.0,pygtk.py}
+ python_mod_cleanup gtk-2.0 pygtk.py
-# create_symlinks() {
+ 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_execute_function create_symlinks
}
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: dev-python/pygobject/files/, dev-python/pygobject/
@ 2011-04-29 12:47 Nirbheek Chauhan
0 siblings, 0 replies; 9+ messages in thread
From: Nirbheek Chauhan @ 2011-04-29 12:47 UTC (permalink / raw
To: gentoo-commits
commit: 35451aeb81a4b622505ddaaf7585e88c8e517e45
Author: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 28 17:34:44 2011 +0000
Commit: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Thu Apr 28 17:35:01 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=35451aeb
dev-python/pygobject: 2.28.4 moved to tree
---
.../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 ----------------
dev-python/pygobject/pygobject-2.28.4.ebuild | 130 --------------------
5 files changed, 0 insertions(+), 428 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
deleted file mode 100644
index 86a66dd..0000000
--- a/dev-python/pygobject/files/pygobject-2.28.3-disable-failing-tests.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-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
deleted file mode 100644
index 44440a5..0000000
--- a/dev-python/pygobject/files/pygobject-2.28.3-fix-codegen-location.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-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
deleted file mode 100644
index 45c04b9..0000000
--- a/dev-python/pygobject/files/pygobject-2.28.3-make_check.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-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
deleted file mode 100644
index 65d881a..0000000
--- a/dev-python/pygobject/files/pygobject-2.28.3-support_multiple_python_versions.patch
+++ /dev/null
@@ -1,103 +0,0 @@
-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
-
diff --git a/dev-python/pygobject/pygobject-2.28.4.ebuild b/dev-python/pygobject/pygobject-2.28.4.ebuild
deleted file mode 100644
index 0a07449..0000000
--- a/dev-python/pygobject/pygobject-2.28.4.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# 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.26.0-r1.ebuild,v 1.2 2010/12/21 21:48:56 eva Exp $
-
-EAPI="3"
-GCONF_DEBUG="no"
-SUPPORT_PYTHON_ABIS="1"
-PYTHON_DEPEND="2:2.6"
-# FIXME: Supports Python 3, but needs pycairo-3 support too
-RESTRICT_PYTHON_ABIS="2.4 2.5 3.*"
-
-# 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 +cairo examples +introspection libffi test"
-
-COMMON_DEPEND=">=dev-libs/glib-2.24.0:2
- introspection? (
- >=dev-libs/gobject-introspection-0.10.2
- cairo? ( >=dev-python/pycairo-1.2.0 ) )
- 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"
-
-pkg_setup() {
- DOCS="AUTHORS ChangeLog* NEWS README"
- G2CONF="${G2CONF}
- --disable-dependency-tracking
- $(use_enable doc docs)
- $(use_enable cairo)
- $(use_enable introspection)
- $(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
- 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 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
-}
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: dev-python/pygobject/files/, dev-python/pygobject/
@ 2012-03-21 18:27 Alexandre Restovtsev
0 siblings, 0 replies; 9+ messages in thread
From: Alexandre Restovtsev @ 2012-03-21 18:27 UTC (permalink / raw
To: gentoo-commits
commit: 827c9b55797a0ec367bd97b5598f21f950403bee
Author: Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 21 18:17:44 2012 +0000
Commit: Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Wed Mar 21 18:26:14 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=827c9b55
dev-python/pygobject: 3.1.1 → 3.1.92
Instead of patching, set PYTHON for multiple python version support
(fix from the progress overlay by Arfrever).
---
...ct-3.0.0-support_multiple_python_versions.patch | 85 --------------------
...object-3.1.1.ebuild => pygobject-3.1.92.ebuild} | 17 ++--
dev-python/pygobject/pygobject-9999.ebuild | 19 ++---
3 files changed, 17 insertions(+), 104 deletions(-)
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
deleted file mode 100644
index f0fab7f..0000000
--- a/dev-python/pygobject/files/pygobject-3.0.0-support_multiple_python_versions.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-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-3.1.1.ebuild b/dev-python/pygobject/pygobject-3.1.92.ebuild
similarity index 86%
rename from dev-python/pygobject/pygobject-3.1.1.ebuild
rename to dev-python/pygobject/pygobject-3.1.92.ebuild
index 71c93a8..e155391 100644
--- a/dev-python/pygobject/pygobject-3.1.1.ebuild
+++ b/dev-python/pygobject/pygobject-3.1.92.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pygobject/pygobject-3.0.3.ebuild,v 1.4 2011/12/31 18:47:31 tetromino Exp $
+# $Header: $
EAPI="4"
GCONF_DEBUG="no"
@@ -27,7 +27,7 @@ fi
IUSE="+cairo examples test +threads" # doc
COMMON_DEPEND=">=dev-libs/glib-2.31.0:2
- >=dev-libs/gobject-introspection-1.31
+ >=dev-libs/gobject-introspection-1.31.20
virtual/libffi
cairo? ( >=dev-python/pycairo-1.10.0 )"
DEPEND="${COMMON_DEPEND}
@@ -67,14 +67,10 @@ src_prepare() {
# 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}-3.0.0-support_multiple_python_versions.patch"
-
# Disable tests that fail
#epatch "${FILESDIR}/${PN}-2.28.3-disable-failing-tests.patch"
- # disable pyc compiling
- echo > py-compile
+ python_clean_py-compile_files
[[ ${PV} != 9999 ]] && eautoreconf
gnome2_src_prepare
@@ -83,7 +79,10 @@ src_prepare() {
}
src_configure() {
- python_execute_function -s gnome2_src_configure
+ configuration() {
+ PYTHON="$(PYTHON)" gnome2_src_configure
+ }
+ python_execute_function -s configuration
}
src_compile() {
diff --git a/dev-python/pygobject/pygobject-9999.ebuild b/dev-python/pygobject/pygobject-9999.ebuild
index 4800d33..e155391 100644
--- a/dev-python/pygobject/pygobject-9999.ebuild
+++ b/dev-python/pygobject/pygobject-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pygobject/pygobject-3.0.3.ebuild,v 1.4 2011/12/31 18:47:31 tetromino Exp $
+# $Header: $
EAPI="4"
GCONF_DEBUG="no"
@@ -26,8 +26,8 @@ else
fi
IUSE="+cairo examples test +threads" # doc
-COMMON_DEPEND=">=dev-libs/glib-2.24.0:2
- >=dev-libs/gobject-introspection-1.31
+COMMON_DEPEND=">=dev-libs/glib-2.31.0:2
+ >=dev-libs/gobject-introspection-1.31.20
virtual/libffi
cairo? ( >=dev-python/pycairo-1.10.0 )"
DEPEND="${COMMON_DEPEND}
@@ -67,14 +67,10 @@ src_prepare() {
# 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}-3.0.0-support_multiple_python_versions.patch"
-
# Disable tests that fail
#epatch "${FILESDIR}/${PN}-2.28.3-disable-failing-tests.patch"
- # disable pyc compiling
- echo > py-compile
+ python_clean_py-compile_files
[[ ${PV} != 9999 ]] && eautoreconf
gnome2_src_prepare
@@ -83,7 +79,10 @@ src_prepare() {
}
src_configure() {
- python_execute_function -s gnome2_src_configure
+ configuration() {
+ PYTHON="$(PYTHON)" gnome2_src_configure
+ }
+ python_execute_function -s configuration
}
src_compile() {
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: dev-python/pygobject/files/, dev-python/pygobject/
@ 2012-09-25 15:46 Alexandre Rostovtsev
0 siblings, 0 replies; 9+ messages in thread
From: Alexandre Rostovtsev @ 2012-09-25 15:46 UTC (permalink / raw
To: gentoo-commits
commit: cecba379028f25b85c7ab348f475cdd12f88cc8a
Author: Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 25 15:40:03 2012 +0000
Commit: Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
CommitDate: Tue Sep 25 15:40:03 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=cecba379
dev-python/pygobject: sync with gx86
---
...heck.patch => pygobject-3.4.0-make_check.patch} | 49 ++++++++++---------
dev-python/pygobject/pygobject-9999.ebuild | 19 +++++---
2 files changed, 38 insertions(+), 30 deletions(-)
diff --git a/dev-python/pygobject/files/pygobject-2.90.1-make_check.patch b/dev-python/pygobject/files/pygobject-3.4.0-make_check.patch
similarity index 64%
rename from dev-python/pygobject/files/pygobject-2.90.1-make_check.patch
rename to dev-python/pygobject/files/pygobject-3.4.0-make_check.patch
index c2e80d6..08d8fa3 100644
--- a/dev-python/pygobject/files/pygobject-2.90.1-make_check.patch
+++ b/dev-python/pygobject/files/pygobject-3.4.0-make_check.patch
@@ -1,16 +1,16 @@
-From b5c4b8b97a1ccb9a4c63ab726ea9c84d81ef51ca Mon Sep 17 00:00:00 2001
+From 50dd12f2958945626defdf305332f270309cacc0 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
+Subject: [PATCH] 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(-)
+ tests/Makefile.am | 10 +++++-----
+ tests/runtests.py | 3 +++
+ 2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/tests/Makefile.am b/tests/Makefile.am
-index 4ec6477..c52cb9d 100644
+index 081028a..ac71575 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,5 +1,5 @@
@@ -19,7 +19,7 @@ index 4ec6477..c52cb9d 100644
+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)
+ libregress_la_CFLAGS = $(GIO_CFLAGS) $(CAIRO_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
@@ -29,17 +29,17 @@ index 4ec6477..c52cb9d 100644
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)
+@@ -63,7 +63,7 @@ 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)
++all: $(check_LTLIBRARIES:.la=.so)
+
+ EXTRA_DIST = \
+ compathelper.py \
+@@ -103,7 +103,7 @@ EXTRA_DIST = \
+ $(NULL)
clean-local:
- rm -f $(LTLIBRARIES:.la=.so) file.txt~
@@ -47,22 +47,22 @@ index 4ec6477..c52cb9d 100644
DBUS_LAUNCH=$(shell which dbus-launch)
RUN_TESTS_ENV_VARS= \
-@@ -108,7 +106,7 @@ RUN_TESTS_ENV_VARS= \
+@@ -114,7 +114,7 @@ RUN_TESTS_ENV_VARS= \
+ MALLOC_PERTURB_=85 \
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)
-
+ @echo " CHECK Pyflakes"
+ @if type pyflakes >/dev/null 2>&1; then pyflakes $(top_srcdir); else echo "skipped, pyflakes not installed"; fi
+ @echo " CHECK PEP8"
diff --git a/tests/runtests.py b/tests/runtests.py
-index 2a8ecf4..dc9fb03 100755
+index c518fcc..35bb5c4 100755
--- a/tests/runtests.py
+++ b/tests/runtests.py
-@@ -7,6 +7,9 @@ import sys
-
- import unittest
+@@ -34,6 +34,9 @@ if sys.version_info[:2] == (2, 6):
+ unittest.TestCase.assertGreater = assertGreater
+ unittest.TestCase.assertIsInstance = assertIsInstance
+# Some tests fail with translated messages.
+os.environ["LC_ALL"] = "C"
@@ -70,3 +70,6 @@ index 2a8ecf4..dc9fb03 100755
if '--help' in sys.argv:
print("Usage: ./runtests.py <testfiles>")
sys.exit(0)
+--
+1.7.12
+
diff --git a/dev-python/pygobject/pygobject-9999.ebuild b/dev-python/pygobject/pygobject-9999.ebuild
index 8c07c67..474efa7 100644
--- a/dev-python/pygobject/pygobject-9999.ebuild
+++ b/dev-python/pygobject/pygobject-9999.ebuild
@@ -9,7 +9,7 @@ SUPPORT_PYTHON_ABIS="1"
PYTHON_DEPEND="2:2.6 3:3.1"
RESTRICT_PYTHON_ABIS="2.4 2.5 3.0 *-jython *-pypy-*"
-inherit autotools gnome2 python virtualx
+inherit autotools eutils gnome2 python virtualx
if [[ ${PV} = 9999 ]]; then
inherit gnome2-live
fi
@@ -17,25 +17,30 @@ fi
DESCRIPTION="GLib's GObject library bindings for Python"
HOMEPAGE="http://www.pygtk.org/"
-LICENSE="LGPL-2.1"
+LICENSE="LGPL-2.1+"
SLOT="3"
if [[ ${PV} = 9999 ]]; then
KEYWORDS=""
else
- 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"
+ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
fi
IUSE="+cairo examples test +threads" # doc
+REQUIRED_USE="test? ( cairo )"
COMMON_DEPEND=">=dev-libs/glib-2.31.0:2
- >=dev-libs/gobject-introspection-1.31.20
+ >=dev-libs/gobject-introspection-1.33.14
virtual/libffi
cairo? ( >=dev-python/pycairo-1.10.0 )"
DEPEND="${COMMON_DEPEND}
+ x11-libs/cairo[glib]
+ virtual/pkgconfig
test? (
+ dev-libs/atk[introspection]
media-fonts/font-cursor-misc
media-fonts/font-misc-misc
- >=dev-libs/gobject-introspection-1.29.17 )
- virtual/pkgconfig"
+ x11-libs/gdk-pixbuf:2[introspection]
+ x11-libs/gtk+:3[introspection]
+ x11-libs/pango[introspection] )"
# docs disabled for now per upstream default since they are very out of date
# doc? (
# app-text/docbook-xml-dtd:4.1.2
@@ -65,7 +70,7 @@ pkg_setup() {
src_prepare() {
# Do not build tests if unneeded, bug #226345
- epatch "${FILESDIR}/${PN}-2.90.1-make_check.patch"
+ epatch "${FILESDIR}/${PN}-3.4.0-make_check.patch"
# Disable tests that fail
#epatch "${FILESDIR}/${PN}-2.28.3-disable-failing-tests.patch"
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: dev-python/pygobject/files/, dev-python/pygobject/
@ 2012-12-17 11:12 Alexandre Rostovtsev
0 siblings, 0 replies; 9+ messages in thread
From: Alexandre Rostovtsev @ 2012-12-17 11:12 UTC (permalink / raw
To: gentoo-commits
commit: de2cc89cd22a4b8f1121eedc0bf9841e7f46cd5e
Author: Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 17 11:01:32 2012 +0000
Commit: Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
CommitDate: Mon Dec 17 11:01:32 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=de2cc89c
dev-python/pygobject: sync with gx86
Update for python-r1.eclass and EAPI5.
---
...ck.patch => pygobject-3.4.1.1-make_check.patch} | 35 +++++++----
dev-python/pygobject/metadata.xml | 6 ++
dev-python/pygobject/pygobject-9999.ebuild | 64 +++++++-------------
3 files changed, 51 insertions(+), 54 deletions(-)
diff --git a/dev-python/pygobject/files/pygobject-3.4.0-make_check.patch b/dev-python/pygobject/files/pygobject-3.4.1.1-make_check.patch
similarity index 64%
rename from dev-python/pygobject/files/pygobject-3.4.0-make_check.patch
rename to dev-python/pygobject/files/pygobject-3.4.1.1-make_check.patch
index 08d8fa3..7aa7058 100644
--- a/dev-python/pygobject/files/pygobject-3.4.0-make_check.patch
+++ b/dev-python/pygobject/files/pygobject-3.4.1.1-make_check.patch
@@ -1,26 +1,35 @@
-From 50dd12f2958945626defdf305332f270309cacc0 Mon Sep 17 00:00:00 2001
+From d0885d5757f02f53dbc8036054a1ced7f727eb08 Mon Sep 17 00:00:00 2001
From: Gilles Dartiguelongue <eva@gentoo.org>
Date: Fri, 5 Nov 2010 23:39:08 +0100
Subject: [PATCH] Do not build tests unless needed
[Alexandre Rostovtsev <tetromino@gmail.com>: port to 2.90.1]
---
- tests/Makefile.am | 10 +++++-----
+ tests/Makefile.am | 12 ++++++------
tests/runtests.py | 3 +++
- 2 files changed, 8 insertions(+), 5 deletions(-)
+ 2 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/tests/Makefile.am b/tests/Makefile.am
-index 081028a..ac71575 100644
+index 7a619bf..a3cbf57 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
+-noinst_LTLIBRARIES = libgimarshallingtests.la
++check_LTLIBRARIES = libgimarshallingtests.la
+ test_typelibs = GIMarshallingTests-1.0.typelib
+ nodist_libgimarshallingtests_la_SOURCES = $(GI_DATADIR)/tests/gimarshallingtests.c $(GI_DATADIR)/tests/gimarshallingtests.h
+@@ -23,7 +23,7 @@ GIMarshallingTests-1.0.typelib: GIMarshallingTests-1.0.gir Makefile
+
+ # regress.c needs cairo
+ if ENABLE_CAIRO
+-noinst_LTLIBRARIES += libregress.la
++check_LTLIBRARIES += libregress.la
+ test_typelibs += Regress-1.0.typelib
nodist_libregress_la_SOURCES = $(GI_DATADIR)/tests/regress.c $(GI_DATADIR)/tests/regress.h
libregress_la_CFLAGS = $(GIO_CFLAGS) $(CAIRO_CFLAGS)
-@@ -43,7 +43,7 @@ gschemas.compiled: org.gnome.test.gschema.xml
+@@ -52,7 +52,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
@@ -29,7 +38,7 @@ index 081028a..ac71575 100644
testhelper_la_CFLAGS = -I$(top_srcdir)/gi/_gobject -I$(top_srcdir)/gi/_glib $(PYTHON_INCLUDES) $(GLIB_CFLAGS)
testhelper_la_LDFLAGS = -module -avoid-version
-@@ -63,7 +63,7 @@ testhelper.la: $(testhelper_la_OBJECTS) $(testhelper_la_DEPENDENCIES)
+@@ -72,7 +72,7 @@ testhelper.la: $(testhelper_la_OBJECTS) $(testhelper_la_DEPENDENCIES)
test -L $@ || $(LN_S) .libs/$@ $@
@@ -38,7 +47,7 @@ index 081028a..ac71575 100644
EXTRA_DIST = \
compathelper.py \
-@@ -103,7 +103,7 @@ EXTRA_DIST = \
+@@ -112,7 +112,7 @@ EXTRA_DIST = \
$(NULL)
clean-local:
@@ -47,12 +56,12 @@ index 081028a..ac71575 100644
DBUS_LAUNCH=$(shell which dbus-launch)
RUN_TESTS_ENV_VARS= \
-@@ -114,7 +114,7 @@ RUN_TESTS_ENV_VARS= \
+@@ -123,7 +123,7 @@ RUN_TESTS_ENV_VARS= \
MALLOC_PERTURB_=85 \
TESTS_BUILDDIR=$(builddir)
--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
+-check-local: $(LTLIBRARIES:.la=.so) $(test_typelibs) gschemas.compiled
++check-local: $(check_LTLIBRARIES:.la=.so) $(test_typelibs) gschemas.compiled
@echo " CHECK Pyflakes"
@if type pyflakes >/dev/null 2>&1; then pyflakes $(top_srcdir); else echo "skipped, pyflakes not installed"; fi
@echo " CHECK PEP8"
@@ -71,5 +80,5 @@ index c518fcc..35bb5c4 100755
print("Usage: ./runtests.py <testfiles>")
sys.exit(0)
--
-1.7.12
+1.7.12.4
diff --git a/dev-python/pygobject/metadata.xml b/dev-python/pygobject/metadata.xml
new file mode 100644
index 0000000..9b1bc26
--- /dev/null
+++ b/dev-python/pygobject/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>gnome</herd>
+<herd>python</herd>
+</pkgmetadata>
diff --git a/dev-python/pygobject/pygobject-9999.ebuild b/dev-python/pygobject/pygobject-9999.ebuild
index 474efa7..3b3ba4c 100644
--- a/dev-python/pygobject/pygobject-9999.ebuild
+++ b/dev-python/pygobject/pygobject-9999.ebuild
@@ -2,14 +2,12 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-EAPI="4"
+EAPI="5"
GCONF_DEBUG="no"
GNOME2_LA_PUNT="yes"
-SUPPORT_PYTHON_ABIS="1"
-PYTHON_DEPEND="2:2.6 3:3.1"
-RESTRICT_PYTHON_ABIS="2.4 2.5 3.0 *-jython *-pypy-*"
+PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} )
-inherit autotools eutils gnome2 python virtualx
+inherit autotools eutils gnome2 python-r1 virtualx
if [[ ${PV} = 9999 ]]; then
inherit gnome2-live
fi
@@ -24,13 +22,16 @@ if [[ ${PV} = 9999 ]]; then
else
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
fi
-IUSE="+cairo examples test +threads" # doc
+IUSE="+cairo examples test +threads"
+
REQUIRED_USE="test? ( cairo )"
COMMON_DEPEND=">=dev-libs/glib-2.31.0:2
- >=dev-libs/gobject-introspection-1.33.14
- virtual/libffi
- cairo? ( >=dev-python/pycairo-1.10.0 )"
+ >=dev-libs/gobject-introspection-1.34.1.1
+ virtual/libffi:=
+ cairo? ( >=dev-python/pycairo-1.10.0 )
+ ${PYTHON_DEPS}"
+# TODO: should be >=dev-python/pycairo-1.10.0[${PYTHON_USEDEP}]
DEPEND="${COMMON_DEPEND}
x11-libs/cairo[glib]
virtual/pkgconfig
@@ -41,11 +42,6 @@ DEPEND="${COMMON_DEPEND}
x11-libs/gdk-pixbuf:2[introspection]
x11-libs/gtk+:3[introspection]
x11-libs/pango[introspection] )"
-# 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,27 +51,19 @@ RDEPEND="${COMMON_DEPEND}
!<dev-python/pygtk-2.13
!<dev-python/pygobject-2.28.6-r50:2[introspection]"
-pkg_setup() {
+src_prepare() {
DOCS="AUTHORS ChangeLog* NEWS README"
# Hard-enable libffi support since both gobject-introspection and
# glib-2.29.x rdepend on it anyway
+ # docs disabled by upstream default since they are very out of date
G2CONF="${G2CONF}
--disable-dependency-tracking
--with-ffi
$(use_enable cairo)
$(use_enable threads thread)"
- python_pkg_setup
-}
-
-src_prepare() {
# Do not build tests if unneeded, bug #226345
- epatch "${FILESDIR}/${PN}-3.4.0-make_check.patch"
-
- # Disable tests that fail
- #epatch "${FILESDIR}/${PN}-2.28.3-disable-failing-tests.patch"
-
- python_clean_py-compile_files
+ epatch "${FILESDIR}/${PN}-3.4.1.1-make_check.patch"
[[ ${PV} != 9999 ]] && eautoreconf
gnome2_src_prepare
@@ -84,14 +72,11 @@ src_prepare() {
}
src_configure() {
- configuration() {
- PYTHON="$(PYTHON)" gnome2_src_configure
- }
- python_execute_function -s configuration
+ python_foreach_impl run_in_build_dir gnome2_src_configure
}
src_compile() {
- python_src_compile
+ python_foreach_impl run_in_build_dir gnome2_src_compile
}
# FIXME: With python multiple ABI support, tests return 1 even when they pass
@@ -100,17 +85,16 @@ src_test() {
export GIO_USE_VFS="local" # prevents odd issues with deleting ${T}/.gvfs
testing() {
- export XDG_CACHE_HOME="${T}/$(PYTHON --ABI)"
- Xemake check PYTHON=$(PYTHON -a)
+ export XDG_CACHE_HOME="${T}/${EPYTHON}"
+ run_in_build_dir Xemake check
unset XDG_CACHE_HOME
}
- python_execute_function -s testing
+ python_foreach_impl testing
unset GIO_USE_VFS
}
src_install() {
- python_execute_function -s gnome2_src_install
- python_clean_installation_image
+ python_foreach_impl run_in_build_dir gnome2_src_install
if use examples; then
insinto /usr/share/doc/${PF}
@@ -118,10 +102,8 @@ src_install() {
fi
}
-pkg_postinst() {
- python_mod_optimize gi
-}
-
-pkg_postrm() {
- python_mod_cleanup gi
+run_in_build_dir() {
+ pushd "${BUILD_DIR}" > /dev/null || die
+ "$@"
+ popd > /dev/null
}
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: dev-python/pygobject/files/, dev-python/pygobject/
@ 2013-11-25 23:15 Gilles Dartiguelongue
0 siblings, 0 replies; 9+ messages in thread
From: Gilles Dartiguelongue @ 2013-11-25 23:15 UTC (permalink / raw
To: gentoo-commits
commit: 5dab79e5344641e02bd371bd5f2a6d8e476ac7d4
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 25 22:44:15 2013 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Mon Nov 25 23:14:21 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=5dab79e5
dev-python/pygobject: 3.8.3 → 3.10.2
---
.../pygobject-3.0.3-disable-new-gi-tests.patch | 69 ------------------
.../files/pygobject-3.4.1.1-make_check.patch | 84 ----------------------
...gobject-9999.ebuild => pygobject-3.10.2.ebuild} | 70 ++++++++----------
dev-python/pygobject/pygobject-9999.ebuild | 63 ++++++++--------
4 files changed, 58 insertions(+), 228 deletions(-)
diff --git a/dev-python/pygobject/files/pygobject-3.0.3-disable-new-gi-tests.patch b/dev-python/pygobject/files/pygobject-3.0.3-disable-new-gi-tests.patch
deleted file mode 100644
index a445374..0000000
--- a/dev-python/pygobject/files/pygobject-3.0.3-disable-new-gi-tests.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-Disable tests requiring >=gobject-introspection-1.31
-
-diff --git a/tests/test_everything.py b/tests/test_everything.py
-index 43735e5..ecfdef4 100644
---- a/tests/test_everything.py
-+++ b/tests/test_everything.py
-@@ -507,22 +507,3 @@ class TestAdvancedInterfaces(unittest.TestCase):
- self.assertEquals(ret[0], 51);
- self.assertEquals(ret[1], 61);
- self.assertEquals(ret[2], 32);
--
-- def test_obj_skip_return_val_no_out(self):
-- obj = Everything.TestObj();
-- # raises an error for 0, succeeds for any other value
-- self.assertRaises(GLib.GError, obj.skip_return_val_no_out, 0)
--
-- ret = obj.skip_return_val_no_out(1)
-- self.assertEquals(ret, None)
--
--class TestSignals(unittest.TestCase):
-- def test_object_param_signal(self):
-- obj = Everything.TestObj();
--
-- def callback (obj_param):
-- self.assertEquals(obj_param.props.int, 3)
-- self.assertEquals(obj_param.__grefcount__, 2)
--
-- obj.connect('sig-with-obj', callback)
-- obj.emit_sig_with_obj()
-diff --git a/tests/test_gi.py b/tests/test_gi.py
-index 0a9b1b2..7e24778 100644
---- a/tests/test_gi.py
-+++ b/tests/test_gi.py
-@@ -770,18 +770,6 @@ class TestArray(unittest.TestCase):
- def test_gstrv_inout(self):
- self.assertEquals(['-1', '0', '1', '2'], GIMarshallingTests.gstrv_inout(['0', '1', '2']))
-
-- def test_array_gvariant_none_in(self):
-- v = [GLib.Variant("i", 27), GLib.Variant("s", "Hello")]
-- self.assertEquals([27, "Hello"], map(GLib.Variant.unpack, GIMarshallingTests.array_gvariant_none_in(v)))
--
-- def test_array_gvariant_container_in(self):
-- v = [GLib.Variant("i", 27), GLib.Variant("s", "Hello")]
-- self.assertEquals([27, "Hello"], map(GLib.Variant.unpack, GIMarshallingTests.array_gvariant_none_in(v)))
--
-- def test_array_gvariant_full_in(self):
-- v = [GLib.Variant("i", 27), GLib.Variant("s", "Hello")]
-- self.assertEquals([27, "Hello"], map(GLib.Variant.unpack, GIMarshallingTests.array_gvariant_none_in(v)))
--
- def test_bytearray_gvariant(self):
- v = GLib.Variant.new_bytestring("foo")
- self.assertEquals(v.get_bytestring(), "foo")
-@@ -1651,16 +1639,6 @@ class TestPythonGObject(unittest.TestCase):
- def do_method_not_a_vfunc(self):
- pass
-
-- def test_subsubobject(self):
-- class SubSubSubObject(GIMarshallingTests.SubSubObject):
-- def do_method_deep_hierarchy(self, num):
-- self.props.int = num * 2
--
-- sub_sub_sub_object = SubSubSubObject()
-- GIMarshallingTests.SubSubObject.do_method_deep_hierarchy(sub_sub_sub_object, 5)
-- self.assertEqual(sub_sub_sub_object.props.int, 5)
--
--
- class TestMultiOutputArgs(unittest.TestCase):
-
- def test_int_out_out(self):
diff --git a/dev-python/pygobject/files/pygobject-3.4.1.1-make_check.patch b/dev-python/pygobject/files/pygobject-3.4.1.1-make_check.patch
deleted file mode 100644
index 7aa7058..0000000
--- a/dev-python/pygobject/files/pygobject-3.4.1.1-make_check.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-From d0885d5757f02f53dbc8036054a1ced7f727eb08 Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Fri, 5 Nov 2010 23:39:08 +0100
-Subject: [PATCH] Do not build tests unless needed
-
-[Alexandre Rostovtsev <tetromino@gmail.com>: port to 2.90.1]
----
- tests/Makefile.am | 12 ++++++------
- tests/runtests.py | 3 +++
- 2 files changed, 9 insertions(+), 6 deletions(-)
-
-diff --git a/tests/Makefile.am b/tests/Makefile.am
-index 7a619bf..a3cbf57 100644
---- a/tests/Makefile.am
-+++ b/tests/Makefile.am
-@@ -1,5 +1,5 @@
- CLEANFILES =
--noinst_LTLIBRARIES = libgimarshallingtests.la
-+check_LTLIBRARIES = libgimarshallingtests.la
- test_typelibs = GIMarshallingTests-1.0.typelib
-
- nodist_libgimarshallingtests_la_SOURCES = $(GI_DATADIR)/tests/gimarshallingtests.c $(GI_DATADIR)/tests/gimarshallingtests.h
-@@ -23,7 +23,7 @@ GIMarshallingTests-1.0.typelib: GIMarshallingTests-1.0.gir Makefile
-
- # regress.c needs cairo
- if ENABLE_CAIRO
--noinst_LTLIBRARIES += libregress.la
-+check_LTLIBRARIES += libregress.la
- test_typelibs += Regress-1.0.typelib
- nodist_libregress_la_SOURCES = $(GI_DATADIR)/tests/regress.c $(GI_DATADIR)/tests/regress.h
- libregress_la_CFLAGS = $(GIO_CFLAGS) $(CAIRO_CFLAGS)
-@@ -52,7 +52,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
-@@ -72,7 +72,7 @@ testhelper.la: $(testhelper_la_OBJECTS) $(testhelper_la_DEPENDENCIES)
- test -L $@ || $(LN_S) .libs/$@ $@
-
-
--all: $(LTLIBRARIES:.la=.so)
-+all: $(check_LTLIBRARIES:.la=.so)
-
- EXTRA_DIST = \
- compathelper.py \
-@@ -112,7 +112,7 @@ EXTRA_DIST = \
- $(NULL)
-
- 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= \
-@@ -123,7 +123,7 @@ RUN_TESTS_ENV_VARS= \
- MALLOC_PERTURB_=85 \
- TESTS_BUILDDIR=$(builddir)
-
--check-local: $(LTLIBRARIES:.la=.so) $(test_typelibs) gschemas.compiled
-+check-local: $(check_LTLIBRARIES:.la=.so) $(test_typelibs) gschemas.compiled
- @echo " CHECK Pyflakes"
- @if type pyflakes >/dev/null 2>&1; then pyflakes $(top_srcdir); else echo "skipped, pyflakes not installed"; fi
- @echo " CHECK PEP8"
-diff --git a/tests/runtests.py b/tests/runtests.py
-index c518fcc..35bb5c4 100755
---- a/tests/runtests.py
-+++ b/tests/runtests.py
-@@ -34,6 +34,9 @@ if sys.version_info[:2] == (2, 6):
- unittest.TestCase.assertGreater = assertGreater
- unittest.TestCase.assertIsInstance = assertIsInstance
-
-+# Some tests fail with translated messages.
-+os.environ["LC_ALL"] = "C"
-+
- if '--help' in sys.argv:
- print("Usage: ./runtests.py <testfiles>")
- sys.exit(0)
---
-1.7.12.4
-
diff --git a/dev-python/pygobject/pygobject-9999.ebuild b/dev-python/pygobject/pygobject-3.10.2.ebuild
similarity index 58%
copy from dev-python/pygobject/pygobject-9999.ebuild
copy to dev-python/pygobject/pygobject-3.10.2.ebuild
index 3b3ba4c..730eb8f 100644
--- a/dev-python/pygobject/pygobject-9999.ebuild
+++ b/dev-python/pygobject/pygobject-3.10.2.ebuild
@@ -1,37 +1,34 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="5"
GCONF_DEBUG="no"
GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} )
+PYTHON_COMPAT=( python{2_7,3_2,3_3} )
-inherit autotools eutils gnome2 python-r1 virtualx
-if [[ ${PV} = 9999 ]]; then
- inherit gnome2-live
-fi
+inherit gnome2 python-r1 virtualx
DESCRIPTION="GLib's GObject library bindings for Python"
HOMEPAGE="http://www.pygtk.org/"
LICENSE="LGPL-2.1+"
SLOT="3"
-if [[ ${PV} = 9999 ]]; then
- KEYWORDS=""
-else
- KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-fi
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="+cairo examples test +threads"
-REQUIRED_USE="test? ( cairo )"
+REQUIRED_USE="
+ ${PYTHON_REQUIRED_USE}
+ test? ( cairo )
+"
-COMMON_DEPEND=">=dev-libs/glib-2.31.0:2
- >=dev-libs/gobject-introspection-1.34.1.1
+COMMON_DEPEND="
+ >=dev-libs/glib-2.35.9:2
+ >=dev-libs/gobject-introspection-1.35.9
virtual/libffi:=
- cairo? ( >=dev-python/pycairo-1.10.0 )
- ${PYTHON_DEPS}"
-# TODO: should be >=dev-python/pycairo-1.10.0[${PYTHON_USEDEP}]
+ cairo? ( >=dev-python/pycairo-1.10.0[${PYTHON_USEDEP}] )
+ ${PYTHON_DEPS}
+"
DEPEND="${COMMON_DEPEND}
x11-libs/cairo[glib]
virtual/pkgconfig
@@ -39,9 +36,12 @@ DEPEND="${COMMON_DEPEND}
dev-libs/atk[introspection]
media-fonts/font-cursor-misc
media-fonts/font-misc-misc
+ virtual/python-unittest2[${PYTHON_USEDEP}]
x11-libs/gdk-pixbuf:2[introspection]
x11-libs/gtk+:3[introspection]
- x11-libs/pango[introspection] )"
+ x11-libs/pango[introspection] )
+"
+# gnome-base/gnome-common required by eautoreconf
# We now disable introspection support in slot 2 per upstream recommendation
# (see https://bugzilla.gnome.org/show_bug.cgi?id=642048#c9); however,
@@ -52,37 +52,29 @@ RDEPEND="${COMMON_DEPEND}
!<dev-python/pygobject-2.28.6-r50:2[introspection]"
src_prepare() {
- DOCS="AUTHORS ChangeLog* NEWS README"
- # Hard-enable libffi support since both gobject-introspection and
- # glib-2.29.x rdepend on it anyway
- # docs disabled by upstream default since they are very out of date
- G2CONF="${G2CONF}
- --disable-dependency-tracking
- --with-ffi
- $(use_enable cairo)
- $(use_enable threads thread)"
-
- # Do not build tests if unneeded, bug #226345
- epatch "${FILESDIR}/${PN}-3.4.1.1-make_check.patch"
-
- [[ ${PV} != 9999 ]] && eautoreconf
gnome2_src_prepare
-
python_copy_sources
}
src_configure() {
- python_foreach_impl run_in_build_dir gnome2_src_configure
+ # Hard-enable libffi support since both gobject-introspection and
+ # glib-2.29.x rdepend on it anyway
+ # docs disabled by upstream default since they are very out of date
+ python_foreach_impl run_in_build_dir \
+ gnome2_src_configure \
+ --with-ffi \
+ $(use_enable cairo) \
+ $(use_enable threads thread)
}
src_compile() {
python_foreach_impl run_in_build_dir gnome2_src_compile
}
-# FIXME: With python multiple ABI support, tests return 1 even when they pass
src_test() {
unset DBUS_SESSION_BUS_ADDRESS
export GIO_USE_VFS="local" # prevents odd issues with deleting ${T}/.gvfs
+ export GIO_USE_VOLUME_MONITOR="unix" # prevent udisks-related failures in chroots, bug #449484
testing() {
export XDG_CACHE_HOME="${T}/${EPYTHON}"
@@ -94,6 +86,8 @@ src_test() {
}
src_install() {
+ DOCS="AUTHORS ChangeLog* NEWS README"
+
python_foreach_impl run_in_build_dir gnome2_src_install
if use examples; then
@@ -101,9 +95,3 @@ src_install() {
doins -r examples
fi
}
-
-run_in_build_dir() {
- pushd "${BUILD_DIR}" > /dev/null || die
- "$@"
- popd > /dev/null
-}
diff --git a/dev-python/pygobject/pygobject-9999.ebuild b/dev-python/pygobject/pygobject-9999.ebuild
index 3b3ba4c..664a5d3 100644
--- a/dev-python/pygobject/pygobject-9999.ebuild
+++ b/dev-python/pygobject/pygobject-9999.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="5"
GCONF_DEBUG="no"
GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} )
+PYTHON_COMPAT=( python{2_7,3_2,3_3} )
-inherit autotools eutils gnome2 python-r1 virtualx
+inherit gnome2 python-r1 virtualx
if [[ ${PV} = 9999 ]]; then
inherit gnome2-live
fi
@@ -20,18 +20,22 @@ SLOT="3"
if [[ ${PV} = 9999 ]]; then
KEYWORDS=""
else
- KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
fi
IUSE="+cairo examples test +threads"
-REQUIRED_USE="test? ( cairo )"
+REQUIRED_USE="
+ ${PYTHON_REQUIRED_USE}
+ test? ( cairo )
+"
-COMMON_DEPEND=">=dev-libs/glib-2.31.0:2
- >=dev-libs/gobject-introspection-1.34.1.1
+COMMON_DEPEND="
+ >=dev-libs/glib-2.35.9:2
+ >=dev-libs/gobject-introspection-1.35.9
virtual/libffi:=
- cairo? ( >=dev-python/pycairo-1.10.0 )
- ${PYTHON_DEPS}"
-# TODO: should be >=dev-python/pycairo-1.10.0[${PYTHON_USEDEP}]
+ cairo? ( >=dev-python/pycairo-1.10.0[${PYTHON_USEDEP}] )
+ ${PYTHON_DEPS}
+"
DEPEND="${COMMON_DEPEND}
x11-libs/cairo[glib]
virtual/pkgconfig
@@ -39,9 +43,12 @@ DEPEND="${COMMON_DEPEND}
dev-libs/atk[introspection]
media-fonts/font-cursor-misc
media-fonts/font-misc-misc
+ virtual/python-unittest2[${PYTHON_USEDEP}]
x11-libs/gdk-pixbuf:2[introspection]
x11-libs/gtk+:3[introspection]
- x11-libs/pango[introspection] )"
+ x11-libs/pango[introspection] )
+"
+# gnome-base/gnome-common required by eautoreconf
# We now disable introspection support in slot 2 per upstream recommendation
# (see https://bugzilla.gnome.org/show_bug.cgi?id=642048#c9); however,
@@ -52,37 +59,29 @@ RDEPEND="${COMMON_DEPEND}
!<dev-python/pygobject-2.28.6-r50:2[introspection]"
src_prepare() {
- DOCS="AUTHORS ChangeLog* NEWS README"
- # Hard-enable libffi support since both gobject-introspection and
- # glib-2.29.x rdepend on it anyway
- # docs disabled by upstream default since they are very out of date
- G2CONF="${G2CONF}
- --disable-dependency-tracking
- --with-ffi
- $(use_enable cairo)
- $(use_enable threads thread)"
-
- # Do not build tests if unneeded, bug #226345
- epatch "${FILESDIR}/${PN}-3.4.1.1-make_check.patch"
-
- [[ ${PV} != 9999 ]] && eautoreconf
gnome2_src_prepare
-
python_copy_sources
}
src_configure() {
- python_foreach_impl run_in_build_dir gnome2_src_configure
+ # Hard-enable libffi support since both gobject-introspection and
+ # glib-2.29.x rdepend on it anyway
+ # docs disabled by upstream default since they are very out of date
+ python_foreach_impl run_in_build_dir \
+ gnome2_src_configure \
+ --with-ffi \
+ $(use_enable cairo) \
+ $(use_enable threads thread)
}
src_compile() {
python_foreach_impl run_in_build_dir gnome2_src_compile
}
-# FIXME: With python multiple ABI support, tests return 1 even when they pass
src_test() {
unset DBUS_SESSION_BUS_ADDRESS
export GIO_USE_VFS="local" # prevents odd issues with deleting ${T}/.gvfs
+ export GIO_USE_VOLUME_MONITOR="unix" # prevent udisks-related failures in chroots, bug #449484
testing() {
export XDG_CACHE_HOME="${T}/${EPYTHON}"
@@ -94,6 +93,8 @@ src_test() {
}
src_install() {
+ DOCS="AUTHORS ChangeLog* NEWS README"
+
python_foreach_impl run_in_build_dir gnome2_src_install
if use examples; then
@@ -101,9 +102,3 @@ src_install() {
doins -r examples
fi
}
-
-run_in_build_dir() {
- pushd "${BUILD_DIR}" > /dev/null || die
- "$@"
- popd > /dev/null
-}
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: dev-python/pygobject/files/, dev-python/pygobject/
@ 2018-09-18 20:24 Mart Raudsepp
0 siblings, 0 replies; 9+ messages in thread
From: Mart Raudsepp @ 2018-09-18 20:24 UTC (permalink / raw
To: gentoo-commits
commit: 37668a8e48c239cfb8951876504410f3eca6dd20
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 18 20:21:35 2018 +0000
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Tue Sep 18 20:21:35 2018 +0000
URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=37668a8e
dev-python/pygobject: remove, 3.28.3 available in ::gentoo
Main tree version removes some by now unnecessary test workarounds
(cairo.SubpixelOrder stuff seems solved, compat gtk stuff moved to
a separate file than we still sed and I don't get test failures),
which however might have been still relevant in the overlay 3.26
version.
Also updates comment about gnome-common to autoconf-archive, as that's
what it needs now for eautoreconf. However 3.30 and git master use
meson. Relatedly, the 9999 is thus useless here now (still autotools),
so remove that too.
.../files/pygobject-3.16.1-unittest.patch | 15 ---
dev-python/pygobject/metadata.xml | 12 ---
dev-python/pygobject/pygobject-3.26.1.ebuild | 107 ---------------------
dev-python/pygobject/pygobject-9999.ebuild | 105 --------------------
4 files changed, 239 deletions(-)
diff --git a/dev-python/pygobject/files/pygobject-3.16.1-unittest.patch b/dev-python/pygobject/files/pygobject-3.16.1-unittest.patch
deleted file mode 100644
index 5ee15b1d..00000000
--- a/dev-python/pygobject/files/pygobject-3.16.1-unittest.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Comment out unittest that ought to work but for some reason does not want to.
-
---- a/tests/test_glib.py 2015-05-10 14:01:45.873164005 +0200
-+++ b/tests/test_glib.py 2015-03-05 09:32:55.000000000 +0100
-@@ -38,8 +38,8 @@
- def test_xdg_dirs(self):
- d = GLib.get_user_data_dir()
- self.assertTrue('/' in d, d)
-- d = GLib.get_user_special_dir(GLib.UserDirectory.DIRECTORY_MUSIC)
-- self.assertTrue('/' in d, d)
-+ #d = GLib.get_user_special_dir(GLib.UserDirectory.DIRECTORY_MUSIC)
-+ #self.assertTrue('/' in d, d)
- with warnings.catch_warnings():
- warnings.simplefilter('ignore', PyGIDeprecationWarning)
-
diff --git a/dev-python/pygobject/metadata.xml b/dev-python/pygobject/metadata.xml
deleted file mode 100644
index 08a5bd43..00000000
--- a/dev-python/pygobject/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>gnome@gentoo.org</email>
- <name>Gentoo GNOME Desktop</name>
- </maintainer>
-<maintainer type="project">
- <email>python@gentoo.org</email>
- <name>Python</name>
- </maintainer>
-</pkgmetadata>
diff --git a/dev-python/pygobject/pygobject-3.26.1.ebuild b/dev-python/pygobject/pygobject-3.26.1.ebuild
deleted file mode 100644
index 535769f2..00000000
--- a/dev-python/pygobject/pygobject-3.26.1.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
-
-inherit eutils gnome2 python-r1 virtualx
-
-DESCRIPTION="GLib's GObject library bindings for Python"
-HOMEPAGE="https://wiki.gnome.org/Projects/PyGObject"
-
-LICENSE="LGPL-2.1+"
-SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="+cairo examples test"
-
-REQUIRED_USE="
- ${PYTHON_REQUIRED_USE}
- test? ( cairo )
-"
-
-COMMON_DEPEND="${PYTHON_DEPS}
- >=dev-libs/glib-2.38:2
- >=dev-libs/gobject-introspection-1.46.0:=
- virtual/libffi:=
- cairo? (
- >=dev-python/pycairo-1.11.1[${PYTHON_USEDEP}]
- x11-libs/cairo )
-"
-DEPEND="${COMMON_DEPEND}
- virtual/pkgconfig
- cairo? ( x11-libs/cairo[glib] )
- test? (
- dev-libs/atk[introspection]
- media-fonts/font-cursor-misc
- media-fonts/font-misc-misc
- x11-libs/cairo[glib]
- x11-libs/gdk-pixbuf:2[introspection,jpeg]
- x11-libs/gtk+:3[introspection]
- x11-libs/pango[introspection]
- python_targets_python2_7? ( dev-python/pyflakes[$(python_gen_usedep python2_7)] ) )
-"
-# gnome-base/gnome-common required by eautoreconf
-
-# 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]
-"
-
-src_prepare() {
- # Test fail with xvfb but not X
- sed -e 's/^.*TEST_NAMES=compat_test_pygtk .*;/echo "Test disabled";/' \
- -i tests/Makefile.{am,in} || die
-
- # FAIL: test_cairo_font_options (test_cairo.TestPango)
- # AssertionError: <type 'cairo.SubpixelOrder'> != <type 'int'>
- sed -e 's/^.*type(font_opts.get_subpixel_order()), int.*/#/' \
- -i tests/test_cairo.py || die
-
- gnome2_src_prepare
- python_copy_sources
-}
-
-src_configure() {
- # Hard-enable libffi support since both gobject-introspection and
- # glib-2.29.x rdepend on it anyway
- # docs disabled by upstream default since they are very out of date
- configuring() {
- gnome2_src_configure \
- $(use_enable cairo)
-
- # Pyflakes tests work only in python2, bug #516744
- if use test && [[ ${EPYTHON} != python2.7 ]]; then
- sed -e 's/if type pyflakes/if false/' \
- -i Makefile || die "sed failed"
- fi
- }
-
- python_foreach_impl run_in_build_dir configuring
-}
-
-src_compile() {
- python_foreach_impl run_in_build_dir gnome2_src_compile
-}
-
-src_test() {
- local -x GIO_USE_VFS="local" # prevents odd issues with deleting ${T}/.gvfs
- local -x GIO_USE_VOLUME_MONITOR="unix" # prevent udisks-related failures in chroots, bug #449484
- local -x SKIP_PEP8="yes"
-
- testing() {
- local -x XDG_CACHE_HOME="${T}/${EPYTHON}"
- emake -C "${BUILD_DIR}" check
- }
- virtx python_foreach_impl testing
-}
-
-src_install() {
- python_foreach_impl run_in_build_dir gnome2_src_install
-
- dodoc -r examples
-}
diff --git a/dev-python/pygobject/pygobject-9999.ebuild b/dev-python/pygobject/pygobject-9999.ebuild
deleted file mode 100644
index 1faffe2b..00000000
--- a/dev-python/pygobject/pygobject-9999.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
-
-inherit eutils gnome2 python-r1 virtualx
-if [[ ${PV} = 9999 ]]; then
- inherit gnome2-live
-fi
-
-DESCRIPTION="GLib's GObject library bindings for Python"
-HOMEPAGE="https://wiki.gnome.org/Projects/PyGObject"
-
-LICENSE="LGPL-2.1+"
-SLOT="3"
-if [[ ${PV} = 9999 ]]; then
- KEYWORDS=""
-else
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-fi
-IUSE="+cairo examples test"
-
-REQUIRED_USE="
- ${PYTHON_REQUIRED_USE}
- test? ( cairo )
-"
-
-COMMON_DEPEND="${PYTHON_DEPS}
- >=dev-libs/glib-2.38:2
- >=dev-libs/gobject-introspection-1.46.0:=
- virtual/libffi:=
- cairo? (
- >=dev-python/pycairo-1.11.1[${PYTHON_USEDEP}]
- x11-libs/cairo )
-"
-DEPEND="${COMMON_DEPEND}
- virtual/pkgconfig
- cairo? ( x11-libs/cairo[glib] )
- test? (
- dev-libs/atk[introspection]
- media-fonts/font-cursor-misc
- media-fonts/font-misc-misc
- x11-libs/cairo[glib]
- x11-libs/gdk-pixbuf:2[introspection,jpeg]
- x11-libs/gtk+:3[introspection]
- x11-libs/pango[introspection]
- python_targets_python2_7? ( dev-python/pyflakes[$(python_gen_usedep python2_7)] ) )
-"
-# gnome-base/gnome-common required by eautoreconf
-
-# 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]
-"
-
-src_prepare() {
- gnome2_src_prepare
- python_copy_sources
-}
-
-src_configure() {
- # Hard-enable libffi support since both gobject-introspection and
- # glib-2.29.x rdepend on it anyway
- # docs disabled by upstream default since they are very out of date
- configuring() {
- gnome2_src_configure \
- $(use_enable cairo)
-
- # Pyflakes tests work only in python2, bug #516744
- if use test && [[ ${EPYTHON} != python2.7 ]]; then
- sed -e 's/if type pyflakes/if false/' \
- -i Makefile || die "sed failed"
- fi
- }
-
- python_foreach_impl run_in_build_dir configuring
-}
-
-src_compile() {
- python_foreach_impl run_in_build_dir gnome2_src_compile
-}
-
-src_test() {
- local -x GIO_USE_VFS="local" # prevents odd issues with deleting ${T}/.gvfs
- local -x GIO_USE_VOLUME_MONITOR="unix" # prevent udisks-related failures in chroots, bug #449484
- local -x SKIP_PEP8="yes"
-
- testing() {
- local -x XDG_CACHE_HOME="${T}/${EPYTHON}"
- emake -C "${BUILD_DIR}" check
- }
- virtx python_foreach_impl testing
-}
-
-src_install() {
- python_foreach_impl run_in_build_dir gnome2_src_install
-
- dodoc -r examples
-}
^ permalink raw reply related [flat|nested] 9+ messages in thread
end of thread, other threads:[~2018-09-18 20:24 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-12-17 11:12 [gentoo-commits] proj/gnome:master commit in: dev-python/pygobject/files/, dev-python/pygobject/ Alexandre Rostovtsev
-- strict thread matches above, loose matches on Subject: below --
2018-09-18 20:24 Mart Raudsepp
2013-11-25 23:15 Gilles Dartiguelongue
2012-09-25 15:46 Alexandre Rostovtsev
2012-03-21 18:27 Alexandre Restovtsev
2011-04-29 12:47 Nirbheek Chauhan
2011-04-10 18:04 Gilles Dartiguelongue
2011-04-01 11:45 Nirbheek Chauhan
2011-03-12 3:12 Nirbheek Chauhan
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox