gentoo resync : 13.11.2021

5 files changed, 204 insertions, 4 deletions

diff --git a/media-libs/harfbuzz/Manifest b/media-libs/harfbuzz/Manifest
index 018d6bb1e9b8..78c8384f3de9 100644
--- a/media-libs/harfbuzz/Manifest
+++ b/media-libs/harfbuzz/Manifest
@@ -2,9 +2,13 @@ DIST harfbuzz-2.8.1.tar.gz 17939717 BLAKE2B 4e6eeb0beb45e88386d994eb219479a2ed68
 DIST harfbuzz-2.8.2.tar.gz 18506485 BLAKE2B 39a43d643339a5bc27d886e418695d2864ad7b9094dc508f5ccf52bf635b340adb7ec6958a15349e0b2580444ec98c5850e4022f708287fbe44cb7ea90065881 SHA512 51eee8c8fa6f839512e0dfc5c80ae8ed1e09d747d0ffc6736e5a1cbf86de956322f23e6ea25a90985e2317e98229a133e208da2a7b5177d65894cc64706ee8d4
 DIST harfbuzz-2.9.1.tar.gz 19154048 BLAKE2B e6cdc3936606e3d9a4bacf385db13c54f328d5be6c20ab20f844650351dd34f8f2015954f4ac7a6e0b8a1258ed9a6e71f43871c768c892d87af5c399c4499c63 SHA512 f8bb1d75b498d1581e76c57e5a15999e2c0d745d7d73dad17bfc91daf000f96d17c4924e6fb31270c90c26693dd504a7e7b2add152a013acca2491a86256b07b
 DIST harfbuzz-3.0.0.tar.gz 20360786 BLAKE2B acc1e4d7d59908a23ae1015700cfbf1737cdb0b26ba811d752954356baffb2ab18c3d22b5964d200c4cc7e312a79655c3437aff9f5a85b72c472e324dc3257ba SHA512 69999ad86bde56ef689392a521143b6ad14b6719860772c3d4c343358997049a48c79e8f302fe0a7f3b0d930b476ddf440def874a1269b50ae79d020bcd073b5
+DIST harfbuzz-3.1.0.tar.gz 24969178 BLAKE2B b9a21de7648382a104c60c135f46719c36158a766ff445de0f6038b143f5e524feb2214ebc1b3591141bcb023b79ce0d35b8b20efd69e3166685644ef2e6e0a6 SHA512 da75297bc205036d5f4374d68cb71a96f7b4db5428384bec6f9412988682301a30094643e7d33359c985b7f309f7b3f88275488137e75a5a0d2d493b11f52ae9
+DIST harfbuzz-3.1.1.tar.gz 24966288 BLAKE2B f655d6a175dc495c00a76838d101705a32270668b7d989b8e82b9c34d2c16a5c10d210c0ed99a334515f73f7cad5c22e35c97f3a2c3f40f686380dd0559d0d7f SHA512 ccb1c840d07e28871893c40b2bb687cc78dfd25992ee20192f1faf8cae4356f401abd5947d7480a268edea10dd9f1d1d7e113b29b6e2d958220bf53799ae01b0
 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-r1.ebuild 2546 BLAKE2B 4b74f8cdffa64a9ddcce411caabad933d046ce07f184303e73ac70941f9a4a1c4f6adbfe7b809e387b7de23e60bbf8205156b26622cf6980743f006d653db385 SHA512 e018e167e1346ad421a093ec4fa762738f5a9c43f759387109299147cb873082a1d16195ffa9281b67aac6a0dec7f30f270df4a5e86e125f142d83722528f3f6
 EBUILD harfbuzz-2.9.1.ebuild 2505 BLAKE2B 1de2fdb70f4647273658b95cf2425c7c94d56d55c695d4df4b94b4c375d5dad50a04e2f279443061e721c19102345832d3be84cb857f9713e7ab9660e0ab3d82 SHA512 ed1bc1b2870766467bf808aa277c5db7fcda334e610378b84e739646c22cc71e810c6ad051abb0d4bb93af10a74be672b552054719a29979e653131ad4af4070
 EBUILD harfbuzz-3.0.0-r1.ebuild 2560 BLAKE2B 834b18435b9f86998faf43a40a61094064b93db75943d87ddf5b9b9d40600f7554c3d4a0cdb3eddb3ce7c9a836638b8773ef11da90fcb0630f18c210906d6eb0 SHA512 c44538f14327df10ec25f7f57afbe107a14286688c5d7912be9044abaa3e14a6ed3034601a9c354b89b9d26ced7559ece1e5c42dd2c94cb13cf0bd8bdf1e8a3a
-EBUILD harfbuzz-9999.ebuild 2560 BLAKE2B 834b18435b9f86998faf43a40a61094064b93db75943d87ddf5b9b9d40600f7554c3d4a0cdb3eddb3ce7c9a836638b8773ef11da90fcb0630f18c210906d6eb0 SHA512 c44538f14327df10ec25f7f57afbe107a14286688c5d7912be9044abaa3e14a6ed3034601a9c354b89b9d26ced7559ece1e5c42dd2c94cb13cf0bd8bdf1e8a3a
+EBUILD harfbuzz-3.1.0.ebuild 2570 BLAKE2B 5df3f3bec5fdc10f651804c0fba6cb2b0c0e88045585edee823d58f3ba8473b81e2788274cf4739b36b92f0bcdf7b0079b38038787014ce32e441adade6496a3 SHA512 1deb1e8dd62a12965d391e094e8bd363ea5c1cfc5305eaed275439dd3073e44f2b44606c9969c5475352d2034ce9b2339cf1a7ba6dd0310a6bb5ff7484c16470
+EBUILD harfbuzz-3.1.1.ebuild 2570 BLAKE2B 5df3f3bec5fdc10f651804c0fba6cb2b0c0e88045585edee823d58f3ba8473b81e2788274cf4739b36b92f0bcdf7b0079b38038787014ce32e441adade6496a3 SHA512 1deb1e8dd62a12965d391e094e8bd363ea5c1cfc5305eaed275439dd3073e44f2b44606c9969c5475352d2034ce9b2339cf1a7ba6dd0310a6bb5ff7484c16470
+EBUILD harfbuzz-9999.ebuild 2570 BLAKE2B 5df3f3bec5fdc10f651804c0fba6cb2b0c0e88045585edee823d58f3ba8473b81e2788274cf4739b36b92f0bcdf7b0079b38038787014ce32e441adade6496a3 SHA512 1deb1e8dd62a12965d391e094e8bd363ea5c1cfc5305eaed275439dd3073e44f2b44606c9969c5475352d2034ce9b2339cf1a7ba6dd0310a6bb5ff7484c16470
 MISC metadata.xml 818 BLAKE2B 6165990c46a33076cbcb991aa9417b1b1725886c03748d1fbb3f299408d6b56895b66cd723be06f0c72ded731698ca8d16d00cbf7247fafd1291b031aa784cf6 SHA512 141b1399bb3bdb6a5ade1bef685f99e60195edac718b93ec2350ab9e2dad3cc138a3d599c3a2b662a76579309a4f4cff259ef12a194d6a8dfffc4ef74c9102b6
diff --git a/media-libs/harfbuzz/harfbuzz-2.8.2-r1.ebuild b/media-libs/harfbuzz/harfbuzz-2.8.2-r1.ebuild
index cef9400fbdb2..c24312bb372e 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"
diff --git a/media-libs/harfbuzz/harfbuzz-3.1.0.ebuild b/media-libs/harfbuzz/harfbuzz-3.1.0.ebuild
new file mode 100644
index 000000000000..f6617befe9b3
--- /dev/null
+++ b/media-libs/harfbuzz/harfbuzz-3.1.0.ebuild
@@ -0,0 +1,98 @@
+# 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 ~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 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.1.1.ebuild b/media-libs/harfbuzz/harfbuzz-3.1.1.ebuild
new file mode 100644
index 000000000000..f6617befe9b3
--- /dev/null
+++ b/media-libs/harfbuzz/harfbuzz-3.1.1.ebuild
@@ -0,0 +1,98 @@
+# 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 ~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 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-9999.ebuild b/media-libs/harfbuzz/harfbuzz-9999.ebuild
index 64ba1e60df03..f6617befe9b3 100644
--- a/media-libs/harfbuzz/harfbuzz-9999.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-9999.ebuild
@@ -82,7 +82,7 @@ multilib_src_configure() {
 		-Dchafa="disabled"
 
 		$(meson_feature glib)
-		$(meson_feature graphite)
+		$(meson_feature graphite graphite2)
 		$(meson_feature icu)
 		$(meson_feature introspection gobject)
 		$(meson_feature test tests)