4 files changed, 67 insertions, 119 deletions

diff --git a/dev-python/pyopengl/ChangeLog b/dev-python/pyopengl/ChangeLog
index 0c3177eece4e..07827fda5f87 100644
--- a/dev-python/pyopengl/ChangeLog
+++ b/dev-python/pyopengl/ChangeLog
@@ -1,56 +1,10 @@
-# ChangeLog for dev-python/pyopengl
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyopengl/ChangeLog,v 1.12 2005/02/08 12:03:36 fserb Exp $
-
-  08 Feb 2005; Fernando Serboncini <fserb@gentoo.org>
-  pyopengl-2.0.0.44.ebuild, pyopengl-2.0.1.09.ebuild:
-  Fixed lib vars. Thanks to Tom Payne <twp@gentoo.org> for the diff. Closes
-  #81217
-
-  07 Feb 2005; Fernando Serboncini <fserb@gentoo.org>
-  pyopengl-2.0.0.44.ebuild, pyopengl-2.0.1.09.ebuild:
-  Fixed SED expression. Closes #81164
-
-  31 Jan 2005; Fernando Serboncini <fserb@gentoo.org>
-  -files/pyopengl-2.0.0.44-disable_togl.patch,
-  +files/pyopengl-2.0.0.44-fix_togl.patch, pyopengl-2.0.0.44.ebuild,
-  pyopengl-2.0.1.09.ebuild:
-  removed virtualx eclass dependency on both ebuilds. Closes #80090.
-
-  28 Jan 2005; Mike Frysinger <vapier@gentoo.org> pyopengl-2.0.0.44.ebuild,
-  pyopengl-2.0.1.09.ebuild:
-  Remove opengl-update cruft.
-
-  25 Jan 2005; Fernando Serboncini <fserb@gentoo.org>
-  pyopengl-2.0.0.44.ebuild, pyopengl-2.0.1.09.ebuild:
-  Fixed opengl-update switch on both ebuilds. Fixes #76928
-
-  25 Jan 2005; Jeremy Huddleston <eradicator@gentoo.org>
-  pyopengl-2.0.0.44.ebuild, pyopengl-2.0.1.09.ebuild:
-  Use proper env.d file.
-
-*pyopengl-2.0.1.09 (25 Jan 2005)
-
-  25 Jan 2005; Fernando Serboncini <fserb@gentoo.org>
-  +pyopengl-2.0.1.09.ebuild:
-  Version bump, closes #68921.
-  Thanks to Keith Lyon <kglyon@uwyo.edu> for the ebuild.
-
-  30 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
-  Change encoding to UTF-8 for GLEP 31 compliance
-
-  05 Sep 2004; Sven Wegener <swegener@gentoo.org> :
-  Fixed ChangeLog header.
-
-  13 Aug 2004; Alastair Tse <liquidx@gentoo.org> pyopengl-2.0.0.44.ebuild:
-  stop unary warnings
-
-  29 Jul 2004; Tom Gall <tgall@gentoo.org> PyOpenGL-2.0.0.44.ebuild:
-  stable on ppc64, bug #57015
+# ChangeLog for dev-python/PyOpenGL
+# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyopengl/ChangeLog,v 1.1 2004/07/20 19:52:08 kloeri Exp $
 
 *pyopengl-2.0.0.44 (20 Jul 2004)
 
-  20 Jul 2004; Bryan Østergaard <kloeri@gentoo.org> +metadata.xml,
+  20 Jul 2004; Bryan Østergaard <kloeri@gentoo.org> +metadata.xml,
   +files/config.diff, +files/pyopengl-2.0.0.44-disable_togl.patch,
   +pyopengl-2.0.0.44.ebuild:
   Rename dev-python/PyOpenGL to dev-python/pyopengl.
@@ -58,7 +12,7 @@
   13 May 2004; Stephen P. Becker <geoman@gentoo.org> PyOpenGL-2.0.0.44.ebuild:
   Stable on mips.
 
-  07 May 2004; Bryan Østergaard <kloeri@gentoo.org> PyOpenGL-2.0.0.44.ebuild:
+  07 May 2004; Bryan Østergaard <kloeri@gentoo.org> PyOpenGL-2.0.0.44.ebuild:
   Add missing IUSE.
 
   11 Apr 2004; Donnie Berkholz <spyderous@gentoo.org>;
diff --git a/dev-python/pyopengl/Manifest b/dev-python/pyopengl/Manifest
index 5bc252a43223..8a9b4ff0f6b4 100644
--- a/dev-python/pyopengl/Manifest
+++ b/dev-python/pyopengl/Manifest
@@ -1,18 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 c848da6670d15bc6f902ace1165939ac ChangeLog 4836
+MD5 ec0ea084fdb916164b3df9b388e17e52 PyOpenGL-2.0.0.44.ebuild 1532
+MD5 50f1635efa2f5d93ae3023769fb8629f ChangeLog 2949
 MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
-MD5 8917900a36bd56b70e5428b8cfb5fc40 pyopengl-2.0.0.44.ebuild 1423
-MD5 02a600002851e147c0f74f6b4ead8de9 pyopengl-2.0.1.09.ebuild 1361
 MD5 67d2ad027cfd6d411a585b0e346606a8 files/config.diff 1175
-MD5 9feca450998c720327067463fea8cdc0 files/digest-pyopengl-2.0.0.44 70
-MD5 1160aa70c95cda6bac58711ef532c929 files/digest-pyopengl-2.0.1.09 70
-MD5 c3e4064cdb5f7ab59c2e27e91f7ed4c0 files/pyopengl-2.0.0.44-fix_togl.patch 946
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFCCKqwxtZcznfol0URAkXeAKCCWrRa7weXdHuCkHqwUk34lSeZfACg6epx
-t33cpZCRSkrXyvS2nUiNbtA=
-=Bq9g
------END PGP SIGNATURE-----
+MD5 ba0f0760a4a22fa7666205b8a5f4f514 files/PyOpenGL-2.0.0.44-disable_togl.patch 406
+MD5 9feca450998c720327067463fea8cdc0 files/digest-PyOpenGL-2.0.0.44 70
diff --git a/dev-python/pyopengl/pyopengl-2.0.0.44.ebuild b/dev-python/pyopengl/pyopengl-2.0.0.44.ebuild
index 943accd30103..1d77ec658d1b 100644
--- a/dev-python/pyopengl/pyopengl-2.0.0.44.ebuild
+++ b/dev-python/pyopengl/pyopengl-2.0.0.44.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyopengl/pyopengl-2.0.0.44.ebuild,v 1.11 2005/02/08 12:03:36 fserb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyopengl/pyopengl-2.0.0.44.ebuild,v 1.1 2004/07/20 19:52:08 kloeri Exp $
 
 MY_P=${P/pyopengl/PyOpenGL}
 S=${WORKDIR}/${MY_P}
 
-inherit eutils distutils
+inherit eutils distutils virtualx
 
 DESCRIPTION="Python OpenGL bindings"
 HOMEPAGE="http://pyopengl.sourceforge.net/"
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/pyopengl/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sparc x86"
+KEYWORDS="x86 ppc sparc mips alpha arm hppa amd64 ia64"
 IUSE=""
 
 DEPEND="virtual/python
@@ -23,27 +23,47 @@ DEPEND="virtual/python
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/config.diff
-	epatch ${FILESDIR}/${P}-fix_togl.patch
-
-	if built_with_use dev-lang/python tcltk; then
-		tkv=$(grep TK_VER /usr/include/tk.h | sed 's/^.*"\(.*\)".*/\1/')
-		TKLIBRARY="'\/usr\/$(get_libdir)\/tk${tkv}'"
-		tclv=$(grep TCL_VER /usr/include/tcl.h | sed 's/^.*"\(.*\)".*/\1/')
-		TCLLIBRARY="'\/usr\/$(get_libdir)\/tcl${tclv}'"
-		TKEQ="True"
+	EPATCH_OPTS="-d ${S}" epatch ${FILESDIR}/config.diff
+	EPATCH_OPTS="-d ${S}" epatch ${FILESDIR}/${P}-disable_togl.patch
+}
+
+src_compile() {
+	export maketype="python"
+	export python="virtualmake"
+	distutils_src_compile
+}
+
+src_install() {
+	export maketype="python"
+	export python="virtualmake"
+	distutils_src_install
+}
+
+pkg_setup () {
+	if [ -e /etc/env.d/09opengl ]
+	then
+		# Set up X11 implementation
+		X11_IMPLEM_P="$(portageq best_version "${ROOT}" virtual/x11)"
+		X11_IMPLEM="${X11_IMPLEM_P%-[0-9]*}"
+		X11_IMPLEM="${X11_IMPLEM##*\/}"
+		einfo "X11 implementation is ${X11_IMPLEM}."
+
+		VOID=$(cat /etc/env.d/09opengl | grep ${X11_IMPLEM})
+
+		USING_X11=$?
+		if [ ${USING_X11} -eq 1 ]
+		then
+			GL_IMPLEM=$(cat /etc/env.d/09opengl | cut -f5 -d/)
+			opengl-update ${X11_IMPLEM}
+		fi
 	else
-		TKLIBRARY="'/usr/lib/'"
-		TCLLIBRARY="'/usr/lib/'"
-		TKEQ="None"
+		die "Could not find /etc/env.d/09opengl. Please run opengl-update."
+	fi
+}
+
+pkg_postinst () {
+	if [ ${USING_X11} -eq 1 ]
+	then
+		opengl-update ${GL_IMPLEM}
 	fi
-	SEDED="""
-s:tk = Tkinter.Tk():tk = ${TKEQ}:;
-s:tk.getvar('tk_version'):str(Tkinter.TkVersion):g;
-s:tk.getvar( 'tk_version' ):str(Tkinter.TkVersion):g;
-s:tk.getvar('tcl_version'):str(Tkinter.TclVersion):g;
-s:tk.getvar('tk_library'):${TKLIBRARY}:g;
-s:tk.getvar('tcl_library'):${TCLLIBRARY}:g;"""
-	sed -i -e "${SEDED}" setup/togl_setup.py
 }
diff --git a/dev-python/pyopengl/pyopengl-2.0.1.09.ebuild b/dev-python/pyopengl/pyopengl-2.0.1.09.ebuild
index ace7966d254b..9946fc46010a 100644
--- a/dev-python/pyopengl/pyopengl-2.0.1.09.ebuild
+++ b/dev-python/pyopengl/pyopengl-2.0.1.09.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyopengl/pyopengl-2.0.1.09.ebuild,v 1.7 2005/02/08 12:03:36 fserb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyopengl/pyopengl-2.0.1.09.ebuild,v 1.1 2005/01/25 02:27:51 fserb Exp $
 
 MY_P=${P/pyopengl/PyOpenGL}
 S=${WORKDIR}/${MY_P}
 
-inherit eutils distutils
+inherit eutils distutils virtualx
 
 DESCRIPTION="Python OpenGL bindings"
 HOMEPAGE="http://pyopengl.sourceforge.net/"
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/pyopengl/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~arm ~hppa ~amd64 ~ia64 ~ppc64"
 IUSE=""
 
 DEPEND="virtual/python
@@ -21,29 +21,15 @@ DEPEND="virtual/python
 	virtual/x11
 	virtual/opengl"
 
-src_unpack()
-{
-	unpack ${A}
-	cd ${S}/setup
-
-	if built_with_use dev-lang/python tcltk; then
-		tkv=$(grep TK_VER /usr/include/tk.h | sed 's/^.*"\(.*\)".*/\1/')
-		TKLIBRARY="'\/usr\/$(get_libdir)\/tk${tkv}'"
-		tclv=$(grep TCL_VER /usr/include/tcl.h | sed 's/^.*"\(.*\)".*/\1/')
-		TCLLIBRARY="'\/usr\/$(get_libdir)\/tcl${tclv}'"
-		TKEQ="True"
-	else
-		TKLIBRARY="'/usr/lib/'"
-		TCLLIBRARY="'/usr/lib/'"
-		TKEQ="None"
-	fi
-	SEDED="""
-s:tk = Tkinter.Tk():tk = ${TKEQ}:;
-s:tk.getvar('tk_version'):str(Tkinter.TkVersion):g;
-s:tk.getvar( 'tk_version' ):str(Tkinter.TkVersion):g;
-s:tk.getvar('tcl_version'):str(Tkinter.TclVersion):g;
-s:tk.getvar('tk_library'):${TKLIBRARY}:g;
-s:tk.getvar('tcl_library'):${TCLLIBRARY}:g;"""
-	sed -i -e "${SEDED}" togl_setup.py
+src_compile() {
+	export maketype="python"
+	export python="virtualmake"
+	distutils_src_compile
+}
 
+src_install() {
+	export maketype="python"
+	export python="virtualmake"
+	distutils_src_install
 }
+