From: tharvik <tharvik@users.noreply.github.com>
Date: Wed, 29 Aug 2018 13:54:28 +0000 (+0200)
Subject: dev-lang/scala: fix compile's encoding
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b668f7b1d0e89f4bd3dda5d22a6b7f0971f2bd70;p=gentoo.git

dev-lang/scala: fix compile's encoding

Closes: https://bugs.gentoo.org/664866
Closes: https://github.com/gentoo/gentoo/pull/9732

Signed-off-by: Mark Wright <gienah@gentoo.org>
---

diff --git a/dev-lang/scala/scala-2.12.4.ebuild b/dev-lang/scala/scala-2.12.4.ebuild
index b36402420d49..1adbeeb8b465 100644
--- a/dev-lang/scala/scala-2.12.4.ebuild
+++ b/dev-lang/scala/scala-2.12.4.ebuild
@@ -145,7 +145,7 @@ src_prepare() {
 			#!/bin/bash
 			gjl_package=sbt
 			gjl_jar="sbt-launch.jar"
-			gjl_java_args="-Dsbt.version=0.13.13 -Xms512M -Xmx1536M -Xss1M -XX:+CMSClassUnloadingEnabled -Duser.home="${WORKDIR}""
+			gjl_java_args="-Dsbt.version=0.13.13 -Dfile.encoding=UTF8 -Xms512M -Xmx1536M -Xss1M -XX:+CMSClassUnloadingEnabled -Duser.home="${WORKDIR}""
 			source /usr/share/java-config-2/launcher/launcher.bash
 		EOF
 		chmod u+x "${S}/sbt" || die
@@ -161,7 +161,6 @@ src_prepare() {
 src_compile() {
 	if ! use binary; then
 		export PATH="${EROOT}usr/share/scala-${SV}/bin:${WORKDIR}/${L_P}:${PATH}"
-		export LANG="en_US.UTF-8"
 		einfo "=== scala compile ..."
 		"${S}"/sbt -Dsbt.log.noformat=true compile || die "sbt compile failed"
 		einfo "=== sbt publishLocal with jdk $(java-pkg_get-vm-version) ..."