public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: dev-java/sbt/
@ 2015-09-05 12:08 Mark Wright
  0 siblings, 0 replies; 21+ messages in thread
From: Mark Wright @ 2015-09-05 12:08 UTC (permalink / raw
  To: gentoo-commits

commit:     59a0d07ac6423dc541e3e0e0b9275a96b368cbf7
Author:     Mark Wright <gienah <AT> gentoo <DOT> org>
AuthorDate: Sat Sep  5 12:08:08 2015 +0000
Commit:     Mark Wright <gienah <AT> gentoo <DOT> org>
CommitDate: Sat Sep  5 12:08:08 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=59a0d07a

dev-java/sbt: Add sbt-0.13.8-r1 that builds with jdk 1.7

Try to fix: Bug 558142 - =dev-java/sbt-0.13.8: fails to compile
thanks to Patrice Clement (monsieurp) for reporting.
Fix Bug 558848 - dev-java/sbt-0.13.8 : java.lang.NoClassDefFoundError:
Could not initialize class scala.tools.nsc.Main$
Thanks to Toralf Forster for reporting.

Package-Manager: portage-2.2.20.1

 dev-java/sbt/sbt-0.13.8-r1.ebuild | 151 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 151 insertions(+)

diff --git a/dev-java/sbt/sbt-0.13.8-r1.ebuild b/dev-java/sbt/sbt-0.13.8-r1.ebuild
new file mode 100644
index 0000000..3c3360f
--- /dev/null
+++ b/dev-java/sbt/sbt-0.13.8-r1.ebuild
@@ -0,0 +1,151 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+# 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}"
+
+B_PV="0.13.7"
+BL_P="${L_PN}-${B_PV}"
+B_P="${PN}-${B_PV}"
+
+SV="2.10"
+
+# creating the sbt src snapshot:
+# git clone https://github.com/sbt/sbt.git sbt-0.13.8
+# cd sbt-0.13.8
+# git checkout v0.13.8
+# cd ..
+# tar --owner=portage --group=portage -cjf sbt-0.13.8-src.tar.bz2 sbt-0.13.8
+
+# creating the binary:
+# cd $WORDKIR
+# tar -cjf sbt-0.13.8-gentoo-binary.tar.bz2 sbt-0.13.8/sbt-launch/target/sbt-launch.jar
+
+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://dev.gentoo.org/~gienah/snapshots/${P}-src.tar.bz2
+	https://dev.gentoo.org/~gienah/snapshots/${P}-ivy2-deps.tar.bz2
+	https://dev.gentoo.org/~gienah/snapshots/${P}-sbt-deps.tar.bz2
+	https://dev.gentoo.org/~gienah/snapshots/${P}-test-deps.tar.bz2
+	http://repo.typesafe.com/typesafe/ivy-releases/org.scala-sbt/${L_PN}/${PV}/${L_PN}.jar -> ${BL_P}.jar
+)
+binary? ( https://dev.gentoo.org/~gienah/files/dist/${P}-gentoo-binary.tar.bz2 )"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="binary"
+
+DEPEND="=virtual/jdk-1.7*
+	>=dev-lang/scala-2.10.4-r1:${SV}"
+RDEPEND=">=virtual/jre-1.7
+	dev-lang/scala:*"
+
+# test hangs or fails
+RESTRICT="test"
+
+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
+}
+
+java_prepare() {
+	if ! use binary; then
+		# Note: to bump sbt, some things to try are:
+		# 1. remove the https://dev.gentoo.org/~gienah/snapshots/${P}-ivy2-deps.tar.bz2
+		# https://dev.gentoo.org/~gienah/snapshots/${P}-sbt-deps.tar.bz2 and
+		# https://dev.gentoo.org/~gienah/snapshots/${P}-test-deps.tar.bz2 from SRC_URI
+		# 2. Comment the sbt publishLocal line in src_compile.
+		# 3. try:
+		# FEATURES='noclean -test' emerge -v 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.
+		# 4. If some of the downloads fail, it might be necessary to run the sbt compile
+		# again manually to obtain all the dependencies, if so (with jdk 1.6):
+		# cd to ${S}
+		# export EROOT=/
+		# export WORKDIR='/var/tmp/portage/dev-java/sbt-0.13.8/work'
+		# export SV="2.10"
+		# export B_P=sbt-0.13.7
+		# export PATH="/usr/share/scala-${SV}/bin:${WORKDIR}/${B_P}:${PATH}"
+		# sbt compile
+		# cd ${WORKDIR}
+		# find .ivy2 .sbt -uid 0 -exec chown portage:portage {} \;
+		# 5. cd ${WORKDIR}
+		# tar -cjf sbt-0.13.8-ivy2-deps.tar.bz2 .ivy2
+		# tar -cjf sbt-0.13.8-sbt-deps.tar.bz2 .sbt
+		# 6. It downloads 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.  Note: src_test creates some files in ${WORKDIR}/.m2 which are can
+		# hopefully be ignored. As root:
+		# cd ${S}
+		# sbt test
+		# cd ${WORKDIR}
+		# find .ivy2 .sbt -uid 0 -print
+		# Then add those files to sbt-0.13.8-ivy2-test-deps.tar.bz2 except the files in the directories
+		# .ivy2/local
+		# .ivy2/cache/org.scala-sbt
+		# Something like:
+		# tar --owner=portage --group=portage -cjf sbt-0.13.8-test-deps.tar.bz2 <list of files as described above>
+		# 7. Undo the earlier temporary edits to the ebuild.
+
+		mkdir "${WORKDIR}/${B_P}" || die
+		cp -p "${DISTDIR}/${BL_P}.jar" "${WORKDIR}/${B_P}/${L_PN}.jar" || die
+		cat <<- EOF > "${WORKDIR}/${B_P}/sbt"
+			#!/bin/sh
+			SBT_OPTS="-Xms512M -Xmx1536M -Xss1M -XX:+CMSClassUnloadingEnabled -XX:MaxPermSize=512M"
+			java -Djavac.args="-encoding UTF-8" -Duser.home="${WORKDIR}" \${SBT_OPTS} -jar "${WORKDIR}/${B_P}/sbt-launch.jar" "\$@"
+		EOF
+		chmod u+x "${WORKDIR}/${B_P}/sbt" || die
+		local SCALA_PVR="$(java-config --query=PVR --package=scala-${SV})"
+		local SFV="${SCALA_PVR/-*}"
+		sed -e "s@scalaVersion := \"2.10.4\",@scalaVersion := \"${SFV}\",\n  scalaHome := Some(file(\"/usr/share/scala-${SV}\")),@" \
+			-i "${S}/build.sbt" || die
+	fi
+}
+
+src_compile() {
+	if ! use binary; then
+		export PATH="${EROOT}usr/share/scala-${SV}/bin:${WORKDIR}/${B_P}:${PATH}"
+		einfo "=== sbt compile ..."
+		"${WORKDIR}/${B_P}/sbt" -Dsbt.log.noformat=true compile || die
+		einfo "=== sbt publishLocal ..."
+		cat <<- EOF | "${WORKDIR}/${B_P}/sbt" -Dsbt.log.noformat=true || die
+			set every javaVersionPrefix in javaVersionCheck := Some("1.7")
+			publishLocal
+		EOF
+	fi
+}
+
+src_test() {
+	if ! use binary; then
+		export PATH="${EROOT}usr/share/scala-${SV}/bin:${WORKDIR}/${B_P}:${PATH}"
+		"${WORKDIR}/${B_P}/sbt" -Dsbt.log.noformat=true test || die
+	fi
+}
+
+src_install() {
+	if ! use binary; then
+		pushd sbt-launch/target || die
+		mv ${L_P}.jar ${L_PN}.jar || die
+		popd
+	fi
+	java-pkg_dojar sbt-launch/target/${L_PN}.jar
+	java-pkg_dolauncher sbt --main xsbt.boot.Boot --java_args "-Xms512M -Xmx1536M -Xss1M -XX:+CMSClassUnloadingEnabled -XX:MaxPermSize=512M"
+}


^ permalink raw reply related	[flat|nested] 21+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-java/sbt/
@ 2016-02-06  9:30 Mark Wright
  0 siblings, 0 replies; 21+ messages in thread
From: Mark Wright @ 2016-02-06  9:30 UTC (permalink / raw
  To: gentoo-commits

commit:     105968862cba170d0770bce8f3eb4a3d1a158ca2
Author:     Mark Wright <gienah <AT> gentoo <DOT> org>
AuthorDate: Sat Feb  6 09:29:38 2016 +0000
Commit:     Mark Wright <gienah <AT> gentoo <DOT> org>
CommitDate: Sat Feb  6 09:29:38 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=10596886

dev-java/sbt: Bump to 0.13.10_rc2

Package-Manager: portage-2.2.27

 dev-java/sbt/Manifest               |   6 ++
 dev-java/sbt/sbt-0.13.10_rc2.ebuild | 154 ++++++++++++++++++++++++++++++++++++
 2 files changed, 160 insertions(+)

diff --git a/dev-java/sbt/Manifest b/dev-java/sbt/Manifest
index 9436c22..71dcd3f 100644
--- a/dev-java/sbt/Manifest
+++ b/dev-java/sbt/Manifest
@@ -1,6 +1,12 @@
+DIST sbt-0.13.10_rc2-gentoo-binary.tar.bz2 66131831 SHA256 863cf71b32439e452e1d5400a8ec1ac06a9c29852c7eafb79ce9ce2b1288a321 SHA512 1b25c47fa01462bdbd1a88d5b441226ba8261f83a4ef6ce2832c5e752cd90e8eacf6f0272505f2e5330f1e9b3bedb71e4d83da81952e08d8144a52e22dc26008 WHIRLPOOL b300931a4b516f7aa4f5984ea17e9d2d022e52dd4d4468b777b8b88c949d22c2eb9702c3883ef0a9eff6fd52542668c2ba041d4f12ab56603c6fcfe444d9c9bb
+DIST sbt-0.13.10_rc2-ivy2-deps.tar.bz2 139970194 SHA256 b3ef28fbc330d8b8218712a4ff6ad11a3ed67c618b99df1845edb17d67e5ca3a SHA512 e7023798a303e37b282fe08590516031f7952d4df6d2aa4792c727e9d50000e1e1c4f9e97d656abc32f84f8b0df9b2de7e15e29bb2c7ed648efcad8ae432cff4 WHIRLPOOL 48860777b2ffabbdf33800a3897727b91e7487430138177b39174276506bcef2b4c810c1858bfa158ee83953d4de8e61085022037518fbb733339b5e7c0a4801
+DIST sbt-0.13.10_rc2-sbt-deps.tar.bz2 38778951 SHA256 f2be26d49010fa521b4a0e9a112c465107838f5250883de4bc132926ccd685fa SHA512 c929562d18e2e5032d502556a960b25fa707c2893172425c2c3b5365a86ccd63729ce8795f12fd1aced5b39267f6db4b8e9d0c1eaf00ba20b071fac9044157f8 WHIRLPOOL b75096e0b2429a104b548e601e06fc5b3e452bda39d4fc434d8f98137275899a5c40ac2bb528324dd621eef4aa17e952648c9698cc4eeedd6e8aeb391509db16
+DIST sbt-0.13.10_rc2-src.tar.bz2 35017169 SHA256 c34051649a8c998a98d5ff401e622d6c3e54fc15b6e1aeac7e223c5ff8ce54aa SHA512 7e734fdecc631cc0307c09e6706b761dd55d1cb6a03aa29a0cd5826d86bfa44dde29ebc05bca7f947351a6b6510caef51d0c3df2b07d60895b41f074c319d1b8 WHIRLPOOL de34b47a87af7f77a2ee00230901cf21015312359f29cff8689692b7c9d2f148a8233224a3b5b488c63a55cde695b0928000938e6608c1437e4be2287ddc026d
+DIST sbt-0.13.10_rc2-test-deps.tar.bz2 266656 SHA256 62d0ed5b43898a42696f8b148e933d70871c2f75bf3f6b20ac39cea00b327f17 SHA512 7e30459f010eb9c8ffba8e8e4da90bcb7d03cdd4347e63d0207a9bf9b9ddeb38b68d2798c98452ea81bcddc9973e287066603ce06ebadf56c006f25e76fdb57d WHIRLPOOL e4c06db36cc2b0e4417a81c961bc470caa169e358734ab7f7b71103547286704e6cfd104fe342afd7df0270300073a695ee35342944e25a65e96bd036bb5a953
 DIST sbt-0.13.8-gentoo-binary.tar.bz2 1048674 SHA256 4a2b22c9d9fbe922d5a5336d88ca21f18b2545850fec16485c824aee43df53e1 SHA512 9a5707601387d604b746ea21145a3c7735dd4b6d36541111b47519b66e5abc929ecc96ff52e144ed39a3db947204a1956e19394a1848e3fd8904f9a98ec24816 WHIRLPOOL 4fb1bde15ab57260a25b0a4a1634122af2e2b9d6cd35d3a9c693d9bba6c398bee489f05bf29a763a60d7a04f54823bdd9fc54ec5a2809900b28f890930649fc7
 DIST sbt-0.13.8-ivy2-deps.tar.bz2 124672043 SHA256 565ba7434316a3ab2f61f58b4bc57317e5c2ae7c9ee95061c39cfddd5767a355 SHA512 47b2f235b7d5883086f8246265e9081a50dcdaede43550a1c0de1c85a9ebf24b47e1331b662aa5c0faebaf22a37849ffb2c1f25a7592c461e62f582984ad4b70 WHIRLPOOL f92b2cd087d51f0ae31d5ac93d1dca7214ace6df8c06b050287007f05697e81ac14758368730e6df45043ba80167b9581e636b0364d5ba3a5c7352fafd7e5007
 DIST sbt-0.13.8-sbt-deps.tar.bz2 88352931 SHA256 d0eab3858f389e201277d1ead68352172830b17dd8343f09e0e63e4880a5e20e SHA512 a6e886f5f18821c26df28a2e8cf2773b4841854fc1bd4dfa43924089966020da5affd635da96a8e13efc7c06be6a5bf53697ca91f5fbf41efcdf8dda00e8428d WHIRLPOOL 54744676b33b11ffb350b5a543986efd5cd629594ce4bac5154a78df233619a92a2a4842659acf9c15533e764d24333183372f136b3b1f7463bbe55347c41b8f
 DIST sbt-0.13.8-src.tar.bz2 32766054 SHA256 5225864c54e5718dc68cfcd554a7215bd028947d61ed9522e2ad9d0a19cbdd83 SHA512 f6c834c6294c957e8d5b89a3a616f23a980cca1f882695d09a6e0080d1013227ba3bac86942b39c13e49fb6ac9fb72c3478df24ec8549b8b9812ea352932fff8 WHIRLPOOL 5054578505fe35b6c5f269c72b921920cf232a1efed18da5cd1833457d46f4e4342988be46539001b4dcfcfc6c807785915f4d0791af939dc83018ffcc03effe
 DIST sbt-0.13.8-test-deps.tar.bz2 40704285 SHA256 7cb252d69b5868905e0592df7ef9a83ce09f75cb10a72bc9dcd649286bb524a3 SHA512 a79ea9c81abc436168f04f674ffef4fee6f7c7a5dede5a3060e2e2bd9a9863dd5f1c7b31c02f3823fb5a67b2bb43c44d306efb59468f625e4db277cface47cd0 WHIRLPOOL 268ea150c5ca2fe1988317e0616262de814e2aa7213f64b99baf389c3e67e2093a04765ac27f08bd585fe33c77d9dd8c7a0ba8d3bd77d937d9a7260dab72c23a
 DIST sbt-launch-0.13.7.jar 1208385 SHA256 6570bb03df6138ffaa7ac0bbe35eb4ea79062d1146b6929c75cf238d14dd9158 SHA512 ddc62dd85b552a7157ae0c19d0161d77a929adeb4ea81042a3a38c3d979e32674b9174aef47d458e9a7c8ea7942c08f1a7177b9bc739f7cd9e0484aef9915204 WHIRLPOOL 63841a401739aa3eab24632fcec41dc5c186502f4b80fe782106a0c6448b1da2321bf2a7a0b0f83473f7c073cce2ac8f5f85440d955acc191a73bd95200cb2cf
+DIST sbt-launch-0.13.9.jar 1210236 SHA256 06ca058181d73f4eceb193b97b02bc9fb02df0fb0fa3acb142cc425ffefb2fb3 SHA512 5d404cdb81ad5f64d3ca75695246f452bccb2200ce28333f0e37eed3476feeb7e9a693f468ab13ed507036b02172b1ae8218506c9e117ee4e3d4cedd8bcd3c9d WHIRLPOOL 5c2404c4156c83585fcc35eded27baa3f785acd752d9ec1d436eb329f9b12d318aab4913c14fdbd229950d052a142267e806eeb29846977da9980264c487b2fe

diff --git a/dev-java/sbt/sbt-0.13.10_rc2.ebuild b/dev-java/sbt/sbt-0.13.10_rc2.ebuild
new file mode 100644
index 0000000..86defae
--- /dev/null
+++ b/dev-java/sbt/sbt-0.13.10_rc2.ebuild
@@ -0,0 +1,154 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+# repoman gives LIVEVCS.unmasked even with EGIT_COMMIT, so create snapshot
+inherit eutils java-pkg-2 # git-r3
+
+MY_PV="0.13.10-RC2"
+
+L_PN="sbt-launch"
+L_P="${L_PN}-${MY_PV}"
+
+B_PV="0.13.9"
+BL_P="${L_PN}-${B_PV}"
+B_P="${PN}-${B_PV}"
+
+SV="2.10"
+
+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://dev.gentoo.org/~gienah/snapshots/${P}-src.tar.bz2
+	https://dev.gentoo.org/~gienah/snapshots/${P}-ivy2-deps.tar.bz2
+	https://dev.gentoo.org/~gienah/snapshots/${P}-sbt-deps.tar.bz2
+	https://dev.gentoo.org/~gienah/snapshots/${P}-test-deps.tar.bz2
+	http://repo.typesafe.com/typesafe/ivy-releases/org.scala-sbt/${L_PN}/${MY_PV}/${L_PN}.jar -> ${BL_P}.jar
+)
+binary? ( https://dev.gentoo.org/~gienah/files/dist/${P}-gentoo-binary.tar.bz2 )
+"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="binary"
+
+DEPEND="virtual/jdk:1.7
+	>=dev-lang/scala-2.10.6:${SV}"
+RDEPEND="|| ( virtual/jre:1.7 virtual/jre:1.8 )
+	dev-lang/scala:*"
+
+# test hangs or fails
+RESTRICT="test"
+
+# Note: to bump sbt, some things to try are:
+# 1. Create the sbt src snapshot:
+# git clone https://github.com/sbt/sbt.git sbt-0.13.10_rc2
+# cd sbt-0.13.10_rc2
+# git checkout v0.13.10-RC2
+# cd ..
+# tar --owner=portage --group=portage -cjf /usr/portage/distfiles/sbt-0.13.10_rc2-src.tar.bz2 \
+# sbt-0.13.10_rc2
+# 2. remove the https://dev.gentoo.org/~gienah/snapshots/${P}-ivy2-deps.tar.bz2
+# https://dev.gentoo.org/~gienah/snapshots/${P}-sbt-deps.tar.bz2 and
+# https://dev.gentoo.org/~gienah/snapshots/${P}-test-deps.tar.bz2
+# binary? ( https://dev.gentoo.org/~gienah/files/dist/${P}-gentoo-binary.tar.bz2 )
+# 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 (with jdk 1.6):
+# cd to ${S}
+# export EROOT=/
+# export WORKDIR='/var/tmp/portage/dev-java/sbt-0.13.10_rc2/work'
+# export SV="2.10"
+# export B_P=sbt-0.13.10_rc2
+# export PATH="/usr/share/scala-${SV}/bin:${WORKDIR}/${B_P}:${PATH}"
+# sbt compile
+# cd ${WORKDIR}
+# find .ivy2 .sbt -uid 0 -exec chown portage:portage {} \;
+# 6. cd ${WORKDIR}
+# tar -cjf /usr/portage/distfiles/sbt-0.13.10_rc2-ivy2-deps.tar.bz2 .ivy2
+# tar -cjf /usr/portage/distfiles/sbt-0.13.10_rc2-sbt-deps.tar.bz2 .sbt
+# Uncomment the sbt publishLocal line in src_compile.
+# 7. It downloads 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.  Note: src_test creates some files in ${WORKDIR}/.m2 which are can
+# hopefully be ignored. As root:
+# cd ${S}
+# ${S}/sbt-0.13.10_rc2 test
+# cd ${WORKDIR}
+# tar --owner=portage --group=portage -cjf /usr/portage/distfiles/sbt-0.13.10_rc2-test-deps.tar.bz2 \
+# $(find .ivy2 .sbt -uid 0 -type f -print)
+# 8. Create the binary
+# cd $WORDKIR
+# tar --owner=portage --group=portage -cjf /usr/portage/distfiles/sbt-0.13.10_rc2-gentoo-binary.tar.bz2 \
+# sbt-0.13.10_rc2 .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
+}
+
+java_prepare() {
+	if ! use binary; then
+		mkdir "${WORKDIR}/${B_P}" || die
+		cp -p "${DISTDIR}/${BL_P}.jar" "${WORKDIR}/${B_P}/${L_PN}.jar" || die
+		cat <<- EOF > "${WORKDIR}/${B_P}/sbt"
+			#!/bin/sh
+			SBT_OPTS="-Xms512M -Xmx1536M -Xss1M -XX:+CMSClassUnloadingEnabled -XX:MaxPermSize=512M"
+			java -Djavac.args="-encoding UTF-8" -Duser.home="${WORKDIR}" \${SBT_OPTS} -jar "${WORKDIR}/${B_P}/sbt-launch.jar" "\$@"
+		EOF
+		cat <<- EOF > "${S}/${P}"
+			#!/bin/sh
+			SBT_OPTS="-Xms512M -Xmx1536M -Xss1M -XX:+CMSClassUnloadingEnabled -XX:MaxPermSize=512M"
+			java -Djavac.args="-encoding UTF-8" -Duser.home="${WORKDIR}" \${SBT_OPTS} -jar "${S}/launch/target/sbt-launch.jar" "\$@"
+		EOF
+		chmod u+x "${WORKDIR}/${B_P}/sbt" "${S}/${P}" || die
+		local SCALA_PVR="$(java-config --query=PVR --package=scala-${SV})"
+		local SFV="${SCALA_PVR/-*}"
+		sed -e "s@scalaVersion := \"2.10.4\",@scalaVersion := \"${SFV}\",\n  scalaHome := Some(file(\"/usr/share/scala-${SV}\")),@" \
+			-i "${S}/build.sbt" || die
+	fi
+}
+
+src_compile() {
+	if ! use binary; then
+		export PATH="${EROOT}usr/share/scala-${SV}/bin:${WORKDIR}/${B_P}:${PATH}"
+		einfo "=== sbt compile ..."
+		"${WORKDIR}/${B_P}/sbt" -Dsbt.log.noformat=true compile || die
+		einfo "=== sbt publishLocal ..."
+		cat <<- EOF | "${WORKDIR}/${B_P}/sbt" -Dsbt.log.noformat=true || die
+			set every javaVersionPrefix in javaVersionCheck := Some("1.7")
+			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() {
+	# 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)
+	java-pkg_dolauncher sbt --jar sbt-launch.jar --java_args "-Xms512M -Xmx1536M -Xss1M -XX:+CMSClassUnloadingEnabled -XX:MaxPermSize=512M"
+}


^ permalink raw reply related	[flat|nested] 21+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-java/sbt/
@ 2016-02-06 10:11 Mark Wright
  0 siblings, 0 replies; 21+ messages in thread
From: Mark Wright @ 2016-02-06 10:11 UTC (permalink / raw
  To: gentoo-commits

commit:     ae0d55dc9923ef202ecaa224dcd1717af677aa8d
Author:     Mark Wright <gienah <AT> gentoo <DOT> org>
AuthorDate: Sat Feb  6 10:08:52 2016 +0000
Commit:     Mark Wright <gienah <AT> gentoo <DOT> org>
CommitDate: Sat Feb  6 10:08:52 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae0d55dc

dev-java/sbt: Remove sbt-0.13.8

Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=558142

Package-Manager: portage-2.2.27

 dev-java/sbt/sbt-0.13.8.ebuild | 148 -----------------------------------------
 1 file changed, 148 deletions(-)

diff --git a/dev-java/sbt/sbt-0.13.8.ebuild b/dev-java/sbt/sbt-0.13.8.ebuild
deleted file mode 100644
index 7c64cec..0000000
--- a/dev-java/sbt/sbt-0.13.8.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-# 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}"
-
-B_PV="0.13.7"
-BL_P="${L_PN}-${B_PV}"
-B_P="${PN}-${B_PV}"
-
-SV="2.10"
-
-# creating the sbt src snapshot:
-# git clone https://github.com/sbt/sbt.git sbt-0.13.8
-# cd sbt-0.13.8
-# git checkout v0.13.8
-# cd ..
-# tar --owner=portage --group=portage -cjf sbt-0.13.8-src.tar.bz2 sbt-0.13.8
-
-# creating the binary:
-# cd $WORDKIR
-# tar -cjf sbt-0.13.8-gentoo-binary.tar.bz2 sbt-0.13.8/sbt-launch/target/sbt-launch.jar
-
-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://dev.gentoo.org/~gienah/snapshots/${P}-src.tar.bz2
-	https://dev.gentoo.org/~gienah/snapshots/${P}-ivy2-deps.tar.bz2
-	https://dev.gentoo.org/~gienah/snapshots/${P}-sbt-deps.tar.bz2
-	https://dev.gentoo.org/~gienah/snapshots/${P}-test-deps.tar.bz2
-	http://repo.typesafe.com/typesafe/ivy-releases/org.scala-sbt/${L_PN}/${PV}/${L_PN}.jar -> ${BL_P}.jar
-)
-binary? ( https://dev.gentoo.org/~gienah/files/dist/${P}-gentoo-binary.tar.bz2 )"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="binary"
-
-DEPEND="virtual/jdk:1.6
-	>=dev-lang/scala-2.10.4-r1:${SV}"
-RDEPEND=">=virtual/jre-1.6
-	dev-lang/scala:*"
-
-# test hangs or fails
-RESTRICT="test"
-
-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
-}
-
-java_prepare() {
-	if ! use binary; then
-		# Note: to bump sbt, some things to try are:
-		# 1. remove the https://dev.gentoo.org/~gienah/snapshots/${P}-ivy2-deps.tar.bz2
-		# https://dev.gentoo.org/~gienah/snapshots/${P}-sbt-deps.tar.bz2 and
-		# https://dev.gentoo.org/~gienah/snapshots/${P}-test-deps.tar.bz2 from SRC_URI
-		# 2. Comment the sbt publishLocal line in src_compile.
-		# 3. try:
-		# FEATURES='noclean -test' emerge -v 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.
-		# 4. If some of the downloads fail, it might be necessary to run the sbt compile
-		# again manually to obtain all the dependencies, if so (with jdk 1.6):
-		# cd to ${S}
-		# export EROOT=/
-		# export WORKDIR='/var/tmp/portage/dev-java/sbt-0.13.8/work'
-		# export SV="2.10"
-		# export B_P=sbt-0.13.7
-		# export PATH="/usr/share/scala-${SV}/bin:${WORKDIR}/${B_P}:${PATH}"
-		# sbt compile
-		# cd ${WORKDIR}
-		# find .ivy2 .sbt -uid 0 -exec chown portage:portage {} \;
-		# 5. cd ${WORKDIR}
-		# tar -cjf sbt-0.13.8-ivy2-deps.tar.bz2 .ivy2
-		# tar -cjf sbt-0.13.8-sbt-deps.tar.bz2 .sbt
-		# 6. It downloads 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.  Note: src_test creates some files in ${WORKDIR}/.m2 which are can
-		# hopefully be ignored. As root:
-		# cd ${S}
-		# sbt test
-		# cd ${WORKDIR}
-		# find .ivy2 .sbt -uid 0 -print
-		# Then add those files to sbt-0.13.8-ivy2-test-deps.tar.bz2 except the files in the directories
-		# .ivy2/local
-		# .ivy2/cache/org.scala-sbt
-		# Something like:
-		# tar --owner=portage --group=portage -cjf sbt-0.13.8-test-deps.tar.bz2 <list of files as described above>
-		# 7. Undo the earlier temporary edits to the ebuild.
-
-		mkdir "${WORKDIR}/${B_P}" || die
-		cp -p "${DISTDIR}/${BL_P}.jar" "${WORKDIR}/${B_P}/${L_PN}.jar" || die
-		cat <<- EOF > "${WORKDIR}/${B_P}/sbt"
-			#!/bin/sh
-			SBT_OPTS="-Xms512M -Xmx1536M -Xss1M -XX:+CMSClassUnloadingEnabled -XX:MaxPermSize=512M"
-			java -Djavac.args="-encoding UTF-8" -Duser.home="${WORKDIR}" \${SBT_OPTS} -jar "${WORKDIR}/${B_P}/sbt-launch.jar" "\$@"
-		EOF
-		chmod u+x "${WORKDIR}/${B_P}/sbt" || die
-		local SCALA_PVR="$(java-config --query=PVR --package=scala-${SV})"
-		local SFV="${SCALA_PVR/-*}"
-		sed -e "s@scalaVersion := \"2.10.4\",@scalaVersion := \"${SFV}\",\n  scalaHome := Some(file(\"/usr/share/scala-${SV}\")),@" \
-			-i "${S}/build.sbt" || die
-	fi
-}
-
-src_compile() {
-	if ! use binary; then
-		export PATH="${EROOT}usr/share/scala-${SV}/bin:${WORKDIR}/${B_P}:${PATH}"
-		einfo "=== sbt compile ..."
-		"${WORKDIR}/${B_P}/sbt" -Dsbt.log.noformat=true compile || die
-		einfo "=== sbt publishLocal ..."
-		"${WORKDIR}/${B_P}/sbt" -Dsbt.log.noformat=true publishLocal || die
-	fi
-}
-
-src_test() {
-	if ! use binary; then
-		export PATH="${EROOT}usr/share/scala-${SV}/bin:${WORKDIR}/${B_P}:${PATH}"
-		"${WORKDIR}/${B_P}/sbt" -Dsbt.log.noformat=true test || die
-	fi
-}
-
-src_install() {
-	if ! use binary; then
-		pushd sbt-launch/target || die
-		mv ${L_P}.jar ${L_PN}.jar || die
-		popd
-	fi
-	java-pkg_dojar sbt-launch/target/${L_PN}.jar
-	java-pkg_dolauncher sbt --main xsbt.boot.Boot --java_args "-Xms512M -Xmx1536M -Xss1M -XX:+CMSClassUnloadingEnabled -XX:MaxPermSize=512M"
-}


^ permalink raw reply related	[flat|nested] 21+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-java/sbt/
@ 2016-02-09 12:17 Mark Wright
  0 siblings, 0 replies; 21+ messages in thread
From: Mark Wright @ 2016-02-09 12:17 UTC (permalink / raw
  To: gentoo-commits

commit:     56600eaf597801b98a3d9cf16069735a094584da
Author:     Mark Wright <gienah <AT> gentoo <DOT> org>
AuthorDate: Tue Feb  9 12:17:03 2016 +0000
Commit:     Mark Wright <gienah <AT> gentoo <DOT> org>
CommitDate: Tue Feb  9 12:17:03 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=56600eaf

dev-java/sbt: Thanks to _flow_ for reporting, upstream changed sbt-launch binary

Package-Manager: portage-2.2.27

 dev-java/sbt/Manifest | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/sbt/Manifest b/dev-java/sbt/Manifest
index 71dcd3f..df04a94 100644
--- a/dev-java/sbt/Manifest
+++ b/dev-java/sbt/Manifest
@@ -9,4 +9,4 @@ DIST sbt-0.13.8-sbt-deps.tar.bz2 88352931 SHA256 d0eab3858f389e201277d1ead683521
 DIST sbt-0.13.8-src.tar.bz2 32766054 SHA256 5225864c54e5718dc68cfcd554a7215bd028947d61ed9522e2ad9d0a19cbdd83 SHA512 f6c834c6294c957e8d5b89a3a616f23a980cca1f882695d09a6e0080d1013227ba3bac86942b39c13e49fb6ac9fb72c3478df24ec8549b8b9812ea352932fff8 WHIRLPOOL 5054578505fe35b6c5f269c72b921920cf232a1efed18da5cd1833457d46f4e4342988be46539001b4dcfcfc6c807785915f4d0791af939dc83018ffcc03effe
 DIST sbt-0.13.8-test-deps.tar.bz2 40704285 SHA256 7cb252d69b5868905e0592df7ef9a83ce09f75cb10a72bc9dcd649286bb524a3 SHA512 a79ea9c81abc436168f04f674ffef4fee6f7c7a5dede5a3060e2e2bd9a9863dd5f1c7b31c02f3823fb5a67b2bb43c44d306efb59468f625e4db277cface47cd0 WHIRLPOOL 268ea150c5ca2fe1988317e0616262de814e2aa7213f64b99baf389c3e67e2093a04765ac27f08bd585fe33c77d9dd8c7a0ba8d3bd77d937d9a7260dab72c23a
 DIST sbt-launch-0.13.7.jar 1208385 SHA256 6570bb03df6138ffaa7ac0bbe35eb4ea79062d1146b6929c75cf238d14dd9158 SHA512 ddc62dd85b552a7157ae0c19d0161d77a929adeb4ea81042a3a38c3d979e32674b9174aef47d458e9a7c8ea7942c08f1a7177b9bc739f7cd9e0484aef9915204 WHIRLPOOL 63841a401739aa3eab24632fcec41dc5c186502f4b80fe782106a0c6448b1da2321bf2a7a0b0f83473f7c073cce2ac8f5f85440d955acc191a73bd95200cb2cf
-DIST sbt-launch-0.13.9.jar 1210236 SHA256 06ca058181d73f4eceb193b97b02bc9fb02df0fb0fa3acb142cc425ffefb2fb3 SHA512 5d404cdb81ad5f64d3ca75695246f452bccb2200ce28333f0e37eed3476feeb7e9a693f468ab13ed507036b02172b1ae8218506c9e117ee4e3d4cedd8bcd3c9d WHIRLPOOL 5c2404c4156c83585fcc35eded27baa3f785acd752d9ec1d436eb329f9b12d318aab4913c14fdbd229950d052a142267e806eeb29846977da9980264c487b2fe
+DIST sbt-launch-0.13.9.jar 1210236 SHA256 4fddf384322c8aa02671ab89e229ab1e703613eee350e3af6c7790916d43f96d SHA512 c447e7be5b18689e4821dbde699fba230214a34059aa38441dcff13938d3cb351f1bd4266d99a2dcd40a80a7c623a14483755a461417750ab60635ab73c2fdde WHIRLPOOL 61806d9140b9b64b8a60f5f6a0e5d16bb6b16e643185b874780af0b3b32a9e62311d86e4a3fc3526735eb590a1a98f00881e60789c5b079521da660aea319171


^ permalink raw reply related	[flat|nested] 21+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-java/sbt/
@ 2016-02-13  0:06 Mark Wright
  0 siblings, 0 replies; 21+ messages in thread
From: Mark Wright @ 2016-02-13  0:06 UTC (permalink / raw
  To: gentoo-commits

commit:     6a34fd5778f396b63dfce7cef5fffc3e4b1ae13a
Author:     Mark Wright <gienah <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 13 00:05:35 2016 +0000
Commit:     Mark Wright <gienah <AT> gentoo <DOT> org>
CommitDate: Sat Feb 13 00:05:35 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a34fd57

dev-java/sbt: Thanks to angry_vincent for reporting, Chewi for fix: RDEPEND >=virtual/jre-1.7

As the eclass does not like RDEPEND="|| ( virtual/jre:1.7 virtual/jre:1.8 )"

Package-Manager: portage-2.2.27

 dev-java/sbt/sbt-0.13.10_rc2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/sbt/sbt-0.13.10_rc2.ebuild b/dev-java/sbt/sbt-0.13.10_rc2.ebuild
index 86defae..cf80d0f 100644
--- a/dev-java/sbt/sbt-0.13.10_rc2.ebuild
+++ b/dev-java/sbt/sbt-0.13.10_rc2.ebuild
@@ -39,7 +39,7 @@ IUSE="binary"
 
 DEPEND="virtual/jdk:1.7
 	>=dev-lang/scala-2.10.6:${SV}"
-RDEPEND="|| ( virtual/jre:1.7 virtual/jre:1.8 )
+RDEPEND=">=virtual/jre-1.7
 	dev-lang/scala:*"
 
 # test hangs or fails


^ permalink raw reply related	[flat|nested] 21+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-java/sbt/
@ 2016-02-23 13:45 Mark Wright
  0 siblings, 0 replies; 21+ messages in thread
From: Mark Wright @ 2016-02-23 13:45 UTC (permalink / raw
  To: gentoo-commits

commit:     cc12259f2c6c10bfdb780156b1f0e31008749f1e
Author:     Mark Wright <gienah <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 23 13:44:10 2016 +0000
Commit:     Mark Wright <gienah <AT> gentoo <DOT> org>
CommitDate: Tue Feb 23 13:44:10 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc12259f

dev-java/sbt: Bump to 0.13.11, allow building with jdk 1.8.

Thanks to Christian Strahl for the bump request 562904 and Pavel Kozlov for
reporting 560810 requesting allowing building with jdk 1.8.

Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=562904
Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=560810

Package-Manager: portage-2.2.27

 dev-java/sbt/Manifest           |   5 ++
 dev-java/sbt/sbt-0.13.11.ebuild | 153 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 158 insertions(+)

diff --git a/dev-java/sbt/Manifest b/dev-java/sbt/Manifest
index df04a94..e525e64 100644
--- a/dev-java/sbt/Manifest
+++ b/dev-java/sbt/Manifest
@@ -3,10 +3,15 @@ DIST sbt-0.13.10_rc2-ivy2-deps.tar.bz2 139970194 SHA256 b3ef28fbc330d8b8218712a4
 DIST sbt-0.13.10_rc2-sbt-deps.tar.bz2 38778951 SHA256 f2be26d49010fa521b4a0e9a112c465107838f5250883de4bc132926ccd685fa SHA512 c929562d18e2e5032d502556a960b25fa707c2893172425c2c3b5365a86ccd63729ce8795f12fd1aced5b39267f6db4b8e9d0c1eaf00ba20b071fac9044157f8 WHIRLPOOL b75096e0b2429a104b548e601e06fc5b3e452bda39d4fc434d8f98137275899a5c40ac2bb528324dd621eef4aa17e952648c9698cc4eeedd6e8aeb391509db16
 DIST sbt-0.13.10_rc2-src.tar.bz2 35017169 SHA256 c34051649a8c998a98d5ff401e622d6c3e54fc15b6e1aeac7e223c5ff8ce54aa SHA512 7e734fdecc631cc0307c09e6706b761dd55d1cb6a03aa29a0cd5826d86bfa44dde29ebc05bca7f947351a6b6510caef51d0c3df2b07d60895b41f074c319d1b8 WHIRLPOOL de34b47a87af7f77a2ee00230901cf21015312359f29cff8689692b7c9d2f148a8233224a3b5b488c63a55cde695b0928000938e6608c1437e4be2287ddc026d
 DIST sbt-0.13.10_rc2-test-deps.tar.bz2 266656 SHA256 62d0ed5b43898a42696f8b148e933d70871c2f75bf3f6b20ac39cea00b327f17 SHA512 7e30459f010eb9c8ffba8e8e4da90bcb7d03cdd4347e63d0207a9bf9b9ddeb38b68d2798c98452ea81bcddc9973e287066603ce06ebadf56c006f25e76fdb57d WHIRLPOOL e4c06db36cc2b0e4417a81c961bc470caa169e358734ab7f7b71103547286704e6cfd104fe342afd7df0270300073a695ee35342944e25a65e96bd036bb5a953
+DIST sbt-0.13.11-gentoo-binary.tar.bz2 144170371 SHA256 ca13e6d5751de14ac0fe3542f80c42c3dc74fabd3f897455b8f93391ab465f08 SHA512 705f8a5e3065ee6d88ca0044a1e0b55856e4cf167172fc3102503ff28b0992bc918da9ab8541320474abe7dd4956d2a0d33df1709894bace225993e32b85b667 WHIRLPOOL 0b94e74ebb827d9517d621606321e8fd0ca72c74b6f40776248e1bbcdf64e328c3bf83ece4c37adbbdaadb273f0951275a21d278ea3307e904a76c44809b4321
+DIST sbt-0.13.11-ivy2-deps.tar.bz2 139796284 SHA256 d8ad25a99e1dd8ebbc29955844543a1cee8bbd845cca9bb4fa92b62c27673a29 SHA512 e431e00884dbf58ca911d64da726b41b8aeae9987ae2725705c9c45b4601162e45d310f933e4214cf8a4d21ba9e7207365d9ba352cbe1511ce09f59cd33da033 WHIRLPOOL b56ba91892ee2dbb1d9d9609ffd8417184e291fa8c03f8a115757301c412a8d141a17ae315ac916067bab5b49d74f16cb82da497c8790c212f3ccc068721e24f
+DIST sbt-0.13.11-sbt-deps.tar.bz2 38783848 SHA256 c2059a2513cbee50afe506d1fb0511b384df99757273d941b136e5bb3155ca7e SHA512 53020538eac11d6ae268436987d98093f017f421750496080908fad36eb9148a4cce41ab1a231ff1a35868c5c07cc8e338f1793fc91d044802b3e95b900e9cc8 WHIRLPOOL 0e4617b728536be9adfcf683b1575a522c5c0f073098c7f685003f0a340bfc4fff06031252016227b8af38f666296185815508b89bb7e82334276e55c707e16e
+DIST sbt-0.13.11-src.tar.bz2 35163092 SHA256 1b987725b4e57d6139b02c9d43b18d6ec43880681cccdfca3a29c803e79f6494 SHA512 95065c452fbbf2a206ad8d8518f083abe608e8bad1075848fa7a4ad797e8a10e4127823cdb8502f4d9bd0eb01867298af7d69895eb1470bf71deba354871dd86 WHIRLPOOL 652ba691ea2dccf6eb22ea2b43d9b96e15597cb8ce2325eacd912752a60854f982e1a6fec8c049e144042c10e98b888a66b3fe923c63447ef46e6582786e4a81
 DIST sbt-0.13.8-gentoo-binary.tar.bz2 1048674 SHA256 4a2b22c9d9fbe922d5a5336d88ca21f18b2545850fec16485c824aee43df53e1 SHA512 9a5707601387d604b746ea21145a3c7735dd4b6d36541111b47519b66e5abc929ecc96ff52e144ed39a3db947204a1956e19394a1848e3fd8904f9a98ec24816 WHIRLPOOL 4fb1bde15ab57260a25b0a4a1634122af2e2b9d6cd35d3a9c693d9bba6c398bee489f05bf29a763a60d7a04f54823bdd9fc54ec5a2809900b28f890930649fc7
 DIST sbt-0.13.8-ivy2-deps.tar.bz2 124672043 SHA256 565ba7434316a3ab2f61f58b4bc57317e5c2ae7c9ee95061c39cfddd5767a355 SHA512 47b2f235b7d5883086f8246265e9081a50dcdaede43550a1c0de1c85a9ebf24b47e1331b662aa5c0faebaf22a37849ffb2c1f25a7592c461e62f582984ad4b70 WHIRLPOOL f92b2cd087d51f0ae31d5ac93d1dca7214ace6df8c06b050287007f05697e81ac14758368730e6df45043ba80167b9581e636b0364d5ba3a5c7352fafd7e5007
 DIST sbt-0.13.8-sbt-deps.tar.bz2 88352931 SHA256 d0eab3858f389e201277d1ead68352172830b17dd8343f09e0e63e4880a5e20e SHA512 a6e886f5f18821c26df28a2e8cf2773b4841854fc1bd4dfa43924089966020da5affd635da96a8e13efc7c06be6a5bf53697ca91f5fbf41efcdf8dda00e8428d WHIRLPOOL 54744676b33b11ffb350b5a543986efd5cd629594ce4bac5154a78df233619a92a2a4842659acf9c15533e764d24333183372f136b3b1f7463bbe55347c41b8f
 DIST sbt-0.13.8-src.tar.bz2 32766054 SHA256 5225864c54e5718dc68cfcd554a7215bd028947d61ed9522e2ad9d0a19cbdd83 SHA512 f6c834c6294c957e8d5b89a3a616f23a980cca1f882695d09a6e0080d1013227ba3bac86942b39c13e49fb6ac9fb72c3478df24ec8549b8b9812ea352932fff8 WHIRLPOOL 5054578505fe35b6c5f269c72b921920cf232a1efed18da5cd1833457d46f4e4342988be46539001b4dcfcfc6c807785915f4d0791af939dc83018ffcc03effe
 DIST sbt-0.13.8-test-deps.tar.bz2 40704285 SHA256 7cb252d69b5868905e0592df7ef9a83ce09f75cb10a72bc9dcd649286bb524a3 SHA512 a79ea9c81abc436168f04f674ffef4fee6f7c7a5dede5a3060e2e2bd9a9863dd5f1c7b31c02f3823fb5a67b2bb43c44d306efb59468f625e4db277cface47cd0 WHIRLPOOL 268ea150c5ca2fe1988317e0616262de814e2aa7213f64b99baf389c3e67e2093a04765ac27f08bd585fe33c77d9dd8c7a0ba8d3bd77d937d9a7260dab72c23a
+DIST sbt-launch-0.13.11.jar 1210231 SHA256 c63ade35a7a7aa0d8e3bdc7c2353ce79b045083cfabf6bc6fab88584f6100bc1 SHA512 9db3d3e953e4246b09ce2265b76463b6000c6d1c9d1328eb0deb1b67e9c955816ef67f6aeaeca22dc46e27cc71ba833545ab39c5351b8230609c021ca9e818b9 WHIRLPOOL 6650144da7aef195779c4d23c594fee9c7f79e7b2758bb2c98c83732f75656b0143ec73023a98677201502a813c0e37bbec48cebbc6fe520484ec6bd53fb4019
 DIST sbt-launch-0.13.7.jar 1208385 SHA256 6570bb03df6138ffaa7ac0bbe35eb4ea79062d1146b6929c75cf238d14dd9158 SHA512 ddc62dd85b552a7157ae0c19d0161d77a929adeb4ea81042a3a38c3d979e32674b9174aef47d458e9a7c8ea7942c08f1a7177b9bc739f7cd9e0484aef9915204 WHIRLPOOL 63841a401739aa3eab24632fcec41dc5c186502f4b80fe782106a0c6448b1da2321bf2a7a0b0f83473f7c073cce2ac8f5f85440d955acc191a73bd95200cb2cf
 DIST sbt-launch-0.13.9.jar 1210236 SHA256 4fddf384322c8aa02671ab89e229ab1e703613eee350e3af6c7790916d43f96d SHA512 c447e7be5b18689e4821dbde699fba230214a34059aa38441dcff13938d3cb351f1bd4266d99a2dcd40a80a7c623a14483755a461417750ab60635ab73c2fdde WHIRLPOOL 61806d9140b9b64b8a60f5f6a0e5d16bb6b16e643185b874780af0b3b32a9e62311d86e4a3fc3526735eb590a1a98f00881e60789c5b079521da660aea319171

diff --git a/dev-java/sbt/sbt-0.13.11.ebuild b/dev-java/sbt/sbt-0.13.11.ebuild
new file mode 100644
index 0000000..991ac86
--- /dev/null
+++ b/dev-java/sbt/sbt-0.13.11.ebuild
@@ -0,0 +1,153 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+# repoman gives LIVEVCS.unmasked even with EGIT_COMMIT, so create snapshot
+inherit eutils java-pkg-2 # git-r3
+
+MY_PV="0.13.11"
+
+L_PN="sbt-launch"
+L_P="${L_PN}-${MY_PV}"
+
+SV="2.10"
+
+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://dev.gentoo.org/~gienah/snapshots/${P}-src.tar.bz2
+	https://dev.gentoo.org/~gienah/snapshots/${P}-ivy2-deps.tar.bz2
+	https://dev.gentoo.org/~gienah/snapshots/${P}-sbt-deps.tar.bz2
+	http://repo.typesafe.com/typesafe/ivy-releases/org.scala-sbt/${L_PN}/${MY_PV}/${L_PN}.jar -> ${L_P}.jar
+)
+binary? ( https://dev.gentoo.org/~gienah/files/dist/${P}-gentoo-binary.tar.bz2 )
+"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="binary"
+
+DEPEND=">=virtual/jdk-1.7
+	>=dev-lang/scala-2.10.6:${SV}"
+RDEPEND=">=virtual/jre-1.7
+	dev-lang/scala:*"
+
+# test hangs or fails
+RESTRICT="test"
+
+# Note: to bump sbt, some things to try are:
+# 1. Create the sbt src snapshot:
+# git clone https://github.com/sbt/sbt.git sbt-0.13.11
+# cd sbt-0.13.11
+# git checkout v0.13.11
+# cd ..
+# tar --owner=portage --group=portage -cjf /usr/portage/distfiles/sbt-0.13.11-src.tar.bz2 \
+# sbt-0.13.11
+# 2. remove the https://dev.gentoo.org/~gienah/snapshots/${P}-ivy2-deps.tar.bz2
+# https://dev.gentoo.org/~gienah/snapshots/${P}-sbt-deps.tar.bz2 and
+# https://dev.gentoo.org/~gienah/snapshots/${P}-test-deps.tar.bz2
+# binary? ( https://dev.gentoo.org/~gienah/files/dist/${P}-gentoo-binary.tar.bz2 )
+# 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 (with jdk 1.6):
+# cd to ${S}
+# export EROOT=/
+# export WORKDIR='/var/tmp/portage/dev-java/sbt-0.13.11/work'
+# export SV="2.10"
+# export L_P=sbt-0.13.11
+# 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}
+# tar -cjf /usr/portage/distfiles/sbt-0.13.11-ivy2-deps.tar.bz2 .ivy2
+# tar -cjf /usr/portage/distfiles/sbt-0.13.11-sbt-deps.tar.bz2 .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.  Note: src_test creates some files in ${WORKDIR}/.m2 which are can
+# hopefully be ignored. As root:
+# cd ${S}
+# ${S}/sbt-0.13.11 test
+# cd ${WORKDIR}
+# tar --owner=portage --group=portage -cjf /usr/portage/distfiles/sbt-0.13.11-test-deps.tar.bz2 \
+# $(find .ivy2 .sbt -uid 0 -type f -print)
+# Note: It might not download anything in src_test, in which case sbt-0.13.11-test-deps.tar.bz2
+# is not required.
+# 8. Create the binary
+# cd $WORDKIR
+# tar --owner=portage --group=portage -cjf /usr/portage/distfiles/sbt-0.13.11-gentoo-binary.tar.bz2 \
+# sbt-0.13.11 .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
+}
+
+java_prepare() {
+	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 -XX:MaxPermSize=512M"
+			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 -XX:MaxPermSize=512M"
+			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
+		local SCALA_PVR="$(java-config --query=PVR --package=scala-${SV})"
+		local SFV="${SCALA_PVR/-*}"
+		sed -e "s@scalaVersion := \"2.10.4\",@scalaVersion := \"${SFV}\",\n  scalaHome := Some(file(\"/usr/share/scala-${SV}\")),@" \
+			-i "${S}/build.sbt" || die
+	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() {
+	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() {
+	# 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_current-vm-matches "1.7" && ja+=" -XX:MaxPermSize=512M"
+	java-pkg_dolauncher sbt --jar sbt-launch.jar --java_args "${ja}"
+}


^ permalink raw reply related	[flat|nested] 21+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-java/sbt/
@ 2016-12-28 21:54 Mark Wright
  0 siblings, 0 replies; 21+ messages in thread
From: Mark Wright @ 2016-12-28 21:54 UTC (permalink / raw
  To: gentoo-commits

commit:     3ad01901931f6a7b47b50b66ae882fd2dd3f15b5
Author:     Mark Wright <gienah <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 28 21:54:19 2016 +0000
Commit:     Mark Wright <gienah <AT> gentoo <DOT> org>
CommitDate: Wed Dec 28 21:54:19 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ad01901

dev-java/sbt: Bump to 0.13.13, built with jdk 1.8.

Gentoo-bug: 585262

Package-Manager: portage-2.3.3

 dev-java/sbt/Manifest           |   5 ++
 dev-java/sbt/sbt-0.13.13.ebuild | 162 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 167 insertions(+)

diff --git a/dev-java/sbt/Manifest b/dev-java/sbt/Manifest
index e525e64..868d280 100644
--- a/dev-java/sbt/Manifest
+++ b/dev-java/sbt/Manifest
@@ -7,11 +7,16 @@ DIST sbt-0.13.11-gentoo-binary.tar.bz2 144170371 SHA256 ca13e6d5751de14ac0fe3542
 DIST sbt-0.13.11-ivy2-deps.tar.bz2 139796284 SHA256 d8ad25a99e1dd8ebbc29955844543a1cee8bbd845cca9bb4fa92b62c27673a29 SHA512 e431e00884dbf58ca911d64da726b41b8aeae9987ae2725705c9c45b4601162e45d310f933e4214cf8a4d21ba9e7207365d9ba352cbe1511ce09f59cd33da033 WHIRLPOOL b56ba91892ee2dbb1d9d9609ffd8417184e291fa8c03f8a115757301c412a8d141a17ae315ac916067bab5b49d74f16cb82da497c8790c212f3ccc068721e24f
 DIST sbt-0.13.11-sbt-deps.tar.bz2 38783848 SHA256 c2059a2513cbee50afe506d1fb0511b384df99757273d941b136e5bb3155ca7e SHA512 53020538eac11d6ae268436987d98093f017f421750496080908fad36eb9148a4cce41ab1a231ff1a35868c5c07cc8e338f1793fc91d044802b3e95b900e9cc8 WHIRLPOOL 0e4617b728536be9adfcf683b1575a522c5c0f073098c7f685003f0a340bfc4fff06031252016227b8af38f666296185815508b89bb7e82334276e55c707e16e
 DIST sbt-0.13.11-src.tar.bz2 35163092 SHA256 1b987725b4e57d6139b02c9d43b18d6ec43880681cccdfca3a29c803e79f6494 SHA512 95065c452fbbf2a206ad8d8518f083abe608e8bad1075848fa7a4ad797e8a10e4127823cdb8502f4d9bd0eb01867298af7d69895eb1470bf71deba354871dd86 WHIRLPOOL 652ba691ea2dccf6eb22ea2b43d9b96e15597cb8ce2325eacd912752a60854f982e1a6fec8c049e144042c10e98b888a66b3fe923c63447ef46e6582786e4a81
+DIST sbt-0.13.13-gentoo-binary.tar.xz 58011476 SHA256 5d24c07945c713e265e40634b5e4bf8ff34ecfed2e87df1f5f65e8d907b4a268 SHA512 9763b67ac4838e6ccac1848c17a03608bed61669671a10c93afc4c81d6dad06a3463ac4e4a9b7b3fb91325df5df6e0148847669d482e3cacf4fde957c110ccc1 WHIRLPOOL c1b30ccc325a11b9886de9c0d2ffcd71acd7b15a352faea20e7c8cd2ae0a2a7b7a933f7b795a417f6a64837912a2b287b5e3e91e1c428ce604c708c3549362f3
+DIST sbt-0.13.13-ivy2-deps.tar.xz 121677604 SHA256 71dc4487a7fb203750230fb7ddbda5b2b12dad6d1e9f2ed5d2bec36df962799b SHA512 3301447a563e9a83431bb67a6281a6045630669012f1cc5cdde7a2cbae3f7db75f87abed003ecf8243fd230e2adea2ba3666468358ae29c51e346940235f5ed5 WHIRLPOOL a6e66fb56e85b923142cf2fdb9867fe8f75200db01285c5e7f32f391573bf39c68be7f022f80eb679b15442c4425e87111878d0c93e8ddc0e7d4dca1f11eb909
+DIST sbt-0.13.13-sbt-deps.tar.xz 34750700 SHA256 a5897a610393c0d2004badbf82ebd40469f85f29b5d29f6a3d76b8ecfbe73776 SHA512 0bfd35a6926545da7340f7ee72e420121f2bb2f83d98d420b7f65b465d207b1b30a48788914e7b1fdf575a4fee870f2632b0717f1a7a2c19e2f2d5794d08b4da WHIRLPOOL 6b1b70b705ea613074a111e7a6cfbc2b31fd91645701f0018120ced4bd678c71e8a785922ece74111648d6ada89bfe714a4e95cb9b513fb409349967ed60d779
+DIST sbt-0.13.13-src.tar.xz 35911028 SHA256 1344e49fe870f755ab872f51368f9d939a0076e24c03bd1f7f600e10db8210be SHA512 351f18108a23014ee7ffd5c4713f390728fb98b742efdc139e094e64df7800f399d088600d245631635b0f6f4cb69c6cd327aafa3b0bf8a233fcbf0cb4ac5702 WHIRLPOOL 7998c7e95bd9c85c3b25a2c9ea584cab7651508e90e30304ede1744ca56d41d25b2b095e397c3af52025683e6cf3fb54b6992f438545f3fc8d5afc54308c33d2
 DIST sbt-0.13.8-gentoo-binary.tar.bz2 1048674 SHA256 4a2b22c9d9fbe922d5a5336d88ca21f18b2545850fec16485c824aee43df53e1 SHA512 9a5707601387d604b746ea21145a3c7735dd4b6d36541111b47519b66e5abc929ecc96ff52e144ed39a3db947204a1956e19394a1848e3fd8904f9a98ec24816 WHIRLPOOL 4fb1bde15ab57260a25b0a4a1634122af2e2b9d6cd35d3a9c693d9bba6c398bee489f05bf29a763a60d7a04f54823bdd9fc54ec5a2809900b28f890930649fc7
 DIST sbt-0.13.8-ivy2-deps.tar.bz2 124672043 SHA256 565ba7434316a3ab2f61f58b4bc57317e5c2ae7c9ee95061c39cfddd5767a355 SHA512 47b2f235b7d5883086f8246265e9081a50dcdaede43550a1c0de1c85a9ebf24b47e1331b662aa5c0faebaf22a37849ffb2c1f25a7592c461e62f582984ad4b70 WHIRLPOOL f92b2cd087d51f0ae31d5ac93d1dca7214ace6df8c06b050287007f05697e81ac14758368730e6df45043ba80167b9581e636b0364d5ba3a5c7352fafd7e5007
 DIST sbt-0.13.8-sbt-deps.tar.bz2 88352931 SHA256 d0eab3858f389e201277d1ead68352172830b17dd8343f09e0e63e4880a5e20e SHA512 a6e886f5f18821c26df28a2e8cf2773b4841854fc1bd4dfa43924089966020da5affd635da96a8e13efc7c06be6a5bf53697ca91f5fbf41efcdf8dda00e8428d WHIRLPOOL 54744676b33b11ffb350b5a543986efd5cd629594ce4bac5154a78df233619a92a2a4842659acf9c15533e764d24333183372f136b3b1f7463bbe55347c41b8f
 DIST sbt-0.13.8-src.tar.bz2 32766054 SHA256 5225864c54e5718dc68cfcd554a7215bd028947d61ed9522e2ad9d0a19cbdd83 SHA512 f6c834c6294c957e8d5b89a3a616f23a980cca1f882695d09a6e0080d1013227ba3bac86942b39c13e49fb6ac9fb72c3478df24ec8549b8b9812ea352932fff8 WHIRLPOOL 5054578505fe35b6c5f269c72b921920cf232a1efed18da5cd1833457d46f4e4342988be46539001b4dcfcfc6c807785915f4d0791af939dc83018ffcc03effe
 DIST sbt-0.13.8-test-deps.tar.bz2 40704285 SHA256 7cb252d69b5868905e0592df7ef9a83ce09f75cb10a72bc9dcd649286bb524a3 SHA512 a79ea9c81abc436168f04f674ffef4fee6f7c7a5dede5a3060e2e2bd9a9863dd5f1c7b31c02f3823fb5a67b2bb43c44d306efb59468f625e4db277cface47cd0 WHIRLPOOL 268ea150c5ca2fe1988317e0616262de814e2aa7213f64b99baf389c3e67e2093a04765ac27f08bd585fe33c77d9dd8c7a0ba8d3bd77d937d9a7260dab72c23a
 DIST sbt-launch-0.13.11.jar 1210231 SHA256 c63ade35a7a7aa0d8e3bdc7c2353ce79b045083cfabf6bc6fab88584f6100bc1 SHA512 9db3d3e953e4246b09ce2265b76463b6000c6d1c9d1328eb0deb1b67e9c955816ef67f6aeaeca22dc46e27cc71ba833545ab39c5351b8230609c021ca9e818b9 WHIRLPOOL 6650144da7aef195779c4d23c594fee9c7f79e7b2758bb2c98c83732f75656b0143ec73023a98677201502a813c0e37bbec48cebbc6fe520484ec6bd53fb4019
+DIST sbt-launch-0.13.13.jar 1210231 SHA256 9cd7d56eabfb15b5fe68c39116c4cfe6379b5b260d63086d4f5c69fa62521c13 SHA512 78e7ce21c610e83a532b04491e13d53b4193205328adce473252d523fe0ca0f3892dba900f01ff6e28d94a17c3ba1ebbe7d85fd6ce9900c48263bc4816da37ef WHIRLPOOL 20e0cd1bd836cee2b4aaee8af8d1e29812211dc5e9ecda4b058a64c26c607c7645285949751f84ea95e68cee2bfaa4cce14b14c2d602e40d9db967bf8a094217
 DIST sbt-launch-0.13.7.jar 1208385 SHA256 6570bb03df6138ffaa7ac0bbe35eb4ea79062d1146b6929c75cf238d14dd9158 SHA512 ddc62dd85b552a7157ae0c19d0161d77a929adeb4ea81042a3a38c3d979e32674b9174aef47d458e9a7c8ea7942c08f1a7177b9bc739f7cd9e0484aef9915204 WHIRLPOOL 63841a401739aa3eab24632fcec41dc5c186502f4b80fe782106a0c6448b1da2321bf2a7a0b0f83473f7c073cce2ac8f5f85440d955acc191a73bd95200cb2cf
 DIST sbt-launch-0.13.9.jar 1210236 SHA256 4fddf384322c8aa02671ab89e229ab1e703613eee350e3af6c7790916d43f96d SHA512 c447e7be5b18689e4821dbde699fba230214a34059aa38441dcff13938d3cb351f1bd4266d99a2dcd40a80a7c623a14483755a461417750ab60635ab73c2fdde WHIRLPOOL 61806d9140b9b64b8a60f5f6a0e5d16bb6b16e643185b874780af0b3b32a9e62311d86e4a3fc3526735eb590a1a98f00881e60789c5b079521da660aea319171

diff --git a/dev-java/sbt/sbt-0.13.13.ebuild b/dev-java/sbt/sbt-0.13.13.ebuild
new file mode 100644
index 00000000..a6753ad
--- /dev/null
+++ b/dev-java/sbt/sbt-0.13.13.ebuild
@@ -0,0 +1,162 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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.11"
+
+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://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-2.11.8:${SV}"
+RDEPEND=">=virtual/jre-1.8
+	>=dev-lang/scala-2.11.8:${SV}"
+
+# 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}"
+}


^ permalink raw reply related	[flat|nested] 21+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-java/sbt/
@ 2017-11-05 13:56 James Le Cuirot
  0 siblings, 0 replies; 21+ messages in thread
From: James Le Cuirot @ 2017-11-05 13:56 UTC (permalink / raw
  To: gentoo-commits

commit:     3bd6bb4252da32787d1748d4d26bc6fda25453b8
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Fri Sep  1 19:48:40 2017 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sun Nov  5 13:50:41 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3bd6bb42

dev-java/sbt: Drop old versions requiring Java 7

Package-Manager: Portage-2.3.8, Repoman-2.3.2

 dev-java/sbt/Manifest               |  17 ----
 dev-java/sbt/sbt-0.13.10_rc2.ebuild | 153 ------------------------------------
 dev-java/sbt/sbt-0.13.11.ebuild     | 152 -----------------------------------
 dev-java/sbt/sbt-0.13.8-r1.ebuild   | 150 -----------------------------------
 4 files changed, 472 deletions(-)

diff --git a/dev-java/sbt/Manifest b/dev-java/sbt/Manifest
index 868d280d59b..35f4f087324 100644
--- a/dev-java/sbt/Manifest
+++ b/dev-java/sbt/Manifest
@@ -1,22 +1,5 @@
-DIST sbt-0.13.10_rc2-gentoo-binary.tar.bz2 66131831 SHA256 863cf71b32439e452e1d5400a8ec1ac06a9c29852c7eafb79ce9ce2b1288a321 SHA512 1b25c47fa01462bdbd1a88d5b441226ba8261f83a4ef6ce2832c5e752cd90e8eacf6f0272505f2e5330f1e9b3bedb71e4d83da81952e08d8144a52e22dc26008 WHIRLPOOL b300931a4b516f7aa4f5984ea17e9d2d022e52dd4d4468b777b8b88c949d22c2eb9702c3883ef0a9eff6fd52542668c2ba041d4f12ab56603c6fcfe444d9c9bb
-DIST sbt-0.13.10_rc2-ivy2-deps.tar.bz2 139970194 SHA256 b3ef28fbc330d8b8218712a4ff6ad11a3ed67c618b99df1845edb17d67e5ca3a SHA512 e7023798a303e37b282fe08590516031f7952d4df6d2aa4792c727e9d50000e1e1c4f9e97d656abc32f84f8b0df9b2de7e15e29bb2c7ed648efcad8ae432cff4 WHIRLPOOL 48860777b2ffabbdf33800a3897727b91e7487430138177b39174276506bcef2b4c810c1858bfa158ee83953d4de8e61085022037518fbb733339b5e7c0a4801
-DIST sbt-0.13.10_rc2-sbt-deps.tar.bz2 38778951 SHA256 f2be26d49010fa521b4a0e9a112c465107838f5250883de4bc132926ccd685fa SHA512 c929562d18e2e5032d502556a960b25fa707c2893172425c2c3b5365a86ccd63729ce8795f12fd1aced5b39267f6db4b8e9d0c1eaf00ba20b071fac9044157f8 WHIRLPOOL b75096e0b2429a104b548e601e06fc5b3e452bda39d4fc434d8f98137275899a5c40ac2bb528324dd621eef4aa17e952648c9698cc4eeedd6e8aeb391509db16
-DIST sbt-0.13.10_rc2-src.tar.bz2 35017169 SHA256 c34051649a8c998a98d5ff401e622d6c3e54fc15b6e1aeac7e223c5ff8ce54aa SHA512 7e734fdecc631cc0307c09e6706b761dd55d1cb6a03aa29a0cd5826d86bfa44dde29ebc05bca7f947351a6b6510caef51d0c3df2b07d60895b41f074c319d1b8 WHIRLPOOL de34b47a87af7f77a2ee00230901cf21015312359f29cff8689692b7c9d2f148a8233224a3b5b488c63a55cde695b0928000938e6608c1437e4be2287ddc026d
-DIST sbt-0.13.10_rc2-test-deps.tar.bz2 266656 SHA256 62d0ed5b43898a42696f8b148e933d70871c2f75bf3f6b20ac39cea00b327f17 SHA512 7e30459f010eb9c8ffba8e8e4da90bcb7d03cdd4347e63d0207a9bf9b9ddeb38b68d2798c98452ea81bcddc9973e287066603ce06ebadf56c006f25e76fdb57d WHIRLPOOL e4c06db36cc2b0e4417a81c961bc470caa169e358734ab7f7b71103547286704e6cfd104fe342afd7df0270300073a695ee35342944e25a65e96bd036bb5a953
-DIST sbt-0.13.11-gentoo-binary.tar.bz2 144170371 SHA256 ca13e6d5751de14ac0fe3542f80c42c3dc74fabd3f897455b8f93391ab465f08 SHA512 705f8a5e3065ee6d88ca0044a1e0b55856e4cf167172fc3102503ff28b0992bc918da9ab8541320474abe7dd4956d2a0d33df1709894bace225993e32b85b667 WHIRLPOOL 0b94e74ebb827d9517d621606321e8fd0ca72c74b6f40776248e1bbcdf64e328c3bf83ece4c37adbbdaadb273f0951275a21d278ea3307e904a76c44809b4321
-DIST sbt-0.13.11-ivy2-deps.tar.bz2 139796284 SHA256 d8ad25a99e1dd8ebbc29955844543a1cee8bbd845cca9bb4fa92b62c27673a29 SHA512 e431e00884dbf58ca911d64da726b41b8aeae9987ae2725705c9c45b4601162e45d310f933e4214cf8a4d21ba9e7207365d9ba352cbe1511ce09f59cd33da033 WHIRLPOOL b56ba91892ee2dbb1d9d9609ffd8417184e291fa8c03f8a115757301c412a8d141a17ae315ac916067bab5b49d74f16cb82da497c8790c212f3ccc068721e24f
-DIST sbt-0.13.11-sbt-deps.tar.bz2 38783848 SHA256 c2059a2513cbee50afe506d1fb0511b384df99757273d941b136e5bb3155ca7e SHA512 53020538eac11d6ae268436987d98093f017f421750496080908fad36eb9148a4cce41ab1a231ff1a35868c5c07cc8e338f1793fc91d044802b3e95b900e9cc8 WHIRLPOOL 0e4617b728536be9adfcf683b1575a522c5c0f073098c7f685003f0a340bfc4fff06031252016227b8af38f666296185815508b89bb7e82334276e55c707e16e
-DIST sbt-0.13.11-src.tar.bz2 35163092 SHA256 1b987725b4e57d6139b02c9d43b18d6ec43880681cccdfca3a29c803e79f6494 SHA512 95065c452fbbf2a206ad8d8518f083abe608e8bad1075848fa7a4ad797e8a10e4127823cdb8502f4d9bd0eb01867298af7d69895eb1470bf71deba354871dd86 WHIRLPOOL 652ba691ea2dccf6eb22ea2b43d9b96e15597cb8ce2325eacd912752a60854f982e1a6fec8c049e144042c10e98b888a66b3fe923c63447ef46e6582786e4a81
 DIST sbt-0.13.13-gentoo-binary.tar.xz 58011476 SHA256 5d24c07945c713e265e40634b5e4bf8ff34ecfed2e87df1f5f65e8d907b4a268 SHA512 9763b67ac4838e6ccac1848c17a03608bed61669671a10c93afc4c81d6dad06a3463ac4e4a9b7b3fb91325df5df6e0148847669d482e3cacf4fde957c110ccc1 WHIRLPOOL c1b30ccc325a11b9886de9c0d2ffcd71acd7b15a352faea20e7c8cd2ae0a2a7b7a933f7b795a417f6a64837912a2b287b5e3e91e1c428ce604c708c3549362f3
 DIST sbt-0.13.13-ivy2-deps.tar.xz 121677604 SHA256 71dc4487a7fb203750230fb7ddbda5b2b12dad6d1e9f2ed5d2bec36df962799b SHA512 3301447a563e9a83431bb67a6281a6045630669012f1cc5cdde7a2cbae3f7db75f87abed003ecf8243fd230e2adea2ba3666468358ae29c51e346940235f5ed5 WHIRLPOOL a6e66fb56e85b923142cf2fdb9867fe8f75200db01285c5e7f32f391573bf39c68be7f022f80eb679b15442c4425e87111878d0c93e8ddc0e7d4dca1f11eb909
 DIST sbt-0.13.13-sbt-deps.tar.xz 34750700 SHA256 a5897a610393c0d2004badbf82ebd40469f85f29b5d29f6a3d76b8ecfbe73776 SHA512 0bfd35a6926545da7340f7ee72e420121f2bb2f83d98d420b7f65b465d207b1b30a48788914e7b1fdf575a4fee870f2632b0717f1a7a2c19e2f2d5794d08b4da WHIRLPOOL 6b1b70b705ea613074a111e7a6cfbc2b31fd91645701f0018120ced4bd678c71e8a785922ece74111648d6ada89bfe714a4e95cb9b513fb409349967ed60d779
 DIST sbt-0.13.13-src.tar.xz 35911028 SHA256 1344e49fe870f755ab872f51368f9d939a0076e24c03bd1f7f600e10db8210be SHA512 351f18108a23014ee7ffd5c4713f390728fb98b742efdc139e094e64df7800f399d088600d245631635b0f6f4cb69c6cd327aafa3b0bf8a233fcbf0cb4ac5702 WHIRLPOOL 7998c7e95bd9c85c3b25a2c9ea584cab7651508e90e30304ede1744ca56d41d25b2b095e397c3af52025683e6cf3fb54b6992f438545f3fc8d5afc54308c33d2
-DIST sbt-0.13.8-gentoo-binary.tar.bz2 1048674 SHA256 4a2b22c9d9fbe922d5a5336d88ca21f18b2545850fec16485c824aee43df53e1 SHA512 9a5707601387d604b746ea21145a3c7735dd4b6d36541111b47519b66e5abc929ecc96ff52e144ed39a3db947204a1956e19394a1848e3fd8904f9a98ec24816 WHIRLPOOL 4fb1bde15ab57260a25b0a4a1634122af2e2b9d6cd35d3a9c693d9bba6c398bee489f05bf29a763a60d7a04f54823bdd9fc54ec5a2809900b28f890930649fc7
-DIST sbt-0.13.8-ivy2-deps.tar.bz2 124672043 SHA256 565ba7434316a3ab2f61f58b4bc57317e5c2ae7c9ee95061c39cfddd5767a355 SHA512 47b2f235b7d5883086f8246265e9081a50dcdaede43550a1c0de1c85a9ebf24b47e1331b662aa5c0faebaf22a37849ffb2c1f25a7592c461e62f582984ad4b70 WHIRLPOOL f92b2cd087d51f0ae31d5ac93d1dca7214ace6df8c06b050287007f05697e81ac14758368730e6df45043ba80167b9581e636b0364d5ba3a5c7352fafd7e5007
-DIST sbt-0.13.8-sbt-deps.tar.bz2 88352931 SHA256 d0eab3858f389e201277d1ead68352172830b17dd8343f09e0e63e4880a5e20e SHA512 a6e886f5f18821c26df28a2e8cf2773b4841854fc1bd4dfa43924089966020da5affd635da96a8e13efc7c06be6a5bf53697ca91f5fbf41efcdf8dda00e8428d WHIRLPOOL 54744676b33b11ffb350b5a543986efd5cd629594ce4bac5154a78df233619a92a2a4842659acf9c15533e764d24333183372f136b3b1f7463bbe55347c41b8f
-DIST sbt-0.13.8-src.tar.bz2 32766054 SHA256 5225864c54e5718dc68cfcd554a7215bd028947d61ed9522e2ad9d0a19cbdd83 SHA512 f6c834c6294c957e8d5b89a3a616f23a980cca1f882695d09a6e0080d1013227ba3bac86942b39c13e49fb6ac9fb72c3478df24ec8549b8b9812ea352932fff8 WHIRLPOOL 5054578505fe35b6c5f269c72b921920cf232a1efed18da5cd1833457d46f4e4342988be46539001b4dcfcfc6c807785915f4d0791af939dc83018ffcc03effe
-DIST sbt-0.13.8-test-deps.tar.bz2 40704285 SHA256 7cb252d69b5868905e0592df7ef9a83ce09f75cb10a72bc9dcd649286bb524a3 SHA512 a79ea9c81abc436168f04f674ffef4fee6f7c7a5dede5a3060e2e2bd9a9863dd5f1c7b31c02f3823fb5a67b2bb43c44d306efb59468f625e4db277cface47cd0 WHIRLPOOL 268ea150c5ca2fe1988317e0616262de814e2aa7213f64b99baf389c3e67e2093a04765ac27f08bd585fe33c77d9dd8c7a0ba8d3bd77d937d9a7260dab72c23a
-DIST sbt-launch-0.13.11.jar 1210231 SHA256 c63ade35a7a7aa0d8e3bdc7c2353ce79b045083cfabf6bc6fab88584f6100bc1 SHA512 9db3d3e953e4246b09ce2265b76463b6000c6d1c9d1328eb0deb1b67e9c955816ef67f6aeaeca22dc46e27cc71ba833545ab39c5351b8230609c021ca9e818b9 WHIRLPOOL 6650144da7aef195779c4d23c594fee9c7f79e7b2758bb2c98c83732f75656b0143ec73023a98677201502a813c0e37bbec48cebbc6fe520484ec6bd53fb4019
 DIST sbt-launch-0.13.13.jar 1210231 SHA256 9cd7d56eabfb15b5fe68c39116c4cfe6379b5b260d63086d4f5c69fa62521c13 SHA512 78e7ce21c610e83a532b04491e13d53b4193205328adce473252d523fe0ca0f3892dba900f01ff6e28d94a17c3ba1ebbe7d85fd6ce9900c48263bc4816da37ef WHIRLPOOL 20e0cd1bd836cee2b4aaee8af8d1e29812211dc5e9ecda4b058a64c26c607c7645285949751f84ea95e68cee2bfaa4cce14b14c2d602e40d9db967bf8a094217
-DIST sbt-launch-0.13.7.jar 1208385 SHA256 6570bb03df6138ffaa7ac0bbe35eb4ea79062d1146b6929c75cf238d14dd9158 SHA512 ddc62dd85b552a7157ae0c19d0161d77a929adeb4ea81042a3a38c3d979e32674b9174aef47d458e9a7c8ea7942c08f1a7177b9bc739f7cd9e0484aef9915204 WHIRLPOOL 63841a401739aa3eab24632fcec41dc5c186502f4b80fe782106a0c6448b1da2321bf2a7a0b0f83473f7c073cce2ac8f5f85440d955acc191a73bd95200cb2cf
-DIST sbt-launch-0.13.9.jar 1210236 SHA256 4fddf384322c8aa02671ab89e229ab1e703613eee350e3af6c7790916d43f96d SHA512 c447e7be5b18689e4821dbde699fba230214a34059aa38441dcff13938d3cb351f1bd4266d99a2dcd40a80a7c623a14483755a461417750ab60635ab73c2fdde WHIRLPOOL 61806d9140b9b64b8a60f5f6a0e5d16bb6b16e643185b874780af0b3b32a9e62311d86e4a3fc3526735eb590a1a98f00881e60789c5b079521da660aea319171

diff --git a/dev-java/sbt/sbt-0.13.10_rc2.ebuild b/dev-java/sbt/sbt-0.13.10_rc2.ebuild
deleted file mode 100644
index 1c85cdff402..00000000000
--- a/dev-java/sbt/sbt-0.13.10_rc2.ebuild
+++ /dev/null
@@ -1,153 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-# repoman gives LIVEVCS.unmasked even with EGIT_COMMIT, so create snapshot
-inherit eutils java-pkg-2 # git-r3
-
-MY_PV="0.13.10-RC2"
-
-L_PN="sbt-launch"
-L_P="${L_PN}-${MY_PV}"
-
-B_PV="0.13.9"
-BL_P="${L_PN}-${B_PV}"
-B_P="${PN}-${B_PV}"
-
-SV="2.10"
-
-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://dev.gentoo.org/~gienah/snapshots/${P}-src.tar.bz2
-	https://dev.gentoo.org/~gienah/snapshots/${P}-ivy2-deps.tar.bz2
-	https://dev.gentoo.org/~gienah/snapshots/${P}-sbt-deps.tar.bz2
-	https://dev.gentoo.org/~gienah/snapshots/${P}-test-deps.tar.bz2
-	http://repo.typesafe.com/typesafe/ivy-releases/org.scala-sbt/${L_PN}/${MY_PV}/${L_PN}.jar -> ${BL_P}.jar
-)
-binary? ( https://dev.gentoo.org/~gienah/files/dist/${P}-gentoo-binary.tar.bz2 )
-"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="binary"
-
-DEPEND="virtual/jdk:1.7
-	>=dev-lang/scala-2.10.6:${SV}"
-RDEPEND=">=virtual/jre-1.7
-	dev-lang/scala:*"
-
-# test hangs or fails
-RESTRICT="test"
-
-# Note: to bump sbt, some things to try are:
-# 1. Create the sbt src snapshot:
-# git clone https://github.com/sbt/sbt.git sbt-0.13.10_rc2
-# cd sbt-0.13.10_rc2
-# git checkout v0.13.10-RC2
-# cd ..
-# tar --owner=portage --group=portage -cjf /usr/portage/distfiles/sbt-0.13.10_rc2-src.tar.bz2 \
-# sbt-0.13.10_rc2
-# 2. remove the https://dev.gentoo.org/~gienah/snapshots/${P}-ivy2-deps.tar.bz2
-# https://dev.gentoo.org/~gienah/snapshots/${P}-sbt-deps.tar.bz2 and
-# https://dev.gentoo.org/~gienah/snapshots/${P}-test-deps.tar.bz2
-# binary? ( https://dev.gentoo.org/~gienah/files/dist/${P}-gentoo-binary.tar.bz2 )
-# 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 (with jdk 1.6):
-# cd to ${S}
-# export EROOT=/
-# export WORKDIR='/var/tmp/portage/dev-java/sbt-0.13.10_rc2/work'
-# export SV="2.10"
-# export B_P=sbt-0.13.10_rc2
-# export PATH="/usr/share/scala-${SV}/bin:${WORKDIR}/${B_P}:${PATH}"
-# sbt compile
-# cd ${WORKDIR}
-# find .ivy2 .sbt -uid 0 -exec chown portage:portage {} \;
-# 6. cd ${WORKDIR}
-# tar -cjf /usr/portage/distfiles/sbt-0.13.10_rc2-ivy2-deps.tar.bz2 .ivy2
-# tar -cjf /usr/portage/distfiles/sbt-0.13.10_rc2-sbt-deps.tar.bz2 .sbt
-# Uncomment the sbt publishLocal line in src_compile.
-# 7. It downloads 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.  Note: src_test creates some files in ${WORKDIR}/.m2 which are can
-# hopefully be ignored. As root:
-# cd ${S}
-# ${S}/sbt-0.13.10_rc2 test
-# cd ${WORKDIR}
-# tar --owner=portage --group=portage -cjf /usr/portage/distfiles/sbt-0.13.10_rc2-test-deps.tar.bz2 \
-# $(find .ivy2 .sbt -uid 0 -type f -print)
-# 8. Create the binary
-# cd $WORDKIR
-# tar --owner=portage --group=portage -cjf /usr/portage/distfiles/sbt-0.13.10_rc2-gentoo-binary.tar.bz2 \
-# sbt-0.13.10_rc2 .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
-}
-
-java_prepare() {
-	if ! use binary; then
-		mkdir "${WORKDIR}/${B_P}" || die
-		cp -p "${DISTDIR}/${BL_P}.jar" "${WORKDIR}/${B_P}/${L_PN}.jar" || die
-		cat <<- EOF > "${WORKDIR}/${B_P}/sbt"
-			#!/bin/sh
-			SBT_OPTS="-Xms512M -Xmx1536M -Xss1M -XX:+CMSClassUnloadingEnabled -XX:MaxPermSize=512M"
-			java -Djavac.args="-encoding UTF-8" -Duser.home="${WORKDIR}" \${SBT_OPTS} -jar "${WORKDIR}/${B_P}/sbt-launch.jar" "\$@"
-		EOF
-		cat <<- EOF > "${S}/${P}"
-			#!/bin/sh
-			SBT_OPTS="-Xms512M -Xmx1536M -Xss1M -XX:+CMSClassUnloadingEnabled -XX:MaxPermSize=512M"
-			java -Djavac.args="-encoding UTF-8" -Duser.home="${WORKDIR}" \${SBT_OPTS} -jar "${S}/launch/target/sbt-launch.jar" "\$@"
-		EOF
-		chmod u+x "${WORKDIR}/${B_P}/sbt" "${S}/${P}" || die
-		local SCALA_PVR="$(java-config --query=PVR --package=scala-${SV})"
-		local SFV="${SCALA_PVR/-*}"
-		sed -e "s@scalaVersion := \"2.10.4\",@scalaVersion := \"${SFV}\",\n  scalaHome := Some(file(\"/usr/share/scala-${SV}\")),@" \
-			-i "${S}/build.sbt" || die
-	fi
-}
-
-src_compile() {
-	if ! use binary; then
-		export PATH="${EROOT}usr/share/scala-${SV}/bin:${WORKDIR}/${B_P}:${PATH}"
-		einfo "=== sbt compile ..."
-		"${WORKDIR}/${B_P}/sbt" -Dsbt.log.noformat=true compile || die
-		einfo "=== sbt publishLocal ..."
-		cat <<- EOF | "${WORKDIR}/${B_P}/sbt" -Dsbt.log.noformat=true || die
-			set every javaVersionPrefix in javaVersionCheck := Some("1.7")
-			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() {
-	# 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)
-	java-pkg_dolauncher sbt --jar sbt-launch.jar --java_args "-Xms512M -Xmx1536M -Xss1M -XX:+CMSClassUnloadingEnabled -XX:MaxPermSize=512M"
-}

diff --git a/dev-java/sbt/sbt-0.13.11.ebuild b/dev-java/sbt/sbt-0.13.11.ebuild
deleted file mode 100644
index e1157a8118a..00000000000
--- a/dev-java/sbt/sbt-0.13.11.ebuild
+++ /dev/null
@@ -1,152 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-# repoman gives LIVEVCS.unmasked even with EGIT_COMMIT, so create snapshot
-inherit eutils java-pkg-2 # git-r3
-
-MY_PV="0.13.11"
-
-L_PN="sbt-launch"
-L_P="${L_PN}-${MY_PV}"
-
-SV="2.10"
-
-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://dev.gentoo.org/~gienah/snapshots/${P}-src.tar.bz2
-	https://dev.gentoo.org/~gienah/snapshots/${P}-ivy2-deps.tar.bz2
-	https://dev.gentoo.org/~gienah/snapshots/${P}-sbt-deps.tar.bz2
-	http://repo.typesafe.com/typesafe/ivy-releases/org.scala-sbt/${L_PN}/${MY_PV}/${L_PN}.jar -> ${L_P}.jar
-)
-binary? ( https://dev.gentoo.org/~gienah/files/dist/${P}-gentoo-binary.tar.bz2 )
-"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="binary"
-
-DEPEND=">=virtual/jdk-1.7
-	>=dev-lang/scala-2.10.6:${SV}"
-RDEPEND=">=virtual/jre-1.7
-	dev-lang/scala:*"
-
-# test hangs or fails
-RESTRICT="test"
-
-# Note: to bump sbt, some things to try are:
-# 1. Create the sbt src snapshot:
-# git clone https://github.com/sbt/sbt.git sbt-0.13.11
-# cd sbt-0.13.11
-# git checkout v0.13.11
-# cd ..
-# tar --owner=portage --group=portage -cjf /usr/portage/distfiles/sbt-0.13.11-src.tar.bz2 \
-# sbt-0.13.11
-# 2. remove the https://dev.gentoo.org/~gienah/snapshots/${P}-ivy2-deps.tar.bz2
-# https://dev.gentoo.org/~gienah/snapshots/${P}-sbt-deps.tar.bz2 and
-# https://dev.gentoo.org/~gienah/snapshots/${P}-test-deps.tar.bz2
-# binary? ( https://dev.gentoo.org/~gienah/files/dist/${P}-gentoo-binary.tar.bz2 )
-# 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 (with jdk 1.6):
-# cd to ${S}
-# export EROOT=/
-# export WORKDIR='/var/tmp/portage/dev-java/sbt-0.13.11/work'
-# export SV="2.10"
-# export L_P=sbt-0.13.11
-# 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}
-# tar -cjf /usr/portage/distfiles/sbt-0.13.11-ivy2-deps.tar.bz2 .ivy2
-# tar -cjf /usr/portage/distfiles/sbt-0.13.11-sbt-deps.tar.bz2 .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.  Note: src_test creates some files in ${WORKDIR}/.m2 which are can
-# hopefully be ignored. As root:
-# cd ${S}
-# ${S}/sbt-0.13.11 test
-# cd ${WORKDIR}
-# tar --owner=portage --group=portage -cjf /usr/portage/distfiles/sbt-0.13.11-test-deps.tar.bz2 \
-# $(find .ivy2 .sbt -uid 0 -type f -print)
-# Note: It might not download anything in src_test, in which case sbt-0.13.11-test-deps.tar.bz2
-# is not required.
-# 8. Create the binary
-# cd $WORDKIR
-# tar --owner=portage --group=portage -cjf /usr/portage/distfiles/sbt-0.13.11-gentoo-binary.tar.bz2 \
-# sbt-0.13.11 .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
-}
-
-java_prepare() {
-	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 -XX:MaxPermSize=512M"
-			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 -XX:MaxPermSize=512M"
-			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
-		local SCALA_PVR="$(java-config --query=PVR --package=scala-${SV})"
-		local SFV="${SCALA_PVR/-*}"
-		sed -e "s@scalaVersion := \"2.10.4\",@scalaVersion := \"${SFV}\",\n  scalaHome := Some(file(\"/usr/share/scala-${SV}\")),@" \
-			-i "${S}/build.sbt" || die
-	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() {
-	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() {
-	# 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_current-vm-matches "1.7" && ja+=" -XX:MaxPermSize=512M"
-	java-pkg_dolauncher sbt --jar sbt-launch.jar --java_args "${ja}"
-}

diff --git a/dev-java/sbt/sbt-0.13.8-r1.ebuild b/dev-java/sbt/sbt-0.13.8-r1.ebuild
deleted file mode 100644
index 6e8a7e3062c..00000000000
--- a/dev-java/sbt/sbt-0.13.8-r1.ebuild
+++ /dev/null
@@ -1,150 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-# 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}"
-
-B_PV="0.13.7"
-BL_P="${L_PN}-${B_PV}"
-B_P="${PN}-${B_PV}"
-
-SV="2.10"
-
-# creating the sbt src snapshot:
-# git clone https://github.com/sbt/sbt.git sbt-0.13.8
-# cd sbt-0.13.8
-# git checkout v0.13.8
-# cd ..
-# tar --owner=portage --group=portage -cjf sbt-0.13.8-src.tar.bz2 sbt-0.13.8
-
-# creating the binary:
-# cd $WORDKIR
-# tar -cjf sbt-0.13.8-gentoo-binary.tar.bz2 sbt-0.13.8/sbt-launch/target/sbt-launch.jar
-
-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://dev.gentoo.org/~gienah/snapshots/${P}-src.tar.bz2
-	https://dev.gentoo.org/~gienah/snapshots/${P}-ivy2-deps.tar.bz2
-	https://dev.gentoo.org/~gienah/snapshots/${P}-sbt-deps.tar.bz2
-	https://dev.gentoo.org/~gienah/snapshots/${P}-test-deps.tar.bz2
-	http://repo.typesafe.com/typesafe/ivy-releases/org.scala-sbt/${L_PN}/${PV}/${L_PN}.jar -> ${BL_P}.jar
-)
-binary? ( https://dev.gentoo.org/~gienah/files/dist/${P}-gentoo-binary.tar.bz2 )"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="binary"
-
-DEPEND="=virtual/jdk-1.7*
-	>=dev-lang/scala-2.10.4-r1:${SV}"
-RDEPEND=">=virtual/jre-1.7
-	dev-lang/scala:*"
-
-# test hangs or fails
-RESTRICT="test"
-
-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
-}
-
-java_prepare() {
-	if ! use binary; then
-		# Note: to bump sbt, some things to try are:
-		# 1. remove the https://dev.gentoo.org/~gienah/snapshots/${P}-ivy2-deps.tar.bz2
-		# https://dev.gentoo.org/~gienah/snapshots/${P}-sbt-deps.tar.bz2 and
-		# https://dev.gentoo.org/~gienah/snapshots/${P}-test-deps.tar.bz2 from SRC_URI
-		# 2. Comment the sbt publishLocal line in src_compile.
-		# 3. try:
-		# FEATURES='noclean -test' emerge -v 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.
-		# 4. If some of the downloads fail, it might be necessary to run the sbt compile
-		# again manually to obtain all the dependencies, if so (with jdk 1.6):
-		# cd to ${S}
-		# export EROOT=/
-		# export WORKDIR='/var/tmp/portage/dev-java/sbt-0.13.8/work'
-		# export SV="2.10"
-		# export B_P=sbt-0.13.7
-		# export PATH="/usr/share/scala-${SV}/bin:${WORKDIR}/${B_P}:${PATH}"
-		# sbt compile
-		# cd ${WORKDIR}
-		# find .ivy2 .sbt -uid 0 -exec chown portage:portage {} \;
-		# 5. cd ${WORKDIR}
-		# tar -cjf sbt-0.13.8-ivy2-deps.tar.bz2 .ivy2
-		# tar -cjf sbt-0.13.8-sbt-deps.tar.bz2 .sbt
-		# 6. It downloads 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.  Note: src_test creates some files in ${WORKDIR}/.m2 which are can
-		# hopefully be ignored. As root:
-		# cd ${S}
-		# sbt test
-		# cd ${WORKDIR}
-		# find .ivy2 .sbt -uid 0 -print
-		# Then add those files to sbt-0.13.8-ivy2-test-deps.tar.bz2 except the files in the directories
-		# .ivy2/local
-		# .ivy2/cache/org.scala-sbt
-		# Something like:
-		# tar --owner=portage --group=portage -cjf sbt-0.13.8-test-deps.tar.bz2 <list of files as described above>
-		# 7. Undo the earlier temporary edits to the ebuild.
-
-		mkdir "${WORKDIR}/${B_P}" || die
-		cp -p "${DISTDIR}/${BL_P}.jar" "${WORKDIR}/${B_P}/${L_PN}.jar" || die
-		cat <<- EOF > "${WORKDIR}/${B_P}/sbt"
-			#!/bin/sh
-			SBT_OPTS="-Xms512M -Xmx1536M -Xss1M -XX:+CMSClassUnloadingEnabled -XX:MaxPermSize=512M"
-			java -Djavac.args="-encoding UTF-8" -Duser.home="${WORKDIR}" \${SBT_OPTS} -jar "${WORKDIR}/${B_P}/sbt-launch.jar" "\$@"
-		EOF
-		chmod u+x "${WORKDIR}/${B_P}/sbt" || die
-		local SCALA_PVR="$(java-config --query=PVR --package=scala-${SV})"
-		local SFV="${SCALA_PVR/-*}"
-		sed -e "s@scalaVersion := \"2.10.4\",@scalaVersion := \"${SFV}\",\n  scalaHome := Some(file(\"/usr/share/scala-${SV}\")),@" \
-			-i "${S}/build.sbt" || die
-	fi
-}
-
-src_compile() {
-	if ! use binary; then
-		export PATH="${EROOT}usr/share/scala-${SV}/bin:${WORKDIR}/${B_P}:${PATH}"
-		einfo "=== sbt compile ..."
-		"${WORKDIR}/${B_P}/sbt" -Dsbt.log.noformat=true compile || die
-		einfo "=== sbt publishLocal ..."
-		cat <<- EOF | "${WORKDIR}/${B_P}/sbt" -Dsbt.log.noformat=true || die
-			set every javaVersionPrefix in javaVersionCheck := Some("1.7")
-			publishLocal
-		EOF
-	fi
-}
-
-src_test() {
-	if ! use binary; then
-		export PATH="${EROOT}usr/share/scala-${SV}/bin:${WORKDIR}/${B_P}:${PATH}"
-		"${WORKDIR}/${B_P}/sbt" -Dsbt.log.noformat=true test || die
-	fi
-}
-
-src_install() {
-	if ! use binary; then
-		pushd sbt-launch/target || die
-		mv ${L_P}.jar ${L_PN}.jar || die
-		popd
-	fi
-	java-pkg_dojar sbt-launch/target/${L_PN}.jar
-	java-pkg_dolauncher sbt --main xsbt.boot.Boot --java_args "-Xms512M -Xmx1536M -Xss1M -XX:+CMSClassUnloadingEnabled -XX:MaxPermSize=512M"
-}


^ permalink raw reply related	[flat|nested] 21+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-java/sbt/
@ 2018-06-13 21:18 Aaron Bauman
  0 siblings, 0 replies; 21+ messages in thread
From: Aaron Bauman @ 2018-06-13 21:18 UTC (permalink / raw
  To: gentoo-commits

commit:     0f8a028bae3841c4b5256bf7aa3db27edfebf10a
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Mon Jun 11 20:38:07 2018 +0000
Commit:     Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Wed Jun 13 21:17:41 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f8a028b

dev-java/sbt: use HTTPS

Closes: https://github.com/gentoo/gentoo/pull/8807

 dev-java/sbt/sbt-0.13.13.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-java/sbt/sbt-0.13.13.ebuild b/dev-java/sbt/sbt-0.13.13.ebuild
index f881129e9be..4dab1103382 100644
--- a/dev-java/sbt/sbt-0.13.13.ebuild
+++ b/dev-java/sbt/sbt-0.13.13.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -12,7 +12,7 @@ L_P="${L_PN}-${PV}"
 SV="2.11"
 
 DESCRIPTION="sbt is a build tool for Scala and Java projects that aims to do the basics well"
-HOMEPAGE="http://www.scala-sbt.org/"
+HOMEPAGE="https://www.scala-sbt.org/"
 EGIT_COMMIT="v${PV}"
 EGIT_REPO_URI="https://github.com/sbt/sbt.git"
 SRC_URI="


^ permalink raw reply related	[flat|nested] 21+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-java/sbt/
@ 2018-06-25 23:20 Thomas Deutschmann
  0 siblings, 0 replies; 21+ messages in thread
From: Thomas Deutschmann @ 2018-06-25 23:20 UTC (permalink / raw
  To: gentoo-commits

commit:     412c1b6f281a5f968eb956a18347bf1d94b3faec
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 25 23:00:28 2018 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Jun 25 23:20:20 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=412c1b6f

dev-java/sbt: x86 stable (bug #637940)

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 dev-java/sbt/sbt-0.13.13.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/sbt/sbt-0.13.13.ebuild b/dev-java/sbt/sbt-0.13.13.ebuild
index 4dab1103382..3afb504c909 100644
--- a/dev-java/sbt/sbt-0.13.13.ebuild
+++ b/dev-java/sbt/sbt-0.13.13.ebuild
@@ -27,7 +27,7 @@ SRC_URI="
 	)"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="binary"
 
 DEPEND=">=virtual/jdk-1.8


^ permalink raw reply related	[flat|nested] 21+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-java/sbt/
@ 2018-06-26  1:28 Aaron Bauman
  0 siblings, 0 replies; 21+ messages in thread
From: Aaron Bauman @ 2018-06-26  1:28 UTC (permalink / raw
  To: gentoo-commits

commit:     c0ec77dc634cadb1265148ec3c5376c4087d0ef8
Author:     Aaron Bauman <bman <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 26 01:24:41 2018 +0000
Commit:     Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Tue Jun 26 01:24:41 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0ec77dc

dev-java/sbt: amd64 stable

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 dev-java/sbt/sbt-0.13.13.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/sbt/sbt-0.13.13.ebuild b/dev-java/sbt/sbt-0.13.13.ebuild
index 3afb504c909..16862a31628 100644
--- a/dev-java/sbt/sbt-0.13.13.ebuild
+++ b/dev-java/sbt/sbt-0.13.13.ebuild
@@ -27,7 +27,7 @@ SRC_URI="
 	)"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="binary"
 
 DEPEND=">=virtual/jdk-1.8


^ permalink raw reply related	[flat|nested] 21+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-java/sbt/
@ 2018-11-01 21:27 Patrice Clement
  0 siblings, 0 replies; 21+ messages in thread
From: Patrice Clement @ 2018-11-01 21:27 UTC (permalink / raw
  To: gentoo-commits

commit:     59f44c3fac51829942d16ebdda1b428b86cf53d8
Author:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Thu Nov  1 21:26:37 2018 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Thu Nov  1 21:26:37 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=59f44c3f

dev-java/sbt: do not specify SV in DEPEND/RDEPEND.

This trick is required for Portage to solve forward dependencies and
clear QA warnings.

Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>
Package-Manager: Portage-2.3.49, Repoman-2.3.11

 dev-java/sbt/sbt-0.13.13.ebuild | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/dev-java/sbt/sbt-0.13.13.ebuild b/dev-java/sbt/sbt-0.13.13.ebuild
index 16862a31628..7191e9414ff 100644
--- a/dev-java/sbt/sbt-0.13.13.ebuild
+++ b/dev-java/sbt/sbt-0.13.13.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -9,8 +9,6 @@ inherit eutils java-pkg-2 # git-r3
 L_PN="sbt-launch"
 L_P="${L_PN}-${PV}"
 
-SV="2.11"
-
 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}"
@@ -30,10 +28,13 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="binary"
 
-DEPEND=">=virtual/jdk-1.8
-	>=dev-lang/scala-2.11.8:${SV}"
-RDEPEND=">=virtual/jre-1.8
-	>=dev-lang/scala-2.11.8:${SV}"
+DEPEND="
+	>=virtual/jdk-1.8
+	dev-lang/scala"
+
+RDEPEND="
+	>=virtual/jre-1.8
+	dev-lang/scala"
 
 # test hangs or fails
 RESTRICT="test"
@@ -155,7 +156,7 @@ src_test() {
 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)
+		$(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}"
 }


^ permalink raw reply related	[flat|nested] 21+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-java/sbt/
@ 2020-01-14 12:15 Mark Wright
  0 siblings, 0 replies; 21+ messages in thread
From: Mark Wright @ 2020-01-14 12:15 UTC (permalink / raw
  To: gentoo-commits

commit:     6f4bb562edb2cd65b3ef6b642d147b48c1673869
Author:     Mark Wright <gienah <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 14 12:11:08 2020 +0000
Commit:     Mark Wright <gienah <AT> gentoo <DOT> org>
CommitDate: Tue Jan 14 12:11:08 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f4bb562

dev-java/sbt: Bump to 0.13.18, fix bugs #671072 #671284

Thanks to Maxim Buzdalov and cono for reporting bug #671072, this
is fixed in 0.13.18.

Thanks to Till Schafer and Martin von Gagern for reporting
bug #671284, this is also fixed in 0.13.18.

Bug: https://bugs.gentoo.org/show_bug.cgi?id=671072
Bug: https://bugs.gentoo.org/show_bug.cgi?id=671284
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Mark Wright <gienah <AT> gentoo.org>

 dev-java/sbt/Manifest           |   5 ++
 dev-java/sbt/sbt-0.13.18.ebuild | 144 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 149 insertions(+)

diff --git a/dev-java/sbt/Manifest b/dev-java/sbt/Manifest
index bdb6c19c048..31129ee59c9 100644
--- a/dev-java/sbt/Manifest
+++ b/dev-java/sbt/Manifest
@@ -2,4 +2,9 @@ DIST sbt-0.13.13-gentoo-binary.tar.xz 58011476 BLAKE2B 87f829a5a6c4047b5120b9685
 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

diff --git a/dev-java/sbt/sbt-0.13.18.ebuild b/dev-java/sbt/sbt-0.13.18.ebuild
new file mode 100644
index 00000000000..f6976d5d9d1
--- /dev/null
+++ b/dev-java/sbt/sbt-0.13.18.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit eutils java-pkg-2
+
+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://github.com/sbt/sbt/archive/v${PV}.tar.gz -> ${P}.tar.gz
+		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:*
+"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+"
+
+# test hangs or fails
+RESTRICT="test"
+
+# Note: to bump sbt, some things to try are:
+# 1. 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
+# 2. Comment the sbt publishLocal line in src_compile.
+# 3. 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.
+# 4. 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 L_P=${P}
+# export PATH="${WORKDIR}/${L_P}:${PATH}"
+# sbt compile
+# cd ${WORKDIR}
+# find .ivy2 .sbt -uid 0 -exec chown portage:portage {} \;
+# 5. 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.
+# 6. 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.
+# 7. 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() {
+	# 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
+
+		# 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
+		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() {
+	"${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}"
+}


^ permalink raw reply related	[flat|nested] 21+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-java/sbt/
@ 2021-12-25 13:21 Benda XU
  0 siblings, 0 replies; 21+ messages in thread
From: Benda XU @ 2021-12-25 13:21 UTC (permalink / raw
  To: gentoo-commits

commit:     a8ed50692eb36f0ee397f6688126f9bb7a7ed662
Author:     Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 24 15:53:40 2021 +0000
Commit:     Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Sat Dec 25 13:21:24 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8ed5069

dev-java/sbt: double the heap upper limit to 3GB.

Otherwise the build fails with out-of-memory error.

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Benda Xu <heroxbd <AT> gentoo.org>

 dev-java/sbt/sbt-0.13.18.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-java/sbt/sbt-0.13.18.ebuild b/dev-java/sbt/sbt-0.13.18.ebuild
index c4f3a8c3e8bc..4262d767d5b3 100644
--- a/dev-java/sbt/sbt-0.13.18.ebuild
+++ b/dev-java/sbt/sbt-0.13.18.ebuild
@@ -97,12 +97,12 @@ src_prepare() {
 		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"
+			SBT_OPTS="-Xms512M -Xmx3072M -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"
+			SBT_OPTS="-Xms512M -Xmx3072M -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


^ permalink raw reply related	[flat|nested] 21+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-java/sbt/
@ 2022-06-08  8:12 Florian Schmaus
  0 siblings, 0 replies; 21+ messages in thread
From: Florian Schmaus @ 2022-06-08  8:12 UTC (permalink / raw
  To: gentoo-commits

commit:     57b73b8034e374fe7b963ff34086c1b6d327008c
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Wed Jun  8 05:10:50 2022 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Wed Jun  8 08:12:12 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=57b73b80

dev-java/sbt: EAPI 8, restrict to jdk:1.8

Closes: https://bugs.gentoo.org/831297
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/25802
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>

 dev-java/sbt/sbt-0.13.18-r1.ebuild | 147 +++++++++++++++++++++++++++++++++++++
 1 file changed, 147 insertions(+)

diff --git a/dev-java/sbt/sbt-0.13.18-r1.ebuild b/dev-java/sbt/sbt-0.13.18-r1.ebuild
new file mode 100644
index 000000000000..13fbc7b910f9
--- /dev/null
+++ b/dev-java/sbt/sbt-0.13.18-r1.ebuild
@@ -0,0 +1,147 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit java-pkg-2
+
+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://github.com/sbt/sbt/archive/v${PV}.tar.gz -> ${P}.tar.gz
+		https://dev.gentoo.org/~gienah/snapshots/${P}-ivy2-deps.tar.xz
+		https://dev.gentoo.org/~gienah/snapshots/${P}-sbt-deps.tar.xz
+		https://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"
+
+# Restrict to jdk:1.8
+# Missing dependency 'object java.lang.Object in compiler mirror', bug #831297
+DEPEND="
+	virtual/jdk:1.8
+"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+"
+
+# test hangs or fails
+RESTRICT="test"
+
+# Note: to bump sbt, some things to try are:
+# 1. 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
+# 2. Comment the sbt publishLocal line in src_compile.
+# 3. 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.
+# 4. 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 L_P=${P}
+# export PATH="${WORKDIR}/${L_P}:${PATH}"
+# sbt compile
+# cd ${WORKDIR}
+# find .ivy2 .sbt -uid 0 -exec chown portage:portage {} \;
+# 5. 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.
+# 6. 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.
+# 7. 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() {
+	# 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 -Xmx3072M -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 -Xmx3072M -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
+
+		# 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
+		einfo "=== sbt compile ..."
+		local vm_version="$(java-config -g PROVIDES_VERSION)"
+		"${WORKDIR}/${L_P}/sbt" -Dsbt.log.noformat=true compile || die
+		einfo "=== sbt publishLocal with jdk ${vm_version} ..."
+		cat <<- EOF | "${WORKDIR}/${L_P}/sbt" -Dsbt.log.noformat=true || die
+			set every javaVersionPrefix in javaVersionCheck := Some("${vm_version}")
+			publishLocal
+		EOF
+	fi
+}
+
+src_test() {
+	"${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}"
+}


^ permalink raw reply related	[flat|nested] 21+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-java/sbt/
@ 2022-06-09  6:45 Sam James
  0 siblings, 0 replies; 21+ messages in thread
From: Sam James @ 2022-06-09  6:45 UTC (permalink / raw
  To: gentoo-commits

commit:     3c1b60c44c5659c65b0dd40ae3fed3bfde631792
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Wed Jun  8 09:21:10 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Jun  9 06:45:05 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c1b60c4

dev-java/sbt: drop 0.13.18

Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-java/sbt/sbt-0.13.18.ebuild | 144 ----------------------------------------
 1 file changed, 144 deletions(-)

diff --git a/dev-java/sbt/sbt-0.13.18.ebuild b/dev-java/sbt/sbt-0.13.18.ebuild
deleted file mode 100644
index 4262d767d5b3..000000000000
--- a/dev-java/sbt/sbt-0.13.18.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit java-pkg-2
-
-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://github.com/sbt/sbt/archive/v${PV}.tar.gz -> ${P}.tar.gz
-		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:*
-"
-
-RDEPEND="
-	>=virtual/jre-1.8:*
-"
-
-# test hangs or fails
-RESTRICT="test"
-
-# Note: to bump sbt, some things to try are:
-# 1. 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
-# 2. Comment the sbt publishLocal line in src_compile.
-# 3. 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.
-# 4. 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 L_P=${P}
-# export PATH="${WORKDIR}/${L_P}:${PATH}"
-# sbt compile
-# cd ${WORKDIR}
-# find .ivy2 .sbt -uid 0 -exec chown portage:portage {} \;
-# 5. 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.
-# 6. 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.
-# 7. 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() {
-	# 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 -Xmx3072M -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 -Xmx3072M -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
-
-		# 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
-		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() {
-	"${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}"
-}


^ permalink raw reply related	[flat|nested] 21+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-java/sbt/
@ 2022-06-23  5:49 Sam James
  0 siblings, 0 replies; 21+ messages in thread
From: Sam James @ 2022-06-23  5:49 UTC (permalink / raw
  To: gentoo-commits

commit:     e3b9e6fdbe5b67cc835a77ea94b918a3dbaa99b4
Author:     pvgoran <pvgoran <AT> users <DOT> noreply <DOT> github <DOT> com>
AuthorDate: Wed Jun 22 12:03:57 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Jun 23 05:47:54 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3b9e6fd

dev-java/sbt: Correct source URL for USE=binary for 0.13.18

Closes: https://bugs.gentoo.org/731830
Signed-off-by: Pavel Goran <via-gentoo <AT> pvgoran.name>
Closes: https://github.com/gentoo/gentoo/pull/26037
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-java/sbt/sbt-0.13.18-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-java/sbt/sbt-0.13.18-r1.ebuild b/dev-java/sbt/sbt-0.13.18-r1.ebuild
index 13fbc7b910f9..bcdc4ac6bcdc 100644
--- a/dev-java/sbt/sbt-0.13.18-r1.ebuild
+++ b/dev-java/sbt/sbt-0.13.18-r1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 		https://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
+		https://dev.gentoo.org/~gienah/distfiles/${P}-gentoo-binary.tar.xz
 	)"
 LICENSE="BSD"
 SLOT="0"
@@ -43,7 +43,7 @@ RESTRICT="test"
 # Note: to bump sbt, some things to try are:
 # 1. 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 )
+# binary? ( https://dev.gentoo.org/~gienah/distfiles/${P}-gentoo-binary.tar.xz )
 # from SRC_URI
 # 2. Comment the sbt publishLocal line in src_compile.
 # 3. try:


^ permalink raw reply related	[flat|nested] 21+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-java/sbt/
@ 2022-06-26  8:46 Agostino Sarubbo
  0 siblings, 0 replies; 21+ messages in thread
From: Agostino Sarubbo @ 2022-06-26  8:46 UTC (permalink / raw
  To: gentoo-commits

commit:     a76a1e30e591ce5c858edcce920bc3d35a367b95
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 26 08:46:28 2022 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Sun Jun 26 08:46:28 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a76a1e30

dev-java/sbt: amd64 stable wrt bug #842441

Package-Manager: Portage-3.0.30, Repoman-3.0.3
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 dev-java/sbt/sbt-0.13.18-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/sbt/sbt-0.13.18-r1.ebuild b/dev-java/sbt/sbt-0.13.18-r1.ebuild
index bcdc4ac6bcdc..38c010dd588e 100644
--- a/dev-java/sbt/sbt-0.13.18-r1.ebuild
+++ b/dev-java/sbt/sbt-0.13.18-r1.ebuild
@@ -24,7 +24,7 @@ SRC_URI="
 	)"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="binary"
 
 # Restrict to jdk:1.8


^ permalink raw reply related	[flat|nested] 21+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-java/sbt/
@ 2022-08-05  8:17 Arthur Zamarin
  0 siblings, 0 replies; 21+ messages in thread
From: Arthur Zamarin @ 2022-08-05  8:17 UTC (permalink / raw
  To: gentoo-commits

commit:     f60a40ad5d2c6887b2528a22aa60b5378fbe0d19
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Aug  5 08:17:42 2022 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Aug  5 08:17:42 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f60a40ad

dev-java/sbt: Keyword 0.13.18-r1 arm64, #732962

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 dev-java/sbt/sbt-0.13.18-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/sbt/sbt-0.13.18-r1.ebuild b/dev-java/sbt/sbt-0.13.18-r1.ebuild
index 38c010dd588e..eb340eb54926 100644
--- a/dev-java/sbt/sbt-0.13.18-r1.ebuild
+++ b/dev-java/sbt/sbt-0.13.18-r1.ebuild
@@ -24,7 +24,7 @@ SRC_URI="
 	)"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 IUSE="binary"
 
 # Restrict to jdk:1.8


^ permalink raw reply related	[flat|nested] 21+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-java/sbt/
@ 2022-10-15 23:26 Sam James
  0 siblings, 0 replies; 21+ messages in thread
From: Sam James @ 2022-10-15 23:26 UTC (permalink / raw
  To: gentoo-commits

commit:     45cc0be244bdb85aa9500355e72a12acdb9b1c29
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 15 15:36:52 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Oct 15 23:26:19 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45cc0be2

dev-java/sbt: drop 0.13.13

Closes: https://bugs.gentoo.org/836049
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-java/sbt/Manifest           |   5 --
 dev-java/sbt/sbt-0.13.13.ebuild | 162 ----------------------------------------
 2 files changed, 167 deletions(-)

diff --git a/dev-java/sbt/Manifest b/dev-java/sbt/Manifest
index 31129ee59c98..0ac8b9dc2cb9 100644
--- a/dev-java/sbt/Manifest
+++ b/dev-java/sbt/Manifest
@@ -1,10 +1,5 @@
-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

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}"
-}


^ permalink raw reply related	[flat|nested] 21+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-java/sbt/
@ 2024-05-09 10:52 Florian Schmaus
  0 siblings, 0 replies; 21+ messages in thread
From: Florian Schmaus @ 2024-05-09 10:52 UTC (permalink / raw
  To: gentoo-commits

commit:     bdfddcb4e7ce11e24d99225d8f72b3dd6ea05a2f
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Tue Apr 30 09:22:16 2024 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Thu May  9 10:51:39 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bdfddcb4

dev-java/sbt: add github upstream metadata

Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>

 dev-java/sbt/metadata.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/dev-java/sbt/metadata.xml b/dev-java/sbt/metadata.xml
index feefedbb43eb..9844fcc90ace 100644
--- a/dev-java/sbt/metadata.xml
+++ b/dev-java/sbt/metadata.xml
@@ -7,4 +7,7 @@ The interactive build tool.
 Use Scala to define your tasks. Then run them in parallel from the shell. 
 </longdescription>
 <use><flag name="binary">Install from (Gentoo-compiled) binary instead of building from sources. Set this when you run out of memory during build.</flag></use>
+<upstream>
+<remote-id type="github">sbt/sbt</remote-id>
+</upstream>
 </pkgmetadata>


^ permalink raw reply related	[flat|nested] 21+ messages in thread

end of thread, other threads:[~2024-05-09 10:52 UTC | newest]

Thread overview: 21+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-09-05 12:08 [gentoo-commits] repo/gentoo:master commit in: dev-java/sbt/ Mark Wright
  -- strict thread matches above, loose matches on Subject: below --
2016-02-06  9:30 Mark Wright
2016-02-06 10:11 Mark Wright
2016-02-09 12:17 Mark Wright
2016-02-13  0:06 Mark Wright
2016-02-23 13:45 Mark Wright
2016-12-28 21:54 Mark Wright
2017-11-05 13:56 James Le Cuirot
2018-06-13 21:18 Aaron Bauman
2018-06-25 23:20 Thomas Deutschmann
2018-06-26  1:28 Aaron Bauman
2018-11-01 21:27 Patrice Clement
2020-01-14 12:15 Mark Wright
2021-12-25 13:21 Benda XU
2022-06-08  8:12 Florian Schmaus
2022-06-09  6:45 Sam James
2022-06-23  5:49 Sam James
2022-06-26  8:46 Agostino Sarubbo
2022-08-05  8:17 Arthur Zamarin
2022-10-15 23:26 Sam James
2024-05-09 10:52 Florian Schmaus

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox