From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A1F80138334 for ; Sun, 29 Dec 2019 06:17:36 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 69E83E0A04; Sun, 29 Dec 2019 06:17:34 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 448DCE0A04 for ; Sun, 29 Dec 2019 06:17:34 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D39BE34DCA6 for ; Sun, 29 Dec 2019 06:17:32 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 468A729 for ; Sun, 29 Dec 2019 06:17:30 +0000 (UTC) From: "Mark Wright" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mark Wright" Message-ID: <1577600182.b668f7b1d0e89f4bd3dda5d22a6b7f0971f2bd70.gienah@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/scala/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-lang/scala/scala-2.12.4.ebuild X-VCS-Directories: dev-lang/scala/ X-VCS-Committer: gienah X-VCS-Committer-Name: Mark Wright X-VCS-Revision: b668f7b1d0e89f4bd3dda5d22a6b7f0971f2bd70 X-VCS-Branch: master Date: Sun, 29 Dec 2019 06:17:30 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: b19af2d8-c78e-4012-a493-27708057a7af X-Archives-Hash: 9fa085df24832f5a1aae5eecbec0c264 commit: b668f7b1d0e89f4bd3dda5d22a6b7f0971f2bd70 Author: tharvik users noreply github com> AuthorDate: Wed Aug 29 13:54:28 2018 +0000 Commit: Mark Wright gentoo 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 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) ..."