Version bump with lots of bugfixes and gtk+-2.22 compatible, skip broken test (upstream bug #636589) and test wanting to write outside sandbox (bug #245103). Remove old.

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

5 files changed, 42 insertions, 32 deletions

diff --git a/dev-python/foolscap/Manifest b/dev-python/foolscap/Manifest
index 956263c81659..030b3b63f589 100644
--- a/dev-python/foolscap/Manifest
+++ b/dev-python/foolscap/Manifest
@@ -4,7 +4,7 @@ DIST foolscap-0.6.0.tar.gz 484583 RMD160 91f61874223dcb0a625244b1e797643cc9f6c7c
 DIST foolscap-0.6.1.tar.gz 486798 RMD160 5b296e6f0e5500e5121c4c468663127a4def1673 SHA1 bb1a9de492a007abbf9c355e07b3b79c4fa0319e SHA256 8b3e4fc678c5c41483b3130666583a1c3909713adcd325204daded7b67171ed5
 EBUILD foolscap-0.4.2.ebuild 995 RMD160 8e2d1b9b2e3c40916d438065b105d48f96809d30 SHA1 d88ca42f7158c053473d1f28ec6966b5c591311b SHA256 18fdf220c5556b43457c14c7a4d239be06f892a57a11cb9ceaa2eebaa896d431
 EBUILD foolscap-0.5.1.ebuild 1047 RMD160 021880e5b248548409e1671abcff842dc5c5ff58 SHA1 5c4f4e1956f5131851e701f0d6af11c582393c9f SHA256 56aa8da27ce854ca97dd82af6636c0a795e79c362ae85bc4b4550354ce843ce9
-EBUILD foolscap-0.6.0.ebuild 1233 RMD160 810c84d24a6f1e4f47b067304f2c33c4732cc426 SHA1 3b1df982a38a406e81fa820137eda1c81f7ba4fe SHA256 d61153d35e4e528001fcec8cd9d8b63bcca8015a19ec3564876abad7643d419d
+EBUILD foolscap-0.6.0.ebuild 1229 RMD160 15ad399f505c64a3fb70a7b25d50f7317d30ebcc SHA1 1a5a849788966ce556dc78d5791e657787cf66f8 SHA256 81e9990a8e86b1ce6562d2a9082770802b23e81bd24c07fb4ee08ff9f5f5f019
 EBUILD foolscap-0.6.1.ebuild 1235 RMD160 cb211c121324044cb89bd9e39967ece847fc985f SHA1 b624d926c08d358bec6f3aaeac50deef280aa55a SHA256 a33fa6d5de7dc310692760a425372d4244d99cb2059dcbc356e43132911c2073
-MISC ChangeLog 3690 RMD160 91dc444890ebd5ad6e063deddd6ff2336e6b9744 SHA1 d6fd484ec921ab891b80f1a6b860808d1c2bfd90 SHA256 02784f9753dd5e3b412985b34f08526d453393d69cf499a837771bd5f799eb01
+MISC ChangeLog 3774 RMD160 d288ce952fb84106830d034fd2a45050964e9fbd SHA1 49f1ccc9aa334e7150d9e24f0ed43f3c9ede92e8 SHA256 d0ed99af99972014d3559579c169e2008ca4982c86a619c655b7f6d50ba64df2
 MISC metadata.xml 1119 RMD160 d0052abe0a21d815fd298b5666502623a3603d20 SHA1 93cd4077d540e5709d4ca2a6b165d855ea0d5425 SHA256 2aaa289cd63443ccf6929a6ea1c94df120f6800454f1b924c86f26ddce518be8
diff --git a/dev-python/pygtk/ChangeLog b/dev-python/pygtk/ChangeLog
index 7dfcccdb3e55..e77a04d6f7cd 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.243 2011/01/17 18:17:50 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygtk/ChangeLog,v 1.244 2011/01/19 14:36:14 pacho Exp $
+
+*pygtk-2.22.0 (19 Jan 2011)
+
+  19 Jan 2011; Pacho Ramos <pacho@gentoo.org> -pygtk-2.16.0-r1.ebuild,
+  -files/pygtk-2.16.0-gdkcolor-fix.patch, +pygtk-2.22.0.ebuild:
+  Version bump with lots of bugfixes and gtk+-2.22 compatible, skip broken test
+  (upstream bug #636589) and test wanting to write outside sandbox (bug
+  #245103). Remove old.
 
   17 Jan 2011; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
   pygtk-2.16.0-r1.ebuild, pygtk-2.17.0.ebuild:
diff --git a/dev-python/pygtk/Manifest b/dev-python/pygtk/Manifest
index fccd3f2fa0fa..b419deb68846 100644
--- a/dev-python/pygtk/Manifest
+++ b/dev-python/pygtk/Manifest
@@ -1,8 +1,17 @@
+-----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.16.0-gdkcolor-fix.patch 456 RMD160 ebcdb4334faa473f5257dc914fb85b3f94dcab09 SHA1 137a2aff42b83d7e3029a46ef4c6d1e547bad762 SHA256 14d793e0560bc08a8c057cef9189c6cd159be0c40e2f3b71e8a65e7bfc763762
-DIST pygtk-2.16.0.tar.bz2 2253202 RMD160 76ef8d362975e8928e2e5499d8b5dffc32a5c9d8 SHA1 b8998ca94841906e71b2475319bb47c841b188e8 SHA256 7fae5e01af217a01738eae41c38ad7f86d1f538f444300d0fa2847aafb7444a8
 DIST pygtk-2.17.0.tar.bz2 2260394 RMD160 8b60dc6d15d69c1195ed4512fb6974a5df5e9e66 SHA1 04d5e3b19116578c13a36d9f4ee3c7c18f3a7013 SHA256 6a61817a2e765c6209c72ecdf44389ec134c1ebed1d842408bf001c9321f1400
-EBUILD pygtk-2.16.0-r1.ebuild 2483 RMD160 838de87bd9a36919eaa4203c8528816d5f1f2680 SHA1 7b2a8eeb51cb5fb47644cdefdf55c25868aab6c4 SHA256 eeb3bf69fece2225ece7a27405eef2bf4beadfa2f4928675c72eed2319b39383
+DIST pygtk-2.22.0.tar.bz2 2285379 RMD160 98fb89d32f36c97cc51bf4eb1aa38699bf010c8e SHA1 6a180d0c9ed19179662f51decb150b2c98cc9362 SHA256 4acf0ef2bde8574913c40ee4a43d9c4f43bb77b577b67147271b534501a54cc8
 EBUILD pygtk-2.17.0.ebuild 2397 RMD160 c376da203221e22575479a28a22eb6c5ddc1bae1 SHA1 0cd6ceb08356d9ff3f43b42f299a6b5c831343c4 SHA256 a4831db725edb34fcd14f31eae32b61c592be7273478f1dc11a7a85350558f42
-MISC ChangeLog 30534 RMD160 0115c6a9fc531ddca48da25dce8a0fc12c7cbf23 SHA1 1ee0067129be985a53fb2823e8c80e2267c1817c SHA256 98c8e30684c4dc3933d76fd618a9b64c316251ff1755ec914675a5ae529b45fb
+EBUILD pygtk-2.22.0.ebuild 2705 RMD160 a3bf418a57ac14654eac8daafd569b020b86b344 SHA1 f0b1b1c793b2f35b468645e21e474034c31b2bd5 SHA256 a868b8eaa98bb9cac49c8da8a9a5e46c52d8a3cf285fd9e4180b9f4adfb89124
+MISC ChangeLog 30872 RMD160 780dd32ff871d4f51ec271eb56ad14b9af49291c SHA1 fcf6ccb506c1626d16c248574580a23e1ca0630d SHA256 338e4cf0e06da17d43e68563139ce6ab070bb942952feaf413e08c9ef2b833f5
 MISC metadata.xml 934 RMD160 5160cf3a201fe5209f575b0633ba8dd40d7b5ed5 SHA1 e62fb7156a43df5b3380a77f9ad7616130075f7d SHA256 6a0af6b71bbaca6634e59f933775fbf76053472b54ff3989bf26a065a4c9c426
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iEYEARECAAYFAk029uQACgkQCaWpQKGI+9ScxwCdGzNDGBVhe+RbzxpG3ZLHdnZR
+Uo4An1ISw7Y2FEyobmKwxE5QUxbnrDFL
+=DtHA
+-----END PGP SIGNATURE-----
diff --git a/dev-python/pygtk/files/pygtk-2.16.0-gdkcolor-fix.patch b/dev-python/pygtk/files/pygtk-2.16.0-gdkcolor-fix.patch
deleted file mode 100644
index 76646bf82a2f..000000000000
--- a/dev-python/pygtk/files/pygtk-2.16.0-gdkcolor-fix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urNp pygtk-2.16.0-orig/gtk/gdkcolor.override pygtk-2.16.0/gtk/gdkcolor.override
---- pygtk-2.16.0-orig/gtk/gdkcolor.override	2009-09-07 11:24:02.000000000 +0530
-+++ pygtk-2.16.0/gtk/gdkcolor.override	2009-09-07 11:24:11.000000000 +0530
-@@ -139,7 +139,7 @@ _wrap_gdk_color_new(PyGBoxed *self,
- }
- 
- %%
--define color_from_hsv
-+define color_from_hsv kwargs
- static PyObject *
- _wrap_color_from_hsv (PyObject *ignored, PyObject *args, PyObject*kwargs)
- {
diff --git a/dev-python/pygtk/pygtk-2.16.0-r1.ebuild b/dev-python/pygtk/pygtk-2.22.0.ebuild
index 631b2f5a0e56..7e2c9b03025a 100644
--- a/dev-python/pygtk/pygtk-2.16.0-r1.ebuild
+++ b/dev-python/pygtk/pygtk-2.22.0.ebuild
@@ -1,8 +1,8 @@
 # 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.16.0-r1.ebuild,v 1.13 2011/01/17 18:17:50 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygtk/pygtk-2.22.0.ebuild,v 1.1 2011/01/19 14:36:14 pacho Exp $
 
-EAPI="2"
+EAPI="3"
 PYTHON_DEPEND="2:2.6"
 SUPPORT_PYTHON_ABIS="1"
 RESTRICT_PYTHON_ABIS="2.4 2.5 3.* *-jython"
@@ -15,16 +15,16 @@ 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"
+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.0
-	>=x11-libs/pango-1.16.0
-	>=dev-libs/atk-1.12.0
-	>=x11-libs/gtk+-2.13.6
-	>=gnome-base/libglade-2.5.0
+RDEPEND=">=dev-libs/glib-2.8
+	>=x11-libs/pango-1.16
+	>=dev-libs/atk-1.12
+	>=x11-libs/gtk+-2.18:2
+	>=gnome-base/libglade-2.5
 	>=dev-python/pycairo-1.0.2
-	>=dev-python/pygobject-2.16.1
+	>=dev-python/pygobject-2.21.3
 	dev-python/numpy"
 
 DEPEND="${RDEPEND}
@@ -37,8 +37,13 @@ src_prepare() {
 	# Fix declaration of codegen in .pc
 	epatch "${FILESDIR}/${PN}-2.13.0-fix-codegen-location.patch"
 
-	# Fix a crash in gdk.color_from_hsv
-	epatch "${FILESDIR}/${P}-gdkcolor-fix.patch"
+	# Broken test, upstream bug #636589
+	sed -i -e '/test_enum.py/d' tests/Makefile.am || die
+	rm -f tests/test_enum.py || die
+
+	# Wants to write outside sandbox, bug #245103
+	sed -i -e '/test_filechooserdialog.py/d' tests/Makefile.am || die
+	rm -f tests/test_filechooserdialog.py || die
 
 	# Disable pyc compiling
 	mv "${S}"/py-compile "${S}"/py-compile.orig
@@ -67,12 +72,12 @@ src_test() {
 src_install() {
 	python_src_install
 	python_clean_installation_image
-	dodoc AUTHORS ChangeLog INSTALL MAPPING NEWS README THREADS TODO
+	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
+		doins -r examples || die
 	fi
 }