gentoo resync : 15.06.2021

3 files changed, 5 insertions, 29 deletions

diff --git a/dev-util/wayland-scanner/Manifest b/dev-util/wayland-scanner/Manifest
index aff82dd70820..616835476a72 100644
--- a/dev-util/wayland-scanner/Manifest
+++ b/dev-util/wayland-scanner/Manifest
@@ -1,4 +1,4 @@
 DIST wayland-1.19.0.tar.xz 456380 BLAKE2B 0f70bb02e890898c4763001884527067adb686abe9a2b9325badf1730d411d269c437037afc298eec8075eb1e3845f5b81b8ed3d702908388a54e7063cbea91a SHA512 d8a86f5e23e4a88e7c84b82fdb51eb350419086afe462ecb2f4d5c3ba9290ede310cbbcffd60215219ddccf5bad4adec21a5ebfbef6577200f66ac7a1b64a5ef
-EBUILD wayland-scanner-1.19.0.ebuild 1041 BLAKE2B bb4bcd14432c7c64e7fb6be2408ff9f7c29301fda057d386c59e31cb4fac670812fe7ea90f697db9b4480849ff60ef07d8b594f05345f130bf14b9e86f7997d3 SHA512 2951bdaab11251d1d435428754586d4939c96d7484f260e57ae25320e17d303856389f94c805f394d2c0b353c80feeb49d1d3ca0ea4e232fe43353234c6cdc5d
-EBUILD wayland-scanner-9999.ebuild 1048 BLAKE2B a18ab822990665a586d1a6a61c6b2c458efb10a18993ea07b2ef654cad4c7f3101687dd83fb96c0fe3ef6c14c2b26f6ab9850a493dc2d770b321770de055c36c SHA512 4004be25df48935c51c70c6c403cfaa079123a054b28efe8c535008e5cee8b77abe19504681b7fdba2c80a7dc9eaa7cd1e9465196e1eccf7189521ccb57ee749
+EBUILD wayland-scanner-1.19.0.ebuild 898 BLAKE2B ab8daa932983ac49f4814a55c91efb2469b5d0dc04e1f1ed5aa75d77b219ef97281dea8bec9ec19dd46abb8b02e43f87b61d2725c76e2575130f83598b2c7146 SHA512 9517e36eabeb6638030adace3322dcabdcdae0a31f17cfd54a835f11dfbc4292b37d66335fa4e69391370d2df123518ac4ac05edb6ed48c97ec0483fa57d86c0
+EBUILD wayland-scanner-9999.ebuild 905 BLAKE2B 331d51a38154e1ecf329e876db8b3b47ea94cd480a214b1a76231127bf6a94644f2d388bd2ed8c30010535173182adbf11d98610e314dd87e2c92cd1c5c52b1e SHA512 ed4cfab969ecb5eeafbdd6f464d693b2c9390127bc88c98e5dbb28d2e3f964763f8f5fc2bdaaf3051e0c88be8c02daf07cf3dbfac04f418166e65f5ffcc1d9a0
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/dev-util/wayland-scanner/wayland-scanner-1.19.0.ebuild b/dev-util/wayland-scanner/wayland-scanner-1.19.0.ebuild
index 65fd72ba7ef4..fd089bb57e88 100644
--- a/dev-util/wayland-scanner/wayland-scanner-1.19.0.ebuild
+++ b/dev-util/wayland-scanner/wayland-scanner-1.19.0.ebuild
@@ -11,7 +11,7 @@ else
 	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 	S="${WORKDIR}/wayland-${PV}"
 fi
-inherit meson multilib-minimal
+inherit meson-multilib
 
 DESCRIPTION="wayland-scanner tool"
 HOMEPAGE="https://wayland.freedesktop.org/ https://gitlab.freedesktop.org/wayland/wayland"
@@ -35,15 +35,3 @@ multilib_src_configure() {
 	)
 	meson_src_configure
 }
-
-multilib_src_compile() {
-	meson_src_compile
-}
-
-multilib_src_test() {
-	meson_src_test
-}
-
-multilib_src_install() {
-	meson_src_install
-}
diff --git a/dev-util/wayland-scanner/wayland-scanner-9999.ebuild b/dev-util/wayland-scanner/wayland-scanner-9999.ebuild
index eeb424d9d3c1..0e0f4d733eba 100644
--- a/dev-util/wayland-scanner/wayland-scanner-9999.ebuild
+++ b/dev-util/wayland-scanner/wayland-scanner-9999.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
@@ -11,7 +11,7 @@ else
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 	S="${WORKDIR}/wayland-${PV}"
 fi
-inherit meson multilib-minimal
+inherit meson-multilib
 
 DESCRIPTION="wayland-scanner tool"
 HOMEPAGE="https://wayland.freedesktop.org/ https://gitlab.freedesktop.org/wayland/wayland"
@@ -35,15 +35,3 @@ multilib_src_configure() {
 	)
 	meson_src_configure
 }
-
-multilib_src_compile() {
-	meson_src_compile
-}
-
-multilib_src_test() {
-	meson_src_test
-}
-
-multilib_src_install() {
-	meson_src_install
-}