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 5207B1382C5 for ; Wed, 24 Jun 2020 14:10:36 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 70EC7E08E8; Wed, 24 Jun 2020 14:10:35 +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 56C34E08E8 for ; Wed, 24 Jun 2020 14:10:35 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 242CC34EDC6 for ; Wed, 24 Jun 2020 14:10:33 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 44AB3175 for ; Wed, 24 Jun 2020 14:10:17 +0000 (UTC) From: "Keri Harris" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Keri Harris" Message-ID: <1593007786.08278e6cd0b4d9cbb023696822f5fe76c75623d2.keri@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/mozart/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-lang/mozart/mozart-2.0.1.ebuild X-VCS-Directories: dev-lang/mozart/ X-VCS-Committer: keri X-VCS-Committer-Name: Keri Harris X-VCS-Revision: 08278e6cd0b4d9cbb023696822f5fe76c75623d2 X-VCS-Branch: master Date: Wed, 24 Jun 2020 14:10:17 +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: b3731424-1b8a-4e85-82ea-8e005cede60a X-Archives-Hash: 3bce18d47fa4c219f13b4a7dbb81d0bd commit: 08278e6cd0b4d9cbb023696822f5fe76c75623d2 Author: Keri Harris gentoo org> AuthorDate: Wed Jun 24 14:09:46 2020 +0000 Commit: Keri Harris gentoo org> CommitDate: Wed Jun 24 14:09:46 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=08278e6c dev-lang/mozart: pin bootcompiler to scala-2.12 Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Keri Harris gentoo.org> dev-lang/mozart/mozart-2.0.1.ebuild | 11 ++--------- 1 file 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