diff options
| -rw-r--r-- | dev-python/pyopengl/ChangeLog | 10 | ||||
| -rw-r--r-- | dev-python/pyopengl/pyopengl-2.0.1.09-r1.ebuild | 59 | ||||
| -rw-r--r-- | dev-python/pyopengl/pyopengl-2.0.1.09.ebuild | 52 | ||||
| -rw-r--r-- | dev-python/pyopengl/pyopengl-3.0.0_beta6.ebuild (renamed from dev-python/pyopengl/pyopengl-3.0.0_beta1.ebuild) | 22 |
4 files changed, 14 insertions, 129 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/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 |