commit:     71cf14faacdb901d25e6b0f099ce55b6925155d3
Author:     Florian Schmaus <flow <AT> gentoo <DOT> org>
AuthorDate: Tue Sep  6 08:17:25 2022 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Tue Sep  6 08:20:20 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71cf14fa

dev-java/joda-time: remove unecessary die, use edo

Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>

 dev-java/joda-time/joda-time-2.11.0.ebuild | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/dev-java/joda-time/joda-time-2.11.0.ebuild 
b/dev-java/joda-time/joda-time-2.11.0.ebuild
index 316c6321066d..f9c720bebe0a 100644
--- a/dev-java/joda-time/joda-time-2.11.0.ebuild
+++ b/dev-java/joda-time/joda-time-2.11.0.ebuild
@@ -10,7 +10,7 @@ JAVA_PKG_IUSE="doc source test"
 MAVEN_ID="joda-time:joda-time:2.11.0"
 JAVA_TESTING_FRAMEWORKS="junit"
 
-inherit java-pkg-2 java-pkg-simple
+inherit edo java-pkg-2 java-pkg-simple
 
 DESCRIPTION="Date and time library to replace JDK date handling"
 HOMEPAGE="https://www.joda.org/joda-time/";
@@ -64,7 +64,7 @@ src_compile() {
 
        # Generate the missing "org/joda/time/tz/data/ZoneInfoMap"
        # Arguments from 
https://github.com/JodaOrg/joda-time/blob/v2.10.10/pom.xml#L413-L427
-       "$(java-config -J)" \
+       edo "$(java-config -J)" \
                -cp ${PN}.jar \
                org.joda.time.tz.ZoneInfoCompiler \
                -src "${JAVA_SRC_DIR}/org/joda/time/tz/src" \
@@ -79,7 +79,7 @@ src_compile() {
                etcetera \
                backward
 
-       java-pkg_addres ${PN}.jar "${P}"/src/main/resources || die
+       java-pkg_addres ${PN}.jar "${P}"/src/main/resources
 }
 
 src_test() {

Reply via email to