gentoo resync : 18.11.2018

3 files changed, 155 insertions, 2 deletions

diff --git a/dev-embedded/arduino/Manifest b/dev-embedded/arduino/Manifest
index c25ceb0e293f..c90d21ba415a 100644
--- a/dev-embedded/arduino/Manifest
+++ b/dev-embedded/arduino/Manifest
@@ -1,7 +1,7 @@
 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
+AUX arduino.desktop 196 BLAKE2B f844a6a0c5b9295a61f42ba76e3d11f988cc1186df95acaf376a1710cf4644de84d31cf1846d1c135c7559d23b005429e6f90a4cf59e090fb4d5a160108817eb SHA512 c02376865c1f0cc11f7b985e57f05ce4049bd49645d71294817896059e043a3679199b47e6687cc6db6ca8908c874dfeed6cb9ed083ecce89f001104e37bdc49
 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
@@ -21,5 +21,12 @@ 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-1.8.7.tar.gz 38372798 BLAKE2B a59aac177bb95e17eec7ab85d88cf0a25737f21d4be88458abfd8ffa12f2215b82e2256fc2921a14583b60f51f3144f46d35d19ae83ba6dd726a2a8773839aea SHA512 6676e0a7e0383eb2addbfad05020cb54c1606f6920840c269625e58354fd950b57037f553e3f9661b462dfbb8afb40d6ba7390cbe0c4b96406871279939b5823
+DIST arduino-Edison_help_files-1.6.2.zip 3321743 BLAKE2B 5d760ba329741cac27253fb439cf98381c0c0d7327f0c22f61cffc23c48d655278280185e5a7f6c85f3d182cacad4626eb9fe6cc2aaf7d2965bb377e2f39bbaa SHA512 63d4005036b43f09347814433578e8c75a7af5caa0923516deab146ef0867af4e60aad0c9d5d47870dcec0ddb4e5396363e4312425f95a8d8da8725f77da8f3a
+DIST arduino-Galileo_help_files-1.6.2.zip 4352077 BLAKE2B 16b99a57535ed77cdd69bb60dbb17085edfb2454b81a1b55b46310aa75e797bf784e39fb4642daf281ff92d9ade6f002cf359f98b95fc5225f66e63d189305fa SHA512 411fcfad9e9877078de62c02accd66ed5e44daf2979cad38c12962c22d73412d084670db77d5b50b3a32f35977961943e90d85ac80484f926468aa994f8b107b
+DIST arduino-WiFi101-Updater-ArduinoIDE-Plugin-0.9.2.zip 945515 BLAKE2B a2ab32b400f774f006e1afb69797951382f8768ee55216591baecc8fc0665c31b31df403ffd17825ae524dcd0bcba87bfecbdc82722f9105d68cf9d5c8298415 SHA512 2fd003b638133d9ff77d76952ce4a38c3c2ea78c0c0c849580883e5104c3a5c141313f74934eeda29a446388e3d502e69e65ded088e693b0ff5810a133001ba8
+DIST arduino-avr-1.6.23.tar.bz2 5001988 BLAKE2B 8b6ddc2d66e651a3a2b6bd6992cd1311aad223a6cefa1a1a4bc1fa05de449116511137f8cf13c50ca42b83477c66cf4aa3a7984f49905eb7a295eff7f2c3623e SHA512 70ff70446bfc0f036f7a2927e8e53861e60225a0a6c1eb993557278ec79b8337f3a5ee6fd6f6d200744d80104efb1783332eb8d6d53c9f1b6ea6dc3054d78fd4
+DIST arduino-reference-1.6.6-3.zip 7004842 BLAKE2B 49d0d41fb499c15f06c8cb8d8211e5039ee9843a6629f305762b262a5bf199e4bbe7fea4716b7734403dc7e83ce35a963035b3a2c0d6a198a4218e7472b18d74 SHA512 65962322b6dcb15da6c119d47c382052d1183772c855b8e8fcdd108b54e730e2374d93741737f3b51e57288a0e8842a6a7f79dce4377ea3630293e6c3e7e8b73
 EBUILD arduino-1.8.5-r2.ebuild 5052 BLAKE2B 1a5030bbbf97a84b23895770cb26dfd1aeaca126ff87d295cd96664955f15704a52585de0cfb09e35741e8a21ddef1cf9fa33ed2fe112f435fcecc001562dfb6 SHA512 43d670b61383637d7da05b3619a941823c3b786c348c8290e55649e390bdb12a664770588267e8cb55a8d96b8de272c6694295ba1fab0e8eda7db4aa1ac1e5bc
+EBUILD arduino-1.8.7.ebuild 4685 BLAKE2B 1468fe1960e87f4fe6e7ae40416662bf872de5434dc1165cb92f3161561a27a14337dd217efe8a02e5d19a7c828d1279d533d32b5bcc29e6bccb6d437e1808fc SHA512 1d279214fba31f7bef7062beeec26d4ad0c48aa3d2c320ca21c4cc2e171e2a2c9541a067c3e24d3329fc35203d85c81febd92a0c1dd13ba2fba5883ce524b797
 MISC metadata.xml 331 BLAKE2B 5449a181e8d470cb80c1a32d50e79c9f912117df14673adc2d1d989f037b1fd89c8bb4a263b4a883e30ab034e0e1ef1e82f54fa9134511755f9ccd62acff9af9 SHA512 6966c4f97ca07b9ef925691abe06e3110d9901cf15fbc7ed07c5ac65dbe583d346186961f64fba71ff796b5d6ff187870b8db41b3f1836b3fefbcc3e54c7ba4e
diff --git a/dev-embedded/arduino/arduino-1.8.7.ebuild b/dev-embedded/arduino/arduino-1.8.7.ebuild
new file mode 100644
index 000000000000..60451878c0aa
--- /dev/null
+++ b/dev-embedded/arduino/arduino-1.8.7.ebuild
@@ -0,0 +1,146 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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="https://arduino.cc/ https://github.com/arduino/"
+
+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 -> ${PN}-${docname}.zip"
+done
+
+SRC_URI="https://github.com/arduino/Arduino/archive/${PV}.tar.gz -> ${P}.tar.gz
+	https://downloads.arduino.cc/cores/avr-1.6.23.tar.bz2 -> ${PN}-avr-1.6.23.tar.bz2
+	https://github.com/arduino-libraries/WiFi101-FirmwareUpdater-Plugin/releases/download/v0.9.2/WiFi101-Updater-ArduinoIDE-Plugin-0.9.2.zip -> ${PN}-WiFi101-Updater-ArduinoIDE-Plugin-0.9.2.zip
+	doc? (
+		${ARDUINO_DOCS_URI}
+	)"
+
+LICENSE="GPL-2 LGPL-2.1 CC-BY-SA-3.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+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}
+	app-arch/unzip
+	>=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=" -Dlight_bundle=1 -Dlocal_sources=1 -Dno_arduino_builder=1"
+
+RESTRICT="strip"
+QA_PREBUILT="usr/share/arduino/hardware/arduino/avr/firmwares/*"
+
+S="${WORKDIR}/Arduino-${PV}"
+
+PATCHES=(
+	# We need to load system astyle/listserialportsc instead of bundled ones.
+	"${FILESDIR}/${PN}-1.8.5-lib-loading.patch"
+)
+
+src_unpack() {
+	# We don't want to unpack tools, just move zip files into the work dir
+	unpack `echo ${A} | cut -d ' ' -f1`
+
+	cp "${DISTDIR}/${PN}-avr-1.6.23.tar.bz2" "${S}/build/avr-1.6.23.tar.bz2" || die
+	cp "${DISTDIR}/${PN}-WiFi101-Updater-ArduinoIDE-Plugin-0.9.2.zip" "${S}/build/shared/WiFi101-Updater-ArduinoIDE-Plugin-0.9.2.zip"|| die
+
+	if use doc; then
+		local docname
+		for docname in "${ARDUINO_DOCS[@]}"; do
+			cp "${DISTDIR}/${PN}-${docname}.zip" "${S}/build/shared/${docname}.zip" || die
+		done
+	fi
+}
+
+src_prepare() {
+	default
+
+	# Unbundle libastyle
+	sed -i 's/\(target name="linux-libastyle-[a-zA-Z0-9]*"\)/\1 if="never"/g' "$S/build/build.xml" || die
+
+	# Unbundle avr toolchain
+	sed -i 's/target name="avr-toolchain-bundle" unless="light_bundle"/target name="avr-toolchain-bundle" if="never"/' "$S/build/build.xml" || die
+
+	# Install avr hardware
+	sed -i 's/target name="assemble-hardware" unless="light_bundle"/target name="assemble-hardware"/' "$S/build/build.xml" || die
+}
+
+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
+
+	# We need to replace relative paths for toolchain executable by paths to system ones.
+	sed -i -e 's@^compiler.path=.*@compiler.path=/usr/bin/@' -e 's@^tools.avrdude.path=.*@tools.avrdude.path=/usr@' \
+		-e 's@^tools.avrdude.config.path=.*@tools.avrdude.config.path=/etc/avrdude.conf@' hardware/arduino/avr/platform.txt || die
+
+	java-pkg_dojar lib/*.jar
+	java-pkg_dolauncher ${PN} \
+		--pwd "/usr/share/${PN}" \
+		--main "processing.app.Base" \
+		--java_args "-DAPP_DIR=/usr/share/${PN} -Djava.library.path=${EPREFIX}/usr/$(get_libdir)"
+
+	insinto "/usr/share/${PN}"
+
+	doins -r examples hardware lib 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" "/usr/share/${PN}/hardware/platform.txt"
+	dosym "${EPREFIX}/usr/share/arduino-builder/platform.keys.rewrite.txt" "/usr/share/${PN}/hardware/platform.keys.rewrite.txt"
+	dosym "${EPREFIX}/usr/bin/arduino-builder" "/usr/share/${PN}/arduino-builder"
+
+	# hardware/tools/avr needs to exist or arduino-builder will
+	# complain about missing required -tools arg
+	dodir "/usr/share/${PN}/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/${PF}/html/reference" "/usr/share/${PN}/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.desktop b/dev-embedded/arduino/files/arduino.desktop
index b75dea564b5d..e72bcfcd3c29 100644
--- a/dev-embedded/arduino/files/arduino.desktop
+++ b/dev-embedded/arduino/files/arduino.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Version=1.0
-Name=arduino
+Name=Arduino
 Comment=Open-source electronics prototyping platform
 Exec=arduino
 Icon=arduino