commit:     b668f7b1d0e89f4bd3dda5d22a6b7f0971f2bd70
Author:     tharvik <tharvik <AT> users <DOT> noreply <DOT> github <DOT> com>
AuthorDate: Wed Aug 29 13:54:28 2018 +0000
Commit:     Mark Wright <gienah <AT> gentoo <DOT> org>
CommitDate: Sun Dec 29 06:16:22 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b668f7b1

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 <AT> gentoo.org>

 dev-lang/scala/scala-2.12.4.ebuild | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/dev-lang/scala/scala-2.12.4.ebuild 
b/dev-lang/scala/scala-2.12.4.ebuild
index b36402420d4..1adbeeb8b46 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) 
..."

Reply via email to