* remove opengl dependencies, fix bug #212434

 * remove custom SRC_URI, fix bug #205676
 * remove old revision
Package-Manager: portage-2.1.4.4

4 files changed, 16 insertions, 112 deletions

diff --git a/dev-python/pygtk/ChangeLog b/dev-python/pygtk/ChangeLog
index fa0d2afe4b5f..159e06ba7525 100644
--- a/dev-python/pygtk/ChangeLog
+++ b/dev-python/pygtk/ChangeLog
@@ -1,6 +1,12 @@
 # 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.175 2008/01/07 00:04:20 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygtk/ChangeLog,v 1.176 2008/03/09 22:17:58 eva Exp $
+
+  09 Mar 2008; Gilles Dartiguelongue <eva@gentoo.org> -pygtk-2.8.6.ebuild,
+  pygtk-2.12.1.ebuild:
+  remove opengl dependencies, fix bug #212434
+  remove custom SRC_URI, fix bug #205676
+  remove old revision
 
 *pygtk-2.12.1 (06 Jan 2008)
 
diff --git a/dev-python/pygtk/Manifest b/dev-python/pygtk/Manifest
index 5f4e33105884..35130718982a 100644
--- a/dev-python/pygtk/Manifest
+++ b/dev-python/pygtk/Manifest
@@ -4,19 +4,16 @@ Hash: SHA1
 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
-DIST pygtk-2.8.6.tar.bz2 756885 RMD160 f2bc07556b15444add5cd31c0e494e85ad52b89b SHA1 088e5aeddee9e42f8c8ea0e1a171f1b8f363ba33 SHA256 dee1ec46a43bf624f1ff796903bd2d49e65c1cc8396385f46bf1489817bd6e60
 DIST pygtk2reference-2.9.0.tar.bz2 759824 RMD160 966cae10fa93b512f565aa0d552a8c83fe5de53f SHA1 b952fb86c3c0d98a6ea15b10c3d02f35eb169801 SHA256 a01cf19a26aca49b2522f6c987cb48bcc9a2a393b4383709707acd5a994e00fd
-DIST pygtk2reference.tbz2 604463 RMD160 3d4d9c5d5616dc6876c3c01fafaeadc1d96ccade SHA1 c28cbb714f769e6d444a20cca9a9e50b0b5594f4 SHA256 4f19595f2ecac6a7265e4f130efe7e4c8543afc6ad16429db0411be6e841849b
 EBUILD pygtk-2.10.6.ebuild 2435 RMD160 660bf2b8a65273a0276fac02189f16142d1c63f2 SHA1 67ae7b9d124551b7761acf56efe344ad8e502aee SHA256 a0c2396c1eff3cae05dba13269025f97cf2d1f7cd1684a2f14db7c2c46760f4a
 EBUILD pygtk-2.12.0.ebuild 2464 RMD160 01e20566153ad7a104745de56d56632e3f7ce733 SHA1 29cf8d9f223a7b24d328567104c39a67c1061879 SHA256 e4ef858b55d1a9b4e543f87b541b391f42a86203926b1b26e10df8287dc33852
-EBUILD pygtk-2.12.1.ebuild 2438 RMD160 b0e7934cc558bbc2cdab81b89254462efc723a8b SHA1 8202dd9c8e4feea5704a42753f48966276540370 SHA256 efc749c1ac571f6a96fc58e2e8e340cb0878412ba3beffda8afe81c5da34a025
-EBUILD pygtk-2.8.6.ebuild 2760 RMD160 17dec556d760f0d692ccc61bb1d5cb89a39594bd SHA1 d04292aa0d5c9600f54dcb1555ce83a706c7baf1 SHA256 b2b9623ea380e997ee041c70327ccc43e51fb9a1df0810acf600f32d359002e3
-MISC ChangeLog 21425 RMD160 6662376e9c9cc107a4d383fe40345e073e5fd656 SHA1 90b0a9da774c5f422297f019f092a3e6ebaecd90 SHA256 77f7e29818ad17faea456a1a08fa36733a3e90a15a7cac82f65c04c6bd94979e
+EBUILD pygtk-2.12.1.ebuild 2147 RMD160 cdd6147ff4221ee6799cee542934b67ac07b6dcd SHA1 d1fa3335aab05d23db430d1ae012db52dc19ac6d SHA256 aacd2e4daf9a4f7b5150e1c7be461585ebe278f48264607c36ab4947792bcfba
+MISC ChangeLog 21633 RMD160 4a6d679c524e938e298010aaef3853e5e9f6d9b3 SHA1 5169bc545cdfeed64d168013dbf49395913989e4 SHA256 ac0eac4434a13f9c21fcef989b599efa3a71723f5359c66e7408ac28fe54e9ee
 MISC metadata.xml 934 RMD160 5160cf3a201fe5209f575b0633ba8dd40d7b5ed5 SHA1 e62fb7156a43df5b3380a77f9ad7616130075f7d SHA256 6a0af6b71bbaca6634e59f933775fbf76053472b54ff3989bf26a065a4c9c426
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.8 (GNU/Linux)
+Version: GnuPG v2.0.7 (GNU/Linux)
 
-iEYEARECAAYFAkfUBdQACgkQkeYb6olFHJcmxACg1OCl25yB98tyLTfDAJROSL+M
-IFkAn0m7k6LHnujvqPMbZ4uKSHU/ngGr
-=rIqv
+iD8DBQFH1GIe1fmVwcYIWAYRAo/gAJ0TXi2xgDfnMa2+8Kxpo4uJf5jOpQCgxjgA
+XbTTa4nzGme7+3Eha5F/oDQ=
+=ysqE
 -----END PGP SIGNATURE-----
diff --git a/dev-python/pygtk/pygtk-2.12.1.ebuild b/dev-python/pygtk/pygtk-2.12.1.ebuild
index 79b6d97775d3..36bcd3cd5aef 100644
--- a/dev-python/pygtk/pygtk-2.12.1.ebuild
+++ b/dev-python/pygtk/pygtk-2.12.1.ebuild
@@ -1,20 +1,16 @@
 # 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.ebuild,v 1.1 2008/01/07 00:04:20 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygtk/pygtk-2.12.1.ebuild,v 1.2 2008/03/09 22:17:58 eva Exp $
 
 inherit gnome.org python flag-o-matic eutils virtualx
 
 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"
+IUSE="doc examples"
 
 RDEPEND=">=dev-libs/glib-2.8.0
 	>=x11-libs/pango-1.16.0
@@ -24,11 +20,7 @@ RDEPEND=">=dev-libs/glib-2.8.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
-			)"
+	!arm? ( dev-python/numeric )"
 
 DEPEND="${RDEPEND}
 	doc? ( dev-libs/libxslt >=app-text/docbook-xsl-stylesheets-1.70.1 )
@@ -36,7 +28,6 @@ DEPEND="${RDEPEND}
 
 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
diff --git a/dev-python/pygtk/pygtk-2.8.6.ebuild b/dev-python/pygtk/pygtk-2.8.6.ebuild
deleted file mode 100644
index db047dd188e5..000000000000
--- a/dev-python/pygtk/pygtk-2.8.6.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# 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.8.6.ebuild,v 1.15 2008/01/31 23:36:17 leio Exp $
-
-inherit gnome.org python flag-o-matic
-
-DESCRIPTION="GTK+2 bindings for Python"
-HOMEPAGE="http://www.pygtk.org/"
-SRC_URI="${SRC_URI}
-	doc? ( http://www.pygtk.org/dist/pygtk2reference.tbz2 )"
-
-LICENSE="LGPL-2.1"
-SLOT="2"
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sh sparc x86 ~x86-fbsd"
-IUSE="opengl doc"
-
-RDEPEND=">=dev-lang/python-2.3.5
-	>=x11-libs/gtk+-2.8.0
-	>=dev-libs/glib-2.8.0
-	>=x11-libs/pango-1.10.0
-	>=dev-libs/atk-1.8.0
-	>=gnome-base/libglade-2.5.0
-	>=dev-python/pycairo-0.9.0
-	dev-python/numeric
-	opengl? ( virtual/opengl
-		dev-python/pyopengl
-		>=x11-libs/gtkglarea-1.99 )"
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.9"
-
-# Tests fail (missing display)
-RESTRICT="test"
-
-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
-}
-
-src_compile() {
-	use hppa && append-flags -ffunction-sections
-	econf --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
-	rm examples/Makefile*
-	cp -r examples "${D}/usr/share/doc/${PF}/"
-
-	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
-
-	if use doc; then
-		cd "${S}"/../
-		dodir /usr/share/gtk-doc/html
-		cp -pPR pygtk2reference	"${D}"/usr/share/gtk-doc/html/
-	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
-	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() {
-	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]
-}