gentoo auto-resync : 18:06:2023 - 19:48:47

3 files changed, 17 insertions, 11 deletions

diff --git a/media-gfx/hydrus/Manifest b/media-gfx/hydrus/Manifest
index 5d1892780930..1f2b918033dc 100644
--- a/media-gfx/hydrus/Manifest
+++ b/media-gfx/hydrus/Manifest
@@ -1,9 +1,9 @@
 AUX hydrus-client 105 BLAKE2B cb1c55f0831eda122eebb9363eab50180b8746038405ba514a6821c8e4e892e59f18b9b29b5f3117d62d758ad6e5d06fdacde7fe0d8ad59a8e674134c945c77d SHA512 56dc21cd54d0fbf95d1a127ac387d29ae99583210c97a1e77233e1bfc08fb631caf1ac3be1034c43e0485e4238ecc96009533d4079560807ff1126d37b75fe6f
 AUX hydrus-server 69 BLAKE2B 245851a0bfd7ed4e947d229cae980daaaf213e2ff4238b5bc6c75b12832f3fbf7c95d34d72f4fc7b6194ed06df8652e5042bc69ab40367d09c55796e9013392b SHA512 70fa7877b7d5efc7786926af6a02a468a0c8ebbb553a61bc7e049622ddf00b5ca67876af74e17d0d9408e5f950acf8aa0fc007baaf1a656d3fb5368fa15fcd22
 AUX userpath-in-local-share.patch 443 BLAKE2B 2562bdb6207a35a872a7c1b22ee378504ec4f53ee7b64bdce31649d62780cae00b42be7297aa82e069a9df5e01f76c508d97c47a25a9dffec8cbf8829e7ff674 SHA512 f96cf0040a663c534bd539e40413c95928ea45238f765f741db3c251b7c141fe99989b092d4033695a99e7267fec7fac74641fdc4a0887e74d23d3695f8ce467
-DIST hydrus-526.tar.gz 41182831 BLAKE2B cf41641625d6c8d64aeea78f56f643a39a6bf8030c919e0a83e5b7183ee7f5a03edef5574f67fb023c79e9e4d757e79f536d91d57ca8a097cc7c380075036c0b SHA512 ed8fff59563bbe8f8c3b235a188575be9d56aa5cf7e70cf340215a7af910247ba711061020f257dbdf1032b5d0ebd5e8995411f60ffe6b6ba9061d189b6274cd
 DIST hydrus-528.tar.gz 41492703 BLAKE2B 3e97e64a2bbdd513441c5ae34640779934057ec4bcea9ef806a3bbc053d5849af69eed79edca35b9b9f276bdc53c379c10a613b1efb7bb3e2e69dbcc4b210038 SHA512 b9c9069a92fd82c6c6137aeaf205c5cac2c34d31dce2174308c796e9289fc64b346eabb8ef55e2fef78ac0af73c1b8c14aa507f9d4508759e435ac7eb01400bb
-EBUILD hydrus-526.ebuild 4504 BLAKE2B 96d203c08c189d520f891332bce49ecd1aba1296e3ff073528fa1d322d6ab51ccdc9b83eacde3290e14247366b2668c7fd6ec1cc1da401c4f241c03412753ceb SHA512 58929367bdfd224ce1b68336afde1a4d7c7eab494a553c9126c502d090f90a21cab7b1be939735bcceae59c2ce4df2227fe0abbf45eb1655c20df79f2f83086d
+DIST hydrus-531.tar.gz 41507932 BLAKE2B 388bc87bedf46ce2e8b4a26bfe744a80382d2c87985950db4458834e4bb8acaa50d04c50d8321db6c35400079d88c6f8c62f68084f5b1d8503fa4c93e280b9bb SHA512 8083b37d7b99c9f5e2679d64e40bc90a2144878746454aea01d9548705c767889b3f895abde5d172a72e4edcaca1feca450ba2ed99389eecfc8467491dafac1c
 EBUILD hydrus-528.ebuild 4662 BLAKE2B e8ea3f9971318f96a1ea3ba789d12dbec7e882723c4afdf2e8d40aa0636ea885c0e4fb912e852567098db8a39aaa71d5a7bdbe8ab470552c638497482050ac20 SHA512 4d1f850cb07dbc045ed40941a57d930bacd0591e00c6ab228190436a99d892887409b0fa98ded6ca16ee1d0aa2581043b5e108ee628db294fe2c6b1c520b1e5f
-EBUILD hydrus-9999.ebuild 4504 BLAKE2B 96d203c08c189d520f891332bce49ecd1aba1296e3ff073528fa1d322d6ab51ccdc9b83eacde3290e14247366b2668c7fd6ec1cc1da401c4f241c03412753ceb SHA512 58929367bdfd224ce1b68336afde1a4d7c7eab494a553c9126c502d090f90a21cab7b1be939735bcceae59c2ce4df2227fe0abbf45eb1655c20df79f2f83086d
+EBUILD hydrus-531.ebuild 4662 BLAKE2B e8ea3f9971318f96a1ea3ba789d12dbec7e882723c4afdf2e8d40aa0636ea885c0e4fb912e852567098db8a39aaa71d5a7bdbe8ab470552c638497482050ac20 SHA512 4d1f850cb07dbc045ed40941a57d930bacd0591e00c6ab228190436a99d892887409b0fa98ded6ca16ee1d0aa2581043b5e108ee628db294fe2c6b1c520b1e5f
+EBUILD hydrus-9999.ebuild 4662 BLAKE2B e8ea3f9971318f96a1ea3ba789d12dbec7e882723c4afdf2e8d40aa0636ea885c0e4fb912e852567098db8a39aaa71d5a7bdbe8ab470552c638497482050ac20 SHA512 4d1f850cb07dbc045ed40941a57d930bacd0591e00c6ab228190436a99d892887409b0fa98ded6ca16ee1d0aa2581043b5e108ee628db294fe2c6b1c520b1e5f
 MISC metadata.xml 836 BLAKE2B 049faa70763ba176b6e4930abcdb5f4b4b87bd243759aba42dec32b9f2a199b3f2c33f0415ffdd1a392af3b461d939e633ec1f9333b0ff538f74d24306790fbe SHA512 0404c79e85e51eaba13fef930e695f168074e69734d3d8a604515f77196706bae9d36a2df9b3db0530c9f17b32881602509c7e22e7383c957a67e13c2a46e7bb
diff --git a/media-gfx/hydrus/hydrus-526.ebuild b/media-gfx/hydrus/hydrus-531.ebuild
index c78c948645a3..851d373d97a8 100644
--- a/media-gfx/hydrus/hydrus-526.ebuild
+++ b/media-gfx/hydrus/hydrus-531.ebuild
@@ -69,6 +69,8 @@ BDEPEND="
 		test? (
 			dev-python/httmock[${PYTHON_USEDEP}]
 			dev-python/mock[${PYTHON_USEDEP}]
+
+			dev-python/pyside2[widgets,gui,multimedia,${PYTHON_USEDEP}]
 		)
 	')
 "
@@ -82,8 +84,6 @@ 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 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
@@ -99,7 +99,7 @@ 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"
+	"${EPYTHON}" "${S}/hydrus_test.py" || die "Tests failed"
 }
 
 src_install() {
@@ -114,8 +114,11 @@ src_install() {
 	einstalldocs
 
 	# Files only needed for testing
-	rm test.py hydrus/hydrus_test.py || die
+	rm hydrus_test.py hydrus/hydrus_test_boot.py || die
 	rm -r hydrus/test/ static/testing/ || die
+	# Build files used for CI and development, not actually needed. Has to be deleted after src_compile.
+	# because it contains documentation
+	rm -r static/build_files static/requirements || die
 
 	# ${DOCS[@]} files are copied into doc
 	# ${S}/docs/ is the markdown source code for documentation
diff --git a/media-gfx/hydrus/hydrus-9999.ebuild b/media-gfx/hydrus/hydrus-9999.ebuild
index c78c948645a3..851d373d97a8 100644
--- a/media-gfx/hydrus/hydrus-9999.ebuild
+++ b/media-gfx/hydrus/hydrus-9999.ebuild
@@ -69,6 +69,8 @@ BDEPEND="
 		test? (
 			dev-python/httmock[${PYTHON_USEDEP}]
 			dev-python/mock[${PYTHON_USEDEP}]
+
+			dev-python/pyside2[widgets,gui,multimedia,${PYTHON_USEDEP}]
 		)
 	')
 "
@@ -82,8 +84,6 @@ 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 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
@@ -99,7 +99,7 @@ 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"
+	"${EPYTHON}" "${S}/hydrus_test.py" || die "Tests failed"
 }
 
 src_install() {
@@ -114,8 +114,11 @@ src_install() {
 	einstalldocs
 
 	# Files only needed for testing
-	rm test.py hydrus/hydrus_test.py || die
+	rm hydrus_test.py hydrus/hydrus_test_boot.py || die
 	rm -r hydrus/test/ static/testing/ || die
+	# Build files used for CI and development, not actually needed. Has to be deleted after src_compile.
+	# because it contains documentation
+	rm -r static/build_files static/requirements || die
 
 	# ${DOCS[@]} files are copied into doc
 	# ${S}/docs/ is the markdown source code for documentation