gentoo resync : 20.03.2022

7 files changed, 142 insertions, 13 deletions

diff --git a/media-libs/harfbuzz/Manifest b/media-libs/harfbuzz/Manifest
index 67bfe5405cab..174a89f2293a 100644
--- a/media-libs/harfbuzz/Manifest
+++ b/media-libs/harfbuzz/Manifest
@@ -1,8 +1,11 @@
-DIST harfbuzz-3.1.2.tar.gz 26678706 BLAKE2B 231687fa77983217cf60eda2b4796431c15a9efa79e8925363e6d8374ea2710d167eb1bcf5e14a7c738a98f6be06e24ee6b038ea5697b380b81425c9d4244dad SHA512 4d1093904bd450c6d65130b3d7198c07cfc5cce9a5d234fcb14bae1101b28e697ba42cb455217f863d8d5c83830784f716ae59a2dbb38e88156677213bdb4799
+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.3.1.tar.gz 29039964 BLAKE2B 55034a83d63369fe6b8a010cbab35615c60d03e052f2f49a6ed176222f2623beaa11e32a3872a0f2128d10b4e7240fcf198d8445b8b80ae0134ff2bf9a51ece4 SHA512 05a5fd52e0eac9eb1288c4d5e49154a29c1dd98032b5afd49cbb563520865ead0fd756651e46374b016fac0d1a584fb89aef5835758b5970266a3c926676da95
-EBUILD harfbuzz-3.1.2.ebuild 2562 BLAKE2B a990a70b030b29da047c19c6d06800412c2b80286431981bd24d856f2498506268c205a229792fb13618b37a19743dc2c76b090639835df18f8a5c0533ba39b9 SHA512 d3efd205a3e94aa5bbf4d96766e272a08c89d26535cc00d57f51b14a31e8dc3b4e9309c431e99eb49ee2e9d87d7da902bb178cbb65baee4794aba34c869770f8
-EBUILD harfbuzz-3.2.0.ebuild 2570 BLAKE2B 5df3f3bec5fdc10f651804c0fba6cb2b0c0e88045585edee823d58f3ba8473b81e2788274cf4739b36b92f0bcdf7b0079b38038787014ce32e441adade6496a3 SHA512 1deb1e8dd62a12965d391e094e8bd363ea5c1cfc5305eaed275439dd3073e44f2b44606c9969c5475352d2034ce9b2339cf1a7ba6dd0310a6bb5ff7484c16470
-EBUILD harfbuzz-3.3.1.ebuild 2570 BLAKE2B 942e4d6d00de538db5253cb2fac48ddc6d0b2c52475067451d6b130ea71429ffb99b2172a724183786ebd69ae2953629175e651e6354ef70f984d015c2ab3fcb SHA512 8f3c1001af7b91538d38969686d168b4246e1dbc058de9450eba764b15bdba6fb145b11f2c21fea13e88547f1225d420f37acbf5b91541b55f474a1e52d6b8ec
-EBUILD harfbuzz-9999.ebuild 2570 BLAKE2B 5df3f3bec5fdc10f651804c0fba6cb2b0c0e88045585edee823d58f3ba8473b81e2788274cf4739b36b92f0bcdf7b0079b38038787014ce32e441adade6496a3 SHA512 1deb1e8dd62a12965d391e094e8bd363ea5c1cfc5305eaed275439dd3073e44f2b44606c9969c5475352d2034ce9b2339cf1a7ba6dd0310a6bb5ff7484c16470
+DIST harfbuzz-3.4.0.tar.gz 29043149 BLAKE2B 7b779149b34353ebb85143f74e9efdd8f8ba3616cd192df63ae43aa86f3f08d9a4104554f1f43624824549cf957625e496a307470dd1a9599e492cbf490ab1f3 SHA512 c0b3802fc084cb781acb717f07ca7811685e6834d97ae1a2f13ddc68ce0a31d672cb92e1192705c6d5ed870cb735f5d37150f7bf661b95d806a9d8f362520c01
+DIST harfbuzz-4.0.0.tar.gz 29060304 BLAKE2B f49693d3329a44c7e614d27a491076dd00e725ac85f64bdaacc128a9573e459b84c247c1585adb2e3ce194bd7b3d01ce7c517ff2e27f04d23985b8655188a239 SHA512 d2b740f3392cd2763f467298dcd384e74fdbf592ebc066125451f886163c24bfe7993eb43f34d0ea3933ad16eee1c6f6ebe4e95f48cc13ac6650c64dd0b4ba8c
+DIST harfbuzz-4.0.1.tar.gz 29070744 BLAKE2B c88aa93908a8203d53eff0e2dabe29fd619ee75ca32932fe836270fa0eaae535746029d917c1b378c598bf50d4b50a062f9bd70f22f24aa1d7d7bba6e65ad24f SHA512 771be2493e35c9ba101e1c173bd2bcab13d733d83a93ca1a0dceec1db217197bc0ba2bd8b85a3052857aea5c509de827715074c16717d7133fc95afb5a7e89e2
+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.0.ebuild 2570 BLAKE2B 459c5ac4277d4599453d0cff69261a2039a1a6cb959e1a3051bb981836117fe2dc05f1807e7ce45e3f6c0192952825563e82f20aaa907517c1f59a7fdca348c4 SHA512 2c142e552897c3b13674e8858da9f6a0734fc9d7244a9588483b09749bc38811af974015d2fc7322dadbde5a306e5d182caa15cf39f76454f33dadd6f1e38a31
+EBUILD harfbuzz-4.0.1.ebuild 2570 BLAKE2B 459c5ac4277d4599453d0cff69261a2039a1a6cb959e1a3051bb981836117fe2dc05f1807e7ce45e3f6c0192952825563e82f20aaa907517c1f59a7fdca348c4 SHA512 2c142e552897c3b13674e8858da9f6a0734fc9d7244a9588483b09749bc38811af974015d2fc7322dadbde5a306e5d182caa15cf39f76454f33dadd6f1e38a31
+EBUILD harfbuzz-9999.ebuild 2570 BLAKE2B 459c5ac4277d4599453d0cff69261a2039a1a6cb959e1a3051bb981836117fe2dc05f1807e7ce45e3f6c0192952825563e82f20aaa907517c1f59a7fdca348c4 SHA512 2c142e552897c3b13674e8858da9f6a0734fc9d7244a9588483b09749bc38811af974015d2fc7322dadbde5a306e5d182caa15cf39f76454f33dadd6f1e38a31
 MISC metadata.xml 818 BLAKE2B 6165990c46a33076cbcb991aa9417b1b1725886c03748d1fbb3f299408d6b56895b66cd723be06f0c72ded731698ca8d16d00cbf7247fafd1291b031aa784cf6 SHA512 141b1399bb3bdb6a5ade1bef685f99e60195edac718b93ec2350ab9e2dad3cc138a3d599c3a2b662a76579309a4f4cff259ef12a194d6a8dfffc4ef74c9102b6
diff --git a/media-libs/harfbuzz/files/harfbuzz-3.4.0-multiple_icu_defs.patch b/media-libs/harfbuzz/files/harfbuzz-3.4.0-multiple_icu_defs.patch
new file mode 100644
index 000000000000..64aebcfc03f1
--- /dev/null
+++ b/media-libs/harfbuzz/files/harfbuzz-3.4.0-multiple_icu_defs.patch
@@ -0,0 +1,24 @@
+From 256dcde149737246a04cfc0fe388cb91acb65522 Mon Sep 17 00:00:00 2001
+From: James Hilliard <james.hilliard1@gmail.com>
+Date: Mon, 21 Feb 2022 00:07:03 -0700
+Subject: [PATCH] [meson] handle multiple element ICU DEFS
+
+---
+ meson.build | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index e22859a265..27cd3daa97 100644
+--- a/meson.build
++++ b/meson.build
+@@ -105,8 +105,8 @@ else
+ endif
+ 
+ if icu_dep.found() and icu_dep.type_name() == 'pkgconfig'
+-  icu_defs = icu_dep.get_variable(pkgconfig: 'DEFS', default_value: '')
+-  if icu_defs != ''
++  icu_defs = icu_dep.get_variable(pkgconfig: 'DEFS', default_value: '').split()
++  if icu_defs.length() > 0
+     add_project_arguments(icu_defs, language: ['c', 'cpp'])
+   endif
+ endif
diff --git a/media-libs/harfbuzz/harfbuzz-3.2.0.ebuild b/media-libs/harfbuzz/harfbuzz-3.2.0.ebuild
index f6617befe9b3..a40771678b2b 100644
--- a/media-libs/harfbuzz/harfbuzz-3.2.0.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-3.2.0.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
@@ -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-3.4.0-r1.ebuild b/media-libs/harfbuzz/harfbuzz-3.4.0-r1.ebuild
new file mode 100644
index 000000000000..8a1d1b1f669e
--- /dev/null
+++ b/media-libs/harfbuzz/harfbuzz-3.4.0-r1.ebuild
@@ -0,0 +1,102 @@
+# 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 )
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-multiple_icu_defs.patch" #833891
+)
+
+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 instrospection, 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.3.1.ebuild b/media-libs/harfbuzz/harfbuzz-4.0.0.ebuild
index 9322b2928b1c..5513b4acfdb6 100644
--- a/media-libs/harfbuzz/harfbuzz-3.3.1.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-4.0.0.ebuild
@@ -21,7 +21,7 @@ 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"
+SLOT="0/4.0.0"
 
 IUSE="+cairo debug doc experimental +glib +graphite icu +introspection test +truetype"
 RESTRICT="!test? ( test )"
diff --git a/media-libs/harfbuzz/harfbuzz-3.1.2.ebuild b/media-libs/harfbuzz/harfbuzz-4.0.1.ebuild
index a40771678b2b..5513b4acfdb6 100644
--- a/media-libs/harfbuzz/harfbuzz-3.1.2.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-4.0.1.ebuild
@@ -15,13 +15,13 @@ 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"
 # 0.9.18 introduced the harfbuzz-icu split; bug #472416
 # 3.0.0 dropped some unstable APIs; bug #813705
-SLOT="0/3.0.0"
+SLOT="0/4.0.0"
 
 IUSE="+cairo debug doc experimental +glib +graphite icu +introspection test +truetype"
 RESTRICT="!test? ( test )"
diff --git a/media-libs/harfbuzz/harfbuzz-9999.ebuild b/media-libs/harfbuzz/harfbuzz-9999.ebuild
index f6617befe9b3..5513b4acfdb6 100644
--- a/media-libs/harfbuzz/harfbuzz-9999.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-9999.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
@@ -21,7 +21,7 @@ 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"
+SLOT="0/4.0.0"
 
 IUSE="+cairo debug doc experimental +glib +graphite icu +introspection test +truetype"
 RESTRICT="!test? ( test )"