gentoo resync : 27.10.2018

13 files changed, 8 insertions, 278 deletions

diff --git a/dev-embedded/Manifest.gz b/dev-embedded/Manifest.gz
index fa928385a7fc..54551f8b513e 100644
--- a/dev-embedded/Manifest.gz
+++ b/dev-embedded/Manifest.gz
diff --git a/dev-embedded/arduino-builder/Manifest b/dev-embedded/arduino-builder/Manifest
index eda424cb8d2c..4b703b18748b 100644
--- a/dev-embedded/arduino-builder/Manifest
+++ b/dev-embedded/arduino-builder/Manifest
@@ -14,6 +14,6 @@ DIST github.com-google-go-genproto-af9cb2a35e7f169ec875002c1829c9b315cddc04.tar.
 DIST github.com-grpc-grpc-go-8dea3dc473e90c8179e519d91302d0597c0ca1d1.tar.gz 506815 BLAKE2B 498909d0704b46d54571ad1f87d7636fafdf48f11fbf53e5e8ec6cd16aa6cd57cdfaedd8a7c00cd33ff60c99b0ab0dbf3f9c8df28155c75b2ceeaada3afabf92 SHA512 37970d20ce358d5186a9a152b1a0b1af816f7d53de8f2c35c901e8533e8191125e08ca60e1177bbab5e2585a1fa6e0fa9785ac70caadc5aa0fa58c189d26ca95
 DIST github.com-jstemmer-go-junit-report-833f8ea2b99d36d5f018698333834f3df200a0c2.tar.gz 6901 BLAKE2B 6138ac40810ad000a4336ffbca3bc5c1d0e96854c7918fb2aad9f7b2596ac66f285ac8c519e30b6e97cdb0009b31ab73b83ff2e1db2f464c2d88f2c1045a6bd9 SHA512 00f38f51c5f761b5a3e60a6e6b602f1246a746f081f2d8946d01387234270544692c6af54d0e69919c1af8aa753f848eeecc4421f2ddf881f21522ccf5545d75
 DIST github.com-stretchr-testify-1661650f989674e3e5bcdcb805536e5d31481526.tar.gz 81099 BLAKE2B 592a7c114b01bc5b1982135f310aa8619c2888ac36ccb5d876a38655a13f7dc4d468a7a42a44cf9cf69fc7bd6769a9ba010b48089d5ce866dcd564e20487e04a SHA512 f10255b0f47237c7583626a3bb213ca67d0db92c2a1531cc31dac089cdb13139b01647809503313a26f3e53a64a98cebc3bf9c4e1bd1ed975d9b81aa516ab5af
-EBUILD arduino-builder-1.3.25.ebuild 2825 BLAKE2B cc4ec18475e9ecf08e317356bd613b0706e5aa455a22b2d6d1807228609afeb1e95e1e45e0fea2ae5e7651f2db163632d27a5d7212bbbe30b14e25cb61e5c358 SHA512 b121e4c06899ed675897cfa29d12f6b2879a43402bd2c02135e9ae5f54615385e55ec315492ebc43af7ad8ab9c0e2252b743abb5a76d7b53c46b98a784e22bc6
+EBUILD arduino-builder-1.3.25.ebuild 2824 BLAKE2B b8d42a6e5086df92dc85a3714720140b0aa99ece6035d8356565eb0e9235d4da65206a38559078341576bb5a3dcb77b53dfad115b1f42ce54d132771867c7709 SHA512 0d6a2360afc615db3c1a43600cbe70cc9348035a170727f3ce7097cd7630239a376a095b2b4763c3e9f11d8b915be848d5387d6ae7d29eccaeadbb46e02242bc
 EBUILD arduino-builder-1.4.1.ebuild 2478 BLAKE2B 85a284b161b9e98260c52fd5338db7c8f3afe1063f00306fa73e1ef7f0ce2cbf0cdfc07ec75729d89b8ceed995671dc96c62c0c90581edccb38a52ae367b1533 SHA512 0deb62c9ebaa1089f0b2e021e871a29a2994edc167a6f9cdb01ddb9fab38f2bd8a640759627adfa2c5d068b47afd0d6ac77520c5c40f6245aaaed0fef33d7233
 MISC metadata.xml 339 BLAKE2B 8353146b638f77f9846c37e1717f19e9d3eff24a88a8299bb43d6118e47c5159a53ed8612681f5f849269a8d250d99b9dc57030452d96ed81975196b3faedfb1 SHA512 3a107172d306efee35994af117181d4a08388883d4efeb48dd270f8a711deae39d68e1bd38423e0a71d91f708d4c1877d300ed4823e43fda8a924bd98b8f37c7
diff --git a/dev-embedded/arduino-builder/arduino-builder-1.3.25.ebuild b/dev-embedded/arduino-builder/arduino-builder-1.3.25.ebuild
index fbf0e5e82916..9eea737b208b 100644
--- a/dev-embedded/arduino-builder/arduino-builder-1.3.25.ebuild
+++ b/dev-embedded/arduino-builder/arduino-builder-1.3.25.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/arduino/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
 	${EGO_VENDOR_URI}"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="sys-devel/crossdev
 	dev-embedded/avrdude
diff --git a/dev-embedded/arduino-ctags/Manifest b/dev-embedded/arduino-ctags/Manifest
index e6000e5707a0..6923f1d99d6a 100644
--- a/dev-embedded/arduino-ctags/Manifest
+++ b/dev-embedded/arduino-ctags/Manifest
@@ -1,3 +1,3 @@
 DIST arduino-ctags-20161123.tar.gz 490200 BLAKE2B f51b18a0db420124c5fed2b320c16d9eeb96fce6d0f118cf43a8177f88400daaeb83437c3993353c16b73781961c7476e782e66891582f4b3dc5301c73da64dc SHA512 ae5bde92c3dd0b9a179bc1df998f20312c4ab8b2c9c1840dbe543d23fb4531b9e5524f1399d9922ed9b2de4582bdb74635f7ec576a42c808d152c3fbb84f9687
-EBUILD arduino-ctags-20161123.ebuild 734 BLAKE2B 255520788f2d2e133bf01a233623fbdf5d8dd275a81fcfc7e14026a3d1f50a548a193e13c3726e6ca943a4e977ec92d24eb573ab615d84b31ca304f81909e4e9 SHA512 1cdd8a481ad8d7f02ada234df6e3da3baa63e879924e757bf83958e0ad44e131549f622ce2bb6b68a3c9015587a4a100ce12cce4cc5166cc84fa89b68b3417c3
+EBUILD arduino-ctags-20161123.ebuild 733 BLAKE2B 822fe29867f851c0f427872984073c512a84ad61cf0f3911be3f7c529761f9e6e114429ce1fcce4fc51903f0fa9c95aef149cc09aab60c7a4e02f457e1c7d082 SHA512 be55305db260927da48fc78409ce762aeeff1d694bf26f7a5359a0955518790be4bb294d9f023a8ac9783be3c8f6c05e0404f207f693ae41c42696c22f4772a2
 MISC metadata.xml 626 BLAKE2B 723945b93e97337df1fc85a27c7fb937d624372a1732ef026d0541ab6179806aaa8416e3e973873d7b2b2d5c39a32391158a1d0e172b02aa35b9c20aa1619ee7 SHA512 e129f6dec30edb56b3a85f26c171d314445c8bbe44cfb7e5fdd7f4d18a763fa13a79a6af95b7d0195bbc33b51d67fe84e33f402d30bf5672a7e7262738fba72f
diff --git a/dev-embedded/arduino-ctags/arduino-ctags-20161123.ebuild b/dev-embedded/arduino-ctags/arduino-ctags-20161123.ebuild
index 5fdb6990c1fe..2e0a463f1c00 100644
--- a/dev-embedded/arduino-ctags/arduino-ctags-20161123.ebuild
+++ b/dev-embedded/arduino-ctags/arduino-ctags-20161123.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/arduino/ctags/archive/${COMMITHASH}.tar.gz -> ${P}.t
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 
 S="${WORKDIR}/ctags-${COMMITHASH}"
 
diff --git a/dev-embedded/arduino-listserialportsc/Manifest b/dev-embedded/arduino-listserialportsc/Manifest
index 6ebb5e050db9..874aaac14c10 100644
--- a/dev-embedded/arduino-listserialportsc/Manifest
+++ b/dev-embedded/arduino-listserialportsc/Manifest
@@ -1,3 +1,3 @@
 DIST arduino-listserialportsc-1.4.0.tar.gz 5448 BLAKE2B a1b5256c9e9ece7ec4de8b1481b6e20769fe07fd94b73d099922074ff20d251896d992aba1e3680dc7e667ff2897fec05812a07273efe097cf5387a5f0207554 SHA512 0e8bbf1e49fa8705a6d3c28b44043f8d13589b7ebdac245db79ed3826bf56028778fdf721af3cf756cc8ea19e7a2f7e5f19421a105211cf0cd35041ec718c2bb
-EBUILD arduino-listserialportsc-1.4.0.ebuild 1099 BLAKE2B d22c201011786d7bf1bf54078d475aad32f89bfa6cfffb07e714bfc2f310b0035983b71b988100c35cbb8227e71077d01716421fc214f43ef7f1722147f21f15 SHA512 73684175e543ebaa62e6e848456344efafb20a4abef24132a24501e8cf40c549ef8135f53e662be4b5baf548a37cacccb0cba5ce1fe6031a611c64f2c98427a6
+EBUILD arduino-listserialportsc-1.4.0.ebuild 1098 BLAKE2B 527cef4a815c78f57f5b17fddf4133bcf3e7818d27c7b07e64ddef4c19e7e61465da8e2e1a30c52be75cd0a7635f6e85f3693c6c0d0346f6c908ecc024163ce3 SHA512 3bce0d830e299b20b576483164a5ac0682397bde5184e786218318d8890cee0bff2ca13b88377aa09cb35151daadb3d40421ee45b847d49d9bb0d1a945b5c264
 MISC metadata.xml 340 BLAKE2B 2cd9ba0239d059246ccb17feca24dc51e3ea6a03ffddc316e7ba596decd2cd52337f54ecb3746b04d1ebe6fbc1b4a8488e3080b5274283837fa43f5a75bead76 SHA512 67948320e986bc94e6ca659c06e6a914b824c54bddfbd507d1bdfc6773c673540bd07555eac945ab72e4ff85d93de97455abf3481d0ae3d99691e48efebb9cde
diff --git a/dev-embedded/arduino-listserialportsc/arduino-listserialportsc-1.4.0.ebuild b/dev-embedded/arduino-listserialportsc/arduino-listserialportsc-1.4.0.ebuild
index 54309574a086..7a3b5304855c 100644
--- a/dev-embedded/arduino-listserialportsc/arduino-listserialportsc-1.4.0.ebuild
+++ b/dev-embedded/arduino-listserialportsc/arduino-listserialportsc-1.4.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://github.com/arduino/listSerialPortsC"
 SRC_URI="https://github.com/arduino/listSerialPortsC/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND=">=dev-libs/libserialport-0.1.1"
 DEPEND="${RDEPEND}
diff --git a/dev-embedded/arduino/Manifest b/dev-embedded/arduino/Manifest
index 6519be28d330..c25ceb0e293f 100644
--- a/dev-embedded/arduino/Manifest
+++ b/dev-embedded/arduino/Manifest
@@ -1,10 +1,7 @@
-AUX arduino-1.0.1-build.xml.patch 1732 BLAKE2B 9defdbb63aa921458f4d76f9f76e173937594b52a92906b13a2322695a0866702fccc8c7d90bff503f7675c900d322199188bce3df428e05358205b76d4b20b3 SHA512 a5317a131449f08fa272cd7d3bf477eedc69f354b771297bc20623277e79a2c1349299c14fba52689f015c71d6a19733fb8ee24de820e59c1aa2b3e2d7f2af42
-AUX arduino-1.0.3-script.patch 608 BLAKE2B 93f555a54ac9ff47feb2c6d51b4f1fc58cd09dc2e7af1dacf7fa3bb704929fb1feea65f5852a1a0da9c8cd0965cdaaf252c0dd96b9e49b9e85ffc10bb826d0fa SHA512 073f2adfc9066879a409a064599d9972ecf0110990a20d778d631fa24c35854831872a0ee220d80cfe996b9e6fa91ef00281a40c466b510a5ce635c59c84103a
 AUX arduino-1.8.5-avr-platform.txt.patch 1215 BLAKE2B e4995a86865959d136cbbfcbdccdc1440c53344d9c90717a6d51dc7df2e5c22029de3af94d9f1a3b63243862c457f8ad1e7239359366afacb4a47b94dc5e44c5 SHA512 2032dda5e9c318550539f8d9c9ef1e0668bf60a11e6d6ae9c86e28c19518db999401538fc5b0af6ee606e2509ffc06d69d3e43b5bd63925ad92457cfc2d39d27
 AUX arduino-1.8.5-build.xml.patch 1402 BLAKE2B 84a9961cb21522a1bf3a485e8c758621632eda7bc15fb69c445197314a124042f19bc4619cea394a669659fb17f23c7240504cc01d31475d57234f1d28a962d9 SHA512 c279b5fabf6231deeb77b532d7bf0093ece2aad48c31d6bb5a524e32fde5dc58c9c102b3afee4e8e999021049101fae7e00dc4f1bf1ad8dad3ddf451a61835aa
 AUX arduino-1.8.5-lib-loading.patch 1164 BLAKE2B c1e0168f04727ab39340db3594d418eb1f6a25cbf728fb4c75c4db79b9b7b67daeaac35bcbc111f9e7eb76ba5539a5a57bcb5a3f274f3b92cf4b5bf6e51e513a SHA512 c2487e57e654872b8c4a4e046431b43385654ebdc8c9e8bbf5f9593f91a40f0d3288d0f13b6237dea351284cb5e4044013a406af1e9606b9111df3cf7f0ed760
 AUX arduino.desktop 196 BLAKE2B c3b8c380e005911b6a7473a5c9fa5248923655afad1e7029aaa3de6dc95e3d7c8e5d9f7dc3c4f1afba516e0f330bed788d68b5d8eb2fd899d47ebf333d1e7d1d SHA512 d5c19162e7863ef3d1e4182caafafd090e2df98cb65b92aad01a3c68d793fe7f056939b920ab11666ab67fba4faa880ad4da599cad25206b8f22612c675cb3f1
-DIST arduino-1.0.5-src.tar.gz 40526292 BLAKE2B 3844d5f644af94adbb8fb6fa2f80640ae823d2455d0c2e175bc614a281ce5ece0bd111ecd3661d8ab2f2017781b8b1753b215b705090e449be0525b5ec009a4b SHA512 0401bf6051a48d343f9e4e822446a846b2c6446c68949efe5daf5f5445114312eecb9c99a4565ab2e2f80831aaa32122ecc21f81c8a97136704482cd0f1f1c00
 DIST arduino-1.8.5-Adafruit_CircuitPlayground-1.6.8.zip 404619 BLAKE2B 993ec1282cc711b814db99fe1e4b50a2a6e6559722872e8fbcbb42e022c0e3611e10a4a0285468f82241eb5e15c0f91ff49ae9f2e0190d80a674cba51c93eae6 SHA512 0f0d32841bb6987edfc0e9aa0af8d0f7cf68dd33bf07ff0ec4cdd0d9733bb092b97a4810d7a0828e1d38fb25ec58e8fd3c023f70dffa3b1397386a902c932491
 DIST arduino-1.8.5-Bridge-1.6.3.zip 64717 BLAKE2B cb20da7b1db33ad89bd5fcadd01035592b664a7aaa98c27463fad643deba0b1d7e48b341f75f2564716f5b32e800b96934202c683b9a68c628d5af01662c9b7e SHA512 6836580af17b9fbc1ce39821c2e3891bb2f240904a30e66110a03837a24979093ad88819dc333fa5b47ceff6f6ef17552004356bc71200a2e7b09d2182e91fc5
 DIST arduino-1.8.5-Edison_help_files-1.6.2.zip 3321743 BLAKE2B 5d760ba329741cac27253fb439cf98381c0c0d7327f0c22f61cffc23c48d655278280185e5a7f6c85f3d182cacad4626eb9fe6cc2aaf7d2965bb377e2f39bbaa SHA512 63d4005036b43f09347814433578e8c75a7af5caa0923516deab146ef0867af4e60aad0c9d5d47870dcec0ddb4e5396363e4312425f95a8d8da8725f77da8f3a
@@ -24,9 +21,5 @@ DIST arduino-1.8.5-Temboo-1.2.1.zip 187499 BLAKE2B 4f26317b21492697fa3bbce1fe2cd
 DIST arduino-1.8.5-WiFi101-Updater-ArduinoIDE-Plugin-0.9.1.zip 703748 BLAKE2B be9a0e2ac5a890121a0ef59700ee9a001711d7357d1c9aedfac7ca8593ed6bdef32219a88003846d4a793a532a3ebb47cde28dbe4c93dbeef8567ad6fb36bf00 SHA512 f107e5ee544450cc7cabfc7eb43462d374a59446418b5ce3a9f3eb545b03fe6383f42e79eb6919fb4b6e621902cbb84f4fa7119f23b51aa770ebd020ffffdee9
 DIST arduino-1.8.5-reference-1.6.6-3.zip 7004842 BLAKE2B 49d0d41fb499c15f06c8cb8d8211e5039ee9843a6629f305762b262a5bf199e4bbe7fea4716b7734403dc7e83ce35a963035b3a2c0d6a198a4218e7472b18d74 SHA512 65962322b6dcb15da6c119d47c382052d1183772c855b8e8fcdd108b54e730e2374d93741737f3b51e57288a0e8842a6a7f79dce4377ea3630293e6c3e7e8b73
 DIST arduino-1.8.5.tar.gz 48219839 BLAKE2B b031ccd601c42adce0ef06b69bd6103996d7a2a29a4640ab2518bb607e17d90524e1f7dc9861c096df90b0f0a439c5ee8867912b53cb925309dd7e0f6ddf3b54 SHA512 f01b0401edc7ea5d58cb475776b816d05f289060613dd452ca71ecaf4a3a95c5e9ddb5f2cf06d3c165e9e0540c895f9eaea896a7974c88834de569944c4adbd2
-DIST arduino-icons.tar.bz2 58775 BLAKE2B 20f230394a8d725eaf7300f66105b09b31eb96aad8798f325d9e5eec6a1aec8319deb561d1b76d47d08dc6663ec11b6b991e057b88d6619c16a80cf0e10959e1 SHA512 b750e79d6117f5df619f2b765dad6e64f0ba4aa3314b0b6e00801577e3ea1f15951ba15efe7a00f5317285a19ac29ac41c78b71342f45cd164c794a42bafcdd9
-DIST arduino-src-1.0.5.tar.gz 235284641 BLAKE2B 7e7ed1305be468dff5ee32238e51b56c214bb993531c67a5ed178a267b5ff8b0f5303aa2a539b64ac40b20278d0206513c3b26f74dd9120058d97fabbbafef27 SHA512 0a40203b8a31c4d9288500962ada7f5083c280a84d8c56ab7da2d1326e1c02a908a96db589ab10bafc115abefe010bf23f6994c08e43c86a4ac10c2d4ab93ec2
-EBUILD arduino-1.0.5-r1.ebuild 2583 BLAKE2B 78d8ff706d0bdeb6bcede5a70b8eabf862a91f38bb994218924ad01f6174bd181891e8d9e0237b3d2b8564ef519956f32393c6b61a161714ebf22b4f0181e1ea SHA512 40d26584bb9ac446fd29831774e476d984a900004128618883e161c1d2d39c185c2a4e8e34a66c961b2d8905186d67806a844d792f42d1b52c34eb840ea0badb
-EBUILD arduino-1.0.5-r2.ebuild 2602 BLAKE2B 1d32d6ad9581d02f2ba8d8844a19360d855a2ff1d1487898e77ad1b76e87679b8879cc928e0c30e362b22564fc9312b7c55e774f69f92d3bc0a22e18046336ae SHA512 c4a1a0d4ceafc9693c105995a0fae9696e9ed23c677588d9eee9ed25ecd43a011bfab27945201c89685dd3586607a33680ef938a37cc20bf0653c9d373f5b2d7
-EBUILD arduino-1.8.5-r2.ebuild 5053 BLAKE2B de8c70974d012e9fbf457e926d506b84a1069c1fe76358542139751dff7b7988e72f22da964db2e5b9ba9f7a4dc7170e9e72afee7a3bf76a297ce300b05c2ae3 SHA512 1600d9455ec9ad2065d4589806ca6ecbd0ccd3dd2e814e32d19b8fa3749156fe7e1f9c38710d72302dc4fbb303388e9b22d7af70ac825ddb248965a1a5e16657
+EBUILD arduino-1.8.5-r2.ebuild 5052 BLAKE2B 1a5030bbbf97a84b23895770cb26dfd1aeaca126ff87d295cd96664955f15704a52585de0cfb09e35741e8a21ddef1cf9fa33ed2fe112f435fcecc001562dfb6 SHA512 43d670b61383637d7da05b3619a941823c3b786c348c8290e55649e390bdb12a664770588267e8cb55a8d96b8de272c6694295ba1fab0e8eda7db4aa1ac1e5bc
 MISC metadata.xml 331 BLAKE2B 5449a181e8d470cb80c1a32d50e79c9f912117df14673adc2d1d989f037b1fd89c8bb4a263b4a883e30ab034e0e1ef1e82f54fa9134511755f9ccd62acff9af9 SHA512 6966c4f97ca07b9ef925691abe06e3110d9901cf15fbc7ed07c5ac65dbe583d346186961f64fba71ff796b5d6ff187870b8db41b3f1836b3fefbcc3e54c7ba4e
diff --git a/dev-embedded/arduino/arduino-1.0.5-r1.ebuild b/dev-embedded/arduino/arduino-1.0.5-r1.ebuild
deleted file mode 100644
index 6dde62efe0a9..000000000000
--- a/dev-embedded/arduino/arduino-1.0.5-r1.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-JAVA_PKG_IUSE="doc examples"
-
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="An open-source AVR electronics prototyping platform"
-HOMEPAGE="https://arduino.cc/ https://github.com/arduino/"
-SRC_URI="https://${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="amd64 x86"
-RESTRICT="strip binchecks"
-IUSE=""
-
-COMMONDEP="
-dev-java/jna:0
->dev-java/rxtx-2.1:2"
-
-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/${PF}/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-r2.ebuild b/dev-embedded/arduino/arduino-1.0.5-r2.ebuild
deleted file mode 100644
index 7ca3ff607939..000000000000
--- a/dev-embedded/arduino/arduino-1.0.5-r2.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-JAVA_PKG_IUSE="doc examples"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="An open-source AVR electronics prototyping platform"
-HOMEPAGE="https://arduino.cc/ https://github.com/arduino/"
-SRC_URI="
-	https://github.com/arduino/Arduino/archive/${PV}.tar.gz -> arduino-src-${PV}.tar.gz
-	mirror://gentoo/arduino-icons.tar.bz2
-"
-
-LICENSE="GPL-2 GPL-2+ LGPL-2 CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-RESTRICT="strip binchecks"
-
-S="${WORKDIR}/Arduino-${PV}"
-
-CDEPEND="
-	dev-java/jna:0
-	>dev-java/rxtx-2.1:2"
-
-RDEPEND="
-	${CDEPEND}
-	dev-embedded/avrdude
-	dev-embedded/uisp
-	sys-devel/crossdev
-	>=virtual/jre-1.6"
-
-DEPEND="
-	${CDEPEND}
-	>=virtual/jdk-1.6"
-
-EANT_GENTOO_CLASSPATH="jna,rxtx-2"
-EANT_EXTRA_ARGS="-Dversion=${PV}"
-EANT_BUILD_TARGET="build"
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-
-src_prepare() {
-	# Remove the libraries to ensure the system
-	# libraries are used
-	rm -rv \
-		build/linux/dist/tools/avrdude* \
-		build/linux/dist/lib/* \
-		app/lib/* \
-		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 \
-		"${FILESDIR}"/${PN}-1.0.3-script.patch
-
-	default
-}
-
-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/${PF}/examples/
-	fi
-
-	if use doc; then
-		DOCS=( revisions.txt "${S}"/readme.txt )
-		HTML_DOCS=( reference )
-		einstalldocs
-		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.8.5-r2.ebuild b/dev-embedded/arduino/arduino-1.8.5-r2.ebuild
index 1f664fa2853c..f058950e8fcf 100644
--- a/dev-embedded/arduino/arduino-1.8.5-r2.ebuild
+++ b/dev-embedded/arduino/arduino-1.8.5-r2.ebuild
@@ -51,7 +51,7 @@ SRC_URI="https://github.com/arduino/Arduino/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="GPL-2 LGPL-2.1 CC-BY-SA-3.0"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 
 # bincheck RESTRICT is needed because firmware that ships with arduino contains code that makes
 # scanelf bark. It's also why we need a separate package for arduino-listserialportsc because if
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
deleted file mode 100644
index afde2e05b661..000000000000
--- a/dev-embedded/arduino/files/arduino-1.0.1-build.xml.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- 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.3-script.patch b/dev-embedded/arduino/files/arduino-1.0.3-script.patch
deleted file mode 100644
index b4accc8959a1..000000000000
--- a/dev-embedded/arduino/files/arduino-1.0.3-script.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/build/linux/dist/arduino b/build/linux/dist/arduino
-index b5eb9db..3f3b4aa 100644
---- a/build/linux/dist/arduino
-+++ b/build/linux/dist/arduino
-@@ -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
- 
--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}"