diff options
Diffstat (limited to 'dev-java/commons-digester')
| -rw-r--r-- | dev-java/commons-digester/Manifest | 2 | ||||
| -rw-r--r-- | dev-java/commons-digester/commons-digester-3.2-r4.ebuild (renamed from dev-java/commons-digester/commons-digester-3.2-r3.ebuild) | 57 |
2 files changed, 25 insertions, 34 deletions
diff --git a/dev-java/commons-digester/Manifest b/dev-java/commons-digester/Manifest index 5ec339d1c112..6c135779c2c2 100644 --- a/dev-java/commons-digester/Manifest +++ b/dev-java/commons-digester/Manifest @@ -1,5 +1,5 @@ DIST commons-digester-2.1-src.tar.gz 304060 BLAKE2B 2360f6f8ab77b20ad6b4058e0437aa792bf3886ddec2e09b6db259bc142c070965ce066ef224e92fb91614075631a2af1358ae4b4fc065fe9118e1d2559bb9bb SHA512 6bdb63431ed1e17f5e8ba24951762750a0e59b70c76eabecbf13f5fe6974864825456beed615c8f2c16f9a2f1404f2e56bdbc3ba335656c3661d5f368c708b88 DIST commons-digester-3.2.tar.gz 324555 BLAKE2B 7b8bdaa70eeafb069e9ecbfe697ab86f5167ae3b9933e8aa306f0080de0ec99d12bd023067678b7b904329178f553fd6d4d98141ab329154a1c27385b33e449f SHA512 6d5ed9a1cc7612244747dcbd5c713349f27d63d1cef39fa368b4e91eaa3b1fe7043ab2fb498a73e8afde8081b8ff26a966e5b87b8b6dc68a3d907e9b25aa7cad EBUILD commons-digester-2.1-r2.ebuild 1971 BLAKE2B 3ca0d54794623343c908ede4a10e56c54fcb23908111077e80c3d2142f1f9e0aac3b07d3ce27d5fb869cfa52e5c5c99d3fcb20cb557e0767edc2afd8398178c0 SHA512 234cf84cfa9758f470e8f5dc9c991627f752ec12028db99290f9cdb7efca4c33066200f70becff250ec081230613fcc25b5ab110820233b81ef3df9f22fdf25f -EBUILD commons-digester-3.2-r3.ebuild 2377 BLAKE2B bf571ae3508a95abfa531ea561e20297c6a87e8a2f4f2be4c31d68077bd2e74f44e96362cf5477791ff42c3887cf1a77bdf2e5c451739857a1be599251839d22 SHA512 cb60aea9c7597ec7b5233787ffdf6fc4fa12f7950d99d83434e67215480e41b8eea81f32c866d18743da14bbcfa267b9ee28361779bf4d7192bb0365cfba8363 +EBUILD commons-digester-3.2-r4.ebuild 1803 BLAKE2B cebc2f164709e83de2751e71945df4662c7e13a59f41da3ddcbfbccbad2a01c26419937d41539d947d2888b91e901946b845cc2dccbe7457c6be183cdd7df79d SHA512 fabca523606502cd572a634883d72e9686eaa5b1e0bd097c65877d69e69bf401b5c10e191ec2819f80ad5e918f02ee7b338a27c36af787d2fa259356b020bf46 MISC metadata.xml 482 BLAKE2B 2c8b9ab044dd5e95d9f17fcb0e284c7d8ed87727fa891bc6c15414b8db928346e8af71222bb3e6daec5ce682cfe72c7f315aa55d1dd5d55531554ab7d4ddc863 SHA512 31bd4dd9999a412986ac2dcc5cccffd7dd1f36ce8bf148f93dd35115da003c2663a0f5994a3e2a44ad537c26ee534294c80697f986737c02f434b3646e8f7c40 diff --git a/dev-java/commons-digester/commons-digester-3.2-r3.ebuild b/dev-java/commons-digester/commons-digester-3.2-r4.ebuild index 30428563c87c..cce136b3888f 100644 --- a/dev-java/commons-digester/commons-digester-3.2-r3.ebuild +++ b/dev-java/commons-digester/commons-digester-3.2-r4.ebuild @@ -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 mirror://apache/commons/digester/source/commons-digester3-3.2-src.tar.gz --slot 3.2 --keywords "~amd64 ~ppc64 ~x86" --ebuild commons-digester3.2-r3.ebuild - EAPI=8 JAVA_PKG_IUSE="doc source test" @@ -15,9 +12,10 @@ inherit java-pkg-2 java-pkg-simple DESCRIPTION="Reads XML configuration files to provide initialization of various Java objects" HOMEPAGE="https://commons.apache.org/digester/" SRC_URI="mirror://apache/commons/digester/source/${PN}3-${PV}-src.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/commons-digester3-${PV}-src" LICENSE="Apache-2.0" -SLOT="3.2" +SLOT="0" KEYWORDS="amd64 ppc64" # 1) atomWithNamespaceParse(org.apache.commons.digester3.xmlrules.SetNamespaceURITestCase) @@ -25,53 +23,46 @@ KEYWORDS="amd64 ppc64" PROPERTIES="test_network" RESTRICT="test" -# Common dependencies -# POM: pom.xml -# cglib:cglib:2.2.2 -> >=dev-java/cglib-3.3.0:3 -# commons-beanutils:commons-beanutils:1.8.3 -> >=dev-java/commons-beanutils-1.9.4:1.7 -# commons-logging:commons-logging:1.1.1 -> >=dev-java/commons-logging-1.2:0 - CP_DEPEND=" - >=dev-java/cglib-3.3.0:3 + >=dev-java/cglib-3.3.0-r3:0 >=dev-java/commons-beanutils-1.9.4:1.7 >=dev-java/commons-logging-1.2:0 " -DEPEND="${CP_DEPEND} - >=virtual/jdk-1.8:*" - -RDEPEND="${CP_DEPEND} - >=virtual/jre-1.8:*" - -DOCS=( {LICENSE,NOTICE,RELEASE-NOTES}.txt ) - -S="${WORKDIR}/commons-digester3-${PV}-src" +DEPEND=" + ${CP_DEPEND} + >=virtual/jdk-1.8:* +" -JAVA_ENCODING="iso-8859-1" +RDEPEND=" + ${CP_DEPEND} + >=virtual/jre-1.8:* +" -JAVA_SRC_DIR="src/main/java" +DOCS=( {NOTICE,RELEASE-NOTES}.txt ) 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() { pushd src/test/java || die # Exclusions according to 226,229 pom.xml - local JAVA_TEST_RUN_ONLY=$(find * -name "*TestCase.java" ! -name "Abstract*.java" ! -name "TestBean.java" ! -name "TestRule.java" ! -name "TestRuleSet.java") + local JAVA_TEST_RUN_ONLY=$(find * \ + -name "*TestCase.java" \ + ! -name "Abstract*.java" \ + ! -name "TestBean.java" \ + ! -name "TestRule.java" \ + ! -name "TestRuleSet.java") JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}" JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}" popd - # Testing with java-17 throws too many test failures local vm_version="$(java-config -g PROVIDES_VERSION)" - if [[ "${vm_version}" != "17" ]] ; then - java-pkg-simple_src_test + if ver_test "${vm_version}" -ge "17" ; then + JAVA_TEST_EXTRA_ARGS+=( --add-opens=java.base/java.lang=ALL-UNNAMED ) fi -} -src_install() { - default # https://bugs.gentoo.org/789582 - java-pkg-simple_src_install + java-pkg-simple_src_test } |