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

[Miroslav Šulc]

commit:     785ec13ab2562c87ef4ab644d6eace7a8b740bfd
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 25 09:46:22 2020 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Tue Aug 25 09:46:22 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=785ec13a

dev-java/joda-time: eapi7, min jdk 1.8

Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 .../{joda-time-2.7.ebuild => joda-time-2.7-r1.ebuild}          | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/dev-java/joda-time/joda-time-2.7.ebuild 
b/dev-java/joda-time/joda-time-2.7-r1.ebuild
similarity index 95%
rename from dev-java/joda-time/joda-time-2.7.ebuild
rename to dev-java/joda-time/joda-time-2.7-r1.ebuild
index 2f19a557d78..bbf0efca3a8 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."