pyopengl: update to 3.1.0

3 files changed, 51 insertions, 27 deletions

diff --git a/abs/core/python_modules/python-opengl/LICENSE b/abs/core/python_modules/pyopengl/LICENSE
index 11d88fb..11d88fb 100644
--- a/abs/core/python_modules/python-opengl/LICENSE
+++ b/abs/core/python_modules/pyopengl/LICENSE
diff --git a/abs/core/python_modules/pyopengl/PKGBUILD b/abs/core/python_modules/pyopengl/PKGBUILD
new file mode 100644
index 0000000..dbb05c9
--- /dev/null
+++ b/abs/core/python_modules/pyopengl/PKGBUILD
@@ -0,0 +1,51 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars@archlinux.org>
+# Contributor: Josh Taylor <joshtaylor.mail@gmail.com>
+# Contributor: simo <simo@archlinux.org>
+# Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
+# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
+
+pkgbase=pyopengl
+pkgname=('python2-opengl' 'python-opengl')
+pkgver=3.1.0
+pkgrel=3
+pkgdesc="The cross platform Python binding to OpenGL and related APIs"
+url="http://pyopengl.sourceforge.net/"
+license=('BSD')
+arch=('any')
+makedepends=('freeglut' 'python2-setuptools' 'python-setuptools')
+source=("https://pypi.python.org/packages/source/P/PyOpenGL/PyOpenGL-${pkgver}.tar.gz"
+        'LICENSE')
+md5sums=('0de021941018d46d91e5a8c11c071693'
+         '0b53c508a63e5dbaf44cdfb0fa103b3a')\
+
+prepare() {
+    cp -a PyOpenGL-${pkgver} python-PyOpenGL-${pkgver}
+
+    # Fix the shebang
+    sed -i 's|#!/usr/bin/env python|#!/usr/bin/python2|' \
+        PyOpenGL-${pkgver}/OpenGL/Tk/__init__.py
+    sed -i 's|#! /usr/bin/env python|#!/usr/bin/python2|' \
+        PyOpenGL-${pkgver}/OpenGL/arrays/{_,}buffers.py
+}
+
+package_python2-opengl() {
+    depends=('python2' 'freeglut')
+	conflicts=('python-pyopengl' 'python-opengl<=3.0.1-4')
+	replaces=('python-pyopengl' 'python-opengl<=3.0.1-4')
+
+    cd PyOpenGL-${pkgver}
+	python2 setup.py install --root="${pkgdir}" --optimize=1
+	install -Dm644 "${srcdir}/LICENSE" \
+		"${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}
+
+package_python-opengl() {
+    depends=('python' 'freeglut')
+ 
+    cd python-PyOpenGL-${pkgver}
+ 	python setup.py install --root="${pkgdir}" --optimize=1
+	install -Dm644 "${srcdir}/LICENSE" \
+		"${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}
+
diff --git a/abs/core/python_modules/python-opengl/PKGBUILD b/abs/core/python_modules/python-opengl/PKGBUILD
deleted file mode 100644
index 57f77fd..0000000
--- a/abs/core/python_modules/python-opengl/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id: PKGBUILD 150966 2012-02-24 10:19:17Z pierre $
-# Contributor: Josh Taylor <joshtaylor.mail@gmail.com>
-# Contributor: simo <simo@archlinux.org>
-# Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
-# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
-
-pkgname=python-opengl
-pkgver=3.0.1
-pkgrel=3
-pkgdesc="The cross platform Python binding to OpenGL and related APIs"
-url="http://pyopengl.sourceforge.net"
-license=('BSD')
-arch=('any')
-depends=('python2' 'tk' 'freeglut' 'setuptools')
-provides=('pyopengl' 'python-pyopengl')
-conflicts=('pyopengl' 'python-pyopengl')
-source=("http://downloads.sourceforge.net/pyopengl/PyOpenGL-${pkgver}.tar.gz"
-        'LICENSE')
-md5sums=('221d4a6a0928fcfeef26751370ec5f52'
-         '0b53c508a63e5dbaf44cdfb0fa103b3a')
-
-package() {
-	cd ${srcdir}/PyOpenGL-${pkgver}
-	python2 setup.py install --root=${pkgdir}
-	install -Dm644 ${srcdir}/LICENSE \
-		${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-}