Add dev-python/py{gtk,gobject}-9999

- Modify the pygtk ebuild to use gnome2.eclass
- Modify gnome2-live.eclass:
    * Include "m4" for eautoreconf
    * Disable pyc compilation

8 files changed, 206 insertions, 1 deletions

diff --git a/dev-python/pygobject/Manifest b/dev-python/pygobject/Manifest
new file mode 100644
index 0000000..6017bbe
--- /dev/null
+++ b/dev-python/pygobject/Manifest
@@ -0,0 +1,2 @@
+AUX pygobject-fix-codegen-location.patch 1519 RMD160 e4721ae2d9a2d05e3b129627c762acf177521974 SHA1 02e9446db952de3b934a264ce77648d2cd5c6d97 SHA256 6ab22def2c57a4dd44dedc787cb660dc326a62b518c3dc747fbe600ca2c20b8c
+EBUILD pygobject-9999.ebuild 1812 RMD160 35d87036a60520c8a1390190ebb4315931efc0ec SHA1 4a1140c7d5424ce3db36458c29a2c863f8dcbadc SHA256 ee8fe7474c481b4006148d4a7d8f5d54834906c719c8bfbae20508ee7be2348a
diff --git a/dev-python/pygobject/files/pygobject-fix-codegen-location.patch b/dev-python/pygobject/files/pygobject-fix-codegen-location.patch
new file mode 100644
index 0000000..8882cd0
--- /dev/null
+++ b/dev-python/pygobject/files/pygobject-fix-codegen-location.patch
@@ -0,0 +1,50 @@
+---
+ Fix FHS compliance of codegen
+
+ codegen/Makefile.am          |    2 +-
+ codegen/pygtk-codegen-2.0.in |    3 ++-
+ pygtk-2.0.pc.in              |    2 +-
+ 3 files changed, 4 insertions(+), 3 deletions(-)
+
+--- a/codegen/Makefile.am	2007-11-01 12:20:22.000000000 -0400
++++ b/codegen/Makefile.am	2008-05-28 22:21:04.000000000 -0400
+@@ -2,7 +2,7 @@ PLATFORM_VERSION = 2.0
+ 
+ bin_SCRIPTS = pygobject-codegen-$(PLATFORM_VERSION)
+ 
+-codegendir = $(pkgdatadir)/$(PLATFORM_VERSION)/codegen
++codegendir = $(pyexecdir)/gtk-2.0/codegen
+ 
+ codegen_PYTHON = \
+ 	__init__.py \
+--- a/codegen/pygobject-codegen-2.0.in	2007-11-01 12:20:22.000000000 -0400
++++ b/codegen/pygobject-codegen-2.0.in	2008-05-28 22:24:38.000000000 -0400
+@@ -1,9 +1,10 @@
+ #!/bin/sh
+ 
+ prefix=@prefix@
++exec_prefix=@exec_prefix@
+ datarootdir=@datarootdir@
+ datadir=@datadir@
+-codegendir=${datadir}/pygobject/2.0/codegen
++codegendir=@pyexecdir@/gtk-2.0/codegen
+ 
+ PYTHONPATH=$codegendir
+ export PYTHONPATH
+--- a/pygobject-2.0.pc.in	2007-11-01 12:20:22.000000000 -0400
++++ b/pygobject-2.0.pc.in	2008-05-28 22:21:04.000000000 -0400
+@@ -4,6 +4,7 @@
+ datarootdir=@datarootdir@
+ datadir=@datadir@
+ libdir=@libdir@
++pyexecdir=@pyexecdir@
+ 
+ # you can use the --variable=pygtkincludedir argument to
+ # pkg-config to get this value.  You might want to use this to
+@@ -12,5 +12,5 @@
+ defsdir=${datadir}/pygobject/2.0/defs
+-codegendir=${datadir}/pygobject/2.0/codegen
++codegendir=${pyexecdir}/gtk-2.0/codegen
+ 
+ Name: PyGObject
+ Description: Python bindings for GObject
diff --git a/dev-python/pygobject/pygobject-9999.ebuild b/dev-python/pygobject/pygobject-9999.ebuild
new file mode 100644
index 0000000..68c6189
--- /dev/null
+++ b/dev-python/pygobject/pygobject-9999.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+inherit autotools gnome2 python virtualx gnome2-live
+
+DESCRIPTION="GLib's GObject library bindings for Python"
+HOMEPAGE="http://www.pygtk.org/"
+
+LICENSE="LGPL-2"
+SLOT="2"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples libffi"
+
+RDEPEND=">=dev-lang/python-2.4.4-r5
+	>=dev-libs/glib-2.16
+	!<dev-python/pygtk-2.13"
+DEPEND="${RDEPEND}
+	doc? ( dev-libs/libxslt >=app-text/docbook-xsl-stylesheets-1.70.1 )
+	>=dev-util/pkgconfig-0.12.0"
+
+DOCS="AUTHORS ChangeLog NEWS README"
+PATCHES="${PN}-fix-codegen-location.patch"
+
+pkg_setup() {
+	if use libffi && ! built_with_use sys-devel/gcc libffi; then
+		eerror "libffi support not found in sys-devel/gcc." && die
+	fi
+
+	G2CONF="${G2CONF} $(use_enable doc docs) $(use_with libffi)"
+}
+
+src_test() {
+	unset DBUS_SESSION_BUS_ADDRESS
+	Xemake check || die "tests failed"
+}
+
+src_install() {
+	gnome2_src_install
+
+	if use examples; then
+		insinto /usr/share/doc/${P}
+		doins -r examples
+	fi
+
+	python_version
+	mv "${D}"/usr/$(get_libdir)/python${PYVER}/site-packages/pygtk.py \
+		"${D}"/usr/$(get_libdir)/python${PYVER}/site-packages/pygtk.py-2.0
+	mv "${D}"/usr/$(get_libdir)/python${PYVER}/site-packages/pygtk.pth \
+		"${D}"/usr/$(get_libdir)/python${PYVER}/site-packages/pygtk.pth-2.0
+}
+
+pkg_postinst() {
+	python_version
+	python_mod_optimize /usr/$(get_libdir)/python${PYVER}/site-packages/gtk-2.0
+	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]
+	python_mod_compile /usr/$(get_libdir)/python${PYVER}/site-packages/pygtk.py
+
+	gnome2-live_pkg_postinst
+}
+
+pkg_postrm() {
+	python_version
+	python_mod_cleanup
+}
diff --git a/dev-python/pygtk/Manifest b/dev-python/pygtk/Manifest
new file mode 100644
index 0000000..7061876
--- /dev/null
+++ b/dev-python/pygtk/Manifest
@@ -0,0 +1,2 @@
+AUX pygtk-2.13.0-fix-codegen-location.patch 507 RMD160 30b49791ac11da80efae1ef0f3c7ccbb72fc82f9 SHA1 dc7d975fe4ebd95afba79cac6276c73f55a9961b SHA256 f446a7b3e3ac76a9ab594738b1fbf9105c1ca17e8053b1a8712a966e9cfe54d0
+EBUILD pygtk-9999.ebuild 1698 RMD160 7ec1eac1f61cc09d75517cde45a5847014b01061 SHA1 99a26163a7c81cf1e4a4443447b9a69d73ea17e0 SHA256 4305e9b1a1863a5c3758c33478f48b07574eb9ad55619d7992efdc120647986f
diff --git a/dev-python/pygtk/files/pygtk-2.13.0-fix-codegen-location.patch b/dev-python/pygtk/files/pygtk-2.13.0-fix-codegen-location.patch
new file mode 100644
index 0000000..701d828
--- /dev/null
+++ b/dev-python/pygtk/files/pygtk-2.13.0-fix-codegen-location.patch
@@ -0,0 +1,11 @@
+--- a/pygtk-2.0.pc.in	2007-11-01 12:20:22.000000000 -0400
++++ b/pygtk-2.0.pc.in	2008-05-28 22:21:04.000000000 -0400
+@@ -12,7 +12,7 @@ pygtkincludedir=${includedir}/pygtk-2.0
+ # This is strictly speaking not necessarily so (we refer to another
+ # package), but we want to preserve compatibility with times codegen
+ # was in PyGTK, not PyGObject.
+-codegendir=${datadir}/pygobject/2.0/codegen
++codegendir=${pyexecdir}/gtk-2.0/codegen
+ 
+ Name: PyGTK
+ Description: Python bindings for GTK+ and related libraries
diff --git a/dev-python/pygtk/pygtk-9999.ebuild b/dev-python/pygtk/pygtk-9999.ebuild
new file mode 100644
index 0000000..b320485
--- /dev/null
+++ b/dev-python/pygtk/pygtk-9999.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+inherit autotools flag-o-matic python virtualx gnome2 gnome2-live
+
+DESCRIPTION="GTK+2 bindings for Python"
+HOMEPAGE="http://www.pygtk.org/"
+SRC_URI=""
+
+LICENSE="LGPL-2.1"
+SLOT="2"
+KEYWORDS="~amd64 ~x86"
+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
+	>=dev-lang/python-2.4.4-r5
+	>=dev-python/pycairo-1.0.2
+	>=dev-python/pygobject-2.15.5
+	!arm? ( dev-python/numeric )"
+
+DEPEND="${RDEPEND}
+	doc? ( dev-libs/libxslt >=app-text/docbook-xsl-stylesheets-1.70.1 )
+	>=dev-util/pkgconfig-0.9"
+
+DOCS="AUTHORS ChangeLog INSTALL MAPPING NEWS README THREADS TODO"
+PATCHES="${PN}-2.13.0-fix-codegen-location.patch"
+
+pkg_setup() {
+	use hppa && append-flags -ffunction-sections
+	G2CONF="${G2CONF}
+		--enable-thread
+		$(use_enable doc docs)"
+}
+
+src_install() {
+	gnome2_src_install
+
+	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
+
+	gnome2-live_pkg_postinst
+}
+
+pkg_postrm() {
+	python_version
+	python_mod_cleanup /usr/$(get_libdir)/python*/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]
+}
diff --git a/eclass/gnome2-live.eclass b/eclass/gnome2-live.eclass
index 952e230..6e19c2c 100644
--- a/eclass/gnome2-live.eclass
+++ b/eclass/gnome2-live.eclass
@@ -47,7 +47,11 @@ gnome2-live_src_prepare() {
 	gnome-doc-common
 	gnome-doc-prepare --automake
 	intltoolize --force
-	eautoreconf
+	# Add by default; it's ignored if DNE
+	AT_M4DIR=m4 eautoreconf
+
+	# Disable pyc compiling. Doesn't harm if DNE
+	ln -sf $(type -P true) py-compile
 
 	### Keep this in-sync with gnome2.eclass!
 	# Prevent scrollkeeper access violations
diff --git a/profiles/package.mask b/profiles/package.mask
index 69097f9..123359b 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -4,6 +4,8 @@
 # Please append to the top of this list as ebuilds are added
 
 
+=dev-python/pygtk-9999
+=dev-python/pygobject-9999
 =app-crypt/seahorse-plugins-9999
 =app-crypt/seahorse-9999
 =gnome-extra/network-manager-applet-9999