gentoo resync : 15.06.2021

5 files changed, 12 insertions, 282 deletions

diff --git a/media-libs/harfbuzz/Manifest b/media-libs/harfbuzz/Manifest
index 6ab12a4b9886..595b69aa9cc0 100644
--- a/media-libs/harfbuzz/Manifest
+++ b/media-libs/harfbuzz/Manifest
@@ -1,8 +1,4 @@
-DIST harfbuzz-2.7.4.tar.gz 16703694 BLAKE2B 9932c039bb27ee53179e500c80ae8bd24d4cb77d4fcd01c10b8b5f0fd55de6af3c265196aa80653835f464c5431f89a870a7112eaf2c715f05e1e084011fa240 SHA512 5b412e0f6d1c9142a0ef2713826cb8d6ebf348c5b64054a0676d3ce084bcff1de375dadf90e87dbbf6d0ec8e4a99339cb64b514d5464efb7e27037551e494099
-DIST harfbuzz-2.8.0.tar.gz 17000989 BLAKE2B a2b29bccf394ad8836fb534af42aaa193addc02745ffe8a82294e571483b2eb1f7ece300dbae60a0c1b9e70235109e764ded16518ab2b17e4d3d319b43404faa SHA512 736e6829fd470d1647df2c7116b4e9e6186676bc33140b3913130a9f1818f7bef2415958cab8c6bf9c5b660f43e4924d3ca220970a5c48c0c1525f601e26fd48
 DIST harfbuzz-2.8.1.tar.gz 17939717 BLAKE2B 4e6eeb0beb45e88386d994eb219479a2ed68bd1b78af3becb4ef1c89152e21924319b415e194f57c7aa4acf8031ab4ae35725b873f36b6f816aaa33a7bbb86d9 SHA512 16e43b9182d3ebd2394c2c0e0df815ca9e715d55dc7e46de4eafcde49ddf59cccae69a5340e05c8aa2ee6bc2ba46d1cffae8252d1b2a004ffe9d70c62628cf73
-EBUILD harfbuzz-2.7.4.ebuild 2830 BLAKE2B d73705a7cdc51bc7a3162ec94894e91269b070d5b19e467e4d6d123281120793e7cba62b20b5aa06e304285a97cb5aba64adca31213b3534a77ad52367f223aa SHA512 b9eb722d9ead132cb2bc01029b9a3fe6e91d731c2543fbfa4b6ca2b96e21500a26801f30cc1f6561a55d71befc60940d813cc6c901c790909a7c17613b817459
-EBUILD harfbuzz-2.8.0.ebuild 2838 BLAKE2B 0388c4fa0d71c09d0299437d3335d7f0a6dffdca8310a67db597227c04672964fcd33914a081d45084749210358db7f505f968ea07af1ade0843df92b1706952 SHA512 6341f907d560396b101de4530aa08624428b5d16a30441c91bcc6cf509c55164e079a94475bebf03cda5fb24cbaecd294a611e63b2eda57e519419f39258aef4
-EBUILD harfbuzz-2.8.1.ebuild 2830 BLAKE2B d73705a7cdc51bc7a3162ec94894e91269b070d5b19e467e4d6d123281120793e7cba62b20b5aa06e304285a97cb5aba64adca31213b3534a77ad52367f223aa SHA512 b9eb722d9ead132cb2bc01029b9a3fe6e91d731c2543fbfa4b6ca2b96e21500a26801f30cc1f6561a55d71befc60940d813cc6c901c790909a7c17613b817459
-EBUILD harfbuzz-9999.ebuild 2838 BLAKE2B 0388c4fa0d71c09d0299437d3335d7f0a6dffdca8310a67db597227c04672964fcd33914a081d45084749210358db7f505f968ea07af1ade0843df92b1706952 SHA512 6341f907d560396b101de4530aa08624428b5d16a30441c91bcc6cf509c55164e079a94475bebf03cda5fb24cbaecd294a611e63b2eda57e519419f39258aef4
+EBUILD harfbuzz-2.8.1.ebuild 2492 BLAKE2B fa89daa0b745c7b5035bcb4e94dfee1e8d7bcdaac1a59e2f394a5f705254fe463922251d95e87868c78e8d4123fda3bb946757a18054cd86337de1484a6a679d SHA512 582d14b536c6a9bddfe6a74b00e0e30672d5e4fc86786cf7dfa5d6fb52432b2fc31ad081c44f7b1a4c07d8f2b5362a0448ef04bc28827e836a1b648e0254f20b
+EBUILD harfbuzz-9999.ebuild 2500 BLAKE2B 93be2b3189be9c9b6506e0741743c0c76231aaccf619d1021cccd00bafc2c8506f8e3209d849a8762b2c12e9f4accb9bd9492de81228cb99d7da1c510e682a15 SHA512 a0d35c7158d698fe597be089897aaeeb22ed2f1a61e0f2d72fd42562d8466482e04736f46ca493f07cb10d88a39e70bfd36bf4d7346a359bc54bb1ac0f5aea2d
 MISC metadata.xml 739 BLAKE2B df7724d5cef26b569f76d41c808f99a1ecf44631f0bae96fbc2a9b4f5981061b55c60d69b1b64d966897f223a3d3b5cc4325a3ac780599ed76591fc2044b4988 SHA512 192f7abc191044f267bddb4db7d91f9b78926f4a361802f607bfe4635d7cf63398c289bc52009ad4d3bc6f92684cafd8b40e48f1e0f8cdaef9a4e27f538e7dbd
diff --git a/media-libs/harfbuzz/harfbuzz-2.7.4.ebuild b/media-libs/harfbuzz/harfbuzz-2.7.4.ebuild
deleted file mode 100644
index faa0655ca207..000000000000
--- a/media-libs/harfbuzz/harfbuzz-2.7.4.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-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
-"
-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 's:tests/macos.tests::' \
-		test/shaping/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
-}
-
-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.8.0.ebuild b/media-libs/harfbuzz/harfbuzz-2.8.0.ebuild
deleted file mode 100644
index 48efc9f4fcbc..000000000000
--- a/media-libs/harfbuzz/harfbuzz-2.8.0.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-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
-"
-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 's:tests/macos.tests::' \
-		test/shaping/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
-}
-
-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.8.1.ebuild b/media-libs/harfbuzz/harfbuzz-2.8.1.ebuild
index faa0655ca207..453389b63317 100644
--- a/media-libs/harfbuzz/harfbuzz-2.8.1.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-2.8.1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{7..9} )
 
-inherit flag-o-matic meson multilib-minimal python-any-r1 xdg-utils
+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"
@@ -73,23 +73,15 @@ src_prepare() {
 	done
 }
 
-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)"
+		$(meson_native_use_feature cairo)
 		-Dcoretext="disabled"
-		-Ddocs="$(meson_multilib_native_feature doc)"
+		$(meson_native_use_feature doc)
 		-Dfontconfig="disabled" #609300
-		-Dintrospection="$(meson_multilib_native_feature introspection)"
-		-Dstatic="$(usex static-libs true false)"
+		$(meson_native_use_feature introspection)
+		$(meson_use static-libs static)
 		$(meson_feature glib)
 		$(meson_feature graphite)
 		$(meson_feature icu)
@@ -99,15 +91,3 @@ multilib_src_configure() {
 	)
 	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-9999.ebuild b/media-libs/harfbuzz/harfbuzz-9999.ebuild
index 48efc9f4fcbc..9f52c19d3421 100644
--- a/media-libs/harfbuzz/harfbuzz-9999.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-9999.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{7..9} )
 
-inherit flag-o-matic meson multilib-minimal python-any-r1 xdg-utils
+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"
@@ -73,23 +73,15 @@ src_prepare() {
 	done
 }
 
-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)"
+		$(meson_native_use_feature cairo)
 		-Dcoretext="disabled"
-		-Ddocs="$(meson_multilib_native_feature doc)"
+		$(meson_native_use_feature doc)
 		-Dfontconfig="disabled" #609300
-		-Dintrospection="$(meson_multilib_native_feature introspection)"
-		-Dstatic="$(usex static-libs true false)"
+		$(meson_native_use_feature introspection)
+		$(meson_use static-libs static)
 		$(meson_feature glib)
 		$(meson_feature graphite)
 		$(meson_feature icu)
@@ -99,15 +91,3 @@ multilib_src_configure() {
 	)
 	meson_src_configure
 }
-
-multilib_src_compile() {
-	meson_src_compile
-}
-
-multilib_src_install() {
-	meson_src_install
-}
-
-multilib_src_install_all() {
-	einstalldocs
-}