[gentoo-commits] repo/gentoo:master commit in: x11-libs/libvdpau/

[Matt Turner]

commit:     314ab3c52435ecd859b551e730eecec3af16d92b
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Fri May 28 01:38:06 2021 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Fri Jun  4 01:14:15 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=314ab3c5

x11-libs/libvdpau: Switch to meson-multilib

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

 x11-libs/libvdpau/libvdpau-1.4.ebuild   | 14 +++-----------
 x11-libs/libvdpau/libvdpau-99999.ebuild | 14 +++-----------
 2 files changed, 6 insertions(+), 22 deletions(-)

diff --git a/x11-libs/libvdpau/libvdpau-1.4.ebuild 
b/x11-libs/libvdpau/libvdpau-1.4.ebuild
index a531acdf58b..ab328e5779f 100644
--- a/x11-libs/libvdpau/libvdpau-1.4.ebuild
+++ b/x11-libs/libvdpau/libvdpau-1.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 VIRTUALX_REQUIRED="test"
-inherit flag-o-matic meson virtualx multilib-minimal
+inherit flag-o-matic meson-multilib virtualx
 
 DESCRIPTION="VDPAU wrapper and trace libraries"
 HOMEPAGE="https://www.freedesktop.org/wiki/Software/VDPAU";
@@ -38,20 +38,12 @@ src_prepare() {
 multilib_src_configure() {
        append-cppflags -D_GNU_SOURCE
        local emesonargs=(
-               -Ddri2=$(usex dri true false)
-               -Ddocumentation=$(usex doc true false)
+               $(meson_use dri dri2)
+               $(meson_native_use_bool doc documentation)
        )
        meson_src_configure
 }
 
-multilib_src_compile() {
-       meson_src_compile
-}
 multilib_src_test() {
        virtx meson_src_test
 }
-
-multilib_src_install() {
-       meson_src_install
-       find "${ED}" -name '*.la' -delete || die
-}

diff --git a/x11-libs/libvdpau/libvdpau-99999.ebuild 
b/x11-libs/libvdpau/libvdpau-99999.ebuild
index c5bd93bb1cb..2817d03b963 100644
--- a/x11-libs/libvdpau/libvdpau-99999.ebuild
+++ b/x11-libs/libvdpau/libvdpau-99999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 VIRTUALX_REQUIRED="test"
-inherit flag-o-matic git-r3 meson virtualx multilib-minimal
+inherit flag-o-matic git-r3 meson-multilib virtualx
 
 DESCRIPTION="VDPAU wrapper and trace libraries"
 HOMEPAGE="https://www.freedesktop.org/wiki/Software/VDPAU";
@@ -38,20 +38,12 @@ src_prepare() {
 multilib_src_configure() {
        append-cppflags -D_GNU_SOURCE
        local emesonargs=(
-               -Ddri2=$(usex dri true false)
-               -Ddocumentation=$(usex doc true false)
+               $(meson_use dri dri2)
+               $(meson_native_use_bool doc documentation)
        )
        meson_src_configure
 }
 
-multilib_src_compile() {
-       meson_src_compile
-}
 multilib_src_test() {
        virtx meson_src_test
 }
-
-multilib_src_install() {
-       meson_src_install
-       find "${ED}" -name '*.la' -delete || die
-}