10 files changed, 170 insertions, 195 deletions
diff --git a/libre/java-asm/PKGBUILD b/libre/java-asm/PKGBUILD
new file mode 100644
index 000000000..382b9c177
--- /dev/null
+++ b/libre/java-asm/PKGBUILD
@@ -0,0 +1,83 @@
+# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
+
+_pkgname=asm
+pkgname=java-asm
+pkgver=3.3.1
+pkgrel=2
+pkgdesc="An all purpose Java bytecode manipulation and analysis framework."
+arch=('any')
+url="http://asm.ow2.org/"
+license=('custom:BSD3')
+depends=('java-runtime')
+makedepends=(
+  apache-ant
+  java-ow-util-ant-tasks
+)
+source=("http://download.forge.objectweb.org/$_pkgname/$_pkgname-$pkgver.tar.gz")
+
+build() {
+  cd "$srcdir/$_pkgname-$pkgver"
+
+  rm cobertura.ser # We regenerate this
+  rm examples/jasmin/test/jasmin.jar
+
+  echo 'objectweb.ant.tasks.path /usr/share/java/ow_util_ant_tasks.jar' >> build.properties
+  ant dist
+}
+
+# Tests have more dependencies, and I can't be bothered to package them.
+#check() {
+#  cd "$srcdir/$_pkgname-$pkgver"
+#  ant test
+#}
+
+mvn-install() {
+  group=$1
+  pkg=$2
+  ver=$3
+
+  dir="$pkgdir"/usr/share/maven/repository/$group/$pkg/$ver
+  install -d "$dir"
+  cp $pkg-$pkgver.* "$dir"
+}
+
+package() {
+  cd "$srcdir/$_pkgname-$pkgver"
+
+  # Install license file
+  install -Dm644 LICENSE.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+
+  # Install documentation
+  cd output/dist
+  install -d "$pkgdir/usr/share/doc/$pkgname"
+  cp -r doc/javadoc/user "$pkgdir/usr/share/doc/$pkgname/javadoc"
+  cp -r examples         "$pkgdir/usr/share/doc/$pkgname/examples"
+  
+  # Install Apache Maven modules
+  cd lib
+  mvn-install asm asm $pkgver
+  mvn-install asm asm-analysis $pkgver
+  mvn-install asm asm-commons $pkgver
+  mvn-install asm asm-parent $pkgver
+  mvn-install asm asm-tree $pkgver
+  mvn-install asm asm-util $pkgver
+  mvn-install asm asm-xml $pkgver
+  cd all
+  mvn-install asm asm-all $pkgver
+  mvn-install asm asm-debug-all $pkgver
+
+  # Synlink Maven modules to /usr/share/java
+  install -d "$pkgdir"/usr/share/java/asm
+  cd "$pkgdir"
+  find usr/share/maven/repository/asm \
+    -type f -name '*.jar' -printf '/%p\n' | while read jar; do
+    ln -s "$jar" "$pkgdir"/usr/share/java/asm
+  done
+  
+  # Put the finishing touches on /usr/share/java
+  ln -s "asm/asm-$pkgver.jar" "$pkgdir"/usr/share/java/asm.jar
+  cd "$srcdir/$_pkgname-$pkgver"
+  install -m644 output/dist/lib/all/README.txt "$pkgdir"/usr/share/java/asm
+}
+
+md5sums=('433024df8176f09922646316e415631c')
diff --git a/libre/maven-libre/PKGBUILD b/libre/maven-libre/PKGBUILD
new file mode 100644
index 000000000..5ed656245
--- /dev/null
+++ b/libre/maven-libre/PKGBUILD
@@ -0,0 +1,74 @@
+# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
+# Maintainer (Arch): Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Contributor: William Rea <sillywilly@gmail.com>
+
+_pkgname=maven
+pkgname=maven-libre
+pkgver=3.0.4
+
+provides=("$_pkgname=$pkgver")
+replaces=("$_pkgname")
+conflicts=("$_pkgname")
+
+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')
+backup=('etc/maven/settings.xml')
+
+_mirror=http://archive.apache.org/dist
+source=($_mirror/maven/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
+
+  . /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"
+
+  # FIXME: Downloads many deps from Internet. They should be
+  #        packaged separately and added to depends=()
+  # FIXME: Does things that should be in package()
+  install -d "$pkgdir$_M2_LOCALREPO"
+  install -d "$pkgdir"/opt
+  ant -Dmaven.repo.local="$pkgdir$_M2_LOCALREPO"
+  rm "$pkgdir"/opt/maven/*.txt
+}
+
+package() {
+  # 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
+}
+
+md5sums=('17ca94d5be05a78c6ab12425b7a0ee10'
+         '58820067a4d7384477daa134023d9b57'
+         'e2bbdeffed100cd51d05b2ba8ebd6321')
diff --git a/libre/maven-libre/maven.csh b/libre/maven-libre/maven.csh
new file mode 100644
index 000000000..f5750cfc8
--- /dev/null
+++ b/libre/maven-libre/maven.csh
@@ -0,0 +1,2 @@
+setenv MAVEN_OPTS -Xmx512m
+setenv M2_HOME=/opt/maven
diff --git a/libre/maven-libre/maven.sh b/libre/maven-libre/maven.sh
new file mode 100644
index 000000000..b6655cc22
--- /dev/null
+++ b/libre/maven-libre/maven.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+export MAVEN_OPTS=-Xmx512m
+export M2_HOME=/opt/maven
diff --git a/~lukeshu-closure-compiler/java-asm/PKGBUILD b/~lukeshu-closure-compiler/java-asm/PKGBUILD
deleted file mode 100644
index b1d817441..000000000
--- a/~lukeshu-closure-compiler/java-asm/PKGBUILD
+++ /dev/null
@@ -1,46 +0,0 @@
-# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
-
-_pkgname=asm
-pkgname=java-asm
-pkgver=3.3.1
-pkgrel=1
-pkgdesc="An all purpose Java bytecode manipulation and analysis framework."
-arch=('any')
-url="http://asm.ow2.org/"
-license=('custom:BSD3')
-depends=('java-runtime')
-source=("http://download.forge.objectweb.org/$_pkgname/$_pkgname-$pkgver.tar.gz")
-
-build() {
-  cd "$srcdir/$_pkgname-$pkgver"
-
-  rm examples/jasmin/test/jasmin.jar
-  rm cobertura.ser # This is just precompiled for convenience
-
-  echo 'paths.configured /lts' >> build.config
-  echo 'test.paths.configured /lts' >> build.config
-  ant dist
-}
-
-# Tests have more dependencies, and I can't be bothered to package them.
-#check() {
-#  cd "$srcdir/$_pkgname-$pkgver"
-#  ant test
-#}
-
-package() {
-  cd "$srcdir/$_pkgname-$pkgver"
-
-  install -D -m644 LICENSE.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-
-  cd output/dist
-  
-  install -d "$pkgdir/usr/share/doc/$pkgname"
-  cp -r doc/javadoc/user "$pkgdir/usr/share/doc/$pkgname/javadoc"
-  cp -r examples         "$pkgdir/usr/share/doc/$pkgname/examples"
-  
-  install -d "$pkgdir/usr/share/java/$_pkgname"
-  cp -r lib/* "$pkgdir/usr/share/java/$_pkgname"
-}
-
-md5sums=('433024df8176f09922646316e415631c')
diff --git a/~lukeshu-closure-compiler/java-jarjar/PKGBUILD b/~lukeshu-closure-compiler/java-jarjar/PKGBUILD
deleted file mode 100644
index 31f374427..000000000
--- a/~lukeshu-closure-compiler/java-jarjar/PKGBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
-
-_pkgname=jarjar
-pkgname=java-jarjar
-pkgver=1.1
-pkgrel=1
-pkgdesc="A utility that makes it easy to repackage Java libraries and embed them into your own distribution."
-arch=('any')
-url="https://code.google.com/p/jarjar/"
-license=('Apache2')
-depends=('java-runtime')
-makedepends=('apache-ant' 'java-asm' 'maven')
-source=("http://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}-${pkgrel}-any.src.tar.xz")
-
-build() {
-  cd "$srcdir/$pkgname"
-
-  ln -s /usr/share/java/asm/asm-3.3.1.jar lib
-  ln -s /usr/share/java/asm/asm-commons-3.3.1.jar lib
-  ln -s /opt/maven/lib/maven-plugin-api-*.jar lib/maven-plugin-api.jar
-
-  # Define the version
-  sed -i "s/snapshot/$pkgver/" build.xml
-
-  # Fix a bug causing an incompatibility with newer versions of ant
-  sed -i 's/zipDir(null,/zipDir((java.io.File)null,/' \
-      src/main/com/tonicsystems/jarjar/util/AntJarProcessor.java
-
-  ant jar
-}
-
-package() {
-  cd "$srcdir/$pkgname"
-  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=('af46c24b90d009169b7f83ee1e8bbd9c')
diff --git a/~lukeshu-closure-compiler/java-jarjar/SRCBUILD b/~lukeshu-closure-compiler/java-jarjar/SRCBUILD
deleted file mode 100644
index b716eeb51..000000000
--- a/~lukeshu-closure-compiler/java-jarjar/SRCBUILD
+++ /dev/null
@@ -1,42 +0,0 @@
-# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
-
-_pkgname=jarjar
-pkgname=java-jarjar
-pkgver=1.1
-pkgrel=1
-pkgdesc="A utility that makes it easy to repackage Java libraries and embed them into your own distribution."
-arch=('any')
-url="https://code.google.com/p/jarjar/"
-license=('Apache2')
-makedepends=('subversion' 'findutils')
-options=('!strip' 'docs' '!zipman' 'emptydirs')
-
-_svntrunk="https://jarjar.googlecode.com/svn/tags/release-$pkgver/$_pkgname"
-_svnver=131
-
-build() {
-  cd "$srcdir"
-  msg "Connecting to SVN server...."
-
-  if [[ -d "$pkgname/.svn" ]]; then
-    (cd "$pkgname" && svn up -r "$_svnver")
-  else
-    svn co "$_svntrunk" --config-dir ./ -r "$_svnver" "$pkgname"
-  fi
-
-  msg "SVN checkout done or server timeout"
-
-  msg "Removing .svn files..."
-  find . -name .svn -print0 | xargs -0 rm -rf
-
-  msg "Removing precompiled binaries..."
-  cd "$srcdir/$pkgname"
-  rm -v src/test/*.class src/test/*.jar
-  rm -v lib/*.jar
-}
-
-package() {
-  PKGEXT=${SRCEXT}
-  PKGDEST=${SRCDEST}
-  cp -a "${srcdir}/${pkgname}" "${pkgdir}/"
-}
diff --git a/~lukeshu-closure-compiler/protobuf-java/PKGBUILD b/~lukeshu-closure-compiler/protobuf-java/PKGBUILD
deleted file mode 100644
index 473bf3f2f..000000000
--- a/~lukeshu-closure-compiler/protobuf-java/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# Maintainer: Igor R. Dejanovic igor.dejanovic@gmail.com
-# Contributor: Igor R. Dejanovic igor.dejanovic@gmail.com
-
-pkgname=protobuf-java
-_xpkgname=protobuf
-pkgver=2.4.1
-pkgrel=1
-pkgdesc="Google's data interchange format utility (java API)."
-url="http://code.google.com/p/protobuf/"
-license=('custom:BSD')
-arch=('any')
-depends=("java-environment")
-makedepends=('java-environment' 'maven' "${_xpkgname}>=${pkgver}")
-source=(http://protobuf.googlecode.com/files/$_xpkgname-$pkgver.tar.bz2 protobuf-java.patch)
-md5sums=('ed436802019c9e1f40cc750eaf78f318'
-         '01a3244c88fc5ddfee07c658c0bc7df4')
-
-build() {
-
-  cd $srcdir/$_xpkgname-$pkgver
-  patch -p1 < ../protobuf-java.patch
-
-  cd $srcdir/$_xpkgname-$pkgver/java
-  mvn package
-
-}
-
-package() {
-  install -Dm644 "$srcdir/$_xpkgname-$pkgver/java/target/$pkgname-$pkgver.jar" \
-                "$pkgdir/usr/share/java/$pkgname/$pkgname-$pkgver.jar"
-  install -Dm644 "$srcdir/$_xpkgname-$pkgver/COPYING.txt" \
-      "$pkgdir/usr/share/licenses/$pkgname/COPYING.txt"
-}
-
diff --git a/~lukeshu-closure-compiler/protobuf-java/protobuf-java.patch b/~lukeshu-closure-compiler/protobuf-java/protobuf-java.patch
deleted file mode 100644
index 1286223ed..000000000
--- a/~lukeshu-closure-compiler/protobuf-java/protobuf-java.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -aur protobuf-2.4.1/java/pom.xml protobuf-2.4.1-patched/java/pom.xml
---- protobuf-2.4.1/java/pom.xml	2011-04-30 19:23:04.000000000 +0200
-+++ protobuf-2.4.1-patched/java/pom.xml	2011-05-09 17:58:09.000000000 +0200
-@@ -78,7 +78,7 @@
-             <configuration>
-               <tasks>
-                 <mkdir dir="target/generated-sources" />
--                <exec executable="../src/protoc">
-+                <exec executable="protoc">
-                   <arg value="--java_out=target/generated-sources" />
-                   <arg value="--proto_path=../src" />
-                   <arg value="../src/google/protobuf/descriptor.proto" />
-@@ -96,7 +96,7 @@
-             <configuration>
-               <tasks>
-                 <mkdir dir="target/generated-test-sources" />
--                <exec executable="../src/protoc">
-+                <exec executable="protoc">
-                   <arg value="--java_out=target/generated-test-sources" />
-                   <arg value="--proto_path=../src" />
-                   <arg value="--proto_path=src/test/java" />
diff --git a/~lukeshu/parabolaweb-git/PKGBUILD b/~lukeshu/parabolaweb-git/PKGBUILD
index 9b2614ed8..962b1c977 100644
--- a/~lukeshu/parabolaweb-git/PKGBUILD
+++ b/~lukeshu/parabolaweb-git/PKGBUILD
@@ -1,22 +1,19 @@
 # Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
+# This does not follow normal package guidelines; it is not a normal package.
 
 pkgname=parabolaweb-git
-pkgver=20111204
-pkgrel=1
+pkgver=20120228
+pkgrel=2
 pkgdesc="The Parabola website, fork of archweb"
 arch=('any')
 url="https://projects.parabolagnulinux.org/parabolaweb.git/"
 license=('GPL2')
-depends=('python2' 'git'
-    'django=1.3.1'
-    'python-markdown=2.0.3'
-    'python-south=0.7.3'
-    'python2-pyinotify=0.9.2'
-    'python-memcached=1.47'
-    'python2-pytz>=2011n'
 
-    'python2-psycopg2'
-)
+_requirements=https://projects.parabolagnulinux.org/parabolaweb.git/plain/requirements_prod.txt
+depends=('python2' 'git'
+    `curl -s "$_requirements" | sed -r -e 's/.*/\L&/' -e 's/==/=/' \
+      -e 's/^(south)/python-&/' \
+      -e 's/^(markdown|psycopg2|pyinotify|pytz)/python2-&/'`)
 install=parabolaweb.install
 
 # These will make it install into /http/srv/web
@@ -38,5 +35,3 @@ build() {
 package() {
     install -d "${pkgdir}/${_install_dir}"
 }
-
-# vim:set ts=2 sw=2 et: