gentoo resync : 06.04.2022

3 files changed, 2 insertions, 53 deletions

diff --git a/x11-libs/libvdpau/Manifest b/x11-libs/libvdpau/Manifest
index 53382792b484..c833fed5449d 100644
--- a/x11-libs/libvdpau/Manifest
+++ b/x11-libs/libvdpau/Manifest
@@ -1,5 +1,3 @@
-DIST libvdpau-1.4.tar.bz2 139504 BLAKE2B de2b9251060f10e3126b59f44595c3b9cc65c3f5bc719133809414ed51362fb1f90fa67d0351007a178455329493f929d0983a2a7e67c29022ff351ea1f5adfc SHA512 68f502f53f4a95c9af571bd5a3f5048dd1afe30d7576f7e80751c7f29450ef8cb226c1281562b616079d6c177830ec67391d0fae33348a4627ca8c113990cd01
 DIST libvdpau-1.5.tar.gz 152838 BLAKE2B c3d76c1e46b718d71daff74232f2de9efb989c496cef7fa1016ec76d751530be39b5b6ad6354819579043f23744a647492d5d52b5ab93cae89dd82fb17d08289 SHA512 cebe0e0d9411b87238fa2adec40516881c61a67f33f80c22372f514e672e2dff839687291ab0b01d47af811c254fa65da579f360fcded3f65e382720548d3ea5
-EBUILD libvdpau-1.4.ebuild 1028 BLAKE2B f63cfa2124df8ba2aaf07ae483e14da0b42d7bcc6bf4761f299ee61207fa57eec2fa16fcbbc3a2b7190497fad44ee0c8357269255f38ad8f4fa8176f26d7ffac SHA512 a5f0e95051d22a30b5f013826fb42c856e9300a304ae5ee651902383a5a5db3a3fde002d79ffea6f2c71a02752c93f8e303f9e58175f5d1a6b44e43d8ebb27f2
-EBUILD libvdpau-1.5.ebuild 937 BLAKE2B 2f83e41eb8cec7193beb68d76d5e0dfb80ce5674006d860f9ccee34d0b9fbfd4d9a28f6252f5bb99df9f1fa6e8aecf00979b0786724052c5a8d095c6371288cd SHA512 8ff2c0f311962df290712688bff9a9d711cb2e2e31d228507080cdbcf396f6c1626512963cb0e590a00c7094203a4dfe3ec4c8f771c5db6461e1c80d6ae3024b
+EBUILD libvdpau-1.5.ebuild 934 BLAKE2B 55ef409c47b1c2999c119c175fae00238e4868d84001fb0332e22389080eb29b9d8cad7940422ceb82ae7e6001b4885cb25340f38812b189c8de70e0f54bf7b3 SHA512 f73eacec85942d7786bf8ccb0886047dddba19d6d649cdb4ea4321f28e17c4aa765e94d6120d4e0f06bf727e18855a420641149edfce4cb2ea8834bfcb27f642
 MISC metadata.xml 246 BLAKE2B a512e6e8ffd8a998f89ea9dbf8a29dd4bb2d6db435e4ac0ef3182fc23996e04a6e87c1771975d835038ad86d6cb61e4a1aea8b80286666d64ad0b511c9d8f163 SHA512 d827f64596500d61c0f24c9d2a69fa3ca2f8b52e5f5815106d7db2837482172f0518d99677e6332a69fd4c34289ef817203a5047363ea7d2c10372b09f9e0618
diff --git a/x11-libs/libvdpau/libvdpau-1.4.ebuild b/x11-libs/libvdpau/libvdpau-1.4.ebuild
deleted file mode 100644
index ab328e5779fd..000000000000
--- a/x11-libs/libvdpau/libvdpau-1.4.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-VIRTUALX_REQUIRED="test"
-inherit flag-o-matic meson-multilib virtualx
-
-DESCRIPTION="VDPAU wrapper and trace libraries"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/VDPAU"
-SRC_URI="https://gitlab.freedesktop.org/vdpau/${PN}/-/archive/${PV}/${P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm64 ~riscv x86"
-IUSE="doc dri"
-
-RDEPEND="
-	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-	dri? ( >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	dri? ( x11-base/xorg-proto )
-"
-BDEPEND="
-	virtual/pkgconfig
-	doc? (
-		app-doc/doxygen
-		media-gfx/graphviz
-		virtual/latex-base
-	)
-"
-
-src_prepare() {
-	sed -i -e "/^docdir/s|${PN}|${PF}|g" doc/meson.build || die
-	default
-}
-
-multilib_src_configure() {
-	append-cppflags -D_GNU_SOURCE
-	local emesonargs=(
-		$(meson_use dri dri2)
-		$(meson_native_use_bool doc documentation)
-	)
-	meson_src_configure
-}
-
-multilib_src_test() {
-	virtx meson_src_test
-}
diff --git a/x11-libs/libvdpau/libvdpau-1.5.ebuild b/x11-libs/libvdpau/libvdpau-1.5.ebuild
index 6e035344ce97..0ec6c6eb88e1 100644
--- a/x11-libs/libvdpau/libvdpau-1.5.ebuild
+++ b/x11-libs/libvdpau/libvdpau-1.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://gitlab.freedesktop.org/vdpau/libvdpau/-/archive/${PV}/${P}.tar.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="~alpha amd64 arm64 ~riscv x86"
 IUSE="doc dri"
 
 RDEPEND="