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

[Florian Schmaus]

commit:     4550c323fce7947fd9b3fa612d6d9be70b84a908
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Thu Dec 16 14:51:36 2021 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Thu Feb  3 06:55:52 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4550c323

dev-java/msv: EAPI 8, min java 1.8:*

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>

 dev-java/msv/msv-20130601.ebuild | 41 ++++++++++++++++++++++++++--------------
 1 file changed, 27 insertions(+), 14 deletions(-)

diff --git a/dev-java/msv/msv-20130601.ebuild b/dev-java/msv/msv-20130601.ebuild
index 6eb799182641..031b99a48d22 100644
--- a/dev-java/msv/msv-20130601.ebuild
+++ b/dev-java/msv/msv-20130601.ebuild
@@ -1,39 +1,52 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=8
 
 MY_PV="${PV:4:2}.${PV:6}"
 MY_PV="${PV:0:4}.${MY_PV//0}"
 JAVA_PKG_IUSE="doc source"
+MAVEN_ID="net.java.dev.msv:msv-core:2013.6.1"
 
 inherit java-pkg-2 java-pkg-simple
 
 DESCRIPTION="Multi-Schema XML Validator, a Java tool for validating XML documents"
 HOMEPAGE="https://msv.java.net/"
-SRC_URI="http://search.maven.org/remotecontent?filepath=net/java/dev/${PN}/${PN}-core/${MY_PV}/${PN}-core-${MY_PV}-sources.jar"
+SRC_URI="https://search.maven.org/remotecontent?filepath=net/java/dev/${PN}/${PN}-core/${MY_PV}/${PN}-core-${MY_PV}-sources.jar"
+
 LICENSE="BSD Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 
-CDEPEND="dev-java/iso-relax:0
+CP_DEPEND="
+	dev-java/iso-relax:0
 	dev-java/relaxng-datatype:0
+	dev-java/xml-commons-resolver:0
 	dev-java/xsdlib:0"
 
-RDEPEND="${CDEPEND}
+DEPEND="${CP_DEPEND}
+	>=virtual/jdk-1.8:*"
+
+RDEPEND="${CP_DEPEND}
 	dev-java/xerces:2
-	>=virtual/jre-1.5"
+	>=virtual/jre-1.8:*"
 
-DEPEND="${CDEPEND}
-	app-arch/unzip
-	>=virtual/jdk-1.5"
+BDEPEND="app-arch/unzip"
 
-JAVA_GENTOO_CLASSPATH="iso-relax,relaxng-datatype,xsdlib"
 JAVAC_ARGS="-XDignore.symbol.file"
+JAVA_SRC_DIR="."
+JAVA_RESOURCE_DIRS="res"
+
+src_prepare() {
+	default
+	mkdir "res" || die
+	cp -r "com" "res" || die
+
+	# The only resources to have are '*.properties'
+	find res -type f ! -name '*.properties' -exec rm -rf {} + || die
 
-src_compile() {
-	java-pkg-simple_src_compile
-	java-pkg_addres "${PN}.jar" . ! -path "*/doc-files/*" ! -name "*.html"
+	sed -e '/resolver.tools.CatalogResolver/s/com.sun.org.apache.xml.internal/org.apache.xml/' \
+		-i com/sun/msv/driver/textui/Driver.java || die
 }
 
 src_install() {