Version bump, cleaned up old cruft.

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

14 files changed, 146 insertions, 384 deletions

diff --git a/dev-embedded/arduino/ChangeLog b/dev-embedded/arduino/ChangeLog
index 47110ea5d252..c8a8e70f6753 100644
--- a/dev-embedded/arduino/ChangeLog
+++ b/dev-embedded/arduino/ChangeLog
@@ -1,6 +1,16 @@
 # 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.8 2012/02/10 00:50:47 miknix Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/arduino/ChangeLog,v 1.9 2012/09/03 21:07:08 miknix Exp $
+
+*arduino-1.0.1 (03 Sep 2012)
+
+  03 Sep 2012; Angelo Arrifano <miknix@gentoo.org> -arduino-1.0.ebuild,
+  +arduino-1.0.1.ebuild, +files/arduino-1.0.1-build.xml.patch,
+  +files/arduino-1.0.1-script.patch, -files/arduino-1.0-prog_char-fix.patch,
+  -files/arduino-1.0-script.patch, -files/Makefile-0011.patch,
+  -arduino-0015-r1.ebuild, -files/Makefile-0015.patch, -arduino-0017.ebuild,
+  -files/Makefile-0017.patch, -files/arduino-script-0017.patch, -files/arduino:
+  Version bump, cleaned up old cruft. Thanks mrueg and others, #420861
 
   10 Feb 2012; Angelo Arrifano <miknix@gentoo.org> arduino-1.0.ebuild,
   +files/arduino.desktop:
diff --git a/dev-embedded/arduino/Manifest b/dev-embedded/arduino/Manifest
index cb1823cebfd5..86c7f9e03e52 100644
--- a/dev-embedded/arduino/Manifest
+++ b/dev-embedded/arduino/Manifest
@@ -1,17 +1,17 @@
-AUX Makefile-0011.patch 1413 SHA256 5ef1676f842f7c7f141919a72006839a154bf69990f4ef38d2fe7c79b3b63401 SHA512 0ad1a138fed62a5289be1d6bf200fd81285ee9d11e3a05e8b4fd50d8b0143e0e97e23424c49fbcc0ead6245f68a7fa74238a02295213588adb3a274673d03f2f WHIRLPOOL c481daa3c2784870b743b16ff866a4ad32d470967af9462d7460c2e865e0f5542ad5da0bbcb3df0eff52136da6e233a6311eb90f091148de68640ed373fac665
-AUX Makefile-0015.patch 1429 SHA256 60439c7edf4a9e9d16e66e47549695a89e3b1bd9216499ffad47709e55a6bf3e SHA512 4d654d593fad50354dd4af86d18dfd48e1bd9448cb318dced88226542236760db49305fa3725af664ded0ae554f1f47d90aa7c135732db17ad4f2c1d237f4a3d WHIRLPOOL 37832ca9b1b6c23ba612066918489b242242a1297645bfacf3fed5b78a042419b1a83f6a9ee638227ddd44ad1628b19544dba1d8de053c216bc3eabee85d28a9
-AUX Makefile-0017.patch 1381 SHA256 9e0a617434bb483f083fc73322ceb8cfa29f33247609745ca0da437e774ad9f5 SHA512 1ac1e9eb35108ed729883e60a501a0f3c56d04d06b062f4f7b826922cc73785ef7de9132ee0da683e3a56367834f0c3bb4c0e9886c2302801aaa14e8fe4b3772 WHIRLPOOL 689b359d61c4477e60f596fa46a64f9ad876c597e9aca9d8d922ec61fe023960f843b682aaf8dad2ed4390f70efb4e470f08081ce94d6f72ec452844657a1dd7
-AUX arduino 49 SHA256 95d6daf538f4a3d36a16725b8e38ae02b634ff708282b10b5f62678e18289fe4 SHA512 d67c3d7e5817ef9ce3f5be8467ae88dd0c3f84fd7a3b1f587f388b57662019f7eea5c1b6cb1e69e6c149b96ff9afa59e9a1e8ad8fdac2e2d490fe8fe47beea3d WHIRLPOOL deb9a281e38ce530d0f01980aeee8ab64449c4de12fab1ef8b51dacd7bd0ac933f4a857d625e2cb7c6b5d7bc73d333965db5d04a5f82657684fc868f07d53f20
-AUX arduino-1.0-prog_char-fix.patch 533 SHA256 0ab092fd602b47b3c8b9f7164fff4a3c284a02a6aafe9239e3cf158a04279881 SHA512 b54734033510785332305a0424cdec9d50818950e4b46e51cad2e4884a321fdbcaf4d6dfc8978d40813e3dd250e39c6e5f2df78f35109c54db06481287c712fe WHIRLPOOL 41e9ca091ca51058a5588ae93c99377beddfa17b40a420c9a984789e9ab6b36c1888370e5240b5f08fd7dec0bba9a8922f43905d08f5c88cec5e5e0764a27053
-AUX arduino-1.0-script.patch 697 SHA256 50c1f489b8cb1a6772f29a81184aba1b0324e4ab3117d87ef18f401e259600bb SHA512 db331043e4d8cc957b6f98314e585229ce0f2de03abeafff6d1c258bc172b43d1580113266af7f0ef2465bb6d906200b471cf86fec233f3a93235cf6e5476006 WHIRLPOOL 0dc1a023b95305d79e3c37ca9b477bff14c27fb20ff3c40755ca91ff7e9f3a2e2e3a3c972cff6a42b12764b6603974ae126db222a1bd05cd85027c3defe991ca
-AUX arduino-script-0017.patch 688 SHA256 a7ab22ccfe2ac2022e54239b333fad238bbc8edf99e274e4c3c6bee58943dc67 SHA512 4d8334c8d33e78e26e96606a919d47228f9a718b5394d0bfe8faecfebade32d13e060b0b9e055393aee09205ca2e0d92c3fdb65e8874a3a1ca19c09ec2d942d8 WHIRLPOOL 32120d9191330a7ebb56ae6dfa09f0028cc08f450ceba6140267c4671c491d2d0fc1f1270a0a3a2d10007e867ea84ccea4c2ff6293ef37b2c384b8a510029519
+-----BEGIN PGP SIGNED MESSAGE-----
+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.desktop 228 SHA256 92a5ba03e4db99efd2a9dea5c5b7b6d2b0f5c512a73a73024f34cfd3db5b5fad SHA512 56bc26e0028fc3ccbe2595133ec35132d8897be5d1f711eb85e928f7263f9719386e4217b4fa8cb7d3d6be7dfa13efa1bf14a49e2d7e1d6d9828e8320d08f65a WHIRLPOOL 9ec7f299fd8f2a5b12c20a6f9eeca3bd344e5377aede60d766f31c387a1c4b8f89571b82e8cda25f0d8baaf01e7b2199df26303abf6d71256a55fbd6d7b7dc26
-DIST arduino-0015-linux.tgz 1389657 SHA256 5eee994268a7f7227c6bf4ecb9290a256566c051fc0c215a91adbe7f314432fb SHA512 e932d67c8bbd499f86ab67a539c81603af134c2b4e63aaf0b58af4e960aab86ad5ab7df9bc57f3c34979c36497280f950536216b49798f1235c3643c59289cde WHIRLPOOL ba7e88e7d26199da72db9f2281da3aee929bf3f795f0a653cf7196ee44ba050d85abe153afa7b7642b8dca9de95a26cb08a9bd3b7680e44c98b8d46c146a6a9d
-DIST arduino-0017.tgz 4141675 SHA256 0b9e61dbcd8577eb90e5f498f2a416659d7994f92e0a9a10e25619803f36a7e7 SHA512 75294c81a562ef2e3d1c37f49fd464830365004b9f6339719b08b74b25cd4f21974f9b2ac898919ce233f876f84dfb5b68451afaf7a9fb994e712e8888ef804d WHIRLPOOL 2fd1b9134d4923df647ebc073e8405f9eb0877205b714d8431d5a4c3d54128378169028114412d42bfb05fbafc25367aa678eea6fe87ec7f08d1da406ec03464
-DIST arduino-1.0-linux.tgz 4318822 SHA256 ea9868d6520d987810625a661dc8c1c5b5908fb44b2b00954b90f9d2f8c87070 SHA512 9b5f27bda2a8aba791f62a48a34ddb9d87885ca279d2baaf964fc46cbf0f144687f5b2d5f83e83996197310883a32530a82c264fa38c59e4243e1c436f0dd489 WHIRLPOOL 3f2b3c9abf39889a754564a10146b14e82cf3c230670ca2585f835401b2cc84d58a7279642b8b56be61021c4c1be7f9864679136488af1e662d8713a047f6ea7
-DIST arduino-1.0-linux64.tgz 4351508 SHA256 813ea60669563fed7f8e16e4553a3cf0a7a5e7f7ec766f10a630c1b60a9b955e SHA512 a49fdd956e5842e2e18695ca029d51fc85a1eaa43ac768eea79eaff0aefe802ab527134aba133503fe7246315baa002f827dede62776dde7f2aa7ceefa5b4c01 WHIRLPOOL 6a0ecb435929d4b20e0134dc1c2e170e1affca5bd1ac9af5a5a2b126e92f6dc45d2ca0f37b47c4273d9ef24b68cef45adbc7e0a4d4c0f985971e1b511455985d
-EBUILD arduino-0015-r1.ebuild 2288 SHA256 2de7aa7a257e9c83f7c535fe1fdd70e5c02fe8c96cd75d474aa0b9c722f71ae8 SHA512 c46c90747d1fb95db60c4c4ab42bd07eaecfa632361104ffff851dd69c10debc309cabfb79168091edca4627df53eb04e28abe91600257f66cdc6beb9cea1241 WHIRLPOOL 7184c524e31b80262ae93dfdef7bc6cf72e37d5a9e302da1b24c149fff39344399e8a138cb34a365efe5d5fd3ecad6e46a49d6c202978e8f27d307ed2a3525f9
-EBUILD arduino-0017.ebuild 2119 SHA256 df7f350f4b22f64c5e09ee4e3e475248a6ed4fff9770653c3e21db7bc13a2440 SHA512 a3c22284a09f4b35b659c6156517eff04f51a2b0875042cc9efce94f194f5d1a5dbbeef26f9f4a1deae52dc89c048c2c590960803bd50a937975f401b58844a4 WHIRLPOOL 03cdf8474455ba1c41664f17c020bfef380e99c36df5d1273dbf005ded19b33ba48aa7fe97d40498a8267c6e749b0aeb857aabcc83c76169ef938149044ad9cb
-EBUILD arduino-1.0.ebuild 2707 SHA256 918b45966519c0a70fd71956421bd5e6a1cadf8d8486313c46019249e730a30f SHA512 3d5ba95af1a852c728e4fa9d5788206c40b513ddd8df3f92430b6a68efc88d645084c7d2996f36cb806d36a50089638ea9a7cff4f43b4f70e364008476ce7a4e WHIRLPOOL 930e8e7f71132ea7b27a2d37579b25a5c12afa1d5aa928d7d401a02f76316a6ab83838c710c5d17d99182703eded265b2132bd52b250535d0c2d66ecbcbc43b1
-MISC ChangeLog 1876 SHA256 b11afa3767db58f4790125f95e1e8c69cbced26652f0760073e3fb7ab71142fe SHA512 2044ce1d41e422d88ff9a50067f7bc1ef2581103e592079dd836dd3916a5763c4655975ba1f7950b35453e1a7a3b600cc0291828ef8911dbe4db0b6526546399 WHIRLPOOL 014775a643066e2e0984813a703ad6487e3d30587cbc4014729af089458ee607fb227ceccc3793fc77b9825c3bedd7643281d1d2e19a9296b2c4de0b948432d6
+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
 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
+-----END PGP SIGNATURE-----
diff --git a/dev-embedded/arduino/arduino-0015-r1.ebuild b/dev-embedded/arduino/arduino-0015-r1.ebuild
deleted file mode 100644
index 0c195dc99c4e..000000000000
--- a/dev-embedded/arduino/arduino-0015-r1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 2008-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/arduino/arduino-0015-r1.ebuild,v 1.2 2009/04/24 22:55:42 nixphoeni Exp $
-
-inherit eutils
-
-DESCRIPTION="Arduino is an open-source AVR electronics prototyping platform"
-HOMEPAGE="http://arduino.cc/"
-SRC_URI="http://www.arduino.cc/files/${P}-linux.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"
-DEPEND="${RDEPEND} sys-devel/crossdev 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_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/Makefile-${PV}.patch
-	rm -rf hardware/tools/avrdude*
-	if ! use java; then
-		rm -rf lib
-		rm -f arduino
-	fi
-}
-
-src_install() {
-	mkdir -p "${D}/usr/share/${P}/" "${D}/usr/bin"
-	cp -a "${S}" "${D}/usr/share/"
-	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"
-
-		# fix the provided arduino script to call out the right libraries
-		sed -i -e 's@lib/antlr\.jar@$(java-config -dp antlr)@g' \
-			-e 's@lib/RXTXcomm\.jar@$(java-config -dp rxtx-2)@g' "${D}/usr/share/${P}/arduino"
-		# and fix its reference to LD_LIBRARY_PATH (see bug #189249)
-		sed -i -e 's@^LD_LIBRARY_PATH=.*@LD_LIBRARY_PATH=$(java-config -di rxtx-2)${LD_LIBRARY_PATH+:$LD_LIBRARY_PATH}@' "${D}/usr/share/${P}/arduino"
-
-		# use system avrdude
-		# patching class files is too hard
-		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"
-	fi
-
-}
diff --git a/dev-embedded/arduino/arduino-0017.ebuild b/dev-embedded/arduino/arduino-0017.ebuild
deleted file mode 100644
index ea736b390c1d..000000000000
--- a/dev-embedded/arduino/arduino-0017.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# 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
-
-DESCRIPTION="Arduino is an open-source AVR electronics prototyping platform"
-HOMEPAGE="http://arduino.cc/"
-SRC_URI="http://www.arduino.cc/files/${P}.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/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
-	rm -rf hardware/tools/avrdude*
-	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/"
-	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
-		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"
-	fi
-
-	dodoc readme.txt
-}
diff --git a/dev-embedded/arduino/arduino-1.0.1.ebuild b/dev-embedded/arduino/arduino-1.0.1.ebuild
new file mode 100644
index 000000000000..e777386c1ca4
--- /dev/null
+++ b/dev-embedded/arduino/arduino-1.0.1.ebuild
@@ -0,0 +1,82 @@
+# 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.1.ebuild,v 1.1 2012/09/03 21:07:08 miknix Exp $
+
+EAPI=4
+JAVA_PKG_IUSE="doc examples"
+
+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"
+LICENSE="GPL-2 LGPL-2 CCPL-Attribution-ShareAlike-3.0"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+RESTRICT="strip binchecks"
+IUSE=""
+
+RDEPEND="dev-embedded/avrdude
+dev-embedded/uisp
+>dev-java/rxtx-2.1
+sys-devel/crossdev
+>=virtual/jre-1.5"
+
+DEPEND="dev-java/jna
+>=virtual/jdk-1.5"
+
+EANT_GENTOO_CLASSPATH="jna,rxtx-2"
+EANT_EXTRA_ARGS="-Dversion=${PV}"
+EANT_BUILD_TARGET="build"
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+
+java_prepare() {
+	# Remove the libraries to ensure the system
+	# libraries are used
+	rm build/linux/dist/tools/avrdude* || die
+	rm build/linux/dist/lib/* || die
+	rm app/lib/* || die
+	rm app/pde.jar || die
+	# Patch build/build.xml - remove local jar files
+	# for rxtx and ecj (use system wide versions)
+	epatch "${FILESDIR}"/${P}-build.xml.patch
+
+	# Patch launcher script to include rxtx class/ld paths
+	epatch "${FILESDIR}"/${P}-script.patch
+}
+
+src_compile() {
+	eant -f core/build.xml
+	EANT_GENTOO_CLASSPATH_EXTRA="../core/core.jar"
+	eant -f app/build.xml
+	eant "${EANT_EXTRA_ARGS}" -f build/build.xml
+}
+
+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 doc; then
+		dodoc revisions.txt "${S}"/readme.txt
+		dohtml -r reference
+		java-pkg_dojavadoc "${S}"/build/javadoc
+	fi
+
+	insinto "/usr/share/${PN}/"
+	doins -r hardware libraries
+	fowners -R root:uucp "/usr/share/${PN}/hardware"
+
+	insinto "/usr/share/${PN}/lib"
+	doins -r lib/*.txt lib/theme lib/*.jpg
+
+	# use system avrdude
+	# patching class files is too hard
+	dosym /usr/bin/avrdude "/usr/share/${PN}/hardware/tools/avrdude"
+	dosym /etc/avrdude.conf "/usr/share/${PN}/hardware/tools/avrdude.conf"
+}
+
+pkg_postinst() {
+	[ ! -x /usr/bin/avr-g++ ] && ewarn "Missing avr-g++; you need to crossdev -s4 avr"
+}
diff --git a/dev-embedded/arduino/arduino-1.0.ebuild b/dev-embedded/arduino/arduino-1.0.ebuild
deleted file mode 100644
index d2061a298510..000000000000
--- a/dev-embedded/arduino/arduino-1.0.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# 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.2 2012/02/10 00:50:47 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"
-
-		# install desktop icon
-		mkdir -p "${D}"/usr/share/applications
-		sed -e s@__P__@${P}@ < "${FILESDIR}"/arduino.desktop \
-			> "${D}"/usr/share/applications/arduino.desktop \
-			|| die "Failed to install desktop icon"
-	fi
-}
diff --git a/dev-embedded/arduino/files/Makefile-0011.patch b/dev-embedded/arduino/files/Makefile-0011.patch
deleted file mode 100644
index b9790305025e..000000000000
--- a/dev-embedded/arduino/files/Makefile-0011.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- hardware/cores/arduino/Makefile	2008-09-20 20:15:27.000000000 -0700
-+++ hardware/cores/arduino/Makefile	2008-09-20 20:22:19.000000000 -0700
-@@ -37,8 +37,8 @@
- # $Id: Makefile-0011.patch,v 1.1 2008/09/21 05:03:07 solar Exp $
- 
- TARGET = foo
--INSTALL_DIR = /Users/dmellis/Source/arduino/trunk/build/macosx/build/work
--PORT = /dev/tty.usb*
-+INSTALL_DIR = /usr/share/arduino-0011/
-+PORT = /dev/ttyUSB1
- UPLOAD_RATE = 19200
- AVRDUDE_PROGRAMMER = stk500v1
- MCU = atmega168
-@@ -48,7 +48,7 @@
- # Below here nothing should be changed...
- 
- ARDUINO = $(INSTALL_DIR)/hardware/cores/arduino
--AVR_TOOLS_PATH = $(INSTALL_DIR)/hardware/tools/avr/bin
-+AVR_TOOLS_PATH = /usr/bin
- SRC =  $(ARDUINO)/pins_arduino.c $(ARDUINO)/wiring.c \
- $(ARDUINO)/wiring_analog.c $(ARDUINO)/wiring_digital.c \
- $(ARDUINO)/wiring_pulse.c $(ARDUINO)/wiring_serial.c \
-@@ -89,13 +89,13 @@
- CFLAGS = $(CDEBUG) $(CDEFS) $(CINCS) -O$(OPT) $(CWARN) $(CSTANDARD) $(CEXTRA)
- CXXFLAGS = $(CDEFS) $(CINCS) -O$(OPT)
- #ASFLAGS = -Wa,-adhlns=$(<:.S=.lst),-gstabs 
--LDFLAGS = -lm
-+LDFLAGS = -L/usr/avr/lib -lm
- 
- 
- # Programming support using avrdude. Settings and variables.
- AVRDUDE_PORT = $(PORT)
- AVRDUDE_WRITE_FLASH = -U flash:w:applet/$(TARGET).hex
--AVRDUDE_FLAGS = -V -F -C $(INSTALL_DIR)/hardware/tools/avr/etc/avrdude.conf \
-+AVRDUDE_FLAGS = -V -F -C /etc/avrdude.conf \
- -p $(MCU) -P $(AVRDUDE_PORT) -c $(AVRDUDE_PROGRAMMER) \
- -b $(UPLOAD_RATE)
- 
diff --git a/dev-embedded/arduino/files/Makefile-0015.patch b/dev-embedded/arduino/files/Makefile-0015.patch
deleted file mode 100644
index c4f6e410e0de..000000000000
--- a/dev-embedded/arduino/files/Makefile-0015.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- hardware/cores/arduino/Makefile	2009-04-14 16:48:57.000000000 -0400
-+++ hardware/cores/arduino/Makefile	2009-04-14 16:51:56.000000000 -0400
-@@ -35,8 +35,8 @@
- # $Id: Makefile-0015.patch,v 1.1 2009/04/14 22:00:19 solar Exp $
- 
- TARGET = $(notdir $(CURDIR))
--INSTALL_DIR = /Users/dmellis/Source/arduino/trunk/build/macosx/build/work
--PORT = /dev/tty.usb*
-+INSTALL_DIR = /usr/share/arduino-0015/
-+PORT = /dev/ttyUSB1
- UPLOAD_RATE = 19200
- AVRDUDE_PROGRAMMER = stk500v1
- MCU = atmega168
-@@ -46,7 +46,7 @@
- # Below here nothing should be changed...
- 
- ARDUINO = $(INSTALL_DIR)/hardware/cores/arduino
--AVR_TOOLS_PATH = $(INSTALL_DIR)/hardware/tools/avr/bin
-+AVR_TOOLS_PATH = /usr/bin
- SRC =  $(ARDUINO)/pins_arduino.c $(ARDUINO)/wiring.c \
- $(ARDUINO)/wiring_analog.c $(ARDUINO)/wiring_digital.c \
- $(ARDUINO)/wiring_pulse.c $(ARDUINO)/wiring_serial.c \
-@@ -88,13 +88,13 @@
- CFLAGS = $(CDEBUG) $(CDEFS) $(CINCS) -O$(OPT) $(CWARN) $(CSTANDARD) $(CEXTRA)
- CXXFLAGS = $(CDEFS) $(CINCS) -O$(OPT)
- #ASFLAGS = -Wa,-adhlns=$(<:.S=.lst),-gstabs 
--LDFLAGS = -lm
-+LDFLAGS = -L/usr/avr/lib -lm
- 
- 
- # Programming support using avrdude. Settings and variables.
- AVRDUDE_PORT = $(PORT)
- AVRDUDE_WRITE_FLASH = -U flash:w:applet/$(TARGET).hex
--AVRDUDE_FLAGS = -V -F -C $(INSTALL_DIR)/hardware/tools/avr/etc/avrdude.conf \
-+AVRDUDE_FLAGS = -V -F -C /etc/avrdude.conf \
- -p $(MCU) -P $(AVRDUDE_PORT) -c $(AVRDUDE_PROGRAMMER) \
- -b $(UPLOAD_RATE)
- 
diff --git a/dev-embedded/arduino/files/Makefile-0017.patch b/dev-embedded/arduino/files/Makefile-0017.patch
deleted file mode 100644
index cee474142192..000000000000
--- a/dev-embedded/arduino/files/Makefile-0017.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- hardware/cores/arduino/Makefile	2009-10-16 23:18:21.000000000 -0400
-+++ hardware/cores/arduino/Makefile	2009-10-16 23:20:02.000000000 -0400
-@@ -35,8 +35,8 @@
- # $Id: Makefile-0017.patch,v 1.1 2009/10/17 18:15:11 nixphoeni Exp $
- 
- TARGET = $(notdir $(CURDIR))
--INSTALL_DIR = ../../..
--PORT = /dev/tty.usb*
-+INSTALL_DIR = /usr/share/arduino-0017
-+PORT = /dev/ttyUSB1
- UPLOAD_RATE = 19200
- AVRDUDE_PROGRAMMER = stk500v1
- MCU = atmega168
-@@ -46,7 +46,7 @@
- # Below here nothing should be changed...
- 
- ARDUINO = $(INSTALL_DIR)/hardware/cores/arduino
--AVR_TOOLS_PATH = $(INSTALL_DIR)/hardware/tools/avr/bin
-+AVR_TOOLS_PATH = /usr/bin
- SRC =  $(ARDUINO)/pins_arduino.c $(ARDUINO)/wiring.c \
- $(ARDUINO)/wiring_analog.c $(ARDUINO)/wiring_digital.c \
- $(ARDUINO)/wiring_pulse.c $(ARDUINO)/wiring_serial.c \
-@@ -88,13 +88,13 @@
- CFLAGS = $(CDEBUG) $(CDEFS) $(CINCS) -O$(OPT) $(CWARN) $(CSTANDARD) $(CEXTRA)
- CXXFLAGS = $(CDEFS) $(CINCS) -O$(OPT)
- #ASFLAGS = -Wa,-adhlns=$(<:.S=.lst),-gstabs 
--LDFLAGS = -lm
-+LDFLAGS = -L/usr/avr/lib -lm
- 
- 
- # Programming support using avrdude. Settings and variables.
- AVRDUDE_PORT = $(PORT)
- AVRDUDE_WRITE_FLASH = -U flash:w:applet/$(TARGET).hex
--AVRDUDE_FLAGS = -V -F -C $(INSTALL_DIR)/hardware/tools/avr/etc/avrdude.conf \
-+AVRDUDE_FLAGS = -V -F -C /etc/avrdude.conf \
- -p $(MCU) -P $(AVRDUDE_PORT) -c $(AVRDUDE_PROGRAMMER) \
- -b $(UPLOAD_RATE)
- 
diff --git a/dev-embedded/arduino/files/arduino b/dev-embedded/arduino/files/arduino
deleted file mode 100755
index f6b97590109a..000000000000
--- a/dev-embedded/arduino/files/arduino
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-cd /usr/share/__PN__/
-./arduino "$@"
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
deleted file mode 100644
index 727944719d58..000000000000
--- a/dev-embedded/arduino/files/arduino-1.0-prog_char-fix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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.1-build.xml.patch b/dev-embedded/arduino/files/arduino-1.0.1-build.xml.patch
new file mode 100644
index 000000000000..afde2e05b661
--- /dev/null
+++ b/dev-embedded/arduino/files/arduino-1.0.1-build.xml.patch
@@ -0,0 +1,38 @@
+--- arduino-1.0.1/build/build.xml	2012-04-09 00:16:12.000000000 +0100
++++ arduino-1.0.1/build/build.xml	2012-06-25 06:12:09.000000000 +0100
+@@ -24,9 +24,9 @@
+   <fileset dir=".." id="runtime.jars">
+     <include name="core/core.jar" />
+     <include name="app/pde.jar" />
+-    <include name="app/lib/ecj.jar" />
++<!--    <include name="app/lib/ecj.jar" /> -->
+     <include name="app/lib/jna.jar" />
+-    <include name="app/lib/RXTXcomm.jar" />
++<!--    <include name="app/lib/RXTXcomm.jar" /> -->
+     <include name="app/lib/ant.jar" />
+     <include name="app/lib/ant-launcher.jar" />
+   </fileset>
+@@ -361,16 +361,18 @@
+   </target>
+ 
+   <target name="linux64-build" depends="linux-build" description="Build linux (64-bit) version">
+-    <copy tofile="linux/work/hardware/tools/avrdude" file="linux/dist/tools/avrdude64" overwrite="true" />
+-    <copy tofile="linux/work/lib/librxtxSerial.so" file="linux/dist/lib/librxtxSerial64.so" overwrite="true" />
++<!--    <copy tofile="linux/work/hardware/tools/avrdude" file="linux/dist/tools/avrdude64" overwrite="true" />      -->
++<!--    <copy tofile="linux/work/lib/librxtxSerial.so" file="linux/dist/lib/librxtxSerial64.so" overwrite="true" /> -->
+ 
+-    <chmod perm="755" file="linux/work/hardware/tools/avrdude" />
++<!--    <chmod perm="755" file="linux/work/hardware/tools/avrdude" /> -->
+ 
+     <!-- Unzip AVR tools -->
+-    <exec executable="tar" dir="linux/work/hardware">
++<!-- Removed by Paulj - use system installed instead -->
++<!--    <exec executable="tar" dir="linux/work/hardware">
+       <arg value="-xjf"/>
+       <arg value="../../avr_tools_linux64.tar.bz2"/>
+-    </exec>
++    </exec> 
++-->
+   </target>
+   
+   <target name="linux32-run" depends="linux32-build" 
diff --git a/dev-embedded/arduino/files/arduino-1.0-script.patch b/dev-embedded/arduino/files/arduino-1.0.1-script.patch
index 323d6a639b18..323d6a639b18 100644
--- a/dev-embedded/arduino/files/arduino-1.0-script.patch
+++ b/dev-embedded/arduino/files/arduino-1.0.1-script.patch
diff --git a/dev-embedded/arduino/files/arduino-script-0017.patch b/dev-embedded/arduino/files/arduino-script-0017.patch
deleted file mode 100644
index aaad17e8ec73..000000000000
--- a/dev-embedded/arduino/files/arduino-script-0017.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- arduino     2009-08-11 19:00:04.000000000 -0400
-+++ arduino    2009-10-17 13:39:14.000000000 -0400
-@@ -8,14 +8,14 @@
-     lib/*.jar \
-     ;
- do
--    CLASSPATH="${CLASSPATH}:${APPDIR}/${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="$(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