libraries/CherryPy: Updated for version + new maintainer.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

2 files changed, 47 insertions, 13 deletions

diff --git a/libraries/CherryPy/CherryPy.SlackBuild b/libraries/CherryPy/CherryPy.SlackBuild
index ba6566de68..6f7a6c6cb0 100644
--- a/libraries/CherryPy/CherryPy.SlackBuild
+++ b/libraries/CherryPy/CherryPy.SlackBuild
@@ -1,15 +1,36 @@
 #!/bin/sh
+
 # Slackware build script for CherryPy
+
 # Written by Larry Hajali <larryhaja[at]gmail[dot]com>
+# Copyright 2016  Dimitris Zlatanidis  Orestiada, Greece
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=CherryPy
-VERSION=${VERSION:-3.6.0}
+VERSION=${VERSION:-7.1.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -20,6 +41,20 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
 set -e
 
 rm -rf $PKG
@@ -30,10 +65,10 @@ tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 python setup.py install --root=$PKG
 
@@ -41,8 +76,7 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a README.txt cherrypy/LICENSE.txt $PKG/usr/doc/$PRGNAM-$VERSION
-rm -f $PKG/usr/lib/python2.5/site-packages/cherrypy/LICENSE.txt
+cp -a PKG-INFO cherrypy/LICENSE.txt $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/libraries/CherryPy/CherryPy.info b/libraries/CherryPy/CherryPy.info
index 482bf301c7..99c3e8f06b 100644
--- a/libraries/CherryPy/CherryPy.info
+++ b/libraries/CherryPy/CherryPy.info
@@ -1,10 +1,10 @@
 PRGNAM="CherryPy"
-VERSION="3.6.0"
+VERSION="7.1.0"
 HOMEPAGE="http://www.cherrypy.org/"
-DOWNLOAD="https://pypi.python.org/packages/source/C/CherryPy/CherryPy-3.6.0.tar.gz"
-MD5SUM="9772dbee426d656f01a13881e2b139d8"
+DOWNLOAD="https://pypi.python.org/packages/ae/0a/1e47566e3e63142f1c676221f0e9ce41d4045773af98cb6b206b366702cc/CherryPy-7.1.0.tar.gz"
+MD5SUM="8eb14a07c1b5c242fe15ba932011847b"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Ben Mendis"
-EMAIL="ben.mendis@gmail.com"
+MAINTAINER="Dimitris Zlatanidis"
+EMAIL="d.zlatanidis@gmail.com"