From 6144cd2e90f8e3623912112050c8d2025de44f0a Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 16 Oct 2022 01:51:50 +0100 Subject: gentoo auto-resync : 16:10:2022 - 01:51:50 --- dev-java/Manifest.gz | Bin 55537 -> 55538 bytes dev-java/sbt/Manifest | 6 -- dev-java/sbt/sbt-0.13.13.ebuild | 162 ---------------------------------------- 3 files changed, 168 deletions(-) delete mode 100644 dev-java/sbt/sbt-0.13.13.ebuild (limited to 'dev-java') diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz index a746a768239c..ce24b961a024 100644 Binary files a/dev-java/Manifest.gz and b/dev-java/Manifest.gz differ diff --git a/dev-java/sbt/Manifest b/dev-java/sbt/Manifest index b89d6d1f5cdf..c3e740eff6c9 100644 --- a/dev-java/sbt/Manifest +++ b/dev-java/sbt/Manifest @@ -1,13 +1,7 @@ -DIST sbt-0.13.13-gentoo-binary.tar.xz 58011476 BLAKE2B 87f829a5a6c4047b5120b9685c1caa1477d6ab5789835bf890d241ae512bae65cc3b0b2b60c15c18e15891210b6687ad2c8cd7dcc581f5224fc8788a576ff754 SHA512 9763b67ac4838e6ccac1848c17a03608bed61669671a10c93afc4c81d6dad06a3463ac4e4a9b7b3fb91325df5df6e0148847669d482e3cacf4fde957c110ccc1 -DIST sbt-0.13.13-ivy2-deps.tar.xz 121677604 BLAKE2B 7f6e508104a99c36f8f928550f7c0e41b742cefef3f3fccf2999fe7a5873cf690d693c0ded1df481535b59a7340a997cc21ef3ffd403b147fd8a323d1ee28620 SHA512 3301447a563e9a83431bb67a6281a6045630669012f1cc5cdde7a2cbae3f7db75f87abed003ecf8243fd230e2adea2ba3666468358ae29c51e346940235f5ed5 -DIST sbt-0.13.13-sbt-deps.tar.xz 34750700 BLAKE2B 5856f19d19255a6c4a373086962f3bff195d03193bb74d8d3aee1cfb2749ef3638f5c26dff7cb7c455c5b4ce67e8cf4fa46bbf9a8363f80dc26092e6df768d81 SHA512 0bfd35a6926545da7340f7ee72e420121f2bb2f83d98d420b7f65b465d207b1b30a48788914e7b1fdf575a4fee870f2632b0717f1a7a2c19e2f2d5794d08b4da -DIST sbt-0.13.13-src.tar.xz 35911028 BLAKE2B 42157af03ae3567a2acc67cc0c96a9ffe19b69d60fddfde1cd65bbc410c14b09e5da0febb8225e49693c380a444b752296c29a21cc7f2239ee49ccef5128a3ff SHA512 351f18108a23014ee7ffd5c4713f390728fb98b742efdc139e094e64df7800f399d088600d245631635b0f6f4cb69c6cd327aafa3b0bf8a233fcbf0cb4ac5702 DIST sbt-0.13.18-gentoo-binary.tar.xz 24312512 BLAKE2B 8601ff9d8783156f98df7e855563ebd1a1e51b4588f7fb5701b2fbd86771b7a280518272fc24f469f8810893f2762afb33f1c590764f980d9571555b3f84e4c6 SHA512 ca4b3b50d04f33c55e4bef468623a245e6001f922c8ad404e60a4369bcd6e683a97dab169b03cbc12d9e530aff194fdf1571aceca32c5dbb37b4c3d7a49a09f9 DIST sbt-0.13.18-ivy2-deps.tar.xz 97612984 BLAKE2B d712b80cde43c46bc714d30f3009b9e46c5f50f78fbc46f8bc106f522308faa9a8d0bdbf4ad9634730f759bb3c484380d33e585771b33633aab6b8ee7dda5ba4 SHA512 c6affd495f9882b71d3a811638c803a646f71e926cc7efb2e84950d85a4fb6dcb65674ff5444d9ffc8858726342b6d3733880d1611157004b891689e67f24028 DIST sbt-0.13.18-sbt-deps.tar.xz 34787436 BLAKE2B aba63ee1f7ec3f105bae0fa882dc193360c29f772a50ee84b9770f79491d55fcff509d70b813b62ad0bdd618729293b030b29209236ad5d9af1bfc11b7a0fdf0 SHA512 aab302c83303baa89bf6a2ed8d3af76e4d92b9c4339d0e30767fcfcf61131c29a534ba43fb73467f673dec0b3f61d2e740a19b3790fcc4f76b413d04115dfbb8 DIST sbt-0.13.18.tar.gz 952783 BLAKE2B 31648c2cbbeb5d57db03c10bd4ac25344ae2d0351fc592e85e053e9ac0deb063e1b1e700a8dfa4a242243dd06fa491f721852ddbc2ea1d7fd4174e01febad25e SHA512 0eeb6fddc2454c2fff2eee06a80179495c0210d97fd3677bfe0f8833524ac707515b9e8f3c19e0d0372f503ef9b9f19dbe4cf15b6f8b48181ad730685004267c -DIST sbt-launch-0.13.13.jar 1210231 BLAKE2B 754abad78cec4f6b040fb63dcb62e549768174b22cf3f9ab7d2419736d4f09b53863cf645b38d7d534deb1c6e897f55d8b1b5fa82462ca9d906c410d22c0c198 SHA512 78e7ce21c610e83a532b04491e13d53b4193205328adce473252d523fe0ca0f3892dba900f01ff6e28d94a17c3ba1ebbe7d85fd6ce9900c48263bc4816da37ef DIST sbt-launch-0.13.18.jar 1210278 BLAKE2B b3c03f0c823576db51eda51a494edeb771f7ab762afe74fa95f19a4581d80cfdf3c6d6bfacd76e195de34f420912d18b505b74414fbc02550c9331fe4b3e07e3 SHA512 2b1e27f8d873ee45cc168ab19f6e82421d6896116c7b7af60974b97f41edd034fa008e668c83f83d2ce3a501986674821d8a427ccbcda291c8c33b576d64921b -EBUILD sbt-0.13.13.ebuild 5670 BLAKE2B 0447138d640ae8ee54ae7818c78c34ba7f6ed1b9535be53241308a7803f18c732d6d6f041d7d35baadf670b4f6df14e2dc87c526f47d08ac2309521382265a3b SHA512 6851e0463519ced88b12ba0d23018b1e36209a37ec65f11c5d0210b74ee403346eef1c3335dd33a240398dc985229ca2fc3c1fce82cca5430cbe4662421f2068 EBUILD sbt-0.13.18-r1.ebuild 5036 BLAKE2B abf40e154af71302d2802751c7f34201f188e558fa501f9db205d6a61b7d7416c11ca28d8d48f410113b55177745d5db1a0a7c01caae16ed90f3cdf231ba7817 SHA512 fc6906a7c1dfe1ba9b234223da4ee29feb92e4589ebba6dd957b11e7f97f7815f5869352816ad7694b1233b1c14f0e1a8f53217fd781588c25873c7b76ae5433 MISC metadata.xml 526 BLAKE2B d06c4612bc3b5973953ff1a80c565bf0daad172b1de8ec2856c811bbe4a98d14386139c5d1f5987f2360226f2b7a5665263730fa0789bc8999704270fc57952c SHA512 36c893290862eaf30eb3e53e3bd6b3593fdbc03c2a72c171a8fa5c913ab2e5836c69d0259c0d6d256dacaa6e97590c778980a0e46a9c71f9c2131619f047b8b4 diff --git a/dev-java/sbt/sbt-0.13.13.ebuild b/dev-java/sbt/sbt-0.13.13.ebuild deleted file mode 100644 index 65292f4be54a..000000000000 --- a/dev-java/sbt/sbt-0.13.13.ebuild +++ /dev/null @@ -1,162 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# 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 java-pkg-2 # git-r3 - -L_PN="sbt-launch" -L_P="${L_PN}-${PV}" - -DESCRIPTION="sbt is a build tool for Scala and Java projects that aims to do the basics well" -HOMEPAGE="https://www.scala-sbt.org/" -EGIT_COMMIT="v${PV}" -EGIT_REPO_URI="https://github.com/sbt/sbt.git" -SRC_URI=" - !binary? ( - https://dev.gentoo.org/~gienah/snapshots/${P}-src.tar.xz - https://dev.gentoo.org/~gienah/snapshots/${P}-ivy2-deps.tar.xz - https://dev.gentoo.org/~gienah/snapshots/${P}-sbt-deps.tar.xz - http://repo.typesafe.com/typesafe/ivy-releases/org.scala-sbt/${L_PN}/${PV}/${L_PN}.jar -> ${L_P}.jar - ) - binary? ( - https://dev.gentoo.org/~gienah/files/dist/${P}-gentoo-binary.tar.xz - )" -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="binary" - -DEPEND=" - >=virtual/jdk-1.8 - dev-lang/scala" - -RDEPEND=" - >=virtual/jre-1.8 - dev-lang/scala" - -# test hangs or fails -RESTRICT="test" - -JAVA_GENTOO_CLASSPATH="scala-${SV}" - -# Note: to bump sbt, some things to try are: -# 1. Create the sbt src snapshot: -# git clone https://github.com/sbt/sbt.git ${P} -# cd ${P} -# git checkout v${PV} -# cd .. -# XZ_OPT=-9 tar --owner=portage --group=portage \ -# -cJf /usr/portage/distfiles/${P}-src.tar.xz ${P} -# 2. remove the https://dev.gentoo.org/~gienah/snapshots/${P}-ivy2-deps.tar.xz -# https://dev.gentoo.org/~gienah/snapshots/${P}-sbt-deps.tar.xz and -# binary? ( https://dev.gentoo.org/~gienah/files/dist/${P}-gentoo-binary.tar.xz ) -# from SRC_URI -# 3. Comment the sbt publishLocal line in src_compile. -# 4. try: -# FEATURES='noclean -test' emerge -v -1 dev-java/sbt -# It should fail in src_install since the sbt publishLocal is not done. -# Check if it downloads more stuff in -# src_compile to ${WORKDIR}/.ivy2 and ${WORKDIR}/.sbt. -# 5. If some of the downloads fail, it might be necessary to run the sbt compile -# again manually to obtain all the dependencies, if so: -# cd to ${S} -# export EROOT=/ -# export WORKDIR='/var/tmp/portage/dev-java/${P}/work' -# export SV="2.11" -# export L_P=${P} -# export PATH="/usr/share/scala-${SV}/bin:${WORKDIR}/${L_P}:${PATH}" -# sbt compile -# cd ${WORKDIR} -# find .ivy2 .sbt -uid 0 -exec chown portage:portage {} \; -# 6. cd ${WORKDIR} -# XZ_OPT=-9 tar --owner=portage --group=portage \ -# -cJf /usr/portage/distfiles/${P}-ivy2-deps.tar.xz .ivy2/cache -# XZ_OPT=-9 tar --owner=portage --group=portage \ -# -cJf /usr/portage/distfiles/${P}-sbt-deps.tar.xz .sbt -# Uncomment the sbt publishLocal line in src_compile. -# 7. It *might* download more dependencies for src_test, however the presence -# of some of these may cause the src_compile to fail. So download them -# seperately as root so we can identify the -# additional files. As root: -# cd ${S} -# ${S}/${P} test -# cd ${WORKDIR} -# XZ_OPT=-9 tar --owner=portage --group=portage \ -# -cJf /usr/portage/distfiles/${P}-test-deps.tar.xz \ -# $(find .ivy2/cache .sbt -uid 0 -type f -print) -# Note: It might not download anything in src_test, in which case -# ${P}-test-deps.tar.xz is not required. -# 8. Create the binary -# cd $WORDKIR -# XZ_OPT=-9 tar --owner=portage --group=portage \ -# -cJf /usr/portage/distfiles/${P}-gentoo-binary.tar.xz ${P} .ivy2/local -# 9. Undo the earlier temporary edits to the ebuild. - -src_unpack() { - # if ! use binary; then - # git-r3_src_unpack - # fi - # Unpack tar files only. - for f in ${A} ; do - [[ ${f} == *".tar."* ]] && unpack ${f} - done -} - -src_prepare() { - default - if ! use binary; then - 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 - 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() { - export PATH="${EROOT}usr/share/scala-${SV}/bin:${S}:${PATH}" - "${S}/${P}" -Dsbt.log.noformat=true test || die -} - -src_install() { - # 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}" -} -- cgit v1.2.3