python/pypy: Updated for version 2.6.

Signed-off-by: Audrius Kažukauskas <audrius@neutrino.lt>

3 files changed, 23 insertions, 20 deletions

diff --git a/python/pypy/README b/python/pypy/README
index c59a22825660..d322d59058e5 100644
--- a/python/pypy/README
+++ b/python/pypy/README
@@ -3,4 +3,5 @@ has several advantages and distinctive features: speed (Just-in-Time
 compiler), lower memory usage for large programs, sandboxing and
 stackless mode.
 
-This is a repackaging of the binaries provided by upstream.
+This is a repackaging of the portable binaries from
+<https://github.com/squeaky-pl/portable-pypy>.
diff --git a/python/pypy/pypy.SlackBuild b/python/pypy/pypy.SlackBuild
index 0e88a2c11c00..d54430b2e2dd 100644
--- a/python/pypy/pypy.SlackBuild
+++ b/python/pypy/pypy.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for pypy
 
-# Copyright 2012 Audrius Kažukauskas <audrius@neutrino.lt>
+# Copyright 2012-2015 Audrius Kažukauskas <audrius@neutrino.lt>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,13 +23,13 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=pypy
-VERSION=${VERSION:-1.9}
+VERSION=${VERSION:-2.6}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i686 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -59,29 +59,31 @@ set -eu
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION-linux$LIBDIRSUFFIX.tar.bz2
-cd $PRGNAM-$VERSION
+rm -rf $PRGNAM-$VERSION-linux_$ARCH-portable
+tar xvf $CWD/$PRGNAM-$VERSION-linux_$ARCH-portable.tar.bz2
+cd $PRGNAM-$VERSION-linux_$ARCH-portable
 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 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/pypy-$VERSION
-cp -a \
-  bin/pypy include lib-python lib_pypy site-packages \
-  $PKG/usr/lib${LIBDIRSUFFIX}/pypy-$VERSION
+# Use os.path.realpath to resolve symlink in the path.
+sed -i 's/abspath/realpath/' bin/virtualenv-pypy
 
-# Create a symlink to pypy binary.
+mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/$PRGNAM-$VERSION
+cp -a * $PKG/usr/lib${LIBDIRSUFFIX}/$PRGNAM-$VERSION
+
+# Create symlinks to pypy executables.
 mkdir -p $PKG/usr/bin
 ( cd $PKG/usr/bin
-  ln -sf ../lib${LIBDIRSUFFIX}/pypy-$VERSION/pypy pypy
+  ln -sf ../lib${LIBDIRSUFFIX}/$PRGNAM-$VERSION/bin/pypy pypy
+  ln -sf ../lib${LIBDIRSUFFIX}/$PRGNAM-$VERSION/bin/virtualenv-pypy virtualenv-pypy
 )
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a LICENSE README $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a LICENSE README.rst $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/python/pypy/pypy.info b/python/pypy/pypy.info
index eb00f8676add..3e56bd62caaf 100644
--- a/python/pypy/pypy.info
+++ b/python/pypy/pypy.info
@@ -1,10 +1,10 @@
 PRGNAM="pypy"
-VERSION="1.9"
+VERSION="2.6"
 HOMEPAGE="http://pypy.org/"
-DOWNLOAD="https://bitbucket.org/pypy/pypy/downloads/pypy-1.9-linux.tar.bz2"
-MD5SUM="1a08c88642434fc2e0e4256d351f48db"
-DOWNLOAD_x86_64="https://bitbucket.org/pypy/pypy/downloads/pypy-1.9-linux64.tar.bz2"
-MD5SUM_x86_64="201d2cce2557e40c784473b471ee1b6b"
+DOWNLOAD="https://bitbucket.org/squeaky/portable-pypy/downloads/pypy-2.6-linux_i686-portable.tar.bz2"
+MD5SUM="f41f8dda1967853612d92002f539848a"
+DOWNLOAD_x86_64="https://bitbucket.org/squeaky/portable-pypy/downloads/pypy-2.6-linux_x86_64-portable.tar.bz2"
+MD5SUM_x86_64="900be4fb348cf2acb0da90ada46348f2"
 REQUIRES=""
 MAINTAINER="Audrius Kažukauskas"
 EMAIL="audrius@neutrino.lt"