diff options
author | Gilles Dartiguelongue <eva@gentoo.org> | 2010-11-06 00:07:16 +0000 |
---|---|---|
committer | Gilles Dartiguelongue <eva@gentoo.org> | 2010-11-06 00:07:16 +0000 |
commit | d639e46aef573f21538a9bbb6d7f4a9bb8735074 (patch) | |
tree | e746285452ef9b9a3539408db7d957588ffef4d5 | |
parent | Add die to do... function calls, add die to cp call (diff) | |
download | historical-d639e46aef573f21538a9bbb6d7f4a9bb8735074.tar.gz historical-d639e46aef573f21538a9bbb6d7f4a9bb8735074.tar.bz2 historical-d639e46aef573f21538a9bbb6d7f4a9bb8735074.zip |
Version bump. Disable some non-working tests, but still has more enabled than 2.21.5. It is supposed to build against python 3 but failed to link, keep it restricted for now.
Package-Manager: portage-2.2.0_alpha3/cvs/Linux x86_64
-rw-r--r-- | dev-python/pygobject/ChangeLog | 12 | ||||
-rw-r--r-- | dev-python/pygobject/Manifest | 12 | ||||
-rw-r--r-- | dev-python/pygobject/files/pygobject-2.26.0-disable-non-working-tests.patch | 190 | ||||
-rw-r--r-- | dev-python/pygobject/files/pygobject-2.26.0-make_check.patch | 71 | ||||
-rw-r--r-- | dev-python/pygobject/pygobject-2.26.0.ebuild | 128 |
5 files changed, 408 insertions, 5 deletions
diff --git a/dev-python/pygobject/ChangeLog b/dev-python/pygobject/ChangeLog index e65c11e1d5d0..55dbd4b85f84 100644 --- a/dev-python/pygobject/ChangeLog +++ b/dev-python/pygobject/ChangeLog @@ -1,6 +1,16 @@ # ChangeLog for dev-python/pygobject # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/pygobject/ChangeLog,v 1.102 2010/11/05 22:06:04 eva Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/pygobject/ChangeLog,v 1.103 2010/11/06 00:07:16 eva Exp $ + +*pygobject-2.26.0 (06 Nov 2010) + + 06 Nov 2010; Gilles Dartiguelongue <eva@gentoo.org> + +pygobject-2.26.0.ebuild, + +files/pygobject-2.26.0-disable-non-working-tests.patch, + +files/pygobject-2.26.0-make_check.patch: + Version bump. Disable some non-working tests, but still has more enabled + than 2.21.5. It is supposed to build against python 3 but failed to link, + keep it restricted for now. *pygobject-2.21.5 (05 Nov 2010) diff --git a/dev-python/pygobject/Manifest b/dev-python/pygobject/Manifest index 7f95cd47999d..538af7608598 100644 --- a/dev-python/pygobject/Manifest +++ b/dev-python/pygobject/Manifest @@ -8,17 +8,21 @@ AUX pygobject-2.18.0-support_multiple_python_versions.patch 2349 RMD160 054080d2 AUX pygobject-2.20.0-automagic-introspection.patch 867 RMD160 13c58bcba041b93fa15c9eccdbc0d5f77b06617e SHA1 e1d97790a492f246695c68c9a69c7a1435c4262f SHA256 208bbc1d6c0f6baf03bf51b37fa450c69cde1d65c77b402c83bd742f11754cda AUX pygobject-2.20.0-tmpdir-makefile.patch 1817 RMD160 6e2032012f65a74ed140f777e0e7d5addfbc5c1f SHA1 ea47d992fed96f2cea63543232cc3b9ed9e160a9 SHA256 88245480666f05f302a6abd3ef52d8e3a581a2842774f52a484a02d2ea389699 AUX pygobject-2.21.4-make_check.patch 1694 RMD160 d9485a3ae24b1d68cdc7ce46276617554d0ae856 SHA1 a5be94fe784317d057bfcfdc6f2ef51196b4af95 SHA256 431af0993c2c03c043fd6f1b48b74e9bb84de302af88ea6dc9f0eb85397fcbde +AUX pygobject-2.26.0-disable-non-working-tests.patch 6372 RMD160 c2c0a4503a57c8ebb7406a2a382761216b3c82b9 SHA1 d9042ea99b13c0552c45735375f32d2a6acb45a8 SHA256 7441538523a626bd0ea436dfd46a12e7caa83cffa1d1ddc14ac3190be331ad35 +AUX pygobject-2.26.0-make_check.patch 2392 RMD160 b1b396b1504bca96982718ea23400cf19d431ba1 SHA1 42dd409d977ba90d615fec8b89d3a92e17ad0c1f SHA256 60ef6e56bebcd33e61dcf90586cc115303181c0e5b72ba19579e4104aa7d6e79 DIST pygobject-2.20.0.tar.bz2 666287 RMD160 5e3a8c976b3047b0dd9c492c8344ccd0ca77d3fd SHA1 a5954262051f376983bef6cc0e3fd1b0ca1824f7 SHA256 41e923a3f4426a3e19f6d154c424e3dac6f39defca77af602ac6272ce270fa81 DIST pygobject-2.21.5.tar.bz2 767809 RMD160 f1341e01cfd14399ba6b4a5dad8638da67d8de9d SHA1 8017d5dba28278727501194d45310d3156937c70 SHA256 14dc23bd8adb3626cfbaa7b7df1070c8da260e60925ec83beac517d7155cfed8 +DIST pygobject-2.26.0.tar.bz2 808427 RMD160 dd164d29232509f729fe7f766b18d1985eca73f6 SHA1 d091412760d44477e76ae995125c8fc5a15eae74 SHA256 5554acff9c27b647144143b0459359864e4a6f2ff62c7ba21cf310ad755cf7c7 EBUILD pygobject-2.20.0-r1.ebuild 3312 RMD160 f95e07931bc92a48cb2818d8b25e10a975adcda1 SHA1 9524e533f7ca9a786401eca7d33ff7db1f0f5c21 SHA256 8c1f1caed077afe6c714169651ed55b368b04d47a27fe6acb7d3c2c1b53d796e EBUILD pygobject-2.20.0.ebuild 3240 RMD160 c109a5308d1034b84053b5639d70902862778ac3 SHA1 260cf60d3c41dd4789f55cf56eb077cd4e9b5b0c SHA256 ac2a4c61dd2af6a1ba4889056422fa2d57143f8f4aabea1d051fd134094644ed EBUILD pygobject-2.21.5.ebuild 3367 RMD160 d9709bc628508ea9d2f743cd3c69d906c631f321 SHA1 63d2ead177838cc57e810a51ff0c17fa43fa57e3 SHA256 eb125d744c129864148c02b41e8b1fae88ac63055d6b09aba800320ea146ebd8 -MISC ChangeLog 14718 RMD160 aaeea631da7c31e59d00976db92b5ebde541174b SHA1 83bec3885716f581faf1a8f4a94d1a59ac5b2f18 SHA256 b5455589055a06f645194bc3a5754b73361453731462cc0cc020d456c4b94a4f +EBUILD pygobject-2.26.0.ebuild 3408 RMD160 1b6508a734a562f73e0501ed8af1ab2a84f51f43 SHA1 70ba931cddc69373065109c7660823df9e469e00 SHA256 1f77432419eb1ac2ba546f8074509b5e1b579b95425a1aa83323b829e6135c1d +MISC ChangeLog 15118 RMD160 5f0c6fefff477d7c4cb62ff051a22fceed62c9b3 SHA1 334f31c4c9b1b91781dbe084a2513cddf167fef9 SHA256 ee42b2200b9b855033ab55c557f7d0dbd845422a5ddab74e71d282edc186692f MISC metadata.xml 382 RMD160 6b39793f627fa71b2e71979d910f944dec3d2c07 SHA1 cc1fb99567697670ace85665a1a45a90bcd6d23d SHA256 9dc0bee05a8cffd8bdd29bc2b30a1aebe7ac319af5afdac9618f26a9943f14e5 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.16 (GNU/Linux) -iEYEARECAAYFAkzUf9cACgkQ1fmVwcYIWAYTNgCgh7PCjizEHfBrOSoVp1kK9zuf -5W8An3eOw1g0XJIR6r9PvYYPW3qrahGH -=rpoV +iEYEARECAAYFAkzUnEEACgkQ1fmVwcYIWAbCuACgxbbBxyPLdAhLtxqTMTwY+9J5 +hlUAn282SDzsTv2vgR3GF/pXJ35CCZaA +=icrA -----END PGP SIGNATURE----- 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 new file mode 100644 index 000000000000..a4110cab0705 --- /dev/null +++ b/dev-python/pygobject/files/pygobject-2.26.0-disable-non-working-tests.patch @@ -0,0 +1,190 @@ +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-make_check.patch b/dev-python/pygobject/files/pygobject-2.26.0-make_check.patch new file mode 100644 index 000000000000..37eba722fd79 --- /dev/null +++ b/dev-python/pygobject/files/pygobject-2.26.0-make_check.patch @@ -0,0 +1,71 @@ +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 + +--- + 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 77bc020..49416b0 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) +@@ -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 + 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 +@@ -63,8 +63,6 @@ testhelper.la: $(testhelper_la_OBJECTS) $(testhelper_la_DEPENDENCIES) + test -L $@ || $(LN_S) .libs/$@ $@ + + +-all: $(LTLIBRARIES:.la=.so) +- + TEST_FILES = \ + test_gobject.py \ + test_interface.py \ +@@ -104,10 +102,10 @@ EXTRA_DIST = \ + EXTRA_DIST += $(TEST_FILES) + + 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 + diff --git a/dev-python/pygobject/pygobject-2.26.0.ebuild b/dev-python/pygobject/pygobject-2.26.0.ebuild new file mode 100644 index 000000000000..9f5f840a90b6 --- /dev/null +++ b/dev-python/pygobject/pygobject-2.26.0.ebuild @@ -0,0 +1,128 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-python/pygobject/pygobject-2.26.0.ebuild,v 1.1 2010/11/06 00:07:16 eva Exp $ + +EAPI="2" +GCONF_DEBUG="no" +SUPPORT_PYTHON_ABIS="1" +PYTHON_DEPEND="2:2.5" +RESTRICT_PYTHON_ABIS="2.4 3.*" + +inherit alternatives autotools gnome2 python virtualx + +DESCRIPTION="GLib's GObject library bindings for Python" +HOMEPAGE="http://www.pygtk.org/" + +LICENSE="LGPL-2.1" +SLOT="2" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +IUSE="doc cairo examples +introspection libffi test" + +RDEPEND=">=dev-libs/glib-2.22.4:2 + !<dev-python/pygtk-2.13 + introspection? ( + >=dev-libs/gobject-introspection-0.9.5 + cairo? ( >=dev-python/pycairo-1.0.2 ) ) + libffi? ( virtual/libffi )" +DEPEND="${RDEPEND} + doc? ( + dev-libs/libxslt + >=app-text/docbook-xsl-stylesheets-1.70.1 ) + test? ( + media-fonts/font-cursor-misc + media-fonts/font-misc-misc ) + >=dev-util/pkgconfig-0.12" + +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.15.4-fix-codegen-location.patch" + + # Do not build tests if unneeded, bug #226345 + epatch "${FILESDIR}/${PN}-2.26.0-make_check.patch" + + # Support installation for multiple Python versions + epatch "${FILESDIR}/${PN}-2.18.0-support_multiple_python_versions.patch" + + # Disable non-working tests + epatch "${FILESDIR}/${PN}-2.26.0-disable-non-working-tests.patch" + + # disable pyc compiling + mv py-compile py-compile.orig + ln -s $(type -P true) py-compile + + eautoreconf + + python_copy_sources +} + +src_configure() { + python_execute_function -s gnome2_src_configure +} + +src_compile() { + python_execute_function -d -s +} + +src_test() { + unset DBUS_SESSION_BUS_ADDRESS + + testing() { + if has ${PYTHON_ABI} 2.4 2.5; then + einfo "Skipping tests with Python ${PYTHON_ABI}. dev-python/pycairo supports only Python >=2.6." + return 0 + fi + + 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 + + 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 +} |