From 7d32e705f11f0d623d136440bd84bdedb2e48b29 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <LukeShu@sbcglobal.net>
Date: Sun, 23 Jun 2013 22:27:09 -0600
Subject: tune up java/java-jarjar

---
 java/java-jarjar/PKGBUILD | 31 +++++++++++++++----------------
 1 file changed, 15 insertions(+), 16 deletions(-)

(limited to 'java/java-jarjar/PKGBUILD')

diff --git a/java/java-jarjar/PKGBUILD b/java/java-jarjar/PKGBUILD
index 8d1d1120b..c78d5539e 100644
--- a/java/java-jarjar/PKGBUILD
+++ b/java/java-jarjar/PKGBUILD
@@ -9,30 +9,28 @@ pkgver=1.2
 _pkgrev=132 # v1.2 wasn't tagged, but this is clearly it
 pkgdesc="Java static linker (instead of the normal dynamic linking)"
 url="https://code.google.com/p/jarjar/"
-license=('Apache2')
+license=('Apache')
 
-pkgrel=1
+pkgrel=2
 arch=('any')
 depends=('java-runtime')
-makedepends=('apache-ant' 'java-asm3' 'junit' 'maven' 'jh')
-source=("svn+http://jarjar.googlecode.com/svn/trunk/jarjar#revision=$_pkgrev")
+makedepends=('apache-ant' 'java-asm3' 'junit' 'maven')
 
+source=("libre://${_pkgname}-${pkgver}.tar.gz")
+mksource=("${_pkgname}-${pkgver}::svn+http://jarjar.googlecode.com/svn/trunk/jarjar#revision=$_pkgrev")
 mksource() {
-  cd "$srcdir/$_pkgname"
-  rm -f src/test/*.{class,jar}
+  cd "$srcdir/$_pkgname-$pkgver"
   rm -f lib/*.jar
 }
 
 build() {
-  cd "$srcdir/$_pkgname"
-  eval `jh mksource`
+  cd "$srcdir/$_pkgname-$pkgver"
 
-  ln -s /usr/share/java/asm-3.jar             lib/asm-3.3.1.jar
-  ln -s /usr/share/java/asm-commons-3.jar     lib/asm-commons-3.3.1.jar
-  ln -s /usr/share/java/junit.jar             lib/junit-4.8.1.jar
-  ln -s /opt/maven/lib/maven-plugin-api-*.jar lib/maven-plugin-api.jar
-
-  ln -s /opt/apache-ant/lib/ant.jar lib/
+  ln -sf /usr/share/java/asm-3.jar             lib/asm-3.3.1.jar
+  ln -sf /usr/share/java/asm-commons-3.jar     lib/asm-commons-3.3.1.jar
+  ln -sf /usr/share/java/junit.jar             lib/junit-4.8.1.jar
+  ln -sf /opt/maven/lib/maven-plugin-api-*.jar lib/maven-plugin-api.jar
+  ln -sf /opt/apache-ant/lib/ant.jar           lib/ant.jar
 
   export CLASSPATH=/usr/share/java/asm-3.jar
   echo 'includeantruntime false' > build.properties
@@ -40,10 +38,11 @@ build() {
 }
 
 package() {
-  cd "$srcdir/$_pkgname"
+  cd "$srcdir/$_pkgname-$pkgver"
   install -d "$pkgdir/usr/share/java/$_pkgname"
   install -D "dist/$_pkgname-$pkgver.jar" "$pkgdir/usr/share/java/$_pkgname"
   ln -s "$_pkgname/$_pkgname-$pkgver.jar" "$pkgdir/usr/share/java/$_pkgname.jar"
 }
 
-md5sums=('SKIP')
+mkmd5sums=('SKIP')
+md5sums=('cc2698a58f93cdb22c51f039a1b8a56e')
-- 
cgit v1.2.3-54-g00ecf