removed virtualx eclass dependency. Closes #80090.

Package-Manager: portage-2.0.51-r15

6 files changed, 96 insertions, 43 deletions

diff --git a/dev-python/pyopengl/ChangeLog b/dev-python/pyopengl/ChangeLog
index 191530aef171..08366f1cb8e0 100644
--- a/dev-python/pyopengl/ChangeLog
+++ b/dev-python/pyopengl/ChangeLog
@@ -1,6 +1,12 @@
 # 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.9 2005/01/28 23:56:16 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyopengl/ChangeLog,v 1.10 2005/01/31 23:50:46 fserb Exp $
+
+  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:
diff --git a/dev-python/pyopengl/Manifest b/dev-python/pyopengl/Manifest
index 1c4c8b63508c..0dcb55a70d3b 100644
--- a/dev-python/pyopengl/Manifest
+++ b/dev-python/pyopengl/Manifest
@@ -1,8 +1,18 @@
-MD5 40fa6bcc16dea91fd5ceb7225bf6104e ChangeLog 4227
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 13d6cb11d9ce309d7f4dae7c542d925f ChangeLog 4495
 MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
-MD5 ff5802217c7de916cf5d24e1e74a6a32 pyopengl-2.0.0.44.ebuild 955
-MD5 d0650fc9a9a90e2660c6bdf468841201 pyopengl-2.0.1.09.ebuild 814
+MD5 b381571386491235b94a9390a1145b94 pyopengl-2.0.0.44.ebuild 1418
+MD5 d35279e3e21834873b0bcc23b1d9cf11 pyopengl-2.0.1.09.ebuild 1357
 MD5 67d2ad027cfd6d411a585b0e346606a8 files/config.diff 1175
 MD5 9feca450998c720327067463fea8cdc0 files/digest-pyopengl-2.0.0.44 70
-MD5 ba0f0760a4a22fa7666205b8a5f4f514 files/pyopengl-2.0.0.44-disable_togl.patch 406
 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)
+
+iD8DBQFB/sRlxtZcznfol0URAnKCAKCG3PWpWgzeV87m9rQ4vBWMDLm3SwCfd9fW
+voM/2UEMa2reL1soaXK4q24=
+=6LUQ
+-----END PGP SIGNATURE-----
diff --git a/dev-python/pyopengl/files/pyopengl-2.0.0.44-disable_togl.patch b/dev-python/pyopengl/files/pyopengl-2.0.0.44-disable_togl.patch
deleted file mode 100644
index 80027afc7dad..000000000000
--- a/dev-python/pyopengl/files/pyopengl-2.0.0.44-disable_togl.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- config/linux.cfg~	2003-12-06 02:49:49.034371944 +0000
-+++ config/linux.cfg	2003-12-06 03:52:07.818990288 +0000
-@@ -9,7 +9,7 @@
- ; additional directories for headers and libraries.  No quotes
- ; are needed
- [General]
--build_togl=1
-+build_togl=0
- gl_platform=GLX
- include_dirs=/usr/include:/usr/local/include:/usr/X11R6/include:/usr/lib/tk8.4/include
- library_dirs=/usr/lib:/usr/local/lib:/usr/X11R6/lib
diff --git a/dev-python/pyopengl/files/pyopengl-2.0.0.44-fix_togl.patch b/dev-python/pyopengl/files/pyopengl-2.0.0.44-fix_togl.patch
new file mode 100644
index 000000000000..c456e55b6e23
--- /dev/null
+++ b/dev-python/pyopengl/files/pyopengl-2.0.0.44-fix_togl.patch
@@ -0,0 +1,24 @@
+--- setup/togl_setup.py.orig	2005-01-30 23:26:54.137328288 -0200
++++ setup/togl_setup.py	2005-01-30 23:27:41.729093240 -0200
+@@ -142,13 +142,14 @@
+     outfiles.append(out)
+ 
+     # make package index for tcl/tk
++    indexFile = os.path.join( togl_dir, 'pkgIndex.tcl' )
+     if not dry_run: 
+-        # only if real install
+-        install.announce('running "pkg_mkIndex %s %s"' % (togl_dir, togl))
+-        if install.verbose:
+-            tk.tk.call('pkg_mkIndex','-verbose',togl_dir, togl)
+-        else:
+-            tk.tk.call('pkg_mkIndex',togl_dir, togl)
+-    outfiles.append(os.path.join(togl_dir,'pkgIndex.tcl'))
++	    # only if real install
++        install.announce( 'creating pkgIndex.tcl in %(togl_dir)s for %(togl)s'%locals())
++        file = open( indexFile, 'w')
++        file.write("package ifneeded Togl 1.5 [list load [file join $dir Togl.so]]")
++        file.close()
++    outfiles.append(indexFile)
++ 
+ 
+     return outfiles
diff --git a/dev-python/pyopengl/pyopengl-2.0.0.44.ebuild b/dev-python/pyopengl/pyopengl-2.0.0.44.ebuild
index d00b3a4d26ae..54d278317ffc 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
 # 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.8 2005/01/28 23:56:16 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyopengl/pyopengl-2.0.0.44.ebuild,v 1.9 2005/01/31 23:50:46 fserb Exp $
 
 MY_P=${P/pyopengl/PyOpenGL}
 S=${WORKDIR}/${MY_P}
 
-inherit eutils distutils virtualx
+inherit eutils distutils
 
 DESCRIPTION="Python OpenGL bindings"
 HOMEPAGE="http://pyopengl.sourceforge.net/"
@@ -23,18 +23,27 @@ DEPEND="virtual/python
 
 src_unpack() {
 	unpack ${A}
-	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
+	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"
+	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}" 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 fd6617805edc..84bcf87d7a66 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.4 2005/01/28 23:56:16 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyopengl/pyopengl-2.0.1.09.ebuild,v 1.5 2005/01/31 23:50:46 fserb Exp $
 
 MY_P=${P/pyopengl/PyOpenGL}
 S=${WORKDIR}/${MY_P}
 
-inherit eutils distutils virtualx
+inherit eutils distutils
 
 DESCRIPTION="Python OpenGL bindings"
 HOMEPAGE="http://pyopengl.sourceforge.net/"
@@ -21,14 +21,29 @@ DEPEND="virtual/python
 	virtual/x11
 	virtual/opengl"
 
-src_compile() {
-	export maketype="python"
-	export python="virtualmake"
-	distutils_src_compile
-}
+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_install() {
-	export maketype="python"
-	export python="virtualmake"
-	distutils_src_install
 }