dev-python/pygtk: fix bug #194343 and bug #209531, add amd64 keyword back

Package-Manager: portage-2.1.5.2

5 files changed, 143 insertions, 2 deletions

diff --git a/dev-python/pygtk/ChangeLog b/dev-python/pygtk/ChangeLog
index f536bbb0df26..b5263a086b47 100644
--- a/dev-python/pygtk/ChangeLog
+++ b/dev-python/pygtk/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-python/pygtk
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pygtk/ChangeLog,v 1.180 2008/04/25 17:11:06 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygtk/ChangeLog,v 1.181 2008/05/28 14:03:44 remi Exp $
+
+*pygtk-2.12.1-r1 (28 May 2008)
+
+  28 May 2008; Rémi Cardona <remi@gentoo.org>
+  +files/pygtk-2.12.1-fix-amd64.patch,
+  +files/pygtk-2.12.1-fix-codegen-location.patch, +pygtk-2.12.1-r1.ebuild:
+  fix bug #194343 and bug #209531, add amd64 keyword back
 
   25 Apr 2008; Samuli Suominen <drac@gentoo.org>
   +files/pygtk-2.12.0-extrafuncs.patch, +pygtk-2.12.0-r1.ebuild:
diff --git a/dev-python/pygtk/Manifest b/dev-python/pygtk/Manifest
index e9233825e0a2..9c34c38e1dbf 100644
--- a/dev-python/pygtk/Manifest
+++ b/dev-python/pygtk/Manifest
@@ -1,4 +1,6 @@
 AUX pygtk-2.12.0-extrafuncs.patch 1339 RMD160 4d1d64c0da5157dcf2c468359cdc00eedc3f9756 SHA1 c23f9d6e17664e7154cd8e490977b1c392a4a05d SHA256 02d7933266cdff1fedbdcbae46ef92ab71f355190395565d3812b7af00abfe43
+AUX pygtk-2.12.1-fix-amd64.patch 391 RMD160 ff177af662fb0e83cf38d593c73a5bb01f455fd7 SHA1 b0826471db034fefaab667a0f3db1dda0f29a93c SHA256 aaf2073f38cad27b84093e9e7b017a7e5959e9b70c76eec32de974b0d7ab8af8
+AUX pygtk-2.12.1-fix-codegen-location.patch 1234 RMD160 58ba208bdacc943f7fd1595f71967d9cf2489e12 SHA1 e92acc5841fca0fb30c5676feb9f642a9a9e107d SHA256 dcf5e1dd7ceb7bdee1cf1009e3a3701d529944d61f4c04e8f54b59a7ca98ae4c
 DIST pygtk-2.10.6.tar.bz2 1977892 RMD160 504492d461bb4604bc5dd57bbde729ea30a116dc SHA1 aaa22fce4cf4f1d22f0586975dced4cc6bc4881a SHA256 e524a45b7ffab55c441bafff43f9583e48616ce48a150413f30208e540435ac9
 DIST pygtk-2.12.0.tar.bz2 2154621 RMD160 d982a9752abcd214be975a3ead3946b3c8d1d474 SHA1 8248a620ef4147af07a708643926523024789d4e SHA256 0200c16528c8fd32eec2a9b1c1c2a303d88f5dc6ca94124a6e3ec8be1cac496e
 DIST pygtk-2.12.1.tar.bz2 2175955 RMD160 c368deab52524248593b77984e93f18150efa0f4 SHA1 7a7d095f53829895174640d693c4e4af16122d98 SHA256 4100ed4bf295b03106308f1cfb9931cc22910401dab785f8bd3af9935f1fe13d
@@ -6,6 +8,7 @@ DIST pygtk2reference-2.9.0.tar.bz2 759824 RMD160 966cae10fa93b512f565aa0d552a8c8
 EBUILD pygtk-2.10.6.ebuild 2437 RMD160 81034383af649610c30bfd4b3349e5c9d1994791 SHA1 bf7de3e54b3f89e964faaf1348a09cbd99888f58 SHA256 edd9ace278b6579884b913c518cc5a9316f975ec3148965cd0919b46841577dc
 EBUILD pygtk-2.12.0-r1.ebuild 2568 RMD160 d73b31bc59cda9c8380a9f499cc0ed75558b99b4 SHA1 0f67dc47d191ae923b00b0fcf2a035c89360a868 SHA256 6583aaa1958aafe1981c6f434de2df52286ffaedaa389df55e5904b71478387f
 EBUILD pygtk-2.12.0.ebuild 2464 RMD160 01e20566153ad7a104745de56d56632e3f7ce733 SHA1 29cf8d9f223a7b24d328567104c39a67c1061879 SHA256 e4ef858b55d1a9b4e543f87b541b391f42a86203926b1b26e10df8287dc33852
+EBUILD pygtk-2.12.1-r1.ebuild 2172 RMD160 1e66404e77cdc9fd46a3e07e0671c20415b8f139 SHA1 68c5b266d393317b77bea053de57150d0e029cc3 SHA256 3f6cc7e18f1341a034c7ff4fe65872206ee9267ebbc91da4a5596571e8db8855
 EBUILD pygtk-2.12.1.ebuild 2019 RMD160 d492b8fba3a46273c742b784042942131643616a SHA1 55923e4e4b76cb344a0ee92186f617a28298a2d7 SHA256 0111e5126792f74b2351a225b468c840416f068a371c4c2e4d125e5e12a7c770
-MISC ChangeLog 22123 RMD160 c86c719a5e10cfd32bc71caed907c6f5531d79eb SHA1 98cbd7ca43a1977b7fdf3b68dd29ef735e25a748 SHA256 7246035d42912336ffc7981592e367b8eb74fb7c3883a7fc2b25bfacb083e058
+MISC ChangeLog 22375 RMD160 41c702856a38d1b60e9fff7002cadfb99faaef90 SHA1 b3a6ce370bce371a63f3b1a2894ae1dba27fa614 SHA256 6b84db24a914b12f7e440d293f969a98d926784ba7c88c19dd87c638c2d3b799
 MISC metadata.xml 934 RMD160 5160cf3a201fe5209f575b0633ba8dd40d7b5ed5 SHA1 e62fb7156a43df5b3380a77f9ad7616130075f7d SHA256 6a0af6b71bbaca6634e59f933775fbf76053472b54ff3989bf26a065a4c9c426
diff --git a/dev-python/pygtk/files/pygtk-2.12.1-fix-amd64.patch b/dev-python/pygtk/files/pygtk-2.12.1-fix-amd64.patch
new file mode 100644
index 000000000000..0fbcf851a668
--- /dev/null
+++ b/dev-python/pygtk/files/pygtk-2.12.1-fix-amd64.patch
@@ -0,0 +1,13 @@
+Index: gtk/gtk.override
+===================================================================
+--- gtk/gtk.override	(revision 2949)
++++ gtk/gtk.override	(working copy)
+@@ -1168,7 +1168,7 @@
+ static GSource *
+ pygtk_main_watch_new(void)
+ {
+-    return g_source_new(&pygtk_main_watch_funcs, sizeof(GSource));
++    return g_source_new(&pygtk_main_watch_funcs, sizeof(PySignalWatchSource));
+ }
+ 
+ 
diff --git a/dev-python/pygtk/files/pygtk-2.12.1-fix-codegen-location.patch b/dev-python/pygtk/files/pygtk-2.12.1-fix-codegen-location.patch
new file mode 100644
index 000000000000..4d65927f5e01
--- /dev/null
+++ b/dev-python/pygtk/files/pygtk-2.12.1-fix-codegen-location.patch
@@ -0,0 +1,39 @@
+Index: pygtk-2.0.pc.in
+===================================================================
+--- pygtk-2.0.pc.in	(revision 2949)
++++ pygtk-2.0.pc.in	(working copy)
+@@ -12,7 +12,7 @@
+ 
+ # same here.  Useful when calling the code generator in addon packages.
+ defsdir=${datadir}/pygtk/2.0/defs
+-codegendir=${datadir}/pygtk/2.0/codegen
++codegendir=${pyexecdir}/gtk-2.0/codegen
+ 
+ Name: PyGTK
+ Description: Python bindings for GTK+ and related libraries
+Index: codegen/pygtk-codegen-2.0.in
+===================================================================
+--- codegen/pygtk-codegen-2.0.in	(revision 2949)
++++ codegen/pygtk-codegen-2.0.in	(working copy)
+@@ -3,7 +3,7 @@
+ prefix=@prefix@
+ datarootdir=@datarootdir@
+ datadir=@datadir@
+-codegendir=${datadir}/pygtk/2.0/codegen
++codegendir=@pyexecdir@/gtk-2.0/codegen
+ 
+ PYTHONPATH=$codegendir
+ export PYTHONPATH
+Index: codegen/Makefile.am
+===================================================================
+--- codegen/Makefile.am	(revision 2949)
++++ codegen/Makefile.am	(working copy)
+@@ -2,7 +2,7 @@
+ 
+ bin_SCRIPTS = pygtk-codegen-$(PLATFORM_VERSION)
+ 
+-codegendir = $(pkgdatadir)/$(PLATFORM_VERSION)/codegen
++codegendir = $(pyexecdir)/gtk-2.0/codegen
+ 
+ codegen_PYTHON = \
+ 	__init__.py \
diff --git a/dev-python/pygtk/pygtk-2.12.1-r1.ebuild b/dev-python/pygtk/pygtk-2.12.1-r1.ebuild
new file mode 100644
index 000000000000..749cf0225483
--- /dev/null
+++ b/dev-python/pygtk/pygtk-2.12.1-r1.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygtk/pygtk-2.12.1-r1.ebuild,v 1.1 2008/05/28 14:03:44 remi Exp $
+
+inherit gnome.org python flag-o-matic eutils 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"
+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.11.6
+	>=gnome-base/libglade-2.5.0
+	>=dev-lang/python-2.4.4-r5
+	>=dev-python/pycairo-1.0.2
+	>=dev-python/pygobject-2.14
+	!arm? ( dev-python/numeric )"
+
+DEPEND="${RDEPEND}
+	doc? ( dev-libs/libxslt >=app-text/docbook-xsl-stylesheets-1.70.1 )
+	>=dev-util/pkgconfig-0.9"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# fix for bug #209531
+	epatch "${FILESDIR}/${PN}-2.12.1-fix-amd64.patch"
+
+	# fix for bug #194343
+	epatch "${FILESDIR}/${PN}-2.12.1-fix-codegen-location.patch"
+
+	# disable pyc compiling
+	mv "${S}"/py-compile "${S}"/py-compile.orig
+	ln -s $(type -P true) "${S}"/py-compile
+}
+
+src_compile() {
+	use hppa && append-flags -ffunction-sections
+	econf $(use_enable doc docs) --enable-thread || die
+	# possible problems with parallel builds (#45776)
+	#emake -j1 || die
+	emake || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || 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
+	fi
+}
+
+src_test() {
+	cd tests
+	Xemake check-local || die "tests failed"
+}
+
+pkg_postinst() {
+	python_version
+	python_mod_optimize /usr/$(get_libdir)/python${PYVER}/site-packages/gtk-2.0
+}
+
+pkg_postrm() {
+	python_version
+	python_mod_cleanup /usr/$(get_libdir)/python${PYVER}/site-packages/gtk-2.0
+	rm -f "${ROOT}"/usr/$(get_libdir)/python${PYVER}/site-packages/pygtk.{py,pth}
+	alternatives_auto_makesym /usr/$(get_libdir)/python${PYVER}/site-packages/pygtk.py pygtk.py-[0-9].[0-9]
+	alternatives_auto_makesym /usr/$(get_libdir)/python${PYVER}/site-packages/pygtk.pth pygtk.pth-[0-9].[0-9]
+}