gentoo resync : 08.01.2021

5 files changed, 30 insertions, 18 deletions

diff --git a/media-libs/harfbuzz/Manifest b/media-libs/harfbuzz/Manifest
index 7ac73b173563..d5b3b844f27c 100644
--- a/media-libs/harfbuzz/Manifest
+++ b/media-libs/harfbuzz/Manifest
@@ -1,8 +1,8 @@
 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 2674 BLAKE2B 72db7468c820529e8879777a4223fae0a67e6dc61a2bdaceccedd93123f11e07f7602c1271e6cab560ed533ac30fe8df34eed1176812a7c2881b1b6578f0de17 SHA512 488c4842618955b7e3d3c08f71701fffac5d043104f0a2c9efefd3f55869d5e257ce857f511ba4b36e7bf654d2c2dbd163898df3e929cd8732367480fcff70cc
-EBUILD harfbuzz-2.7.3.ebuild 2683 BLAKE2B 0d77179666616c88ab26ce02a7f3bc3da2da986ecc35896054072fac75cf3555dfe045290da40f383aace1493ddc1903442b1aa882b5357a167761b8a039ad68 SHA512 64b73de5828d32f3f413bfbe37e0cc129c5bc8077cc8062d0b6dbae40a0b89807d9896c4a9ce3949beb1505ef7e2a70ea860557b41f839705d98d4f98d506477
-EBUILD harfbuzz-2.7.4.ebuild 2683 BLAKE2B 0d77179666616c88ab26ce02a7f3bc3da2da986ecc35896054072fac75cf3555dfe045290da40f383aace1493ddc1903442b1aa882b5357a167761b8a039ad68 SHA512 64b73de5828d32f3f413bfbe37e0cc129c5bc8077cc8062d0b6dbae40a0b89807d9896c4a9ce3949beb1505ef7e2a70ea860557b41f839705d98d4f98d506477
-EBUILD harfbuzz-9999.ebuild 2676 BLAKE2B 97f707097c94ce4a506aea6a65e9a855c471e4b03d8d8507068489f1e4a4d7b9469e6675a00773d856f63f18cdea77c7a16386d23b6120fc78439a6a9399c374 SHA512 0ac9dde94fff7fff9376fe73f9fd492d904506dce73b0221ac2448b754cb39bb3923c110ae553e460c44e661994c0d58b18e345b984a1b1a4d26ad8d954e0618
+EBUILD harfbuzz-2.7.2.ebuild 2663 BLAKE2B 2aa5402ddfe5e332a7727e7db32237aba787f7fa8c3e4585daeb8c83d106ba5afdd3841b46520e6495e1fcee5d5d0a5b04ae0266e40bfd285c713a8e89fc08be SHA512 f8bd13ee08a1737f601caa6a379f925166d0f6f3882bfb08fa5f6f572b19cf1974133f11b48d784c08c3b43321c9c5cf86bd6f41f93cc1102817a9bece56380d
+EBUILD harfbuzz-2.7.3.ebuild 2672 BLAKE2B a024b31d374e781e5994907bd809697f2c3cb23f4ffb7bbfee88eb0257524de95d3175858c571e088fd405f09434f79a61c7b7f2b78180dd8c4e57f6741552dd SHA512 ee205d223556a5b137446355de0df0fcd5ae27be13ab266fd40988940c3a03581885e333d7be2c862aee4c127a9708e1432f937a1eb6bc87b6ea39e0fd1caef9
+EBUILD harfbuzz-2.7.4.ebuild 2775 BLAKE2B 403450e6be075cc13943a30f20e4c5beafdd780df8d614c3772ee5b8a4c34e14eb2ce42f857fa0ab54ba5a6bc6d0eb5efab8ee89a11e92341983d593a3aff9d9 SHA512 f3b51d9cc6ddb8778031e40b43821c8ac1d08f05389afed70f8595e989befe1ed27f7c16934ef286a6b544198d526e7b65d1f8ae9315c95d1e6c12b506bceae6
+EBUILD harfbuzz-9999.ebuild 2775 BLAKE2B 403450e6be075cc13943a30f20e4c5beafdd780df8d614c3772ee5b8a4c34e14eb2ce42f857fa0ab54ba5a6bc6d0eb5efab8ee89a11e92341983d593a3aff9d9 SHA512 f3b51d9cc6ddb8778031e40b43821c8ac1d08f05389afed70f8595e989befe1ed27f7c16934ef286a6b544198d526e7b65d1f8ae9315c95d1e6c12b506bceae6
 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
index 0f9b87292f7f..5cfff46530c9 100644
--- a/media-libs/harfbuzz/harfbuzz-2.7.2.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-2.7.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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 ~x86-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.7.3.ebuild
index 89e06e272b90..295706a33c0b 100644
--- a/media-libs/harfbuzz/harfbuzz-2.7.3.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-2.7.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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 ~x86-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.4.ebuild b/media-libs/harfbuzz/harfbuzz-2.7.4.ebuild
index 89e06e272b90..ca0f97a63d11 100644
--- a/media-libs/harfbuzz/harfbuzz-2.7.4.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-2.7.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 
 inherit flag-o-matic meson multilib-minimal python-any-r1 xdg-utils
 
@@ -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 ~x86-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"
@@ -34,8 +34,8 @@ RDEPEND="
 	truetype? ( >=media-libs/freetype-2.5.0.1:2=[${MULTILIB_USEDEP}] )
 "
 DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
 	>=dev-libs/gobject-introspection-common-1.34
-	test? ( ${PYTHON_DEPS} )
 "
 BDEPEND="
 	virtual/pkgconfig
@@ -44,7 +44,7 @@ BDEPEND="
 "
 
 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() {
diff --git a/media-libs/harfbuzz/harfbuzz-9999.ebuild b/media-libs/harfbuzz/harfbuzz-9999.ebuild
index d8d692333627..ca0f97a63d11 100644
--- a/media-libs/harfbuzz/harfbuzz-9999.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 
 inherit flag-o-matic meson multilib-minimal python-any-r1 xdg-utils
 
@@ -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 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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"
@@ -34,8 +34,8 @@ RDEPEND="
 	truetype? ( >=media-libs/freetype-2.5.0.1:2=[${MULTILIB_USEDEP}] )
 "
 DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
 	>=dev-libs/gobject-introspection-common-1.34
-	test? ( ${PYTHON_DEPS} )
 "
 BDEPEND="
 	virtual/pkgconfig
@@ -44,7 +44,7 @@ BDEPEND="
 "
 
 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() {