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 <[email protected]>

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

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

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