gentoo resync : 21.08.2021

4 files changed, 106 insertions, 9 deletions

diff --git a/media-libs/harfbuzz/Manifest b/media-libs/harfbuzz/Manifest
index f24e196bcc73..ffd7c2cb8da3 100644
--- a/media-libs/harfbuzz/Manifest
+++ b/media-libs/harfbuzz/Manifest
@@ -1,7 +1,9 @@
 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
 EBUILD harfbuzz-2.8.1.ebuild 2497 BLAKE2B 89bb2b0796c1a151efc58f43abb0c87df3829361be12e37d43652dae4c002efd29405c61e2e66350ac5ae8b75693f385ce4594d8e480d7a389a3311af4c41621 SHA512 8093198447adef9c164c8fb8d7f9a39a39bfd3ca43e2210a2d4edfe6e51716378c009f0aa5b64e5560f4f174021b8b525d9a3d2837aea53eba6059efd1cf336e
-EBUILD harfbuzz-2.8.2-r1.ebuild 2564 BLAKE2B 70d26ed09e44b991caac53c5db51c8fc89baa543d62e13f635ee390f7f916f1a35cd1588d0cb8a0af94ad1f4cf06dbd5e27e0b4e34d30f811fbf4e09a5d8084c SHA512 60b23b0d0cfdb0c2bd8353027559ea4868a951417efbae0f6657c9e5bf9d69a81b7e0dae1060b736bde5d116e340a10be733e619a5156ea3976defbbd0a204d8
+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-9999.ebuild 2567 BLAKE2B c3d727edc7b320f54dd2e09d29f49bd57717c4db4e49123869cf0bfc2eb28475587ef78ddd24222afca5a6e92fe4076efad2bcb8ae63fdb0f2ec4d21e74af36a SHA512 c677139803efe70c41326932b7d26b7567ece5cb97d334314a73176fccb68452bcc99fb72fb6aa677ebc79855678af6e1201e2d17cc73ad9349d230cb676a09d
+EBUILD harfbuzz-2.9.0.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-r1.ebuild b/media-libs/harfbuzz/harfbuzz-2.8.2-r1.ebuild
index 789b5303c5d9..cef9400fbdb2 100644
--- a/media-libs/harfbuzz/harfbuzz-2.8.2-r1.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-2.8.2-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 ~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 ~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"
@@ -77,7 +77,7 @@ multilib_src_configure() {
 	# harfbuzz-gobject only used for instrospection, bug #535852
 	local emesonargs=(
 		-Dcoretext="disabled"
-		-Dfontconfig="disabled" #609300
+		-Dchafa="disabled"
 
 		$(meson_feature glib)
 		$(meson_feature graphite)
diff --git a/media-libs/harfbuzz/harfbuzz-2.9.0.ebuild b/media-libs/harfbuzz/harfbuzz-2.9.0.ebuild
new file mode 100644
index 000000000000..6b8cea0dd156
--- /dev/null
+++ b/media-libs/harfbuzz/harfbuzz-2.9.0.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2021 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 ~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"
+SLOT="0/0.9.18" # 0.9.18 introduced the harfbuzz-icu split; bug #472416
+
+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 instrospection, bug #535852
+	local emesonargs=(
+		-Dcoretext="disabled"
+		-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
+}
diff --git a/media-libs/harfbuzz/harfbuzz-9999.ebuild b/media-libs/harfbuzz/harfbuzz-9999.ebuild
index 86a480282559..6b8cea0dd156 100644
--- a/media-libs/harfbuzz/harfbuzz-9999.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-9999.ebuild
@@ -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 experimental +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
@@ -77,7 +77,7 @@ multilib_src_configure() {
 	# harfbuzz-gobject only used for instrospection, bug #535852
 	local emesonargs=(
 		-Dcoretext="disabled"
-		-Dfontconfig="disabled" #609300
+		-Dchafa="disabled"
 
 		$(meson_feature glib)
 		$(meson_feature graphite)
@@ -91,7 +91,6 @@ multilib_src_configure() {
 		$(meson_native_use_feature introspection)
 
 		$(meson_use experimental experimental_api)
-		$(meson_use static-libs static)
 	)
 	meson_src_configure
 }