gentoo auto-resync : 03:01:2023 - 20:27:24

author: V3n3RiX <venerix@koprulu.sector> 2023-01-03 20:27:24 +0000
committer: V3n3RiX <venerix@koprulu.sector> 2023-01-03 20:27:24 +0000
commit: 27e5574c9ed56a2633e25f7fa8f591554266a1b4 (patch)
tree: eafae39b8faa55ceb7cc8100d5d03a2dfc9b7842 /media-libs
parent: 5aede38e7304fc5c3bd8a2034b25758b15a19fa0 (diff)
25 files changed, 287 insertions, 1635 deletions
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 5cf316e341a4..3061d5edb91d 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/ctl/Manifest b/media-libs/ctl/Manifest
index 757d85f7a5a1..a5f26d9e4882 100644
--- a/media-libs/ctl/Manifest
+++ b/media-libs/ctl/Manifest
@@ -6,6 +6,6 @@ AUX ctl-1.5.2-install-dpx-library.patch 565 BLAKE2B 234ba1ca74575a0babcf080c7405
 AUX ctl-1.5.2-openexr-2.3.patch 455 BLAKE2B b42032d28612bef6f6a3beeda67c6b6a20fb4b99527003acd6a97eceec8286e073b3c6594c92ae99ad559c9d520b9d94fe93ea783e9d6021d81f66b258c3e2f1 SHA512 0e97065c78c6ef5c2a8f657c6c41031f66379483aaf2754f612d69261932a7f6ee1ccd01c5c0b1b450e511aa758a640cacf55629651d5974a92c519f4ff3a25a
 DIST ctl-1.5.2.tar.gz 1411871 BLAKE2B 223740aa8b68630f449b65e17470c76b2825a77eead040724b65e9e69752a696f642ae6755116046e188305a7d043c4def7cb8a773ad08d51fba35e9273b3a71 SHA512 c92af23e897f30f96ecb27b4b865e2fe1a1e33c8616797fc18f68e7fcc89210ce8ae70a003169b2f449bfd5f90d192734f1e8038b1d3e03c5f48c81587c871c6
 DIST ctl-1.5.2_p20221224.tar.gz 1418659 BLAKE2B 6798439b270b785974cfd45381f927f2005884b6a00878fa845cc1c36cd912eb6f3acb913f896389a67bff52103d3d52032e3f1f9f53e1a3d98b545428c1580b SHA512 9cc132100d3ea622d954e783fbab43c07cfa72e1930f4b9c55cb01709e88f09f956ac02e973a09bfc2842e769060e6f50f082d5491be03c1499a58e79b0f1ca3
-EBUILD ctl-1.5.2-r4.ebuild 956 BLAKE2B 8454ae19d44b2dda96c70f61a3fcc233d03ea074769e5d4766a7cd5d2f72ac6fb9b155b348cbe9774d003c352df25cc68edbc32954fd07387d31bbfc9b242731 SHA512 08cf15312934281f82985903c8106b012d4038dfc9fe4e1f2d2cf7439970a61d4e055eb06a88a0d91426a7847b0c747a755b4182dcb810be62765afe87806da4
+EBUILD ctl-1.5.2-r4.ebuild 898 BLAKE2B 0ebae767ba5149aabfe1338459de2b8557865a3e9e0c49a84c331382d023ed47a15b561060176036994f303f70a3a41bc967af94ea148eb4b0883fec31621bb6 SHA512 348985af0ad004e661838cb9c253713b55231d0c7a7c413f08a86ea07de4751c9949976b7bc2be702dc04b351d99dfced20383c64e32012ec12368af9b4e32f9
 EBUILD ctl-1.5.2_p20221224.ebuild 883 BLAKE2B a2f9265105aff276107cfe2b5af7d46273b94416a5bb823990086dafb107c83811e7152a3d55a9fc2f7e72e490193cb36e889c42e9345580d3cc3d8a8359fa30 SHA512 52e7ff1af1aa3dc56b74fd166d9b88ccd58f0155f8a738100e36d8b76a458111227bbc993e854fc90f2325dfb016632f6c4b8507d32ac51244cb54a30d8177d2
 MISC metadata.xml 298 BLAKE2B 6e4266628d090b71081fd7756e6e725250f41a8a670fa745eef96503c01915a93d41e82b84bca8f81b173b846f5437a40a1974491cb261adeb3e692e4750a40c SHA512 318801a89aef840e0aa9e823bc50bad3c95aa4f993a2a67097fe1ebe397d3702ad18165074e7887c090921f2e3330965b45114375ddb1ac60b40161a8acda8de
diff --git a/media-libs/ctl/ctl-1.5.2-r4.ebuild b/media-libs/ctl/ctl-1.5.2-r4.ebuild
index a63570fa6617..0276777c0657 100644
--- a/media-libs/ctl/ctl-1.5.2-r4.ebuild
+++ b/media-libs/ctl/ctl-1.5.2-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -32,8 +32,6 @@ PATCHES=(
 	"${FILESDIR}/${P}-fix-unit-tests.patch"
 )
 
-mycmakeargs=( -DCMAKE_INSTALL_DOCDIR="share/doc/${PF}" )
-
 src_test() {
 	pushd "${BUILD_DIR}" >/dev/null || die
 	eninja check
diff --git a/media-libs/hamlib/Manifest b/media-libs/hamlib/Manifest
index dcfe2a51950f..c782104a93cd 100644
--- a/media-libs/hamlib/Manifest
+++ b/media-libs/hamlib/Manifest
@@ -1,11 +1,7 @@
 AUX hamlib-4.4-fix-clang-warnings.patch 6673 BLAKE2B 26b0bbbc2c9bb89fe2707b0bbc7ff81c33104670f5bc157fe7063b5150786963fcd379fca620c7a457682f6b1d8bc9a13729ab442ce771500763cf91127a68db SHA512 1cfbff642826281d42226a5c4364b438602dc2022baf7b6bd7cc41d4cb1a0defec511a9c20d06cdf5aca6549e00ec11639899326ac03d4a6604a7440d813f7e9
 AUX hamlib-4.4-slibtool.patch 2414 BLAKE2B 798b95d72e57d1b68a1d26c36f631b084722a32ae3c20238f7cb2495412e200ee7e909d2e614ad27db7016654a6e662834b8c95f86dbec609754fe817a49a1b8 SHA512 743a5be7160e80453810873ea074fd62934524fcf7fc9b8e224c93a2876760c96793ebb13e6e40c32b648065b034a2355935862d540c6620babaeacb7fc2f88c
 DIST hamlib-4.4.tar.gz 2401399 BLAKE2B 4256b5b4374c62ef4fb957d29deda95aa9d15a8b52b81c5db1c07f3ebbf4c8e48c6c082769cef82c8457b3f813ac00ef7a37136615747f2c93e5275a112891e7 SHA512 37366ba180031de34da447c3d4e0086f156b893f57b5ab9bbc38b8e1f4bf9310fa1a9eb2a6d7884f1f11900dbdb811b4071e023aba571ea0ac5d07ddb122bf7b
-DIST hamlib-4.5.1.tar.gz 2588713 BLAKE2B 11b45fe82adc0bedfabed1847589ee67fe3612c8b2c34e0c91bbf33b237f2992c97ab266687f7173767bf01db81747ea1b710af0bd3fdb3aa5c4035190d35ceb SHA512 3fbfa18f3f04890eb0bb2ffef5347ffc3759fa276d613785a0e585dd3613837db4461eb79bf7e3794f6ce33dcae8a4357b3f27c8be44a9d838fcb82cb0a60753
 DIST hamlib-4.5.3.tar.gz 2590200 BLAKE2B 7c06a20a1185a2e413fee56231f3e0f6aa77a7585b9853896b00abb773e2e23fc5e97a8a3fbb873528282756ee674b1ca5b2b14f0fe8e6b9b8e8f7e8ffa223f2 SHA512 be3b58c7276c1289d85b4dc9054016757200fde06d66116f7a1687442e53bf322f0a3ae974c9b784cbd0bff0c64b901b97fac74184f4b4a0fdf1f5079d0ea509
-DIST hamlib-4.5.tar.gz 2568061 BLAKE2B 6ccb0c1faf8f64453c3696e75ced413048e7705184c7755fdde200be1d9b17f5495427ba492317cf7e75b5f373b859840d1d364db1f057c28f7779f8284fd96a SHA512 671da06aed54951ca810b4de7291a16de3a2f6ed54b8d024d4d9bfed9dfc6a21336c3cadd6f5b128c3ab54f1edd2b22db491b074b7759b9dfd9e71e1ce4055f3
 EBUILD hamlib-4.4.ebuild 2256 BLAKE2B 481a0b54d4c94bd232ebaaf099ff38a57052705363fc416b9b6d90581c65eb96e8690ac2f68bda6429ccc35936a9ec6c7a4f5b6dad3497c8b0a838399df04c5d SHA512 4ef6ccc5b5e9d289d29be6c89e641005b99c062391532ecce3708879d2c29868fe86645824a65de8fca16ed1e9c063291a2083d99d0b8468c90c95d7961fc274
-EBUILD hamlib-4.5.1.ebuild 2147 BLAKE2B 560831f12f948ffa3bba2a6b317999ccaff530b6b1ee8b18da0a6af254fd3a180b561bccda01aceed6f56da399c204533566f7bbea2263635318f2505e15591f SHA512 538d46e71035fe9c1b36060181110029b21004d2961fa0d2217816192bfc2faf528d538454261bf42e662f53fd82a3cc658fe47649b94d16ee837786716c854e
-EBUILD hamlib-4.5.3.ebuild 2147 BLAKE2B 78617b898ab4ffd67b5392a4d03810fda8fb550acb7e694e7725ec1465d983ec62b210882f80436e8b2464876cfda251bbf81417e784fd7d1f8ff78483e64aca SHA512 3eaac707ee37c64dac991cf9fa0ea0507fbb8594613880fc1fa6e4f1fa93e1f8905e9a75ed6fd245545ecea2e699b2b7d94bf26dc30cce386b884fc13da1649f
-EBUILD hamlib-4.5.ebuild 2219 BLAKE2B 933671fb2525421297a9c7693230daa3fc551d19eb000898dd70c1c321d2124ee9d8cad49cfdefed555d1a2c2e98aa8435bf034e5a1733b175e7ab3db26a9ece SHA512 7805a0332fa2795147c2dfebcaba2648740bba7d1cc7fed9a1566c80a17aaabe9f656263651e5a1041e849747352ee8a75c7fd9036907c27f005e78bb1b45c78
+EBUILD hamlib-4.5.3.ebuild 2147 BLAKE2B a92108f28aed0925de078c20284bd3c079fb920f36b07c3fa50db7398c071c30e1136441b4dd016496a0adf5ae19ed5a3d1ff6637b418b724fe7231fab0598af SHA512 ee006033ad578985bf4c76bbbfe1c0470aee0a94fc6ba23c9c48f3553e3af94d16d6913bd37ade3d444c408a972f3ba486c6e9ae659167c4f60fb15e4893ee57
 MISC metadata.xml 326 BLAKE2B ea402b17f863a6a0370743d2756c6c3c15a8d7bdfd0777db2cec56cc41dd93198ad36ff114f3c9bc265ea54228d87856f3edd35f9696ac5c89136fce4c5acf87 SHA512 84642d6397e97ea348a12d44a01015a51af72b40af5456416ac3477e55da9ef5ab1934f66b2fac0762c4b0483e20e92c3a49f334bf136de16b01043a15073f7f
diff --git a/media-libs/hamlib/hamlib-4.5.1.ebuild b/media-libs/hamlib/hamlib-4.5.1.ebuild
deleted file mode 100644
index a519e701d933..000000000000
--- a/media-libs/hamlib/hamlib-4.5.1.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-MY_P=${P/_rc2/~rc2}
-
-inherit autotools python-single-r1
-
-DESCRIPTION="Ham radio backend rig control libraries"
-HOMEPAGE="http://www.hamlib.org"
-SRC_URI="mirror://sourceforge/hamlib/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2 GPL-2"
-SLOT="0/4.2"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
-IUSE="doc perl python tcl"
-
-RESTRICT="test"
-
-RDEPEND="
-	=virtual/libusb-0*
-	dev-libs/libxml2
-	sys-libs/readline:0=
-	perl? ( dev-lang/perl )
-	python? ( ${PYTHON_DEPS} )
-	tcl? ( dev-lang/tcl:0= )"
-
-DEPEND=" ${RDEPEND}
-	virtual/pkgconfig
-	dev-lang/swig
-	>=sys-devel/libtool-2.2
-	doc? ( app-doc/doxygen
-		dev-util/source-highlight )"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DOCS=(AUTHORS NEWS PLAN README README.betatester README.developer)
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# fix hardcoded libdir paths
-	sed -i -e "s#fix}/lib#fix}/$(get_libdir)/hamlib#" \
-		-e "s#fix}/include#fix}/include/hamlib#" \
-		hamlib.pc.in || die "sed failed"
-
-	# Correct install target to whatever INSTALLDIRS says and use vendor
-	# installdirs everywhere (bug #611550)
-	sed -i -e "s#install_site#install#"	\
-	-e 's#MAKEFILE="Hamlib-pl.mk"#MAKEFILE="Hamlib-pl.mk" INSTALLDIRS=vendor#' \
-	bindings/Makefile.am || die "sed failed patching for perl"
-
-	# make building of documentation compatible with autotools-utils
-	sed -i -e "s/doc:/html:/g" doc/Makefile.am || die "sed failed"
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--libdir=/usr/$(get_libdir)/hamlib \
-		--disable-static \
-		--with-xml-support \
-		$(use_with perl perl-binding) \
-		$(use_with python python-binding) \
-		$(use_with tcl tcl-binding)
-}
-
-src_compile() {
-	emake
-	use doc && emake html
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	use python && python_optimize
-
-	use doc && HTML_DOCS=( doc/html/ )
-	einstalldocs
-
-	insinto /usr/$(get_libdir)/pkgconfig
-	doins hamlib.pc
-
-	echo "LDPATH=/usr/$(get_libdir)/hamlib" > "${T}"/73hamlib
-	doenvd "${T}"/73hamlib
-
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/media-libs/hamlib/hamlib-4.5.3.ebuild b/media-libs/hamlib/hamlib-4.5.3.ebuild
index 1b172b2c2880..c09e460664c0 100644
--- a/media-libs/hamlib/hamlib-4.5.3.ebuild
+++ b/media-libs/hamlib/hamlib-4.5.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 MY_P=${P/_rc2/~rc2}
 
 inherit autotools python-single-r1
diff --git a/media-libs/hamlib/hamlib-4.5.ebuild b/media-libs/hamlib/hamlib-4.5.ebuild
deleted file mode 100644
index 18a7511241b4..000000000000
--- a/media-libs/hamlib/hamlib-4.5.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-MY_P=${P/_rc2/~rc2}
-
-inherit autotools python-single-r1
-
-DESCRIPTION="Ham radio backend rig control libraries"
-HOMEPAGE="http://www.hamlib.org"
-SRC_URI="mirror://sourceforge/hamlib/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2 GPL-2"
-SLOT="0/4.2"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
-IUSE="doc perl python tcl"
-
-RESTRICT="test"
-
-RDEPEND="
-	=virtual/libusb-0*
-	dev-libs/libxml2
-	sys-libs/readline:0=
-	perl? ( dev-lang/perl )
-	python? ( ${PYTHON_DEPS} )
-	tcl? ( dev-lang/tcl:0= )"
-
-DEPEND=" ${RDEPEND}
-	virtual/pkgconfig
-	dev-lang/swig
-	>=sys-devel/libtool-2.2
-	doc? ( app-doc/doxygen
-		dev-util/source-highlight )"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DOCS=(AUTHORS NEWS PLAN README README.betatester README.developer)
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.4-fix-clang-warnings.patch" # 880961
-)
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# fix hardcoded libdir paths
-	sed -i -e "s#fix}/lib#fix}/$(get_libdir)/hamlib#" \
-		-e "s#fix}/include#fix}/include/hamlib#" \
-		hamlib.pc.in || die "sed failed"
-
-	# Correct install target to whatever INSTALLDIRS says and use vendor
-	# installdirs everywhere (bug #611550)
-	sed -i -e "s#install_site#install#"	\
-	-e 's#MAKEFILE="Hamlib-pl.mk"#MAKEFILE="Hamlib-pl.mk" INSTALLDIRS=vendor#' \
-	bindings/Makefile.am || die "sed failed patching for perl"
-
-	# make building of documentation compatible with autotools-utils
-	sed -i -e "s/doc:/html:/g" doc/Makefile.am || die "sed failed"
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--libdir=/usr/$(get_libdir)/hamlib \
-		--disable-static \
-		--with-xml-support \
-		$(use_with perl perl-binding) \
-		$(use_with python python-binding) \
-		$(use_with tcl tcl-binding)
-}
-
-src_compile() {
-	emake
-	use doc && emake html
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	use python && python_optimize
-
-	use doc && HTML_DOCS=( doc/html/ )
-	einstalldocs
-
-	insinto /usr/$(get_libdir)/pkgconfig
-	doins hamlib.pc
-
-	echo "LDPATH=/usr/$(get_libdir)/hamlib" > "${T}"/73hamlib
-	doenvd "${T}"/73hamlib
-
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/media-libs/intel-mediasdk/Manifest b/media-libs/intel-mediasdk/Manifest
index 70be4381cc28..0bc15a8a6842 100644
--- a/media-libs/intel-mediasdk/Manifest
+++ b/media-libs/intel-mediasdk/Manifest
@@ -1,4 +1,6 @@
 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
 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.4.ebuild b/media-libs/intel-mediasdk/intel-mediasdk-22.6.4.ebuild
new file mode 100644
index 000000000000..27755b2b6e96
--- /dev/null
+++ b/media-libs/intel-mediasdk/intel-mediasdk-22.6.4.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2023 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/mesa/Manifest b/media-libs/mesa/Manifest
index 12eaffef0d23..fe0eff536fd1 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -1,12 +1,6 @@
-DIST mesa-22.2.3.tar.xz 16464020 BLAKE2B 8f1482983ff9de9565a7f48f22e315b022ea8a07d7157e0d202c4d027d13ad4563c40ea63e1d0a92675af7f23d5245be9ed137955c3a9dd85171a35d497a94b2 SHA512 08e9ce43392c46f9c0d122d70e118511eea81422d06f93ab6d330689b46feed3ac1c3bdcdcfd4a27cd5b9eaf26aab518d152a2c753f07b8ed19575d4ed892ad6
 DIST mesa-22.2.5.tar.xz 16524904 BLAKE2B 5891e76e818dcd665ebac6dadbf223f382380206ec0edc85f8d9f6e298ab3126d9992fc7d4e38c12b455f21e6e40f3849b08ffaacc0cb38454b2e23c06277d36 SHA512 9039cf31e719b66a6ecea48e7f871d187333a1accd3fa77ce2cb36ce539682dd50f09bccc11a0c35760051768108699cf90dfb0936809faf1e1294cc5d1ec0af
-DIST mesa-22.3.0.tar.xz 16878600 BLAKE2B 16b11bfad509292338fc46b36e49d747e5cd43a96c753cc2a8c0b915c7b86198a30aa78c8e2bcbaa0daf8cadd79a82046cf32ee6f6e373dcc00e2fdef554bc66 SHA512 bf4d344459f97d266a5943b33aecf062b0825e13c1617afdab71c4ba6a87a201440761c9a32a6e0060910a0917122e3f4d29f666d6b94a38a71c94b9ff3ab9da
-DIST mesa-22.3.1.tar.xz 16972884 BLAKE2B 14c2b265af97cf0436c0f104c748952ae875caac3e48766e2bad70e500c8f87cd8e1483ed88d19efc44625058ee80b242501dad5c24c96450b7068946e352152 SHA512 8a7aee67f6351de293d23425229eb7c42d6918fe9ffb46c6e5df9609f79633c98ab78e892507fe48055c51fa88bf103d7b7baa58e826b1758f66067048baed5b
 DIST mesa-22.3.2.tar.xz 16988720 BLAKE2B 8fdadd77a7bcac1b0ba6955b452a89cf823650ad3296128b82471888da666a33407e6ea2784ccf3f49c04a34fecfcd6a172372828fd2200e74d7dcf97e9c5938 SHA512 32934dd23cfcd6165c365597d9a469da0b806b72ea98a200f499344c3b47815db3bf78875b4ea766d2d28d9c70b50c1615d2d3fcbfd4769447fe0a9d3b32951f
-EBUILD mesa-22.2.3.ebuild 12662 BLAKE2B 1a59e0550ecb26c798779952f41b3778d8c5291ac82f1735f8ef34a0cf41f9f894623526f8ef6aa2df9b2d1c5caeb23dcdb907ee2292cf831b74a7743a94317d SHA512 2b67830be3e83ab1033d52d57300ab57b5aa85bede7e5f69bd94e9a517324c61abc719347f792596271e602a9057500eaa35ddd4f7d43278fb03bc4de0c4b5d9
-EBUILD mesa-22.2.5.ebuild 12670 BLAKE2B 183cad628fc9b0f4af0dbc1306fb1b0d3c1abfd6d7278f04b407b5f1eee3906de0e646f21ad8c0351d233d214ee61b523dfb8e3553054465dc68bbeed8532c1b SHA512 ad642794372efcd0c3588ef198c8f81a4944e92c0f3b834cd833e1fca48d2b32e2422113999f3f1c807779d057498e6d304217b4028480ef9da045ec7beb160d
-EBUILD mesa-22.3.0.ebuild 12462 BLAKE2B 39bef0e3793be36b2e20f70dfebe4d6693aba98019cb60b3975301bdb31cc6e6b9c903721dc875407c78151b6eec4612f1e759571234cb53e93b2887bcc0bd11 SHA512 b73c8b2a7bbb31b11b09b8477409839cb87ba9a0102dca8116e3ffad8e1672fa2c349a82f1b63433224e4813cd8a7ad0b668444b82ba31b7b61cbc858d386c98
-EBUILD mesa-22.3.1.ebuild 12462 BLAKE2B 39bef0e3793be36b2e20f70dfebe4d6693aba98019cb60b3975301bdb31cc6e6b9c903721dc875407c78151b6eec4612f1e759571234cb53e93b2887bcc0bd11 SHA512 b73c8b2a7bbb31b11b09b8477409839cb87ba9a0102dca8116e3ffad8e1672fa2c349a82f1b63433224e4813cd8a7ad0b668444b82ba31b7b61cbc858d386c98
+EBUILD mesa-22.2.5.ebuild 12662 BLAKE2B 1a59e0550ecb26c798779952f41b3778d8c5291ac82f1735f8ef34a0cf41f9f894623526f8ef6aa2df9b2d1c5caeb23dcdb907ee2292cf831b74a7743a94317d SHA512 2b67830be3e83ab1033d52d57300ab57b5aa85bede7e5f69bd94e9a517324c61abc719347f792596271e602a9057500eaa35ddd4f7d43278fb03bc4de0c4b5d9
 EBUILD mesa-22.3.2.ebuild 12462 BLAKE2B 39bef0e3793be36b2e20f70dfebe4d6693aba98019cb60b3975301bdb31cc6e6b9c903721dc875407c78151b6eec4612f1e759571234cb53e93b2887bcc0bd11 SHA512 b73c8b2a7bbb31b11b09b8477409839cb87ba9a0102dca8116e3ffad8e1672fa2c349a82f1b63433224e4813cd8a7ad0b668444b82ba31b7b61cbc858d386c98
 EBUILD mesa-9999.ebuild 12462 BLAKE2B 39bef0e3793be36b2e20f70dfebe4d6693aba98019cb60b3975301bdb31cc6e6b9c903721dc875407c78151b6eec4612f1e759571234cb53e93b2887bcc0bd11 SHA512 b73c8b2a7bbb31b11b09b8477409839cb87ba9a0102dca8116e3ffad8e1672fa2c349a82f1b63433224e4813cd8a7ad0b668444b82ba31b7b61cbc858d386c98
 MISC metadata.xml 1705 BLAKE2B d00c5edf48d5fb9c7485958569d8be761b0a8a79b893d50347687d2fd1c4ffac1325bbc32254737f8249e8b2cef2e86ae7b06a3c6351f7a03844f48ce1df428d SHA512 5c67ebd046a486e5e45864f79233ce659e0fa1d4c30284e9f3908c73d2f3480af50dddcf0676b8ed0ffe60a991ed4b59ce199d7ea16d6520a191ad076c5a9ec0
diff --git a/media-libs/mesa/mesa-22.2.3.ebuild b/media-libs/mesa/mesa-22.2.3.ebuild
deleted file mode 100644
index dbced9dbf5a3..000000000000
--- a/media-libs/mesa/mesa-22.2.3.ebuild
+++ /dev/null
@@ -1,476 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit llvm meson-multilib python-any-r1 linux-info
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="OpenGL-like graphic library for Linux"
-HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/"
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git"
-	inherit git-r3
-else
-	SRC_URI="https://archive.mesa3d.org/${MY_P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-RESTRICT="!test? ( test )"
-
-RADEON_CARDS="r300 r600 radeon radeonsi"
-VIDEO_CARDS="${RADEON_CARDS} d3d12 freedreno intel lima nouveau panfrost v3d vc4 virgl vivante vmware"
-for card in ${VIDEO_CARDS}; do
-	IUSE_VIDEO_CARDS+=" video_cards_${card}"
-done
-
-IUSE="${IUSE_VIDEO_CARDS}
-	cpu_flags_x86_sse2 d3d9 debug gles1 +gles2 +llvm
-	lm-sensors opencl osmesa +proprietary-codecs selinux
-	test unwind vaapi valgrind vdpau vulkan
-	vulkan-overlay wayland +X xa xvmc zink +zstd"
-
-REQUIRED_USE="
-	d3d9?   ( || ( video_cards_intel video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) )
-	vulkan? ( video_cards_radeonsi? ( llvm ) )
-	vulkan-overlay? ( vulkan )
-	video_cards_radeon? ( x86? ( llvm ) amd64? ( llvm ) )
-	video_cards_r300?   ( x86? ( llvm ) amd64? ( llvm ) )
-	video_cards_radeonsi?   ( llvm )
-	xa? ( X )
-	xvmc? ( X )
-	zink? ( vulkan )
-"
-
-LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.110"
-RDEPEND="
-	>=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
-	>=media-libs/libglvnd-1.3.2[X?,${MULTILIB_USEDEP}]
-	>=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}]
-	unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
-	llvm? (
-		video_cards_radeonsi? (
-			virtual/libelf:0=[${MULTILIB_USEDEP}]
-		)
-		video_cards_r600? (
-			virtual/libelf:0=[${MULTILIB_USEDEP}]
-		)
-		video_cards_radeon? (
-			virtual/libelf:0=[${MULTILIB_USEDEP}]
-		)
-	)
-	lm-sensors? ( sys-apps/lm-sensors:=[${MULTILIB_USEDEP}] )
-	opencl? (
-				>=virtual/opencl-3[${MULTILIB_USEDEP}]
-				dev-libs/libclc
-				virtual/libelf:0=[${MULTILIB_USEDEP}]
-			)
-	vaapi? (
-		>=media-libs/libva-1.7.3:=[${MULTILIB_USEDEP}]
-	)
-	vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
-	xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
-	selinux? ( sys-libs/libselinux[${MULTILIB_USEDEP}] )
-	wayland? (
-		>=dev-libs/wayland-1.18.0:=[${MULTILIB_USEDEP}]
-	)
-	${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_intel?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}]
-	X? (
-		>=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
-		>=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}]
-		>=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
-		>=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}]
-		>=x11-libs/libxcb-1.13:=[${MULTILIB_USEDEP}]
-		x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
-	)
-	zink? ( media-libs/vulkan-loader:=[${MULTILIB_USEDEP}] )
-	zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )
-"
-for card in ${RADEON_CARDS}; do
-	RDEPEND="${RDEPEND}
-		video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
-	"
-done
-RDEPEND="${RDEPEND}
-	video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] )
-"
-
-# Please keep the LLVM dependency block separate. Since LLVM is slotted,
-# we need to *really* make sure we're not pulling one than more slot
-# simultaneously.
-#
-# How to use it:
-# 1. List all the working slots (with min versions) in ||, newest first.
-# 2. Update the := to specify *max* version, e.g. < 10.
-# 3. Specify LLVM_MAX_SLOT, e.g. 9.
-LLVM_MAX_SLOT="15"
-LLVM_DEPSTR="
-	|| (
-		sys-devel/llvm:15[${MULTILIB_USEDEP}]
-		sys-devel/llvm:14[${MULTILIB_USEDEP}]
-		sys-devel/llvm:13[${MULTILIB_USEDEP}]
-	)
-	<sys-devel/llvm-$((LLVM_MAX_SLOT + 1)):=[${MULTILIB_USEDEP}]
-"
-LLVM_DEPSTR_AMDGPU=${LLVM_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
-CLANG_DEPSTR=${LLVM_DEPSTR//llvm/clang}
-CLANG_DEPSTR_AMDGPU=${CLANG_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
-RDEPEND="${RDEPEND}
-	llvm? (
-		opencl? (
-			video_cards_r600? (
-				${CLANG_DEPSTR_AMDGPU}
-			)
-			!video_cards_r600? (
-				video_cards_radeonsi? (
-					${CLANG_DEPSTR_AMDGPU}
-				)
-			)
-			!video_cards_r600? (
-				!video_cards_radeonsi? (
-					video_cards_radeon? (
-						${CLANG_DEPSTR_AMDGPU}
-					)
-				)
-			)
-			!video_cards_r600? (
-				!video_cards_radeon? (
-					!video_cards_radeonsi? (
-						${CLANG_DEPSTR}
-					)
-				)
-			)
-		)
-		!opencl? (
-			video_cards_r600? (
-				${LLVM_DEPSTR_AMDGPU}
-			)
-			!video_cards_r600? (
-				video_cards_radeonsi? (
-					${LLVM_DEPSTR_AMDGPU}
-				)
-			)
-			!video_cards_r600? (
-				!video_cards_radeonsi? (
-					video_cards_radeon? (
-						${LLVM_DEPSTR_AMDGPU}
-					)
-				)
-			)
-			!video_cards_r600? (
-				!video_cards_radeon? (
-					!video_cards_radeonsi? (
-						${LLVM_DEPSTR}
-					)
-				)
-			)
-		)
-	)
-"
-unset {LLVM,CLANG}_DEPSTR{,_AMDGPU}
-
-DEPEND="${RDEPEND}
-	video_cards_d3d12? ( dev-util/directx-headers[${MULTILIB_USEDEP}] )
-	valgrind? ( dev-util/valgrind )
-	wayland? ( >=dev-libs/wayland-protocols-1.24 )
-	X? (
-		x11-libs/libXrandr[${MULTILIB_USEDEP}]
-		x11-base/xorg-proto
-	)
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	opencl? (
-		>=sys-devel/gcc-4.6
-	)
-	sys-devel/bison
-	sys-devel/flex
-	virtual/pkgconfig
-	$(python_gen_any_dep ">=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]")
-	vulkan? ( video_cards_radeonsi? ( dev-util/glslang ) )
-	vulkan-overlay? ( dev-util/glslang )
-	wayland? ( dev-util/wayland-scanner )
-"
-
-S="${WORKDIR}/${MY_P}"
-EGIT_CHECKOUT_DIR=${S}
-
-QA_WX_LOAD="
-x86? (
-	usr/lib*/libglapi.so.0.0.0
-	usr/lib*/libGLESv1_CM.so.1.1.0
-	usr/lib*/libGLESv2.so.2.0.0
-	usr/lib*/libGL.so.1.2.0
-	usr/lib*/libOSMesa.so.8.0.0
-	usr/lib/libGLX_mesa.so.0.0.0
-)"
-
-llvm_check_deps() {
-	local flags=${MULTILIB_USEDEP}
-	if use video_cards_r600 || use video_cards_radeon || use video_cards_radeonsi
-	then
-		flags+=",llvm_targets_AMDGPU(-)"
-	fi
-
-	if use opencl; then
-		has_version "sys-devel/clang:${LLVM_SLOT}[${flags}]" || return 1
-	fi
-	has_version "sys-devel/llvm:${LLVM_SLOT}[${flags}]"
-}
-
-pkg_pretend() {
-	if use vulkan; then
-		if ! use video_cards_d3d12 &&
-		   ! use video_cards_freedreno &&
-		   ! use video_cards_intel &&
-		   ! use video_cards_radeonsi &&
-		   ! use video_cards_v3d; then
-			ewarn "Ignoring USE=vulkan     since VIDEO_CARDS does not contain d3d12, freedreno, intel, radeonsi, or v3d"
-		fi
-	fi
-
-	if use opencl; then
-		if ! use video_cards_r600 &&
-		   ! use video_cards_radeonsi; then
-			ewarn "Ignoring USE=opencl     since VIDEO_CARDS does not contain r600 or radeonsi"
-		fi
-	fi
-
-	if use vaapi; then
-		if ! use video_cards_d3d12 &&
-		   ! use video_cards_r600 &&
-		   ! use video_cards_radeonsi &&
-		   ! use video_cards_nouveau; then
-			ewarn "Ignoring USE=vaapi      since VIDEO_CARDS does not contain d3d12, r600, radeonsi, or nouveau"
-		fi
-	fi
-
-	if use vdpau; then
-		if ! use video_cards_d3d12 &&
-		   ! use video_cards_r300 &&
-		   ! use video_cards_r600 &&
-		   ! use video_cards_radeonsi &&
-		   ! use video_cards_nouveau; then
-			ewarn "Ignoring USE=vdpau      since VIDEO_CARDS does not contain d3d12, r300, r600, radeonsi, or nouveau"
-		fi
-	fi
-
-	if use xa; then
-		if ! use video_cards_freedreno &&
-		   ! use video_cards_nouveau &&
-		   ! use video_cards_vmware; then
-			ewarn "Ignoring USE=xa         since VIDEO_CARDS does not contain freedreno, nouveau, or vmware"
-		fi
-	fi
-
-	if use xvmc; then
-		if ! use video_cards_r600 &&
-		   ! use video_cards_nouveau; then
-			ewarn "Ignoring USE=xvmc       since VIDEO_CARDS does not contain r600 or nouveau"
-		fi
-	fi
-
-	if ! use llvm; then
-		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain llvm"
-	fi
-
-	if use osmesa && ! use llvm; then
-		ewarn "OSMesa will be slow without enabling USE=llvm"
-	fi
-}
-
-python_check_deps() {
-	python_has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	# warning message for bug 459306
-	if use llvm && has_version sys-devel/llvm[!debug=]; then
-		ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm"
-		ewarn "detected! This can cause problems. For details, see bug 459306."
-	fi
-
-	if use video_cards_intel ||
-	   use video_cards_radeonsi; then
-		if kernel_is -ge 5 11 3; then
-			CONFIG_CHECK="~KCMP"
-		elif kernel_is -ge 5 11; then
-			CONFIG_CHECK="~CHECKPOINT_RESTORE"
-		elif kernel_is -ge 5 10 20; then
-			CONFIG_CHECK="~KCMP"
-		else
-			CONFIG_CHECK="~CHECKPOINT_RESTORE"
-		fi
-		linux-info_pkg_setup
-	fi
-
-	if use llvm; then
-		llvm_pkg_setup
-	fi
-	python-any-r1_pkg_setup
-}
-
-multilib_src_configure() {
-	local emesonargs=()
-
-	local platforms
-	use X && platforms+="x11"
-	use wayland && platforms+=",wayland"
-	emesonargs+=(-Dplatforms=${platforms#,})
-
-	if use video_cards_intel ||
-	   use video_cards_r300 ||
-	   use video_cards_r600 ||
-	   use video_cards_radeonsi ||
-	   use video_cards_nouveau ||
-	   use video_cards_vmware; then
-		emesonargs+=($(meson_use d3d9 gallium-nine))
-	else
-		emesonargs+=(-Dgallium-nine=false)
-	fi
-
-	if use video_cards_d3d12 ||
-	   use video_cards_r600 ||
-	   use video_cards_radeonsi ||
-	   use video_cards_nouveau; then
-		emesonargs+=($(meson_feature vaapi gallium-va))
-		use vaapi && emesonargs+=( -Dva-libs-path="${EPREFIX}"/usr/$(get_libdir)/va/drivers )
-	else
-		emesonargs+=(-Dgallium-va=disabled)
-	fi
-
-	if use video_cards_d3d12; then
-		emesonargs+=($(meson_feature vaapi gallium-d3d12-video))
-	fi
-
-	if use video_cards_d3d12 ||
-	   use video_cards_r300 ||
-	   use video_cards_r600 ||
-	   use video_cards_radeonsi ||
-	   use video_cards_nouveau; then
-		emesonargs+=($(meson_feature vdpau gallium-vdpau))
-	else
-		emesonargs+=(-Dgallium-vdpau=disabled)
-	fi
-
-	if use video_cards_freedreno ||
-	   use video_cards_nouveau ||
-	   use video_cards_vmware; then
-		emesonargs+=($(meson_feature xa gallium-xa))
-	else
-		emesonargs+=(-Dgallium-xa=disabled)
-	fi
-
-	if use video_cards_r600 ||
-	   use video_cards_nouveau; then
-		emesonargs+=($(meson_feature xvmc gallium-xvmc))
-	else
-		emesonargs+=(-Dgallium-xvmc=disabled)
-	fi
-
-	if use video_cards_freedreno ||
-	   use video_cards_lima ||
-	   use video_cards_panfrost ||
-	   use video_cards_v3d ||
-	   use video_cards_vc4 ||
-	   use video_cards_vivante; then
-		gallium_enable -- kmsro
-	fi
-
-	gallium_enable -- swrast
-	gallium_enable video_cards_freedreno freedreno
-	gallium_enable video_cards_intel crocus i915 iris
-	gallium_enable video_cards_lima lima
-	gallium_enable video_cards_d3d12 d3d12
-	gallium_enable video_cards_nouveau nouveau
-	gallium_enable video_cards_panfrost panfrost
-	gallium_enable video_cards_v3d v3d
-	gallium_enable video_cards_vc4 vc4
-	gallium_enable video_cards_virgl virgl
-	gallium_enable video_cards_vivante etnaviv
-	gallium_enable video_cards_vmware svga
-	gallium_enable zink zink
-
-	gallium_enable video_cards_r300 r300
-	gallium_enable video_cards_r600 r600
-	gallium_enable video_cards_radeonsi radeonsi
-	if ! use video_cards_r300 && \
-		! use video_cards_r600; then
-		gallium_enable video_cards_radeon r300 r600
-	fi
-
-	# opencl stuff
-	emesonargs+=(
-		-Dgallium-opencl="$(usex opencl icd disabled)"
-	)
-
-	if use vulkan; then
-		vulkan_enable video_cards_freedreno freedreno
-		vulkan_enable video_cards_intel intel
-		vulkan_enable video_cards_d3d12 microsoft-experimental
-		vulkan_enable video_cards_radeonsi amd
-		vulkan_enable video_cards_v3d broadcom
-	fi
-
-	driver_list() {
-		local drivers="$(sort -u <<< "${1// /$'\n'}")"
-		echo "${drivers//$'\n'/,}"
-	}
-
-	local vulkan_layers
-	use vulkan && vulkan_layers+="device-select"
-	use vulkan-overlay && vulkan_layers+=",overlay"
-	emesonargs+=(-Dvulkan-layers=${vulkan_layers#,})
-
-	emesonargs+=(
-		$(meson_use test build-tests)
-		-Dglx=$(usex X dri disabled)
-		-Dshared-glapi=enabled
-		-Ddri3=enabled
-		-Degl=enabled
-		-Dgbm=enabled
-		-Dglvnd=true
-		$(meson_feature gles1)
-		$(meson_feature gles2)
-		$(meson_feature llvm)
-		$(meson_feature lm-sensors lmsensors)
-		$(meson_use osmesa)
-		$(meson_use selinux)
-		$(meson_feature unwind libunwind)
-		$(meson_feature zstd)
-		$(meson_use cpu_flags_x86_sse2 sse2)
-		-Dvalgrind=$(usex valgrind auto disabled)
-		-Dvideo-codecs=$(usex proprietary-codecs "h264dec,h264enc,h265dec,h265enc,vc1dec" "")
-		-Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}")
-		-Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}")
-		--buildtype $(usex debug debug plain)
-		-Db_ndebug=$(usex debug false true)
-	)
-	meson_src_configure
-}
-
-multilib_src_test() {
-	meson_src_test -t 100
-}
-
-# $1 - VIDEO_CARDS flag (check skipped for "--")
-# other args - names of DRI drivers to enable
-gallium_enable() {
-	if [[ $1 == -- ]] || use $1; then
-		shift
-		GALLIUM_DRIVERS+=("$@")
-	fi
-}
-
-vulkan_enable() {
-	if [[ $1 == -- ]] || use $1; then
-		shift
-		VULKAN_DRIVERS+=("$@")
-	fi
-}
diff --git a/media-libs/mesa/mesa-22.2.5.ebuild b/media-libs/mesa/mesa-22.2.5.ebuild
index c0bc271552b9..dbced9dbf5a3 100644
--- a/media-libs/mesa/mesa-22.2.5.ebuild
+++ b/media-libs/mesa/mesa-22.2.5.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://archive.mesa3d.org/${MY_P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="MIT"
diff --git a/media-libs/mesa/mesa-22.3.0.ebuild b/media-libs/mesa/mesa-22.3.0.ebuild
deleted file mode 100644
index f39169af89a2..000000000000
--- a/media-libs/mesa/mesa-22.3.0.ebuild
+++ /dev/null
@@ -1,467 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit llvm meson-multilib python-any-r1 linux-info
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="OpenGL-like graphic library for Linux"
-HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/"
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git"
-	inherit git-r3
-else
-	SRC_URI="https://archive.mesa3d.org/${MY_P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-RESTRICT="!test? ( test )"
-
-RADEON_CARDS="r300 r600 radeon radeonsi"
-VIDEO_CARDS="${RADEON_CARDS} d3d12 freedreno intel lima nouveau panfrost v3d vc4 virgl vivante vmware"
-for card in ${VIDEO_CARDS}; do
-	IUSE_VIDEO_CARDS+=" video_cards_${card}"
-done
-
-IUSE="${IUSE_VIDEO_CARDS}
-	cpu_flags_x86_sse2 d3d9 debug gles1 +gles2 +llvm
-	lm-sensors opencl osmesa +proprietary-codecs selinux
-	test unwind vaapi valgrind vdpau vulkan
-	vulkan-overlay wayland +X xa zink +zstd"
-
-REQUIRED_USE="
-	d3d9?   ( || ( video_cards_intel video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) )
-	vulkan? ( video_cards_radeonsi? ( llvm ) )
-	vulkan-overlay? ( vulkan )
-	video_cards_radeon? ( x86? ( llvm ) amd64? ( llvm ) )
-	video_cards_r300?   ( x86? ( llvm ) amd64? ( llvm ) )
-	video_cards_radeonsi?   ( llvm )
-	xa? ( X )
-	zink? ( vulkan )
-"
-
-LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.110"
-RDEPEND="
-	>=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}]
-	>=media-libs/libglvnd-1.3.2[X?,${MULTILIB_USEDEP}]
-	>=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}]
-	unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
-	llvm? (
-		video_cards_radeonsi? (
-			virtual/libelf:0=[${MULTILIB_USEDEP}]
-		)
-		video_cards_r600? (
-			virtual/libelf:0=[${MULTILIB_USEDEP}]
-		)
-		video_cards_radeon? (
-			virtual/libelf:0=[${MULTILIB_USEDEP}]
-		)
-	)
-	lm-sensors? ( sys-apps/lm-sensors:=[${MULTILIB_USEDEP}] )
-	opencl? (
-				>=virtual/opencl-3[${MULTILIB_USEDEP}]
-				dev-libs/libclc
-				virtual/libelf:0=[${MULTILIB_USEDEP}]
-			)
-	vaapi? (
-		>=media-libs/libva-1.7.3:=[${MULTILIB_USEDEP}]
-	)
-	vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
-	selinux? ( sys-libs/libselinux[${MULTILIB_USEDEP}] )
-	wayland? ( >=dev-libs/wayland-1.18.0[${MULTILIB_USEDEP}] )
-	${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_intel?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}]
-	X? (
-		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libxshmfence-1.1[${MULTILIB_USEDEP}]
-		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXxf86vm-1.1.3[${MULTILIB_USEDEP}]
-		>=x11-libs/libxcb-1.13:=[${MULTILIB_USEDEP}]
-		x11-libs/libXfixes[${MULTILIB_USEDEP}]
-	)
-	zink? ( media-libs/vulkan-loader:=[${MULTILIB_USEDEP}] )
-	zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )
-"
-for card in ${RADEON_CARDS}; do
-	RDEPEND="${RDEPEND}
-		video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
-	"
-done
-RDEPEND="${RDEPEND}
-	video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] )
-"
-
-# Please keep the LLVM dependency block separate. Since LLVM is slotted,
-# we need to *really* make sure we're not pulling one than more slot
-# simultaneously.
-#
-# How to use it:
-# 1. List all the working slots (with min versions) in ||, newest first.
-# 2. Update the := to specify *max* version, e.g. < 10.
-# 3. Specify LLVM_MAX_SLOT, e.g. 9.
-LLVM_MAX_SLOT="16"
-LLVM_DEPSTR="
-	|| (
-		sys-devel/llvm:16[${MULTILIB_USEDEP}]
-		sys-devel/llvm:15[${MULTILIB_USEDEP}]
-		sys-devel/llvm:14[${MULTILIB_USEDEP}]
-		sys-devel/llvm:13[${MULTILIB_USEDEP}]
-	)
-	<sys-devel/llvm-$((LLVM_MAX_SLOT + 1)):=[${MULTILIB_USEDEP}]
-"
-LLVM_DEPSTR_AMDGPU=${LLVM_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
-CLANG_DEPSTR=${LLVM_DEPSTR//llvm/clang}
-CLANG_DEPSTR_AMDGPU=${CLANG_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
-RDEPEND="${RDEPEND}
-	llvm? (
-		opencl? (
-			video_cards_r600? (
-				${CLANG_DEPSTR_AMDGPU}
-			)
-			!video_cards_r600? (
-				video_cards_radeonsi? (
-					${CLANG_DEPSTR_AMDGPU}
-				)
-			)
-			!video_cards_r600? (
-				!video_cards_radeonsi? (
-					video_cards_radeon? (
-						${CLANG_DEPSTR_AMDGPU}
-					)
-				)
-			)
-			!video_cards_r600? (
-				!video_cards_radeon? (
-					!video_cards_radeonsi? (
-						${CLANG_DEPSTR}
-					)
-				)
-			)
-		)
-		!opencl? (
-			video_cards_r600? (
-				${LLVM_DEPSTR_AMDGPU}
-			)
-			!video_cards_r600? (
-				video_cards_radeonsi? (
-					${LLVM_DEPSTR_AMDGPU}
-				)
-			)
-			!video_cards_r600? (
-				!video_cards_radeonsi? (
-					video_cards_radeon? (
-						${LLVM_DEPSTR_AMDGPU}
-					)
-				)
-			)
-			!video_cards_r600? (
-				!video_cards_radeon? (
-					!video_cards_radeonsi? (
-						${LLVM_DEPSTR}
-					)
-				)
-			)
-		)
-	)
-"
-unset {LLVM,CLANG}_DEPSTR{,_AMDGPU}
-
-DEPEND="${RDEPEND}
-	video_cards_d3d12? ( dev-util/directx-headers[${MULTILIB_USEDEP}] )
-	valgrind? ( dev-util/valgrind )
-	wayland? ( >=dev-libs/wayland-protocols-1.24 )
-	X? (
-		x11-libs/libXrandr[${MULTILIB_USEDEP}]
-		x11-base/xorg-proto
-	)
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	opencl? (
-		>=sys-devel/gcc-4.6
-	)
-	sys-devel/bison
-	sys-devel/flex
-	virtual/pkgconfig
-	$(python_gen_any_dep ">=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]")
-	vulkan? ( dev-util/glslang )
-	wayland? ( dev-util/wayland-scanner )
-"
-
-S="${WORKDIR}/${MY_P}"
-EGIT_CHECKOUT_DIR=${S}
-
-QA_WX_LOAD="
-x86? (
-	usr/lib*/libglapi.so.0.0.0
-	usr/lib*/libGLESv1_CM.so.1.1.0
-	usr/lib*/libGLESv2.so.2.0.0
-	usr/lib*/libGL.so.1.2.0
-	usr/lib*/libOSMesa.so.8.0.0
-	usr/lib/libGLX_mesa.so.0.0.0
-)"
-
-llvm_check_deps() {
-	local flags=${MULTILIB_USEDEP}
-	if use video_cards_r600 || use video_cards_radeon || use video_cards_radeonsi
-	then
-		flags+=",llvm_targets_AMDGPU(-)"
-	fi
-
-	if use opencl; then
-		has_version "sys-devel/clang:${LLVM_SLOT}[${flags}]" || return 1
-	fi
-	has_version "sys-devel/llvm:${LLVM_SLOT}[${flags}]"
-}
-
-pkg_pretend() {
-	if use vulkan; then
-		if ! use video_cards_d3d12 &&
-		   ! use video_cards_freedreno &&
-		   ! use video_cards_intel &&
-		   ! use video_cards_radeonsi &&
-		   ! use video_cards_v3d; then
-			ewarn "Ignoring USE=vulkan     since VIDEO_CARDS does not contain d3d12, freedreno, intel, radeonsi, or v3d"
-		fi
-	fi
-
-	if use opencl; then
-		if ! use video_cards_r600 &&
-		   ! use video_cards_radeonsi; then
-			ewarn "Ignoring USE=opencl     since VIDEO_CARDS does not contain r600 or radeonsi"
-		fi
-	fi
-
-	if use vaapi; then
-		if ! use video_cards_d3d12 &&
-		   ! use video_cards_r600 &&
-		   ! use video_cards_radeonsi &&
-		   ! use video_cards_nouveau; then
-			ewarn "Ignoring USE=vaapi      since VIDEO_CARDS does not contain d3d12, r600, radeonsi, or nouveau"
-		fi
-	fi
-
-	if use vdpau; then
-		if ! use video_cards_d3d12 &&
-		   ! use video_cards_r300 &&
-		   ! use video_cards_r600 &&
-		   ! use video_cards_radeonsi &&
-		   ! use video_cards_nouveau; then
-			ewarn "Ignoring USE=vdpau      since VIDEO_CARDS does not contain d3d12, r300, r600, radeonsi, or nouveau"
-		fi
-	fi
-
-	if use xa; then
-		if ! use video_cards_freedreno &&
-		   ! use video_cards_nouveau &&
-		   ! use video_cards_vmware; then
-			ewarn "Ignoring USE=xa         since VIDEO_CARDS does not contain freedreno, nouveau, or vmware"
-		fi
-	fi
-
-	if ! use llvm; then
-		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain llvm"
-	fi
-
-	if use osmesa && ! use llvm; then
-		ewarn "OSMesa will be slow without enabling USE=llvm"
-	fi
-}
-
-python_check_deps() {
-	python_has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	# warning message for bug 459306
-	if use llvm && has_version sys-devel/llvm[!debug=]; then
-		ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm"
-		ewarn "detected! This can cause problems. For details, see bug 459306."
-	fi
-
-	if use video_cards_intel ||
-	   use video_cards_radeonsi; then
-		if kernel_is -ge 5 11 3; then
-			CONFIG_CHECK="~KCMP"
-		elif kernel_is -ge 5 11; then
-			CONFIG_CHECK="~CHECKPOINT_RESTORE"
-		elif kernel_is -ge 5 10 20; then
-			CONFIG_CHECK="~KCMP"
-		else
-			CONFIG_CHECK="~CHECKPOINT_RESTORE"
-		fi
-		linux-info_pkg_setup
-	fi
-
-	if use llvm; then
-		llvm_pkg_setup
-	fi
-	python-any-r1_pkg_setup
-}
-
-multilib_src_configure() {
-	local emesonargs=()
-
-	local platforms
-	use X && platforms+="x11"
-	use wayland && platforms+=",wayland"
-	emesonargs+=(-Dplatforms=${platforms#,})
-
-	if use video_cards_intel ||
-	   use video_cards_r300 ||
-	   use video_cards_r600 ||
-	   use video_cards_radeonsi ||
-	   use video_cards_nouveau ||
-	   use video_cards_vmware; then
-		emesonargs+=($(meson_use d3d9 gallium-nine))
-	else
-		emesonargs+=(-Dgallium-nine=false)
-	fi
-
-	if use video_cards_d3d12 ||
-	   use video_cards_r600 ||
-	   use video_cards_radeonsi ||
-	   use video_cards_nouveau; then
-		emesonargs+=($(meson_feature vaapi gallium-va))
-		use vaapi && emesonargs+=( -Dva-libs-path="${EPREFIX}"/usr/$(get_libdir)/va/drivers )
-	else
-		emesonargs+=(-Dgallium-va=disabled)
-	fi
-
-	if use video_cards_d3d12; then
-		emesonargs+=($(meson_feature vaapi gallium-d3d12-video))
-	fi
-
-	if use video_cards_d3d12 ||
-	   use video_cards_r300 ||
-	   use video_cards_r600 ||
-	   use video_cards_radeonsi ||
-	   use video_cards_nouveau; then
-		emesonargs+=($(meson_feature vdpau gallium-vdpau))
-	else
-		emesonargs+=(-Dgallium-vdpau=disabled)
-	fi
-
-	if use video_cards_freedreno ||
-	   use video_cards_nouveau ||
-	   use video_cards_vmware; then
-		emesonargs+=($(meson_feature xa gallium-xa))
-	else
-		emesonargs+=(-Dgallium-xa=disabled)
-	fi
-
-	if use video_cards_freedreno ||
-	   use video_cards_lima ||
-	   use video_cards_panfrost ||
-	   use video_cards_v3d ||
-	   use video_cards_vc4 ||
-	   use video_cards_vivante; then
-		gallium_enable -- kmsro
-	fi
-
-	gallium_enable -- swrast
-	gallium_enable video_cards_freedreno freedreno
-	gallium_enable video_cards_intel crocus i915 iris
-	gallium_enable video_cards_lima lima
-	gallium_enable video_cards_d3d12 d3d12
-	gallium_enable video_cards_nouveau nouveau
-	gallium_enable video_cards_panfrost panfrost
-	gallium_enable video_cards_v3d v3d
-	gallium_enable video_cards_vc4 vc4
-	gallium_enable video_cards_virgl virgl
-	gallium_enable video_cards_vivante etnaviv
-	gallium_enable video_cards_vmware svga
-	gallium_enable zink zink
-
-	gallium_enable video_cards_r300 r300
-	gallium_enable video_cards_r600 r600
-	gallium_enable video_cards_radeonsi radeonsi
-	if ! use video_cards_r300 && \
-		! use video_cards_r600; then
-		gallium_enable video_cards_radeon r300 r600
-	fi
-
-	# opencl stuff
-	emesonargs+=(
-		-Dgallium-opencl="$(usex opencl icd disabled)"
-	)
-
-	if use vulkan; then
-		vulkan_enable video_cards_freedreno freedreno
-		vulkan_enable video_cards_intel intel
-		vulkan_enable video_cards_d3d12 microsoft-experimental
-		vulkan_enable video_cards_radeonsi amd
-		vulkan_enable video_cards_v3d broadcom
-	fi
-
-	driver_list() {
-		local drivers="$(sort -u <<< "${1// /$'\n'}")"
-		echo "${drivers//$'\n'/,}"
-	}
-
-	local vulkan_layers
-	use vulkan && vulkan_layers+="device-select"
-	use vulkan-overlay && vulkan_layers+=",overlay"
-	emesonargs+=(-Dvulkan-layers=${vulkan_layers#,})
-
-	# In LLVM 16, we've switched to building LLVM with EH/RTTI disabled
-	# to match upstream defaults.  Mesa requires being built the same way.
-	# https://bugs.gentoo.org/883955
-	if [[ ${LLVM_SLOT} -ge 16 ]]; then
-		emesonargs+=(
-			-Dcpp_rtti=false
-		)
-	fi
-
-	emesonargs+=(
-		$(meson_use test build-tests)
-		-Dglx=$(usex X dri disabled)
-		-Dshared-glapi=enabled
-		-Ddri3=enabled
-		-Degl=enabled
-		-Dgbm=enabled
-		-Dglvnd=true
-		$(meson_feature gles1)
-		$(meson_feature gles2)
-		$(meson_feature llvm)
-		$(meson_feature lm-sensors lmsensors)
-		$(meson_use osmesa)
-		$(meson_use selinux)
-		$(meson_feature unwind libunwind)
-		$(meson_feature zstd)
-		$(meson_use cpu_flags_x86_sse2 sse2)
-		-Dvalgrind=$(usex valgrind auto disabled)
-		-Dvideo-codecs=$(usex proprietary-codecs "h264dec,h264enc,h265dec,h265enc,vc1dec" "")
-		-Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}")
-		-Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}")
-		--buildtype $(usex debug debug plain)
-		-Db_ndebug=$(usex debug false true)
-	)
-	meson_src_configure
-}
-
-multilib_src_test() {
-	meson_src_test -t 100
-}
-
-# $1 - VIDEO_CARDS flag (check skipped for "--")
-# other args - names of DRI drivers to enable
-gallium_enable() {
-	if [[ $1 == -- ]] || use $1; then
-		shift
-		GALLIUM_DRIVERS+=("$@")
-	fi
-}
-
-vulkan_enable() {
-	if [[ $1 == -- ]] || use $1; then
-		shift
-		VULKAN_DRIVERS+=("$@")
-	fi
-}
diff --git a/media-libs/mesa/mesa-22.3.1.ebuild b/media-libs/mesa/mesa-22.3.1.ebuild
deleted file mode 100644
index f39169af89a2..000000000000
--- a/media-libs/mesa/mesa-22.3.1.ebuild
+++ /dev/null
@@ -1,467 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit llvm meson-multilib python-any-r1 linux-info
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="OpenGL-like graphic library for Linux"
-HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/"
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git"
-	inherit git-r3
-else
-	SRC_URI="https://archive.mesa3d.org/${MY_P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-RESTRICT="!test? ( test )"
-
-RADEON_CARDS="r300 r600 radeon radeonsi"
-VIDEO_CARDS="${RADEON_CARDS} d3d12 freedreno intel lima nouveau panfrost v3d vc4 virgl vivante vmware"
-for card in ${VIDEO_CARDS}; do
-	IUSE_VIDEO_CARDS+=" video_cards_${card}"
-done
-
-IUSE="${IUSE_VIDEO_CARDS}
-	cpu_flags_x86_sse2 d3d9 debug gles1 +gles2 +llvm
-	lm-sensors opencl osmesa +proprietary-codecs selinux
-	test unwind vaapi valgrind vdpau vulkan
-	vulkan-overlay wayland +X xa zink +zstd"
-
-REQUIRED_USE="
-	d3d9?   ( || ( video_cards_intel video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) )
-	vulkan? ( video_cards_radeonsi? ( llvm ) )
-	vulkan-overlay? ( vulkan )
-	video_cards_radeon? ( x86? ( llvm ) amd64? ( llvm ) )
-	video_cards_r300?   ( x86? ( llvm ) amd64? ( llvm ) )
-	video_cards_radeonsi?   ( llvm )
-	xa? ( X )
-	zink? ( vulkan )
-"
-
-LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.110"
-RDEPEND="
-	>=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}]
-	>=media-libs/libglvnd-1.3.2[X?,${MULTILIB_USEDEP}]
-	>=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}]
-	unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
-	llvm? (
-		video_cards_radeonsi? (
-			virtual/libelf:0=[${MULTILIB_USEDEP}]
-		)
-		video_cards_r600? (
-			virtual/libelf:0=[${MULTILIB_USEDEP}]
-		)
-		video_cards_radeon? (
-			virtual/libelf:0=[${MULTILIB_USEDEP}]
-		)
-	)
-	lm-sensors? ( sys-apps/lm-sensors:=[${MULTILIB_USEDEP}] )
-	opencl? (
-				>=virtual/opencl-3[${MULTILIB_USEDEP}]
-				dev-libs/libclc
-				virtual/libelf:0=[${MULTILIB_USEDEP}]
-			)
-	vaapi? (
-		>=media-libs/libva-1.7.3:=[${MULTILIB_USEDEP}]
-	)
-	vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
-	selinux? ( sys-libs/libselinux[${MULTILIB_USEDEP}] )
-	wayland? ( >=dev-libs/wayland-1.18.0[${MULTILIB_USEDEP}] )
-	${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_intel?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}]
-	X? (
-		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libxshmfence-1.1[${MULTILIB_USEDEP}]
-		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXxf86vm-1.1.3[${MULTILIB_USEDEP}]
-		>=x11-libs/libxcb-1.13:=[${MULTILIB_USEDEP}]
-		x11-libs/libXfixes[${MULTILIB_USEDEP}]
-	)
-	zink? ( media-libs/vulkan-loader:=[${MULTILIB_USEDEP}] )
-	zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )
-"
-for card in ${RADEON_CARDS}; do
-	RDEPEND="${RDEPEND}
-		video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
-	"
-done
-RDEPEND="${RDEPEND}
-	video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] )
-"
-
-# Please keep the LLVM dependency block separate. Since LLVM is slotted,
-# we need to *really* make sure we're not pulling one than more slot
-# simultaneously.
-#
-# How to use it:
-# 1. List all the working slots (with min versions) in ||, newest first.
-# 2. Update the := to specify *max* version, e.g. < 10.
-# 3. Specify LLVM_MAX_SLOT, e.g. 9.
-LLVM_MAX_SLOT="16"
-LLVM_DEPSTR="
-	|| (
-		sys-devel/llvm:16[${MULTILIB_USEDEP}]
-		sys-devel/llvm:15[${MULTILIB_USEDEP}]
-		sys-devel/llvm:14[${MULTILIB_USEDEP}]
-		sys-devel/llvm:13[${MULTILIB_USEDEP}]
-	)
-	<sys-devel/llvm-$((LLVM_MAX_SLOT + 1)):=[${MULTILIB_USEDEP}]
-"
-LLVM_DEPSTR_AMDGPU=${LLVM_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
-CLANG_DEPSTR=${LLVM_DEPSTR//llvm/clang}
-CLANG_DEPSTR_AMDGPU=${CLANG_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
-RDEPEND="${RDEPEND}
-	llvm? (
-		opencl? (
-			video_cards_r600? (
-				${CLANG_DEPSTR_AMDGPU}
-			)
-			!video_cards_r600? (
-				video_cards_radeonsi? (
-					${CLANG_DEPSTR_AMDGPU}
-				)
-			)
-			!video_cards_r600? (
-				!video_cards_radeonsi? (
-					video_cards_radeon? (
-						${CLANG_DEPSTR_AMDGPU}
-					)
-				)
-			)
-			!video_cards_r600? (
-				!video_cards_radeon? (
-					!video_cards_radeonsi? (
-						${CLANG_DEPSTR}
-					)
-				)
-			)
-		)
-		!opencl? (
-			video_cards_r600? (
-				${LLVM_DEPSTR_AMDGPU}
-			)
-			!video_cards_r600? (
-				video_cards_radeonsi? (
-					${LLVM_DEPSTR_AMDGPU}
-				)
-			)
-			!video_cards_r600? (
-				!video_cards_radeonsi? (
-					video_cards_radeon? (
-						${LLVM_DEPSTR_AMDGPU}
-					)
-				)
-			)
-			!video_cards_r600? (
-				!video_cards_radeon? (
-					!video_cards_radeonsi? (
-						${LLVM_DEPSTR}
-					)
-				)
-			)
-		)
-	)
-"
-unset {LLVM,CLANG}_DEPSTR{,_AMDGPU}
-
-DEPEND="${RDEPEND}
-	video_cards_d3d12? ( dev-util/directx-headers[${MULTILIB_USEDEP}] )
-	valgrind? ( dev-util/valgrind )
-	wayland? ( >=dev-libs/wayland-protocols-1.24 )
-	X? (
-		x11-libs/libXrandr[${MULTILIB_USEDEP}]
-		x11-base/xorg-proto
-	)
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	opencl? (
-		>=sys-devel/gcc-4.6
-	)
-	sys-devel/bison
-	sys-devel/flex
-	virtual/pkgconfig
-	$(python_gen_any_dep ">=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]")
-	vulkan? ( dev-util/glslang )
-	wayland? ( dev-util/wayland-scanner )
-"
-
-S="${WORKDIR}/${MY_P}"
-EGIT_CHECKOUT_DIR=${S}
-
-QA_WX_LOAD="
-x86? (
-	usr/lib*/libglapi.so.0.0.0
-	usr/lib*/libGLESv1_CM.so.1.1.0
-	usr/lib*/libGLESv2.so.2.0.0
-	usr/lib*/libGL.so.1.2.0
-	usr/lib*/libOSMesa.so.8.0.0
-	usr/lib/libGLX_mesa.so.0.0.0
-)"
-
-llvm_check_deps() {
-	local flags=${MULTILIB_USEDEP}
-	if use video_cards_r600 || use video_cards_radeon || use video_cards_radeonsi
-	then
-		flags+=",llvm_targets_AMDGPU(-)"
-	fi
-
-	if use opencl; then
-		has_version "sys-devel/clang:${LLVM_SLOT}[${flags}]" || return 1
-	fi
-	has_version "sys-devel/llvm:${LLVM_SLOT}[${flags}]"
-}
-
-pkg_pretend() {
-	if use vulkan; then
-		if ! use video_cards_d3d12 &&
-		   ! use video_cards_freedreno &&
-		   ! use video_cards_intel &&
-		   ! use video_cards_radeonsi &&
-		   ! use video_cards_v3d; then
-			ewarn "Ignoring USE=vulkan     since VIDEO_CARDS does not contain d3d12, freedreno, intel, radeonsi, or v3d"
-		fi
-	fi
-
-	if use opencl; then
-		if ! use video_cards_r600 &&
-		   ! use video_cards_radeonsi; then
-			ewarn "Ignoring USE=opencl     since VIDEO_CARDS does not contain r600 or radeonsi"
-		fi
-	fi
-
-	if use vaapi; then
-		if ! use video_cards_d3d12 &&
-		   ! use video_cards_r600 &&
-		   ! use video_cards_radeonsi &&
-		   ! use video_cards_nouveau; then
-			ewarn "Ignoring USE=vaapi      since VIDEO_CARDS does not contain d3d12, r600, radeonsi, or nouveau"
-		fi
-	fi
-
-	if use vdpau; then
-		if ! use video_cards_d3d12 &&
-		   ! use video_cards_r300 &&
-		   ! use video_cards_r600 &&
-		   ! use video_cards_radeonsi &&
-		   ! use video_cards_nouveau; then
-			ewarn "Ignoring USE=vdpau      since VIDEO_CARDS does not contain d3d12, r300, r600, radeonsi, or nouveau"
-		fi
-	fi
-
-	if use xa; then
-		if ! use video_cards_freedreno &&
-		   ! use video_cards_nouveau &&
-		   ! use video_cards_vmware; then
-			ewarn "Ignoring USE=xa         since VIDEO_CARDS does not contain freedreno, nouveau, or vmware"
-		fi
-	fi
-
-	if ! use llvm; then
-		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain llvm"
-	fi
-
-	if use osmesa && ! use llvm; then
-		ewarn "OSMesa will be slow without enabling USE=llvm"
-	fi
-}
-
-python_check_deps() {
-	python_has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	# warning message for bug 459306
-	if use llvm && has_version sys-devel/llvm[!debug=]; then
-		ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm"
-		ewarn "detected! This can cause problems. For details, see bug 459306."
-	fi
-
-	if use video_cards_intel ||
-	   use video_cards_radeonsi; then
-		if kernel_is -ge 5 11 3; then
-			CONFIG_CHECK="~KCMP"
-		elif kernel_is -ge 5 11; then
-			CONFIG_CHECK="~CHECKPOINT_RESTORE"
-		elif kernel_is -ge 5 10 20; then
-			CONFIG_CHECK="~KCMP"
-		else
-			CONFIG_CHECK="~CHECKPOINT_RESTORE"
-		fi
-		linux-info_pkg_setup
-	fi
-
-	if use llvm; then
-		llvm_pkg_setup
-	fi
-	python-any-r1_pkg_setup
-}
-
-multilib_src_configure() {
-	local emesonargs=()
-
-	local platforms
-	use X && platforms+="x11"
-	use wayland && platforms+=",wayland"
-	emesonargs+=(-Dplatforms=${platforms#,})
-
-	if use video_cards_intel ||
-	   use video_cards_r300 ||
-	   use video_cards_r600 ||
-	   use video_cards_radeonsi ||
-	   use video_cards_nouveau ||
-	   use video_cards_vmware; then
-		emesonargs+=($(meson_use d3d9 gallium-nine))
-	else
-		emesonargs+=(-Dgallium-nine=false)
-	fi
-
-	if use video_cards_d3d12 ||
-	   use video_cards_r600 ||
-	   use video_cards_radeonsi ||
-	   use video_cards_nouveau; then
-		emesonargs+=($(meson_feature vaapi gallium-va))
-		use vaapi && emesonargs+=( -Dva-libs-path="${EPREFIX}"/usr/$(get_libdir)/va/drivers )
-	else
-		emesonargs+=(-Dgallium-va=disabled)
-	fi
-
-	if use video_cards_d3d12; then
-		emesonargs+=($(meson_feature vaapi gallium-d3d12-video))
-	fi
-
-	if use video_cards_d3d12 ||
-	   use video_cards_r300 ||
-	   use video_cards_r600 ||
-	   use video_cards_radeonsi ||
-	   use video_cards_nouveau; then
-		emesonargs+=($(meson_feature vdpau gallium-vdpau))
-	else
-		emesonargs+=(-Dgallium-vdpau=disabled)
-	fi
-
-	if use video_cards_freedreno ||
-	   use video_cards_nouveau ||
-	   use video_cards_vmware; then
-		emesonargs+=($(meson_feature xa gallium-xa))
-	else
-		emesonargs+=(-Dgallium-xa=disabled)
-	fi
-
-	if use video_cards_freedreno ||
-	   use video_cards_lima ||
-	   use video_cards_panfrost ||
-	   use video_cards_v3d ||
-	   use video_cards_vc4 ||
-	   use video_cards_vivante; then
-		gallium_enable -- kmsro
-	fi
-
-	gallium_enable -- swrast
-	gallium_enable video_cards_freedreno freedreno
-	gallium_enable video_cards_intel crocus i915 iris
-	gallium_enable video_cards_lima lima
-	gallium_enable video_cards_d3d12 d3d12
-	gallium_enable video_cards_nouveau nouveau
-	gallium_enable video_cards_panfrost panfrost
-	gallium_enable video_cards_v3d v3d
-	gallium_enable video_cards_vc4 vc4
-	gallium_enable video_cards_virgl virgl
-	gallium_enable video_cards_vivante etnaviv
-	gallium_enable video_cards_vmware svga
-	gallium_enable zink zink
-
-	gallium_enable video_cards_r300 r300
-	gallium_enable video_cards_r600 r600
-	gallium_enable video_cards_radeonsi radeonsi
-	if ! use video_cards_r300 && \
-		! use video_cards_r600; then
-		gallium_enable video_cards_radeon r300 r600
-	fi
-
-	# opencl stuff
-	emesonargs+=(
-		-Dgallium-opencl="$(usex opencl icd disabled)"
-	)
-
-	if use vulkan; then
-		vulkan_enable video_cards_freedreno freedreno
-		vulkan_enable video_cards_intel intel
-		vulkan_enable video_cards_d3d12 microsoft-experimental
-		vulkan_enable video_cards_radeonsi amd
-		vulkan_enable video_cards_v3d broadcom
-	fi
-
-	driver_list() {
-		local drivers="$(sort -u <<< "${1// /$'\n'}")"
-		echo "${drivers//$'\n'/,}"
-	}
-
-	local vulkan_layers
-	use vulkan && vulkan_layers+="device-select"
-	use vulkan-overlay && vulkan_layers+=",overlay"
-	emesonargs+=(-Dvulkan-layers=${vulkan_layers#,})
-
-	# In LLVM 16, we've switched to building LLVM with EH/RTTI disabled
-	# to match upstream defaults.  Mesa requires being built the same way.
-	# https://bugs.gentoo.org/883955
-	if [[ ${LLVM_SLOT} -ge 16 ]]; then
-		emesonargs+=(
-			-Dcpp_rtti=false
-		)
-	fi
-
-	emesonargs+=(
-		$(meson_use test build-tests)
-		-Dglx=$(usex X dri disabled)
-		-Dshared-glapi=enabled
-		-Ddri3=enabled
-		-Degl=enabled
-		-Dgbm=enabled
-		-Dglvnd=true
-		$(meson_feature gles1)
-		$(meson_feature gles2)
-		$(meson_feature llvm)
-		$(meson_feature lm-sensors lmsensors)
-		$(meson_use osmesa)
-		$(meson_use selinux)
-		$(meson_feature unwind libunwind)
-		$(meson_feature zstd)
-		$(meson_use cpu_flags_x86_sse2 sse2)
-		-Dvalgrind=$(usex valgrind auto disabled)
-		-Dvideo-codecs=$(usex proprietary-codecs "h264dec,h264enc,h265dec,h265enc,vc1dec" "")
-		-Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}")
-		-Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}")
-		--buildtype $(usex debug debug plain)
-		-Db_ndebug=$(usex debug false true)
-	)
-	meson_src_configure
-}
-
-multilib_src_test() {
-	meson_src_test -t 100
-}
-
-# $1 - VIDEO_CARDS flag (check skipped for "--")
-# other args - names of DRI drivers to enable
-gallium_enable() {
-	if [[ $1 == -- ]] || use $1; then
-		shift
-		GALLIUM_DRIVERS+=("$@")
-	fi
-}
-
-vulkan_enable() {
-	if [[ $1 == -- ]] || use $1; then
-		shift
-		VULKAN_DRIVERS+=("$@")
-	fi
-}
diff --git a/media-libs/oneVPL-cpu/Manifest b/media-libs/oneVPL-cpu/Manifest
index 3ab9f22ee9c0..9b0083767acd 100644
--- a/media-libs/oneVPL-cpu/Manifest
+++ b/media-libs/oneVPL-cpu/Manifest
@@ -1,5 +1,7 @@
 AUX oneVPL-cpu-2022.2.5-respect-user-flags.patch 416 BLAKE2B c0ba2a7d75ab2d4ce93a472df09529536a141ff30563f0c6cc618a02d2766a1a88b5c3ab21fc6d02a4da6007e1b0c45df8b3c7bd206d2494200b8a835654315f SHA512 e5e7d762db4b45e84832cbee5f8e3e37e986bb0f73c07e792373c254e172fed0eb320ec58c3873aec071a51617682b0f4e2c299f701112094fec56ee74356986
 AUX oneVPL-cpu-2022.2.5-use-system-libs.patch 1884 BLAKE2B c13fecb58e2692ae53c531fe3ca4199a381f170712777d2df9f5ddd334481238f48666636dced8d39213187d9e162915b62c641d9015afe1a8326fcdcb724c88 SHA512 bffcfcc4b17145d1b1f0b608b1451d8438a77254c389ed4542c0b457b6064ad85b646605ac9cd2c176d9480aa1136412a728b172e8d2c642f8aae77ff9d18703
 DIST oneVPL-cpu-2022.2.5.tar.gz 9917180 BLAKE2B 8e0beebc226a0984474ca6822769736c78e80959bd2df9fd4a34014a31e3439cd42b9a104dfefaa70043df03834246c973e1ba29cea3a9af94a48c2b1d08edcc SHA512 e79b0f396bfcdb7156f8ec5b3008ddd813a0a01ade8e319f78afd3c9d862b111531c42a65ba19ea396b51d3e298608da271894867297dc95f51e4bcc19e9029e
+DIST oneVPL-cpu-2023.1.1.tar.gz 9917709 BLAKE2B 2e30f8e8e493b4027089031ea9434dd04e2ca4dc75d56083259077ef6f2b906c4419451592ce7d272af689c9e46f5dafe2a1552564e77a8012eb4881edc6afc2 SHA512 d294268f45dd59ebae43f3845641c39ecdea39055b9b2fb0fa660e7a3c809ba675f52a23a4cfb67b7c6e6dc0ea200aeb43d3313aeb70efa2b5027eec3d25e5f8
 EBUILD oneVPL-cpu-2022.2.5.ebuild 1350 BLAKE2B 39d7b66b53cd7f0c6a02a7f6626131adf78a176fbb270fdfd45853c99cf42655ac383feb4039d658d6ba8ff7601f0843ccac547d7116fa1e53ba98f9f05153ea SHA512 6d32c0ef1a0e77d75cc65a24c418b963be6daa2009aae32e6de92e579e81e7db302edf1ef811a0d5eea5b5474a78486b1df8d0be0aaddd812b0b36328194d45e
+EBUILD oneVPL-cpu-2023.1.1.ebuild 1355 BLAKE2B 5722d49b8a2cc4a81e9349b072605149efa1cc90cd20d73315094920f8ab504f15cf443835e872015b6e23249b6dd686110d498ca97136b25e1da2190a91d53a SHA512 4969d207a4e58b03e3fcec68b828a5bcbeb1c7618889db3682272eeb3f1e682574257214b016efe1b1e9c314519a1ee41469e26f3dc0340ae373b1d1856104c7
 MISC metadata.xml 606 BLAKE2B 470321a75d274c50d7480359081d67f9a4614549af06d0172f8211815d1d70edf73fd17ab576802294c375b7ddfff1849b63647894c7dca971e3b429236501cb SHA512 3e43d49860ee353cd16b6070ff358d3bef7ab404c55bd57f22e49e6aebf3b245930554884ecc490690512c92914fe04d40b35dbb6b339f46b5314d9e3545a92f
diff --git a/media-libs/oneVPL-cpu/oneVPL-cpu-2023.1.1.ebuild b/media-libs/oneVPL-cpu/oneVPL-cpu-2023.1.1.ebuild
new file mode 100644
index 000000000000..513675dc8a74
--- /dev/null
+++ b/media-libs/oneVPL-cpu/oneVPL-cpu-2023.1.1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="oneAPI Video Processing Library CPU implementation"
+HOMEPAGE="https://github.com/oneapi-src/oneVPL-cpu"
+SRC_URI="https://github.com/oneapi-src/oneVPL-cpu/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT x264? ( GPL-2 )"
+SLOT="0"
+KEYWORDS="~amd64"
+
+IUSE="experimental openh264 test +x264"
+REQUIRED_USE="^^ ( openh264 x264 )"
+# RESTRICT="!test? ( test )"
+# Tests fail
+RESTRICT="test"
+
+BDEPEND="virtual/pkgconfig"
+DEPEND="
+	media-libs/dav1d
+	media-libs/oneVPL[experimental?]
+	media-libs/svt-av1
+	media-libs/svt-hevc
+	media-video/ffmpeg
+	x264? ( media-libs/x264 )
+	openh264? ( media-libs/openh264 )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2022.2.5-use-system-libs.patch"
+	"${FILESDIR}/${PN}-2022.2.5-respect-user-flags.patch"
+)
+
+src_configure() {
+	# Use system libraries
+	export VPL_BUILD_DEPENDENCIES="${ESYSROOT}/usr"
+	local mycmakeargs=(
+		-DUSE_EXPERIMENTAL_API="$(usex experimental)"
+		-DBUILD_OPENH264="$(usex openh264)"
+		-DBUILD_TESTS="$(usex test)"
+		-DBUILD_GPL_X264="$(usex x264)"
+		# Use FHS instead
+		-DUSE_ONEAPI_INSTALL_LAYOUT=NO
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	# Remove these license files
+	rm -r "${ED}/usr/share/oneVPL-cpu/licensing" || die
+}
diff --git a/media-libs/oneVPL-intel-gpu/Manifest b/media-libs/oneVPL-intel-gpu/Manifest
index 46bc3750ef23..6a5f80144cdb 100644
--- a/media-libs/oneVPL-intel-gpu/Manifest
+++ b/media-libs/oneVPL-intel-gpu/Manifest
@@ -1,3 +1,5 @@
 DIST oneVPL-intel-gpu-22.6.3.tar.gz 6819100 BLAKE2B 9c87c41c072b7e7ef2dd8adcc6843eea564582f4070d452babb6b1eeadc13eb12dbe2e9d6075821954b7f7194f2ed814d3c1f6463c3b078912ee42cd684d1277 SHA512 56b29513142dc434732e646e3ec3e8d60db542f3be315190b06e9b532e4aef98423be9a0b6f35e65489085786446ecbd1c1774d06bea7552aaa7fb71517f4fb9
+DIST oneVPL-intel-gpu-22.6.4.tar.gz 6820037 BLAKE2B 0e91c91e31fbab69468f4ef351e6674551c02a7a42099b17b3e8fee07a2b8a1ea5884b2becee78d406cf881b3199a6b9823b690334dfd087b7e589309b382d17 SHA512 6d8c144e7efa0f900fab282fceb2d9f58e68212ed71c0e70ce3b9098f7dfba9f441d0ac181082387d254fcf171ef35746ac72edd7351a8065d0fd0f98e4b8ed6
 EBUILD oneVPL-intel-gpu-22.6.3.ebuild 1184 BLAKE2B 38714a7bf7d4c044540652f430378aa6930b65e7eab925941be748e1547519f78ee44b54a7c677e7325ccbe107bd04dd5a811d04c1a009cff3e27469ac03187a SHA512 1758be8b6e3ea52d174148df81a5970e4ccc2782ada6b03ea272eb7874c5b9956ef6b85110816378b0c780cc4805b19d0fec7d15c3c08b2ea36f9b7e3ce99d51
+EBUILD oneVPL-intel-gpu-22.6.4.ebuild 1189 BLAKE2B 8a6ed3716eb86c59cafe38febd015d9d66ed96f7db2397f9b3cf97283ed367d8d3ff49a764f97a0f59b831611576792df1398bd29d1cc740be7e0e6ccad8f62a SHA512 92c6095b06adfb4d3e697c8a2958d2afa9b5a50d13c1c16b870540be3356006a81913db012afbc8f5f9e0db96c29b95da6c547e9b9613666bbcdf932b33574db
 MISC metadata.xml 434 BLAKE2B f5f6ea2e0ebac9ba06ebdb2a8469e99171f25ad08d8e992695e7d189f5c3f8fb3e966d710fe02cbd1f590f2137e265d9bf5014f0d9e7a492574b526360d70133 SHA512 713bf6044fd4d5606568af248dc0adf1a93c5917fb7d6d79c7a033a5b52a0164769b02086caa0a4492979c586511b5a4d7b85fe603ffe80d4884786e05dc520e
diff --git a/media-libs/oneVPL-intel-gpu/oneVPL-intel-gpu-22.6.4.ebuild b/media-libs/oneVPL-intel-gpu/oneVPL-intel-gpu-22.6.4.ebuild
new file mode 100644
index 000000000000..1f7c7bcb5019
--- /dev/null
+++ b/media-libs/oneVPL-intel-gpu/oneVPL-intel-gpu-22.6.4.ebuild
@@ -0,0 +1,46 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="oneAPI Video Processing Library Intel GPU implementation"
+HOMEPAGE="https://github.com/oneapi-src/oneVPL-intel-gpu"
+SRC_URI="https://github.com/oneapi-src/oneVPL-intel-gpu/archive/refs/tags/intel-onevpl-${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-intel-onevpl-${PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="virtual/pkgconfig"
+DEPEND="
+	media-libs/libva
+	x11-libs/libdrm[video_cards_intel]
+"
+# At runtime we need a dispatcher, oneVPL is preferred but mediasdk also works
+RDEPEND="${DEPEND}
+	>=media-libs/libva-intel-media-driver-${PV}
+	|| (
+		media-libs/oneVPL[drm,vaapi]
+		media-libs/intel-mediasdk
+	)
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_RUNTIME=ON
+		# To build the kernels we need to package the cm-compiler, use pre-built instead
+		-DBUILD_KERNELS=OFF
+		-DBUILD_TESTS="$(usex test)"
+		# This only seems to do something if we BUILD_KERNELS=ON
+		#-DBUILD_TOOLS="$(usex tools)"
+		# OpenCL only has an effect if we build kernels
+		-DENABLE_OPENCL=OFF
+	)
+	cmake_src_configure
+}
diff --git a/media-libs/oneVPL/Manifest b/media-libs/oneVPL/Manifest
index cd01742ca98d..b973cc84a946 100644
--- a/media-libs/oneVPL/Manifest
+++ b/media-libs/oneVPL/Manifest
@@ -1,3 +1,5 @@
 DIST oneVPL-2022.2.5.tar.gz 6517210 BLAKE2B 1da487e9a4fbaa171f14213d0828c7dbed91d1f92d9641f10d9ef8fc895b4d51b33f80485b16e41e2cb15cd8d771f5c5f84370268cb2c347dc8e19d90d91a759 SHA512 7d100a347a109720f37d86c6dd86c216a75e77b9f032f5c066835fb5a3c7c7312bca81ffd3a30836c59d20e10863567788a247b4daa57721b3ba011c4e0cd34d
+DIST oneVPL-2023.1.1.tar.gz 6346209 BLAKE2B 043064fb5781ec0f23cbc2eedb5371bdd1718ae862bd9ae492529ab501b034d2a8d5c4814c5ce219bd15894bc6139dd3b2bef7c7ac4b8a5e9cd37502f022faf8 SHA512 a3df5ebafd748a887cb581525d07af930d3e3b4930d5d2adc5bc2629e385d1802b3315b8f02a3c66956a3dbb46b008e680687ebf125b344a34e86b9cc0910faa
 EBUILD oneVPL-2022.2.5.ebuild 2131 BLAKE2B 99803b725c8b0b69626062f78b1bad90f70264588962931b54fb1285ac4a39b4d14edbc9d3873dc171891cadb9ee3bf39fc3fa8f78d6c38501a68a2998aab280 SHA512 373c1a9b2f0649d0a6db77066ea72126ef7224373558245efdeec70925242d96ed21ad30b29c310459436b3aaed1c7b7ac6d256d549bcefefbcef84026f7f58c
+EBUILD oneVPL-2023.1.1.ebuild 2146 BLAKE2B c6e3e3ecae998581833b70616d81354e54d32869379632293d3c1a29e5e7ff8465ad98b14332ab9d2db6d92693ad4dc322858a71ef487e059f7c36187b9e9447 SHA512 e77ed4ba01e53f7055264f32c88455e6b87e931735dfbb94560e685fedb3ef913fec63fdc29d53346fce044f08247af300d46b58f8002e3603cbaa28e98f0c3c
 MISC metadata.xml 633 BLAKE2B b53305f7c1127190352b5ba25b43411455eba014b85a2305abe07571c2d95c6e1a60b1f1872895b94b7e6292178966c5b3733d7c8b5b9d1c16925f153d60e00d SHA512 a1dcf8c3fe13311bd81d48c3afd76de850b7fc395ae89e2f5973811525e56e69c12de2c83ce8e25971ab4330ed80ba4794051e5826c271f62b86116bc520d81a
diff --git a/media-libs/oneVPL/oneVPL-2023.1.1.ebuild b/media-libs/oneVPL/oneVPL-2023.1.1.ebuild
new file mode 100644
index 000000000000..223184c18698
--- /dev/null
+++ b/media-libs/oneVPL/oneVPL-2023.1.1.ebuild
@@ -0,0 +1,79 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake optfeature
+
+DESCRIPTION="oneAPI Video Processing Library, dispatcher, tools, and examples"
+HOMEPAGE="https://github.com/oneapi-src/oneVPL"
+SRC_URI="https://github.com/oneapi-src/oneVPL/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+IUSE="dri drm examples experimental +tools test vaapi wayland X"
+RESTRICT="!test? ( test )"
+# Most of these flags only have an effect on the tools
+REQUIRED_USE="
+	dri? ( X drm )
+	drm? ( tools )
+	X? ( tools vaapi )
+	wayland? ( tools drm )
+	vaapi? ( tools )
+"
+
+BDEPEND="virtual/pkgconfig"
+DEPEND="
+	x11-libs/libpciaccess
+	vaapi? ( media-libs/libva[X?,wayland?,drm(+)?] )
+	drm? ( x11-libs/libdrm )
+	wayland? (
+		dev-libs/wayland
+		dev-libs/wayland-protocols
+	)
+	X? (
+		x11-libs/libX11
+		x11-libs/libxcb
+	)
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=ON
+		-DBUILD_DISPATCHER=ON
+		# Headers, cmake and pkgconfig files
+		-DBUILD_DEV=ON
+		-DBUILD_EXAMPLES="$(usex examples)"
+		-DINSTALL_EXAMPLE_CODE="$(usex examples)"
+		-DBUILD_PREVIEW="$(usex experimental)"
+		-DBUILD_DISPATCHER_ONEVPL_EXPERIMENTAL="$(usex experimental)"
+		# Fails to build with experimental tools off if tools on
+		-DBUILD_TOOLS_ONEVPL_EXPERIMENTAL="$(usex tools)"
+		-DBUILD_TESTS="$(usex test)"
+		-DBUILD_TOOLS="$(usex tools)"
+		-DENABLE_WAYLAND="$(usex wayland)"
+		-DENABLE_X11="$(usex X)"
+		-DENABLE_DRI3="$(usex dri)"
+		-DENABLE_VA="$(usex vaapi)"
+		-DENABLE_DRM="$(usex drm)"
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
+		-DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc"
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	# Remove these license files
+	rm -r "${ED}/usr/share/vpl/licensing" || die
+}
+
+pkg_postinst() {
+	optfeature_header "This package provides only the dispatcher, to use it install one or more implementations"
+	optfeature "CPUs" media-libs/oneVPL-cpu
+	optfeature "Intel GPUs newer then, and including, Intel Xe" media-libs/oneVPL-intel-gpu
+	optfeature "Intel GPUs older then Intel Xe" media-libs/intel-mediasdk
+}
diff --git a/media-libs/raspberrypi-userland/Manifest b/media-libs/raspberrypi-userland/Manifest
index 4da67f46c706..4f723e402dfe 100644
--- a/media-libs/raspberrypi-userland/Manifest
+++ b/media-libs/raspberrypi-userland/Manifest
@@ -11,6 +11,6 @@ AUX raspberrypi-userland-pkgconf-arm64.patch 1453 BLAKE2B 42dae98ead22bf8c37adae
 DIST raspberrypi-userland-0_pre20160424.tar.gz 32933952 BLAKE2B 4a2d40200a6a4d673be277a0958f768342a2777c28b14b4c7fcac1dbc9c59f2ef2485234f11fbd228aea6bbcf4982a3fd1d4825268af60be91665ea6fee6922d SHA512 04a71837b1247ecbbe479b3b09b5705638a9e576dc99a1ab2200727509195a4a2f2a9b184e3c23ce3933a3236b260afc8bd2b75bc218567b386445bdd8208a5b
 DIST raspberrypi-userland-0_pre20201022.tar.gz 32958590 BLAKE2B 01733a24822d80c5bf9aa3e0feefc3e9437390a465d7a4184d0a9c6a68446e91515d3d6d398ff516d9fd1bdcd4a885512d358a4ed1d24d9b94bdc72d81db84d3 SHA512 1813224068b8a8e569c874a8ffb354f1ac86e95b482caaad18b9703a187baaea60f1f87dfbb0c7e4b3cb2eb875abbcc82aedba410646a3c1df0208bd73aaf9f9
 EBUILD raspberrypi-userland-0_pre20160424.ebuild 3301 BLAKE2B e161b79ed582cd8a2e296240ab69a4e93d35db235b4b1bc362a00fdc2bd08a7fe2667297ec088f7769d0e94c66bd4dacc70dede2700f1f4e5d326810e032c828 SHA512 f74586db6a6a0790f29a2007fc2e6abd8892df6024c83ad71d21757e9f3d490b8f6643c255c60a4d617cc53c0d1d2193fd5a78dbbf5ec165b97c87df7ae87574
-EBUILD raspberrypi-userland-0_pre20201022.ebuild 2196 BLAKE2B 642b00c7d84402d89b221b1cb3cbad841967564b65a647ac22335e0ecaabad2855d9360c4a0b03d9aff5a934d33a0b94ae3d2bd7e9507993dfc3ac63aded398a SHA512 5f55c812d3157038c07290bc6fa1ab6e5b599f597035a8d4002773204b9b70337a850cfcc112ac449860074435b4a080bb6086af886fae0c02fa16b0ea476428
-EBUILD raspberrypi-userland-9999.ebuild 2198 BLAKE2B b319169a6cb94cfae89bdbe11814a59e61127bfd3919a3ef55c946fb87bee93b946ce5bc52d717cf63d6785b8487b53ce276643a176f30676ea8cd2fb2008379 SHA512 71e2caf3c5791eeb42b330a3f47050afed43abff461bb295f24a378c41446842431c03305d81f1f0784e631cb8d23949c58233c8c25820fb013ceefe86532dc5
+EBUILD raspberrypi-userland-0_pre20201022.ebuild 2202 BLAKE2B c06468662e378695c8b2440af7445e61c794e9b702f99b5a5c315eea0f8d3a313ccae61abc6c3f7fb129b59dd6a07900702fa2b4d08c2c41127ca00b82358e38 SHA512 104808aed7cd1cc35b7e61e3a304b9ab4e66c759756cf022be80f4dcdc4d8d6cd7dbd7501671161493e25f5bd9483141a19673bf47d9723c6f2e73ca06a1f4f7
+EBUILD raspberrypi-userland-9999.ebuild 2204 BLAKE2B 259252104160364565b2dff655e10670b4ed82282af72b16212ee1eccfb1d5b42431c5533e324e1d71ebf21e109f72dc68aab9f331f7bebb198cd081a2ef1be6 SHA512 bc1dd67bbe72f4da1625640fc657dd6b893a0e464138a65fd07836e02a46f2ef85e7baf0a5657373fb60f1748424309cf48a09674c33396286ef3701f7f6beeb
 MISC metadata.xml 352 BLAKE2B 4824c9e6ed48717baa59e11b0efe49446163a2371964c4062d8797da53f842c9bd8e1f2c2717f6d8a2541ef26bbe9ada9fbe1a1a04bb7bc31cf96153dab63465 SHA512 56890e790e423f487613ec16aa317463f459d6400b81d09d826c2a96524e05cb6a27b16f4f664e4c0880d790cd69fcd12bcb2ff02c5eca5995055e3a295beb0b
diff --git a/media-libs/raspberrypi-userland/raspberrypi-userland-0_pre20201022.ebuild b/media-libs/raspberrypi-userland/raspberrypi-userland-0_pre20201022.ebuild
index 112896ef1dde..b4ce5bc37dc1 100644
--- a/media-libs/raspberrypi-userland/raspberrypi-userland-0_pre20201022.ebuild
+++ b/media-libs/raspberrypi-userland/raspberrypi-userland-0_pre20201022.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -57,7 +57,7 @@ src_prepare() {
 src_configure() {
 	append-ldflags $(no-as-needed)
 
-	mycmakeargs=(
+	local mycmakeargs=(
 		-DVMCS_INSTALL_PREFIX="${EPREFIX}/usr"
 		-DARM64=$(usex arm64)
 	)
diff --git a/media-libs/raspberrypi-userland/raspberrypi-userland-9999.ebuild b/media-libs/raspberrypi-userland/raspberrypi-userland-9999.ebuild
index f05820d71ac0..b7827907a660 100644
--- a/media-libs/raspberrypi-userland/raspberrypi-userland-9999.ebuild
+++ b/media-libs/raspberrypi-userland/raspberrypi-userland-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -57,7 +57,7 @@ src_prepare() {
 src_configure() {
 	append-ldflags $(no-as-needed)
 
-	mycmakeargs=(
+	local mycmakeargs=(
 		-DVMCS_INSTALL_PREFIX="${EPREFIX}/usr"
 		-DARM64=$(usex arm64)
 	)
diff --git a/media-libs/rtmidi/Manifest b/media-libs/rtmidi/Manifest
index 73601a1cb434..5a58cef82169 100644
--- a/media-libs/rtmidi/Manifest
+++ b/media-libs/rtmidi/Manifest
@@ -1,3 +1,3 @@
 DIST rtmidi-5.0.0.tar.gz 528747 BLAKE2B 7bc8f5d9109cf1fb81ced4ff3afb4a7a42200d7458315c7b33cf966c856ca13959a9ce99012eadf05f65ec1bb93d41b8d2b7c9c66082badb7598c519a7fe2531 SHA512 d2688b6777c09c213e1f6800c67bca6905ac9a0161480e7c167583322a64be086bb47f1452cc45d4a4e2c1d3d3fe626d57b4a187e79c0a20af4f6e23d4a3530a
-EBUILD rtmidi-5.0.0.ebuild 625 BLAKE2B dfa5e7823bd68085a01809b04fa40e07886c88cbd2a1267cb685a3674080bb2a343339cf0e87af95c33d37a678432c293938ddf20a6c37bee569f0301c2f2857 SHA512 2cd0970f68730773ed3dff434ee283a807d210670edda84cbd30811e4a17402c12ccf6abc06c2d851ce27da70befae048b59870ece8576879fee5dcf27a91456
+EBUILD rtmidi-5.0.0.ebuild 631 BLAKE2B 581b139d52e14f2eede673b7bc246628ca830c2a7f200af41030e74da1cf26e2a6bf57614b9b71f26f596a817c90769a0ffeb153a51cf042ed2e4ab423799d0b SHA512 dd1941787f02bfcdabe6a46c77f5d1bba10a21af669c3fd8c737eaf0e9ada88721b6071baf19e00fc98733e1cdd7a73ca181edab012f027ac92520c4544c7b6c
 MISC metadata.xml 685 BLAKE2B 20a22f4c40cd51230f13c0cc46a9237bf49a326d4fada0060d42c8cf6ddc17b58517a3df82a19c491045c4d81705522871dff9af7b1fe9a4ef3e18fd8bde51f8 SHA512 dbba9fe55711732149801c6dd4a15685215507f23a080ce2be060b1dc48c6da18adc23de611dbfade2b64afde25703a6e460ab2c2b403450829d3982374507f2
diff --git a/media-libs/rtmidi/rtmidi-5.0.0.ebuild b/media-libs/rtmidi/rtmidi-5.0.0.ebuild
index 1689276e2d89..b7bef58e8518 100644
--- a/media-libs/rtmidi/rtmidi-5.0.0.ebuild
+++ b/media-libs/rtmidi/rtmidi-5.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -21,7 +21,7 @@ DEPEND="
 RDEPEND="${DEPEND}"
 
 src_configure() {
-	mycmakeargs=(
+	local mycmakeargs=(
 		-DRTMIDI_API_ALSA=$(usex alsa)
 		-DRTMIDI_API_JACK=$(usex jack)
 	)
author	V3n3RiX <venerix@koprulu.sector>	2023-01-03 20:27:24 +0000
committer	V3n3RiX <venerix@koprulu.sector>	2023-01-03 20:27:24 +0000
commit	27e5574c9ed56a2633e25f7fa8f591554266a1b4 (patch)
tree	eafae39b8faa55ceb7cc8100d5d03a2dfc9b7842 /media-libs
parent	5aede38e7304fc5c3bd8a2034b25758b15a19fa0 (diff)