Version bump, #442130

(Portage version: 2.1.11.31/cvs/Linux x86_64, signed Manifest commit with key 0720FC74)

3 files changed, 23 insertions, 14 deletions

diff --git a/dev-embedded/arduino/ChangeLog b/dev-embedded/arduino/ChangeLog
index c8a8e70f6753..ca9f84cab116 100644
--- a/dev-embedded/arduino/ChangeLog
+++ b/dev-embedded/arduino/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-embedded/arduino
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/arduino/ChangeLog,v 1.9 2012/09/03 21:07:08 miknix Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/arduino/ChangeLog,v 1.10 2013/01/07 21:01:59 miknix Exp $
+
+*arduino-1.0.3 (07 Jan 2013)
+
+  07 Jan 2013; Angelo Arrifano <miknix@gentoo.org> -arduino-1.0.1.ebuild,
+  -files/arduino-1.0.1-script.patch, +arduino-1.0.3.ebuild,
+  +files/arduino-1.0.3-script.patch:
+  Version hump, thanks mrueg #442130
 
 *arduino-1.0.1 (03 Sep 2012)
 
diff --git a/dev-embedded/arduino/arduino-1.0.1.ebuild b/dev-embedded/arduino/arduino-1.0.3.ebuild
index e777386c1ca4..8feb5163df42 100644
--- a/dev-embedded/arduino/arduino-1.0.1.ebuild
+++ b/dev-embedded/arduino/arduino-1.0.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/arduino/arduino-1.0.1.ebuild,v 1.1 2012/09/03 21:07:08 miknix Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/arduino/arduino-1.0.3.ebuild,v 1.1 2013/01/07 21:01:59 miknix Exp $
 
 EAPI=4
 JAVA_PKG_IUSE="doc examples"
@@ -9,7 +9,7 @@ inherit eutils java-pkg-2 java-ant-2
 
 DESCRIPTION="An open-source AVR electronics prototyping platform"
 HOMEPAGE="http://arduino.cc/ http://arduino.googlecode.com/"
-SRC_URI="http://arduino.googlecode.com/files/${P}-src.tar.gz"
+SRC_URI="http://${PN}.googlecode.com/files/${P}-src.tar.gz"
 LICENSE="GPL-2 LGPL-2 CCPL-Attribution-ShareAlike-3.0"
 SLOT="0"
 KEYWORDS="~x86 ~amd64"
@@ -36,10 +36,10 @@ java_prepare() {
 	rm build/linux/dist/tools/avrdude* || die
 	rm build/linux/dist/lib/* || die
 	rm app/lib/* || die
-	rm app/pde.jar || die
+	rm -rf app/src/processing/app/macosx || die
 	# Patch build/build.xml - remove local jar files
 	# for rxtx and ecj (use system wide versions)
-	epatch "${FILESDIR}"/${P}-build.xml.patch
+	epatch "${FILESDIR}"/${PN}-1.0.1-build.xml.patch
 
 	# Patch launcher script to include rxtx class/ld paths
 	epatch "${FILESDIR}"/${P}-script.patch
@@ -56,7 +56,11 @@ src_install() {
 	cd "${S}"/build/linux/work || die
 	java-pkg_dojar lib/core.jar lib/pde.jar
 	java-pkg_dolauncher ${PN} --pwd /usr/share/${PN} --main processing.app.Base
-	use examples && java-pkg_doexamples examples
+
+	if use examples; then
+		java-pkg_doexamples examples
+		docompress -x /usr/share/doc/${P}/examples/
+	fi
 
 	if use doc; then
 		dodoc revisions.txt "${S}"/readme.txt
diff --git a/dev-embedded/arduino/files/arduino-1.0.1-script.patch b/dev-embedded/arduino/files/arduino-1.0.3-script.patch
index 323d6a639b18..b4accc8959a1 100644
--- a/dev-embedded/arduino/files/arduino-1.0.1-script.patch
+++ b/dev-embedded/arduino/files/arduino-1.0.3-script.patch
@@ -1,13 +1,14 @@
 diff --git a/build/linux/dist/arduino b/build/linux/dist/arduino
-index d371e76..eec238b 100755
+index b5eb9db..3f3b4aa 100644
 --- a/build/linux/dist/arduino
 +++ b/build/linux/dist/arduino
-@@ -10,13 +10,12 @@ for LIB in \
+@@ -10,11 +10,13 @@ for LIB in \
      lib/*.jar \
      ;
  do
 -    CLASSPATH="${CLASSPATH}:${LIB}"
 +    CLASSPATH="${CLASSPATH+$CLASSPATH:}${LIB}"
++
  done
 +CLASSPATH="${CLASSPATH+$CLASSPATH:}:$(java-config -dp rxtx-2)"
  export CLASSPATH
@@ -16,7 +17,4 @@ index d371e76..eec238b 100755
 +LD_LIBRARY_PATH="$(java-config -di rxtx-2)${LD_LIBRARY_PATH+:$LD_LIBRARY_PATH}"
  export LD_LIBRARY_PATH
  
--export PATH="${APPDIR}/java/bin:${PATH}"
--
- java -Dswing.defaultlaf=com.sun.java.swing.plaf.gtk.GTKLookAndFeel processing.app.Base
-
+ export PATH="${APPDIR}/java/bin:${PATH}"