From 70a503101bd1e92dfe0deb9f4f9780827f07d1db Mon Sep 17 00:00:00 2001 From: "Volkmar W. Pogatzki" Date: Thu, 6 Feb 2025 11:24:01 +0100 Subject: [PATCH] dev-java/commons-digester: 3.2-r4 style update, drop obsolete JAVA_ENCODING MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Volkmar W. Pogatzki Closes: https://github.com/gentoo/gentoo/pull/40451/commits/02b6d7706b6c0642b95061b4d75da0fee24d0949 Signed-off-by: Miroslav Ć ulc --- .../commons-digester-3.2-r4.ebuild | 31 +++++++++---------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/dev-java/commons-digester/commons-digester-3.2-r4.ebuild b/dev-java/commons-digester/commons-digester-3.2-r4.ebuild index 11ad4b1bbb1d1..cce136b3888f0 100644 --- a/dev-java/commons-digester/commons-digester-3.2-r4.ebuild +++ b/dev-java/commons-digester/commons-digester-3.2-r4.ebuild @@ -1,9 +1,6 @@ # 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" @@ -26,26 +23,23 @@ 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-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:*" +DEPEND=" + ${CP_DEPEND} + >=virtual/jdk-1.8:* +" -RDEPEND="${CP_DEPEND} - >=virtual/jre-1.8:*" +RDEPEND=" + ${CP_DEPEND} + >=virtual/jre-1.8:* +" -DOCS=( {LICENSE,NOTICE,RELEASE-NOTES}.txt ) -JAVA_ENCODING="iso-8859-1" +DOCS=( {NOTICE,RELEASE-NOTES}.txt ) JAVA_RESOURCE_DIRS="src/main/resources" JAVA_SRC_DIR="src/main/java" JAVA_TEST_GENTOO_CLASSPATH="junit-4" @@ -55,7 +49,12 @@ 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