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

2023-06-29 Thread Miroslav Šulc
commit: 0e44201d7f3ae177c3b8449d53e55fa71ff229c7
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Wed Jun 28 17:55:24 2023 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Thu Jun 29 06:08:55 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e44201d

dev-lang/scala-bin: drop 2.13.6

Bug: https://bugs.gentoo.org/872695
Signed-off-by: Volkmar W. Pogatzki  pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/31661
Signed-off-by: Miroslav Šulc  gentoo.org>

 dev-lang/scala-bin/Manifest|  1 -
 dev-lang/scala-bin/scala-bin-2.13.6.ebuild | 77 --
 2 files changed, 78 deletions(-)

diff --git a/dev-lang/scala-bin/Manifest b/dev-lang/scala-bin/Manifest
index bc6b95ce2154..3521c3e86b2f 100644
--- a/dev-lang/scala-bin/Manifest
+++ b/dev-lang/scala-bin/Manifest
@@ -1,2 +1 @@
-DIST scala-2.13.6.tgz 23407489 BLAKE2B 
b65db49968dcbce2f5586aafaa4cd437156050050f209cce4a7d5edc18dfca3ebb60d2a726b4a26902723f993b78a673909c1139eb67e8eea4f35a4842b33c70
 SHA512 
445267cd7c1ddb8ef94d2edeb36567318c66429c88fcb183840998dc204a10253df09c33eb4de2f87b68b1a8cd4f557910fa3f061d4316314653eb64e91c0188
 DIST scala-2.13.9.tgz 23602967 BLAKE2B 
93bbee93562143c72a4bdcfa3e7a8257064474cf38a2de448444bc5639f54e0ef17b9361e7144b39b3040b97683c2674bcc7611fc770c2fa985d9d0d9fd403d3
 SHA512 
da808ea65fe66c83dc55873662de92647675a2da15b87fb719f1c76d29588f725a466d8519c53f4c521d4defc7b66c023e52a6b264c58117f321ddcf50ebd2a6

diff --git a/dev-lang/scala-bin/scala-bin-2.13.6.ebuild 
b/dev-lang/scala-bin/scala-bin-2.13.6.ebuild
deleted file mode 100644
index 951d45582b4f..
--- a/dev-lang/scala-bin/scala-bin-2.13.6.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc"
-
-inherit java-pkg-2
-
-MY_PN="${PN%-*}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="The Scala Programming Language"
-HOMEPAGE="http://scala.epfl.ch/;
-SRC_URI="http://downloads.lightbend.com/${MY_PN}/${PV}/${MY_P}.tgz;
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc"
-
-RDEPEND="
-   >=virtual/jre-1.8
-   !dev-lang/scala"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-   default
-   ebegin 'Cleaning .bat files'
-   rm -f bin/*.bat || die
-   eend $?
-
-   ebegin 'Patching SCALA_HOME variable in bin/ directory'
-   local f
-   for f in bin/*; do
-   sed -i -e 's#\(SCALA_HOME\)=.*#\1=/usr/share/scala-bin#' "$f" 
|| die
-   done
-   eend $?
-}
-
-src_compile() {
-   :;
-}
-
-src_install() {
-   ebegin 'Installing bin scripts'
-   dobin bin/*
-   eend $?
-
-   ebegin 'Installing jar files'
-
-   cd lib/ || die
-
-   # Unversion those libs.
-   java-pkg_newjar jline-*.jar jline.jar
-   java-pkg_newjar scalap-*.jar scalap.jar
-
-   # Install these the usual way.
-   java-pkg_dojar scala-compiler.jar
-   java-pkg_dojar scala-library.jar
-   java-pkg_dojar scala-reflect.jar
-
-   eend $?
-
-   cd ../ || die
-
-   ebegin 'Installing man pages'
-   doman man/man1/*.1
-   eend $?
-
-   if use doc; then
-   ebegin 'Installing documentation'
-   java-pkg_dohtml -r doc/tools
-   eend $?
-   fi
-}



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

2023-06-28 Thread Sam James
commit: ce1609e557d25de105d0422f8fbbc64b136b65b8
Author: Sam James  gentoo  org>
AuthorDate: Wed Jun 28 17:43:22 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Jun 28 17:43:27 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce1609e5

dev-lang/scala-bin: Stabilize 2.13.9 x86, #909324

Signed-off-by: Sam James  gentoo.org>

 dev-lang/scala-bin/scala-bin-2.13.9.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-lang/scala-bin/scala-bin-2.13.9.ebuild 
b/dev-lang/scala-bin/scala-bin-2.13.9.ebuild
index c4fd788b0609..595cbbe98dc1 100644
--- a/dev-lang/scala-bin/scala-bin-2.13.9.ebuild
+++ b/dev-lang/scala-bin/scala-bin-2.13.9.ebuild
@@ -16,7 +16,7 @@ 
SRC_URI="https://downloads.lightbend.com/${MY_PN}/${PV}/${MY_P}.tgz;
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc"
 
 RDEPEND="



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

2023-06-28 Thread Sam James
commit: 586bf660d175d8a63c574b83dc11562f3dbe565b
Author: Sam James  gentoo  org>
AuthorDate: Wed Jun 28 13:54:00 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Jun 28 13:54:09 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=586bf660

dev-lang/scala-bin: Stabilize 2.13.9 amd64, #909324

Signed-off-by: Sam James  gentoo.org>

 dev-lang/scala-bin/scala-bin-2.13.9.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-lang/scala-bin/scala-bin-2.13.9.ebuild 
b/dev-lang/scala-bin/scala-bin-2.13.9.ebuild
index 1f9dc34f8e61..c4fd788b0609 100644
--- a/dev-lang/scala-bin/scala-bin-2.13.9.ebuild
+++ b/dev-lang/scala-bin/scala-bin-2.13.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ 
SRC_URI="https://downloads.lightbend.com/${MY_PN}/${PV}/${MY_P}.tgz;
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="doc"
 
 RDEPEND="



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

2022-09-28 Thread Florian Schmaus
commit: e35d7d6b7a1e56e29fb6e515693208ab0ba370c9
Author: Florian Schmaus  gentoo  org>
AuthorDate: Wed Sep 28 15:38:31 2022 +
Commit: Florian Schmaus  gentoo  org>
CommitDate: Wed Sep 28 15:39:46 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e35d7d6b

dev-lang/scala-bin: add 2.13.9

Bug: https://bugs.gentoo.org/872695
Signed-off-by: Florian Schmaus  gentoo.org>

 dev-lang/scala-bin/Manifest|  1 +
 dev-lang/scala-bin/scala-bin-2.13.9.ebuild | 77 ++
 2 files changed, 78 insertions(+)

diff --git a/dev-lang/scala-bin/Manifest b/dev-lang/scala-bin/Manifest
index 23816a53fc3a..bc6b95ce2154 100644
--- a/dev-lang/scala-bin/Manifest
+++ b/dev-lang/scala-bin/Manifest
@@ -1 +1,2 @@
 DIST scala-2.13.6.tgz 23407489 BLAKE2B 
b65db49968dcbce2f5586aafaa4cd437156050050f209cce4a7d5edc18dfca3ebb60d2a726b4a26902723f993b78a673909c1139eb67e8eea4f35a4842b33c70
 SHA512 
445267cd7c1ddb8ef94d2edeb36567318c66429c88fcb183840998dc204a10253df09c33eb4de2f87b68b1a8cd4f557910fa3f061d4316314653eb64e91c0188
+DIST scala-2.13.9.tgz 23602967 BLAKE2B 
93bbee93562143c72a4bdcfa3e7a8257064474cf38a2de448444bc5639f54e0ef17b9361e7144b39b3040b97683c2674bcc7611fc770c2fa985d9d0d9fd403d3
 SHA512 
da808ea65fe66c83dc55873662de92647675a2da15b87fb719f1c76d29588f725a466d8519c53f4c521d4defc7b66c023e52a6b264c58117f321ddcf50ebd2a6

diff --git a/dev-lang/scala-bin/scala-bin-2.13.9.ebuild 
b/dev-lang/scala-bin/scala-bin-2.13.9.ebuild
new file mode 100644
index ..1f9dc34f8e61
--- /dev/null
+++ b/dev-lang/scala-bin/scala-bin-2.13.9.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc"
+
+inherit java-pkg-2
+
+MY_PN="${PN%-*}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="The Scala Programming Language"
+HOMEPAGE="https://scala.epfl.ch/;
+SRC_URI="https://downloads.lightbend.com/${MY_PN}/${PV}/${MY_P}.tgz;
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+RDEPEND="
+   >=virtual/jre-1.8
+   !dev-lang/scala"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+   default
+   ebegin 'Cleaning .bat files'
+   rm -f bin/*.bat || die
+   eend $?
+
+   ebegin 'Patching SCALA_HOME variable in bin/ directory'
+   local f
+   for f in bin/*; do
+   sed -i -e 's#\(SCALA_HOME\)=.*#\1=/usr/share/scala-bin#' "$f" 
|| die
+   done
+   eend $?
+}
+
+src_compile() {
+   :;
+}
+
+src_install() {
+   ebegin 'Installing bin scripts'
+   dobin bin/*
+   eend $?
+
+   ebegin 'Installing jar files'
+
+   cd lib/ || die
+
+   # Unversion those libs.
+   java-pkg_newjar jline-*.jar jline.jar
+   java-pkg_newjar scalap-*.jar scalap.jar
+
+   # Install these the usual way.
+   java-pkg_dojar scala-compiler.jar
+   java-pkg_dojar scala-library.jar
+   java-pkg_dojar scala-reflect.jar
+
+   eend $?
+
+   cd ../ || die
+
+   ebegin 'Installing man pages'
+   doman man/man1/*.1
+   eend $?
+
+   if use doc; then
+   ebegin 'Installing documentation'
+   java-pkg_dohtml -r doc/tools
+   eend $?
+   fi
+}



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

2021-07-12 Thread Miroslav Šulc
commit: ec29f081b7c8ec4f62800c5eff19a1e3dec84718
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Mon Jul 12 07:51:35 2021 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Mon Jul 12 07:51:35 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec29f081

dev-lang/scala-bin: removed obsolete 2.13.1-r1

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Miroslav Šulc  gentoo.org>

 dev-lang/scala-bin/Manifest   |  1 -
 dev-lang/scala-bin/scala-bin-2.13.1-r1.ebuild | 77 ---
 2 files changed, 78 deletions(-)

diff --git a/dev-lang/scala-bin/Manifest b/dev-lang/scala-bin/Manifest
index 3d736c36968..23816a53fc3 100644
--- a/dev-lang/scala-bin/Manifest
+++ b/dev-lang/scala-bin/Manifest
@@ -1,2 +1 @@
-DIST scala-2.13.1.tgz 19685743 BLAKE2B 
aaff6db71023f539d08da521ab1ff505a626605d9c298472d0c2e98a9a13d6b8440e89cf5ff4a53b7b9bcc48cbc1e3b55cc253563f54f18c369e13fc8c00a6c2
 SHA512 
028aa237c471cada1501cd5764b3c384c3f50e9fc327cddd3fa7c79e9cc909d86bf84d5fc28103054600f879a60c546fc45a837cdca54964eb57ec77f9c1613e
 DIST scala-2.13.6.tgz 23407489 BLAKE2B 
b65db49968dcbce2f5586aafaa4cd437156050050f209cce4a7d5edc18dfca3ebb60d2a726b4a26902723f993b78a673909c1139eb67e8eea4f35a4842b33c70
 SHA512 
445267cd7c1ddb8ef94d2edeb36567318c66429c88fcb183840998dc204a10253df09c33eb4de2f87b68b1a8cd4f557910fa3f061d4316314653eb64e91c0188

diff --git a/dev-lang/scala-bin/scala-bin-2.13.1-r1.ebuild 
b/dev-lang/scala-bin/scala-bin-2.13.1-r1.ebuild
deleted file mode 100644
index 9469077928d..000
--- a/dev-lang/scala-bin/scala-bin-2.13.1-r1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-JAVA_PKG_IUSE="doc"
-
-inherit java-pkg-2
-
-MY_PN="${PN%-*}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="The Scala Programming Language"
-HOMEPAGE="http://scala.epfl.ch/;
-SRC_URI="http://downloads.lightbend.com/${MY_PN}/${PV}/${MY_P}.tgz;
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc"
-
-RDEPEND="
-   >=virtual/jre-1.6
-   !dev-lang/scala"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-   default
-   ebegin 'Cleaning .bat files'
-   rm -f bin/*.bat || die
-   eend $?
-
-   ebegin 'Patching SCALA_HOME variable in bin/ directory'
-   local f
-   for f in bin/*; do
-   sed -i -e 's#\(SCALA_HOME\)=.*#\1=/usr/share/scala-bin#' "$f" 
|| die
-   done
-   eend $?
-}
-
-src_compile() {
-   :;
-}
-
-src_install() {
-   ebegin 'Installing bin scripts'
-   dobin bin/*
-   eend $?
-
-   ebegin 'Installing jar files'
-
-   cd lib/ || die
-
-   # Unversion those libs.
-   java-pkg_newjar jline-*.jar jline.jar
-   java-pkg_newjar scalap-*.jar scalap.jar
-
-   # Install these the usual way.
-   java-pkg_dojar scala-compiler.jar
-   java-pkg_dojar scala-library.jar
-   java-pkg_dojar scala-reflect.jar
-
-   eend $?
-
-   cd ../ || die
-
-   ebegin 'Installing man pages'
-   doman man/man1/*.1
-   eend $?
-
-   if use doc; then
-   ebegin 'Installing documentation'
-   java-pkg_dohtml -r doc/tools
-   eend $?
-   fi
-}



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

2021-07-12 Thread Agostino Sarubbo
commit: 975a0aa61f53600017351b360f8abb7298db0dc2
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Mon Jul 12 06:35:14 2021 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Mon Jul 12 06:35:14 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=975a0aa6

dev-lang/scala-bin: amd64 stable wrt bug #801532

Package-Manager: Portage-3.0.20, Repoman-3.0.2
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 dev-lang/scala-bin/scala-bin-2.13.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-lang/scala-bin/scala-bin-2.13.6.ebuild 
b/dev-lang/scala-bin/scala-bin-2.13.6.ebuild
index e344864fb4f..951d45582b4 100644
--- a/dev-lang/scala-bin/scala-bin-2.13.6.ebuild
+++ b/dev-lang/scala-bin/scala-bin-2.13.6.ebuild
@@ -16,7 +16,7 @@ 
SRC_URI="http://downloads.lightbend.com/${MY_PN}/${PV}/${MY_P}.tgz;
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="doc"
 
 RDEPEND="



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

2021-07-11 Thread Sam James
commit: 9e9ac493f9b3b4026d7cdc7e2920c33c95e82920
Author: Sam James  gentoo  org>
AuthorDate: Sun Jul 11 20:51:31 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jul 11 20:51:31 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e9ac493

dev-lang/scala-bin: Stabilize 2.13.6 x86, #801532

Signed-off-by: Sam James  gentoo.org>

 dev-lang/scala-bin/scala-bin-2.13.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-lang/scala-bin/scala-bin-2.13.6.ebuild 
b/dev-lang/scala-bin/scala-bin-2.13.6.ebuild
index cdb8e4a5f11..e344864fb4f 100644
--- a/dev-lang/scala-bin/scala-bin-2.13.6.ebuild
+++ b/dev-lang/scala-bin/scala-bin-2.13.6.ebuild
@@ -16,7 +16,7 @@ 
SRC_URI="http://downloads.lightbend.com/${MY_PN}/${PV}/${MY_P}.tgz;
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="doc"
 
 RDEPEND="



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

2021-06-08 Thread Patrice Clement
commit: ab949a71e4b7749694cea921e96786b1667a7524
Author: Florian Schmaus  geekplace  eu>
AuthorDate: Tue Jun  8 13:12:54 2021 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Tue Jun  8 13:25:16 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab949a71

dev-lang/scala-bin: add 2.13.6.

This introduces the following changes to the ebuild:
- correct license to Apache-2.0
- increase virutal/jre RDEPEND requirement to 1.8
- bump EAPI to 7
- update copyright header year to 2021

Signed-off-by: Florian Schmaus  geekplace.eu>
Closes: https://github.com/gentoo/gentoo/pull/21160
Signed-off-by: Patrice Clement  gentoo.org>

 dev-lang/scala-bin/Manifest|  1 +
 dev-lang/scala-bin/scala-bin-2.13.6.ebuild | 77 ++
 2 files changed, 78 insertions(+)

diff --git a/dev-lang/scala-bin/Manifest b/dev-lang/scala-bin/Manifest
index 46dcb484038..3d736c36968 100644
--- a/dev-lang/scala-bin/Manifest
+++ b/dev-lang/scala-bin/Manifest
@@ -1 +1,2 @@
 DIST scala-2.13.1.tgz 19685743 BLAKE2B 
aaff6db71023f539d08da521ab1ff505a626605d9c298472d0c2e98a9a13d6b8440e89cf5ff4a53b7b9bcc48cbc1e3b55cc253563f54f18c369e13fc8c00a6c2
 SHA512 
028aa237c471cada1501cd5764b3c384c3f50e9fc327cddd3fa7c79e9cc909d86bf84d5fc28103054600f879a60c546fc45a837cdca54964eb57ec77f9c1613e
+DIST scala-2.13.6.tgz 23407489 BLAKE2B 
b65db49968dcbce2f5586aafaa4cd437156050050f209cce4a7d5edc18dfca3ebb60d2a726b4a26902723f993b78a673909c1139eb67e8eea4f35a4842b33c70
 SHA512 
445267cd7c1ddb8ef94d2edeb36567318c66429c88fcb183840998dc204a10253df09c33eb4de2f87b68b1a8cd4f557910fa3f061d4316314653eb64e91c0188

diff --git a/dev-lang/scala-bin/scala-bin-2.13.6.ebuild 
b/dev-lang/scala-bin/scala-bin-2.13.6.ebuild
new file mode 100644
index 000..cdb8e4a5f11
--- /dev/null
+++ b/dev-lang/scala-bin/scala-bin-2.13.6.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc"
+
+inherit java-pkg-2
+
+MY_PN="${PN%-*}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="The Scala Programming Language"
+HOMEPAGE="http://scala.epfl.ch/;
+SRC_URI="http://downloads.lightbend.com/${MY_PN}/${PV}/${MY_P}.tgz;
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+RDEPEND="
+   >=virtual/jre-1.8
+   !dev-lang/scala"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+   default
+   ebegin 'Cleaning .bat files'
+   rm -f bin/*.bat || die
+   eend $?
+
+   ebegin 'Patching SCALA_HOME variable in bin/ directory'
+   local f
+   for f in bin/*; do
+   sed -i -e 's#\(SCALA_HOME\)=.*#\1=/usr/share/scala-bin#' "$f" 
|| die
+   done
+   eend $?
+}
+
+src_compile() {
+   :;
+}
+
+src_install() {
+   ebegin 'Installing bin scripts'
+   dobin bin/*
+   eend $?
+
+   ebegin 'Installing jar files'
+
+   cd lib/ || die
+
+   # Unversion those libs.
+   java-pkg_newjar jline-*.jar jline.jar
+   java-pkg_newjar scalap-*.jar scalap.jar
+
+   # Install these the usual way.
+   java-pkg_dojar scala-compiler.jar
+   java-pkg_dojar scala-library.jar
+   java-pkg_dojar scala-reflect.jar
+
+   eend $?
+
+   cd ../ || die
+
+   ebegin 'Installing man pages'
+   doman man/man1/*.1
+   eend $?
+
+   if use doc; then
+   ebegin 'Installing documentation'
+   java-pkg_dohtml -r doc/tools
+   eend $?
+   fi
+}



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

2021-06-08 Thread Patrice Clement
commit: eef18a157cc6c787f394be1acd2f9f6566326db4
Author: Florian Schmaus  geekplace  eu>
AuthorDate: Tue Jun  8 13:18:36 2021 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Tue Jun  8 13:25:16 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eef18a15

dev-lang/scala-bin: correct LICENSE to Apache-2.0.

Signed-off-by: Florian Schmaus  geekplace.eu>
Signed-off-by: Patrice Clement  gentoo.org>

 .../scala-bin/{scala-bin-2.13.1.ebuild => scala-bin-2.13.1-r1.ebuild} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-lang/scala-bin/scala-bin-2.13.1.ebuild 
b/dev-lang/scala-bin/scala-bin-2.13.1-r1.ebuild
similarity index 95%
rename from dev-lang/scala-bin/scala-bin-2.13.1.ebuild
rename to dev-lang/scala-bin/scala-bin-2.13.1-r1.ebuild
index 622baa6cd43..9469077928d 100644
--- a/dev-lang/scala-bin/scala-bin-2.13.1.ebuild
+++ b/dev-lang/scala-bin/scala-bin-2.13.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ DESCRIPTION="The Scala Programming Language"
 HOMEPAGE="http://scala.epfl.ch/;
 SRC_URI="http://downloads.lightbend.com/${MY_PN}/${PV}/${MY_P}.tgz;
 
-LICENSE="BSD"
+LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="doc"



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

2020-06-20 Thread Patrice Clement
commit: b0a5433a0b442546bbc2e9aaeb29c20adc16576b
Author: Patrice Clement  gentoo  org>
AuthorDate: Sat Jun 20 14:37:38 2020 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Sat Jun 20 14:37:43 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0a5433a

dev-lang/scala-bin: clean up old.

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Patrice Clement  gentoo.org>

 dev-lang/scala-bin/Manifest|  1 -
 dev-lang/scala-bin/scala-bin-2.12.4.ebuild | 79 --
 2 files changed, 80 deletions(-)

diff --git a/dev-lang/scala-bin/Manifest b/dev-lang/scala-bin/Manifest
index f631039e862..46dcb484038 100644
--- a/dev-lang/scala-bin/Manifest
+++ b/dev-lang/scala-bin/Manifest
@@ -1,2 +1 @@
-DIST scala-2.12.4.tgz 19741785 BLAKE2B 
e782a4ac000ffcebc2faaac077cbb3cc13f8cc56deb9b3a78f1bddd3d0e6fd282d70f10cfef0780e4ab6a13e8d51b0401f84829b7974bd8823aecab54476ab02
 SHA512 
e6a9e11974d3bacc5f5dcdfdb379bdd1b430b1682141bed688f02f8b49395aff7c55cdb8da3319dff55da7bd7cfe7545e9b26db9558316ac8b3e29f6bb2c6d74
 DIST scala-2.13.1.tgz 19685743 BLAKE2B 
aaff6db71023f539d08da521ab1ff505a626605d9c298472d0c2e98a9a13d6b8440e89cf5ff4a53b7b9bcc48cbc1e3b55cc253563f54f18c369e13fc8c00a6c2
 SHA512 
028aa237c471cada1501cd5764b3c384c3f50e9fc327cddd3fa7c79e9cc909d86bf84d5fc28103054600f879a60c546fc45a837cdca54964eb57ec77f9c1613e

diff --git a/dev-lang/scala-bin/scala-bin-2.12.4.ebuild 
b/dev-lang/scala-bin/scala-bin-2.12.4.ebuild
deleted file mode 100644
index a434c4ee628..000
--- a/dev-lang/scala-bin/scala-bin-2.12.4.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-JAVA_PKG_IUSE="doc"
-
-inherit java-pkg-2
-
-MY_PN="${PN%-*}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="The Scala Programming Language"
-HOMEPAGE="http://scala.epfl.ch/;
-SRC_URI="http://downloads.lightbend.com/${MY_PN}/${PV}/${MY_P}.tgz;
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc"
-
-RDEPEND="
-   >=virtual/jre-1.6
-   !dev-lang/scala"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-   default
-   ebegin 'Cleaning .bat files'
-   rm -f bin/*.bat || die
-   eend $?
-
-   ebegin 'Patching SCALA_HOME variable in bin/ directory'
-   local f
-   for f in bin/*; do
-   sed -i -e 's#\(SCALA_HOME\)=.*#\1=/usr/share/scala-bin#' $f || 
die
-   done
-   eend $?
-}
-
-src_compile() {
-   :;
-}
-
-src_install() {
-   ebegin 'Installing bin scripts'
-   dobin bin/*
-   eend $?
-
-   ebegin 'Installing jar files'
-   cd lib/ || die
-
-   # Unversion those libs.
-   java-pkg_newjar jline-*.jar jline.jar
-   java-pkg_newjar scalap-*.jar scalap.jar
-   java-pkg_newjar scala-parser-combinators_*.jar 
scala-parser-combinators.jar
-   java-pkg_newjar scala-swing_*.jar scala-swing.jar
-   java-pkg_newjar scala-xml_*.jar scala-xml.jar
-
-   # Install these the usual way.
-   java-pkg_dojar scala-compiler.jar
-   java-pkg_dojar scala-library.jar
-   java-pkg_dojar scala-reflect.jar
-
-   eend $?
-
-   cd ../ || die
-
-   ebegin 'Installing man pages'
-   doman man/man1/*.1
-   eend $?
-
-   if use doc; then
-   ebegin 'Installing documentation'
-   java-pkg_dohtml -r doc/tools
-   eend $?
-   fi
-}



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

2020-06-20 Thread Patrice Clement
commit: 41be73c70fc16cb1d749570753ad7f96d1b10e67
Author: Patrice Clement  gentoo  org>
AuthorDate: Sat Jun 20 14:37:06 2020 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Sat Jun 20 14:37:43 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41be73c7

dev-lang/scala-bin: stable for amd64+x86.

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Patrice Clement  gentoo.org>

 dev-lang/scala-bin/scala-bin-2.13.1.ebuild | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/dev-lang/scala-bin/scala-bin-2.13.1.ebuild 
b/dev-lang/scala-bin/scala-bin-2.13.1.ebuild
index 27531fa3d55..622baa6cd43 100644
--- a/dev-lang/scala-bin/scala-bin-2.13.1.ebuild
+++ b/dev-lang/scala-bin/scala-bin-2.13.1.ebuild
@@ -16,7 +16,7 @@ 
SRC_URI="http://downloads.lightbend.com/${MY_PN}/${PV}/${MY_P}.tgz;
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc"
 
 RDEPEND="
@@ -34,7 +34,7 @@ src_prepare() {
ebegin 'Patching SCALA_HOME variable in bin/ directory'
local f
for f in bin/*; do
-   sed -i -e 's#\(SCALA_HOME\)=.*#\1=/usr/share/scala-bin#' $f || 
die
+   sed -i -e 's#\(SCALA_HOME\)=.*#\1=/usr/share/scala-bin#' "$f" 
|| die
done
eend $?
 }
@@ -49,6 +49,7 @@ src_install() {
eend $?
 
ebegin 'Installing jar files'
+
cd lib/ || die
 
# Unversion those libs.



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

2020-03-31 Thread Patrice Clement
commit: db6fe940274c722b5efe3957e66a0a830cace815
Author: Patrice Clement  gentoo  org>
AuthorDate: Tue Mar 31 18:18:09 2020 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Tue Mar 31 18:18:53 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db6fe940

dev-lang/scala-bin: version bump.

Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Patrice Clement  gentoo.org>

 dev-lang/scala-bin/Manifest|  1 +
 dev-lang/scala-bin/scala-bin-2.13.1.ebuild | 76 ++
 2 files changed, 77 insertions(+)

diff --git a/dev-lang/scala-bin/Manifest b/dev-lang/scala-bin/Manifest
index 28df49eaab8..f631039e862 100644
--- a/dev-lang/scala-bin/Manifest
+++ b/dev-lang/scala-bin/Manifest
@@ -1 +1,2 @@
 DIST scala-2.12.4.tgz 19741785 BLAKE2B 
e782a4ac000ffcebc2faaac077cbb3cc13f8cc56deb9b3a78f1bddd3d0e6fd282d70f10cfef0780e4ab6a13e8d51b0401f84829b7974bd8823aecab54476ab02
 SHA512 
e6a9e11974d3bacc5f5dcdfdb379bdd1b430b1682141bed688f02f8b49395aff7c55cdb8da3319dff55da7bd7cfe7545e9b26db9558316ac8b3e29f6bb2c6d74
+DIST scala-2.13.1.tgz 19685743 BLAKE2B 
aaff6db71023f539d08da521ab1ff505a626605d9c298472d0c2e98a9a13d6b8440e89cf5ff4a53b7b9bcc48cbc1e3b55cc253563f54f18c369e13fc8c00a6c2
 SHA512 
028aa237c471cada1501cd5764b3c384c3f50e9fc327cddd3fa7c79e9cc909d86bf84d5fc28103054600f879a60c546fc45a837cdca54964eb57ec77f9c1613e

diff --git a/dev-lang/scala-bin/scala-bin-2.13.1.ebuild 
b/dev-lang/scala-bin/scala-bin-2.13.1.ebuild
new file mode 100644
index 000..27531fa3d55
--- /dev/null
+++ b/dev-lang/scala-bin/scala-bin-2.13.1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+JAVA_PKG_IUSE="doc"
+
+inherit java-pkg-2
+
+MY_PN="${PN%-*}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="The Scala Programming Language"
+HOMEPAGE="http://scala.epfl.ch/;
+SRC_URI="http://downloads.lightbend.com/${MY_PN}/${PV}/${MY_P}.tgz;
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+RDEPEND="
+   >=virtual/jre-1.6
+   !dev-lang/scala"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+   default
+   ebegin 'Cleaning .bat files'
+   rm -f bin/*.bat || die
+   eend $?
+
+   ebegin 'Patching SCALA_HOME variable in bin/ directory'
+   local f
+   for f in bin/*; do
+   sed -i -e 's#\(SCALA_HOME\)=.*#\1=/usr/share/scala-bin#' $f || 
die
+   done
+   eend $?
+}
+
+src_compile() {
+   :;
+}
+
+src_install() {
+   ebegin 'Installing bin scripts'
+   dobin bin/*
+   eend $?
+
+   ebegin 'Installing jar files'
+   cd lib/ || die
+
+   # Unversion those libs.
+   java-pkg_newjar jline-*.jar jline.jar
+   java-pkg_newjar scalap-*.jar scalap.jar
+
+   # Install these the usual way.
+   java-pkg_dojar scala-compiler.jar
+   java-pkg_dojar scala-library.jar
+   java-pkg_dojar scala-reflect.jar
+
+   eend $?
+
+   cd ../ || die
+
+   ebegin 'Installing man pages'
+   doman man/man1/*.1
+   eend $?
+
+   if use doc; then
+   ebegin 'Installing documentation'
+   java-pkg_dohtml -r doc/tools
+   eend $?
+   fi
+}



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

2019-06-01 Thread Patrice Clement
commit: 3b4cc797d4983e41a3a0fe402e24ac645cba1f3b
Author: Patrice Clement  gentoo  org>
AuthorDate: Fri May 24 18:08:31 2019 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Sat Jun  1 21:55:45 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b4cc797

dev-lang/scala-bin: clean up old.

Signed-off-by: Patrice Clement  gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11

 dev-lang/scala-bin/Manifest|  1 -
 dev-lang/scala-bin/scala-bin-2.11.8.ebuild | 85 --
 2 files changed, 86 deletions(-)

diff --git a/dev-lang/scala-bin/Manifest b/dev-lang/scala-bin/Manifest
index a491439fc32..28df49eaab8 100644
--- a/dev-lang/scala-bin/Manifest
+++ b/dev-lang/scala-bin/Manifest
@@ -1,2 +1 @@
-DIST scala-2.11.8.tgz 28678231 BLAKE2B 
3e75e941112afb094e99be76fa7d039b27a32b1cedd645bad43b776ee9136f6ac3951eabe7c7182280f442050a3c7c658d49906b42004965128dd048d2ad73d2
 SHA512 
c00a0eaa4317c3ffbdbbd9c817f06c5262f0549f22bd7f1886cc22643e34e8909648bbfb58f3a63c453baf045381a52128ff0b18b7a39274ef03aad7daea9fdf
 DIST scala-2.12.4.tgz 19741785 BLAKE2B 
e782a4ac000ffcebc2faaac077cbb3cc13f8cc56deb9b3a78f1bddd3d0e6fd282d70f10cfef0780e4ab6a13e8d51b0401f84829b7974bd8823aecab54476ab02
 SHA512 
e6a9e11974d3bacc5f5dcdfdb379bdd1b430b1682141bed688f02f8b49395aff7c55cdb8da3319dff55da7bd7cfe7545e9b26db9558316ac8b3e29f6bb2c6d74

diff --git a/dev-lang/scala-bin/scala-bin-2.11.8.ebuild 
b/dev-lang/scala-bin/scala-bin-2.11.8.ebuild
deleted file mode 100644
index 83f4905b76f..000
--- a/dev-lang/scala-bin/scala-bin-2.11.8.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-JAVA_PKG_IUSE="doc"
-
-inherit java-pkg-2
-
-MY_PN="${PN%-*}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="The Scala Programming Language"
-HOMEPAGE="http://scala.epfl.ch/;
-SRC_URI="http://downloads.lightbend.com/${MY_PN}/${PV}/${MY_P}.tgz;
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc"
-
-RDEPEND="
-   >=virtual/jre-1.6
-   !dev-lang/scala"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-   default
-   ebegin 'Cleaning .bat files'
-   rm -f bin/*.bat || die
-   eend $?
-
-   ebegin 'Patching SCALA_HOME variable in bin/ directory'
-   local f
-   for f in bin/*; do
-   sed -i -e 's#\(SCALA_HOME\)=.*#\1=/usr/share/scala-bin#' $f || 
die
-   done
-   eend $?
-}
-
-src_compile() {
-   :;
-}
-
-src_install() {
-   ebegin 'Installing bin scripts'
-   dobin bin/*
-   eend $?
-
-   ebegin 'Installing jar files'
-   cd lib/ || die
-
-   # Unversion those libs
-   java-pkg_newjar scala-continuations-library_*.jar 
scala-continuations-library.jar
-   java-pkg_newjar akka-actor_*.jar akka-actor.jar
-   java-pkg_newjar config-*.jar config.jar
-   java-pkg_newjar scala-actors-2.11.0.jar scala-actors.jar
-   java-pkg_newjar scala-actors-migration_*.jar scala-actors-migration.jar
-   java-pkg_newjar scala-swing_*.jar scala-swing.jar
-   java-pkg_newjar scala-parser-combinators_*.jar 
scala-parser-combinators.jar
-   java-pkg_newjar scala-xml_*.jar scala-xml.jar
-   java-pkg_newjar jline-*.jar jline.jar
-   java-pkg_newjar scala-continuations-plugin_*.jar 
scala-continuations-plugin.jar
-   java-pkg_newjar scalap-*.jar scalap.jar
-
-   # Install these the usual way
-   java-pkg_dojar scala-compiler.jar
-   java-pkg_dojar scala-library.jar
-   java-pkg_dojar scala-reflect.jar
-
-   eend $?
-
-   cd ../ || die
-
-   ebegin 'Installing man pages'
-   doman man/man1/*.1
-   eend $?
-
-   if use doc; then
-   ebegin 'Installing documentation'
-   java-pkg_dohtml -r doc/tools
-   eend $?
-   fi
-}



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

2018-06-24 Thread Patrice Clement
commit: c3a70f5c90a097d4dcbb8e3919e688739cd81e0a
Author: Patrice Clement  gentoo  org>
AuthorDate: Sun Jun 24 14:52:55 2018 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Sun Jun 24 16:53:04 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3a70f5c

dev-lang/scala-bin: stable for amd64+x86.

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 dev-lang/scala-bin/scala-bin-2.12.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-lang/scala-bin/scala-bin-2.12.4.ebuild 
b/dev-lang/scala-bin/scala-bin-2.12.4.ebuild
index 40d1bd76212..a434c4ee628 100644
--- a/dev-lang/scala-bin/scala-bin-2.12.4.ebuild
+++ b/dev-lang/scala-bin/scala-bin-2.12.4.ebuild
@@ -16,7 +16,7 @@ 
SRC_URI="http://downloads.lightbend.com/${MY_PN}/${PV}/${MY_P}.tgz;
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc"
 
 RDEPEND="



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

2018-01-05 Thread Patrice Clement
commit: f8c36299f3bcbb92a39644f67619b19bab204a75
Author: Patrice Clement  gentoo  org>
AuthorDate: Fri Jan  5 14:57:01 2018 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Fri Jan  5 15:02:06 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f8c36299

dev-lang/scala-bin: version bump.

Package-Manager: Portage-2.3.13, Repoman-2.3.3

 dev-lang/scala-bin/Manifest|  1 +
 dev-lang/scala-bin/scala-bin-2.12.4.ebuild | 79 ++
 2 files changed, 80 insertions(+)

diff --git a/dev-lang/scala-bin/Manifest b/dev-lang/scala-bin/Manifest
index ddc24750b2f..a491439fc32 100644
--- a/dev-lang/scala-bin/Manifest
+++ b/dev-lang/scala-bin/Manifest
@@ -1 +1,2 @@
 DIST scala-2.11.8.tgz 28678231 BLAKE2B 
3e75e941112afb094e99be76fa7d039b27a32b1cedd645bad43b776ee9136f6ac3951eabe7c7182280f442050a3c7c658d49906b42004965128dd048d2ad73d2
 SHA512 
c00a0eaa4317c3ffbdbbd9c817f06c5262f0549f22bd7f1886cc22643e34e8909648bbfb58f3a63c453baf045381a52128ff0b18b7a39274ef03aad7daea9fdf
+DIST scala-2.12.4.tgz 19741785 BLAKE2B 
e782a4ac000ffcebc2faaac077cbb3cc13f8cc56deb9b3a78f1bddd3d0e6fd282d70f10cfef0780e4ab6a13e8d51b0401f84829b7974bd8823aecab54476ab02
 SHA512 
e6a9e11974d3bacc5f5dcdfdb379bdd1b430b1682141bed688f02f8b49395aff7c55cdb8da3319dff55da7bd7cfe7545e9b26db9558316ac8b3e29f6bb2c6d74

diff --git a/dev-lang/scala-bin/scala-bin-2.12.4.ebuild 
b/dev-lang/scala-bin/scala-bin-2.12.4.ebuild
new file mode 100644
index 000..40d1bd76212
--- /dev/null
+++ b/dev-lang/scala-bin/scala-bin-2.12.4.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+JAVA_PKG_IUSE="doc"
+
+inherit java-pkg-2
+
+MY_PN="${PN%-*}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="The Scala Programming Language"
+HOMEPAGE="http://scala.epfl.ch/;
+SRC_URI="http://downloads.lightbend.com/${MY_PN}/${PV}/${MY_P}.tgz;
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+RDEPEND="
+   >=virtual/jre-1.6
+   !dev-lang/scala"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+   default
+   ebegin 'Cleaning .bat files'
+   rm -f bin/*.bat || die
+   eend $?
+
+   ebegin 'Patching SCALA_HOME variable in bin/ directory'
+   local f
+   for f in bin/*; do
+   sed -i -e 's#\(SCALA_HOME\)=.*#\1=/usr/share/scala-bin#' $f || 
die
+   done
+   eend $?
+}
+
+src_compile() {
+   :;
+}
+
+src_install() {
+   ebegin 'Installing bin scripts'
+   dobin bin/*
+   eend $?
+
+   ebegin 'Installing jar files'
+   cd lib/ || die
+
+   # Unversion those libs.
+   java-pkg_newjar jline-*.jar jline.jar
+   java-pkg_newjar scalap-*.jar scalap.jar
+   java-pkg_newjar scala-parser-combinators_*.jar 
scala-parser-combinators.jar
+   java-pkg_newjar scala-swing_*.jar scala-swing.jar
+   java-pkg_newjar scala-xml_*.jar scala-xml.jar
+
+   # Install these the usual way.
+   java-pkg_dojar scala-compiler.jar
+   java-pkg_dojar scala-library.jar
+   java-pkg_dojar scala-reflect.jar
+
+   eend $?
+
+   cd ../ || die
+
+   ebegin 'Installing man pages'
+   doman man/man1/*.1
+   eend $?
+
+   if use doc; then
+   ebegin 'Installing documentation'
+   java-pkg_dohtml -r doc/tools
+   eend $?
+   fi
+}



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

2017-11-25 Thread Patrick Lauer
commit: 4596a6a96388e5c6824babcbacb8a6a81198c58c
Author: Patrick Lauer  gentoo  org>
AuthorDate: Sat Nov 25 14:08:26 2017 +
Commit: Patrick Lauer  gentoo  org>
CommitDate: Sat Nov 25 14:08:42 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4596a6a9

dev-lang/scala-bin: Whitespace

Package-Manager: Portage-2.3.16, Repoman-2.3.6

 dev-lang/scala-bin/scala-bin-2.11.8.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dev-lang/scala-bin/scala-bin-2.11.8.ebuild 
b/dev-lang/scala-bin/scala-bin-2.11.8.ebuild
index 6cd3aef956b..83f4905b76f 100644
--- a/dev-lang/scala-bin/scala-bin-2.11.8.ebuild
+++ b/dev-lang/scala-bin/scala-bin-2.11.8.ebuild
@@ -1,5 +1,6 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI=6
 
 JAVA_PKG_IUSE="doc"



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

2016-12-19 Thread Patrice Clement
commit: 6873b6c8fb0a8bbeaed4020ae023b44d490d3137
Author: Patrice Clement  gentoo  org>
AuthorDate: Mon Dec 19 14:45:00 2016 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Mon Dec 19 14:45:00 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6873b6c8

dev-lang/scala-bin: stable for amd64+x86.

Package-Manager: portage-2.3.0

 dev-lang/scala-bin/scala-bin-2.11.8.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dev-lang/scala-bin/scala-bin-2.11.8.ebuild 
b/dev-lang/scala-bin/scala-bin-2.11.8.ebuild
index 4b58588..e89885f 100644
--- a/dev-lang/scala-bin/scala-bin-2.11.8.ebuild
+++ b/dev-lang/scala-bin/scala-bin-2.11.8.ebuild
@@ -14,7 +14,7 @@ 
SRC_URI="http://downloads.typesafe.com/scala/${PV}/scala-${PV}.tgz;
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc"
 
 RDEPEND=">=virtual/jre-1.6
@@ -29,6 +29,7 @@ src_prepare() {
eend $?
 
ebegin 'Patching SCALA_HOME variable in bin/ directory'
+   local f
for f in bin/*; do
sed -i -e 's#\(SCALA_HOME\)=.*#\1=/usr/share/scala-bin#' $f || 
die
done



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

2016-12-19 Thread Patrice Clement
commit: 6f225eb9ffab9a85d300feebf090439d8a5db8e1
Author: Patrice Clement  gentoo  org>
AuthorDate: Mon Dec 19 14:50:18 2016 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Mon Dec 19 14:50:18 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f225eb9

dev-lang/scala-bin: minor cleanup.

Package-Manager: portage-2.3.0

 dev-lang/scala-bin/scala-bin-2.11.8.ebuild | 11 +++
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/dev-lang/scala-bin/scala-bin-2.11.8.ebuild 
b/dev-lang/scala-bin/scala-bin-2.11.8.ebuild
index e89885f..6c3ec37 100644
--- a/dev-lang/scala-bin/scala-bin-2.11.8.ebuild
+++ b/dev-lang/scala-bin/scala-bin-2.11.8.ebuild
@@ -1,26 +1,29 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
-
 EAPI=6
 
 JAVA_PKG_IUSE="doc"
 
 inherit java-pkg-2
 
+MY_PN="${PN%-*}"
+MY_P="${MY_PN}-${PV}"
+
 DESCRIPTION="The Scala Programming Language"
 HOMEPAGE="http://scala.epfl.ch/;
-SRC_URI="http://downloads.typesafe.com/scala/${PV}/scala-${PV}.tgz;
+SRC_URI="http://downloads.lightbend.com/${MY_PN}/${PV}/${MY_P}.tgz;
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="doc"
 
-RDEPEND=">=virtual/jre-1.6
+RDEPEND="
+   >=virtual/jre-1.6
!dev-lang/scala"
 
-S="${WORKDIR}/scala-${PV}"
+S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
default



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

2016-12-19 Thread Patrice Clement
commit: 12fef56cdcf32bd9835230e4898a601a3e802109
Author: Patrice Clement  gentoo  org>
AuthorDate: Mon Dec 19 14:50:33 2016 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Mon Dec 19 14:50:33 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=12fef56c

dev-lang/scala-bin: clean up old.

Package-Manager: portage-2.3.0

 dev-lang/scala-bin/Manifest|  1 -
 dev-lang/scala-bin/scala-bin-2.11.7.ebuild | 77 --
 2 files changed, 78 deletions(-)

diff --git a/dev-lang/scala-bin/Manifest b/dev-lang/scala-bin/Manifest
index 9e39424..667d2de 100644
--- a/dev-lang/scala-bin/Manifest
+++ b/dev-lang/scala-bin/Manifest
@@ -1,2 +1 @@
-DIST scala-2.11.7.tgz 28460530 SHA256 
ffe4196f13ee98a66cf54baffb0940d29432b2bd820bd0781a8316eec22926d0 SHA512 
1603fc6a0a6b3656146eee5650e0a57402d8ce65382220055a4934acb8fa15a81721b3b732ca856566e99c564e8b0a9448c8887668a814765798bea57933e6a3
 WHIRLPOOL 
808db0b2eddf356ad259b21681a6465b666875da3ebc6f49be3f4c9da7358b36dec0b25b6c243725e92f27311a109f559ffc6f2c31dd19f115d665cff95ed8b5
 DIST scala-2.11.8.tgz 28678231 SHA256 
87fc86a19d9725edb5fd9866c5ee9424cdb2cd86b767f1bb7d47313e8e391ace SHA512 
c00a0eaa4317c3ffbdbbd9c817f06c5262f0549f22bd7f1886cc22643e34e8909648bbfb58f3a63c453baf045381a52128ff0b18b7a39274ef03aad7daea9fdf
 WHIRLPOOL 
dfdd640218b0fa39acb4ba3bb0b43fc82b24b6f5442ab4bca1140b90022dccfd222d9d05c8b790184735e6d254e5d7a06b06f066b7d6ec74166c010298723069

diff --git a/dev-lang/scala-bin/scala-bin-2.11.7.ebuild 
b/dev-lang/scala-bin/scala-bin-2.11.7.ebuild
deleted file mode 100644
index 5e1bed0..
--- a/dev-lang/scala-bin/scala-bin-2.11.7.ebuild
+++ /dev/null
@@ -1,77 +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"
-
-inherit java-pkg-2
-
-DESCRIPTION="The Scala Programming Language"
-HOMEPAGE="http://scala.epfl.ch/;
-SRC_URI="http://downloads.typesafe.com/scala/${PV}/scala-${PV}.tgz;
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc"
-
-DEPEND=""
-RDEPEND=">=virtual/jre-1.6
-   !dev-lang/scala"
-
-S=${WORKDIR}/scala-${PV}
-
-java_prepare() {
-   ebegin 'Cleaning .bat files'
-   rm -f bin/*.bat || die
-   eend $?
-
-   ebegin 'Patching SCALA_HOME variable in bin/ directory'
-   for f in bin/*; do
-   sed -i -e 's#\(SCALA_HOME\)=.*#\1=/usr/share/scala-bin#' $f || 
die
-   done
-   eend $?
-}
-
-src_install() {
-   ebegin 'Installing bin scripts'
-   dobin bin/*
-   eend $?
-
-   ebegin 'Installing jar files'
-   cd lib/ || die
-
-   # Unversion those libs
-   java-pkg_newjar scala-continuations-library_*.jar 
scala-continuations-library.jar
-   java-pkg_newjar akka-actor_*.jar akka-actor.jar
-   java-pkg_newjar config-*.jar config.jar
-   java-pkg_newjar scala-actors-2.11.0.jar scala-actors.jar
-   java-pkg_newjar scala-actors-migration_*.jar scala-actors-migration.jar
-   java-pkg_newjar scala-swing_*.jar scala-swing.jar
-   java-pkg_newjar scala-parser-combinators_*.jar 
scala-parser-combinators.jar
-   java-pkg_newjar scala-xml_*.jar scala-xml.jar
-   java-pkg_newjar jline-*.jar jline.jar
-   java-pkg_newjar scala-continuations-plugin_*.jar 
scala-continuations-plugin.jar
-   java-pkg_newjar scalap-*.jar scalap.jar
-
-   # Install these the usual way
-   java-pkg_dojar scala-compiler.jar
-   java-pkg_dojar scala-library.jar
-   java-pkg_dojar scala-reflect.jar
-
-   eend $?
-
-   cd ../ || die
-
-   ebegin 'Installing man pages'
-   doman man/man1/*.1
-   eend $?
-
-   if use doc; then
-   ebegin 'Installing documentation'
-   java-pkg_dohtml -r doc/tools
-   eend $?
-   fi
-}



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

2016-11-27 Thread Patrice Clement
commit: 282fac066f28a0d442ab5a0833aae810bc0f7317
Author: Patrice Clement  gentoo  org>
AuthorDate: Sun Nov 27 16:45:23 2016 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Sun Nov 27 16:45:39 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=282fac06

dev-lang/scala-bin: version bump.

Package-Manager: portage-2.3.0

 dev-lang/scala-bin/Manifest|  1 +
 dev-lang/scala-bin/scala-bin-2.11.8.ebuild | 81 ++
 2 files changed, 82 insertions(+)

diff --git a/dev-lang/scala-bin/Manifest b/dev-lang/scala-bin/Manifest
index 63f678a..9e39424 100644
--- a/dev-lang/scala-bin/Manifest
+++ b/dev-lang/scala-bin/Manifest
@@ -1 +1,2 @@
 DIST scala-2.11.7.tgz 28460530 SHA256 
ffe4196f13ee98a66cf54baffb0940d29432b2bd820bd0781a8316eec22926d0 SHA512 
1603fc6a0a6b3656146eee5650e0a57402d8ce65382220055a4934acb8fa15a81721b3b732ca856566e99c564e8b0a9448c8887668a814765798bea57933e6a3
 WHIRLPOOL 
808db0b2eddf356ad259b21681a6465b666875da3ebc6f49be3f4c9da7358b36dec0b25b6c243725e92f27311a109f559ffc6f2c31dd19f115d665cff95ed8b5
+DIST scala-2.11.8.tgz 28678231 SHA256 
87fc86a19d9725edb5fd9866c5ee9424cdb2cd86b767f1bb7d47313e8e391ace SHA512 
c00a0eaa4317c3ffbdbbd9c817f06c5262f0549f22bd7f1886cc22643e34e8909648bbfb58f3a63c453baf045381a52128ff0b18b7a39274ef03aad7daea9fdf
 WHIRLPOOL 
dfdd640218b0fa39acb4ba3bb0b43fc82b24b6f5442ab4bca1140b90022dccfd222d9d05c8b790184735e6d254e5d7a06b06f066b7d6ec74166c010298723069

diff --git a/dev-lang/scala-bin/scala-bin-2.11.8.ebuild 
b/dev-lang/scala-bin/scala-bin-2.11.8.ebuild
new file mode 100644
index ..4b58588
--- /dev/null
+++ b/dev-lang/scala-bin/scala-bin-2.11.8.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+JAVA_PKG_IUSE="doc"
+
+inherit java-pkg-2
+
+DESCRIPTION="The Scala Programming Language"
+HOMEPAGE="http://scala.epfl.ch/;
+SRC_URI="http://downloads.typesafe.com/scala/${PV}/scala-${PV}.tgz;
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+RDEPEND=">=virtual/jre-1.6
+   !dev-lang/scala"
+
+S="${WORKDIR}/scala-${PV}"
+
+src_prepare() {
+   default
+   ebegin 'Cleaning .bat files'
+   rm -f bin/*.bat || die
+   eend $?
+
+   ebegin 'Patching SCALA_HOME variable in bin/ directory'
+   for f in bin/*; do
+   sed -i -e 's#\(SCALA_HOME\)=.*#\1=/usr/share/scala-bin#' $f || 
die
+   done
+   eend $?
+}
+
+src_compile() {
+   :;
+}
+
+src_install() {
+   ebegin 'Installing bin scripts'
+   dobin bin/*
+   eend $?
+
+   ebegin 'Installing jar files'
+   cd lib/ || die
+
+   # Unversion those libs
+   java-pkg_newjar scala-continuations-library_*.jar 
scala-continuations-library.jar
+   java-pkg_newjar akka-actor_*.jar akka-actor.jar
+   java-pkg_newjar config-*.jar config.jar
+   java-pkg_newjar scala-actors-2.11.0.jar scala-actors.jar
+   java-pkg_newjar scala-actors-migration_*.jar scala-actors-migration.jar
+   java-pkg_newjar scala-swing_*.jar scala-swing.jar
+   java-pkg_newjar scala-parser-combinators_*.jar 
scala-parser-combinators.jar
+   java-pkg_newjar scala-xml_*.jar scala-xml.jar
+   java-pkg_newjar jline-*.jar jline.jar
+   java-pkg_newjar scala-continuations-plugin_*.jar 
scala-continuations-plugin.jar
+   java-pkg_newjar scalap-*.jar scalap.jar
+
+   # Install these the usual way
+   java-pkg_dojar scala-compiler.jar
+   java-pkg_dojar scala-library.jar
+   java-pkg_dojar scala-reflect.jar
+
+   eend $?
+
+   cd ../ || die
+
+   ebegin 'Installing man pages'
+   doman man/man1/*.1
+   eend $?
+
+   if use doc; then
+   ebegin 'Installing documentation'
+   java-pkg_dohtml -r doc/tools
+   eend $?
+   fi
+}



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

2015-09-25 Thread Patrice Clement
commit: c6d4694e9eb0a0941215c9a898eeffd77ab89625
Author: Patrice Clement  gentoo  org>
AuthorDate: Fri Sep 25 20:26:08 2015 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Fri Sep 25 20:26:08 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6d4694e

dev-lang/scala-bin: Clean up old.

Package-Manager: portage-2.2.18
Signed-off-by: Patrice Clement  gentoo.org>

 dev-lang/scala-bin/Manifest|  1 -
 dev-lang/scala-bin/scala-bin-2.11.6.ebuild | 77 --
 2 files changed, 78 deletions(-)

diff --git a/dev-lang/scala-bin/Manifest b/dev-lang/scala-bin/Manifest
index d7dee54..63f678a 100644
--- a/dev-lang/scala-bin/Manifest
+++ b/dev-lang/scala-bin/Manifest
@@ -1,2 +1 @@
-DIST scala-2.11.6.tgz 27130723 SHA256 
41ba45e4600404634217a66d6b2c960459d3a67e0344a7c3d9642d0eaa446583 SHA512 
aeb6dd1b586d4e66e01f268aa8a647a303f2f960cbe255e9c79ced978dad92b6cef3cba143945affa3427548daed6e5e1d607b9ecb4d7567adc886d64546da61
 WHIRLPOOL 
20c1bd8b905ad4f7d155d366637a2aeaeb50569025ba585a0e6e3bb2268068e7b74bed26769a9b3a1d1d662833b6d5f57781c7165ec84d1c63142cdd6edae294
 DIST scala-2.11.7.tgz 28460530 SHA256 
ffe4196f13ee98a66cf54baffb0940d29432b2bd820bd0781a8316eec22926d0 SHA512 
1603fc6a0a6b3656146eee5650e0a57402d8ce65382220055a4934acb8fa15a81721b3b732ca856566e99c564e8b0a9448c8887668a814765798bea57933e6a3
 WHIRLPOOL 
808db0b2eddf356ad259b21681a6465b666875da3ebc6f49be3f4c9da7358b36dec0b25b6c243725e92f27311a109f559ffc6f2c31dd19f115d665cff95ed8b5

diff --git a/dev-lang/scala-bin/scala-bin-2.11.6.ebuild 
b/dev-lang/scala-bin/scala-bin-2.11.6.ebuild
deleted file mode 100644
index 886fd7b..000
--- a/dev-lang/scala-bin/scala-bin-2.11.6.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit java-pkg-2
-
-DESCRIPTION="The Scala Programming Language"
-HOMEPAGE="http://scala.epfl.ch/;
-SRC_URI="http://downloads.typesafe.com/scala/${PV}/scala-${PV}.tgz;
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="x86 amd64"
-IUSE="doc"
-
-DEPEND=""
-RDEPEND=">=virtual/jre-1.6
-   !dev-lang/scala"
-
-JAVA_PKG_IUSE="doc"
-
-S=${WORKDIR}/scala-${PV}
-
-java_prepare() {
-   ebegin 'Cleaning .bat files'
-   rm -f bin/*.bat || die
-   eend $?
-
-   ebegin 'Patching SCALA_HOME variable in bin/ scripts'
-   for f in bin/*; do
-   sed -i -e 's#\(SCALA_HOME\)=.*#\1=/usr/share/scala-bin#' $f || 
die
-   done
-   eend $?
-}
-
-src_install() {
-   ebegin 'Installing bin scripts'
-   dobin bin/*
-   eend $?
-
-   ebegin 'Installing jar files'
-   cd lib/ || die
-
-   # Unversion those libs
-   java-pkg_newjar scala-continuations-library_*.jar 
scala-continuations-library.jar
-   java-pkg_newjar akka-actor_*.jar akka-actor.jar
-   java-pkg_newjar config-*.jar config.jar
-   java-pkg_newjar scala-actors-2.11.0.jar scala-actors.jar
-   java-pkg_newjar scala-actors-migration_*.jar scala-actors-migration.jar
-   java-pkg_newjar scala-swing_*.jar scala-swing.jar
-   java-pkg_newjar scala-parser-combinators_*.jar 
scala-parser-combinators.jar
-   java-pkg_newjar scala-xml_*.jar scala-xml.jar
-   java-pkg_newjar jline-*.jar jline.jar
-   java-pkg_newjar scala-continuations-plugin_*.jar 
scala-continuations-plugin.jar
-   java-pkg_newjar scalap-*.jar scalap.jar
-
-   # Install these the usual way
-   java-pkg_dojar scala-compiler.jar
-   java-pkg_dojar scala-library.jar
-   java-pkg_dojar scala-reflect.jar
-
-   eend $?
-
-   cd ../ || die
-
-   ebegin 'Installing man pages'
-   doman man/man1/*.1
-   eend $?
-
-   if use doc; then
-   ebegin 'Installing documentation'
-   java-pkg_dohtml -r doc/tools
-   eend $?
-   fi
-}



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

2015-09-25 Thread Patrice Clement
commit: 7e22a06e39a9b4418dab4521d39d557fd2de9979
Author: Patrice Clement  gentoo  org>
AuthorDate: Fri Sep 25 20:25:21 2015 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Fri Sep 25 20:25:21 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e22a06e

dev-lang/scala-bin: Stable for amd64+x86 using the ALLARCHES policy.

Package-Manager: portage-2.2.18
Signed-off-by: Patrice Clement  gentoo.org>

 dev-lang/scala-bin/scala-bin-2.11.7.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-lang/scala-bin/scala-bin-2.11.7.ebuild 
b/dev-lang/scala-bin/scala-bin-2.11.7.ebuild
index 24e2c44..5e1bed0 100644
--- a/dev-lang/scala-bin/scala-bin-2.11.7.ebuild
+++ b/dev-lang/scala-bin/scala-bin-2.11.7.ebuild
@@ -14,7 +14,7 @@ 
SRC_URI="http://downloads.typesafe.com/scala/${PV}/scala-${PV}.tgz;
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc"
 
 DEPEND=""