diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2022-01-04 01:27:12 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2022-01-04 01:27:12 +0000 |
| commit | 3517852e3b8a68d1e997770fc0650c5053bafc6c (patch) | |
| tree | 44068672445b1418489aed82de58df3c470289e7 /dev-lang/scala | |
| parent | 0f15659d48c193027158492acb726297501202c5 (diff) | |
gentoo resync : 04.01.2022
Diffstat (limited to 'dev-lang/scala')
| -rw-r--r-- | dev-lang/scala/Manifest | 4 | ||||
| -rw-r--r-- | dev-lang/scala/scala-2.12.10.ebuild | 7 | ||||
| -rw-r--r-- | dev-lang/scala/scala-2.12.4.ebuild | 6 |
3 files changed, 6 insertions, 11 deletions
diff --git a/dev-lang/scala/Manifest b/dev-lang/scala/Manifest index a7cf8c51caa8..4034a8c5b4e0 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 5507 BLAKE2B fec89b83fb26559234edbe20e0d03e7d7bf07fca48385c783cc5326f2262740fc04df70a798bd2967540ffaac7d387583eb65ab8ba7a8800d8b3f8cfd312873e SHA512 7ebb583765d0040e0d75ea6dec0d0684924aa7556aea79e00960133ff2d0e336de9b326491b648c35f197185150dc89309874544a0d87fb7522d1c3a9fe67f51 -EBUILD scala-2.12.4.ebuild 7248 BLAKE2B fbb18e8246d2a584ea768268437e18503e929f1fc714f8c7493caddadce15b357585be99416d78142cf497390444780a5fc0f08b9cbdd697684c4fa75658301f SHA512 4ba07f182a2490156286528d598871854498c1ee2c81779261b987cb728f0d14bb9e815648060863b638e0b0e1d62a16e31765d48a03003eb53b0cdd2bbc6e86 +EBUILD scala-2.12.10.ebuild 5482 BLAKE2B 4cbee8a9c95f285fb839faac50b503f11af08b5beabb2747551a8460c98969ff56bb99e8ddc3c83a92ff76f766fcfdb88547335edc9ff42f610ab5c309ff05c8 SHA512 f0aa1879e8a825a250fd7c24173f0708469b83ba00fc7c885f21b78de15a92abbbd26f3cfcb8a662e3e5b8c8d7a267315e450c03fbefe8b470bd09ea4b263063 +EBUILD scala-2.12.4.ebuild 7245 BLAKE2B ad043af82810eec37776ec3a771e3a0805ac145062cbfbb0ec1b155432b6e2152debfb617772bbc98aba3d68c78f841405f7060ac49dcaab9c3d8a6453d3992e SHA512 6fecc048fa89edda91673c6686eecf9d7f30857a7cd5791144623794154956aae7e99b721947b991122ceff390359205fe5f4225488deb8c70c8d0c20cd09283 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.ebuild index 466ca0b73817..55b8c7fa565a 100644 --- a/dev-lang/scala/scala-2.12.10.ebuild +++ b/dev-lang/scala/scala-2.12.10.ebuild @@ -57,13 +57,10 @@ COMMON_DEP="dev-java/ant-core:0 DEPEND="${COMMON_DEP} !binary? ( - >=virtual/jdk-1.8:* >=dev-java/sbt-${SBTV}:0 media-gfx/graphviz ) - binary? ( - >=virtual/jdk-1.8:* - ) + >=virtual/jdk-1.8:* app-arch/xz-utils:0" RDEPEND="${COMMON_DEP} @@ -130,7 +127,7 @@ src_prepare() { gjl_package=sbt gjl_jar="sbt-launch.jar" gjl_java_args="-Dsbt.version=${SBT_PVR} -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 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 |