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

[Miroslav Šulc]

commit:     fb83e8a64cf52a952ac45a25dff08e847a8da52b
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 12 10:30:13 2021 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Fri Mar 12 12:18:03 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb83e8a6

dev-java/xalan: 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>

 .../{xalan-2.7.2.ebuild => xalan-2.7.2-r1.ebuild}      | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/dev-java/xalan/xalan-2.7.2.ebuild 
b/dev-java/xalan/xalan-2.7.2-r1.ebuild
similarity index 88%
rename from dev-java/xalan/xalan-2.7.2.ebuild
rename to dev-java/xalan/xalan-2.7.2-r1.ebuild
index c5f4ec852ee..068336c4047 100644
--- a/dev-java/xalan/xalan-2.7.2.ebuild
+++ b/dev-java/xalan/xalan-2.7.2-r1.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
 
 # NOTE: Building the docs is much more hassle than it's worth. It
 # requires com.sun.image.codec, which has long gone from JDKs, and
@@ -9,16 +9,16 @@ EAPI=5
 
 JAVA_PKG_IUSE="doc source"
 
-inherit java-pkg-2 java-ant-2 versionator
+inherit java-pkg-2 java-ant-2
 
 MY_PN="${PN}-j"
-MY_PV="$(replace_all_version_separators _)"
+MY_PV="$(ver_rs 1- _)"
 MY_P="${MY_PN}_${MY_PV}"
 SRC_DIST="${MY_P}-src.tar.gz"
 BIN_DIST="${MY_P}-bin.zip"
 
 DESCRIPTION="Transforming XML documents into HTML, text, or other XML document 
types"
-HOMEPAGE="http://xalan.apache.org/";
+HOMEPAGE="https://xalan.apache.org/";
 SRC_URI="mirror://apache/${PN}/${MY_PN}/source/${SRC_DIST}
        doc? ( mirror://apache/${PN}/${MY_PN}/binaries/${BIN_DIST} )"
 LICENSE="Apache-2.0"
@@ -28,13 +28,13 @@ KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux 
~x86-linux ~ppc-macos ~x64-mac
 CDEPEND="dev-java/javacup:0
        dev-java/bcel:0"
 
+BDEPEND="doc? ( app-arch/unzip )"
 RDEPEND="${CDEPEND}
-       >=virtual/jre-1.3
+       >=virtual/jre-1.8:*
        ~dev-java/xalan-serializer-${PV}:${SLOT}"
 
 DEPEND="${CDEPEND}
-       >=virtual/jdk-1.3
-       doc? ( app-arch/unzip )"
+       >=virtual/jdk-1.8:*"
 
 EANT_GENTOO_CLASSPATH="bcel,javacup"
 EANT_BUILD_TARGET="unbundledjar"
@@ -43,7 +43,9 @@ EANT_DOC_TARGET=""
 JAVA_ANT_REWRITE_CLASSPATH="true"
 S="${WORKDIR}/${MY_P}"
 
-java_prepare() {
+src_prepare() {
+       default
+
        # disable building of serializer.jar
        sed -i -e 's/depends="prepare,serializer.jar"/depends="prepare"/' \
                build.xml || die "sed build.xml failed"