[gentoo-commits] repo/gentoo:master commit in: dev-java/sbt/

[Patrice Clement]

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