Fix slotting of Java dependencies, straight to stable to avoid

immediate breakage. Also remove older unstable version.

Package-Manager: portage-2.2.18/cvs/Linux x86_64
RepoMan-Options: --force
Manifest-Sign-Key: 0x9C6D7DE4

4 files changed, 32 insertions, 124 deletions

diff --git a/dev-embedded/arduino/ChangeLog b/dev-embedded/arduino/ChangeLog
index 7c19e9df3f3e..2589d204eb0f 100644
--- a/dev-embedded/arduino/ChangeLog
+++ b/dev-embedded/arduino/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-embedded/arduino
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/arduino/ChangeLog,v 1.19 2013/08/18 13:27:35 ago Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/arduino/ChangeLog,v 1.20 2015/04/16 23:04:19 chewi Exp $
+
+*arduino-1.0.5-r1 (16 Apr 2015)
+
+  16 Apr 2015; James Le Cuirot <chewi@gentoo.org> +arduino-1.0.5-r1.ebuild,
+  -arduino-1.0.4.ebuild, -arduino-1.0.5.ebuild:
+  Fix slotting of Java dependencies, straight to stable to avoid immediate
+  breakage. Also remove older unstable version.
 
   18 Aug 2013; Agostino Sarubbo <ago@gentoo.org> arduino-1.0.5.ebuild:
   Stable for x86, wrt bug #477092
diff --git a/dev-embedded/arduino/Manifest b/dev-embedded/arduino/Manifest
index d808aabcf045..ae943cea6e14 100644
--- a/dev-embedded/arduino/Manifest
+++ b/dev-embedded/arduino/Manifest
@@ -1,30 +1,30 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX arduino-1.0.1-build.xml.patch 1732 SHA256 4637f8843a9abcafc7bfd95c247636248c8223419751159d5b323f6851de47b8 SHA512 a5317a131449f08fa272cd7d3bf477eedc69f354b771297bc20623277e79a2c1349299c14fba52689f015c71d6a19733fb8ee24de820e59c1aa2b3e2d7f2af42 WHIRLPOOL 5f598424c212c4e6bdd3126bb71867cf8e73c1b4fe5cb336507197ca77e138d4cf655f5fd55ced4f778a028558b761a4fca05a077b3a3b6f6d7624ada92f2b70
 AUX arduino-1.0.3-script.patch 608 SHA256 1b77300bce911b5b697df0804c18b805f9ca52178451983336514aefa34ea53b SHA512 073f2adfc9066879a409a064599d9972ecf0110990a20d778d631fa24c35854831872a0ee220d80cfe996b9e6fa91ef00281a40c466b510a5ce635c59c84103a WHIRLPOOL e7953e567209c408b370c1d1771f38cac8ed875b9074f893c444481f5b6e2ad681516941a5152f0aa878c2678aac3e743c2c79d02e5aac994b29197d9996c2b4
 AUX arduino.desktop 196 SHA256 707520d5c0075f9ad6663890d697e41f4a0b486bdb946469343c9fffced8b8db SHA512 d5c19162e7863ef3d1e4182caafafd090e2df98cb65b92aad01a3c68d793fe7f056939b920ab11666ab67fba4faa880ad4da599cad25206b8f22612c675cb3f1 WHIRLPOOL 9df9e95c443393a56e818b4892c7a7b41a7d0ec3220bffaa9dd9c767dfe9d3c1c9affc86b40baa00b27e2429fe59dfe7191a63f74e1f822312ddf851f712bb3d
-DIST arduino-1.0.4-src.tar.gz 35340189 SHA256 b956cfd13830d623ac3b933dafce2e1bec07eb3c5767f3702c649efb868a8a2a SHA512 f2fbc80856e452ce6c42b64191be313cb2b20ece9dde139cc7b18cda7e91ee8a627dd2753d4f2fbe2d44b3f4bb2f992a94da7f0c8aa09e89ed94cfe16b40d844 WHIRLPOOL c8c7383418ca3f948c3d99461f104f4d166c151b7d866e57429936a61cc33a08547dbd05f6a08825b6c9f26fbb3fa49919bca86f3554b257b6904f6c8c922126
 DIST arduino-1.0.5-src.tar.gz 40526292 SHA256 2f222c944d317dcae40c2d9a1e8ca8c2092f1fff4e3d1814c609209ffc9afe17 SHA512 0401bf6051a48d343f9e4e822446a846b2c6446c68949efe5daf5f5445114312eecb9c99a4565ab2e2f80831aaa32122ecc21f81c8a97136704482cd0f1f1c00 WHIRLPOOL 9176557007b039dae097dd96fc6a56956117ec879f3689005493bb19f54909e6f502672c92e81cb8bdc24b3a661881ffd696e7179b4dfc4a68af38a8d05cee93
 DIST arduino-icons.tar.bz2 58775 SHA256 9086ae27a13cc19e428ed7e6434366752b33a7d066b5620bfdd371709277390e SHA512 b750e79d6117f5df619f2b765dad6e64f0ba4aa3314b0b6e00801577e3ea1f15951ba15efe7a00f5317285a19ac29ac41c78b71342f45cd164c794a42bafcdd9 WHIRLPOOL b53ab3ff2981ca9f6d45311b9f885ca831700a7a49fef4a376cdc489f7cc3a6c39fbb93994b962b6854b0833d7342b951b5c6327422aafce762f92952b7a5876
-EBUILD arduino-1.0.4.ebuild 2697 SHA256 170e32042b68b603aee46c866bd0e323f331ec5f18b418f1b06a181ad21df6fe SHA512 e45dc56f40319fd3e80aa84981ea37a6d9368c78ff2297af4376bd316f113043a89bb0c876243c8f39e11411b7cf2734f1dee1139603cb38e9dcbce3e861c59d WHIRLPOOL c06ac1e87f65a9b31e05d211f35502058bd4204d15a7ac6f4019e9267e2ed8a079fd8d10149466a7fc15a892793abb1cc887431e46c31442377352320f137403
-EBUILD arduino-1.0.5.ebuild 2692 SHA256 e9c42bda3c4ea241d8a7e44879b252ce742415871ac021e4b36594c5d31b8bb2 SHA512 3ee4af04c57dd7e4496897519271c6f6f07d4a170b5eefb557d76d4752e1e3f0d0aff154c109a749b05c7ea347db9fc1bf6db6143b5e65c552baf9320dba788b WHIRLPOOL 9fd5e5116bdab4d2618d34bfafa4105fd4ae93d8daf9ce1e3b91c612395e9d0bca240bb70ff668e08870f6d9d6c7f3a319fb3379373320b276fe5da723ed6ef3
-MISC ChangeLog 3774 SHA256 85427ace8d3cd441bdf52a9f5d03227a92eecd27fb26f694e56b4b8bf3e3e341 SHA512 404294e1d94d994512fe7a1a4d8bfef5c52060fdafdf9d0d262b9adb4eef761e4b7aa2cd985130b539094518dcb81d4d8290138441438a6e79bb982c4cc442ec WHIRLPOOL e9939525d06b22e7f4b9a55925c0a5b74d19996343588c860e2bc81ed4a735d45a1d0bdff65acde563a5c7705a58185e5d41a84e5ada8522525e24a6c51c0544
+EBUILD arduino-1.0.5-r1.ebuild 2701 SHA256 89dbba803bc7732ca94dc1d82f364b1991bbe183e583f540571948c3cd2b1739 SHA512 c2a8f1b77c7ebcd259ae191ff7366cf24ce805bb59473e899c080e532baefe6ba65415f555ae58cca86b10c52ee9fe13ffb72362191006d8560f25488c383df5 WHIRLPOOL fb7635137cd830e57dbda8ba264cf5d4f3c875f4132711df8ee9b60cddc5f2ebfae77d81781fd1c87d1a0d4152672edb2e6a507be3f255e3a1063c81a9e46f4f
+MISC ChangeLog 4057 SHA256 19dabdf9943d0a692195db0e5e1668574651ef96c8dafc6e61299a549b2abf83 SHA512 9afc5536d14f2ab42da7d4e52dcd6cdefc6d19e014f2e3bbe11be90e20a1bd56298bae6e5989b78bb830aedd66845f650c2bef307a0e714200e933cde3e2ec01 WHIRLPOOL f29b9e8b8f8e65a41ebf0644ba4576a119b427c048fddf3842feeb5f5c3f43febb1f80e672fcffd911ea19c0daaa801eee3f5f6132298ed7e48b5fd070bb3e04
 MISC metadata.xml 230 SHA256 b0d6478161eabd31cab53e116df75e934097717ad3cb0568c0298a8b66c557e9 SHA512 ab2e84014667623d0eeeb2b17f603ea8eef5d65621f9a5ea848d1ef0826566e2f3b7fad25cab1d31c7c5f0684773e678088316bb6ff3db71878f715d900cf229 WHIRLPOOL 86d2e3365e5c6ed4eda673063a499e6f1a9fac177138582f8ce5931269873ac1f6d275f1f30482ba0becf7b8cf7af4f8fa277ac8dbf585a4f5b01bbffb3b150d
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0
 
-iQIcBAEBCgAGBQJSEMvCAAoJELp701BxlEWfDT0QAK9kAEq01yXn8bhdkqhof/1A
-X91b413AmAIv2VVWFbzdaINgvq/jfImhEJFHx8UtTBIEzsexH3CQ9z2eO0wbKuZm
-NUfQvjRg2HedouuEHeYyzAKNKzJ3/A5AiV0pC7JCQacrTax/+ZwbXg527V4pqVfg
-YJuZc0H9iXNLv0Wn/amvFYfIkVCs3uKnAI50jeCfQFmUq/nFqcRG0Ux5lyjmplzr
-UJUfNdShmyJGNFwUEBh8dZIEeExW1sZldTepHDzfX61FNkwRqKpuo3/k+n7zCTIv
-td08OlPsnCpuMIGLxHh0TVl9X0cAadV7IkOZEdll9QcNcG4Q4X8AIk+vvHpWH5N2
-EfrXjmYDpP3j1VAK/ZZwxH+YVxN4QlZmIzX+qFBR93Atsz1XqvJaKd1ue5Zl2IgX
-BJkHTKyqvdeDHvenz+mBwoH+oVh6yCPi7hrj+ccDhDPSsOr5cIPizhwcVEwZOxga
-QZbNUQCSlwfDNnoJhrKPMzBueehfh1bo1GVxS0Io3eGBqCu4HN/I9VO5/3zfvHe0
-Lpfj64GsK1m2njvejeonIYNWKOaGDvujL+S3o1g6OA64hFDVhxhC7Pmm4mYLkWna
-CaHpnR/L4mq+aIjZKGqER8k6RcTAPNHn6kcdxAWtUrv4Ch59izWmoP1UA4Bum1Zv
-UrJ1P8M+Bu4Z+M3oY4kF
-=9wPf
+iQJ8BAEBCABmBQJVMD/5XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1MjhERTZCRDg2OTFBNDM5MUZEQTJFRDQy
+MUM2MzIxMjlDNkQ3REU0AAoJECHGMhKcbX3kG3YP/RBeNxBCj7E0B1PcpAXU4FzC
+g3bQ14QYGTc6uKAmMMG6ek5yabbvSOG2PQAuh+QfulZYn0syWGBL2wl5vlhVmKKI
+NBmgORzD09a+1t77bx3xXAbT7binqVtd2b2NpmDb9901KTxz/lAbnk9sy/uEPo6u
+shQxfJQl+E27gk/A7uKhKX0ADhQTw/TX4Q+L+IcAO3t7WsSUJdYqeugUNJM4ESz6
+EMfXtNDoVJvWc82bFXM8DerA8BTCaSw6eVrynrv+hHyH0/bfjDX9tFzWXqSti7zV
+pE2p+b8YODLdcBQGJIxcKTzi3VK7K3EEXli7LRZWgfgsXjk0zFsNv7/CK/WoUX7p
+FvIGK5PkX07Gn/4didE4Koz0S6Fqb5IlqDTnqYT2Vk907bHTa68gsAdX4Pa5vpqN
+H1l+xQmhp4qdzAO5Mwd/+hEjqMx9NVZiBPyXFyoG9auOVQbdrUGmcFJWoUk89qLa
+5/egF01sktInQ0oYYgL/vQnbSlQFbtRCs0c4tWp22IheQfimVNGHsc4jCKQpOPnc
+EzCSM276NN1Gn0UJ1hdex9wjy8zrsqVpp8gBL80l0emzxKErGpOQVAmmc8En2lLE
+OZ9U7QqpJMDgqZsIe5CmoezALIkYvS7UGWkkN0SMo9hMZZRNZN1E9D91JJN0m0H7
+RSWjxKi18R7SiASZiB4j
+=H/4X
 -----END PGP SIGNATURE-----
diff --git a/dev-embedded/arduino/arduino-1.0.4.ebuild b/dev-embedded/arduino/arduino-1.0.4.ebuild
deleted file mode 100644
index afe440d4b029..000000000000
--- a/dev-embedded/arduino/arduino-1.0.4.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# 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.4.ebuild,v 1.1 2013/04/03 20:18:11 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://${PN}.googlecode.com/files/${P}-src.tar.gz
-mirror://gentoo/arduino-icons.tar.bz2"
-LICENSE="GPL-2 GPL-2+ LGPL-2 CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-RESTRICT="strip binchecks"
-IUSE=""
-
-COMMONDEP="
-dev-java/jna
->dev-java/rxtx-2.1"
-
-RDEPEND="${COMMONDEP}
-dev-embedded/avrdude
-dev-embedded/uisp
-sys-devel/crossdev
->=virtual/jre-1.5"
-
-DEPEND="${COMMONDEP}
->=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 -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}"/${PN}-1.0.1-build.xml.patch
-
-	# Patch launcher script to include rxtx class/ld paths
-	epatch "${FILESDIR}"/${PN}-1.0.3-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
-
-	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
-		dohtml -r reference
-		java-pkg_dojavadoc "${S}"/build/javadoc/everything
-	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"
-
-	# install menu and icons
-	domenu "${FILESDIR}/${PN}.desktop"
-	for sz in 16 24 32 48 128 256; do
-		newicon -s $sz \
-			"${WORKDIR}/${PN}-icons/debian_icons_${sz}x${sz}_apps_${PN}.png" \
-			"${PN}.png"
-	done
-}
-
-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.5.ebuild b/dev-embedded/arduino/arduino-1.0.5-r1.ebuild
index cf7865b675f0..47ed44ff45fa 100644
--- a/dev-embedded/arduino/arduino-1.0.5.ebuild
+++ b/dev-embedded/arduino/arduino-1.0.5-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/arduino/arduino-1.0.5.ebuild,v 1.3 2013/08/18 13:27:34 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/arduino/arduino-1.0.5-r1.ebuild,v 1.1 2015/04/16 23:04:19 chewi Exp $
 
 EAPI=4
 JAVA_PKG_IUSE="doc examples"
@@ -18,8 +18,8 @@ RESTRICT="strip binchecks"
 IUSE=""
 
 COMMONDEP="
-dev-java/jna
->dev-java/rxtx-2.1"
+dev-java/jna:0
+>dev-java/rxtx-2.1:2"
 
 RDEPEND="${COMMONDEP}
 dev-embedded/avrdude