Version 4.4

7 files changed, 81 insertions, 21 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 53f6d6eb1f19..b67df97e07cd 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,16 +1,17 @@
 pkgbase = pypy-zope-event
 	pkgdesc = Provides a simple event system
-	pkgver = 4.2.0
+	pkgver = 4.4
 	pkgrel = 1
 	url = https://github.com/zopefoundation/zope.event
 	arch = any
 	license = ZPL
 	makedepends = pypy-setuptools
 	makedepends = pypy3-setuptools
-	source = https://github.com/zopefoundation/zope.event/archive/4.2.0.tar.gz
-	sha256sums = 20b0a3abe0dadfac853f9922287e598cce8f73b9dcfd68c10aaf6f897d0dfd7f
+	source = https://github.com/zopefoundation/zope.event/archive/4.4.tar.gz
+	sha256sums = 64a7f9472f5a11b0239270ff40f6854083b3905238a415729067dcfa735856d5
 
 pkgname = pypy-zope-event
+	pkgdesc = Provides a simple event system for Pypy
 	depends = pypy
 
 pkgname = pypy3-zope-event
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..18a234f3d379
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,5 @@
+src
+pkg
+*.gz
+*.xz
+*.bak
diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 000000000000..32aba7d0d399
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,11 @@
+sudo: required
+language: none
+services:
+  - docker
+before_install:
+  - docker pull nandub/arch-pkgbuild
+script:
+  - docker run --rm -it -v$(pwd):/build nandub/arch-pkgbuild
+branches:
+  only:
+    - master
diff --git a/PKGBUILD b/PKGBUILD
index 42b60b072f81..fa6b9c077388 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,10 +1,11 @@
-# Maintainer: Markus Kitsinger (SwooshyCueb) <root@swooshalicio.us>
+# Maintainer: Fernando Ortiz <nandub+arch@nandub.info>
+# Contributor: Markus Kitsinger (SwooshyCueb) <root@swooshalicio.us>
 # Contributor: Felix Yan <felixonmars@archlinux.org>
 # Contributor: Simon Hanna <simon dot hanna AT serve-me DOT info>
 
 pkgbase=pypy-zope-event
 pkgname=('pypy-zope-event' 'pypy3-zope-event')
-pkgver=4.2.0
+pkgver=4.4
 pkgrel=1
 pkgdesc="Provides a simple event system"
 arch=(any)
@@ -12,38 +13,43 @@ license=('ZPL')
 url="https://github.com/zopefoundation/zope.event"
 makedepends=('pypy-setuptools' 'pypy3-setuptools')
 source=("https://github.com/zopefoundation/zope.event/archive/${pkgver}.tar.gz")
-sha256sums=('20b0a3abe0dadfac853f9922287e598cce8f73b9dcfd68c10aaf6f897d0dfd7f')
+sha256sums=('64a7f9472f5a11b0239270ff40f6854083b3905238a415729067dcfa735856d5')
 
 prepare() {
-  cp -a zope.event-${pkgver}{,-py2}
+  # copy folder, so we can cleanly build for both python versions
+  cp -rup zope.event-$pkgver pypy3zope.event-$pkgver
 }
 
 build() {
-  cd "${srcdir}/zope.event-${pkgver}"
-  pypy3 setup.py build
-
-  cd "${srcdir}/zope.event-${pkgver}-py2"
+  cd zope.event-${pkgver}
   pypy setup.py build
+
+  cd ../pypy3zope.event-${pkgver}
+  pypy3 setup.py build
 }
 
 check() {
-  cd "${srcdir}/zope.event-${pkgver}"
+  cd zope.event-${pkgver}
+  pypy setup.py test
+
+  cd ../pypy3zope.event-${pkgver}
   pypy3 setup.py test
+}
 
-  cd "${srcdir}/zope.event-${pkgver}-py2"
-  pypy setup.py test
+package_pypy-zope-event() {
+  depends=('pypy')
+  pkgdesc+=" for Pypy"
+
+  cd zope.event-$pkgver
+  pypy setup.py install --prefix=/opt/pypy --root="$pkgdir/" --optimize=1
 }
 
 package_pypy3-zope-event() {
   depends=('pypy3')
-  cd "$srcdir/zope.event-$pkgver"
-  pypy3 setup.py install --root="$pkgdir/" --optimize=1 --prefix=/opt/pypy3
-}
+  pkg_desc+=" for Pypy 3"
 
-package_pypy-zope-event() {
-  depends=('pypy')
-  cd "$srcdir/zope.event-$pkgver"
-  pypy setup.py install --root="$pkgdir/" --optimize=1 --prefix=/opt/pypy
+  cd pypy3zope.event-$pkgver
+  pypy3 setup.py install --prefix=/opt/pypy3 --root="$pkgdir/" --optimize=1
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/aur.deps b/aur.deps
new file mode 100644
index 000000000000..ead2bda805dd
--- /dev/null
+++ b/aur.deps
@@ -0,0 +1 @@
+pypy-setuptools pypy3-setuptools
diff --git a/pkgsum.sh b/pkgsum.sh
new file mode 100755
index 000000000000..e908ad353016
--- /dev/null
+++ b/pkgsum.sh
@@ -0,0 +1,15 @@
+#!/usr/bin/env bash
+
+#taken from https://bbs.archlinux.org/viewtopic.php?id=131666 by falconindy
+awk -v newsums="$(makepkg -g)" '
+BEGIN {
+  if (!newsums) exit 1
+}
+
+/^[[:blank:]]*(md|sha)[[:digit:]]+sums=/,/\)[[:blank:]]*$/ {
+  if (!i) print newsums; i++
+  next
+}
+
+1
+' PKGBUILD > PKGBUILD.new && mv PKGBUILD{.new,}
\ No newline at end of file
diff --git a/update.sh b/update.sh
new file mode 100755
index 000000000000..ff5d2422df42
--- /dev/null
+++ b/update.sh
@@ -0,0 +1,21 @@
+#!/usr/bin/env bash
+
+latest_version=$1
+current_version=$(cat PKGBUILD | grep pkgver= | awk -F'=' '{print $2}')
+
+if ! [ "$latest_version" = "$current_version" ]; then
+  echo Updating the package with the latest version
+  echo latest: $latest_version
+  echo current: $current_version
+  sed -i.bak "s/$current_version/$latest_version/g" PKGBUILD
+  sed -i.bak "s/pkgrel=[^d.]/pkgrel=1/g" PKGBUILD
+  ./pkgsum.sh
+  if which makepkg &> /dev/null; then
+    makepkg --printsrcinfo > .SRCINFO
+  else
+    mksrcinfo
+  fi
+  rm -f *.bak
+else
+  echo Nothing to update.
+fi