diff --git a/dev-python/pygobject-base/Manifest b/dev-python/pygobject-base/Manifest index 1b4fc400c..c72e1822a 100644 --- a/dev-python/pygobject-base/Manifest +++ b/dev-python/pygobject-base/Manifest @@ -1 +1 @@ -DIST pygobject-3.16.1.tar.xz 725220 SHA256 7d96dad050f15ec1688617b749bb485811842de46a22d31f9396023e8eaa1ec3 SHA512 f32db7620b6714fdc780ec28c282566c0e662648a53f37b2466cbed609d1cbbbf998e30fd42d24ae1e5c0334656b04276dd3a8bf210f9b93f2bfb66f305f7a72 WHIRLPOOL 7f3257f1743510d1c602d797bce4722f6f987676dee4186b7026277f94412663bef0b1e70519030e890ad330eb2cb2cdb7ac7bf8060d9c4a0aca019bd7d4f1a2 +DIST pygobject-3.16.2.tar.xz 725544 SHA256 de620e00fe7ecb788aa2dc0d664e41f71b8e718e728168e8d982cf193a9e7e64 SHA512 9a742db4b05fdf0cf2b7bb9139d5f43b4a4e25b4652e8bd3aa8d6f64b03b745b57c047dfc95335045126d0dd4c797989d95d6a1bdb4752cab8e04146470653bf WHIRLPOOL d39b5f23ca33f4331582fd8229a348db679b1db1b9f5daff2639a03ec70f31bfcf2f7ac7a67cc3d54a2444faa228b878fdd9556110af10c3246087a634ba88e3 diff --git a/dev-python/pygobject-base/files/pygobject-3.7.90-make_check.patch b/dev-python/pygobject-base/files/pygobject-3.7.90-make_check.patch deleted file mode 100755 index 74db7757f..000000000 --- a/dev-python/pygobject-base/files/pygobject-3.7.90-make_check.patch +++ /dev/null @@ -1,86 +0,0 @@ -From 319d6d68a398d326ef95e39f494da7c514facf81 Mon Sep 17 00:00:00 2001 -From: Sobhan Mohammadpour -Date: Fri, 8 Mar 2013 08:25:58 +0330 -Subject: [PATCH] pygobject-3.7.90-make check - -originaly by [Alexandre Rostovtsev -don't build tests unless it's needed - ---- - 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 287542d..2cc0da9 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 \ -@@ -116,7 +116,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= \ -@@ -130,7 +130,7 @@ RUN_TESTS_ENV_VARS= \ - - # pygtkcompat tests need to be run in a separate process as they - # clobber global name space --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 - @if test -z "$$SKIP_PEP8"; then \ -diff --git a/tests/runtests.py b/tests/runtests.py -index d3a4f47..5a53d3f 100755 ---- a/tests/runtests.py -+++ b/tests/runtests.py -@@ -54,6 +54,9 @@ if sys.version_info[:2] == (2, 6): - if sys.version_info[:2] == (2, 7): - unittest.TestCase.assertRaisesRegex = unittest.TestCase.assertRaisesRegexp - -+# Some tests fail with translated messages. -+os.environ["LC_ALL"] = "C" -+ - if '--help' in sys.argv: - print("Usage: ./runtests.py ") - sys.exit(0) --- -1.8.1.2 - diff --git a/dev-python/pygobject-base/pygobject-base-3.16.1.ebuild b/dev-python/pygobject-base/pygobject-base-3.16.2.ebuild similarity index 82% rename from dev-python/pygobject-base/pygobject-base-3.16.1.ebuild rename to dev-python/pygobject-base/pygobject-base-3.16.2.ebuild index a75c5052e..07ac95bfa 100644 --- a/dev-python/pygobject-base/pygobject-base-3.16.1.ebuild +++ b/dev-python/pygobject-base/pygobject-base-3.16.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ @@ -22,11 +22,10 @@ IUSE="+cairo examples test +threads" REQUIRED_USE="${PYTHON_REQUIRED_USE}" -COMMON_DEPEND=" +COMMON_DEPEND="${PYTHON_DEPS} >=dev-libs/glib-2.38:2 - >=dev-libs/gobject-introspection-1.39 + >=dev-libs/gobject-introspection-1.39:= virtual/libffi:= - ${PYTHON_DEPS} " DEPEND="${COMMON_DEPEND} virtual/pkgconfig @@ -36,7 +35,8 @@ DEPEND="${COMMON_DEPEND} media-fonts/font-misc-misc x11-libs/gdk-pixbuf:2[introspection] x11-libs/gtk+:3[introspection] - x11-libs/pango[introspection] ) + x11-libs/pango[introspection] + !sparc? ( python_targets_python2_7? ( dev-python/pyflakes[$(python_gen_usedep python2_7)] ) ) ) " # gnome-base/gnome-common required by eautoreconf @@ -60,10 +60,19 @@ 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 \ + configuring() { gnome2_src_configure \ --disable-cairo \ $(use_enable threads thread) + + # 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() { diff --git a/dev-python/pygobject-cairo/Manifest b/dev-python/pygobject-cairo/Manifest index 1b4fc400c..c72e1822a 100644 --- a/dev-python/pygobject-cairo/Manifest +++ b/dev-python/pygobject-cairo/Manifest @@ -1 +1 @@ -DIST pygobject-3.16.1.tar.xz 725220 SHA256 7d96dad050f15ec1688617b749bb485811842de46a22d31f9396023e8eaa1ec3 SHA512 f32db7620b6714fdc780ec28c282566c0e662648a53f37b2466cbed609d1cbbbf998e30fd42d24ae1e5c0334656b04276dd3a8bf210f9b93f2bfb66f305f7a72 WHIRLPOOL 7f3257f1743510d1c602d797bce4722f6f987676dee4186b7026277f94412663bef0b1e70519030e890ad330eb2cb2cdb7ac7bf8060d9c4a0aca019bd7d4f1a2 +DIST pygobject-3.16.2.tar.xz 725544 SHA256 de620e00fe7ecb788aa2dc0d664e41f71b8e718e728168e8d982cf193a9e7e64 SHA512 9a742db4b05fdf0cf2b7bb9139d5f43b4a4e25b4652e8bd3aa8d6f64b03b745b57c047dfc95335045126d0dd4c797989d95d6a1bdb4752cab8e04146470653bf WHIRLPOOL d39b5f23ca33f4331582fd8229a348db679b1db1b9f5daff2639a03ec70f31bfcf2f7ac7a67cc3d54a2444faa228b878fdd9556110af10c3246087a634ba88e3 diff --git a/dev-python/pygobject-cairo/files/pygobject-3.7.90-make_check.patch b/dev-python/pygobject-cairo/files/pygobject-3.7.90-make_check.patch deleted file mode 100755 index 74db7757f..000000000 --- a/dev-python/pygobject-cairo/files/pygobject-3.7.90-make_check.patch +++ /dev/null @@ -1,86 +0,0 @@ -From 319d6d68a398d326ef95e39f494da7c514facf81 Mon Sep 17 00:00:00 2001 -From: Sobhan Mohammadpour -Date: Fri, 8 Mar 2013 08:25:58 +0330 -Subject: [PATCH] pygobject-3.7.90-make check - -originaly by [Alexandre Rostovtsev -don't build tests unless it's needed - ---- - 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 287542d..2cc0da9 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 \ -@@ -116,7 +116,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= \ -@@ -130,7 +130,7 @@ RUN_TESTS_ENV_VARS= \ - - # pygtkcompat tests need to be run in a separate process as they - # clobber global name space --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 - @if test -z "$$SKIP_PEP8"; then \ -diff --git a/tests/runtests.py b/tests/runtests.py -index d3a4f47..5a53d3f 100755 ---- a/tests/runtests.py -+++ b/tests/runtests.py -@@ -54,6 +54,9 @@ if sys.version_info[:2] == (2, 6): - if sys.version_info[:2] == (2, 7): - unittest.TestCase.assertRaisesRegex = unittest.TestCase.assertRaisesRegexp - -+# Some tests fail with translated messages. -+os.environ["LC_ALL"] = "C" -+ - if '--help' in sys.argv: - print("Usage: ./runtests.py ") - sys.exit(0) --- -1.8.1.2 - diff --git a/dev-python/pygobject-cairo/pygobject-cairo-3.16.1.ebuild b/dev-python/pygobject-cairo/pygobject-cairo-3.16.2.ebuild similarity index 95% rename from dev-python/pygobject-cairo/pygobject-cairo-3.16.1.ebuild rename to dev-python/pygobject-cairo/pygobject-cairo-3.16.2.ebuild index 8f57d7c74..0b415d6af 100644 --- a/dev-python/pygobject-cairo/pygobject-cairo-3.16.1.ebuild +++ b/dev-python/pygobject-cairo/pygobject-cairo-3.16.2.ebuild @@ -22,10 +22,10 @@ IUSE="+threads" REQUIRED_USE="${PYTHON_REQUIRED_USE}" -COMMON_DEPEND=" +COMMON_DEPEND="${PYTHON_DEPS} ~dev-python/pygobject-base-${PV}[threads=] >=dev-python/pycairo-1.10.0[${PYTHON_USEDEP}] - ${PYTHON_DEPS}" +" DEPEND="${COMMON_DEPEND} x11-libs/cairo[glib] gnome-base/gnome-common" @@ -46,10 +46,13 @@ 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 \ + configuring() { gnome2_src_configure \ --enable-cairo \ $(use_enable threads thread) + } + + python_foreach_impl run_in_build_dir configuring } src_compile() { diff --git a/dev-python/pygobject/pygobject-3.16.1.ebuild b/dev-python/pygobject/pygobject-3.16.2.ebuild similarity index 100% rename from dev-python/pygobject/pygobject-3.16.1.ebuild rename to dev-python/pygobject/pygobject-3.16.2.ebuild