version bump plus fixed for get_libdir (#76791)

(Portage version: 2.0.51.19)

6 files changed, 36 insertions, 26 deletions

diff --git a/dev-python/pygtk/ChangeLog b/dev-python/pygtk/ChangeLog
index 230a4c7edaa7..50929af1a596 100644
--- a/dev-python/pygtk/ChangeLog
+++ b/dev-python/pygtk/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-python/pygtk
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pygtk/ChangeLog,v 1.73 2005/02/27 01:57:52 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygtk/ChangeLog,v 1.74 2005/03/08 13:39:50 liquidx Exp $
+
+*pygtk-2.6.0 (08 Mar 2005)
+
+  08 Mar 2005; Alastair Tse <liquidx@gentoo.org> -pygtk-2.4.0.ebuild,
+  +pygtk-2.6.0.ebuild:
+  version bump, now requires gtk+-2.6. fix get_libdir in pkg_postinst and
+  pkg_postrm. (#76791)
 
   26 Feb 2005; Jeremy Huddleston <eradicator@gentoo.org> pygtk-2.4.1.ebuild:
   Multilib fixes.
diff --git a/dev-python/pygtk/Manifest b/dev-python/pygtk/Manifest
index 4ef14b8d24bf..8e33596dae0a 100644
--- a/dev-python/pygtk/Manifest
+++ b/dev-python/pygtk/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 346eaec382ab83187a7bd9194b9294f2 ChangeLog 9194
 MD5 8f03582f883634bcb2007a13b8350931 metadata.xml 487
 MD5 a244841efdd7989d4e751e0742ea911d pygtk-0.6.11-r1.ebuild 1948
@@ -11,6 +8,7 @@ MD5 7ffd433ac94020e9547ed67c93806054 pygtk-2.0.0.ebuild 925
 MD5 5d2c87676a6ea4abbff3e7d05936c8fd pygtk-2.2.0.ebuild 2171
 MD5 ed4090fb04194f21e55a09a7fa253609 pygtk-2.4.0.ebuild 2245
 MD5 aff3ce4fdbe95bb147644c51c0e82e30 pygtk-2.4.1.ebuild 2518
+MD5 4bfb12cc3307c6fd0ce518132d974f4b pygtk-2.6.0.ebuild 2468
 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
@@ -19,10 +17,4 @@ MD5 f0923e335952213318838067c14df0a0 files/digest-pygtk-2.0.0-r1 64
 MD5 a6372d851a8b936f2df258b93a5bc719 files/digest-pygtk-2.2.0 64
 MD5 928b221404d07fcc1913b00f8498cf3d files/digest-pygtk-2.4.0 64
 MD5 39ecd0ee60f11eff2a596002e0ddf34d files/digest-pygtk-2.4.1 129
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
-
-iD8DBQFCISmGArHZZzCEUG0RAt8OAJ4pf8LF0xLi9ERz/Ysou+1c4o1KXQCfTXb8
-IInJOMyvjfjyyB/Wsrfy0Ag=
-=8Zs2
------END PGP SIGNATURE-----
+MD5 19690d7b7578eaf46c0ce7d12936dac3 files/digest-pygtk-2.6.0 129
diff --git a/dev-python/pygtk/files/digest-pygtk-2.4.0 b/dev-python/pygtk/files/digest-pygtk-2.4.0
deleted file mode 100644
index 7793289f0707..000000000000
--- a/dev-python/pygtk/files/digest-pygtk-2.4.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d3ae939f0d484cde22169e3e63021049 pygtk-2.4.0.tar.bz2 710461
diff --git a/dev-python/pygtk/files/digest-pygtk-2.6.0 b/dev-python/pygtk/files/digest-pygtk-2.6.0
new file mode 100644
index 000000000000..b138d0b70a23
--- /dev/null
+++ b/dev-python/pygtk/files/digest-pygtk-2.6.0
@@ -0,0 +1,2 @@
+MD5 45e870beec4dd384d4c6397df7fbaecd pygtk-2.6.0.tar.bz2 729250
+MD5 b7c7f1aaaf24165d4cb2a5f4e2225d34 pygtk2reference.tbz2 604463
diff --git a/dev-python/pygtk/pygtk-2.4.1.ebuild b/dev-python/pygtk/pygtk-2.4.1.ebuild
index c575d034e7f7..d91c17847548 100644
--- a/dev-python/pygtk/pygtk-2.4.1.ebuild
+++ b/dev-python/pygtk/pygtk-2.4.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pygtk/pygtk-2.4.1.ebuild,v 1.11 2005/02/27 01:57:52 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygtk/pygtk-2.4.1.ebuild,v 1.12 2005/03/08 13:39:50 liquidx Exp $
 
 inherit gnome.org python flag-o-matic
 
@@ -80,3 +80,4 @@ pkg_postrm() {
 	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]
 }
+
diff --git a/dev-python/pygtk/pygtk-2.4.0.ebuild b/dev-python/pygtk/pygtk-2.6.0.ebuild
index e57e6beb56ca..f38c45ff8cfd 100644
--- a/dev-python/pygtk/pygtk-2.4.0.ebuild
+++ b/dev-python/pygtk/pygtk-2.6.0.ebuild
@@ -1,20 +1,21 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pygtk/pygtk-2.4.0.ebuild,v 1.3 2005/01/03 11:33:40 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygtk/pygtk-2.6.0.ebuild,v 1.1 2005/03/08 13:39:50 liquidx Exp $
 
 inherit gnome.org python flag-o-matic
 
 DESCRIPTION="GTK+2 bindings for Python"
 HOMEPAGE="http://www.pygtk.org/"
-SRC_URI="ftp://ftp.gnome.org/pub/gnome/sources/pygtk/2.4/${P}.tar.bz2"
+SRC_URI="${SRC_URI}
+		doc? ( http://www.pygtk.org/dist/pygtk2reference.tbz2 )"
 
 LICENSE="LGPL-2.1"
 SLOT="2"
-KEYWORDS="x86 ~ppc ~sparc ~alpha ~hppa ~amd64"
-IUSE="gnome opengl"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~sparc ~x86"
+IUSE="gnome opengl doc"
 
 RDEPEND=">=dev-lang/python-2.3
-	>=x11-libs/gtk+-2.4.0
+	>=x11-libs/gtk+-2.6.0
 	>=dev-libs/glib-2.4.0
 	gnome? ( >=gnome-base/libglade-2.3.6 )
 	opengl? ( virtual/opengl
@@ -25,6 +26,9 @@ DEPEND="${RDEPEND}
 
 src_unpack() {
 	unpack ${A}
+	if use doc; then
+		unpack pygtk2reference.tbz2
+	fi
 	# disable pyc compiling
 	mv ${S}/py-compile ${S}/py-compile.orig
 	ln -s /bin/true ${S}/py-compile
@@ -38,16 +42,21 @@ src_compile() {
 }
 
 src_install() {
-	einstall || die
+	make DESTDIR="${D}" install || die
 	dodoc AUTHORS ChangeLog INSTALL MAPPING NEWS README THREADS TODO
 	rm examples/Makefile*
 	cp -r examples ${D}/usr/share/doc/${PF}/
 
 	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
+	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
+
+	if use doc; then
+		cd ${S}/../pygtk2reference
+		dohtml -r *
+	fi
 }
 
 src_test() {
@@ -58,9 +67,9 @@ src_test() {
 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
+	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
 }
 
 pkg_postrm() {