[gentoo-commits] repo/gentoo:master commit in: dev-lang/scala/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

From: "Mark Wright" <gienah@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/scala/
Date: Mon, 24 Aug 2015 14:58:09 +0000 (UTC)	[thread overview]
Message-ID: <1440428247.9620d4d1f0c62b2b5b5fd561cade6955c8cf1e68.gienah@gentoo> (raw)

commit:     9620d4d1f0c62b2b5b5fd561cade6955c8cf1e68
Author:     Mark Wright <gienah <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 24 14:56:34 2015 +0000
Commit:     Mark Wright <gienah <AT> gentoo <DOT> org>
CommitDate: Mon Aug 24 14:57:27 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9620d4d1

Drop support for jdk 1.6 for unstable scala 2.10 and 2.11 versions. scala 2.9.2 requires jdk 1.6 to build.

Package-Manager: portage-2.2.20.1

 .../{scala-2.10.2-r2.ebuild => scala-2.10.2-r3.ebuild}   |  2 +-
 .../{scala-2.10.3-r1.ebuild => scala-2.10.3-r2.ebuild}   |  4 ++--
 .../{scala-2.10.4-r1.ebuild => scala-2.10.4-r2.ebuild}   |  4 ++--
 .../{scala-2.11.1-r1.ebuild => scala-2.11.1-r2.ebuild}   |  4 ++--
 .../{scala-2.11.2-r1.ebuild => scala-2.11.2-r2.ebuild}   |  4 ++--
 .../{scala-2.11.6.ebuild => scala-2.11.4-r2.ebuild}      | 16 ++++++++--------
 .../{scala-2.11.6.ebuild => scala-2.11.6-r1.ebuild}      |  4 ++--
 .../{scala-2.11.7.ebuild => scala-2.11.7-r1.ebuild}      |  4 ++--
 8 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/dev-lang/scala/scala-2.10.2-r2.ebuild b/dev-lang/scala/scala-2.10.2-r3.ebuild
similarity index 99%
rename from dev-lang/scala/scala-2.10.2-r2.ebuild
rename to dev-lang/scala/scala-2.10.2-r3.ebuild
index 8881028..9ae487c 100644
--- a/dev-lang/scala/scala-2.10.2-r2.ebuild
+++ b/dev-lang/scala/scala-2.10.2-r3.ebuild
@@ -72,7 +72,7 @@ COMMON_DEP="dev-java/ant-core:0
 	dev-java/junit:4"
 
 DEPEND="${COMMON_DEP}
-	|| ( =virtual/jdk-1.6* =virtual/jdk-1.7* )
+	=virtual/jdk-1.7*
 	java-virtuals/jdk-with-com-sun:0
 	!binary? (
 		dev-java/ant-contrib:0

diff --git a/dev-lang/scala/scala-2.10.3-r1.ebuild b/dev-lang/scala/scala-2.10.3-r2.ebuild
similarity index 99%
rename from dev-lang/scala/scala-2.10.3-r1.ebuild
rename to dev-lang/scala/scala-2.10.3-r2.ebuild
index 7310d51..40a9e35 100644
--- a/dev-lang/scala/scala-2.10.3-r1.ebuild
+++ b/dev-lang/scala/scala-2.10.3-r2.ebuild
@@ -83,7 +83,7 @@ COMMON_DEP="dev-java/ant-core:0
 	dev-java/hawtjni-runtime:0"
 
 DEPEND="${COMMON_DEP}
-	|| ( =virtual/jdk-1.6* =virtual/jdk-1.7* )
+	=virtual/jdk-1.7*
 	java-virtuals/jdk-with-com-sun:0
 	!binary? (
 		dev-java/ant-core:0
@@ -93,7 +93,7 @@ DEPEND="${COMMON_DEP}
 	app-arch/xz-utils:0"
 
 RDEPEND="${COMMON_DEP}
-	>=virtual/jre-1.6
+	>=virtual/jre-1.7
 	app-eselect/eselect-scala
 	!dev-lang/scala-bin:0"
 

diff --git a/dev-lang/scala/scala-2.10.4-r1.ebuild b/dev-lang/scala/scala-2.10.4-r2.ebuild
similarity index 99%
rename from dev-lang/scala/scala-2.10.4-r1.ebuild
rename to dev-lang/scala/scala-2.10.4-r2.ebuild
index 2dfa0a8..c3e0af4 100644
--- a/dev-lang/scala/scala-2.10.4-r1.ebuild
+++ b/dev-lang/scala/scala-2.10.4-r2.ebuild
@@ -83,7 +83,7 @@ COMMON_DEP="dev-java/ant-core:0
 DEPEND="${COMMON_DEP}
 	java-virtuals/jdk-with-com-sun:0
 	!binary? (
-		|| ( =virtual/jdk-1.6* =virtual/jdk-1.7* )
+		=virtual/jdk-1.7*
 		dev-java/ant-core:0
 		dev-java/ant-contrib:0
 		dev-java/ant-nodeps:0
@@ -95,7 +95,7 @@ DEPEND="${COMMON_DEP}
 	app-arch/xz-utils:0"
 
 RDEPEND="${COMMON_DEP}
-	>=virtual/jre-1.6
+	>=virtual/jre-1.7
 	app-eselect/eselect-scala
 	!dev-lang/scala-bin:0"
 

diff --git a/dev-lang/scala/scala-2.11.1-r1.ebuild b/dev-lang/scala/scala-2.11.1-r2.ebuild
similarity index 98%
rename from dev-lang/scala/scala-2.11.1-r1.ebuild
rename to dev-lang/scala/scala-2.11.1-r2.ebuild
index 5fd5e5b..6b22204 100644
--- a/dev-lang/scala/scala-2.11.1-r1.ebuild
+++ b/dev-lang/scala/scala-2.11.1-r2.ebuild
@@ -73,7 +73,7 @@ COMMON_DEP="dev-java/ant-core:0
 DEPEND="${COMMON_DEP}
 	java-virtuals/jdk-with-com-sun:0
 	!binary? (
-		|| ( =virtual/jdk-1.6* =virtual/jdk-1.7* =virtual/jdk-1.8* )
+		|| ( =virtual/jdk-1.7* =virtual/jdk-1.8* )
 		dev-java/ant-core:0
 		dev-java/ant-contrib:0
 		dev-java/ant-nodeps:0
@@ -85,7 +85,7 @@ DEPEND="${COMMON_DEP}
 	app-arch/xz-utils:0"
 
 RDEPEND="${COMMON_DEP}
-	>=virtual/jre-1.6
+	>=virtual/jre-1.7
 	app-eselect/eselect-scala
 	!dev-lang/scala-bin:0"
 

diff --git a/dev-lang/scala/scala-2.11.2-r1.ebuild b/dev-lang/scala/scala-2.11.2-r2.ebuild
similarity index 98%
rename from dev-lang/scala/scala-2.11.2-r1.ebuild
rename to dev-lang/scala/scala-2.11.2-r2.ebuild
index 0e2edfd..0f3b1ae 100644
--- a/dev-lang/scala/scala-2.11.2-r1.ebuild
+++ b/dev-lang/scala/scala-2.11.2-r2.ebuild
@@ -73,7 +73,7 @@ COMMON_DEP="dev-java/ant-core:0
 DEPEND="${COMMON_DEP}
 	java-virtuals/jdk-with-com-sun:0
 	!binary? (
-		|| ( =virtual/jdk-1.6* =virtual/jdk-1.7* =virtual/jdk-1.8* )
+		|| ( =virtual/jdk-1.7* =virtual/jdk-1.8* )
 		dev-java/ant-core:0
 		dev-java/ant-contrib:0
 		dev-java/ant-nodeps:0
@@ -85,7 +85,7 @@ DEPEND="${COMMON_DEP}
 	app-arch/xz-utils:0"
 
 RDEPEND="${COMMON_DEP}
-	>=virtual/jre-1.6
+	>=virtual/jre-1.7
 	app-eselect/eselect-scala
 	!dev-lang/scala-bin:0"
 

diff --git a/dev-lang/scala/scala-2.11.6.ebuild b/dev-lang/scala/scala-2.11.4-r2.ebuild
similarity index 94%
copy from dev-lang/scala/scala-2.11.6.ebuild
copy to dev-lang/scala/scala-2.11.4-r2.ebuild
index 5ad91d1..4d8c9fd 100644
--- a/dev-lang/scala/scala-2.11.6.ebuild
+++ b/dev-lang/scala/scala-2.11.4-r2.ebuild
@@ -16,12 +16,12 @@ SV="$(get_version_component_range 1-2)"
 # creating the binary:
 # JAVA_PKG_FORCE_VM="$available-1.7" USE="doc source" ebuild scala-*.ebuild compile
 # cd $WORDKIR
-# tar -cjf scala-2.11.6-gentoo-binary.tar.bz2 scala-2.11.6/build/pack/bin \
-# scala-2.11.6/build/pack/lib/ scala-2.11.6/build/pack/man \
-# scala-2.11.6/src/actors/ scala-2.11.6/src/forkjoin/ \
-# scala-2.11.6/src/library scala-2.11.6/src/library-aux/ \
-# scala-2.11.6/src/reflect/ scala-2.11.6/docs/TODO \
-# scala-2.11.6/doc/README scala-2.11.6/build/scaladoc/compiler
+# tar -cjf scala-2.11.4-gentoo-binary.tar.bz2 scala-2.11.4/build/pack/bin \
+# scala-2.11.4/build/pack/lib/ scala-2.11.4/build/pack/man \
+# scala-2.11.4/src/actors/ scala-2.11.4/src/forkjoin/ \
+# scala-2.11.4/src/library scala-2.11.4/src/library-aux/ \
+# scala-2.11.4/src/reflect/ scala-2.11.4/docs/TODO \
+# scala-2.11.4/doc/README scala-2.11.4/build/scaladoc/compiler
 
 # In the pullJarFiles function in tools/binary-repo-lib.sh it executes find commands
 # to search for .desired.sha1 files, which contain sha1 hashes that are appended
@@ -73,7 +73,7 @@ COMMON_DEP="dev-java/ant-core:0
 DEPEND="${COMMON_DEP}
 	java-virtuals/jdk-with-com-sun:0
 	!binary? (
-		|| ( =virtual/jdk-1.6* =virtual/jdk-1.7* =virtual/jdk-1.8* )
+		|| ( =virtual/jdk-1.7* =virtual/jdk-1.8* )
 		dev-java/ant-core:0
 		dev-java/ant-contrib:0
 		dev-java/ant-nodeps:0
@@ -85,7 +85,7 @@ DEPEND="${COMMON_DEP}
 	app-arch/xz-utils:0"
 
 RDEPEND="${COMMON_DEP}
-	>=virtual/jre-1.6
+	>=virtual/jre-1.7
 	app-eselect/eselect-scala
 	!dev-lang/scala-bin:0"
 

diff --git a/dev-lang/scala/scala-2.11.6.ebuild b/dev-lang/scala/scala-2.11.6-r1.ebuild
similarity index 98%
rename from dev-lang/scala/scala-2.11.6.ebuild
rename to dev-lang/scala/scala-2.11.6-r1.ebuild
index 5ad91d1..c4bafb0 100644
--- a/dev-lang/scala/scala-2.11.6.ebuild
+++ b/dev-lang/scala/scala-2.11.6-r1.ebuild
@@ -73,7 +73,7 @@ COMMON_DEP="dev-java/ant-core:0
 DEPEND="${COMMON_DEP}
 	java-virtuals/jdk-with-com-sun:0
 	!binary? (
-		|| ( =virtual/jdk-1.6* =virtual/jdk-1.7* =virtual/jdk-1.8* )
+		|| ( =virtual/jdk-1.7* =virtual/jdk-1.8* )
 		dev-java/ant-core:0
 		dev-java/ant-contrib:0
 		dev-java/ant-nodeps:0
@@ -85,7 +85,7 @@ DEPEND="${COMMON_DEP}
 	app-arch/xz-utils:0"
 
 RDEPEND="${COMMON_DEP}
-	>=virtual/jre-1.6
+	>=virtual/jre-1.7
 	app-eselect/eselect-scala
 	!dev-lang/scala-bin:0"
 

diff --git a/dev-lang/scala/scala-2.11.7.ebuild b/dev-lang/scala/scala-2.11.7-r1.ebuild
similarity index 98%
rename from dev-lang/scala/scala-2.11.7.ebuild
rename to dev-lang/scala/scala-2.11.7-r1.ebuild
index a3e310f..0cedfbd 100644
--- a/dev-lang/scala/scala-2.11.7.ebuild
+++ b/dev-lang/scala/scala-2.11.7-r1.ebuild
@@ -73,7 +73,7 @@ COMMON_DEP="dev-java/ant-core:0
 DEPEND="${COMMON_DEP}
 	java-virtuals/jdk-with-com-sun:0
 	!binary? (
-		|| ( =virtual/jdk-1.6* =virtual/jdk-1.7* =virtual/jdk-1.8* )
+		|| ( =virtual/jdk-1.7* =virtual/jdk-1.8* )
 		dev-java/ant-core:0
 		dev-java/ant-contrib:0
 		dev-java/ant-nodeps:0
@@ -85,7 +85,7 @@ DEPEND="${COMMON_DEP}
 	app-arch/xz-utils:0"
 
 RDEPEND="${COMMON_DEP}
-	>=virtual/jre-1.6
+	>=virtual/jre-1.7
 	app-eselect/eselect-scala
 	!dev-lang/scala-bin:0"

next             reply	other threads:[~2015-08-24 14:58 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-08-24 14:58 Mark Wright [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-05-09 10:52 [gentoo-commits] repo/gentoo:master commit in: dev-lang/scala/ Florian Schmaus
2024-04-30  8:15 Florian Schmaus
2022-10-15 23:40 Sam James
2022-08-05  8:17 Arthur Zamarin
2022-06-23  5:49 Sam James
2021-12-26 12:14 Benda XU
2020-05-17 16:55 Aaron Bauman
2020-01-14 22:46 Thomas Deutschmann
2019-12-29  6:17 Mark Wright
2018-08-26  9:39 Michał Górny
2018-06-26  1:28 Aaron Bauman
2018-06-25 23:20 Thomas Deutschmann
2016-02-17 11:56 Mark Wright
2016-02-16 10:44 Mark Wright
2015-08-24 14:17 Mark Wright

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:8881028 dfblob:9ae487c dfblob:7310d51 dfblob:40a9e35
dfblob:2dfa0a8 dfblob:c3e0af4 dfblob:5fd5e5b dfblob:6b22204
dfblob:0e2edfd dfblob:0f3b1ae dfblob:5ad91d1 dfblob:4d8c9fd
dfblob:5ad91d1 dfblob:c4bafb0 dfblob:a3e310f dfblob:0cedfbd )
 OR (
bs:"[gentoo-commits] repo/gentoo:master commit in: dev-lang/scala/" )
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1440428247.9620d4d1f0c62b2b5b5fd561cade6955c8cf1e68.gienah@gentoo \
    --to=gienah@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

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