gentoo auto-resync : 25:07:2022 - 02:55:08

3 files changed, 110 insertions, 6 deletions

diff --git a/media-libs/harfbuzz/Manifest b/media-libs/harfbuzz/Manifest
index 3a96c1ee36c0..4fcea960ab31 100644
--- a/media-libs/harfbuzz/Manifest
+++ b/media-libs/harfbuzz/Manifest
@@ -1,6 +1,8 @@
 DIST harfbuzz-4.3.0.tar.gz 29200217 BLAKE2B dfe5e3b47e3d89a5ad7c6eaf6d274027a0eb05d1994b922d3124c97270f34353384c0161d8815fb2e379e82c8bdf046843902ba53db38daa4348e99d99255900 SHA512 bccf7cfb06ac18a9a9bf465c30dbfb51d73762a6667b3a069a85f9f597e6d27858e9e39a36cce12e23ec5b002b9e572638bf00c76bdea66545ae67a2bb7915f4
 DIST harfbuzz-4.4.1.tar.gz 29231251 BLAKE2B 3947084ea2eedd76d64acfc5286ecd14d772ce0507163bc2c54a86579556a8799959ff4d47ea2919ee8472f8fe50d0266d325e3d0a7024f2ae8dcdf48d14f37e SHA512 bbc415d7b74408b1e8d34bfbc19a3cab002471fdd56d71b469c3129f0eae5532d5c7aaae7bb5cc3942fea6008d2ed9e96a7b20b10f4f5e46db63cecfa5c0248e
+DIST harfbuzz-5.0.1.tar.gz 29291175 BLAKE2B a30512dbceba7eb339164cfe77685e6ccd8338c297a080341236e90bbcf7451eb27d5227422e040d92ff4267f4d97c377a66cdcaff45ea2b1e69de0602047ae0 SHA512 9d05b97dfce248634b6b3ff69fac5cc344f0c8265bf05595b74b0b060049dba082d358184662b8ea045cd51c3d07e7c4a4804513052094566b777c33ec5af89c
 EBUILD harfbuzz-4.3.0.ebuild 2568 BLAKE2B cd0fd13772b43e47a8c90a5912ed5839c09599766e865e5fd7633a0694b9f379ad4c19c7c4b28af4aebaa839e5eefe45138254b075954427a9b105fa0247a52c SHA512 6d4ab2b384c575df4da788cb4042ce3ea88010d1513d1a84a340881e26efeefec5eb46179758eb06b377bedeba5ad999f69ef9a5e33c0779c4d25394b9d1aaf7
 EBUILD harfbuzz-4.4.1.ebuild 2576 BLAKE2B 09004b39b15d8579369e445f9ed43969fe07bae360d3ff8f64c9652427bb1f5ca4aceb444b126b1b5b3fc84317b3edba9d88fec4009392685ad153006bd08838 SHA512 cae3657529a8ae6448d54a705b2ea7665b02256b078bdff2ee4d38f6a3eb1a8ec981c076c2d39bb944978ed6a68778ae7ef22d4273ca85395b1110f8aa03c21e
-EBUILD harfbuzz-9999.ebuild 2569 BLAKE2B b0d0ee97ba2e80f55c7ebd237fd10ba16c3be21fb4cdfae92a8332f130e67ab1cf6d8a5bebd40fd14e1f114802f82be2d66a509c4dc693eba9df5863d14ae625 SHA512 072199bab29c5d69097a34a3a67e31a7f092ef4aa5ff14b9f8d543348b7853beb90df791f9f7c9425158f586b506b8b1a9ad19d7cd3d435114568c78ad6f3d5d
+EBUILD harfbuzz-5.0.1.ebuild 2582 BLAKE2B a1bf615e3b0e26a5e44504f9b65795e6431df96e35a8dc1cfc1f03f97538b2297aa1fba6a2a137cda94b3b41d2b29683d15447fa69fc9f55e9bc27a85424a91c SHA512 b50293b623a32972a5ba1c3dfa2a0aa44ec076bdb2f44cea30131309ab238cf816bf87c3740dd567e042c8a053514e49d02f3eec5ed14ff5bd47f4f426a58325
+EBUILD harfbuzz-9999.ebuild 2582 BLAKE2B a1bf615e3b0e26a5e44504f9b65795e6431df96e35a8dc1cfc1f03f97538b2297aa1fba6a2a137cda94b3b41d2b29683d15447fa69fc9f55e9bc27a85424a91c SHA512 b50293b623a32972a5ba1c3dfa2a0aa44ec076bdb2f44cea30131309ab238cf816bf87c3740dd567e042c8a053514e49d02f3eec5ed14ff5bd47f4f426a58325
 MISC metadata.xml 706 BLAKE2B 8f8639d60a36707cea3dce7e25634fbc6204c6a685dd73d2a470678ae5cca042749378e84a9472a888532310fa001dc0db42cdb60b02f9534e422da67d34e05b SHA512 c573f3ccb80e692a061944ec0d8d54342f9a4ae3f082e784e729e13ecb4b20f0d4ab59d6446ec51a8755842653315922469475d9c2e508db5b3712609fa70411
diff --git a/media-libs/harfbuzz/harfbuzz-5.0.1.ebuild b/media-libs/harfbuzz/harfbuzz-5.0.1.ebuild
new file mode 100644
index 000000000000..c3af9764765b
--- /dev/null
+++ b/media-libs/harfbuzz/harfbuzz-5.0.1.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+
+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 ~loong ~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
+
+	# bug #726120
+	sed -i \
+		-e '/tests\/macos\.tests/d' \
+		test/shape/data/in-house/Makefile.sources \
+		|| die
+
+	# 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 d69105f6a7dc..c3af9764765b 100644
--- a/media-libs/harfbuzz/harfbuzz-9999.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-9999.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 ~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 ~loong ~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"
@@ -57,18 +57,19 @@ src_prepare() {
 
 	xdg_environment_reset
 
+	# bug #726120
 	sed -i \
 		-e '/tests\/macos\.tests/d' \
 		test/shape/data/in-house/Makefile.sources \
-		|| die # bug 726120
+		|| die
 
-	# bug 618772
+	# bug #618772
 	append-cxxflags -std=c++14
 
-	# bug 790359
+	# bug #790359
 	filter-flags -fexceptions -fthreadsafe-statics
 
-	# bug 762415
+	# bug #762415
 	local pyscript
 	for pyscript in $(find -type f -name "*.py") ; do
 		python_fix_shebang -q "${pyscript}"
@@ -94,5 +95,6 @@ multilib_src_configure() {
 
 		$(meson_use experimental experimental_api)
 	)
+
 	meson_src_configure
 }