python/python-simpy: Updated for version 3.0.10.

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

3 files changed, 16 insertions, 18 deletions

diff --git a/python/python-simpy/python-simpy.SlackBuild b/python/python-simpy/python-simpy.SlackBuild
index 3fcea3bccc..f7ce00312d 100644
--- a/python/python-simpy/python-simpy.SlackBuild
+++ b/python/python-simpy/python-simpy.SlackBuild
@@ -5,15 +5,15 @@
 # Written by John Tyree <johntyree+sbo@gmail.com>
 
 PRGNAM=python-simpy
-VERSION=${VERSION:-2.2}
+VERSION=${VERSION:-3.0.10}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
-SRCNAM=SimPy
+SRCNAM=simpy
 DOCS=${DOCS:-"no"}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -24,8 +24,8 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -44,18 +44,17 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $SRCNAM-$VERSION
-tar xvf $CWD/$SRCNAM-$VERSION.tar.bz2
+tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
 cd $SRCNAM-$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
 
-# Strip binaries and libraries.
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
@@ -63,8 +62,7 @@ mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 if [[ $DOCS == "yes" ]]; then
     (cd ./docs; make html; cp -a html $PKG/usr/doc/$PRGNAM-$VERSION)
 fi
-cp -a \
-  AUTHORS.txt CHANGES.txt LICENSE.txt README.txt docs/examples \
+cp -a AUTHORS.txt CHANGES.txt LICENSE.txt README.txt docs/examples \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/python/python-simpy/python-simpy.info b/python/python-simpy/python-simpy.info
index 2fbe1218a1..2ddca2801b 100644
--- a/python/python-simpy/python-simpy.info
+++ b/python/python-simpy/python-simpy.info
@@ -1,8 +1,8 @@
 PRGNAM="python-simpy"
-VERSION="2.2"
-HOMEPAGE="http://simpy.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/project/simpy/simpy/SimPy-2.2/SimPy-2.2.tar.bz2"
-MD5SUM="62f973cc3160d7b5865ab6537add1cd2"
+VERSION="3.0.10"
+HOMEPAGE="https://pypi.python.org/pypi/simpy"
+DOWNLOAD="https://pypi.python.org/packages/81/87/074e97b833d35e2979e6a67fe2fdc26c0178bf1ce5a3a6ea999e771688dd/simpy-3.0.10.tar.gz"
+MD5SUM="a968f5562d6f2292a139f8a445e2f7d5"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/python/python-simpy/slack-desc b/python/python-simpy/slack-desc
index 68744e61b8..d8a22c687b 100644
--- a/python/python-simpy/slack-desc
+++ b/python/python-simpy/slack-desc
@@ -16,4 +16,4 @@ python-simpy: vehicles, and resources, for passive components that form limited
 python-simpy: capacity congestion points like servers, checkout counters, and
 python-simpy: tunnels.
 python-simpy:
-python-simpy: http://simpy.sourceforge.net
+python-simpy: https://pypi.python.org/pypi/simpy