Version bump. I'll need to profile mask previous versions since upstream

version has changed.

Package-Manager: portage-2.1.10.41/cvs/Linux x86_64

5 files changed, 138 insertions, 2 deletions

diff --git a/dev-embedded/arduino/ChangeLog b/dev-embedded/arduino/ChangeLog
index e4df73695bfc..59a763d32cb6 100644
--- a/dev-embedded/arduino/ChangeLog
+++ b/dev-embedded/arduino/ChangeLog
@@ -1,6 +1,12 @@
 # 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.6 2012/02/09 22:56:21 miknix Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/arduino/ChangeLog,v 1.7 2012/02/10 00:09:27 miknix Exp $
+
+*arduino-1.0 (10 Feb 2012)
+
+  10 Feb 2012; Angelo Arrifano <miknix@gentoo.org> +arduino-1.0.ebuild,
+  +files/arduino-1.0-prog_char-fix.patch, +files/arduino-1.0-script.patch:
+  Version bump, thanks Jess Haas for providing the ebuild, #303043
 
   09 Feb 2012; Angelo Arrifano <miknix@gentoo.org> metadata.xml:
   Add myself as maintaner, remove solar (with his permission)
diff --git a/dev-embedded/arduino/Manifest b/dev-embedded/arduino/Manifest
index ab30144c92e0..e8fc9af8ca4c 100644
--- a/dev-embedded/arduino/Manifest
+++ b/dev-embedded/arduino/Manifest
@@ -1,11 +1,26 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX Makefile-0011.patch 1413 RMD160 677cb0b9664e0379103cb48866d31e6f91d65b12 SHA1 e9884501b2ebea909b84cb7350f7b5f8a5e7189b SHA256 5ef1676f842f7c7f141919a72006839a154bf69990f4ef38d2fe7c79b3b63401
 AUX Makefile-0015.patch 1429 RMD160 ee3535e9f596cf01e68f7b1b430bcf9fa83107cf SHA1 32dae6f370e5338f37967953bb3feea916fcb609 SHA256 60439c7edf4a9e9d16e66e47549695a89e3b1bd9216499ffad47709e55a6bf3e
 AUX Makefile-0017.patch 1381 RMD160 2dc4b0863f880180602aed802d62817edfc8e2a0 SHA1 d0018d925dfeebd995c3f5b5aa95c2df28fb2734 SHA256 9e0a617434bb483f083fc73322ceb8cfa29f33247609745ca0da437e774ad9f5
 AUX arduino 49 RMD160 5cb54f143b4d69163121fd133f4effa474f2257d SHA1 72b9dc6322353c9474eed33052bc87a636ff1acd SHA256 95d6daf538f4a3d36a16725b8e38ae02b634ff708282b10b5f62678e18289fe4
+AUX arduino-1.0-prog_char-fix.patch 533 RMD160 452dae9afb00ca6f8d5f1bed012438f4e13b28c7 SHA1 ec2594e87ea06a796a5258cb96dbe68f40e02738 SHA256 0ab092fd602b47b3c8b9f7164fff4a3c284a02a6aafe9239e3cf158a04279881
+AUX arduino-1.0-script.patch 697 RMD160 dc43c3981ca3996af7c520af1bc097c1ab82e462 SHA1 a84134882a4892cdc8e5d92f1ff66888e422f957 SHA256 50c1f489b8cb1a6772f29a81184aba1b0324e4ab3117d87ef18f401e259600bb
 AUX arduino-script-0017.patch 688 RMD160 0ab5d830d7175c1b8286635cd656269109f355ed SHA1 c93ac06a1bf11b6eb49223a8773f37e9e54bb076 SHA256 a7ab22ccfe2ac2022e54239b333fad238bbc8edf99e274e4c3c6bee58943dc67
 DIST arduino-0015-linux.tgz 1389657 RMD160 6c1de452a0c3936c3cd658fe8784d593aa388cdf SHA1 9f6876449640f287f0c42d821e80e96017f3ddf3 SHA256 5eee994268a7f7227c6bf4ecb9290a256566c051fc0c215a91adbe7f314432fb
 DIST arduino-0017.tgz 4141675 RMD160 555ae7611d9335305ae60a28b901d2ade9cb4d8a SHA1 f40828b2bd2a229cb5ccec56afc70602e866dfc4 SHA256 0b9e61dbcd8577eb90e5f498f2a416659d7994f92e0a9a10e25619803f36a7e7
+DIST arduino-1.0-linux.tgz 4318822 RMD160 968452339a19af55dad32cfca05d81565de8d50b SHA1 588e8409846a10f379ed07f2f167237fd10c0006 SHA256 ea9868d6520d987810625a661dc8c1c5b5908fb44b2b00954b90f9d2f8c87070
+DIST arduino-1.0-linux64.tgz 4351508 RMD160 3c87a817b6dc309f53693bd49a7edfd7d326a530 SHA1 1317dbb39c52a6fda6c0a680d7b6ddf1c49c5027 SHA256 813ea60669563fed7f8e16e4553a3cf0a7a5e7f7ec766f10a630c1b60a9b955e
 EBUILD arduino-0015-r1.ebuild 2288 RMD160 0f518fb54255f2ff32528d30a26cd38241c20b2d SHA1 fac85b44f9d6e593cef04ffdae77459f4925416f SHA256 2de7aa7a257e9c83f7c535fe1fdd70e5c02fe8c96cd75d474aa0b9c722f71ae8
 EBUILD arduino-0017.ebuild 2119 RMD160 f31820968eecacc58e56d3c6d98efcd67beaee71 SHA1 f3dd9833a0b6d0af5a38e4399094275784f63a3b SHA256 df7f350f4b22f64c5e09ee4e3e475248a6ed4fff9770653c3e21db7bc13a2440
-MISC ChangeLog 1487 RMD160 a348d00138a902bdf9e978bf5f1e666a6cab6b93 SHA1 82207f69f90167b430388d93550861455fe102d4 SHA256 b2352d99b89227e1d39d6d51715752159ecf9ddfe182785f0af643fbd0c1e139
+EBUILD arduino-1.0.ebuild 2487 RMD160 5ab668451dc408e611d383739cb843d88aba9c91 SHA1 adb01d1075c940909746571514b0fe5f57f6bd50 SHA256 4de6153b46a36c79643a5e337b344e9044b8aed5e9c4bb11ab7c9dc5dfbd0b9f
+MISC ChangeLog 1730 RMD160 a803d879e4f97ac0ae5cee5c52626a2a7511e551 SHA1 b96ac60e5ec84cbeab0700cb02a6a702593ca952 SHA256 b6195b1e3d7cedf43f29a8db0217dfeb33ac9e0250df62e4d4c3e77d2b3b6a90
 MISC metadata.xml 297 RMD160 0924f915fabac6631eda486e34c35a542ae34710 SHA1 6830190f628bab697f9e21ac993a1fa1b4d5d46f SHA256 73f1c4f65508f6e26aa3cb95609ee4f77f687931075c073c58a81344ce1e46d8
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk80YEQACgkQbkqODQcg/HT8AgCfZ+ztrPNDRqDGLc7pue6KGqMc
+v/YAn00cJgj4UytwalHgQjRbhp4wm9Of
+=0H9x
+-----END PGP SIGNATURE-----
diff --git a/dev-embedded/arduino/arduino-1.0.ebuild b/dev-embedded/arduino/arduino-1.0.ebuild
new file mode 100644
index 000000000000..846e660e5a32
--- /dev/null
+++ b/dev-embedded/arduino/arduino-1.0.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/arduino/arduino-1.0.ebuild,v 1.1 2012/02/10 00:09:27 miknix Exp $
+
+EAPI=3
+inherit eutils
+
+DESCRIPTION="Arduino is an open-source AVR electronics prototyping platform"
+HOMEPAGE="http://arduino.cc/"
+SRC_URI="x86?   ( http://arduino.googlecode.com/files/${P}-linux.tgz )
+		 amd64? ( http://arduino.googlecode.com/files/${P}-linux64.tgz )"
+
+LICENSE="GPL-2 LGPL-2 CCPL-Attribution-ShareAlike-3.0"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+RESTRICT="strip binchecks"
+IUSE="+java"
+RDEPEND="dev-embedded/avrdude
+	sys-devel/crossdev"
+DEPEND="${RDEPEND} java? (
+	virtual/jre
+	dev-embedded/uisp
+	dev-java/jikes
+	dev-java/jna
+	>=dev-java/rxtx-2.2_pre2 )"
+
+pkg_postinst() {
+	ewarn "PLEASE NOTICE:"
+	if [ ! -x /usr/bin/avr-g++ ]; then
+		ewarn "avr-g++ is missing, if you need a toolchain please see"
+		ewarn "http://en.gentoo-wiki.com/wiki/Crossdev#AVR_Architecture"
+		ewarn ""
+	fi
+	ewarn "You will need >=cross-avr/gcc-4.4.1 if you intend to use the new"
+	ewarn "Arduino Mega 2560."
+}
+
+src_prepare() {
+	# avrdude has it's own ebuild
+	rm -rf hardware/tools/avrdude*
+
+	# fix deprecated prog_char usage in Print.cpp (#303043)
+	epatch "${FILESDIR}"/${P}-prog_char-fix.patch
+
+	# -java don't build IDE
+	if ! use java; then
+		rm -rf lib
+		rm -f arduino
+	else
+		# fix the provided arduino script to call out the right
+		# libraries, remove resetting of $PATH, and fix its
+		# reference to LD_LIBRARY_PATH (see bug #189249)
+		epatch "${FILESDIR}"/${P}-script.patch
+	fi
+}
+
+src_install() {
+	mkdir -p "${D}/usr/share/${P}/" "${D}/usr/bin"
+	cp -a "${S}" "${D}/usr/share/" || die "Copying failed"
+
+	if use java; then
+		sed -e s@__PN__@${P}@g < "${FILESDIR}"/arduino \
+			> "${D}/usr/bin/arduino" && chmod +x "${D}/usr/bin/arduino" \
+			|| die "Creating run script failed"
+
+		# get rid of libraries provided by other packages
+		rm -f "${D}/usr/share/${P}/lib/RXTXcomm.jar"
+		rm -f "${D}/usr/share/${P}/lib/jna.jar"
+		rm -f "${D}/usr/share/${P}/lib/librxtxSerial.so"
+		rm -f "${D}/usr/share/${P}/lib/librxtxSerial64.so"
+		rm -f "${D}/usr/share/${P}/lib/ecj.jar"
+
+		# use system avrdude
+		# patching class files is too hard
+		dosym /usr/bin/avrdude "/usr/share/${P}/hardware/tools/avrdude" \
+			|| die "Couldn't symlink system avrdude files"
+		dosym /etc/avrdude.conf "/usr/share/${P}/hardware/tools/avrdude.conf" \
+			|| die "Couldn't symlink system avrdude files"
+	fi
+}
diff --git a/dev-embedded/arduino/files/arduino-1.0-prog_char-fix.patch b/dev-embedded/arduino/files/arduino-1.0-prog_char-fix.patch
new file mode 100644
index 000000000000..727944719d58
--- /dev/null
+++ b/dev-embedded/arduino/files/arduino-1.0-prog_char-fix.patch
@@ -0,0 +1,13 @@
+diff --git a/hardware/arduino/cores/arduino/Print.cpp b/hardware/arduino/cores/arduino/Print.cpp
+index ff9b154..e541a6c 100644
+--- a/hardware/arduino/cores/arduino/Print.cpp
++++ b/hardware/arduino/cores/arduino/Print.cpp
+@@ -41,7 +41,7 @@ size_t Print::write(const uint8_t *buffer, size_t size)
+ 
+ size_t Print::print(const __FlashStringHelper *ifsh)
+ {
+-  const prog_char *p = (const prog_char *)ifsh;
++  const char PROGMEM *p = (const char PROGMEM *)ifsh;
+   size_t n = 0;
+   while (1) {
+     unsigned char c = pgm_read_byte(p++);
diff --git a/dev-embedded/arduino/files/arduino-1.0-script.patch b/dev-embedded/arduino/files/arduino-1.0-script.patch
new file mode 100644
index 000000000000..323d6a639b18
--- /dev/null
+++ b/dev-embedded/arduino/files/arduino-1.0-script.patch
@@ -0,0 +1,22 @@
+diff --git a/build/linux/dist/arduino b/build/linux/dist/arduino
+index d371e76..eec238b 100755
+--- a/build/linux/dist/arduino
++++ b/build/linux/dist/arduino
+@@ -10,13 +10,12 @@ for LIB in \
+     lib/*.jar \
+     ;
+ do
+-    CLASSPATH="${CLASSPATH}:${LIB}"
++    CLASSPATH="${CLASSPATH+$CLASSPATH:}${LIB}"
+ done
++CLASSPATH="${CLASSPATH+$CLASSPATH:}:$(java-config -dp rxtx-2)"
+ export CLASSPATH
+ 
+-LD_LIBRARY_PATH=`pwd`/lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
++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
+