dev-java/msv: adjust dependencies "Possibly unneeded dependencies found"

There was xerces-2 wrongly registered in the DEPEND line in package.env.
This commit moves dev-java/xerces:2 from CP_DEPEND to DEPEND and adds it
to JAVA_CLASSPATH_EXTRA so that in /usr/share/msv/package.env it gets
registered as BUILD_DEPEND="xerces-2" instead in the DEPEND line.

Also sorts variables and removes useless comments.

Signed-off-by: Volkmar W. Pogatzki <gentoo@pogatzki.net>
Part-of: https://github.com/gentoo/gentoo/pull/41910
Signed-off-by: Miroslav Šulc <fordfrog@gentoo.org>
This commit is contained in:
Volkmar W. Pogatzki 2025-05-03 08:18:47 +02:00 committed by Miroslav Šulc
parent 5ee469bc4e
commit 32bfbc1413
No known key found for this signature in database
GPG Key ID: 65D0F770B26B469C

View File

@ -1,9 +1,6 @@
# Copyright 1999-2024 Gentoo Authors
# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# Skeleton command:
# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/xmlark/msv/archive/msv-2022.7.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild msv-2022.7.ebuild
EAPI=8
JAVA_PKG_IUSE="doc source test"
@ -15,55 +12,43 @@ inherit java-pkg-2 java-pkg-simple
DESCRIPTION="Multi-Schema Validator Core package"
HOMEPAGE="https://xmlark.github.io/msv/core/"
SRC_URI="https://github.com/xmlark/msv/archive/msv-${PV}.tar.gz"
S="${WORKDIR}/msv-${P}/msv"
LICENSE="BSD-1"
SLOT="0"
KEYWORDS="amd64 arm64 ppc64"
# Common dependencies
# POM: pom.xml
# isorelax:isorelax:20030108 -> !!!groupId-not-found!!!
# net.java.dev.msv:xsdlib:2022.7 -> !!!suitable-mavenVersion-not-found!!!
# relaxngDatatype:relaxngDatatype:20020414 -> >=dev-java/relaxng-datatype-20020414:0
# xerces:xercesImpl:2.12.2 -> >=dev-java/xerces-2.12.2:2
# xml-apis:xml-apis:1.4.01 -> >=dev-java/xml-commons-external-1.4.01:1.4
# xml-resolver:xml-resolver:1.2 -> >=dev-java/xml-commons-resolver-1.2:0
CP_DEPEND="
dev-java/iso-relax:0
dev-java/relaxng-datatype:0
dev-java/xerces:2
dev-java/xml-commons-external:1.4
dev-java/xml-commons-resolver:0
dev-java/xsdlib:0
"
DEPEND=">=virtual/jdk-1.8:*
dev-java/xerces:2
${CP_DEPEND}"
RDEPEND=">=virtual/jre-1.8:*
${CP_DEPEND}"
S="${WORKDIR}/msv-${P}/msv"
JAVA_CLASSPATH_EXTRA="xerces-2"
JAVA_MAIN_CLASS="com.sun.msv.driver.textui.Driver"
JAVA_SRC_DIR="src/main/java"
JAVA_RESOURCE_DIRS="src/main/resources"
JAVA_SRC_DIR="src/main/java"
JAVA_TEST_GENTOO_CLASSPATH="junit-4"
JAVA_TEST_SRC_DIR="src/test/java"
JAVA_TEST_RESOURCE_DIRS="src/test/resources"
JAVA_TEST_SRC_DIR="src/test/java"
src_test() {
# Selection according to pom.xml#L182-L210
pushd src/test/java || die
local JAVA_TEST_RUN_ONLY=$(find * \
\( -wholename "**/*Test.java" \
-o -wholename "**/*TestCase.java" \
-o -wholename "**/*TestCases.java" \) \
! -wholename "**/*\$*" \
)
popd
local JAVA_TEST_RUN_ONLY=$(find src/test/java \
\( -name "*Test.java" \
-o -name "*TestCase.java" \
-o -name "*TestCases.java" \) \
! -name "*\$*" -printf "%P\n")
JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}"
JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}"
java-pkg-simple_src_test