[arch-commits] Commit in ant/repos/extra-any (PKGBUILD PKGBUILD ant.conf ant.conf)

Levente Polyak anthraxx at archlinux.org
Tue Sep 10 20:52:26 UTC 2019


    Date: Tuesday, September 10, 2019 @ 20:52:26
  Author: anthraxx
Revision: 362175

archrelease: copy trunk to extra-any

Added:
  ant/repos/extra-any/PKGBUILD
    (from rev 362174, ant/trunk/PKGBUILD)
  ant/repos/extra-any/ant.conf
    (from rev 362174, ant/trunk/ant.conf)
Deleted:
  ant/repos/extra-any/PKGBUILD
  ant/repos/extra-any/ant.conf

----------+
 PKGBUILD |  170 ++++++++++++++++++++++++++++++-------------------------------
 ant.conf |   16 ++---
 2 files changed, 93 insertions(+), 93 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2019-09-10 20:52:21 UTC (rev 362174)
+++ PKGBUILD	2019-09-10 20:52:26 UTC (rev 362175)
@@ -1,85 +0,0 @@
-# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org>
-# Maintainer: Guillaume ALAUX <guillaume at archlinux.org>
-# Contributor: Andrew Wright <andreww at photism.org>
-# Contributor: Paul Mattal <paul at archlinux.org>
-
-pkgbase=ant
-pkgname=('ant' 'ant-doc')
-pkgver=1.10.6
-pkgrel=1
-pkgdesc='Java based build tool'
-url='https://ant.apache.org/'
-arch=('any')
-license=('APACHE')
-makedepends=('bash' 'java-environment' 'junit' 'java-hamcrest')
-source=(https://www.apache.org/dist/ant/source/apache-${pkgbase}-${pkgver}-src.tar.bz2{,.asc}
-        ant.conf)
-sha256sums=('628be0efd81719231c89df68911cfa15a03868039b70d706ef3a0900b4106cd7'
-            'SKIP'
-            '23bbef577b56d48adb1985dbd9795e5533146646f1e8bb879dd061a4014ffcf2')
-validpgpkeys=(
-  'CE8075A251547BEE249BC151A2115AE15F6B8B72' # Stefan Bodewig
-  '8DA70C00DF7AF1B0D2F9DC74DDBCC1270A29D081' # jaikiran at apache <jaikiran at apache.org>
-)
-
-_replace_lib() {
-  # explicitly call rm to ensure we replace instead of add
-  rm "$2"
-  ln -s "$1" "$2"
-}
-
-prepare() {
-  cd apache-${pkgbase}-${pkgver}
-  sed -i 's|/usr/bin/python|/usr/bin/python2|' src/script/runant.py
-}
-
-build() {
-  cd apache-${pkgbase}-${pkgver}
-  export JAVA_HOME=/usr/lib/jvm/default
-  ./bootstrap.sh
-  bootstrap/bin/ant -Ddest=optional -f fetch.xml
-  _replace_lib /usr/share/java/junit.jar lib/optional/junit-4.12.jar
-  _replace_lib /usr/share/java/hamcrest-core.jar lib/optional/hamcrest-core-1.3.jar
-  _replace_lib /usr/share/java/hamcrest-library.jar lib/optional/hamcrest-library-1.3.jar
-  bootstrap/bin/ant dist
-}
-
-package_ant() {
-  depends=('java-environment' 'bash')
-  optdepends=('junit: junit tasks'
-              'java-hamcrest: junit tasks')
-  replaces=('apache-ant')
-  provides=('apache-ant')
-  conflicts=('apache-ant')
-  backup=('etc/ant.conf')
-
-  cd apache-${pkgbase}-${pkgver}/apache-${pkgbase}-${pkgver}
-  local _ant_home=/usr/share/ant
-
-  install -d "${pkgdir}${_ant_home}"
-  cp -Rp etc "${pkgdir}${_ant_home}"
-
-  find bin -type f -a ! -name \*.bat -a ! -name \*.cmd \
-    -exec install -Dm 755 {} -t "${pkgdir}${_ant_home}/bin" \;
-  install -d "${pkgdir}/usr/bin"
-  ln -s /usr/share/ant/bin/ant "${pkgdir}/usr/bin/ant"
-
-  install -Dm 644 "${srcdir}/ant.conf" -t "${pkgdir}/etc"
-  install -Dm 644 lib/*.jar -t "${pkgdir}/usr/share/java/ant"
-  ln -s /usr/share/java/ant "${pkgdir}${_ant_home}/lib"
-
-  install -Dm 644 ../{LICENSE,NOTICE} -t "${pkgdir}/usr/share/licenses/${pkgname}"
-}
-
-package_ant-doc() {
-  pkgdesc='Apache Ant build tool documentation'
-  replaces=('apache-ant-doc')
-  provices=('apache-ant-doc')
-  conflicts=('apache-ant-doc')
-
-  install -d "${pkgdir}/usr/share/doc/ant"
-  cp -r apache-${pkgbase}-${pkgver}/apache-${pkgbase}-${pkgver}/manual/* \
-    "${pkgdir}/usr/share/doc/ant"
-}
-
-# vim: ts=2 sw=2 et:

Copied: ant/repos/extra-any/PKGBUILD (from rev 362174, ant/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2019-09-10 20:52:26 UTC (rev 362175)
@@ -0,0 +1,85 @@
+# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org>
+# Maintainer: Guillaume ALAUX <guillaume at archlinux.org>
+# Contributor: Andrew Wright <andreww at photism.org>
+# Contributor: Paul Mattal <paul at archlinux.org>
+
+pkgbase=ant
+pkgname=('ant' 'ant-doc')
+pkgver=1.10.7
+pkgrel=1
+pkgdesc='Java based build tool'
+url='https://ant.apache.org/'
+arch=('any')
+license=('APACHE')
+makedepends=('bash' 'java-environment' 'junit' 'java-hamcrest')
+source=(https://www.apache.org/dist/ant/source/apache-${pkgbase}-${pkgver}-src.tar.bz2{,.asc}
+        ant.conf)
+sha256sums=('39882eff327f4a056d77605f0a973d4f30d003083e54fa0885ddab6055b6c8de'
+            'SKIP'
+            '23bbef577b56d48adb1985dbd9795e5533146646f1e8bb879dd061a4014ffcf2')
+validpgpkeys=(
+  'CE8075A251547BEE249BC151A2115AE15F6B8B72' # Stefan Bodewig
+  '8DA70C00DF7AF1B0D2F9DC74DDBCC1270A29D081' # jaikiran at apache <jaikiran at apache.org>
+)
+
+_replace_lib() {
+  # explicitly call rm to ensure we replace instead of add
+  rm "$2"
+  ln -s "$1" "$2"
+}
+
+prepare() {
+  cd apache-${pkgbase}-${pkgver}
+  sed -i 's|/usr/bin/python|/usr/bin/python2|' src/script/runant.py
+}
+
+build() {
+  cd apache-${pkgbase}-${pkgver}
+  export JAVA_HOME=/usr/lib/jvm/default
+  ./bootstrap.sh
+  bootstrap/bin/ant -Ddest=optional -f fetch.xml
+  _replace_lib /usr/share/java/junit.jar lib/optional/junit-4.12.jar
+  _replace_lib /usr/share/java/hamcrest-core.jar lib/optional/hamcrest-core-1.3.jar
+  _replace_lib /usr/share/java/hamcrest-library.jar lib/optional/hamcrest-library-1.3.jar
+  bootstrap/bin/ant dist
+}
+
+package_ant() {
+  depends=('java-environment' 'bash')
+  optdepends=('junit: junit tasks'
+              'java-hamcrest: junit tasks')
+  replaces=('apache-ant')
+  provides=('apache-ant')
+  conflicts=('apache-ant')
+  backup=('etc/ant.conf')
+
+  cd apache-${pkgbase}-${pkgver}/apache-${pkgbase}-${pkgver}
+  local _ant_home=/usr/share/ant
+
+  install -d "${pkgdir}${_ant_home}"
+  cp -Rp etc "${pkgdir}${_ant_home}"
+
+  find bin -type f -a ! -name \*.bat -a ! -name \*.cmd \
+    -exec install -Dm 755 {} -t "${pkgdir}${_ant_home}/bin" \;
+  install -d "${pkgdir}/usr/bin"
+  ln -s /usr/share/ant/bin/ant "${pkgdir}/usr/bin/ant"
+
+  install -Dm 644 "${srcdir}/ant.conf" -t "${pkgdir}/etc"
+  install -Dm 644 lib/*.jar -t "${pkgdir}/usr/share/java/ant"
+  ln -s /usr/share/java/ant "${pkgdir}${_ant_home}/lib"
+
+  install -Dm 644 ../{LICENSE,NOTICE} -t "${pkgdir}/usr/share/licenses/${pkgname}"
+}
+
+package_ant-doc() {
+  pkgdesc='Apache Ant build tool documentation'
+  replaces=('apache-ant-doc')
+  provices=('apache-ant-doc')
+  conflicts=('apache-ant-doc')
+
+  install -d "${pkgdir}/usr/share/doc/ant"
+  cp -r apache-${pkgbase}-${pkgver}/apache-${pkgbase}-${pkgver}/manual/* \
+    "${pkgdir}/usr/share/doc/ant"
+}
+
+# vim: ts=2 sw=2 et:

Deleted: ant.conf
===================================================================
--- ant.conf	2019-09-10 20:52:21 UTC (rev 362174)
+++ ant.conf	2019-09-10 20:52:26 UTC (rev 362175)
@@ -1,8 +0,0 @@
-# Apache Ant start script configuration file
-ANT_HOME=/usr/share/ant
-
-# Optional jars and their dependencies
-OPT_JAR_LIST=/usr/share/java/junit.jar:/usr/share/java/hamcrest-core.jar
-LOCALCLASSPATH=${OPT_JAR_LIST}
-
-# vim:ft=sh

Copied: ant/repos/extra-any/ant.conf (from rev 362174, ant/trunk/ant.conf)
===================================================================
--- ant.conf	                        (rev 0)
+++ ant.conf	2019-09-10 20:52:26 UTC (rev 362175)
@@ -0,0 +1,8 @@
+# Apache Ant start script configuration file
+ANT_HOME=/usr/share/ant
+
+# Optional jars and their dependencies
+OPT_JAR_LIST=/usr/share/java/junit.jar:/usr/share/java/hamcrest-core.jar
+LOCALCLASSPATH=${OPT_JAR_LIST}
+
+# vim:ft=sh


More information about the arch-commits mailing list