1 files changed, 24 insertions, 20 deletions

diff --git a/pcr/java-jarjar/PKGBUILD b/pcr/java-jarjar/PKGBUILD
index 7b50bf171..aa71171b8 100644
--- a/pcr/java-jarjar/PKGBUILD
+++ b/pcr/java-jarjar/PKGBUILD
@@ -3,49 +3,53 @@
 _pkgname=jarjar
 pkgname=java-${_pkgname}
 pkgver=1.4
-pkgrel=1
+pkgrel=1.1
 pkgdesc="Repackage third-party jars"
 arch=('any')
 url="https://code.google.com/p/jarjar/"
 license=('APACHE')
 depends=('java-runtime')
-makedepends=('apache-ant' 'java-asm' 'jh' 'maven' 'subversion')
-source=("${_pkgname}-${pkgver}::svn+https://jarjar.googlecode.com/svn/trunk/jarjar/"
+makedepends=('apache-ant' 'java-asm' 'jh' 'maven')
+source=("https://storage.googleapis.com/google-code-archive-source/v2/code.google.com/${_pkgname}/source-archive.zip"
         "jarjar-fix_javadocs.patch")
-md5sums=('SKIP'
+md5sums=('d7123ee34fab0d4610404a7a355410da'
          'f6f003fe768eaa487a2624d1dba41ce3')
 
 prepare() {
-  cd "${srcdir}/${_pkgname}-${pkgver}"
+  cd "$srcdir/${_pkgname}/trunk/${_pkgname}"
+  rm -rvf "$srcdir/${_pkgname}/"{branches,tags,wiki}
   find . -name \*.jar -delete
   sed -i 's/1\.3/1\.4/g' pom.xml
-  patch -Np1 -i "${srcdir}/jarjar-fix_javadocs.patch"
+  patch -Np1 -i "$srcdir/jarjar-fix_javadocs.patch"
 }
 
 build() {
-  cd "${srcdir}/${_pkgname}-${pkgver}"
+  cd "$srcdir/${_pkgname}/trunk/${_pkgname}"
 
   ln -s "/usr/share/java/asm-4.jar" "lib/asm-4.0.jar"
   ln -s "/usr/share/java/asm-commons-4.jar" "lib/asm-commons-4.0.jar"
-  ln -s "/opt/maven/lib/maven-plugin-api-3.3.3.jar" "lib/maven-plugin-api.jar"
+  ln -s "/opt/maven/lib/maven-plugin-api-3.3.9.jar" "lib/maven-plugin-api.jar"
 
   ant jar javadoc \
-    -Dant.jar=/opt/apache-ant/lib/ant.jar
+    -Dant.jar=/usr/share/apache-ant/lib/ant.jar
 }
 
 package() {
-  cd "${srcdir}/${_pkgname}-${pkgver}"
+  cd "$srcdir/${_pkgname}/trunk/${_pkgname}"
+
+  # Install license file
+  install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
 
   # Install documentation
-  install -d "${pkgdir}/usr/share/doc/${pkgname}"
-  cp -r "dist/javadoc" "${pkgdir}/usr/share/doc/${pkgname}"
+  install -d "$pkgdir/usr/share/doc/$pkgname"
+  cp -r "dist/javadoc" "$pkgdir/usr/share/doc/$pkgname"
 
   # Install Maven artifacts
-  export DESTDIR=${pkgdir}
-  jh mvn-install "com.googlecode.jarjar" ${_pkgname} ${pkgver} \
-    "${srcdir}/${_pkgname}-${pkgver}/pom.xml" \
-    "${srcdir}/${_pkgname}-${pkgver}/dist/${_pkgname}-${pkgver}.jar" \
-    "${_pkgname}.jar"
-  ln -s "/usr/share/java/${_pkgname}.jar" \
-    "${pkgdir}/usr/share/java/${_pkgname}-${pkgver}.jar"
-}
\ No newline at end of file
+  export DESTDIR=$pkgdir
+  jh mvn-install "com.googlecode.jarjar" ${_pkgname} $pkgver \
+    pom.xml \
+    "dist/${_pkgname}-$pkgver.jar" \
+    "${_pkgname}-$pkgver.jar"
+  ln -s "/usr/share/java/${_pkgname}-$pkgver.jar" \
+    "$pkgdir/usr/share/java/${_pkgname}.jar"
+}