[arch-commits] Commit in python-cherrypy/trunk (PKGBUILD)

[Jelle van der Waa]

    Date: Friday, June 24, 2016 @ 20:45:47
  Author: jelle
Revision: 181038

upgpkg: python-cherrypy 6.0.2-1

Modified:
  python-cherrypy/trunk/PKGBUILD

----------+
 PKGBUILD |   33 +++++++++++++--------------------
 1 file changed, 13 insertions(+), 20 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-06-24 19:49:27 UTC (rev 181037)
+++ PKGBUILD	2016-06-24 20:45:47 UTC (rev 181038)
@@ -5,37 +5,30 @@
 # Contributor: Armando M. Baratti <amblistas at ajato.com.br>
 # Contributor: Florian Richter <Florian_Richter at gmx.de>
 pkgname=('python-cherrypy' 'python2-cherrypy')
-pkgver=5.4.0
+pkgver=6.0.2
 pkgrel=1
 pkgdesc="A pythonic, object-oriented web development framework"
 arch=('any')
 url="http://www.cherrypy.org"
 license=('BSD')
-makedepends=('python' 'python2')
-source=("https://pypi.python.org/packages/a3/b8/b010a1803d4239caf320c364ba3d4e3bb64f7cf1cc350182f64048dfde69/CherryPy-5.4.0.tar.gz")
-md5sums=('7801c069cf4affdd4ff43faa1a63b481')
+makedepends=('python' 'python2' 'python-setuptools' 'python2-setuptools')
+source=(https://github.com/cherrypy/cherrypy/archive/v$pkgver.tar.gz)
+md5sums=('0d3ed6a4dc7385b6621267f07534b57c')
 
 build() {
-  cp -r CherryPy-${pkgver} CherryPy2-${pkgver}
+  cp -r cherrypy-${pkgver} cherrypy-${pkgver}-py2
 
-  cd CherryPy-${pkgver}
+  cd cherrypy-${pkgver}
   python ./setup.py build
 
-  cd "${srcdir}/CherryPy2-${pkgver}"
-  sed \
-    -e 's_#! /usr/bin/env python_&2_' \
-    -i cherrypy/cherryd
-  sed \
-    -e 's_#!/usr/bin/python_&2_' \
-    -i cherrypy/test/sessiondemo.py
+  cd "${srcdir}/cherrypy-${pkgver}-py2"
   python2 ./setup.py build
-
 }
 
 package_python-cherrypy() {
   depends=('python')
 
-  cd CherryPy-${pkgver}
+  cd cherrypy-${pkgver}
 
   python ./setup.py install --root="${pkgdir}" --optimize=1
 
@@ -46,7 +39,7 @@
 package_python2-cherrypy() {
   depends=('python2')
 
-  cd CherryPy2-${pkgver}
+  cd cherrypy-${pkgver}-py2
 
   python2 ./setup.py install --root="${pkgdir}" --optimize=1
   mv "${pkgdir}/usr/bin/cherryd" "${pkgdir}/usr/bin/cherryd2"
@@ -56,9 +49,9 @@
 }
 
 check() {
-  cd CherryPy2-${pkgver}
-#  python2 ./setup.py test
+  cd cherrypy-${pkgver}
+  python2 ./setup.py test
 
-  cd ../CherryPy-${pkgver}
-#  python3 ./setup.py check
+  cd ../cherrypy-${pkgver}
+  python3 ./setup.py check
 }