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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id DED12158064 for ; Tue, 30 Apr 2024 08:15:42 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 99106E2A05; Tue, 30 Apr 2024 08:15:41 +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 7F1DCE2A05 for ; Tue, 30 Apr 2024 08:15:41 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 53627343092 for ; Tue, 30 Apr 2024 08:15:40 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 91E50179A for ; Tue, 30 Apr 2024 08:15:38 +0000 (UTC) From: "Florian Schmaus" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Florian Schmaus" Message-ID: <1714464920.907e8457f31775648ccee6eb0f03277ea9b00799.flow@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-r1.ebuild dev-lang/scala/scala-2.12.10.ebuild X-VCS-Directories: dev-lang/scala/ X-VCS-Committer: flow X-VCS-Committer-Name: Florian Schmaus X-VCS-Revision: 907e8457f31775648ccee6eb0f03277ea9b00799 X-VCS-Branch: master Date: Tue, 30 Apr 2024 08:15:38 +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: a3a2d061-038e-478b-b21e-868ca34de81a X-Archives-Hash: fa28315a5aaf7449589dcdbe2e00ab8a commit: 907e8457f31775648ccee6eb0f03277ea9b00799 Author: Volkmar W. Pogatzki pogatzki net> AuthorDate: Fri Apr 26 13:03:19 2024 +0000 Commit: Florian Schmaus gentoo org> CommitDate: Tue Apr 30 08:15:20 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=907e8457 dev-lang/scala: fix compilation errors - Replaces ${SBT_PVR} with ${SBTV} for #904316 - Restricts to <=virtual/jdk-17:* for #854717 - Switches from ant-core to >=dev-java/ant-1.10.14-r3 - Updates EAPI 7 -> 8 Closes: https://bugs.gentoo.org/854717 Closes: https://bugs.gentoo.org/904316 Signed-off-by: Volkmar W. Pogatzki pogatzki.net> Closes: https://github.com/gentoo/gentoo/pull/36474 Signed-off-by: Florian Schmaus gentoo.org> .../{scala-2.12.10.ebuild => scala-2.12.10-r1.ebuild} | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/dev-lang/scala/scala-2.12.10.ebuild b/dev-lang/scala/scala-2.12.10-r1.ebuild similarity index 90% rename from dev-lang/scala/scala-2.12.10.ebuild rename to dev-lang/scala/scala-2.12.10-r1.ebuild index dc6558800069..3ce6719026ac 100644 --- a/dev-lang/scala/scala-2.12.10.ebuild +++ b/dev-lang/scala/scala-2.12.10-r1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="7" +EAPI=8 JAVA_PKG_IUSE="doc source" @@ -52,7 +52,7 @@ KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux" IUSE="binary emacs" -COMMON_DEP="dev-java/ant-core:0 +COMMON_DEP=">=dev-java/ant-1.10.14-r3:0 dev-java/jline:2" DEPEND="${COMMON_DEP} @@ -60,7 +60,7 @@ DEPEND="${COMMON_DEP} >=dev-java/sbt-${SBTV}:0 media-gfx/graphviz ) - >=virtual/jdk-1.8:* + <=virtual/jdk-17:* app-arch/xz-utils:0" RDEPEND="${COMMON_DEP} @@ -100,7 +100,7 @@ src_unpack() { } src_prepare() { - java-pkg_getjars ant-core,jline-2,sbt + java-pkg_getjars ant,jline-2,sbt if ! use binary; then local a @@ -117,16 +117,11 @@ src_prepare() { # gentoo patch (by gienah) to stop it calling git log in the build eapply "${FILESDIR}/${PN}-2.12.10-no-git.patch" - local SBT_PVR="$(java-config --query=PVR --package=sbt)" - sed -e "s@sbt.version=${SBTV}@sbt.version=${SBT_PVR}@" \ - -i "${S}/project/build.properties" \ - || die "Could not set sbt.version=${SBT_PVR} in project/build.properties" - cat <<- EOF > "${S}/sbt" #!/bin/bash gjl_package=sbt gjl_jar="sbt-launch.jar" - gjl_java_args="-Dsbt.version=${SBT_PVR} -Xms512M -Xmx1536M -Xss1M -XX:+CMSClassUnloadingEnabled -Duser.home="${WORKDIR}"" + gjl_java_args="-Dsbt.version=${SBTV} -Xms512M -Xmx1536M -Xss1M -XX:+CMSClassUnloadingEnabled -Duser.home="${WORKDIR}"" source "${EPREFIX}"/usr/share/java-config-2/launcher/launcher.bash EOF chmod u+x "${S}/sbt" || die