apache-ant-contrib-1.0b5-1.parabola1: updating version

3 files changed, 144 insertions, 11 deletions

diff --git a/pcr/apache-ant-contrib/PKGBUILD b/pcr/apache-ant-contrib/PKGBUILD
index 2ce91e60b..ff4d4b535 100644
--- a/pcr/apache-ant-contrib/PKGBUILD
+++ b/pcr/apache-ant-contrib/PKGBUILD
@@ -1,18 +1,86 @@
-# Contributor (Arch): Brendan MacDonell <brendan AT macdonell.net>
-# Maintainer        : Omar Vega Ramos <ovruni@gnu.org.pe>
+# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>
 
-pkgname=apache-ant-contrib
-pkgver=1.0b3
-pkgrel=4
+_pkgname=ant-contrib
+pkgname=apache-${_pkgname}
+pkgver=1.0b5
+pkgrel=1.parabola1
 pkgdesc="Extra task definitions for apache ant."
 arch=('any')
-url="http://ant-contrib.sourceforge.net"
-license=('apache')
+url='http://ant-contrib.sourceforge.net'
+license=('APACHE')
 depends=('apache-ant')
-source=(http://downloads.sourceforge.net/project/ant-contrib/ant-contrib/1.0b3/ant-contrib-1.0b3-bin.tar.gz)
-md5sums=('ee06ff88da133dce3acc3248aee0ad83')
+makedepends=('apache-ivy' 'jh' 'subversion')
+source=("${_pkgname}-${pkgver}::svn+http://svn.code.sf.net/p/${_pkgname}/code/${_pkgname}/trunk/"
+        'apache-ant-contrib-for_task.patch'
+        'apache-ant-contrib-parabolize.patch')
+sha1sums=('SKIP'
+          'af77026f41c0405c53d7e2a65c12e9f894b060c6'
+          '35d35ccd7d85e7bdd6be0cc3c684f23cacd60b05')
+
+# The format is:
+#   jarname:description:pkgname:jarpath
+_library_dependencies=(
+  ant-1.7.0.jar:'':apache-ant:/usr/share/java/ant.jar
+  xercesImpl-2.6.2.jar:'Java XML parser':xerces2-java:/usr/share/java/xercesImpl.jar
+  oro-2.0.8.jar:'Regular expressions API':jakarta-oro:/usr/share/java/jakarta-oro.jar
+  junit-3.8.1.jar:'<junit> task':junit:/usr/share/java/junit.jar
+  ivy-2.0.0.jar:'<ivy> task':apache-ivy:/usr/share/java/apache-ivy/ivy.jar
+  commons-logging-1.0.4.jar:'CommonsLoggingListener':java-commons-logging:/usr/share/java/commons-logging.jar
+  commons-httpclient-3.0.1.jar:'':java-commons-httpclient:/usr/share/java/commons-httpclient.jar
+  commons-codec-1.3.jar:'Common encoders and decoders':java-commons-codec:/usr/share/java/commons-codec.jar
+  commons-cli-1.0.jar:'Parsing command line options':java-commons-cli:/usr/share/java/commons-cli.jar
+  bcel-5.1.jar:"'classfileset' data type, JavaClassHelper for ClassConstants filter reader":java-bcel:/usr/share/java/bcel.jar
+)
+
+for _dep in "${_library_dependencies[@]}"; do
+  IFS=: read _jarname _desc _libname _jarpath <<<"$_dep"
+  optdepends+=("${_libname}: ${_desc}")
+  makedepends+=("${_libname}")
+done
+unset _dep _jarname _desc _libname _jarpath
+
+prepare() {
+  cd "${srcdir}/${_pkgname}-${pkgver}"
+  rm -rv $(find lib -name \*.jar)
+
+  patch -Np1 -i "${srcdir}/apache-ant-contrib-for_task.patch"
+  patch -Np1 -i "${srcdir}/apache-ant-contrib-parabolize.patch"
+  sed -i 's/-SNAPSHOT//g' pom.xml
+}
+
+build() {
+  cd "${srcdir}/${_pkgname}-${pkgver}"
+  ant jar javadoc test \
+    -Dant.jar=/usr/share/java/ant.jar \
+    -Dbcel.jar=/usr/share/java/bcel.jar \
+    -Dhttpclient.jar=/usr/share/java/commons-httpclient.jar \
+    -Divy.jar=/usr/share/java/apache-ivy/ivy.jar \
+    -Djunit.jar=/usr/share/java/junit.jar \
+    -Dno-ivy=true \
+    -lib /usr/share/java/xercesImpl.jar
+}
 
 package() {
-    install -m 755 -d "${pkgdir}/usr/share/java/apache-ant/"
-    install -m 444 "${srcdir}/ant-contrib/ant-contrib-1.0b3.jar" "${pkgdir}/usr/share/java/apache-ant/"
+  cd "${srcdir}/${_pkgname}-${pkgver}"
+
+  # Install license file
+  install -Dm644 docs/LICENSE.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.txt"
+
+  # Install documentation
+  install -d "${pkgdir}/usr/share/doc/${pkgname}"
+  cp -r target/docs/api "${pkgdir}/usr/share/doc/${pkgname}"
+
+  # Install Maven artifacts
+  export DESTDIR=${pkgdir}
+  jh mvn-install ${_pkgname} ${_pkgname} ${pkgver} \
+    pom.xml \
+    "target/${_pkgname}.jar" \
+    "${_pkgname}-${pkgver}.jar"
+
+  ln -s "/usr/share/java/${_pkgname}-${pkgver}.jar" \
+    "${pkgdir}/usr/share/java/${_pkgname}.jar"
+
+  install -d "${pkgdir}/usr/share/java/apache-ant/"
+  ln -s "/usr/share/java/${_pkgname}-${pkgver}.jar" \
+    "${pkgdir}/usr/share/java/apache-ant/${_pkgname}-${pkgver}.jar"
 }
diff --git a/pcr/apache-ant-contrib/apache-ant-contrib-for_task.patch b/pcr/apache-ant-contrib/apache-ant-contrib-for_task.patch
new file mode 100644
index 000000000..3a97d9282
--- /dev/null
+++ b/pcr/apache-ant-contrib/apache-ant-contrib-for_task.patch
@@ -0,0 +1,12 @@
+--- ant-contrib-1.0b3.orig/src/main/resources/net/sf/antcontrib/antcontrib.properties	2016-06-25 00:18:39.187999000 -0500
++++ ant-contrib-1.0b3/src/main/resources/net/sf/antcontrib/antcontrib.properties	2016-06-25 01:31:53.622992765 -0500
+@@ -13,7 +13,8 @@
+ inifile=net.sf.antcontrib.inifile.IniFileTask

+ 

+ # Logic tasks

+-if=net.sf.antcontrib.logic.IfTask

++if=net.sf.antcontrib.logic.IfTask
++for=net.sf.antcontrib.logic.ForTask

+ foreach=net.sf.antcontrib.logic.ForEach

+ throw=net.sf.antcontrib.logic.Throw

+ trycatch=net.sf.antcontrib.logic.TryCatchTask

diff --git a/pcr/apache-ant-contrib/apache-ant-contrib-parabolize.patch b/pcr/apache-ant-contrib/apache-ant-contrib-parabolize.patch
new file mode 100644
index 000000000..244a513e9
--- /dev/null
+++ b/pcr/apache-ant-contrib/apache-ant-contrib-parabolize.patch
@@ -0,0 +1,53 @@
+--- ant-contrib-1.0b3.orig/build.xml	2016-06-25 00:18:39.274662000 -0500
++++ ant-contrib-1.0b3/build.xml	2016-06-25 01:52:50.547085640 -0500
+@@ -53,12 +53,12 @@
+ 	

+ 	<target name="init" unless="no-ivy">

+         <path id="ivy.lib.path">

+-            <fileset dir="lib/ivy/jars" includes="ivy-2.0.0.jar"/>

+-            <fileset dir="lib/commons-cli/jars" includes="commons-cli-1.0.jar"/>

+-            <fileset dir="lib/commons-codec/jars" includes="commons-codec-1.3.jar"/>

+-            <fileset dir="lib/commons-httpclient/jars" includes="commons-httpclient-3.0.1.jar"/>

+-            <fileset dir="lib/commons-logging/jars" includes="commons-logging-1.0.4.jar"/>

+-            <fileset dir="lib/oro/jars" includes="oro-2.0.8.jar"/>

++            <fileset dir="/usr/share/java/apache-ivy" includes="ivy.jar"/>

++            <fileset dir="/usr/share/java" includes="commons-cli.jar"/>

++            <fileset dir="/usr/share/java" includes="commons-codec.jar"/>

++            <fileset dir="/usr/share/java" includes="commons-httpclient.jar"/>

++            <fileset dir="/usr/share/java" includes="commons-logging.jar"/>

++            <fileset dir="/usr/share/java" includes="oro.jar"/>

+         </path>

+ 	    

+         <taskdef resource="org/apache/ivy/ant/antlib.xml"

+@@ -109,6 +109,7 @@
+ 		       classpathref="compile.classpath"

+ 		       source="${jdk.source}"

+ 		       target="${jdk.target}"

++                       excludes="**/Ivy14Adapter.java"

+ 		  />

+ 		

+ 		<copy todir="${target.classes.dir}">

+--- ant-contrib-1.0b3.orig/ivysettings.xml	2016-06-25 00:18:38.381370000 -0500
++++ ant-contrib-1.0b3/ivysettings.xml	2016-06-25 01:48:32.389967175 -0500
+@@ -5,8 +5,8 @@
+   
+   <resolvers>
+       <filesystem name="local">
+-          <ivy pattern="${ivy.conf.dir}/lib/[module]/ivy-[revision].xml" />
+-          <artifact pattern="${ivy.conf.dir}/lib/[module]/[ext]s/[artifact]-[revision].[ext]" />
++          <ivy pattern="${ivy.conf.dir}/ivy-[revision].xml" />
++          <artifact pattern="/usr/share/java/[artifact].[ext]" />
+       </filesystem>
+           
+ 
+--- ant-contrib-1.0b3.orig/src/main/java/net/sf/antcontrib/net/URLImportTask.java	2016-06-25 00:18:38.968009000 -0500
++++ ant-contrib-1.0b3/src/main/java/net/sf/antcontrib/net/URLImportTask.java	2016-06-25 01:46:26.712467308 -0500
+@@ -158,7 +158,7 @@
+ 			adapter = new Ivy20Adapter();

+ 		}

+ 		catch (ClassNotFoundException e) {

+-			adapter = new Ivy14Adapter();

++			// adapter = new Ivy14Adapter();

+ 		}

+ 		

+ 		String setId = org + "." + module + "." + rev + ".fileset";