3 files changed, 8 insertions, 24 deletions
diff --git a/x11-libs/libvdpau/Manifest b/x11-libs/libvdpau/Manifest
index 41f33d2fbd1e..53cd7f225968 100644
--- a/x11-libs/libvdpau/Manifest
+++ b/x11-libs/libvdpau/Manifest
@@ -1,4 +1,4 @@
 DIST libvdpau-1.4.tar.bz2 139504 BLAKE2B de2b9251060f10e3126b59f44595c3b9cc65c3f5bc719133809414ed51362fb1f90fa67d0351007a178455329493f929d0983a2a7e67c29022ff351ea1f5adfc SHA512 68f502f53f4a95c9af571bd5a3f5048dd1afe30d7576f7e80751c7f29450ef8cb226c1281562b616079d6c177830ec67391d0fae33348a4627ca8c113990cd01
-EBUILD libvdpau-1.4.ebuild 1175 BLAKE2B 4c52d0809b52ba6497bc1d79244a676c6c862a684c0a1433e768964d9a71e244b6b7e3fec21cc9589fceb9af9994bad973e164bd8989049b8a0ad6c67dcb2be2 SHA512 26e6815ba39b14023a95c54940e7153491d11968e0c0dad7733d8bde610aca8e69e3626d79c2a48ac7b6c8230d22fc16f26a30e4d6f4aee21209e433371c0c1d
-EBUILD libvdpau-99999.ebuild 1131 BLAKE2B 2de73faca85b1957d53681cc68b5303de26a9a078ab862cab6d4e43f412b258f488ea5f801cae576179206097473e5705bebcf6ce6010e8bff2e6e16b28ecf4e SHA512 6f5a03ce02de0815cb199b307289601088094a5ccbd376164c6b3e6d6506c0a608b81a07fdfa45774b7eedeb128c65d39b2cc21b02d4b9e54b6dbe0086cd03d5
+EBUILD libvdpau-1.4.ebuild 1028 BLAKE2B f63cfa2124df8ba2aaf07ae483e14da0b42d7bcc6bf4761f299ee61207fa57eec2fa16fcbbc3a2b7190497fad44ee0c8357269255f38ad8f4fa8176f26d7ffac SHA512 a5f0e95051d22a30b5f013826fb42c856e9300a304ae5ee651902383a5a5db3a3fde002d79ffea6f2c71a02752c93f8e303f9e58175f5d1a6b44e43d8ebb27f2
+EBUILD libvdpau-99999.ebuild 984 BLAKE2B fa50879c53fc97416694af3ba7e2cfd20bc50f52206cf0aae8ac7cde334ebc2c7f910a914529c65223635c3cad4cd0947b5c6768e60878e28941514ae0fae9ea SHA512 370f7c80450503e798097acb85769362130b8488b065bda0dd9e4651b8bd713858fcaa2b78e55137d9596c4f64ee57ee7ab5a02b8452f3278cbcfce4d46130dd
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/x11-libs/libvdpau/libvdpau-1.4.ebuild b/x11-libs/libvdpau/libvdpau-1.4.ebuild
index a531acdf58b4..ab328e5779fd 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 c5bd93bb1cb6..2817d03b9638 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
-}