java/arduino: bring it back from the dead

1 files changed, 14 insertions, 20 deletions

diff --git a/java/arduino/PKGBUILD b/java/arduino/PKGBUILD
index c726f35c1..19ab11874 100644
--- a/java/arduino/PKGBUILD
+++ b/java/arduino/PKGBUILD
@@ -3,28 +3,28 @@
 
 pkgname=arduino
 pkgver=1.0.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Arduino SDK and IDE"
-arch=('i686' 'x86_64' 'mips64el')
+arch=('i686' 'x86_64')
 url="http://arduino.cc/en/Main/Software"
 options=(!strip)
 license=('GPL')
 
 depends=('avr-gcc' 'avr-libc' 'libusb-compat' 'java-runtime' 'avrdude'
     'java-rxtx' 'antlr2' 'eclipse-ecj' 'jna')
-makedepends=(java-environment apache-ant makepkg-git)
+makedepends=(java-environment apache-ant)
 install="arduino.install"
-source=("http://arduino.googlecode.com/files/arduino-$pkgver-src.tar.gz"
+source=("${pkgname}-${pkgver}.tar.gz::https://github.com/arduino/Arduino/archive/${pkgver}.tar.gz"
 	'avrlibc-signals.patch'
 	'external-avrtools.patch'
 	'arduino.png'
 	'arduino.desktop')
 
 unset _JAVA_OPTIONS
-. /etc/profile.d/jdk.sh
+. /etc/profile.d/jre.sh
 
 prepare() {
-  cd "$srcdir/arduino-$pkgver"
+  cd "$srcdir/Arduino-$pkgver"
   find . -name '*.hex' -delete
   find . -name '*.jar' -delete
   find . -name '*.so'  -delete
@@ -34,13 +34,13 @@ prepare() {
 }
 
 _link_jars() {
-  for jar in RXTXcomm.jar antlr2.jar ecj.jar jna.jar; do
+  for jar in rxtx/RXTXcomm.jar antlr2.jar ecj.jar jna.jar; do
     ln -sf /usr/share/java/$jar .
   done
 }
 
 _patch() {
-  cd "$srcdir/arduino-$pkgver"
+  cd "$srcdir/Arduino-$pkgver"
 
   # Fix issue 955 to be compatible with newer versions of avr-libc
   # https://code.google.com/p/arduino/issues/detail?id=955
@@ -52,6 +52,7 @@ _patch() {
   patch -Np1 -i "$srcdir/external-avrtools.patch"
 
   rm -rf app/src/processing/app/macosx
+  rm -rf app/src/processing/app/windows
 
   cd app/lib
   _link_jars
@@ -62,20 +63,13 @@ build() {
 
   # build submodules
   for submodule in core/methods core/preproc; do
-    cd "$srcdir/arduino-$pkgver/$submodule"
+    cd "$srcdir/Arduino-$pkgver/$submodule"
     ant
   done
 
   # build the main package
-  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
+  cd "$srcdir/Arduino-$pkgver/build"
+  ant
 
   # symlink jar files to the system locations
   cd "linux/work/lib"
@@ -83,7 +77,7 @@ build() {
 }
 
 package() {
-  cd "$srcdir/arduino-$pkgver/build/linux/work"
+  cd "$srcdir/Arduino-$pkgver/build/linux/work"
 
   install -d "$pkgdir"/usr/{bin,share/{doc,applications,pixmaps}}
 
@@ -99,7 +93,7 @@ package() {
   install -m644 "$srcdir/arduino.png" "$pkgdir/usr/share/pixmaps/"
 }
 
-md5sums=('dfb64e2a7de4a4a8b872732fe90e3249'
+md5sums=('9f3378b2b092f9c6e7f32a65231aad1c'
          'e44975d31aa1770e4f5ac6e6867b0864'
          '9c696c2361d57027be41ae64436182aa'
          '9e36d33891d5e68d38ec55d1494499a5'