* [gentoo-commits] repo/gentoo:master commit in: dev-java/bsh/
@ 2016-02-23 17:35 Patrice Clement
0 siblings, 0 replies; 16+ messages in thread
From: Patrice Clement @ 2016-02-23 17:35 UTC (permalink / raw
To: gentoo-commits
commit: 9c796dcc0d36ed7a9795f7b154fe6ab4964a8529
Author: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 23 16:29:55 2016 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Tue Feb 23 17:22:21 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c796dcc
dev-java/bsh: Version bump. Fixes security bug 575482.
Whilst at it, this commit also bumps the ebuild to EAPI version 5.
Package-Manager: portage-2.2.26
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>
dev-java/bsh/Manifest | 1 +
dev-java/bsh/bsh-2.0_beta4-r4.ebuild | 2 +-
dev-java/bsh/bsh-2.0_beta6.ebuild | 70 ++++++++++++++++++++++++++++++++++++
3 files changed, 72 insertions(+), 1 deletion(-)
diff --git a/dev-java/bsh/Manifest b/dev-java/bsh/Manifest
index d0f694b..721210c 100644
--- a/dev-java/bsh/Manifest
+++ b/dev-java/bsh/Manifest
@@ -1,2 +1,3 @@
DIST beanshell-icon.png 29784 SHA256 a3df458c6e892ec328e8865f081da8c3f3d9ff4c979ecb701a57fc7cedacdef9 SHA512 731cc0e39e69ef84230e2cea8f9eaf00f80b607c70d83f767d600d8f76fae024516e9b97a988bfcb1ad963da279a6b97ad2559bb8213dc9aaa23c65aa5946d45 WHIRLPOOL 018f8915426bb77bcb62e9f811a51436c6467e01b4d24fc4e2ddb92a3635c18ab1ba7f3154e74fdaccd1621a81b7fc735e53b7cb09caffcd8c103f5462e71e77
DIST bsh-2.0b4-src.jar 1636723 SHA256 beaa29a8bcbd00db2563a5a9f0fdcfa8ae268e959880baef0a59167ff1729f8e SHA512 867e960420f8ad0f49ffa1c7cb291ddc64e75dc20f91bd33b91151e9ba96033250b94efbf8e3d4b8d4f8c7193017efcb88840536080809ecb45e2ee0fb8e9040 WHIRLPOOL 1dc8f6d3600ca22fbf993ccb6aafa3954b1d2127f0940cbe84468aa8f323ad69b02c2a3619435ee0e6e1024e1784e57e138f781314ac735f01b909629e074109
+DIST bsh-2.0b6.zip 1994608 SHA256 25e4ca61c198c3268a52d318736ecab9e2d8868c15ba121547df0c39f452bafd SHA512 ce461cc74bc48580c636c2f2e55e4e734a2b2075547cc5663722866e5c978a680051131c13240afb586a777ab93165119d1f96f9623bd9747f8e7d8293dd3bcf WHIRLPOOL 35251126719af7ab6e3aae3a0dc3680221578198ed4b38ee9717a83bd9ef06b11b99d033a47a65feeb00ab1bdeebfe97832e4ec35026f644470114506d6ef177
diff --git a/dev-java/bsh/bsh-2.0_beta4-r4.ebuild b/dev-java/bsh/bsh-2.0_beta4-r4.ebuild
index 0952aae..d299c60 100644
--- a/dev-java/bsh/bsh-2.0_beta4-r4.ebuild
+++ b/dev-java/bsh/bsh-2.0_beta4-r4.ebuild
@@ -54,7 +54,7 @@ src_test() {
}
src_install() {
- java-pkg_newjar dist/${P/_beta/b}.jar
+ java-pkg_newjar "dist/${MY_P}.jar" "${PN}.jar"
java-pkg_dolauncher bsh-console --main bsh.Console
java-pkg_dolauncher bsh-interpreter --main bsh.Interpreter
diff --git a/dev-java/bsh/bsh-2.0_beta6.ebuild b/dev-java/bsh/bsh-2.0_beta6.ebuild
new file mode 100644
index 0000000..ec71d7a
--- /dev/null
+++ b/dev-java/bsh/bsh-2.0_beta6.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2
+
+MY_PN="beanshell"
+MY_BETA="b6"
+MY_PV="${PV%%_*}"
+MY_P="${PN}-${MY_PV}${MY_BETA}"
+
+DESCRIPTION="A small embeddable Java source interpreter"
+HOMEPAGE="https://github.com/beanshell/beanshell"
+SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/${MY_PV}${MY_BETA}.zip -> ${MY_P}.zip"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos"
+IUSE=""
+
+CDEPEND="
+ dev-java/bsf:2.3
+ java-virtuals/servlet-api:3.0
+"
+
+RDEPEND="
+ ${CDEPEND}
+ >=virtual/jre-1.6"
+
+DEPEND="
+ ${CDEPEND}
+ test? (
+ dev-java/ant-junit:0
+ )
+ app-arch/unzip
+ >=virtual/jdk-1.6"
+
+S="${WORKDIR}/${MY_PN}-${MY_PV}${MY_BETA}"
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+EANT_BUILD_TARGET="jarall"
+EANT_DOC_TARGET="javadoc"
+EANT_GENTOO_CLASSPATH="
+ bsf-2.3
+ servlet-api-3.0
+"
+
+java_prepare() {
+ java-pkg_clean
+}
+
+EANT_TEST_TARGET="test"
+
+src_test() {
+ java-pkg-2_src_test
+}
+
+src_install() {
+ java-pkg_newjar "dist/${MY_P}.jar" "${PN}.jar"
+
+ java-pkg_dolauncher "${PN}-console" --main bsh.Console
+ java-pkg_dolauncher "${PN}-interpreter" --main bsh.Interpreter
+
+ use doc && java-pkg_dohtml -r javadoc
+ use source && java-pkg_dosrc src/bsh
+}
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/bsh/
@ 2016-03-02 13:58 Agostino Sarubbo
0 siblings, 0 replies; 16+ messages in thread
From: Agostino Sarubbo @ 2016-03-02 13:58 UTC (permalink / raw
To: gentoo-commits
commit: c44db171302ecad1fda1d8b70c3ef79bf03784ed
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 2 13:58:32 2016 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Wed Mar 2 13:58:32 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c44db171
dev-java/bsh: amd64 stable wrt bug #575482
Package-Manager: portage-2.2.26
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
dev-java/bsh/bsh-2.0_beta6.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/bsh/bsh-2.0_beta6.ebuild b/dev-java/bsh/bsh-2.0_beta6.ebuild
index ec71d7a..584bc18 100644
--- a/dev-java/bsh/bsh-2.0_beta6.ebuild
+++ b/dev-java/bsh/bsh-2.0_beta6.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/${MY_PV}${MY_BETA}.zip ->
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="amd64 ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos"
IUSE=""
CDEPEND="
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/bsh/
@ 2016-03-02 14:10 Patrice Clement
0 siblings, 0 replies; 16+ messages in thread
From: Patrice Clement @ 2016-03-02 14:10 UTC (permalink / raw
To: gentoo-commits
commit: e8937dfbd3198b3c8854fc4b6f1f12205fa2f5b1
Author: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 2 13:57:26 2016 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Wed Mar 2 13:57:26 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8937dfb
dev-java/bsh: Swap java-pkg_dohtml for java-pkg_dojavadoc to install documentation.
Package-Manager: portage-2.2.26
dev-java/bsh/bsh-2.0_beta6.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/bsh/bsh-2.0_beta6.ebuild b/dev-java/bsh/bsh-2.0_beta6.ebuild
index 584bc18..95af9cf 100644
--- a/dev-java/bsh/bsh-2.0_beta6.ebuild
+++ b/dev-java/bsh/bsh-2.0_beta6.ebuild
@@ -65,6 +65,6 @@ src_install() {
java-pkg_dolauncher "${PN}-console" --main bsh.Console
java-pkg_dolauncher "${PN}-interpreter" --main bsh.Interpreter
- use doc && java-pkg_dohtml -r javadoc
+ use doc && java-pkg_dojavadoc javadoc
use source && java-pkg_dosrc src/bsh
}
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/bsh/
@ 2016-03-15 10:07 Patrice Clement
0 siblings, 0 replies; 16+ messages in thread
From: Patrice Clement @ 2016-03-15 10:07 UTC (permalink / raw
To: gentoo-commits
commit: 9ad0cc9ca74f10c207be0ab69c4f637eca1ae2bb
Author: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 15 09:49:45 2016 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Tue Mar 15 09:53:15 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ad0cc9c
dev-java/bsh: Stable for ppc64+x86. Fixes security bug 575482.
As per IRC discussion with Agostino.
Package-Manager: portage-2.2.26
dev-java/bsh/bsh-2.0_beta6.ebuild | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/dev-java/bsh/bsh-2.0_beta6.ebuild b/dev-java/bsh/bsh-2.0_beta6.ebuild
index 95af9cf..a07c417 100644
--- a/dev-java/bsh/bsh-2.0_beta6.ebuild
+++ b/dev-java/bsh/bsh-2.0_beta6.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/${MY_PV}${MY_BETA}.zip ->
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="amd64 ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="amd64 ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos"
IUSE=""
CDEPEND="
@@ -33,10 +33,8 @@ RDEPEND="
DEPEND="
${CDEPEND}
- test? (
- dev-java/ant-junit:0
- )
- app-arch/unzip
+ test? ( dev-java/ant-junit:0 )
+ source? ( app-arch/zip )
>=virtual/jdk-1.6"
S="${WORKDIR}/${MY_PN}-${MY_PV}${MY_BETA}"
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/bsh/
@ 2018-03-01 8:39 Michał Górny
0 siblings, 0 replies; 16+ messages in thread
From: Michał Górny @ 2018-03-01 8:39 UTC (permalink / raw
To: gentoo-commits
commit: 333f7b2e6047c987ce72f562af4d208de881167d
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 1 08:37:44 2018 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Mar 1 08:39:39 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=333f7b2e
dev-java/bsh: Dekeyword *-fbsd
dev-java/bsh/bsh-2.0_beta6.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dev-java/bsh/bsh-2.0_beta6.ebuild b/dev-java/bsh/bsh-2.0_beta6.ebuild
index e0de8248262..2026697f5ff 100644
--- a/dev-java/bsh/bsh-2.0_beta6.ebuild
+++ b/dev-java/bsh/bsh-2.0_beta6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/${MY_PV}${MY_BETA}.zip ->
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="amd64 ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos"
IUSE=""
CDEPEND="
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/bsh/
@ 2020-08-25 9:33 Miroslav Šulc
0 siblings, 0 replies; 16+ messages in thread
From: Miroslav Šulc @ 2020-08-25 9:33 UTC (permalink / raw
To: gentoo-commits
commit: e7f208b5f09d971cd080b0601018a98111b7183a
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 25 09:33:07 2020 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Tue Aug 25 09:33:07 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e7f208b5
dev-java/bsh: update and fixes
1) eapi7
2) new src uri to avoid .zip
3) min jdk set to 1.8
4) doesn't compile with jdk:11
Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
dev-java/bsh/Manifest | 2 +-
dev-java/bsh/{bsh-2.0_beta6.ebuild => bsh-2.0_beta6-r1.ebuild} | 10 +++++-----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/dev-java/bsh/Manifest b/dev-java/bsh/Manifest
index b503231d595..45f1210949a 100644
--- a/dev-java/bsh/Manifest
+++ b/dev-java/bsh/Manifest
@@ -1 +1 @@
-DIST bsh-2.0b6.zip 1994608 BLAKE2B c06b783fed6a1b433d5c6efcf3f2343493c96895863118326f41076d56465b88b9139810c8ae38895b9c2c2da226788ef8ba7657b1ceadcac8ee8e7ed79d9c07 SHA512 ce461cc74bc48580c636c2f2e55e4e734a2b2075547cc5663722866e5c978a680051131c13240afb586a777ab93165119d1f96f9623bd9747f8e7d8293dd3bcf
+DIST bsh-2.0b6.tar.gz 1720334 BLAKE2B 7ade7d35ac66dad8c79dd2cb541c8851b321601bc6239f4d82e6b37269fdefc5cfa5efd1198f58030bb9dcc4712b42c1ca07071f0b042a59ebdbc4168e472fb0 SHA512 3d4458153f5e2a3b30d9afd79f0fe28862effa8e490fd1649d435c03bf90b060c255949a49780afee95069da4e8e8d2e4e2c5d979908370a525b3ca9a396458c
diff --git a/dev-java/bsh/bsh-2.0_beta6.ebuild b/dev-java/bsh/bsh-2.0_beta6-r1.ebuild
similarity index 91%
rename from dev-java/bsh/bsh-2.0_beta6.ebuild
rename to dev-java/bsh/bsh-2.0_beta6-r1.ebuild
index 2026697f5ff..d98757feaf2 100644
--- a/dev-java/bsh/bsh-2.0_beta6.ebuild
+++ b/dev-java/bsh/bsh-2.0_beta6-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
JAVA_PKG_IUSE="doc source test"
@@ -14,7 +14,7 @@ MY_P="${PN}-${MY_PV}${MY_BETA}"
DESCRIPTION="A small embeddable Java source interpreter"
HOMEPAGE="https://github.com/beanshell/beanshell"
-SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/${MY_PV}${MY_BETA}.zip -> ${MY_P}.zip"
+SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/${MY_PV}${MY_BETA}.tar.gz -> ${MY_P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
@@ -28,13 +28,13 @@ CDEPEND="
RDEPEND="
${CDEPEND}
- >=virtual/jre-1.6"
+ >=virtual/jre-1.8"
DEPEND="
${CDEPEND}
test? ( dev-java/ant-junit:0 )
source? ( app-arch/zip )
- >=virtual/jdk-1.6"
+ virtual/jdk:1.8"
S="${WORKDIR}/${MY_PN}-${MY_PV}${MY_BETA}"
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/bsh/
@ 2021-10-19 0:15 Sam James
0 siblings, 0 replies; 16+ messages in thread
From: Sam James @ 2021-10-19 0:15 UTC (permalink / raw
To: gentoo-commits
commit: 23750f6059d253e3b1883958bdca9501933c06df
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 19 00:14:17 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Oct 19 00:14:17 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23750f60
dev-java/bsh: Keyword 2.0_beta6-r1 arm64, #802609
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-java/bsh/bsh-2.0_beta6-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/bsh/bsh-2.0_beta6-r1.ebuild b/dev-java/bsh/bsh-2.0_beta6-r1.ebuild
index 6453015fe97..8acac44b6f5 100644
--- a/dev-java/bsh/bsh-2.0_beta6-r1.ebuild
+++ b/dev-java/bsh/bsh-2.0_beta6-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/${MY_PV}${MY_BETA}.tar.gz
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux"
IUSE=""
CDEPEND="
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/bsh/
@ 2021-11-30 20:51 Arthur Zamarin
0 siblings, 0 replies; 16+ messages in thread
From: Arthur Zamarin @ 2021-11-30 20:51 UTC (permalink / raw
To: gentoo-commits
commit: f34d72189de52e1b11012401ed20b32d76f13945
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 30 20:51:27 2021 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Tue Nov 30 20:51:40 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f34d7218
dev-java/bsh: Stabilize 2.0_beta6-r1 arm64, #822927
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
dev-java/bsh/bsh-2.0_beta6-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/bsh/bsh-2.0_beta6-r1.ebuild b/dev-java/bsh/bsh-2.0_beta6-r1.ebuild
index 8acac44b6f5e..e0000a5f8a81 100644
--- a/dev-java/bsh/bsh-2.0_beta6-r1.ebuild
+++ b/dev-java/bsh/bsh-2.0_beta6-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/${MY_PV}${MY_BETA}.tar.gz
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm64 ppc64 x86 ~amd64-linux ~x86-linux"
IUSE=""
CDEPEND="
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/bsh/
@ 2022-01-10 19:10 Arthur Zamarin
0 siblings, 0 replies; 16+ messages in thread
From: Arthur Zamarin @ 2022-01-10 19:10 UTC (permalink / raw
To: gentoo-commits
commit: f86de8d9e598d7b0851deb7f2e9753a8ada4be30
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 10 19:10:27 2022 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Mon Jan 10 19:10:27 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f86de8d9
dev-java/bsh: Keyword 2.0_beta6-r1 arm, #828049
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
dev-java/bsh/bsh-2.0_beta6-r1.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dev-java/bsh/bsh-2.0_beta6-r1.ebuild b/dev-java/bsh/bsh-2.0_beta6-r1.ebuild
index e0000a5f8a81..11fad8fe7e6b 100644
--- a/dev-java/bsh/bsh-2.0_beta6-r1.ebuild
+++ b/dev-java/bsh/bsh-2.0_beta6-r1.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
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/${MY_PV}${MY_BETA}.tar.gz
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux"
IUSE=""
CDEPEND="
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/bsh/
@ 2022-01-14 8:43 Miroslav Šulc
0 siblings, 0 replies; 16+ messages in thread
From: Miroslav Šulc @ 2022-01-14 8:43 UTC (permalink / raw
To: gentoo-commits
commit: 4ef71609ceb122238bea0713a626e60349a665d6
Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Wed Dec 15 21:18:11 2021 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Fri Jan 14 08:43:36 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ef71609
dev-java/bsh: MAVEN_ID
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
dev-java/bsh/bsh-2.0_beta6-r1.ebuild | 1 +
1 file changed, 1 insertion(+)
diff --git a/dev-java/bsh/bsh-2.0_beta6-r1.ebuild b/dev-java/bsh/bsh-2.0_beta6-r1.ebuild
index 11fad8fe7e6b..ead3b203a195 100644
--- a/dev-java/bsh/bsh-2.0_beta6-r1.ebuild
+++ b/dev-java/bsh/bsh-2.0_beta6-r1.ebuild
@@ -4,6 +4,7 @@
EAPI=7
JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.apache-extras.beanshell:bsh:2.0b6"
inherit java-pkg-2 java-ant-2
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/bsh/
@ 2023-02-27 5:53 Miroslav Šulc
0 siblings, 0 replies; 16+ messages in thread
From: Miroslav Šulc @ 2023-02-27 5:53 UTC (permalink / raw
To: gentoo-commits
commit: 7e8baa625d33014892243efce77a6dc286871c28
Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Thu Feb 9 12:25:03 2023 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Mon Feb 27 05:53:11 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e8baa62
dev-java/bsh: add 2.1.1
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/29506
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
dev-java/bsh/Manifest | 1 +
dev-java/bsh/bsh-2.1.1.ebuild | 116 ++++++++++++++++++++++++++++++++++++++++++
2 files changed, 117 insertions(+)
diff --git a/dev-java/bsh/Manifest b/dev-java/bsh/Manifest
index 45f1210949a7..ad27f0978a5e 100644
--- a/dev-java/bsh/Manifest
+++ b/dev-java/bsh/Manifest
@@ -1 +1,2 @@
DIST bsh-2.0b6.tar.gz 1720334 BLAKE2B 7ade7d35ac66dad8c79dd2cb541c8851b321601bc6239f4d82e6b37269fdefc5cfa5efd1198f58030bb9dcc4712b42c1ca07071f0b042a59ebdbc4168e472fb0 SHA512 3d4458153f5e2a3b30d9afd79f0fe28862effa8e490fd1649d435c03bf90b060c255949a49780afee95069da4e8e8d2e4e2c5d979908370a525b3ca9a396458c
+DIST bsh-2.1.1.tar.gz 1922883 BLAKE2B d60ebfab96f81a17120733887468571dd991dce663d725d9bee2dc44146e320d36600be70a3b7f76516645030d40fcda17db70989d54e98ffdc69c91738bcaf1 SHA512 585fcb9fdc8c36063a7d4dfe9a909e68b61d611f023731c955b7ced3f894cb6c48b0d463735e6825cb6f0181ba97902279212d285e325267aa533490e0bbfe00
diff --git a/dev-java/bsh/bsh-2.1.1.ebuild b/dev-java/bsh/bsh-2.1.1.ebuild
new file mode 100644
index 000000000000..f593111f6a84
--- /dev/null
+++ b/dev-java/bsh/bsh-2.1.1.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.apache-extras.beanshell:bsh:2.1.1"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="A small embeddable Java source interpreter"
+HOMEPAGE="https://github.com/beanshell/beanshell"
+SRC_URI="https://github.com/beanshell/beanshell/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/beanshell-${PV}"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+
+# There was 1 failure:
+# 1) do_not_access_non_open_methods(bsh.Java_9_Test)
+# bsh.TargetError: Sourced file: inline evaluation of: ``import java.net.URL;
+PROPERTIES="test_network"
+RESTRICT="test"
+
+CP_DEPEND="
+ dev-java/bsf:2.3
+ dev-java/jakarta-servlet-api:4"
+
+RDEPEND="${CP_DEPEND}
+ >=virtual/jre-1.8:*"
+
+DEPEND="${CP_DEPEND}
+ virtual/jdk:1.8"
+
+DOCS=(
+ CHANGES.md
+ NOTICE
+ README.md
+)
+
+JAVA_LAUNCHER_FILENAME="bsh-console"
+JAVA_MAIN_CLASS="bsh.Console"
+JAVA_RESOURCE_DIRS="resources/src"
+JAVA_SRC_DIR=( src bsf/src engine/src )
+JAVA_TEST_EXCLUDES=(
+ bsh.TestUtil # invalid test class
+ bsh.TestFilter # invalid test class
+ bsh.Class3_Test
+ bsh.Class13Test
+ bsh.Issue_7_Test
+ bsh.Issue_8_Test
+ bsh.OldScriptsTest # ?? As the name says Old...
+)
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_SRC_DIR="tests/junitTests/src"
+
+src_prepare() {
+ java-pkg-2_src_prepare
+ java-pkg_clean
+
+ # These classes are not in upstream jar file
+ rm engine/src/bsh/TestBshScriptEngine.java || die
+ rm src/bsh/JThis.java || die
+
+ # java-pkg-simple.eclass wants resources in JAVA_RESOURCE_DIRS
+ mkdir resources || die
+ find src -type f \
+ ! -name '*.java' \
+ ! -name 'bsh.jj*' \
+ ! -name '*.scripted' \
+ ! -name '*.txt' \
+ ! -name '*.xml' \
+ ! -name '.errLog' \
+ ! -name 'index.html' \
+ ! -name 'Changes.html' \
+ ! -name 'CodeMap.html' \
+ ! -name 'Manifest.*' \
+ | xargs cp --parent -t resources || die
+
+ # Some but not all tests in these test classes fail
+ sed \
+ -e '/import org.junit.Test/a import org.junit.Ignore;' \
+ -e '/diamond_operator()/i @Ignore' \
+ -e '/try_with_resource()/i @Ignore' \
+ -e '/integer_literal_enhancements()/i @Ignore' \
+ -i tests/junitTests/src/bsh/Project_Coin_Test.java || die
+
+ sed \
+ -e '/import org.junit.Test/a import org.junit.Ignore;' \
+ -e '/parsing_very_large_hex_literal()/i @Ignore' \
+ -e '/integer_literal_enhancements_binary()/i @Ignore' \
+ -e '/parsing_large_hex_literal()/i @Ignore' \
+ -i tests/junitTests/src/bsh/NumberLiteralTest.java || die
+
+ sed \
+ -e '/import org.junit.Test/a import org.junit.Ignore;' \
+ -e '/define_interface_with_constants()/i @Ignore' \
+ -i tests/junitTests/src/bsh/ClassGeneratorTest.java || die
+}
+
+src_test() {
+ # tests/junitTests/src/bsh/Issue_55_Test.java:47: error: cannot find symbol
+ # final Object scriptEngineResult = new BshScriptEngineFactory().getScriptEngine().eval(script);
+ # ^
+ # symbol: class BshScriptEngineFactory
+ # location: class Issue_55_Test
+ rm tests/junitTests/src/bsh/Issue_55_Test.java || die
+ java-pkg-simple_src_test
+}
+
+src_install() {
+ java-pkg-simple_src_install
+ java-pkg_dolauncher "${PN}-interpreter" --main bsh.Interpreter
+}
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/bsh/
@ 2023-03-28 22:15 Sam James
0 siblings, 0 replies; 16+ messages in thread
From: Sam James @ 2023-03-28 22:15 UTC (permalink / raw
To: gentoo-commits
commit: 1912a417c029c04627df1a60c180565cb251172d
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 28 22:15:34 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Mar 28 22:15:34 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1912a417
dev-java/bsh: Stabilize 2.1.1 arm64, #903495
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-java/bsh/bsh-2.1.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/bsh/bsh-2.1.1.ebuild b/dev-java/bsh/bsh-2.1.1.ebuild
index f593111f6a84..cb4a50b92da7 100644
--- a/dev-java/bsh/bsh-2.1.1.ebuild
+++ b/dev-java/bsh/bsh-2.1.1.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/beanshell-${PV}"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
# There was 1 failure:
# 1) do_not_access_non_open_methods(bsh.Java_9_Test)
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/bsh/
@ 2023-03-28 22:19 Sam James
0 siblings, 0 replies; 16+ messages in thread
From: Sam James @ 2023-03-28 22:19 UTC (permalink / raw
To: gentoo-commits
commit: 80604c50db716a911173453a8e19c82b88683bfc
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 28 22:19:27 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Mar 28 22:19:27 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80604c50
dev-java/bsh: Stabilize 2.1.1 x86, #903495
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-java/bsh/bsh-2.1.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/bsh/bsh-2.1.1.ebuild b/dev-java/bsh/bsh-2.1.1.ebuild
index cb4a50b92da7..4f66f64cc8ff 100644
--- a/dev-java/bsh/bsh-2.1.1.ebuild
+++ b/dev-java/bsh/bsh-2.1.1.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/beanshell-${PV}"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~amd64 ~arm arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
# There was 1 failure:
# 1) do_not_access_non_open_methods(bsh.Java_9_Test)
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/bsh/
@ 2023-03-28 22:19 Sam James
0 siblings, 0 replies; 16+ messages in thread
From: Sam James @ 2023-03-28 22:19 UTC (permalink / raw
To: gentoo-commits
commit: 41b3f28284a639f6e1d0e11721dd09e299734a39
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 28 22:19:28 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Mar 28 22:19:28 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41b3f282
dev-java/bsh: Stabilize 2.1.1 amd64, #903495
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-java/bsh/bsh-2.1.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/bsh/bsh-2.1.1.ebuild b/dev-java/bsh/bsh-2.1.1.ebuild
index 4f66f64cc8ff..6692a51b91aa 100644
--- a/dev-java/bsh/bsh-2.1.1.ebuild
+++ b/dev-java/bsh/bsh-2.1.1.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/beanshell-${PV}"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~amd64 ~arm arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
# There was 1 failure:
# 1) do_not_access_non_open_methods(bsh.Java_9_Test)
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/bsh/
@ 2023-03-29 0:11 Sam James
0 siblings, 0 replies; 16+ messages in thread
From: Sam James @ 2023-03-29 0:11 UTC (permalink / raw
To: gentoo-commits
commit: f3b0d0abb2bae94bc66f3fa3882142a6cc2b354b
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 29 00:10:46 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Mar 29 00:10:46 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3b0d0ab
dev-java/bsh: Stabilize 2.1.1 ppc64, #903495
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-java/bsh/bsh-2.1.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/bsh/bsh-2.1.1.ebuild b/dev-java/bsh/bsh-2.1.1.ebuild
index 6692a51b91aa..cf6c415a2b30 100644
--- a/dev-java/bsh/bsh-2.1.1.ebuild
+++ b/dev-java/bsh/bsh-2.1.1.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/beanshell-${PV}"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux"
# There was 1 failure:
# 1) do_not_access_non_open_methods(bsh.Java_9_Test)
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/bsh/
@ 2023-03-30 6:49 Miroslav Šulc
0 siblings, 0 replies; 16+ messages in thread
From: Miroslav Šulc @ 2023-03-30 6:49 UTC (permalink / raw
To: gentoo-commits
commit: 437974dd35a3390673409451066c09a4a612ef6d
Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Wed Mar 29 07:15:32 2023 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Thu Mar 30 06:49:48 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=437974dd
dev-java/bsh: drop 2.0_beta6-r1
Closes: https://bugs.gentoo.org/657354
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
dev-java/bsh/Manifest | 1 -
dev-java/bsh/bsh-2.0_beta6-r1.ebuild | 68 ------------------------------------
2 files changed, 69 deletions(-)
diff --git a/dev-java/bsh/Manifest b/dev-java/bsh/Manifest
index ad27f0978a5e..f4efff50c5dc 100644
--- a/dev-java/bsh/Manifest
+++ b/dev-java/bsh/Manifest
@@ -1,2 +1 @@
-DIST bsh-2.0b6.tar.gz 1720334 BLAKE2B 7ade7d35ac66dad8c79dd2cb541c8851b321601bc6239f4d82e6b37269fdefc5cfa5efd1198f58030bb9dcc4712b42c1ca07071f0b042a59ebdbc4168e472fb0 SHA512 3d4458153f5e2a3b30d9afd79f0fe28862effa8e490fd1649d435c03bf90b060c255949a49780afee95069da4e8e8d2e4e2c5d979908370a525b3ca9a396458c
DIST bsh-2.1.1.tar.gz 1922883 BLAKE2B d60ebfab96f81a17120733887468571dd991dce663d725d9bee2dc44146e320d36600be70a3b7f76516645030d40fcda17db70989d54e98ffdc69c91738bcaf1 SHA512 585fcb9fdc8c36063a7d4dfe9a909e68b61d611f023731c955b7ced3f894cb6c48b0d463735e6825cb6f0181ba97902279212d285e325267aa533490e0bbfe00
diff --git a/dev-java/bsh/bsh-2.0_beta6-r1.ebuild b/dev-java/bsh/bsh-2.0_beta6-r1.ebuild
deleted file mode 100644
index ead3b203a195..000000000000
--- a/dev-java/bsh/bsh-2.0_beta6-r1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.apache-extras.beanshell:bsh:2.0b6"
-
-inherit java-pkg-2 java-ant-2
-
-MY_PN="beanshell"
-MY_BETA="b6"
-MY_PV="${PV%%_*}"
-MY_P="${PN}-${MY_PV}${MY_BETA}"
-
-DESCRIPTION="A small embeddable Java source interpreter"
-HOMEPAGE="https://github.com/beanshell/beanshell"
-SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/${MY_PV}${MY_BETA}.tar.gz -> ${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-CDEPEND="
- dev-java/bsf:2.3
- java-virtuals/servlet-api:3.0
-"
-
-RDEPEND="
- ${CDEPEND}
- >=virtual/jre-1.8"
-
-DEPEND="
- ${CDEPEND}
- test? ( dev-java/ant-junit:0 )
- source? ( app-arch/zip )
- virtual/jdk:1.8"
-
-S="${WORKDIR}/${MY_PN}-${MY_PV}${MY_BETA}"
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-EANT_BUILD_TARGET="jarall"
-EANT_DOC_TARGET="javadoc"
-EANT_GENTOO_CLASSPATH="
- bsf-2.3
- servlet-api-3.0
-"
-
-java_prepare() {
- java-pkg_clean
-}
-
-EANT_TEST_TARGET="test"
-
-src_test() {
- java-pkg-2_src_test
-}
-
-src_install() {
- java-pkg_newjar "dist/${MY_P}.jar" "${PN}.jar"
-
- java-pkg_dolauncher "${PN}-console" --main bsh.Console
- java-pkg_dolauncher "${PN}-interpreter" --main bsh.Interpreter
-
- use doc && java-pkg_dojavadoc javadoc
- use source && java-pkg_dosrc src/bsh
-}
^ permalink raw reply related [flat|nested] 16+ messages in thread
end of thread, other threads:[~2023-03-30 6:49 UTC | newest]
Thread overview: 16+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-11-30 20:51 [gentoo-commits] repo/gentoo:master commit in: dev-java/bsh/ Arthur Zamarin
-- strict thread matches above, loose matches on Subject: below --
2023-03-30 6:49 Miroslav Šulc
2023-03-29 0:11 Sam James
2023-03-28 22:19 Sam James
2023-03-28 22:19 Sam James
2023-03-28 22:15 Sam James
2023-02-27 5:53 Miroslav Šulc
2022-01-14 8:43 Miroslav Šulc
2022-01-10 19:10 Arthur Zamarin
2021-10-19 0:15 Sam James
2020-08-25 9:33 Miroslav Šulc
2018-03-01 8:39 Michał Górny
2016-03-15 10:07 Patrice Clement
2016-03-02 14:10 Patrice Clement
2016-03-02 13:58 Agostino Sarubbo
2016-02-23 17:35 Patrice Clement
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox