Version bump. Add gtk-2.24 support, document updates.

Package-Manager: portage-2.2.0_alpha28/cvs/Linux x86_64

4 files changed, 27 insertions, 109 deletions

diff --git a/dev-python/pygtk/ChangeLog b/dev-python/pygtk/ChangeLog
index b17cdac02687..e159728a3ec1 100644
--- a/dev-python/pygtk/ChangeLog
+++ b/dev-python/pygtk/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/pygtk
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pygtk/ChangeLog,v 1.253 2011/03/22 19:03:56 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygtk/ChangeLog,v 1.254 2011/03/28 22:16:32 eva Exp $
+
+*pygtk-2.23.2 (28 Mar 2011)
+
+  28 Mar 2011; Gilles Dartiguelongue <eva@gentoo.org> -pygtk-2.17.0.ebuild,
+  -pygtk-2.22.0.ebuild, +pygtk-2.23.2.ebuild:
+  Version bump. Add gtk-2.24 support, document updates.
 
   22 Mar 2011; Brent Baude <ranger@gentoo.org> pygtk-2.22.0-r1.ebuild:
   Marking pygtk-2.22.0-r1 ppc stable for bug 353436
diff --git a/dev-python/pygtk/Manifest b/dev-python/pygtk/Manifest
index 4e14611bfaa4..7653786a1bb0 100644
--- a/dev-python/pygtk/Manifest
+++ b/dev-python/pygtk/Manifest
@@ -1,10 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX pygtk-2.13.0-fix-codegen-location.patch 507 RMD160 30b49791ac11da80efae1ef0f3c7ccbb72fc82f9 SHA1 dc7d975fe4ebd95afba79cac6276c73f55a9961b SHA256 f446a7b3e3ac76a9ab594738b1fbf9105c1ca17e8053b1a8712a966e9cfe54d0
 AUX pygtk-2.22.0-disable-broken-tests.patch 1981 RMD160 79857fd2c32e818096eb13f64b67c6860d58d04c SHA1 013b874f4aed3fd5cf923145c08dd4bb1bed8b7a SHA256 9423ad98dd62aa11ef392c969676c99efc6b94609c06b8d32b0e96bef6d442ba
 AUX pygtk-2.22.0-wakeupfd-fix.patch 891 RMD160 31335487eee841295bd4e5cf8741ed42a168a216 SHA1 2f4be3b01fe9a2065c19aa08f5e3086c5c6aceb6 SHA256 97453082977367e710af789f7119819e376630aa1fd40f521d7bff95bc9b9958
-DIST pygtk-2.17.0.tar.bz2 2260394 RMD160 8b60dc6d15d69c1195ed4512fb6974a5df5e9e66 SHA1 04d5e3b19116578c13a36d9f4ee3c7c18f3a7013 SHA256 6a61817a2e765c6209c72ecdf44389ec134c1ebed1d842408bf001c9321f1400
 DIST pygtk-2.22.0.tar.bz2 2285379 RMD160 98fb89d32f36c97cc51bf4eb1aa38699bf010c8e SHA1 6a180d0c9ed19179662f51decb150b2c98cc9362 SHA256 4acf0ef2bde8574913c40ee4a43d9c4f43bb77b577b67147271b534501a54cc8
-EBUILD pygtk-2.17.0.ebuild 2455 RMD160 a5d566506edfdd8fe28d03967b5dbdd9586ac52f SHA1 1c1aeb892157f39a283eb5f664e7215796f458a8 SHA256 e36eec8d5b8c6c73a2e50670dd059828bdc47a6a03e5850b7b4fabe4712950c2
+DIST pygtk-2.23.2.tar.bz2 2365312 RMD160 b17e9548f4f2ce88baa9e9ed9436048fdddb6a36 SHA1 20ad7d0906b1502235e0beff108102d521c18721 SHA256 8d289b10a33cbe4cdb7ff296b735f53cd0fc7d3445af0e8a40b0eec51d0c79df
 EBUILD pygtk-2.22.0-r1.ebuild 2758 RMD160 035cd450a214ce777d141ceece048e751050c257 SHA1 b76c96c2a585fdc66fb6def6d248b32c8265e408 SHA256 703dbe8d97f0b61eb5dac1c596825468a16f7f0b25b28b9e83165c7f7a487b8b
-EBUILD pygtk-2.22.0.ebuild 2591 RMD160 dfae1acdf1fbfdbc037662783f19b1dc44935931 SHA1 a07e9dec0fceed8612cedcbae7c780b73f366f44 SHA256 be638627e08be920108367f683474317d9c0451fdeafb633f623fcd2ab50e30d
-MISC ChangeLog 32113 RMD160 17f9bfa24269c8f54550efdc642d85cc91e31873 SHA1 16e870db883a8a1b73f9a6facb7171eb9d25cf6f SHA256 96c2aeb2f89fac4b8be4c7ed11bc96c58e54a2871d1c715d2a46d8b663bb2c29
+EBUILD pygtk-2.23.2.ebuild 2546 RMD160 75709cf163c6766324e93818a26bf096efd623e9 SHA1 886363b86e9ae6adf7c437ff39748d9ea54ceb3d SHA256 85be250bac03ec387294c375a6773403cf2fac1485b3951889cc2a6491356078
+MISC ChangeLog 32318 RMD160 5deb9965c86e81712447c03bc9d4ca25de71cae1 SHA1 111fd34ca3a3dc644984e5dbe8535669d0b2dbae SHA256 2d582bcfbbb818f1263ada8ab156221575d241c94f25e453b7bf450e4589fa27
 MISC metadata.xml 934 RMD160 5160cf3a201fe5209f575b0633ba8dd40d7b5ed5 SHA1 e62fb7156a43df5b3380a77f9ad7616130075f7d SHA256 6a0af6b71bbaca6634e59f933775fbf76053472b54ff3989bf26a065a4c9c426
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk2RCMYACgkQ1fmVwcYIWAY1RgCeKQDeybZx/EuCUlDn0XlXXQQR
+y3UAn0Cd6gOV/RGoTm7kDI8Y0Yqqq3O4
+=kj0v
+-----END PGP SIGNATURE-----
diff --git a/dev-python/pygtk/pygtk-2.17.0.ebuild b/dev-python/pygtk/pygtk-2.17.0.ebuild
deleted file mode 100644
index a0c718aef5f4..000000000000
--- a/dev-python/pygtk/pygtk-2.17.0.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pygtk/pygtk-2.17.0.ebuild,v 1.12 2011/03/16 10:14:30 nirbheek Exp $
-
-EAPI="2"
-PYTHON_DEPEND="2:2.6"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.4 2.5 3.* *-jython"
-PYTHON_EXPORT_PHASE_FUNCTIONS="1"
-
-inherit alternatives autotools eutils flag-o-matic gnome.org python virtualx
-
-DESCRIPTION="GTK+2 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"
-
-RDEPEND=">=dev-libs/glib-2.8:2
-	>=x11-libs/pango-1.16
-	>=dev-libs/atk-1.12
-	>=x11-libs/gtk+-2.18:2
-	>=gnome-base/libglade-2.5:2.0
-	>=dev-python/pycairo-1.0.2
-	>=dev-python/pygobject-2.16.1:2
-	dev-python/numpy"
-
-DEPEND="${RDEPEND}
-	doc? (
-		dev-libs/libxslt
-		>=app-text/docbook-xsl-stylesheets-1.70.1 )
-	>=dev-util/pkgconfig-0.9"
-
-src_prepare() {
-	# Fix declaration of codegen in .pc
-	epatch "${FILESDIR}/${PN}-2.13.0-fix-codegen-location.patch"
-
-	# Disable pyc compiling
-	mv "${S}"/py-compile "${S}"/py-compile.orig
-	ln -s $(type -P true) "${S}"/py-compile
-
-	AT_M4DIR="m4" eautoreconf
-
-	python_copy_sources
-}
-
-src_configure() {
-	use hppa && append-flags -ffunction-sections
-	python_src_configure $(use_enable doc docs) --enable-thread
-}
-
-src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-
-	testing() {
-		cd tests
-		export XDG_CONFIG_HOME="${T}/$(PYTHON --ABI)"
-		Xemake check-local
-	}
-	python_execute_function -s testing
-}
-
-src_install() {
-	python_src_install
-	python_clean_installation_image
-	dodoc AUTHORS ChangeLog INSTALL MAPPING NEWS README THREADS TODO
-
-	if use examples; then
-		rm examples/Makefile*
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-	fi
-}
-
-pkg_postinst() {
-	python_mod_optimize gtk-2.0
-
-	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
-}
-
-pkg_postrm() {
-	python_mod_cleanup gtk-2.0
-
-	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/pygtk/pygtk-2.22.0.ebuild b/dev-python/pygtk/pygtk-2.23.2.ebuild
index 846881a97ab1..132f20889da4 100644
--- a/dev-python/pygtk/pygtk-2.22.0.ebuild
+++ b/dev-python/pygtk/pygtk-2.23.2.ebuild
@@ -1,12 +1,13 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pygtk/pygtk-2.22.0.ebuild,v 1.3 2011/03/16 10:14:30 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygtk/pygtk-2.23.2.ebuild,v 1.1 2011/03/28 22:16:32 eva Exp $
 
 EAPI="3"
 GCONF_DEBUG="no"
-PYTHON_DEPEND="2:2.5"
+PYTHON_DEPEND="2:2.6"
 SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.4 3.* *-jython"
+# dev-python/pycairo does not support Python 2.4 / 2.5.
+RESTRICT_PYTHON_ABIS="2.4 2.5 3.* *-jython"
 PYTHON_EXPORT_PHASE_FUNCTIONS="1"
 
 inherit alternatives autotools eutils flag-o-matic gnome.org python virtualx
@@ -22,12 +23,12 @@ IUSE="doc examples"
 RDEPEND=">=dev-libs/glib-2.8:2
 	>=x11-libs/pango-1.16
 	>=dev-libs/atk-1.12
-	>=x11-libs/gtk+-2.22:2
+	>=x11-libs/gtk+-2.24:2
 	>=gnome-base/libglade-2.5:2.0
 	>=dev-python/pycairo-1.0.2
 	>=dev-python/pygobject-2.21.3:2
-	dev-python/numpy"
-
+	dev-python/numpy
+"
 DEPEND="${RDEPEND}
 	doc? (
 		dev-libs/libxslt
@@ -38,9 +39,6 @@ src_prepare() {
 	# Fix declaration of codegen in .pc
 	epatch "${FILESDIR}/${PN}-2.13.0-fix-codegen-location.patch"
 
-	# Broken test, upstream bug #636589
-	epatch "${FILESDIR}/${PN}-2.22.0-disable-broken-tests.patch"
-
 	# Disable pyc compiling
 	mv "${S}"/py-compile "${S}"/py-compile.orig
 	ln -s $(type -P true) "${S}"/py-compile