pcr/rush: updated to 1.8

1 files changed, 54 insertions, 25 deletions

diff --git a/pcr/rush/PKGBUILD b/pcr/rush/PKGBUILD
index 3fde49dd8..d35292d36 100644
--- a/pcr/rush/PKGBUILD
+++ b/pcr/rush/PKGBUILD
@@ -1,39 +1,68 @@
-# Maintainer (Arch): Brandon Invergo <brandon@invergo.net>
-# Contributor (Arch): B3nny <benny@b3nny.net>
-pkgname=rush
-pkgver=1.7
-pkgrel=3
-pkgdesc="GNU Restricted User Shell"
-arch=('i686' 'x86_64')
-url="http://puszcza.gnu.org.ua/software/rush/"
+# Maintainer (AUR):  Chris Severance aur.severach aATt spamgourmet dott com
+# Contributor (AUR): Brandon Invergo <brandon@invergo.net>
+# Contributor (AUR): B3nny <benny@b3nny.net>
+
+# parabola changes and rationale:
+#  - added .install file to update icon database
+#  - added patch to fix build errors with gcc7
+
+set -u
+pkgname='rush'
+pkgver='1.8'
+pkgrel='1'
+pkgdesc='GNU Restricted User Shell'
+arch=('i686' 'x86_64' 'armv7h')
+url='http://puszcza.gnu.org.ua/software/rush/'
 license=('GPL3')
-backup=(etc/rush.rc)
+makedepends=('patch')
+backup=('etc/rush.rc')
 install='rush.install'
-source=("http://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz"
-    'rush-1.7-glib-2.16-gets.patch')
-noextract=()
-md5sums=('02fae838fe8f5dc5b4e3a2e4da0182b8'
-         'dcd87b8bf9738796621030930384f97d')
+_verwatch=("${url}download.html" "${pkgname}-\([0-9\.]\+\)\.tar.xz" 't')
+source=("http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz"
+        'rush-1.7-glib-2.16-gets.patch'
+        'intprops.patch')
+# md5 and sha1 are published by gnu
+md5sums=('50d8bb3c0a502f2c1f5b374046ff78de'
+         'dcd87b8bf9738796621030930384f97d'
+         'a86f13da54caba8df99719153c72cdcf')
+sha1sums=('e882f68d9004af608b7e5c430c367645aa3e3b75'
+          'adb33d34f04846734ec3457517b46fb7a73efa6f'
+          '637d0a93c8e73e86e9a62f95296e1e110bd6a038')
+sha256sums=('dd3b7bfb33570890086218aa049900a9b4d5a9e8d4878a1328e2aa88bb5793ee'
+            '159dd2fc0fd4feec5d43cf7763a429b9c2da5c50597b157de9e5b376d9ff85a8'
+            'eb916fff92a4a33fff4951f1f219e8c9fb12f3a6c0dd462da30e451b26789a28')
 
 prepare() {
-    cd "$srcdir/$pkgname-$pkgver"
-    patch -p1 < "$srcdir/rush-1.7-glib-2.16-gets.patch"
-    sed -i 's/^\( *[a-z#].*\)/#\1/g' etc/rush.rc
+  set -u
+  cd "${pkgname}-${pkgver}"
+  patch -Np1 -i "$srcdir"/intprops.patch
+  if [ "$(vercmp ${pkgver} '1.8')" -lt 0 ]; then
+    patch -p1 < "${srcdir}/rush-1.7-glib-2.16-gets.patch"
+  fi
+  sed -i -e 's:^\s*[^#]:#&:g' 'etc/rush.rc'
+  ./configure --prefix='/usr' --sysconfdir='/etc' --localstatedir='/var' --sbindir='/usr/bin'
+  set +u
 }
 
 build() {
-    cd "$srcdir/$pkgname-$pkgver"
-    ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --sbindir=/usr/bin
-    make
+  set -u
+  cd "${pkgname}-${pkgver}"
+  local _nproc="$(nproc)"; _nproc=$((_nproc>8?8:_nproc))
+  make -s -j "${_nproc}"
+  set +u
 }
 
 check() {
-    cd "$srcdir/$pkgname-$pkgver"
-    make check
+  set -u
+  cd "${pkgname}-${pkgver}"
+  make check
+  set +u
 }
 
 package() {
-    cd "$srcdir/$pkgname-$pkgver"
-    make DESTDIR="$pkgdir/" install
+  set -u
+  cd "${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+  set +u
 }
-
+set +u