From: Amy Liffey <amynka@gentoo.org>
Date: Mon, 16 Apr 2018 15:46:05 +0000 (+0200)
Subject: dev-embedded/arduino: fix java.library.path
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=850599bc368ee18dd3b5e49147b496b6b1b8b57c;p=gentoo.git

dev-embedded/arduino: fix java.library.path

Closes: https://bugs.gentoo.org/650566
Package-Manager: Portage-2.3.24, Repoman-2.3.6
---

diff --git a/dev-embedded/arduino/arduino-1.8.5.ebuild b/dev-embedded/arduino/arduino-1.8.5-r1.ebuild
similarity index 97%
rename from dev-embedded/arduino/arduino-1.8.5.ebuild
rename to dev-embedded/arduino/arduino-1.8.5-r1.ebuild
index 5eb1fe0db93d..1ea4adfe2d4d 100644
--- a/dev-embedded/arduino/arduino-1.8.5.ebuild
+++ b/dev-embedded/arduino/arduino-1.8.5-r1.ebuild
@@ -86,12 +86,12 @@ src_unpack() {
 	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"
+		cp "${DISTDIR}/${P}-${lib[0]}-${lib[1]}.zip" "${S}/${destfolder}/${lib[0]}-${lib[1]}.zip" || die
 	done
 	if use doc; then
 		local docname
 		for docname in "${ARDUINO_DOCS[@]}"; do
-			cp "${DISTDIR}/${P}-${docname}.zip" "${S}/build/shared/${docname}.zip"
+			cp "${DISTDIR}/${P}-${docname}.zip" "${S}/build/shared/${docname}.zip" || die
 		done
 	fi
 }
@@ -122,7 +122,7 @@ src_install() {
 	java-pkg_dolauncher ${PN} \
 		--pwd "${SHARE}" \
 		--main "processing.app.Base" \
-		--java_args "-DAPP_DIR=${SHARE}"
+		--java_args "-DAPP_DIR=${SHARE} -Djava.library.path=${EPREFIX}/usr/$(get_libdir)"
 
 	# Install libraries
 	insinto "${SHARE}"