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 5669D1381F3 for ; Mon, 17 Dec 2012 11:12:59 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7FAA121C14C; Mon, 17 Dec 2012 11:12:46 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 6BB6121C14C for ; Mon, 17 Dec 2012 11:12:45 +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 4E66833DBA8 for ; Mon, 17 Dec 2012 11:12:44 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id E7318E543C for ; Mon, 17 Dec 2012 11:12:42 +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: <1355742092.de2cc89cd22a4b8f1121eedc0bf9841e7f46cd5e.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-3.4.0-make_check.patch dev-python/pygobject/files/pygobject-3.4.1.1-make_check.patch dev-python/pygobject/metadata.xml 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: de2cc89cd22a4b8f1121eedc0bf9841e7f46cd5e X-VCS-Branch: master Date: Mon, 17 Dec 2012 11:12:42 +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: 9581a6d0-5d27-461b-a641-3ef6b42b9502 X-Archives-Hash: 0c4aca3f5c8de58c53b11f8ccd74711f commit: de2cc89cd22a4b8f1121eedc0bf9841e7f46cd5e Author: Alexandre Rostovtsev gentoo org> AuthorDate: Mon Dec 17 11:01:32 2012 +0000 Commit: Alexandre Rostovtsev gentoo 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 Date: Fri, 5 Nov 2010 23:39:08 +0100 Subject: [PATCH] Do not build tests unless needed [Alexandre Rostovtsev : 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 ") 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 @@ + + + +gnome +python + 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/null || die + "$@" + popd > /dev/null }