Version bump. Fix python dependency, bug 242688. Use use dependencies instead of built_with_use. Drop old.

Package-Manager: portage--svn/cvs/Linux 2.6.26-gentoo x86_64

5 files changed, 20 insertions, 138 deletions

diff --git a/dev-python/pyopengl/ChangeLog b/dev-python/pyopengl/ChangeLog
index d5aef79bed3e..deed4945dbe3 100644
--- a/dev-python/pyopengl/ChangeLog
+++ b/dev-python/pyopengl/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-python/pyopengl
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyopengl/ChangeLog,v 1.22 2008/06/29 10:34:02 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyopengl/ChangeLog,v 1.23 2008/10/25 15:27:29 hawking Exp $
+
+*pyopengl-3.0.0_beta6 (25 Oct 2008)
+
+  25 Oct 2008; Ali Polatel <hawking@gentoo.org> -pyopengl-2.0.1.09.ebuild,
+  -pyopengl-2.0.1.09-r1.ebuild, -pyopengl-3.0.0_beta1.ebuild,
+  +pyopengl-3.0.0_beta6.ebuild:
+  Version bump. Fix python dependency, bug 242688. Use use dependencies
+  instead of built_with_use. Drop old.
 
   29 Jun 2008; Torsten Veller <tove@gentoo.org> pyopengl-3.0.0_beta1.ebuild:
   Add missing die: || "..." -> || die "..."
diff --git a/dev-python/pyopengl/Manifest b/dev-python/pyopengl/Manifest
index e6b8958a8739..6fccefdbcc3f 100644
--- a/dev-python/pyopengl/Manifest
+++ b/dev-python/pyopengl/Manifest
@@ -5,18 +5,15 @@ AUX config.diff 1175 RMD160 a7b54dd87d9e41df5801a10d04f0986911031cd8 SHA1 8adc58
 AUX pyopengl-2.0.0.44-fix_togl.patch 946 RMD160 cac8c7857ac9410366a1041636c0f5a99e81585a SHA1 cbf170db3a5305e0dc5c4d1068f715f28d71f1ef SHA256 738a8aa349b9c1a97540e42bcc7c0a2b23c4ae1dcde29ae95ad869fc4496a582
 AUX pyopengl-2.0.1.09-malloc.patch 3396 RMD160 3d69e5d384b713a67eeb52db5d951ab108bf3eb4 SHA1 58b3d903c65d6a95c9ae4d1b926b58c9c7e7ce35 SHA256 860b8214d820205b60d56fab3672719126fe2283553e04adccf8d27cc1e69c28
 DIST PyOpenGL-2.0.0.44.tar.gz 1281640 RMD160 d777746ab9a8a562ed5400f9e8937d2852b85c4c SHA1 14bdf4f134c54fad245dae6647f9c6554c49c82a SHA256 73416cb38c81d68aa74d3417105f40f78c9a6074a5181aacdd04180a6f2adf29
-DIST PyOpenGL-2.0.1.09.tar.gz 2180479 RMD160 d5558ff9af52f2cdcc95c6897377d28a52120066 SHA1 3a70b1a298dd9e55cdfd511ef52a4566492de15d SHA256 143baf9f29303c0c0090c3ec3499b4d5c16531db1da5e7a33f590b104e2d4236
-DIST PyOpenGL-3.0.0b1.tar.gz 614923 RMD160 188e9f0c41ee07181de15055fea4b79f9e31d215 SHA1 f0a8734f770f090cd8e3b5bbe36719ff8f5e3ab9 SHA256 618076c043e64f3c0052a3debff026e4868eba1a197082379b0bfcb35a80cca0
+DIST PyOpenGL-3.0.0b6.tar.gz 573360 RMD160 5eacede1d144c9d937729df3981daf56501beb42 SHA1 d622df9be810f39cad96a4b72e3267b7e1b20d9b SHA256 ddfee8ce7832dcb45e95d2199a8379da1191bbb245a8b664ac44d4c0e329c0bc
 EBUILD pyopengl-2.0.0.44.ebuild 1506 RMD160 11328126446b491025237634b0a876eb794492a1 SHA1 0fa98c71bce4fea5b85c0ba179eb43528e0cd868 SHA256 740559c338ec244a56d3c9da7b16fb52129798d0548b7847bf4728f0ebb4e20d
-EBUILD pyopengl-2.0.1.09-r1.ebuild 1610 RMD160 7453f27baeb6ed43da60dcad4bb0f8ea4d9fa83c SHA1 fd7cf661520b0ae0d70a41c5265b2d6f4d367eda SHA256 f16ceb0c940f506082d26c4bd329253afa8c49177c4eedc308e7bbefacaebfbc
-EBUILD pyopengl-2.0.1.09.ebuild 1501 RMD160 72cc93309cba2561f99693013c86e92b1e39e820 SHA1 c62ce26c727327a5ceea56f4b68d563f111207e6 SHA256 4bcddda672b2c603d4e9d104fec62d8dc668e5db4c54a8986d4e0e3c0882de67
-EBUILD pyopengl-3.0.0_beta1.ebuild 1664 RMD160 a57f22a48f17556c35c4d7f7f4efb1d4af82f50f SHA1 81a8096192e3e11ce84c24ee9eed9162b64ba262 SHA256 ebc8ebc2e5d50f4793c4da12b482ea3165e45c92f136fe5522e6f9210cad3e34
-MISC ChangeLog 6438 RMD160 ffa5918e3cd81c96b60abf406ffa03e37f03c499 SHA1 57ad934933e9ae84162982d6cc842e9c653cffb7 SHA256 b2cabce174d07447f2472b48f44190399702da558a745d4fcc9e468fea2b91c5
+EBUILD pyopengl-3.0.0_beta6.ebuild 1189 RMD160 a5926cf76644cd5c17939e7187364f9dd7e395d9 SHA1 61a50d3a014074026450fe7ecf8e716656ca4080 SHA256 264102fcd35be0856d570fe8f04991ca2f8062210699adad3f5d8798b9c8e64b
+MISC ChangeLog 6759 RMD160 b17fe09610940b57ca5ddd3dcfb51e3cd2df0c80 SHA1 1667bd3d892e0bacf7caafb7d48c91688678d9e6 SHA256 64e78f02d11a46feb5c28ffda18a4245fcdeb6a3170d24a3e662f7735c27fd9e
 MISC metadata.xml 159 RMD160 900a8c55d7a7d2f6312594769aaf941bf9e99c7f SHA1 c8e604d56dae898258b5254d78cfeac0b981e288 SHA256 9f01104d3484792496faff4805eed0ecea2352a897151f3397d49a13800037b4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkhnZSEACgkQV3J2n04EauzqywCgl4Le6yuIqGNm4rdFtyfcLL3+
-vnsAoM9NErI2DkkDe5ivFS5ePm5cVZC0
-=j+lx
+iEYEARECAAYFAkkDOu4ACgkQQU4yORhF8iCh3ACfU+6S2EmMkkP3rHoIt/2PSr/j
+jH0AnR9zwHNKhE8Xro8xTgyYN7IncWGz
+=8lGZ
 -----END PGP SIGNATURE-----
diff --git a/dev-python/pyopengl/pyopengl-2.0.1.09-r1.ebuild b/dev-python/pyopengl/pyopengl-2.0.1.09-r1.ebuild
deleted file mode 100644
index 2b7bd8b433cc..000000000000
--- a/dev-python/pyopengl/pyopengl-2.0.1.09-r1.ebuild
+++ /dev/null
@@ -1,59 +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/pyopengl/pyopengl-2.0.1.09-r1.ebuild,v 1.2 2007/07/22 07:45:06 graaff Exp $
-
-MY_P=${P/pyopengl/PyOpenGL}
-S=${WORKDIR}/${MY_P}
-
-inherit eutils distutils
-
-DESCRIPTION="Python OpenGL bindings"
-HOMEPAGE="http://pyopengl.sourceforge.net/"
-SRC_URI="mirror://sourceforge/pyopengl/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="doc"
-
-DEPEND="virtual/python
-	virtual/glut
-	x11-libs/libXi
-	x11-libs/libXmu
-	virtual/opengl"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"/setup
-
-	if built_with_use dev-lang/python tk; 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
-
-	# replace malloc.h with stdlib.h for freebsd (#140940)
-	cd "${S}"
-	epatch ${FILESDIR}/${P}-malloc.patch
-}
-
-src_install() {
-	use doc && dohtml -r -A xml OpenGL/doc/*
-	rm -rf OpenGL/doc
-
-	distutils_src_install
-}
diff --git a/dev-python/pyopengl/pyopengl-2.0.1.09.ebuild b/dev-python/pyopengl/pyopengl-2.0.1.09.ebuild
deleted file mode 100644
index e1077baa3c81..000000000000
--- a/dev-python/pyopengl/pyopengl-2.0.1.09.ebuild
+++ /dev/null
@@ -1,52 +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/pyopengl/pyopengl-2.0.1.09.ebuild,v 1.13 2007/07/22 07:45:06 graaff Exp $
-
-MY_P=${P/pyopengl/PyOpenGL}
-S=${WORKDIR}/${MY_P}
-
-inherit eutils distutils
-
-DESCRIPTION="Python OpenGL bindings"
-HOMEPAGE="http://pyopengl.sourceforge.net/"
-SRC_URI="mirror://sourceforge/pyopengl/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND="virtual/python
-	virtual/glut
-	x11-libs/libXi
-	x11-libs/libXmu
-	virtual/opengl"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"/setup
-
-	if built_with_use dev-lang/python tk; 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
-
-	# replace malloc.h with stdlib.h for freebsd (#140940)
-	cd "${S}"
-	epatch ${FILESDIR}/${P}-malloc.patch
-}
diff --git a/dev-python/pyopengl/pyopengl-3.0.0_beta1.ebuild b/dev-python/pyopengl/pyopengl-3.0.0_beta6.ebuild
index cc9b3b8b9f0f..7f8a8f4a0de0 100644
--- a/dev-python/pyopengl/pyopengl-3.0.0_beta1.ebuild
+++ b/dev-python/pyopengl/pyopengl-3.0.0_beta6.ebuild
@@ -1,11 +1,10 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyopengl/pyopengl-3.0.0_beta1.ebuild,v 1.3 2008/06/29 10:34:02 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyopengl/pyopengl-3.0.0_beta6.ebuild,v 1.1 2008/10/25 15:27:29 hawking Exp $
 
-EAPI="1"
+EAPI="2"
 NEED_PYTHON="2.4"
-
-inherit eutils distutils
+inherit distutils
 
 MY_P=PyOpenGL-${PV/_beta/b}
 
@@ -21,8 +20,8 @@ RDEPEND="virtual/glut
 	x11-libs/libXi
 	x11-libs/libXmu
 	virtual/opengl
-	|| ( dev-lang/python:2.5
-		( dev-lang/python:2.4 dev-python/ctypes ) )"
+	|| ( >=dev-lang/python-2.5[tk?]
+		( dev-lang/python:2.4[tk?] dev-python/ctypes ) )"
 DEPEND="${RDEPEND}
 	dev-python/setuptools"
 
@@ -30,17 +29,6 @@ PYTHON_MODNAME="OpenGL"
 
 S="${WORKDIR}/${MY_P}"
 
-pkg_setup() {
-	if use tk && ! built_with_use dev-lang/python tk; then
-		# Note: This isn't really fatal since the files get installed anyway
-		#       The only thing where it matters is the generated API-documentation.
-		#       Mainly to avoid bugs from people who don't read warnings and then ask
-		#       where the ToGL API docs are.
-		eerror "dev-lang/python has to be built with tk support to get tk-support in PyOpenGL."
-		die "Missing tk USE-flag on dev-lang/python"
-	fi
-}
-
 src_compile() {
 	distutils_src_compile