python-regex: update to 2018.02.21

2 files changed, 32 insertions, 11 deletions

diff --git a/abs/core/python_modules/python-regex/PKGBUILD b/abs/core/python_modules/python-regex/PKGBUILD
index 13c1ca0..e07a3c2 100644
--- a/abs/core/python_modules/python-regex/PKGBUILD
+++ b/abs/core/python_modules/python-regex/PKGBUILD
@@ -1,46 +1,68 @@
 # Maintainer: Jelle van der Waa <jelle@archlinux.org>
+# Maintainer: Eli Schwartz <eschwartz@archlinux.org>
 # Contributor: Nikola Milinković <nikmil@gmail.com>
 # Submitter: Xiao-Long Chen <chenxiaolong@cxl.epac.to>
 
 _pkgbase=regex
 pkgbase=python-regex
-pkgname=('python2-regex')
-#pkgname=python-regex
-pkgver=2017.07.11
+pkgname=('python-regex' 'python2-regex')
+pkgname=python-regex
+pkgver=2018.02.21
 pkgrel=1
 pkgdesc="Alternative python regular expression module."
-arch=('x86_64' 'i686')
+arch=('x86_64')
 url="https://bitbucket.org/mrabarnett/mrab-regex"
 license=('Python')
-makedepends=('python2-setuptools')
+makedepends=('python-setuptools' 'python2-setuptools')
 options=(!emptydirs)
 source=(https://pypi.io/packages/source/r/${_pkgbase}/${_pkgbase}-${pkgver}.tar.gz)
-sha256sums=('dbda8bdc31a1c85445f1a1b29d04abda46e5c690f8f933a9cc3a85a358969616')
+sha256sums=('b44624a38d07d3c954c84ad302c29f7930f4bf01443beef5589e9157b14e2a29')
+
+build() {
+  cd "regex-${pkgver}"
+
+  python setup.py build
+  python2 setup.py build
+}
+
+check() {
+  cd "regex-${pkgver}"
+
+  pushd build/lib.linux-${CARCH}-3*/
+  python test_regex.py
+  popd
+
+  pushd build/lib.linux-${CARCH}-2*/
+  python2 test_regex.py
+  popd
+}
 
 package_python2-regex() {
   depends=('python2')
-  conflicts=('python2-regex-hg')
   pkgdesc="Alternative python regular expression module. (python2 version)"
 
   cd "regex-${pkgver}"
-  python2 setup.py install --root="${pkgdir}/" --optimize=1
+  python2 setup.py install --root="${pkgdir}/" --optimize=1 --skip-build
 
   install -v -m755 -d "${pkgdir}/usr/share/doc/python2-regex"
   install -v -m644 ./docs/Features.html "${pkgdir}/usr/share/doc/python2-regex/"
   install -v -m644 ./docs/Features.rst "${pkgdir}/usr/share/doc/python2-regex/"
   install -v -m644 ./docs/UnicodeProperties.txt "${pkgdir}/usr/share/doc/python2-regex/"
+
+  sed -n '1,/^$/p' regex_2/regex.py | install -Dm644 /dev/stdin "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
 }
 
 package_python-regex() {
   depends=('python')
-  conflicts=('python-regex-hg')
   pkgdesc="Alternative python regular expression module. (python3 version)"
 
   cd "regex-${pkgver}"
-  python setup.py install --root="${pkgdir}/" --optimize=1
+  python setup.py install --root="${pkgdir}/" --optimize=1 --skip-build
 
   install -v -m755 -d "${pkgdir}/usr/share/doc/python-regex"
   install -v -m644 ./docs/Features.html "${pkgdir}/usr/share/doc/python-regex/"
   install -v -m644 ./docs/Features.rst "${pkgdir}/usr/share/doc/python-regex/"
   install -v -m644 ./docs/UnicodeProperties.txt "${pkgdir}/usr/share/doc/python-regex/"
+
+  sed -n '1,/^$/p' regex_3/regex.py | install -Dm644 /dev/stdin "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
 }
diff --git a/abs/core/python_modules/python-regex/__changelog b/abs/core/python_modules/python-regex/__changelog
deleted file mode 100644
index c6e1e55..0000000
--- a/abs/core/python_modules/python-regex/__changelog
+++ /dev/null
@@ -1 +0,0 @@
-PKGBUILD: don't build py 3 stuff