Version bump, glade support is now optional.

Package-Manager: portage-2.1.9.45/cvs/Linux x86_64

4 files changed, 128 insertions, 6 deletions

diff --git a/dev-python/pygtk/ChangeLog b/dev-python/pygtk/ChangeLog
index e159728a3ec1..b5e3e83863fd 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.254 2011/03/28 22:16:32 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygtk/ChangeLog,v 1.255 2011/04/02 17:47:17 pacho Exp $
+
+*pygtk-2.24.0 (02 Apr 2011)
+
+  02 Apr 2011; Pacho Ramos <pacho@gentoo.org> +pygtk-2.24.0.ebuild,
+  metadata.xml:
+  Version bump, glade support is now optional.
 
 *pygtk-2.23.2 (28 Mar 2011)
 
diff --git a/dev-python/pygtk/Manifest b/dev-python/pygtk/Manifest
index 7653786a1bb0..d63e765191c9 100644
--- a/dev-python/pygtk/Manifest
+++ b/dev-python/pygtk/Manifest
@@ -6,14 +6,16 @@ AUX pygtk-2.22.0-disable-broken-tests.patch 1981 RMD160 79857fd2c32e818096eb13f6
 AUX pygtk-2.22.0-wakeupfd-fix.patch 891 RMD160 31335487eee841295bd4e5cf8741ed42a168a216 SHA1 2f4be3b01fe9a2065c19aa08f5e3086c5c6aceb6 SHA256 97453082977367e710af789f7119819e376630aa1fd40f521d7bff95bc9b9958
 DIST pygtk-2.22.0.tar.bz2 2285379 RMD160 98fb89d32f36c97cc51bf4eb1aa38699bf010c8e SHA1 6a180d0c9ed19179662f51decb150b2c98cc9362 SHA256 4acf0ef2bde8574913c40ee4a43d9c4f43bb77b577b67147271b534501a54cc8
 DIST pygtk-2.23.2.tar.bz2 2365312 RMD160 b17e9548f4f2ce88baa9e9ed9436048fdddb6a36 SHA1 20ad7d0906b1502235e0beff108102d521c18721 SHA256 8d289b10a33cbe4cdb7ff296b735f53cd0fc7d3445af0e8a40b0eec51d0c79df
+DIST pygtk-2.24.0.tar.bz2 2361097 RMD160 33f597def646261483cbbf5491aeb27bf0d22ea6 SHA1 344e6a32a5e8c7e0aaeb807e0636a163095231c2 SHA256 cd1c1ea265bd63ff669e92a2d3c2a88eb26bcd9e5363e0f82c896e649f206912
 EBUILD pygtk-2.22.0-r1.ebuild 2758 RMD160 035cd450a214ce777d141ceece048e751050c257 SHA1 b76c96c2a585fdc66fb6def6d248b32c8265e408 SHA256 703dbe8d97f0b61eb5dac1c596825468a16f7f0b25b28b9e83165c7f7a487b8b
 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
+EBUILD pygtk-2.24.0.ebuild 2802 RMD160 d7f23bc75a9ac9c063138c13de96095296d705a0 SHA1 e9d8a287bc3d4ead133e768cf8e5feb168efa800 SHA256 21d8a79585efcb6f05c5b036c36a9f2cf5d129302400da14acd3a5cf5b555eac
+MISC ChangeLog 32481 RMD160 649423d6ceb08c87a5a25b225aa1bfabdb7c3e1c SHA1 d9f8e57d4ae5705a67749a65c0edd9513a4e9804 SHA256 ffbe9cb5033abc3b9ca047766cbcab1c339b41fb4516760f4c8b59f33414d3b2
+MISC metadata.xml 1034 RMD160 f33a131f858b938666b887c9930daac82b93a12e SHA1 56eb76e223233fca89da6285ae40be30caad58e2 SHA256 24dcfdcde788d4d3484875b96f9ed18ed1cc2c697a8126d6b355882c398e77e7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk2RCMYACgkQ1fmVwcYIWAY1RgCeKQDeybZx/EuCUlDn0XlXXQQR
-y3UAn0Cd6gOV/RGoTm7kDI8Y0Yqqq3O4
-=kj0v
+iEYEARECAAYFAk2XYSsACgkQCaWpQKGI+9S2qACdHRO3G5BiUwiAu5MSfoG6sEeI
+cAkAnRaLamLIa46HbeLcxGu/t2Fz4XBT
+=bsI5
 -----END PGP SIGNATURE-----
diff --git a/dev-python/pygtk/metadata.xml b/dev-python/pygtk/metadata.xml
index 6d9588ff59c9..03a86cbdfe25 100644
--- a/dev-python/pygtk/metadata.xml
+++ b/dev-python/pygtk/metadata.xml
@@ -3,6 +3,10 @@
 <pkgmetadata>
 <herd>gnome</herd>
 <herd>python</herd>
+<use>
+	<flag name='glade'>Enable <pkg>gnome-base/libglade</pkg> bindings
+	compilation</flag>
+</use>
 <longdescription>
 PyGTK provides a convenient wrapper for the GTK+ library for use in
 Python programs, taking care of many of the boring details such as
diff --git a/dev-python/pygtk/pygtk-2.24.0.ebuild b/dev-python/pygtk/pygtk-2.24.0.ebuild
new file mode 100644
index 000000000000..708512a92906
--- /dev/null
+++ b/dev-python/pygtk/pygtk-2.24.0.ebuild
@@ -0,0 +1,110 @@
+# 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.24.0.ebuild,v 1.1 2011/04/02 17:47:17 pacho Exp $
+
+EAPI="3"
+GCONF_DEBUG="no"
+PYTHON_DEPEND="2:2.6"
+SUPPORT_PYTHON_ABIS="1"
+# 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
+
+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 +glade test"
+
+RDEPEND=">=dev-libs/glib-2.8:2
+	>=x11-libs/pango-1.16
+	>=dev-libs/atk-1.12
+	>=x11-libs/gtk+-2.24:2
+	>=dev-python/pycairo-1.0.2
+	>=dev-python/pygobject-2.21.3:2
+	dev-python/numpy
+	glade? ( >=gnome-base/libglade-2.5:2.0 )
+	test? ( >=gnome-base/libglade-2.5:2.0 )
+"
+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
+
+	local myconf
+
+	if use test; then
+		! use glade && einfo "Enabling glade support as it's needed for running tests."
+		myconf="--with-glade"
+	fi
+
+	python_src_configure \
+		$(use_enable doc docs) \
+		$(use_with glade) \
+		--enable-thread \
+		${myconf}
+}
+
+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 || die
+
+	if use examples; then
+		rm examples/Makefile*
+		insinto /usr/share/doc/${PF}
+		doins -r examples || die
+	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
+}