commit: 3bee014b10165220f166f76e6879fc7748b71ee5 Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net> AuthorDate: Sat Apr 3 22:12:07 2021 +0000 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> CommitDate: Mon Apr 5 09:54:13 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3bee014b
dev-java/joda-time: bugfix Generate missing files using "org/joda/time/tz/data/ZoneInfoMap" Closes: https://bugs.gentoo.org/779892 Package-Manager: Portage-3.0.17, Repoman-3.0.2 Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net> Closes: https://github.com/gentoo/gentoo/pull/20176/commits/ddefe3c3bf3a1dc6d3efb09792929bb55fcec4cd Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> dev-java/joda-time/Manifest | 1 + dev-java/joda-time/joda-time-2.10.10-r1.ebuild | 75 ++++++++++++++++++++++++++ 2 files changed, 76 insertions(+) diff --git a/dev-java/joda-time/Manifest b/dev-java/joda-time/Manifest index 23b3649d4b7..291708b4869 100644 --- a/dev-java/joda-time/Manifest +++ b/dev-java/joda-time/Manifest @@ -1,2 +1,3 @@ DIST joda-time-2.10.10-sources.tar.gz 1052384 BLAKE2B 656efddf6b98f10ce6729c6fa4c76ddfeb86dd94971c2637af3ddcb8a3a47f83948dbd58b04a6249445ef2857c5c5edb994a6d56349ed4ff4130ce9aaebd57e9 SHA512 e7917fd28cd10d7fbee02016b1f13a15a80af099b952cc0e8978bfc7fa389109553804670492c206f2b49bcf910ea093fc1838cb45ce4b7a3a885aac2aaf5943 +DIST joda-time-2.10.10.tar.gz 1052384 BLAKE2B 656efddf6b98f10ce6729c6fa4c76ddfeb86dd94971c2637af3ddcb8a3a47f83948dbd58b04a6249445ef2857c5c5edb994a6d56349ed4ff4130ce9aaebd57e9 SHA512 e7917fd28cd10d7fbee02016b1f13a15a80af099b952cc0e8978bfc7fa389109553804670492c206f2b49bcf910ea093fc1838cb45ce4b7a3a885aac2aaf5943 DIST joda-time-2.7-dist.tar.gz 4007765 BLAKE2B ed34c988dae1f1fb3359e06cccc148f680a04244987464770024635e72d5693036ec4d1648245f44db2fd57c47d9842a964d39e04e9ba510ecda7ec25c853ee7 SHA512 2a9bf91024bf20c4f1a28c87e5c6e560994ba6f7e131757c83a5ab6984ea79549e1d00452dcf767fc5cab374e531649759703acbaed724a1e49436cae0799209 diff --git a/dev-java/joda-time/joda-time-2.10.10-r1.ebuild b/dev-java/joda-time/joda-time-2.10.10-r1.ebuild new file mode 100644 index 00000000000..f72c34bc8ab --- /dev/null +++ b/dev-java/joda-time/joda-time-2.10.10-r1.ebuild @@ -0,0 +1,75 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# Skeleton command: +# java-ebuilder --generate-ebuild --workdir . --pom joda-time-2.10.10/pom.xml --download-uri https://github.com/JodaOrg/joda-time/archive/refs/tags/v2.10.10.tar.gz --slot 0 --keywords "~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris" --ebuild joda-time-2.10.10.ebuild + +EAPI=7 + +JAVA_PKG_IUSE="doc source test" +MAVEN_ID="joda-time:joda-time:2.10.10" +JAVA_TESTING_FRAMEWORKS="junit" + +inherit java-pkg-2 java-pkg-simple + +DESCRIPTION="Date and time library to replace JDK date handling" +HOMEPAGE="https://www.joda.org/joda-time/"; +SRC_URI="https://github.com/JodaOrg/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris" + +# Common dependencies +# POM: ${P}/pom.xml +# org.joda:joda-convert:1.9.2 -> >=dev-java/joda-convert-2.2.1:0 + +CDEPEND=" + dev-java/joda-convert:0 +" + +DEPEND=" + >=virtual/jdk-1.8:* + ${CDEPEND} +" + +RDEPEND=" + >=virtual/jre-1.8:* + ${CDEPEND}" + +S="${WORKDIR}" + +JAVA_GENTOO_CLASSPATH="joda-convert" +JAVA_SRC_DIR="${P}/src/main/java" +JAVA_RESOURCE_DIRS=( + "${P}/src/main/java" +) + +JAVA_TEST_GENTOO_CLASSPATH="junit" +JAVA_TEST_SRC_DIR="${P}/src/test/java" +JAVA_TEST_RESOURCE_DIRS=( + "${P}/src/test/resources" +) + +src_compile() { + java-pkg-simple_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)" \ + -cp ${PN}.jar \ + org.joda.time.tz.ZoneInfoCompiler \ + -src "${JAVA_SRC_DIR}/org/joda/time/tz/src" \ + -dst "${P}/src/main/resources/org/joda/time/tz/data" \ + africa \ + antarctica \ + asia \ + australasia \ + europe \ + northamerica \ + southamerica \ + etcetera \ + backward + + java-pkg_addres ${PN}.jar "${P}"/src/main/resources || die +}
