gentoo resync : 09.07.2022

4 files changed, 20 insertions, 39 deletions

diff --git a/x11-libs/libva/Manifest b/x11-libs/libva/Manifest
index 8e0a2a8119d6..210cc2487d70 100644
--- a/x11-libs/libva/Manifest
+++ b/x11-libs/libva/Manifest
@@ -1,6 +1,6 @@
-DIST libva-2.13.0.tar.gz 256724 BLAKE2B 97dd51bf488dc88027125973399e17dedcce03b7bf5104fd9bf17156c5013e1e9d46f2bf78c16431141294f75549a00fed3542b4f79dd31b032f4505c11d07d7 SHA512 226d09956754c9942348ed289f210268bad64dbba95d948b33ae063f7ecb276af9da083a48c03c3c79ad4305716d203898bc75a109945d064a5fe6fb43398dea
 DIST libva-2.14.0.tar.gz 266254 BLAKE2B 1ad504dc7f72b15bb35b486a5fcb327c14663b80068791aa983f2d46876b1504b8330888430b85d2fb309bd5aa2a11c4a34589b68fa140e10b27cb952e3eb5c7 SHA512 8d87b49c7242174d05dca709bd79e6e45cea6e6060d12f5cf7636433be587c2b3a6c3183f632fb0ff49b19f31f915a2a62818c26f57c3a8f40741aa1ab8270b4
-EBUILD libva-2.13.0-r2.ebuild 2211 BLAKE2B d32d23548a690da4d07760074c77a981da21f139e39cf9b8f53a7b5317459c6f3c4a72328edfaaa9bdf5002fd17db4b66d6cff9ced7fd38527d2c67d6f34c561 SHA512 08396b6f8359cecb707ed63b25d0b1de37955cbddb82fe18cede7f2af7b582c947da3079079222fc7c614b4341aec29e849d63f4d1f56abe6504339323fc0c5a
+DIST libva-2.15.0.tar.gz 264429 BLAKE2B c1bd8c3de25a266b8cc35400db464ea8b0dc81f017951b2814874c93ebf6b1b9e09860749c9eb932fe54b012e6295ff7d9cf0895f5af5fe6963f7dc3cea809b2 SHA512 fd96da76db6e6a80bb83d74a6f736e168d3a27cd200e77553d8ca9a19b9766b101b2e550953ca50445e1874f7ad59bf6c3a166eee6c83fe66c924b5a3494be9d
 EBUILD libva-2.14.0.ebuild 1713 BLAKE2B 145c4efbbce03720086f6e31799cf84958cba6e64d50c84309e5467c268fac75bba18ff044dbac81c53a21402599b2c116dafda8de536b1bc406ca6be463eea2 SHA512 1580c4269b93fb4ced2d0e88315c0efcd0e3cf4f6da39e2607e8edf66b7601b3a0a0ced8b38ea51c6309f336cc29df6ec808752235508559387c33e4e6ca9ba9
-EBUILD libva-9999.ebuild 1717 BLAKE2B 62666bd850edfda63ad64e0f771bd321c7dc374022a70f6e6b7733ca80dd82001bd33d1a21e533bb6223f029fcba4e4cafab4de5bd12274d6f829c247e5bfe08 SHA512 986122df4a2991f91f5e76dff1679c27839700bb961cca76a688a3edd1c2bda85fe431194fb526bb4d4dd8b52981140628b746cdc2735ae99bbe65fa76ce805f
-MISC metadata.xml 470 BLAKE2B d9df0ced571b8afa6cecda8dafb7165d142c3fd1c0fff21526d5624edb530e0ac705a36a7fa1a17d18583805a267652dfb77850a70aa47dcceb4794636821e9e SHA512 66f62980ed7d876f681bc77cb47cf43940fe056db6577557cf518604885c54ad94a17680c6749eb81937b44e21d7df9cad3ede05fdf74be88dcb6d21e271491e
+EBUILD libva-2.15.0.ebuild 1717 BLAKE2B 14281441c0db91fca4d71121610320e7539d48f2389fd10f75f81b9104f95683222dca01b1e335f70e2b01e1904859a161089c6de7232cf18e67ed12c0d77fd2 SHA512 fd41d2efbf07ede1d2f437923071e02e250873667fd5b31b5afa77f84f0680be3eb578e2fa3b42b4de0ef8758c805eb8471b5ae510c3e14a133766e26e19c2e0
+EBUILD libva-9999.ebuild 1717 BLAKE2B 14281441c0db91fca4d71121610320e7539d48f2389fd10f75f81b9104f95683222dca01b1e335f70e2b01e1904859a161089c6de7232cf18e67ed12c0d77fd2 SHA512 fd41d2efbf07ede1d2f437923071e02e250873667fd5b31b5afa77f84f0680be3eb578e2fa3b42b4de0ef8758c805eb8471b5ae510c3e14a133766e26e19c2e0
+MISC metadata.xml 407 BLAKE2B 9c609122fe71e96581d55f64dcb1d1b1dc513c7e8efb6c54823011f8788cfd750114752616f06149b1ad22ae47239a76fb38a8f8fe73a66f2c5def9a29e994fd SHA512 9d0fe2952d89278e8753fba47cd51cd76a73bf6f6566327ad425a7a9d64b4e5d72b12d8e2dff8f6aa97ac960121b3a4a73c87bcfed1a7d1e611e206c0f814925
diff --git a/x11-libs/libva/libva-2.13.0-r2.ebuild b/x11-libs/libva/libva-2.15.0.ebuild
index 97c7e8eace62..f2032b33b3ca 100644
--- a/x11-libs/libva/libva-2.13.0-r2.ebuild
+++ b/x11-libs/libva/libva-2.15.0.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit autotools multilib-minimal optfeature
+inherit meson-multilib optfeature
 
 DESCRIPTION="Video Acceleration (VA) API for Linux"
 HOMEPAGE="https://01.org/linuxmedia/vaapi"
@@ -13,25 +13,22 @@ if [[ ${PV} = *9999 ]] ; then
 	EGIT_BRANCH=master
 	EGIT_REPO_URI="https://github.com/intel/libva"
 else
-	# SRC_URI="https://github.com/intel/libva/releases/download/${PV}/${P}.tar.bz2"
-	# The upstream provides periodically tarball with pre-built 'configure'.
-	# To simplify updates, portage use tarballs without pre-build 'configure'
-	# which are always available.
 	SRC_URI="https://github.com/intel/libva/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm64 ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="MIT"
 SLOT="0/$(ver_cut 1)"
-IUSE="+drm opengl utils wayland X"
+IUSE="+drm opengl wayland X"
+REQUIRED_USE="opengl? ( X )"
 
 RDEPEND="
 	>=x11-libs/libdrm-2.4.60[${MULTILIB_USEDEP}]
-	opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] )
 	wayland? (
 		>=dev-libs/wayland-1.11[${MULTILIB_USEDEP}]
 	)
 	X? (
+		>=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]
 		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
 		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
 		>=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
@@ -42,12 +39,6 @@ BDEPEND="
 	wayland? ( dev-util/wayland-scanner )
 	virtual/pkgconfig
 "
-PDEPEND="utils? ( media-video/libva-utils )"
-
-REQUIRED_USE="|| ( drm wayland X )
-	opengl? ( X )"
-
-DOCS=( NEWS )
 
 MULTILIB_WRAPPED_HEADERS=(
 	/usr/include/va/va_backend_glx.h
@@ -57,26 +48,17 @@ MULTILIB_WRAPPED_HEADERS=(
 	/usr/include/va/va_glx.h
 )
 
-src_prepare() {
-	default
-	eautoreconf
-}
-
 multilib_src_configure() {
-	local myeconfargs=(
-		--with-drivers-path="${EPREFIX}/usr/$(get_libdir)/va/drivers"
-		$(use_enable opengl glx)
-		$(use_enable X x11)
-		$(use_enable wayland)
-		$(use_enable drm)
-		--enable-va-messaging
+	local emesonargs=(
+		-Ddriverdir="${EPREFIX}/usr/$(get_libdir)/va/drivers"
+		-Ddisable_drm=false
+		-Dwith_x11=$(usex X)
+		-Dwith_glx=$(usex X)
+		-Dwith_wayland=$(usex wayland)
+		-Denable_docs=false
+		-Denable_va_messaging=true
 	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
-	default
-	find "${ED}" -type f -name "*.la" -delete || die
+	meson_src_configure
 }
 
 pkg_postinst() {
diff --git a/x11-libs/libva/libva-9999.ebuild b/x11-libs/libva/libva-9999.ebuild
index 48d03afe7a28..f2032b33b3ca 100644
--- a/x11-libs/libva/libva-9999.ebuild
+++ b/x11-libs/libva/libva-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-multilib optfeature
 
diff --git a/x11-libs/libva/metadata.xml b/x11-libs/libva/metadata.xml
index 52ff72140216..5ca5eb42a6b9 100644
--- a/x11-libs/libva/metadata.xml
+++ b/x11-libs/libva/metadata.xml
@@ -7,7 +7,6 @@
   </maintainer>
   <use>
     <flag name="drm">Enables VA/DRM API support.</flag>
-    <flag name="utils">Install VA-API utility programs.</flag>
   </use>
   <upstream>
   <remote-id type="github">intel/libva</remote-id>