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

[Sven-Hendrik Haase]

    Date: Tuesday, June 2, 2015 @ 20:01:11
  Author: svenstaro
Revision: 134615

upgpkg: pypy 2.6.0-1

upstream release 2.6.0

Modified:
  pypy/trunk/PKGBUILD

----------+
 PKGBUILD |   27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-06-02 18:01:10 UTC (rev 134614)
+++ PKGBUILD	2015-06-02 18:01:11 UTC (rev 134615)
@@ -3,7 +3,7 @@
 # Contributor: William Giokas <1007380 at gmail.com>
 
 pkgname=pypy
-pkgver=2.5.1
+pkgver=2.6.0
 pkgrel=1
 pkgdesc="A Python implementation written in Python, JIT enabled"
 url="http://pypy.org"
@@ -25,16 +25,19 @@
 
 package() {
   cd pypy
+  
+  python2 pypy/tool/release/package.py --archive-name pypy --targetdir .
+  mkdir unpacked
+  tar xf pypy.tar.bz2 -C unpacked
 
-  install -Dm755 pypy/goal/pypy-c "${pkgdir}"/opt/pypy/bin/pypy-c
-  install -Dm755 pypy/goal/libpypy-c.so "${pkgdir}"/usr/lib/libpypy-c.so
-  cp -r include lib_pypy site-packages "${pkgdir}"/opt/pypy/
+  cd unpacked
+  install -Dm755 pypy/bin/pypy "${pkgdir}"/opt/pypy/bin/pypy
+  install -Dm755 pypy/bin/libpypy-c.so "${pkgdir}"/usr/lib/libpypy-c.so
+  cp -r pypy/include pypy/lib_pypy pypy/lib-python pypy/site-packages "${pkgdir}"/opt/pypy/
+  cd ..
 
-  mkdir "${pkgdir}"/opt/pypy/lib-python/
-  cp -r lib-python/2.7 "${pkgdir}"/opt/pypy/lib-python/
-
   mkdir -p "${pkgdir}"/usr/bin
-  ln -s /opt/pypy/bin/pypy-c "${pkgdir}"/usr/bin/pypy
+  ln -s /opt/pypy/bin/pypy "${pkgdir}"/usr/bin/pypy
 
   install -Dm644 LICENSE "${pkgdir}"/opt/pypy/LICENSE
   install -Dm644 README.rst "${pkgdir}"/opt/pypy/README.rst
@@ -41,10 +44,10 @@
   install -Dm644 LICENSE "${pkgdir}"/usr/share/licenses/pypy/LICENSE
 
   # Compile binary modules
-  export LD_LIBRARY_PATH="${pkgdir}"/usr/lib:${LD_LIBRARY_PATH}
-  for module in _curses syslog gdbm sqlite3 _tkinter; do
-     "${pkgdir}"/opt/pypy/bin/pypy-c -c "import ${module}"
-  done
+  #export LD_LIBRARY_PATH="${pkgdir}"/usr/lib:${LD_LIBRARY_PATH}
+  #for module in _curses syslog gdbm sqlite3 _tkinter; do
+  #   "${pkgdir}"/opt/pypy/bin/pypy-c -c "import ${module}"
+  #done
 
   # Generate bytecode (they apparently haven't intended for this to happen yet)
   #"${pkgdir}"/opt/pypy/bin/pypy-c -m compileall "${pkgdir}"/opt/pypy