fix pyc/pyo cleanup, fix pygtk.{py,pth} conflicts when installing pygtk-2.0 and pygtk-0.6 in different orders using alternatives.eclass.

6 files changed, 142 insertions, 1 deletions

diff --git a/dev-python/pygtk/ChangeLog b/dev-python/pygtk/ChangeLog
index 904c1f9bc16f..6c7565b2b92a 100644
--- a/dev-python/pygtk/ChangeLog
+++ b/dev-python/pygtk/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-python/pygtk
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pygtk/ChangeLog,v 1.36 2004/01/15 04:09:35 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygtk/ChangeLog,v 1.37 2004/01/24 16:56:05 liquidx Exp $
+
+*pygtk-0.6.11-r1 (24 Jan 2004)
+
+  24 Jan 2004; Alastair Tse <liquidx@gentoo.org> pygtk-0.6.11-r1.ebuild,
+  pygtk-2.0.0-r1.ebuild:
+  fix pyc/pyo cleanup, fix pygtk.{py,pth} conflicts when installing
+  pygtk-2.0 and pygtk-0.6 in different orders using alternatives.eclass. 
+  add pyopengl dependencies instead of einfo at the end.
 
   14 Jan 2004; Aron Griffis <agriffis@gentoo.org> pygtk-0.6.11.ebuild:
   stable on alpha for bug 31858
diff --git a/dev-python/pygtk/Manifest b/dev-python/pygtk/Manifest
index c8cd18294a52..bdb5cdb86eae 100644
--- a/dev-python/pygtk/Manifest
+++ b/dev-python/pygtk/Manifest
@@ -1,8 +1,12 @@
 MD5 73ccc457c1f48e00c149ba9039af31e7 ChangeLog 4428
 MD5 7f4b1ac767214657b085c4951227af02 metadata.xml 178
+MD5 443a80319924397c3986da954976e901 pygtk-0.6.11-r1.ebuild 1536
 MD5 da507f871da603f506a8211b6e0bccf0 pygtk-0.6.11.ebuild 607
 MD5 490ff23006c83de94333bfd389d99d2f pygtk-1.99.13-r1.ebuild 1004
+MD5 ccf7dae2c279809413c8d52d6c2a82d9 pygtk-2.0.0-r1.ebuild 1570
 MD5 ad10f5bc570e8fc18343dce10cd873b5 pygtk-2.0.0.ebuild 944
 MD5 f7476a916a6add9b10800b1f5bf31e98 files/digest-pygtk-0.6.11 64
+MD5 f7476a916a6add9b10800b1f5bf31e98 files/digest-pygtk-0.6.11-r1 64
 MD5 24c9de51067b362e1e30dd1d3019e1b0 files/digest-pygtk-1.99.13-r1 65
 MD5 f0923e335952213318838067c14df0a0 files/digest-pygtk-2.0.0 64
+MD5 f0923e335952213318838067c14df0a0 files/digest-pygtk-2.0.0-r1 64
diff --git a/dev-python/pygtk/files/digest-pygtk-0.6.11-r1 b/dev-python/pygtk/files/digest-pygtk-0.6.11-r1
new file mode 100644
index 000000000000..cb1712964ebe
--- /dev/null
+++ b/dev-python/pygtk/files/digest-pygtk-0.6.11-r1
@@ -0,0 +1 @@
+MD5 0a327b0ea116014bb70ebe93d071a7a8 pygtk-0.6.11.tar.gz 401327
diff --git a/dev-python/pygtk/files/digest-pygtk-2.0.0-r1 b/dev-python/pygtk/files/digest-pygtk-2.0.0-r1
new file mode 100644
index 000000000000..6e1afdab22b7
--- /dev/null
+++ b/dev-python/pygtk/files/digest-pygtk-2.0.0-r1
@@ -0,0 +1 @@
+MD5 14db9cfffe31f6df0351bd5fec69f606 pygtk-2.0.0.tar.bz2 526780
diff --git a/dev-python/pygtk/pygtk-0.6.11-r1.ebuild b/dev-python/pygtk/pygtk-0.6.11-r1.ebuild
new file mode 100644
index 000000000000..f4a36d2a2e90
--- /dev/null
+++ b/dev-python/pygtk/pygtk-0.6.11-r1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygtk/pygtk-0.6.11-r1.ebuild,v 1.1 2004/01/24 16:56:05 liquidx Exp $
+
+inherit python
+
+DESCRIPTION="GTK+ bindings for Python"
+HOMEPAGE="http://www.daa.com.au/~james/pygtk/"
+SRC_URI="ftp://ftp.gtk.org/pub/gtk/python/v1.2/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="1.2"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha"
+IUSE=""
+
+DEPEND="virtual/python
+	>=gnome-base/libglade-0.17-r6
+	>=media-libs/imlib-1.8
+	>=media-libs/gdk-pixbuf-0.9.0
+	=x11-libs/gtk+-1.2*
+	opengl? ( virtual/opengl dev-python/PyOpenGL )"
+
+src_unpack() {
+	unpack ${A}
+	# disable pyc compiling
+	mv ${S}/py-compile ${S}/py-compile.orig
+	ln -s /bin/true ${S}/py-compile
+}
+
+src_compile() {
+	econf
+	emake || die "make failed"
+}
+
+src_install() {
+	einstall || die
+	dodoc AUTHORS COPYING ChangeLog INSTALL MAPPING NEWS README TODO
+
+	python_version
+	mv ${D}/usr/lib/python${PYVER}/site-packages/pygtk.py \
+		${D}/usr/lib/python${PYVER}/site-packages/pygtk.py-1.2
+	mv ${D}/usr/lib/python${PYVER}/site-packages/pygtk.pth \
+		${D}/usr/lib/python${PYVER}/site-packages/pygtk.pth-1.2
+}
+
+pkg_postinst() {
+	python_version
+	python_mod_optimize /usr/share/pygtk/1.2/codegen /usr/lib/python${PYVER}/site-packages/gtk-1.2
+	alternatives_auto_makesym /usr/lib/python${PYVER}/site-packages/pygtk.py pygtk.py-[0-9].[0-9]
+	alternatives_auto_makesym /usr/lib/python${PYVER}/site-packages/pygtk.pth pygtk.pth-[0-9].[0-9]
+	python_mod_compile /usr/lib/python${PYVER}/site-packages/pygtk.py
+}
+
+pkg_postrm() {
+	python_version
+	python_mod_cleanup /usr/share/pygtk/1.2/codegen
+	rm -f ${ROOT}/usr/lib/python${PYVER}/site-packages/pygtk.{py,pth}
+	alternatives_auto_makesym /usr/lib/python${PYVER}/site-packages/pygtk.py pygtk.py-[0-9].[0-9]
+	alternatives_auto_makesym /usr/lib/python${PYVER}/site-packages/pygtk.pth pygtk.pth-[0-9].[0-9]
+	python_mod_cleanup
+}
diff --git a/dev-python/pygtk/pygtk-2.0.0-r1.ebuild b/dev-python/pygtk/pygtk-2.0.0-r1.ebuild
new file mode 100644
index 000000000000..25545da90435
--- /dev/null
+++ b/dev-python/pygtk/pygtk-2.0.0-r1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygtk/pygtk-2.0.0-r1.ebuild,v 1.1 2004/01/24 16:56:05 liquidx Exp $
+
+inherit gnome.org python
+
+DESCRIPTION="GTK+2 bindings for Python"
+HOMEPAGE="http://www.daa.com.au/~james/pygtk/"
+
+LICENSE="LGPL-2.1"
+SLOT="2"
+KEYWORDS="~x86 ppc ~sparc ~alpha"
+IUSE="gnome opengl"
+
+RDEPEND=">=dev-lang/python-2.2
+	>=x11-libs/pango-1
+	>=x11-libs/gtk+-2
+	>=dev-libs/atk-1
+	>=dev-libs/glib-2
+	gnome? ( >=gnome-base/libglade-2 )
+	opengl? ( virtual/opengl
+		dev-python/PyOpenGL
+		>=x11-libs/gtkglarea-1.99 )"
+
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.9"
+
+src_unpack() {
+	unpack ${A}
+	# disable pyc compiling
+	mv ${S}/py-compile ${S}/py-compile.orig
+	ln -s /bin/true ${S}/py-compile
+}
+
+src_compile() {
+	econf --enable-thread || die
+	emake || die
+}
+
+src_install() {
+	einstall || die
+	dodoc AUTHORS COPYING ChangeLog INSTALL MAPPING NEWS README THREADS TODO
+
+	python_version
+	mv ${D}/usr/lib/python${PYVER}/site-packages/pygtk.py \
+		${D}/usr/lib/python${PYVER}/site-packages/pygtk.py-2.0
+	mv ${D}/usr/lib/python${PYVER}/site-packages/pygtk.pth \
+		${D}/usr/lib/python${PYVER}/site-packages/pygtk.pth-2.0
+}
+
+pkg_postinst() {
+	python_version
+	python_mod_optimize /usr/share/pygtk/2.0/codegen /usr/lib/python${PYVER}/site-packages/gtk-2.0
+	alternatives_auto_makesym /usr/lib/python${PYVER}/site-packages/pygtk.py pygtk.py-[0-9].[0-9]
+	alternatives_auto_makesym /usr/lib/python${PYVER}/site-packages/pygtk.pth pygtk.pth-[0-9].[0-9]
+	python_mod_compile /usr/lib/python${PYVER}/site-packages/pygtk.py
+}
+
+pkg_postrm() {
+	python_version
+	python_mod_cleanup /usr/share/pygtk/2.0/codegen
+	python_mod_cleanup
+	rm -f ${ROOT}/usr/lib/python${PYVER}/site-packages/pygtk.{py,pth}
+	alternatives_auto_makesym /usr/lib/python${PYVER}/site-packages/pygtk.py pygtk.py-[0-9].[0-9]
+	alternatives_auto_makesym /usr/lib/python${PYVER}/site-packages/pygtk.pth pygtk.pth-[0-9].[0-9]
+}