24 files changed, 575 insertions, 150 deletions
diff --git a/java/antlr2/PKGBUILD b/java/antlr2/PKGBUILD
index 4269d30c7..3468e25fc 100644
--- a/java/antlr2/PKGBUILD
+++ b/java/antlr2/PKGBUILD
@@ -1,17 +1,22 @@
-# $Id: PKGBUILD 167380 2012-10-01 19:24:15Z guillaume $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+# Maintainer: luke Shumaker <lukeshu@sbcglobal.net>
+# Maintainer (Arch): Andrea Scarpino <andrea@archlinux.org>
 # Contributor: George Giorgidze <giorgidze (at) gmail.com>
 # Contributor: Stefan Husmann <stefan-husmann@t-online.de>
 
+# FIXME: antlr2-sharp doesn't build with mono 3.
+
 pkgbase=antlr2
-pkgname=(antlr2 antlr2-{java,python2,cxx,sharp})
+#MONO pkgname=(antlr2 antlr2-{java,python2,cxx,sharp})
+pkgname=(antlr2 antlr2-{java,python2,cxx})
 pkgver=2.7.7
+pkgdesc="ANother Tool for Language Recognition (formerly PCCTS)"
 url="http://www.antlr2.org/"
 license=('custom:Public Domain')
 
-pkgrel=3
+pkgrel=3.1
 arch=('i686' 'x86_64')
-makedepends=('java-environment' 'python2' 'sh' 'nant' 'jh')
+#MONO makedepends=('java-environment' 'python2' 'sh' 'nant' 'jh')
+makedepends=('java-environment' 'python2' 'sh' 'jh')
 source=("http://www.antlr2.org/download/antlr-${pkgver}.tar.gz"
 	"http://repo.maven.apache.org/maven2/antlr/antlr/$pkgver/antlr-$pkgver.pom"
 	'runantlr2.sh' 'gcc4.4.patch' 'mono.patch')
@@ -25,8 +30,8 @@ build() {
   ./configure --prefix=/usr --disable-examples
   make -j1
 
-  cd lib/csharp
-  nant release
+  #MONO cd lib/csharp
+  #MONO nant release
 }
 
 _install_license() {
@@ -35,7 +40,6 @@ _install_license() {
 }
 
 package_antlr2() {
-  pkgdesc="ANother Tool for Language Recognition (formerly PCCTS)"
   depends=('sh' 'antlr2-java')
 
   install -Dm755 "$srcdir"/runantlr2.sh "$pkgdir"/usr/bin/runantlr2
@@ -43,7 +47,7 @@ package_antlr2() {
 }
 
 package_antlr2-java() {
-  pkgdesc="ANother Tool for Language Recognition (formerly PCCTS) (Java version)"
+  pkgdesc+=" (Java version)"
   depends=('java-runtime')
 
   provides=("java-antlr2=$pkgver")
@@ -51,16 +55,16 @@ package_antlr2-java() {
   replaces=("java-antlr2")
 
   DESTDIR="$pkgdir" jh mvn-install antlr antlr $pkgver \
-	  "$srcdir"/antlr-${pkgver}.pom \
-	  "$srcdir"/antlr-${pkgver}/antlr/antlr.jar \
-	  antlr2.jar
+    "$srcdir"/antlr-${pkgver}.pom \
+    "$srcdir"/antlr-${pkgver}/antlr/antlr.jar \
+    antlr2.jar
 
   _install_license
 }
 
 package_antlr2-python2() {
-  pkgdesc="ANother Tool for Language Recognition (formerly PCCTS) (Python version)"
-  depends=('antlr2' 'python2')
+  pkgdesc+=" (Python version)"
+  depends=('python2')
 
   provides=("python2-antlr2=$pkgver")
   conflicts=("python2-antlr2")
@@ -73,8 +77,7 @@ package_antlr2-python2() {
 }
 
 package_antlr2-cxx() {
-  pkgdesc="ANother Tool for Language Recognition (formerly PCCTS) (C++ version)"
-  depends=('java-runtime')
+  pkgdesc+=" (C++ version)"
 
   cd "$srcdir"/antlr-${pkgver}/lib/cpp
   make -j1 prefix="${pkgdir}/usr" install
@@ -83,8 +86,8 @@ package_antlr2-cxx() {
 }
 
 package_antlr2-sharp() {
-  pkgdesc="ANother Tool for Language Recognition (formerly PCCTS) (C Sharp version)"
-  depends=('antlr2' 'mono')
+  pkgdesc+=" (C Sharp version)"
+  depends=('mono')
 
   cd "$srcdir"/antlr-${pkgver}/lib/csharp
   install -d "$pkgdir"/usr/share
diff --git a/java/apache-ant/PKGBUILD b/java/apache-ant/PKGBUILD
index 77e0dfe94..dfda3c28d 100644
--- a/java/apache-ant/PKGBUILD
+++ b/java/apache-ant/PKGBUILD
@@ -3,52 +3,55 @@
 # Contributor: Andrew Wright <andreww@photism.org>
 
 pkgname=apache-ant
-pkgver=1.8.4
+pkgver=1.9.1
+pkgdesc="A Java-based build tool"
+license=('Apache' 'custom:BSD3')
+url="http://ant.apache.org/"
 
 provides=("apache-ant-libre=$pkgver")
 replaces=("apache-ant-libre")
 conflicts=("apache-ant-libre")
 
-pkgrel=1.1
-pkgdesc="A Java-based build tool"
+pkgrel=3
 arch=('any')
-license=('Apache')
-url="http://ant.apache.org/"
+depends=('java-environment')
+makedepends=('jh')
+
 _mirror=http://archive.apache.org/dist
 source=($_mirror/ant/source/${pkgname}-${pkgver}-src.tar.bz2
         ${pkgname}.sh ${pkgname}.csh)
-depends=('java-environment')
 
 # This list is adapted from https://ant.apache.org/manual/install.html#librarydependencies
 declare -A _opts
 _opts[junit]='to have JUnit on the classpath in javac tasks;/usr/share/java/junit.jar'
 _opts[xalan-java]='<junitreport> task;/usr/share/java/xalan.jar'
-_opts[antlr2]='<antlr> task;/usr/share/java/antlr2.jar::antlr.jar'
-#_opts[java-bsf]='<script> task;/usr/share/java/bsf.jar'
+_opts[java-antlr2]='<antlr> task;/usr/share/java/antlr2.jar::antlr.jar'
+_opts[java-commons-bsf2]='<script> task;/usr/share/java/bsf2.jar::bsf.jar'
 #_opts[groovy]='Groovy with <script> and <scriptdef> tasks;/usr/share/java/groovy.jar'
 _opts[java-asm2]='Groovy with <script> and <scriptdef> tasks;/usr/share/java/asm-2.jar::asm.jar /usr/share/java/asm-util-2.jar::asm-util.jar'
 #_opts[netrexx]='<netrexx> task, Rexx with <script> task;/usr/share/java/netrexx.jar'
-_opts[rhino]='Javascript with <script> task;/usr/share/java/js.jar'
+_opts[java-rhino]='Javascript with <script> task;/usr/share/java/js.jar'
 _opts[jython]='Python with <script> task;/opt/jython/jython.jar'
 #_opts[jacl]='TCL with <script> task;/usr/share/java/jacl.jar'
 #_opts[tcljava]='TCL with <script> task;/usr/share/java/tcljava.jar'
 _opts[beanshell>=1.3]='BeanShell with <script> task;/usr/share/java/bsh.jar::beanshell.jar'
-#_opts[jruby]='Ruby with <script> task;/usr/share/java/jruby.jar'
+_opts[jruby]='Ruby with <script> task;/opt/jruby/lib/jruby.jar'
 #_opts[judo]='Judoscript with <script> task;/usr/share/java/judo.jar'
 _opts[java-commons-logging]='CommonsLoggingListener;/usr/share/java/commons-logging/commons-logging.jar'
 #_opts[java-log4j]='Log4jListener;/usr/share/java/log4j.jar'
-#_opts[java-commons-net>=1.4.0]='<ftp>, <rexec> and <telnet> tasks;/usr/share/java/commons-net.jar'
-#_opts[java-bcel]="'classfileset' data type, JavaClassHelper for ClassConstants filter reader;/usr/share/java/bcel.jar"
+_opts[java-commons-net1>=1.4.0]='<ftp>, <rexec> and <telnet> tasks;/usr/share/java/commons-net.jar'
+_opts[java-bcel]="'classfileset' data type, JavaClassHelper for ClassConstants filter reader;/usr/share/java/bcel.jar"
 #_opts[java-mail]='<mimemail> task, mime encoding with <mail>;/usr/share/java/mail.jar'
-#_opts[java-activation]='<mimemail> task, mime encoding with <mail>;/usr/share/java/activation.jar'
-#_opts[jdepend]='<jdepend> task;/usr/share/java/jdepend.jar'
+_opts[java-activation-gnu]='<mimemail> task, mime encoding with <mail>;/usr/share/java/activation.jar'
+_opts[java-jdepend]='<jdepend> task;/usr/share/java/jdepend.jar'
 #_opts[java-xmlcommons-resolver>=1.1beta]="external files for 'xmlcatalog' datatype;/usr/share/java/resolver.jar"
-#_opts[java-jsch>=0.1.42]='<sshexec> and <scp> tasks;/usr/share/java/jsch.jar'
+_opts[java-jsch>=0.1.42]='<sshexec> and <scp> tasks;/usr/share/java/jsch.jar'
 #_opts[java-advanced-imaging]='<image> task/usr/share/java/jai/*.jar'
 
 for pkg in "${!_opts[@]}"; do
   optdepends+=("$pkg: ${_opts[$pkg]%;*}")
   makedepends+=("$pkg")
+  _jars+="${_opts[$pkg]#*;} "
 done
 
 build() {
@@ -59,9 +62,9 @@ build() {
   mkdir -p "${srcdir}"/${pkgname}-${pkgver}-bin
 
   cd "${srcdir}"/${pkgname}-${pkgver}
-  # Symlink to external optional libraries
-  for jar in ${_opts[@]#*;}; do
-    ln -sf ${jar%::*} lib/optional/`basename ${jar/*::}`
+  # Symlink to external optional libraries/
+  for jar in $_jars; do
+    ln -sfv ${jar%::*} lib/optional/`basename ${jar#*::}`
   done
   # Build
   source "/etc/profile.d/jdk.sh"   # Get the JAVA_HOME env var
@@ -87,8 +90,8 @@ package() {
   # Fix python2 path
   sed -i 's|/usr/bin/python|/usr/bin/python2|' "${pkgdir}"/${ANT_HOME}/bin/runant.py
   # Symlink to external optional libraries
-  for jar in ${_opts[@]#*;}; do
-    ln -sf ${jar%::*} "${pkgdir}"/${ANT_HOME}/lib/`basename ${jar/*::}`
+  for jar in $_jars; do
+    ln -sf ${jar%::*} "${pkgdir}"/${ANT_HOME}/lib/`basename ${jar#*::}`
   done
 
   ## Symlink the /opt distribution to the normal places
@@ -96,15 +99,24 @@ package() {
   install -d "${pkgdir}"/usr/share/doc/${pkgname}
   install -d "${pkgdir}"/usr/share/licenses/${pkgname}
 
+  cd "${pkgdir}"/${ANT_HOME}/lib
+  for pom in *.pom; do
+    a=${pom%.pom}
+    base=$(jh mvn-basename org.apache.ant $a $pkgver)
+    install -d "${pkgdir}${base%/*}"
+    ln -sf ${ANT_HOME}/lib/$a.pom "${pkgdir}${base}".pom
+    ln -sf ${ANT_HOME}/lib/$a.jar "${pkgdir}${base}".jar
+  done
+
   cd "${pkgdir}"/${ANT_HOME}
   for prog in bin/*; do
-      ln -sf ${ANT_HOME}/$prog "${pkgdir}"/usr/bin
+    ln -sf ${ANT_HOME}/$prog "${pkgdir}"/usr/bin
   done
   ln -sf ${ANT_HOME}/{README,WHATSNEW} "${pkgdir}"/usr/share/doc/${pkgname}
   ln -sf ${ANT_HOME}/docs "${pkgdir}"/usr/share/doc/${pkgname}/html
   ln -sf ${ANT_HOME}/{LICENSE,NOTICE} "${pkgdir}"/usr/share/licenses/${pkgname}
 }
 
-md5sums=('c474fa9d0c35a24037c23b6e476862c1'
+md5sums=('39771fd8b4ba87cd77ff6f27001cce4e'
          'bd63c881be406f515fc4d22635e8326a'
          'aaa615512cbe1ed7f3b62c1ff46802f8')
diff --git a/java/beanshell/PKGBUILD b/java/beanshell/PKGBUILD
new file mode 100644
index 000000000..95b14d379
--- /dev/null
+++ b/java/beanshell/PKGBUILD
@@ -0,0 +1,45 @@
+# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
+# Maintainer (Arch): AndyRTR <andyrtr at archlinux.org>
+
+pkgname=beanshell
+pkgver=2.0b4
+pkgrel=2.1
+pkgdesc="Lightweight scripting for Java"
+url="http://www.beanshell.org/"
+license=('LGPL')
+
+provides=('bsh')
+
+arch=('any')
+depends=('java-runtime')
+makedepends=('apache-ant' 'java-commons-bsf2' 'javacc' 'java-servlet3.0-tomcat')
+source=("http://www.beanshell.org/bsh-${pkgver}-src.jar")
+
+prepare() {
+  cd "$srcdir"/BeanShell-$pkgver
+
+  rm lib/*.jar
+  ln -s /usr/share/java/bsf2.jar lib/
+  ln -s /usr/share/java/javacc.jar lib/
+  ln -s /usr/share/java/servlet-api.jar lib/servlet.jar
+}
+
+build() {
+  cd "$srcdir"/BeanShell-$pkgver
+  ant dist
+}
+
+check() {
+  cd "$srcdir"/BeanShell-$pkgver
+  ant test
+}
+
+package() {
+  cd "$srcdir"/BeanShell-$pkgver/dist
+  install -d "${pkgdir}"/usr/share/java/
+  for artifact in $(printf '%s\n' *.jar|sed 's/-[0-9b.]*\.jar$//'); do
+    install -m644 $artifact-$pkgver.jar "${pkgdir}"/usr/share/java/$artifact.jar
+  done
+}
+
+sha1sums=('69b36df249654a04e777ab899046c50b8cc844ac')
diff --git a/java/closure-compiler/PKGBUILD b/java/closure-compiler/PKGBUILD
new file mode 100644
index 000000000..25d5d60ad
--- /dev/null
+++ b/java/closure-compiler/PKGBUILD
@@ -0,0 +1,67 @@
+# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
+
+pkgname=closure-compiler
+pkgver=20130603
+pkgdesc="A JavaScript optimizing compiler."
+url="https://code.google.com/closure/compiler/"
+license=('Apache2')
+
+pkgrel=1
+arch=('any')
+depends=('java-runtime' 'sh')
+makedepends=(
+  'apache-ant'
+  #'java-args4j' # does not exist
+  #'google-caja' # does not exist
+  #'java-guava' # does not build
+  'java-jarjar'
+  'java-json'
+  #'java-jsr305' # does not exist
+  'junit'
+  #'java-protobuf' # does not build
+  # maven-ant-tasks
+  'jh')
+
+source=("libre://$pkgname-$pkgver.tar.gz" 'closure-compiler.sh')
+
+mksource=("$pkgname-$pkgver::git+https://code.google.com/p/closure-compiler/#tag=v${pkgver}")
+mkmd5sums=('SKIP')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  ln -sf /opt/apache-ant/lib/ant.jar          lib/ant.jar
+  ln -sf /opt/apache-ant/lib/ant-launcher.jar lib/ant-launcher.jar
+  #ln -sf /usr/share/java/args4.jar            lib/args4j.jar
+  #ln -sf /usr/share/java/caja-r4314.jar       lib/caja-r4314.jar
+  #ln -sf /usr/share/java/guava.jar            lib/guava.jar
+  ln -sf /usr/share/java/jarjar.jar           lib/jarjar.jar
+  ln -sf /usr/share/java/json.jar             lib/json.jar
+  #ln -sf /usr/share/java/jsr305.jar           lib/jsr305.jar
+  ln -sf /usr/share/java/junit.jar            lib/junit.jar
+  #ln -sf /usr/share/java/protobuf.jar         lib/protobuf-java.jar
+  #ln -sf /...                                 tools/maven-ant-tasks-2.1.3.jar
+
+  sed -i "
+/<target name=\"relversion\">/,/<\/target>/ {
+  s/executable=\"git\"/executable=\"echo\"/
+  /<arg/d
+  /<\/exec>/i<arg value=\"v${pkgver}\" />
+}" build.xml
+
+  ant jar pom
+}
+
+package() {
+  cd "$srcdir"
+  install -Dm755 closure-compiler.sh  "$pkgdir"/usr/bin/closure-compiler
+
+  cd "$srcdir/$pkgname-$pkgver"
+  DESTDIR="$pkgdir" jh mvn-install \
+    com.google.javascript closure-compiler v${pkgver} \
+    build/pom.xml build/compiler.jar \
+    closure-compiler.jar
+}
+
+md5sums=('00b89084401b9550166a1f1294f9ba39'
+         'd4ead4585fcc7039d3c32eb5c4491bb9')
diff --git a/java/closure-compiler/closure-compiler.sh b/java/closure-compiler/closure-compiler.sh
new file mode 100644
index 000000000..e06590db2
--- /dev/null
+++ b/java/closure-compiler/closure-compiler.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+java -jar /usr/share/java/closure-compiler.jar "$@"
diff --git a/java/jakarta-oro/PKGBUILD b/java/jakarta-oro/PKGBUILD
new file mode 100644
index 000000000..9bc3e11b9
--- /dev/null
+++ b/java/jakarta-oro/PKGBUILD
@@ -0,0 +1,30 @@
+# Maintainer: Xiao-Long Chen <chenxiaolong@cxl.epac.to>
+
+pkgname=jakarta-oro
+pkgver=2.0.8
+pkgrel=1
+pkgdesc="Full regular expressions API"
+arch=('any')
+url="http://jakarta.apache.org/oro"
+license=('Apache')
+makedepends=('apache-ant')
+source=("http://archive.apache.org/dist/jakarta/oro/jakarta-oro-${pkgver}.tar.gz")
+sha512sums=('a7f6eb6a088765f273df18ccc823f918737f18ec8772275054839a87f8370f1848e795d481f226c712651104d7598ab86c7d90a991fb039df6581f42f1447920')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  find . -name '*.jar' -o -name '*.class' -delete
+
+  ant jar
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  install -dm755 "${pkgdir}/usr/share/java/"
+  install -m644 ${pkgname}-${pkgver}.jar \
+    "${pkgdir}/usr/share/java/${pkgname}.jar"
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/java/java-asm2/PKGBUILD b/java/java-asm2/PKGBUILD
index 71bc0f303..8860ef86f 100644
--- a/java/java-asm2/PKGBUILD
+++ b/java/java-asm2/PKGBUILD
@@ -1,11 +1,11 @@
 # Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
 
 pkgver=2.2.3
-. common.sh
+. PKGBUILD.common.sh
 
 ####
 
-pkgrel=6
+pkgrel=7
 
 mksource() {
   cd "$srcdir/$_pkgname-$pkgver"
diff --git a/java/java-asm2/common.sh b/java/java-asm2/PKGBUILD.common.sh
index ef4547696..ef4547696 100644
--- a/java/java-asm2/common.sh
+++ b/java/java-asm2/PKGBUILD.common.sh
diff --git a/java/java-asm3/PKGBUILD b/java/java-asm3/PKGBUILD
index 345c83edf..9c9928766 100644
--- a/java/java-asm3/PKGBUILD
+++ b/java/java-asm3/PKGBUILD
@@ -1,11 +1,11 @@
 # Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
 
 pkgver=3.3.1
-. ../java-asm2/common.sh
+. PKGBUILD.common.sh
 
 ####
 
-pkgrel=6
+pkgrel=7
 
 mksource() {
   cd "$srcdir/$_pkgname-$pkgver"
diff --git a/java/java-asm3/PKGBUILD.common.sh b/java/java-asm3/PKGBUILD.common.sh
new file mode 120000
index 000000000..e76a92ae0
--- /dev/null
+++ b/java/java-asm3/PKGBUILD.common.sh
@@ -0,0 +1 @@
+../java-asm2/PKGBUILD.common.sh
+\ No newline at end of file
diff --git a/java/java-commons-bsf2/PKGBUILD b/java/java-commons-bsf2/PKGBUILD
new file mode 100644
index 000000000..57a9dfc1a
--- /dev/null
+++ b/java/java-commons-bsf2/PKGBUILD
@@ -0,0 +1,59 @@
+# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
+
+pkgname=java-commons-bsf2
+pkgver=2.4.0
+url="https://commons.apache.org/proper/commons-bsf/"
+license=('Apache')
+pkgdesc="Bean Scripting Framework"
+
+pkgrel=1
+arch=('any')
+depends=('java-commons-logging')
+makedepends=('apache-ant')
+
+_mirror=http://archive.apache.org/dist
+source=($_mirror/commons/bsf/source/bsf-src-$pkgver.tar.gz
+  build-properties.xml::"https://svn.apache.org/viewvc/commons/proper/bsf/tags/bsf-2.4.0/build-properties.xml?view=co&content-type=text%2Fplain"
+)
+
+declare -A _opts
+#_opts[jacl]="/usr/share/java/jacl.jar"
+_opts[jython]="/opt/jython/jython.jar"
+#_opts[nexrexx]="/usr/share/java/nexrexx.jar"
+_opts[java-rhino]="/usr/share/java/js.jar"
+_opts[xalan-java]="/usr/share/java/xalan.jar"
+_opts[junit]="/usr/share/java/junit.jar"
+
+for pkg in "${!_opts[@]}"; do
+  optdepends+=("$pkg")
+  makedepends+=("$pkg")
+  _jars+="${_opts[$pkg]} "
+done
+
+prepare() {
+  cd "${srcdir}/bsf-${pkgver}"
+  rm lib/*.jar
+}
+
+build() {
+  cd "${srcdir}/bsf-${pkgver}"
+
+  for jar in $_jars; do
+	  ln -s "$jar" lib/
+  done
+
+  # Adjust it to work with jython 2.5+
+  sed -i 's/PyJavaInstance/PyJavaType/g' src/org/apache/bsf/engines/jython/*
+
+  ln -sf ../build-properties.xml ./
+  ant jar
+}
+
+package() {
+  cd "${srcdir}/bsf-${pkgver}"
+  install -Dm644 build/lib/bsf.jar "$pkgdir"/usr/share/java/bsf-$pkgver.jar
+  ln -s bsf-$pkgver.jar "$pkgdir"/usr/share/java/bsf2.jar
+}
+
+md5sums=('7e58b2a009c0f70ab36bbef420b25c07'
+         'd7180c2b95f1a5424f785a2482260eaa')
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')
diff --git a/java/java-json-android/PKGBUILD b/java/java-json-android/PKGBUILD
new file mode 100644
index 000000000..a5ec08c9f
--- /dev/null
+++ b/java/java-json-android/PKGBUILD
@@ -0,0 +1,50 @@
+# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
+
+pkgname=java-json-android
+_pkgver=4.2.2_r1
+pkgdesc="Java org.json implementation developed as part of Android's libcore"
+url="https://android.googlesource.com/platform/libcore/"
+license=(Apache2)
+
+pkgver=${_pkgver//_/.}
+provides=(java-json)
+conflicts=(java-json)
+
+pkgrel=2
+arch=(any)
+
+depends=(java-runtime)
+makedepends=(java-environment junit)
+
+source=("libre://android-libcore-$_pkgver.tar.gz")
+md5sums=('367769bb9d7fe571ff4e1e82b99e99ed')
+
+mkdepends=(git)
+mksource=("android-libcore-$_pkgver::git+https://android.googlesource.com/platform/libcore/#tag=android-${_pkgver}")
+mkmd5sums=('SKIP')
+
+build() {
+  cd "$srcdir"/android-libcore-$_pkgver
+  sed 11q < NOTICE > json/NOTICE
+  cd json/src/main/java
+  javac org/json/*.java
+  jar cf json.jar org/json/*.class
+}
+
+check() {
+  cd "$srcdir"/android-libcore-$_pkgver/json/src/test/java
+
+  # disable test for known bug:
+  sed -i 's/test64BitHexValues()/x&/' org/json/ParsingTest.java
+
+  local cp="/usr/share/java/junit.jar:../../main/java/json.jar"
+  javac -cp "$cp" org/json/*.java
+  printf '%s\n' org/json/*.java | sed 's|/|.|g;s|\.java$||' > tests.txt
+  java -cp "$cp:." org.junit.runner.JUnitCore $(cat tests.txt)
+}
+
+package() {
+  cd "$srcdir"/android-libcore-$_pkgver/json
+  install -Dm644 NOTICE "$pkgdir"/usr/share/licenses/$pkgname/NOTICE
+  install -Dm644 src/main/java/json.jar "$pkgdir"/usr/share/java/json.jar
+}
diff --git a/java/java-rxtx/PKGBUILD b/java/java-rxtx/PKGBUILD
index 4fcabe2a4..ceb0d9bab 100644
--- a/java/java-rxtx/PKGBUILD
+++ b/java/java-rxtx/PKGBUILD
@@ -10,16 +10,18 @@ pkgver=${_pkgver//-/.}
 pkgdesc="A native library providing serial and parallel communication for Java"
 license=(LGPL2.1)
 
-pkgrel=3
+pkgrel=4
 arch=('i686' 'x86_64')
 depends=('java-runtime')
-makedepends=('java-environment' 'pacman>4.0.3')
+makedepends=('java-environment')
 
 case "$_pkgver" in
     *arduino*)
 	url="https://github.com/arduino/RXTX"
-	source=("git://github.com/arduino/RXTX.git#${_gitver}")
-	md5sums=('SKIP')
+	source=("libre://RXTX-$pkgver.tar.gz")
+	md5sums=('a71156587dc8d28d1ff4ece376bc0140')
+	mksource=("git://github.com/arduino/RXTX.git#${_gitver}")
+	mkmd5sums=('SKIP')
 	_dirname=RXTX
 	;;
     *)
diff --git a/java/java-sonatype-oss-parent/PKGBUILD b/java/java-sonatype-oss-parent/PKGBUILD
index f42f6adc5..b62c971ac 100644
--- a/java/java-sonatype-oss-parent/PKGBUILD
+++ b/java/java-sonatype-oss-parent/PKGBUILD
@@ -5,23 +5,17 @@ pkgver=7
 pkgdesc="Metadata file for Maven-based build systems to inherit from"
 license='Apache2'
 
-_groupId=org/sonatype/oss
+_groupId=org.sonatype.oss
 _artifactId=oss-parent
 
 pkgrel=1
 arch=('any')
-depends=('maven')
-makedepends=('java-sonatype-oss-parent=7' 'jh')
+makedepends=('jh')
 source=("http://search.maven.org/remotecontent?filepath=$_groupId/$_artifactId/$pkgver/$_artifactId-$pkgver.pom")
 
-build() {
-  :
-}
-
 package() {
   cd "$srcdir"
-  install -Dm644 $_artifactId-$pkgver.pom \
-      "$pkgdir/`jh mvn-basename $_groupId $_artifactId $pkgver`".pom
+  DESTDIR=$pkgdir jh mvn-install $_groupId $_artifactId $pkgver $_artifactId-$pkgver.pom
 }
 
 md5sums=('3e418cf7f2607bf359e6c514a992cb38')
diff --git a/java/javacc/PKGBUILD b/java/javacc/PKGBUILD
new file mode 100644
index 000000000..032fd7b25
--- /dev/null
+++ b/java/javacc/PKGBUILD
@@ -0,0 +1,47 @@
+# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
+
+pkgname=javacc
+pkgver=5.0
+pkgdesc="Java Compiler Compiler; a parser generator"
+url="http://javacc.java.net/"
+license=('BSD3')
+
+arch=('any')
+pkgrel=2.1
+depends=('java-runtime')
+makedepends=('apache-ant' 'junit' 'jh')
+source=("http://java.net/projects/${pkgname}/downloads/download/${pkgname}-${pkgver}src.tar.gz")
+
+prepare() {
+  cd "$srcdir/$pkgname"
+  rm lib/junit3.8.1/junit.jar
+  ln -s /usr/share/java/junit.jar lib/junit3.8.1
+  #rm bootstrap/javacc.jar
+}
+
+build() {
+  cd "$srcdir/$pkgname"
+
+  sed -i \
+	  -e 's|<modelVersion>.*</modelVersion>|<modelVersion>4.0.0</modelVersion>|' \
+	  -e "s|<version>.*</version>|<version>$pkgver</version>|" \
+	  pom.xml
+
+  for prog in javacc jjdoc jjtree; do
+	  sed -i 's|JAR=.*|JAR=/usr/share/java/javacc.jar|' bin/$prog
+  done
+
+  CLASSPATH=/usr/share/java/junit.jar ant
+}
+
+package() {
+  cd "$srcdir/$pkgname"
+
+  for prog in javacc jjdoc jjrun jjtree; do
+	  install -Dm755 bin/$prog "$pkgdir"/usr/bin/$prog
+  done
+  install -Dm644 bin/lib/javacc.jar "$pkgdir"/usr/share/java/javacc.jar
+  install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
+}
+
+md5sums=('871d78a2a5859c2eebc712c1f8135be5')
diff --git a/java/jh/PKGBUILD b/java/jh/PKGBUILD
index 4c1dee6f3..5638adbce 100644
--- a/java/jh/PKGBUILD
+++ b/java/jh/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
 
 pkgname=jh
-pkgver=0.5
+pkgver=0.5.1
 pkgdesc="Java helpers for PKGBUILDs"
 url="https://projects.parabolagnulinux.org/packages/jh.git/"
 license=('custom:WTFPL')
@@ -24,4 +24,4 @@ package() {
   install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
 }
 
-md5sums=('5fe2279fbada213eb8df38875450c4d2')
+md5sums=('051d39c5dac14e86b755bab9ec1d0d5d')
diff --git a/java/junit/PKGBUILD b/java/junit/PKGBUILD
new file mode 100644
index 000000000..5e466a029
--- /dev/null
+++ b/java/junit/PKGBUILD
@@ -0,0 +1,53 @@
+# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
+# Maintainer (Arch): Guillaume ALAUX <Guillaume at Arch Linux dot org>
+
+pkgname=junit
+pkgver=4.11
+pkgdesc="Automated testing framework for Java"
+url="http://www.junit.org/"
+license=('CPL')
+
+pkgrel=3.1
+arch=('any')
+depends=('java-runtime' 'java-hamcrest')
+makedepends=('apache-ant' 'jakarta-oro' 'jh')
+
+source=("libre://$pkgname-$pkgver.tar.gz")
+md5sums=('47c8879e05effb2ab98461c43243cc65')
+
+mksource=("$pkgname::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}"
+  find . -name '*.jar' -delete
+}
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  ln -sf /usr/share/java/jakarta-oro.jar build/lib/
+  ln -sf /usr/share/java/hamcrest-core.jar lib/hamcrest-core-1.3.jar
+
+  ant -Dversion-status='' jars
+  for artifact in junit junit-dep; do
+    sed \
+      -e "s|@artifactID@|$artifact|" \
+      -e "s|@version@|$pkgver|" \
+      < build/maven/$artifact-pom-template.xml > $pkgname$pkgver/$artifact-$pkgver.pom
+  done
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}/${pkgname}${pkgver}"
+
+  export DESTDIR="$pkgdir"
+  jh mvn-install $pkgname junit     $pkgver junit-$pkgver.{pom,jar} junit-$pkgver.jar
+  jh mvn-install $pkgname junit-dep $pkgver junit-dep-$pkgver.pom
+  ln -s ${pkgname}-${pkgver}.jar ${pkgdir}/usr/share/java/${pkgname}.jar
+}
diff --git a/java/maven/PKGBUILD b/java/maven/PKGBUILD
new file mode 100644
index 000000000..3f8e5071d
--- /dev/null
+++ b/java/maven/PKGBUILD
@@ -0,0 +1,107 @@
+# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
+# Maintainer (Arch): Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Contributor: William Rea <sillywilly@gmail.com>
+
+pkgname=maven
+pkgver=3.0.5
+pkgdesc="A Java project management and project comprehension tool"
+url="http://maven.apache.org"
+license=('Apache')
+
+replaces=('maven-libre')
+conflicts=('maven-libre')
+
+pkgrel=1
+arch=('any')
+options=(!emptydirs)
+conflicts=('maven')
+depends=('java-environment' 'sh')
+makedepends=('apache-ant' 'jh' 'imake'
+	java-antlr2
+	java-asm3
+)
+backup=('etc/maven/settings.xml')
+
+_mirror=http://archive.apache.org/dist
+source=($_mirror/maven/maven-${pkgver%%.*}/$pkgver/source/apache-maven-$pkgver-src.tar.gz
+	maven.sh maven.csh)
+
+_setup_env() {
+  unset _JAVA_OPTIONS
+  . /etc/profile.d/jre.sh
+  . /etc/profile.d/jdk.sh
+  export MAVEN_OPTS=-Xmx512m
+  export M2_HOME="$pkgdir"/opt/maven
+  export PATH="$PATH:$M2_HOME/bin"
+  _M2_LOCALREPO=$(jh mvn-localrepo)
+  ant_args=(
+    -Dmaven.repo.local="$srcdir"/maven.repo.local
+  )
+}
+
+prepare() {
+  if type mvn &>/dev/null; then
+    error "maven cannot be built while an existing version is installed"
+    return 1
+  fi
+}
+
+build() (
+  _setup_env
+  install -d "$srcdir"/maven.repo.local
+  lndir "$_M2_LOCALREPO" "$srcdir"/maven.repo.local
+
+  cd "$srcdir"/apache-maven-$pkgver
+
+  # FIXME: downloads makedepends from the Internet. Add them to makedepends=()
+  ant "${ant_args[@]}" maven-assembly 2>&1|tee "$srcdir"/ant-log.txt
+
+  < "$srcdir"/ant-log.txt \
+    sed -nr 's/.*Download(ed|ing):\s*//p' | \
+    sed 's/ .*//' | \
+    sed -r -e 's|^http://repo.maven.apache.org/maven2/||' -e 's/\.(jar|pom)$//' | \
+    sort -u > "$srcdir"/downloaded-artifacts.txt
+)
+
+package() (
+  _setup_env
+  cd "$srcdir"/apache-maven-$pkgver
+  ant "${ant_args[@]}" extract-assembly
+  #rm "$pkgdir"/opt/maven/*.txt
+
+  # Install config file in /etc
+  #  Unlike the other directories, we symlink from the system to /opt/maven
+  #  because that way all conf files stay in /etc
+  install -d "$pkgdir"/etc/maven
+  sed "55i<localRepository>$_M2_LOCALREPO</localRepository>" \
+    < "$pkgdir"/opt/maven/conf/settings.xml \
+    > "$pkgdir"/etc/maven/settings.xml
+  rm -rf "$pkgdir"/opt/maven/conf
+  ln -s /etc/maven "$pkgdir"/opt/maven/conf
+
+  # Install profile.d settings
+  install -d "$pkgdir"/etc/profile.d
+  install -m 755 "$srcdir"/maven.{csh,sh} "$pkgdir"/etc/profile.d
+
+  # Link executables to /usr/bin
+  install -d "$pkgdir"/usr/bin
+  ln -s /opt/maven/bin/{mvn,mvnDebug,mvnyjp} "$pkgdir"/usr/bin
+
+  # Link jar files to appropriate place in /usr/share
+  install -d "$pkgdir"/usr/share/java
+  ln -s /opt/maven/lib "$pkgdir"/usr/share/java/maven
+
+  # Install the local repo
+  mkdir -p "$pkgdir"${_M2_LOCALREPO%/*}
+  cp -a "$srcdir"/maven.repo.local "$pkgdir"$_M2_LOCALREPO
+  # Remove extra artifacts
+  find "$pkgdir"$_M2_LOCALREPO -type l -delete
+  find "$pkgdir"$_M2_LOCALREPO -name _maven.repositories -delete
+  cat "$srcdir"/downloaded-artifacts.txt | while read artifact; do
+    rm -f "$pkgdir"$_M2_LOCALREPO/$artifact*
+  done
+)
+
+md5sums=('b88becd8fe5a9665191e05945942db64'
+         '58820067a4d7384477daa134023d9b57'
+         'e2bbdeffed100cd51d05b2ba8ebd6321')
diff --git a/java/maven/maven.csh b/java/maven/maven.csh
new file mode 100644
index 000000000..f5750cfc8
--- /dev/null
+++ b/java/maven/maven.csh
@@ -0,0 +1,2 @@
+setenv MAVEN_OPTS -Xmx512m
+setenv M2_HOME=/opt/maven
diff --git a/java/maven/maven.sh b/java/maven/maven.sh
new file mode 100644
index 000000000..b6655cc22
--- /dev/null
+++ b/java/maven/maven.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+export MAVEN_OPTS=-Xmx512m
+export M2_HOME=/opt/maven
diff --git a/java/not-working/closure-compiler/PKGBUILD b/java/not-working/closure-compiler/PKGBUILD
deleted file mode 100644
index 8318379a2..000000000
--- a/java/not-working/closure-compiler/PKGBUILD
+++ /dev/null
@@ -1,73 +0,0 @@
-# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
-
-pkgname=closure-compiler
-pkgver=20120917
-_pkgrev=2180
-pkgdesc="A JavaScript optimizing compiler."
-url="https://code.google.com/closure/compiler/"
-license=('Apache')
-
-pkgrel=1
-arch=('any')
-depends=('java-runtime')
-makedepends=(
-  'apache-ant'
-  'java-args4j' # does not exist
-  'google-caja' # does not exist
-  'java-guava' # does not build
-  'java-jarjar'
-  'java-json' # does not exist
-  'java-jsr305' # does not exist
-  'junit'
-  'java-protobuf' # does not build
-  # maven-ant-tasks
-  'jh')
-source=("compiler-$pkgver::svn+http://closure-compiler.googlecode.com/svn/trunk/#revision=$_pkgrev")
-
-# For some reason, `file` detects this as a Fortran binary
-_funny_js=(
-  lib/rhino/testsrc/benchmarks/sunspider-0.9.1/bitops-3bit-bits-in-byte.js
-)
-
-mksource() {
-  cd "$srcdir/compiler-$pkgver"
-  rm lib/ant.jar
-  rm lib/ant-launcher.jar
-  rm lib/args4j.jar
-  rm lib/caja-r4314.jar
-  rm lib/guava.jar
-  rm lib/jarjar.jar
-  rm lib/json.jar
-  rm lib/jsr305.jar
-  rm lib/junit.jar
-  rm lib/protobuf-java.jar
-  rm lib/rhino/testsrc/org/mozilla/javascript/tests/commonjs/module/modules.jar
-  rm tools/maven-ant-tasks-2.1.3.jar
-}
-
-build() {
-  cd "$srcdir/compiler-$pkgver"
-  eval `jh mksource ${_funny_js[@]}`
-
-  ln -s /opt/apache-ant/lib/ant.jar          lib/ant.jar
-  ln -s /opt/apache-ant/lib/ant-launcher.jar lib/ant-launcher.jar
-  ln -s /usr/share/java/...                  lib/args4j.jar
-  ln -s /usr/share/java/...                  lib/caja-r4314.jar
-  ln -s /usr/share/java/...                  lib/guava.jar
-  ln -s /usr/share/java/jarjar.jar           lib/jarjar.jar
-  ln -s /usr/share/java/...                  lib/json.jar
-  ln -s /usr/share/java/...                  lib/jsr305.jar
-  ln -s /usr/share/java/junit.jar            lib/junit.jar
-  ln -s /usr/share/java/protobuf.jar         lib/protobuf-java.jar
-  # I think lib/rhino/.../module.jar autogenerates
-  ln -s /...                                 tools/maven-ant-tasks-2.1.3.jar
-
-  ant jar
-}
-
-package() {
-  cd "$srcdir/$pkgname"
-  :
-}
-
-md5sums=('SKIP')
diff --git a/java/not-working/closure-compiler/TODO b/java/not-working/closure-compiler/TODO
deleted file mode 100644
index 8527a4898..000000000
--- a/java/not-working/closure-compiler/TODO
+++ /dev/null
@@ -1,2 +0,0 @@
-* Has plenty of missing dependencies (most of the 'not-working' folder)
-* package() has not been written
diff --git a/java/not-working/java-bnd/PKGBUILD b/java/not-working/java-bnd/PKGBUILD
new file mode 100644
index 000000000..86820469a
--- /dev/null
+++ b/java/not-working/java-bnd/PKGBUILD
@@ -0,0 +1,24 @@
+# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
+
+_pkgname=bnd
+pkgname=java-bnd
+pkgver=1.50.0
+pkgdesc="A swiss army knife for OSGi"
+url="http://www.aqute.biz/Bnd/"
+license=('Apache2')
+
+pkgrel=1
+arch=(any)
+makedepends=('apache-ant' 'junit')
+source=("git://github.com/bndtools/bnd.git")
+
+build() {
+  cd "$srcdir/$_pkgname"  
+  ant dist
+}
+
+package() {
+  :
+}
+
+md5sums=('SKIP')