[gentoo-commits] dev/scarabeus:master commit in: dev-embedded/arduino/, dev-embedded/arduino/files/

[gentoo-commits] dev/scarabeus:master commit in: dev-embedded/arduino/, dev-embedded/arduino/files/

[Tomas Chvatal]

commit:     55cd568a06c845bb876f75d3e41e3d3989c834cc
Author:     Amynka <amy <AT> bedrunecka <DOT> cz>
AuthorDate: Fri Mar  4 22:35:04 2011 +0000
Commit:     Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
CommitDate: Fri Mar  4 22:38:57 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/scarabeus.git;a=commit;h=55cd568a

Add new arduino-0022.

---
 dev-embedded/arduino/Manifest                      |    4 +
 dev-embedded/arduino/arduino-0022.ebuild           |   85 ++++++++++++++++++++
 .../arduino/files/arduino-script-0022.patch        |   22 +++++
 3 files changed, 111 insertions(+), 0 deletions(-)

diff --git a/dev-embedded/arduino/Manifest b/dev-embedded/arduino/Manifest
index 0a2c4da..a6410ec 100644
--- a/dev-embedded/arduino/Manifest
+++ b/dev-embedded/arduino/Manifest
@@ -4,8 +4,12 @@ AUX Makefile-0017.patch 1381 RMD160 2dc4b0863f880180602aed802d62817edfc8e2a0 SHA
 AUX arduino 49 RMD160 5cb54f143b4d69163121fd133f4effa474f2257d SHA1 72b9dc6322353c9474eed33052bc87a636ff1acd SHA256 95d6daf538f4a3d36a16725b8e38ae02b634ff708282b10b5f62678e18289fe4
 AUX arduino-script-0017.patch 688 RMD160 0ab5d830d7175c1b8286635cd656269109f355ed SHA1 c93ac06a1bf11b6eb49223a8773f37e9e54bb076 SHA256 a7ab22ccfe2ac2022e54239b333fad238bbc8edf99e274e4c3c6bee58943dc67
 AUX arduino-script-0018.patch 688 RMD160 0ab5d830d7175c1b8286635cd656269109f355ed SHA1 c93ac06a1bf11b6eb49223a8773f37e9e54bb076 SHA256 a7ab22ccfe2ac2022e54239b333fad238bbc8edf99e274e4c3c6bee58943dc67
+AUX arduino-script-0022.patch 810 RMD160 78844b0ddf28455b328b88127f502d770c3803d4 SHA1 9ec5086139590d424f05671ef1c9f98145d5b53b SHA256 78d256d71ad16bbd24dbe58c722a0a6ae541c4a2c1d60be221e8fd7634ddaba1
 DIST arduino-0018-64-2.tgz 3964083 RMD160 4ecab977244b34f3841fe8d2d93c00d770c11949 SHA1 84b5e49ad883c17b3e58652d5de140899e517662 SHA256 309e0b2064e9d0810d013e5c547149c0c0b322831348cf6c3d7aea23322720bb
 DIST arduino-0018.tgz 3848593 RMD160 9c6efaaad01106ae752274dec7be352be1929727 SHA1 9e6a91af337876b7abd651189523c8da3e722407 SHA256 2ebe851e8d18f847599cd4ac1664a942c177dd34037a292a0279fdb084bcebba
+DIST arduino-0022-64-2.tgz 3873878 RMD160 5dcb64dc1d7fa000efafaed6131e3f63b9dfd880 SHA1 9e9a35910ddf11a247dce7bee94e5ad58a189760 SHA256 9842d1dabd90f7a051d1aa00cbe0a0d48e7b04787f0cf772bc7f996d80eda8be
+DIST arduino-0022.tgz 3715797 RMD160 6d52b914d9bea505b374e663b2870df222f94e1e SHA1 8f2f5816edf667d29f3cb2919b8ff6287aab0a3e SHA256 06163735068b782a4f7645f6d1b8191f33ace7b0e8125a22a1a5b234f30ca483
 EBUILD arduino-0018.ebuild 2833 RMD160 f4d4059920369deaa404c85d3994291af14c8839 SHA1 93b2c8420ffac0408d61052e12caea90c90bca43 SHA256 e8612d2eae3ed43d859ac9ae37edbf2a1c2b45c2c245dc17c8527be4e54b7db1
+EBUILD arduino-0022.ebuild 2833 RMD160 f4d4059920369deaa404c85d3994291af14c8839 SHA1 93b2c8420ffac0408d61052e12caea90c90bca43 SHA256 e8612d2eae3ed43d859ac9ae37edbf2a1c2b45c2c245dc17c8527be4e54b7db1
 MISC ChangeLog 1362 RMD160 879588b7335b6a8d4c7bddc628a6d4d5e4b45fcf SHA1 251eeb9c6ec3872755cf60d629b58c0ec13d2d4e SHA256 32c404818895f1209c7ad447503a16a74e6a41b4db613966a6c4279bf6db3076
 MISC metadata.xml 296 RMD160 257fb7c49fdb92d61b27af23898c128dee0ca360 SHA1 5985105860fe1c29409bfe51141c04ce655e4587 SHA256 eaa506a8c6d17aeb12582aeb742f6675ea7ab7d638a0ab74b9aa00fbd8674d8f

diff --git a/dev-embedded/arduino/arduino-0022.ebuild b/dev-embedded/arduino/arduino-0022.ebuild
new file mode 100644
index 0000000..51a8d03
--- /dev/null
+++ b/dev-embedded/arduino/arduino-0022.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/arduino/arduino-0017.ebuild,v 1.1 2009/10/17 18:15:07 nixphoeni Exp $
+
+EAPI=2
+inherit eutils
+
+# raxas says: there is a bug in original .17 ebuild, results wrong ldscripts on host,
+# it's workaroundable but didn't thought it yet
+# also, it's fix is expected to be different on x86 and AMD64 as well
+
+DESCRIPTION="Libs&IDE for Arduino, an open-source AVR electronics prototyping platform"
+HOMEPAGE="http://arduino.cc/"
+# http://arduino.googlecode.com/files/arduino-0018.tgz
+# http://arduino.googlecode.com/files/arduino-0018-64-2.tgz
+SRC_URI="x86?   ( http://arduino.googlecode.com/files/${P}.tgz )
+		 amd64? ( http://arduino.googlecode.com/files/${P}-64-2.tgz )"
+
+LICENSE="GPL-2 LGPL-2 CCPL-Attribution-ShareAlike-3.0"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+RESTRICT="strip binchecks"
+IUSE="java"
+# todo: +examples and stuff
+RDEPEND="dev-embedded/avrdude sys-devel/crossdev"
+DEPEND="${RDEPEND} java? (
+	virtual/jre
+	dev-embedded/uisp
+	dev-java/jikes
+	dev-java/rxtx
+	dev-java/antlr )"
+
+pkg_setup() {
+	[ ! -x /usr/bin/avr-g++ ] && ewarn "Missing avr-g++; you need to crossdev -s4 avr"
+}
+
+pkg_postinst() {
+	pkg_setup
+	einfo "Copy /usr/share/${P}/hardware/cores/arduino/Makefile and edit it to suit the project"
+}
+
+src_prepare() {
+	# epatch "${FILESDIR}"/Makefile-${PV}.patch
+	# avrdude has it's own ebuild
+	rm -rf hardware/tools/avrdude*
+	# -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}"/arduino-script-${PV}.patch
+	fi
+}
+
+src_install() {
+	mkdir -p "${D}/usr/share/${P}/" "${D}/usr/bin"
+	cp -a "${S}" "${D}/usr/share/"
+	# enable access to serial ports
+	fowners -R root:uucp "/usr/share/${P}/hardware"
+	if use java; then
+		sed -e  s@__PN__@${P}@g < "${FILESDIR}"/arduino > "${D}/usr/bin/arduino"
+		chmod +x "${D}/usr/bin/arduino"
+
+		# get rid of libraries provided by other packages
+		rm -f "${D}/usr/share/${P}/lib/RXTXcomm.jar"
+		rm -f "${D}/usr/share/${P}/lib/librxtxSerial.so"
+		rm -f "${D}/usr/share/${P}/lib/antlr.jar"
+		rm -f "${D}/usr/share/${P}/lib/ecj.jar"
+
+		# use system avrdude
+		# patching class files is too hard
+		# todo: do it better (raxas) rozhodne pridat ${ROOT} prefix aspon
+		dosym /usr/bin/avrdude "/usr/share/${P}/hardware/tools/avrdude"
+		dosym /etc/avrdude.conf "/usr/share/${P}/hardware/tools/avrdude.conf"
+
+		# IDE tries to compile these libs at first start up
+		# fperms -R g+w "/usr/share/${P}/hardware/libraries"
+		# jednak to selhava v ebuildu, vsecko je jinde, druhak se mi nezda ze by ide neco kompilovalo napoprve
+	fi
+
+	dodoc readme.txt
+}

diff --git a/dev-embedded/arduino/files/arduino-script-0022.patch b/dev-embedded/arduino/files/arduino-script-0022.patch
new file mode 100644
index 0000000..94c9f02
--- /dev/null
+++ b/dev-embedded/arduino/files/arduino-script-0022.patch
@@ -0,0 +1,22 @@
+diff -burN arduino-0022.old//arduino arduino-0022//arduino
+--- arduino-0022.old//arduino	2011-03-04 23:26:18.058000024 +0100
++++ arduino-0022//arduino	2011-03-04 23:33:09.454000022 +0100
+@@ -10,13 +10,13 @@
+     lib/*.jar \
+     ;
+ do
+-    CLASSPATH="${CLASSPATH}:${LIB}"
++    CLASSPATH="${CLASSPATH+$CLASSPATH:}${APPDIR}/${LIB}"
+ done
++CLASSPATH="${CLASSPATH+$CLASSPATH:}$(java-config -dp antlr)"
++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
++java processing.app.Base