gentoo auto-resync : 07:01:2023 - 18:14:11

7 files changed, 33 insertions, 324 deletions

diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index ea886be49d32..9d56e24e7352 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/hydrus/Manifest b/media-gfx/hydrus/Manifest
index 82b378ed1cac..16b8824aea4b 100644
--- a/media-gfx/hydrus/Manifest
+++ b/media-gfx/hydrus/Manifest
@@ -1,13 +1,9 @@
 AUX hydrus-client 98 BLAKE2B c08af22c2ee9ea3d5c95ed3196ceb9b74b9c886bfa9b91141584f7ea884830fbdd300c948af199ac82a016e1a9dd7314e9c7fdfa8f47f07a9336eff9e2bd2ce1 SHA512 453ac6f9685325b6510c7f833b658491f01e92be213ae26da0d86490033951d3a825f9b15fd33d8a0727992cd83bf7ed491b88f0808674d6fdc23af90c7911a5
 AUX hydrus-server 62 BLAKE2B dac100012fb03c2a14438b67a1c68daa1673eb23dfe7725a941325eb67149064c1276f462732e62db294acce75d111f948599698615e9fa15be43fe74ce444cd SHA512 5b7f9ca4b364ff529e5f4feb6fb11c91aff9cf1ad3ae6c12ff301915fa1d7b9920d51028b820000635d071a049a4e98a0e4e815ffa6ca31d2e67bec5a78afdea
 AUX userpath-in-local-share.patch 443 BLAKE2B 2562bdb6207a35a872a7c1b22ee378504ec4f53ee7b64bdce31649d62780cae00b42be7297aa82e069a9df5e01f76c508d97c47a25a9dffec8cbf8829e7ff674 SHA512 f96cf0040a663c534bd539e40413c95928ea45238f765f741db3c251b7c141fe99989b092d4033695a99e7267fec7fac74641fdc4a0887e74d23d3695f8ce467
-DIST hydrus-496.tar.gz 40644118 BLAKE2B 8acb369acb3bbe667d51eeb3de8cceef02585040ae63d50fbbff4b5e8d8f4bac29dc4cd08c9eb8f436a1fc7150bb7eb249ff3f5d13e5a4ee54a2dee877f00208 SHA512 5cc7e4f4f152790659014d675159e121aa65e275231ef43bc3bbd6efe67b458cd821d8858d94e440a1585e0040b242c5ef65368796705242e7eb8e51c62b81bf
-DIST hydrus-497.tar.gz 40649206 BLAKE2B e014ff318275547ec210aa13bba1377de726b80ee1389b593ab219fc4530a44766b29111444fbc08cf50b4ca61f6129683adeb0f3835afa3cfba729e9af285b1 SHA512 39fb3e3ef3bf024913a168f616fa436013f1d2b92be102b3dfead35219420791c11b3c1846ddae577a6ee4ae3aeb9601f11d1e7ce8daac99932f14699a497242
-DIST hydrus-501.tar.gz 40724774 BLAKE2B 6a93c4483b07e976fac829aee4c1f4c879f535ff0ce7e89c64b278bc3f7d77abdd9b906d48f87b175a1eccec2dcf962725abe0602fb68b009fbba9d0f3381067 SHA512 1c9275023f1d205bf916eb85566237fe8f25a446399065ebc371e1db8ca3c3e2501e8a82867e9f7711b007a74a9e88d838babca29a2556d19ffcf77b14182834
-DIST hydrus-505.tar.gz 40756022 BLAKE2B a5d9cfd5f8023a2f809c2610c48e8018ca7bb6002d1420485e463b3fe477cae07a2f4ea2cd823ff592a164d37e611938fe805d163cbf5512c636b972c1afad77 SHA512 f5c818616aa195b904d5cd65e77f29095f22fc9f435b0218110cb47e655c004c3ce3e72fc9de8ec8b1e9b508ced42b045131e0ddd6442fa43fc7d4d77877465e
-EBUILD hydrus-496-r1.ebuild 4421 BLAKE2B dd4b42c8d5432180b7354d6fa3149c3715acda88686e24b513f71664b7198e51af47016395010284af7f1475ec14dd5da6aaaeca83425040506665979be10088 SHA512 79306d83ec1eeadfa3c196517fe77c2f92bd10b61144adc42a67d3b159ca51dc11d387075973867849566baf9d508de4151bdee173c3dc061a27b878f873ab93
-EBUILD hydrus-497-r1.ebuild 4421 BLAKE2B dd4b42c8d5432180b7354d6fa3149c3715acda88686e24b513f71664b7198e51af47016395010284af7f1475ec14dd5da6aaaeca83425040506665979be10088 SHA512 79306d83ec1eeadfa3c196517fe77c2f92bd10b61144adc42a67d3b159ca51dc11d387075973867849566baf9d508de4151bdee173c3dc061a27b878f873ab93
-EBUILD hydrus-501-r1.ebuild 4421 BLAKE2B dd4b42c8d5432180b7354d6fa3149c3715acda88686e24b513f71664b7198e51af47016395010284af7f1475ec14dd5da6aaaeca83425040506665979be10088 SHA512 79306d83ec1eeadfa3c196517fe77c2f92bd10b61144adc42a67d3b159ca51dc11d387075973867849566baf9d508de4151bdee173c3dc061a27b878f873ab93
-EBUILD hydrus-505.ebuild 4464 BLAKE2B 0863755a27b7ebe116aa2325ff861740a71ae3138fd0209d40ce5dbd467560606a51a8a6a54554d78aad6ca7746aa3a2ed372ae637246e2da5500da754314c8e SHA512 301682f97135bbf9fa76f88c0718309a31985304aa6add947ca6693f236d4f862dbb18a902b5b73671075890066fd2c493b6140f5e9068e8a9a20fd171101edc
-EBUILD hydrus-9999.ebuild 4421 BLAKE2B dd4b42c8d5432180b7354d6fa3149c3715acda88686e24b513f71664b7198e51af47016395010284af7f1475ec14dd5da6aaaeca83425040506665979be10088 SHA512 79306d83ec1eeadfa3c196517fe77c2f92bd10b61144adc42a67d3b159ca51dc11d387075973867849566baf9d508de4151bdee173c3dc061a27b878f873ab93
+DIST hydrus-510.tar.gz 40813887 BLAKE2B 84ecc40897e0aa324005d05146ea1ac439e9576a376ab40641a948ddeb2a58b7f171a0b9c00f69bd34b218e195c8b77c505992c0b51372454bc3c8208f1ef485 SHA512 998cdd09bcbb8bf3ba611754f5237d5a743e89988bf3259ae7187ac8730e6183b433622c25fef400c0efdc9fd38dcbfa171e70da5be953557983d08f15c8b21e
+DIST hydrus-511.tar.gz 40821597 BLAKE2B 15bff5bf7427ddef3a3700a883d0afe83090844c2052c41b1c4bfc13bce1f0052d48cc452d7e779c8b42a9a0d68901d27e750673ca2414c209db1c1fcd67a427 SHA512 d48d8e31b4eab80db917ebe6fe5ece719644e1b06ec8ca063a20044b39ad695b90c00340850be42c69ee163ab8866c0925c90752c74fdfbf40643dc02658b813
+EBUILD hydrus-510.ebuild 4547 BLAKE2B 985a4145e4215df4906fc88377ec48ebfe3be032453d941b0af93b528debb611904d3fbd34a021d4e030101c8a53b154f89b9ced6e5f2418c1e21b634d647d66 SHA512 108a29a927112362104247c106e9acbdf519d17859224a2057416a6431835dc16ee889e7f97c18814a82a8147d8f574e2fc0cc3223eee18ea9dbd2fc768c7f10
+EBUILD hydrus-511.ebuild 4547 BLAKE2B 985a4145e4215df4906fc88377ec48ebfe3be032453d941b0af93b528debb611904d3fbd34a021d4e030101c8a53b154f89b9ced6e5f2418c1e21b634d647d66 SHA512 108a29a927112362104247c106e9acbdf519d17859224a2057416a6431835dc16ee889e7f97c18814a82a8147d8f574e2fc0cc3223eee18ea9dbd2fc768c7f10
+EBUILD hydrus-9999.ebuild 4547 BLAKE2B 985a4145e4215df4906fc88377ec48ebfe3be032453d941b0af93b528debb611904d3fbd34a021d4e030101c8a53b154f89b9ced6e5f2418c1e21b634d647d66 SHA512 108a29a927112362104247c106e9acbdf519d17859224a2057416a6431835dc16ee889e7f97c18814a82a8147d8f574e2fc0cc3223eee18ea9dbd2fc768c7f10
 MISC metadata.xml 836 BLAKE2B 049faa70763ba176b6e4930abcdb5f4b4b87bd243759aba42dec32b9f2a199b3f2c33f0415ffdd1a392af3b461d939e633ec1f9333b0ff538f74d24306790fbe SHA512 0404c79e85e51eaba13fef930e695f168074e69734d3d8a604515f77196706bae9d36a2df9b3db0530c9f17b32881602509c7e22e7383c957a67e13c2a46e7bb
diff --git a/media-gfx/hydrus/hydrus-497-r1.ebuild b/media-gfx/hydrus/hydrus-497-r1.ebuild
deleted file mode 100644
index 1ecb76ea0b7b..000000000000
--- a/media-gfx/hydrus/hydrus-497-r1.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="sqlite"
-
-DOCS_BUILDER=mkdocs
-DOCS_DEPEND="dev-python/mkdocs-material"
-
-inherit python-single-r1 desktop docs optfeature
-
-DESCRIPTION="A booru-like media organizer for the desktop"
-HOMEPAGE="https://hydrusnetwork.github.io/hydrus/ https://github.com/hydrusnetwork/hydrus"
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/hydrusnetwork/hydrus.git"
-else
-	SRC_URI="https://github.com/hydrusnetwork/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-	KEYWORDS="~amd64"
-fi
-
-# hydrus itself is WTFPL
-# icons included are CC-BY-2.5
-LICENSE="WTFPL-2 CC-BY-2.5"
-SLOT="0"
-IUSE="test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RESTRICT="!test? ( test )"
-
-# RDEPEND is sorted as such:
-# - No specific requirements
-# - Specific version or slot
-RDEPEND="
-	${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		dev-python/cbor2[${PYTHON_USEDEP}]
-		dev-python/chardet[${PYTHON_USEDEP}]
-		dev-python/cloudscraper[${PYTHON_USEDEP}]
-		dev-python/html5lib[${PYTHON_USEDEP}]
-		dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP},lcms]
-		dev-python/psutil[${PYTHON_USEDEP}]
-		dev-python/pyopenssl[${PYTHON_USEDEP}]
-		dev-python/pyside2[widgets,gui,${PYTHON_USEDEP}]
-		dev-python/python-mpv[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/send2trash[${PYTHON_USEDEP}]
-		dev-python/service_identity[${PYTHON_USEDEP}]
-		dev-python/six[${PYTHON_USEDEP}]
-		dev-python/twisted[${PYTHON_USEDEP}]
-		media-libs/opencv[python,png,jpeg,${PYTHON_USEDEP}]
-		media-video/ffmpeg
-
-		>=dev-python/QtPy-1.9.0-r4[pyside2,${PYTHON_USEDEP}]
-		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
-	')
-"
-BDEPEND="
-	${RDEPEND}
-	$(python_gen_cond_dep '
-		test? (
-			dev-python/httmock[${PYTHON_USEDEP}]
-			dev-python/mock[${PYTHON_USEDEP}]
-			dev-python/nose[${PYTHON_USEDEP}]
-		)
-	')
-"
-
-PATCHES=(
-	"${FILESDIR}/userpath-in-local-share.patch"
-)
-
-src_prepare() {
-	default
-
-	# Contains pre-built binaries for other systems and a broken swf renderer for linux
-	rm -r bin/ || die
-	# Build files used for CI, not actually needed
-	rm -r static/build_files || die
-	# Python requirements files, not needed
-	rm requirements_*.txt || die
-}
-
-src_compile() {
-	python_optimize "${S}"
-	docs_compile
-}
-
-src_test() {
-	# The tests use unittest, but are run with a custom runner script.
-	# QT_QPA_PLATFORM is required to make them run without X
-	local -x QT_QPA_PLATFORM=offscreen
-	"${EPYTHON}" "${S}/test.py" || die "Tests failed"
-}
-
-src_install() {
-	local doc="${EPREFIX}/usr/share/doc/${PF}"
-	elog "Hydrus includes an excellent manual, that can either be viewed at"
-	elog "${doc}/html/help/index.html"
-	elog "or accessed through the hydrus help menu."
-
-	mv "help my client will not boot.txt" "help_my_client_will_not_boot.txt" || die
-
-	local DOCS=(COPYING README.md help_my_client_will_not_boot.txt db/)
-	einstalldocs
-
-	# Files only needed for testing
-	rm test.py hydrus/hydrus_test.py || die
-	rm -r hydrus/test/ static/testing/ || die
-
-	# ${DOCS[@]} files are copied into doc
-	# ${S}/docs/ is the markdown source code for documentation
-	# .gitignore/.github files aren't needed for the program to work, same with mkdocs files
-	rm -r "${DOCS[@]}" "${S}/docs/" .gitignore .github/ mkdocs.yml mkdocs-gh-pages.yml || die
-	if use doc; then
-		# ${S}/_build = ${DOCS_OUTDIR}/.. , these have already been copied, remove before installation
-		rm -r "${S}/_build" || die
-		# The program expects to find documentation here, so add a symlink to doc
-		dosym "${doc}/html" /opt/hydrus/help
-	fi
-
-	insinto /opt/hydrus
-	doins -r "${S}"/.
-
-	exeinto /usr/bin
-	python_newexe - hydrus-server < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-server" || die)
-	python_newexe - hydrus-client < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-client" || die)
-
-	make_desktop_entry "hydrus-client" "Hydrus Client" "/opt/hydrus/static/hydrus_non-transparent.png" \
-					   "AudioVideo;FileTools;Graphics;Network;"
-}
-
-pkg_postinst() {
-	optfeature "automatic port forwarding support" "net-libs/miniupnpc"
-	optfeature "bandwidth charts support" "dev-python/pyside2[charts]"
-	optfeature "memory compression in the client" "dev-python/lz4"
-	optfeature "SOCKS proxy support" "dev-python/requests[socks5]" "dev-python/PySocks"
-}
diff --git a/media-gfx/hydrus/hydrus-501-r1.ebuild b/media-gfx/hydrus/hydrus-501-r1.ebuild
deleted file mode 100644
index 1ecb76ea0b7b..000000000000
--- a/media-gfx/hydrus/hydrus-501-r1.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="sqlite"
-
-DOCS_BUILDER=mkdocs
-DOCS_DEPEND="dev-python/mkdocs-material"
-
-inherit python-single-r1 desktop docs optfeature
-
-DESCRIPTION="A booru-like media organizer for the desktop"
-HOMEPAGE="https://hydrusnetwork.github.io/hydrus/ https://github.com/hydrusnetwork/hydrus"
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/hydrusnetwork/hydrus.git"
-else
-	SRC_URI="https://github.com/hydrusnetwork/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-	KEYWORDS="~amd64"
-fi
-
-# hydrus itself is WTFPL
-# icons included are CC-BY-2.5
-LICENSE="WTFPL-2 CC-BY-2.5"
-SLOT="0"
-IUSE="test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RESTRICT="!test? ( test )"
-
-# RDEPEND is sorted as such:
-# - No specific requirements
-# - Specific version or slot
-RDEPEND="
-	${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		dev-python/cbor2[${PYTHON_USEDEP}]
-		dev-python/chardet[${PYTHON_USEDEP}]
-		dev-python/cloudscraper[${PYTHON_USEDEP}]
-		dev-python/html5lib[${PYTHON_USEDEP}]
-		dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP},lcms]
-		dev-python/psutil[${PYTHON_USEDEP}]
-		dev-python/pyopenssl[${PYTHON_USEDEP}]
-		dev-python/pyside2[widgets,gui,${PYTHON_USEDEP}]
-		dev-python/python-mpv[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/send2trash[${PYTHON_USEDEP}]
-		dev-python/service_identity[${PYTHON_USEDEP}]
-		dev-python/six[${PYTHON_USEDEP}]
-		dev-python/twisted[${PYTHON_USEDEP}]
-		media-libs/opencv[python,png,jpeg,${PYTHON_USEDEP}]
-		media-video/ffmpeg
-
-		>=dev-python/QtPy-1.9.0-r4[pyside2,${PYTHON_USEDEP}]
-		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
-	')
-"
-BDEPEND="
-	${RDEPEND}
-	$(python_gen_cond_dep '
-		test? (
-			dev-python/httmock[${PYTHON_USEDEP}]
-			dev-python/mock[${PYTHON_USEDEP}]
-			dev-python/nose[${PYTHON_USEDEP}]
-		)
-	')
-"
-
-PATCHES=(
-	"${FILESDIR}/userpath-in-local-share.patch"
-)
-
-src_prepare() {
-	default
-
-	# Contains pre-built binaries for other systems and a broken swf renderer for linux
-	rm -r bin/ || die
-	# Build files used for CI, not actually needed
-	rm -r static/build_files || die
-	# Python requirements files, not needed
-	rm requirements_*.txt || die
-}
-
-src_compile() {
-	python_optimize "${S}"
-	docs_compile
-}
-
-src_test() {
-	# The tests use unittest, but are run with a custom runner script.
-	# QT_QPA_PLATFORM is required to make them run without X
-	local -x QT_QPA_PLATFORM=offscreen
-	"${EPYTHON}" "${S}/test.py" || die "Tests failed"
-}
-
-src_install() {
-	local doc="${EPREFIX}/usr/share/doc/${PF}"
-	elog "Hydrus includes an excellent manual, that can either be viewed at"
-	elog "${doc}/html/help/index.html"
-	elog "or accessed through the hydrus help menu."
-
-	mv "help my client will not boot.txt" "help_my_client_will_not_boot.txt" || die
-
-	local DOCS=(COPYING README.md help_my_client_will_not_boot.txt db/)
-	einstalldocs
-
-	# Files only needed for testing
-	rm test.py hydrus/hydrus_test.py || die
-	rm -r hydrus/test/ static/testing/ || die
-
-	# ${DOCS[@]} files are copied into doc
-	# ${S}/docs/ is the markdown source code for documentation
-	# .gitignore/.github files aren't needed for the program to work, same with mkdocs files
-	rm -r "${DOCS[@]}" "${S}/docs/" .gitignore .github/ mkdocs.yml mkdocs-gh-pages.yml || die
-	if use doc; then
-		# ${S}/_build = ${DOCS_OUTDIR}/.. , these have already been copied, remove before installation
-		rm -r "${S}/_build" || die
-		# The program expects to find documentation here, so add a symlink to doc
-		dosym "${doc}/html" /opt/hydrus/help
-	fi
-
-	insinto /opt/hydrus
-	doins -r "${S}"/.
-
-	exeinto /usr/bin
-	python_newexe - hydrus-server < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-server" || die)
-	python_newexe - hydrus-client < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-client" || die)
-
-	make_desktop_entry "hydrus-client" "Hydrus Client" "/opt/hydrus/static/hydrus_non-transparent.png" \
-					   "AudioVideo;FileTools;Graphics;Network;"
-}
-
-pkg_postinst() {
-	optfeature "automatic port forwarding support" "net-libs/miniupnpc"
-	optfeature "bandwidth charts support" "dev-python/pyside2[charts]"
-	optfeature "memory compression in the client" "dev-python/lz4"
-	optfeature "SOCKS proxy support" "dev-python/requests[socks5]" "dev-python/PySocks"
-}
diff --git a/media-gfx/hydrus/hydrus-505.ebuild b/media-gfx/hydrus/hydrus-510.ebuild
index ca93c8125f9a..063824a750b8 100644
--- a/media-gfx/hydrus/hydrus-505.ebuild
+++ b/media-gfx/hydrus/hydrus-510.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
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{8..10} )
 PYTHON_REQ_USE="sqlite"
 
 DOCS_BUILDER=mkdocs
-DOCS_DEPEND="dev-python/mkdocs-material"
+DOCS_DEPEND="dev-python/mkdocs-material dev-python/regex"
 
 inherit python-single-r1 desktop docs optfeature
 
@@ -70,7 +70,6 @@ BDEPEND="
 		test? (
 			dev-python/httmock[${PYTHON_USEDEP}]
 			dev-python/mock[${PYTHON_USEDEP}]
-			dev-python/nose[${PYTHON_USEDEP}]
 		)
 	')
 "
@@ -84,10 +83,12 @@ src_prepare() {
 
 	# Contains pre-built binaries for other systems and a broken swf renderer for linux
 	rm -r bin/ || die
-	# Build files used for CI, not actually needed
-	rm -r static/build_files || die
-	# Python requirements files, not needed
-	rm requirements_*.txt || die
+	# Build files used for CI and development, not actually needed
+	rm -r static/build_files static/requirements || die
+	# Python requirements file, not needed
+	rm requirements.txt || die
+	# Remove unneeded additional scripts
+	rm *.command *.sh *.bat || die
 }
 
 src_compile() {
diff --git a/media-gfx/hydrus/hydrus-496-r1.ebuild b/media-gfx/hydrus/hydrus-511.ebuild
index 1ecb76ea0b7b..063824a750b8 100644
--- a/media-gfx/hydrus/hydrus-496-r1.ebuild
+++ b/media-gfx/hydrus/hydrus-511.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 PYTHON_COMPAT=( python3_{8..10} )
 PYTHON_REQ_USE="sqlite"
 
 DOCS_BUILDER=mkdocs
-DOCS_DEPEND="dev-python/mkdocs-material"
+DOCS_DEPEND="dev-python/mkdocs-material dev-python/regex"
 
 inherit python-single-r1 desktop docs optfeature
 
@@ -58,6 +58,7 @@ RDEPEND="
 		dev-python/twisted[${PYTHON_USEDEP}]
 		media-libs/opencv[python,png,jpeg,${PYTHON_USEDEP}]
 		media-video/ffmpeg
+		media-video/mpv[libmpv,${PYTHON_USEDEP}]
 
 		>=dev-python/QtPy-1.9.0-r4[pyside2,${PYTHON_USEDEP}]
 		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
@@ -69,7 +70,6 @@ BDEPEND="
 		test? (
 			dev-python/httmock[${PYTHON_USEDEP}]
 			dev-python/mock[${PYTHON_USEDEP}]
-			dev-python/nose[${PYTHON_USEDEP}]
 		)
 	')
 "
@@ -83,10 +83,12 @@ src_prepare() {
 
 	# Contains pre-built binaries for other systems and a broken swf renderer for linux
 	rm -r bin/ || die
-	# Build files used for CI, not actually needed
-	rm -r static/build_files || die
-	# Python requirements files, not needed
-	rm requirements_*.txt || die
+	# Build files used for CI and development, not actually needed
+	rm -r static/build_files static/requirements || die
+	# Python requirements file, not needed
+	rm requirements.txt || die
+	# Remove unneeded additional scripts
+	rm *.command *.sh *.bat || die
 }
 
 src_compile() {
diff --git a/media-gfx/hydrus/hydrus-9999.ebuild b/media-gfx/hydrus/hydrus-9999.ebuild
index 1ecb76ea0b7b..063824a750b8 100644
--- a/media-gfx/hydrus/hydrus-9999.ebuild
+++ b/media-gfx/hydrus/hydrus-9999.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 PYTHON_COMPAT=( python3_{8..10} )
 PYTHON_REQ_USE="sqlite"
 
 DOCS_BUILDER=mkdocs
-DOCS_DEPEND="dev-python/mkdocs-material"
+DOCS_DEPEND="dev-python/mkdocs-material dev-python/regex"
 
 inherit python-single-r1 desktop docs optfeature
 
@@ -58,6 +58,7 @@ RDEPEND="
 		dev-python/twisted[${PYTHON_USEDEP}]
 		media-libs/opencv[python,png,jpeg,${PYTHON_USEDEP}]
 		media-video/ffmpeg
+		media-video/mpv[libmpv,${PYTHON_USEDEP}]
 
 		>=dev-python/QtPy-1.9.0-r4[pyside2,${PYTHON_USEDEP}]
 		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
@@ -69,7 +70,6 @@ BDEPEND="
 		test? (
 			dev-python/httmock[${PYTHON_USEDEP}]
 			dev-python/mock[${PYTHON_USEDEP}]
-			dev-python/nose[${PYTHON_USEDEP}]
 		)
 	')
 "
@@ -83,10 +83,12 @@ src_prepare() {
 
 	# Contains pre-built binaries for other systems and a broken swf renderer for linux
 	rm -r bin/ || die
-	# Build files used for CI, not actually needed
-	rm -r static/build_files || die
-	# Python requirements files, not needed
-	rm requirements_*.txt || die
+	# Build files used for CI and development, not actually needed
+	rm -r static/build_files static/requirements || die
+	# Python requirements file, not needed
+	rm requirements.txt || die
+	# Remove unneeded additional scripts
+	rm *.command *.sh *.bat || die
 }
 
 src_compile() {