From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 9559015803E for ; Sat, 6 Jan 2024 21:52:21 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 910D02BC02D; Sat, 6 Jan 2024 21:52:18 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 762612BC02D for ; Sat, 6 Jan 2024 21:52:18 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 906B33431AF for ; Sat, 6 Jan 2024 21:52:17 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B321614B5 for ; Sat, 6 Jan 2024 21:52:14 +0000 (UTC) From: "Miroslav Šulc" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Miroslav Šulc" Message-ID: <1704577920.d43b96a01ae08b5b98930b0b662fea94f36e4e06.fordfrog@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-java/icu4j/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-java/icu4j/Manifest dev-java/icu4j/icu4j-73.2.ebuild X-VCS-Directories: dev-java/icu4j/ X-VCS-Committer: fordfrog X-VCS-Committer-Name: Miroslav Šulc X-VCS-Revision: d43b96a01ae08b5b98930b0b662fea94f36e4e06 X-VCS-Branch: master Date: Sat, 6 Jan 2024 21:52:14 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 241583d0-909c-4ea5-af55-dd8d90c41016 X-Archives-Hash: 770305c133179f89cc1bd819576dbbd4 commit: d43b96a01ae08b5b98930b0b662fea94f36e4e06 Author: Volkmar W. Pogatzki pogatzki net> AuthorDate: Sat Jan 6 19:56:34 2024 +0000 Commit: Miroslav Šulc gentoo org> CommitDate: Sat Jan 6 21:52:00 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d43b96a0 dev-java/icu4j: drop 73.2 Signed-off-by: Volkmar W. Pogatzki pogatzki.net> Signed-off-by: Miroslav Šulc gentoo.org> dev-java/icu4j/Manifest | 1 - dev-java/icu4j/icu4j-73.2.ebuild | 240 --------------------------------------- 2 files changed, 241 deletions(-) diff --git a/dev-java/icu4j/Manifest b/dev-java/icu4j/Manifest index 3496bfaee538..6ce8293f6e85 100644 --- a/dev-java/icu4j/Manifest +++ b/dev-java/icu4j/Manifest @@ -1,3 +1,2 @@ -DIST icu-73.2.tar.gz 81522943 BLAKE2B 006d7ccab04385f0aa60e2e60b616be9598f448f27d9b0f6dba554874bfe1dd442ba0719a7677ba8aba7e4e0f05e5e50dca74855a900da1f496aad0cd54c3cdc SHA512 f234fb9c76af62dad59e159ef7f7792aca563d88f2988d3d1ecc8be6250837beb9a530ec121e0949f6925ee8e5171a0d04fa41a0c50d9993c4061fa55be6836e DIST icu-74.1.tar.gz 65889935 BLAKE2B e9dc354a795b69cf22152db437027f099e65b02f352e3ec9f0203b465b4f01a7844229ed5a7954e9b7f7f55f0d2d93a8e1f984c70de47555c230ec8b42cb7949 SHA512 eec8858cb37200fffce9bc60a8bd0c56d7024d9e2574d030c7e726aa4b2a105b1362548c0be163c720048bd7a7bfe9374b3c5954ba14e2e34beab346a8af8df4 DIST icu-74.2.tar.gz 65888936 BLAKE2B 81d5acddbfc58a859906cb61660b6f230b88f4a1b1cfd56838843e9445b5858d3dd4888707026340581322143f6a4b7b81f53b6431fd5d4cc3fb90531c4d82fb SHA512 728ae0f09ffc802d675bcf5b849e3081472de8417736bf8b7df0f4db9d1fb8073779be76536764c9111f7cb0e5ab2d2af6c644cc24be432b9eeae9063802ad6c diff --git a/dev-java/icu4j/icu4j-73.2.ebuild b/dev-java/icu4j/icu4j-73.2.ebuild deleted file mode 100644 index bb57ea2829c9..000000000000 --- a/dev-java/icu4j/icu4j-73.2.ebuild +++ /dev/null @@ -1,240 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -JAVA_PKG_IUSE="doc source test" -MAVEN_ID="com.ibm.icu:icu4j:${PV}" -JAVA_TESTING_FRAMEWORKS="junit-4" - -inherit java-pkg-2 java-pkg-simple - -DESCRIPTION="A set of Java libraries providing Unicode and Globalization support" -HOMEPAGE="https://icu.unicode.org" -SRC_URI="https://github.com/unicode-org/icu/archive/release-${PV/./-}.tar.gz -> icu-${PV}.tar.gz" -S="${WORKDIR}/icu-release-${PV/./-}/icu4j/main" - -LICENSE="icu" -SLOT="70" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" - -DEPEND=">=virtual/jdk-1.8:* - test? ( dev-java/junitparams:0 )" - -RDEPEND=">=virtual/jre-1.8:*" - -HTML_DOCS=( ../{APIChangeReport,readme}.html ) - -JAVA_TEST_EXCLUDES=( - # Invalid tests, not run by maven - "com.ibm.icu.dev.data.TestDataElements_testtypes" - "com.ibm.icu.dev.data.resources.TestDataElements_en_Latn_US" - "com.ibm.icu.dev.data.resources.TestDataElements_en_US" - "com.ibm.icu.dev.data.resources.TestDataElements_fr_Latn_FR" - "com.ibm.icu.dev.data.resources.TestDataElements_te" - "com.ibm.icu.dev.data.resources.TestMessages" - "com.ibm.icu.dev.test.ModuleTest" - "com.ibm.icu.dev.test.TestBoilerplate" - "com.ibm.icu.dev.test.TestDataModule" - "com.ibm.icu.dev.test.bidi.TestData" - "com.ibm.icu.dev.test.calendar.ChineseTestCase" - "com.ibm.icu.dev.test.calendar.TestCase" - "com.ibm.icu.dev.test.format.ExhaustivePersonNameFormatterTest" - "com.ibm.icu.dev.test.localespi.TestUtil" - "com.ibm.icu.dev.test.message2.TestCase" - "com.ibm.icu.dev.test.stringprep.TestData" - "com.ibm.icu.dev.test.translit.TestUtility" - # Maven: [INFO] Tests run: 364, Failures: 0, Errors: 0, Skipped: 0 - "com.ibm.icu.dev.test.serializable.CompatibilityTest" # Tests run: 364, Failures: 4 - # Maven: [INFO] Tests run: 90, Failures: 0, Errors: 0, Skipped: 0 - "com.ibm.icu.dev.test.serializable.CoverageTest" # Tests run: 99, Failures: 9 - # Following tests need to run separately: - com.ibm.icu.dev.test.calendar.CalendarRegressionTest - com.ibm.icu.dev.test.calendar.CompatibilityTest - com.ibm.icu.dev.test.calendar.DataDrivenCalendarTest - com.ibm.icu.dev.test.calendar.HolidayTest - com.ibm.icu.dev.test.calendar.IndianTest - com.ibm.icu.dev.test.calendar.IslamicTest - com.ibm.icu.dev.test.calendar.JapaneseTest - com.ibm.icu.dev.test.format.DataDrivenFormatTest - com.ibm.icu.dev.test.format.DateFormatRegressionTest - com.ibm.icu.dev.test.format.DateFormatRoundTripTest - com.ibm.icu.dev.test.format.DateIntervalFormatTest - com.ibm.icu.dev.test.format.DateTimeGeneratorTest - com.ibm.icu.dev.test.format.TestMessageFormat - com.ibm.icu.dev.test.message2.MessageFormat2Test - com.ibm.icu.dev.test.message2.Mf2FeaturesTest - com.ibm.icu.dev.test.message2.Mf2IcuTest - com.ibm.icu.dev.test.timezone.TimeZoneBoundaryTest - com.ibm.icu.dev.test.util.CurrencyTest -) -JAVA_TEST_EXTRA_ARGS="-Djava.locale.providers=CLDR,COMPAT,SPI" -JAVA_TEST_GENTOO_CLASSPATH="junit-4,junitparams" -JAVA_TEST_RESOURCE_DIRS=( - tests/res/collate/src - tests/res/core/src - tests/res/translit/src -) -JAVA_TEST_SRC_DIR=( - tests/charset/src - tests/collate/src - tests/core/src - tests/localespi/src - tests/packaging/src - tests/translit/src -) - -src_prepare() { - java-pkg_clean ! -path "./shared/data/*" # keep icudata.jar, icutzdata.jar, testdata.jar - java-pkg-2_src_prepare - - # java-pkg-simple.eclass wants resources in JAVA_RESOURCE_DIRS - mkdir -p resources || die - - pushd classes > /dev/null || die - find -type f \ - ! -name '*.java' \ - ! -name 'license.html' \ - | xargs cp --parent -t ../resources || die - popd > /dev/null || die - - pushd resources/core/src > /dev/null || die - # icudata and icutzdata for "icu4j.jar" - jar -xf "${S}"/shared/data/icudata.jar || die - jar -xf "${S}"/shared/data/icutzdata.jar || die - # move these resources to "icu4j-charset.jar" - mkdir -p "${S}"/resources/charset/src/com/ibm/icu/impl/data/icudt"$(ver_cut 1)"b || die - mv com/ibm/icu/impl/data/icudt"$(ver_cut 1)"b/{*.cnv,cnvalias.icu} \ - "${S}"/resources/charset/src/com/ibm/icu/impl/data/icudt"$(ver_cut 1)"b || die - - # create 9 files com/ibm/icu/impl/data/icudt69b/*/fullLocaleNames.lst - for dir in $(find com/ibm/icu/impl/data/icudt"$(ver_cut 1)"b/ -type d ! -name 'unit' -exec echo {} +); do - ls -1 $dir/*.res | sed -e 's%.*\/%%' -e 's%\..*$%%' -e '/pool/d' -e '/res_index/d' -e '/tzdbNames/d'\ - > $dir/'fullLocaleNames.lst'; - done || die "fullLocaleNames.lst failed" - popd > /dev/null || die - - if use test; then - # initializationError(com.ibm.icu.dev.data.resources.TestDataElements) - # but test_excluding it would kill tousands of other tests. - mkdir -p tests/framework/src/com/ibm/icu/dev/data/resources || die - mv tests/{core,framework}/src/com/ibm/icu/dev/data/resources/TestDataElements.java || die - - # Separate tests resources - mkdir tests/res || die - pushd tests > /dev/null || die - find -type f \ - ! -name '*.java' \ - | xargs cp --parent -t res || die - popd > /dev/null || die - - cp -r ../tools/misc/{src,resources} || die - find ../tools/misc/resources -type f -name '*.java' -exec rm -rf {} + || die - fi -} - -src_compile() { - einfo "Compiling icu4j.jar" - JAVA_AUTOMATIC_MODULE_NAME="com.ibm.icu" - JAVA_JAR_FILENAME="icu4j.jar" - JAVA_MAIN_CLASS="com.ibm.icu.util.VersionInfo" - JAVA_RESOURCE_DIRS="resources/core/src" - JAVA_SRC_DIR=( - classes/collate/src - classes/core/src - classes/currdata/src - classes/langdata/src - classes/regiondata/src - classes/translit/src - ) - java-pkg-simple_src_compile - JAVA_GENTOO_CLASSPATH_EXTRA+=":icu4j.jar" - rm -r target || die - - einfo "Compiling icu4j-charset.jar" - JAVA_AUTOMATIC_MODULE_NAME="com.ibm.icu.charset" - JAVA_JAR_FILENAME="icu4j-charset.jar" - JAVA_MAIN_CLASS="" - JAVA_RESOURCE_DIRS="resources/charset/src" - JAVA_SRC_DIR=( classes/charset/src ) - java-pkg-simple_src_compile - JAVA_GENTOO_CLASSPATH_EXTRA+=":icu4j-charset.jar" - rm -r target || die - - einfo "Compiling icu4j-localespi.jar" - JAVA_AUTOMATIC_MODULE_NAME="com.ibm.icu.localespi" - JAVA_JAR_FILENAME="icu4j-localespi.jar" - JAVA_RESOURCE_DIRS="resources/localespi/src" - JAVA_SRC_DIR=( classes/localespi/src ) - java-pkg-simple_src_compile - JAVA_GENTOO_CLASSPATH_EXTRA+=":icu4j-localespi.jar" - rm -r target || die - - # main/test/framework - # needed for compilicg the tests - # but "No runnable methods" ("Invalid test class") - if use test; then - JAVA_JAR_FILENAME="framework.jar" - JAVA_RESOURCE_DIRS=( tests/res/framework/src ../tools/misc/resources ) - JAVA_SRC_DIR=( tests/framework/src ../tools/misc/src ) - java-pkg-simple_src_compile - rm -fr target || die - fi - - # javadocs - if use doc; then - JAVA_JAR_FILENAME="ignoreme.jar" - JAVA_SRC_DIR=( classes ) - java-pkg-simple_src_compile - fi -} - -src_test () { - # TZ needed for some tests in com/ibm/icu/dev/test/format/DateFormatTest - export LC_ALL="en_US.UTF-8" TZ="US/Pacific" - JAVA_GENTOO_CLASSPATH_EXTRA+=":framework.jar:shared/data/testdata.jar" - - JAVA_TEST_RUN_ONLY=( - com.ibm.icu.dev.test.rbbi.AbstractBreakIteratorTests - com.ibm.icu.dev.test.calendar.CalendarRegressionTest - com.ibm.icu.dev.test.calendar.CompatibilityTest - com.ibm.icu.dev.test.calendar.DataDrivenCalendarTest - com.ibm.icu.dev.test.calendar.HolidayTest - com.ibm.icu.dev.test.calendar.IndianTest - com.ibm.icu.dev.test.calendar.IslamicTest - com.ibm.icu.dev.test.calendar.JapaneseTest - com.ibm.icu.dev.test.format.DataDrivenFormatTest - com.ibm.icu.dev.test.format.DateFormatRegressionTest - com.ibm.icu.dev.test.format.DateFormatRoundTripTest - com.ibm.icu.dev.test.format.DateIntervalFormatTest - com.ibm.icu.dev.test.format.DateTimeGeneratorTest - com.ibm.icu.dev.test.format.TestMessageFormat - com.ibm.icu.dev.test.message2.MessageFormat2Test - com.ibm.icu.dev.test.message2.Mf2FeaturesTest - com.ibm.icu.dev.test.message2.Mf2IcuTest - com.ibm.icu.dev.test.timezone.TimeZoneBoundaryTest - com.ibm.icu.dev.test.util.CurrencyTest - ) - java-pkg-simple_src_test - - JAVA_TEST_RUN_ONLY=() - # ../maven-build/maven-icu4j-localespi/pom.xml#L133-L143 - local vm_version="$(java-config -g PROVIDES_VERSION)" - if [[ "${vm_version}" != "1.8" ]] ; then - java-pkg-simple_src_test - fi -} - -src_install() { - default - java-pkg_dojar "icu4j.jar" - java-pkg_dojar "icu4j-charset.jar" - java-pkg_dojar "icu4j-localespi.jar" - - if use doc; then - java-pkg_dojavadoc target/api - fi - if use source; then - java-pkg_dosrc "classes" - fi -}