diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2024-05-01 00:00:05 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2024-05-01 00:00:05 +0100 |
| commit | 3d12b65aa1b4bb8b02b1f8d3e77bccf230b79a09 (patch) | |
| tree | cb6347688c91bfbdebe49a78a55dad3d72cc193e /dev-lang/scala | |
| parent | 4c2b70adc6484c35ff05e412de08a7b7f50cfb34 (diff) | |
gentoo auto-resync : 01:05:2024 - 00:00:04
Diffstat (limited to 'dev-lang/scala')
| -rw-r--r-- | dev-lang/scala/Manifest | 2 | ||||
| -rw-r--r-- | dev-lang/scala/scala-2.12.10-r1.ebuild (renamed from dev-lang/scala/scala-2.12.10.ebuild) | 17 |
2 files changed, 7 insertions, 12 deletions
diff --git a/dev-lang/scala/Manifest b/dev-lang/scala/Manifest index 3101b89c3042..4d412c5be2f4 100644 --- a/dev-lang/scala/Manifest +++ b/dev-lang/scala/Manifest @@ -22,6 +22,6 @@ DIST scala-2.12.4-nest.jar 2920 BLAKE2B 3c48a2ea7501be03ede0fd9c1f907508491299cd DIST scala-2.12.4-sbt-deps.tar.xz 34841672 BLAKE2B 0f1577bba65eb5863013014b16627c28934f13e84a6ed0a52748e2007417ae074bcb4b68650993d870f4ada872248d489f84ea02ee19521dd9ce8faae963e221 SHA512 74455451e77f0d935c8027e67b898e5eec9e984158292a37a4362072f4922eb53dfe9ddd5d52da8066fb8949c6469bff70405df8581633a49a37c8b900c6885e DIST scala-2.12.4-vizant.jar 15910 BLAKE2B 393ddd38ff2528b9c54fbb2b79111858a2dfeab66e4b10daf4e23d113963edb3002db8c9415fe47557736a63ecef4b198bd90b87a54240a9a43823fdab0f3082 SHA512 4464d7349016f4999199e227e8eaf7bb3ef6b7e38ad0e8e710faad55df2e1243d99b53b9a789a1ffd3c39aef0d979dffc543f4691feae68cfa743e51bcf61390 DIST scala-2.12.4.tar.gz 5999529 BLAKE2B 5dfeadb9ac9562dd825f6a41f9cabdd353f669a58dc3aaec714d6155e9e598296c1e31dcc8956a24a97103e3449fb8f8c3a9ebe5e52dd405572d59ccae89c5e6 SHA512 cad6d54777a3ad4d26df5b4d5cecbbdb4a91ecb17cbf791fe259735221d33f9dd17a14e86f5e3520464078ad9ef68581e722e3c0d7494436bf356c79a9d31697 -EBUILD scala-2.12.10.ebuild 5488 BLAKE2B d24b53addd83a3c3260d83fa5bf8f3460ac7637662d8a15fdbdd8dd2bce5f2b880dcb9d3e88497483e87c1b4938af735fe752ddf1968b9600501860b2fa2235e SHA512 0bb524dd4e3b9c333af579d836c35905105fdc6b90ce0e1275f66ce0476f3891b7fe909c9045d99bc7a0f17a060a93bc01296988000be519fa8dc40fda62d651 +EBUILD scala-2.12.10-r1.ebuild 5249 BLAKE2B c91d4749c36be4d932e8e5f4a663b639cf9eef8079a34c299d709fb1597ba4393ce262c84626662c77ea7990035be6a2beaebbd87e390d8882d86eea7db81ca9 SHA512 e338c45b67b5bfa34a7512eb1d9960c25da8a698e5ea995e8750c8d67954e0d65288f3ccfa53c4552b12a76f94214408090ae4b4ceb96487a72ba53bfff2ab53 EBUILD scala-2.12.4.ebuild 7246 BLAKE2B f2d4b5b5cf33764ecbbc1eb83367b3bdae9fd1ce82e6f9c7759a467a132de5ad4be1623b273fdce0d7a07b28f2a354a78d4b41663bff4d62e46e4c4c78deaf52 SHA512 03673e873e5415b090d9d3582c41d6f4e88cae29b9cd466d12a21a5b8f814e7c8626f345c6fc4bb60fb4ee287c9edf3898a01185570e2268b6092347c7188a7b MISC metadata.xml 479 BLAKE2B 8927ad38cb58fcc55fef40f95a1e57c2172a8ca8b6994f71a92fe0e10065b80ece596696afe93595e7f6c27959d4025d5670a41bd7dfece649faaf4f7dd7ed8d SHA512 f8ed5a95195ac7d96c22d0e8b7e65e0e5d624fae245b976b1486a93910ef9b9a9cc20b9c31363085868bf120589247ddc607f22b583ba65b247b84acd4e0763f diff --git a/dev-lang/scala/scala-2.12.10.ebuild b/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 |