[arch-commits] Commit in (apache-ivy ivy ivy/trunk/PKGBUILD ivy/trunk/ivy.sh)

[Alexander Rødseth]

    Date: Friday, September 14, 2018 @ 17:10:18
  Author: arodseth
Revision: 380949

Rename apache-ivy to just ivy

Added:
  ivy/
Modified:
  ivy/trunk/PKGBUILD
  ivy/trunk/ivy.sh
Deleted:
  apache-ivy/

----------+
 PKGBUILD |   41 ++++++++++++++++++++++++++---------------
 ivy.sh   |   10 +++++-----
 2 files changed, 31 insertions(+), 20 deletions(-)

Modified: ivy/trunk/PKGBUILD
===================================================================
--- apache-ivy/trunk/PKGBUILD	2018-09-14 17:09:00 UTC (rev 380948)
+++ ivy/trunk/PKGBUILD	2018-09-14 17:10:18 UTC (rev 380949)
@@ -1,25 +1,36 @@
-# Maintainer: Alexander F Rødseth <xyproto at archlinux.org>
+# Maintainer: Alexander F. Rødseth <xyproto at archlinux.org>
 # Contributor: Vitaliy Berdinskikh <ur6lad at archlinux.org.ua>
 
-pkgname=apache-ivy
+pkgname=ivy
 pkgver=2.4.0
-pkgrel=2
+pkgrel=3
 pkgdesc='Dependency manager'
 arch=('any')
-url='http://ant.apache.org/ivy/'
+url='https://ant.apache.org/ivy/'
 license=('Apache')
-depends=('bash' 'apache-ant')
-source=("http://mirror.ventraip.net.au/apache/ant/ivy/${pkgver//_/-}/${pkgname}-${pkgver//_/-}-bin.tar.gz" 'ivy.sh')
-sha256sums=('7a3d13a80b69d71608191463dfc2a74fff8ef638ce0208e70d54d28ba9785ee9'
-            '8abb3c0a8f03809d665083053bb432591f1b9c8852009bf31cd61a71cc28b4f5')
+depends=('java-runtime>=1.8')
+makedepends=('ant' 'setconf')
+source=("https://apache.uib.no/ant/ivy/2.4.0/apache-ivy-2.4.0-src.tar.gz"
+        'ivy.sh')
+sha256sums=('202f08ca41f4bdf1c081aa8b2e531565be6c73e9e5e0d68137f454f14eb16ef6'
+            'fc719139726f670f0acf7b09016a4bb3c4ffdd7a0db88e11eb827467b475ad2d')
 
+prepare() {
+  _fn="apache-$pkgname-$pkgver/build.properties"
+  setconf "$_fn" ivy.minimum.javaversion=1.8
+  setconf "$_fn" ivy.install.version=1.10
+}
+
+build() {
+  cd "apache-$pkgname-$pkgver"
+
+  ant jar
+}
+
 package() {
-  install -d "$pkgdir/usr/"{bin,share/java/apache-ivy,share/java/apache-ant}
-  install -m 644 "$pkgname-${pkgver//_/-}/ivy-${pkgver//_/-}.jar" \
-    "$pkgdir/usr/share/java/apache-ivy"
-  install -m 755 ivy.sh "$pkgdir/usr/bin/ivy"
-  ln -s "ivy-${pkgver//_/-}.jar" "$pkgdir/usr/share/java/apache-ivy/ivy.jar"
-  ln -s "../apache-ivy/ivy-${pkgver//_/-}.jar" "$pkgdir/usr/share/java/apache-ant/ivy.jar"
+  install -Dm755 ivy.sh "$pkgdir/usr/bin/ivy"
+  install -Dm644 "apache-$pkgname-$pkgver/build/artifact/jars/ivy.jar" \
+    "$pkgdir/usr/share/java/ivy/ivy.jar"
 }
 
-# vim:set ts=2 sw=2 et:
+# vim: ts=2 sw=2 et:

Modified: ivy/trunk/ivy.sh
===================================================================
--- apache-ivy/trunk/ivy.sh	2018-09-14 17:09:00 UTC (rev 380948)
+++ ivy/trunk/ivy.sh	2018-09-14 17:10:18 UTC (rev 380949)
@@ -1,7 +1,7 @@
-#!/bin/bash
-if [[ -z $CLASSPATH ]]; then
-  CLASSPATH="/usr/share/java/apache-ivy/ivy.jar"
+#!/bin/sh
+if [ -z $CLASSPATH ]; then
+  CLASSPATH="/usr/share/java/ivy/ivy.jar"
 else
-  CLASSPATH="/usr/share/java/apache-ivy/ivy.jar:$CLASSPATH"
+  CLASSPATH="/usr/share/java/ivy/ivy.jar:$CLASSPATH"
 fi
-exec "$JAVA_HOME/bin/java" -classpath $CLASSPATH $JAVA_OPTS org.apache.ivy.Main "$@"
+exec "$JAVA_HOME/bin/java" -classpath "$CLASSPATH" $JAVA_OPTS org.apache.ivy.Main "$@"