gentoo resync : 15.06.2021

3 files changed, 8 insertions, 64 deletions

diff --git a/dev-libs/wayland/Manifest b/dev-libs/wayland/Manifest
index 6e684d530617..7b06f8937421 100644
--- a/dev-libs/wayland/Manifest
+++ b/dev-libs/wayland/Manifest
@@ -1,4 +1,4 @@
 DIST wayland-1.19.0.tar.xz 456380 BLAKE2B 0f70bb02e890898c4763001884527067adb686abe9a2b9325badf1730d411d269c437037afc298eec8075eb1e3845f5b81b8ed3d702908388a54e7063cbea91a SHA512 d8a86f5e23e4a88e7c84b82fdb51eb350419086afe462ecb2f4d5c3ba9290ede310cbbcffd60215219ddccf5bad4adec21a5ebfbef6577200f66ac7a1b64a5ef
-EBUILD wayland-1.19.0.ebuild 1820 BLAKE2B 9cda545cdbdc652d3fae5d76e9e27947b9a15fa5f8215b83fdf46afd3e6717a6c1d3ca0a91bdfed6d2146a883a01790b06b746f7dd1d577f2d394ef34449dd09 SHA512 89bfba7c9ea7fe6770b039abe27f1a9f3e12d3d82d2fa2a6eb229d7a01df3a31c9237f4959b2bde84d9e6f0c28cd22dbebbd9bae3821e37e437688e9f335e694
-EBUILD wayland-9999.ebuild 1827 BLAKE2B f239a647ff50a6ed23c90d3439caff612116c5bddbc642842142015ec4bb592de91f934804c5487957c473b838080514b9fc43c18316df05a58fe8bc9fe21dca SHA512 ff5751e03b6f098ac784c5d10bddcff73a831974537b795dd6716b813f97b412110f0fcf145f43271636646fd42e8b407a29f99611ced9b29a1c374149fdd8c7
+EBUILD wayland-1.19.0.ebuild 1469 BLAKE2B a44e69efbd172377a84d8bfe46ca35a9f10652f37ffc949d7b59d9130ea460ab42db6affacf076bc2bd574c70629d814cf829d452a88ae7cfc0c135097a08d72 SHA512 3a368fef2f2170c29ffc2598b0cf634109c10cb1d845803299a07a3a6634864650283190fe81cda401c2e4de488cdd0f632145a590caee959c25387461fe380f
+EBUILD wayland-9999.ebuild 1476 BLAKE2B f367b4aff2adba99306d601b4abe4c41fcf803eba363ef8f265e4893beafab9477ebdcc7f1373734cdb58ee0205aeb0dba0087691d858a649396cfede9f0adcf SHA512 1f5076f2c7699bdbd14d2d5e63c43eaee550d109a39709e1435204c721036af9eddb13bf4b6fa57d930e142347d2cfae139c037677e7474d967908b9d23578f9
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/dev-libs/wayland/wayland-1.19.0.ebuild b/dev-libs/wayland/wayland-1.19.0.ebuild
index 765bef844873..1e94dde694a5 100644
--- a/dev-libs/wayland/wayland-1.19.0.ebuild
+++ b/dev-libs/wayland/wayland-1.19.0.ebuild
@@ -10,7 +10,7 @@ else
 	SRC_URI="https://wayland.freedesktop.org/releases/${P}.tar.xz"
 	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 fi
-inherit meson multilib-minimal
+inherit meson-multilib
 
 DESCRIPTION="Wayland protocol libraries"
 HOMEPAGE="https://wayland.freedesktop.org/ https://gitlab.freedesktop.org/wayland/wayland"
@@ -35,40 +35,16 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-meson_multilib() {
-	if multilib_is_native_abi; then
-		echo true
-	else
-		echo false
-	fi
-}
-
-meson_multilib_native_use() {
-	if multilib_is_native_abi && use "$1"; then
-		echo true
-	else
-		echo false
-	fi
-}
-
 multilib_src_configure() {
 	local emesonargs=(
-		-Ddocumentation=$(meson_multilib_native_use doc)
-		-Ddtd_validation=$(meson_multilib)
+		$(meson_native_use_bool doc documentation)
+		$(meson_native_true dtd_validation)
 		-Dlibraries=true
 		-Dscanner=false
 	)
 	meson_src_configure
 }
 
-multilib_src_compile() {
-	meson_src_compile
-}
-
-multilib_src_test() {
-	meson_src_test
-}
-
 src_test() {
 	# We set it on purpose to only a short subdir name, as socket paths are
 	# created in there, which are 108 byte limited. With this it hopefully
@@ -79,7 +55,3 @@ src_test() {
 
 	multilib-minimal_src_test
 }
-
-multilib_src_install() {
-	meson_src_install
-}
diff --git a/dev-libs/wayland/wayland-9999.ebuild b/dev-libs/wayland/wayland-9999.ebuild
index d069ea46340e..058e90a73824 100644
--- a/dev-libs/wayland/wayland-9999.ebuild
+++ b/dev-libs/wayland/wayland-9999.ebuild
@@ -10,7 +10,7 @@ else
 	SRC_URI="https://wayland.freedesktop.org/releases/${P}.tar.xz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
-inherit meson multilib-minimal
+inherit meson-multilib
 
 DESCRIPTION="Wayland protocol libraries"
 HOMEPAGE="https://wayland.freedesktop.org/ https://gitlab.freedesktop.org/wayland/wayland"
@@ -35,40 +35,16 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-meson_multilib() {
-	if multilib_is_native_abi; then
-		echo true
-	else
-		echo false
-	fi
-}
-
-meson_multilib_native_use() {
-	if multilib_is_native_abi && use "$1"; then
-		echo true
-	else
-		echo false
-	fi
-}
-
 multilib_src_configure() {
 	local emesonargs=(
-		-Ddocumentation=$(meson_multilib_native_use doc)
-		-Ddtd_validation=$(meson_multilib)
+		$(meson_native_use_bool doc documentation)
+		$(meson_native_true dtd_validation)
 		-Dlibraries=true
 		-Dscanner=false
 	)
 	meson_src_configure
 }
 
-multilib_src_compile() {
-	meson_src_compile
-}
-
-multilib_src_test() {
-	meson_src_test
-}
-
 src_test() {
 	# We set it on purpose to only a short subdir name, as socket paths are
 	# created in there, which are 108 byte limited. With this it hopefully
@@ -79,7 +55,3 @@ src_test() {
 
 	multilib-minimal_src_test
 }
-
-multilib_src_install() {
-	meson_src_install
-}