gentoo resync : 20.03.2021

4 files changed, 13 insertions, 113 deletions

diff --git a/media-libs/harfbuzz/Manifest b/media-libs/harfbuzz/Manifest
index d4d52ab6ee96..a2d0c46878f7 100644
--- a/media-libs/harfbuzz/Manifest
+++ b/media-libs/harfbuzz/Manifest
@@ -1,8 +1,6 @@
-DIST harfbuzz-2.7.2.tar.gz 16605557 BLAKE2B 246ab64e29afcadc692b57bad84acdea1f9200a63f6f8b1519d12b8515ec65dc45e2edf3abdde473b71364427a689d92ce2ee25c514edf4b1e680dd423d774ee SHA512 2eeb198dab1ed1cc7d10c3890293ff40e9f37372413877a5bd44d66e88d8460a81f51cbe71c328b1300f542ca8de3269749d1d01d0c324c8b95a9c038fbe1521
-DIST harfbuzz-2.7.3.tar.gz 16696840 BLAKE2B 95eb0fc86caf51f512520ba599e9be08b4a9f6565a3e52280f9454043b524e7b04194e506b5122db066966125fa4583b7be856005b53726a0192d3f08fb5cdcb SHA512 1fa1cfd7b55446309413deb6c139ff9015a013b480da422482e75fa11b130b7dcfaeabfffc513a2027732d0b58fbd39dede2f3eb516214d5efd901a2d1e6af8f
 DIST harfbuzz-2.7.4.tar.gz 16703694 BLAKE2B 9932c039bb27ee53179e500c80ae8bd24d4cb77d4fcd01c10b8b5f0fd55de6af3c265196aa80653835f464c5431f89a870a7112eaf2c715f05e1e084011fa240 SHA512 5b412e0f6d1c9142a0ef2713826cb8d6ebf348c5b64054a0676d3ce084bcff1de375dadf90e87dbbf6d0ec8e4a99339cb64b514d5464efb7e27037551e494099
-EBUILD harfbuzz-2.7.2.ebuild 2661 BLAKE2B a6bd48d29506d99817b97a68464f7f662b72e6c0e8df0f72def1b5ca25cc145645cd96663487b4c3152fb6b99837167700677f4e2b8785f23d93cbaa80abb900 SHA512 733df9dbbe4036f88f66672da20c58345a42f602c097cb846a75c34626dae380d70cef4ed4f0e4a8909518c93ffb9dbd5ddad8a9f98d6c163e395b5f33860353
-EBUILD harfbuzz-2.7.3.ebuild 2670 BLAKE2B 7440f374a018e052194a2deeec2f810839769466de248dc1d9c66db2bf5321f3706e8e6ac186b9457fa1e3f189489746a4c707d8c0763076b17d255e90a0f193 SHA512 a62aa5bb0e35b5d68022c43985eaad257306900ba4399b4e65c9a4fd3f99b78d6220204eb2148cb936c84656a3edaf55513afebe74b996b8b7cda033e89e12af
-EBUILD harfbuzz-2.7.4.ebuild 2768 BLAKE2B baf2486a8dd32b590c304d7c1f2da1e0318aa8a173d8249088061b38998ccfe5625f5af245220f312b0dd2a5589f8931748df0d340bbc2b338f3d024e750fef6 SHA512 b52d9c5aa13a76c713670b19090d042d3b8e7c74ca0fa3e95cc02cb9155a39cd8e6e890c99623130602b0f1226f5e75f368d96773129a79ebe6759d6fc26be57
+DIST harfbuzz-2.8.0.tar.gz 17000989 BLAKE2B a2b29bccf394ad8836fb534af42aaa193addc02745ffe8a82294e571483b2eb1f7ece300dbae60a0c1b9e70235109e764ded16518ab2b17e4d3d319b43404faa SHA512 736e6829fd470d1647df2c7116b4e9e6186676bc33140b3913130a9f1818f7bef2415958cab8c6bf9c5b660f43e4924d3ca220970a5c48c0c1525f601e26fd48
+EBUILD harfbuzz-2.7.4.ebuild 2767 BLAKE2B a1c4735ac9cbc60c398c2aecd86d6fdf700caf0c47d19cde266b3b471874e9761ad72f30299adc812ecbf9c65eb2c8928ebbe6c5f6d16d985812d0f1779d4dc0 SHA512 66f1d810305e2108de21d7fab29f499bb9992c32adbf88dcc37acc9aceee3c8feaca89ee9be8c85b30b6d358fe0d1c0e63af99cbc2d9847cf345e49e30aa84fc
+EBUILD harfbuzz-2.8.0.ebuild 2775 BLAKE2B 09138736a479f0bbf49c50e232bf66cff70dfc78e46166f3be07231002b3a1c3813be2c04af35468f0fab9459f4a7e58dc7b8d70eb56ddd94a01b67d343a0ed3 SHA512 fdc7e80b435ac37008654bac7771a00a0e06878fb9ea217b914f57a954ddd1266cbfdf737cbccbe624596d4a14fa3ff49f13a69644ecee595c670593280d0ac8
 EBUILD harfbuzz-9999.ebuild 2775 BLAKE2B 09138736a479f0bbf49c50e232bf66cff70dfc78e46166f3be07231002b3a1c3813be2c04af35468f0fab9459f4a7e58dc7b8d70eb56ddd94a01b67d343a0ed3 SHA512 fdc7e80b435ac37008654bac7771a00a0e06878fb9ea217b914f57a954ddd1266cbfdf737cbccbe624596d4a14fa3ff49f13a69644ecee595c670593280d0ac8
 MISC metadata.xml 739 BLAKE2B df7724d5cef26b569f76d41c808f99a1ecf44631f0bae96fbc2a9b4f5981061b55c60d69b1b64d966897f223a3d3b5cc4325a3ac780599ed76591fc2044b4988 SHA512 192f7abc191044f267bddb4db7d91f9b78926f4a361802f607bfe4635d7cf63398c289bc52009ad4d3bc6f92684cafd8b40e48f1e0f8cdaef9a4e27f538e7dbd
diff --git a/media-libs/harfbuzz/harfbuzz-2.7.2.ebuild b/media-libs/harfbuzz/harfbuzz-2.7.2.ebuild
deleted file mode 100644
index 95ab9eb8acd3..000000000000
--- a/media-libs/harfbuzz/harfbuzz-2.7.2.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit flag-o-matic meson multilib-minimal 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 +glib +graphite icu +introspection static-libs 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
-	test? ( ${PYTHON_DEPS} )
-"
-BDEPEND="
-	virtual/pkgconfig
-	doc? ( dev-util/gtk-doc )
-	introspection? ( dev-util/glib-utils )
-"
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-	if ! use debug ; then
-		append-cppflags -DHB_NDEBUG
-	fi
-}
-
-src_prepare() {
-	default
-
-	xdg_environment_reset
-
-	sed -i \
-		-e 's:tests/macos.tests::' \
-		test/shaping/data/in-house/Makefile.sources \
-		|| die # bug 726120
-
-	# bug 618772
-	append-cxxflags -std=c++14
-}
-
-meson_multilib_native_feature() {
-	if multilib_is_native_abi && use "$1" ; then
-		echo "enabled"
-	else
-		echo "disabled"
-	fi
-}
-
-multilib_src_configure() {
-	# harfbuzz-gobject only used for instrospection, bug #535852
-	local emesonargs=(
-		-Dcairo="$(meson_multilib_native_feature cairo)"
-		-Dcoretext="disabled"
-		-Ddocs="$(meson_multilib_native_feature doc)"
-		-Dfontconfig="disabled" #609300
-		-Dintrospection="$(meson_multilib_native_feature introspection)"
-		-Dstatic="$(usex static-libs true false)"
-		$(meson_feature glib)
-		$(meson_feature graphite)
-		$(meson_feature icu)
-		$(meson_feature introspection gobject)
-		$(meson_feature test tests)
-		$(meson_feature truetype freetype)
-	)
-	meson_src_configure
-}
-
-multilib_src_compile() {
-	meson_src_compile
-}
-
-multilib_src_install() {
-	meson_src_install
-}
-
-multilib_src_install_all() {
-	einstalldocs
-}
diff --git a/media-libs/harfbuzz/harfbuzz-2.7.4.ebuild b/media-libs/harfbuzz/harfbuzz-2.7.4.ebuild
index 30f4061f3c5d..0a5cf370b8b6 100644
--- a/media-libs/harfbuzz/harfbuzz-2.7.4.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-2.7.4.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-2.7.3.ebuild b/media-libs/harfbuzz/harfbuzz-2.8.0.ebuild
index aa205f2fc508..dd5ebd99dc19 100644
--- a/media-libs/harfbuzz/harfbuzz-2.7.3.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-2.8.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7..9} )
 
 inherit flag-o-matic meson multilib-minimal python-any-r1 xdg-utils
 
@@ -35,16 +35,16 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	>=dev-libs/gobject-introspection-common-1.34
-	test? ( ${PYTHON_DEPS} )
 "
 BDEPEND="
+	${PYTHON_DEPS}
 	virtual/pkgconfig
 	doc? ( dev-util/gtk-doc )
 	introspection? ( dev-util/glib-utils )
 "
 
 pkg_setup() {
-	use test && python-any-r1_pkg_setup
+	python-any-r1_pkg_setup
 	if ! use debug ; then
 		append-cppflags -DHB_NDEBUG
 	fi
@@ -62,6 +62,12 @@ src_prepare() {
 
 	# bug 618772
 	append-cxxflags -std=c++14
+
+	# bug 762415
+	local pyscript
+	for pyscript in $(find -type f -name "*.py") ; do
+		python_fix_shebang -q "${pyscript}"
+	done
 }
 
 meson_multilib_native_feature() {