[gentoo-commits] repo/gentoo:master commit in: dev-libs/icu/files/, dev-libs/icu/

["Andreas Sturmlechner" <asturm@gentoo.org>]

commit:     717a5d9246a1b33796e21dbf42c0520c54deb837
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Sep  3 17:51:32 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Sep  4 13:28:41 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=717a5d92

dev-libs/icu: drop 73.1-r2

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 dev-libs/icu/Manifest                              |   2 -
 .../icu/files/icu-73.1-fix-UChar-api-deux.patch    |  82 -----------
 dev-libs/icu/icu-73.1-r2.ebuild                    | 163 ---------------------
 3 files changed, 247 deletions(-)

diff --git a/dev-libs/icu/Manifest b/dev-libs/icu/Manifest
index 1bd85246f8dd..d312969b2e95 100644
--- a/dev-libs/icu/Manifest
+++ b/dev-libs/icu/Manifest
@@ -1,4 +1,2 @@
-DIST icu4c-73_1-src.tgz 26512935 BLAKE2B 45de117efc4a49301c04a997963393967a70b8583abf1a9626331e275c5bc329cf2685de5c80b32f764c8ff2530b5594316d7119ce66503e5adba7842ca24424 SHA512 e788e372716eecebc39b56bbc88f3a458e21c3ef20631c2a3d7ef05794a678fe8dad482a03a40fdb9717109a613978c7146682e98ee16fade5668d641d5c48f8
-DIST icu4c-73_1-src.tgz.asc 833 BLAKE2B 2c0a02a109280c7994f3c9404473119105ccbe051633dd8dc89c14ff65612d7a18deccff2a525752808f26f34d7c192f9346a8c3a0d34af9aa2110744d9f863d SHA512 b7042b0e39e1ebfcef8573d3000088b32a740106c7cfd4c18ebd52e7fd22e64e07b174d766373b1722520369e937fc56d439a0b290a3efeee287b2740388c3d3
 DIST icu4c-73_2-src.tgz 26519906 BLAKE2B 3f7dec9d527939d6d594c92844a400733e43af018bbc2f600edcb18299211a2f2285332188976d15e1ef672191416abac0b95a9d1a2ea6ababdaddf12708ccef SHA512 76dd782db6205833f289d7eb68b60860dddfa3f614f0ba03fe7ec13117077f82109f0dc1becabcdf4c8a9c628b94478ab0a46134bdb06f4302be55f74027ce62
 DIST icu4c-73_2-src.tgz.asc 659 BLAKE2B 83e082ba15ba7aeb366b6d97da15d076c200f9051e55bf00ba13265a3d87aade5a5b18c98a0c903d5015821c63e4b340ffbcc7940a654d169ad1948d6594ce63 SHA512 7598b8cc498ada8ca904b13f7aba27abd3f8f3013a0677d7ffab42d5413df9d2f0526107559301abc4049123b2e6d4d4f4cc589cbd943959d97b595dd57ea63c

diff --git a/dev-libs/icu/files/icu-73.1-fix-UChar-api-deux.patch b/dev-libs/icu/files/icu-73.1-fix-UChar-api-deux.patch
deleted file mode 100644
index ea943873a82b..000000000000
--- a/dev-libs/icu/files/icu-73.1-fix-UChar-api-deux.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-https://bugs.gentoo.org/904381
-https://unicode-org.atlassian.net/browse/ICU-22356
-https://github.com/unicode-org/icu/pull/2431 (what we originally applied)
-https://github.com/unicode-org/icu/pull/2432 (this commit)
-https://github.com/unicode-org/icu/commit/4fd9d6ce9a951e66e727b296138f22cd05479de1
-
-From 4fd9d6ce9a951e66e727b296138f22cd05479de1 Mon Sep 17 00:00:00 2001
-From: Fredrik Roubert <roubert@google.com>
-Date: Tue, 18 Apr 2023 23:39:28 +0200
-Subject: [PATCH] ICU-22356 Use ConstChar16Ptr to safely cast from UChar* to
- char16_t*.
-
-This is necessary for this header file to be usable by clients that
-define UCHAR_TYPE as a type not compatible with char16_t, eg. uint16_t.
---- a/common/unicode/ures.h
-+++ b/common/unicode/ures.h
-@@ -25,6 +25,7 @@
- #ifndef URES_H
- #define URES_H
- 
-+#include "unicode/char16ptr.h"
- #include "unicode/utypes.h"
- #include "unicode/uloc.h"
- 
-@@ -812,7 +813,7 @@ inline UnicodeString
- ures_getUnicodeString(const UResourceBundle *resB, UErrorCode* status) {
-     UnicodeString result;
-     int32_t len = 0;
--    const char16_t *r = ures_getString(resB, &len, status);
-+    const char16_t *r = ConstChar16Ptr(ures_getString(resB, &len, status));
-     if(U_SUCCESS(*status)) {
-         result.setTo(true, r, len);
-     } else {
-@@ -837,7 +838,7 @@ inline UnicodeString
- ures_getNextUnicodeString(UResourceBundle *resB, const char ** key, UErrorCode* status) {
-     UnicodeString result;
-     int32_t len = 0;
--    const char16_t* r = ures_getNextString(resB, &len, key, status);
-+    const char16_t* r = ConstChar16Ptr(ures_getNextString(resB, &len, key, status));
-     if(U_SUCCESS(*status)) {
-         result.setTo(true, r, len);
-     } else {
-@@ -859,7 +860,7 @@ inline UnicodeString
- ures_getUnicodeStringByIndex(const UResourceBundle *resB, int32_t indexS, UErrorCode* status) {
-     UnicodeString result;
-     int32_t len = 0;
--    const char16_t* r = ures_getStringByIndex(resB, indexS, &len, status);
-+    const char16_t* r = ConstChar16Ptr(ures_getStringByIndex(resB, indexS, &len, status));
-     if(U_SUCCESS(*status)) {
-         result.setTo(true, r, len);
-     } else {
-@@ -882,7 +883,7 @@ inline UnicodeString
- ures_getUnicodeStringByKey(const UResourceBundle *resB, const char* key, UErrorCode* status) {
-     UnicodeString result;
-     int32_t len = 0;
--    const char16_t* r = ures_getStringByKey(resB, key, &len, status);
-+    const char16_t* r = ConstChar16Ptr(ures_getStringByKey(resB, key, &len, status));
-     if(U_SUCCESS(*status)) {
-         result.setTo(true, r, len);
-     } else {
---- a/test/intltest/Makefile.in
-+++ b/test/intltest/Makefile.in
-@@ -70,7 +70,7 @@ numbertest_parse.o numbertest_doubleconversion.o numbertest_skeletons.o \
- static_unisets_test.o numfmtdatadriventest.o numbertest_range.o erarulestest.o \
- formattedvaluetest.o formatted_string_builder_test.o numbertest_permutation.o \
- units_data_test.o units_router_test.o units_test.o displayoptions_test.o \
--numbertest_simple.o
-+numbertest_simple.o uchar_type_build_test.o
- 
- DEPS = $(OBJECTS:.o=.d)
- 
---- /dev/null
-+++ b/test/intltest/uchar_type_build_test.cpp
-@@ -0,0 +1,7 @@
-+// © 2023 and later: Unicode, Inc. and others.
-+// License & terms of use: http://www.unicode.org/copyright.html#License
-+
-+// ICU-22356 Test that client code can be built with UCHAR_TYPE redefined.
-+#undef UCHAR_TYPE
-+#define UCHAR_TYPE uint16_t
-+#include "unicode/ures.h"
-

diff --git a/dev-libs/icu/icu-73.1-r2.ebuild b/dev-libs/icu/icu-73.1-r2.ebuild
deleted file mode 100644
index d29e3a24d933..000000000000
--- a/dev-libs/icu/icu-73.1-r2.ebuild
+++ /dev/null
@@ -1,163 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Please bump with dev-libs/icu-layoutex
-
-PYTHON_COMPAT=( python3_{10..11} )
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/icu.asc
-inherit autotools flag-o-matic multilib-minimal python-any-r1 toolchain-funcs verify-sig
-
-MY_PV=${PV/_rc/-rc}
-MY_PV=${MY_PV//./_}
-
-DESCRIPTION="International Components for Unicode"
-HOMEPAGE="https://icu.unicode.org/"
-SRC_URI="https://github.com/unicode-org/icu/releases/download/release-${MY_PV/_/-}/icu4c-${MY_PV/-rc/rc}-src.tgz"
-SRC_URI+=" verify-sig? ( https://github.com/unicode-org/icu/releases/download/release-${MY_PV/_/-}/icu4c-${MY_PV/-rc/rc}-src.tgz.asc )"
-S="${WORKDIR}"/${PN}/source
-
-# Keyword with boost-1.82
-if [[ ${PV} != *_rc* ]] ; then
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-fi
-LICENSE="BSD"
-SLOT="0/${PV}"
-IUSE="debug doc examples static-libs test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	${PYTHON_DEPS}
-	sys-devel/autoconf-archive
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen[dot] )
-	verify-sig? ( >=sec-keys/openpgp-keys-icu-20221020 )
-"
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/icu-config
-)
-
-PATCHES=(
-	"${FILESDIR}/${PN}-65.1-remove-bashisms.patch"
-	"${FILESDIR}/${PN}-64.2-darwin.patch"
-	"${FILESDIR}/${PN}-68.1-nonunicode.patch"
-	"${FILESDIR}/${PN}-73.1-fix-UChar-api-deux.patch"
-)
-
-src_prepare() {
-	default
-
-	# Disable renaming as it assumes stable ABI and that consumers
-	# won't use unofficial APIs. We need this despite the configure argument.
-	sed -i \
-		-e "s/#define U_DISABLE_RENAMING 0/#define U_DISABLE_RENAMING 1/" \
-		common/unicode/uconfig.h || die
-
-	# Fix linking of icudata
-	sed -i \
-		-e "s:LDFLAGSICUDT=-nodefaultlibs -nostdlib:LDFLAGSICUDT=:" \
-		config/mh-linux || die
-
-	# Append doxygen configuration to configure
-	sed -i \
-		-e 's:icudefs.mk:icudefs.mk Doxyfile:' \
-		configure.ac || die
-
-	eautoreconf
-}
-
-src_configure() {
-	MAKEOPTS+=" VERBOSE=1"
-
-	# ICU tries to append -std=c++11 without this, so as of 71.1,
-	# despite GCC 9+ using c++14 (or gnu++14) and GCC 11+ using gnu++17,
-	# we still need this.
-	append-cxxflags -std=c++14
-
-	if tc-is-cross-compiler; then
-		mkdir "${WORKDIR}"/host || die
-		pushd "${WORKDIR}"/host >/dev/null || die
-
-		CFLAGS="" CXXFLAGS="" ASFLAGS="" LDFLAGS="" \
-		CC="$(tc-getBUILD_CC)" CXX="$(tc-getBUILD_CXX)" AR="$(tc-getBUILD_AR)" \
-		RANLIB="$(tc-getBUILD_RANLIB)" LD="$(tc-getBUILD_LD)" \
-		"${S}"/configure --disable-renaming --disable-debug \
-			--disable-samples --enable-static || die
-		emake
-
-		popd >/dev/null || die
-	fi
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--disable-renaming
-		--disable-samples
-		--disable-layoutex
-		$(use_enable debug)
-		$(use_enable static-libs static)
-		$(use_enable test tests)
-		$(multilib_native_use_enable examples samples)
-	)
-
-	tc-is-cross-compiler && myeconfargs+=(
-		--with-cross-build="${WORKDIR}"/host
-	)
-
-	# Work around cross-endian testing failures with LTO #757681
-	if tc-is-cross-compiler && is-flagq '-flto*' ; then
-		myeconfargs+=( --disable-strict )
-	fi
-
-	# ICU tries to use clang by default
-	tc-export CC CXX
-
-	# Make sure we configure with the same shell as we run icu-config
-	# with, or ECHO_N, ECHO_T and ECHO_C will be wrongly defined
-	export CONFIG_SHELL="${EPREFIX}/bin/sh"
-	# Probably have no /bin/sh in prefix-chain
-	[[ -x ${CONFIG_SHELL} ]] || CONFIG_SHELL="${BASH}"
-
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_compile() {
-	default
-
-	if multilib_is_native_abi && use doc; then
-		doxygen -u Doxyfile || die
-		doxygen Doxyfile || die
-	fi
-}
-
-multilib_src_test() {
-	# INTLTEST_OPTS: intltest options
-	#   -e: Exhaustive testing
-	#   -l: Reporting of memory leaks
-	#   -v: Increased verbosity
-	# IOTEST_OPTS: iotest options
-	#   -e: Exhaustive testing
-	#   -v: Increased verbosity
-	# CINTLTST_OPTS: cintltst options
-	#   -e: Exhaustive testing
-	#   -v: Increased verbosity
-	emake -j1 check
-}
-
-multilib_src_install() {
-	default
-
-	if multilib_is_native_abi && use doc; then
-		docinto html
-		dodoc -r doc/html/*
-	fi
-}
-
-multilib_src_install_all() {
-	local HTML_DOCS=( ../readme.html )
-	einstalldocs
-}