From e6450f3c0b59d3b51886f62d4fbd28ce66ec769a Mon Sep 17 00:00:00 2001
From: Luke Shumaker <LukeShu@sbcglobal.net>
Date: Wed, 26 Sep 2012 16:51:19 -0400
Subject: add java/java-rxtx, a dependency of arduino

---
 java/java-rxtx/ChangeLog.txt         |  8 ++++++
 java/java-rxtx/PKGBUILD              | 54 ++++++++++++++++++++++++++++++++++++
 java/java-rxtx/destdir.patch         | 20 +++++++++++++
 java/java-rxtx/java7-configure.patch | 38 +++++++++++++++++++++++++
 4 files changed, 120 insertions(+)
 create mode 100644 java/java-rxtx/ChangeLog.txt
 create mode 100644 java/java-rxtx/PKGBUILD
 create mode 100644 java/java-rxtx/destdir.patch
 create mode 100644 java/java-rxtx/java7-configure.patch

diff --git a/java/java-rxtx/ChangeLog.txt b/java/java-rxtx/ChangeLog.txt
new file mode 100644
index 000000000..7efab2514
--- /dev/null
+++ b/java/java-rxtx/ChangeLog.txt
@@ -0,0 +1,8 @@
+Differences from rxtx-2.1-7r2 made by Arduino:
+ * Adding support for /dev/ttyACM* devices on Linux.
+ * Fixing (I hope) problems on 64-bit Linux systems.
+ * Adding checks for Java 1.6.
+ * Removing unnecessary compiler warning.
+
+Differences from Arduino's version:
+ * Adding checks for Java 1.7.
diff --git a/java/java-rxtx/PKGBUILD b/java/java-rxtx/PKGBUILD
new file mode 100644
index 000000000..30ed25967
--- /dev/null
+++ b/java/java-rxtx/PKGBUILD
@@ -0,0 +1,54 @@
+# Maintainer (Parabola): Luke Shumaker <lukeshu@sbcglobal.net>
+# Maintainer (AUR): PyroPeter <googlemail.com@abi1789>
+
+pkgname=java-rxtx
+_pkgver=2.1-7r2-arduino4
+_gitver='commit=a8cd90f8505d7c472b57550b1192fe67885dd638'
+pkgver=${_pkgver//-/.}
+
+pkgrel=1
+pkgdesc="A native library providing serial and parallel communication for Java"
+arch=('i686' 'x86_64')
+depends=('java-environment')
+
+case "$_pkgver" in
+    *arduino*)
+	url="https://github.com/arduino/RXTX"
+	source=("git://github.com/arduino/RXTX.git#${_gitver}"
+	    java7-configure.patch
+	    destdir.patch)
+	license=(LGPL)
+	changelog=ChangeLog.txt
+	_dirname=RXTX
+	;;
+    *)
+	url="http://rxtx.qbang.org/"
+	source=("http://rxtx.qbang.org/pub/rxtx/rxtx-${_pkgver}.zip"
+	    destdir.patch)
+	# Todo: patch for Java 6 AND Java 7
+	license=('custom:LGPL-with-java-exception')
+	_dirname=rxtx-{$_pkgver}
+	;;
+esac
+
+build() {
+  cd "$srcdir/$_dirname"
+  . /etc/profile.d/jdk.sh
+
+  patch -i "$srcdir/java7-configure.patch"
+  patch -i "$srcdir/destdir.patch"
+
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd "$srcdir/$_dirname"
+  . /etc/profile.d/jdk.sh
+
+  make DESTDIR="$pkgdir" install
+}
+
+md5sums=('SKIP'
+         'f07bc244660852dd9b016c190e38e1c9'
+         '90be9bdf1d8cbe5304739df066559a13')
diff --git a/java/java-rxtx/destdir.patch b/java/java-rxtx/destdir.patch
new file mode 100644
index 000000000..11416841f
--- /dev/null
+++ b/java/java-rxtx/destdir.patch
@@ -0,0 +1,20 @@
+--- Makefile.in.orig	2012-09-21 15:21:00.000000000 -0400
++++ Makefile.in	2012-09-21 15:21:07.000000000 -0400
+@@ -566,13 +566,15 @@
+ #  install librxtxSerial.so into the proper directory and copy $(JARTARGET) to its
+ #  proper location
+ install: all
++	$(mkinstalldirs) $(DESTDIR)$(RXTX_PATH)
++	$(mkinstalldirs) $(DESTDIR)$(JHOME)
+ 	@$(LIBTOOL_INST) \
+ 	`for i in $(TARGETLIB);do \
+ 		if [ -f $$i ];then \
+ 			echo $$i; \
+ 		fi; \
+-	done` $(RXTX_PATH)
+-	$(INSTALL_PROGRAM) $(JARTARGET) $(JHOME)/
++	done` $(DESTDIR)$(RXTX_PATH)
++	$(INSTALL_PROGRAM) $(JARTARGET) $(DESTDIR)$(JHOME)/
+ 
+ clean-generic:
+ 	rm -rf $(DEST) $(TOP)/$(CLASSTOP)
diff --git a/java/java-rxtx/java7-configure.patch b/java/java-rxtx/java7-configure.patch
new file mode 100644
index 000000000..fed710200
--- /dev/null
+++ b/java/java-rxtx/java7-configure.patch
@@ -0,0 +1,38 @@
+--- configure.orig	2012-09-21 15:02:54.000000000 -0400
++++ configure	2012-09-21 15:03:38.000000000 -0400
+@@ -21541,7 +21541,7 @@
+ 	CFLAGS=$CFLAGS" -D__need_timespec"
+ 	case $JAVA_VERSION in
+ 
+-	1.2*|1.3*|1.4*|1.5*|1.6*)
++	1.2*|1.3*|1.4*|1.5*|1.6*|1.7*)
+ 		#fix_parameters $JPATH/jre/lib/javax.comm.properties
+ 		CLASSPATH=".:\$(TOP):\$(TOP)/src:"`find $JPATH/ -name RXTXcomm.jar |head -n1`
+ 		JHOME=$JPATH"/jre/lib/ext"
+@@ -21611,7 +21611,7 @@
+ 	TARGETLIB="\$(target_triplet)/librxtxSerial.la \
+ 			\$(target_triplet)/librxtxParallel.la"
+ 	case $JAVA_VERSION in
+-	1.2*|1.3*|1.4*|1.5*|1.6*)
++	1.2*|1.3*|1.4*|1.5*|1.6*|1.7*)
+ 		#fix_parameters $JPATH/jre/lib/javax.comm.properties
+ 		CLASSPATH=".:\$(TOP):\$(TOP)/src:"`find $JPATH/ -name RXTXcomm.jar |head -n1`
+ 		RXTX_PATH="\$(JPATH)/jre/lib/\$(OS_ARCH)"
+@@ -21747,7 +21747,7 @@
+ 
+ WIN32)
+ 	case $JAVA_VERSION in
+-	1.2*|1.3*|1.4*|1.5*|1.6*)
++	1.2*|1.3*|1.4*|1.5*|1.6*|1.7*)
+ 		CLASSPATH=".:\$(TOP):\$(TOP)/src:`find $JPATH/ -name RXTXcomm.jar |head -n1`:$CLASSPATH"
+ 		JHOME=$JPATH"/jre/lib/ext"
+ 	;;
+@@ -21799,7 +21799,7 @@
+ 	CLASSPATH=".:\$(TOP):\$(TOP)/src:\$(JPATH)/lib/classes.zip:\$(JPATH)/lib/RXTXcomm.jar:$CLASSPATH"
+ 
+ 	case $JAVA_VERSION in
+-	1.2*|1.3*|1.4*|1.5*|1.6*)
++	1.2*|1.3*|1.4*|1.5*|1.6*|1.7*)
+ 		RXTX_PATH="\$(JPATH)/jre/lib/\$(OS_ARCH)"
+ 	;;
+ 	1.1*)
-- 
cgit v1.2.3


From 706009a7dba502eb03d133afe818c03a43d45108 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <LukeShu@sbcglobal.net>
Date: Wed, 26 Sep 2012 16:51:39 -0400
Subject: add java/jna, a dependency of arduino

---
 java/jna/PKGBUILD                    | 117 +++++++++++++++++++++++++++++++++++
 java/jna/bugfix-type-inference.patch |  13 ++++
 java/jna/libre-without-clover.patch  |  71 +++++++++++++++++++++
 java/jna/webstart-test.keystore      | Bin 0 -> 679 bytes
 4 files changed, 201 insertions(+)
 create mode 100644 java/jna/PKGBUILD
 create mode 100644 java/jna/bugfix-type-inference.patch
 create mode 100644 java/jna/libre-without-clover.patch
 create mode 100644 java/jna/webstart-test.keystore

diff --git a/java/jna/PKGBUILD b/java/jna/PKGBUILD
new file mode 100644
index 000000000..db5f552cb
--- /dev/null
+++ b/java/jna/PKGBUILD
@@ -0,0 +1,117 @@
+# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
+
+pkgname=jna
+pkgver=3.4.2
+
+pkgdesc="Provides Java programs easy access to native shared libraries"
+url="https://github.com/twall/jna"
+license=('LGPL')
+source=("git://github.com/twall/jna.git#tag=${pkgver}"
+  'libre-without-clover.patch'
+  'bugfix-type-inference.patch'
+  'webstart-test.keystore')
+
+####
+
+pkgrel=1
+arch=('i686' 'x86_64')
+depends=('java-environment' 'libffi')
+makedepends=('apache-ant' 'zip')
+checkdepends=('junit' 'icedtea-web-java7')
+options=('!makeflags')
+
+unset _JAVA_OPTIONS
+_M2_LOCALREPO='/usr/share/maven/repository'
+. /etc/profile.d/jdk.sh
+
+_ant_options=(
+  '-Ddynlink.native=true' # use the system install of libffi
+)
+
+####
+
+mksource() {
+  cd "$srcdir/jna"
+  find . -name '*.jar' -delete
+  rm -rf dist
+  rm -rf native/libffi # make sure it doesn't cheat
+  rm lib/clover.license
+  rm w32ce-test.lnk
+
+  ln -s /usr/share/java/junit.jar lib/
+
+  # Create an emtpy zip (jar) file
+  cd "$srcdir"
+  touch file
+  zip empty.zip file
+  zip -d empty.zip file
+  rm file
+}
+
+####
+
+build() {
+  mksource
+  cd "$srcdir/jna"
+
+  # Because JNA's release process is ridiculous, it wants a jar file for every
+  # architecture to be present.  So let's just dump in an empty jar file!
+  sed -n 's|\s*<zipfileset src="${lib\.native}/\(.*\)"|\1|p' build.xml \
+    | while read jarfile; do
+    cp "$srcdir/empty.zip" lib/native/$jarfile
+  done
+
+  patch -p1 -i "$srcdir/libre-without-clover.patch"
+  patch -p1 -i "$srcdir/bugfix-type-inference.patch"
+
+  # Disable tests that intermittently fail
+  # crashes vm (segfault)
+  sed -i -e 's|testRegisterMethods|no&|' test/com/sun/jna/DirectTest.java
+  # crashes vm, java 7 only (icedtea-7, oracle-jdk-bin-1.7)
+  sed -i -e 's|testGCCallbackOnFinalize|no&|' test/com/sun/jna/CallbacksTest.java
+
+  # Actually build
+  ant "${_ant_options[@]}" dist
+}
+
+check() {
+  cd "$srcdir/jna"
+
+  # Create a foke home directory to trash
+  mkdir "$srcdir/user.home"
+  export _JAVA_OPTIONS="-Duser.home=$srcdir/user.home"
+
+  # The webstart test looks for this config file
+  mkdir -p "$srcdir/user.home/.java/deployment"
+  touch "$srcdir/user.home/.java/deployment/deployment.properties"
+
+  # Trust the cert used for the webstart test
+  mkdir -p "$srcdir/user.home/.icedtea/security"
+  cp "$srcdir/webstart-test.keystore" "$srcdir/user.home/.icedtea/security/trusted.certs"
+
+  _ant_options+=('-Dtests.exclude-patterns=**/DirectTest.java')
+
+  # Run the tests
+  ant "${_ant_options[@]}" test
+}
+
+package() {
+  cd "$srcdir/jna"
+
+  install -d "$pkgdir/usr/share/java/jna"
+
+  for pkg in jna platform; do
+   dir="$_M2_LOCALREPO"/net/java/dev/jna/$pkg/$pkgver
+   install -d "$pkgdir$dir"
+   cp dist/$pkg.jar "$pkgdir$dir/$pkg-$pkgver.jar"
+   cp pom-$pkg.xml  "$pkgdir$dir/$pkg-$pkgver.pom"
+   ln -s "$dir/$pkg-$pkgver.jar" "$pkgdir/usr/share/java/jna/$pkg.jar"
+  done
+
+  ln -s jna/jna.jar "$pkgdir/usr/share/java/jna.jar"
+}
+
+md5sums=('SKIP'
+         '3a2f96b868f49ca125b677779e846484'
+         '932d9cb2da1531a2315ae132480683fa'
+         'b704c7d2cb1fe7a93f8cad8d321d16f8')
diff --git a/java/jna/bugfix-type-inference.patch b/java/jna/bugfix-type-inference.patch
new file mode 100644
index 000000000..2322b13fc
--- /dev/null
+++ b/java/jna/bugfix-type-inference.patch
@@ -0,0 +1,13 @@
+diff -ru jna-3.4.2.orig/test/com/sun/jna/NativeTest.java jna-3.4.2/test/com/sun/jna/NativeTest.java
+--- jna-3.4.2.orig/test/com/sun/jna/NativeTest.java	2012-09-03 08:30:42.000000000 -0400
++++ jna-3.4.2/test/com/sun/jna/NativeTest.java	2012-09-24 15:29:48.000000000 -0400
+@@ -374,7 +374,8 @@
+             for (int i=0;i < args.length;i++) {
+                 System.out.println("Running tests on class " + args[i]);
+                 try {
+-                    junit.textui.TestRunner.run(Class.forName(args[i]));
++                    Class<?> klass = Class.forName(args[i]);
++                    junit.textui.TestRunner.run((Class<? extends TestCase>)klass);
+                 }
+                 catch(Throwable e) {
+                     e.printStackTrace();
diff --git a/java/jna/libre-without-clover.patch b/java/jna/libre-without-clover.patch
new file mode 100644
index 000000000..b4947e8b2
--- /dev/null
+++ b/java/jna/libre-without-clover.patch
@@ -0,0 +1,71 @@
+diff -ru jna-3.4.2.orig/build.xml jna-3.4.2/build.xml
+--- jna-3.4.2.orig/build.xml	2012-09-06 06:55:52.000000000 -0400
++++ jna-3.4.2/build.xml	2012-09-24 15:49:59.000000000 -0400
+@@ -230,7 +230,6 @@
+     <path id="test.runpath">
+       <pathelement path="${build}/${jar}"/>
+       <pathelement path="${test.classes}"/>
+-      <pathelement path="lib/clover.jar"/>
+       <path refid="test.libs"/>
+     </path>
+   </target>
+@@ -536,12 +535,11 @@
+     <copy todir="${build}/jws" file="${build}/${jar}"/>
+     <copy todir="${build}/jws" file="${build}/${testjar}"/>
+     <copy todir="${build}/jws" file="lib/junit.jar"/>
+-    <copy todir="${build}/jws" file="lib/clover.jar"/>
+     <jar jarfile="${build}/jws/jnidispatch.jar">
+       <fileset dir="${build.native}" includes="*jnidispatch.*"/>
+     </jar>
+     <signjar alias="jna" keystore="jna.keystore" storepass="jnadev" lazy="true">
+-      <fileset dir="${build}/jws" includes="jna.jar,jna-test.jar,junit.jar,jnidispatch.jar,clover.jar"/>
++      <fileset dir="${build}/jws" includes="jna.jar,jna-test.jar,junit.jar,jnidispatch.jar"/>
+     </signjar>
+   </target>
+ 
+@@ -626,7 +624,7 @@
+       <report todir="${reports.junit}"/>
+     </junitreport>
+     <echo>View test report in file://${reports.junit}/index.html</echo>
+-    <fail if="testfailure" unless="clover">One or more tests failed</fail>
++    <fail if="testfailure">One or more tests failed</fail>
+   </target>
+ 
+   <target name="contrib-test" depends="contrib-jars,compile-tests">
+@@ -640,27 +638,6 @@
+     </subant>
+   </target>
+ 
+-  <target name="with.clover" description="Enable code coverage for tests">
+-    <taskdef resource="cloverlib.xml" classpath="lib/clover.jar"/>
+-    <property name="clover" value="true"/>
+-    <property name="build" value="build.clover"/>
+-    <clover-setup/>
+-  </target>
+-
+-  <target name="clover" depends="with.clover,test"
+-          description="Generate test code coverage reports">
+-    <property name="reports.clover" value="${reports}/clover"/>
+-    <mkdir dir="${reports.clover}"/>
+-    <clover-report>
+-      <current outfile="${reports.clover}" title="clover">
+-        <fileset dir="." includes="**/*.java" />
+-        <testresults dir="${results.junit}" includes="TEST-*.xml"/>
+-        <format type="html"/>
+-      </current>
+-    </clover-report>
+-    <echo>Reports generated in ${reports.clover}</echo>
+-  </target>
+-
+   <target name="javadoc" depends="-setup">
+     <path id="javadoc.src.path">
+       <path refid="src.path"/>
+@@ -881,7 +858,7 @@
+     <!-- Full sources required to build and test everything -->
+     <zip zipfile="${dist}/src-full.zip">
+       <zipfileset src="${dist}/src.zip"/>
+-      <zipfileset dir="lib" includes="junit.jar,clover.jar" prefix="lib"/>
++      <zipfileset dir="lib" includes="junit.jar" prefix="lib"/>
+       <zipfileset dir="." includes=".classpath,.project"/>
+       <zipfileset dir="${native}" includes="libffi,libffi/**/*" prefix="native"/>
+     </zip>
diff --git a/java/jna/webstart-test.keystore b/java/jna/webstart-test.keystore
new file mode 100644
index 000000000..1bbe8c829
Binary files /dev/null and b/java/jna/webstart-test.keystore differ
-- 
cgit v1.2.3


From 55ce2f9ba6fa030cea9008f93f5fc715ee027615 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <LukeShu@sbcglobal.net>
Date: Wed, 26 Sep 2012 16:51:52 -0400
Subject: add java/arduino

---
 java/arduino/PKGBUILD        |  88 +++++++++++++++++++++++++++++++++++++++++++
 java/arduino/arduino.desktop |   9 +++++
 java/arduino/arduino.install |  10 +++++
 java/arduino/arduino.png     | Bin 0 -> 47981 bytes
 4 files changed, 107 insertions(+)
 create mode 100644 java/arduino/PKGBUILD
 create mode 100644 java/arduino/arduino.desktop
 create mode 100644 java/arduino/arduino.install
 create mode 100644 java/arduino/arduino.png

diff --git a/java/arduino/PKGBUILD b/java/arduino/PKGBUILD
new file mode 100644
index 000000000..b21db4fbf
--- /dev/null
+++ b/java/arduino/PKGBUILD
@@ -0,0 +1,88 @@
+# Maintainer: PyroPeter <googlemail.com@abi1789>
+
+pkgname=arduino
+pkgver=1.0.1
+pkgrel=1
+pkgdesc="Arduino SDK"
+arch=('i686' 'x86_64')
+url="http://arduino.cc/en/Main/Software"
+options=(!strip)
+license=('GPL')
+
+makedependa=(java-environment avr-gcc avr-libc make apache-ant)
+depends=('avr-gcc>=4.3.2' 'avr-libc' 'libusb-compat' 'java-runtime' 'avrdude'
+    'java-rxtx' 'antlr2' 'eclipse-ecj' 'jna')
+#conflicts=('avr-gcc>=4.4')
+install="arduino.install"
+source=("http://arduino.googlecode.com/files/arduino-$pkgver-src.tar.gz"
+	'arduino.png'
+	'arduino.desktop')
+
+unset _JAVA_OPTIONS
+. /etc/profile.d/jdk.sh
+
+build() {
+  cd "$srcdir"
+  mkdir empty.d
+  cd empty.d
+  bsdtar cjf ../empty.tar.bz2 .
+  cd ..
+  rmdir empty.d
+
+  cd "$srcdir/arduino-$pkgver"
+  find . -name '*.jar' -delete
+  find . -name '*.swp' -delete
+  find . -name '*.so' -delete
+  rm -rf build/linux/dist/*/*
+
+  #ln -s /.../RXTXcomm.jar app/lib # already on the classpath
+  ln -s /usr/share/java/antlr2.jar app/lib/antlr.jar
+  #ln -s /.../apple.jar app/lib # only used on Mac OS
+  ln -s /usr/share/java/ecj.jar app/lib
+  ln -s /usr/share/java/jna.jar app/lib
+  ln -s /usr/bin/avrdude build/linux/dist/tools
+
+  ln -s "$srcdir/empty.tar.bz2" build/linux/avr_tools_linux32.tar.bz2
+  ln -s "$srcdir/empty.tar.bz2" build/linux/avr_tools_linux64.tar.bz2
+
+  for d in methods preproc; do
+      cd "$srcdir/arduino-$pkgver/core/$d"
+      ant
+  done
+
+  cd "$srcdir/arduino-$pkgver/build"
+
+  log=`mktemp`
+  ant 2>&1|tee "$log"
+  if egrep -q 'Error|FAILED' "$log"; then
+      rm "$log"
+      false
+  else
+      rm "$log"
+  fi
+}
+
+package() {
+  cd "$srcdir/arduino-$pkgver/build/linux/work"
+
+  # arduino excutable should accept arguments
+  sed -i 's|^java .* processing.app.Base$|\0 "$@"|' arduino
+  sed -i 's|^APPDIR=.*|APPDIR=/usr/share/arduino|' arduino
+
+  mkdir -p "$pkgdir"/usr/{bin,share/{doc,applications,pixmaps}}
+
+  # copy the whole SDK to /usr/share/arduino/
+  cp -r . "$pkgdir/usr/share/arduino"
+
+  # at least support the FHS a little bit:
+  install -m755 "arduino" "$pkgdir/usr/bin/arduino"
+  ln -s /usr/share/arduino/reference "$pkgdir/usr/share/doc/arduino"
+
+  # desktop icon
+  install -m644 "$srcdir/arduino.desktop" "$pkgdir/usr/share/applications/"
+  install -m644 "$srcdir/arduino.png" "$pkgdir/usr/share/pixmaps/"
+}
+
+md5sums=('03263613f4be4f865989244420be04fa'
+         '9e36d33891d5e68d38ec55d1494499a5'
+         'eebc4d6495864bea99ad057af801afb9')
diff --git a/java/arduino/arduino.desktop b/java/arduino/arduino.desktop
new file mode 100644
index 000000000..8469724ea
--- /dev/null
+++ b/java/arduino/arduino.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=Arduino
+GenericName=Arduino IDE
+Comment=The open-source Arduino environment
+Exec=arduino
+Icon=arduino
+Type=Application
+Terminal=false
+Categories=Development;IDE;Qt;KDE;;Application;
diff --git a/java/arduino/arduino.install b/java/arduino/arduino.install
new file mode 100644
index 000000000..35d283fab
--- /dev/null
+++ b/java/arduino/arduino.install
@@ -0,0 +1,10 @@
+post_install() {
+  xdg-icon-resource install --size 256 --novendor /usr/share/pixmaps/arduino.png
+  echo "Don't forget to add yourself to the uucp group: gpasswd -a <user> uucp"
+}
+
+pre_remove() {
+  xdg-icon-resource uninstall --size 256 arduino
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/java/arduino/arduino.png b/java/arduino/arduino.png
new file mode 100644
index 000000000..ea3ac81b4
Binary files /dev/null and b/java/arduino/arduino.png differ
-- 
cgit v1.2.3


From f02e29ff7501aa7b5e074c60718c61ff10e6622d Mon Sep 17 00:00:00 2001
From: Luke Shumaker <LukeShu@sbcglobal.net>
Date: Wed, 26 Sep 2012 17:09:23 -0400
Subject: mv libre/apache-ant java/apache-ant

---
 java/apache-ant/PKGBUILD        | 110 ++++++++++++++++++++++++++++++++++++++++
 java/apache-ant/apache-ant.csh  |   2 +
 java/apache-ant/apache-ant.sh   |   2 +
 libre/apache-ant/PKGBUILD       | 110 ----------------------------------------
 libre/apache-ant/apache-ant.csh |   2 -
 libre/apache-ant/apache-ant.sh  |   2 -
 6 files changed, 114 insertions(+), 114 deletions(-)
 create mode 100755 java/apache-ant/PKGBUILD
 create mode 100755 java/apache-ant/apache-ant.csh
 create mode 100755 java/apache-ant/apache-ant.sh
 delete mode 100755 libre/apache-ant/PKGBUILD
 delete mode 100755 libre/apache-ant/apache-ant.csh
 delete mode 100755 libre/apache-ant/apache-ant.sh

diff --git a/java/apache-ant/PKGBUILD b/java/apache-ant/PKGBUILD
new file mode 100755
index 000000000..77e0dfe94
--- /dev/null
+++ b/java/apache-ant/PKGBUILD
@@ -0,0 +1,110 @@
+# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
+# Maintainer (Arch): Paul Mattal <paul@archlinux.org>
+# Contributor: Andrew Wright <andreww@photism.org>
+
+pkgname=apache-ant
+pkgver=1.8.4
+
+provides=("apache-ant-libre=$pkgver")
+replaces=("apache-ant-libre")
+conflicts=("apache-ant-libre")
+
+pkgrel=1.1
+pkgdesc="A Java-based build tool"
+arch=('any')
+license=('Apache')
+url="http://ant.apache.org/"
+_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[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[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[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-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-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-advanced-imaging]='<image> task/usr/share/java/jai/*.jar'
+
+for pkg in "${!_opts[@]}"; do
+  optdepends+=("$pkg: ${_opts[$pkg]%;*}")
+  makedepends+=("$pkg")
+done
+
+build() {
+  # This directory is what becomes
+  # http://archive.apache.org/dist/ant/binaries/${pkgname}-${pkgver}-bin.tar.bz2
+  # which is what Arch uses
+  rm -rf "${srcdir}"/${pkgname}-${pkgver}-bin
+  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/*::}`
+  done
+  # Build
+  source "/etc/profile.d/jdk.sh"   # Get the JAVA_HOME env var
+  sh build.sh -Ddist.dir="${srcdir}"/${pkgname}-${pkgver}-bin dist
+}
+
+package() {
+  cd "${srcdir}"/${pkgname}-${pkgver}-bin
+  source "${srcdir}"/${pkgname}.sh # Get the ANT_HOME env var
+  source "/etc/profile.d/jdk.sh"   # Get the JAVA_HOME env var
+
+  ## Install profile.d script
+  install -d "${pkgdir}"/etc/profile.d
+  install -m755 "${srcdir}"/${pkgname}.{csh,sh} "${pkgdir}"/etc/profile.d/
+
+  ## Install the main distribution
+  install -d "${pkgdir}"/${ANT_HOME}
+  cp -Rp * "${pkgdir}"/${ANT_HOME}
+
+  ## Fix the distribution
+  # Remove Windows .bat/.cmd files
+  rm -f "${pkgdir}"/${ANT_HOME}/bin/*.{bat,cmd}
+  # 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/*::}`
+  done
+
+  ## Symlink the /opt distribution to the normal places
+  install -d "${pkgdir}"/usr/bin
+  install -d "${pkgdir}"/usr/share/doc/${pkgname}
+  install -d "${pkgdir}"/usr/share/licenses/${pkgname}
+
+  cd "${pkgdir}"/${ANT_HOME}
+  for prog in bin/*; do
+      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'
+         'bd63c881be406f515fc4d22635e8326a'
+         'aaa615512cbe1ed7f3b62c1ff46802f8')
diff --git a/java/apache-ant/apache-ant.csh b/java/apache-ant/apache-ant.csh
new file mode 100755
index 000000000..fdc04b2f8
--- /dev/null
+++ b/java/apache-ant/apache-ant.csh
@@ -0,0 +1,2 @@
+#!/bin/csh
+setenv ANT_HOME /opt/apache-ant
diff --git a/java/apache-ant/apache-ant.sh b/java/apache-ant/apache-ant.sh
new file mode 100755
index 000000000..6e4809da5
--- /dev/null
+++ b/java/apache-ant/apache-ant.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+export ANT_HOME=/opt/apache-ant
diff --git a/libre/apache-ant/PKGBUILD b/libre/apache-ant/PKGBUILD
deleted file mode 100755
index 77e0dfe94..000000000
--- a/libre/apache-ant/PKGBUILD
+++ /dev/null
@@ -1,110 +0,0 @@
-# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
-# Maintainer (Arch): Paul Mattal <paul@archlinux.org>
-# Contributor: Andrew Wright <andreww@photism.org>
-
-pkgname=apache-ant
-pkgver=1.8.4
-
-provides=("apache-ant-libre=$pkgver")
-replaces=("apache-ant-libre")
-conflicts=("apache-ant-libre")
-
-pkgrel=1.1
-pkgdesc="A Java-based build tool"
-arch=('any')
-license=('Apache')
-url="http://ant.apache.org/"
-_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[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[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[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-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-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-advanced-imaging]='<image> task/usr/share/java/jai/*.jar'
-
-for pkg in "${!_opts[@]}"; do
-  optdepends+=("$pkg: ${_opts[$pkg]%;*}")
-  makedepends+=("$pkg")
-done
-
-build() {
-  # This directory is what becomes
-  # http://archive.apache.org/dist/ant/binaries/${pkgname}-${pkgver}-bin.tar.bz2
-  # which is what Arch uses
-  rm -rf "${srcdir}"/${pkgname}-${pkgver}-bin
-  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/*::}`
-  done
-  # Build
-  source "/etc/profile.d/jdk.sh"   # Get the JAVA_HOME env var
-  sh build.sh -Ddist.dir="${srcdir}"/${pkgname}-${pkgver}-bin dist
-}
-
-package() {
-  cd "${srcdir}"/${pkgname}-${pkgver}-bin
-  source "${srcdir}"/${pkgname}.sh # Get the ANT_HOME env var
-  source "/etc/profile.d/jdk.sh"   # Get the JAVA_HOME env var
-
-  ## Install profile.d script
-  install -d "${pkgdir}"/etc/profile.d
-  install -m755 "${srcdir}"/${pkgname}.{csh,sh} "${pkgdir}"/etc/profile.d/
-
-  ## Install the main distribution
-  install -d "${pkgdir}"/${ANT_HOME}
-  cp -Rp * "${pkgdir}"/${ANT_HOME}
-
-  ## Fix the distribution
-  # Remove Windows .bat/.cmd files
-  rm -f "${pkgdir}"/${ANT_HOME}/bin/*.{bat,cmd}
-  # 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/*::}`
-  done
-
-  ## Symlink the /opt distribution to the normal places
-  install -d "${pkgdir}"/usr/bin
-  install -d "${pkgdir}"/usr/share/doc/${pkgname}
-  install -d "${pkgdir}"/usr/share/licenses/${pkgname}
-
-  cd "${pkgdir}"/${ANT_HOME}
-  for prog in bin/*; do
-      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'
-         'bd63c881be406f515fc4d22635e8326a'
-         'aaa615512cbe1ed7f3b62c1ff46802f8')
diff --git a/libre/apache-ant/apache-ant.csh b/libre/apache-ant/apache-ant.csh
deleted file mode 100755
index fdc04b2f8..000000000
--- a/libre/apache-ant/apache-ant.csh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/csh
-setenv ANT_HOME /opt/apache-ant
diff --git a/libre/apache-ant/apache-ant.sh b/libre/apache-ant/apache-ant.sh
deleted file mode 100755
index 6e4809da5..000000000
--- a/libre/apache-ant/apache-ant.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-export ANT_HOME=/opt/apache-ant
-- 
cgit v1.2.3


From 90659729131deb0bcaced168d9d932cd49c8ce7d Mon Sep 17 00:00:00 2001
From: Luke Shumaker <LukeShu@sbcglobal.net>
Date: Wed, 26 Sep 2012 17:10:23 -0400
Subject: mv libre/maven-libre java-ugly/maven

---
 java-ugly/maven/PKGBUILD    | 76 +++++++++++++++++++++++++++++++++++++++++++++
 java-ugly/maven/maven.csh   |  2 ++
 java-ugly/maven/maven.sh    |  3 ++
 libre/maven-libre/PKGBUILD  | 76 ---------------------------------------------
 libre/maven-libre/maven.csh |  2 --
 libre/maven-libre/maven.sh  |  3 --
 6 files changed, 81 insertions(+), 81 deletions(-)
 create mode 100755 java-ugly/maven/PKGBUILD
 create mode 100755 java-ugly/maven/maven.csh
 create mode 100755 java-ugly/maven/maven.sh
 delete mode 100755 libre/maven-libre/PKGBUILD
 delete mode 100755 libre/maven-libre/maven.csh
 delete mode 100755 libre/maven-libre/maven.sh

diff --git a/java-ugly/maven/PKGBUILD b/java-ugly/maven/PKGBUILD
new file mode 100755
index 000000000..2bd99940e
--- /dev/null
+++ b/java-ugly/maven/PKGBUILD
@@ -0,0 +1,76 @@
+# 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=()
+  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
+}
+
+package() {
+  install -d "$pkgdir$_M2_LOCALREPO"
+
+  # 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/java-ugly/maven/maven.csh b/java-ugly/maven/maven.csh
new file mode 100755
index 000000000..f5750cfc8
--- /dev/null
+++ b/java-ugly/maven/maven.csh
@@ -0,0 +1,2 @@
+setenv MAVEN_OPTS -Xmx512m
+setenv M2_HOME=/opt/maven
diff --git a/java-ugly/maven/maven.sh b/java-ugly/maven/maven.sh
new file mode 100755
index 000000000..b6655cc22
--- /dev/null
+++ b/java-ugly/maven/maven.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+export MAVEN_OPTS=-Xmx512m
+export M2_HOME=/opt/maven
diff --git a/libre/maven-libre/PKGBUILD b/libre/maven-libre/PKGBUILD
deleted file mode 100755
index 2bd99940e..000000000
--- a/libre/maven-libre/PKGBUILD
+++ /dev/null
@@ -1,76 +0,0 @@
-# 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=()
-  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
-}
-
-package() {
-  install -d "$pkgdir$_M2_LOCALREPO"
-
-  # 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
deleted file mode 100755
index f5750cfc8..000000000
--- a/libre/maven-libre/maven.csh
+++ /dev/null
@@ -1,2 +0,0 @@
-setenv MAVEN_OPTS -Xmx512m
-setenv M2_HOME=/opt/maven
diff --git a/libre/maven-libre/maven.sh b/libre/maven-libre/maven.sh
deleted file mode 100755
index b6655cc22..000000000
--- a/libre/maven-libre/maven.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-export MAVEN_OPTS=-Xmx512m
-export M2_HOME=/opt/maven
-- 
cgit v1.2.3


From 206fe44d98c5e965c07646e096e1cccd4b947aab Mon Sep 17 00:00:00 2001
From: Márcio Alexandre Silva Delgado <coadde@lavabit.com>
Date: Thu, 18 Oct 2012 18:34:45 -0200
Subject: blender-libre: updating package

---
 libre/blender-libre/PKGBUILD              | 95 +++++++++++++++++++++++++------
 libre/blender-libre/blender-libre.install | 13 +++++
 2 files changed, 90 insertions(+), 18 deletions(-)
 create mode 100755 libre/blender-libre/blender-libre.install

diff --git a/libre/blender-libre/PKGBUILD b/libre/blender-libre/PKGBUILD
index fcaa11298..1fc1a7f91 100755
--- a/libre/blender-libre/PKGBUILD
+++ b/libre/blender-libre/PKGBUILD
@@ -3,9 +3,9 @@
 
 pkgname=blender-libre
 pkgver=2.64a
-pkgrel=1
+pkgrel=2
 pkgaev=5
-pkgdesc='A fully integrated 3D graphics creation suite, without nonfree cuda-toolkit support'
+pkgdesc='A fully integrated 3D graphics creation suite, without nonfree cuda-toolkit and redcode image format support'
 arch=(
   i686
   x86_64
@@ -16,29 +16,88 @@ license=(
 )
 url=http://www.${pkgname%-libre}.org
 depends=(
-  boost-libs
-  desktop-file-utils
+  # rbd tree #
   ffmpeg
   fftw
   freetype2
-  glew
-  glu
-  hicolor-icon-theme
   jack
-  libgl
   libpng
-  libsndfile
   libtiff
   openal
-  opencollada
-  opencolorio
-  openexr
   openimageio
-  python
+  opencolorio
+  # bed #
+  opencollada
+  # ded #
+  desktop-file-utils
+  hicolor-icon-theme
   shared-mime-info
   xdg-utils
+  # cbd tree #
+  #alsa-lib
+  #boost-libs
+  #bzip2
+  #celt
+  #dbus-core
+  #flac
+  #gcc-libs
+  #glew
+  #glibc
+  #glu
+  #gsm
+  #icu
+  #ilmbase
+  #json-c
+  #lame
+  #libasyncns
+  #libdrm
+  #libgl
+  #libglapi
+  #libice
+  #libjpeg-turbo
+  #libogg
+  #libpulse
+  #libsndfile
+  #libsm
+  #libtheora
+  #libva
+  #libvorbis
+  #libvpx
+  #libx11
+  #libxau
+  #libxcb
+  #libxdamage
+  #libxdmcp
+  #libxext
+  #libxfixes
+  #libxi
+  #libxml2
+  #libxmu
+  #libxt
+  #libxxf86vm
+  #ocr
+  #openexr
+  #opencore-amr
+  #openjpeg
+  #openssl
+  #pcre
+  #python
+  #rtmpdump
+  #sdl-libre
+  #schroedinger
+  #speex
+  #util-linux
+  #x264
+  #xvidcore
+  #xz
+  #v4l-utils
+  #zlib
+)
+optdepends=(
+  'bullet: for Physics Simulation in BGE'
 )
 makedepends=(
+  # rmd tree #
   mesa
   boost
   cmake
@@ -53,7 +112,7 @@ conflicts=(
 provides=(
   ${pkgname%-libre}=$pkgaev:$pkgver
 )
-install=${pkgname%-libre}.install
+install=$pkgname.install
 source=(
   http://download.${pkgname%-libre}.org/source/${pkgname%-libre}-$pkgver.tar.gz
 )
@@ -62,7 +121,7 @@ sha512sums=(
 )
 
 build() {
-  cd $srcdir/${pkgname%-libre}-$pkgver
+  cd "$srcdir/${pkgname%-libre}-$pkgver"
 
   mkdir build
   cd build
@@ -72,10 +131,10 @@ build() {
   cmake .. \
     -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_INSTALL_PREFIX=/usr \
-    -DPYTHON_INCLUDE_DIRS=/usr/include/python3.2mu \
+    -DPYTHON_INCLUDE_DIRS=/usr/include/python3.3m \
     -DPYTHON_LIBPATH=/usr/lib \
-    -DPYTHON_LIBRARY=python3.2mu \
-    -DPYTHON_VERSION=3.2 \
+    -DPYTHON_LIBRARY=python3.3m \
+    -DPYTHON_VERSION=3.3 \
     $DSUPPORT_SSE2_BUILD \
     -DWITH_CODEC_FFMPEG=ON \
     -DWITH_CODEC_SNDFILE=ON \
diff --git a/libre/blender-libre/blender-libre.install b/libre/blender-libre/blender-libre.install
new file mode 100755
index 000000000..724bfce00
--- /dev/null
+++ b/libre/blender-libre/blender-libre.install
@@ -0,0 +1,13 @@
+post_install() {
+  update-desktop-database -q
+  update-mime-database usr/share/mime &> /dev/null
+  xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}
-- 
cgit v1.2.3


From 42735e67c78a104933d4d3184f704149815f7b38 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <LukeShu@sbcglobal.net>
Date: Thu, 18 Oct 2012 17:31:01 -0400
Subject: add java/jh

---
 java/jh/PKGBUILD | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 java/jh/PKGBUILD

diff --git a/java/jh/PKGBUILD b/java/jh/PKGBUILD
new file mode 100644
index 000000000..a34cee122
--- /dev/null
+++ b/java/jh/PKGBUILD
@@ -0,0 +1,24 @@
+# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
+
+pkgname=jh
+pkgver=0.3
+pkgdesc="Java helpers for PKGBUILDs"
+url="https://gitorious.org/parabola/jh"
+license=('Public Domain')
+
+pkgrel=1
+arch=(any)
+depends=(xmlstarlet maven)
+source=("git://gitorious.org/parabola/jh.git#tag=v$pkgver")
+
+build() {
+  cd "$srcdir/$pkgname"
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname"
+  make install DESTDIR="$pkgdir"
+}
+
+md5sums=('SKIP')
-- 
cgit v1.2.3


From bbd428cf29cf1b28325a661e7f6ddcddac0226d4 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <LukeShu@sbcglobal.net>
Date: Thu, 18 Oct 2012 17:09:55 -0400
Subject: mv libre/java-* java/

---
 java/java-asm2/PKGBUILD               | 76 ++++++++++++++++++++++++++++++++++
 java/java-asm3/PKGBUILD               | 78 +++++++++++++++++++++++++++++++++++
 java/java-ow-util-ant-tasks/PKGBUILD  | 27 ++++++++++++
 java/java-ow-util-ant-tasks/SRCBUILD  | 29 +++++++++++++
 libre/java-asm2/PKGBUILD              | 76 ----------------------------------
 libre/java-asm3/PKGBUILD              | 78 -----------------------------------
 libre/java-ow-util-ant-tasks/PKGBUILD | 27 ------------
 libre/java-ow-util-ant-tasks/SRCBUILD | 29 -------------
 8 files changed, 210 insertions(+), 210 deletions(-)
 create mode 100755 java/java-asm2/PKGBUILD
 create mode 100755 java/java-asm3/PKGBUILD
 create mode 100755 java/java-ow-util-ant-tasks/PKGBUILD
 create mode 100755 java/java-ow-util-ant-tasks/SRCBUILD
 delete mode 100755 libre/java-asm2/PKGBUILD
 delete mode 100755 libre/java-asm3/PKGBUILD
 delete mode 100755 libre/java-ow-util-ant-tasks/PKGBUILD
 delete mode 100755 libre/java-ow-util-ant-tasks/SRCBUILD

diff --git a/java/java-asm2/PKGBUILD b/java/java-asm2/PKGBUILD
new file mode 100755
index 000000000..4853d79c0
--- /dev/null
+++ b/java/java-asm2/PKGBUILD
@@ -0,0 +1,76 @@
+# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
+
+_pkgname=asm
+pkgname=java-asm2
+_pkgver=2
+pkgver=2.2.3
+pkgrel=4
+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")
+
+_M2_LOCALREPO='/usr/share/maven/repository'
+_ow_util_ant_tasks='/usr/share/java/ow_util_ant_tasks.jar'
+_m2_packages=(
+  asm
+  asm-analysis
+  asm-attrs
+  asm-commons
+  asm-tree
+  asm-util
+  asm-xml
+  asm-all)
+
+build() {
+  cd "$srcdir/$_pkgname-$pkgver"
+
+  mkdir -p test/lib
+
+  echo "objectweb.ant.tasks.path $_ow_util_ant_tasks" >> build.properties
+  ant dist
+
+  # This will make package() easier:
+  cd output/dist/lib
+  ln -s all/* .
+}
+
+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
+  install -d "$pkgdir"/usr/share/java/asm
+  for pkg in "${_m2_packages[@]}"; do
+    dir="$_M2_LOCALREPO"/asm/$pkg/$pkgver
+    # Create the Maven directory
+    install -d "$pkgdir$dir"
+    # Install the files
+    cp $pkg-$pkgver.* "$pkgdir$dir"
+    # Symlink them to /usr/share/java
+    ln -s "$dir"/$pkg-$pkgver.jar "$pkgdir"/usr/share/java/asm/
+    ln -s asm/$pkg-$pkgver.jar "$pkgdir"/usr/share/java/$pkg-$_pkgver.jar
+  done
+  
+  # Install a README file about the -all files
+  cd "$srcdir/$_pkgname-$pkgver"
+  install -m644 output/dist/lib/all/README.txt \
+    "$pkgdir"/usr/share/java/asm/README-$pkgver.txt
+}
+
+md5sums=('7a92c87bf067925685cf68dcc0dd8998')
diff --git a/java/java-asm3/PKGBUILD b/java/java-asm3/PKGBUILD
new file mode 100755
index 000000000..7e66a5b5a
--- /dev/null
+++ b/java/java-asm3/PKGBUILD
@@ -0,0 +1,78 @@
+# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
+
+_pkgname=asm
+pkgname=java-asm3
+_pkgver=3
+pkgver=3.3.1
+pkgrel=4.1
+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")
+
+_M2_LOCALREPO='/usr/share/maven/repository'
+_ow_util_ant_tasks='/usr/share/java/ow_util_ant_tasks.jar'
+_m2_packages=(
+  asm
+  asm-analysis
+  asm-commons
+  asm-parent
+  asm-tree
+  asm-util
+  asm-xml
+  asm-all
+  asm-debug-all)
+
+build() {
+  cd "$srcdir/$_pkgname-$pkgver"
+
+  rm cobertura.ser # We regenerate this
+  rm examples/jasmin/test/jasmin.jar
+
+  echo "objectweb.ant.tasks.path $_ow_util_ant_tasks" >> build.properties
+  ant dist
+
+  # This will make package() easier:
+  cd output/dist/lib
+  ln -s all/* .
+}
+
+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
+  install -d "$pkgdir"/usr/share/java/asm
+  for pkg in "${_m2_packages[@]}"; do
+    dir="$_M2_LOCALREPO"/asm/$pkg/$pkgver
+    # Create the Maven directory
+    install -d "$pkgdir$dir"
+    # Install the files
+    cp $pkg-$pkgver.* "$pkgdir$dir"
+    # Symlink them to /usr/share/java
+    ln -s "$dir"/$pkg-$pkgver.jar "$pkgdir"/usr/share/java/asm/
+    ln -s asm/$pkg-$pkgver.jar "$pkgdir"/usr/share/java/$pkg-$_pkgver.jar
+  done
+  
+  # Install a README file about the -all files
+  cd "$srcdir/$_pkgname-$pkgver"
+  install -m644 output/dist/lib/all/README.txt \
+    "$pkgdir"/usr/share/java/asm/README-$pkgver.txt
+}
+
+md5sums=('433024df8176f09922646316e415631c')
diff --git a/java/java-ow-util-ant-tasks/PKGBUILD b/java/java-ow-util-ant-tasks/PKGBUILD
new file mode 100755
index 000000000..023048188
--- /dev/null
+++ b/java/java-ow-util-ant-tasks/PKGBUILD
@@ -0,0 +1,27 @@
+# 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')
+depends=('java-environment')
+makedepends=('apache-ant' 'xalan-java' 'java-asm2')
+source=("http://repo.parabolagnulinux.org/sources/${pkgname}-${pkgver}-1-any.src.tar.xz")
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+  ln -s /usr/share/java/asm-2.jar externals
+  ln -s /usr/share/java/xalan.jar externals
+  ant jar
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  install -d "$pkgdir"/usr/share/java
+  install -m644 "output/lib/ow_util_ant_tasks.jar" "$pkgdir"/usr/share/java
+}
+
+md5sums=('339b3eb4b2960473a42f5f781afbeca6')
diff --git a/java/java-ow-util-ant-tasks/SRCBUILD b/java/java-ow-util-ant-tasks/SRCBUILD
new file mode 100755
index 000000000..01241907d
--- /dev/null
+++ b/java/java-ow-util-ant-tasks/SRCBUILD
@@ -0,0 +1,29 @@
+# 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/libre/java-asm2/PKGBUILD b/libre/java-asm2/PKGBUILD
deleted file mode 100755
index 4853d79c0..000000000
--- a/libre/java-asm2/PKGBUILD
+++ /dev/null
@@ -1,76 +0,0 @@
-# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
-
-_pkgname=asm
-pkgname=java-asm2
-_pkgver=2
-pkgver=2.2.3
-pkgrel=4
-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")
-
-_M2_LOCALREPO='/usr/share/maven/repository'
-_ow_util_ant_tasks='/usr/share/java/ow_util_ant_tasks.jar'
-_m2_packages=(
-  asm
-  asm-analysis
-  asm-attrs
-  asm-commons
-  asm-tree
-  asm-util
-  asm-xml
-  asm-all)
-
-build() {
-  cd "$srcdir/$_pkgname-$pkgver"
-
-  mkdir -p test/lib
-
-  echo "objectweb.ant.tasks.path $_ow_util_ant_tasks" >> build.properties
-  ant dist
-
-  # This will make package() easier:
-  cd output/dist/lib
-  ln -s all/* .
-}
-
-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
-  install -d "$pkgdir"/usr/share/java/asm
-  for pkg in "${_m2_packages[@]}"; do
-    dir="$_M2_LOCALREPO"/asm/$pkg/$pkgver
-    # Create the Maven directory
-    install -d "$pkgdir$dir"
-    # Install the files
-    cp $pkg-$pkgver.* "$pkgdir$dir"
-    # Symlink them to /usr/share/java
-    ln -s "$dir"/$pkg-$pkgver.jar "$pkgdir"/usr/share/java/asm/
-    ln -s asm/$pkg-$pkgver.jar "$pkgdir"/usr/share/java/$pkg-$_pkgver.jar
-  done
-  
-  # Install a README file about the -all files
-  cd "$srcdir/$_pkgname-$pkgver"
-  install -m644 output/dist/lib/all/README.txt \
-    "$pkgdir"/usr/share/java/asm/README-$pkgver.txt
-}
-
-md5sums=('7a92c87bf067925685cf68dcc0dd8998')
diff --git a/libre/java-asm3/PKGBUILD b/libre/java-asm3/PKGBUILD
deleted file mode 100755
index 7e66a5b5a..000000000
--- a/libre/java-asm3/PKGBUILD
+++ /dev/null
@@ -1,78 +0,0 @@
-# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
-
-_pkgname=asm
-pkgname=java-asm3
-_pkgver=3
-pkgver=3.3.1
-pkgrel=4.1
-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")
-
-_M2_LOCALREPO='/usr/share/maven/repository'
-_ow_util_ant_tasks='/usr/share/java/ow_util_ant_tasks.jar'
-_m2_packages=(
-  asm
-  asm-analysis
-  asm-commons
-  asm-parent
-  asm-tree
-  asm-util
-  asm-xml
-  asm-all
-  asm-debug-all)
-
-build() {
-  cd "$srcdir/$_pkgname-$pkgver"
-
-  rm cobertura.ser # We regenerate this
-  rm examples/jasmin/test/jasmin.jar
-
-  echo "objectweb.ant.tasks.path $_ow_util_ant_tasks" >> build.properties
-  ant dist
-
-  # This will make package() easier:
-  cd output/dist/lib
-  ln -s all/* .
-}
-
-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
-  install -d "$pkgdir"/usr/share/java/asm
-  for pkg in "${_m2_packages[@]}"; do
-    dir="$_M2_LOCALREPO"/asm/$pkg/$pkgver
-    # Create the Maven directory
-    install -d "$pkgdir$dir"
-    # Install the files
-    cp $pkg-$pkgver.* "$pkgdir$dir"
-    # Symlink them to /usr/share/java
-    ln -s "$dir"/$pkg-$pkgver.jar "$pkgdir"/usr/share/java/asm/
-    ln -s asm/$pkg-$pkgver.jar "$pkgdir"/usr/share/java/$pkg-$_pkgver.jar
-  done
-  
-  # Install a README file about the -all files
-  cd "$srcdir/$_pkgname-$pkgver"
-  install -m644 output/dist/lib/all/README.txt \
-    "$pkgdir"/usr/share/java/asm/README-$pkgver.txt
-}
-
-md5sums=('433024df8176f09922646316e415631c')
diff --git a/libre/java-ow-util-ant-tasks/PKGBUILD b/libre/java-ow-util-ant-tasks/PKGBUILD
deleted file mode 100755
index 023048188..000000000
--- a/libre/java-ow-util-ant-tasks/PKGBUILD
+++ /dev/null
@@ -1,27 +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')
-depends=('java-environment')
-makedepends=('apache-ant' 'xalan-java' 'java-asm2')
-source=("http://repo.parabolagnulinux.org/sources/${pkgname}-${pkgver}-1-any.src.tar.xz")
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  ln -s /usr/share/java/asm-2.jar externals
-  ln -s /usr/share/java/xalan.jar externals
-  ant jar
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  install -d "$pkgdir"/usr/share/java
-  install -m644 "output/lib/ow_util_ant_tasks.jar" "$pkgdir"/usr/share/java
-}
-
-md5sums=('339b3eb4b2960473a42f5f781afbeca6')
diff --git a/libre/java-ow-util-ant-tasks/SRCBUILD b/libre/java-ow-util-ant-tasks/SRCBUILD
deleted file mode 100755
index 01241907d..000000000
--- a/libre/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')
-- 
cgit v1.2.3


From ba7bed75477c53136cb7fbf68a58dff23f64f8ae Mon Sep 17 00:00:00 2001
From: Luke Shumaker <LukeShu@sbcglobal.net>
Date: Thu, 18 Oct 2012 17:15:26 -0400
Subject: fix up the [java] packages that were in [libre]

---
 java/java-asm2/PKGBUILD              | 54 +++++++++++++++++++-----------------
 java/java-asm2/PKGBUILD-bootstrap    | 23 +++++++++++++++
 java/java-asm3/PKGBUILD              | 49 ++++++++++++++++----------------
 java/java-ow-util-ant-tasks/PKGBUILD |  4 +--
 java/java-ow-util-ant-tasks/SRCBUILD |  0
 5 files changed, 78 insertions(+), 52 deletions(-)
 mode change 100755 => 100644 java/java-asm2/PKGBUILD
 create mode 100644 java/java-asm2/PKGBUILD-bootstrap
 mode change 100755 => 100644 java/java-asm3/PKGBUILD
 mode change 100755 => 100644 java/java-ow-util-ant-tasks/PKGBUILD
 mode change 100755 => 100644 java/java-ow-util-ant-tasks/SRCBUILD

diff --git a/java/java-asm2/PKGBUILD b/java/java-asm2/PKGBUILD
old mode 100755
new mode 100644
index 4853d79c0..45831b033
--- a/java/java-asm2/PKGBUILD
+++ b/java/java-asm2/PKGBUILD
@@ -2,7 +2,6 @@
 
 _pkgname=asm
 pkgname=java-asm2
-_pkgver=2
 pkgver=2.2.3
 pkgrel=4
 pkgdesc="An all purpose Java bytecode manipulation and analysis framework."
@@ -13,12 +12,13 @@ depends=('java-runtime')
 makedepends=(
   apache-ant
   java-ow-util-ant-tasks
+  jh
 )
 source=("http://download.forge.objectweb.org/$_pkgname/$_pkgname-$pkgver.tar.gz")
 
-_M2_LOCALREPO='/usr/share/maven/repository'
+_distdir="$_pkgname-$pkgver/output/dist"
 _ow_util_ant_tasks='/usr/share/java/ow_util_ant_tasks.jar'
-_m2_packages=(
+_m2_artifacts=(
   asm
   asm-analysis
   asm-attrs
@@ -28,49 +28,51 @@ _m2_packages=(
   asm-xml
   asm-all)
 
-build() {
+mksource() {
   cd "$srcdir/$_pkgname-$pkgver"
-
+  rm test/conform/org/objectweb/asm/attrs/StackMapTableSample.data
+  rm test/conform/cases/*.class
   mkdir -p test/lib
+}
+
+build() {
+  cd "$srcdir/$_pkgname-$pkgver"
+  eval `jh mksource test/conform/org/objectweb/asm/signature/signatures.txt`
 
   echo "objectweb.ant.tasks.path $_ow_util_ant_tasks" >> build.properties
   ant dist
 
   # This will make package() easier:
-  cd output/dist/lib
+  cd "$srcdir/$_distdir/lib"
   ln -s all/* .
 }
 
 package() {
-  cd "$srcdir/$_pkgname-$pkgver"
-
   # Install license file
+  cd "$srcdir/$_pkgname-$pkgver"
   install -Dm644 LICENSE.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 
   # Install documentation
-  cd output/dist
+  cd "$srcdir/$_distdir"
   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
-  install -d "$pkgdir"/usr/share/java/asm
-  for pkg in "${_m2_packages[@]}"; do
-    dir="$_M2_LOCALREPO"/asm/$pkg/$pkgver
-    # Create the Maven directory
-    install -d "$pkgdir$dir"
-    # Install the files
-    cp $pkg-$pkgver.* "$pkgdir$dir"
+
+  # Install the README about the -all files
+  cd "$srcdir/$_distdir/lib"
+  install -Dm644 README.txt \
+      "$pkgdir"/usr/share/java/$_pkgname/README-$pkgver.txt
+
+  # Install Maven artifacts
+  export DESTDIR=$pkgdir
+  for artifact in "${_m2_artifacts[@]}"; do
+    jh mvn-install $_pkgname $artifact $pkgver $artifact-$pkgver.{jar,pom}
     # Symlink them to /usr/share/java
-    ln -s "$dir"/$pkg-$pkgver.jar "$pkgdir"/usr/share/java/asm/
-    ln -s asm/$pkg-$pkgver.jar "$pkgdir"/usr/share/java/$pkg-$_pkgver.jar
+    ln -s "$(jh mvn-basename asm $artifact $pkgver).jar" \
+	"$pkgdir"/usr/share/java/$_pkgname/
+    ln -s $_pkgname/$artifact-$pkgver.jar \
+	"$pkgdir"/usr/share/java/$artifact-${pkgver%%.*}.jar
   done
-  
-  # Install a README file about the -all files
-  cd "$srcdir/$_pkgname-$pkgver"
-  install -m644 output/dist/lib/all/README.txt \
-    "$pkgdir"/usr/share/java/asm/README-$pkgver.txt
 }
 
 md5sums=('7a92c87bf067925685cf68dcc0dd8998')
diff --git a/java/java-asm2/PKGBUILD-bootstrap b/java/java-asm2/PKGBUILD-bootstrap
new file mode 100644
index 000000000..9e896a90e
--- /dev/null
+++ b/java/java-asm2/PKGBUILD-bootstrap
@@ -0,0 +1,23 @@
+# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
+
+# "java-asm2" is required to build "java-ow-util-ant-tasks", which is in turn
+# required to build "java-asm2".
+
+. PKGBUILD
+
+makedepends=(jh)
+source=("http://download.forge.objectweb.org/$_pkgname/$_pkgname-$pkgver-bin.zip")
+_distdir="$_pkgname-$pkgver"
+
+provides+=("$pkgname=$pkgver")
+pkgname+='-bootstrap'
+pkgdesc+=" (prebuilt binary release for bootstrapping purposes)"
+
+build() {
+  cd "$srcdir/$_pkgname-$pkgver"
+  echo "3-clause BSD license; install the non-bootstrap version for full text" > LICENSE.txt
+  cd "$srcdir/$_distdir/lib"
+  ln -s all/* .
+}
+
+md5sums=('9bedaa1d00c5b5f1c7fec10a2d2f7142')
diff --git a/java/java-asm3/PKGBUILD b/java/java-asm3/PKGBUILD
old mode 100755
new mode 100644
index 7e66a5b5a..3af6902f4
--- a/java/java-asm3/PKGBUILD
+++ b/java/java-asm3/PKGBUILD
@@ -13,12 +13,13 @@ depends=('java-runtime')
 makedepends=(
   apache-ant
   java-ow-util-ant-tasks
+  jh
 )
 source=("http://download.forge.objectweb.org/$_pkgname/$_pkgname-$pkgver.tar.gz")
 
-_M2_LOCALREPO='/usr/share/maven/repository'
+_distdir="$_pkgname-$pkgver/output/dist"
 _ow_util_ant_tasks='/usr/share/java/ow_util_ant_tasks.jar'
-_m2_packages=(
+_m2_artifacts=(
   asm
   asm-analysis
   asm-commons
@@ -29,50 +30,50 @@ _m2_packages=(
   asm-all
   asm-debug-all)
 
-build() {
+mksource()
   cd "$srcdir/$_pkgname-$pkgver"
-
   rm cobertura.ser # We regenerate this
   rm examples/jasmin/test/jasmin.jar
+}
+
+build() {
+  cd "$srcdir/$_pkgname-$pkgver"
+  eval `jh mksource`
 
   echo "objectweb.ant.tasks.path $_ow_util_ant_tasks" >> build.properties
   ant dist
 
   # This will make package() easier:
-  cd output/dist/lib
+  cd "$srcdir/$_distdir/lib"
   ln -s all/* .
 }
 
 package() {
-  cd "$srcdir/$_pkgname-$pkgver"
-
   # Install license file
+  cd "$srcdir/$_pkgname-$pkgver"
   install -Dm644 LICENSE.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 
   # Install documentation
-  cd output/dist
+  cd "$srcdir/$_distdir"
   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
-  install -d "$pkgdir"/usr/share/java/asm
-  for pkg in "${_m2_packages[@]}"; do
-    dir="$_M2_LOCALREPO"/asm/$pkg/$pkgver
-    # Create the Maven directory
-    install -d "$pkgdir$dir"
-    # Install the files
-    cp $pkg-$pkgver.* "$pkgdir$dir"
+  # Install the README about the -all files
+  cd "$srcdir/$_distdir/lib"
+  install -Dm644 README.txt \
+      "$pkgdir"/usr/share/java/$_pkgname/README-$pkgver.txt
+
+  # Install Maven artifacts
+  export DESTDIR=$pkgdir
+  for artifact in "${_m2_artifacts[@]}"; do
+    jh mvn-install $_pkgname $artifact $pkgver $artifact-$pkgver.{jar,pom}
     # Symlink them to /usr/share/java
-    ln -s "$dir"/$pkg-$pkgver.jar "$pkgdir"/usr/share/java/asm/
-    ln -s asm/$pkg-$pkgver.jar "$pkgdir"/usr/share/java/$pkg-$_pkgver.jar
+    ln -s "$(jh mvn-basename asm $artifact $pkgver).jar" \
+	"$pkgdir"/usr/share/java/$_pkgname/
+    ln -s $_pkgname/$artifact-$pkgver.jar \
+	"$pkgdir"/usr/share/java/$artifact-${pkgver%%.*}.jar
   done
-  
-  # Install a README file about the -all files
-  cd "$srcdir/$_pkgname-$pkgver"
-  install -m644 output/dist/lib/all/README.txt \
-    "$pkgdir"/usr/share/java/asm/README-$pkgver.txt
 }
 
 md5sums=('433024df8176f09922646316e415631c')
diff --git a/java/java-ow-util-ant-tasks/PKGBUILD b/java/java-ow-util-ant-tasks/PKGBUILD
old mode 100755
new mode 100644
index 023048188..f1add43ea
--- a/java/java-ow-util-ant-tasks/PKGBUILD
+++ b/java/java-ow-util-ant-tasks/PKGBUILD
@@ -13,8 +13,8 @@ source=("http://repo.parabolagnulinux.org/sources/${pkgname}-${pkgver}-1-any.src
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
-  ln -s /usr/share/java/asm-2.jar externals
-  ln -s /usr/share/java/xalan.jar externals
+  ln -s /usr/share/java/asm-2.jar externals/
+  ln -s /usr/share/java/xalan.jar externals/
   ant jar
 }
 
diff --git a/java/java-ow-util-ant-tasks/SRCBUILD b/java/java-ow-util-ant-tasks/SRCBUILD
old mode 100755
new mode 100644
-- 
cgit v1.2.3


From 6fa24b3322f6bd570f89b6ff4f10c582798f2224 Mon Sep 17 00:00:00 2001
From: Márcio Alexandre Silva Delgado <coadde@lavabit.com>
Date: Fri, 19 Oct 2012 00:36:43 -0200
Subject: mix blender-libre packages

---
 artistic/blender-spacenav-libre/PKGBUILD          | 105 ------
 artistic/blender-spacenav-libre/blender.install   |  13 -
 artistic/blender-spacenav-libre/boost-1.50.patch  |  42 ---
 artistic/blender-spacenav-libre/ffmpeg-0.11.patch | 434 ----------------------
 libre/blender-libre/PKGBUILD                      |  56 ++-
 5 files changed, 38 insertions(+), 612 deletions(-)
 delete mode 100755 artistic/blender-spacenav-libre/PKGBUILD
 delete mode 100755 artistic/blender-spacenav-libre/blender.install
 delete mode 100755 artistic/blender-spacenav-libre/boost-1.50.patch
 delete mode 100755 artistic/blender-spacenav-libre/ffmpeg-0.11.patch

diff --git a/artistic/blender-spacenav-libre/PKGBUILD b/artistic/blender-spacenav-libre/PKGBUILD
deleted file mode 100755
index 9ef4b7b07..000000000
--- a/artistic/blender-spacenav-libre/PKGBUILD
+++ /dev/null
@@ -1,105 +0,0 @@
-# $Id$
-# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
-
-pkgname=blender-spacenav-libre
-pkgver=2.64a
-pkgrel=1
-pkgaev=5
-pkgdesc='A fully integrated 3D graphics creation suite, compiled with spacenav (without nonfree cuda-toolkit support)'
-arch=(
-  i686
-  x86_64
-  mips64el
-)
-license=(
-  GPL
-)
-url=http://www.${pkgname%-spacenav-libre}.org
-depends=(
-  boost-libs
-  desktop-file-utils
-  ffmpeg
-  fftw
-  freetype2
-  glew
-  glu
-  hicolor-icon-theme
-  jack
-  libgl
-  libpng
-  libsndfile
-  libspnav
-  libtiff
-  openal
-  opencollada
-  opencolorio
-  openexr
-  openimageio
-  python
-  shared-mime-info
-  xdg-utils
-)
-makedepends=(
-  mesa
-  boost
-  cmake
-  subversion
-)
-replaces=(
-  ${pkgname%-spacenav-libre}
-)
-conflicts=(
-  ${pkgname%-spacenav-libre}
-)
-provides=(
-  ${pkgname%-spacenav-libre}=$pkgaev:$pkgver
-)
-install=${pkgname%-spacenav-libre}.install
-source=(
-  http://download.${pkgname%-spacenav-libre}.org/source/${pkgname%-spacenav-libre}-$pkgver.tar.gz
-)
-sha512sums=(
-  77d171a36f1c87a82613ed7601df9cef444069a2a6600e05260607e9a2009c292068a2b4753f3cbd53d820cdc8d9ed88ddd1685f20647b943f75bfbeb905b9b5
-)
-
-build() {
-  cd $srcdir/${pkgname%-spacenav-libre}-$pkgver
-
-  mkdir build
-  cd build
-
-  [[ $CARCH == i686 ]] && DSUPPORT_SSE2_BUILD='-DSUPPORT_SSE2_BUILD=OFF'
-
-  cmake .. \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DPYTHON_INCLUDE_DIRS=/usr/include/python3.2mu \
-    -DPYTHON_LIBPATH=/usr/lib \
-    -DPYTHON_LIBRARY=python3.2mu \
-    -DPYTHON_VERSION=3.2 \
-    $DSUPPORT_SSE2_BUILD \
-    -DWITH_CODEC_FFMPEG=ON \
-    -DWITH_CODEC_SNDFILE=ON \
-    -DWITH_CYCLES=ON \
-    -DWITH_CYCLES_CUDA_BINARIES=OFF \
-    -DWITH_FFTW3=ON \
-    -DWITH_GAMEENGINE=ON \
-    -DWITH_IMAGE_REDCODE=OFF \
-    -DWITH_INSTALL_PORTABLE=OFF \
-    -DWITH_JACK=ON \
-    -DWITH_MOD_OCEANSIM=ON \
-    -DWITH_OPENCOLLADA=ON \
-    -DWITH_PLAYER=ON \
-    -DWITH_PYTHON_INSTALL=OFF \
-    -DWITH_SYSTEM_GLEW=ON
-
-  make $MAKEFLAGS
-
-  make
-}
-
-package() {
-  cd $srcdir/${pkgname%-spacenav-libre}-$pkgver/build
-  make DESTDIR=$pkgdir install
-  python -m compileall $pkgdir/usr/share/blender
-}
diff --git a/artistic/blender-spacenav-libre/blender.install b/artistic/blender-spacenav-libre/blender.install
deleted file mode 100755
index 724bfce00..000000000
--- a/artistic/blender-spacenav-libre/blender.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-  update-desktop-database -q
-  update-mime-database usr/share/mime &> /dev/null
-  xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/artistic/blender-spacenav-libre/boost-1.50.patch b/artistic/blender-spacenav-libre/boost-1.50.patch
deleted file mode 100755
index fa698a3a6..000000000
--- a/artistic/blender-spacenav-libre/boost-1.50.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff -Naur a/intern/cycles/util/util_cache.cpp b/intern/cycles/util/util_cache.cpp
---- a/intern/cycles/util/util_cache.cpp	2012-05-10 11:44:09.000000000 -0300
-+++ b/intern/cycles/util/util_cache.cpp	2012-07-15 14:19:34.893238929 -0300
-@@ -26,8 +26,6 @@
- #include "util_path.h"
- #include "util_types.h"
- 
--#define BOOST_FILESYSTEM_VERSION 2
--
- #include <boost/filesystem.hpp> 
- #include <boost/algorithm/string.hpp>
- 
-@@ -117,7 +115,7 @@
- 		boost::filesystem::directory_iterator it(dir), it_end;
- 
- 		for(; it != it_end; it++) {
--			string filename = it->path().filename();
-+			string filename = it->path().filename().string();
- 
- 			if(boost::starts_with(filename, name))
- 				if(except.find(filename) == except.end())
-diff -Naur blender-2.63a/intern/cycles/util/util_path.cpp blender-2.63a-new/intern/cycles/util/util_path.cpp
---- a/intern/cycles/util/util_path.cpp	2012-05-10 11:44:09.000000000 -0300
-+++ b/intern/cycles/util/util_path.cpp	2012-07-15 14:19:14.126293394 -0300
-@@ -26,8 +26,6 @@
- 
- #include <stdio.h>
- 
--#define BOOST_FILESYSTEM_VERSION 2
--
- #include <boost/filesystem.hpp> 
- #include <boost/algorithm/string.hpp>
- 
-@@ -60,7 +58,7 @@
- 
- string path_filename(const string& path)
- {
--	return boost::filesystem::path(path).filename();
-+	return boost::filesystem::path(path).filename().string();
- }
- 
- string path_dirname(const string& path)
diff --git a/artistic/blender-spacenav-libre/ffmpeg-0.11.patch b/artistic/blender-spacenav-libre/ffmpeg-0.11.patch
deleted file mode 100755
index 45144140c..000000000
--- a/artistic/blender-spacenav-libre/ffmpeg-0.11.patch
+++ /dev/null
@@ -1,434 +0,0 @@
-diff -Naur blender-2.63a.orig/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp blender-2.63a/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp
---- blender-2.63a.orig/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp	2012-05-10 11:45:40.000000000 -0300
-+++ blender-2.63a/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp	2012-07-10 18:12:55.727129720 -0300
-@@ -143,23 +143,23 @@
- 
- 	switch(m_codecCtx->sample_fmt)
- 	{
--	case SAMPLE_FMT_U8:
-+	case AV_SAMPLE_FMT_U8:
- 		m_convert = AUD_convert_u8_float;
- 		m_specs.format = AUD_FORMAT_U8;
- 		break;
--	case SAMPLE_FMT_S16:
-+	case AV_SAMPLE_FMT_S16:
- 		m_convert = AUD_convert_s16_float;
- 		m_specs.format = AUD_FORMAT_S16;
- 		break;
--	case SAMPLE_FMT_S32:
-+	case AV_SAMPLE_FMT_S32:
- 		m_convert = AUD_convert_s32_float;
- 		m_specs.format = AUD_FORMAT_S32;
- 		break;
--	case SAMPLE_FMT_FLT:
-+	case AV_SAMPLE_FMT_FLT:
- 		m_convert = AUD_convert_copy<float>;
- 		m_specs.format = AUD_FORMAT_FLOAT32;
- 		break;
--	case SAMPLE_FMT_DBL:
-+	case AV_SAMPLE_FMT_DBL:
- 		m_convert = AUD_convert_double_float;
- 		m_specs.format = AUD_FORMAT_FLOAT64;
- 		break;
-@@ -189,7 +189,7 @@
- 	}
- 	catch(AUD_Exception&)
- 	{
--		av_close_input_file(m_formatCtx);
-+		avformat_close_input(&m_formatCtx);
- 		throw;
- 	}
- }
-@@ -227,7 +227,7 @@
- 	}
- 	catch(AUD_Exception&)
- 	{
--		av_close_input_stream(m_formatCtx);
-+		avformat_close_input(&m_formatCtx);
- 		av_free(m_aviocontext);
- 		throw;
- 	}
-@@ -239,7 +239,7 @@
- 
- 	if(m_aviocontext)
- 	{
--		av_close_input_stream(m_formatCtx);
-+		avformat_close_input(&m_formatCtx);
- 		av_free(m_aviocontext);
- 	}
- 	else
-diff -Naur blender-2.63a.orig/intern/audaspace/ffmpeg/AUD_FFMPEGWriter.cpp blender-2.63a/intern/audaspace/ffmpeg/AUD_FFMPEGWriter.cpp
---- blender-2.63a.orig/intern/audaspace/ffmpeg/AUD_FFMPEGWriter.cpp	2012-05-10 11:45:40.000000000 -0300
-+++ blender-2.63a/intern/audaspace/ffmpeg/AUD_FFMPEGWriter.cpp	2012-07-10 18:14:55.893790273 -0300
-@@ -133,23 +133,23 @@
- 		{
- 		case AUD_FORMAT_U8:
- 			m_convert = AUD_convert_float_u8;
--			m_codecCtx->sample_fmt = SAMPLE_FMT_U8;
-+			m_codecCtx->sample_fmt = AV_SAMPLE_FMT_U8;
- 			break;
- 		case AUD_FORMAT_S16:
- 			m_convert = AUD_convert_float_s16;
--			m_codecCtx->sample_fmt = SAMPLE_FMT_S16;
-+			m_codecCtx->sample_fmt = AV_SAMPLE_FMT_S16;
- 			break;
- 		case AUD_FORMAT_S32:
- 			m_convert = AUD_convert_float_s32;
--			m_codecCtx->sample_fmt = SAMPLE_FMT_S32;
-+			m_codecCtx->sample_fmt = AV_SAMPLE_FMT_S32;
- 			break;
- 		case AUD_FORMAT_FLOAT32:
- 			m_convert = AUD_convert_copy<float>;
--			m_codecCtx->sample_fmt = SAMPLE_FMT_FLT;
-+			m_codecCtx->sample_fmt = AV_SAMPLE_FMT_FLT;
- 			break;
- 		case AUD_FORMAT_FLOAT64:
- 			m_convert = AUD_convert_float_double;
--			m_codecCtx->sample_fmt = SAMPLE_FMT_DBL;
-+			m_codecCtx->sample_fmt = AV_SAMPLE_FMT_DBL;
- 			break;
- 		default:
- 			AUD_THROW(AUD_ERROR_FFMPEG, format_error);
-diff -Naur blender-2.63a.orig/intern/ffmpeg/ffmpeg_compat.h blender-2.63a/intern/ffmpeg/ffmpeg_compat.h
---- blender-2.63a.orig/intern/ffmpeg/ffmpeg_compat.h	2012-05-10 11:46:17.000000000 -0300
-+++ blender-2.63a/intern/ffmpeg/ffmpeg_compat.h	2012-07-10 18:17:04.823783714 -0300
-@@ -76,6 +76,10 @@
- #define FFMPEG_FFV1_ALPHA_SUPPORTED
- #endif
- 
-+#if ((LIBAVFORMAT_VERSION_MAJOR < 53) || ((LIBAVFORMAT_VERSION_MAJOR == 53) && (LIBAVFORMAT_VERSION_MINOR < 24)) || ((LIBAVFORMAT_VERSION_MAJOR == 53) && (LIBAVFORMAT_VERSION_MINOR < 24) && (LIBAVFORMAT_VERSION_MICRO < 2)))
-+#define avformat_close_input(x) av_close_input_file(*(x))
-+#endif
-+
- #ifndef FFMPEG_HAVE_AVIO
- #define AVIO_FLAG_WRITE URL_WRONLY
- #define avio_open url_fopen
-diff -Naur blender-2.63a.orig/source/blender/blenkernel/intern/writeffmpeg.c blender-2.63a/source/blender/blenkernel/intern/writeffmpeg.c
---- blender-2.63a.orig/source/blender/blenkernel/intern/writeffmpeg.c	2012-05-10 11:50:20.000000000 -0300
-+++ blender-2.63a/source/blender/blenkernel/intern/writeffmpeg.c	2012-07-10 18:27:00.213753426 -0300
-@@ -36,6 +36,7 @@
- #include <libavformat/avformat.h>
- #include <libavcodec/avcodec.h>
- #include <libavutil/rational.h>
-+#include <libavutil/samplefmt.h>
- #include <libswscale/swscale.h>
- #include <libavcodec/opt.h>
- 
-@@ -612,7 +613,7 @@
- 
- 	c->sample_rate = rd->ffcodecdata.audio_mixrate;
- 	c->bit_rate = ffmpeg_audio_bitrate*1000;
--	c->sample_fmt = SAMPLE_FMT_S16;
-+	c->sample_fmt = AV_SAMPLE_FMT_S16;
- 	c->channels = rd->ffcodecdata.audio_channels;
- 	codec = avcodec_find_encoder(c->codec_id);
- 	if (!codec) {
-@@ -654,11 +655,21 @@
- }
- /* essential functions -- start, append, end */
- 
-+static void ffmpeg_dict_set_int(AVDictionary **dict, const char *key, int value)
-+{
-+	char buffer[32];
-+
-+	BLI_snprintf(buffer, sizeof(buffer), "%d", value);
-+
-+	av_dict_set(dict, key, buffer, 0);
-+}
-+
- static int start_ffmpeg_impl(struct RenderData *rd, int rectx, int recty, ReportList *reports)
- {
- 	/* Handle to the output file */
- 	AVFormatContext* of;
- 	AVOutputFormat* fmt;
-+	AVDictionary *opts = NULL;
- 	char name[256];
- 	const char ** exts;
- 
-@@ -704,13 +715,14 @@
- 	of->oformat = fmt;
- 	of->packet_size= rd->ffcodecdata.mux_packet_size;
- 	if (ffmpeg_audio_codec != CODEC_ID_NONE) {
--		of->mux_rate = rd->ffcodecdata.mux_rate;
-+		ffmpeg_dict_set_int(&opts, "muxrate", rd->ffcodecdata.mux_rate);
- 	}
- 	else {
--		of->mux_rate = 0;
-+		av_dict_set(&opts, "muxrate", "0", 0);
- 	}
- 
--	of->preload = (int)(0.5*AV_TIME_BASE);
-+	ffmpeg_dict_set_int(&opts, "preload", (int)(0.5*AV_TIME_BASE));
-+
- 	of->max_delay = (int)(0.7*AV_TIME_BASE);
- 
- 	fmt->audio_codec = ffmpeg_audio_codec;
-@@ -773,6 +785,7 @@
- 		fmt->audio_codec = CODEC_ID_PCM_S16LE;
- 		if (ffmpeg_audio_codec != CODEC_ID_NONE && rd->ffcodecdata.audio_mixrate != 48000 && rd->ffcodecdata.audio_channels != 2) {
- 			BKE_report(reports, RPT_ERROR, "FFMPEG only supports 48khz / stereo audio for DV!");
-+			av_dict_free(&opts);
- 			return 0;
- 		}
- 	}
-@@ -782,6 +795,7 @@
- 		printf("alloc video stream %p\n", video_stream);
- 		if (!video_stream) {
- 			BKE_report(reports, RPT_ERROR, "Error initializing video stream.");
-+			av_dict_free(&opts);
- 			return 0;
- 		}
- 	}
-@@ -790,27 +804,27 @@
- 		audio_stream = alloc_audio_stream(rd, fmt->audio_codec, of);
- 		if (!audio_stream) {
- 			BKE_report(reports, RPT_ERROR, "Error initializing audio stream.");
-+			av_dict_free(&opts);
- 			return 0;
- 		}
- 	}
--	if (av_set_parameters(of, NULL) < 0) {
--		BKE_report(reports, RPT_ERROR, "Error setting output parameters.");
--		return 0;
--	}
- 	if (!(fmt->flags & AVFMT_NOFILE)) {
- 		if (avio_open(&of->pb, name, AVIO_FLAG_WRITE) < 0) {
- 			BKE_report(reports, RPT_ERROR, "Could not open file for writing.");
-+			av_dict_free(&opts);
- 			return 0;
- 		}
- 	}
- 
--	if (av_write_header(of) < 0) {
-+	if (avformat_write_header(of, NULL) < 0) {
- 		BKE_report(reports, RPT_ERROR, "Could not initialize streams. Probably unsupported codec combination.");
-+		av_dict_free(&opts);
- 		return 0;
- 	}
- 
- 	outfile = of;
- 	av_dump_format(of, 0, name, 1);
-+	av_dict_free(&opts);
- 
- 	return 1;
- }
-diff -Naur blender-2.63a.orig/source/blender/imbuf/intern/anim_movie.c blender-2.63a/source/blender/imbuf/intern/anim_movie.c
---- blender-2.63a.orig/source/blender/imbuf/intern/anim_movie.c	2012-05-10 11:50:59.000000000 -0300
-+++ blender-2.63a/source/blender/imbuf/intern/anim_movie.c	2012-07-10 18:30:19.413743294 -0300
-@@ -436,7 +436,7 @@
- 	int            i, videoStream;
- 
- 	AVCodec *pCodec;
--	AVFormatContext *pFormatCtx;
-+	AVFormatContext *pFormatCtx = NULL;
- 	AVCodecContext *pCodecCtx;
- 	int frs_num;
- 	double frs_den;
-@@ -455,7 +455,7 @@
- 
- 	do_init_ffmpeg();
- 
--	if (av_open_input_file(&pFormatCtx, anim->name, NULL, 0, NULL)!=0) {
-+	if (avformat_open_input(&pFormatCtx, anim->name, NULL, NULL)!=0) {
- 		return -1;
- 	}
- 
-@@ -990,7 +990,8 @@
- 				ret = av_seek_frame(anim->pFormatCtx, 
- 						    -1,
- 						    pos, AVSEEK_FLAG_BYTE);
--				av_update_cur_dts(anim->pFormatCtx, v_st, dts);
-+				// XXX: need double verification
-+				// av_update_cur_dts(anim->pFormatCtx, v_st, dts);
- 			}
- 			else {
- 				av_log(anim->pFormatCtx, AV_LOG_DEBUG, 
-diff -Naur blender-2.63a.orig/source/blender/imbuf/intern/indexer.c blender-2.63a/source/blender/imbuf/intern/indexer.c
---- blender-2.63a.orig/source/blender/imbuf/intern/indexer.c	2012-05-10 11:50:59.000000000 -0300
-+++ blender-2.63a/source/blender/imbuf/intern/indexer.c	2012-07-10 18:38:25.737051891 -0300
-@@ -533,13 +533,6 @@
- 		rv->c->flags |= CODEC_FLAG_GLOBAL_HEADER;
- 	}
- 
--	if (av_set_parameters(rv->of, NULL) < 0) {
--		fprintf(stderr, "Couldn't set output parameters? "
--			"Proxy not built!\n");
--		av_free(rv->of);
--		return 0;
--	}
--
- 	if (avio_open(&rv->of->pb, fname, AVIO_FLAG_WRITE) < 0) {
- 		fprintf(stderr, "Couldn't open outputfile! "
- 			"Proxy not built!\n");
-@@ -576,7 +569,12 @@
- 			NULL, NULL, NULL);
- 	}
- 
--	av_write_header(rv->of);
-+	if (avformat_write_header(rv->of, NULL) < 0) {
-+		fprintf(stderr, "Couldn't set output parameters? "
-+		        "Proxy not built!\n");
-+		av_free(rv->of);
-+		return 0;
-+	}
- 
- 	return rv;
- }
-@@ -739,7 +737,7 @@
- 	memset(context->proxy_ctx, 0, sizeof(context->proxy_ctx));
- 	memset(context->indexer, 0, sizeof(context->indexer));
- 
--	if (av_open_input_file(&context->iFormatCtx, anim->name, NULL, 0, NULL) != 0) {
-+	if (avformat_open_input(&context->iFormatCtx, anim->name, NULL, NULL) != 0) {
- 		MEM_freeN(context);
- 		return NULL;
- 	}
-diff -Naur blender-2.63a.orig/source/blender/imbuf/intern/util.c blender-2.63a/source/blender/imbuf/intern/util.c
---- blender-2.63a.orig/source/blender/imbuf/intern/util.c	2012-05-10 11:50:59.000000000 -0300
-+++ blender-2.63a/source/blender/imbuf/intern/util.c	2012-07-10 18:40:49.950377886 -0300
-@@ -243,7 +243,7 @@
- 
- static int isffmpeg (const char *filename)
- {
--	AVFormatContext *pFormatCtx;
-+	AVFormatContext *pFormatCtx = NULL;
- 	unsigned int i;
- 	int videoStream;
- 	AVCodec *pCodec;
-@@ -261,7 +261,7 @@
- 		BLI_testextensie(filename, ".cin") ||
- 		BLI_testextensie(filename, ".wav")) return 0;
- 
--	if (av_open_input_file(&pFormatCtx, filename, NULL, 0, NULL)!=0) {
-+	if (avformat_open_input(&pFormatCtx, filename, NULL, NULL)!=0) {
- 		if (UTIL_DEBUG) fprintf(stderr, "isffmpeg: av_open_input_file failed\n");
- 		return 0;
- 	}
-diff -Naur blender-2.63a.orig/source/gameengine/VideoTexture/VideoFFmpeg.cpp blender-2.63a/source/gameengine/VideoTexture/VideoFFmpeg.cpp
---- blender-2.63a.orig/source/gameengine/VideoTexture/VideoFFmpeg.cpp	2012-05-10 11:48:50.000000000 -0300
-+++ blender-2.63a/source/gameengine/VideoTexture/VideoFFmpeg.cpp	2012-07-10 18:56:03.696998071 -0300
-@@ -162,14 +162,14 @@
- }
- 
- 
--int VideoFFmpeg::openStream(const char *filename, AVInputFormat *inputFormat, AVFormatParameters *formatParams)
-+int VideoFFmpeg::openStream(const char *filename, AVInputFormat *inputFormat, AVDictionary **formatParams)
- {
--	AVFormatContext *formatCtx;
-+	AVFormatContext *formatCtx = NULL;
- 	int				i, videoStream;
- 	AVCodec			*codec;
- 	AVCodecContext	*codecCtx;
- 
--	if (av_open_input_file(&formatCtx, filename, inputFormat, 0, formatParams)!=0)
-+	if (avformat_open_input(&formatCtx, filename, inputFormat, formatParams)!=0)
- 		return -1;
- 
- 	if (av_find_stream_info(formatCtx)<0) 
-@@ -545,11 +545,7 @@
- 		// but it is really not desirable to seek on http file, so force streaming.
- 		// It would be good to find this information from the context but there are no simple indication
- 		!strncmp(filename, "http://", 7) ||
--#ifdef FFMPEG_PB_IS_POINTER
--		(m_formatCtx->pb && m_formatCtx->pb->is_streamed)
--#else
--		m_formatCtx->pb.is_streamed
--#endif
-+		(m_formatCtx->pb && !m_formatCtx->pb->seekable)
- 		)
- 	{
- 		// the file is in fact a streaming source, treat as cam to prevent seeking
-@@ -586,13 +582,11 @@
- {
- 	// open camera source
- 	AVInputFormat		*inputFormat;
--	AVFormatParameters	formatParams;
--	AVRational			frameRate;
-+	AVDictionary		*formatParams = NULL;
- 	char				*p, filename[28], rateStr[20];
- 
- 	do_init_ffmpeg();
- 
--	memset(&formatParams, 0, sizeof(formatParams));
- #ifdef WIN32
- 	// video capture on windows only through Video For Windows driver
- 	inputFormat = av_find_input_format("vfwcap");
-@@ -622,7 +616,13 @@
- 		sprintf(filename, "/dev/dv1394/%d", camIdx);
- 	} else 
- 	{
--		inputFormat = av_find_input_format("video4linux");
-+		const char *formats[] = {"video4linux2,v4l2", "video4linux2", "video4linux"};
-+		int i, formatsCount = sizeof(formats) / sizeof(char*);
-+		for (i = 0; i < formatsCount; i++) {
-+			inputFormat = av_find_input_format(formats[i]);
-+			if (inputFormat)
-+				break;
-+		}
- 		sprintf(filename, "/dev/video%d", camIdx);
- 	}
- 	if (!inputFormat)
-@@ -636,20 +636,22 @@
- 		if ((p = strchr(filename, ':')) != 0)
- 			*p = 0;
- 	}
--	if (file && (p = strchr(file, ':')) != NULL)
--		formatParams.standard = p+1;
-+	if (file && (p = strchr(file, ':')) != NULL) {
-+		av_dict_set(&formatParams, "standard", p+1, 0);
-+	}
- #endif
- 	//frame rate
- 	if (m_captRate <= 0.f)
- 		m_captRate = defFrameRate;
- 	sprintf(rateStr, "%f", m_captRate);
--	av_parse_video_rate(&frameRate, rateStr);
--	// populate format parameters
--	// need to specify the time base = inverse of rate
--	formatParams.time_base.num = frameRate.den;
--	formatParams.time_base.den = frameRate.num;
--	formatParams.width = m_captWidth;
--	formatParams.height = m_captHeight;
-+
-+	av_dict_set(&formatParams, "framerate", rateStr, 0);
-+
-+	if (m_captWidth > 0 && m_captHeight > 0) {
-+		char video_size[64];
-+		BLI_snprintf(video_size, sizeof(video_size), "%dx%d", m_captWidth, m_captHeight);
-+		av_dict_set(&formatParams, "video_size", video_size, 0);
-+	}
- 
- 	if (openStream(filename, inputFormat, &formatParams) != 0)
- 		return;
-@@ -664,6 +666,8 @@
- 		// no need to thread if the system has a single core
- 		m_isThreaded =  true;
- 	}
-+
-+	av_dict_free(&formatParams);
- }
- 
- // play video
-diff -Naur blender-2.63a.orig/source/gameengine/VideoTexture/VideoFFmpeg.h blender-2.63a/source/gameengine/VideoTexture/VideoFFmpeg.h
---- blender-2.63a.orig/source/gameengine/VideoTexture/VideoFFmpeg.h	2012-05-10 11:48:50.000000000 -0300
-+++ blender-2.63a/source/gameengine/VideoTexture/VideoFFmpeg.h	2012-07-10 18:57:21.710327435 -0300
-@@ -46,10 +46,6 @@
- #  define FFMPEG_CODEC_IS_POINTER 1
- #endif
- 
--#if LIBAVFORMAT_VERSION_INT >= (52 << 16)
--#  define FFMPEG_PB_IS_POINTER 1
--#endif
--
- #ifdef FFMPEG_CODEC_IS_POINTER
- static inline AVCodecContext* get_codec_from_stream(AVStream* stream)
- {
-@@ -172,7 +168,7 @@
- 	double actFrameRate (void) { return m_frameRate * m_baseFrameRate; }
- 
- 	/// common function to video file and capture
--	int openStream(const char *filename, AVInputFormat *inputFormat, AVFormatParameters *formatParams);
-+	int openStream(const char *filename, AVInputFormat *inputFormat, AVDictionary **formatParams);
- 
- 	/// check if a frame is available and load it in pFrame, return true if a frame could be retrieved
- 	AVFrame* grabFrame(long frame);
diff --git a/libre/blender-libre/PKGBUILD b/libre/blender-libre/PKGBUILD
index 1fc1a7f91..2800d9147 100755
--- a/libre/blender-libre/PKGBUILD
+++ b/libre/blender-libre/PKGBUILD
@@ -1,11 +1,24 @@
 # $Id$
 # Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
 
-pkgname=blender-libre
+spacenav=true
+pkgbase=blender-libre
+pkgflag=-libre
+if [ $spacenav == true ]; then
+  pkgname=(
+    blender-spacenav-libre
+  )
+  spndesc=' (with spacenav support)'
+else
+  pkgname=(
+    blender-libre
+  )
+  spndesc=''
+fi
+pkgdesc="A fully integrated 3D graphics creation suite, without nonfree cuda-toolkit and redcode image format support$spndesc"
 pkgver=2.64a
 pkgrel=2
 pkgaev=5
-pkgdesc='A fully integrated 3D graphics creation suite, without nonfree cuda-toolkit and redcode image format support'
 arch=(
   i686
   x86_64
@@ -14,9 +27,10 @@ arch=(
 license=(
   GPL
 )
-url=http://www.${pkgname%-libre}.org
+url="http://www.${pkgbase%$pkgflag}.org"
 depends=(
-  # rbd tree #
+  # used by ldd software "glibc package software"
+  # dependencies tree of binaries software (root) #
   ffmpeg
   fftw
   freetype2
@@ -26,14 +40,14 @@ depends=(
   openal
   openimageio
   opencolorio
-  # bed #
+  # external softwares dependencies #
   opencollada
-  # ded #
+  # softwares dependencies for desktop files and mime types #
   desktop-file-utils
   hicolor-icon-theme
   shared-mime-info
   xdg-utils
-  # cbd tree #
+  # dependencies tree of binaries software (child) #
   #alsa-lib
   #boost-libs
   #bzip2
@@ -93,35 +107,41 @@ depends=(
   #v4l-utils
   #zlib
 )
+if [ $spacenav == true ]; then
+  depends+=(
+    # dependencies tree of binaries software (root) #
+    libspnav
+  )
+fi
 optdepends=(
   'bullet: for Physics Simulation in BGE'
 )
 makedepends=(
-  # rmd tree #
+  # make dependencies tree (root) #
   mesa
   boost
   cmake
   subversion
 )
-replaces=(
-  ${pkgname%-libre}
+provides=(
+  ${pkgbase%$pkgflag}=$pkgaev:$pkgver
 )
 conflicts=(
-  ${pkgname%-libre}
+  ${pkgbase%$pkgflag}
 )
-provides=(
-  ${pkgname%-libre}=$pkgaev:$pkgver
+replaces=(
+  ${pkgbase%$pkgflag}
 )
-install=$pkgname.install
+install=$pkgbase.install
 source=(
-  http://download.${pkgname%-libre}.org/source/${pkgname%-libre}-$pkgver.tar.gz
+  "http://download.${pkgbase%$pkgflag}.org/source/${pkgbase%$pkgflag}-$pkgver.tar.gz"
 )
 sha512sums=(
   77d171a36f1c87a82613ed7601df9cef444069a2a6600e05260607e9a2009c292068a2b4753f3cbd53d820cdc8d9ed88ddd1685f20647b943f75bfbeb905b9b5
 )
 
 build() {
-  cd "$srcdir/${pkgname%-libre}-$pkgver"
+  cd $srcdir/${pkgbase%$pkgflag}-$pkgver
 
   mkdir build
   cd build
@@ -157,7 +177,7 @@ build() {
 }
 
 package() {
-  cd $srcdir/${pkgname%-libre}-$pkgver/build
+  cd $srcdir/${pkgbase%$pkgflag}-$pkgver/build
   make DESTDIR=$pkgdir install
-  python -m compileall $pkgdir/usr/share/blender
+  python -m compileall $pkgdir/usr/share/${pkgbase%$pkgflag}
 }
-- 
cgit v1.2.3


From d07cd6034f4e0fd509de220d7c8aef5d5d7f0fa2 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <LukeShu@sbcglobal.net>
Date: Fri, 19 Oct 2012 00:17:04 -0400
Subject: bump java/jh to v0.3.1

---
 java/jh/PKGBUILD | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/jh/PKGBUILD b/java/jh/PKGBUILD
index a34cee122..a96cf799a 100644
--- a/java/jh/PKGBUILD
+++ b/java/jh/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
 
 pkgname=jh
-pkgver=0.3
+pkgver=0.3.1
 pkgdesc="Java helpers for PKGBUILDs"
 url="https://gitorious.org/parabola/jh"
 license=('Public Domain')
-- 
cgit v1.2.3


From df54578e5c91f87b306bc31dc2a06e9ee27c1d9b Mon Sep 17 00:00:00 2001
From: Luke Shumaker <LukeShu@sbcglobal.net>
Date: Fri, 19 Oct 2012 00:18:42 -0400
Subject: add java/java-sonatype-oss-parent

---
 java/java-sonatype-oss-parent/PKGBUILD | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 java/java-sonatype-oss-parent/PKGBUILD

diff --git a/java/java-sonatype-oss-parent/PKGBUILD b/java/java-sonatype-oss-parent/PKGBUILD
new file mode 100644
index 000000000..f42f6adc5
--- /dev/null
+++ b/java/java-sonatype-oss-parent/PKGBUILD
@@ -0,0 +1,27 @@
+# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
+
+pkgname=java-sonatype-oss-parent
+pkgver=7
+pkgdesc="Metadata file for Maven-based build systems to inherit from"
+license='Apache2'
+
+_groupId=org/sonatype/oss
+_artifactId=oss-parent
+
+pkgrel=1
+arch=('any')
+depends=('maven')
+makedepends=('java-sonatype-oss-parent=7' '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
+}
+
+md5sums=('3e418cf7f2607bf359e6c514a992cb38')
-- 
cgit v1.2.3


From 75f10c84822529dc782da5ad95b092cb15a427c4 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <LukeShu@sbcglobal.net>
Date: Fri, 19 Oct 2012 00:54:38 -0400
Subject: add java-ugly/junit

---
 java-ugly/junit/PKGBUILD | 55 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 55 insertions(+)
 create mode 100644 java-ugly/junit/PKGBUILD

diff --git a/java-ugly/junit/PKGBUILD b/java-ugly/junit/PKGBUILD
new file mode 100644
index 000000000..7204cd5c9
--- /dev/null
+++ b/java-ugly/junit/PKGBUILD
@@ -0,0 +1,55 @@
+# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
+# Maintainer (Arch): Guillaume ALAUX <Guillaume at Arch Linux dot org>
+
+pkgname=junit
+pkgver=4.10
+pkgrel=1
+pkgdesc="Automated testing framework for Java"
+arch=('any')
+url="http://www.junit.org/"
+license=('CPL')
+depends=('java-runtime')
+makedepends=('apache-ant' 'jh')
+source=("$pkgname::git://github.com/KentBeck/junit.git#tag=r$pkgver")
+
+mksource() {
+  cd "${srcdir}/${pkgname}"
+  #find . -name '*.jar' -delete
+
+  # Shut up some warnings from javac 1.7
+  sed -ri 's|target="([0-9.]+)"|\0 source="\1"|' build.xml
+}
+
+build() {
+  mksource
+  cd "${srcdir}/${pkgname}"
+
+  # Shut up some warnings from javac 1.7
+  sed -ri 's|target="([0-9.]+)"$|\0 source="\1"|' build.xml
+  
+  ant jars
+  for pkg in junit junit-dep; do
+    sed \
+      -e "s|@artifactID@|$pkg|" \
+      -e "s|@version@|$pkgver|" \
+      < build/maven/pom-template.xml > $pkgname$pkgver/$pkg-$pkgver.pom
+  done
+}
+
+package() {
+  cd "${srcdir}/${pkgname}"
+  install -Dm644 cpl-v10.html "$pkgdir/usr/share/licenses/junit/cpl-v10.html"
+
+  cd "${srcdir}/${pkgname}/${pkgname}${pkgver}"
+
+  export DESTDIR="$pkgdir"
+  jh mvn-install $pkgname junit     $pkgver junit-$pkgver.{jar,pom}
+  jh mvn-install $pkgname junit-dep $pkgver junit-dep-$pkgver.{jar,pom}
+  install -d "${pkgdir}/usr/share/java/${pkgname}"
+  ln -s `jh mvn-basename $pkgname junit     $pkgver`.jar "${pkgdir}/usr/share/java/${pkgname}"
+  ln -s `jh mvn-basename $pkgname junit-dep $pkgver`.jar "${pkgdir}/usr/share/java/${pkgname}"
+  ln -s ${pkgname}/${pkgname}-${pkgver}.jar     ${pkgdir}/usr/share/java/${pkgname}.jar
+  ln -s ${pkgname}/${pkgname}-dep-${pkgver}.jar ${pkgdir}/usr/share/java/${pkgname}-dep.jar
+}
+
+md5sums=('SKIP')
-- 
cgit v1.2.3


From 7ef9e6ffdd8e71ce4298ef5bb19f5993dc6a4b8c Mon Sep 17 00:00:00 2001
From: Márcio Alexandre Silva Delgado <coadde@lavabit.com>
Date: Fri, 19 Oct 2012 13:54:57 -0200
Subject: luxblend25: updating packages

---
 libre/luxblend25/PKGBUILD | 44 +++++++++++++++++++++++---------------------
 1 file changed, 23 insertions(+), 21 deletions(-)
 mode change 100755 => 100644 libre/luxblend25/PKGBUILD

diff --git a/libre/luxblend25/PKGBUILD b/libre/luxblend25/PKGBUILD
old mode 100755
new mode 100644
index 3ce9b57db..cb89a938e
--- a/libre/luxblend25/PKGBUILD
+++ b/libre/luxblend25/PKGBUILD
@@ -1,44 +1,46 @@
-# Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com>
+# $Id$
 # Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
+
+pkgbase=luxrender
 pkgname=luxblend25
-pkgver=1.0rc4
-_pkgver=06194cf93745
-_blender=2.63
+srcver=3a928b723b29
+pkgver=1.1.v2.64
+_pkgver=${pkgver::3}
+reqname=blender
+reqver=${pkgver:5}
 pkgrel=1
 pkgdesc='A LuxRender exporter for Blender-libre'
 arch=(
   any
 )
-url=http://www.{pkgname::3}render.net/
+url="http://www.$pkgbase.net/"
 license=(
   GPL
 )
 depends=(
-  blender=$_blender
-  ${pkgname::3}render
+  $pkgbase=$_pkgver
+  "$reqname>=$reqver"
 )
-replaces=(
-  $pkgname
+provides=(
+  $pkgname=$_pkgver
 )
 conflicts=(
   $pkgname
+  "$reqname>=${reqver::2}$((${reqver:2}+1))"
 )
-provides=(
-  $pkgname=$pkgver
+replaces=(
+  $pkgname
 )
 source=(
-  https://bitbucket.org/${pkgname::3}render/$pkgname/get/$_pkgver.tar.bz2
+  "https://src.$pkgbase.net/$pkgname/archive/$srcver.tar.bz2"
 )
-md5sums=(
-  c5719c2a0e8567cd9f0aef429a2996f0
+sha512sums=(
+  f5aadc77e699f6b7259ece271b0c50ca7be5858bb628b99aedbb23b64e5587ac59cc3d1c52e063ba89c9d340f915727046e4d3017b26238425d43d3bba14f017
 )
 
 package() {
-  install -d -m755 $pkgdir/usr/share/blender/$_blender/scripts/addons
-  cp -a $srcdir/${pkgname::3}render-$pkgname-$_pkgver/src/${pkgname::3}render \
-    $pkgdir/usr/share/blender/$_blender/scripts/addons
-  # change the search path in exporter so it finds pylux in its new location
-  sed -i 's|from.*import pylux|import pylux|' $pkgdir/usr/share/blender/$_blender/scripts/addons/${pkgname::3}render/outputs/pure_api.py
+  a=$pkgname-$srcver/src/$pkgbase
+  b=usr/share/$reqname/$reqver/scripts/addons
+  install -d -m755 $pkgdir/$b
+  cp -a $srcdir/$a $pkgdir/$b
 }
-
-# vim:set ts=2 sw=2 et:
-- 
cgit v1.2.3


From a565b1de49060d5839f0f053761d81c4671270f4 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <LukeShu@sbcglobal.net>
Date: Fri, 19 Oct 2012 12:35:27 -0400
Subject: refactor common code out of java/java-asm{2,3}/PKGBUILD

---
 java/java-asm2/PKGBUILD  | 70 ++++-----------------------------------------
 java/java-asm2/common.sh | 59 ++++++++++++++++++++++++++++++++++++++
 java/java-asm3/PKGBUILD  | 74 ++++--------------------------------------------
 3 files changed, 70 insertions(+), 133 deletions(-)
 create mode 100644 java/java-asm2/common.sh

diff --git a/java/java-asm2/PKGBUILD b/java/java-asm2/PKGBUILD
index 45831b033..3541c20ab 100644
--- a/java/java-asm2/PKGBUILD
+++ b/java/java-asm2/PKGBUILD
@@ -1,32 +1,12 @@
 # Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
 
-_pkgname=asm
-pkgname=java-asm2
 pkgver=2.2.3
-pkgrel=4
-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
-  jh
-)
-source=("http://download.forge.objectweb.org/$_pkgname/$_pkgname-$pkgver.tar.gz")
+. common.sh
 
-_distdir="$_pkgname-$pkgver/output/dist"
-_ow_util_ant_tasks='/usr/share/java/ow_util_ant_tasks.jar'
-_m2_artifacts=(
-  asm
-  asm-analysis
-  asm-attrs
-  asm-commons
-  asm-tree
-  asm-util
-  asm-xml
-  asm-all)
+####
+
+pkgrel=5
+_checksource_ignore=('test/conform/org/objectweb/asm/signature/signatures.txt')
 
 mksource() {
   cd "$srcdir/$_pkgname-$pkgver"
@@ -35,44 +15,4 @@ mksource() {
   mkdir -p test/lib
 }
 
-build() {
-  cd "$srcdir/$_pkgname-$pkgver"
-  eval `jh mksource test/conform/org/objectweb/asm/signature/signatures.txt`
-
-  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/* .
-}
-
-package() {
-  # Install license file
-  cd "$srcdir/$_pkgname-$pkgver"
-  install -Dm644 LICENSE.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-
-  # Install documentation
-  cd "$srcdir/$_distdir"
-  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 the README about the -all files
-  cd "$srcdir/$_distdir/lib"
-  install -Dm644 README.txt \
-      "$pkgdir"/usr/share/java/$_pkgname/README-$pkgver.txt
-
-  # Install Maven artifacts
-  export DESTDIR=$pkgdir
-  for artifact in "${_m2_artifacts[@]}"; 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" \
-	"$pkgdir"/usr/share/java/$_pkgname/
-    ln -s $_pkgname/$artifact-$pkgver.jar \
-	"$pkgdir"/usr/share/java/$artifact-${pkgver%%.*}.jar
-  done
-}
-
 md5sums=('7a92c87bf067925685cf68dcc0dd8998')
diff --git a/java/java-asm2/common.sh b/java/java-asm2/common.sh
new file mode 100644
index 000000000..6a664c9ff
--- /dev/null
+++ b/java/java-asm2/common.sh
@@ -0,0 +1,59 @@
+# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
+
+_pkgname=asm
+pkgname=java-asm${pkgver%%.*}
+pkgdesc="An all purpose Java bytecode manipulation and analysis framework."
+url="http://asm.ow2.org/"
+license=('custom:BSD3')
+
+arch=('any')
+depends=('java-runtime')
+makedepends=(
+  apache-ant
+  java-ow-util-ant-tasks
+  jh
+)
+source=("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/* .
+}
+
+package() {
+  # Install license file
+  cd "$srcdir/$_pkgname-$pkgver"
+  install -Dm644 LICENSE.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+
+  # Install documentation
+  cd "$srcdir/$_distdir"
+  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 the README about the -all files
+  cd "$srcdir/$_distdir/lib"
+  install -Dm644 README.txt \
+      "$pkgdir"/usr/share/java/$_pkgname/README-$pkgver.txt
+
+  # 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" \
+	"$pkgdir"/usr/share/java/$_pkgname/
+    ln -s $_pkgname/$artifact-$pkgver.jar \
+	"$pkgdir"/usr/share/java/$artifact-${pkgver%%.*}.jar
+  done
+}
diff --git a/java/java-asm3/PKGBUILD b/java/java-asm3/PKGBUILD
index 3af6902f4..e85896b72 100644
--- a/java/java-asm3/PKGBUILD
+++ b/java/java-asm3/PKGBUILD
@@ -1,79 +1,17 @@
 # Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
 
-_pkgname=asm
-pkgname=java-asm3
-_pkgver=3
 pkgver=3.3.1
-pkgrel=4.1
-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
-  jh
-)
-source=("http://download.forge.objectweb.org/$_pkgname/$_pkgname-$pkgver.tar.gz")
+. ../java-asm2/common.sh
 
-_distdir="$_pkgname-$pkgver/output/dist"
-_ow_util_ant_tasks='/usr/share/java/ow_util_ant_tasks.jar'
-_m2_artifacts=(
-  asm
-  asm-analysis
-  asm-commons
-  asm-parent
-  asm-tree
-  asm-util
-  asm-xml
-  asm-all
-  asm-debug-all)
+####
 
-mksource()
+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 cobertura.ser # We regenerate this
   rm examples/jasmin/test/jasmin.jar
 }
 
-build() {
-  cd "$srcdir/$_pkgname-$pkgver"
-  eval `jh mksource`
-
-  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/* .
-}
-
-package() {
-  # Install license file
-  cd "$srcdir/$_pkgname-$pkgver"
-  install -Dm644 LICENSE.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-
-  # Install documentation
-  cd "$srcdir/$_distdir"
-  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 the README about the -all files
-  cd "$srcdir/$_distdir/lib"
-  install -Dm644 README.txt \
-      "$pkgdir"/usr/share/java/$_pkgname/README-$pkgver.txt
-
-  # Install Maven artifacts
-  export DESTDIR=$pkgdir
-  for artifact in "${_m2_artifacts[@]}"; 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" \
-	"$pkgdir"/usr/share/java/$_pkgname/
-    ln -s $_pkgname/$artifact-$pkgver.jar \
-	"$pkgdir"/usr/share/java/$artifact-${pkgver%%.*}.jar
-  done
-}
-
 md5sums=('433024df8176f09922646316e415631c')
-- 
cgit v1.2.3


From 250f36709515f452ea256cfe2ceb4b770dfdb49e Mon Sep 17 00:00:00 2001
From: Luke Shumaker <LukeShu@sbcglobal.net>
Date: Fri, 19 Oct 2012 16:57:57 -0400
Subject: add java/java-jarjar 1.2

---
 java/java-jarjar/PKGBUILD | 49 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 49 insertions(+)
 create mode 100644 java/java-jarjar/PKGBUILD

diff --git a/java/java-jarjar/PKGBUILD b/java/java-jarjar/PKGBUILD
new file mode 100644
index 000000000..8d1d1120b
--- /dev/null
+++ b/java/java-jarjar/PKGBUILD
@@ -0,0 +1,49 @@
+# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
+
+# jarjar 1.2 is old, but is the last version that used java-asm3
+# java-asm4 is not packaged
+
+_pkgname=jarjar
+pkgname=java-jarjar
+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')
+
+pkgrel=1
+arch=('any')
+depends=('java-runtime')
+makedepends=('apache-ant' 'java-asm3' 'junit' 'maven' 'jh')
+source=("svn+http://jarjar.googlecode.com/svn/trunk/jarjar#revision=$_pkgrev")
+
+mksource() {
+  cd "$srcdir/$_pkgname"
+  rm -f src/test/*.{class,jar}
+  rm -f lib/*.jar
+}
+
+build() {
+  cd "$srcdir/$_pkgname"
+  eval `jh mksource`
+
+  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/
+
+  export CLASSPATH=/usr/share/java/asm-3.jar
+  echo 'includeantruntime false' > build.properties
+  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=('SKIP')
-- 
cgit v1.2.3


From 659ed1759060bb4bf572f162d15785eeba6c0172 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <LukeShu@sbcglobal.net>
Date: Fri, 19 Oct 2012 16:58:06 -0400
Subject: add a non-working java/java-jarjar/PKGBUILD-1.4

---
 java/java-jarjar/PKGBUILD-1.4 | 41 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)
 create mode 100644 java/java-jarjar/PKGBUILD-1.4

diff --git a/java/java-jarjar/PKGBUILD-1.4 b/java/java-jarjar/PKGBUILD-1.4
new file mode 100644
index 000000000..f0ebe9270
--- /dev/null
+++ b/java/java-jarjar/PKGBUILD-1.4
@@ -0,0 +1,41 @@
+# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
+
+_pkgname=jarjar
+pkgname=java-jarjar
+pkgver=1.4
+pkgdesc="Java static linker (instead of the normal dynamic linking)"
+url="https://code.google.com/p/jarjar/"
+license=('Apache2')
+
+pkgrel=1
+arch=('any')
+depends=('java-runtime')
+makedepends=('apache-ant' 'java-asm4' 'junit' 'maven' 'jh')
+source=("https://${_pkgname}.googlecode.com/files/${_pkgname}-src-${pkgver}.zip")
+
+mksource() {
+  cd "$srcdir/$_pkgname-$pkgver"
+  rm -f src/test/*.{class,jar}
+  rm -f lib/*.jar
+}
+
+build() {
+  cd "$srcdir/$_pkgname-$pkgver"
+  eval `jh mksource`
+
+  ln -s /usr/share/java/asm-4.jar             lib/asm-4.0.jar
+  ln -s /usr/share/java/asm-commons-4.jar     lib/asm-commons-4.0.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
+
+  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"
+}
+
+sha1sums=('803ad79cf429faeb4d767b2fb45d84bbc904ea04')
-- 
cgit v1.2.3


From 49455600daf927f16cee8c7ffb0638cefa32247c Mon Sep 17 00:00:00 2001
From: Luke Shumaker <LukeShu@sbcglobal.net>
Date: Fri, 19 Oct 2012 17:42:01 -0400
Subject: add java{,-ugly}/not-working folders with all of my not-working
 packages

---
 java-ugly/not-working/java-bnd/PKGBUILD    | 24 ++++++++
 java/not-working/closure-compiler/PKGBUILD | 73 ++++++++++++++++++++++
 java/not-working/closure-compiler/TODO     |  2 +
 java/not-working/java-asm4/PKGBUILD        | 17 +++++
 java/not-working/java-asm4/TODO            |  1 +
 java/not-working/java-guava/PKGBUILD       | 34 ++++++++++
 java/not-working/java-guava/TODO           |  2 +
 java/not-working/junit-truth/PKGBUILD      | 45 ++++++++++++++
 java/not-working/junit-truth/TODO          |  1 +
 java/not-working/protobuf/PKGBUILD         | 99 ++++++++++++++++++++++++++++++
 java/not-working/protobuf/TODO             |  5 ++
 11 files changed, 303 insertions(+)
 create mode 100644 java-ugly/not-working/java-bnd/PKGBUILD
 create mode 100644 java/not-working/closure-compiler/PKGBUILD
 create mode 100644 java/not-working/closure-compiler/TODO
 create mode 100644 java/not-working/java-asm4/PKGBUILD
 create mode 100644 java/not-working/java-asm4/TODO
 create mode 100644 java/not-working/java-guava/PKGBUILD
 create mode 100644 java/not-working/java-guava/TODO
 create mode 100644 java/not-working/junit-truth/PKGBUILD
 create mode 100644 java/not-working/junit-truth/TODO
 create mode 100644 java/not-working/protobuf/PKGBUILD
 create mode 100644 java/not-working/protobuf/TODO

diff --git a/java-ugly/not-working/java-bnd/PKGBUILD b/java-ugly/not-working/java-bnd/PKGBUILD
new file mode 100644
index 000000000..86820469a
--- /dev/null
+++ b/java-ugly/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/closure-compiler/PKGBUILD b/java/not-working/closure-compiler/PKGBUILD
new file mode 100644
index 000000000..8318379a2
--- /dev/null
+++ b/java/not-working/closure-compiler/PKGBUILD
@@ -0,0 +1,73 @@
+# 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
new file mode 100644
index 000000000..8527a4898
--- /dev/null
+++ b/java/not-working/closure-compiler/TODO
@@ -0,0 +1,2 @@
+* 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
new file mode 100644
index 000000000..3db06dddc
--- /dev/null
+++ b/java/not-working/java-asm4/PKGBUILD
@@ -0,0 +1,17 @@
+# 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
new file mode 100644
index 000000000..563c88bc9
--- /dev/null
+++ b/java/not-working/java-asm4/TODO
@@ -0,0 +1 @@
+Depends on java-bnd, which is not packaged
\ No newline at end of file
diff --git a/java/not-working/java-guava/PKGBUILD b/java/not-working/java-guava/PKGBUILD
new file mode 100644
index 000000000..0250e7183
--- /dev/null
+++ b/java/not-working/java-guava/PKGBUILD
@@ -0,0 +1,34 @@
+# 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
new file mode 100644
index 000000000..ee0a18042
--- /dev/null
+++ b/java/not-working/java-guava/TODO
@@ -0,0 +1,2 @@
+* 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
new file mode 100644
index 000000000..61a0ee469
--- /dev/null
+++ b/java/not-working/junit-truth/PKGBUILD
@@ -0,0 +1,45 @@
+# 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
new file mode 100644
index 000000000..d21b3e472
--- /dev/null
+++ b/java/not-working/junit-truth/TODO
@@ -0,0 +1 @@
+has unpackaged dependencies
diff --git a/java/not-working/protobuf/PKGBUILD b/java/not-working/protobuf/PKGBUILD
new file mode 100644
index 000000000..699bde0cf
--- /dev/null
+++ b/java/not-working/protobuf/PKGBUILD
@@ -0,0 +1,99 @@
+# 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
new file mode 100644
index 000000000..6a126b757
--- /dev/null
+++ b/java/not-working/protobuf/TODO
@@ -0,0 +1,5 @@
+* 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
-- 
cgit v1.2.3


From 3f0e156548a72a447c089113ddf888a5dc51403a Mon Sep 17 00:00:00 2001
From: Márcio Alexandre Silva Delgado <coadde@lavabit.com>
Date: Fri, 19 Oct 2012 19:52:28 -0200
Subject: zoneminder: updating package

---
 pcr/zoneminder/PKGBUILD           | 84 ++++++++++++++++++++++++---------------
 pcr/zoneminder/httpd-zm.conf      |  8 ++--
 pcr/zoneminder/zoneminder.install | 44 +++++++++++++++-----
 3 files changed, 92 insertions(+), 44 deletions(-)

diff --git a/pcr/zoneminder/PKGBUILD b/pcr/zoneminder/PKGBUILD
index bb850eec2..64c3f94b0 100644
--- a/pcr/zoneminder/PKGBUILD
+++ b/pcr/zoneminder/PKGBUILD
@@ -8,7 +8,7 @@
 
 pkgname=zoneminder
 pkgver=1.25.0
-pkgrel=17
+pkgrel=19
 pkgdesc='Capture, analyse, record and monitor video security cameras'
 arch=(i686 x86_64 mips64el)
 backup=(etc/zm.conf etc/httpd/conf/extra/httpd-zm.conf)
@@ -31,7 +31,7 @@ source=(
 )
 md5sums=(
   eaefa14befd482154970541252aa1a39
-  25ad042b501aaad98cbe4e05ca0a96c2
+  72380d8793a784ec24cb6809aea4a739
   034b61cda8849fc3001849e76ef26041
   7487cc72ead82aea0bc78f2e4106ae1a
   81c8be870260142e2633eedf73c72040
@@ -39,27 +39,49 @@ md5sums=(
 build() {
   cd $srcdir/ZoneMinder-$pkgver
 
-  export CPPFLAGS=-D__STDC_CONSTANT_MACROS \
+  export CPPFLAGS=-D__STDC_CONSTANT_MACROS\
     ZM_SSL_LIB=gnutls
 
   # Patch for GCC 4.7.x
-  sed -i -e 's/^#include <errno.h>/#include <errno.h>\n#include <unistd.h>/' src/zm_logger.cpp
-  sed -i -e 's/^#include <pthread.h>/#include <pthread.h>\n#include <unistd.h>/' src/zm_thread.h
+  sed -i -e 's/^#include <errno.h>/#include <errno.h>\n#include <unistd.h>/'\
+     src/zm_logger.cpp || read
+  sed -i -e 's/^#include <pthread.h>/#include <pthread.h>\n#include <unistd.h>/'\
+     src/zm_thread.h || read
+
+  # Patch for automake 1.12
+  sed -i -e '/am__api_version=/ s/1.11/1.12/'\
+    configure || read
 
   # Patch for disable ZM_CHECK_FOR_UPDATES
-  sed -i -e '/ZM_CHECK_FOR_UPDATES/,+1 s/yes/no/' scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
+  sed -i -e '/ZM_CHECK_FOR_UPDATES/,+1 s/yes/no/'\
+    scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in || read
 
   # Patch for support html5 video and flv
   sed -i -e '/ZM_MPEG_LIVE_FORMAT/,+1 s/swf/webm/;/ZM_MPEG_REPLAY_FORMAT/,+1 s/swf/webm/;
     /ZM_FFMPEG_FORMATS/,+1 s/mpg mpeg wmv asf avi\* mov swf 3gp\*\*/mpg mpeg wmv asf avi\* mov flv swf 3gp\*\* webm ogg h254/'\
-    scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
+    scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in || read
+
+  # Patch for change path
+  sed -i -e '/ZM_PATH_SOCKS/,+1 s/tmp\/zm/run/;
+    /ZM_PATH_LOGS/,+1 s/zm/zonemider/;
+    /ZM_PATH_SWAP/,+1 s/zm/zonemider/'\
+    scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in || read
+
+  # Patch for v4l1 compat
+  sed -i -e "s/$ENV{SHELL} = \'\/bin\/sh\' if exists $ENV{SHELL};/$ENV{SHELL} = \'\/bin\/sh\' if exists $ENV{SHELL};\n$ENV{LD_PRELOAD} = \'\/usr\/lib\/libv4l\/v4l1compat.so\' ;/"\
+    scripts/zmdc.pl.in || read
+
+  # Patch for add more socket tries
+  sed -i -e '/$max_socket_tries/ s/3/15/'\
+    web/ajax/stream.php || read
 
   # Patch for wrong "suppported"
-  sed -i -e 's/suppported/supported/' src/zm_local_camera.cpp
+  sed -i -e 's/suppported/supported/'\
+     src/zm_local_camera.cpp || read
 
   # Patch for type cast in linux-libre kernel 3.5
   sed -i -e 's/enum v4l2_buf_type type = v4l2_data.fmt.type;/enum v4l2_buf_type type = (v4l2_buf_type)v4l2_data.fmt.type;/'\
-    src/zm_local_camera.cpp
+    src/zm_local_camera.cpp || read
 
   # Patch for drop custom perl install paths
   sed -i -e '/# Slight hack for non-standard perl install paths/,+10 d;
@@ -93,22 +115,22 @@ build() {
     /	( cd $(DESTDIR)$(sysconfdir); chown $(webuser):$(webgroup) $(sysconf_DATA); chmod 600 $(sysconf_DATA) )/d;
     /	( if ! test -e $(ZM_RUNDIR); then mkdir -p $(ZM_RUNDIR); fi; if test "$(ZM_RUNDIR)" != "\/var\/run"; then chown $(webuser):$(webgroup) $(ZM_RUNDIR); chmod u+w $(ZM_RUNDIR); fi )/d;
     /	( if ! test -e $(ZM_TMPDIR); then mkdir -m 700 -p $(ZM_TMPDIR); fi; if test "$(ZM_TMPDIR)" != "\/tmp"; then chown $(webuser):$(webgroup) $(ZM_TMPDIR); chmod u+w $(ZM_TMPDIR); fi )/d;
-    /	( if ! test -e $(ZM_LOGDIR); then mkdir -p $(ZM_LOGDIR); fi; if test "$(ZM_LOGDIR)" != "\/var\/log"; then chown $(webuser):$(webgroup) $(ZM_LOGDIR); chmod u+w $(ZM_LOGDIR); fi )/,+1 d' \
+    /	( if ! test -e $(ZM_LOGDIR); then mkdir -p $(ZM_LOGDIR); fi; if test "$(ZM_LOGDIR)" != "\/var\/log"; then chown $(webuser):$(webgroup) $(ZM_LOGDIR); chmod u+w $(ZM_LOGDIR); fi )/,+1 d'\
     Makefile.{am,in}
 
-  ./configure --prefix=/usr \
-    --build \
-    --enable-crashtrace=no \
-    --enable-debug=no \
-    --enable-mmap=yes \
-    --sysconfdir=/etc \
-    --with-cgidir=/usr/lib/$pkgname/cgi-bin \
-    --with-ffmpeg=/usr \
-    --with-libarch=lib \
-    --with-mysql=/usr \
-    --with-webdir=/usr/share/$pkgname/www \
-    --with-webgroup=http \
-    --with-webhost=localhost \
+  ./configure --prefix=/usr\
+    --enable-crashtrace=no\
+    --enable-debug=no\
+    --enable-mmap=yes\
+    --sysconfdir=/etc\
+    --with-cgidir=/srv/http/cgi-bin\
+    --with-extralibs='-L/usr/lib -L/usr/lib/mysql'\
+    --with-ffmpeg=/usr\
+    --with-libarch=lib\
+    --with-mysql=/usr\
+    --with-webdir=/srv/http/$pkgname\
+    --with-webgroup=http\
+    --with-webhost=localhost\
     --with-webuser=http
 
   make V=0
@@ -117,22 +139,22 @@ build() {
 package() {
   cd $srcdir/ZoneMinder-$pkgver
 
-  make DESTDIR=$pkgdir install
+  make DESTDIR=$pkgdir RUNDIR=$pkdir/run ZM_RUNDIR=$pkgdir/run install
 
-  mkdir -p $pkgdir/{etc/{httpd/conf/extra,rc.d},usr/{lib/{systemd/system,$pkgname/cgi-bin},share/{license/$pkgname,$pkgname/{db,www}}},var/{cache/$pkgname,log/zm}}
+  mkdir -p $pkgdir/{etc/{httpd/conf/extra,rc.d},srv/http/{cgi-bin,$pkgname},usr/{lib/systemd/system,share/{license/$pkgname,$pkgname/db}},var/{cache/$pkgname,log/$pkgname}}
 
-  chown -R http.http $pkgdir/{etc/zm.conf,var/{cache/$pkgname,log/zm}}
+  chown -R http.http $pkgdir/{etc/zm.conf,var/{cache/$pkgname,log/$pkgname}}
 
   for i in events images temp; do
-    mv    $pkgdir/usr/share/$pkgname/www/$i $pkgdir/var/cache/$pkgname/$i
-    ln -s /var/cache/$pkgname/$i            $pkgdir/usr/share/$pkgname/www/$i
+    mv    $pkgdir/srv/http/$pkgname/$i $pkgdir/var/cache/$pkgname/$i
+    ln -s /var/cache/$pkgname/$i       $pkgdir/srv/http/$pkgname/$i
   done
 
-  ln -s /usr/lib/$pkgname/cgi-bin          $pkgdir/usr/share/$pkgname/www
-  ln -s /usr/share/cambozola/cambozola.jar $pkgdir/usr/share/$pkgname/www
+  ln -s /srv/http/cgi-bin                  $pkgdir/srv/http/$pkgname
+  ln -s /usr/share/cambozola/cambozola.jar $pkgdir/srv/http/$pkgname
 
   install -D -m 644 $srcdir/httpd-zm.conf    $pkgdir/etc/httpd/conf/extra
-  install -D -m 644 $srcdir/zm.rc.d          $pkgdir/etc/rc.d/zm
+  install -D -m 644 $srcdir/zm.rc.d          $pkgdir/etc/rc.d/${pkgname}d
   install -D -m 644 $srcdir/$pkgname.service $pkgdir/usr/lib/systemd/system
   install -D -m 644 COPYING                  $pkgdir/usr/share/license/$pkgname
   install -D -m 644 db/zm*.sql               $pkgdir/usr/share/$pkgname/db
diff --git a/pcr/zoneminder/httpd-zm.conf b/pcr/zoneminder/httpd-zm.conf
index 8c6356aec..aeb089bc1 100644
--- a/pcr/zoneminder/httpd-zm.conf
+++ b/pcr/zoneminder/httpd-zm.conf
@@ -1,8 +1,8 @@
 # /etc/httpd/conf/extra/httpd-zm.conf
 # Config for zoneminder web app
 
-Alias /zm "/usr/share/zoneminder/www"
-<Directory "/usr/share/zoneminder/www">
+Alias /zm "/srv/http/zoneminder"
+<Directory "/srv/http/zoneminder">
   Options -Indexes MultiViews FollowSymLinks
   AllowOverride None
   Order allow,deny
@@ -11,8 +11,8 @@ Alias /zm "/usr/share/zoneminder/www"
   php_value short_open_tag On
 </Directory>
 
-ScriptAlias /zm/cgi-bin "/usr/lib/zoneminder/cgi-bin"
-<Directory "/usr/lib/zoneminder/cgi-bin">
+ScriptAlias /cgi-bin "/srv/http/cgi-bin"
+<Directory "/srv/http/cgi-bin">
   AllowOverride None
   Options ExecCGI FollowSymLinks
   Order allow,deny
diff --git a/pcr/zoneminder/zoneminder.install b/pcr/zoneminder/zoneminder.install
index 922aaad9b..5e62cc23e 100644
--- a/pcr/zoneminder/zoneminder.install
+++ b/pcr/zoneminder/zoneminder.install
@@ -1,14 +1,14 @@
 pre_install() {
   set -e
   abort=false
-  if [ -L /usr/share/zoneminder/www/events ]; then
-    l=$(readlink /usr/share/zoneminder/www/events)
+  if [ -L /srv/http/zoneminder/events ]; then
+    l=$(readlink /srv/http/zoneminder/events)
     if [ $l != /var/cache/zoneminder/events ]; then
         abort=true
     fi
   fi
-  if [ -L /usr/share/zoneminder/www/images ]; then
-    l=$(readlink /usr/share/zoneminder/www/images )
+  if [ -L /srv/http/zoneminder/images ]; then
+    l=$(readlink /srv/http/zoneminder/images )
     if [ $l != /var/cache/zoneminder/images ]; then
         abort=true
     fi
@@ -16,7 +16,7 @@ pre_install() {
   if [ $abort = true ]; then
     cat >&2 << EOF
 Aborting installation of zoneminder due to non-default symlinks in
-/usr/share/zoneminder/www for the images and/or events directory, which could
+/srv/http/zoneminder for the images and/or events directory, which could
 result in loss of data. Please move your data in each of these directories to
 /var/cache/zoneminder before installing zoneminder from the package.
 EOF
@@ -26,8 +26,13 @@ EOF
 }
 
 post_install() {
-  mkdir /usr/share/zoneminder/www/backup
-  mkdir /usr/share/zoneminder/www/socks
+  if [ -d /var/log/zoneminder ]; then
+    mkdir -m 0755 /var/log/zoneminder
+    chown http.http /var/log/zoneminder
+  else
+    chmod 0755 /var/log/zoneminder
+    chown http.http /var/log/zoneminder
+  fi
   cat << EOF
 Note:
 ==> To run Zoneminder, you must install the database running mysql service (as root):
@@ -50,9 +55,10 @@ Note:
 
 ==> You must edit /etc/php/php.ini and add to open_basedir "/etc" and
 ==> "/usr/share/zoneminder" like so
-==> "open_basedir = /home:/tmp:/usr/share/pear:/etc:/usr/share/zoneminder/www"
+==> "open_basedir = /home:/tmp:/usr/share/pear:/etc:/srv/http/zoneminder"
 ==> Otherwise ZoneMinder will be unable to read /etc/zm.conf
 ==> or display its own web directory
+==> And set your timezone in php.ini: date.timezone = <my_country>/<my_city>
 
 Note:
 ==> You must edit /etc/httpd/conf/httpd.conf and add the line:
@@ -65,9 +71,22 @@ EOF
 
 post_upgrade() {
   /usr/bin/zmupdate.pl -f >/dev/null
+  if [ -d /var/log/zoneminder ]; then
+    mkdir -m 0755 /var/log/zoneminder
+    chown http.http /var/log/zoneminder
+  else
+    chmod 0755 /var/log/zoneminder
+    chown http.http /var/log/zoneminder
+  fi
 }
 
 post_remove() {
+  if [ -d /run/zoneminder ]; then
+    rm -vr /run/zoneminder
+  fi
+  if [ -d /tmp/zoneminder ]; then
+    rm -vr /tmp/zoneminder
+  fi
   cat << EOF
 Note:
 ==> To clean Zoneminder mysql database, run as root:
@@ -79,6 +98,8 @@ Note:
 ==> comment or remove that lines in /etc/httpd/conf/httpd.conf:
 ==> "LoadModule php5_module modules/libphp5.so"
 ==> "Include /etc/httpd/conf/extra/php5_module.conf"
+
+==> Remove
 ==> "Include /etc/httpd/conf/extra/httpd-zm.conf"
 
 ==> Disable php with mysql if it isn't needed with others servers, 
@@ -90,8 +111,13 @@ Note:
 ==> "extension=mysqli.so"
 ==> "extension=session.so"
 ==> "extension=sockets.so"
+==> "date.timezone = <my_country>/<my_city>"
 
-==> edit /etc/php/php.ini and remove "/etc" and "/usr/share/zoneminder/www"
+==> Edit /etc/php/php.ini and remove "/etc" and "/usr/share/zoneminder/www"
 ==> in the open_basedir.
+
+==> Remove log files and 'zonemider' directory in "/var/log/zoneminder"
+
+==> Backup and remove events images and temp dirs in "/var/cache/zoneminder"
 EOF
 }
-- 
cgit v1.2.3


From 4a859810d5bd6b54c5d20bf3f23628fb1daef35c Mon Sep 17 00:00:00 2001
From: Esteban Carnevale <alfplayer@mailoo.org>
Date: Fri, 19 Oct 2012 19:12:56 -0300
Subject: parabola-archiso-2012.10.17-1: add package

---
 libre/parabola-archiso/PKGBUILD | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100755 libre/parabola-archiso/PKGBUILD

diff --git a/libre/parabola-archiso/PKGBUILD b/libre/parabola-archiso/PKGBUILD
new file mode 100755
index 000000000..336892373
--- /dev/null
+++ b/libre/parabola-archiso/PKGBUILD
@@ -0,0 +1,22 @@
+# Maintainer: Pierre Schmitz <pierre@archlinux.de>
+# Maintainer (Parabola): Esteban Carnevale <alfplayer@mailoo.org>
+
+pkgname=parabola-archiso
+pkgver=2012.10.17
+pkgrel=1
+pkgdesc='Tools for creating Parabola GNU/Linux-libre live and install iso images'
+arch=('any')
+url='https://parabolagnulinux.org'
+license=('GPL')
+depends=('make' 'squashfs-tools' 'libisoburn' 'dosfstools' 'patch' 'lynx' 'wget')
+provides=('archiso')
+conflicts=('archiso')
+source=("https://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}.tar.gz"
+        "https://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}.tar.gz.sig")
+md5sums=('b8a5d4a6ee2547a502cbecea0e238e61'
+         '9425cc4353b5654d7478e9e2b0bf848d')
+
+package() {
+	cd ${srcdir}/${pkgname}-${pkgver}
+	make DESTDIR=${pkgdir} install
+}
-- 
cgit v1.2.3


From df2072bf0a3ff862e603f28a73ac7781b1c732a9 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <LukeShu@sbcglobal.net>
Date: Fri, 19 Oct 2012 23:36:10 -0400
Subject: improve java/arduino

 * patch to be compatible with newer versions of avr-libc
 * use jh
---
 java/arduino/PKGBUILD       |  31 ++++--
 java/arduino/sig-patch.diff | 256 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 278 insertions(+), 9 deletions(-)
 create mode 100644 java/arduino/sig-patch.diff

diff --git a/java/arduino/PKGBUILD b/java/arduino/PKGBUILD
index b21db4fbf..426664a37 100644
--- a/java/arduino/PKGBUILD
+++ b/java/arduino/PKGBUILD
@@ -2,26 +2,37 @@
 
 pkgname=arduino
 pkgver=1.0.1
-pkgrel=1
-pkgdesc="Arduino SDK"
+pkgrel=2
+pkgdesc="Arduino SDK and IDE"
 arch=('i686' 'x86_64')
 url="http://arduino.cc/en/Main/Software"
 options=(!strip)
 license=('GPL')
 
-makedependa=(java-environment avr-gcc avr-libc make apache-ant)
-depends=('avr-gcc>=4.3.2' 'avr-libc' 'libusb-compat' 'java-runtime' 'avrdude'
+depends=('avr-gcc' 'avr-libc' 'libusb-compat' 'java-runtime' 'avrdude'
     'java-rxtx' 'antlr2' 'eclipse-ecj' 'jna')
-#conflicts=('avr-gcc>=4.4')
+makedepends=(java-environment apache-ant jh)
 install="arduino.install"
 source=("http://arduino.googlecode.com/files/arduino-$pkgver-src.tar.gz"
+	'sig-patch.diff'
 	'arduino.png'
 	'arduino.desktop')
 
 unset _JAVA_OPTIONS
 . /etc/profile.d/jdk.sh
 
+mksource() {
+  cd "$srcdir/arduino-$pkgver"
+  find . -name '*.jar' -delete
+  find . -name '*.swp' -delete
+  find . -name '*.so' -delete
+  rm -rf build/linux/dist/*/*
+}
+
 build() {
+  cd "$srcdir/arduino-$pkgver"
+  eval `jh mksource build/shared/reference.zip`
+
   cd "$srcdir"
   mkdir empty.d
   cd empty.d
@@ -30,10 +41,11 @@ build() {
   rmdir empty.d
 
   cd "$srcdir/arduino-$pkgver"
-  find . -name '*.jar' -delete
-  find . -name '*.swp' -delete
-  find . -name '*.so' -delete
-  rm -rf build/linux/dist/*/*
+
+  # Fix issue 955 to be compatible with newer versions of avr-libc
+  # https://code.google.com/p/arduino/issues/detail?id=955
+  # Note: this patch is not the patch given in the comments
+  patch -Np1 -i "$srcdir/sig-patch.diff"
 
   #ln -s /.../RXTXcomm.jar app/lib # already on the classpath
   ln -s /usr/share/java/antlr2.jar app/lib/antlr.jar
@@ -84,5 +96,6 @@ package() {
 }
 
 md5sums=('03263613f4be4f865989244420be04fa'
+         'acadc724cbe08c09711825f4bd5c04f6'
          '9e36d33891d5e68d38ec55d1494499a5'
          'eebc4d6495864bea99ad057af801afb9')
diff --git a/java/arduino/sig-patch.diff b/java/arduino/sig-patch.diff
new file mode 100644
index 000000000..4be3a6cdc
--- /dev/null
+++ b/java/arduino/sig-patch.diff
@@ -0,0 +1,256 @@
+diff -ruN arduino-1.0.1.orig/hardware/arduino/cores/arduino/HardwareSerial.cpp arduino-1.0.1/hardware/arduino/cores/arduino/HardwareSerial.cpp
+--- arduino-1.0.1.orig/hardware/arduino/cores/arduino/HardwareSerial.cpp	2012-05-21 13:01:43.000000000 -0400
++++ arduino-1.0.1/hardware/arduino/cores/arduino/HardwareSerial.cpp	2012-10-19 23:26:46.000000000 -0400
+@@ -88,24 +88,16 @@
+ #if !defined(USART0_RX_vect) && defined(USART1_RX_vect)
+ // do nothing - on the 32u4 the first USART is USART1
+ #else
+-#if !defined(USART_RX_vect) && !defined(SIG_USART0_RECV) && \
+-    !defined(SIG_UART0_RECV) && !defined(USART0_RX_vect) && \
+-	!defined(SIG_UART_RECV)
++#if !defined(USART_RX_vect) && !defined(USART0_RX_vect)
+   #error "Don't know what the Data Received vector is called for the first UART"
+ #else
+   void serialEvent() __attribute__((weak));
+   void serialEvent() {}
+   #define serialEvent_implemented
+ #if defined(USART_RX_vect)
+-  SIGNAL(USART_RX_vect)
+-#elif defined(SIG_USART0_RECV)
+-  SIGNAL(SIG_USART0_RECV)
+-#elif defined(SIG_UART0_RECV)
+-  SIGNAL(SIG_UART0_RECV)
++  ISR(USART_RX_vect)
+ #elif defined(USART0_RX_vect)
+-  SIGNAL(USART0_RX_vect)
+-#elif defined(SIG_UART_RECV)
+-  SIGNAL(SIG_UART_RECV)
++  ISR(USART0_RX_vect)
+ #endif
+   {
+   #if defined(UDR0)
+@@ -124,39 +116,33 @@
+   void serialEvent1() __attribute__((weak));
+   void serialEvent1() {}
+   #define serialEvent1_implemented
+-  SIGNAL(USART1_RX_vect)
++  ISR(USART1_RX_vect)
+   {
+     unsigned char c = UDR1;
+     store_char(c, &rx_buffer1);
+   }
+-#elif defined(SIG_USART1_RECV)
+-  #error SIG_USART1_RECV
+ #endif
+ 
+ #if defined(USART2_RX_vect) && defined(UDR2)
+   void serialEvent2() __attribute__((weak));
+   void serialEvent2() {}
+   #define serialEvent2_implemented
+-  SIGNAL(USART2_RX_vect)
++  ISR(USART2_RX_vect)
+   {
+     unsigned char c = UDR2;
+     store_char(c, &rx_buffer2);
+   }
+-#elif defined(SIG_USART2_RECV)
+-  #error SIG_USART2_RECV
+ #endif
+ 
+ #if defined(USART3_RX_vect) && defined(UDR3)
+   void serialEvent3() __attribute__((weak));
+   void serialEvent3() {}
+   #define serialEvent3_implemented
+-  SIGNAL(USART3_RX_vect)
++  ISR(USART3_RX_vect)
+   {
+     unsigned char c = UDR3;
+     store_char(c, &rx_buffer3);
+   }
+-#elif defined(SIG_USART3_RECV)
+-  #error SIG_USART3_RECV
+ #endif
+ 
+ void serialEventRun(void)
+diff -ruN arduino-1.0.1.orig/hardware/arduino/cores/arduino/HardwareSerial.h arduino-1.0.1/hardware/arduino/cores/arduino/HardwareSerial.h
+--- arduino-1.0.1.orig/hardware/arduino/cores/arduino/HardwareSerial.h	2012-05-21 13:01:43.000000000 -0400
++++ arduino-1.0.1/hardware/arduino/cores/arduino/HardwareSerial.h	2012-10-19 23:13:59.000000000 -0400
+@@ -76,6 +76,15 @@
+   extern HardwareSerial Serial3;
+ #endif
+ 
++/*
++ * on ATmega8, the uart and its bits are not numbered, so there is no "TXC0"
++ * definition.  It is slightly cleaner to define this here instead of having
++ * conditional code in the cpp module.
++ */
++#if !defined(TXC0)
++#define TXC0 TXC
++#endif
++
+ extern void serialEventRun(void) __attribute__((weak));
+ 
+ #endif
+diff -ruN arduino-1.0.1.orig/hardware/arduino/cores/arduino/WInterrupts.c arduino-1.0.1/hardware/arduino/cores/arduino/WInterrupts.c
+--- arduino-1.0.1.orig/hardware/arduino/cores/arduino/WInterrupts.c	2012-05-21 13:01:43.000000000 -0400
++++ arduino-1.0.1/hardware/arduino/cores/arduino/WInterrupts.c	2012-10-19 23:13:59.000000000 -0400
+@@ -216,72 +216,72 @@
+ */
+ 
+ #if defined(__AVR_ATmega32U4__)
+-SIGNAL(INT0_vect) {
++ISR(INT0_vect) {
+ 	if(intFunc[EXTERNAL_INT_0])
+ 		intFunc[EXTERNAL_INT_0]();
+ }
+ 
+-SIGNAL(INT1_vect) {
++ISR(INT1_vect) {
+ 	if(intFunc[EXTERNAL_INT_1])
+ 		intFunc[EXTERNAL_INT_1]();
+ }
+ 
+ #elif defined(EICRA) && defined(EICRB)
+ 
+-SIGNAL(INT0_vect) {
++ISR(INT0_vect) {
+   if(intFunc[EXTERNAL_INT_2])
+     intFunc[EXTERNAL_INT_2]();
+ }
+ 
+-SIGNAL(INT1_vect) {
++ISR(INT1_vect) {
+   if(intFunc[EXTERNAL_INT_3])
+     intFunc[EXTERNAL_INT_3]();
+ }
+ 
+-SIGNAL(INT2_vect) {
++ISR(INT2_vect) {
+   if(intFunc[EXTERNAL_INT_4])
+     intFunc[EXTERNAL_INT_4]();
+ }
+ 
+-SIGNAL(INT3_vect) {
++ISR(INT3_vect) {
+   if(intFunc[EXTERNAL_INT_5])
+     intFunc[EXTERNAL_INT_5]();
+ }
+ 
+-SIGNAL(INT4_vect) {
++ISR(INT4_vect) {
+   if(intFunc[EXTERNAL_INT_0])
+     intFunc[EXTERNAL_INT_0]();
+ }
+ 
+-SIGNAL(INT5_vect) {
++ISR(INT5_vect) {
+   if(intFunc[EXTERNAL_INT_1])
+     intFunc[EXTERNAL_INT_1]();
+ }
+ 
+-SIGNAL(INT6_vect) {
++ISR(INT6_vect) {
+   if(intFunc[EXTERNAL_INT_6])
+     intFunc[EXTERNAL_INT_6]();
+ }
+ 
+-SIGNAL(INT7_vect) {
++ISR(INT7_vect) {
+   if(intFunc[EXTERNAL_INT_7])
+     intFunc[EXTERNAL_INT_7]();
+ }
+ 
+ #else
+ 
+-SIGNAL(INT0_vect) {
++ISR(INT0_vect) {
+   if(intFunc[EXTERNAL_INT_0])
+     intFunc[EXTERNAL_INT_0]();
+ }
+ 
+-SIGNAL(INT1_vect) {
++ISR(INT1_vect) {
+   if(intFunc[EXTERNAL_INT_1])
+     intFunc[EXTERNAL_INT_1]();
+ }
+ 
+ #if defined(EICRA) && defined(ISC20)
+-SIGNAL(INT2_vect) {
++ISR(INT2_vect) {
+   if(intFunc[EXTERNAL_INT_2])
+     intFunc[EXTERNAL_INT_2]();
+ }
+@@ -290,9 +290,8 @@
+ #endif
+ 
+ /*
+-SIGNAL(SIG_2WIRE_SERIAL) {
++ISR(TWI_vect) {
+   if(twiIntFunc)
+     twiIntFunc();
+ }
+ */
+-
+diff -ruN arduino-1.0.1.orig/hardware/arduino/cores/arduino/wiring.c arduino-1.0.1/hardware/arduino/cores/arduino/wiring.c
+--- arduino-1.0.1.orig/hardware/arduino/cores/arduino/wiring.c	2012-05-21 13:01:43.000000000 -0400
++++ arduino-1.0.1/hardware/arduino/cores/arduino/wiring.c	2012-10-19 23:13:59.000000000 -0400
+@@ -42,9 +42,9 @@
+ static unsigned char timer0_fract = 0;
+ 
+ #if defined(__AVR_ATtiny24__) || defined(__AVR_ATtiny44__) || defined(__AVR_ATtiny84__)
+-SIGNAL(TIM0_OVF_vect)
++ISR(TIM0_OVF_vect)
+ #else
+-SIGNAL(TIMER0_OVF_vect)
++ISR(TIMER0_OVF_vect)
+ #endif
+ {
+ 	// copy these to local variables so they can be stored in registers
+diff -ruN arduino-1.0.1.orig/libraries/Servo/Servo.cpp arduino-1.0.1/libraries/Servo/Servo.cpp
+--- arduino-1.0.1.orig/libraries/Servo/Servo.cpp	2012-05-08 20:34:38.000000000 -0400
++++ arduino-1.0.1/libraries/Servo/Servo.cpp	2012-10-19 23:13:59.000000000 -0400
+@@ -100,28 +100,28 @@
+ #ifndef WIRING // Wiring pre-defines signal handlers so don't define any if compiling for the Wiring platform
+ // Interrupt handlers for Arduino 
+ #if defined(_useTimer1)
+-SIGNAL (TIMER1_COMPA_vect) 
++ISR(TIMER1_COMPA_vect) 
+ { 
+   handle_interrupts(_timer1, &TCNT1, &OCR1A); 
+ }
+ #endif
+ 
+ #if defined(_useTimer3)
+-SIGNAL (TIMER3_COMPA_vect) 
++ISR(TIMER3_COMPA_vect) 
+ { 
+   handle_interrupts(_timer3, &TCNT3, &OCR3A); 
+ }
+ #endif
+ 
+ #if defined(_useTimer4)
+-SIGNAL (TIMER4_COMPA_vect) 
++ISR(TIMER4_COMPA_vect) 
+ {
+   handle_interrupts(_timer4, &TCNT4, &OCR4A); 
+ }
+ #endif
+ 
+ #if defined(_useTimer5)
+-SIGNAL (TIMER5_COMPA_vect) 
++ISR(TIMER5_COMPA_vect) 
+ {
+   handle_interrupts(_timer5, &TCNT5, &OCR5A); 
+ }
+diff -ruN arduino-1.0.1.orig/libraries/Wire/utility/twi.c arduino-1.0.1/libraries/Wire/utility/twi.c
+--- arduino-1.0.1.orig/libraries/Wire/utility/twi.c	2012-02-18 19:57:03.000000000 -0500
++++ arduino-1.0.1/libraries/Wire/utility/twi.c	2012-10-19 23:13:59.000000000 -0400
+@@ -360,7 +360,7 @@
+   twi_state = TWI_READY;
+ }
+ 
+-SIGNAL(TWI_vect)
++ISR(TWI_vect)
+ {
+   switch(TW_STATUS){
+     // All Master
-- 
cgit v1.2.3


From 422d616c151e4df847fdc5fc23af4f15946092ee Mon Sep 17 00:00:00 2001
From: Luke Shumaker <LukeShu@sbcglobal.net>
Date: Fri, 19 Oct 2012 23:43:42 -0400
Subject: bump java/jh to 0.3.2

---
 java/jh/PKGBUILD | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/jh/PKGBUILD b/java/jh/PKGBUILD
index a96cf799a..5382cb0e5 100644
--- a/java/jh/PKGBUILD
+++ b/java/jh/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
 
 pkgname=jh
-pkgver=0.3.1
+pkgver=0.3.2
 pkgdesc="Java helpers for PKGBUILDs"
 url="https://gitorious.org/parabola/jh"
 license=('Public Domain')
-- 
cgit v1.2.3


From 2ecf59e36659c710c187166da65d40e0d8b6af7b Mon Sep 17 00:00:00 2001
From: Márcio Alexandre Silva Delgado <coadde@lavabit.com>
Date: Sat, 20 Oct 2012 13:19:51 -0200
Subject: luxblend25: fixing package

---
 libre/luxblend25/PKGBUILD | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libre/luxblend25/PKGBUILD b/libre/luxblend25/PKGBUILD
index cb89a938e..245aba247 100644
--- a/libre/luxblend25/PKGBUILD
+++ b/libre/luxblend25/PKGBUILD
@@ -8,7 +8,7 @@ pkgver=1.1.v2.64
 _pkgver=${pkgver::3}
 reqname=blender
 reqver=${pkgver:5}
-pkgrel=1
+pkgrel=2
 pkgdesc='A LuxRender exporter for Blender-libre'
 arch=(
   any
@@ -26,7 +26,7 @@ provides=(
 )
 conflicts=(
   $pkgname
-  "$reqname>=${reqver::2}$((${reqver:2}+1))"
+  #"$reqname>=${reqver::2}$((${reqver:2}+1))"
 )
 replaces=(
   $pkgname
-- 
cgit v1.2.3