commit: 9a3af77d36e8c1243e1df6c9e2afec437dec0ca9 Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net> AuthorDate: Sat Nov 23 15:04:40 2024 +0000 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> CommitDate: Sun Nov 24 09:11:32 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a3af77d
dev-java/joda-time: drop 2.11.2 Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net> Closes: https://github.com/gentoo/gentoo/pull/39233/commits/5ce22301db0b5f5bb816f1a52f5fe7886fb5c834 Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> dev-java/joda-time/Manifest | 1 - .../joda-time/files/joda-time-2.11.0-test.patch | 14 ---- dev-java/joda-time/joda-time-2.11.2.ebuild | 95 ---------------------- 3 files changed, 110 deletions(-) diff --git a/dev-java/joda-time/Manifest b/dev-java/joda-time/Manifest index 579996b282c0..50464a6ea1bd 100644 --- a/dev-java/joda-time/Manifest +++ b/dev-java/joda-time/Manifest @@ -1,2 +1 @@ -DIST joda-time-2.11.2.tar.gz 1055885 BLAKE2B 52281dcb530734dd33d0c01b07c9fbc5e7afd507a97e6926f7ef442dc91907d999d126289bc609e6fabf6af4267e47e5a79452d462a3f0561c405e6cd7f5976f SHA512 ea43deea4ef751fc631c35589adec0c5d9d0a5c836c1a24ada5d994cb9310a55b5af69260afd2647516c64fc84b892a2e25fca4bb38e852982c40f7caa5858b3 DIST joda-time-2.13.0.tar.gz 1076948 BLAKE2B d70be1086175c80f72c7dc945aea24f71d74552e7f8e56bd84a62f308bd9db0e006951ae415dfec6f18cb47485019e179e66a198b6c1adafaa79b3f590318825 SHA512 0e185c433891d6d6a1ac9e93e5ddf6cde4097de4b810881266ab8f149de4cfbe089b857a946e8d36731ad82f84c789e12ffcde1836cd088e9056e3533ce79200 diff --git a/dev-java/joda-time/files/joda-time-2.11.0-test.patch b/dev-java/joda-time/files/joda-time-2.11.0-test.patch deleted file mode 100644 index a74cd01edfbc..000000000000 --- a/dev-java/joda-time/files/joda-time-2.11.0-test.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/src/test/java/org/joda/time/TestDateTimeZone.java -+++ b/src/test/java/org/joda/time/TestDateTimeZone.java -@@ -778,9 +778,10 @@ public class TestDateTimeZone extends TestCase { - static final boolean JDK9; - static { - boolean jdk9 = true; -+ System.out.println("java.version = " + System.getProperty("java.version") ); - try { - String str = System.getProperty("java.version"); -- jdk9 = str.startsWith("9"); -+ jdk9 = str.startsWith("11"); - } catch (Exception ex) { - jdk9 = false; - } diff --git a/dev-java/joda-time/joda-time-2.11.2.ebuild b/dev-java/joda-time/joda-time-2.11.2.ebuild deleted file mode 100644 index 113221e97500..000000000000 --- a/dev-java/joda-time/joda-time-2.11.2.ebuild +++ /dev/null @@ -1,95 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# Skeleton command: -# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/JodaOrg/joda-time/archive/v2.11..tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos" --ebuild joda-time-2.11..ebuild - -EAPI=8 - -JAVA_PKG_IUSE="doc source test" -MAVEN_ID="joda-time:joda-time:2.11.2" -JAVA_TESTING_FRAMEWORKS="junit" - -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/"; -SRC_URI="https://github.com/JodaOrg/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 arm64 ppc64 ~amd64-linux ~x86-linux ~ppc-macos" - -# Common dependencies -# POM: pom.xml -# org.joda:joda-convert:1.9.2 -> >=dev-java/joda-convert-2.2.2:0 - -CP_DEPEND="dev-java/joda-convert:0" - -DEPEND=">=virtual/jdk-1.8:* - ${CP_DEPEND}" - -RDEPEND=">=virtual/jre-1.8:* - ${CP_DEPEND}" - -PATCHES=( - # Enable tests for jdk-11 in - # src/test/java/org/joda/time/TestDateTimeZone.java - "${FILESDIR}/joda-time-2.11.0-test.patch" -) - -DOCS=( NOTICE.txt README.md RELEASE-NOTES.txt ) - -S="${WORKDIR}/${P}" - -JAVA_AUTOMATIC_MODULE_NAME="org.joda.time" -JAVA_RESOURCE_DIRS="src/main/res" -JAVA_SRC_DIR="src/main/java" - -JAVA_TEST_GENTOO_CLASSPATH="junit" -JAVA_TEST_RESOURCE_DIRS="src/test/resources" -JAVA_TEST_RUN_ONLY="org.joda.time.TestAllPackages" -JAVA_TEST_SRC_DIR="src/test/java" - -src_prepare() { - default - # move .properties files to JAVA_RESOURCE_DIRS - mkdir -p src/main/res - cp -r src/main/{java/*,res} || die - find src/main/res -type f ! -name '*.properties' -exec rm -rf {} + || die -} - -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 - edo "$(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 -} - -src_test() { - # There are test failures in - # src/test/java/org/joda/time/TestDateTimeZone.java - # with jdk higher than 11 - local vm_version="$(java-config -g PROVIDES_VERSION)" - if ver_test "${vm_version}" -le 11 ; then - java-pkg-simple_src_test - else - einfo "Tests restricted to <=jdk-11" - fi -}
