5 files changed, 22 insertions, 215 deletions
diff --git a/dev-python/pygobject/ChangeLog b/dev-python/pygobject/ChangeLog
index ca19d6e8df36..56a3b509393d 100644
--- a/dev-python/pygobject/ChangeLog
+++ b/dev-python/pygobject/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-python/pygobject
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pygobject/ChangeLog,v 1.97 2010/07/12 16:59:39 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygobject/ChangeLog,v 1.98 2010/09/09 19:49:33 eva Exp $
+
+  09 Sep 2010; Gilles Dartiguelongue <eva@gentoo.org>
+  -pygobject-2.18.0.ebuild, -pygobject-2.18.0-r2.ebuild,
+  pygobject-2.20.0.ebuild:
+  Depend on python >=2.5, bug #325895. Clean up old revisions.
 
   12 Jul 2010; Jeroen Roovers <jer@gentoo.org> pygobject-2.20.0.ebuild:
   Stable for HPPA (bug #312877).
diff --git a/dev-python/pygobject/Manifest b/dev-python/pygobject/Manifest
index 309436aa4867..b3e144ba6fe3 100644
--- a/dev-python/pygobject/Manifest
+++ b/dev-python/pygobject/Manifest
@@ -1,12 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX pygobject-2.15.4-fix-codegen-location.patch 1519 RMD160 e4721ae2d9a2d05e3b129627c762acf177521974 SHA1 02e9446db952de3b934a264ce77648d2cd5c6d97 SHA256 6ab22def2c57a4dd44dedc787cb660dc326a62b518c3dc747fbe600ca2c20b8c
 AUX pygobject-2.18.0-automake111.patch 323 RMD160 182ea96cbb8fe28a93add0ef3dfd7710777615d8 SHA1 96c22e5bb8f07ea117248f4c8ca580474938c7af SHA256 4a94e9ca2a421a923c522ad4132c8988f22e74949f0361e231b6ba0ca813bc57
 AUX pygobject-2.18.0-make_check.patch 1589 RMD160 a2657fb299055620a745cb704ea3de289cdf8d63 SHA1 64ada13e6ac91845353855ed694ed951f63f583b SHA256 df43cef258567f824753caa0ba3a8d2820f729dac5ecba0d9fbf39a6f4861c4a
 AUX pygobject-2.18.0-support_multiple_python_versions.patch 2349 RMD160 054080d2a62b466ffe2ba9e182e5e796c652161f SHA1 d1ac7d308cb82caab4a5c56256ebd53b13cb9a3b SHA256 d66bcf31acf8b310ad346b9803d5e41d9840cfbca3c62d19b5c99f605c58066d
 AUX pygobject-2.20.0-tmpdir-makefile.patch 1817 RMD160 6e2032012f65a74ed140f777e0e7d5addfbc5c1f SHA1 ea47d992fed96f2cea63543232cc3b9ed9e160a9 SHA256 88245480666f05f302a6abd3ef52d8e3a581a2842774f52a484a02d2ea389699
-DIST pygobject-2.18.0.tar.bz2 639205 RMD160 db454107949b0e797c6c151aa426368ef0f59317 SHA1 f800eda7978fe9813600cfdda973da15c3178bb0 SHA256 b11b840ae31e6e644986806ee3400f4528b803d07b6cee26add45e0f2e5e622b
 DIST pygobject-2.20.0.tar.bz2 666287 RMD160 5e3a8c976b3047b0dd9c492c8344ccd0ca77d3fd SHA1 a5954262051f376983bef6cc0e3fd1b0ca1824f7 SHA256 41e923a3f4426a3e19f6d154c424e3dac6f39defca77af602ac6272ce270fa81
-EBUILD pygobject-2.18.0-r2.ebuild 3190 RMD160 4fc073deb7049f61c7004e3c91fed53bb2ef5f36 SHA1 6d5f85f8e70bde2be8379cd8e4174096018b1956 SHA256 a8a20e1563ceffe2df259498cf509c582576fcf7dfba3d6c59952b080a8e5eae
-EBUILD pygobject-2.18.0.ebuild 2275 RMD160 f6638b3d988b00d1ec5fb2c93ee87842ebd41518 SHA1 c4e59d7eeaee95704a9132f53d59002d0a43ffe7 SHA256 c76987086f79700411185bc01ef6fce4a7d7aa12c6337f9593ca07ad6050ecd4
-EBUILD pygobject-2.20.0.ebuild 3238 RMD160 8e4b8ed0d189c4d8c8263dbc37315abbccfbd3e2 SHA1 f48c389b76e0cbc0bbd5a94322390fe12117bc67 SHA256 dfa268417e7ae9e9e2df4c1aa03a3dc7534ba3110143e4b2bd029a2e860ae89e
-MISC ChangeLog 13729 RMD160 1aba24226e2cf4f34cb116edb8621824b5092c1c SHA1 fc9bf9d017f6a654b0b972788c7631047681d6d6 SHA256 dee091d6a24f3bf2cb0e3984c67e42c3632ae6903ea3a8e55e57a064475a62e1
+EBUILD pygobject-2.20.0.ebuild 3231 RMD160 df30967db2ce34b26a34600453100b851a958811 SHA1 f1be3f13d64fc2cc186792f9fd183e74230d1639 SHA256 aa809c75f6919b2ef8b2896d7a44bd1076b78e48af8ef61b2c6518ff3b142395
+MISC ChangeLog 13931 RMD160 3f3124a9518c1171ed0e9cfeba1ac9be37ee2926 SHA1 52c8398110f52dd83648b7e55a7b56fae0a5b38b SHA256 7a11438e6bd7665c33bb257f4459849770e0d4f16457fbca944613f88e2e3422
 MISC metadata.xml 282 RMD160 32fd779b50e24af15b5d30862d362cef786e2930 SHA1 6603342ce4d848c26dd1a585eeebc1b84198f2fa SHA256 116a6827697ff69c8f1971077502e9fa2b0d2fd23e57c97d4b54b3d1495597ca
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iEYEARECAAYFAkyJOoAACgkQ1fmVwcYIWAZxgQCfQuweGgKxp+AZxzxEnI/d3e6y
+/8YAoLMiUmmRX8Um8ZdpmKQC5vxvaBTU
+=Xm4M
+-----END PGP SIGNATURE-----
diff --git a/dev-python/pygobject/pygobject-2.18.0-r2.ebuild b/dev-python/pygobject/pygobject-2.18.0-r2.ebuild
deleted file mode 100644
index a2f36123d65c..000000000000
--- a/dev-python/pygobject/pygobject-2.18.0-r2.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pygobject/pygobject-2.18.0-r2.ebuild,v 1.8 2010/05/22 18:10:10 arfrever Exp $
-
-EAPI="2"
-SUPPORT_PYTHON_ABIS="1"
-
-inherit alternatives autotools 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 ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc examples libffi test"
-
-RDEPEND=">=dev-lang/python-2.4.4-r5
-	>=dev-libs/glib-2.18
-	!<dev-python/pygtk-2.13
-	libffi? ( virtual/libffi )"
-DEPEND="${RDEPEND}
-	doc? ( dev-libs/libxslt >=app-text/docbook-xsl-stylesheets-1.70.1 )
-	test? ( media-fonts/font-cursor-misc media-fonts/font-misc-misc )
-	>=dev-util/pkgconfig-0.12.0"
-
-RESTRICT_PYTHON_ABIS="3*"
-
-DOCS="AUTHORS ChangeLog* NEWS README"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--disable-dependency-tracking
-		$(use_enable doc docs)
-		$(use_with libffi ffi)"
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# Fix FHS compliance, see upstream bug #535524
-	epatch "${FILESDIR}/${PN}-2.15.4-fix-codegen-location.patch"
-
-	# Do not build tests if unneeded, bug #226345
-	epatch "${FILESDIR}"/${P}-make_check.patch
-
-	# Do not install files twice, bug #279813
-	epatch "${FILESDIR}/${P}-automake111.patch"
-
-	# Support installation for multiple Python versions
-	epatch "${FILESDIR}/${P}-support_multiple_python_versions.patch"
-
-	# needed to build on a libtool-1 system, bug #255542
-	rm m4/lt* m4/libtool.m4 ltmain.sh
-
-	# disable pyc compiling
-	mv py-compile py-compile.orig
-	ln -s $(type -P true) py-compile
-
-	eautoreconf
-
-	python_copy_sources
-}
-
-src_configure() {
-	python_execute_function -s gnome2_src_configure
-}
-
-src_compile() {
-	python_execute_function -d -s
-}
-
-src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-
-	testing() {
-		if has ${PYTHON_ABI} 2.4 2.5; then
-			einfo "Skipping tests with Python ${PYTHON_ABI}. dev-python/pycairo supports only Python >=2.6."
-			return 0
-		fi
-
-		Xemake check
-	}
-	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
-
-	if use examples; then
-		insinto /usr/share/doc/${P}
-		doins -r examples
-	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 gtk-2.0 pygtk.py
-}
-
-pkg_postrm() {
-	python_mod_cleanup 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.18.0.ebuild b/dev-python/pygobject/pygobject-2.18.0.ebuild
deleted file mode 100644
index 1866df19251c..000000000000
--- a/dev-python/pygobject/pygobject-2.18.0.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pygobject/pygobject-2.18.0.ebuild,v 1.17 2010/05/22 18:10:10 arfrever Exp $
-
-inherit alternatives autotools 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"
-IUSE="doc examples libffi test"
-
-RDEPEND=">=dev-lang/python-2.4.4-r5
-	>=dev-libs/glib-2.18
-	!<dev-python/pygtk-2.13
-	libffi? ( virtual/libffi )"
-DEPEND="${RDEPEND}
-	doc? ( dev-libs/libxslt >=app-text/docbook-xsl-stylesheets-1.70.1 )
-	test? ( media-fonts/font-cursor-misc media-fonts/font-misc-misc )
-	>=dev-util/pkgconfig-0.12.0"
-
-DOCS="AUTHORS ChangeLog* NEWS README"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--disable-dependency-tracking
-		$(use_enable doc docs)
-		$(use_with libffi ffi)"
-}
-
-src_unpack() {
-	gnome2_src_unpack
-
-	# Fix FHS compliance, see upstream bug #535524
-	epatch "${FILESDIR}/${PN}-2.15.4-fix-codegen-location.patch"
-
-	# Do not build tests if unneeded, bug #226345
-	epatch "${FILESDIR}"/${P}-make_check.patch
-
-	# Do not install files twice, bug #279813
-	epatch "${FILESDIR}/${P}-automake111.patch"
-
-	# needed to build on a libtool-1 system, bug #255542
-	rm m4/lt* m4/libtool.m4 ltmain.sh
-
-	# disable pyc compiling
-	mv py-compile py-compile.orig
-	ln -s $(type -P true) py-compile
-
-	eautoreconf
-}
-
-src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-	Xemake check || die "tests failed"
-}
-
-src_install() {
-	gnome2_src_install
-	python_clean_installation_image
-
-	if use examples; then
-		insinto /usr/share/doc/${P}
-		doins -r examples
-	fi
-
-	mv "${D}"$(python_get_sitedir)/pygtk.py "${D}"$(python_get_sitedir)/pygtk.py-2.0
-	mv "${D}"$(python_get_sitedir)/pygtk.pth "${D}"$(python_get_sitedir)/pygtk.pth-2.0
-}
-
-pkg_postinst() {
-	python_mod_optimize $(python_get_sitedir)/gtk-2.0 $(python_get_sitedir)/pygtk.py
-	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_need_rebuild
-}
-
-pkg_postrm() {
-	python_mod_cleanup $(python_get_sitedir)/gtk-2.0 $(python_get_sitedir)/pygtk.py
-}
diff --git a/dev-python/pygobject/pygobject-2.20.0.ebuild b/dev-python/pygobject/pygobject-2.20.0.ebuild
index 25f71da5d942..1a6b6a6c51a3 100644
--- a/dev-python/pygobject/pygobject-2.20.0.ebuild
+++ b/dev-python/pygobject/pygobject-2.20.0.ebuild
@@ -1,9 +1,11 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pygobject/pygobject-2.20.0.ebuild,v 1.13 2010/07/12 16:59:39 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygobject/pygobject-2.20.0.ebuild,v 1.14 2010/09/09 19:49:33 eva Exp $
 
 EAPI="2"
 SUPPORT_PYTHON_ABIS="1"
+PYTHON_DEPEND="2:2.5"
+RESTRICT_PYTHON_ABIS="3.*"
 
 inherit alternatives autotools gnome2 python virtualx
 
@@ -16,8 +18,7 @@ KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-
 IUSE="doc examples libffi test"
 
 # FIXME: add introspection support
-RDEPEND=">=dev-lang/python-2.4.4-r5
-	>=dev-libs/glib-2.20
+RDEPEND=">=dev-libs/glib-2.20
 	!<dev-python/pygtk-2.13
 	libffi? ( virtual/libffi )"
 DEPEND="${RDEPEND}
@@ -25,8 +26,6 @@ DEPEND="${RDEPEND}
 	test? ( media-fonts/font-cursor-misc media-fonts/font-misc-misc )
 	>=dev-util/pkgconfig-0.12.0"
 
-RESTRICT_PYTHON_ABIS="3.*"
-
 DOCS="AUTHORS ChangeLog* NEWS README"
 
 pkg_setup() {