Remove useless doc and introspection USE flags from pygobject-2. Add 3.4.2-r1 that uses python-r1.eclass. Drop old.

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

4 files changed, 43 insertions, 179 deletions

diff --git a/dev-python/pygobject/ChangeLog b/dev-python/pygobject/ChangeLog
index c031ca12013f..8434327389a2 100644
--- a/dev-python/pygobject/ChangeLog
+++ b/dev-python/pygobject/ChangeLog
@@ -1,6 +1,14 @@
 # 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.182 2012/11/12 17:23:16 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygobject/ChangeLog,v 1.183 2012/12/10 04:04:38 tetromino Exp $
+
+*pygobject-3.4.2-r1 (10 Dec 2012)
+
+  10 Dec 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -pygobject-2.28.6-r51.ebuild, pygobject-2.28.6-r52.ebuild,
+  -pygobject-3.4.1.1.ebuild, +pygobject-3.4.2-r1.ebuild:
+  Remove useless doc and introspection USE flags from pygobject-2. Add 3.4.2-r1
+  that uses python-r1.eclass. Drop old.
 
 *pygobject-3.4.2 (12 Nov 2012)
 
diff --git a/dev-python/pygobject/pygobject-2.28.6-r51.ebuild b/dev-python/pygobject/pygobject-2.28.6-r51.ebuild
deleted file mode 100644
index 31ea60cf117b..000000000000
--- a/dev-python/pygobject/pygobject-2.28.6-r51.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# 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-2.28.6-r51.ebuild,v 1.16 2012/09/25 11:53:14 tetromino Exp $
-
-EAPI="3"
-GCONF_DEBUG="no"
-GNOME_TARBALL_SUFFIX="xz"
-GNOME2_LA_PUNT="yes"
-SUPPORT_PYTHON_ABIS="1"
-# pygobject is partially incompatible with Python 3.
-# PYTHON_DEPEND="2:2.6 3:3.1"
-# RESTRICT_PYTHON_ABIS="2.4 2.5 3.0 *-jython"
-PYTHON_DEPEND="2:2.6"
-RESTRICT_PYTHON_ABIS="2.4 2.5 3.* *-jython 2.7-pypy-*"
-
-# XXX: Is the alternatives stuff needed anymore?
-inherit alternatives autotools eutils gnome2 python virtualx
-
-DESCRIPTION="GLib's GObject library bindings for Python"
-HOMEPAGE="http://www.pygtk.org/"
-
-LICENSE="LGPL-2.1+"
-SLOT="2"
-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"
-IUSE="doc examples +introspection libffi test"
-# FIXME: tests require introspection support, but we can't enable introspection,
-# or we get file collisions with slot 3 :/
-RESTRICT="test"
-
-COMMON_DEPEND=">=dev-libs/glib-2.24.0:2
-	libffi? ( virtual/libffi )"
-DEPEND="${COMMON_DEPEND}
-	doc? (
-		dev-libs/libxslt
-		>=app-text/docbook-xsl-stylesheets-1.70.1 )
-	test? (
-		media-fonts/font-cursor-misc
-		media-fonts/font-misc-misc )
-	virtual/pkgconfig"
-RDEPEND="${COMMON_DEPEND}
-	!<dev-python/pygtk-2.13"
-# Use slot 3 for introspection support per upstream recommendation
-# (see https://bugzilla.gnome.org/show_bug.cgi?id=642048#c9);
-# keep introspection USE flag in slot 2 for backward compatibility for now.
-PDEPEND="introspection? ( dev-python/pygobject:3 )"
-
-pkg_setup() {
-	DOCS="AUTHORS ChangeLog* NEWS README"
-	# --disable-introspection and --disable-cairo because we use pygobject:3
-	# for introspection support
-	G2CONF="${G2CONF}
-		--disable-dependency-tracking
-		--disable-introspection
-		--disable-cairo
-		$(use_enable doc docs)
-		$(use_with libffi ffi)"
-}
-
-src_prepare() {
-	# Fix FHS compliance, see upstream bug #535524
-	epatch "${FILESDIR}/${PN}-2.28.3-fix-codegen-location.patch"
-
-	# Do not build tests if unneeded, bug #226345
-	epatch "${FILESDIR}/${PN}-2.28.3-make_check.patch"
-
-	# Support installation for multiple Python versions, upstream bug #648292
-	epatch "${FILESDIR}/${PN}-2.28.3-support_multiple_python_versions.patch"
-
-	# Disable tests that fail
-	epatch "${FILESDIR}/${PN}-2.28.3-disable-failing-tests.patch"
-
-	# disable pyc compiling
-	echo '#!/bin/sh' > py-compile
-
-	eautoreconf
-	gnome2_src_prepare
-
-	python_copy_sources
-}
-
-src_configure() {
-	python_execute_function -s gnome2_src_configure
-}
-
-src_compile() {
-	python_execute_function -d -s
-}
-
-# FIXME: With python multiple ABI support, tests return 1 even when they pass
-src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-
-	testing() {
-		XDG_CACHE_HOME="${T}/$(PYTHON --ABI)"
-		Xemake check PYTHON=$(PYTHON -a)
-	}
-	python_execute_function -s testing
-}
-
-src_install() {
-	[[ -z ${ED} ]] && local ED="${D}"
-	installation() {
-		gnome2_src_install
-		mv "${ED}$(python_get_sitedir)/pygtk.py" "${ED}$(python_get_sitedir)/pygtk.py-2.0"
-		mv "${ED}$(python_get_sitedir)/pygtk.pth" "${ED}$(python_get_sitedir)/pygtk.pth-2.0"
-	}
-	python_execute_function -s installation
-
-	python_clean_installation_image
-
-	sed "s:/usr/bin/python:/usr/bin/python2:" \
-		-i "${ED}"/usr/bin/pygobject-codegen-2.0 \
-		|| die "Fix usage of python interpreter"
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples || die "doins failed"
-	fi
-}
-
-pkg_postinst() {
-	create_symlinks() {
-		alternatives_auto_makesym "$(python_get_sitedir)/pygtk.py" pygtk.py-[0-9].[0-9]
-		alternatives_auto_makesym "$(python_get_sitedir)/pygtk.pth" pygtk.pth-[0-9].[0-9]
-	}
-	python_execute_function create_symlinks
-
-	python_mod_optimize glib gobject gtk-2.0 pygtk.py
-}
-
-pkg_postrm() {
-	python_mod_cleanup glib gobject gtk-2.0 pygtk.py
-
-	create_symlinks() {
-		alternatives_auto_makesym "$(python_get_sitedir)/pygtk.py" pygtk.py-[0-9].[0-9]
-		alternatives_auto_makesym "$(python_get_sitedir)/pygtk.pth" pygtk.pth-[0-9].[0-9]
-	}
-	python_execute_function create_symlinks
-}
diff --git a/dev-python/pygobject/pygobject-2.28.6-r52.ebuild b/dev-python/pygobject/pygobject-2.28.6-r52.ebuild
index 5df167acf013..28bfd717cc83 100644
--- a/dev-python/pygobject/pygobject-2.28.6-r52.ebuild
+++ b/dev-python/pygobject/pygobject-2.28.6-r52.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-2.28.6-r52.ebuild,v 1.13 2012/10/28 15:44:39 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygobject/pygobject-2.28.6-r52.ebuild,v 1.14 2012/12/10 04:04:38 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -21,7 +21,7 @@ HOMEPAGE="http://www.pygtk.org/"
 LICENSE="LGPL-2.1+"
 SLOT="2"
 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="doc examples +introspection libffi test"
+IUSE="examples libffi test"
 # FIXME: tests require introspection support, but we can't enable introspection,
 # or we get file collisions with slot 3 :/
 RESTRICT="test"
@@ -29,19 +29,13 @@ RESTRICT="test"
 COMMON_DEPEND=">=dev-libs/glib-2.24.0:2
 	libffi? ( virtual/libffi )"
 DEPEND="${COMMON_DEPEND}
-	doc? (
-		dev-libs/libxslt
-		>=app-text/docbook-xsl-stylesheets-1.70.1 )
+	dev-util/gtk-doc-am
 	test? (
 		media-fonts/font-cursor-misc
 		media-fonts/font-misc-misc )
 	virtual/pkgconfig"
 RDEPEND="${COMMON_DEPEND}
 	!<dev-python/pygtk-2.13"
-# Use slot 3 for introspection support per upstream recommendation
-# (see https://bugzilla.gnome.org/show_bug.cgi?id=642048#c9);
-# keep introspection USE flag in slot 2 for backward compatibility for now.
-PDEPEND="introspection? ( dev-python/pygobject:3 )"
 
 pkg_setup() {
 	DOCS="AUTHORS ChangeLog* NEWS README"
@@ -51,7 +45,6 @@ pkg_setup() {
 		--disable-dependency-tracking
 		--disable-introspection
 		--disable-cairo
-		$(use_enable doc docs)
 		$(use_with libffi ffi)"
 	python_pkg_setup
 }
diff --git a/dev-python/pygobject/pygobject-3.4.1.1.ebuild b/dev-python/pygobject/pygobject-3.4.2-r1.ebuild
index 21b96e8f2a92..3827e6f0bcb1 100644
--- a/dev-python/pygobject/pygobject-3.4.1.1.ebuild
+++ b/dev-python/pygobject/pygobject-3.4.2-r1.ebuild
@@ -1,15 +1,13 @@
 # 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.1.1.ebuild,v 1.1 2012/10/30 08:22:06 eva Exp $
+# $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 $
 
-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
 
 DESCRIPTION="GLib's GObject library bindings for Python"
 HOMEPAGE="http://www.pygtk.org/"
@@ -18,7 +16,11 @@ 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
-REQUIRED_USE="test? ( cairo )"
+
+# FIXME: pycairo uses python.eclass, doesn't support multiple 2.x or 3.x pythons
+REQUIRED_USE="test? ( cairo )
+	?? ( python_targets_python2_6 python_targets_python2_7 )
+	?? ( python_targets_python3_1 python_targets_python3_2 python_targets_python3_3 )"
 
 COMMON_DEPEND=">=dev-libs/glib-2.31.0:2
 	>=dev-libs/gobject-introspection-1.34.1.1
@@ -48,10 +50,6 @@ RDEPEND="${COMMON_DEPEND}
 	!<dev-python/pygtk-2.13
 	!<dev-python/pygobject-2.28.6-r50:2[introspection]"
 
-pkg_setup() {
-	python_pkg_setup
-}
-
 src_prepare() {
 	DOCS="AUTHORS ChangeLog* NEWS README"
 	# Hard-enable libffi support since both gobject-introspection and
@@ -67,20 +65,26 @@ src_prepare() {
 
 	eautoreconf
 	gnome2_src_prepare
-	python_clean_py-compile_files
 
 	python_copy_sources
 }
 
 src_configure() {
-	configuration() {
-		PYTHON="$(PYTHON)" gnome2_src_configure
+	configuring() {
+		pushd "${BUILD_DIR}" >/dev/null || die
+		gnome2_src_configure
+		popd > /dev/null
 	}
-	python_execute_function -s configuration
+	python_foreach_impl configuring
 }
 
 src_compile() {
-	python_src_compile
+	compiling() {
+		pushd "${BUILD_DIR}" >/dev/null || die
+		gnome2_src_compile
+		popd > /dev/null
+	}
+	python_foreach_impl compiling
 }
 
 # FIXME: With python multiple ABI support, tests return 1 even when they pass
@@ -89,28 +93,26 @@ 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}/${BUILD_DIR#${S}}"
+		pushd "${BUILD_DIR}" >/dev/null
+		Xemake check
+		popd > /dev/null
 		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
+	installing() {
+		pushd "${BUILD_DIR}" >/dev/null || die
+		gnome2_src_install
+		popd > /dev/null
+	}
+	python_foreach_impl installing
 
 	if use examples; then
 		insinto /usr/share/doc/${PF}
 		doins -r examples
 	fi
 }
-
-pkg_postinst() {
-	python_mod_optimize gi
-}
-
-pkg_postrm() {
-	python_mod_cleanup gi
-}