From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 37B71138010 for ; Tue, 25 Sep 2012 15:48:14 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A814C21C1EA; Tue, 25 Sep 2012 15:46:40 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 65C9C21C1E9 for ; Tue, 25 Sep 2012 15:46:35 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9FE9733D72F for ; Tue, 25 Sep 2012 15:46:34 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 843F0E5453 for ; Tue, 25 Sep 2012 15:46:32 +0000 (UTC) From: "Alexandre Rostovtsev" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alexandre Rostovtsev" Message-ID: <1348587603.cecba379028f25b85c7ab348f475cdd12f88cc8a.tetromino@gentoo> Subject: [gentoo-commits] proj/gnome:master commit in: dev-python/pygobject/files/, dev-python/pygobject/ X-VCS-Repository: proj/gnome X-VCS-Files: dev-python/pygobject/files/pygobject-2.90.1-make_check.patch dev-python/pygobject/files/pygobject-3.4.0-make_check.patch dev-python/pygobject/pygobject-9999.ebuild X-VCS-Directories: dev-python/pygobject/files/ dev-python/pygobject/ X-VCS-Committer: tetromino X-VCS-Committer-Name: Alexandre Rostovtsev X-VCS-Revision: cecba379028f25b85c7ab348f475cdd12f88cc8a X-VCS-Branch: master Date: Tue, 25 Sep 2012 15:46:32 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 57445f86-7df8-4f6b-b8ae-42ed2c8166ff X-Archives-Hash: 557d4bf17c4b9d54d8ff52d9fa0ee136 commit: cecba379028f25b85c7ab348f475cdd12f88cc8a Author: Alexandre Rostovtsev gentoo org> AuthorDate: Tue Sep 25 15:40:03 2012 +0000 Commit: Alexandre Rostovtsev gentoo 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 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 : 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 ") 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"