* remove opengl dependencies, fix bug #212434

 * remove custom SRC_URI, fix bug #205676
 * remove old revision
(Portage version: 2.1.4.4)

3 files changed, 10 insertions, 103 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/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]
-}