Version bump, #442130

Package-Manager: portage-2.1.11.31/cvs/Linux x86_64
Manifest-Sign-Key: 0x0720FC74

4 files changed, 30 insertions, 21 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/Manifest b/dev-embedded/arduino/Manifest
index 86c7f9e03e52..fa16e139251e 100644
--- a/dev-embedded/arduino/Manifest
+++ b/dev-embedded/arduino/Manifest
@@ -2,16 +2,16 @@
 Hash: SHA256
 
 AUX arduino-1.0.1-build.xml.patch 1732 SHA256 4637f8843a9abcafc7bfd95c247636248c8223419751159d5b323f6851de47b8 SHA512 a5317a131449f08fa272cd7d3bf477eedc69f354b771297bc20623277e79a2c1349299c14fba52689f015c71d6a19733fb8ee24de820e59c1aa2b3e2d7f2af42 WHIRLPOOL 5f598424c212c4e6bdd3126bb71867cf8e73c1b4fe5cb336507197ca77e138d4cf655f5fd55ced4f778a028558b761a4fca05a077b3a3b6f6d7624ada92f2b70
-AUX arduino-1.0.1-script.patch 697 SHA256 50c1f489b8cb1a6772f29a81184aba1b0324e4ab3117d87ef18f401e259600bb SHA512 db331043e4d8cc957b6f98314e585229ce0f2de03abeafff6d1c258bc172b43d1580113266af7f0ef2465bb6d906200b471cf86fec233f3a93235cf6e5476006 WHIRLPOOL 0dc1a023b95305d79e3c37ca9b477bff14c27fb20ff3c40755ca91ff7e9f3a2e2e3a3c972cff6a42b12764b6603974ae126db222a1bd05cd85027c3defe991ca
+AUX arduino-1.0.3-script.patch 608 SHA256 1b77300bce911b5b697df0804c18b805f9ca52178451983336514aefa34ea53b SHA512 073f2adfc9066879a409a064599d9972ecf0110990a20d778d631fa24c35854831872a0ee220d80cfe996b9e6fa91ef00281a40c466b510a5ce635c59c84103a WHIRLPOOL e7953e567209c408b370c1d1771f38cac8ed875b9074f893c444481f5b6e2ad681516941a5152f0aa878c2678aac3e743c2c79d02e5aac994b29197d9996c2b4
 AUX arduino.desktop 228 SHA256 92a5ba03e4db99efd2a9dea5c5b7b6d2b0f5c512a73a73024f34cfd3db5b5fad SHA512 56bc26e0028fc3ccbe2595133ec35132d8897be5d1f711eb85e928f7263f9719386e4217b4fa8cb7d3d6be7dfa13efa1bf14a49e2d7e1d6d9828e8320d08f65a WHIRLPOOL 9ec7f299fd8f2a5b12c20a6f9eeca3bd344e5377aede60d766f31c387a1c4b8f89571b82e8cda25f0d8baaf01e7b2199df26303abf6d71256a55fbd6d7b7dc26
-DIST arduino-1.0.1-src.tar.gz 10049328 SHA256 353e59835820695d853d309cfa426f1445cfae5cc4bf4e082acd1917b9077e01 SHA512 876a040210a51455b741b92defb8cac8bc75b099dcbaa0181726d3ef61ad2ed0a35b2cfda8980fef04d37ce62c7f5f28a42a253d10c2dec0027bf6ac66832ab1 WHIRLPOOL 189c30b3a62c34e9bbed323dbb4ebed5f35030d5d029efbe3b0d87f21a20fcd00f3678fb2e226168e17522a9816eff8b4852c2cbd0aef281efc075b9cabfe922
-EBUILD arduino-1.0.1.ebuild 2319 SHA256 211ea1cddb9f86e6b0ea61db42c32432ea48b8ce935c581efc447b9f3cb20ae7 SHA512 8dabbd811a7fcdf623359ae2e503cda188346fd8af8d3b43ae5ba4b74d6b360b79f4c76d20d5815ab12e25e490599b91b41a7f298bfe79b4b14a0e16d7dd1672 WHIRLPOOL f44f8cc511d66bb7ee2f3f8597b69a46ad56d411fbfc7bd1bbe4d7bf718937cbdffc8018de86c72d20ac39a9f0c0cda7bdfb1aaf938868bdb6f7d18247804eec
-MISC ChangeLog 2410 SHA256 b14974374d8e80072c67cae2910bf2b525683dfa916f7f3c13536f5932890ba2 SHA512 22115068fea9044b210d99e05143c39b4714e31512db29189f058bbc350013cba697a24b084eb9c9633ae4d55fa02eb57a99e611d8e857bf8261ba2fb8f7e2f2 WHIRLPOOL 9d51fab3424de9eab5d8df41bbff3214064214439aebe37932bbbe9c38bf1ec5736cdff9a54538d0ec5d92a1231369040611edf83afd1e90af0a87e195e76dbc
+DIST arduino-1.0.3-src.tar.gz 13454594 SHA256 b273aa72354cc9cdfee0bee48fe52d80c2454bb4537d329bd30e984d917c42ae SHA512 bc1f3ad4ca2385724c2e6845237176900d0c4e7cf65837b5380faf83d7fc2d0b20de43b0b83fd080bcdaf83dc0f2597723cb344960ced16d43c4b9ac2ab2f2a7 WHIRLPOOL 45fd0a0af4202bb77444ddfd2754d07f9960d7f5680966cb69da58aaf6ed87ea16f00323ec75e67c74dc959a7e99b0a93175e3177f7ddb1b566665698edd3fcc
+EBUILD arduino-1.0.3.ebuild 2405 SHA256 3117be4d15da9a455d035633b855a94ed73e3db752f5730f17b4adb1218db179 SHA512 7caf1e9e80c37848c352bbf13c7dd827fac6eeab4827e23befe2a8858dff7623ec7be41377872f668ff31e04d2b2fef467d408199f35a753bb3066e1728cdc3a WHIRLPOOL 603a74cdcfad423d746b5a8f9eba1a23bc46c88050a6059702b9b319d9c6f0a751f1fccf2f72019bd0dd69581762e9562193b3cd5f6aa84da8deed3d677673a8
+MISC ChangeLog 2650 SHA256 275c35862689fbb46eced5a70ccc24d8aaccc0fcf9fc01419aa613f8cfef3479 SHA512 42a01886004ae4002afe9d90c297daf8424272afce5381601e799e4dc81eab1250be6d50f1d6f6ad41b7743a6f72ed1a6966885f88c0b25d7c5c41ca7ec4e44a WHIRLPOOL da72c2a82dfb7b7330be7ed81d6f3c1bb8f7a50f441b1d0036fce567e4a42b5f7c7a3b5e074d2ff1f91df3b7b31f980c7dcdf236d99a1ad98c6b08cbb427a194
 MISC metadata.xml 297 SHA256 73f1c4f65508f6e26aa3cb95609ee4f77f687931075c073c58a81344ce1e46d8 SHA512 6c632405492215967b3132694f162d5abf89d814b25d37fc5ec18e928ad31633342e9201e3a5d232adbc01cac9aac7dfcc19306a56c3784af107240816eb79bf WHIRLPOOL 67f9f3a5252fd0a62e516a8fe49a5417463549535254afd244f476bc91e5b57b79c35e6f902b248a9051825645ba69b58471b8fc0f827d7c29dd5a770ba9826e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlBFHAwACgkQbkqODQcg/HSW5QCbB1zmvUaJ/JVyPRsmLCUyROV7
-LasAnRsouvTha9H0zaaeyLPVsQPFAYKC
-=WaPB
+iEYEAREIAAYFAlDrODcACgkQbkqODQcg/HSs4gCePlP7tbVlrRT+3FF2CS8Tvi0H
+a38Ani0MiADC3fDk9GVn8gpS/iFcENT0
+=7q9A
 -----END PGP SIGNATURE-----
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}"