From d7fb70eb5c7ab7a7608f6733ed32955e67f7ea46 Mon Sep 17 00:00:00 2001 From: "Volkmar W. Pogatzki" Date: Thu, 6 Feb 2025 11:19:55 +0100 Subject: [PATCH] dev-java/commons-digester: 3.2-r4 sort variables, drop src_install() 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/718644c7d058d17c52cec2bccf3b5966e25b5d22 Signed-off-by: Miroslav Ć ulc --- .../commons-digester-3.2-r4.ebuild | 15 +++------------ 1 file changed, 3 insertions(+), 12 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 64b48386e9538..11ad4b1bbb1d1 100644 --- a/dev-java/commons-digester/commons-digester-3.2-r4.ebuild +++ b/dev-java/commons-digester/commons-digester-3.2-r4.ebuild @@ -15,6 +15,7 @@ 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="0" @@ -44,17 +45,12 @@ RDEPEND="${CP_DEPEND} >=virtual/jre-1.8:*" DOCS=( {LICENSE,NOTICE,RELEASE-NOTES}.txt ) - -S="${WORKDIR}/commons-digester3-${PV}-src" - JAVA_ENCODING="iso-8859-1" - -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() { pushd src/test/java || die @@ -71,8 +67,3 @@ src_test() { java-pkg-simple_src_test } - -src_install() { - default # https://bugs.gentoo.org/789582 - java-pkg-simple_src_install -}