updating spree in [java]

13 files changed, 269 insertions, 79 deletions

diff --git a/java-ugly/maven/PKGBUILD b/java-ugly/maven/PKGBUILD
index 2bd99940e..3f8e5071d 100644
--- a/java-ugly/maven/PKGBUILD
+++ b/java-ugly/maven/PKGBUILD
@@ -2,51 +2,72 @@
 # Maintainer (Arch): Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: William Rea <sillywilly@gmail.com>
 
-_pkgname=maven
-pkgname=maven-libre
-pkgver=3.0.4
+pkgname=maven
+pkgver=3.0.5
+pkgdesc="A Java project management and project comprehension tool"
+url="http://maven.apache.org"
+license=('Apache')
 
-provides=("$_pkgname=$pkgver")
-replaces=("$_pkgname")
-conflicts=("$_pkgname")
+replaces=('maven-libre')
+conflicts=('maven-libre')
 
 pkgrel=1
-pkgdesc="A Java project management and project comprehension tool"
 arch=('any')
-url="http://maven.apache.org"
-license=('Apache')
-depends=('java-environment')
-makedepends=('apache-ant')
+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/source/apache-maven-$pkgver-src.tar.gz
+source=($_mirror/maven/maven-${pkgver%%.*}/$pkgver/source/apache-maven-$pkgver-src.tar.gz
 	maven.sh maven.csh)
 
-_M2_LOCALREPO="/usr/share/maven/repository"
-
-# FIXME: This also does tasks for package()
-build() {
-  cd $srcdir/apache-maven-$pkgver
-
+_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
+  )
+}
 
-  # FIXME: Downloads many deps from Internet. They should be
-  #        packaged separately and added to depends=()
-  install -d "$pkgdir`dirname $_M2_LOCALREPO`"
-  cp -r $_M2_LOCALREPO "$pkgdir$_M2_LOCALREPO"
-  install -d "$pkgdir"/opt
-  ant -Dmaven.repo.local="$pkgdir$_M2_LOCALREPO"
-  rm "$pkgdir"/opt/maven/*.txt
+prepare() {
+  if type mvn &>/dev/null; then
+    error "maven cannot be built while an existing version is installed"
+    return 1
+  fi
 }
 
-package() {
-  install -d "$pkgdir$_M2_LOCALREPO"
+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
@@ -69,8 +90,18 @@ package() {
   # 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
-}
 
-md5sums=('17ca94d5be05a78c6ab12425b7a0ee10'
+  # 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/antlr2/PKGBUILD b/java/antlr2/PKGBUILD
new file mode 100644
index 000000000..4269d30c7
--- /dev/null
+++ b/java/antlr2/PKGBUILD
@@ -0,0 +1,100 @@
+# $Id: PKGBUILD 167380 2012-10-01 19:24:15Z guillaume $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+# Contributor: George Giorgidze <giorgidze (at) gmail.com>
+# Contributor: Stefan Husmann <stefan-husmann@t-online.de>
+
+pkgbase=antlr2
+pkgname=(antlr2 antlr2-{java,python2,cxx,sharp})
+pkgver=2.7.7
+url="http://www.antlr2.org/"
+license=('custom:Public Domain')
+
+pkgrel=3
+arch=('i686' 'x86_64')
+makedepends=('java-environment' 'python2' 'sh' 'nant' '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')
+
+build() {
+  cd "${srcdir}/antlr-${pkgver}"
+
+  patch -Np1 -i "${srcdir}"/gcc4.4.patch
+  patch -Np1 -i "${srcdir}"/mono.patch
+
+  ./configure --prefix=/usr --disable-examples
+  make -j1
+
+  cd lib/csharp
+  nant release
+}
+
+_install_license() {
+  install -Dm644 "$srcdir"/antlr-${pkgver}/LICENSE.txt \
+    "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}
+
+package_antlr2() {
+  pkgdesc="ANother Tool for Language Recognition (formerly PCCTS)"
+  depends=('sh' 'antlr2-java')
+
+  install -Dm755 "$srcdir"/runantlr2.sh "$pkgdir"/usr/bin/runantlr2
+  _install_license
+}
+
+package_antlr2-java() {
+  pkgdesc="ANother Tool for Language Recognition (formerly PCCTS) (Java version)"
+  depends=('java-runtime')
+
+  provides=("java-antlr2=$pkgver")
+  conflicts=("java-antlr2")
+  replaces=("java-antlr2")
+
+  DESTDIR="$pkgdir" jh mvn-install antlr antlr $pkgver \
+	  "$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')
+
+  provides=("python2-antlr2=$pkgver")
+  conflicts=("python2-antlr2")
+  replaces=("python2-antlr2")
+
+  cd "$srcdir"/antlr-${pkgver}/lib/python
+  python2 setup.py install --root="${pkgdir}" --optimize=1
+
+  _install_license
+}
+
+package_antlr2-cxx() {
+  pkgdesc="ANother Tool for Language Recognition (formerly PCCTS) (C++ version)"
+  depends=('java-runtime')
+
+  cd "$srcdir"/antlr-${pkgver}/lib/cpp
+  make -j1 prefix="${pkgdir}/usr" install
+
+  _install_license
+}
+
+package_antlr2-sharp() {
+  pkgdesc="ANother Tool for Language Recognition (formerly PCCTS) (C Sharp version)"
+  depends=('antlr2' 'mono')
+
+  cd "$srcdir"/antlr-${pkgver}/lib/csharp
+  install -d "$pkgdir"/usr/share
+  make -j1 prefix="${pkgdir}/usr" install
+
+  _install_license
+}
+
+md5sums=('01cc9a2a454dd33dcd8c856ec89af090'
+         '78af3de823003f6d8dded39c70bc30ae'
+         'e4aa827cf78f97c4e5fae086831192d6'
+         '158677e4c0f357afbb56656231a54815'
+         '0d1960d27ff81f2fea0dd35a8290216f')
diff --git a/java/antlr2/gcc4.4.patch b/java/antlr2/gcc4.4.patch
new file mode 100644
index 000000000..15e25fb00
--- /dev/null
+++ b/java/antlr2/gcc4.4.patch
@@ -0,0 +1,12 @@
+diff -Nur antlr-2.7.7.orig/lib/cpp/antlr/CharScanner.hpp antlr-2.7.7/lib/cpp/antlr/CharScanner.hpp
+--- antlr-2.7.7.orig/lib/cpp/antlr/CharScanner.hpp
++++ antlr-2.7.7/lib/cpp/antlr/CharScanner.hpp
+@@ -10,6 +10,8 @@
+ 
+ #include <antlr/config.hpp>
+ 
++#include <cstdio>
++#include <cstring>
+ #include <map>
+ 
+ #ifdef HAS_NOT_CCTYPE_H
diff --git a/java/antlr2/mono.patch b/java/antlr2/mono.patch
new file mode 100644
index 000000000..59c78d811
--- /dev/null
+++ b/java/antlr2/mono.patch
@@ -0,0 +1,31 @@
+diff -ruN antlr-2.7.7.orig/lib/csharp/antlr.runtime.build antlr-2.7.7/lib/csharp/antlr.runtime.build
+--- antlr-2.7.7.orig/lib/csharp/antlr.runtime.build	2006-11-01 16:37:17.000000000 -0500
++++ antlr-2.7.7/lib/csharp/antlr.runtime.build	2013-05-14 20:07:32.000000000 -0400
+@@ -25,6 +25,9 @@
+     	
+ 		<!-- Use script task to get this from AssemblyInfo.cs using a regular expression -->
+ 		<script language="C#">
++			<imports>
++				<import namespace="System.Text.RegularExpressions" />
++			</imports>
+ 			<code><![CDATA[
+ 				public static void ScriptMain(Project project) {
+ 					string assemblyInfoFileName = Path.Combine(project.BaseDirectory, "antlr.runtime/AssemblyInfo.cs");
+@@ -122,7 +125,7 @@
+         </csc>
+ 
+         <!-- copy the antlr.runtime assembly to the astframe build folder -->
+-        <copy file="${compile.dir}\${project.FileName}.dll" tofile="${astframe.compile.dir}\${project.FileName}.dll" />
++        <copy file="${compile.dir}/${project.FileName}.dll" tofile="${astframe.compile.dir}/${project.FileName}.dll" />
+ 
+         <!-- compile antlr.astframe.dll -->
+         <csc target="library" output="${astframe.compile.dir}/${astframe.FileName}.dll" debug="${debug}" doc="${astframe.build.dir}/${astframe.FileName}.xml">
+@@ -134,7 +137,7 @@
+ 	            	<include name="System.dll" />
+ 					<include name="System.Drawing.dll" />
+ 					<include name="System.Windows.Forms.dll" />
+-					<include name="${astframe.compile.dir}\${project.FileName}.dll" />
++					<include name="${astframe.compile.dir}/${project.FileName}.dll" />
+ 				</references>              					
+ 				<arg value="/nowarn:1591"/>
+         </csc>
diff --git a/java/antlr2/runantlr2.sh b/java/antlr2/runantlr2.sh
new file mode 100644
index 000000000..716f6f887
--- /dev/null
+++ b/java/antlr2/runantlr2.sh
@@ -0,0 +1,5 @@
+#!/bin/sh
+echo Running 'java antlr.Tool $*' with /usr/share/java/antlr2.jar appended to the CLASSPATH variable
+export CLASSPATH
+CLASSPATH=$CLASSPATH:/usr/share/java/antlr2.jar
+java antlr.Tool $*
diff --git a/java/java-asm2/PKGBUILD b/java/java-asm2/PKGBUILD
index 3541c20ab..71bc0f303 100644
--- a/java/java-asm2/PKGBUILD
+++ b/java/java-asm2/PKGBUILD
@@ -5,8 +5,7 @@ pkgver=2.2.3
 
 ####
 
-pkgrel=5
-_checksource_ignore=('test/conform/org/objectweb/asm/signature/signatures.txt')
+pkgrel=6
 
 mksource() {
   cd "$srcdir/$_pkgname-$pkgver"
@@ -15,4 +14,5 @@ mksource() {
   mkdir -p test/lib
 }
 
-md5sums=('7a92c87bf067925685cf68dcc0dd8998')
+mkmd5sums=('7a92c87bf067925685cf68dcc0dd8998')
+md5sums=('c2119ab39618cb49ca4e4ad74344b488')
diff --git a/java/java-asm2/PKGBUILD-bootstrap b/java/java-asm2/PKGBUILD-bootstrap
index 9e896a90e..cbe29bb34 100644
--- a/java/java-asm2/PKGBUILD-bootstrap
+++ b/java/java-asm2/PKGBUILD-bootstrap
@@ -7,6 +7,7 @@
 
 makedepends=(jh)
 source=("http://download.forge.objectweb.org/$_pkgname/$_pkgname-$pkgver-bin.zip")
+unset mksource
 _distdir="$_pkgname-$pkgver"
 
 provides+=("$pkgname=$pkgver")
diff --git a/java/java-asm2/common.sh b/java/java-asm2/common.sh
index 6a664c9ff..ef4547696 100644
--- a/java/java-asm2/common.sh
+++ b/java/java-asm2/common.sh
@@ -13,21 +13,21 @@ makedepends=(
   java-ow-util-ant-tasks
   jh
 )
-source=("http://download.forge.objectweb.org/$_pkgname/$_pkgname-$pkgver.tar.gz")
+source=("libre://$pkgname-$pkgver.tar.gz")
+mksource=("http://download.forge.objectweb.org/$_pkgname/$_pkgname-$pkgver.tar.gz")
 
 _distdir="$_pkgname-$pkgver/output/dist"
 _ow_util_ant_tasks='/usr/share/java/ow_util_ant_tasks.jar'
 
 build() {
   cd "$srcdir/$_pkgname-$pkgver"
-  eval `jh mksource ${_checksource_ignore[@]}`
 
   echo "objectweb.ant.tasks.path $_ow_util_ant_tasks" >> build.properties
   ant dist
 
   # This will make package() easier:
   cd "$srcdir/$_distdir/lib"
-  ln -s all/* .
+  ln -sf all/* .
 }
 
 package() {
@@ -48,12 +48,18 @@ package() {
 
   # Install Maven artifacts
   export DESTDIR=$pkgdir
-  for artifact in $(ls *.jar|sed 's/-[0-9.]*\.jar$//'); do
-    jh mvn-install $_pkgname $artifact $pkgver $artifact-$pkgver.{jar,pom}
-    # Symlink them to /usr/share/java
-    ln -s "$(jh mvn-basename asm $artifact $pkgver).jar" \
+  for artifact in $(printf '%s\n' *.pom|sed 's/-[0-9.]*\.pom$//'); do
+    if [[ -f $artifact-$pkgver.jar ]]; then
+      # This artifact has a jar file
+      jh mvn-install $_pkgname $artifact $pkgver $artifact-$pkgver.{pom,jar}
+      # Symlink them to /usr/share/java
+      ln -s "$(jh mvn-basename asm $artifact $pkgver).jar" \
 	"$pkgdir"/usr/share/java/$_pkgname/
-    ln -s $_pkgname/$artifact-$pkgver.jar \
+      ln -s $_pkgname/$artifact-$pkgver.jar \
 	"$pkgdir"/usr/share/java/$artifact-${pkgver%%.*}.jar
+    else
+      # This artifact is just a pom
+      jh mvn-install $_pkgname $artifact $pkgver $artifact-$pkgver.pom
+    fi
   done
 }
diff --git a/java/java-asm3/PKGBUILD b/java/java-asm3/PKGBUILD
index e85896b72..345c83edf 100644
--- a/java/java-asm3/PKGBUILD
+++ b/java/java-asm3/PKGBUILD
@@ -5,8 +5,7 @@ pkgver=3.3.1
 
 ####
 
-pkgrel=5
-_checksource_ignore=(src/org/objectweb/asm/optimizer/jdk{1.2.2_017,1.3.1_19}.txt.gz)
+pkgrel=6
 
 mksource() {
   cd "$srcdir/$_pkgname-$pkgver"
@@ -14,4 +13,5 @@ mksource() {
   rm examples/jasmin/test/jasmin.jar
 }
 
-md5sums=('433024df8176f09922646316e415631c')
+mkmd5sums=('433024df8176f09922646316e415631c')
+md5sums=('c49fb45629cf8670b7f46b95013141cd')
diff --git a/java/java-ow-util-ant-tasks/PKGBUILD b/java/java-ow-util-ant-tasks/PKGBUILD
index f1add43ea..1f94c8728 100644
--- a/java/java-ow-util-ant-tasks/PKGBUILD
+++ b/java/java-ow-util-ant-tasks/PKGBUILD
@@ -2,14 +2,27 @@
 
 pkgname=java-ow-util-ant-tasks
 pkgver=1.3.2
-pkgrel=1
 pkgdesc="ObjectWeb utility Ant tasks library"
-arch=('any')
 url="http://forge.ow2.org/projects/monolog"
 license=('LGPL')
+
+pkgrel=2
+arch=('any')
 depends=('java-environment')
 makedepends=('apache-ant' 'xalan-java' 'java-asm2')
-source=("http://repo.parabolagnulinux.org/sources/${pkgname}-${pkgver}-1-any.src.tar.xz")
+
+source=("libre://$pkgname-$pkgver.tar.gz")
+mksource=("http://download.forge.objectweb.org/monolog/ow_util_ant_tasks_$pkgver.zip")
+noextract=("ow_util_ant_tasks_$pkgver.zip")
+
+mksource() {
+  cd "$srcdir"
+  mkdir $pkgname-$pkgver
+  cd $pkgname-$pkgver
+  bsdtar xf "$srcdir"/ow_util_ant_tasks_$pkgver.zip
+  rm -rf output
+  rm externals/*
+}
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
@@ -24,4 +37,5 @@ package() {
   install -m644 "output/lib/ow_util_ant_tasks.jar" "$pkgdir"/usr/share/java
 }
 
-md5sums=('339b3eb4b2960473a42f5f781afbeca6')
+mkmd5sums=('cd602bf75a0feab480fa97739955b84e')
+md5sums=('5622ed33b43a4ba5bdc5e63a8e2b913b')
diff --git a/java/java-ow-util-ant-tasks/SRCBUILD b/java/java-ow-util-ant-tasks/SRCBUILD
deleted file mode 100644
index 01241907d..000000000
--- a/java/java-ow-util-ant-tasks/SRCBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
-
-pkgname=java-ow-util-ant-tasks
-pkgver=1.3.2
-pkgrel=1
-pkgdesc="ObjectWeb utility Ant tasks library"
-arch=('any')
-url="http://forge.ow2.org/projects/monolog"
-license=('LGPL')
-source=("http://download.forge.objectweb.org/monolog/ow_util_ant_tasks_$pkgver.zip")
-noextract=("ow_util_ant_tasks_$pkgver.zip")
-
-build() {
-  cd "$srcdir"
-  mkdir $pkgname-$pkgver
-  cd $pkgname-$pkgver
-  bsdtar xf "$srcdir"/ow_util_ant_tasks_$pkgver.zip
-  rm -rf output
-  rm externals/*
-}
-
-
-package() {
-  PKGEXT=${SRCEXT}
-  PKGDEST=${SRCDEST}
-  cp -a "$srcdir/$pkgname-$pkgver" "$pkgdir/"
-}
-
-md5sums=('cd602bf75a0feab480fa97739955b84e')
diff --git a/java/jh/PKGBUILD b/java/jh/PKGBUILD
index 3f01ed7d0..4c1dee6f3 100644
--- a/java/jh/PKGBUILD
+++ b/java/jh/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
 
 pkgname=jh
-pkgver=0.4
+pkgver=0.5
 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=('8982b5a25a802e6004a0c20f96a1f185')
+md5sums=('5fe2279fbada213eb8df38875450c4d2')
diff --git a/java/nant/PKGBUILD b/java/nant/PKGBUILD
new file mode 100644
index 000000000..02d9908a6
--- /dev/null
+++ b/java/nant/PKGBUILD
@@ -0,0 +1,19 @@
+# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net
+
+pkgname=nant
+pkgver=0.92
+pkgrel=1
+pkgdesc="A free .NET build tool"
+arch=('i686' 'x86_64')
+url="http://nant.sourceforge.net"
+license=("GPL2")
+depends=('mono-basic')
+makedepends=('pkgconfig')
+source=("http://downloads.sourceforge.net/nant/$pkgname-$pkgver-src.tar.gz")
+
+package() {
+  cd "$srcdir"/$pkgname-$pkgver
+  make -j1 install prefix=/usr DESTDIR="$pkgdir"
+}
+
+md5sums=('d680b47f9b2ce197cec0fac7d7d60950')