6 files changed, 7 insertions, 88 deletions
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 83c9eaf830da..9735d8e036fa 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/aribb24/Manifest b/media-libs/aribb24/Manifest
index 269a85102602..b11969a90a28 100644
--- a/media-libs/aribb24/Manifest
+++ b/media-libs/aribb24/Manifest
@@ -3,4 +3,4 @@ AUX aribb24-1.0.3-fix-default-macros.patch 1511 BLAKE2B 04b32f01928d66389c771f57
 AUX aribb24-1.0.3-reset-control_time.patch 713 BLAKE2B ae8d2bcc787ff12c5bd3374c171785f25b39294c78f8f4f0d2cf610298d0ecc951071b758c33bc1d68230859f032f9e7191a11dd6f7995c4e112a62705a87a54 SHA512 ab9cf73d508d5ae4d570ddf50cb6e914738312951aee49ff010df46d37fc9fd3be67accec518bc43562a12e228fa0d420f005a29c5d17bf1c38bf6bc3a8da090
 DIST aribb24-1.0.3.tar.gz 57378 BLAKE2B 72d5c56a214d63e477ed0bb77e5f20e79ff69fe3712623f54f1369b041622aef1853909f3dfc31685b346c62ef36ffe205bf7a8d2c9f0a2996ae378b025228b7 SHA512 622cc0c3928fd6db0b5ab3921f27348c956af20f8c0133ad5d9bf4de3d199077d9f23cc86ae149a9f0d13c7ee5906ec95de3fb8388207160cebd1f0c59078c8f
 EBUILD aribb24-1.0.3-r2.ebuild 868 BLAKE2B 6bbfd6dbfdea25d4e81f322a92ca92c61aa3acae98ab75866b282f557530aeb70e9efb05f1815252633f14d045f10dc745f83c960c6b15b1a0b72902eb02b6a7 SHA512 0aaaca72ac28dce140347b8e3f5e3d7e7c6610e7772b1297ffd98f6bb538b193ac24397ffb826a2ba2284fc36d249be1830c5a76fa570a8431bf2e83db2c06f8
-MISC metadata.xml 169 BLAKE2B 25149b73446be31f3ea3dd3a6394230987e7d4c601d1605fd3827b37bd99b3301c2e0edb95d0f59a4577ed27919f43c2cc02b1edf62c4012b935a82e709e0c05 SHA512 55c53f74b001bae56ba8c54581a4168335b6b3a28dac23a2102b76795d5fd41de33b8b3e1ec03f9acc6e7a3a77e93b1a6ff3e3967c3156dcbf22b5b5a6245ef5
+MISC metadata.xml 250 BLAKE2B cad276b2b10b61f1cd39ebfc2e1bcfda51b4fbb4069e3c3433ac710a0cfb41c160c2e4522f2f461b50049e361d9ea88fd32a14ce15f3fff9a9dfbec96911f688 SHA512 cf2d93aef62d3b0f808d7ea9bb98efe7623852ef5f75f502cd250578488f2d7cad09cce99bfdc66b140a232f0bbd34eb94e00026dbe5498309d29b4e43c0941f
diff --git a/media-libs/aribb24/metadata.xml b/media-libs/aribb24/metadata.xml
index bef24d2c2337..43873f8d2f32 100644
--- a/media-libs/aribb24/metadata.xml
+++ b/media-libs/aribb24/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
+	<!-- maintainer-needed -->
+	<upstream>
+		<remote-id type="github">nkoriyama/aribb24</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-libs/intel-mediasdk/Manifest b/media-libs/intel-mediasdk/Manifest
index 0bc15a8a6842..9883f2659e7f 100644
--- a/media-libs/intel-mediasdk/Manifest
+++ b/media-libs/intel-mediasdk/Manifest
@@ -1,6 +1,4 @@
-DIST intel-mediasdk-22.6.3.tar.gz 11657130 BLAKE2B 3f63cf85716159f38f52cd0941cb716d9a25d2635e8b6da295a8fb78898ae007c3216148db580b94aa83742803effc0c1c2b0a431414a85f6feb44c93ae04738 SHA512 bd9fb9ca5b96bb2911db7fdf2622127f0dc3e86de8dc732bc6df6f4fcb343406e3ab14ffa5ce4595ed9b3bf19a73652681137fbe5b473c812c5b74554998a2b0
-DIST intel-mediasdk-22.6.4.tar.gz 11657778 BLAKE2B 3d95a685f5e4cc246367d046da8c8526264243321f0aacd2b9f6fbaed7eb0acdece1653801bd7cddd6b25338eecea6adb48b63a50049415621494cd481d455a1 SHA512 350347df8fd997a9043299faaee6fa6c8f67d3a301722c40ef8aab10bdfe6c01e7a2773c0add4617c98434e46030603ac56d4778074550498a128c7fb796c5a9
-EBUILD intel-mediasdk-22.6.3.ebuild 1916 BLAKE2B 0afe7a7034386a2f32dd3a7b074dca39a8771439ff1502cca97baa08959c928aa62614211d500f8d280faca37fa39b68e5bbf95ab77168620432289dcea65e08 SHA512 9c90d66da6c5ff7a93a993d977d48e6a496c1ca872b96465d44c0e954d1678e9a72bbc5f11d54f8578a7bf0811a7a9b2d68d48e42d36cb9a5cb4ec02938b0f4c
-EBUILD intel-mediasdk-22.6.4.ebuild 1914 BLAKE2B 130c75db7637c111ebc9fa229436a7d6e52ecef7417690fb06fcbfd59b4f86c899ae2410f653ce69054e9190dd550edec9a6eb56cd62bc6b3433fcaf00678e10 SHA512 2413e454af5f17327e857b7af3f77d0fc79a23cec9673c47041d04590b0ff36baab12c5e58bc9bc0402d6350eca9b4c694ac25f95ef37c4596b9cef966eb4777
+DIST intel-mediasdk-22.6.5.tar.gz 11657890 BLAKE2B 53b38f7b3757895f65badb7e43e5d1f1112f744dd4a43ea9313f7bfbdf889088310b2093ccd45794426f0ac5e38ca8d901790d4963945648a3b99922476d02e0 SHA512 af9a59a9a7e9477672a875f454988cc49d8b782b32701ba681efa6dda445239e133b00f9366fc58ddadf79beef0ee74f1165990f0b8194124a841b36d5dca6bc
+EBUILD intel-mediasdk-22.6.5.ebuild 1914 BLAKE2B 130c75db7637c111ebc9fa229436a7d6e52ecef7417690fb06fcbfd59b4f86c899ae2410f653ce69054e9190dd550edec9a6eb56cd62bc6b3433fcaf00678e10 SHA512 2413e454af5f17327e857b7af3f77d0fc79a23cec9673c47041d04590b0ff36baab12c5e58bc9bc0402d6350eca9b4c694ac25f95ef37c4596b9cef966eb4777
 EBUILD intel-mediasdk-9999.ebuild 1916 BLAKE2B 0afe7a7034386a2f32dd3a7b074dca39a8771439ff1502cca97baa08959c928aa62614211d500f8d280faca37fa39b68e5bbf95ab77168620432289dcea65e08 SHA512 9c90d66da6c5ff7a93a993d977d48e6a496c1ca872b96465d44c0e954d1678e9a72bbc5f11d54f8578a7bf0811a7a9b2d68d48e42d36cb9a5cb4ec02938b0f4c
 MISC metadata.xml 507 BLAKE2B 1e08efd32142406ac7fc4390a10f51b117bbaf56fc2006ed508bf026d2720447a782f2e86ba323017dc6388ca18e4743688eaf1a8fb7165bc6377194b4139d0b SHA512 ef8d11178dcded14cb74c49e01bedde8986ff8aa02641c275d5a36ca3973782955f90d0c25ef728ca120fc1a46f1f3965f4b5a36376203c6f6cb9b1411af52e1
diff --git a/media-libs/intel-mediasdk/intel-mediasdk-22.6.3.ebuild b/media-libs/intel-mediasdk/intel-mediasdk-22.6.3.ebuild
deleted file mode 100644
index a42d8290d2f3..000000000000
--- a/media-libs/intel-mediasdk/intel-mediasdk-22.6.3.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake optfeature
-
-if [[ ${PV} == *9999 ]] ; then
-	: ${EGIT_REPO_URI:="https://github.com/Intel-Media-SDK/MediaSDK"}
-	if [[ ${PV%9999} != "" ]] ; then
-		: ${EGIT_BRANCH:="release/${PV%.9999}"}
-	fi
-	inherit git-r3
-fi
-
-DESCRIPTION="Intel Media SDK"
-HOMEPAGE="https://github.com/Intel-Media-SDK/MediaSDK"
-if [[ ${PV} == *9999 ]] ; then
-	SRC_URI=""
-else
-	SRC_URI="https://github.com/Intel-Media-SDK/MediaSDK/archive/intel-mediasdk-${PV}.tar.gz"
-	S="${WORKDIR}/MediaSDK-intel-mediasdk-${PV}"
-	KEYWORDS="~amd64"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-
-IUSE="dri test +tools wayland X"
-# Test not working at the moment
-#RESTRICT="!test? ( test )"
-RESTRICT="test"
-# # Most of these flags only have an effect on the tools
-REQUIRED_USE="
-	dri? ( X )
-	wayland? ( tools )
-	X? ( tools )
-"
-
-# x11-libs/libdrm[video_cards_intel] for intel_bufmgr.h in samples
-# bug #805224
-DEPEND="
-	x11-libs/libpciaccess
-	>=media-libs/libva-intel-media-driver-${PV}
-	media-libs/libva[X?,wayland?]
-	x11-libs/libdrm[video_cards_intel]
-	wayland? (
-		dev-libs/wayland
-		dev-util/wayland-scanner
-		dev-libs/wayland-protocols
-	)
-	X? (
-		x11-libs/libX11
-		x11-libs/libxcb
-	)
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		# OpenCL only has an effect if we build kernels
-		-DENABLE_OPENCL=OFF
-		-DBUILD_TUTORIALS=OFF
-		# Need to package the cm-compiler to build kernels, use pre-built instead
-		-DBUILD_KERNELS=OFF
-		-DBUILD_RUNTIME=ON
-		-DBUILD_DISPATCHER=ON
-		-DBUILD_TOOLS="$(usex tools)"
-		# Cannot build tools without samples
-		-DBUILD_SAMPLES="$(usex tools)"
-		-DBUILD_TESTS="$(usex test)"
-		-DENABLE_X11="$(usex X)"
-		-DENABLE_X11_DRI3="$(usex dri)"
-		-DENABLE_WAYLAND="$(usex wayland)"
-	)
-
-	cmake_src_configure
-}
-
-pkg_postinst() {
-	optfeature "Intel GPUs newer then, and including, Intel Xe" media-libs/oneVPL-intel-gpu
-}
diff --git a/media-libs/intel-mediasdk/intel-mediasdk-22.6.4.ebuild b/media-libs/intel-mediasdk/intel-mediasdk-22.6.5.ebuild
index 27755b2b6e96..27755b2b6e96 100644
--- a/media-libs/intel-mediasdk/intel-mediasdk-22.6.4.ebuild
+++ b/media-libs/intel-mediasdk/intel-mediasdk-22.6.5.ebuild