mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-08-25 07:08:13 -07:00
dev-java/xsdlib: 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/xsdlib/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 Closes: https://github.com/gentoo/gentoo/pull/41910 Signed-off-by: Miroslav Šulc <fordfrog@gentoo.org>
This commit is contained in:
committed by
Miroslav Šulc
parent
32bfbc1413
commit
ac2e683bb7
@@ -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 xsdlib-2022.7.ebuild
|
||||
|
||||
EAPI=8
|
||||
|
||||
JAVA_PKG_IUSE="doc source test"
|
||||
@@ -15,27 +12,16 @@ inherit java-pkg-2 java-pkg-simple
|
||||
DESCRIPTION="XML Schema datatypes library"
|
||||
HOMEPAGE="https://github.com/xmlark/msv/tree/main/xsdlib"
|
||||
SRC_URI="https://github.com/xmlark/msv/archive/msv-${PV}.tar.gz"
|
||||
S="${WORKDIR}/msv-msv-${PV}/xsdlib"
|
||||
|
||||
LICENSE="BSD-1"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 arm64 ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
|
||||
|
||||
# Common dependencies
|
||||
# POM: pom.xml
|
||||
# relaxngDatatype:relaxngDatatype:20020414 -> >=dev-java/relaxng-datatype-20020414:0
|
||||
# xerces:xercesImpl:2.12.2 -> >=dev-java/xerces-2.12.2:2
|
||||
|
||||
CP_DEPEND="
|
||||
dev-java/relaxng-datatype:0
|
||||
dev-java/xerces:2
|
||||
"
|
||||
|
||||
# Compile dependencies
|
||||
# POM: pom.xml
|
||||
# test? junit:junit:4.13.2 -> >=dev-java/junit-4.13.2:4
|
||||
# test? org.jdom:jdom2:2.0.6.1 -> >=dev-java/jdom-2.0.6.1:2
|
||||
CP_DEPEND="dev-java/relaxng-datatype:0"
|
||||
|
||||
DEPEND="
|
||||
dev-java/xerces:2
|
||||
>=virtual/jdk-1.8:*
|
||||
${CP_DEPEND}
|
||||
test? (
|
||||
@@ -48,25 +34,20 @@ RDEPEND="
|
||||
${CP_DEPEND}
|
||||
"
|
||||
|
||||
S="${WORKDIR}/msv-msv-${PV}/xsdlib"
|
||||
|
||||
JAVA_CLASSPATH_EXTRA="xerces-2"
|
||||
JAVA_MAIN_CLASS="com.sun.msv.datatype.xsd.CommandLineTester"
|
||||
JAVA_SRC_DIR="src/main/java"
|
||||
JAVA_RESOURCE_DIRS="src/main/resources"
|
||||
|
||||
JAVA_SRC_DIR="src/main/java"
|
||||
JAVA_TEST_GENTOO_CLASSPATH="junit-4,jdom-2"
|
||||
JAVA_TEST_SRC_DIR="src/test/java"
|
||||
|
||||
src_test() {
|
||||
# Selection according to pom.xml#L156-L184
|
||||
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
|
||||
Reference in New Issue
Block a user