[gentoo-commits] repo/gentoo:master commit in: media-libs/waffle/

[Matt Turner]

commit:     00e21d92f986a86d3868fe7ff066c68b15176a72
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Fri May 28 01:21:46 2021 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Fri Jun  4 01:14:11 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=00e21d92

media-libs/waffle: Switch to meson-multilib

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 media-libs/waffle/waffle-1.7.0.ebuild | 8 ++------
 media-libs/waffle/waffle-9999.ebuild  | 8 ++------
 2 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/media-libs/waffle/waffle-1.7.0.ebuild 
b/media-libs/waffle/waffle-1.7.0.ebuild
index 1a2174a6add..b58cfad30b9 100644
--- a/media-libs/waffle/waffle-1.7.0.ebuild
+++ b/media-libs/waffle/waffle-1.7.0.ebuild
@@ -11,7 +11,7 @@ else
        KEYWORDS="amd64 arm ~arm64 ~ppc ~ppc64 x86"
        S="${WORKDIR}"/${PN}-v${PV}
 fi
-inherit meson multilib-minimal ${GIT_ECLASS}
+inherit meson-multilib ${GIT_ECLASS}
 
 DESCRIPTION="Library that allows selection of GL API and of window system at 
runtime"
 HOMEPAGE="http://www.waffle-gl.org/ https://gitlab.freedesktop.org/mesa/waffle";
@@ -49,16 +49,12 @@ multilib_src_configure() {
                $(meson_feature X x11_egl)
                $(meson_feature gbm)
                $(meson_feature egl surfaceless_egl)
-               -Dbuild-manpages=$(multilib_is_native_abi && echo true || echo 
false)
+               $(meson_native_true build-manpages)
                -Dbuild-tests=false
        )
        meson_src_configure
 }
 
-multilib_src_compile() {
-       meson_src_compile
-}
-
 multilib_src_install() {
        meson_src_install
 

diff --git a/media-libs/waffle/waffle-9999.ebuild 
b/media-libs/waffle/waffle-9999.ebuild
index 1a2174a6add..b58cfad30b9 100644
--- a/media-libs/waffle/waffle-9999.ebuild
+++ b/media-libs/waffle/waffle-9999.ebuild
@@ -11,7 +11,7 @@ else
        KEYWORDS="amd64 arm ~arm64 ~ppc ~ppc64 x86"
        S="${WORKDIR}"/${PN}-v${PV}
 fi
-inherit meson multilib-minimal ${GIT_ECLASS}
+inherit meson-multilib ${GIT_ECLASS}
 
 DESCRIPTION="Library that allows selection of GL API and of window system at 
runtime"
 HOMEPAGE="http://www.waffle-gl.org/ https://gitlab.freedesktop.org/mesa/waffle";
@@ -49,16 +49,12 @@ multilib_src_configure() {
                $(meson_feature X x11_egl)
                $(meson_feature gbm)
                $(meson_feature egl surfaceless_egl)
-               -Dbuild-manpages=$(multilib_is_native_abi && echo true || echo 
false)
+               $(meson_native_true build-manpages)
                -Dbuild-tests=false
        )
        meson_src_configure
 }
 
-multilib_src_compile() {
-       meson_src_compile
-}
-
 multilib_src_install() {
        meson_src_install