gentoo resync : 10.09.2021

2 files changed, 15 insertions, 11 deletions

diff --git a/media-libs/harfbuzz/Manifest b/media-libs/harfbuzz/Manifest
index ffd7c2cb8da3..f3e60a40ed78 100644
--- a/media-libs/harfbuzz/Manifest
+++ b/media-libs/harfbuzz/Manifest
@@ -1,9 +1,10 @@
 DIST harfbuzz-2.8.1.tar.gz 17939717 BLAKE2B 4e6eeb0beb45e88386d994eb219479a2ed68bd1b78af3becb4ef1c89152e21924319b415e194f57c7aa4acf8031ab4ae35725b873f36b6f816aaa33a7bbb86d9 SHA512 16e43b9182d3ebd2394c2c0e0df815ca9e715d55dc7e46de4eafcde49ddf59cccae69a5340e05c8aa2ee6bc2ba46d1cffae8252d1b2a004ffe9d70c62628cf73
 DIST harfbuzz-2.8.2.tar.gz 18506485 BLAKE2B 39a43d643339a5bc27d886e418695d2864ad7b9094dc508f5ccf52bf635b340adb7ec6958a15349e0b2580444ec98c5850e4022f708287fbe44cb7ea90065881 SHA512 51eee8c8fa6f839512e0dfc5c80ae8ed1e09d747d0ffc6736e5a1cbf86de956322f23e6ea25a90985e2317e98229a133e208da2a7b5177d65894cc64706ee8d4
 DIST harfbuzz-2.9.0.tar.gz 18794661 BLAKE2B f11f8e744e8d344b340006cc2f3a4f90e32ca62a7f6d737fa339b646ebfa95a92b4ce1bc558fb814ecc95f8b04135c2ae2824d2c31d76411f6e0c1223691c393 SHA512 6c9f32b91d261b3d3a3b5110300ecff750958f889d23b23e407817526efaad9dfd94c4979414f299f9d23a7313e24aaad0da48d02d374b873583d5419c420803
+DIST harfbuzz-2.9.1.tar.gz 19154048 BLAKE2B e6cdc3936606e3d9a4bacf385db13c54f328d5be6c20ab20f844650351dd34f8f2015954f4ac7a6e0b8a1258ed9a6e71f43871c768c892d87af5c399c4499c63 SHA512 f8bb1d75b498d1581e76c57e5a15999e2c0d745d7d73dad17bfc91daf000f96d17c4924e6fb31270c90c26693dd504a7e7b2add152a013acca2491a86256b07b
 EBUILD harfbuzz-2.8.1.ebuild 2497 BLAKE2B 89bb2b0796c1a151efc58f43abb0c87df3829361be12e37d43652dae4c002efd29405c61e2e66350ac5ae8b75693f385ce4594d8e480d7a389a3311af4c41621 SHA512 8093198447adef9c164c8fb8d7f9a39a39bfd3ca43e2210a2d4edfe6e51716378c009f0aa5b64e5560f4f174021b8b525d9a3d2837aea53eba6059efd1cf336e
 EBUILD harfbuzz-2.8.2-r1.ebuild 2547 BLAKE2B 8c1cc61fda1ffbd7bb0c6bba79e7b0f2121b6a533a994536723f1ce6f58ed9cab2ef5c08f704a7cd66775e9f65e7f426fd3cb3c9ae8e01aeafc4ba8160ff2cd5 SHA512 7f6e6715df93de2ece043f2e651463241bb6095d5fc5e1e1b90a24647eafe94ffc845f0814ac52b59804e546140f8f3d929e1ea225e228cb1018c32cbe893ca4
-EBUILD harfbuzz-2.8.2.ebuild 2505 BLAKE2B e1cecf62258e0ea429215a93982370049e83d1675270fcda4c2fdf7b62f313aa5779b30a974c7b1a110644387044d022e040a5d864372e623b29ff920e836779 SHA512 9026825422ce7bab7773a9e6803b7f43cb65c192f83d0286244730fb06eefc63f8e61e39cbd30431c24b74df30897ad4fed5ca7ad0a6ae3bd658f5ce325e5eee
 EBUILD harfbuzz-2.9.0.ebuild 2507 BLAKE2B 43f60e9425b5560c03e7c677d718542e09ac36d1d748a5cc270ce4f9d6f0b0260e07b1f32d11e2ff0e59c52daf8cbbcd2b0cba95f4cc046755cfc35cf140d1ff SHA512 5642c71c3b99dc1e11d9ec0c267bc466d0421151e077ea0141f3aaa11f6b891ecc24686e40c10de4c4494ca396493d585d2e71dd9f0dfb28984048b5f1f963eb
+EBUILD harfbuzz-2.9.1.ebuild 2507 BLAKE2B 43f60e9425b5560c03e7c677d718542e09ac36d1d748a5cc270ce4f9d6f0b0260e07b1f32d11e2ff0e59c52daf8cbbcd2b0cba95f4cc046755cfc35cf140d1ff SHA512 5642c71c3b99dc1e11d9ec0c267bc466d0421151e077ea0141f3aaa11f6b891ecc24686e40c10de4c4494ca396493d585d2e71dd9f0dfb28984048b5f1f963eb
 EBUILD harfbuzz-9999.ebuild 2507 BLAKE2B 43f60e9425b5560c03e7c677d718542e09ac36d1d748a5cc270ce4f9d6f0b0260e07b1f32d11e2ff0e59c52daf8cbbcd2b0cba95f4cc046755cfc35cf140d1ff SHA512 5642c71c3b99dc1e11d9ec0c267bc466d0421151e077ea0141f3aaa11f6b891ecc24686e40c10de4c4494ca396493d585d2e71dd9f0dfb28984048b5f1f963eb
 MISC metadata.xml 817 BLAKE2B c5e4059fe45c0727f6fc831402f6ea0617ffcd70db271b8c36365c8f815347ba12f6a0193ebef2ebb614ef382ddf690e686997045f0eb6e9ec3ebced9147c475 SHA512 9516b81d89c29a1545555925a377c303c69842808915a1a4e376dce77af29a9f9d1f1c0eb0cf4ae5f6698378bffbb81943df5add554cf8a4207fc4aa0978ab84
diff --git a/media-libs/harfbuzz/harfbuzz-2.8.2.ebuild b/media-libs/harfbuzz/harfbuzz-2.9.1.ebuild
index 91e50bcaf5b1..6b8cea0dd156 100644
--- a/media-libs/harfbuzz/harfbuzz-2.8.2.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-2.9.1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit flag-o-matic meson-multilib python-any-r1 xdg-utils
 
@@ -21,7 +21,7 @@ fi
 LICENSE="Old-MIT ISC icu"
 SLOT="0/0.9.18" # 0.9.18 introduced the harfbuzz-icu split; bug #472416
 
-IUSE="+cairo debug doc +glib +graphite icu +introspection static-libs test +truetype"
+IUSE="+cairo debug doc experimental +glib +graphite icu +introspection test +truetype"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="introspection? ( glib )"
 
@@ -56,8 +56,8 @@ src_prepare() {
 	xdg_environment_reset
 
 	sed -i \
-		-e 's:tests/macos.tests::' \
-		test/shaping/data/in-house/Makefile.sources \
+		-e '/tests\/macos\.tests/d' \
+		test/shape/data/in-house/Makefile.sources \
 		|| die # bug 726120
 
 	# bug 618772
@@ -76,18 +76,21 @@ src_prepare() {
 multilib_src_configure() {
 	# harfbuzz-gobject only used for instrospection, bug #535852
 	local emesonargs=(
-		$(meson_native_use_feature cairo)
 		-Dcoretext="disabled"
-		$(meson_native_use_feature doc docs)
-		-Dfontconfig="disabled" #609300
-		$(meson_native_use_feature introspection)
-		$(meson_use static-libs static)
+		-Dchafa="disabled"
+
 		$(meson_feature glib)
 		$(meson_feature graphite)
 		$(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
 }