Updating liguros repo

6 files changed, 25 insertions, 22 deletions

diff --git a/dev-java/bsh/Manifest b/dev-java/bsh/Manifest
index b503231d5959..45f1210949a7 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
index 2026697f5ffc..d98757feaf2a 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}"
 
diff --git a/dev-java/jboss-modules/jboss-modules-1.3.3-r1.ebuild b/dev-java/jboss-modules/jboss-modules-1.3.3-r1.ebuild
index 141ee970261f..177c33e4ec83 100644
--- a/dev-java/jboss-modules/jboss-modules-1.3.3-r1.ebuild
+++ b/dev-java/jboss-modules/jboss-modules-1.3.3-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 JAVA_PKG_IUSE="source" # doc (needs APIviz)
 
@@ -15,8 +15,8 @@ LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="amd64 x86"
 
-RDEPEND=">=virtual/jre-1.7"
-DEPEND=">=virtual/jdk-1.7"
+RDEPEND=">=virtual/jre-1.8"
+DEPEND="virtual/jdk:1.8"
 
 S="${WORKDIR}/${P}.Final/"
 
diff --git a/dev-java/joda-convert/joda-convert-1.3.1.ebuild b/dev-java/joda-convert/joda-convert-1.3.1-r1.ebuild
index ed172701ffa4..80b986790cd2 100644
--- a/dev-java/joda-convert/joda-convert-1.3.1.ebuild
+++ b/dev-java/joda-convert/joda-convert-1.3.1-r1.ebuild
@@ -1,7 +1,7 @@
 # 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"
 
 inherit java-pkg-2 java-ant-2
@@ -14,18 +14,19 @@ LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="amd64 ppc64 x86"
 
-DEPEND=">=virtual/jdk-1.6
+DEPEND="virtual/jdk:1.8
 	test? (
 		dev-java/junit:4
 		dev-java/ant-junit:0
 	)"
-RDEPEND=">=virtual/jre-1.6"
+RDEPEND=">=virtual/jre-1.8"
 
 JAVA_ANT_REWRITE_CLASSPATH="true"
 EANT_TEST_GENTOO_CLASSPATH="junit-4"
 EANT_EXTRA_ARGS="-Dmaven.build.finalName=${PN}"
 
-java_prepare() {
+src_prepare() {
+	default
 	cp "${FILESDIR}"/${P}-build.xml build.xml || die
 }
 
diff --git a/dev-java/joda-time/joda-time-2.7.ebuild b/dev-java/joda-time/joda-time-2.7-r1.ebuild
index 2f19a557d78d..bbf0efca3a84 100644
--- a/dev-java/joda-time/joda-time-2.7.ebuild
+++ b/dev-java/joda-time/joda-time-2.7-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=7
 JAVA_PKG_IUSE="doc examples source test"
 JAVA_ANT_REWRITE_CLASSPATH="true"
 
@@ -17,15 +17,17 @@ KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-s
 
 RESTRICT="test"
 
-DEPEND=">=virtual/jdk-1.5
+DEPEND=">=virtual/jdk-1.8
 	dev-java/joda-convert:0
 	test? (
 		dev-java/junit:0
 		dev-java/ant-junit:0
 	)"
-RDEPEND=">=virtual/jre-1.5"
+RDEPEND=">=virtual/jre-1.8"
+
+src_prepare() {
+	default
 
-java_prepare() {
 	rm -v *.jar || die "Failed to remove bundled jars."
 	cp "${FILESDIR}"/${P}-build.xml "${S}"/build.xml || die "Failed to copy build file."
 
diff --git a/dev-java/validation-api/validation-api-1.1.0.ebuild b/dev-java/validation-api/validation-api-1.1.0-r1.ebuild
index a8fb5ed3a9fd..a3ba9312dd66 100644
--- a/dev-java/validation-api/validation-api-1.1.0.ebuild
+++ b/dev-java/validation-api/validation-api-1.1.0-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2016 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"
 
@@ -17,6 +17,6 @@ KEYWORDS="amd64 x86"
 
 IUSE=""
 
-RDEPEND=">=virtual/jre-1.5"
-DEPEND=">=virtual/jdk-1.5
-	app-arch/unzip"
+BDEPEND="app-arch/unzip"
+RDEPEND=">=virtual/jre-1.8"
+DEPEND=">=virtual/jdk-1.8"