From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1352842-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256)
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 8073B158086
for <garchives@archives.gentoo.org>; Sun, 26 Dec 2021 12:14:44 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 20E60E081E;
Sun, 26 Dec 2021 12:14:42 +0000 (UTC)
Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 3E325E081E
for <gentoo-commits@lists.gentoo.org>; Sun, 26 Dec 2021 12:14:41 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 569FE342F05
for <gentoo-commits@lists.gentoo.org>; Sun, 26 Dec 2021 12:14:39 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id AF218233
for <gentoo-commits@lists.gentoo.org>; Sun, 26 Dec 2021 12:14:37 +0000 (UTC)
From: "Benda XU" <heroxbd@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Benda XU" <heroxbd@gentoo.org>
Message-ID: <1640520853.6a3d73b110504517e8ad9a2cfd0f2ef7a20b54bf.heroxbd@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.10.ebuild dev-lang/scala/scala-2.12.4.ebuild
X-VCS-Directories: dev-lang/scala/
X-VCS-Committer: heroxbd
X-VCS-Committer-Name: Benda XU
X-VCS-Revision: 6a3d73b110504517e8ad9a2cfd0f2ef7a20b54bf
X-VCS-Branch: master
Date: Sun, 26 Dec 2021 12:14:37 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 4e7b479e-b06c-4922-a643-31a57d710aed
X-Archives-Hash: 233962c0683e71ec279e17b108c10054
commit: 6a3d73b110504517e8ad9a2cfd0f2ef7a20b54bf
Author: Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 26 12:11:08 2021 +0000
Commit: Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Sun Dec 26 12:14:13 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a3d73b1
dev-lang/scala: reorganize DEPEND to let it build.
virtual/jdk dependences is conditional on The USE=binary switch. For
scala-2.12.4, "=1.8" jdk version is a subset of >=1.8, USE=binary
dependence is unconditional. Likewise for 2.12.10, USE=-binary is also
unconditional.
This circumvents the bug in java-config for not parsing "!binary( )"
structures correctly.
Reference: https://gitweb.gentoo.org/proj/java-config.git/commit/?id=d9ac25402fa9ff918e1f1da4e3e0d97281e437c4
Credits: Murph, Zhixu Liu, Ivan J.
Reported-by: WGH
Closes: https://bugs.gentoo.org/754393
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Benda Xu <heroxbd <AT> gentoo.org>
dev-lang/scala/scala-2.12.10.ebuild | 7 ++-----
dev-lang/scala/scala-2.12.4.ebuild | 6 ++----
2 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/dev-lang/scala/scala-2.12.10.ebuild b/dev-lang/scala/scala-2.12.10.ebuild
index 466ca0b73817..55b8c7fa565a 100644
--- a/dev-lang/scala/scala-2.12.10.ebuild
+++ b/dev-lang/scala/scala-2.12.10.ebuild
@@ -57,13 +57,10 @@ COMMON_DEP="dev-java/ant-core:0
DEPEND="${COMMON_DEP}
!binary? (
- >=virtual/jdk-1.8:*
>=dev-java/sbt-${SBTV}:0
media-gfx/graphviz
)
- binary? (
- >=virtual/jdk-1.8:*
- )
+ >=virtual/jdk-1.8:*
app-arch/xz-utils:0"
RDEPEND="${COMMON_DEP}
@@ -130,7 +127,7 @@ src_prepare() {
gjl_package=sbt
gjl_jar="sbt-launch.jar"
gjl_java_args="-Dsbt.version=${SBT_PVR} -Xms512M -Xmx1536M -Xss1M -XX:+CMSClassUnloadingEnabled -Duser.home="${WORKDIR}""
- source /usr/share/java-config-2/launcher/launcher.bash
+ source "${EPREFIX}"/usr/share/java-config-2/launcher/launcher.bash
EOF
chmod u+x "${S}/sbt" || die
diff --git a/dev-lang/scala/scala-2.12.4.ebuild b/dev-lang/scala/scala-2.12.4.ebuild
index 99b7b67f1135..fc66541405ac 100644
--- a/dev-lang/scala/scala-2.12.4.ebuild
+++ b/dev-lang/scala/scala-2.12.4.ebuild
@@ -83,9 +83,7 @@ DEPEND="${COMMON_DEP}
>=dev-java/sbt-0.13.13
media-gfx/graphviz
)
- binary? (
- >=virtual/jdk-1.8
- )
+ >=virtual/jdk-1.8
app-arch/xz-utils:0"
RDEPEND="${COMMON_DEP}
@@ -146,7 +144,7 @@ src_prepare() {
gjl_package=sbt
gjl_jar="sbt-launch.jar"
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
+ source "${EPREFIX}"/usr/share/java-config-2/launcher/launcher.bash
EOF
chmod u+x "${S}/sbt" || die