Depend on python >=2.5, bug #325895. Clean up old revisions.

(Portage version: 2.2_rc78/cvs/Linux x86_64)

4 files changed, 10 insertions, 210 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/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() {