11 files changed, 24 insertions, 279 deletions
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-asm4/PKGBUILD b/java/not-working/java-asm4/PKGBUILD
deleted file mode 100644
index 3db06dddc..000000000
--- a/java/not-working/java-asm4/PKGBUILD
+++ /dev/null
@@ -1,17 +0,0 @@
-# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
-
-pkgver=4.1
-. ../java-asm2/common.sh
-depends+=('java-bnd')
-
-####
-
-pkgrel=5
-_checksource_ignore=(src/org/objectweb/asm/optimizer/jdk{1.2.2_017,1.3.1_19}.txt.gz)
-
-mksource() {
-  cd "$srcdir/$_pkgname-$pkgver"
-  rm examples/jasmin/test/jasmin.jar
-}
-
-md5sums=('cbfd7445edc517e0867ad410e48cb106')
diff --git a/java/not-working/java-asm4/TODO b/java/not-working/java-asm4/TODO
deleted file mode 100644
index 563c88bc9..000000000
--- a/java/not-working/java-asm4/TODO
+++ /dev/null
@@ -1 +0,0 @@
-Depends on java-bnd, which is not packaged
-\ No newline at end of file
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')
diff --git a/java/not-working/java-guava/PKGBUILD b/java/not-working/java-guava/PKGBUILD
deleted file mode 100644
index 0250e7183..000000000
--- a/java/not-working/java-guava/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
-
-_pkgname=guava
-pkgname=java-guava
-pkgver=13.0.1
-pkgdesc="Google Core Libraries for Java."
-url="https://code.google.com/p/guava-libraries/"
-license=('Apache2')
-
-pkgrel=1
-arch=('any')
-depends=('java-runtime>=5')
-makedepends=('java-runtime>=6' 'maven' 'junit-truth' 'jh')
-conflicts=('openjdk6') # OpenJDK bug 100167 conflicts
-source=("$pkgname::git+https://code.google.com/p/guava-libraries/#tag=v$pkgver")
-
-mksource() {
-  cd "$srcdir/$pkgname"
-  rm guava/lib/*.jar
-  rm guava-test/lib/*.jar
-}
-
-build() {
-  cd "$srcdir/$pkgname"
-  eval `jh mksource`
-
-  ln -s /usr/share/java/junit-truth.jar guava-tests/lib/libtruth.java
-
-  mvn package
-}
-
-package() {
-    :
-}
diff --git a/java/not-working/java-guava/TODO b/java/not-working/java-guava/TODO
deleted file mode 100644
index ee0a18042..000000000
--- a/java/not-working/java-guava/TODO
+++ /dev/null
@@ -1,2 +0,0 @@
-* depends on junit-truth, which does not build yet
-* package() hasn't been written
diff --git a/java/not-working/junit-truth/PKGBUILD b/java/not-working/junit-truth/PKGBUILD
deleted file mode 100644
index 61a0ee469..000000000
--- a/java/not-working/junit-truth/PKGBUILD
+++ /dev/null
@@ -1,45 +0,0 @@
-# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
-
-pkgname=junit-truth
-pkgdesc="Assertion/Proposition framework for Java unit tests."
-url="https://github.com/truth0/truth"
-license=('Apache2')
-
-#_pkgver=0.5.0-beta1
-#pkgver=${_pkgver//-/.}
-#_tag=v${_pkgver}
-
-#pkgver=0.7.0
-#_tag=truth-rel-${pkgver//./-}
-
-#pkgver=0.8
-#_tag=truth-${pkgver}
-
-#pkgver=0.9
-#_tag=release_${pkgver//./_}
-
-pkgver=0.10
-_tag=release_${pkgver//./_}
-
-pkgrel=1
-arch=('any')
-depends=('junit')
-makedepends=('maven' 'jh')
-conflicts=('openjdk6') # OpenJDK bug 100167 conflicts
-source=("$pkgname::git://github.com/truth0/truth.git#tag=$tag")
-
-build() {
-  cd "${srcdir}/${pkgname}"
-  jh checksource
-  mvn package
-}
-
-package() {
-  cd "${srcdir}/${pkgname}"
-  install -d "${pkgdir}"/usr/share/java/${pkgname}
-  JAR=${pkgname}-${pkgver}.jar
-  install -Dm 644 target/${JAR} "${pkgdir}"/usr/share/java/${pkgname}
-  ln -s       ${pkgname}/${JAR} "${pkgdir}"/usr/share/java/${pkgname}.jar
-}
-
-md5sums=('SKIP')
diff --git a/java/not-working/junit-truth/TODO b/java/not-working/junit-truth/TODO
deleted file mode 100644
index d21b3e472..000000000
--- a/java/not-working/junit-truth/TODO
+++ /dev/null
@@ -1 +0,0 @@
-has unpackaged dependencies
diff --git a/java/not-working/protobuf/PKGBUILD b/java/not-working/protobuf/PKGBUILD
deleted file mode 100644
index 699bde0cf..000000000
--- a/java/not-working/protobuf/PKGBUILD
+++ /dev/null
@@ -1,99 +0,0 @@
-# Maintainer: Thomas S Hatch <thatch45@gmail.com>
-# Contributor: Geoffroy Carrier <geoffroy@archlinux.org>
-# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
-
-pkgbase=protobuf
-pkgname=('protobuf' 'python2-protobuf' 'java-protobuf')
-pkgver=2.4.1
-pkgrel=2.1
-pkgdesc="A way of encoding structured data in an efficient yet extensible format"
-arch=('i686' 'x86_64')
-url="http://code.google.com/p/protobuf/"
-license=('APACHE')
-depends=('gcc-libs' 'zlib')
-makedepends=('python2' 'python2-distribute' 'java-environment')
-options=(!libtool)
-source=(http://$pkgname.googlecode.com/files/$pkgname-$pkgver.tar.bz2)
-md5sums=('ed436802019c9e1f40cc750eaf78f318')
-
-####
-
-build() {
-  build_protobuf
-  build_python2-protobuf
-  build_java-protobuf
-}
-
-check() {
-  check_protobuf
-  check_python2-protobuf
-  check_java-protobuf
-}
-
-package() {
-  package_protobuf
-  package_python2-protobuf
-  package_java-protobuf
-}
-
-####
-
-build_protobuf() {
-  cd $srcdir/$pkgname-$pkgver
-  ./configure --prefix=/usr --disable-static
-  make
-}
-
-check_protobuf() {
-  cd $srcdir/$pkgname-$pkgver
-  make check
-}
-
-package_protobuf() {
-  cd $srcdir/$pkgname-$pkgver
-  make DESTDIR=$pkgdir install
-}
-
-####
-
-build_python2-protobuf() {
-  cd $srcdir/$pkgname-$pkgver/python
-  python2 setup.py build
-}
-
-check_python2-protobuf() {
-  cd $srcdir/$pkgname-$pkgver/python
-  python2 setup.py test
-}
-
-package_python2-protobuf() {
-  pkgdesc="protobuf python2 API"
-  replaces=('protobuf-python')
-  provides=("protobuf-python=${pkgver}")
-  depends=("python2" "protobuf=${pkgver}")
-
-  cd $srcdir/protobuf-$pkgver/python
-  python2 setup.py install --prefix=/usr --root $pkgdir
-}
-
-####
-
-build_java-protobuf() {
-  cd $srcdir/$pkgname-$pkgver/java
-  mvn compile
-}
-
-check_java-protobuf() {
-  cd $srcdir/$pkgname-$pkgver/java
-  mvn test
-}
-
-package_java-protobuf() {
-  pkgdesc="protobuf Java API"
-  replaces=('protobuf-java')
-  provides=("protobuf-java=${pkgver}")
-  depends=("java-runtime" "protobuf=${pkgver}")
-
-  cd $srcdir/$pkgname-$pkgver/java
-  :
-}
diff --git a/java/not-working/protobuf/TODO b/java/not-working/protobuf/TODO
deleted file mode 100644
index 6a126b757..000000000
--- a/java/not-working/protobuf/TODO
+++ /dev/null
@@ -1,5 +0,0 @@
-* Missing dependencies:
- * junit:junit:4.4 (4.10 is packaged, patch to use 4.10?)
- * org.easymock:easymock:2.2
- * org.easymock:easymockclassextension:2.2.1
-* package_java-protobuf() has not been written