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 EBFEC158020 for ; Thu, 24 Nov 2022 07:19:36 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2DB72E08FB; Thu, 24 Nov 2022 07:19:36 +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) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 13344E08FB for ; Thu, 24 Nov 2022 07:19:36 +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) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3A390340F8E for ; Thu, 24 Nov 2022 07:19:35 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6E22C692 for ; Thu, 24 Nov 2022 07:19:33 +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: <1669274369.13df81c219bb4305227bc2d242c8322f93ba5c38.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-71.1.ebuild X-VCS-Directories: dev-java/icu4j/ X-VCS-Committer: fordfrog X-VCS-Committer-Name: Miroslav Šulc X-VCS-Revision: 13df81c219bb4305227bc2d242c8322f93ba5c38 X-VCS-Branch: master Date: Thu, 24 Nov 2022 07:19:33 +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: 065d1ce8-aed4-4365-83e1-09955c2c95f7 X-Archives-Hash: 6b44cee77db02c79b4101ff7f5edc94f commit: 13df81c219bb4305227bc2d242c8322f93ba5c38 Author: Volkmar W. Pogatzki pogatzki net> AuthorDate: Wed Nov 23 14:33:41 2022 +0000 Commit: Miroslav Šulc gentoo org> CommitDate: Thu Nov 24 07:19:29 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13df81c2 dev-java/icu4j: drop 71.1 Closes: https://bugs.gentoo.org/827212 Signed-off-by: Volkmar W. Pogatzki pogatzki.net> Signed-off-by: Miroslav Šulc gentoo.org> dev-java/icu4j/Manifest | 1 - dev-java/icu4j/icu4j-71.1.ebuild | 203 --------------------------------------- 2 files changed, 204 deletions(-) diff --git a/dev-java/icu4j/Manifest b/dev-java/icu4j/Manifest index 92b640160d2f..764b0abe0d37 100644 --- a/dev-java/icu4j/Manifest +++ b/dev-java/icu4j/Manifest @@ -1,2 +1 @@ DIST icu-72.1.tar.gz 67092974 BLAKE2B 2261c7969ddbfdb4e75e405646cc9f29b1f8dd21f98641b9318457d3cd27694833a9181f4888d2cb243ba65191fe9216a508684c1dbd5a85f36e06ae8fac7d9e SHA512 fee1278f16528867da63d95feee6864a1f62befa9cc0b006439e1b47cf6f3f0e6581692432129e465208b5bd7fcc44e1175f124e83157547b3d9a78f3a4944ab -DIST icu4j-71.1.tar.gz 66177851 BLAKE2B 39c5f6e1a8adc6ee913a7a41dcbf733c1f50e6de3047c0c548bf39426102fccef1a03dd7cb4020bd56b32d0c565848f11cc5ce3f738519dd7d2820a670c40443 SHA512 cc9ccb3208d8079c4f8169713aa0ebb930e86cf6c72510a3b7de5824e6482f26166a2e530abaaecfb8338764b23ac215b2921a821167b41d6a3f23952e2718e6 diff --git a/dev-java/icu4j/icu4j-71.1.ebuild b/dev-java/icu4j/icu4j-71.1.ebuild deleted file mode 100644 index 1b928fc77942..000000000000 --- a/dev-java/icu4j/icu4j-71.1.ebuild +++ /dev/null @@ -1,203 +0,0 @@ -# Copyright 1999-2022 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/unicode-org/icu/archive/refs/tags/release-70-1.tar.gz --slot 70 --keywords "~amd64 ~arm64 ~ppc64 ~x86" --ebuild icu4j-70.1.ebuild - -EAPI=8 - -JAVA_PKG_IUSE="doc source test" -MAVEN_ID="com.ibm.icu:icu4j:71.1" -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/refs/tags/release-${PV/./-}.tar.gz -> ${P}.tar.gz" - -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:*" - -S="${WORKDIR}/icu-release-${PV/./-}/icu4j/main" - -HTML_DOCS=( ../{APIChangeReport,license,readme}.html ) - -JAVA_GENTOO_CLASSPATH_EXTRA="icu4j.jar:icu4j-charset.jar:icu4j-localespi.jar:testdata.jar:framework.jar" -JAVA_TEST_GENTOO_CLASSPATH="junit-4,junitparams" -JAVA_TEST_EXTRA_ARGS="-Djava.locale.providers=CLDR,COMPAT,SPI" - -JAVA_TEST_SRC_DIR=( - tests/charset/src - tests/collate/src - tests/core/src -# tests/framework/src # we compile it in src_compile - tests/localespi/src - tests/packaging/src - tests/translit/src -) - -JAVA_TEST_RESOURCE_DIRS=( - tests/charset/resources - tests/collate/resources - tests/core/resources -# tests/framework/resources - tests/localespi/resources - tests/packaging/resources - tests/translit/resources -) - -JAVA_TEST_EXCLUDES=( - "com.ibm.icu.dev.data.TestDataElements_testtypes" # Invalid test class 1. No runnable methods - "com.ibm.icu.dev.data.resources.TestDataElements_en_Latn_US" # Invalid test class 1. No runnable methods - "com.ibm.icu.dev.data.resources.TestDataElements_en_US" # Invalid test class 1. No runnable methods - "com.ibm.icu.dev.data.resources.TestDataElements_fr_Latn_FR" # Invalid test class 1. No runnable methods - "com.ibm.icu.dev.data.resources.TestDataElements_te" # Invalid test class 1. No runnable methods - "com.ibm.icu.dev.data.resources.TestMessages" # Invalid test class 1. No runnable methods - "com.ibm.icu.dev.test.translit.TestUtility" # Invalid test class 1. No runnable methods - "com.ibm.icu.dev.test.localespi.TestUtil" # Invalid test class 1. No runnable methods - "com.ibm.icu.dev.test.stringprep.TestData" # Invalid test class 1. No runnable methods - "com.ibm.icu.dev.test.calendar.ChineseTestCase" # Invalid test class 1. Test class should have exactly one public zero-argument constructor - "com.ibm.icu.dev.test.calendar.TestCase" # java.lang.IllegalArgumentException: Test class can only have one constructor - "com.ibm.icu.dev.test.bidi.TestData" # Invalid test class 1. Test class should have exactly one public constructor - # following kills 98 tests and and avoids 9 test failures - # coverage tests fail because test handlers for the parametrized tests are not defined so the tests are broken and cannot succeed - "com.ibm.icu.dev.test.serializable.CoverageTest" -) - -src_prepare() { - default - - # create the resources directories - mkdir resources || die - cp -r classes/* resources || die - - # remove .java files from resources - find resources -type f -name '*.java' -exec rm -rf {} + || die "deleting classes failed" - - # this should not go in the jar files - mv shared/licenses/license.html .. || die - - # icudata and icutzdata for "icu4j.jar" - pushd resources/core/src || die - 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 - - # this test class was failing with "No runnable methods" - # 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 - - # testdata.jar needs to be on classpath - cp shared/data/testdata.jar . || die - - # clone tests src - for i in charset collate core framework localespi packaging translit; do \ - cp -r tests/$i/{src,resources} ; \ - done || die "copying tests from src to resources failed" - cp -r ../tools/misc/{src,resources} || die - - # separate tests resources from tests src - find tests/*/resources -type f -name '*.java' -exec rm -rf {} + || die - find ../tools/misc/resources -type f -name '*.java' -exec rm -rf {} + || die - - # 874576 - rm resources/core/src/META-INF/MANIFEST.MF || die -} - -src_compile() { - # "icu4j.jar" - JAVA_SRC_DIR=( - classes/collate/src - classes/core/src - classes/currdata/src - classes/langdata/src - classes/regiondata/src - classes/translit/src - ) - JAVA_RESOURCE_DIRS=( - resources/collate/src - resources/core/src - resources/currdata/src - resources/langdata/src - resources/regiondata/src - resources/translit/src - shared/licenses - ) - JAVA_JAR_FILENAME="icu4j.jar" - JAVA_MAIN_CLASS="com.ibm.icu.util.VersionInfo" - java-pkg-simple_src_compile - rm -r target || die - - # "icu4j-charset.jar" - JAVA_SRC_DIR=( classes/charset/src ) - JAVA_RESOURCE_DIRS=( resources/charset/src shared/licenses ) - JAVA_JAR_FILENAME="icu4j-charset.jar" - JAVA_MAIN_CLASS="" - java-pkg-simple_src_compile - rm -r target || die - - # "icu4j-localespi.jar" - JAVA_SRC_DIR=( classes/localespi/src ) - JAVA_RESOURCE_DIRS=( resources/localespi/src shared/licenses ) - JAVA_JAR_FILENAME="icu4j-localespi.jar" - java-pkg-simple_src_compile - rm -r target || die - - # main/test/framework - # needed for compilicg the tests - # but "No runnable methods" ("Invalid test class") - if use test; then - JAVA_SRC_DIR=( tests/framework/src ../tools/misc/src ) - JAVA_RESOURCE_DIRS=( tests/framework/resources ../tools/misc/resources ) - JAVA_JAR_FILENAME="framework.jar" - java-pkg-simple_src_compile - rm -fr target || die - fi - - # javadocs - if use doc; then - JAVA_SRC_DIR=( classes ) - JAVA_JAR_FILENAME="ignoreme.jar" - java-pkg-simple_src_compile - fi -} - -src_test () { - # https://bugs.gentoo.org/827212 - 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 -}