gentoo resync : 29.12.2022

3 files changed, 5 insertions, 111 deletions

diff --git a/dev-libs/icu-layoutex/Manifest b/dev-libs/icu-layoutex/Manifest
index 69e2fa8fdf08..34a5a7491e04 100644
--- a/dev-libs/icu-layoutex/Manifest
+++ b/dev-libs/icu-layoutex/Manifest
@@ -1,7 +1,5 @@
 AUX icu-layoutex-65.1-remove-bashisms.patch 4963 BLAKE2B fb781741a7a908638876729d573a73e42b7b3f0f3e692b54799fed0dac006ecb731583d90d849ea06be47259a0a236933fa7a78a96b3a8107ee85f916dc2000a SHA512 67e60068c356ca8d93b137eadeef2562ff7d8f38153babc97edd92a2c38d7113396d63d4a09364dacefc612b4b3ea28872a4f767c4f38d3e725943b32f98c5bc
-DIST icu4c-70_1-src.tgz 25449582 BLAKE2B e229376ee45322db99aa963465048ab5e694ce9f0ba335f071817198238de21fcd77dfe3e86ea1394790e2a3b6d96772d1b98cb7dccd6462a9dd05c0ab7bdef0 SHA512 0b26ae7207155cb65a8fdb25f7b2fa4431e74b12bccbed0884a17feaae3c96833d12451064dd152197fd6ea5fd3adfd95594284a463e66c82e0d860f645880c9
 DIST icu4c-71_1-src.tgz 25701340 BLAKE2B 182972d87fe5b69b5e08c39ab9bb0ac7ffc7b36530168b3548faa051cce2b73b9f1c1d23198a4b1c655442155e369da76929e4f54fe4e32265160363428d4916 SHA512 1fd2a20aef48369d1f06e2bb74584877b8ad0eb529320b976264ec2db87420bae242715795f372dbc513ea80047bc49077a064e78205cd5e8b33d746fd2a2912
 DIST icu4c-71_1-src.tgz.asc 659 BLAKE2B ac281e0a9b94bf6bfddee2dd5dc7553836aa50ae84f55478a662d0cd1e116a944de92dd5fd701164d62fb5b8e8effcdb3456a151a6b198d603e2324ccd76e334 SHA512 3371e14f3959defa7fb8d3eb0308084646ed553169b7a845bff89f9a8c1054ef5bee45c26c1834a84cab38fa87710f1585e6c5787be1fe2df356eb5c2ba20aae
-EBUILD icu-layoutex-70.1.ebuild 2505 BLAKE2B 3197805d41f024b6cf3aadba1db8b305f6d45af609305f8af4f9fc24154ccc651299b571e37e83f5dbfc4f86cf315443b972139ed87b54856a9af128d7b8830f SHA512 57c95d2a5e2a4b1c5876d5b4becfde3a27ce519a4a6e81db38ea10e8e4423cb4a2b335b153ddd031253713f455b5e09faf6c656ec5ecddc2dcf89a055b961487
-EBUILD icu-layoutex-71.1.ebuild 3444 BLAKE2B 0cca2c97c0dae9b172ebefb2cdb2f0db91c7e8b43bac4a7482591c43313bfed47c7ffa04282f67c7bbdcb9e2e7d061a617ac55646d2904368e6e7d882a33b070 SHA512 be69692c69d6ca047affea7516173b9fe8a004bfe7356325594bdb62fa5d2f1cd0c15eab15fb35294db29c1391d5080d32a10099d3abae861b106e988b3f9fac
+EBUILD icu-layoutex-71.1.ebuild 3582 BLAKE2B 440d45060033cae1471af4cfec6f3443317e3b369fd7d4fbbf272b95c09ae68db809d422b00cf8a8f8f9c5826aa8d286c80d6d631ef68a27e83aee78b6cb7e50 SHA512 d9ec562af9007fa798a148a53c6bf6d5ba4dd8747be2ddaf7014c274c63074f2cd2cfc2966ee90e04a383b92845f056439810d30e2b5bb48c2fa3d4012ccca6c
 MISC metadata.xml 262 BLAKE2B 5f01484e6cd16c1234d97ca24813fe4b74cafdc61d6e3c1ae58ead74558909ef052e406aba4abd7440f8dc45ff6548aaf4a863f0eb46c23e1e389ba52e0c1353 SHA512 3d2f08eb53da96ec680d73c3fad400ac4c2081db37d104647fc53008abef2dd78fab180d6295f850469e0c5da2375b083577a9713ae7701c046eaa24c0115ca2
diff --git a/dev-libs/icu-layoutex/icu-layoutex-70.1.ebuild b/dev-libs/icu-layoutex/icu-layoutex-70.1.ebuild
deleted file mode 100644
index b4c96881ba12..000000000000
--- a/dev-libs/icu-layoutex/icu-layoutex-70.1.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools flag-o-matic multilib-minimal toolchain-funcs
-
-DESCRIPTION="External layout part of International Components for Unicode"
-HOMEPAGE="https://icu-project.org/"
-SRC_URI="https://github.com/unicode-org/icu/releases/download/release-${PV//./-}/icu4c-${PV//./_}-src.tgz"
-S="${WORKDIR}/${PN/-layoutex}/source"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
-IUSE="debug static-libs"
-
-DEPEND="
-	~dev-libs/icu-${PV}[${MULTILIB_USEDEP}]
-	dev-libs/icu-le-hb[${MULTILIB_USEDEP}]
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-PATCHES=( "${FILESDIR}/${PN}-65.1-remove-bashisms.patch" )
-
-src_prepare() {
-	# apply patches
-	default
-
-	# Disable renaming as it is stupid thing to do
-	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
-
-	eautoreconf
-}
-
-src_configure() {
-	# Use C++14
-	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
-		--enable-layoutex
-		$(use_enable debug)
-		$(use_enable static-libs static)
-	)
-
-	tc-is-cross-compiler && myeconfargs+=(
-		--with-cross-build="${WORKDIR}"/host
-	)
-
-	# icu tries to use clang by default
-	tc-export CC CXX
-
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-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
-	pushd layoutex &>/dev/null || die
-	emake -j1 VERBOSE="1" check
-	popd &>/dev/null || die
-}
-
-multilib_src_install() {
-	pushd layoutex &>/dev/null || die
-	default
-	popd &>/dev/null || die
-}
diff --git a/dev-libs/icu-layoutex/icu-layoutex-71.1.ebuild b/dev-libs/icu-layoutex/icu-layoutex-71.1.ebuild
index d66b5589337f..0a11ebb6f4a1 100644
--- a/dev-libs/icu-layoutex/icu-layoutex-71.1.ebuild
+++ b/dev-libs/icu-layoutex/icu-layoutex-71.1.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${PN/-layoutex}/source"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
 IUSE="debug static-libs test"
 RESTRICT="!test? ( test )"
 
@@ -50,7 +50,9 @@ src_prepare() {
 }
 
 src_configure() {
-	# Use C++14
+	# 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