[arch-commits] Commit in ivy/repos/community-any (PKGBUILD PKGBUILD ivy.sh ivy.sh)

[Alexander Rødseth]

    Date: Friday, September 14, 2018 @ 18:05:48
  Author: arodseth
Revision: 380984

archrelease: copy trunk to community-any

Added:
  ivy/repos/community-any/PKGBUILD
    (from rev 380983, ivy/trunk/PKGBUILD)
  ivy/repos/community-any/ivy.sh
    (from rev 380983, ivy/trunk/ivy.sh)
Deleted:
  ivy/repos/community-any/PKGBUILD
  ivy/repos/community-any/ivy.sh

----------+
 PKGBUILD |   66 +++++++++++++++++++++++++++----------------------------------
 ivy.sh   |   14 ++++++------
 2 files changed, 37 insertions(+), 43 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2018-09-14 18:05:41 UTC (rev 380983)
+++ PKGBUILD	2018-09-14 18:05:48 UTC (rev 380984)
@@ -1,36 +0,0 @@
-# Maintainer: Alexander F. Rødseth <xyproto at archlinux.org>
-# Contributor: Vitaliy Berdinskikh <ur6lad at archlinux.org.ua>
-
-pkgname=ivy
-pkgver=2.4.0
-pkgrel=3
-pkgdesc='Dependency manager'
-arch=('any')
-url='https://ant.apache.org/ivy/'
-license=('Apache')
-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 -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: ts=2 sw=2 et:

Copied: ivy/repos/community-any/PKGBUILD (from rev 380983, ivy/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2018-09-14 18:05:48 UTC (rev 380984)
@@ -0,0 +1,30 @@
+# Maintainer: Alexander F. Rødseth <xyproto at archlinux.org>
+# Contributor: Vitaliy Berdinskikh <ur6lad at archlinux.org.ua>
+
+pkgname=ivy
+pkgver=2.4.0
+pkgrel=4
+pkgdesc='Agile dependency manager'
+arch=('any')
+url='https://ant.apache.org/ivy/'
+license=('Apache')
+depends=('java-runtime>=1.8')
+makedepends=('ant')
+source=("https://apache.uib.no/ant/ivy/2.4.0/apache-ivy-2.4.0-src.tar.gz"
+        'ivy.sh')
+sha256sums=('202f08ca41f4bdf1c081aa8b2e531565be6c73e9e5e0d68137f454f14eb16ef6'
+            'fc719139726f670f0acf7b09016a4bb3c4ffdd7a0db88e11eb827467b475ad2d')
+
+build() {
+  cd "apache-$pkgname-$pkgver"
+
+  ant jar -Divy.minimum.javaversion=1.8 -Divy.install.version=1.10
+}
+
+package() {
+  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: ts=2 sw=2 et:

Deleted: ivy.sh
===================================================================
--- ivy.sh	2018-09-14 18:05:41 UTC (rev 380983)
+++ ivy.sh	2018-09-14 18:05:48 UTC (rev 380984)
@@ -1,7 +0,0 @@
-#!/bin/sh
-if [ -z $CLASSPATH ]; then
-  CLASSPATH="/usr/share/java/ivy/ivy.jar"
-else
-  CLASSPATH="/usr/share/java/ivy/ivy.jar:$CLASSPATH"
-fi
-exec "$JAVA_HOME/bin/java" -classpath "$CLASSPATH" $JAVA_OPTS org.apache.ivy.Main "$@"

Copied: ivy/repos/community-any/ivy.sh (from rev 380983, ivy/trunk/ivy.sh)
===================================================================
--- ivy.sh	                        (rev 0)
+++ ivy.sh	2018-09-14 18:05:48 UTC (rev 380984)
@@ -0,0 +1,7 @@
+#!/bin/sh
+if [ -z $CLASSPATH ]; then
+  CLASSPATH="/usr/share/java/ivy/ivy.jar"
+else
+  CLASSPATH="/usr/share/java/ivy/ivy.jar:$CLASSPATH"
+fi
+exec "$JAVA_HOME/bin/java" -classpath "$CLASSPATH" $JAVA_OPTS org.apache.ivy.Main "$@"