Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--dev-python/pygtk/ChangeLog10
-rw-r--r--dev-python/pygtk/Manifest20
-rw-r--r--dev-python/pygtk/files/pygtk-2.22.0-disable-broken-tests.patch50
-rw-r--r--dev-python/pygtk/files/pygtk-2.22.0-wakeupfd-fix.patch26
-rw-r--r--dev-python/pygtk/pygtk-2.22.0-r1.ebuild103
-rw-r--r--dev-python/pygtk/pygtk-2.23.2.ebuild97
-rw-r--r--dev-python/pygtk/pygtk-2.24.0-r2.ebuild16
7 files changed, 26 insertions, 296 deletions
diff --git a/dev-python/pygtk/ChangeLog b/dev-python/pygtk/ChangeLog
index cda8b6519d81..be0607d3b835 100644
--- a/dev-python/pygtk/ChangeLog
+++ b/dev-python/pygtk/ChangeLog
@@ -1,6 +1,14 @@
# 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.263 2011/11/10 22:34:48 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygtk/ChangeLog,v 1.264 2011/11/21 23:01:47 pacho Exp $
+
+ 21 Nov 2011; Pacho Ramos <pacho@gentoo.org>
+ -files/pygtk-2.22.0-disable-broken-tests.patch,
+ -files/pygtk-2.22.0-wakeupfd-fix.patch, -pygtk-2.22.0-r1.ebuild,
+ -pygtk-2.23.2.ebuild, pygtk-2.24.0-r2.ebuild:
+ Call gnome2_environment_reset to let tests pass without permissions problems
+ (bug #245103), note that it will only work if you have, at least,
+ glib-2.30.1-r1. Drop old.
*pygtk-2.24.0-r2 (10 Nov 2011)
diff --git a/dev-python/pygtk/Manifest b/dev-python/pygtk/Manifest
index f555ed68b27a..5266f52c9176 100644
--- a/dev-python/pygtk/Manifest
+++ b/dev-python/pygtk/Manifest
@@ -1,23 +1,17 @@
-----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
AUX pygtk-2.13.0-fix-codegen-location.patch 507 RMD160 30b49791ac11da80efae1ef0f3c7ccbb72fc82f9 SHA1 dc7d975fe4ebd95afba79cac6276c73f55a9961b SHA256 f446a7b3e3ac76a9ab594738b1fbf9105c1ca17e8053b1a8712a966e9cfe54d0
AUX pygtk-2.14.1-libdir-pc.patch 284 RMD160 e76bfe61963c6e1e86ab52a4412c3888e77c75bb SHA1 09afec27b75b4c73c5aff0a9c9ea3f5892a0f1e2 SHA256 bdb29e2491558f8b10ed91ce85b0b05c4d300db4f9ef066e4220c97d202d14be
-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.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
EBUILD pygtk-2.24.0-r1.ebuild 2576 RMD160 69e707ffdab297c03f17588cef3fe5827312a974 SHA1 d5f5a2d56cab864a887785e3009573edfe9f1ca6 SHA256 fbe23b2a69bb2c13aba47009e6f41f65205f46bb47fe7c79df0108d07316bf2a
-EBUILD pygtk-2.24.0-r2.ebuild 2633 RMD160 a6141a29fcdbea9e98e4f622220cd3e4e36fdf73 SHA1 501b5fb1aee58e799a6245b2c4ebb59874ae7688 SHA256 9039b4db5850651f0f858703374a575f1033a06a4cb2133ba10b1f76aa0f0dc7
-MISC ChangeLog 33560 RMD160 9c7257c8ca6e3ee6c53783e737bd8a0fce529ebb SHA1 924152fea9aa3a4347b28b5ed8673020190926f6 SHA256 6cf21490cfbef415190bdcb9ab0cccb414d74ccc70fb3d878ff419b776bca9bb
+EBUILD pygtk-2.24.0-r2.ebuild 2698 RMD160 214471bbc4e4b3dd2830faa76087fb1d44af5856 SHA1 376f56a13259b21fe84359d6b630578b95dc015f SHA256 0569ab1e9e64893eb89c770a27904b2941482d3de0dbed324c4cbbd11a98039f
+MISC ChangeLog 33946 RMD160 153c7989ff6096ffe190124074faca610993b82a SHA1 3c7d2b7acfb3f998cafbb3dbd6ff9867ea213f0e SHA256 9fcfbb1f5d6afc91b3451e9841fca1b24855216d88871c287beffb82884ac492
MISC metadata.xml 934 RMD160 5160cf3a201fe5209f575b0633ba8dd40d7b5ed5 SHA1 e62fb7156a43df5b3380a77f9ad7616130075f7d SHA256 6a0af6b71bbaca6634e59f933775fbf76053472b54ff3989bf26a065a4c9c426
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
-iF4EAREIAAYFAk68UY8ACgkQaC/OocHi7Jb+DgD/RssLW8NZCE6vTSkeeewiM+2I
-BnAeOPDufi8ym+fQj6gA/irDxbaShQyifq62P8DhZd0hT9YmOqnT5/JQIDDcA3Ay
-=uzZ7
+iEYEARECAAYFAk7K2GEACgkQCaWpQKGI+9SGggCfSEallikTmqTKNjlXcaqMt63I
+umEAn0DGCRsFc0kJgJU3EKFEAUJ8IsHB
+=Ndpu
-----END PGP SIGNATURE-----
diff --git a/dev-python/pygtk/files/pygtk-2.22.0-disable-broken-tests.patch b/dev-python/pygtk/files/pygtk-2.22.0-disable-broken-tests.patch
deleted file mode 100644
index cc1998561f7a..000000000000
--- a/dev-python/pygtk/files/pygtk-2.22.0-disable-broken-tests.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-Disable tests using PObject that appears to be broken.
-Upstream unresponsive and application seem to be working still.
-
-Gentoo: #347183
-Gnome: #636589
---- a/tests/test_enum.py 2010-08-07 07:23:44.000000000 +0200
-+++ b/tests/test_enum.py 2011-01-19 18:43:58.946771795 +0100
-@@ -6,13 +6,6 @@
- from common import gobject, atk, gtk, gdk
-
-
--class PObject(gobject.GObject):
-- enum = gobject.property(type=gtk.WindowType, default=gtk.WINDOW_TOPLEVEL)
-- enum2 = gobject.property(type=gtk.WindowType, default=int(gtk.WINDOW_TOPLEVEL))
-- flags = gobject.property(type=gtk.AttachOptions, default=gtk.EXPAND)
-- flags2 = gobject.property(type=gtk.AttachOptions, default=int(gtk.EXPAND))
--
--
- class EnumTest(unittest.TestCase):
- def testEnums(self):
- self.failUnless(issubclass(gobject.GEnum, int))
-@@ -90,14 +83,6 @@
- self.failUnless('7' in repr(val))
- self.failUnless('GtkIconSize' in repr(val))
-
-- def testEnumProperty(self):
-- default = PObject.props.enum.default_value
-- self.failUnless(isinstance(default, gtk.WindowType))
-- self.assertEqual(default, gtk.WINDOW_TOPLEVEL)
-- default = PObject.props.enum2.default_value
-- self.failUnless(isinstance(default, gtk.WindowType))
-- self.assertEqual(default, gtk.WINDOW_TOPLEVEL)
--
- def testPickling(self):
- values = [getattr(gtk, name) for name in dir(gtk)
- if isinstance(getattr(gtk, name), gobject.gobject.GEnum)]
-@@ -222,13 +207,5 @@
- self.failUnless(flag <= 2)
- self.failUnless(flag <= 10)
-
-- def testFlagsProperty(self):
-- default = PObject.props.flags.default_value
-- self.failUnless(isinstance(default, gtk.AttachOptions))
-- self.assertEqual(default, gtk.EXPAND)
-- default = PObject.props.flags2.default_value
-- self.failUnless(isinstance(default, gtk.AttachOptions))
-- self.assertEqual(default, gtk.EXPAND)
--
- if __name__ == '__main__':
- unittest.main()
diff --git a/dev-python/pygtk/files/pygtk-2.22.0-wakeupfd-fix.patch b/dev-python/pygtk/files/pygtk-2.22.0-wakeupfd-fix.patch
deleted file mode 100644
index 3e5cd4553185..000000000000
--- a/dev-python/pygtk/files/pygtk-2.22.0-wakeupfd-fix.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 4cbd3c031289775f365c247f949d91facac4ba82 Mon Sep 17 00:00:00 2001
-From: Dieter Verfaillie <dieterv@optionexplicit.be>
-Date: Thu, 03 Feb 2011 12:44:10 +0000
-Subject: Fix pygtk_main_watch_check, copied from pygobject/glib/pygmainloop.c:pyg_signal_watch_check.
-
-Fixes bug 640738 and 638780.
----
-diff --git a/gtk/gtk.override b/gtk/gtk.override
-index 75018f4..94309a6 100644
---- a/gtk/gtk.override
-+++ b/gtk/gtk.override
-@@ -1151,9 +1151,10 @@ pygtk_main_watch_check(GSource *source)
- #ifdef HAVE_PYSIGNAL_SETWAKEUPFD
- PySignalWatchSource *real_source = (PySignalWatchSource *)source;
- GPollFD *poll_fd = &real_source->fd;
-- int data_size = 0;
-+ unsigned char dummy;
-+ gssize ret;
- if (poll_fd->revents & G_IO_IN)
-- data_size = read(poll_fd->fd, 0, 1);
-+ ret = read(poll_fd->fd, &dummy, 1);
- #endif
-
- state = pyg_gil_state_ensure();
---
-cgit v0.8.3.1
diff --git a/dev-python/pygtk/pygtk-2.22.0-r1.ebuild b/dev-python/pygtk/pygtk-2.22.0-r1.ebuild
deleted file mode 100644
index 180fe2caa0a1..000000000000
--- a/dev-python/pygtk/pygtk-2.22.0-r1.ebuild
+++ /dev/null
@@ -1,103 +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.22.0-r1.ebuild,v 1.10 2011/03/22 19:03:56 ranger 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"
-
-RDEPEND=">=dev-libs/glib-2.8:2
- >=x11-libs/pango-1.16
- >=dev-libs/atk-1.12
- >=x11-libs/gtk+-2.22:2
- >=gnome-base/libglade-2.5:2.0
- >=dev-python/pycairo-1.0.2
- >=dev-python/pygobject-2.21.3: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"
-
- # Broken test, upstream bug #636589
- epatch "${FILESDIR}/${PN}-2.22.0-disable-broken-tests.patch"
-
- # Fix 100% CPU load when apps receive SIGCHLD, bug #353599
- epatch "${FILESDIR}/${PN}-2.22.0-wakeupfd-fix.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 || 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
-}
diff --git a/dev-python/pygtk/pygtk-2.23.2.ebuild b/dev-python/pygtk/pygtk-2.23.2.ebuild
deleted file mode 100644
index 132f20889da4..000000000000
--- a/dev-python/pygtk/pygtk-2.23.2.ebuild
+++ /dev/null
@@ -1,97 +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.23.2.ebuild,v 1.1 2011/03/28 22:16:32 eva 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"
-
-RDEPEND=">=dev-libs/glib-2.8:2
- >=x11-libs/pango-1.16
- >=dev-libs/atk-1.12
- >=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
-"
-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 || 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
-}
diff --git a/dev-python/pygtk/pygtk-2.24.0-r2.ebuild b/dev-python/pygtk/pygtk-2.24.0-r2.ebuild
index c12edd38bc36..f5a2742dc9d1 100644
--- a/dev-python/pygtk/pygtk-2.24.0-r2.ebuild
+++ b/dev-python/pygtk/pygtk-2.24.0-r2.ebuild
@@ -1,16 +1,18 @@
# 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-r2.ebuild,v 1.1 2011/11/10 22:34:48 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygtk/pygtk-2.24.0-r2.ebuild,v 1.2 2011/11/21 23:01:47 pacho Exp $
-EAPI="3"
+EAPI="4"
GCONF_DEBUG="no"
+GNOME_TARBALL_SUFFIX="bz2"
+
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
+inherit alternatives autotools eutils flag-o-matic gnome.org python virtualx gnome2-utils
DESCRIPTION="GTK+2 bindings for Python"
HOMEPAGE="http://www.pygtk.org/"
@@ -36,6 +38,9 @@ DEPEND="${RDEPEND}
>=dev-util/pkgconfig-0.9"
src_prepare() {
+ # Let tests pass without permissions problems, bug #245103
+ gnome2_environment_reset
+
# Fix declaration of codegen in .pc
epatch "${FILESDIR}/${PN}-2.13.0-fix-codegen-location.patch"
epatch "${FILESDIR}/${PN}-2.14.1-libdir-pc.patch"
@@ -62,7 +67,6 @@ src_test() {
testing() {
cd tests
- export XDG_CONFIG_HOME="${T}/$(PYTHON --ABI)"
Xemake check-local
}
python_execute_function -s testing
@@ -71,12 +75,12 @@ src_test() {
src_install() {
python_src_install
python_clean_installation_image
- dodoc AUTHORS ChangeLog INSTALL MAPPING NEWS README THREADS TODO || die
+ dodoc AUTHORS ChangeLog INSTALL MAPPING NEWS README THREADS TODO
if use examples; then
rm examples/Makefile*
insinto /usr/share/doc/${PF}
- doins -r examples || die
+ doins -r examples
fi
}