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

[Miroslav Šulc]

commit:     3b38b403d4e581f079fc1e75e74ef7a37e0ad8c9
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 12 10:41:15 2021 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Fri Mar 12 12:18:04 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b38b403

dev-java/ant-ivy: eapi7, min jdk/jre 1.8

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

 ...ant-ivy-1.4.1-r1.ebuild => ant-ivy-1.4.1-r2.ebuild} | 18 +++++++++++-------
 ...ant-ivy-2.3.0-r2.ebuild => ant-ivy-2.3.0-r3.ebuild} | 10 ++++++----
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/dev-java/ant-ivy/ant-ivy-1.4.1-r1.ebuild 
b/dev-java/ant-ivy/ant-ivy-1.4.1-r2.ebuild
similarity index 89%
rename from dev-java/ant-ivy/ant-ivy-1.4.1-r1.ebuild
rename to dev-java/ant-ivy/ant-ivy-1.4.1-r2.ebuild
index 92df6ba8e8b..62198fb29dc 100644
--- a/dev-java/ant-ivy/ant-ivy-1.4.1-r1.ebuild
+++ b/dev-java/ant-ivy/ant-ivy-1.4.1-r2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=7
 
 JAVA_PKG_IUSE="doc examples source test"
 
@@ -11,7 +11,7 @@ WANT_SPLIT_ANT="true"
 # Rewrites examples otherwise... bad.
 JAVA_PKG_BSFIX_ALL="no"
 
-inherit java-pkg-2 java-ant-2 eutils
+inherit java-pkg-2 java-ant-2
 
 MY_PN="${PN##*-}"
 MY_P="${MY_PN}-${PV}"
@@ -32,19 +32,23 @@ COMMON_DEP="
        dev-java/jakarta-oro:2.0
        dev-java/jsch:0"
 
+BDEPEND="app-arch/unzip"
 DEPEND="
-       >=virtual/jdk-1.4
-       app-arch/unzip
+       >=virtual/jdk-1.8:*
        test? ( dev-java/ant-junit:0 )
        ${COMMON_DEP}"
 
-RDEPEND=">=virtual/jre-1.4
+RDEPEND=">=virtual/jre-1.8:*
        ${COMMON_DEP}"
 
 S="${WORKDIR}/${MY_P}"
 
-java_prepare() {
-       epatch "${FILESDIR}/1.4.1-javadoc.patch"
+PATCHES=(
+       "${FILESDIR}/1.4.1-javadoc.patch"
+)
+
+src_prepare() {
+       default
 
        # init-ivy expects existing ivy.jar, but we don't need actually it
        sed -i -e 's/depends="init-ivy, prepare"/depends="prepare"/' build.xml \

diff --git a/dev-java/ant-ivy/ant-ivy-2.3.0-r2.ebuild 
b/dev-java/ant-ivy/ant-ivy-2.3.0-r3.ebuild
similarity index 95%
rename from dev-java/ant-ivy/ant-ivy-2.3.0-r2.ebuild
rename to dev-java/ant-ivy/ant-ivy-2.3.0-r3.ebuild
index d39bf489081..ef8d904b79d 100644
--- a/dev-java/ant-ivy/ant-ivy-2.3.0-r2.ebuild
+++ b/dev-java/ant-ivy/ant-ivy-2.3.0-r3.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=7
 
 JAVA_PKG_IUSE="doc examples source test"
 
@@ -40,18 +40,20 @@ CDEPEND="dev-java/jsch:0
        dev-java/jakarta-oro:2.0
        dev-java/commons-httpclient:3"
 
-DEPEND=">=virtual/jdk-1.6
+DEPEND=">=virtual/jdk-1.8:*
        test? (
                dev-java/ant-junit:0
        )
        ${CDEPEND}"
 
-RDEPEND=">=virtual/jre-1.6
+RDEPEND=">=virtual/jre-1.8:*
        ${CDEPEND}"
 
 S="${WORKDIR}/${MY_P}"
 
-java_prepare() {
+src_prepare() {
+       default
+
        # This stuff needs removing.
        local CLEANUP=(
                doc/reports