From c664c3a438546ef9f4427ddb49b50b5115412159 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <LukeShu@sbcglobal.net>
Date: Wed, 25 Dec 2013 21:46:47 -0500
Subject: rebuild java/java-json-android

I don't know why the source tarball changed.
---
 java/java-json-android/PKGBUILD | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'java')

diff --git a/java/java-json-android/PKGBUILD b/java/java-json-android/PKGBUILD
index a5ec08c9f..7a9113529 100644
--- a/java/java-json-android/PKGBUILD
+++ b/java/java-json-android/PKGBUILD
@@ -10,14 +10,14 @@ pkgver=${_pkgver//_/.}
 provides=(java-json)
 conflicts=(java-json)
 
-pkgrel=2
+pkgrel=3
 arch=(any)
 
 depends=(java-runtime)
 makedepends=(java-environment junit)
 
 source=("libre://android-libcore-$_pkgver.tar.gz")
-md5sums=('367769bb9d7fe571ff4e1e82b99e99ed')
+md5sums=('546a4614552615a12f45b62db27acddf')
 
 mkdepends=(git)
 mksource=("android-libcore-$_pkgver::git+https://android.googlesource.com/platform/libcore/#tag=android-${_pkgver}")
-- 
cgit v1.2.3


From 5117cfabb1e4e4156a56694cf07cb60f02d897dc Mon Sep 17 00:00:00 2001
From: Luke Shumaker <LukeShu@sbcglobal.net>
Date: Wed, 25 Dec 2013 22:21:06 -0500
Subject: simplify/fix java/junit

---
 java/junit/PKGBUILD | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

(limited to 'java')

diff --git a/java/junit/PKGBUILD b/java/junit/PKGBUILD
index 5e466a029..04dbcb2ac 100644
--- a/java/junit/PKGBUILD
+++ b/java/junit/PKGBUILD
@@ -7,24 +7,18 @@ pkgdesc="Automated testing framework for Java"
 url="http://www.junit.org/"
 license=('CPL')
 
-pkgrel=3.1
+pkgrel=3.2
 arch=('any')
 depends=('java-runtime' 'java-hamcrest')
 makedepends=('apache-ant' 'jakarta-oro' 'jh')
 
 source=("libre://$pkgname-$pkgver.tar.gz")
-md5sums=('47c8879e05effb2ab98461c43243cc65')
+md5sums=('cdaa9856761201de81a61aecb8cfcc9c')
 
-mksource=("$pkgname::git://github.com/junit-team/junit.git#tag=r$pkgver")
+mksource=("$pkgname-$pkgver::git://github.com/junit-team/junit.git#tag=r$pkgver")
 mkmd5sums=('SKIP')
 mksource() {
-  cd "${srcdir}"p
-  if [[ -d $pkgname ]]; then
-    rm -rf "$pkgname"-*
-    mv "$pkgname" "$pkgname-$pkgver"
-  fi
-
-  cd "${pkgname}-${pkgver}"
+  cd "${srcdir}/${pkgname}-${pkgver}"
   find . -name '*.jar' -delete
 }
 
-- 
cgit v1.2.3