gentoo resync : 06.04.2022

7 files changed, 110 insertions, 10 deletions

diff --git a/media-libs/harfbuzz/Manifest b/media-libs/harfbuzz/Manifest
index 7e50c6a4ab83..e031321d3447 100644
--- a/media-libs/harfbuzz/Manifest
+++ b/media-libs/harfbuzz/Manifest
@@ -3,9 +3,11 @@ DIST harfbuzz-3.2.0.tar.gz 28221148 BLAKE2B 55ff832d3f740e2d3819f66ddfadd1031253
 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
-EBUILD harfbuzz-3.2.0.ebuild 2562 BLAKE2B a990a70b030b29da047c19c6d06800412c2b80286431981bd24d856f2498506268c205a229792fb13618b37a19743dc2c76b090639835df18f8a5c0533ba39b9 SHA512 d3efd205a3e94aa5bbf4d96766e272a08c89d26535cc00d57f51b14a31e8dc3b4e9309c431e99eb49ee2e9d87d7da902bb178cbb65baee4794aba34c869770f8
-EBUILD harfbuzz-3.4.0-r1.ebuild 2635 BLAKE2B dbf9df9b91f507cdc1d04e672780691bf514eb3f6c7e257025c0b017a7d3d68e6bec0ef0f8bf4fdf3cabb18935ec1b2d762bc4dd34a68eb1f2184bbb0db4e7ac SHA512 f5eb7784845dd4f4f6982966fb7fad0ec27465261aec72f6f79eacc73e7a17fd6f45272db2749d89047eea89ce742eb183b63c8039f422443b249fd7b846fd5e
-EBUILD harfbuzz-4.0.1.ebuild 2570 BLAKE2B 459c5ac4277d4599453d0cff69261a2039a1a6cb959e1a3051bb981836117fe2dc05f1807e7ce45e3f6c0192952825563e82f20aaa907517c1f59a7fdca348c4 SHA512 2c142e552897c3b13674e8858da9f6a0734fc9d7244a9588483b09749bc38811af974015d2fc7322dadbde5a306e5d182caa15cf39f76454f33dadd6f1e38a31
-EBUILD harfbuzz-4.1.0.ebuild 2570 BLAKE2B 459c5ac4277d4599453d0cff69261a2039a1a6cb959e1a3051bb981836117fe2dc05f1807e7ce45e3f6c0192952825563e82f20aaa907517c1f59a7fdca348c4 SHA512 2c142e552897c3b13674e8858da9f6a0734fc9d7244a9588483b09749bc38811af974015d2fc7322dadbde5a306e5d182caa15cf39f76454f33dadd6f1e38a31
-EBUILD harfbuzz-9999.ebuild 2570 BLAKE2B 459c5ac4277d4599453d0cff69261a2039a1a6cb959e1a3051bb981836117fe2dc05f1807e7ce45e3f6c0192952825563e82f20aaa907517c1f59a7fdca348c4 SHA512 2c142e552897c3b13674e8858da9f6a0734fc9d7244a9588483b09749bc38811af974015d2fc7322dadbde5a306e5d182caa15cf39f76454f33dadd6f1e38a31
+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 2634 BLAKE2B 11d283633a330394fed087949f23577949d8cf2f4cd62f1412bd2dd4446eeed93d4dceab953a4a8478d63f73f55db09ba3ad1413134bc2187434ae59b6bf86c7 SHA512 8156848580a041b5f4fd2e53758caec3c1490fa4d48806646d5b7437862c56c1b61a9cd434ab9047e4cc9f33c4b8cc439780a833c84653fa9af15f24089d9230
+EBUILD harfbuzz-4.0.1.ebuild 2569 BLAKE2B f434eeadafaceda6b51cbf3a47bb1bfdb930950fc5976064744c285708a04f2484d2f2bb85310dd36a177ff3e129c65cd7a09c5417d1cddf699f65c4dc2e22fe SHA512 e62ee2c1623a8a321462ae119aa2485b9e479a66c224961905e2958e9c4cb036a3de399f15ddff9d09619dd6ee8b7d84c295c3d5e15c91af778e04edf969e866
+EBUILD harfbuzz-4.1.0.ebuild 2569 BLAKE2B f434eeadafaceda6b51cbf3a47bb1bfdb930950fc5976064744c285708a04f2484d2f2bb85310dd36a177ff3e129c65cd7a09c5417d1cddf699f65c4dc2e22fe SHA512 e62ee2c1623a8a321462ae119aa2485b9e479a66c224961905e2958e9c4cb036a3de399f15ddff9d09619dd6ee8b7d84c295c3d5e15c91af778e04edf969e866
+EBUILD harfbuzz-4.2.0.ebuild 2569 BLAKE2B f434eeadafaceda6b51cbf3a47bb1bfdb930950fc5976064744c285708a04f2484d2f2bb85310dd36a177ff3e129c65cd7a09c5417d1cddf699f65c4dc2e22fe SHA512 e62ee2c1623a8a321462ae119aa2485b9e479a66c224961905e2958e9c4cb036a3de399f15ddff9d09619dd6ee8b7d84c295c3d5e15c91af778e04edf969e866
+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
index a40771678b2b..04e6837e2000 100644
--- a/media-libs/harfbuzz/harfbuzz-3.2.0.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-3.2.0.ebuild
@@ -76,7 +76,7 @@ src_prepare() {
 }
 
 multilib_src_configure() {
-	# harfbuzz-gobject only used for instrospection, bug #535852
+	# harfbuzz-gobject only used for introspection, bug #535852
 	local emesonargs=(
 		-Dcoretext="disabled"
 		-Dchafa="disabled"
diff --git a/media-libs/harfbuzz/harfbuzz-3.4.0-r1.ebuild b/media-libs/harfbuzz/harfbuzz-3.4.0-r1.ebuild
index 8a1d1b1f669e..fc9f7e995db4 100644
--- a/media-libs/harfbuzz/harfbuzz-3.4.0-r1.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-3.4.0-r1.ebuild
@@ -80,7 +80,7 @@ src_prepare() {
 }
 
 multilib_src_configure() {
-	# harfbuzz-gobject only used for instrospection, bug #535852
+	# harfbuzz-gobject only used for introspection, bug #535852
 	local emesonargs=(
 		-Dcoretext="disabled"
 		-Dchafa="disabled"
diff --git a/media-libs/harfbuzz/harfbuzz-4.0.1.ebuild b/media-libs/harfbuzz/harfbuzz-4.0.1.ebuild
index 5513b4acfdb6..899f139ec716 100644
--- a/media-libs/harfbuzz/harfbuzz-4.0.1.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-4.0.1.ebuild
@@ -76,7 +76,7 @@ src_prepare() {
 }
 
 multilib_src_configure() {
-	# harfbuzz-gobject only used for instrospection, bug #535852
+	# harfbuzz-gobject only used for introspection, bug #535852
 	local emesonargs=(
 		-Dcoretext="disabled"
 		-Dchafa="disabled"
diff --git a/media-libs/harfbuzz/harfbuzz-4.1.0.ebuild b/media-libs/harfbuzz/harfbuzz-4.1.0.ebuild
index 5513b4acfdb6..899f139ec716 100644
--- a/media-libs/harfbuzz/harfbuzz-4.1.0.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-4.1.0.ebuild
@@ -76,7 +76,7 @@ src_prepare() {
 }
 
 multilib_src_configure() {
-	# harfbuzz-gobject only used for instrospection, bug #535852
+	# harfbuzz-gobject only used for introspection, bug #535852
 	local emesonargs=(
 		-Dcoretext="disabled"
 		-Dchafa="disabled"
diff --git a/media-libs/harfbuzz/harfbuzz-4.2.0.ebuild b/media-libs/harfbuzz/harfbuzz-4.2.0.ebuild
new file mode 100644
index 000000000000..899f139ec716
--- /dev/null
+++ b/media-libs/harfbuzz/harfbuzz-4.2.0.ebuild
@@ -0,0 +1,98 @@
+# 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/4.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-9999.ebuild b/media-libs/harfbuzz/harfbuzz-9999.ebuild
index 5513b4acfdb6..899f139ec716 100644
--- a/media-libs/harfbuzz/harfbuzz-9999.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-9999.ebuild
@@ -76,7 +76,7 @@ src_prepare() {
 }
 
 multilib_src_configure() {
-	# harfbuzz-gobject only used for instrospection, bug #535852
+	# harfbuzz-gobject only used for introspection, bug #535852
 	local emesonargs=(
 		-Dcoretext="disabled"
 		-Dchafa="disabled"