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

[Matt Turner]

commit:     ca866571506b7af0656200c221ede960f6939db2
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Fri May 28 01:13:55 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=ca866571

media-libs/libepoxy: Switch to meson-multilib

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

 media-libs/libepoxy/libepoxy-1.5.5.ebuild | 10 +---------
 media-libs/libepoxy/libepoxy-1.5.8.ebuild | 12 ++----------
 media-libs/libepoxy/libepoxy-9999.ebuild  | 12 ++----------
 3 files changed, 5 insertions(+), 29 deletions(-)

diff --git a/media-libs/libepoxy/libepoxy-1.5.5.ebuild 
b/media-libs/libepoxy/libepoxy-1.5.5.ebuild
index 5204c05212a..62036c1ad5b 100644
--- a/media-libs/libepoxy/libepoxy-1.5.5.ebuild
+++ b/media-libs/libepoxy/libepoxy-1.5.5.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{7,8,9} )
 PYTHON_REQ_USE='xml(+)'
-inherit meson multilib-minimal python-any-r1 virtualx
+inherit meson-multilib python-any-r1 virtualx
 
 if [[ ${PV} = 9999* ]]; then
        EGIT_REPO_URI="https://github.com/anholt/${PN}.git";
@@ -41,14 +41,6 @@ multilib_src_configure() {
        meson_src_configure
 }
 
-multilib_src_compile() {
-       meson_src_compile
-}
-
 multilib_src_test() {
        virtx meson_src_test
 }
-
-multilib_src_install() {
-       meson_src_install
-}

diff --git a/media-libs/libepoxy/libepoxy-1.5.8.ebuild 
b/media-libs/libepoxy/libepoxy-1.5.8.ebuild
index 9b903d1590d..8557aa03d5c 100644
--- a/media-libs/libepoxy/libepoxy-1.5.8.ebuild
+++ b/media-libs/libepoxy/libepoxy-1.5.8.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 PYTHON_COMPAT=( python3_{7,8,9} )
 PYTHON_REQ_USE='xml(+)'
-inherit meson multilib-minimal python-any-r1 virtualx
+inherit meson-multilib python-any-r1 virtualx
 
 if [[ ${PV} = 9999* ]]; then
        EGIT_REPO_URI="https://github.com/anholt/${PN}.git";
@@ -41,14 +41,6 @@ multilib_src_configure() {
        meson_src_configure
 }
 
-multilib_src_compile() {
-       meson_src_compile
-}
-
 multilib_src_test() {
        virtx meson_src_test
 }
-
-multilib_src_install() {
-       meson_src_install
-}

diff --git a/media-libs/libepoxy/libepoxy-9999.ebuild 
b/media-libs/libepoxy/libepoxy-9999.ebuild
index 9b903d1590d..8557aa03d5c 100644
--- a/media-libs/libepoxy/libepoxy-9999.ebuild
+++ b/media-libs/libepoxy/libepoxy-9999.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 PYTHON_COMPAT=( python3_{7,8,9} )
 PYTHON_REQ_USE='xml(+)'
-inherit meson multilib-minimal python-any-r1 virtualx
+inherit meson-multilib python-any-r1 virtualx
 
 if [[ ${PV} = 9999* ]]; then
        EGIT_REPO_URI="https://github.com/anholt/${PN}.git";
@@ -41,14 +41,6 @@ multilib_src_configure() {
        meson_src_configure
 }
 
-multilib_src_compile() {
-       meson_src_compile
-}
-
 multilib_src_test() {
        virtx meson_src_test
 }
-
-multilib_src_install() {
-       meson_src_install
-}