updated to 2.1

2 files changed, 30 insertions, 79 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 667d00a33b9f..2fdf85c45c38 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,6 @@
-# Generated by makepkg 4.2.0
-# Thu Jan  1 02:53:35 UTC 2015
 pkgbase = velocity
 	pkgdesc = Free open-source templating engine
-	pkgver = 1.7
+	pkgver = 2.1
 	pkgrel = 1
 	url = http://velocity.apache.org/
 	arch = any
@@ -13,24 +11,16 @@ pkgbase = velocity
 	depends = java-bcel
 	depends = java-commons-collections
 	depends = java-commons-logging
-	depends = java-commons-lang
-	depends = java-jdom1
-	depends = java-servlet3.0-tomcat
+	depends = java-commons-lang3
+	depends = java-jdom
 	depends = junit
 	depends = log4j
-	depends = werken-xpath
-	source = http://www.us.apache.org/dist/velocity/engine/1.7/velocity-1.7.tar.gz
-	source = 0001-Remove-avalon-logkit.patch
-	source = 0003-Use-system-jars.patch
-	source = 0004-JDBC-41-compat.patch
-	md5sums = 6af13ea297dee7ddbabeaa8e3963c184
-	md5sums = 3de9a9b9637520fd19d157549f3f0830
-	md5sums = 377f16d1baab0ca30c69fb036e7eca30
-	md5sums = b1a47ba7da5b3e2c7e6e7cc0fc4cb920
-	sha1sums = 513c8a8c2aa4459d777a53634fc331bfd986e033
-	sha1sums = effe4fb6ca27ba90978f1978865953d2ecb1904a
-	sha1sums = 9365f137bf47934daf606efa24f0a3ea2751cc36
-	sha1sums = e07d06e5c9a08de4c043a6e67986884681559114
+	source = http://mirror.23media.de/apache/velocity/engine/2.1/velocity-engine-core-2.1.jar
+	source = http://mirror.23media.de/apache/velocity/engine/2.1/velocity-engine-scripting-2.1.jar
+	source = http://mirror.23media.de/apache/velocity/engine/2.1/velocity-engine-examples-2.1.jar
+	sha256sums = a921aa299420462f7c39ebe05cdf22ae5b188b67518a2aae06844732fdcc9d7a
+	sha256sums = 18a66042f885c3ca9174b0d6f60e3c7c25b05e5e90b78576b63f0381b8dbdc11
+	sha256sums = d48d880e456bdd5d6952ef2db8a80164a1d7ab6a03a66c4b1b3a5102ad91ebb5
 
 pkgname = velocity
 
diff --git a/PKGBUILD b/PKGBUILD
index 297aa012a5d0..2c10a8afce64 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,72 +3,33 @@
 # Based on Fedora 18's packaging
 
 pkgname=velocity
-pkgver=1.7
+pkgver=2.1
 pkgrel=1
 pkgdesc="Free open-source templating engine"
 arch=(any)
 url="http://velocity.apache.org/"
 license=(Apache)
-depends=(#hsqldb-java-updated
-         jakarta-oro
-         java-bcel
-         java-commons-collections
-         java-commons-logging
-         java-commons-lang
-         java-jdom1
-         java-servlet3.0-tomcat
-         junit
-         log4j
-         werken-xpath)
-makedepends=(antlr2 apache-ant)
-source=("http://www.us.apache.org/dist/velocity/engine/${pkgver}/velocity-${pkgver}.tar.gz"
-        0001-Remove-avalon-logkit.patch
-        0003-Use-system-jars.patch
-        0004-JDBC-41-compat.patch)
-md5sums=('6af13ea297dee7ddbabeaa8e3963c184')
-sha1sums=('513c8a8c2aa4459d777a53634fc331bfd986e033')
-# Patches
-md5sums+=('3de9a9b9637520fd19d157549f3f0830'
-          '377f16d1baab0ca30c69fb036e7eca30'
-          'b1a47ba7da5b3e2c7e6e7cc0fc4cb920')
-sha1sums+=('effe4fb6ca27ba90978f1978865953d2ecb1904a'
-           '9365f137bf47934daf606efa24f0a3ea2751cc36'
-           'e07d06e5c9a08de4c043a6e67986884681559114')
-
-build() {
-  cd "${pkgname}-${pkgver}"
-
-  # Patch from Fedora to use system jar files
-  patch -p1 -i ../0003-Use-system-jars.patch
-
-  find . -name '*.jar' -o -name '*.class' -delete
-
-  # Remove dependency on unpackaged avalon-logkit
-  patch -p1 -i ../0001-Remove-avalon-logkit.patch
-  rm -v src/java/org/apache/velocity/runtime/log/AvalonLogChute.java
-  rm -v src/java/org/apache/velocity/runtime/log/AvalonLogSystem.java
-  rm -v src/java/org/apache/velocity/runtime/log/VelocityFormatter.java
-
-  patch -p1 -i ../0004-JDBC-41-compat.patch
-
-  # Servlet test needs to be ported to the new API
-  rm -v src/test/org/apache/velocity/test/VelocityServletTestCase.java
-
-  # Not working tests
-  rm -v src/test/org/apache/velocity/test/ClassloaderChangeTestCase.java
-
-  export CLASSPATH="/usr/share/java/commons-lang/commons-lang.jar:/usr/share/java/log4j.jar:/usr/share/java/commons-collections/commons-collections.jar:/usr/share/java/servlet3.0-tomcat/servlet-api-3.0.jar:/usr/share/java/jdom/jdom.jar:/usr/share/java/jakarta-oro.jar:/usr/share/java/werken.xpath.jar:/usr/share/java/commons-logging/commons-logging-api.jar:/usr/share/java/hsqldb.jar:/usr/share/java/antlr2.jar"
-  ant -buildfile build/build.xml -Dbuild.sysclasspath=first jar test
-}
+depends=('jakarta-oro'
+         'java-bcel'
+         'java-commons-collections'
+         'java-commons-logging'
+         'java-commons-lang3'
+         'java-jdom'
+         'junit'
+         'log4j')
+makedepends=('antlr2'
+	    'apache-ant')
+source=("http://mirror.23media.de/apache/$pkgname/engine/$pkgver/$pkgname-engine-core-$pkgver.jar"
+	"http://mirror.23media.de/apache/$pkgname/engine/$pkgver/$pkgname-engine-scripting-$pkgver.jar"
+	"http://mirror.23media.de/apache/$pkgname/engine/$pkgver/$pkgname-engine-examples-$pkgver.jar")
+sha256sums=('a921aa299420462f7c39ebe05cdf22ae5b188b67518a2aae06844732fdcc9d7a'
+            '18a66042f885c3ca9174b0d6f60e3c7c25b05e5e90b78576b63f0381b8dbdc11'
+            'd48d880e456bdd5d6952ef2db8a80164a1d7ab6a03a66c4b1b3a5102ad91ebb5')
 
 package() {
-  cd "${pkgname}-${pkgver}"
-
   install -dm755 "${pkgdir}/usr/share/java/"
-  install -m644 bin/${pkgname}-${pkgver}.jar \
-    "${pkgdir}/usr/share/java/${pkgname}.jar"
-
-  install -dm755 "${pkgdir}/usr/share/apache-ant/lib/"
-  install -m644 bin/${pkgname}-${pkgver}.jar \
-    "${pkgdir}/usr/share/apache-ant/lib/${pkgname}.jar"
+  for i in  engine-core engine-scripting engine-examples
+  do
+    install -m644 ${pkgname}-$i-${pkgver}.jar -t "${pkgdir}/usr/share/java/"
+  done
 }