2023-06-28 18:39:50+00:00

34 files changed, 342 insertions, 430 deletions

diff --git a/Manifest b/Manifest
index 9d03783eaa49b..30da216a727b3 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29303 BLAKE2B f03eb3c3e632af1076b10abfe92d5959b3bb0237102346f8be53b0d5ce9119467ed6e21280f2108e81e9463b5342facdd0f812ebce938c803879ce5a74373bda SHA512 ad47631b9454cb8f69fd2679024ef5a5383ea48fa1f49dad8d74bf647deb4d075dec60683137d6791e9c8aee119113d2b5f8ce5e207303c0db13063e54d41c8b
-TIMESTAMP 2023-06-28T18:09:54Z
+MANIFEST Manifest.files.gz 29285 BLAKE2B 31b794351ab6198d4c7dbb7fb7efb7f347874315a4525632ceb6654c5941b180916479a8fee3d6a181d87220b6e7c162ff2418cbd9e5d556c82e52dcae7dd7be SHA512 dffd74cfd05e111bc47a26b28de227cd58efa4be5dbe0c8534a2088f1d915ef200516385ead873e1e6147337a86b2fde9631c09719001e4d15ea3aa8b413c50c
+TIMESTAMP 2023-06-28T18:39:53Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmScd3JfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmScfnlfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCZVBAAnv4NYqCmKvbJbQS3w+Amej7ndeVvi/e++zQ6hzgMh4gAEazTs92AGMBQ
-Gim+Li59mTEIykutJbdRmtIEcM77m20LIbd2nOiV8mz6F2wPBw2AFiG6en6f6J5u
-l7WK3qr0E/PraZPDgeUgCh2A88IeYvbFOdEWrYWGdpbM/y0BVE/9O37EwAVXr5Xe
-iRIMpCfxn6hV5l8aPAU/Xa32uHoY6+m8/FTr6U6Yw2gwE0w/aGEnL4x0NedD5WI2
-DZ6Te5CY0wlGU0EJAmYAAw2StrO8rvELpUTuhUAIeNP/MFSdjagqw8I7Aj2733Et
-LN6ozeR7tXDkPD2ERXaHv1or/3bTHovFpL46Tm3eZpAFIMTh+7/XGheHdc6UwP3v
-9ddXlgAWBxDuCECCvfQAk9Kwiqc/3IlNkr7C/fMY56CrxK4vk7CCWMPqUSzlRhOl
-NXWoJel4sGBoKDiewgCYPZ1LJ85j2Q66mdSW+6b9aVPBP9dS2WKzXyLwJ/YiIXDd
-nPrpVc4V1JmjwzXmElNKp05oCv5hvzKU3y8+MpX8a98Itkyr1eLN9Un2MSKUQmgi
-xqbPyLpbwoy4Hi2BzP3QZLurmxxgyZFOXiBZHa2yjj+Shc5qIbb4q5NTG72A2VTa
-y7INQGSljgJyRwZqKJj21KvIuHPz0dAvzwkaMe1dKjz52j43/8E=
-=LqRu
+klCm8w/9G/cZHJ2l/KXlx8s9e3I+uNK5qONuwEnPgdCE103cVTQlfCZpvzZv6XOw
+wG6ZXoo481odNfp/TMEfLNyWNGQ2O1hwrLCQoRCEWxFk0rrXqqal3818YSGloM+F
+ik1EWU0T69T6d55ZNT9zpseq0f9qhRDd2o0SpyIowYh198yslFYQh2kklAPfvUSe
+DdFnKfmyhsX3QYuItV/3Ya/GJWlN9usEp0Fpd4KqK1MNpHFPHefDr3oP2/Lxt0SE
+kdKkfHp9z0zugp5S1RyO9Bh9C3v6XyngO/n1Mi1gO3JZbMv0u3zfHAmrIRRnFeiD
+wmQC0T93ELKlVPEg4blv16YbB4XWRrOAxaCz+Gzlgj2z3W80Ov+nbqmwek9CbRll
+2q48yHz7GjxJDUFjs5lslLVulNQM4+SSa3aZw/zigKxZu8W3ksur/TSzJheAo7Pn
+vk9c5ZWeQJzAQL1N1FaZjvwAQG2OeAbqnT9aSBEHZVg8bU6ftQSPy+YRm1O9RAKX
+5utgPbu9AYpjk1JC01IvN0MCAOV8AMqjsnaDTcBjmCmr3l3XtYsmokNgvPV4KMaE
+g5fIpODE9MhnS8WA0kPLyTOjzQ1XDaxxqYw6dR63hK7jFBA1DqLEc6FLAQm4JEMm
+0VkhDAToXRfXV0mwXvbkUpKtHRBpwNmiXGyXT3TNNdha121lyVY=
+=eI/G
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index af3606f0247bf..a53afc19908a1 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index 9d4b83e7586b6..da2a984ab1e5e 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/nim/Manifest b/dev-lang/nim/Manifest
index 2be6fc1a55ae0..dac6ffe96550b 100644
--- a/dev-lang/nim/Manifest
+++ b/dev-lang/nim/Manifest
@@ -1,10 +1,13 @@
 AUX nim-0.20.0-paths.patch 934 BLAKE2B 6a4e44c5656cde6d5127bf6a6b8db92cdf8aada0892c27d536d0c1030ed7da8dc97138a8941030101918021f2a301fa683169c8a656fefc6fb7d0fcdb24029d4 SHA512 bf8dbc3e3861ec3ea2718092b981e495194ead5b547e69d01d5d842d128dc4b96b0ba3e95c78afd8fd822d594199315a01de370851ed8f594c091231b9a10ee9
 AUX nim-1.6.10-testament-skipfile.txt 1210 BLAKE2B d70268fcef2edb5383ca7dc696ae393432e0894c313d17e192e988e8826b5c296d3fcdd7bc5d547d62b1450f3c721fe3655166fd9ee3755f29c9ae8390453fba SHA512 a943fa520633b513ae3c5060a79b9501b34cad81bcbebbd803780506713fe1a9fd1580736e85032d0dedcd4190ebc37666ae94f4ca73bf5d88d51df523d2c4ea
+AUX nim-1.6.14-testament-skipfile.txt 1290 BLAKE2B 90924dbbb19768e46cd9d064eb6aa54fa706a4afe3d6e05fdd6a84c453cd4e1cb846ba3a63269c7051ebc120ce8a821694de9033b3415e9f16c2b994ed43d340 SHA512 3b9bb6cd4dc0ff078064a190d9667335a250b13386987cfc9c33debdddc634de18e5b6d9a5ab267de677ab0609a4e2783947f0487c0fc51e537a735717352f66
 AUX nim-1.6.6-csources-flags.patch 371 BLAKE2B 903e9738f6c87bc40ef922c5abde50edaff223cdf11befee0ece7b3a472a68b7dc211e1e6347a2181c68fe524693832f20309bf90aeb3aac9d76125f224587c9 SHA512 2753e14ada3093a2208636eb36eb2a79946f7c4858d86945b1d242d424b1a4350403b7d8f58af33c1c43a04b24465748cb7f26b7426e65b91d09cc61167d5de4
 AUX nim-sets.conf 162 BLAKE2B 976422f31cf8a64e1fad537f4db38a07e0022b9460936c63e0220cb3858ba02704857841d5010ad8c7bde0e6192c4c3c1329aeca8080a48a728e8b288cefc0fb SHA512 61a07de9973fc77998515bbb62498ffd1de991241bf32805f4acc0e4325e39d767ac862f2546757763aa8d0a7f35b95a9e1df91e6aa6f241eed6e93c8e3c46f0
 DIST nim-1.6.10.tar.xz 5216284 BLAKE2B d5b7bdc488086260b84700e3022ff7fc45b98d78574a3d2e288c95968a580fa644e47612dc60d6e63f5e85687f5b59a28128be746abc55bd6d4527344dc3ab14 SHA512 2ba6c4db68030ace2b4dd9b7f85d2b7c882c62e8f7f68bd0b82f548c91c300ab0e03c66f56c678127058f56b75a5550dec48d68eb6d666a179994cd1a6e2cc47
 DIST nim-1.6.12.tar.xz 5180496 BLAKE2B d7c04ffdde273336770d9397dd255b7cfc442f6be9592afbfa5ceb1ac7836a8213d5cea673477ab55bd56c004cc477a6023b6a2799715f46689f3e328302e433 SHA512 17c31024ee19dfa36f25bf8a5091992b24a4adb1a817246119a2fc552075999f698a92e66243ddd5ee69d966deead37535c9aac00ebece3854c930f905eeb030
+DIST nim-1.6.14.tar.xz 5266632 BLAKE2B f6eadf44365a099f45d1b734dea494e5d098b0427791c19a5e0b7ee6fa8069fee606005920cbcbfd7c88a36ace870949ff797d1e37fc1f84e14d5dd1aeb4bd1d SHA512 6923ea98627ea48b5c939438618caa8e6860f248086e43bc101b543aa78e7c475bc8e56b8acb90dc4a3771ca0d2e27fbdda6a0b477dbb906acda8a7b39c272d3
 DIST nim-patches-1.6.6_p1.tar.gz 2632 BLAKE2B 64980d9510dc48e3c566473dc618d00cafba04783882d62b12015e8435c9c0515d7726da30f0b74dca6a41aa88a9c9aed2189a65b3325c28839d0051de8a3365 SHA512 7ba251675cd564452669bf5ec3748565db818324f58506f20a5036e4b54df10f4d7c149cece8cb97c853222cfa7d4d8d26856d92aaa25e613e31c6f5c2a8243d
 EBUILD nim-1.6.10-r2.ebuild 4413 BLAKE2B 4a321ed1751fb582bba04413759d78e061d6d00751b6c1e15668b05ab2e57552a726bf0ac33b49355a881bb6543bd5357ca874cb39b6294d562c2a7900cd64b9 SHA512 afe55c756bf43f875d810e551f2f0d9f746bef5800de269d4a20260bbd6750647bd7da4352502f2e61e60b67f00156975eaf314e5beb373e65e0664152c7f104
 EBUILD nim-1.6.12.ebuild 4459 BLAKE2B d237b8243dcbb0ab941155e5a8abec2295f628ab98d2a92d5e8aee3d661e44d546fb71c36bfbec2fb29958a5736149d4a055a6b5b517a1ab42d3733b7d37f813 SHA512 ad440e3e94f3c91b1366e919b431ca1e51d967b94758921158799981749aeb4d7be9d953ba017811082778d8d3d5023896ea03b95551e2883cc2c90ef8afc15b
+EBUILD nim-1.6.14.ebuild 4460 BLAKE2B 2dd6af1faf63cedd9c5edcded85d27c03cce9823c75832f14dd0f5a7035d0c5e2a24005f1a9dd6dd2fc84ba1b500be6e9147a083894fdf2580e5454092fa4edc SHA512 99371a0f29a93ab01ec5ff4f7c758e450954142c367e7558120633434818c7e0b66b538fc7b843c69a98f5f88868c01bebf5b8faba83a03682c9dfd17758f34d
 MISC metadata.xml 2157 BLAKE2B bbbc15b0c5590a22e276056a55ef09957ae5e5b0429122411e9d7570756873a5147bc8a00ee2bc97e887aa0d76668e3ecab10b495d67e5fd10174a0411d02f5f SHA512 b6d3010ddd9a0dc4e5f9698ac832cebe794c1b4b222d561448d9e43d9e3a581e5983c5d771bdad96957a100029efdb2804ff30b8b223b33ba5864e68fdb25519
diff --git a/dev-lang/nim/files/nim-1.6.14-testament-skipfile.txt b/dev-lang/nim/files/nim-1.6.14-testament-skipfile.txt
new file mode 100644
index 0000000000000..b0317176ac0d3
--- /dev/null
+++ b/dev-lang/nim/files/nim-1.6.14-testament-skipfile.txt
@@ -0,0 +1,43 @@
+# broken
+tests/assert/tassert_c.nim
+tests/async/tasync_traceback.nim
+tests/errmsgs/t14444.nim
+tests/errmsgs/tcall_with_default_arg.nim
+tests/errmsgs/tproper_stacktrace.nim
+tests/errmsgs/tproper_stacktrace2.nim
+tests/errmsgs/tproper_stacktrace3.nim
+tests/js/tmangle.nim
+tests/js/twritestacktrace.nim
+tests/lent/tbasic_lent_check.nim
+tests/misc/trunner.nim
+tests/misc/tstrace.nim
+tests/misc/twarningaserror.nim
+tests/parser/t20922.nim
+tests/pragmas/thintprocessing.nim
+tests/pragmas/tused.nim
+tests/pragmas/twarning_off.nim
+tests/stdlib/tos.nim
+tests/stdlib/tstackframes.nim
+tests/stdlib/tstats.nim
+tests/system/talloc.nim
+tests/testament/tshould_not_work.nim
+# require network
+tests/stdlib/thttpclient.nim
+tests/stdlib/tnetconnect.nim
+tests/stdlib/tssl.nim
+# don't work without megatest
+tests/misc/tjoinable.nim
+tests/testament/tjoinable.nim
+# don't work with "--hint:all:off" hack
+tests/concepts/t3330.nim
+tests/stylecheck/t20397_2.nim
+tests/stylecheck/treject.nim
+tests/stylecheck/tusages.nim
+# need external dependencies
+tests/manyloc/keineschweine/keineschweine.nim
+tests/manyloc/nake/nakefile.nim
+tests/niminaction/Chapter7/Tweeter/src/tweeter.nim
+# need functional valgrind
+tests/destructor/tnewruntime_strutils.nim
+tests/destructor/tv2_raise.nim
+tests/views/tsplit_into_openarray.nim
diff --git a/dev-lang/nim/nim-1.6.14.ebuild b/dev-lang/nim/nim-1.6.14.ebuild
new file mode 100644
index 0000000000000..c6bf55d99f89d
--- /dev/null
+++ b/dev-lang/nim/nim-1.6.14.ebuild
@@ -0,0 +1,198 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PATCH_PV="1.6.6_p1"
+
+inherit bash-completion-r1 edo multiprocessing toolchain-funcs xdg-utils
+
+DESCRIPTION="Compiled, garbage-collected systems programming language"
+HOMEPAGE="https://nim-lang.org/"
+SRC_URI="
+	https://nim-lang.org/download/${P}.tar.xz
+	experimental? (
+		https://git.sr.ht/~cyber/${PN}-patches/archive/${PATCH_PV}.tar.gz
+			-> nim-patches-${PATCH_PV}.tar.gz
+	)
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="doc experimental test-js test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	test? (
+		dev-db/sqlite:3
+		dev-libs/boehm-gc
+		dev-libs/libffi
+		dev-libs/libpcre:3
+		dev-libs/openssl
+		media-libs/libsdl
+		media-libs/libsfml
+	)
+"
+BDEPEND="
+	sys-process/parallel
+	test? (
+		test-js? (
+			net-libs/nodejs
+		)
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.20.0-paths.patch
+	"${FILESDIR}"/${PN}-1.6.6-csources-flags.patch
+)
+
+# Borrowed from nim-utils.eclass (guru overlay).
+nim_gen_config() {
+	cat > nim.cfg <<- EOF || die "Failed to create Nim config"
+		cc:"gcc"
+		gcc.exe:"$(tc-getCC)"
+		gcc.linkerexe:"$(tc-getCC)"
+		gcc.cpp.exe:"$(tc-getCXX)"
+		gcc.cpp.linkerexe:"$(tc-getCXX)"
+		gcc.options.speed:"${CFLAGS}"
+		gcc.options.size:"${CFLAGS}"
+		gcc.options.debug:"${CFLAGS}"
+		gcc.options.always:"${CPPFLAGS}"
+		gcc.options.linker:"${LDFLAGS}"
+		gcc.cpp.options.speed:"${CXXFLAGS}"
+		gcc.cpp.options.size:"${CXXFLAGS}"
+		gcc.cpp.options.debug:"${CXXFLAGS}"
+		gcc.cpp.options.always:"${CPPFLAGS}"
+		gcc.cpp.options.linker:"${LDFLAGS}"
+
+		$([[ "${NOCOLOR}" == true || "${NOCOLOR}" == yes ]] && echo '--colors:"off"')
+		-d:"release"
+		--parallelBuild:"$(makeopts_jobs)"
+
+		# some tests don't work with processing hints
+		--processing:"off"
+	EOF
+}
+
+src_prepare() {
+	default
+
+	# note: there are consumers in the ::guru overlay
+	use experimental && eapply "${WORKDIR}"/nim-patches-${PATCH_PV}
+}
+
+src_configure() {
+	xdg_environment_reset  # bug 667182
+
+	unset NIMBLE_DIR
+	tc-export CC CXX LD
+
+	nim_gen_config
+
+	mkdir "${HOME}"/.parallel || die
+	touch "${HOME}"/.parallel/will-cite || die "parallel setup failed"
+}
+
+src_compile() {
+	local -x PATH="${S}/bin:${PATH}"
+
+	edo ./build.sh --parallel "$(makeopts_jobs)"
+
+	ebegin "Waiting for unfinished jobs"
+	while [[ ! -f "bin/nim" ]]; do
+		sleep 1
+	done
+	eend 0
+
+	edo ./bin/nim compile koch
+	edo ./koch boot -d:nimUseLinenoise --skipParentCfg:off
+	edo ./koch tools
+
+	if use doc; then
+		local -a docargs=(
+			# set git tag
+			--git.commit:v${PV}
+			# skip runnableExamples as some of them need net
+			--docCmd:skip
+			# make logs less verbose
+			--hints:off
+			--warnings:off
+		)
+		edo ./koch doc "${docargs[@]}"
+		HTML_DOCS=( web/upload/${PV}/. )
+	fi
+}
+
+src_test() {
+	local -x PATH="${S}/bin:${PATH}"
+	local -a nimflags=(
+		# Leave only the safe hints enabled.
+		--hint:all:off
+		--hint:User:on
+		--hint:UserRaw:on
+	)
+	local -a testament_args=(
+		--skipFrom:"${FILESDIR}/${PN}-1.6.14-testament-skipfile.txt"
+		--nim:"bin/nim"
+		--targets:"$(usex test-js 'c js' 'c')"
+	)
+
+	[[ "${NOCOLOR}" == true || "${NOCOLOR}" == yes ]] && \
+		testament_args+=( --colors:off )
+
+	local -a categories
+	readarray -t categories < <(find tests -mindepth 1 -maxdepth 1 -type d -printf "%P\n" | sort)
+
+	# AdditionalCategories from "testament/categories.nim".
+	categories+=( debugger examples lib )
+
+	local tcat checkpoint
+	for tcat in "${categories[@]}"; do
+		# Use checkpoints for less painful testing.
+		checkpoint="${T}/.testament-${tcat}"
+		[[ -f "${checkpoint}" ]] && continue
+
+		case ${tcat} in
+			testdata )
+				:
+			;;
+			arc | ic | valgrind )
+				einfo "Skipped category '${tcat}'"
+				;;
+			* )
+				einfo "Running tests in category '${tcat}'"
+				edo ./bin/testament "${testament_args[@]}" \
+					category "${tcat}" "${nimflags[@]}"
+				;;
+		esac
+
+		touch "${checkpoint}" || die
+	done
+}
+
+src_install() {
+	local -x PATH="${S}/bin:${PATH}"
+
+	edo ./koch install "${ED}"
+	einstalldocs
+
+	# "./koch install" installs only "nim" binary but not the rest.
+	local exe
+	for exe in bin/* ; do
+		[[ "${exe}" == bin/nim ]] && continue
+		dobin "${exe}"
+	done
+
+	newbashcomp tools/nim.bash-completion nim
+	newbashcomp dist/nimble/nimble.bash-completion nimble
+
+	insinto /usr/share/zsh/site-functions
+	newins tools/nim.zsh-completion _nim
+	newins dist/nimble/nimble.zsh-completion _nimble
+
+	# Install the @nim-rebuild set for Portage.
+	insinto /usr/share/portage/config/sets
+	newins "${FILESDIR}"/nim-sets.conf nim.conf
+}
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 5b127a99560a9..77b77011e5d81 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/qmplay2/Manifest b/media-video/qmplay2/Manifest
index 85e310b3e8845..dc951abd07dd2 100644
--- a/media-video/qmplay2/Manifest
+++ b/media-video/qmplay2/Manifest
@@ -1,9 +1,4 @@
-AUX qmplay2-23.02.05-fix-libva-glx.patch 619 BLAKE2B c3aeeb812c6012bd4627b984f2fb769e88897030f9f73920102d0e95c179773854ab58002cc97b2df4ba1cea317d725a1a8e0e180143677f16067d6f96a32c73 SHA512 1ae7ab4b443e3ab439fe33748c33484f1d83a20a39d5c9c14a292c9327a4bcd2b1e0c3c456bb82aff6fca84a3e9039174e6f4d2e0beeba3b2427acbd3c389c80
-DIST QMPlay2-src-23.02.05.tar.xz 1428992 BLAKE2B 7296ed089306e50e1051c33c23dae30f14cbb166b9d9ea8c184e8aa027a261a658e1d7770c7d574784a5cde4890c66e2104927f4473f484562378c956bea4b3f SHA512 d2e998a2df08c98b7e0232de693ee17b5c703793e2b1edadde300ca39998f40f7ad58b5850ee1f8cddf1dd9489c7f96e664db7e9deba01a612d97707aad849c0
-DIST QMPlay2-src-23.06.04.tar.xz 1431232 BLAKE2B 7b50e7d28ab9025d7745114c7ee6036df1e1b23b34422ed4097f1ba4e68874efc58a0de68a5635e30cbdb2205777fbdc4f67f759f54cda7e2f926560e4bbc7af SHA512 7e6afb5830b5febd79aa2232d38ccb3483104dd89d20e7476027a7febfd770ccd1df7e6915543df379985d89d307bd1c3bbc8ebc8cc00f440b51e347ddbec0d5
 DIST QMPlay2-src-23.06.17.tar.xz 1432852 BLAKE2B 50512d89f443218bf89f1b54276ece0983d31cc1e563ef829396ed1fb4e5f0437cd25e5ccb3c426ecd668c334477024de8658594c59ae2781a0e54ff83653357 SHA512 62122533a9cfc7aebdbe28166d60816eea21e9c38df5f381817d01aac25a6f10bf806b5a6ccd24cb8fe4b6c7391138226c7a967fab019ad2dcd605797d8d6a28
-EBUILD qmplay2-23.02.05-r1.ebuild 3384 BLAKE2B b1aafd1b3346798f1f1b676627902ca24ccd38eee721b16fea9055698d8c5806f9e64a5e79a2a956fd32e779f904a79eb0c79c9471b146ffc33aedb7bce2e84b SHA512 efd26725ef9b00c214c506c106026e2eb99026aef1386178f24ccf073288df4c2ade3d98e9495b74835c388cab0c63807734edb4154d199f5ff7646c22d3c6ae
-EBUILD qmplay2-23.06.04.ebuild 3344 BLAKE2B ae7d7de6551f46490b7ce7e5e8a9d163c62b3b64f9d327a70c3d139f51556c2b142050fa10534f8c218f5750628f885ac3a1022291a167b806ad446d5e17c518 SHA512 c23e0a10093113e7bb4eae95be33fde3f7f4110a8aa2894c6a302163ab34213cacf40a783a4bf21573d769d2b166e078d35682d2e7bd36706fbd21ff0c5db714
-EBUILD qmplay2-23.06.17.ebuild 3309 BLAKE2B 957fdf4db921edc95266e6cb0192d36f46e2845a7f0d7ef33b955f83ac6767b0a906b79331957db84c4a5976e47fa7ff51e6dc7e98cb88d62adbab58885844bb SHA512 a6ed3fd72323b51cb4569d10eeefd78b2593725b5460451fff8f45aaf2df256e5d539b17f1b4444ec82bcc5ac432f63ddd61bc9eea3f5065ecdc6919f474a24f
-EBUILD qmplay2-9999.ebuild 3318 BLAKE2B bef41fcb3655faf0fb9d0d02014066cded54f3215db6a64944f152ef24a266cd7974894c7ba0573e6f427df1d9c715aaae369afa4a27ba49d034e97671af5ac2 SHA512 22b73ab2f2effee3cb6e494da91a421d12d30572b2343b667002419e57920af8ce93e39be5dc7d926f6222dc728db45c7e38c8cba6fcf9b9c40daaa42054e34c
+EBUILD qmplay2-23.06.17-r1.ebuild 3220 BLAKE2B fa027c0b95bfa918485f454dca0ddd7cd9a30df9d0a8403387ff225bb0a4dec57af7e260151af72b68a8d98d6c3872a787b36960feef50760bb66ab12f5cf783 SHA512 3bcecb7ca00ccc4d3295d32cf215ba83d8edb43d7c336c032c87c147704bb73a8ea9661dc1511b5d1ce17335ac388d43a26fc2fea862d038529f0d71b8d9b802
+EBUILD qmplay2-9999.ebuild 3220 BLAKE2B fa027c0b95bfa918485f454dca0ddd7cd9a30df9d0a8403387ff225bb0a4dec57af7e260151af72b68a8d98d6c3872a787b36960feef50760bb66ab12f5cf783 SHA512 3bcecb7ca00ccc4d3295d32cf215ba83d8edb43d7c336c032c87c147704bb73a8ea9661dc1511b5d1ce17335ac388d43a26fc2fea862d038529f0d71b8d9b802
 MISC metadata.xml 1287 BLAKE2B f04c4032dd3f32f10e33c551d364a9914d7663448b293ab9161da4741f53e65438749c1cd14b2ab0f5dd6a231109763642e53932d2705170a7e063e594acae36 SHA512 3f480f4d3cff62300e8eed043f16fe2a0f5cb8572be5fa00710b86036b93650b852168b7e01c2611c95755205d1a33883d67dfb8fd187d87c459d923e77c9fbd
diff --git a/media-video/qmplay2/files/qmplay2-23.02.05-fix-libva-glx.patch b/media-video/qmplay2/files/qmplay2-23.02.05-fix-libva-glx.patch
deleted file mode 100644
index e47aacf22a5fa..0000000000000
--- a/media-video/qmplay2/files/qmplay2-23.02.05-fix-libva-glx.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-https://bugs.gentoo.org/905453
-
---- a/src/modules/FFmpeg/CMakeLists.txt
-+++ b/src/modules/FFmpeg/CMakeLists.txt
-@@ -67,7 +67,7 @@ if(USE_FFMPEG_VAAPI OR USE_FFMPEG_VDPAU OR USE_FFMPEG_DXVA2 OR USE_FFMPEG_D3D11V
-             list(APPEND FFmpeg_HDR VAAPIVulkan.hpp)
-             list(APPEND FFmpeg_SRC VAAPIVulkan.cpp)
-         endif()
--        pkg_check_modules(LBVA REQUIRED libva libva-glx libva-drm egl)
-+        pkg_check_modules(LBVA REQUIRED libva libva-drm egl)
-         include_directories(${LBVA_INCLUDE_DIRS})
-         link_directories(${LBVA_LIBRARY_DIRS})
-         list(APPEND FFmpeg_LIBS ${LBVA_LIBRARIES})
diff --git a/media-video/qmplay2/qmplay2-23.02.05-r1.ebuild b/media-video/qmplay2/qmplay2-23.02.05-r1.ebuild
deleted file mode 100644
index 162a1b938f4a6..0000000000000
--- a/media-video/qmplay2/qmplay2-23.02.05-r1.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake xdg
-
-DESCRIPTION="A Qt-based video player, which can play most formats and codecs"
-HOMEPAGE="https://github.com/zaps166/QMPlay2"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/zaps166/QMPlay2"
-else
-	SRC_URI="https://github.com/zaps166/QMPlay2/releases/download/${PV}/QMPlay2-src-${PV}.tar.xz"
-	S="${WORKDIR}/QMPlay2-src-${PV}"
-	KEYWORDS="~amd64"
-fi
-
-LICENSE="LGPL-3"
-SLOT="0"
-
-IUSE="avdevice +audiofilters +alsa cdio cuvid extensions gme inputs libass
-	modplug notifications opengl pipewire portaudio pulseaudio sid shaders
-	+taglib vaapi vdpau videofilters visualizations vulkan xv"
-
-REQUIRED_USE="
-	audiofilters? ( || ( alsa pipewire portaudio pulseaudio ) )
-	shaders? ( vulkan )"
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	media-video/ffmpeg
-	|| (
-		dev-qt/qtgui:5[X(-)]
-		dev-qt/qtgui:5[xcb(-)]
-	)
-	alsa? ( media-libs/alsa-lib )
-	cdio? ( dev-libs/libcdio[cddb] )
-	extensions? ( dev-qt/qtdeclarative:5 )
-	gme? ( media-libs/game-music-emu )
-	libass? ( media-libs/libass )
-	opengl? ( virtual/opengl )
-	pipewire? ( media-video/pipewire )
-	portaudio? ( media-libs/portaudio )
-	pulseaudio? ( media-libs/libpulse )
-	sid? ( media-libs/libsidplayfp )
-	shaders? ( >=media-libs/shaderc-2020.1 )
-	taglib? ( media-libs/taglib	)
-	vaapi? (
-		>=media-video/ffmpeg-4.1.3[vaapi]
-		media-libs/libva[X]
-	)
-	vdpau? ( media-video/ffmpeg[vdpau] )
-	videofilters? ( dev-qt/qtconcurrent:5 )
-	vulkan? (
-		>=dev-qt/qtgui-5.14.1:5[vulkan]
-		>=media-libs/vulkan-loader-1.2.133
-	)
-	xv? ( x11-libs/libXv )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="dev-qt/linguist-tools:5"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-23.02.05-fix-libva-glx.patch"
-)
-
-src_prepare() {
-	# disable compress man pages
-	sed -r \
-		-e 's/if\(GZIP\)/if\(TRUE\)/' \
-		-e 's/(install.+QMPlay2\.1)\.gz/\1/' \
-		-i src/gui/CMakeLists.txt || die
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		# core
-		-DUSE_LINK_TIME_OPTIMIZATION=false
-		-DUSE_UPDATES=OFF
-		-DUSE_ALSA=$(usex alsa)
-		-DUSE_AUDIOCD=$(usex cdio)
-		-DUSE_DBUS_SUSPEND=ON
-		-DUSE_FREEDESKTOP_NOTIFICATIONS=ON
-		-DUSE_LIBASS=$(usex libass)
-		-DUSE_NOTIFY=$(usex notifications)
-		-DUSE_OPENGL=$(usex opengl)
-		-DUSE_VULKAN=$(usex vulkan)
-		-DUSE_GLSLC=$(usex shaders)
-		-DUSE_XVIDEO=$(usex xv)
-
-		# ffmpeg
-		-DUSE_FFMPEG_AVDEVICE=$(usex avdevice)
-		-DUSE_FFMPEG_VAAPI=$(usex vaapi)
-		-DUSE_FFMPEG_VDPAU=$(usex vdpau)
-
-		# chiptune
-		-DUSE_CHIPTUNE_GME=$(usex gme)
-		-DUSE_CHIPTUNE_SID=$(usex sid)
-
-		# modules
-		-DUSE_AUDIOFILTERS=$(usex audiofilters)
-		-DUSE_CUVID=$(usex cuvid)
-		-DUSE_INPUTS=$(usex inputs)
-		-DUSE_MODPLUG=$(usex modplug)
-		-DUSE_PIPEWIRE=$(usex pipewire)
-		-DUSE_PORTAUDIO=$(usex portaudio)
-		-DUSE_PULSEAUDIO=$(usex pulseaudio)
-		-DUSE_TAGLIB=$(usex taglib)
-		-DUSE_VIDEOFILTERS=$(usex videofilters)
-		-DUSE_VISUALIZATIONS=$(usex visualizations)
-
-		# extensions
-		-DUSE_EXTENSIONS=$(usex extensions)
-	)
-
-	if use extensions; then
-		# Move inside an if, to remove unused option warning
-		mycmakeargs+=(
-			-DUSE_LASTFM=ON
-			-DUSE_LYRICS=ON
-			-DUSE_MEDIABROWSER=ON
-			-DUSE_MPRIS2=ON
-		)
-	fi
-
-	if [[ ${PV} == *9999 ]]; then
-		mycmakeargs+=( -DUSE_GIT_VERSION=true )
-	else
-		mycmakeargs+=( -DUSE_GIT_VERSION=false )
-	fi
-
-	cmake_src_configure
-}
diff --git a/media-video/qmplay2/qmplay2-23.06.04.ebuild b/media-video/qmplay2/qmplay2-23.06.04.ebuild
deleted file mode 100644
index 1e5663f67ccb3..0000000000000
--- a/media-video/qmplay2/qmplay2-23.06.04.ebuild
+++ /dev/null
@@ -1,138 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake xdg
-
-DESCRIPTION="A Qt-based video player, which can play most formats and codecs"
-HOMEPAGE="https://github.com/zaps166/QMPlay2"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/zaps166/QMPlay2"
-else
-	SRC_URI="https://github.com/zaps166/QMPlay2/releases/download/${PV}/QMPlay2-src-${PV}.tar.xz"
-	S="${WORKDIR}/QMPlay2-src-${PV}"
-	KEYWORDS="~amd64"
-fi
-
-LICENSE="LGPL-3"
-SLOT="0"
-
-IUSE="avdevice +audiofilters +alsa cdio cuvid extensions gme inputs libass
-	modplug notifications opengl pipewire portaudio pulseaudio sid shaders
-	+taglib vaapi vdpau videofilters visualizations vulkan xv"
-
-REQUIRED_USE="
-	audiofilters? ( || ( alsa pipewire portaudio pulseaudio ) )
-	shaders? ( vulkan )"
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	media-video/ffmpeg
-	|| (
-		dev-qt/qtgui:5[X(-)]
-		dev-qt/qtgui:5[xcb(-)]
-	)
-	alsa? ( media-libs/alsa-lib )
-	cdio? ( dev-libs/libcdio[cddb] )
-	extensions? ( dev-qt/qtdeclarative:5 )
-	gme? ( media-libs/game-music-emu )
-	libass? ( media-libs/libass )
-	opengl? ( virtual/opengl )
-	pipewire? ( media-video/pipewire )
-	portaudio? ( media-libs/portaudio )
-	pulseaudio? ( media-libs/libpulse )
-	sid? ( media-libs/libsidplayfp )
-	shaders? ( >=media-libs/shaderc-2020.1 )
-	taglib? ( media-libs/taglib	)
-	vaapi? (
-		>=media-video/ffmpeg-4.1.3[vaapi]
-		media-libs/libva[X]
-	)
-	vdpau? ( media-video/ffmpeg[vdpau] )
-	videofilters? ( dev-qt/qtconcurrent:5 )
-	vulkan? (
-		>=dev-qt/qtgui-5.14.1:5[vulkan]
-		>=media-libs/vulkan-loader-1.2.133
-	)
-	xv? ( x11-libs/libXv )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="dev-qt/linguist-tools:5"
-
-src_prepare() {
-	# disable compress man pages
-	sed -r \
-		-e 's/if\(GZIP\)/if\(TRUE\)/' \
-		-e 's/(install.+QMPlay2\.1)\.gz/\1/' \
-		-i src/gui/CMakeLists.txt || die
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_WITH_QT6=Off
-		# core
-		-DUSE_LINK_TIME_OPTIMIZATION=false
-		-DUSE_UPDATES=OFF
-		-DUSE_ALSA=$(usex alsa)
-		-DUSE_AUDIOCD=$(usex cdio)
-		-DUSE_DBUS_SUSPEND=ON
-		-DUSE_FREEDESKTOP_NOTIFICATIONS=ON
-		-DUSE_LIBASS=$(usex libass)
-		-DUSE_NOTIFY=$(usex notifications)
-		-DUSE_OPENGL=$(usex opengl)
-		-DUSE_VULKAN=$(usex vulkan)
-		-DUSE_GLSLC=$(usex shaders)
-		-DUSE_XVIDEO=$(usex xv)
-
-		# ffmpeg
-		-DUSE_FFMPEG_AVDEVICE=$(usex avdevice)
-		-DUSE_FFMPEG_VAAPI=$(usex vaapi)
-		-DUSE_FFMPEG_VDPAU=$(usex vdpau)
-
-		# chiptune
-		-DUSE_CHIPTUNE_GME=$(usex gme)
-		-DUSE_CHIPTUNE_SID=$(usex sid)
-
-		# modules
-		-DUSE_AUDIOFILTERS=$(usex audiofilters)
-		-DUSE_CUVID=$(usex cuvid)
-		-DUSE_INPUTS=$(usex inputs)
-		-DUSE_MODPLUG=$(usex modplug)
-		-DUSE_PIPEWIRE=$(usex pipewire)
-		-DUSE_PORTAUDIO=$(usex portaudio)
-		-DUSE_PULSEAUDIO=$(usex pulseaudio)
-		-DUSE_TAGLIB=$(usex taglib)
-		-DUSE_VIDEOFILTERS=$(usex videofilters)
-		-DUSE_VISUALIZATIONS=$(usex visualizations)
-
-		# extensions
-		-DUSE_EXTENSIONS=$(usex extensions)
-	)
-
-	if use extensions; then
-		# Move inside an if, to remove unused option warning
-		mycmakeargs+=(
-			-DUSE_LASTFM=ON
-			-DUSE_LYRICS=ON
-			-DUSE_MEDIABROWSER=ON
-			-DUSE_MPRIS2=ON
-		)
-	fi
-
-	if [[ ${PV} == *9999 ]]; then
-		mycmakeargs+=( -DUSE_GIT_VERSION=true )
-	else
-		mycmakeargs+=( -DUSE_GIT_VERSION=false )
-	fi
-
-	cmake_src_configure
-}
diff --git a/media-video/qmplay2/qmplay2-23.06.17.ebuild b/media-video/qmplay2/qmplay2-23.06.17-r1.ebuild
index 41412c90d14c9..9c898d587e0e9 100644
--- a/media-video/qmplay2/qmplay2-23.06.17.ebuild
+++ b/media-video/qmplay2/qmplay2-23.06.17-r1.ebuild
@@ -31,11 +31,11 @@ REQUIRED_USE="
 RDEPEND="
 	dev-qt/qtcore:5
 	dev-qt/qtdbus:5
-	dev-qt/qtgui:5[X(-)]
+	dev-qt/qtgui:5[X(-),vulkan?]
 	dev-qt/qtsvg:5
 	dev-qt/qtwidgets:5
 	dev-qt/qtx11extras:5
-	media-video/ffmpeg
+	media-video/ffmpeg:=[vaapi?,vdpau?]
 	alsa? ( media-libs/alsa-lib )
 	cdio? ( dev-libs/libcdio[cddb] )
 	extensions? ( dev-qt/qtdeclarative:5 )
@@ -48,16 +48,9 @@ RDEPEND="
 	sid? ( media-libs/libsidplayfp )
 	shaders? ( >=media-libs/shaderc-2020.1 )
 	taglib? ( media-libs/taglib	)
-	vaapi? (
-		>=media-video/ffmpeg-4.1.3[vaapi]
-		media-libs/libva[X]
-	)
-	vdpau? ( media-video/ffmpeg[vdpau] )
+	vaapi? ( media-libs/libva[X] )
 	videofilters? ( dev-qt/qtconcurrent:5 )
-	vulkan? (
-		>=dev-qt/qtgui-5.14.1:5[vulkan]
-		>=media-libs/vulkan-loader-1.2.133
-	)
+	vulkan? ( >=media-libs/vulkan-loader-1.2.133 )
 	xv? ( x11-libs/libXv )
 "
 DEPEND="${RDEPEND}"
diff --git a/media-video/qmplay2/qmplay2-9999.ebuild b/media-video/qmplay2/qmplay2-9999.ebuild
index 131c3cf98f39c..9c898d587e0e9 100644
--- a/media-video/qmplay2/qmplay2-9999.ebuild
+++ b/media-video/qmplay2/qmplay2-9999.ebuild
@@ -31,14 +31,11 @@ REQUIRED_USE="
 RDEPEND="
 	dev-qt/qtcore:5
 	dev-qt/qtdbus:5
+	dev-qt/qtgui:5[X(-),vulkan?]
 	dev-qt/qtsvg:5
 	dev-qt/qtwidgets:5
 	dev-qt/qtx11extras:5
-	media-video/ffmpeg
-	|| (
-		dev-qt/qtgui:5[X(-)]
-		dev-qt/qtgui:5[xcb(-)]
-	)
+	media-video/ffmpeg:=[vaapi?,vdpau?]
 	alsa? ( media-libs/alsa-lib )
 	cdio? ( dev-libs/libcdio[cddb] )
 	extensions? ( dev-qt/qtdeclarative:5 )
@@ -51,16 +48,9 @@ RDEPEND="
 	sid? ( media-libs/libsidplayfp )
 	shaders? ( >=media-libs/shaderc-2020.1 )
 	taglib? ( media-libs/taglib	)
-	vaapi? (
-		>=media-video/ffmpeg-4.1.3[vaapi]
-		media-libs/libva
-	)
-	vdpau? ( media-video/ffmpeg[vdpau] )
+	vaapi? ( media-libs/libva[X] )
 	videofilters? ( dev-qt/qtconcurrent:5 )
-	vulkan? (
-		>=dev-qt/qtgui-5.14.1:5[vulkan]
-		>=media-libs/vulkan-loader-1.2.133
-	)
+	vulkan? ( >=media-libs/vulkan-loader-1.2.133 )
 	xv? ( x11-libs/libXv )
 "
 DEPEND="${RDEPEND}"
@@ -78,6 +68,7 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=(
+		-DBUILD_WITH_QT6=Off
 		# core
 		-DUSE_LINK_TIME_OPTIMIZATION=false
 		-DUSE_UPDATES=OFF
diff --git a/metadata/.checksum-test-marker b/metadata/.checksum-test-marker
index 879a8252aa155..5e35e6c4e9ac7 100644
--- a/metadata/.checksum-test-marker
+++ b/metadata/.checksum-test-marker
@@ -1,4 +1,4 @@
-1687975826 Wed Jun 28 06:10:26 PM UTC 2023
+1687977625 Wed Jun 28 06:40:25 PM UTC 2023
 # Testcase for mirror network:
 # Watch the value over a day, if unchanging then
 # one or more mirrors is missing --checksum
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index ec8fe6aee2f34..632ced6fe0229 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 13b84ec7e979b..6c79900c94541 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Wed, 28 Jun 2023 18:09:50 +0000
+Wed, 28 Jun 2023 18:39:50 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index 91d493845d146..ab24e84118d2b 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 546124 BLAKE2B b8c960a7f19f0cac8ea254b9330e3a1add1f4be28ff0a9b4020f5e68f250a6b511280b7dd1dec4e472c73320abae493b0ab8441075c681803abfb19ea280332e SHA512 0dccc4f920463740ab2803f55b50f1cf0df2af9d58750c12c98fe5963dc8738d5a3e8d6a895c2e0d3ba8230bb61557b6e88b4fa56b2f05f5697577b68a9413df
-TIMESTAMP 2023-06-28T18:09:53Z
+TIMESTAMP 2023-06-28T18:39:53Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmScd3FfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmScfnlfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDkChAAnJYvvL0Pjbni2nH1g2+FMrBD+1EKYtwj8DN53W1wHmgjpK85IJCFKEBW
-6AtUpLyFJspDXJPNyr7AHiZZZtOmg62XfO7q+hZ0t4zLqCEe72ufkI/BvIPUXUaJ
-u1+49VGWNnm0SCP5KM9seT1FJJ5XP2At4aZsM4IGTwQ/K/DQnRVKcU1AGlq0wNHK
-ZfnlIjoxUsoFom+qFyxBruTje5soRD/bv8RYAsGcxq23mDdYIWTo6bfo8itwwbyR
-Xu/OxRWpffo4BwTmBgVokFoRBXey7OdhZn/oFE+5+3X7ZZ53p86rhH0PoRLXU1vv
-X3JhtcWn6iXG1Uq807z5m/M4+Fo0lrRMmn00uyT8giINJTZdRnnBLZyxA+/unN0e
-Ba71NNm6Lreekz/18FSuQ5NfrTsdWJTgAVHEbe9PN9WaQ79S7tI+477maPt1kTYN
-u5H+53ao0nhVvJ4AIjHbmO+zqAmqYbl3v4vxOP02Y8v6Pisja6zD08m8om+tdZf7
-allI/deryU8+JcFJ5ER5mScir4fm38KqnWOInNB2vI7uiwgyuvV+1CD2pyyhR5Jv
-D1NUJRSm7y/DYlzONpuz1+5dwPhN3x4ephFQ2ijJhL/JhWsiDnE0c/1ZiVHk3RF0
-CQgomYlba9yZGY42wNUCGl0+XsKSski2lEHQFT6BrFR22Qtmvng=
-=c5lN
+klAW6A//Vt78EZcagr7/mk7UktHmg0AJctVz1VDpShaNg5mAxmpdlv5ewR7d8Ij7
+xslSvhKTxJCQxCRsO0BmMXps9Df5JPZXzCqZ3Bj3WuardB1cjLGGBz9/L6RPOERc
+xmwRXOFdMad1zkysamik/Oc8+0V2t2UH1r2ta2K3lDAoxe6mKL+OkXyhz7AMdY75
+rAOIxoRE+0LeuEugG1i9l+ENBWQ/BHiIu9lHNHi6YinA5sXLEYCc2jXUdk8hmUJK
+aFZeenDS02iO71piyxEX6l7QzZLTkk9AYw7g7TskacFLloLVOXzsnu1YfAPJ1rJF
+3kqMhbqvyG/cvyseNU+JIlznpvSpYBGlFRGEBkBv5Eruv9LEKgtKUFWM4hqjEMSs
+owgBSEn9SDiUa1yeXTaLupbg3FxVrGMK3Og6lAb4cKGjZ/KiNBazxUg+wv3yxThv
+LUpTSujs/jT3jnF0Ts9mkBXPsFDX2JUrpFPeINCJi6gH49+sXbB1LWkAwYjYtmPV
+0begEDTPWhMrzCzAjQGUlHCg6uWTvhVaiwVSQj4NzvXpnsEuhb2+zB6+1RooUIcu
+fspzaIdrEQgZ+QLrwYUQDOycfUTdiYXmx2xefmm6vSBeTAge4GZu8otrnVjzyLaC
+MamQxsf/XJFpiJhPVB9BliZZjMkI7ep+8c2xeroelpPKMq4g2mM=
+=JJr8
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 13b84ec7e979b..6c79900c94541 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Wed, 28 Jun 2023 18:09:50 +0000
+Wed, 28 Jun 2023 18:39:50 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 979639ba35b4c..aa2687e5de924 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index d261960c3f63b..f176499d6a008 100644
--- a/metadata/md5-cache/dev-lang/Manifest.gz
+++ b/metadata/md5-cache/dev-lang/Manifest.gz
diff --git a/metadata/md5-cache/dev-lang/nim-1.6.14 b/metadata/md5-cache/dev-lang/nim-1.6.14
new file mode 100644
index 0000000000000..35143ffb9ea43
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/nim-1.6.14
@@ -0,0 +1,15 @@
+BDEPEND=sys-process/parallel test? ( test-js? ( net-libs/nodejs ) )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=test? ( dev-db/sqlite:3 dev-libs/boehm-gc dev-libs/libffi dev-libs/libpcre:3 dev-libs/openssl media-libs/libsdl media-libs/libsfml )
+DESCRIPTION=Compiled, garbage-collected systems programming language
+EAPI=8
+HOMEPAGE=https://nim-lang.org/
+INHERIT=bash-completion-r1 edo multiprocessing toolchain-funcs xdg-utils
+IUSE=doc experimental test-js test
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=MIT
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://nim-lang.org/download/nim-1.6.14.tar.xz experimental? ( https://git.sr.ht/~cyber/nim-patches/archive/1.6.6_p1.tar.gz -> nim-patches-1.6.6_p1.tar.gz )
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=ce943a6ade3287a1841fb419a4c93e8b
diff --git a/metadata/md5-cache/media-video/Manifest.gz b/metadata/md5-cache/media-video/Manifest.gz
index 083dc640914d6..549a47a0c0486 100644
--- a/metadata/md5-cache/media-video/Manifest.gz
+++ b/metadata/md5-cache/media-video/Manifest.gz
diff --git a/metadata/md5-cache/media-video/qmplay2-23.02.05-r1 b/metadata/md5-cache/media-video/qmplay2-23.02.05-r1
deleted file mode 100644
index a5c3c41d69ffe..0000000000000
--- a/metadata/md5-cache/media-video/qmplay2-23.02.05-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=dev-qt/linguist-tools:5 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-video/ffmpeg || ( dev-qt/qtgui:5[X(-)] dev-qt/qtgui:5[xcb(-)] ) alsa? ( media-libs/alsa-lib ) cdio? ( dev-libs/libcdio[cddb] ) extensions? ( dev-qt/qtdeclarative:5 ) gme? ( media-libs/game-music-emu ) libass? ( media-libs/libass ) opengl? ( virtual/opengl ) pipewire? ( media-video/pipewire ) portaudio? ( media-libs/portaudio ) pulseaudio? ( media-libs/libpulse ) sid? ( media-libs/libsidplayfp ) shaders? ( >=media-libs/shaderc-2020.1 ) taglib? ( media-libs/taglib ) vaapi? ( >=media-video/ffmpeg-4.1.3[vaapi] media-libs/libva[X] ) vdpau? ( media-video/ffmpeg[vdpau] ) videofilters? ( dev-qt/qtconcurrent:5 ) vulkan? ( >=dev-qt/qtgui-5.14.1:5[vulkan] >=media-libs/vulkan-loader-1.2.133 ) xv? ( x11-libs/libXv )
-DESCRIPTION=A Qt-based video player, which can play most formats and codecs
-EAPI=8
-HOMEPAGE=https://github.com/zaps166/QMPlay2
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=cmake xdg
-IUSE=avdevice +audiofilters +alsa cdio cuvid extensions gme inputs libass modplug notifications opengl pipewire portaudio pulseaudio sid shaders +taglib vaapi vdpau videofilters visualizations vulkan xv
-KEYWORDS=~amd64
-LICENSE=LGPL-3
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-video/ffmpeg || ( dev-qt/qtgui:5[X(-)] dev-qt/qtgui:5[xcb(-)] ) alsa? ( media-libs/alsa-lib ) cdio? ( dev-libs/libcdio[cddb] ) extensions? ( dev-qt/qtdeclarative:5 ) gme? ( media-libs/game-music-emu ) libass? ( media-libs/libass ) opengl? ( virtual/opengl ) pipewire? ( media-video/pipewire ) portaudio? ( media-libs/portaudio ) pulseaudio? ( media-libs/libpulse ) sid? ( media-libs/libsidplayfp ) shaders? ( >=media-libs/shaderc-2020.1 ) taglib? ( media-libs/taglib ) vaapi? ( >=media-video/ffmpeg-4.1.3[vaapi] media-libs/libva[X] ) vdpau? ( media-video/ffmpeg[vdpau] ) videofilters? ( dev-qt/qtconcurrent:5 ) vulkan? ( >=dev-qt/qtgui-5.14.1:5[vulkan] >=media-libs/vulkan-loader-1.2.133 ) xv? ( x11-libs/libXv )
-REQUIRED_USE=audiofilters? ( || ( alsa pipewire portaudio pulseaudio ) ) shaders? ( vulkan )
-SLOT=0
-SRC_URI=https://github.com/zaps166/QMPlay2/releases/download/23.02.05/QMPlay2-src-23.02.05.tar.xz
-_eclasses_=cmake	1abaebfe913f48975739281ab7d7ab75	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=99cad3493bc28735e6c370f65326ee5b
diff --git a/metadata/md5-cache/media-video/qmplay2-23.06.04 b/metadata/md5-cache/media-video/qmplay2-23.06.04
deleted file mode 100644
index cd064620e145a..0000000000000
--- a/metadata/md5-cache/media-video/qmplay2-23.06.04
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=dev-qt/linguist-tools:5 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-video/ffmpeg || ( dev-qt/qtgui:5[X(-)] dev-qt/qtgui:5[xcb(-)] ) alsa? ( media-libs/alsa-lib ) cdio? ( dev-libs/libcdio[cddb] ) extensions? ( dev-qt/qtdeclarative:5 ) gme? ( media-libs/game-music-emu ) libass? ( media-libs/libass ) opengl? ( virtual/opengl ) pipewire? ( media-video/pipewire ) portaudio? ( media-libs/portaudio ) pulseaudio? ( media-libs/libpulse ) sid? ( media-libs/libsidplayfp ) shaders? ( >=media-libs/shaderc-2020.1 ) taglib? ( media-libs/taglib ) vaapi? ( >=media-video/ffmpeg-4.1.3[vaapi] media-libs/libva[X] ) vdpau? ( media-video/ffmpeg[vdpau] ) videofilters? ( dev-qt/qtconcurrent:5 ) vulkan? ( >=dev-qt/qtgui-5.14.1:5[vulkan] >=media-libs/vulkan-loader-1.2.133 ) xv? ( x11-libs/libXv )
-DESCRIPTION=A Qt-based video player, which can play most formats and codecs
-EAPI=8
-HOMEPAGE=https://github.com/zaps166/QMPlay2
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=cmake xdg
-IUSE=avdevice +audiofilters +alsa cdio cuvid extensions gme inputs libass modplug notifications opengl pipewire portaudio pulseaudio sid shaders +taglib vaapi vdpau videofilters visualizations vulkan xv
-KEYWORDS=~amd64
-LICENSE=LGPL-3
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-video/ffmpeg || ( dev-qt/qtgui:5[X(-)] dev-qt/qtgui:5[xcb(-)] ) alsa? ( media-libs/alsa-lib ) cdio? ( dev-libs/libcdio[cddb] ) extensions? ( dev-qt/qtdeclarative:5 ) gme? ( media-libs/game-music-emu ) libass? ( media-libs/libass ) opengl? ( virtual/opengl ) pipewire? ( media-video/pipewire ) portaudio? ( media-libs/portaudio ) pulseaudio? ( media-libs/libpulse ) sid? ( media-libs/libsidplayfp ) shaders? ( >=media-libs/shaderc-2020.1 ) taglib? ( media-libs/taglib ) vaapi? ( >=media-video/ffmpeg-4.1.3[vaapi] media-libs/libva[X] ) vdpau? ( media-video/ffmpeg[vdpau] ) videofilters? ( dev-qt/qtconcurrent:5 ) vulkan? ( >=dev-qt/qtgui-5.14.1:5[vulkan] >=media-libs/vulkan-loader-1.2.133 ) xv? ( x11-libs/libXv )
-REQUIRED_USE=audiofilters? ( || ( alsa pipewire portaudio pulseaudio ) ) shaders? ( vulkan )
-SLOT=0
-SRC_URI=https://github.com/zaps166/QMPlay2/releases/download/23.06.04/QMPlay2-src-23.06.04.tar.xz
-_eclasses_=cmake	1abaebfe913f48975739281ab7d7ab75	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=f8f8dd76267565a7976dc8ad4a733842
diff --git a/metadata/md5-cache/media-video/qmplay2-23.06.17 b/metadata/md5-cache/media-video/qmplay2-23.06.17
deleted file mode 100644
index a8e13718fd6a7..0000000000000
--- a/metadata/md5-cache/media-video/qmplay2-23.06.17
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=dev-qt/linguist-tools:5 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5[X(-)] dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-video/ffmpeg alsa? ( media-libs/alsa-lib ) cdio? ( dev-libs/libcdio[cddb] ) extensions? ( dev-qt/qtdeclarative:5 ) gme? ( media-libs/game-music-emu ) libass? ( media-libs/libass ) opengl? ( virtual/opengl ) pipewire? ( media-video/pipewire ) portaudio? ( media-libs/portaudio ) pulseaudio? ( media-libs/libpulse ) sid? ( media-libs/libsidplayfp ) shaders? ( >=media-libs/shaderc-2020.1 ) taglib? ( media-libs/taglib ) vaapi? ( >=media-video/ffmpeg-4.1.3[vaapi] media-libs/libva[X] ) vdpau? ( media-video/ffmpeg[vdpau] ) videofilters? ( dev-qt/qtconcurrent:5 ) vulkan? ( >=dev-qt/qtgui-5.14.1:5[vulkan] >=media-libs/vulkan-loader-1.2.133 ) xv? ( x11-libs/libXv )
-DESCRIPTION=A Qt-based video player, which can play most formats and codecs
-EAPI=8
-HOMEPAGE=https://github.com/zaps166/QMPlay2
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=cmake xdg
-IUSE=avdevice +audiofilters +alsa cdio cuvid extensions gme inputs libass modplug notifications opengl pipewire portaudio pulseaudio sid shaders +taglib vaapi vdpau videofilters visualizations vulkan xv
-KEYWORDS=~amd64
-LICENSE=LGPL-3
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5[X(-)] dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-video/ffmpeg alsa? ( media-libs/alsa-lib ) cdio? ( dev-libs/libcdio[cddb] ) extensions? ( dev-qt/qtdeclarative:5 ) gme? ( media-libs/game-music-emu ) libass? ( media-libs/libass ) opengl? ( virtual/opengl ) pipewire? ( media-video/pipewire ) portaudio? ( media-libs/portaudio ) pulseaudio? ( media-libs/libpulse ) sid? ( media-libs/libsidplayfp ) shaders? ( >=media-libs/shaderc-2020.1 ) taglib? ( media-libs/taglib ) vaapi? ( >=media-video/ffmpeg-4.1.3[vaapi] media-libs/libva[X] ) vdpau? ( media-video/ffmpeg[vdpau] ) videofilters? ( dev-qt/qtconcurrent:5 ) vulkan? ( >=dev-qt/qtgui-5.14.1:5[vulkan] >=media-libs/vulkan-loader-1.2.133 ) xv? ( x11-libs/libXv )
-REQUIRED_USE=audiofilters? ( || ( alsa pipewire portaudio pulseaudio ) ) shaders? ( vulkan )
-SLOT=0
-SRC_URI=https://github.com/zaps166/QMPlay2/releases/download/23.06.17/QMPlay2-src-23.06.17.tar.xz
-_eclasses_=cmake	1abaebfe913f48975739281ab7d7ab75	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=204faaee3f5b9a6bad972fd4c2e2f805
diff --git a/metadata/md5-cache/media-video/qmplay2-23.06.17-r1 b/metadata/md5-cache/media-video/qmplay2-23.06.17-r1
new file mode 100644
index 0000000000000..20e9e4425453b
--- /dev/null
+++ b/metadata/md5-cache/media-video/qmplay2-23.06.17-r1
@@ -0,0 +1,17 @@
+BDEPEND=dev-qt/linguist-tools:5 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5[X(-),vulkan?] dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-video/ffmpeg:=[vaapi?,vdpau?] alsa? ( media-libs/alsa-lib ) cdio? ( dev-libs/libcdio[cddb] ) extensions? ( dev-qt/qtdeclarative:5 ) gme? ( media-libs/game-music-emu ) libass? ( media-libs/libass ) opengl? ( virtual/opengl ) pipewire? ( media-video/pipewire ) portaudio? ( media-libs/portaudio ) pulseaudio? ( media-libs/libpulse ) sid? ( media-libs/libsidplayfp ) shaders? ( >=media-libs/shaderc-2020.1 ) taglib? ( media-libs/taglib ) vaapi? ( media-libs/libva[X] ) videofilters? ( dev-qt/qtconcurrent:5 ) vulkan? ( >=media-libs/vulkan-loader-1.2.133 ) xv? ( x11-libs/libXv )
+DESCRIPTION=A Qt-based video player, which can play most formats and codecs
+EAPI=8
+HOMEPAGE=https://github.com/zaps166/QMPlay2
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=cmake xdg
+IUSE=avdevice +audiofilters +alsa cdio cuvid extensions gme inputs libass modplug notifications opengl pipewire portaudio pulseaudio sid shaders +taglib vaapi vdpau videofilters visualizations vulkan xv
+KEYWORDS=~amd64
+LICENSE=LGPL-3
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5[X(-),vulkan?] dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-video/ffmpeg:=[vaapi?,vdpau?] alsa? ( media-libs/alsa-lib ) cdio? ( dev-libs/libcdio[cddb] ) extensions? ( dev-qt/qtdeclarative:5 ) gme? ( media-libs/game-music-emu ) libass? ( media-libs/libass ) opengl? ( virtual/opengl ) pipewire? ( media-video/pipewire ) portaudio? ( media-libs/portaudio ) pulseaudio? ( media-libs/libpulse ) sid? ( media-libs/libsidplayfp ) shaders? ( >=media-libs/shaderc-2020.1 ) taglib? ( media-libs/taglib ) vaapi? ( media-libs/libva[X] ) videofilters? ( dev-qt/qtconcurrent:5 ) vulkan? ( >=media-libs/vulkan-loader-1.2.133 ) xv? ( x11-libs/libXv )
+REQUIRED_USE=audiofilters? ( || ( alsa pipewire portaudio pulseaudio ) ) shaders? ( vulkan )
+SLOT=0
+SRC_URI=https://github.com/zaps166/QMPlay2/releases/download/23.06.17/QMPlay2-src-23.06.17.tar.xz
+_eclasses_=cmake	1abaebfe913f48975739281ab7d7ab75	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=20686754df2dd8a77dab60025073eb4c
diff --git a/metadata/md5-cache/media-video/qmplay2-9999 b/metadata/md5-cache/media-video/qmplay2-9999
index 039f43c28eec6..3da50aceb2ef7 100644
--- a/metadata/md5-cache/media-video/qmplay2-9999
+++ b/metadata/md5-cache/media-video/qmplay2-9999
@@ -1,6 +1,6 @@
 BDEPEND=dev-qt/linguist-tools:5 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
-DEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-video/ffmpeg || ( dev-qt/qtgui:5[X(-)] dev-qt/qtgui:5[xcb(-)] ) alsa? ( media-libs/alsa-lib ) cdio? ( dev-libs/libcdio[cddb] ) extensions? ( dev-qt/qtdeclarative:5 ) gme? ( media-libs/game-music-emu ) libass? ( media-libs/libass ) opengl? ( virtual/opengl ) pipewire? ( media-video/pipewire ) portaudio? ( media-libs/portaudio ) pulseaudio? ( media-libs/libpulse ) sid? ( media-libs/libsidplayfp ) shaders? ( >=media-libs/shaderc-2020.1 ) taglib? ( media-libs/taglib ) vaapi? ( >=media-video/ffmpeg-4.1.3[vaapi] media-libs/libva ) vdpau? ( media-video/ffmpeg[vdpau] ) videofilters? ( dev-qt/qtconcurrent:5 ) vulkan? ( >=dev-qt/qtgui-5.14.1:5[vulkan] >=media-libs/vulkan-loader-1.2.133 ) xv? ( x11-libs/libXv )
+DEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5[X(-),vulkan?] dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-video/ffmpeg:=[vaapi?,vdpau?] alsa? ( media-libs/alsa-lib ) cdio? ( dev-libs/libcdio[cddb] ) extensions? ( dev-qt/qtdeclarative:5 ) gme? ( media-libs/game-music-emu ) libass? ( media-libs/libass ) opengl? ( virtual/opengl ) pipewire? ( media-video/pipewire ) portaudio? ( media-libs/portaudio ) pulseaudio? ( media-libs/libpulse ) sid? ( media-libs/libsidplayfp ) shaders? ( >=media-libs/shaderc-2020.1 ) taglib? ( media-libs/taglib ) vaapi? ( media-libs/libva[X] ) videofilters? ( dev-qt/qtconcurrent:5 ) vulkan? ( >=media-libs/vulkan-loader-1.2.133 ) xv? ( x11-libs/libXv )
 DESCRIPTION=A Qt-based video player, which can play most formats and codecs
 EAPI=8
 HOMEPAGE=https://github.com/zaps166/QMPlay2
@@ -9,8 +9,8 @@ INHERIT=cmake xdg git-r3
 IUSE=avdevice +audiofilters +alsa cdio cuvid extensions gme inputs libass modplug notifications opengl pipewire portaudio pulseaudio sid shaders +taglib vaapi vdpau videofilters visualizations vulkan xv
 LICENSE=LGPL-3
 PROPERTIES=live
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-video/ffmpeg || ( dev-qt/qtgui:5[X(-)] dev-qt/qtgui:5[xcb(-)] ) alsa? ( media-libs/alsa-lib ) cdio? ( dev-libs/libcdio[cddb] ) extensions? ( dev-qt/qtdeclarative:5 ) gme? ( media-libs/game-music-emu ) libass? ( media-libs/libass ) opengl? ( virtual/opengl ) pipewire? ( media-video/pipewire ) portaudio? ( media-libs/portaudio ) pulseaudio? ( media-libs/libpulse ) sid? ( media-libs/libsidplayfp ) shaders? ( >=media-libs/shaderc-2020.1 ) taglib? ( media-libs/taglib ) vaapi? ( >=media-video/ffmpeg-4.1.3[vaapi] media-libs/libva ) vdpau? ( media-video/ffmpeg[vdpau] ) videofilters? ( dev-qt/qtconcurrent:5 ) vulkan? ( >=dev-qt/qtgui-5.14.1:5[vulkan] >=media-libs/vulkan-loader-1.2.133 ) xv? ( x11-libs/libXv )
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5[X(-),vulkan?] dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-video/ffmpeg:=[vaapi?,vdpau?] alsa? ( media-libs/alsa-lib ) cdio? ( dev-libs/libcdio[cddb] ) extensions? ( dev-qt/qtdeclarative:5 ) gme? ( media-libs/game-music-emu ) libass? ( media-libs/libass ) opengl? ( virtual/opengl ) pipewire? ( media-video/pipewire ) portaudio? ( media-libs/portaudio ) pulseaudio? ( media-libs/libpulse ) sid? ( media-libs/libsidplayfp ) shaders? ( >=media-libs/shaderc-2020.1 ) taglib? ( media-libs/taglib ) vaapi? ( media-libs/libva[X] ) videofilters? ( dev-qt/qtconcurrent:5 ) vulkan? ( >=media-libs/vulkan-loader-1.2.133 ) xv? ( x11-libs/libXv )
 REQUIRED_USE=audiofilters? ( || ( alsa pipewire portaudio pulseaudio ) ) shaders? ( vulkan )
 SLOT=0
 _eclasses_=cmake	1abaebfe913f48975739281ab7d7ab75	flag-o-matic	ad475baa777c9978fa035216c8264a10	git-r3	27e13c09a4c7e4c78ac812f74727e676	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=1b763854cf1c70b3f74e664547b279e0
+_md5_=20686754df2dd8a77dab60025073eb4c
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index 4d897d91985fa..86aacf5f9138d 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 15850 BLAKE2B f8a24ac4773896d3e2d3ac7daac96705bb587c68e5945981d4f8b934b213a0a634607e00cc3481f4c847f66ae537f4bfd1c12852438720d6cf5d711fe74f3237 SHA512 29367a48def7059bf0b6fab4e38cd0ba8266ac4b865394c346e798632efcf7c41364d99e462d98a52192ae8270db65e57b9f15ae208bef7ce4c3cfd98163dee1
-TIMESTAMP 2023-06-28T18:09:53Z
+TIMESTAMP 2023-06-28T18:39:53Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmScd3FfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmScfnlfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klC4uQ//TZ5YIPpHrNH5ADh8tK8mFnT1hjk4NkbW8cE05rWpIFSrP3j7XyElhyYX
-HTayBNBYCsEiVY/qlWvD7Wcd/Lhp+gNbg686v4CJ8zKwKg7ANE5GKmzG58hvv1pC
-QB96s1BpwotGeTyhnp/JrG6jXBz/KOJ8q4lmuTe+sGIFCnWg+sIA0PzwcKL/2wNq
-7BXNdO5lU3iba67voF7QWWANYviMPbRDcoBX7P1Xvclr7KyiQetcbjsd1OSXVnav
-jED4PR/NEoDcvB1D3/WhtMY4U0Lq5gmS6Luj2vC3Bpr7UyFn5PKEQeem/mNAlSTk
-YhqRwgJNCcxA1R/IHbIJBxKKqErCLrZJZkh8R6RCesTQ8FjOupXAB3fCqUl7pQcb
-tvZx4ROyy/e12s4kxSW3mskAOfyAKFm4X2Nz5U3tbYTrikZShU4I1nNxuBoU+6rc
-w155IOIPXxaU8C2Uf/Yf29m3k/wc6bWucBha/CVgvkDUFg2m3rhP5rY2P3e5TrR9
-KfCvEGnx2VLsYOAJL3VRh2s9WTfg/FUvJSfhtoiIsNr34X9co17MhFBs9sb86vNt
-PoyEtTaiKLYK1n9Gno43kEmiJqGWSP2Az1pach/MOcewd0+LjamioJ4srouw6vty
-8+iERQ5nYFQHJ3qRE/1q7uWdLSHt1cMzyXKYDxvguHnDy2p0vyg=
-=ntUS
+klBezA/9EDSQa847hqxj9WIRkwMDeqO/Qkr68C5Yd3+k5fewmAmse5vkFj18cajQ
+Ik0BFpOfp5VmdXJHb0mNr8W3N5iL3RaNZeldwDhmLTKYnLrYbqOrPj/GCIhEo1xF
+1SvplJJjGgqCSR8VbFcw2F8bEugShXdFr5jTSbcK+qXPS3RaTWl9TVbaiP+Yiex2
+fFzen5kBAeryKQk8b1LtgZ+ROrN6/k7IjRH+BOJ2m5r8FnOZeSMKc2/snTVdTOp3
+Ybte06l1VMadNq0f2aJHmry6OYySepZf077PUhIxxZJPwFOS7LFyB9WSe75Yvx83
+qn4ui/cu75oxtFKdkVw+w2bissCtAjAcVB7TWxj1ZvwpMp39VbtiBeocCqPux9EN
+b6fRHZDUFAE3Lz0TcZXMPaEPUQVuuczQ/DpeNCDS8yh1Q/ecB3fLDNoJrFm79BGL
+ptQmrPYIrBJUFsoWDdCY/PN6Utv3qWUBJf5daoTACXflOFEiWitiCEAbwBiCMDI1
+736FNchZyuWYQ0aPvsn++L+5cu9U1UzCLQX/TD9GXgRqASQoqka3ecZ82VnuhUzB
+a5X3Luo5BOGMSAloN82b0DpX3RnhPDCyvznqX9AByXqoE/lTJ+5t+8nDpQGjOsIo
+lt0o8RhOEzRJtNyrcWk/txWP/A0Gm/ZJCe/O6DOuh/CIsyvKf0Q=
+=EGA+
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 13b84ec7e979b..6c79900c94541 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Wed, 28 Jun 2023 18:09:50 +0000
+Wed, 28 Jun 2023 18:39:50 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index d7c8b09a1ac55..5d36db9e8edce 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Wed Jun 28 06:09:50 PM UTC 2023
+Wed Jun 28 06:39:50 PM UTC 2023
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index a7227883628c4..5368c9ae73d5d 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Wed, 28 Jun 2023 18:15:01 +0000
+Wed, 28 Jun 2023 18:45:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index ad8f91cba6696..fcbb3f002753c 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-ce1609e557d25de105d0422f8fbbc64b136b65b8 1687974207 2023-06-28T17:43:27+00:00
+ebcfe73d3318a677f06235e77c474961132ca873 1687977022 2023-06-28T18:30:22+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 89ba44418bbab..837b0c67cc00d 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1687975801 Wed 28 Jun 2023 06:10:01 PM UTC
+1687977601 Wed 28 Jun 2023 06:40:01 PM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 13b84ec7e979b..6c79900c94541 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Wed, 28 Jun 2023 18:09:50 +0000
+Wed, 28 Jun 2023 18:39:50 +0000