gentoo resync : 12.05.2022

4 files changed, 5 insertions, 105 deletions

diff --git a/media-libs/harfbuzz/Manifest b/media-libs/harfbuzz/Manifest
index 4ff04973b82a..e2a71fe6e496 100644
--- a/media-libs/harfbuzz/Manifest
+++ b/media-libs/harfbuzz/Manifest
@@ -1,13 +1,11 @@
 AUX harfbuzz-3.4.0-multiple_icu_defs.patch 777 BLAKE2B 78eabdcdfc8dc54c53113157b9a05d44f90fb75bea1c4333837519b3782a7cd8107919a98c19a19bd792be1192f02dee441a8ca1932ca2309248a278ec0f589e SHA512 0d993fa05fc2b783c50edfb6309448c12d45ed7a434a9b2a6a9930e87bca08bb380a2329b7807ce2b3519512f24e445cf55ac483b38cd00f50a523b21483ec31
-DIST harfbuzz-3.2.0.tar.gz 28221148 BLAKE2B 55ff832d3f740e2d3819f66ddfadd10312533addc975a8871e549ad33f27f4a6da33cc190e3de17bd12c9716258bd0cb165c4c04da5057f92cc53e8673d4c10a SHA512 5d8c629416c0bc557b83e8d9d731d41b9e8ee3abc74590e65ed6ca67d74d3a440d038134313f17a7b1b14ef0fc1ecf8bb87113fdcf5f0c8d3dc3d2eeb9b08c18
 DIST harfbuzz-3.4.0.tar.gz 29043149 BLAKE2B 7b779149b34353ebb85143f74e9efdd8f8ba3616cd192df63ae43aa86f3f08d9a4104554f1f43624824549cf957625e496a307470dd1a9599e492cbf490ab1f3 SHA512 c0b3802fc084cb781acb717f07ca7811685e6834d97ae1a2f13ddc68ce0a31d672cb92e1192705c6d5ed870cb735f5d37150f7bf661b95d806a9d8f362520c01
-DIST harfbuzz-4.0.1.tar.gz 29070744 BLAKE2B c88aa93908a8203d53eff0e2dabe29fd619ee75ca32932fe836270fa0eaae535746029d917c1b378c598bf50d4b50a062f9bd70f22f24aa1d7d7bba6e65ad24f SHA512 771be2493e35c9ba101e1c173bd2bcab13d733d83a93ca1a0dceec1db217197bc0ba2bd8b85a3052857aea5c509de827715074c16717d7133fc95afb5a7e89e2
 DIST harfbuzz-4.1.0.tar.gz 29069953 BLAKE2B 6f8fd1889e36b20309609cc0e0d75c06167345273c78998a481c00e14fb219c3f61538c85e1956d14141b475bbe7cbffed5dfe26313e30ac970231c4e1eb50fb SHA512 e558b58233a13570693cc35764ce2824dea8b6388f47ced228f1317a9f08b6f482c1bc8d5c46352b74e84e709f569b164bea81647212c7e82467e19dfcb703a6
 DIST harfbuzz-4.2.0.tar.gz 29092181 BLAKE2B 75e2461932a17b2da50331b5bbdddd4c68ddafeea59088e2ad34e2de6b9f679154fddaf6579de1ef244f5f55baf61fa0b7f66459d9e16b365e152f973471f649 SHA512 2aff1e6a41d6186b71f2915296c46c0b2ffc67371e1f05c13a62c237ff7a84d7d78d414d7a395e1616a2861c83c4792ef5936a492713780564b994d18e2d3e38
-EBUILD harfbuzz-3.2.0.ebuild 2561 BLAKE2B e495672f81b0d3cc4c3dea9c811b9c305415b7a49345baeef24ea4d13f2460402c059c7e2733750865b47de4be03ec7270980797e8ef601ba3d89abed90c7442 SHA512 59cbf266b6046116e503a783345fc53e517b012b0fb2ade0409a99d2470d330d8411fd6cc9b850dbf114f7c157241ac0b16aa28973344a537960dd26c322aae8
-EBUILD harfbuzz-3.4.0-r1.ebuild 2629 BLAKE2B caa8a6b067b8d95ec5a43d060bbca12b6a04674526e2aa0824fc1845ced4271f9826476ab2de094989dee20d2cd6dfd8d1b70e49ac50c69a7f1f97950452aadd SHA512 b2c741b61779855dc2745b45f1f337a2f7e27da6f066c62569b040a9434334bbdd352b427369c6002e8a491dcadd15500856ed4cb1dca48d98a2a7edf440ef76
-EBUILD harfbuzz-4.0.1.ebuild 2569 BLAKE2B f434eeadafaceda6b51cbf3a47bb1bfdb930950fc5976064744c285708a04f2484d2f2bb85310dd36a177ff3e129c65cd7a09c5417d1cddf699f65c4dc2e22fe SHA512 e62ee2c1623a8a321462ae119aa2485b9e479a66c224961905e2958e9c4cb036a3de399f15ddff9d09619dd6ee8b7d84c295c3d5e15c91af778e04edf969e866
+DIST harfbuzz-4.2.1.tar.gz 29096419 BLAKE2B eb523c2e3c956559e2445bd12719b14c244cfdedd239041afec71a17912e489adb94c0b6fe148c60ae9e908cc3e740752de2a33a255c123ef937debe6008d78b SHA512 de14b673f6bd03d561c45f94e9bda44ee41897a643ab8837493260a83b1eb1f1ca0fe105c1bee241f2ecd6ab869dbccf3ffba8e2c4ee9a3a1fca4e1c6c7ca4f3
+EBUILD harfbuzz-3.4.0-r1.ebuild 2626 BLAKE2B 7b50e89680cea5a8eb4dd83428747639d57f8c5978f40504ef28250626c8409fd0b7a3794ba511e02049d14931b93f65215fdfa19c5a9ab6bfca08fe88c2bca9 SHA512 493089edcfdea0f074e83b34c5fd54c1beeddd2762bc5874877081833c0ba74d431f428c2fe1e18cd8436fabedbb39bf9f1f46c8d276e22c2efd61c0b6b43006
 EBUILD harfbuzz-4.1.0.ebuild 2569 BLAKE2B f434eeadafaceda6b51cbf3a47bb1bfdb930950fc5976064744c285708a04f2484d2f2bb85310dd36a177ff3e129c65cd7a09c5417d1cddf699f65c4dc2e22fe SHA512 e62ee2c1623a8a321462ae119aa2485b9e479a66c224961905e2958e9c4cb036a3de399f15ddff9d09619dd6ee8b7d84c295c3d5e15c91af778e04edf969e866
 EBUILD harfbuzz-4.2.0.ebuild 2569 BLAKE2B f434eeadafaceda6b51cbf3a47bb1bfdb930950fc5976064744c285708a04f2484d2f2bb85310dd36a177ff3e129c65cd7a09c5417d1cddf699f65c4dc2e22fe SHA512 e62ee2c1623a8a321462ae119aa2485b9e479a66c224961905e2958e9c4cb036a3de399f15ddff9d09619dd6ee8b7d84c295c3d5e15c91af778e04edf969e866
+EBUILD harfbuzz-4.2.1.ebuild 2576 BLAKE2B 3921b398fb8bc79f565017c58c0dfa65b719fd973416a28a58e012decab39367c23145b4ee11a00d563e02c9fdb8ea94e4cbbbf423861902760f7a8446500f28 SHA512 1d922c3524ac2ee0ce98e72c2d333ab575d7971b3cf5a5fa60187e433083fe69d826dc614e9ee9a1f98212a27aa3445f4a06bd294e455cdec73d13bde5e33066
 EBUILD harfbuzz-9999.ebuild 2569 BLAKE2B f434eeadafaceda6b51cbf3a47bb1bfdb930950fc5976064744c285708a04f2484d2f2bb85310dd36a177ff3e129c65cd7a09c5417d1cddf699f65c4dc2e22fe SHA512 e62ee2c1623a8a321462ae119aa2485b9e479a66c224961905e2958e9c4cb036a3de399f15ddff9d09619dd6ee8b7d84c295c3d5e15c91af778e04edf969e866
 MISC metadata.xml 818 BLAKE2B 6165990c46a33076cbcb991aa9417b1b1725886c03748d1fbb3f299408d6b56895b66cd723be06f0c72ded731698ca8d16d00cbf7247fafd1291b031aa784cf6 SHA512 141b1399bb3bdb6a5ade1bef685f99e60195edac718b93ec2350ab9e2dad3cc138a3d599c3a2b662a76579309a4f4cff259ef12a194d6a8dfffc4ef74c9102b6
diff --git a/media-libs/harfbuzz/harfbuzz-3.2.0.ebuild b/media-libs/harfbuzz/harfbuzz-3.2.0.ebuild
deleted file mode 100644
index 04e6837e2000..000000000000
--- a/media-libs/harfbuzz/harfbuzz-3.2.0.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit flag-o-matic meson-multilib python-any-r1 xdg-utils
-
-DESCRIPTION="An OpenType text shaping engine"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/HarfBuzz"
-
-if [[ ${PV} = 9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/harfbuzz/harfbuzz.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-LICENSE="Old-MIT ISC icu"
-# 0.9.18 introduced the harfbuzz-icu split; bug #472416
-# 3.0.0 dropped some unstable APIs; bug #813705
-SLOT="0/3.0.0"
-
-IUSE="+cairo debug doc experimental +glib +graphite icu +introspection test +truetype"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="introspection? ( glib )"
-
-RDEPEND="
-	cairo? ( x11-libs/cairo:= )
-	glib? ( >=dev-libs/glib-2.38:2[${MULTILIB_USEDEP}] )
-	graphite? ( >=media-gfx/graphite2-1.2.1:=[${MULTILIB_USEDEP}] )
-	icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] )
-	introspection? ( >=dev-libs/gobject-introspection-1.34:= )
-	truetype? ( >=media-libs/freetype-2.5.0.1:2=[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	>=dev-libs/gobject-introspection-common-1.34
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	virtual/pkgconfig
-	doc? ( dev-util/gtk-doc )
-	introspection? ( dev-util/glib-utils )
-"
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-	if ! use debug ; then
-		append-cppflags -DHB_NDEBUG
-	fi
-}
-
-src_prepare() {
-	default
-
-	xdg_environment_reset
-
-	sed -i \
-		-e '/tests\/macos\.tests/d' \
-		test/shape/data/in-house/Makefile.sources \
-		|| die # bug 726120
-
-	# bug 618772
-	append-cxxflags -std=c++14
-
-	# bug 790359
-	filter-flags -fexceptions -fthreadsafe-statics
-
-	# bug 762415
-	local pyscript
-	for pyscript in $(find -type f -name "*.py") ; do
-		python_fix_shebang -q "${pyscript}"
-	done
-}
-
-multilib_src_configure() {
-	# harfbuzz-gobject only used for introspection, bug #535852
-	local emesonargs=(
-		-Dcoretext="disabled"
-		-Dchafa="disabled"
-
-		$(meson_feature glib)
-		$(meson_feature graphite graphite2)
-		$(meson_feature icu)
-		$(meson_feature introspection gobject)
-		$(meson_feature test tests)
-		$(meson_feature truetype freetype)
-
-		$(meson_native_use_feature cairo)
-		$(meson_native_use_feature doc docs)
-		$(meson_native_use_feature introspection)
-
-		$(meson_use experimental experimental_api)
-	)
-	meson_src_configure
-}
diff --git a/media-libs/harfbuzz/harfbuzz-3.4.0-r1.ebuild b/media-libs/harfbuzz/harfbuzz-3.4.0-r1.ebuild
index 68b9e0f0ae42..7966387b760c 100644
--- a/media-libs/harfbuzz/harfbuzz-3.4.0-r1.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-3.4.0-r1.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} = 9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="Old-MIT ISC icu"
diff --git a/media-libs/harfbuzz/harfbuzz-4.0.1.ebuild b/media-libs/harfbuzz/harfbuzz-4.2.1.ebuild
index 899f139ec716..36d9b9aebfcd 100644
--- a/media-libs/harfbuzz/harfbuzz-4.0.1.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-4.2.1.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} = 9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="Old-MIT ISC icu"