public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Florian Schmaus" <flow@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-java/joda-time/
Date: Tue,  6 Sep 2022 08:20:35 +0000 (UTC)	[thread overview]
Message-ID: <1662452420.71cf14faacdb901d25e6b0f099ce55b6925155d3.flow@gentoo> (raw)

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	other threads:[~2022-09-06  8:20 UTC|newest]

Thread overview: 31+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-09-06  8:20 Florian Schmaus [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-11-23 14:32 [gentoo-commits] repo/gentoo:master commit in: dev-java/joda-time/ Michał Górny
2024-11-22 18:24 Arthur Zamarin
2024-11-22 10:20 Sam James
2024-11-22  7:48 Miroslav Šulc
2024-10-23  7:04 Miroslav Šulc
2024-10-21  7:48 Miroslav Šulc
2022-10-12 20:02 Arthur Zamarin
2022-10-12 19:22 Sam James
2022-10-10 18:39 Arthur Zamarin
2022-10-10  7:02 Agostino Sarubbo
2022-10-09 12:46 Arthur Zamarin
2022-10-03  7:55 Florian Schmaus
2022-08-28  5:17 Miroslav Šulc
2022-08-26 23:27 Sam James
2022-08-26 10:23 Arthur Zamarin
2022-08-26 10:08 Sam James
2022-08-26  9:55 Arthur Zamarin
2022-07-27  8:54 Florian Schmaus
2021-12-17 10:57 Arthur Zamarin
2021-11-24 23:31 Sam James
2021-10-19  0:15 Sam James
2021-04-13 18:23 Sergei Trofimovich
2021-04-11  0:13 Thomas Deutschmann
2021-04-05  9:54 Miroslav Šulc
2021-04-05  9:54 Miroslav Šulc
2021-04-03 10:59 Miroslav Šulc
2020-08-25  9:46 Miroslav Šulc
2020-05-17 16:55 Aaron Bauman
2016-03-31 18:00 Patrice Clement
2016-03-31 16:56 Patrice Clement

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1662452420.71cf14faacdb901d25e6b0f099ce55b6925155d3.flow@gentoo \
    --to=flow@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox