[gentoo-commits] proj/gnome:master commit in: dev-python/pygobject/files/, dev-python/pygobject/

["Alexandre Rostovtsev" <tetromino@gentoo.org>]

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
 }