| 1 |
commit: 71cf14faacdb901d25e6b0f099ce55b6925155d3 |
| 2 |
Author: Florian Schmaus <flow <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Sep 6 08:17:25 2022 +0000 |
| 4 |
Commit: Florian Schmaus <flow <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Sep 6 08:20:20 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71cf14fa |
| 7 |
|
| 8 |
dev-java/joda-time: remove unecessary die, use edo |
| 9 |
|
| 10 |
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org> |
| 11 |
|
| 12 |
dev-java/joda-time/joda-time-2.11.0.ebuild | 6 +++--- |
| 13 |
1 file changed, 3 insertions(+), 3 deletions(-) |
| 14 |
|
| 15 |
diff --git a/dev-java/joda-time/joda-time-2.11.0.ebuild b/dev-java/joda-time/joda-time-2.11.0.ebuild |
| 16 |
index 316c6321066d..f9c720bebe0a 100644 |
| 17 |
--- a/dev-java/joda-time/joda-time-2.11.0.ebuild |
| 18 |
+++ b/dev-java/joda-time/joda-time-2.11.0.ebuild |
| 19 |
@@ -10,7 +10,7 @@ JAVA_PKG_IUSE="doc source test" |
| 20 |
MAVEN_ID="joda-time:joda-time:2.11.0" |
| 21 |
JAVA_TESTING_FRAMEWORKS="junit" |
| 22 |
|
| 23 |
-inherit java-pkg-2 java-pkg-simple |
| 24 |
+inherit edo java-pkg-2 java-pkg-simple |
| 25 |
|
| 26 |
DESCRIPTION="Date and time library to replace JDK date handling" |
| 27 |
HOMEPAGE="https://www.joda.org/joda-time/" |
| 28 |
@@ -64,7 +64,7 @@ src_compile() { |
| 29 |
|
| 30 |
# Generate the missing "org/joda/time/tz/data/ZoneInfoMap" |
| 31 |
# Arguments from https://github.com/JodaOrg/joda-time/blob/v2.10.10/pom.xml#L413-L427 |
| 32 |
- "$(java-config -J)" \ |
| 33 |
+ edo "$(java-config -J)" \ |
| 34 |
-cp ${PN}.jar \ |
| 35 |
org.joda.time.tz.ZoneInfoCompiler \ |
| 36 |
-src "${JAVA_SRC_DIR}/org/joda/time/tz/src" \ |
| 37 |
@@ -79,7 +79,7 @@ src_compile() { |
| 38 |
etcetera \ |
| 39 |
backward |
| 40 |
|
| 41 |
- java-pkg_addres ${PN}.jar "${P}"/src/main/resources || die |
| 42 |
+ java-pkg_addres ${PN}.jar "${P}"/src/main/resources |
| 43 |
} |
| 44 |
|
| 45 |
src_test() { |
Archives