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
