gentoo resync : 20.03.2022

3 files changed, 3 insertions, 114 deletions

diff --git a/dev-libs/icu-layoutex/Manifest b/dev-libs/icu-layoutex/Manifest
index 0d29b92c631e..d1c7eac46ae9 100644
--- a/dev-libs/icu-layoutex/Manifest
+++ b/dev-libs/icu-layoutex/Manifest
@@ -1,6 +1,4 @@
 AUX icu-layoutex-65.1-remove-bashisms.patch 4963 BLAKE2B fb781741a7a908638876729d573a73e42b7b3f0f3e692b54799fed0dac006ecb731583d90d849ea06be47259a0a236933fa7a78a96b3a8107ee85f916dc2000a SHA512 67e60068c356ca8d93b137eadeef2562ff7d8f38153babc97edd92a2c38d7113396d63d4a09364dacefc612b4b3ea28872a4f767c4f38d3e725943b32f98c5bc
-DIST icu4c-69_1-src.tgz 24814903 BLAKE2B ef95a04e238f0de96e969d580ef64000ab04a4a0003e8f31fd02baab35387d5ab2c4d792ae0d14f3de8e48aa28570237ccd67fb32e03b13d1572e4a995b1de76 SHA512 d4aeb781715144ea6e3c6b98df5bbe0490bfa3175221a1d667f3e6851b7bd4a638fa4a37d4a921ccb31f02b5d15a6dded9464d98051964a86f7b1cde0ff0aab7
 DIST icu4c-70_1-src.tgz 25449582 BLAKE2B e229376ee45322db99aa963465048ab5e694ce9f0ba335f071817198238de21fcd77dfe3e86ea1394790e2a3b6d96772d1b98cb7dccd6462a9dd05c0ab7bdef0 SHA512 0b26ae7207155cb65a8fdb25f7b2fa4431e74b12bccbed0884a17feaae3c96833d12451064dd152197fd6ea5fd3adfd95594284a463e66c82e0d860f645880c9
-EBUILD icu-layoutex-69.1.ebuild 2510 BLAKE2B 0bbcafbf071fed411b9b66246e1bb961eed4788a8405bf3dc366b2e90bf299ed7b04723b6aed87f332c0c835250c8d7965820c06544c9fabaceed601eb3b91cd SHA512 d7956417175a54b4f7b8b0c78d76a62b94222fc7290c5b52dd0d78e95b512cf21237988cca42ca8b46ea7995af0d6136a4fe7ed1fa11517bb56bbfdc5f476479
-EBUILD icu-layoutex-70.1.ebuild 2510 BLAKE2B 1ee196eddd7df5a88dd5b26adab558f0bc9a4ed75f106c1e91188b3c43f54d94316da3d4f1c05389344f9ca99db9555232b99a6be155c858ec800e611fc95182 SHA512 dffd70c4c63e704e9be06210a7908236d9d79d135136cfedf93f5013ce43d7c61bd66fbbc92130022605ad46886891fe5e67e257d0f62a8588d5ceb5bf8ac6fe
+EBUILD icu-layoutex-70.1.ebuild 2505 BLAKE2B 3197805d41f024b6cf3aadba1db8b305f6d45af609305f8af4f9fc24154ccc651299b571e37e83f5dbfc4f86cf315443b972139ed87b54856a9af128d7b8830f SHA512 57c95d2a5e2a4b1c5876d5b4becfde3a27ce519a4a6e81db38ea10e8e4423cb4a2b335b153ddd031253713f455b5e09faf6c656ec5ecddc2dcf89a055b961487
 MISC metadata.xml 380 BLAKE2B 8ce5a87c902267e85bba46c378db4430060c8a6d66e7ad869373bd533bcf88ae8870f1814350e76713d54545518b3650ffb7b288e29e504b82fcaf1ef1880fb8 SHA512 6cd44c60cbe48e130cb58d330deeeee325131080e0bc366ea7a1a969e269bd366340a815984fb7dcb3e47b70b81cfe837f601e1c20d358ea6931142d27f4c040
diff --git a/dev-libs/icu-layoutex/icu-layoutex-69.1.ebuild b/dev-libs/icu-layoutex/icu-layoutex-69.1.ebuild
deleted file mode 100644
index 0e04c50bbdea..000000000000
--- a/dev-libs/icu-layoutex/icu-layoutex-69.1.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic multilib-minimal toolchain-funcs
-
-DESCRIPTION="External layout part of International Components for Unicode"
-HOMEPAGE="http://www.icu-project.org/"
-SRC_URI="https://github.com/unicode-org/icu/releases/download/release-${PV//./-}/icu4c-${PV//./_}-src.tgz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
-IUSE="debug static-libs"
-
-BDEPEND="
-	virtual/pkgconfig
-"
-DEPEND="
-	~dev-libs/icu-${PV}[${MULTILIB_USEDEP}]
-	dev-libs/icu-le-hb[${MULTILIB_USEDEP}]
-"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN/-layoutex}/source"
-
-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-70.1.ebuild b/dev-libs/icu-layoutex/icu-layoutex-70.1.ebuild
index 0fad8d95c72a..b4c96881ba12 100644
--- a/dev-libs/icu-layoutex/icu-layoutex-70.1.ebuild
+++ b/dev-libs/icu-layoutex/icu-layoutex-70.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,7 +12,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"
 
 DEPEND="