From caf75d80de9d836b8eebed75e130ea7d3558593d Mon Sep 17 00:00:00 2001 From: Arfrever Frehtes Taifersar Arahesis Date: Sat, 21 Nov 2009 03:27:38 +0000 Subject: Version bump. (Portage version: 14859-svn/cvs/Linux x86_64) --- dev-python/pyopengl/ChangeLog | 10 +++- dev-python/pyopengl/files/config.diff | 26 ---------- .../files/pyopengl-2.0.0.44-fix_togl.patch | 24 --------- dev-python/pyopengl/pyopengl-2.0.0.44.ebuild | 53 -------------------- dev-python/pyopengl/pyopengl-3.0.1_alpha3.ebuild | 58 ---------------------- dev-python/pyopengl/pyopengl-3.0.1_beta1.ebuild | 57 +++++++++++++++++++++ 6 files changed, 66 insertions(+), 162 deletions(-) delete mode 100644 dev-python/pyopengl/files/config.diff delete mode 100644 dev-python/pyopengl/files/pyopengl-2.0.0.44-fix_togl.patch delete mode 100644 dev-python/pyopengl/pyopengl-2.0.0.44.ebuild delete mode 100644 dev-python/pyopengl/pyopengl-3.0.1_alpha3.ebuild create mode 100644 dev-python/pyopengl/pyopengl-3.0.1_beta1.ebuild (limited to 'dev-python') diff --git a/dev-python/pyopengl/ChangeLog b/dev-python/pyopengl/ChangeLog index 5a2ee9235594..a47b19d30b1d 100644 --- a/dev-python/pyopengl/ChangeLog +++ b/dev-python/pyopengl/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for dev-python/pyopengl # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/pyopengl/ChangeLog,v 1.38 2009/10/08 17:54:19 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/pyopengl/ChangeLog,v 1.39 2009/11/21 03:27:38 arfrever Exp $ + +*pyopengl-3.0.1_beta1 (21 Nov 2009) + + 21 Nov 2009; Arfrever Frehtes Taifersar Arahesis + -pyopengl-2.0.0.44.ebuild, -files/pyopengl-2.0.0.44-fix_togl.patch, + -pyopengl-3.0.1_alpha3.ebuild, +pyopengl-3.0.1_beta1.ebuild, + -files/config.diff: + Version bump. 08 Oct 2009; Raúl Porcel pyopengl-3.0.0.ebuild: ia64/sh/sparc stable wrt #271976 diff --git a/dev-python/pyopengl/files/config.diff b/dev-python/pyopengl/files/config.diff deleted file mode 100644 index 465e7c892df1..000000000000 --- a/dev-python/pyopengl/files/config.diff +++ /dev/null @@ -1,26 +0,0 @@ -diff -ru PyOpenGL-2.0.0.44.orig/config/linux.cfg PyOpenGL-2.0.0.44/config/linux.cfg ---- PyOpenGL-2.0.0.44.orig/config/linux.cfg 2001-08-22 14:05:44.000000000 -0700 -+++ PyOpenGL-2.0.0.44/config/linux.cfg 2003-04-30 15:26:32.000000000 -0700 -@@ -11,8 +11,8 @@ - [General] - build_togl=1 - gl_platform=GLX --include_dirs=/usr/include:/usr/local/include:/usr/X11/include --library_dirs=/usr/lib:/usr/local/lib:/usr/X11/lib -+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 - - ; a sys.pathsep separated list of the libs needed when linking GL - [GL] -diff -ru PyOpenGL-2.0.0.44.orig/src/Togl-1.5/togl.c PyOpenGL-2.0.0.44/src/Togl-1.5/togl.c ---- PyOpenGL-2.0.0.44.orig/src/Togl-1.5/togl.c 2001-05-14 15:55:19.000000000 -0700 -+++ PyOpenGL-2.0.0.44/src/Togl-1.5/togl.c 2003-04-30 15:23:14.000000000 -0700 -@@ -137,6 +137,8 @@ - # include "tkInt8.0p2.h" - #elif TK_MAJOR_VERSION==8 && TK_MINOR_VERSION==3 - # include "tkInt8.3.h" -+#elif TK_MAJOR_VERSION==8 && TK_MINOR_VERSION==4 -+# include - #else - #error Sorry, you will have to edit togl.c to include the right tkInt.h file - #endif 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 deleted file mode 100644 index c456e55b6e23..000000000000 --- a/dev-python/pyopengl/files/pyopengl-2.0.0.44-fix_togl.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- 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 deleted file mode 100644 index 17e6b298369a..000000000000 --- a/dev-python/pyopengl/pyopengl-2.0.0.44.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2009 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.17 2009/09/06 21:32:04 idl0r 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" -IUSE="" - -DEPEND="virtual/python - virtual/glut - x11-libs/libXi - x11-libs/libXmu - virtual/opengl" -RDEPEND="${DEPEND}" - -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}"/config.diff - epatch "${FILESDIR}"/${P}-fix_togl.patch - - sed -e 's/self\.NUMERIC/self.HAS_NUMERIC/' -i setup/dist.py - - 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}" setup/togl_setup.py -} diff --git a/dev-python/pyopengl/pyopengl-3.0.1_alpha3.ebuild b/dev-python/pyopengl/pyopengl-3.0.1_alpha3.ebuild deleted file mode 100644 index cf74214c5b47..000000000000 --- a/dev-python/pyopengl/pyopengl-3.0.1_alpha3.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/pyopengl/pyopengl-3.0.1_alpha3.ebuild,v 1.1 2009/08/29 00:16:17 arfrever Exp $ - -EAPI="2" - -NEED_PYTHON="2.4" -SUPPORT_PYTHON_ABIS="1" - -inherit distutils - -MY_P="PyOpenGL-${PV/_alpha/a}" - -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="tk" -# disabled doc useflag - -RDEPEND="virtual/glut - x11-libs/libXi - x11-libs/libXmu - virtual/opengl - || ( >=dev-lang/python-2.5[tk?] - ( dev-lang/python:2.4[tk?] dev-python/ctypes ) )" -DEPEND="${RDEPEND} - dev-python/setuptools" - -RESTRICT_PYTHON_ABIS="3*" - -PYTHON_MODNAME="OpenGL" - -S="${WORKDIR}/${MY_P}" - -src_compile() { - distutils_src_compile - - # upstream does not include docs in the tarball. - #if use doc ; then - # einfo "Generating API docs as requested..." - # mkdir "${S}/api" - # cd "${S}/api" - # PYTHONPATH="${S}" "${python}" "${S}/documentation/pydoc/builddocs.py" || die "generating docs failed" - #fi -} - -src_install() { - distutils_src_install - - # no docs to install - #dohtml -r documentation/{images,style,*.html} - - #use doc && dohtml -r "${S}/api" -} diff --git a/dev-python/pyopengl/pyopengl-3.0.1_beta1.ebuild b/dev-python/pyopengl/pyopengl-3.0.1_beta1.ebuild new file mode 100644 index 000000000000..0f91db33e5df --- /dev/null +++ b/dev-python/pyopengl/pyopengl-3.0.1_beta1.ebuild @@ -0,0 +1,57 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-python/pyopengl/pyopengl-3.0.1_beta1.ebuild,v 1.1 2009/11/21 03:27:38 arfrever Exp $ + +EAPI="2" +SUPPORT_PYTHON_ABIS="1" + +inherit distutils + +MY_PN="PyOpenGL" +MY_P="${MY_PN}-${PV/_beta/b}" + +DESCRIPTION="Python OpenGL bindings" +HOMEPAGE="http://pyopengl.sourceforge.net/ http://pypi.python.org/pypi/PyOpenGL" +SRC_URI="http://pypi.python.org/packages/source/P/PyOpenGL/${MY_P}.tar.gz + 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="tk" +# Disabled doc useflag + +RDEPEND="virtual/glut + x11-libs/libXi + x11-libs/libXmu + virtual/opengl + || ( >=dev-lang/python-2.5[tk?] + ( dev-lang/python:2.4[tk?] dev-python/ctypes ) )" +DEPEND="${RDEPEND} + dev-python/setuptools" +RESTRICT_PYTHON_ABIS="3.*" + +S="${WORKDIR}/${MY_P}" + +PYTHON_MODNAME="OpenGL" + +src_compile() { + distutils_src_compile + + # upstream does not include docs in the tarball. + #if use doc ; then + # einfo "Generating API docs as requested..." + # mkdir "${S}/api" + # cd "${S}/api" + # PYTHONPATH="${S}" "${python}" "${S}/documentation/pydoc/builddocs.py" || die "generating docs failed" + #fi +} + +src_install() { + distutils_src_install + + # no docs to install + #dohtml -r documentation/{images,style,*.html} + + #use doc && dohtml -r "${S}/api" +} -- cgit v1.2.3-65-gdbad