commit:     b6e3751885a971b0bffa3af6e466b1ae69ae9153
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Mon Jul  4 02:13:38 2022 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Mon Jul  4 02:40:29 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b6e37518

media-video/libva-utils: Switch to EAPI=8

* Add missing dep on libdrm
* Drop unnecessary sed (now fixed upstream)
* Restructure dependencies

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

 media-video/libva-utils/libva-utils-9999.ebuild | 23 +++++++++--------------
 1 file changed, 9 insertions(+), 14 deletions(-)

diff --git a/media-video/libva-utils/libva-utils-9999.ebuild 
b/media-video/libva-utils/libva-utils-9999.ebuild
index 4decf846c639..428cc77cbc2d 100644
--- a/media-video/libva-utils/libva-utils-9999.ebuild
+++ b/media-video/libva-utils/libva-utils-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit meson
 
@@ -25,29 +25,24 @@ REQUIRED_USE="
        || ( examples putsurface test vainfo )
 "
 
-BDEPEND="virtual/pkgconfig"
-
-if [[ ${PV} = *9999 ]] ; then
-       DEPEND="~x11-libs/libva-${PV}:=[drm(+),wayland?,X?]"
-else
-       DEPEND=">=x11-libs/libva-$(ver_cut 1-2).0:=[drm(+),wayland?,X?]"
-fi
-
-DEPEND+="
+DEPEND="
+       x11-libs/libdrm
        wayland? ( >=dev-libs/wayland-1.0.6 )
        X? ( >=x11-libs/libX11-1.6.2 )
 "
+if [[ ${PV} = *9999 ]] ; then
+       DEPEND+="~x11-libs/libva-${PV}:=[drm(+),wayland?,X?]"
+else
+       DEPEND+=">=x11-libs/libva-$(ver_cut 1-2).0:=[drm(+),wayland?,X?]"
+fi
 RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 src_prepare() {
        default
 
        local sed_args=()
 
-       # Fix broken dependency check
-       # https://github.com/intel/libva-utils/pull/260
-       sed_args+=(-e "s/dependency('drm'/dependency('libdrm'/")
-
        if ! use examples ; then
                sed_args+=(
                        -e "/^subdir('decode')$/d"

Reply via email to