Simplify the ebuild a bit.

(Portage version: 2.2.0_alpha145/cvs/Linux x86_64, signed Manifest commit with key CF0ADD61)

3 files changed, 25 insertions, 34 deletions

diff --git a/dev-python/pygobject/ChangeLog b/dev-python/pygobject/ChangeLog
index 8434327389a2..cf99d99678f7 100644
--- a/dev-python/pygobject/ChangeLog
+++ b/dev-python/pygobject/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-python/pygobject
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pygobject/ChangeLog,v 1.183 2012/12/10 04:04:38 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygobject/ChangeLog,v 1.184 2012/12/10 04:31:07 tetromino Exp $
+
+  10 Dec 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  pygobject-3.4.2-r1.ebuild, metadata.xml:
+  Simplify the ebuild a bit.
+
+  10 Dec 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  pygobject-3.4.2-r1.ebuild, metadata.xml:
+  Forgot to add PYTHON_DEPS. Clean up old comments. Remove unused flag
+  description.
 
 *pygobject-3.4.2-r1 (10 Dec 2012)
 
diff --git a/dev-python/pygobject/metadata.xml b/dev-python/pygobject/metadata.xml
index ea70bd5c7a67..9b1bc26a9df2 100644
--- a/dev-python/pygobject/metadata.xml
+++ b/dev-python/pygobject/metadata.xml
@@ -3,8 +3,4 @@
 <pkgmetadata>
 <herd>gnome</herd>
 <herd>python</herd>
-<use>
-	<flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg> for
-	introspection</flag>
-</use>
 </pkgmetadata>
diff --git a/dev-python/pygobject/pygobject-3.4.2-r1.ebuild b/dev-python/pygobject/pygobject-3.4.2-r1.ebuild
index 3827e6f0bcb1..ad36506e90a8 100644
--- a/dev-python/pygobject/pygobject-3.4.2-r1.ebuild
+++ b/dev-python/pygobject/pygobject-3.4.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pygobject/pygobject-3.4.2-r1.ebuild,v 1.1 2012/12/10 04:04:38 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygobject/pygobject-3.4.2-r1.ebuild,v 1.2 2012/12/10 04:31:07 tetromino Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -15,7 +15,7 @@ HOMEPAGE="http://www.pygtk.org/"
 LICENSE="LGPL-2.1+"
 SLOT="3"
 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"
-IUSE="+cairo examples test +threads" # doc
+IUSE="+cairo examples test +threads"
 
 # FIXME: pycairo uses python.eclass, doesn't support multiple 2.x or 3.x pythons
 REQUIRED_USE="test? ( cairo )
@@ -25,7 +25,8 @@ REQUIRED_USE="test? ( cairo )
 COMMON_DEPEND=">=dev-libs/glib-2.31.0:2
 	>=dev-libs/gobject-introspection-1.34.1.1
 	virtual/libffi
-	cairo? ( >=dev-python/pycairo-1.10.0 )"
+	cairo? ( >=dev-python/pycairo-1.10.0 )
+	${PYTHON_DEPS}"
 DEPEND="${COMMON_DEPEND}
 	x11-libs/cairo[glib]
 	virtual/pkgconfig
@@ -36,11 +37,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,
@@ -54,6 +50,7 @@ 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
@@ -70,21 +67,11 @@ src_prepare() {
 }
 
 src_configure() {
-	configuring() {
-		pushd "${BUILD_DIR}" >/dev/null || die
-		gnome2_src_configure
-		popd > /dev/null
-	}
-	python_foreach_impl configuring
+	python_foreach_impl run_in_build_dir gnome2_src_configure
 }
 
 src_compile() {
-	compiling() {
-		pushd "${BUILD_DIR}" >/dev/null || die
-		gnome2_src_compile
-		popd > /dev/null
-	}
-	python_foreach_impl compiling
+	python_foreach_impl run_in_build_dir gnome2_src_compile
 }
 
 # FIXME: With python multiple ABI support, tests return 1 even when they pass
@@ -94,9 +81,7 @@ src_test() {
 
 	testing() {
 		export XDG_CACHE_HOME="${T}/${BUILD_DIR#${S}}"
-		pushd "${BUILD_DIR}" >/dev/null
-		Xemake check
-		popd > /dev/null
+		run_in_build_dir Xemake check
 		unset XDG_CACHE_HOME
 	}
 	python_foreach_impl testing
@@ -104,15 +89,16 @@ src_test() {
 }
 
 src_install() {
-	installing() {
-		pushd "${BUILD_DIR}" >/dev/null || die
-		gnome2_src_install
-		popd > /dev/null
-	}
-	python_foreach_impl installing
+	python_foreach_impl run_in_build_dir gnome2_src_install
 
 	if use examples; then
 		insinto /usr/share/doc/${PF}
 		doins -r examples
 	fi
 }
+
+run_in_build_dir() {
+	pushd "${BUILD_DIR}" >/dev/null || die
+	$@
+	popd > /dev/null
+}