From b17a3ef12038de50228bade1f05502c74e135321 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Wed, 2 Sep 2020 14:09:07 +0100
Subject: gentoo resync : 02.09.2020

---
 dev-java/bsh/Manifest                |  4 +--
 dev-java/bsh/bsh-2.0_beta6-r1.ebuild | 67 ++++++++++++++++++++++++++++++++++++
 dev-java/bsh/bsh-2.0_beta6.ebuild    | 67 ------------------------------------
 3 files changed, 69 insertions(+), 69 deletions(-)
 create mode 100644 dev-java/bsh/bsh-2.0_beta6-r1.ebuild
 delete mode 100644 dev-java/bsh/bsh-2.0_beta6.ebuild

(limited to 'dev-java/bsh')

diff --git a/dev-java/bsh/Manifest b/dev-java/bsh/Manifest
index 7761b988a4a0..3ea8f9efce11 100644
--- a/dev-java/bsh/Manifest
+++ b/dev-java/bsh/Manifest
@@ -1,3 +1,3 @@
-DIST bsh-2.0b6.zip 1994608 BLAKE2B c06b783fed6a1b433d5c6efcf3f2343493c96895863118326f41076d56465b88b9139810c8ae38895b9c2c2da226788ef8ba7657b1ceadcac8ee8e7ed79d9c07 SHA512 ce461cc74bc48580c636c2f2e55e4e734a2b2075547cc5663722866e5c978a680051131c13240afb586a777ab93165119d1f96f9623bd9747f8e7d8293dd3bcf
-EBUILD bsh-2.0_beta6.ebuild 1313 BLAKE2B 67d40df99363970f214d50593c4d300f6e29a03c3208bebe8636ecfd4dd5394943ab8c07e5777210d4e31fa4894c8856c4fee92262f99b50bf810b6fd431c6b2 SHA512 5294ec898198726a1b5c1261bdb6d19bb23da96101882f82757a72b585c0453b26325244f2aebdc691ebb13cc09397f7b5eaa0f2f6b47d36a902ab52c2b8961a
+DIST bsh-2.0b6.tar.gz 1720334 BLAKE2B 7ade7d35ac66dad8c79dd2cb541c8851b321601bc6239f4d82e6b37269fdefc5cfa5efd1198f58030bb9dcc4712b42c1ca07071f0b042a59ebdbc4168e472fb0 SHA512 3d4458153f5e2a3b30d9afd79f0fe28862effa8e490fd1649d435c03bf90b060c255949a49780afee95069da4e8e8d2e4e2c5d979908370a525b3ca9a396458c
+EBUILD bsh-2.0_beta6-r1.ebuild 1314 BLAKE2B 18c385182eb1ca8b721b97a3038503302fe3a0b4b62139d7e605ad448fd3688bf88520631dec6d5079a4a7851e8bca6278acf8c58797be6024db7160809760ad SHA512 97efbdceef57cdd8e7154fcdb2109bffc5ae0c9acb0db298d57b1e6bc44a67d8f2a87ab03ceb3e4cf3d3f2a0bb757d946acce83b909f9d9be2a97bcb00f6dbea
 MISC metadata.xml 330 BLAKE2B 4295b9afc957d9b69add3267ff62910a7cb8bed9b918dec04d0f56612f452b669639462479e9627c2fd451977c4f74b2ddbf031b395e34e11a0af34a70405d8b SHA512 5c495c72dfc5d55c63b0af0740b0b82306e047817965a8c095dc6ae89324af842d5f8ccaa218107ff715544051e9c984fd1997ca11786a9c0fd070d72441b7be
diff --git a/dev-java/bsh/bsh-2.0_beta6-r1.ebuild b/dev-java/bsh/bsh-2.0_beta6-r1.ebuild
new file mode 100644
index 000000000000..d98757feaf2a
--- /dev/null
+++ b/dev-java/bsh/bsh-2.0_beta6-r1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos"
+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
+}
diff --git a/dev-java/bsh/bsh-2.0_beta6.ebuild b/dev-java/bsh/bsh-2.0_beta6.ebuild
deleted file mode 100644
index 2026697f5ffc..000000000000
--- a/dev-java/bsh/bsh-2.0_beta6.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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 ~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 )
-	source? ( app-arch/zip )
-	>=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_dojavadoc javadoc
-	use source && java-pkg_dosrc src/bsh
-}
-- 
cgit v1.2.3