[gentoo-commits] repo/gentoo:master commit in: dev-java/bsh/

[Miroslav Šulc]

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