summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKeri Harris <keri@gentoo.org>2020-06-24 16:09:46 +0200
committerKeri Harris <keri@gentoo.org>2020-06-24 16:09:46 +0200
commit08278e6cd0b4d9cbb023696822f5fe76c75623d2 (patch)
treed7cdb51289ff66711f219eaea0bad70c27446a3d
parentnet-misc/remmina: bump to 1.4.7, drop old (diff)
downloadgentoo-08278e6cd0b4d9cbb023696822f5fe76c75623d2.tar.gz
gentoo-08278e6cd0b4d9cbb023696822f5fe76c75623d2.tar.bz2
gentoo-08278e6cd0b4d9cbb023696822f5fe76c75623d2.zip
dev-lang/mozart: pin bootcompiler to scala-2.12
Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Keri Harris <keri@gentoo.org>
-rw-r--r--dev-lang/mozart/mozart-2.0.1.ebuild11
1 files changed, 2 insertions, 9 deletions
diff --git a/dev-lang/mozart/mozart-2.0.1.ebuild b/dev-lang/mozart/mozart-2.0.1.ebuild
index ebd5d3b0473..b44def58b10 100644
--- a/dev-lang/mozart/mozart-2.0.1.ebuild
+++ b/dev-lang/mozart/mozart-2.0.1.ebuild
@@ -27,10 +27,7 @@ RDEPEND="dev-libs/boost:=
DEPEND="${RDEPEND}
dev-java/ant-core
>=virtual/jdk-1.8:=
- || (
- dev-lang/scala:2.12
- dev-lang/scala-bin:0
- )
+ dev-lang/scala:2.12
test? ( dev-cpp/gtest:= )"
S="${WORKDIR}/${PN}2-${PV}"
@@ -59,11 +56,7 @@ src_configure() {
}
src_compile() {
- if has_version "dev-lang/scala"; then
- EANT_GENTOO_CLASSPATH="scala:2.12"
- else
- EANT_GENTOO_CLASSPATH="scala-bin"
- fi
+ EANT_GENTOO_CLASSPATH="scala:2.12"
cd "${S}"/bootcompiler
ANT_OPTS="-Xss2M" eant jar