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

["Alexandre Restovtsev" <tetromino@gmail.com>]

commit:     4f3f98da827a3dd95339521a289258fbba154a6e
Author:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Sat May  5 00:36:18 2012 +0000
Commit:     Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Sat May  5 00:36:18 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=4f3f98da

dev-python/pygobject: in gx86, update pkgconfig dep.

---
 dev-python/pygobject/pygobject-3.1.92.ebuild |  122 --------------------------
 dev-python/pygobject/pygobject-9999.ebuild   |    2 +-
 2 files changed, 1 insertions(+), 123 deletions(-)

diff --git a/dev-python/pygobject/pygobject-3.1.92.ebuild b/dev-python/pygobject/pygobject-3.1.92.ebuild
deleted file mode 100644
index e155391..0000000
--- a/dev-python/pygobject/pygobject-3.1.92.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="4"
-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-*"
-
-inherit autotools gnome2 python virtualx
-if [[ ${PV} = 9999 ]]; then
-	inherit gnome2-live
-fi
-
-DESCRIPTION="GLib's GObject library bindings for Python"
-HOMEPAGE="http://www.pygtk.org/"
-
-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"
-fi
-IUSE="+cairo examples test +threads" # doc
-
-COMMON_DEPEND=">=dev-libs/glib-2.31.0:2
-	>=dev-libs/gobject-introspection-1.31.20
-	virtual/libffi
-	cairo? ( >=dev-python/pycairo-1.10.0 )"
-DEPEND="${COMMON_DEPEND}
-	test? (
-		media-fonts/font-cursor-misc
-		media-fonts/font-misc-misc
-		>=dev-libs/gobject-introspection-1.29.17 )
-	>=dev-util/pkgconfig-0.12"
-# 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,
-# older versions of slot 2 installed their own site-packages/gi, and
-# slot 3 will collide with them.
-RDEPEND="${COMMON_DEPEND}
-	!<dev-python/pygtk-2.13
-	!<dev-python/pygobject-2.28.6-r50:2[introspection]"
-
-pkg_setup() {
-	DOCS="AUTHORS ChangeLog* NEWS README"
-	# Hard-enable libffi support since both gobject-introspection and
-	# glib-2.29.x rdepend on it anyway
-	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}-2.90.1-make_check.patch"
-
-	# Disable tests that fail
-	#epatch "${FILESDIR}/${PN}-2.28.3-disable-failing-tests.patch"
-
-	python_clean_py-compile_files
-
-	[[ ${PV} != 9999 ]] && eautoreconf
-	gnome2_src_prepare
-
-	python_copy_sources
-}
-
-src_configure() {
-	configuration() {
-		PYTHON="$(PYTHON)" gnome2_src_configure
-	}
-	python_execute_function -s configuration
-}
-
-src_compile() {
-	python_src_compile
-}
-
-# FIXME: With python multiple ABI support, tests return 1 even when they pass
-src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-	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)
-		unset XDG_CACHE_HOME
-	}
-	python_execute_function -s testing
-	unset GIO_USE_VFS
-}
-
-src_install() {
-	python_execute_function -s gnome2_src_install
-	python_clean_installation_image
-
-	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
-}

diff --git a/dev-python/pygobject/pygobject-9999.ebuild b/dev-python/pygobject/pygobject-9999.ebuild
index e155391..8c07c67 100644
--- a/dev-python/pygobject/pygobject-9999.ebuild
+++ b/dev-python/pygobject/pygobject-9999.ebuild
@@ -35,7 +35,7 @@ DEPEND="${COMMON_DEPEND}
 		media-fonts/font-cursor-misc
 		media-fonts/font-misc-misc
 		>=dev-libs/gobject-introspection-1.29.17 )
-	>=dev-util/pkgconfig-0.12"
+	virtual/pkgconfig"
 # docs disabled for now per upstream default since they are very out of date
 #	doc? (
 #		app-text/docbook-xml-dtd:4.1.2