* [gentoo-commits] repo/gentoo:master commit in: dev-lang/scala/
@ 2020-05-17 16:55 Aaron Bauman
0 siblings, 0 replies; 16+ messages in thread
From: Aaron Bauman @ 2020-05-17 16:55 UTC (permalink / raw
To: gentoo-commits
commit: bfde4cc3391e43ed4d5f5b60fea49ec047e7846a
Author: Alexey Sokolov <sokolov <AT> google <DOT> com>
AuthorDate: Fri May 8 14:50:45 2020 +0000
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Sun May 17 16:55:19 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bfde4cc3
dev-lang/scala: update homepage
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Alexey Sokolov <sokolov <AT> google.com>
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>
dev-lang/scala/scala-2.12.10.ebuild | 2 +-
dev-lang/scala/scala-2.12.4.ebuild | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/dev-lang/scala/scala-2.12.10.ebuild b/dev-lang/scala/scala-2.12.10.ebuild
index 43d41a07a6f..4699867705b 100644
--- a/dev-lang/scala/scala-2.12.10.ebuild
+++ b/dev-lang/scala/scala-2.12.10.ebuild
@@ -36,7 +36,7 @@ SBTV="0.13.18"
# ${P}/build/scaladoc
DESCRIPTION="The Scala Programming Language"
-HOMEPAGE="http://www.scala-lang.org/"
+HOMEPAGE="https://www.scala-lang.org/"
SRC_URI="
!binary? (
https://github.com/scala/scala/archive/v${PV}.tar.gz -> ${P}.tar.gz
diff --git a/dev-lang/scala/scala-2.12.4.ebuild b/dev-lang/scala/scala-2.12.4.ebuild
index 1adbeeb8b46..715bb6f6fb0 100644
--- a/dev-lang/scala/scala-2.12.4.ebuild
+++ b/dev-lang/scala/scala-2.12.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -59,7 +59,7 @@ declare -a JURI=(
)
DESCRIPTION="The Scala Programming Language"
-HOMEPAGE="http://www.scala-lang.org/"
+HOMEPAGE="https://www.scala-lang.org/"
SRC_URI="
!binary? (
https://github.com/scala/scala/archive/v${PV}.tar.gz -> ${P}.tar.gz
^ permalink raw reply related [flat|nested] 16+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-lang/scala/
@ 2024-05-09 10:52 Florian Schmaus
0 siblings, 0 replies; 16+ messages in thread
From: Florian Schmaus @ 2024-05-09 10:52 UTC (permalink / raw
To: gentoo-commits
commit: cd7420e3db647a6b17a2824799851d4e408aaa7f
Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Thu May 9 10:19:13 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=cd7420e3
dev-lang/scala: fix compilation error
Closes: https://bugs.gentoo.org/931614
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/36491
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>
dev-lang/scala/{scala-2.12.10-r1.ebuild => scala-2.12.10-r2.ebuild} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dev-lang/scala/scala-2.12.10-r1.ebuild b/dev-lang/scala/scala-2.12.10-r2.ebuild
similarity index 99%
rename from dev-lang/scala/scala-2.12.10-r1.ebuild
rename to dev-lang/scala/scala-2.12.10-r2.ebuild
index 3ce6719026ac..0568eda4cfce 100644
--- a/dev-lang/scala/scala-2.12.10-r1.ebuild
+++ b/dev-lang/scala/scala-2.12.10-r2.ebuild
@@ -57,10 +57,10 @@ COMMON_DEP=">=dev-java/ant-1.10.14-r3:0
DEPEND="${COMMON_DEP}
!binary? (
- >=dev-java/sbt-${SBTV}:0
+ >=dev-java/sbt-${SBTV}-r1:0
media-gfx/graphviz
)
- <=virtual/jdk-17:*
+ <=virtual/jdk-11:*
app-arch/xz-utils:0"
RDEPEND="${COMMON_DEP}
^ permalink raw reply related [flat|nested] 16+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-lang/scala/
@ 2024-04-30 8:15 Florian Schmaus
0 siblings, 0 replies; 16+ messages in thread
From: Florian Schmaus @ 2024-04-30 8:15 UTC (permalink / raw
To: gentoo-commits
commit: 907e8457f31775648ccee6eb0f03277ea9b00799
Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Fri Apr 26 13:03:19 2024 +0000
Commit: Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Tue Apr 30 08:15:20 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=907e8457
dev-lang/scala: fix compilation errors
- Replaces ${SBT_PVR} with ${SBTV} for #904316
- Restricts to <=virtual/jdk-17:* for #854717
- Switches from ant-core to >=dev-java/ant-1.10.14-r3
- Updates EAPI 7 -> 8
Closes: https://bugs.gentoo.org/854717
Closes: https://bugs.gentoo.org/904316
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/36474
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>
.../{scala-2.12.10.ebuild => scala-2.12.10-r1.ebuild} | 17 ++++++-----------
1 file changed, 6 insertions(+), 11 deletions(-)
diff --git a/dev-lang/scala/scala-2.12.10.ebuild b/dev-lang/scala/scala-2.12.10-r1.ebuild
similarity index 90%
rename from dev-lang/scala/scala-2.12.10.ebuild
rename to dev-lang/scala/scala-2.12.10-r1.ebuild
index dc6558800069..3ce6719026ac 100644
--- a/dev-lang/scala/scala-2.12.10.ebuild
+++ b/dev-lang/scala/scala-2.12.10-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="7"
+EAPI=8
JAVA_PKG_IUSE="doc source"
@@ -52,7 +52,7 @@ KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
IUSE="binary emacs"
-COMMON_DEP="dev-java/ant-core:0
+COMMON_DEP=">=dev-java/ant-1.10.14-r3:0
dev-java/jline:2"
DEPEND="${COMMON_DEP}
@@ -60,7 +60,7 @@ DEPEND="${COMMON_DEP}
>=dev-java/sbt-${SBTV}:0
media-gfx/graphviz
)
- >=virtual/jdk-1.8:*
+ <=virtual/jdk-17:*
app-arch/xz-utils:0"
RDEPEND="${COMMON_DEP}
@@ -100,7 +100,7 @@ src_unpack() {
}
src_prepare() {
- java-pkg_getjars ant-core,jline-2,sbt
+ java-pkg_getjars ant,jline-2,sbt
if ! use binary; then
local a
@@ -117,16 +117,11 @@ src_prepare() {
# gentoo patch (by gienah) to stop it calling git log in the build
eapply "${FILESDIR}/${PN}-2.12.10-no-git.patch"
- local SBT_PVR="$(java-config --query=PVR --package=sbt)"
- sed -e "s@sbt.version=${SBTV}@sbt.version=${SBT_PVR}@" \
- -i "${S}/project/build.properties" \
- || die "Could not set sbt.version=${SBT_PVR} in project/build.properties"
-
cat <<- EOF > "${S}/sbt"
#!/bin/bash
gjl_package=sbt
gjl_jar="sbt-launch.jar"
- gjl_java_args="-Dsbt.version=${SBT_PVR} -Xms512M -Xmx1536M -Xss1M -XX:+CMSClassUnloadingEnabled -Duser.home="${WORKDIR}""
+ gjl_java_args="-Dsbt.version=${SBTV} -Xms512M -Xmx1536M -Xss1M -XX:+CMSClassUnloadingEnabled -Duser.home="${WORKDIR}""
source "${EPREFIX}"/usr/share/java-config-2/launcher/launcher.bash
EOF
chmod u+x "${S}/sbt" || die
^ permalink raw reply related [flat|nested] 16+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-lang/scala/
@ 2022-10-15 23:40 Sam James
0 siblings, 0 replies; 16+ messages in thread
From: Sam James @ 2022-10-15 23:40 UTC (permalink / raw
To: gentoo-commits
commit: c3c691eb0733b17efb4b3395f9778b2d47d11629
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 15 23:40:27 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Oct 15 23:40:35 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3c691eb
dev-lang/scala: drop to ~x86
Slacking stabilisation for sbt.
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-lang/scala/scala-2.12.4.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dev-lang/scala/scala-2.12.4.ebuild b/dev-lang/scala/scala-2.12.4.ebuild
index fc66541405ac..58851200267d 100644
--- a/dev-lang/scala/scala-2.12.4.ebuild
+++ b/dev-lang/scala/scala-2.12.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -70,7 +70,7 @@ SRC_URI="
https://dev.gentoo.org/~gienah/files/dist/${P}-gentoo-binary.tar.xz )"
LICENSE="BSD"
SLOT="${SV}/${PV}"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
IUSE="binary emacs"
^ permalink raw reply related [flat|nested] 16+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-lang/scala/
@ 2022-08-05 8:17 Arthur Zamarin
0 siblings, 0 replies; 16+ messages in thread
From: Arthur Zamarin @ 2022-08-05 8:17 UTC (permalink / raw
To: gentoo-commits
commit: de6b3ac65243891e6cbcbf751a0f6a1226e48de8
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 5 08:17:47 2022 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Aug 5 08:17:47 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de6b3ac6
dev-lang/scala: Keyword 2.12.10 arm64, #732962
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
dev-lang/scala/scala-2.12.10.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dev-lang/scala/scala-2.12.10.ebuild b/dev-lang/scala/scala-2.12.10.ebuild
index 53d69e4427fa..dc6558800069 100644
--- a/dev-lang/scala/scala-2.12.10.ebuild
+++ b/dev-lang/scala/scala-2.12.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
@@ -48,7 +48,7 @@ SRC_URI="
)"
LICENSE="BSD"
SLOT="${SV}/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
IUSE="binary emacs"
^ permalink raw reply related [flat|nested] 16+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-lang/scala/
@ 2022-06-23 5:49 Sam James
0 siblings, 0 replies; 16+ messages in thread
From: Sam James @ 2022-06-23 5:49 UTC (permalink / raw
To: gentoo-commits
commit: 514ad696ea972f45a2d0c828a4ed1dec2b21cf7e
Author: pvgoran <pvgoran <AT> users <DOT> noreply <DOT> github <DOT> com>
AuthorDate: Wed Jun 22 12:08:46 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Jun 23 05:47:55 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=514ad696
dev-lang/scala: Correct source URL for USE=binary for 2.12.10
Closes: https://bugs.gentoo.org/733086
Signed-off-by: Pavel Goran <via-gentoo <AT> pvgoran.name>
Closes: https://github.com/gentoo/gentoo/pull/26038
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-lang/scala/scala-2.12.10.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-lang/scala/scala-2.12.10.ebuild b/dev-lang/scala/scala-2.12.10.ebuild
index 55b8c7fa565a..53d69e4427fa 100644
--- a/dev-lang/scala/scala-2.12.10.ebuild
+++ b/dev-lang/scala/scala-2.12.10.ebuild
@@ -44,7 +44,7 @@ SRC_URI="
https://dev.gentoo.org/~gienah/snapshots/${P}-sbt-deps.tar.xz
)
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="${SV}/${PV}"
^ permalink raw reply related [flat|nested] 16+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-lang/scala/
@ 2021-12-26 12:14 Benda XU
0 siblings, 0 replies; 16+ messages in thread
From: Benda XU @ 2021-12-26 12:14 UTC (permalink / raw
To: gentoo-commits
commit: 6a3d73b110504517e8ad9a2cfd0f2ef7a20b54bf
Author: Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 26 12:11:08 2021 +0000
Commit: Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Sun Dec 26 12:14:13 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a3d73b1
dev-lang/scala: reorganize DEPEND to let it build.
virtual/jdk dependences is conditional on The USE=binary switch. For
scala-2.12.4, "=1.8" jdk version is a subset of >=1.8, USE=binary
dependence is unconditional. Likewise for 2.12.10, USE=-binary is also
unconditional.
This circumvents the bug in java-config for not parsing "!binary( )"
structures correctly.
Reference: https://gitweb.gentoo.org/proj/java-config.git/commit/?id=d9ac25402fa9ff918e1f1da4e3e0d97281e437c4
Credits: Murph, Zhixu Liu, Ivan J.
Reported-by: WGH
Closes: https://bugs.gentoo.org/754393
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Benda Xu <heroxbd <AT> gentoo.org>
dev-lang/scala/scala-2.12.10.ebuild | 7 ++-----
dev-lang/scala/scala-2.12.4.ebuild | 6 ++----
2 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/dev-lang/scala/scala-2.12.10.ebuild b/dev-lang/scala/scala-2.12.10.ebuild
index 466ca0b73817..55b8c7fa565a 100644
--- a/dev-lang/scala/scala-2.12.10.ebuild
+++ b/dev-lang/scala/scala-2.12.10.ebuild
@@ -57,13 +57,10 @@ COMMON_DEP="dev-java/ant-core:0
DEPEND="${COMMON_DEP}
!binary? (
- >=virtual/jdk-1.8:*
>=dev-java/sbt-${SBTV}:0
media-gfx/graphviz
)
- binary? (
- >=virtual/jdk-1.8:*
- )
+ >=virtual/jdk-1.8:*
app-arch/xz-utils:0"
RDEPEND="${COMMON_DEP}
@@ -130,7 +127,7 @@ src_prepare() {
gjl_package=sbt
gjl_jar="sbt-launch.jar"
gjl_java_args="-Dsbt.version=${SBT_PVR} -Xms512M -Xmx1536M -Xss1M -XX:+CMSClassUnloadingEnabled -Duser.home="${WORKDIR}""
- source /usr/share/java-config-2/launcher/launcher.bash
+ source "${EPREFIX}"/usr/share/java-config-2/launcher/launcher.bash
EOF
chmod u+x "${S}/sbt" || die
diff --git a/dev-lang/scala/scala-2.12.4.ebuild b/dev-lang/scala/scala-2.12.4.ebuild
index 99b7b67f1135..fc66541405ac 100644
--- a/dev-lang/scala/scala-2.12.4.ebuild
+++ b/dev-lang/scala/scala-2.12.4.ebuild
@@ -83,9 +83,7 @@ DEPEND="${COMMON_DEP}
>=dev-java/sbt-0.13.13
media-gfx/graphviz
)
- binary? (
- >=virtual/jdk-1.8
- )
+ >=virtual/jdk-1.8
app-arch/xz-utils:0"
RDEPEND="${COMMON_DEP}
@@ -146,7 +144,7 @@ src_prepare() {
gjl_package=sbt
gjl_jar="sbt-launch.jar"
gjl_java_args="-Dsbt.version=0.13.13 -Dfile.encoding=UTF8 -Xms512M -Xmx1536M -Xss1M -XX:+CMSClassUnloadingEnabled -Duser.home="${WORKDIR}""
- source /usr/share/java-config-2/launcher/launcher.bash
+ source "${EPREFIX}"/usr/share/java-config-2/launcher/launcher.bash
EOF
chmod u+x "${S}/sbt" || die
^ permalink raw reply related [flat|nested] 16+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-lang/scala/
@ 2020-01-14 22:46 Thomas Deutschmann
0 siblings, 0 replies; 16+ messages in thread
From: Thomas Deutschmann @ 2020-01-14 22:46 UTC (permalink / raw
To: gentoo-commits
commit: 7cdca081b179f2053d63018556926aacab50dab5
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 14 22:45:49 2020 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Tue Jan 14 22:46:08 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7cdca081
dev-lang/scala: add missing slash
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
dev-lang/scala/scala-2.12.10.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-lang/scala/scala-2.12.10.ebuild b/dev-lang/scala/scala-2.12.10.ebuild
index 0ae8d306438..43d41a07a6f 100644
--- a/dev-lang/scala/scala-2.12.10.ebuild
+++ b/dev-lang/scala/scala-2.12.10.ebuild
@@ -144,7 +144,7 @@ src_prepare() {
src_compile() {
if ! use binary; then
- export PATH="${EROOT}usr/share/scala-${SV}/bin:${WORKDIR}/${L_P}:${PATH}"
+ export PATH="${EROOT}/usr/share/scala-${SV}/bin:${WORKDIR}/${L_P}:${PATH}"
export LANG="en_US.UTF-8"
einfo "=== scala compile ..."
"${S}"/sbt -Dsbt.log.noformat=true compile || die "sbt compile failed"
^ permalink raw reply related [flat|nested] 16+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-lang/scala/
@ 2019-12-29 6:17 Mark Wright
0 siblings, 0 replies; 16+ messages in thread
From: Mark Wright @ 2019-12-29 6:17 UTC (permalink / raw
To: gentoo-commits
commit: b668f7b1d0e89f4bd3dda5d22a6b7f0971f2bd70
Author: tharvik <tharvik <AT> users <DOT> noreply <DOT> github <DOT> com>
AuthorDate: Wed Aug 29 13:54:28 2018 +0000
Commit: Mark Wright <gienah <AT> gentoo <DOT> org>
CommitDate: Sun Dec 29 06:16:22 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b668f7b1
dev-lang/scala: fix compile's encoding
Closes: https://bugs.gentoo.org/664866
Closes: https://github.com/gentoo/gentoo/pull/9732
Signed-off-by: Mark Wright <gienah <AT> gentoo.org>
dev-lang/scala/scala-2.12.4.ebuild | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/dev-lang/scala/scala-2.12.4.ebuild b/dev-lang/scala/scala-2.12.4.ebuild
index b36402420d4..1adbeeb8b46 100644
--- a/dev-lang/scala/scala-2.12.4.ebuild
+++ b/dev-lang/scala/scala-2.12.4.ebuild
@@ -145,7 +145,7 @@ src_prepare() {
#!/bin/bash
gjl_package=sbt
gjl_jar="sbt-launch.jar"
- gjl_java_args="-Dsbt.version=0.13.13 -Xms512M -Xmx1536M -Xss1M -XX:+CMSClassUnloadingEnabled -Duser.home="${WORKDIR}""
+ gjl_java_args="-Dsbt.version=0.13.13 -Dfile.encoding=UTF8 -Xms512M -Xmx1536M -Xss1M -XX:+CMSClassUnloadingEnabled -Duser.home="${WORKDIR}""
source /usr/share/java-config-2/launcher/launcher.bash
EOF
chmod u+x "${S}/sbt" || die
@@ -161,7 +161,6 @@ src_prepare() {
src_compile() {
if ! use binary; then
export PATH="${EROOT}usr/share/scala-${SV}/bin:${WORKDIR}/${L_P}:${PATH}"
- export LANG="en_US.UTF-8"
einfo "=== scala compile ..."
"${S}"/sbt -Dsbt.log.noformat=true compile || die "sbt compile failed"
einfo "=== sbt publishLocal with jdk $(java-pkg_get-vm-version) ..."
^ permalink raw reply related [flat|nested] 16+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-lang/scala/
@ 2018-08-26 9:39 Michał Górny
0 siblings, 0 replies; 16+ messages in thread
From: Michał Górny @ 2018-08-26 9:39 UTC (permalink / raw
To: gentoo-commits
commit: 7ab2aa6670197fcd97244b359ca98d8ab847e3ba
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 26 09:05:13 2018 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Aug 26 09:05:13 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ab2aa66
dev-lang/scala: Remove support for non-existent deps
dev-lang/scala/scala-2.11.1-r2.ebuild | 4 ++--
dev-lang/scala/scala-2.11.11.ebuild | 4 ++--
dev-lang/scala/scala-2.11.2-r2.ebuild | 4 ++--
dev-lang/scala/scala-2.11.4-r1.ebuild | 4 ++--
dev-lang/scala/scala-2.11.4-r2.ebuild | 4 ++--
dev-lang/scala/scala-2.11.6-r1.ebuild | 4 ++--
dev-lang/scala/scala-2.11.7-r1.ebuild | 4 ++--
dev-lang/scala/scala-2.11.8.ebuild | 4 ++--
8 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/dev-lang/scala/scala-2.11.1-r2.ebuild b/dev-lang/scala/scala-2.11.1-r2.ebuild
index e2bdb4138ba..3c4def15b54 100644
--- a/dev-lang/scala/scala-2.11.1-r2.ebuild
+++ b/dev-lang/scala/scala-2.11.1-r2.ebuild
@@ -71,14 +71,14 @@ COMMON_DEP="dev-java/ant-core:0
DEPEND="${COMMON_DEP}
!binary? (
- || ( =virtual/jdk-1.7* =virtual/jdk-1.8* )
+ =virtual/jdk-1.8*
dev-java/ant-core:0
dev-java/ant-contrib:0
dev-java/ant-nodeps:0
media-gfx/graphviz
)
binary? (
- || ( =virtual/jdk-1.7* =virtual/jdk-1.8* )
+ =virtual/jdk-1.8*
)
app-arch/xz-utils:0"
diff --git a/dev-lang/scala/scala-2.11.11.ebuild b/dev-lang/scala/scala-2.11.11.ebuild
index 40bafa3a7db..563b35b0521 100644
--- a/dev-lang/scala/scala-2.11.11.ebuild
+++ b/dev-lang/scala/scala-2.11.11.ebuild
@@ -73,14 +73,14 @@ COMMON_DEP="dev-java/ant-core:0
DEPEND="${COMMON_DEP}
!binary? (
- || ( =virtual/jdk-1.7* =virtual/jdk-1.8* )
+ =virtual/jdk-1.8*
dev-java/ant-core:0
dev-java/ant-contrib:0
dev-java/ant-nodeps:0
media-gfx/graphviz
)
binary? (
- || ( =virtual/jdk-1.7* =virtual/jdk-1.8* )
+ =virtual/jdk-1.8*
)
app-arch/xz-utils:0"
diff --git a/dev-lang/scala/scala-2.11.2-r2.ebuild b/dev-lang/scala/scala-2.11.2-r2.ebuild
index 200cda5accd..443769b797d 100644
--- a/dev-lang/scala/scala-2.11.2-r2.ebuild
+++ b/dev-lang/scala/scala-2.11.2-r2.ebuild
@@ -71,14 +71,14 @@ COMMON_DEP="dev-java/ant-core:0
DEPEND="${COMMON_DEP}
!binary? (
- || ( =virtual/jdk-1.7* =virtual/jdk-1.8* )
+ =virtual/jdk-1.8*
dev-java/ant-core:0
dev-java/ant-contrib:0
dev-java/ant-nodeps:0
media-gfx/graphviz
)
binary? (
- || ( =virtual/jdk-1.7* =virtual/jdk-1.8* )
+ =virtual/jdk-1.8*
)
app-arch/xz-utils:0"
diff --git a/dev-lang/scala/scala-2.11.4-r1.ebuild b/dev-lang/scala/scala-2.11.4-r1.ebuild
index 5ff29fa215e..eacdf857425 100644
--- a/dev-lang/scala/scala-2.11.4-r1.ebuild
+++ b/dev-lang/scala/scala-2.11.4-r1.ebuild
@@ -71,14 +71,14 @@ COMMON_DEP="dev-java/ant-core:0
DEPEND="${COMMON_DEP}
!binary? (
- || ( =virtual/jdk-1.6* =virtual/jdk-1.7* =virtual/jdk-1.8* )
+ =virtual/jdk-1.8*
dev-java/ant-core:0
dev-java/ant-contrib:0
dev-java/ant-nodeps:0
media-gfx/graphviz
)
binary? (
- || ( =virtual/jdk-1.7* =virtual/jdk-1.8* )
+ =virtual/jdk-1.8*
)
app-arch/xz-utils:0"
diff --git a/dev-lang/scala/scala-2.11.4-r2.ebuild b/dev-lang/scala/scala-2.11.4-r2.ebuild
index 6015a9c1b7c..e9dd2fb848f 100644
--- a/dev-lang/scala/scala-2.11.4-r2.ebuild
+++ b/dev-lang/scala/scala-2.11.4-r2.ebuild
@@ -71,14 +71,14 @@ COMMON_DEP="dev-java/ant-core:0
DEPEND="${COMMON_DEP}
!binary? (
- || ( =virtual/jdk-1.7* =virtual/jdk-1.8* )
+ =virtual/jdk-1.8*
dev-java/ant-core:0
dev-java/ant-contrib:0
dev-java/ant-nodeps:0
media-gfx/graphviz
)
binary? (
- || ( =virtual/jdk-1.7* =virtual/jdk-1.8* )
+ =virtual/jdk-1.8*
)
app-arch/xz-utils:0"
diff --git a/dev-lang/scala/scala-2.11.6-r1.ebuild b/dev-lang/scala/scala-2.11.6-r1.ebuild
index b31e50091cd..50afdf2a1a2 100644
--- a/dev-lang/scala/scala-2.11.6-r1.ebuild
+++ b/dev-lang/scala/scala-2.11.6-r1.ebuild
@@ -71,14 +71,14 @@ COMMON_DEP="dev-java/ant-core:0
DEPEND="${COMMON_DEP}
!binary? (
- || ( =virtual/jdk-1.7* =virtual/jdk-1.8* )
+ =virtual/jdk-1.8*
dev-java/ant-core:0
dev-java/ant-contrib:0
dev-java/ant-nodeps:0
media-gfx/graphviz
)
binary? (
- || ( =virtual/jdk-1.7* =virtual/jdk-1.8* )
+ =virtual/jdk-1.8*
)
app-arch/xz-utils:0"
diff --git a/dev-lang/scala/scala-2.11.7-r1.ebuild b/dev-lang/scala/scala-2.11.7-r1.ebuild
index 25ec70aafff..1b9b10ab12b 100644
--- a/dev-lang/scala/scala-2.11.7-r1.ebuild
+++ b/dev-lang/scala/scala-2.11.7-r1.ebuild
@@ -71,14 +71,14 @@ COMMON_DEP="dev-java/ant-core:0
DEPEND="${COMMON_DEP}
!binary? (
- || ( =virtual/jdk-1.7* =virtual/jdk-1.8* )
+ =virtual/jdk-1.8*
dev-java/ant-core:0
dev-java/ant-contrib:0
dev-java/ant-nodeps:0
media-gfx/graphviz
)
binary? (
- || ( =virtual/jdk-1.7* =virtual/jdk-1.8* )
+ =virtual/jdk-1.8*
)
app-arch/xz-utils:0"
diff --git a/dev-lang/scala/scala-2.11.8.ebuild b/dev-lang/scala/scala-2.11.8.ebuild
index ae3518042cf..8ba79236888 100644
--- a/dev-lang/scala/scala-2.11.8.ebuild
+++ b/dev-lang/scala/scala-2.11.8.ebuild
@@ -71,14 +71,14 @@ COMMON_DEP="dev-java/ant-core:0
DEPEND="${COMMON_DEP}
!binary? (
- || ( =virtual/jdk-1.7* =virtual/jdk-1.8* )
+ =virtual/jdk-1.8*
dev-java/ant-core:0
dev-java/ant-contrib:0
dev-java/ant-nodeps:0
media-gfx/graphviz
)
binary? (
- || ( =virtual/jdk-1.7* =virtual/jdk-1.8* )
+ =virtual/jdk-1.8*
)
app-arch/xz-utils:0"
^ permalink raw reply related [flat|nested] 16+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-lang/scala/
@ 2018-06-26 1:28 Aaron Bauman
0 siblings, 0 replies; 16+ messages in thread
From: Aaron Bauman @ 2018-06-26 1:28 UTC (permalink / raw
To: gentoo-commits
commit: 7d1bfb63fadac010305babfa2d2e4698c65f2ad8
Author: Aaron Bauman <bman <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 26 01:24:30 2018 +0000
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Tue Jun 26 01:24:30 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d1bfb63
dev-lang/scala: amd64 stable
Package-Manager: Portage-2.3.40, Repoman-2.3.9
dev-lang/scala/scala-2.11.11.ebuild | 2 +-
dev-lang/scala/scala-2.12.4.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/dev-lang/scala/scala-2.11.11.ebuild b/dev-lang/scala/scala-2.11.11.ebuild
index 1d07a77195b..40bafa3a7db 100644
--- a/dev-lang/scala/scala-2.11.11.ebuild
+++ b/dev-lang/scala/scala-2.11.11.ebuild
@@ -64,7 +64,7 @@ SRC_URI="
LICENSE="BSD"
SLOT="${SV}/${PV}"
-KEYWORDS="~amd64 x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x86-macos"
IUSE="binary emacs"
diff --git a/dev-lang/scala/scala-2.12.4.ebuild b/dev-lang/scala/scala-2.12.4.ebuild
index fa4f7d78c1d..b36402420d4 100644
--- a/dev-lang/scala/scala-2.12.4.ebuild
+++ b/dev-lang/scala/scala-2.12.4.ebuild
@@ -70,7 +70,7 @@ SRC_URI="
https://dev.gentoo.org/~gienah/files/dist/${P}-gentoo-binary.tar.xz )"
LICENSE="BSD"
SLOT="${SV}/${PV}"
-KEYWORDS="~amd64 x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x86-macos"
IUSE="binary emacs"
^ permalink raw reply related [flat|nested] 16+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-lang/scala/
@ 2018-06-25 23:20 Thomas Deutschmann
0 siblings, 0 replies; 16+ messages in thread
From: Thomas Deutschmann @ 2018-06-25 23:20 UTC (permalink / raw
To: gentoo-commits
commit: 7e9f5548d02a343a755c0074b58c0159253bb49d
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 25 23:00:14 2018 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Jun 25 23:20:19 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e9f5548
dev-lang/scala: x86 stable (bug #637940)
Package-Manager: Portage-2.3.40, Repoman-2.3.9
dev-lang/scala/scala-2.11.11.ebuild | 2 +-
dev-lang/scala/scala-2.12.4.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/dev-lang/scala/scala-2.11.11.ebuild b/dev-lang/scala/scala-2.11.11.ebuild
index 9809a7fcfcb..1d07a77195b 100644
--- a/dev-lang/scala/scala-2.11.11.ebuild
+++ b/dev-lang/scala/scala-2.11.11.ebuild
@@ -64,7 +64,7 @@ SRC_URI="
LICENSE="BSD"
SLOT="${SV}/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~amd64 x86 ~amd64-linux ~x86-linux ~x86-macos"
IUSE="binary emacs"
diff --git a/dev-lang/scala/scala-2.12.4.ebuild b/dev-lang/scala/scala-2.12.4.ebuild
index 767fdd49823..fa4f7d78c1d 100644
--- a/dev-lang/scala/scala-2.12.4.ebuild
+++ b/dev-lang/scala/scala-2.12.4.ebuild
@@ -70,7 +70,7 @@ SRC_URI="
https://dev.gentoo.org/~gienah/files/dist/${P}-gentoo-binary.tar.xz )"
LICENSE="BSD"
SLOT="${SV}/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~amd64 x86 ~amd64-linux ~x86-linux ~x86-macos"
IUSE="binary emacs"
^ permalink raw reply related [flat|nested] 16+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-lang/scala/
@ 2016-02-17 11:56 Mark Wright
0 siblings, 0 replies; 16+ messages in thread
From: Mark Wright @ 2016-02-17 11:56 UTC (permalink / raw
To: gentoo-commits
commit: 0f9735dbe9ca9893b130245baa1a5dfeb32eff6c
Author: Mark Wright <gienah <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 17 11:55:29 2016 +0000
Commit: Mark Wright <gienah <AT> gentoo <DOT> org>
CommitDate: Wed Feb 17 11:55:29 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f9735db
dev-lang/scala: Remove DEPEND java-virtuals/jdk-with-com-sun:0
Package-Manager: portage-2.2.27
dev-lang/scala/scala-2.10.2-r3.ebuild | 3 +--
dev-lang/scala/scala-2.10.3-r2.ebuild | 3 +--
dev-lang/scala/scala-2.10.4-r2.ebuild | 3 +--
dev-lang/scala/scala-2.10.6.ebuild | 1 -
dev-lang/scala/scala-2.11.1-r2.ebuild | 3 +--
dev-lang/scala/scala-2.11.2-r2.ebuild | 3 +--
dev-lang/scala/scala-2.11.4-r1.ebuild | 3 +--
dev-lang/scala/scala-2.11.4-r2.ebuild | 3 +--
dev-lang/scala/scala-2.11.6-r1.ebuild | 3 +--
dev-lang/scala/scala-2.11.7-r1.ebuild | 3 +--
dev-lang/scala/scala-2.9.3.ebuild | 3 +--
11 files changed, 10 insertions(+), 21 deletions(-)
diff --git a/dev-lang/scala/scala-2.10.2-r3.ebuild b/dev-lang/scala/scala-2.10.2-r3.ebuild
index 9ae487c..41067bf 100644
--- a/dev-lang/scala/scala-2.10.2-r3.ebuild
+++ b/dev-lang/scala/scala-2.10.2-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -73,7 +73,6 @@ COMMON_DEP="dev-java/ant-core:0
DEPEND="${COMMON_DEP}
=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-r2.ebuild b/dev-lang/scala/scala-2.10.3-r2.ebuild
index 40a9e35..32db056 100644
--- a/dev-lang/scala/scala-2.10.3-r2.ebuild
+++ b/dev-lang/scala/scala-2.10.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -84,7 +84,6 @@ COMMON_DEP="dev-java/ant-core:0
DEPEND="${COMMON_DEP}
=virtual/jdk-1.7*
- java-virtuals/jdk-with-com-sun:0
!binary? (
dev-java/ant-core:0
dev-java/ant-contrib:0
diff --git a/dev-lang/scala/scala-2.10.4-r2.ebuild b/dev-lang/scala/scala-2.10.4-r2.ebuild
index c3e0af4..ddde117 100644
--- a/dev-lang/scala/scala-2.10.4-r2.ebuild
+++ b/dev-lang/scala/scala-2.10.4-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -81,7 +81,6 @@ COMMON_DEP="dev-java/ant-core:0
dev-java/hawtjni-runtime:0"
DEPEND="${COMMON_DEP}
- java-virtuals/jdk-with-com-sun:0
!binary? (
=virtual/jdk-1.7*
dev-java/ant-core:0
diff --git a/dev-lang/scala/scala-2.10.6.ebuild b/dev-lang/scala/scala-2.10.6.ebuild
index 8bf584d..cf4d985 100644
--- a/dev-lang/scala/scala-2.10.6.ebuild
+++ b/dev-lang/scala/scala-2.10.6.ebuild
@@ -81,7 +81,6 @@ COMMON_DEP="dev-java/ant-core:0
dev-java/hawtjni-runtime:0"
DEPEND="${COMMON_DEP}
- java-virtuals/jdk-with-com-sun:0
!binary? (
=virtual/jdk-1.7*
dev-java/ant-core:0
diff --git a/dev-lang/scala/scala-2.11.1-r2.ebuild b/dev-lang/scala/scala-2.11.1-r2.ebuild
index 6b22204..5549c58 100644
--- a/dev-lang/scala/scala-2.11.1-r2.ebuild
+++ b/dev-lang/scala/scala-2.11.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -71,7 +71,6 @@ COMMON_DEP="dev-java/ant-core:0
dev-java/hawtjni-runtime:0"
DEPEND="${COMMON_DEP}
- java-virtuals/jdk-with-com-sun:0
!binary? (
|| ( =virtual/jdk-1.7* =virtual/jdk-1.8* )
dev-java/ant-core:0
diff --git a/dev-lang/scala/scala-2.11.2-r2.ebuild b/dev-lang/scala/scala-2.11.2-r2.ebuild
index 0f3b1ae..f265eab 100644
--- a/dev-lang/scala/scala-2.11.2-r2.ebuild
+++ b/dev-lang/scala/scala-2.11.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -71,7 +71,6 @@ COMMON_DEP="dev-java/ant-core:0
dev-java/hawtjni-runtime:0"
DEPEND="${COMMON_DEP}
- java-virtuals/jdk-with-com-sun:0
!binary? (
|| ( =virtual/jdk-1.7* =virtual/jdk-1.8* )
dev-java/ant-core:0
diff --git a/dev-lang/scala/scala-2.11.4-r1.ebuild b/dev-lang/scala/scala-2.11.4-r1.ebuild
index e384d9d..464ddf1 100644
--- a/dev-lang/scala/scala-2.11.4-r1.ebuild
+++ b/dev-lang/scala/scala-2.11.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -71,7 +71,6 @@ COMMON_DEP="dev-java/ant-core:0
dev-java/hawtjni-runtime:0"
DEPEND="${COMMON_DEP}
- java-virtuals/jdk-with-com-sun:0
!binary? (
|| ( =virtual/jdk-1.6* =virtual/jdk-1.7* =virtual/jdk-1.8* )
dev-java/ant-core:0
diff --git a/dev-lang/scala/scala-2.11.4-r2.ebuild b/dev-lang/scala/scala-2.11.4-r2.ebuild
index 4d8c9fd..141f851 100644
--- a/dev-lang/scala/scala-2.11.4-r2.ebuild
+++ b/dev-lang/scala/scala-2.11.4-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -71,7 +71,6 @@ COMMON_DEP="dev-java/ant-core:0
dev-java/hawtjni-runtime:0"
DEPEND="${COMMON_DEP}
- java-virtuals/jdk-with-com-sun:0
!binary? (
|| ( =virtual/jdk-1.7* =virtual/jdk-1.8* )
dev-java/ant-core:0
diff --git a/dev-lang/scala/scala-2.11.6-r1.ebuild b/dev-lang/scala/scala-2.11.6-r1.ebuild
index c4bafb0..c28cc61 100644
--- a/dev-lang/scala/scala-2.11.6-r1.ebuild
+++ b/dev-lang/scala/scala-2.11.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -71,7 +71,6 @@ COMMON_DEP="dev-java/ant-core:0
dev-java/hawtjni-runtime:0"
DEPEND="${COMMON_DEP}
- java-virtuals/jdk-with-com-sun:0
!binary? (
|| ( =virtual/jdk-1.7* =virtual/jdk-1.8* )
dev-java/ant-core:0
diff --git a/dev-lang/scala/scala-2.11.7-r1.ebuild b/dev-lang/scala/scala-2.11.7-r1.ebuild
index 0cedfbd..e1ac021 100644
--- a/dev-lang/scala/scala-2.11.7-r1.ebuild
+++ b/dev-lang/scala/scala-2.11.7-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -71,7 +71,6 @@ COMMON_DEP="dev-java/ant-core:0
dev-java/hawtjni-runtime:0"
DEPEND="${COMMON_DEP}
- java-virtuals/jdk-with-com-sun:0
!binary? (
|| ( =virtual/jdk-1.7* =virtual/jdk-1.8* )
dev-java/ant-core:0
diff --git a/dev-lang/scala/scala-2.9.3.ebuild b/dev-lang/scala/scala-2.9.3.ebuild
index fbb26b8..265c450 100644
--- a/dev-lang/scala/scala-2.9.3.ebuild
+++ b/dev-lang/scala/scala-2.9.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -79,7 +79,6 @@ COMMON_DEP="dev-java/ant-core:0
dev-java/hawtjni-runtime:0"
DEPEND="${COMMON_DEP}
- java-virtuals/jdk-with-com-sun:0
!binary? (
=virtual/jdk-1.7*
dev-java/ant-core:0
^ permalink raw reply related [flat|nested] 16+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-lang/scala/
@ 2016-02-16 10:44 Mark Wright
0 siblings, 0 replies; 16+ messages in thread
From: Mark Wright @ 2016-02-16 10:44 UTC (permalink / raw
To: gentoo-commits
commit: a64adaa65101f0d4af6791c4f0bbdef8871ebcf0
Author: Mark Wright <gienah <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 16 10:42:33 2016 +0000
Commit: Mark Wright <gienah <AT> gentoo <DOT> org>
CommitDate: Tue Feb 16 10:44:26 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a64adaa6
dev-lang/scala: Drop old version scala-2.9.2-r1, superceeded by scala-2.9.3
Package-Manager: portage-2.2.27
dev-lang/scala/Manifest | 2 -
dev-lang/scala/scala-2.9.2-r1.ebuild | 148 -----------------------------------
2 files changed, 150 deletions(-)
diff --git a/dev-lang/scala/Manifest b/dev-lang/scala/Manifest
index c74a6d6..405c169 100644
--- a/dev-lang/scala/Manifest
+++ b/dev-lang/scala/Manifest
@@ -181,8 +181,6 @@ DIST scala-2.11.7-nest.jar 2920 SHA256 3c7cf1a1b9fe9ad2abf3bfcedaa17a976c72f4bcc
DIST scala-2.11.7-push.jar 8886289 SHA256 58eb2b8c501bbff0e78074a058e3fc160012a80952c1cc96ed301d8a08d7e98d SHA512 b5539d381c8978ac57fc4258696e4cb552f47917178152b38b5683e42ed60da4d9da198a0344652f201541a71f92afd2ac8b3c3d3ec5266a8c222e9661d8a06a WHIRLPOOL 8fa6522a0fd9939f4ffd443b55e7a5adbb93a9dc5cbad569ccecd6be77ecd259eadbdb16c2c7eab6d9f175fbf33746faf9c41cf4d1050e7f576b86119301e126
DIST scala-2.11.7-vizant.jar 15910 SHA256 a54e19093725d0d085544553246e48607c1e6ab65575ae0ff721b788118461d6 SHA512 4464d7349016f4999199e227e8eaf7bb3ef6b7e38ad0e8e710faad55df2e1243d99b53b9a789a1ffd3c39aef0d979dffc543f4691feae68cfa743e51bcf61390 WHIRLPOOL 1b957b8b850f79309c3577a2dcac52a620fa54f810f242a02c52bbcee1cc9c5818785baa7db8e2b82b850bcb56b528c4dd07cdfad2f991c0025293ca02c0dc99
DIST scala-2.11.7.tar.gz 6443003 SHA256 1679ee604bc4e881b0d325e164c39c02dcfa711d53cd3115f5a6c9676c5915ef SHA512 f74614a303bdc28068b212e9fe4aa499db4a5a9ff87bf1af93d6b3598784edd3f2e37cedbdbc20c9aa507965845b4b511bfc786ff82f31dbc3365af796062611 WHIRLPOOL d7ebd8b9a6c34d90d7b7dd62d79406ff2776ed65037e93cd20c0ce2f954e3380896b67ee88813abe322303ebb7894070c68b1045ce71923ae26e876f1fa57a88
-DIST scala-2.9.2-gentoo-binary.tar.bz2 32370003 SHA256 43e07596f28e723cf1e2d41ed95c312af8422059de8c229d18eadb46d487c9ca SHA512 b0873dbe5d93b1665372c44f9473e1d4616f5347c26e0950cf2366b08e1f68069b1c527bda7bfcecb8af4afeaa1c9cae7d324d36509d5f2072e725310fd1cc7b WHIRLPOOL ffcba39e9f04eccadc16bda8770e42f2725fcf21172f7f6798f3849282c276d3671c93e0eaeb4a0a46a73a815cb31300302354f8e99ce888a5687739ab0f50f8
-DIST scala-2.9.2.tar.gz 38434121 SHA256 1b931103051f4f6b2f8788ac6f5392b5f29e1109e97f0e19340ff6185fbab4ad SHA512 c8ce17728976c506c90d2eec792904d39a16d35d153914a7c936e43e530f20d8cdf494287187c513393e2db7837b8ec9d417c56f6bb47be3b0501f2a57f52b63 WHIRLPOOL 08774dd06a6814a33a21643a0af361310ca8aae649968d4d411a3ffba32e855d320f052bda0707db356c01e1f4e1c1b0cafd67881d1666d046ad8934084e7635
DIST scala-2.9.3-annotations.jar 2242 SHA256 f2d057a006bba4253d069795284a7610f1c837af6a80c0057736099962e24bcc SHA512 3ceee0b1361b9e0911c1ff060ad108a1d93f7ea3e82ef946401cd5f895cb06016ac0ecdfd095f99b11cfb28c4cef7705c1b564c7af644c5f19b45c14a413c4dd WHIRLPOOL 51fa0efc5dd14cf8364e9639375511fc3e716bd520a193e6c17a2fe3f02eebd1529eb98fd3b382a6386baa5b779ebd0327e8f141aee172d11d9548d9921c58e1
DIST scala-2.9.3-ant-contrib.jar 224277 SHA256 be33a69818310b5c55e41dc11d48cd895f5f129da4b0d28c2f4c6c3e1cbcf3fc SHA512 5ec325a55bb213226c86faf8a99951839319e9579956ae58e2ccfe84f62d2742542998f98eed3f0dc8f8f94635d6dff1fe02e3c0f5289df1f09027ae2b9bee83 WHIRLPOOL aa713cc04b10c46adbbb8a5904e3fb34c6e32b67bb9a5f1a89768ceab8c31b977875c84434bc03c5b42105a4019f55cc10d806b0345c365a309e93d3f02e0a10
DIST scala-2.9.3-ant-dotnet-1.0.jar 57795 SHA256 40c18fcfb8c28e4ee82e53f72a3257db43bcba01e16ebd5a4550fc419edf30c1 SHA512 72afc387cf9dbeb99e627ca7f35f919f627bbf3f072eb46036120695fb70311490593c255c2a2e79b684adb8f213d8ab591d4ceda5d5f2e6b6906a6977b38867 WHIRLPOOL 18aa33fe259bd52e2f37b903be39d462e8622ff744f990fc92871eaa4fe10ff69cd25b2c968cc353b3c5138cd3fffd755715aef6bb16c57b0b72e7e5fd1975e1
diff --git a/dev-lang/scala/scala-2.9.2-r1.ebuild b/dev-lang/scala/scala-2.9.2-r1.ebuild
deleted file mode 100644
index 094572b..0000000
--- a/dev-lang/scala/scala-2.9.2-r1.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"
-JAVA_PKG_IUSE="doc examples source"
-WANT_ANT_TASKS="ant-nodeps"
-inherit eutils check-reqs java-pkg-2 java-ant-2 versionator
-
-MY_P="${PN}-sources-${PV}"
-SV="$(get_version_component_range 1-2)"
-
-# creating the binary:
-# JAVA_PKG_FORCE_VM="$available-1.6" USE="doc examples source" ebuild scala-*.ebuild compile
-# cd $WORDKIR
-# fix dist/latest link.
-# tar -cjf $DISTDIR/scala-$PN-gentoo-binary.tar.bz2 ${MY_P}/dists ${MY_P}/docs/TODO
-
-DESCRIPTION="The Scala Programming Language"
-HOMEPAGE="http://www.scala-lang.org/"
-SRC_URI="!binary? ( ${HOMEPAGE}downloads/distrib/files/${MY_P}.tgz -> ${P}.tar.gz )
- binary? ( https://dev.gentoo.org/~ali_bush/distfiles/${P}-gentoo-binary.tar.bz2 )"
-LICENSE="BSD"
-SLOT="${SV}/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-macos"
-IUSE="binary emacs"
-# one fails with 1.7, two with 1.4 (blackdown)
-#RESTRICT="test"
-
-DEPEND="virtual/jdk:1.6
- java-virtuals/jdk-with-com-sun
- !binary? (
- dev-java/ant-contrib:0
- )
- app-arch/xz-utils"
-RDEPEND=">=virtual/jre-1.6
- app-eselect/eselect-scala
- !dev-lang/scala-bin"
-
-PDEPEND="emacs? ( app-emacs/scala-mode )"
-
-S="${WORKDIR}/${P}-sources"
-
-CHECKREQS_MEMORY="1532M"
-
-pkg_setup() {
- java-pkg-2_pkg_setup
-
- if ! use binary; then
- debug-print "Checking for sufficient physical RAM"
-
- ewarn "This package can fail to build with memory allocation errors in some cases."
- ewarn "If you are unable to build from sources, please try USE=binary"
- ewarn "for this package. See bug #181390 for more information."
-
- CHECKREQS_MEMORY="1532M"
-
- check-reqs_pkg_setup
- fi
-}
-
-java_prepare() {
- if ! use binary; then
- pushd lib &> /dev/null
- # other jars are needed for bootstrap
- #rm -v jline.jar ant/ant-contrib.jar #cldcapi10.jar midpapi10.jar msil.jar *.dll || die
- rm -v ant/ant-contrib.jar || die
- java-pkg_jar-from --into ant --build-only ant-contrib
- popd &> /dev/null
- fi
-}
-
-src_compile() {
- if ! use binary; then
- #unset ANT_OPTS as this is set in the build.xml
- #sets -X type variables which might come back to bite me
- unset ANT_OPTS
-
- # reported in bugzilla that multiple launches use less resources
- # https://bugs.gentoo.org/show_bug.cgi?id=282023
- eant all.clean
- eant -Djavac.args="-encoding UTF-8" -Djava6.home=${JAVA_HOME} \
- newlibs newforkjoin build-opt
- eant dist.done
- else
- einfo "Skipping compilation, USE=binary is set."
- fi
-}
-
-src_test() {
- eant test.suite || die "Some tests aren't passed"
-}
-
-#scala_launcher() {
-# local SCALADIR="${EPREFIX}/usr/share/${PN}"
-# local bcp="${EPREFIX}${SCALADIR}/lib/scala-library.jar"
-# java-pkg_dolauncher "${1}" --main "${2}" \
-# --java_args "-Xmx256M -Xms32M -Dscala.home=${SCALADIR} -Denv.emacs=${EMACS}"
-#}
-
-src_install() {
- cd dists/latest || die
-
- local SCALADIR="/usr/share/${PN}-${SV}"
-
- exeinto "${SCALADIR}/bin"
- doexe $(find bin/ -type f ! -iname '*.bat')
-
- #sources are .scala so no use for java-pkg_dosrc
- if use source; then
- dodir "${SCALADIR}/src"
- insinto "${SCALADIR}/src"
- doins src/*-src.jar
- fi
-
- java-pkg_dojar lib/*.jar
-
- pushd man/man1 || die
- for i in *.1; do
- newman "${i}" "${i/./-${SV}.}"
- done
- popd
-
- #docs and examples are not contained in the binary tgz anymore
- if ! use binary; then
- local docdir="doc/${PN}-devel-docs"
- dodoc doc/README ../../docs/TODO || die
- if use doc; then
- java-pkg_dojavadoc "${docdir}/api"
- dohtml -r "${docdir}/tools" || die
- fi
-
- use examples && java-pkg_doexamples "${docdir}/examples"
- fi
-
- dodir /usr/bin
- for b in $(find bin/ -type f ! -iname '*.bat'); do
- #pushd "${ED}/usr/bin" &>/dev/null
- local _name=$(basename "${b}")
- dosym "/usr/share/${PN}-${SV}/bin/${_name}" "/usr/bin/${_name}-${SV}"
- #popd &>/dev/null
- done
- #scala_launcher fsc scala.tools.nsc.CompileClient
- #scala_launcher scala scala.tools.nsc.MainGenericRunner
- #scala_launcher scalac scala.tools.nsc.Main
- #scala_launcher scaladoc scala.tools.nsc.ScalaDoc
- #scala_launcher scalap scala.tools.scalap.Main
-}
^ permalink raw reply related [flat|nested] 16+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-lang/scala/
@ 2015-08-24 14:58 Mark Wright
0 siblings, 0 replies; 16+ messages in thread
From: Mark Wright @ 2015-08-24 14:58 UTC (permalink / raw
To: gentoo-commits
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"
^ permalink raw reply related [flat|nested] 16+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-lang/scala/
@ 2015-08-24 14:17 Mark Wright
0 siblings, 0 replies; 16+ messages in thread
From: Mark Wright @ 2015-08-24 14:17 UTC (permalink / raw
To: gentoo-commits
commit: 1c17497ecb2b701c2c137ba087ced476e7e12086
Author: Mark Wright <gienah <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 24 14:15:50 2015 +0000
Commit: Mark Wright <gienah <AT> gentoo <DOT> org>
CommitDate: Mon Aug 24 14:16:38 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c17497e
Fix Bug 554842 - dev-lang/scala-2.10.4-r1 fails to emerge: JDK 1.8 is not supported by this build! Thanks to Florian Schmaus for reporting, genstorm and Chewi for helping with the fix.
Package-Manager: portage-2.2.20.1
dev-lang/scala/metadata.xml | 2 +-
dev-lang/scala/scala-2.10.2-r2.ebuild | 3 +--
dev-lang/scala/scala-2.10.3-r1.ebuild | 3 +--
dev-lang/scala/scala-2.10.4-r1.ebuild | 6 ++----
dev-lang/scala/scala-2.11.1-r1.ebuild | 6 ++----
dev-lang/scala/scala-2.11.2-r1.ebuild | 6 ++----
dev-lang/scala/scala-2.11.4-r1.ebuild | 6 ++----
dev-lang/scala/scala-2.11.6.ebuild | 6 ++----
dev-lang/scala/scala-2.11.7.ebuild | 6 ++----
9 files changed, 15 insertions(+), 29 deletions(-)
diff --git a/dev-lang/scala/metadata.xml b/dev-lang/scala/metadata.xml
index 3965f8e..a860186 100644
--- a/dev-lang/scala/metadata.xml
+++ b/dev-lang/scala/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>java</herd>
<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>
diff --git a/dev-lang/scala/scala-2.10.2-r2.ebuild b/dev-lang/scala/scala-2.10.2-r2.ebuild
index df8cba9..8881028 100644
--- a/dev-lang/scala/scala-2.10.2-r2.ebuild
+++ b/dev-lang/scala/scala-2.10.2-r2.ebuild
@@ -72,8 +72,7 @@ COMMON_DEP="dev-java/ant-core:0
dev-java/junit:4"
DEPEND="${COMMON_DEP}
- >=virtual/jdk-1.7.0
- <virtual/jdk-1.8.0
+ || ( =virtual/jdk-1.6* =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-r1.ebuild
index a6cb26c..7310d51 100644
--- a/dev-lang/scala/scala-2.10.3-r1.ebuild
+++ b/dev-lang/scala/scala-2.10.3-r1.ebuild
@@ -83,8 +83,7 @@ COMMON_DEP="dev-java/ant-core:0
dev-java/hawtjni-runtime:0"
DEPEND="${COMMON_DEP}
- >=virtual/jdk-1.6.0
- <virtual/jdk-1.8.0
+ || ( =virtual/jdk-1.6* =virtual/jdk-1.7* )
java-virtuals/jdk-with-com-sun:0
!binary? (
dev-java/ant-core:0
diff --git a/dev-lang/scala/scala-2.10.4-r1.ebuild b/dev-lang/scala/scala-2.10.4-r1.ebuild
index f2bd1c6..2dfa0a8 100644
--- a/dev-lang/scala/scala-2.10.4-r1.ebuild
+++ b/dev-lang/scala/scala-2.10.4-r1.ebuild
@@ -83,16 +83,14 @@ COMMON_DEP="dev-java/ant-core:0
DEPEND="${COMMON_DEP}
java-virtuals/jdk-with-com-sun:0
!binary? (
- >=virtual/jdk-1.6.0
- <virtual/jdk-1.8.0
+ || ( =virtual/jdk-1.6* =virtual/jdk-1.7* )
dev-java/ant-core:0
dev-java/ant-contrib:0
dev-java/ant-nodeps:0
media-gfx/graphviz
)
binary? (
- >=virtual/jdk-1.7.0
- <virtual/jdk-1.8.0
+ =virtual/jdk-1.7*
)
app-arch/xz-utils:0"
diff --git a/dev-lang/scala/scala-2.11.1-r1.ebuild b/dev-lang/scala/scala-2.11.1-r1.ebuild
index 4b4fc5f..5fd5e5b 100644
--- a/dev-lang/scala/scala-2.11.1-r1.ebuild
+++ b/dev-lang/scala/scala-2.11.1-r1.ebuild
@@ -73,16 +73,14 @@ COMMON_DEP="dev-java/ant-core:0
DEPEND="${COMMON_DEP}
java-virtuals/jdk-with-com-sun:0
!binary? (
- >=virtual/jdk-1.6.0
- <virtual/jdk-1.9.0
+ || ( =virtual/jdk-1.6* =virtual/jdk-1.7* =virtual/jdk-1.8* )
dev-java/ant-core:0
dev-java/ant-contrib:0
dev-java/ant-nodeps:0
media-gfx/graphviz
)
binary? (
- >=virtual/jdk-1.7.0
- <virtual/jdk-1.9.0
+ || ( =virtual/jdk-1.7* =virtual/jdk-1.8* )
)
app-arch/xz-utils:0"
diff --git a/dev-lang/scala/scala-2.11.2-r1.ebuild b/dev-lang/scala/scala-2.11.2-r1.ebuild
index fd94c43..0e2edfd 100644
--- a/dev-lang/scala/scala-2.11.2-r1.ebuild
+++ b/dev-lang/scala/scala-2.11.2-r1.ebuild
@@ -73,16 +73,14 @@ COMMON_DEP="dev-java/ant-core:0
DEPEND="${COMMON_DEP}
java-virtuals/jdk-with-com-sun:0
!binary? (
- >=virtual/jdk-1.6.0
- <virtual/jdk-1.9.0
+ || ( =virtual/jdk-1.6* =virtual/jdk-1.7* =virtual/jdk-1.8* )
dev-java/ant-core:0
dev-java/ant-contrib:0
dev-java/ant-nodeps:0
media-gfx/graphviz
)
binary? (
- >=virtual/jdk-1.7.0
- <virtual/jdk-1.9.0
+ || ( =virtual/jdk-1.7* =virtual/jdk-1.8* )
)
app-arch/xz-utils:0"
diff --git a/dev-lang/scala/scala-2.11.4-r1.ebuild b/dev-lang/scala/scala-2.11.4-r1.ebuild
index 1727cdc..e384d9d 100644
--- a/dev-lang/scala/scala-2.11.4-r1.ebuild
+++ b/dev-lang/scala/scala-2.11.4-r1.ebuild
@@ -73,16 +73,14 @@ COMMON_DEP="dev-java/ant-core:0
DEPEND="${COMMON_DEP}
java-virtuals/jdk-with-com-sun:0
!binary? (
- >=virtual/jdk-1.6.0
- <virtual/jdk-1.9.0
+ || ( =virtual/jdk-1.6* =virtual/jdk-1.7* =virtual/jdk-1.8* )
dev-java/ant-core:0
dev-java/ant-contrib:0
dev-java/ant-nodeps:0
media-gfx/graphviz
)
binary? (
- >=virtual/jdk-1.7.0
- <virtual/jdk-1.9.0
+ || ( =virtual/jdk-1.7* =virtual/jdk-1.8* )
)
app-arch/xz-utils:0"
diff --git a/dev-lang/scala/scala-2.11.6.ebuild b/dev-lang/scala/scala-2.11.6.ebuild
index f5202ac..5ad91d1 100644
--- a/dev-lang/scala/scala-2.11.6.ebuild
+++ b/dev-lang/scala/scala-2.11.6.ebuild
@@ -73,16 +73,14 @@ COMMON_DEP="dev-java/ant-core:0
DEPEND="${COMMON_DEP}
java-virtuals/jdk-with-com-sun:0
!binary? (
- >=virtual/jdk-1.6.0
- <virtual/jdk-1.9.0
+ || ( =virtual/jdk-1.6* =virtual/jdk-1.7* =virtual/jdk-1.8* )
dev-java/ant-core:0
dev-java/ant-contrib:0
dev-java/ant-nodeps:0
media-gfx/graphviz
)
binary? (
- >=virtual/jdk-1.7.0
- <virtual/jdk-1.9.0
+ || ( =virtual/jdk-1.7* =virtual/jdk-1.8* )
)
app-arch/xz-utils:0"
diff --git a/dev-lang/scala/scala-2.11.7.ebuild b/dev-lang/scala/scala-2.11.7.ebuild
index 10a66b4..a3e310f 100644
--- a/dev-lang/scala/scala-2.11.7.ebuild
+++ b/dev-lang/scala/scala-2.11.7.ebuild
@@ -73,16 +73,14 @@ COMMON_DEP="dev-java/ant-core:0
DEPEND="${COMMON_DEP}
java-virtuals/jdk-with-com-sun:0
!binary? (
- >=virtual/jdk-1.6.0
- <virtual/jdk-1.9.0
+ || ( =virtual/jdk-1.6* =virtual/jdk-1.7* =virtual/jdk-1.8* )
dev-java/ant-core:0
dev-java/ant-contrib:0
dev-java/ant-nodeps:0
media-gfx/graphviz
)
binary? (
- >=virtual/jdk-1.7.0
- <virtual/jdk-1.9.0
+ || ( =virtual/jdk-1.7* =virtual/jdk-1.8* )
)
app-arch/xz-utils:0"
^ permalink raw reply related [flat|nested] 16+ messages in thread
end of thread, other threads:[~2024-05-09 10:52 UTC | newest]
Thread overview: 16+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-05-17 16:55 [gentoo-commits] repo/gentoo:master commit in: dev-lang/scala/ Aaron Bauman
-- strict thread matches above, loose matches on Subject: below --
2024-05-09 10:52 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-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:58 Mark Wright
2015-08-24 14:17 Mark Wright
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox