2 files changed, 42 insertions, 36 deletions
diff --git a/pcr/apenwarr-redo/PKGBUILD b/pcr/apenwarr-redo/PKGBUILD
new file mode 100644
index 000000000..4dcc648a3
--- /dev/null
+++ b/pcr/apenwarr-redo/PKGBUILD
@@ -0,0 +1,42 @@
+# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
+# Maintainer (AUR:redo-git): Tim Diels <timdiels.m@gmail.com>
+
+pkgname='apenwarr-redo'
+pkgdesc="Avery Pennarun's implmentation of the redo build system"
+url="https://github.com/apenwarr/redo"
+pkgver=0.11
+license=(LGPL2 custom:BSD2) # no, not 2.1, and not 'or any later version'
+source=(redo-redo-$pkgver.tar.gz::https://github.com/apenwarr/redo/archive/redo-$pkgver.tar.gz)
+md5sums=('1b6a07bdb00a74b2d166845f9520b67a')
+
+pkgrel=1
+arch=(any)
+depends=(python2 sh)
+makedepends=(python2-markdown python2-beautifulsoup3)
+provides=('redo')
+conflicts=('redo')
+
+prepare() {
+  cd "$srcdir/redo-redo-$pkgver"
+  # Make everything use python2
+  grep -rxFl '#!/usr/bin/env python' | xargs -d $'\n' sed -i 's@^#!/usr/bin/env python$@&2@'
+  sed -i 's@python\b@python2@' install.do
+  sed -rn 's|^# ?||p' < options.py > options.py.LICENSE.txt
+}
+
+build() {
+  cd "$srcdir/redo-redo-$pkgver"
+  make
+}
+
+check() {
+  cd "$srcdir/redo-redo-$pkgver"
+  make test
+}
+
+package() {
+  cd "$srcdir/redo-redo-$pkgver"
+  make DESTDIR="$pkgdir" install
+  install -Dm644 LICENSE                "$pkgdir/usr/share/licenses/$pkgname/LGPL2.txt"
+  install -Dm644 options.py.LICENSE.txt "$pkgdir/usr/share/licenses/$pkgname/options.py.LICENSE.txt"  
+}
diff --git a/~lukeshu/redo/PKGBUILD b/~lukeshu/redo/PKGBUILD
deleted file mode 100644
index fa9bdefc2..000000000
--- a/~lukeshu/redo/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
-
-pkgname=redo
-pkgver=0.06
-pkgrel=1
-pkgdesc="A competitor to make based on essays by DJB."
-arch=('any')
-url="https://github.com/apenwarr/$pkgname"
-license=('GPL2')
-depends=('python2')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/apenwarr/$pkgname/tarball/$pkgname-$pkgver")
-
-build() {
-  cd "$srcdir/apenwarr-$pkgname-"*
-
-  # Make everything use python2
-  sed -i 's@^#!/usr/bin/python$@#!/usr/bin/python2@' *.py
-  sed -i 's@/usr/bin/env python@/usr/bin/env python2@' Documentation/md2man.py
-  sed -i -e 's@^python @python2 @' \
-         -e 's@/usr/bin/python$@/usr/bin/python2@' \
-         install.do
-
-  make
-}
-
-check() {
-  cd "$srcdir/apenwarr-$pkgname-"*
-  make test
-}
-
-package() {
-  cd "$srcdir/apenwarr-$pkgname-"*
-  make install DESTDIR="$pkgdir"
-}
-
-md5sums=('0faa0e98f3d60fdcdea826dad59923c8')