commit: e66cda0a631ec3957faee0125fd11eb631e95949
Author: Samuel Bernardo <samuelbernardo.mail <AT> gmail <DOT> com>
AuthorDate: Mon Jun 10 02:21:39 2024 +0000
Commit: Samuel Bernardo <samuelbernardo.mail <AT> gmail <DOT> com>
CommitDate: Mon Jun 10 02:21:39 2024 +0000
URL: https://gitweb.gentoo.org/repo/user/ssnb.git/commit/?id=e66cda0a
Update sbt to 1.10.0
Signed-off-by: Samuel Bernardo <samuelbernardo.mail <AT> gmail.com>
dev-java/sbt/Manifest | 6 +-
dev-java/sbt/sbt-1.1.2.ebuild | 132 ---------------------
.../sbt/{sbt-1.3.6.ebuild => sbt-1.10.0.ebuild} | 6 +-
3 files changed, 5 insertions(+), 139 deletions(-)
diff --git a/dev-java/sbt/Manifest b/dev-java/sbt/Manifest
index e7acafb..58bf29f 100644
--- a/dev-java/sbt/Manifest
+++ b/dev-java/sbt/Manifest
@@ -1,5 +1,3 @@
-DIST sbt-1.1.2.tar.gz 45772150 BLAKE2B
16092a782a314588bd6b4e3539c76b8aed2834aa7aa7d569d4d309d177f78c43f288044ed527f6dfd7c2d08507df1842322a113b8223831d809fecc8bc1dc61f
SHA512
3cde86001881cc8979a33de8918ad6aadee324fc2ffdc7e2aac9f6b9f0a2764c675fb61354d997ea6bbd2148da30a85964238b7789d5d069506321edd61f3979
-DIST sbt-1.3.6.tar.gz 57542061 BLAKE2B
9d307a1381b592ece9805ed9e017745902800cccda6f84471bda56abb0a1ba0860c36e5740148172a220e4fd0ccdee609c3c8160726482b0ab309ba9578d3e6b
SHA512
8282192b277f9fe9d335ed994860d527726bea4cbe7f8e290cc9864e1a9a749c80ce124ae4397840146165938627ae1413e4d4e1983930ef441e563ea6f4422a
-EBUILD sbt-1.1.2.ebuild 3717 BLAKE2B
31b67ed6aac117b09faf98cfb2809cff6fcaec7a7b58e47669a8bee63d449db668d1781568bfdb465c499fc5aba7c4e5025764f059cfff138796464490c31f99
SHA512
940d9ef3181227e6e6ce38898300feadee18c36ab93951a97df1d41adee4c628602ba534df7d1466353fc57c35198cc340ed4431f51f785a52e7f40f62e5b35a
-EBUILD sbt-1.3.6.ebuild 3701 BLAKE2B
b26f40345ad4f949a2c28d599076b793224a12367f745f929c682caf0aad64a5ee971df7da1085f5d608262374dcaadc3c510dd4c61a8a7e618f23b89f6c6ccf
SHA512
008bec6c798982dcba9223eb26c6aaf33cdff9d3cd639be226ff09b83f25a48a109237f4a778f1145b2fef102c3da2fc7c4c0f38c42711cde7b0b505657d3e93
+DIST sbt-1.10.0.tar.gz 48054447 BLAKE2B
687b5a3c5daebbd42f813ecef8ca257858f17a8ffcd944bfc1670e82d7475be8ccc67dfd9a53869c667eef74fbddd4752d279888fca7df6ea3e93835b872ca36
SHA512
dedf4b0b858dcaa0b3724ad2eb64ac803bdbca38bc5ca8f28bc5633fa7008f69bedd192efb71360da25683a6843578617690d0d262a24085f3fcd7838033a84d
+EBUILD sbt-1.10.0.ebuild 3691 BLAKE2B
c9e041cd6053fd39478367bc71de41d9084730b96ad0c7986280742847fb98b1f22f7e088e065c3e5d037795666b0ca8fe475002324827d9a34e56cc66e90deb
SHA512
6964c751a762138c1401b3634d48d947eff866d19057c9ca03613a1652c2e919a0900140861a9c842ca9696610a2cdf1899765a78857d68800bdedce2356ef02
MISC metadata.xml 537 BLAKE2B
001114436829e1704925eed25f1b8ae0c472087a47eb167b34112f1288e128244e2f4ffb535e0c0c9fabeca9c8920705976223aa58c2367b345ae03db12bf428
SHA512
0a507c70bcbd892026482a59a13e2ae8b3d336c3c04b51358b10bb67236dfaa2c37c9fd7ca89dec2c06d46bca1b868f5f7a40941ef58b20205e5981faaf5602b
diff --git a/dev-java/sbt/sbt-1.1.2.ebuild b/dev-java/sbt/sbt-1.1.2.ebuild
deleted file mode 100644
index 2a59d15..0000000
--- a/dev-java/sbt/sbt-1.1.2.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-# repoman gives LIVEVCS.unmasked even with EGIT_COMMIT, so create snapshot
-inherit eutils java-pkg-2 git-r3
-
-L_PN="sbt-launch"
-L_P="${L_PN}-${PV}"
-
-SV="2.12"
-
-DESCRIPTION="sbt is a build tool for Scala and Java projects that aims to do
the basics well"
-HOMEPAGE="http://www.scala-sbt.org/";
-EGIT_COMMIT="v${PV}"
-EGIT_REPO_URI="https://github.com/sbt/sbt.git";
-SRC_URI="
- binary? (
-
https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tgz -> ${P}.tar.gz
- )"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+binary"
-
-DEPEND=">=virtual/jdk-1.8
- >=dev-lang/scala-2.12.2:${SV}"
-RDEPEND=">=virtual/jre-1.8
- >=dev-lang/scala-2.12.2:${SV}"
-
-# test hangs or fails
-RESTRICT="test"
-
-JAVA_GENTOO_CLASSPATH="scala-${SV}"
-
-
-src_unpack() {
- if use binary; then
- #for f in ${A} ; do
- # [[ ${f} == *".tar."* ]] && unpack ${f}
- #done
- default
- mv "${WORKDIR}/sbt" "${S}" || die
- else
- git-r3_src_unpack
- fi
-}
-
-src_prepare() {
- default
- if use binary; then
- default
- java-pkg_init_paths_
- else
- S="${WORKDIR}/${P}"
- mkdir "${WORKDIR}/${L_P}" || die
- cp -p "${DISTDIR}/${L_P}.jar" "${WORKDIR}/${L_P}/${L_PN}.jar"
|| die
- cat <<- EOF > "${WORKDIR}/${L_P}/sbt"
- #!/bin/sh
- SBT_OPTS="-Xms512M -Xmx1536M -Xss1M
-XX:+CMSClassUnloadingEnabled"
- java -Djavac.args="-encoding UTF-8"
-Duser.home="${WORKDIR}" \${SBT_OPTS} -jar "${WORKDIR}/${L_P}/sbt-launch.jar"
"\$@"
- EOF
- cat <<- EOF > "${S}/${P}"
- #!/bin/sh
- SBT_OPTS="-Xms512M -Xmx1536M -Xss1M
-XX:+CMSClassUnloadingEnabled"
- java -Djavac.args="-encoding UTF-8"
-Duser.home="${WORKDIR}" \${SBT_OPTS} -jar "${S}/launch/target/sbt-launch.jar"
"\$@"
- EOF
- chmod u+x "${WORKDIR}/${L_P}/sbt" "${S}/${P}" || die
- sed -e "s@scalaVersion := scala210,@scalaVersion :=
scala${SV/./},\n scalaHome := Some(file(\"${EROOT}usr/share/scala-${SV}\")),@"
\
- -i "${S}/build.sbt" || die
-
- # suppress this warning in build.log:
- # [warn] Credentials file
/var/tmp/portage/dev-java/${P}/work/.bintray/.credentials does not exist
- mkdir -p "${WORKDIR}/.bintray" || die
- cat <<- EOF > "${WORKDIR}/.bintray/.credentials"
- realm = Bintray API Realm
- host = api.bintray.com
- user =
- password =
- EOF
- fi
-}
-
-src_compile() {
- if use binary; then
- :;
- else
- export
PATH="${EROOT}usr/share/scala-${SV}/bin:${WORKDIR}/${L_P}:${PATH}"
- einfo "=== sbt compile ..."
- "${WORKDIR}/${L_P}/sbt" -Dsbt.log.noformat=true compile || die
- einfo "=== sbt publishLocal with jdk $(java-pkg_get-vm-version)
..."
- cat <<- EOF | "${WORKDIR}/${L_P}/sbt" -Dsbt.log.noformat=true
|| die
- set every javaVersionPrefix in javaVersionCheck :=
Some("$(java-pkg_get-vm-version)")
- publishLocal
- EOF
- fi
-}
-
-src_test() {
- if ! use binary; then
- export PATH="${EROOT}usr/share/scala-${SV}/bin:${S}:${PATH}"
- "${S}/${P}" -Dsbt.log.noformat=true test || die
- fi
-}
-
-src_install() {
- if use binary; then
- local dest="${JAVA_PKG_SHAREPATH}"
-
- rm -v bin/sbt.bat || die
- sed -i -e 's#bin/sbt-launch.jar#lib/sbt-launch.jar#g;' \
- bin/sbt-launch-lib.bash || die
-
- insinto "${dest}/lib"
- doins bin/* || die
-
- insinto "${dest}"
- doins -r conf || die
-
- fperms 0755 "${dest}/lib/sbt" || die
- dosym "${dest}/lib/sbt" /usr/bin/sbt || die
-
- java-pkg_regjar ${D}/${dest}/lib/*.jar
- else
- # Place sbt-launch.jar at the end of the CLASSPATH
- java-pkg_dojar $(find "${WORKDIR}"/.ivy2/local -name \*.jar
-print | grep -v sbt-launch.jar) \
- $(find "${WORKDIR}"/.ivy2/local -name
sbt-launch.jar -print)
- local ja="-Dsbt.version=${PV} -Xms512M -Xmx1536M -Xss1M
-XX:+CMSClassUnloadingEnabled"
- java-pkg_dolauncher sbt --jar sbt-launch.jar --java_args "${ja}"
- fi
-}
diff --git a/dev-java/sbt/sbt-1.3.6.ebuild b/dev-java/sbt/sbt-1.10.0.ebuild
similarity index 97%
rename from dev-java/sbt/sbt-1.3.6.ebuild
rename to dev-java/sbt/sbt-1.10.0.ebuild
index e758b51..53fbba1 100644
--- a/dev-java/sbt/sbt-1.3.6.ebuild
+++ b/dev-java/sbt/sbt-1.10.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Foundation
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="6"
+EAPI="8"
# repoman gives LIVEVCS.unmasked even with EGIT_COMMIT, so create snapshot
-inherit eutils java-pkg-2 git-r3
+inherit java-pkg-2 git-r3
L_PN="sbt-launch"
L_P="${L_PN}-${PV}"
