2.3.1

1 files changed, 10 insertions, 23 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 6a12ae747c2d..498ec74e3dae 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,45 +3,32 @@
 
 pkgname=pypy-pyparsing
 pkgname=('pypy-pyparsing' 'pypy3-pyparsing')
-pkgver=2.1.10
-pkgrel=4
+pkgver=2.3.1
+pkgrel=1
 pkgdesc='General parsing module for Python'
 arch=('any')
 url='http://pyparsing.wikispaces.com/'
 makedepends=('pypy-setuptools' 'pypy3-setuptools' 'subversion')
 license=('MIT')
-source=("svn://svn.code.sf.net/p/pyparsing/code/tags/pyparsing_$pkgver")
-sha256sums=('SKIP')
-
-prepare() {
-  cp -a pyparsing_$pkgver{,-py2}
-
-  # :/
-  sed -i '1i#coding=utf-8' pyparsing_$pkgver-py2/src/unitTests.py
-}
+source=("https://github.com/pyparsing/pyparsing/archive/pyparsing_$pkgver.tar.gz")
+sha512sums=('8c0e2c7a7dc7ec12f3e7c260bde25a33f325af89d9bc2329b7882ebd8a3f506fb06a36fdaba0fd8ed48040d5b7fc5288c41b01f2df84459a9980a035cb213dd0')
 
 build() {
-  cd "$srcdir"/pyparsing_$pkgver/src
-  pypy3 setup.py build
-
-  cd "$srcdir"/pyparsing_$pkgver-py2/src
+  cd pyparsing-pyparsing_$pkgver
   pypy setup.py build
+  pypy3 setup.py build
 }
 
 check() {
-  export LC_CTYPE=en_US.UTF-8
-
-  cd "$srcdir"/pyparsing_$pkgver/src
-  pypy3 unitTests.py
-
-  cd "$srcdir"/pyparsing_$pkgver-py2/src
+  cd pyparsing-pyparsing_$pkgver
   pypy unitTests.py
+  pypy3 unitTests.py
 }
 
 package_pypy3-pyparsing() {
   depends=('pypy3')
 
-  cd pyparsing_$pkgver/src
+  cd pyparsing-pyparsing_$pkgver
 
   pypy3 setup.py install --prefix=/opt/pypy3 --root="$pkgdir" --optimize=1
   install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
@@ -50,7 +37,7 @@ package_pypy3-pyparsing() {
 package_pypy-pyparsing() {
   depends=('pypy')
 
-  cd pyparsing_$pkgver-py2/src
+  cd pyparsing-pyparsing_$pkgver
 
   pypy setup.py install --prefix=/opt/pypy --root="$pkgdir" --optimize=1
   install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE