extra/icedtea-web to 1.7-1

extra/icedtea-web/PKGBUILD

@@ -1,33 +1,27 @@
-# Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Maintainer: Guillaume ALAUX <guillaume@archlinux.org>
+# Contributor: Andreas Radke <andyrtr@archlinux.org>
 
-# ALARM: Jason Plum <jplum@archlinuxarm.org>
-#  - v5,v6h - drop chromium
-#  - v5 - drop chromium
+# ALARM: Kevin Mihelich <kevin@archlinuxarm.org>
+#  - drop firefox makedepend, configure option for v5/v6
 
 pkgbase=icedtea-web
 pkgname=('icedtea-web' 'icedtea-web-doc')
-pkgver=1.6.2
-pkgrel=2
+pkgver=1.7
+pkgrel=1
 arch=('i686' 'x86_64')
 url='http://icedtea.classpath.org/wiki/IcedTea-Web'
 license=('GPL2')
-makedepends=('java-environment-openjdk' 'zip' 'libxtst' 'npapi-sdk' 'rhino' 'junit'
+makedepends=('java-environment-openjdk=8' 'zip' 'libxtst' 'npapi-sdk' 'rhino' 'junit'
              'epiphany')
+makedepends_armv7h=('firefox')
+makedepends_aarch64=('firefox')
 optdepends=('rhino: for using proxy auto config files')
 # Due to broken path names in the tarball that fails with LANG=C in our chroot
 noextract=("${pkgbase}-${pkgver}.tar.gz")
-source=(http://icedtea.classpath.org/download/source/${pkgbase}-${pkgver}.tar.gz)
-sha256sums=('ce67034096d6b960e2b6cfb5c41a7bd6b30eb2ec7f13bf3ecdb477ff6ce69300')
-
-case $CARCH in
-  armv6h)
-    makedepends+=('firefox')
-    ;;
-  armv7h)
-    makedepends+=('firefox')
-    ;;
-esac
+source=(http://icedtea.classpath.org/download/source/${pkgbase}-${pkgver}.tar.gz{,.sig})
+validpgpkeys=('C058EF1E749812E6A486384B53B5CFF671EEED59') # Jiri Vanek <jvanek@redhat.com>
+sha256sums=('2030ea323964ae82eabe5436eef076de4b892786424ad9be21f3abc9d76c0291'
+            'SKIP')
 
 prepare() {
   cd "${srcdir}"
@@ -35,18 +29,10 @@ prepare() {
 }
 
 build() {
-  _arm_configure=""
-  case $CARCH in 
-    armv6h)
-      _arm_configure="--with-firefox=/usr/bin/firefox"
-      ;;
-    armv7h)
-      _arm_configure="--with-firefox=/usr/bin/firefox"
-      ;;
-  esac
-
-
   cd "${srcdir}"/${pkgbase}-${pkgver}
+
+  [[ $CARCH == "armv7h" || $CARCH == "aarch64" ]] && CONFIG="--with-firefox=/usr/bin/firefox"
+
   ./configure \
       --prefix=/usr/share/${pkgbase} \
       --datarootdir=/usr/share \
@@ -54,7 +40,7 @@ build() {
       --with-jre-home=/usr/lib/jvm/default-runtime \
       --with-java=/usr/bin/java \
       --with-browser-tests \
-     $_arm_configure \
+      $CONFIG \
       --with-epiphany=/usr/bin/epiphany
    make
 }