Bump to 2.12.0-r1

	- Install gtk-extrafuncs.def; bug #202140

(Portage version: 2.1.4_rc10)

4 files changed, 133 insertions, 1 deletions

diff --git a/dev-python/pygtk/ChangeLog b/dev-python/pygtk/ChangeLog
index e6aa6328c5df..8a7ecf8e49b2 100644
--- a/dev-python/pygtk/ChangeLog
+++ b/dev-python/pygtk/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-python/pygtk
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pygtk/ChangeLog,v 1.173 2007/11/27 03:40:01 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygtk/ChangeLog,v 1.174 2007/12/22 16:34:49 dang Exp $
+
+*pygtk-2.12.0-r1 (22 Dec 2007)
+
+  22 Dec 2007; Daniel Gryniewicz <dang@gentoo.org>
+  +files/pygtk-2.12.0-extrafuncs.patch, +pygtk-2.12.0-r1.ebuild:
+  Bump to 2.12.0-r1
+  	- Install gtk-extrafuncs.def; bug #202140
 
   27 Nov 2007; Jeroen Roovers <jer@gentoo.org> pygtk-2.12.0.ebuild:
   Stable for HPPA (bug #199322).
diff --git a/dev-python/pygtk/files/digest-pygtk-2.12.0-r1 b/dev-python/pygtk/files/digest-pygtk-2.12.0-r1
new file mode 100644
index 000000000000..b34ae53e1a42
--- /dev/null
+++ b/dev-python/pygtk/files/digest-pygtk-2.12.0-r1
@@ -0,0 +1,6 @@
+MD5 3c1a42b774600c353342cfa3782a7d77 pygtk-2.12.0.tar.bz2 2154621
+RMD160 d982a9752abcd214be975a3ead3946b3c8d1d474 pygtk-2.12.0.tar.bz2 2154621
+SHA256 0200c16528c8fd32eec2a9b1c1c2a303d88f5dc6ca94124a6e3ec8be1cac496e pygtk-2.12.0.tar.bz2 2154621
+MD5 ad0624dd26a19fbb9286c1c7711a60bc pygtk2reference-2.9.0.tar.bz2 759824
+RMD160 966cae10fa93b512f565aa0d552a8c83fe5de53f pygtk2reference-2.9.0.tar.bz2 759824
+SHA256 a01cf19a26aca49b2522f6c987cb48bcc9a2a393b4383709707acd5a994e00fd pygtk2reference-2.9.0.tar.bz2 759824
diff --git a/dev-python/pygtk/files/pygtk-2.12.0-extrafuncs.patch b/dev-python/pygtk/files/pygtk-2.12.0-extrafuncs.patch
new file mode 100644
index 000000000000..b68d581b719f
--- /dev/null
+++ b/dev-python/pygtk/files/pygtk-2.12.0-extrafuncs.patch
@@ -0,0 +1,24 @@
+diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN pygtk-2.12.0.orig/gtk/Makefile.am pygtk-2.12.0/gtk/Makefile.am
+--- pygtk-2.12.0.orig/gtk/Makefile.am	2007-09-15 11:00:42.000000000 -0400
++++ pygtk-2.12.0/gtk/Makefile.am	2007-12-22 11:17:35.000000000 -0500
+@@ -138,7 +138,7 @@ nodist__gtk_la_SOURCES = gtk.c gdk.c
+ if BUILD_GTK
+ pygtkexec_LTLIBRARIES += _gtk.la
+ defs_DATA += $(GDK_DEFS) $(GDK_TYPES_DEFS) $(GTK_DEFS) $(GTK_TYPES_DEFS) \
+-	gdk.defs gtk.defs gdk-types.defs gtk-types.defs
++	gdk.defs gtk.defs gdk-types.defs gtk-types.defs gtk-extrafuncs.defs
+ endif
+ 
+ # libglade module
+diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN pygtk-2.12.0.orig/gtk/Makefile.in pygtk-2.12.0/gtk/Makefile.in
+--- pygtk-2.12.0.orig/gtk/Makefile.in	2007-09-16 07:44:03.000000000 -0400
++++ pygtk-2.12.0/gtk/Makefile.in	2007-12-22 11:26:52.000000000 -0500
+@@ -47,7 +47,7 @@ host_triplet = @host@
+ @HAVE_GTK_2_12_TRUE@am__append_7 = gtk-2.12-types.defs
+ @BUILD_GTK_TRUE@am__append_8 = _gtk.la
+ @BUILD_GTK_TRUE@am__append_9 = $(GDK_DEFS) $(GDK_TYPES_DEFS) $(GTK_DEFS) $(GTK_TYPES_DEFS) \
+-@BUILD_GTK_TRUE@	gdk.defs gtk.defs gdk-types.defs gtk-types.defs
++@BUILD_GTK_TRUE@	gdk.defs gtk.defs gdk-types.defs gtk-types.defs gtk-extrafuncs.defs
+ 
+ @BUILD_LIBGLADE_TRUE@am__append_10 = glade.la
+ @BUILD_LIBGLADE_TRUE@am__append_11 = $(LIBGLADE_DEFS)
diff --git a/dev-python/pygtk/pygtk-2.12.0-r1.ebuild b/dev-python/pygtk/pygtk-2.12.0-r1.ebuild
new file mode 100644
index 000000000000..3053615195aa
--- /dev/null
+++ b/dev-python/pygtk/pygtk-2.12.0-r1.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygtk/pygtk-2.12.0-r1.ebuild,v 1.1 2007/12/22 16:34:49 dang Exp $
+
+NEED_PYTHON=2.3.5
+
+inherit gnome.org python flag-o-matic eutils
+
+DESCRIPTION="GTK+2 bindings for Python"
+HOMEPAGE="http://www.pygtk.org/"
+
+DOC_FILE="pygtk2reference-2.9.0.tar.bz2"
+SRC_URI="${SRC_URI}
+	doc? ( mirror://gnome/sources/pygtk2reference/2.9/${DOC_FILE} )"
+
+LICENSE="LGPL-2.1"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="doc examples opengl"
+
+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 )
+	opengl?	(	virtual/opengl
+				dev-python/pyopengl
+				>=x11-libs/gtkglarea-1.99
+			)"
+
+DEPEND="${RDEPEND}
+	doc? ( dev-libs/libxslt >=app-text/docbook-xsl-stylesheets-1.70.1 )
+	>=dev-util/pkgconfig-0.9"
+
+# Tests fail (missing display)
+RESTRICT="test"
+
+src_unpack() {
+	unpack ${A}
+	use doc || sed -e 's/\(SUBDIRS =.*\) docs$/\1/' -i "${S}"/Makefile.am
+
+	# disable pyc compiling
+	mv "${S}"/py-compile "${S}"/py-compile.orig
+	ln -s $(type -P true) "${S}"/py-compile
+
+	# Install gtk-extrafuncs.def bug#202140
+	epatch "${FILESDIR}"/${P}-extrafuncs.patch
+}
+
+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
+}
+
+src_install() {
+	make 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
+
+	if use doc; then
+		insinto /usr/share/gtk-doc/html/pygtk
+		cd "${WORKDIR}"/pygtk2reference
+		doins -r cursors icons images
+	fi
+}
+
+src_test() {
+	cd tests
+	make check-local || die "tests failed"
+}
+
+pkg_postinst() {
+	python_version
+	python_mod_optimize /usr/share/pygtk/2.0/codegen /usr/$(get_libdir)/python${PYVER}/site-packages/gtk-2.0
+}
+
+pkg_postrm() {
+	python_version
+	python_mod_cleanup /usr/share/pygtk/2.0/codegen
+	python_mod_cleanup
+	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]
+}