diff options
| author | Benda Xu <heroxbd@gentoo.org> | 2021-12-26 20:11:08 +0800 |
|---|---|---|
| committer | Benda Xu <heroxbd@gentoo.org> | 2021-12-26 20:14:13 +0800 |
| commit | 6a3d73b110504517e8ad9a2cfd0f2ef7a20b54bf (patch) | |
| tree | 729b8e15986ee222e720aa2014175718a7fe24b6 /dev-lang/scala/scala-2.12.4.ebuild | |
| parent | 8ff07b9cd814449f4f9dee4e60f7060930b79815 (diff) | |
| download | gentoo-6a3d73b110504517e8ad9a2cfd0f2ef7a20b54bf.tar.gz gentoo-6a3d73b110504517e8ad9a2cfd0f2ef7a20b54bf.tar.bz2 gentoo-6a3d73b110504517e8ad9a2cfd0f2ef7a20b54bf.zip | |
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@gentoo.org>
Diffstat (limited to 'dev-lang/scala/scala-2.12.4.ebuild')
| -rw-r--r-- | dev-lang/scala/scala-2.12.4.ebuild | 6 |
1 files changed, 2 insertions, 4 deletions
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 |