gentoo resync : 09.03.2018

21 files changed, 504 insertions, 8 deletions

diff --git a/dev-embedded/Manifest.gz b/dev-embedded/Manifest.gz
index 739af173850c..1579d0b462ca 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
new file mode 100644
index 000000000000..d275e2c9bb50
--- /dev/null
+++ b/dev-embedded/arduino-builder/Manifest
@@ -0,0 +1,7 @@
+AUX arduino-builder-1.3.25-platform-paths.patch 982 BLAKE2B 9bc9d1d7cb12fe4f1e0539a2a548bbeb9ecc596e03fd9e7757d2d011e15b72a176095311063f0c58db2572db5912f6fbf8da493a83395f16f806ccd8a1c8de7a SHA512 8a2055cb6fdc0141701db908ca26c390d1f5992234eae5410b828a84972fcb0c2645b4062242064e37118ed20bad75b08fe044110a65a7b10c9662f62c3f44e7
+DIST arduino-builder-1.3.25.tar.gz 206905 BLAKE2B 6770b89607c1563b68a79d34e6e214586106c63a4b3c854b4f85a4b9eb2fc24ce5d4a97c29b0c05c19b6834e103f3c3c574bd8cefed0eb684d8aab7e4c71ee7f SHA512 3740530800f8a3cfe1fe20a91579e6b632b76c2c4ace68c7b178a2d234032d5887abee3d0360c3039f2fec912a0d5cabe948bf930a7d9ea23221625456ad5357
+DIST github.com-go-errors-errors-a41850380601eeb43f4350f7d17c6bbd8944aaf8.tar.gz 7835 BLAKE2B f4092b4ef5ebf996cb3c20183868dbdd154ea7cf02a4fd5a3375a3193e9ccacad08f0b6681b456786524b729ffb8c0b5c8af6ceec630eec22326d0fe1e00eb22 SHA512 b1d5e7c6f30f94f8a41b10d32b7f4ce7de8394f74ede6c14fb1f267a0514b24bc3bc7659c3baf6eacf424cea8451e7e57f5f72acc568342e90a447bd02f3e262
+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 2767 BLAKE2B c8ac8f94cffe79ff009aee2dbcefba7a5e282bde90c58f4254fe9dec7564e8e41fa56c61071f475ae5db660f090134cf7f55a0810b940952c78d9a6402820e0b SHA512 adda2529e4cf3fd8be368d3c026ca52970d5e30be7ec0233108a943715c014dadb4e37be79109b7cfdb6ab5746d83aa353afcddc6f1349475c83a48614f7eebe
+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
new file mode 100644
index 000000000000..0930e5240c01
--- /dev/null
+++ b/dev-embedded/arduino-builder/arduino-builder-1.3.25.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGO_PN="arduino.cc/arduino-builder/..."
+
+EGO_VENDOR=(
+	"github.com/go-errors/errors a41850380601eeb43f4350f7d17c6bbd8944aaf8"
+	"github.com/jstemmer/go-junit-report 833f8ea2b99d36d5f018698333834f3df200a0c2"
+	"github.com/stretchr/testify 1661650f989674e3e5bcdcb805536e5d31481526"
+)
+
+inherit golang-build golang-vcs-snapshot
+
+DESCRIPTION="A command line tool for compiling Arduino sketches"
+HOMEPAGE="https://github.com/arduino/arduino-builder"
+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"
+
+RDEPEND="sys-devel/crossdev
+	dev-embedded/avrdude
+	dev-embedded/arduino-ctags"
+
+DEPEND=">=dev-lang/go-1.9.2"
+
+src_unpack() {
+	golang-vcs-snapshot_src_unpack
+}
+
+src_prepare() {
+	# As we know, golang packages have to be compiled from namespace-aware paths which is the whole
+	# point of the EGO_PN dance. arduino-builder goes a step further by re-creating its own
+	# namespace inside its source package, messing up with our build process which can't find
+	# packages. Also, our source package contains multiple namespaces which further messes with
+	# messes with our vendoring process (each namespace needs its own vendor directory).
+	# We do the following to try to work around this mess. It looks like upstream reworked this
+	# in its master branch so we should be able to remove this in the upcoming major release.
+
+	local deeppath="${S}/src/${EGO_PN%/...}"
+	for pkgname in builder properties timeutils; do
+		ln -s "${deeppath}/src/arduino.cc/${pkgname}" "${S}/src/arduino.cc/${pkgname}"
+	done
+	ln -s "${deeppath}/vendor/github.com" "${S}/src/github.com"
+
+	# path paths so that they point to system ctags and avrdude
+	eapply "${FILESDIR}/arduino-builder-1.3.25-platform-paths.patch"
+
+	default
+}
+
+src_install() {
+	# we unfortunately have to copy/paste the contents of golang-build_src_install() here because
+	# we *don't* want to call golang_install_pkgs() which installs all static libraries we've
+	# built. All we want is to install the final executable.
+
+	set -- env GOPATH="${WORKDIR}/${P}:$(get_golibdir_gopath)" \
+		go install -v -work -x ${EGO_BUILD_FLAGS} "${EGO_PN}"
+	echo "$@"
+	"$@" || die
+
+	# END OF COPY/PASTE
+
+	dobin bin/arduino-builder
+
+	# In addition to the binary, we also want to install these two files below. They are needed by
+	# the dev-embedded/arduino which copies those files in its "hardware" folder.
+	insinto "/usr/share/${PN}"
+	cd "src/arduino.cc/builder/hardware" || die
+	doins "platform.txt"
+	doins "platform.keys.rewrite.txt"
+}
+
+pkg_postinst() {
+	[ ! -x /usr/bin/avr-gcc ] && ewarn "Missing avr-gcc; you need to crossdev -s4 avr"
+}
diff --git a/dev-embedded/arduino-builder/files/arduino-builder-1.3.25-platform-paths.patch b/dev-embedded/arduino-builder/files/arduino-builder-1.3.25-platform-paths.patch
new file mode 100644
index 000000000000..854dc886af01
--- /dev/null
+++ b/dev-embedded/arduino-builder/files/arduino-builder-1.3.25-platform-paths.patch
@@ -0,0 +1,19 @@
+diff --git a/src/arduino.cc/builder/hardware/platform.txt b/src/arduino.cc/builder/hardware/platform.txt
+index ca8df1f..17ce03f 100644
+--- a/src/arduino.cc/arduino-builder/src/arduino.cc/builder/hardware/platform.txt
++++ b/src/arduino.cc/arduino-builder/src/arduino.cc/builder/hardware/platform.txt
+@@ -1,11 +1,11 @@
+ # ctags
+ # ------------------------------
+-tools.ctags.path={runtime.tools.ctags.path}
+-tools.ctags.cmd.path={path}/ctags
++tools.ctags.path=/usr/bin
++tools.ctags.cmd.path={path}/arduino-ctags
+ tools.ctags.pattern="{cmd.path}" -u --language-force=c++ -f - --c++-kinds=svpf --fields=KSTtzns --line-directives "{source_file}"
+ 
+ # additional entries
+-tools.avrdude.path={runtime.tools.avrdude.path}
++tools.avrdude.path=/usr/bin
+ 
+ preproc.macros.flags=-w -x c++ -E -CC
+ #preproc.macros.compatibility_flags={build.mbed_api_include} {build.nRF51822_api_include} {build.ble_api_include} {compiler.libsam.c.flags} {compiler.arm.cmsis.path} {build.variant_system_include}
diff --git a/dev-embedded/arduino-builder/metadata.xml b/dev-embedded/arduino-builder/metadata.xml
new file mode 100644
index 000000000000..c6ee565672f5
--- /dev/null
+++ b/dev-embedded/arduino-builder/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>embedded@gentoo.org</email>
+		<name>Embedded Gentoo</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">arduino/arduino-builder</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-embedded/arduino-ctags/Manifest b/dev-embedded/arduino-ctags/Manifest
new file mode 100644
index 000000000000..7d78925654ef
--- /dev/null
+++ b/dev-embedded/arduino-ctags/Manifest
@@ -0,0 +1,3 @@
+DIST arduino-ctags-20161123.tar.gz 490200 BLAKE2B f51b18a0db420124c5fed2b320c16d9eeb96fce6d0f118cf43a8177f88400daaeb83437c3993353c16b73781961c7476e782e66891582f4b3dc5301c73da64dc SHA512 ae5bde92c3dd0b9a179bc1df998f20312c4ab8b2c9c1840dbe543d23fb4531b9e5524f1399d9922ed9b2de4582bdb74635f7ec576a42c808d152c3fbb84f9687
+EBUILD arduino-ctags-20161123.ebuild 738 BLAKE2B d1819283886e1c211496388632a5573c0f55db9d89b047314acdb4a77eee379e5a488a3a374598dd57a53f246a4753d2cb3bebadcdc619e0105cb078cd324aeb SHA512 5b1e043f0ce8b3472be0f05b1e2601c7822db932d1e5c02fecf5f4cb4b4b3adb3b0d7e3cbb99c8d06123df4c1cabc7538ab5844fcb3102e7573991f2186380a9
+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
new file mode 100644
index 000000000000..e2bcd0810ab1
--- /dev/null
+++ b/dev-embedded/arduino-ctags/arduino-ctags-20161123.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+COMMITHASH="abc8fca7499f44c725122881cd380a88c37abe0e"
+
+DESCRIPTION="Arduino private fork of dev-util/ctags"
+HOMEPAGE="https://github.com/arduino/ctags"
+SRC_URI="https://github.com/arduino/ctags/archive/${COMMITHASH}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+S="${WORKDIR}/ctags-${COMMITHASH}"
+
+src_configure() {
+	econf \
+		--disable-readlib \
+		--disable-etags \
+		--enable-tmpdir="${EPREFIX}"/tmp
+}
+
+src_install() {
+	# This package compiles into a "ctags" executable, but don't want to clash into
+	# actually legitimate ctags implementations.
+	mv ctags arduino-ctags
+	dobin arduino-ctags
+}
diff --git a/dev-embedded/arduino-ctags/metadata.xml b/dev-embedded/arduino-ctags/metadata.xml
new file mode 100644
index 000000000000..6e4776276159
--- /dev/null
+++ b/dev-embedded/arduino-ctags/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>embedded@gentoo.org</email>
+		<name>Embedded Gentoo</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">arduino/ctags</remote-id>
+	</upstream>
+	<longdescription>
+		Arduino's build process includes a preprocessing phase that involves ctags,
+		but not any version of ctags, *Arduino's* ctags, a private fork that
+		Arduino maintains. We can't use dev-util/ctags because it causes Arduino
+		to produce corrupt executables.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-embedded/arduino-listserialportsc/Manifest b/dev-embedded/arduino-listserialportsc/Manifest
new file mode 100644
index 000000000000..f6e45a962543
--- /dev/null
+++ b/dev-embedded/arduino-listserialportsc/Manifest
@@ -0,0 +1,3 @@
+DIST arduino-listserialportsc-1.4.0.tar.gz 5448 BLAKE2B a1b5256c9e9ece7ec4de8b1481b6e20769fe07fd94b73d099922074ff20d251896d992aba1e3680dc7e667ff2897fec05812a07273efe097cf5387a5f0207554 SHA512 0e8bbf1e49fa8705a6d3c28b44043f8d13589b7ebdac245db79ed3826bf56028778fdf721af3cf756cc8ea19e7a2f7e5f19421a105211cf0cd35041ec718c2bb
+EBUILD arduino-listserialportsc-1.4.0.ebuild 1084 BLAKE2B ef42c72dafe3856e1b0c011ec826d086bd8be2ccf840f75c9d87fa84b2db3cdb3cf10169a3991f3976db9b382d0bc76c419905a104515a0d40b0ff37b907017f SHA512 62a756ce74d693b8a656d0c6af8914a3416e7598646e972ff5b722afb182a37ae7058de485c93477e1015142720ec866847b650a8330667a1494e38b20464f1a
+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
new file mode 100644
index 000000000000..940f11233120
--- /dev/null
+++ b/dev-embedded/arduino-listserialportsc/arduino-listserialportsc-1.4.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit java-pkg-2 toolchain-funcs
+
+DESCRIPTION="Arduino helper library to list serial ports"
+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"
+
+RDEPEND=">=dev-libs/libserialport-0.1.1"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/listSerialPortsC-${PV}"
+
+src_compile() {
+	CC=$(tc-getCC)
+	${CC} -Wall -O2 ${CPPFLAGS} ${CFLAGS} -c -o main.o main.c
+	${CC} ${CFLAGS} ${LDFLAGS} main.o -lserialport -o listSerialC
+
+	${CC} \
+		-Wall -O2 ${CPPFLAGS} ${CFLAGS} -fPIC \
+		-I$(java-config-2 -o)/include \
+		-I$(java-config-2 -o)/include/linux \
+		-o jnilib.o -c jnilib.c
+
+	${CC} \
+		${CFLAGS} ${LDFLAGS} \
+		-shared -Wl,-soname,liblistSerialsj.so \
+		jnilib.o -lserialport -o liblistSerialsj.so.${PV}
+}
+
+src_install() {
+	dobin listSerialC
+	dolib liblistSerialsj.so.${PV}
+	dosym liblistSerialsj.so.${PV} /usr/$(get_libdir)/liblistSerialsj.so
+}
diff --git a/dev-embedded/arduino-listserialportsc/metadata.xml b/dev-embedded/arduino-listserialportsc/metadata.xml
new file mode 100644
index 000000000000..f94c4150ebc1
--- /dev/null
+++ b/dev-embedded/arduino-listserialportsc/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>embedded@gentoo.org</email>
+		<name>Embedded Gentoo</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">arduino/listSerialPortsC</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-embedded/arduino/Manifest b/dev-embedded/arduino/Manifest
index b4bd841e954c..d241619a6193 100644
--- a/dev-embedded/arduino/Manifest
+++ b/dev-embedded/arduino/Manifest
@@ -1,9 +1,32 @@
 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
+DIST arduino-1.8.5-Esplora-1.0.4.zip 22985 BLAKE2B 799936d5d57b2f054e0f7daf421e9e8657b0867c8b417f28afbd3630d2a5ec08b844b855a3b003d649856713372b32861e36dc97c9bbe865c6a1ff05eac4a7ab SHA512 10665b20d907d586bbe22345799e989b835aaa188040b269ed2925a7b4990c6fb368f0e5afd6c4bed265f2baafc815839ff7c53b5da4940e5338090f39e9c13b
+DIST arduino-1.8.5-Firmata-2.5.6.zip 194883 BLAKE2B b4df63b0417fddf8e71d55373d387650afe47de59d526a0cf546b159c83f8bdeb6fc10f62cec9e7e2755e77b357708d96550071045166b7d5ac1e29ecad34506 SHA512 95ec24ebc6033d4c54ab47f306df8d6d9ab0a666ab0f0123edf8e48cbd66e8c78ccbbd4ff1a4acc0ab16f83dd04957727386ed6d8034284ceec70a0462894526
+DIST arduino-1.8.5-Galileo_help_files-1.6.2.zip 4352077 BLAKE2B 16b99a57535ed77cdd69bb60dbb17085edfb2454b81a1b55b46310aa75e797bf784e39fb4642daf281ff92d9ade6f002cf359f98b95fc5225f66e63d189305fa SHA512 411fcfad9e9877078de62c02accd66ed5e44daf2979cad38c12962c22d73412d084670db77d5b50b3a32f35977961943e90d85ac80484f926468aa994f8b107b
+DIST arduino-1.8.5-Keyboard-1.0.1.zip 5802 BLAKE2B 2fc6d86d54c28d5c1ec5656188ddc159bd0725a966d782e908f9d9bc18a4fb8aadbc09e182e47e80bd08978537bf92b94acd7f5b68c4eb524f6ec71f5a1a0feb SHA512 583328acb8e771b59f3e5bed02892740bcd840baafe63f12850e2c43ae7d05ad31bcc19c5e591e73ab29165952d2a7669bbd07b234dd3abd4c38ea54baf22eec
+DIST arduino-1.8.5-LiquidCrystal-1.0.7.zip 19035 BLAKE2B 051048c871adc34697a12b95dc178e759895fd118a1a341d123155c2807434c6c5b5327e8e9c040b2916a0f06a81e7b27879692bd5813dfe0b2040497aa5002c SHA512 352cbffeaced5e52d1e2b8f118681ce435425bf87c0d1b6c384d11127f371ebcf4a026a0d0320fc324285f959d76b6a28cadba8e038e337d020beca847fcd985
+DIST arduino-1.8.5-Mouse-1.0.1.zip 4093 BLAKE2B 6c071c0bbbea6233ddb0a8573d0c8fbf45e0e83454522eb3040006da2db6baab86bfc3003e833a10807f25b81dfa1aac091256c5e55b882f7633c15bc9122b9a SHA512 be0edd798cafa327752c2d2906193be81bcd214a0f406aca646c043ee527e1c398bde8636b35710b4d02074f01c398147fe2bab7108626d80b4181c0c40aa313
+DIST arduino-1.8.5-RobotIRremote-2.0.0.zip 22611 BLAKE2B 8e2c0bd5356116ad6773f85ec364704f4c6cfd13dce89ded762b2603d68abf0854c66e32a2f0fad470ee433b7431f7c0a878f5f1fd763a770d936264d212b248 SHA512 ad38f813825137f60610d168d6352c871da6d8a39b4378764d82a997719c07c5c314816d8384e205599fc5da198465ed334a8794e7d477d55685eb8f7672acd4
+DIST arduino-1.8.5-Robot_Control-1.0.4.zip 119715 BLAKE2B dd73fc1608b96fbc52f484ffdb7a0a40659f5b7b24546a922b742d9d9c5ff9b82fed58f352485a5b988a7ceaf3259e5aa387d198eacb17d987a3ea6b1d7449ac SHA512 45f710dfc8084f9fcf1608a67978f72885aff06e2bbbcb2613f4e337df8621b0f952383a71a55198618b145df378a94321bd5be83929be897fdd95b6bb69cfe0
+DIST arduino-1.8.5-Robot_Motor-1.0.3.zip 15106 BLAKE2B 0ece114be5c11c1e77c6a2ee524e8cac957852948cba253edec5a0d471341e059ab111310aa21715527e19de800d309fe15b98d1fa326d538cfafe585f280304 SHA512 92d108cc2ddb64e2580fab2cb3a157efb76c5204256332527c3fff67ebb8e520621cdc178738132d4e9ee9e2bcde99968b8f9d3c97c10f7d153792e57cfad111
+DIST arduino-1.8.5-SD-1.1.1.zip 60981 BLAKE2B ef6f3a7d06d76ff203fd238c91aecfa3135b3e6777d982342b11126e118ca7934228b1bd06bcbd7215bef823658c13f9d361e874c5c2ecee811457abb74c15e7 SHA512 b24c2ac276cb531043665b835a1d372294a34ddc2dda12c117b26e4ff33e31975b880e878b17d5798dc18f106091c3b60b6546a672267cf8937c4b0245a85342
+DIST arduino-1.8.5-Servo-1.1.2.zip 27659 BLAKE2B f8eb68547078fe0ba6da88cb3eacdd25440b7c48a52499951111309b5ca331f4608130a74300a063b24c5e8870a1d003c5179b0e0468bde2791326ba141a1d7d SHA512 ade1d725c071e97dc027bc654a1c4b79d3cd6c75bf45bac9c3dfed394451b1661c2488217562515fbb8e29698c7df66e30f8178cea40c7f82056546aa857e348
+DIST arduino-1.8.5-SpacebrewYun-1.0.1.zip 12100 BLAKE2B 1dd4a244cb22f2d03804694db0c7d8dbbeedac58263e80a127060eecf9980146ffca8776123b71b16068f95fb42a16940226eb4239f8a1147ec9e0a76a195e3a SHA512 ec9f499db57d3f86e8615b1a56ae61781add99e9fe4c38ba9faa85d2f7d61090e345a63e8ba4a189c62650631ea5be5cbf22dfb39920a63873408a55c40ac133
+DIST arduino-1.8.5-Temboo-1.2.1.zip 187499 BLAKE2B 4f26317b21492697fa3bbce1fe2cdb34793bd5a1b1ca139dde286185f6403bfd5807e47ac8cd4fd3a6d33791e4bd00dcfb40d430ea2791c233940d489ebbee04 SHA512 4ce89b50cb93f85416b35dc218ad4d5fe0768032d146780d82f1d5d834a24dd831ecc4f1bcfa26d740643a3a7f297cdcec4d19bbf1216482d592d44dcbe2f27c
+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 2586 BLAKE2B 360d882be25e83554eccea257a9f890b95c521d24869fbdbb7fb12f7397aee1be1fd86beef53816400af6abbe77318271862e12ba2d7cccf0f10a0f1ebb583ba SHA512 75a0da395fb887fa3f6ad9807185447f8d2d0fc4e23512e9582186d7520cf00650ed221f0535777eb61ca23505651019eac28d312fc220d29b93269e3752465d
 EBUILD arduino-1.0.5-r2.ebuild 2601 BLAKE2B 3787b65720669c65aab0a19645dd138469e70ace185d04c277bf97bc49a9ea9045aeea0cead1fa869cca2ae6a9832e2e5143f5bdffa97dbc22f545d0a17ee35e SHA512 effd26cbcbe21ee46672c008ff56b7d1c839814863e4cf0e178fc77f5abb9bdb0ca4fa4c53ee2ddf4d173fb7a19d0bf6b5e5a6d2abebfcc1a231ad10e650635e
-MISC metadata.xml 250 BLAKE2B 4a8e0259fe9ac8cbf52fda405b3ca460d0338a62aa11307fb0c83768c12e1319c423ae5fecc7cddf97fd3571edd657052f0dbcec36bb169d882301a53cabc4a9 SHA512 fc90c73a0b3df6c95e54b9f6d801ff3a67912adccff455f1e9ba558c82d30b12e6313d4cc9cbbce0ad13951d81244266de482b4618b0f6c306606f32005b9612
+EBUILD arduino-1.8.5.ebuild 4850 BLAKE2B ae3d0180537b104157c9f635f53209e48ec162a29526a87f3b308cc838071d93829b142320c756e81da2880d4a1a7a714230be67ea1fabac667e655711d9accf SHA512 0445df1beb6a3fcfec0e1710b71b0ee81b4a6ddd819b2ea3df2ba16f4035184954c85a510b5298752f7d095cff52dd626df500e2995704ca0ac2e62d45df2203
+MISC metadata.xml 331 BLAKE2B 5449a181e8d470cb80c1a32d50e79c9f912117df14673adc2d1d989f037b1fd89c8bb4a263b4a883e30ab034e0e1ef1e82f54fa9134511755f9ccd62acff9af9 SHA512 6966c4f97ca07b9ef925691abe06e3110d9901cf15fbc7ed07c5ac65dbe583d346186961f64fba71ff796b5d6ff187870b8db41b3f1836b3fefbcc3e54c7ba4e
diff --git a/dev-embedded/arduino/arduino-1.8.5.ebuild b/dev-embedded/arduino/arduino-1.8.5.ebuild
new file mode 100644
index 000000000000..789545798dae
--- /dev/null
+++ b/dev-embedded/arduino/arduino-1.8.5.ebuild
@@ -0,0 +1,166 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit java-pkg-2 java-ant-2 gnome2-utils
+
+DESCRIPTION="An open-source AVR electronics prototyping platform"
+HOMEPAGE="http://arduino.cc/"
+
+ARDUINO_LIBRARIES=(
+	"Firmata 2.5.6"
+	"Bridge 1.6.3"
+	"Robot_Control 1.0.4"
+	"Robot_Motor 1.0.3"
+	"RobotIRremote 2.0.0"
+	"SpacebrewYun 1.0.1"
+	"Temboo 1.2.1"
+	"Esplora 1.0.4"
+	"Mouse 1.0.1"
+	"Keyboard 1.0.1"
+	"SD 1.1.1"
+	"Servo 1.1.2"
+	"LiquidCrystal 1.0.7"
+	"Adafruit_CircuitPlayground 1.6.8 https://github.com/Adafruit/Adafruit_CircuitPlayground/archive/1.6.8.zip"
+	"WiFi101-Updater-ArduinoIDE-Plugin 0.9.1 https://github.com/arduino-libraries/WiFi101-FirmwareUpdater-Plugin/releases/download/v0.9.1/WiFi101-Updater-ArduinoIDE-Plugin-0.9.1.zip build/shared/"
+)
+
+for lib in "${ARDUINO_LIBRARIES[@]}"; do
+	lib=( $lib )
+	default_url="https://github.com/arduino-libraries/${lib[0]}/archive/${lib[1]}.zip"
+	url=${lib[2]:-$default_url}
+	ARDUINO_LIBRARIES_URI+=" ${url} -> ${P}-${lib[0]}-${lib[1]}.zip"
+done
+
+ARDUINO_DOCS=(
+	"reference-1.6.6-3"
+	"Galileo_help_files-1.6.2"
+	"Edison_help_files-1.6.2"
+)
+
+for docname in "${ARDUINO_DOCS[@]}"; do
+	ARDUINO_DOCS_URI+=" https://downloads.arduino.cc/${docname}.zip -> ${P}-${docname}.zip"
+done
+
+SRC_URI="https://github.com/arduino/Arduino/archive/${PV}.tar.gz -> ${P}.tar.gz
+	${ARDUINO_LIBRARIES_URI}
+	doc? (
+		${ARDUINO_DOCS_URI}
+	)"
+
+LICENSE="GPL-2 LGPL-2.1 CC-BY-SA-3.0"
+SLOT="0"
+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
+# we install it in the context of this package, we will get QA notices telling us we're doing a
+# bad thing.
+RESTRICT="strip binchecks"
+IUSE="doc"
+
+CDEPEND="dev-embedded/arduino-builder"
+
+RDEPEND="${CDEPEND}
+	>=dev-util/astyle-3.1[java]
+	dev-embedded/arduino-listserialportsc
+	>=virtual/jre-1.8"
+
+DEPEND="${CDEPEND}
+	>=virtual/jdk-1.8"
+
+EANT_BUILD_TARGET="build"
+# don't run the default "javadoc" target, we don't have one.
+EANT_DOC_TARGET=""
+EANT_BUILD_XML="build/build.xml"
+EANT_EXTRA_ARGS="-Dno_arduino_builder=1 -Dlocal_sources=1"
+
+S="${WORKDIR}/Arduino-${PV}"
+SHARE="/usr/share/${PN}"
+
+src_unpack() {
+	# We don't want to unpack libraries, just move zip files into the work dir
+	unpack `echo ${A} | cut -d ' ' -f1`
+	local lib
+	for lib in "${ARDUINO_LIBRARIES[@]}"; do
+		lib=( $lib )
+		local destfolder=${lib[3]:-build/}
+		cp "${DISTDIR}/${P}-${lib[0]}-${lib[1]}.zip" "${S}/${destfolder}/${lib[0]}-${lib[1]}.zip"
+	done
+	if use doc; then
+		local docname
+		for docname in "${ARDUINO_DOCS[@]}"; do
+			cp "${DISTDIR}/${P}-${docname}.zip" "${S}/build/shared/${docname}.zip"
+		done
+	fi
+}
+
+src_prepare() {
+	# We need to disable astyle/listserialportsc and toolchain (avr-gcc, avrdude) bundling.
+	eapply "${FILESDIR}/${PN}-1.8.5-build.xml.patch"
+
+	# We need to replace relative paths for toolchain executable by paths to system ones.
+	eapply "${FILESDIR}/${PN}-1.8.5-avr-platform.txt.patch"
+
+	# We need to load system astyle/listserialportsc instead of bundled ones.
+	eapply "${FILESDIR}/${PN}-1.8.5-lib-loading.patch"
+	default
+}
+
+src_compile() {
+	if ! use doc; then
+		EANT_EXTRA_ARGS+=" -Dno_docs=1"
+	fi
+	java-pkg-2_src_compile
+}
+
+src_install() {
+	cd "${S}"/build/linux/work || die
+
+	java-pkg_dojar lib/*.jar
+	java-pkg_dolauncher ${PN} \
+		--pwd "${SHARE}" \
+		--main "processing.app.Base" \
+		--java_args "-DAPP_DIR=${SHARE}"
+
+	# Install libraries
+	insinto "${SHARE}"
+
+	doins -r examples hardware lib libraries tools
+
+	# In upstream's build process, we copy these fiels below from the bundled arduino-builder.
+	# Here we do the same thing, but from the system arduino-builder.
+	dosym "${EPREFIX}/usr/share/arduino-builder/platform.txt" "${SHARE}/hardware/platform.txt"
+	dosym "${EPREFIX}/usr/share/arduino-builder/platform.keys.rewrite.txt" "${SHARE}/hardware/platform.keys.rewrite.txt"
+	dosym "${EPREFIX}/usr/bin/arduino-builder" "${SHARE}/arduino-builder"
+
+	# hardware/tools/avr needs to exist or arduino-builder will
+	# complain about missing required -tools arg
+	dodir "${SHARE}/hardware/tools/avr"
+
+	if use doc; then
+		HTML_DOCS=( reference )
+		einstalldocs
+
+		# arduino expects its doc in its "main" directory. symlink it.
+		dosym "${EPREFIX}/usr/share/doc/${P}/html/reference" "${SHARE}/reference"
+	fi
+
+	# Install menu and icons
+	domenu "${FILESDIR}/${PN}.desktop"
+	cd lib/icons || die
+	local icondir
+	for icondir in *; do
+		# icondir name is something like "24x24" we want the "24" part
+		local iconsize=`cut -dx -f1 <<< "${icondir}"`
+		newicon -s $iconsize \
+			"${icondir}/apps/arduino.png" \
+			"${PN}.png"
+	done
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	[[ ! -x /usr/bin/avr-g++ ]] && ewarn "Missing avr-g++; you need to crossdev -s4 avr"
+}
diff --git a/dev-embedded/arduino/files/arduino-1.8.5-avr-platform.txt.patch b/dev-embedded/arduino/files/arduino-1.8.5-avr-platform.txt.patch
new file mode 100644
index 000000000000..9903da46dc4a
--- /dev/null
+++ b/dev-embedded/arduino/files/arduino-1.8.5-avr-platform.txt.patch
@@ -0,0 +1,26 @@
+diff --git a/hardware/arduino/avr/platform.txt b/hardware/arduino/avr/platform.txt
+index f7fb447c1..8ae8b73d9 100644
+--- a/hardware/arduino/avr/platform.txt
++++ b/hardware/arduino/avr/platform.txt
+@@ -18,7 +18,7 @@ compiler.warning_flags.more=-Wall
+ compiler.warning_flags.all=-Wall -Wextra
+ 
+ # Default "compiler.path" is correct, change only if you want to override the initial value
+-compiler.path={runtime.tools.avr-gcc.path}/bin/
++compiler.path=/usr/bin/
+ compiler.c.cmd=avr-gcc
+ compiler.c.flags=-c -g -Os {compiler.warning_flags} -std=gnu11 -ffunction-sections -fdata-sections -MMD -flto -fno-fat-lto-objects
+ compiler.c.elf.flags={compiler.warning_flags} -Os -g -flto -fuse-linker-plugin -Wl,--gc-sections
+@@ -91,9 +91,9 @@ recipe.preproc.macros="{compiler.path}{compiler.cpp.cmd}" {compiler.cpp.flags} {
+ # AVR Uploader/Programmers tools
+ # ------------------------------
+ 
+-tools.avrdude.path={runtime.tools.avrdude.path}
+-tools.avrdude.cmd.path={path}/bin/avrdude
+-tools.avrdude.config.path={path}/etc/avrdude.conf
++tools.avrdude.path=/usr
++tools.avrdude.cmd.path=/usr/bin/avrdude
++tools.avrdude.config.path=/etc/avrdude.conf
+ 
+ tools.avrdude.network_cmd={runtime.tools.arduinoOTA.path}/bin/arduinoOTA
+ 
diff --git a/dev-embedded/arduino/files/arduino-1.8.5-build.xml.patch b/dev-embedded/arduino/files/arduino-1.8.5-build.xml.patch
new file mode 100644
index 000000000000..59d796ca5a7a
--- /dev/null
+++ b/dev-embedded/arduino/files/arduino-1.8.5-build.xml.patch
@@ -0,0 +1,31 @@
+diff --git a/build/build.xml b/build/build.xml
+index d95f8def6..13ba60286 100644
+--- a/build/build.xml
++++ b/build/build.xml
+@@ -641,7 +641,7 @@
+     </chmod>
+   </target>
+ 
+-  <target name="linux-libastyle-x86" depends="linux-build" description="Download libastyle.so for x86/x64 arch">
++  <target name="linux-libastyle-x86" depends="linux-build" description="Download libastyle.so for x86/x64 arch" if="never">
+     <antcall target="unzip">
+       <param name="archive_file" value="./libastylej-2.05.1-3.zip" />
+       <param name="archive_url" value="https://downloads.arduino.cc/libastylej-2.05.1-3.zip" />
+@@ -666,7 +666,7 @@
+ 
+   </target>
+ 
+-  <target name="linux-libastyle-arm" depends="linux-build" description="Download libastyle.so for ARM">
++  <target name="linux-libastyle-arm" depends="linux-build" description="Download libastyle.so for ARM" if="never">
+     <antcall target="unzip">
+       <param name="archive_file" value="./libastylej-2.05.1-3.zip" />
+       <param name="archive_url" value="https://downloads.arduino.cc/libastylej-2.05.1-3.zip" />
+@@ -1186,7 +1186,7 @@
+ 	  depends="linux-clean, windows-clean, macosx-clean, subprojects-clean">
+   </target>
+ 
+-  <target name="avr-toolchain-bundle" unless="light_bundle">
++  <target name="avr-toolchain-bundle" if="never">
+     <!-- Unzip AVR tools -->
+     <mkdir dir="${staging_folder}/work/${staging_hardware_folder}/tmp/gcc"/>
+ 
diff --git a/dev-embedded/arduino/files/arduino-1.8.5-lib-loading.patch b/dev-embedded/arduino/files/arduino-1.8.5-lib-loading.patch
new file mode 100644
index 000000000000..d2516aeb7357
--- /dev/null
+++ b/dev-embedded/arduino/files/arduino-1.8.5-lib-loading.patch
@@ -0,0 +1,26 @@
+diff --git a/app/src/cc/arduino/packages/formatter/AStyleInterface.java b/app/src/cc/arduino/packages/formatter/AStyleInterface.java
+index 4224bf164..fa92506ba 100644
+--- a/app/src/cc/arduino/packages/formatter/AStyleInterface.java
++++ b/app/src/cc/arduino/packages/formatter/AStyleInterface.java
+@@ -41,7 +41,7 @@ public class AStyleInterface {
+       loadLib(Base.getContentFile(System.mapLibraryName("msvcp100")));
+       loadLib(Base.getContentFile(System.mapLibraryName("msvcr100")));
+     }
+-    loadLib(new File(Base.getContentFile("lib"), System.mapLibraryName("astylej")));
++    System.loadLibrary("astylej");
+   }
+ 
+   private static void loadLib(File lib) {
+diff --git a/arduino-core/src/processing/app/Platform.java b/arduino-core/src/processing/app/Platform.java
+index 28a7ba0f5..8a943a8ac 100644
+--- a/arduino-core/src/processing/app/Platform.java
++++ b/arduino-core/src/processing/app/Platform.java
+@@ -154,7 +154,7 @@ public class Platform {
+   }
+ 
+   static {
+-    loadLib(new File(BaseNoGui.getContentFile("lib"), System.mapLibraryName("listSerialsj")));
++    System.loadLibrary("listSerialsj");
+   }
+ 
+   private static void loadLib(File lib) {
diff --git a/dev-embedded/arduino/metadata.xml b/dev-embedded/arduino/metadata.xml
index e3a5ffc7112d..02101dbf5664 100644
--- a/dev-embedded/arduino/metadata.xml
+++ b/dev-embedded/arduino/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
+	<maintainer type="project">
 		<email>embedded@gentoo.org</email>
 		<name>Embedded Gentoo</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">arduino/Arduino</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-embedded/libftdi/Manifest b/dev-embedded/libftdi/Manifest
index bd08bfb98df8..4d1f6e8acb0e 100644
--- a/dev-embedded/libftdi/Manifest
+++ b/dev-embedded/libftdi/Manifest
@@ -4,7 +4,7 @@ DIST libftdi-0.19.tar.gz 406671 BLAKE2B 47979967d8597584e46a5d9297ed24454d058386
 DIST libftdi-0.20.tar.gz 423570 BLAKE2B f0aa420a704e18c4257b99a4593dbaf46a15806d980b24909fe8678b36e74b568cd5915db1e14f8b904541334fbf3d18f069dc479a0bf66b2ea8e113611cb82b SHA512 540e5eb201a65936c3dbabff70c251deba1615874b11ff27c5ca16c39d71c150cf61758a68b541135a444fe32ab403b0fba0daf55c587647aaf9b3f400f1dee7
 DIST libftdi1-1.2.tar.bz2 100672 BLAKE2B 314ee2695324bc3f6adad56d7ff8fddabfb86714a689ee309afc6aa8498a19fc55d2ea8f4edf0c378d944494505def3faabf1d9c3bb98e6c228526c392d26f09 SHA512 d175e2b39dda880653a2e46db67e49a8921095e69eff6598159c3c31292d4ce76617c2f1617fd6727b08c930fcea335d8ef01857debbb60e7ac384b516d38a05
 EBUILD libftdi-0.19.ebuild 1235 BLAKE2B 2c76a4080ad380355b24c9f2fe1c40ece41e80f8fad57c5c93233c9c13feabe1370263bda92f1ab55124bf0881b4bdb85bc5dcf20d8f52abb8c8b854fbd17e96 SHA512 35b81492bacdcf1ddf9fd8d2aea8e9149a83264d9da2cd524e7ff90497fbfd5132e17c47a5105ca73c26dc7f5826d4b4d81413d65169194bea6d1a1ac38791f4
-EBUILD libftdi-0.20-r1.ebuild 1834 BLAKE2B 048da8d61f6959bf6cb91f86ea573a44a912152c4703be5a8326970e7bec93fdb010d1abf001b4b6b749d06b65a9e9f8358db19b790916fa355cf8536e9a3713 SHA512 3ce94d14f19e250c1ecff203f4be72a96438ce473d308f291f485338c3bddfe54b6d78362cc9f95108b8f750ec15fcfbb6d69ac4f9eb9692a9f5c55e5135e5e7
+EBUILD libftdi-0.20-r1.ebuild 1833 BLAKE2B b8d947e90f2415fff248860856bc1090a6acfee06b688633f7de70e0b631fd0b83a3ffe960bf350ea9495812efeff9b07e091bd79b5951c494f967c97501066b SHA512 75bc5fae60b08c3f89ba21c9e1744097820a838ef155de862d6c1014e27453e6d3fb7105379b2b6d54b5b62783c5e109e7b4d5989cb3a8e1c86e9cc73258cac7
 EBUILD libftdi-1.2-r1.ebuild 1717 BLAKE2B fa33c5993b734ae0eddbd87e3bf098d392ae8e808608ba435713b94bc77323aed77a26c8eed13a4578966a3723b780633bae9c40cc1d644a2c35f683a201421c SHA512 fd235ee3c492ca0a119ff616719f29776637e09362c0c14b64be3eb8dbabd6cd763b05ffc8bdce64d736e198d78cabd905987eb72c1bc492f029aae3f6ae3eb3
 EBUILD libftdi-1.2-r2.ebuild 1726 BLAKE2B 0e6e2388f983b5fccf8a3d41623af1a70d7e0d4277a3c5faf6094a5c88577a0448e37974e47d0a6cca5bd4a72db7ac9cabc9b10544d949d2bebc4c6a00e53cba SHA512 78cfe7cefbe23f4f43cfec20fc134a80e2ebaebcde99c7e7fe2612a2da245523dd7d63630ca022027addcf3144ac3f796be7d1af621ac70789d2d8856f16ee72
 EBUILD libftdi-9999.ebuild 1726 BLAKE2B 0e6e2388f983b5fccf8a3d41623af1a70d7e0d4277a3c5faf6094a5c88577a0448e37974e47d0a6cca5bd4a72db7ac9cabc9b10544d949d2bebc4c6a00e53cba SHA512 78cfe7cefbe23f4f43cfec20fc134a80e2ebaebcde99c7e7fe2612a2da245523dd7d63630ca022027addcf3144ac3f796be7d1af621ac70789d2d8856f16ee72
diff --git a/dev-embedded/libftdi/libftdi-0.20-r1.ebuild b/dev-embedded/libftdi/libftdi-0.20-r1.ebuild
index 8aed5262ba38..8b1f4b321a31 100644
--- a/dev-embedded/libftdi/libftdi-0.20-r1.ebuild
+++ b/dev-embedded/libftdi/libftdi-0.20-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ if [[ ${PV} == 9999* ]] ; then
 	EGIT_REPO_URI="git://developer.intra2net.com/${PN}"
 else
 	SRC_URI="http://www.intra2net.com/en/developer/${PN}/download/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
 fi
 
 DESCRIPTION="Userspace access to FTDI USB interface chips"
diff --git a/dev-embedded/sdcc/Manifest b/dev-embedded/sdcc/Manifest
index 1a63fc665dc8..04dea22177b3 100644
--- a/dev-embedded/sdcc/Manifest
+++ b/dev-embedded/sdcc/Manifest
@@ -21,6 +21,6 @@ EBUILD sdcc-2.6.0.ebuild 1465 BLAKE2B 7b47c6668de2f5bece895dd0c2e6b7eb624887546b
 EBUILD sdcc-2.7.0.ebuild 1467 BLAKE2B fe5a3540373206e3c54ff5bc2cf38eda48b252f0d8264c74976659ea91597c2d1001cda5d468712f2d2651315e3b670b2fbc4d826b708c856029a7ae6020106f SHA512 8ab29dfdc92659ed01b6d5af04fa2927a35431cc7e8d9da7537dd40ca76a9d89436983daffd9f2dbf5c62fee7a8de200fe8d12e7a47f5d8c22a029a25ca6a4de
 EBUILD sdcc-2.8.0.ebuild 1977 BLAKE2B 77a88a395904699ed4a4524b6129bb92456edb122c4ae02254792ff9197b4518069c234b8268ef14f71f6be491b1df98d018258014797f52ace34e27abad7f26 SHA512 2128c11830f2bf44d8253e7789dc878a5d8a460ebc9fa183546341e2c4a981d53ffc7347291e24a904e5a0d1496a8121c754044a19496ee96491e5d928807770
 EBUILD sdcc-2.9.0.ebuild 2276 BLAKE2B ad2681008a03377a635bc2a57ee62092fbe87abf892a4085963463c350446cfb94b61629db6c15746dd2b99b37aaf634917ce0bc33cbaddcf2fd1bea249cf25f SHA512 3ff736235eb8a598c75b2a8f2f879cab5de688f93b31f268892c73783bbeae5c3401cf46849da5fad2e58164c840a31c79cf6eccd9b19637c04c0f304b396241
-EBUILD sdcc-3.5.0.ebuild 3270 BLAKE2B a7399016681d44402b2f27a3d8c7896fb0cbda697d7f485cffaceaa1a42a2f627fbf3fc3dc9a18fe61e1d3e0584a1a8c2d6e4c17beed013917110cc8a6de2922 SHA512 d5531e3c609ebae96ed558de4afe6292179b4c2fa30034203667ece95e7673f04d4d8ea303e521f96b888943bf085ba9ac125a9520a31f2c649f232fb9d3349c
+EBUILD sdcc-3.5.0.ebuild 3269 BLAKE2B 318b78141f56cc293accc5f96f37b6da5f6bfb148bda03f9e238b0ef16bc2ef56ecf9b5133b2bfa9ba83cccc8a64e9a3f6bf28e5db7db884f21b85743dabe9e4 SHA512 218350fdc6f5137c3a62ec665cb6bb4922c5c8df28fd6d751ba54fc64d765de896cc4dc5f0c3dd79f74e9c828e82204fa8360e0ae413f002fabdb0488b0bb9a0
 EBUILD sdcc-9999.ebuild 3270 BLAKE2B a7399016681d44402b2f27a3d8c7896fb0cbda697d7f485cffaceaa1a42a2f627fbf3fc3dc9a18fe61e1d3e0584a1a8c2d6e4c17beed013917110cc8a6de2922 SHA512 d5531e3c609ebae96ed558de4afe6292179b4c2fa30034203667ece95e7673f04d4d8ea303e521f96b888943bf085ba9ac125a9520a31f2c649f232fb9d3349c
 MISC metadata.xml 2212 BLAKE2B 23e83037b2a6e932760e7f0eafdd34230c035dd5a5833335db0ea9c4c1e04e62e69a920e2c2f3492d45ddc014c76450ad05b4d7794d66cca261e294ac20555a0 SHA512 4af2667ae3006548904e9e13894a49c277744d6876e0a99c99e8ea2e89c9e3fc277cf851ae0856b3c3b64f41ef7fd7c255f1bb4f9f42de8917aad7c59e25a0f0
diff --git a/dev-embedded/sdcc/sdcc-3.5.0.ebuild b/dev-embedded/sdcc/sdcc-3.5.0.ebuild
index fdc35714a019..9dbabaed2ff6 100644
--- a/dev-embedded/sdcc/sdcc-3.5.0.ebuild
+++ b/dev-embedded/sdcc/sdcc-3.5.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -12,7 +12,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	SRC_URI="mirror://sourceforge/sdcc/${PN}-src-${PV}.tar.bz2
 		doc? ( mirror://sourceforge/sdcc/${PN}-doc-${PV}.tar.bz2 )"
-	KEYWORDS="~amd64 ~ppc ~x86"
+	KEYWORDS="amd64 ~ppc ~x86"
 	docs_compile() { return 1; }
 fi