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

[Matt Turner]

commit:     8debb747b243851cc2b12d05583a0b8e8d27f22c
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Fri May 28 01:15:27 2021 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Fri Jun  4 01:14:10 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8debb747

media-libs/libglvnd: Switch to meson-multilib

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

 media-libs/libglvnd/libglvnd-1.3.3.ebuild | 10 +---------
 media-libs/libglvnd/libglvnd-9999.ebuild  | 10 +---------
 2 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/media-libs/libglvnd/libglvnd-1.3.3.ebuild 
b/media-libs/libglvnd/libglvnd-1.3.3.ebuild
index b995f4c6c6a..d7d545a2ab8 100644
--- a/media-libs/libglvnd/libglvnd-1.3.3.ebuild
+++ b/media-libs/libglvnd/libglvnd-1.3.3.ebuild
@@ -12,7 +12,7 @@ fi
 PYTHON_COMPAT=( python3_{7..9} )
 VIRTUALX_REQUIRED=manual
 
-inherit ${GIT_ECLASS} meson multilib-minimal python-any-r1 virtualx
+inherit ${GIT_ECLASS} meson-multilib python-any-r1 virtualx
 
 DESCRIPTION="The GL Vendor-Neutral Dispatch library"
 HOMEPAGE="https://gitlab.freedesktop.org/glvnd/libglvnd";
@@ -56,10 +56,6 @@ multilib_src_configure() {
        meson_src_configure
 }
 
-multilib_src_compile() {
-       meson_src_compile
-}
-
 multilib_src_test() {
        if use X; then
                virtx meson_src_test
@@ -67,7 +63,3 @@ multilib_src_test() {
                meson_src_test
        fi
 }
-
-multilib_src_install() {
-       meson_src_install
-}

diff --git a/media-libs/libglvnd/libglvnd-9999.ebuild 
b/media-libs/libglvnd/libglvnd-9999.ebuild
index 00a568b16f9..43050041496 100644
--- a/media-libs/libglvnd/libglvnd-9999.ebuild
+++ b/media-libs/libglvnd/libglvnd-9999.ebuild
@@ -12,7 +12,7 @@ fi
 PYTHON_COMPAT=( python3_{7..9} )
 VIRTUALX_REQUIRED=manual
 
-inherit ${GIT_ECLASS} meson multilib-minimal python-any-r1 virtualx
+inherit ${GIT_ECLASS} meson-multilib python-any-r1 virtualx
 
 DESCRIPTION="The GL Vendor-Neutral Dispatch library"
 HOMEPAGE="https://gitlab.freedesktop.org/glvnd/libglvnd";
@@ -56,10 +56,6 @@ multilib_src_configure() {
        meson_src_configure
 }
 
-multilib_src_compile() {
-       meson_src_compile
-}
-
 multilib_src_test() {
        if use X; then
                virtx meson_src_test
@@ -67,7 +63,3 @@ multilib_src_test() {
                meson_src_test
        fi
 }
-
-multilib_src_install() {
-       meson_src_install
-}