Update libre/apache-ant

1 files changed, 36 insertions, 13 deletions

diff --git a/libre/apache-ant/PKGBUILD b/libre/apache-ant/PKGBUILD
index 9cecc3650..e9bc11576 100644
--- a/libre/apache-ant/PKGBUILD
+++ b/libre/apache-ant/PKGBUILD
@@ -1,27 +1,48 @@
 # Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
-# Maintainer (Arch): Paul Mattal <paul@archlinux.org>
+# Maintainer (Arch): Guillaume ALAUX <guillaume@archlinux.org>
 # Contributor (Arch): Andrew Wright <andreww@photism.org>
+# Contributor (Arch): Paul Mattal <paul@archlinux.org>
 
 pkgname=apache-ant
-pkgver=1.9.4
+pkgver=1.9.5
 pkgdesc="A Java-based build tool"
 license=('Apache' 'custom:BSD3')
 url="http://ant.apache.org/"
 
+# Arch splits it into pkgname=('apache-ant' 'apache-ant-doc')
+provides=("$pkgname-doc=$pkgver")
 replaces=("$pkgname-libre" "$pkgname-doc")
 conflicts=("$pkgname-libre" "$pkgname-doc")
 
-pkgrel=3.parabola1
+pkgrel=1.parabola
 arch=('any')
 depends=('java-environment')
 makedepends=('jh')
 
 _mirror=http://archive.apache.org/dist
-source=($_mirror/ant/source/${pkgname}-${pkgver}-src.tar.bz2
+source=($_mirror/ant/source/${pkgname}-${pkgver}-src.tar.bz2{,.asc}
         ${pkgname}.sh ${pkgname}.csh)
-md5sums=('7a7253ec047195d755c5318a4de8a3a4'
-         'bd63c881be406f515fc4d22635e8326a'
-         'aaa615512cbe1ed7f3b62c1ff46802f8')
+sha512sums=('b618804ce156cad97eafb16f29a2b51f4bb4f95ffbe7c30c3025a106042edba23578348aa1675a1cb73af805bf9de2cc47669566091e77d66e760a1b2ad26a90'
+            'SKIP'
+            'b5bd49bc99161e86f7198181aff7c47c8045e8cac7b7c1e2531dc49b71f1659ae35f90d33b01076b6bf665aa99f951c47ba09a0408b0aca43184f68ebd201768'                           
+            'c8c4be2928af648e064d4dff9efb71e250d0fb4baa318932a88de04c9c2d328b8b1af0321e732d2f302d25893e1a627da5c72264b8bd6bd50e662ca10e3f50bf')                          
+# Run this to get the validpgpkeys:
+#  curl -s https://www.apache.org/dist/ant/KEYS | gpg --with-colons --with-fingerprint - | grep ^fpr: | cut -d: -f10
+validpgpkeys=(5B1E231C400B113C061C26508104644F51898504
+              47309207D818FFD8DCD3F83F1931D684307A10A5
+              5F35E131F832ED23F761578BEFA3E779EDF62C35
+              CE8075A251547BEE249BC151A2115AE15F6B8B72
+              B36135CBA375AA1ADE562A1C6E947594C152431A
+              F54C925C2454F21D86692540A0BFF93DAA0077B0
+              07C69F931EE82E694E73B54203F68CBDDE8884A0
+              9C60C6B3A5A9DF8FEDD299D65BE0BA8CB80602AE
+              14604968898CEB74A5329360AEB01A153B7C75B1
+              5CDF153E81AB0522A1E5BFBE483C23C67BF8BE8E
+              7B8E57E91F116BECF9ACE6AF37A0E062971731FB
+              F19E751B68B907C4F2E6B7B18D6D0AD09711DBFC
+              06A228AAB83A18A8DF7B84B08614D6AB265B4C63
+              61B656E44615E2AEF78E8DCF0E69F809710038F5
+              0BADE59B0EC24E68C03CA4815EFAD9FE82A7FBCD)
 
 # This list is adapted from https://ant.apache.org/manual/install.html#librarydependencies
 # The format is:
@@ -77,7 +98,7 @@ build() {
     ln -sfv "${_jarpath}" lib/optional/${_jarname}
   done
   # Build
-  source "/etc/profile.d/jre.sh"   # Get the JAVA_HOME env var
+  export JAVA_HOME=/usr/lib/jvm/default
   sh build.sh -Ddist.dir="${srcdir}"/${pkgname}-${pkgver}-bin dist
 }
 
@@ -127,9 +148,11 @@ package() {
     ln -sfvr "${pkgdir}/${ANT_HOME}/bin/$prog" "${pkgdir}/usr/bin/$prog"
   done
   install -d "${pkgdir}"/usr/share/{doc,licenses}/${pkgname}
-  ln -sfvr "${pkgdir}/${ANT_HOME}/README"   "${pkgdir}/usr/share/doc/${pkgname}/README"
-  ln -sfvr "${pkgdir}/${ANT_HOME}/WHATSNEW" "${pkgdir}/usr/share/doc/${pkgname}/WHATSNEW"
-  ln -sfvr "${pkgdir}/${ANT_HOME}/manual"   "${pkgdir}/usr/share/doc/${pkgname}/html"
-  ln -sfvr "${pkgdir}/${ANT_HOME}/LICENSE"  "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-  ln -sfvr "${pkgdir}/${ANT_HOME}/NOTICE"   "${pkgdir}/usr/share/licenses/${pkgname}/NOTICE"
+  ln -sfvrT "${pkgdir}/${ANT_HOME}/README"   "${pkgdir}/usr/share/doc/${pkgname}/README"
+  ln -sfvrT "${pkgdir}/${ANT_HOME}/WHATSNEW" "${pkgdir}/usr/share/doc/${pkgname}/WHATSNEW"
+  ln -sfvrT "${pkgdir}/${ANT_HOME}/manual"   "${pkgdir}/usr/share/doc/${pkgname}/html"
+  ln -sfvrT "${pkgdir}/${ANT_HOME}/LICENSE"  "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+  ln -sfvrT "${pkgdir}/${ANT_HOME}/NOTICE"   "${pkgdir}/usr/share/licenses/${pkgname}/NOTICE"
+  mv -T     "${pkgdir}/${ANT_HOME}/etc"      "${pkgdir}/etc/${pkgname}"
+  ln -sfvrT "${pkgdir}/etc/${pkgname}"       "${pkgdir}/${ANT_HOME}/etc"
 }