gentoo auto-resync : 03:06:2024 - 00:07:25

16 files changed, 255 insertions, 9 deletions

diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 3f43332c0b8a..5f368fefefcb 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest
index 30eec579c5e7..bbe9ace5e54d 100644
--- a/media-gfx/blender/Manifest
+++ b/media-gfx/blender/Manifest
@@ -17,6 +17,6 @@ EBUILD blender-3.3.15.ebuild 13709 BLAKE2B c560bc5268c459c98d9bae37e3b916666eb3a
 EBUILD blender-3.3.8.ebuild 13708 BLAKE2B 3822fcde22d31852e8b9539c6689fe93b56716e788839a0afa26b944e3a1599a995270ac4c600be792ba0c5f2a88616009bcc6f5c4ed6e7f1812df77488989d2 SHA512 16ad4f61a12b7c238fd6c2c8013b2db38d7dd6e1ab53e01425fb4e917910892bdbbb09febe185416eb4abc34136d214fc5acccec4f234914f44b5deb2a7ae8b4
 EBUILD blender-3.6.8.ebuild 14113 BLAKE2B a431187e9349f2bb9597fe7a2e315ad6cee581b01840a97b711ed0a9cc746532c75594e96ccc3e09c0409afb680a116589990af69e2b5cbfc1e37b1e5c522609 SHA512 cc8491e28fae32313ef14816025c909d35381d870e4c7b8c4379bd5ca8578f1690b34ee9f6074bc644aff2b065b77ca0be45adefc5a95cd1e2329470a05cee61
 EBUILD blender-4.0.2-r1.ebuild 17304 BLAKE2B 53711bb59d854ea714cbc3c9ae7571813312748ed32bde98dac27ae36166b508f3934414924c2a8f419c46fa0210debb517109c7c78eae0c85f6d01ecb1f9fb1 SHA512 07cccc5cabc1743aa1aa2d133adc623c0eef3869791de1e3e4296275350fe679239b0d5e84f098c42a2f19e7ce06019645bd55dae9ff4d436ea492a17e3bbe11
-EBUILD blender-4.1.1.ebuild 17156 BLAKE2B 878b641cf10d01d00e475c767fc39dce3007fb2163ca9bda89b0ac085a0f61d971c4fb6bba098a9ad745da4d3bfdbee42717ec19cb8c9e943ccac195fe306ae2 SHA512 7afebce103ca50c72e69772db3bf186c645e17562f3a69e2b8b1bbfc0154cf923dd418d02c84375f75fac4d795fb82bf16eb31ee25cc18dae6e37a782a784768
+EBUILD blender-4.1.1.ebuild 17155 BLAKE2B 71e8c2a4e31c2e133e0b320a27a4f408aec774728ee73d402324a590f95a72c657399811d1110f3128a6961a2d03aae097e5d58612ce1df771e3c9c828449b2d SHA512 55f50d28ed3ea76f6da145962caa8e19079ae0dea3bd3d8657e321d4c7ee752f948360f882ddcd490922dd23ac31e5005f9f7f4dfb2d0c73b52092c672972d2e
 EBUILD blender-9999.ebuild 17156 BLAKE2B 878b641cf10d01d00e475c767fc39dce3007fb2163ca9bda89b0ac085a0f61d971c4fb6bba098a9ad745da4d3bfdbee42717ec19cb8c9e943ccac195fe306ae2 SHA512 7afebce103ca50c72e69772db3bf186c645e17562f3a69e2b8b1bbfc0154cf923dd418d02c84375f75fac4d795fb82bf16eb31ee25cc18dae6e37a782a784768
 MISC metadata.xml 3679 BLAKE2B cca8c2f8568be6c83244cf5a90b2db0df11faffa4f55820692990e02ce0bfd84cf3e6c2fdb146af9e6c8e09d1c72fe297c73f126e04ad918e709dc9064908aca SHA512 ac8bdbc0e00442f56d9d077d7d8c97deba90121e7dd34aac9d51b7ae6348bbaa875d2fcd01fe20ff7e9b1c3bf332a5cde63fd0b406a1e29c3f4de323225a17a9
diff --git a/media-gfx/blender/blender-4.1.1.ebuild b/media-gfx/blender/blender-4.1.1.ebuild
index 94e2599fa018..654e53884672 100644
--- a/media-gfx/blender/blender-4.1.1.ebuild
+++ b/media-gfx/blender/blender-4.1.1.ebuild
@@ -27,7 +27,7 @@ else
 	# 		https://projects.blender.org/blender/blender-test-data/archive/blender-v$(ver_cut 1-2)-release.tar.gz
 	# 	)
 	# "
-	KEYWORDS="~amd64 ~arm ~arm64"
+	KEYWORDS="amd64 ~arm ~arm64"
 	RESTRICT="test" # the test archive returns LFS references.
 fi
 
diff --git a/media-gfx/fontforge/Manifest b/media-gfx/fontforge/Manifest
index 509d2108be13..a0189547a202 100644
--- a/media-gfx/fontforge/Manifest
+++ b/media-gfx/fontforge/Manifest
@@ -1,7 +1,8 @@
 AUX fontforge-20230101-fix-splinefont-shell-command-injection.patch 5688 BLAKE2B 9940dd5fd04cc61b87e2498064e9b5e70a9806b9a70a2d93a155d932f888e7bd7e7a11a5f44972feec41c6359e39fa4be982850db7fbceba095a6b35968d4d1a SHA512 1f90a8596c831008fd0a4accbd496455a7951c4ca706aebcfff8091148569680538897e02833bd6d5f92dc885921a92cee6b91f89c70543e0e4856767775ef45
+AUX fontforge-20230101-python3.12-distutils-no-more.patch 988 BLAKE2B ea666805ea0bf1a9fe5fa8cad3e76e8410933a5ce954cc09c7f923efebc78981e3cda61d55621680f1b3278b119050c32c33ea3a53dd118b6e507b60552cbada SHA512 f2656af8ca9280524beaa179e93ca40e230957490aab9dbb307a4bc1b924a2a404e4a03d847865584340801fa3b75d09cdb330ad6b5ac890c521511357e6bdc2
 AUX fontforge-20230101-workaround-broken-translations.patch 5219 BLAKE2B 17ead2e7c178911b48de35c6c86ce60b486a000c05ea5d11e79094851b9e4e68e32335a33ef2b49aeaf0fb161b3823e35f1b281feae426b9b69baabb35c5e02c SHA512 250850a8345511b222faeb7cf6209d412611491a5c9d83f7ad14408b1936059c4fe52cbe834b5d26579281539156b93e692bd8873aea445f23b5d78a0e1684f8
 AUX fontforge-doc-no-warn-error.patch 834 BLAKE2B c8bd1cfcf320b7831cc64d67d8de52b37e2f37bbac91d5df709d23e144ae33ec02907606348185eac7030f5151719e0023c0d9fda5395334a15c56f7174151c4 SHA512 6055f1696f1910e81ab1b84b48d336c1a097b53618a3a960e8ce2aeb57e05ad364848d48082b792cd4d5cc85fc95947cddd2e04e7a98c5ceb6f9ced14bd4e674
 DIST fontforge-20230101.tar.xz 13761728 BLAKE2B 69e79e7c5d8b551a847ba8706157b0f559ae2a85f61711f50e4855eb6a177bbfb25de2650caf9bc8a7dd1d6af074ca5063519b2f3c151d8c784c4750c6ddc1d8 SHA512 7684a2824d5199e230d2e0a654c2119cef422a57b64e6dd75afde6ba623abed6581f596fd5b7509e03f3b3ad3cf69629aafd4c85aeda64fa91a9e1ab88c9b418
-EBUILD fontforge-20230101-r1.ebuild 2960 BLAKE2B 5988bbdb0fa1bdd86808ddda887a707d9501581da7c5fa7e88f8b80bdd51217624194411ca2aa1a9b575a85a5a5ad2db116a283423257274319fc9b5097809f4 SHA512 afc00739a406af802cc5a813ff89fdd937b470f1dd1651bb203a5c5feda2d408d8e1cb3c821d3ab000984bb93a3da08e40c5cf15a7cfb9be731837188515459d
+EBUILD fontforge-20230101-r2.ebuild 3025 BLAKE2B c7aa395574cd03aa4e6545620de39482491971684a524061b3f231a2b3aa529c95b82cd4ff0d21050dcf2d1b439e2f18520c05f879a3384a511fc3d0a9757172 SHA512 1d992aa38c0aea9dd61219395889d817f41d2a8c836919d987cedf2dd9160518958942aa8d34fa2ed8d488423d32cd8686e7995ebeec909f2d3622affddc9ed0
 EBUILD fontforge-20230101.ebuild 2877 BLAKE2B 838d3272eaca260bd5728ecdb6a5f69c3ce5fdbb18432529ff2f536951265d646f7c7ca39bad7c5bb7ec57aaeb312492d7537013d466f263efcd2eedb235bdb3 SHA512 f75fd950ed8e356d09467a6b46980dfba2351239b111a8bf89d17d59167172c5ae3eb0f0254ec86831a4b90dbb9157dd4ef30a154f4b1158bb53e8ed7de2c0c9
 MISC metadata.xml 863 BLAKE2B 6a87762712128bf3d57122277839008c4ef057491ae1c1680a166194037ed00e66816f2c0c09be8a17909843ad49b807c06405b95332684dbee3b8d60d30d7ae SHA512 8f33c7d38f031fbf85c82b9743db80c2a3c85ddddeb4deb631fbb911a8e6c2e97b43560b82539ac93df0c577abe74ef743fd4ca1a3e2e2f978b7edfd94cba280
diff --git a/media-gfx/fontforge/files/fontforge-20230101-python3.12-distutils-no-more.patch b/media-gfx/fontforge/files/fontforge-20230101-python3.12-distutils-no-more.patch
new file mode 100644
index 000000000000..c140e7d19955
--- /dev/null
+++ b/media-gfx/fontforge/files/fontforge-20230101-python3.12-distutils-no-more.patch
@@ -0,0 +1,20 @@
+https://bugs.gentoo.org/933392
+https://github.com/fontforge/fontforge/pull/5423
+
+From 24968a8bf713396bc4a5dbb8bf3a03a9479b2568 Mon Sep 17 00:00:00 2001
+From: Maxim Iorsh <iorsh@users.sourceforge.net>
+Date: Fri, 24 May 2024 16:48:47 +0300
+Subject: [PATCH 1/3] Use sysconfig for Python module locations
+
+--- a/pyhook/CMakeLists.txt
++++ b/pyhook/CMakeLists.txt
+@@ -21,7 +21,7 @@ target_link_libraries(psMat_pyhook PRIVATE Python3::Module)
+ # So do it ourselves, getting the prefix-relative path instead
+ if(NOT DEFINED PYHOOK_INSTALL_DIR)
+   execute_process(
+-    COMMAND "${Python3_EXECUTABLE}" -c "import distutils.sysconfig as sc; print(sc.get_python_lib(prefix='', plat_specific=True,standard_lib=False))"
++    COMMAND "${Python3_EXECUTABLE}" -c "import sysconfig as sc; print(sc.get_path('platlib', sc.get_preferred_scheme('user'), vars={'userbase': '.'}))"
+     RESULT_VARIABLE _pyhook_install_dir_result
+     OUTPUT_VARIABLE PYHOOK_INSTALL_DIR
+     OUTPUT_STRIP_TRAILING_WHITESPACE)
+
diff --git a/media-gfx/fontforge/fontforge-20230101-r1.ebuild b/media-gfx/fontforge/fontforge-20230101-r2.ebuild
index 261c8f986c79..5a9b97e812ee 100644
--- a/media-gfx/fontforge/fontforge-20230101-r1.ebuild
+++ b/media-gfx/fontforge/fontforge-20230101-r2.ebuild
@@ -54,6 +54,7 @@ PATCHES=(
 	"${FILESDIR}"/fontforge-doc-no-warn-error.patch
 	"${FILESDIR}"/${PN}-20230101-workaround-broken-translations.patch
 	"${FILESDIR}"/${PN}-20230101-fix-splinefont-shell-command-injection.patch
+	"${FILESDIR}"/${PN}-20230101-python3.12-distutils-no-more.patch
 )
 
 pkg_setup() {
diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest
index 1ef14746904a..bfc4f5c3f78b 100644
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -11,5 +11,5 @@ EBUILD gimp-2.10.34-r2.ebuild 5882 BLAKE2B 67a9b4c0707f3027f34ba6276b8ac6fd2709e
 EBUILD gimp-2.10.36-r2.ebuild 6001 BLAKE2B e2b78361ae0d4703479e8b9c1a62e99f7099b80a9267ad6b056a15f30a0bba79da7b697af38d76e736ecc01aca6b0a331b90fc7f20060e6872c1854ac56d9ec1 SHA512 cdc970e8766da37a2103010214313a6dd54ce1acfb9bc390aad47474914801884dbff8900ae62107d1c1780a9ccae3803abea10a72827816dff9b72572aab97d
 EBUILD gimp-2.10.36.ebuild 5854 BLAKE2B 811d0ea7218ec368006864732bf94c6f07c7cdb2eeffc1df5deda811bc8cecd76ffa4f17230dd91313fe59ae803a35dc20c6be7e53e2b2143db24ba7dbf57dc8 SHA512 8ad6430138b98b4d384f3657f45733a5e1bd59db25b9619a4593d51af35bcd7b5cfbbe54587cb4f72b54fa1dfeac32a31d4727d0ddb666154810261806188040
 EBUILD gimp-2.99.18.ebuild 7178 BLAKE2B 513d508da711c4c2b57b1df77865a0cbf93a2090fb2669ad6f58cb550fa941445510ccf3592652b025f1ca246162ba3a2a677b8175561067a5a699cfae0b9705 SHA512 58c3695b76c50ab18ae63c35cff5b8f9f13c660b56c3359d064a247a5ea53252b0067a37e6641643c5996232e3b94071ca13772331fe528daaafe2e509c70fc4
-EBUILD gimp-9999.ebuild 7112 BLAKE2B ed4cd65d3e82d45cd102b032dd65d747284cf3140fbc714a87992bffa4eac698f064cd77c56ac8dc4451481beeead8b04e9977fd2ca5c2f5182af03228502f2b SHA512 e1ad4a4d97b17742a27d36b20368e33e9e3e78445ea464a0451e312db495fc79c0d588206f2d096086c178db310e9a7bcd95d1df353b17a0e9c0e97b52f7ed91
+EBUILD gimp-9999.ebuild 7111 BLAKE2B 726d3e15b968938fa2fcbc66775d58c46329cf679b08b36e507c3c26524aba189c8719c78f085b4ff8d574258579ae3e9bd537296f93e7cf0724cadd378230b9 SHA512 170c006ef43c1093f705cf530a21441e8afdbeb7d454c3e9ab0eddd504e2dccdcca24707829b523f0e2eb4025f808cd00d848738b2c26d51f6205ea82f76da6c
 MISC metadata.xml 579 BLAKE2B 7766f3da8488794ee014731965efd289e9e95d07631cd7f08ce9469fb33ed1ada31b646f337afcbb3a540d4de83fa5764fc2aa18c4b132341520d4717c7b251d SHA512 9bf1c5c4442af756e6ce40a7399f096ed1732c095eafdb4ff580e4122154e2549d9e8c36a7cc0391f0bd49c07422c5c59123278d62645330aeefdc9130aef182
diff --git a/media-gfx/gimp/gimp-9999.ebuild b/media-gfx/gimp/gimp-9999.ebuild
index 6ed419a59545..122443176973 100644
--- a/media-gfx/gimp/gimp-9999.ebuild
+++ b/media-gfx/gimp/gimp-9999.ebuild
@@ -208,7 +208,7 @@ _rename_plugins() {
 	einfo 'Renaming plug-ins to not collide with pre-2.10.6 file layout (bug #664938)...'
 	local prename=gimp-org-
 	(
-		cd "${ED}"/usr/$(get_libdir)/gimp/2.99/plug-ins || exit 1
+		cd "${ED}"/usr/$(get_libdir)/gimp/3.0/plug-ins || exit 1
 		for plugin_slash in $(ls -d1 */); do
 			plugin=${plugin_slash%/}
 			if [[ -f ${plugin}/${plugin} ]]; then
diff --git a/media-gfx/gscan2pdf/Manifest b/media-gfx/gscan2pdf/Manifest
index 42cf1e9a0a32..bde85c73d158 100644
--- a/media-gfx/gscan2pdf/Manifest
+++ b/media-gfx/gscan2pdf/Manifest
@@ -3,6 +3,6 @@ AUX gscan2pdf-2.13.2-t1161.patch 512 BLAKE2B b74f51a2cc70c19ef9b242b02540fff6309
 AUX gscan2pdf-2.13.2-t131.patch 473 BLAKE2B 23ec073509f9b252494e677a7f90f1eb41077a7e63641b1f6a6cb06d9a1329a3b5c96189c92a78b11b515c091b8df16173a40ced65d8f563e87b7d83410c31dd SHA512 ceffdfd0e478047d5da7044e160b8feadda9a0fa09ac99c609a118b84ac45ed10cd386f04c499c832566d8626e5abee4ce5d819a9e51733eb7dc822fa162f32d
 AUX gscan2pdf-2.13.2-tiff2ps.patch 1490 BLAKE2B c8b85f7a21e3e03cc1621d0f65af9f6ab03e89e72ef3839dc6f585cd8d0e6cc2d10c49ff119b671bc9f6fc99cf03c6a0117402acc38e624d46fd89cd02a75058 SHA512 b6357c1ea6d6dc958b7044be062bdb9445667da3d2ff9017bbdd3b041daafa89e742d8c1c9c919d3b8b5c4ab35840db1d24ec27a573a1e75b544c0dfce40bd9b
 DIST gscan2pdf-2.13.2.tar.xz 507244 BLAKE2B 66ac15ddcf74ed2b04f231e24a663afa7494bd5df04ecb190b68b9822382e01953d97949174f3d6280fabc9d0a2ea1cc270c0aa333cf9992cfa2f58f645df156 SHA512 882b707b11df26310136ed72428eab6ec8e2c6cf34686675eee3b14181622f85d21be0e05cab411961f2a2441ad948e7b56c7fe24eecb558eae7a7ac6b4db9d1
-EBUILD gscan2pdf-2.13.2-r1.ebuild 3534 BLAKE2B 1701f2dc7dd1564fd0c9791c56e14f2f6fd2a4d9db2074e81930ed63543c9b39332352d82d9c24090a73de52d3a9a2ae018b60d98f1c7d25a2495f42e5693acb SHA512 91076ffc00738240a6a7b59e1a9ba5a63b657c53d9d759ed0465e14ec990d32fc125cc0d1f58f46a3831ae95da45bb2e925ea8ee88a46aa50cbda95dbd3f0d06
+EBUILD gscan2pdf-2.13.2-r1.ebuild 3537 BLAKE2B 83a366fcdd9c4a8b4e40476f1fcd86df21e6e81f98f7af7a27eb49d0035e5454c404cc3207a75fce3a00f982e8c6451db9b9692deb7a8a5179dd1a5b446d2360 SHA512 455e2f6b8b2b7836571ae16a34b42e95d4df0da3345dc74f04afb0ee0d1664a0bade1d06a4001769ebbb3be24792cdff5cdd4213ae67f474a898b0596ba330c5
 EBUILD gscan2pdf-2.13.2.ebuild 3024 BLAKE2B ea848a2d53e265954eecd3df6e878c2669e65a8cbda53cd0526f84885c46bd1dcbb37fc0a99585293e6ebb75a4bfe6b37c62883131560ef2a5d446c390548fc8 SHA512 82d9fef80776516ac278b4636d16af52629f6904999370defe3dea7e23e8383ef04740218d0b4505d41e1e977caf9bf55741cb4320c9732e13ee927c7f38a59f
 MISC metadata.xml 470 BLAKE2B d9a9ad2f443b0bca02e6b8e91c96f22430543ee82fe8a1174739d4ad59225f73b975d31316fecd4dde6f26002ef6ba9fd39bf5d4adfd2bc82540d14e90d623a6 SHA512 ecd2fe9215c3a65760b8c101989772a73a7e9975dc38a1b11b0334cf6e1d001ccebfca1bc6d7631eb3b3e3e03d1736205563b0c836a2aea026fdfe552d72cbe0
diff --git a/media-gfx/gscan2pdf/gscan2pdf-2.13.2-r1.ebuild b/media-gfx/gscan2pdf/gscan2pdf-2.13.2-r1.ebuild
index 656fdc789c77..c62432895cb6 100644
--- a/media-gfx/gscan2pdf/gscan2pdf-2.13.2-r1.ebuild
+++ b/media-gfx/gscan2pdf/gscan2pdf-2.13.2-r1.ebuild
@@ -58,7 +58,7 @@ BDEPEND="
 
 		app-text/djvu[jpeg,tiff]
 		app-text/poppler[utils]
-		app-text/tesseract[-opencl,osd(+),png,tiff]
+		app-text/tesseract[-opencl(-),osd(+),png,tiff]
 		app-text/unpaper
 		media-gfx/imagemagick[djvu,jpeg,png,tiff,perl,postscript,truetype]
 		media-gfx/sane-backends[sane_backends_test]
diff --git a/media-gfx/hydrus/Manifest b/media-gfx/hydrus/Manifest
index cfc7a27cb653..202605d76f32 100644
--- a/media-gfx/hydrus/Manifest
+++ b/media-gfx/hydrus/Manifest
@@ -3,7 +3,9 @@ AUX hydrus-server 69 BLAKE2B 245851a0bfd7ed4e947d229cae980daaaf213e2ff4238b5bc6c
 AUX userpath-in-local-share.patch 492 BLAKE2B b6de719f01072ccbb055fb9fb10980bf2f36972c2b998b23c90001e33d2b103d3d55f288a08db8bbb9b2e743bafab4c9ed304f94d1abd6869fbc39dd226f8673 SHA512 0811d610c29ecae4cdecf6d8f01950738f02cdebee84223c884ba708347c91692b13bff00eaa835790df6bf9d0db79c3a78c1abee9adf6a4e57903cc18cc2587
 DIST hydrus-3500-mpeg-error.patch 1632 BLAKE2B 9cc969a3a2d476ea606f3f280ecd6e4cc7f628420586e651377945d370a6c50464b118da1c96a577bc55b13bbac946801b9cff251922299f91e4a76dabf7edf9 SHA512 8769d63c7b2a345e1a7bfa0dae200bca03b991ef6a217150e3f50c95f3d1235305242348aa8fabf1183fc3d787498bbead8a96145e4cdd2251f67032469f095c
 DIST hydrus-565.tar.gz 46360280 BLAKE2B 7a9492db917b7f7d10fd92c668dff2206111b5734a707ea86e8d3f5c95359126da31e3bd6fdcea64c621527f5a30e608fdf8cd36b7b7b70185a37c3cc7483180 SHA512 442dde4c9e557c162b8a5cc23f22472d8c48d7717513a192875b413a59000897c05b2b050c16ad480cdbb18548485f51b5e8651e44cb2057fc8e6eb1b99e8f26
+DIST hydrus-571.tar.gz 46371027 BLAKE2B b0ca6a4d7fddb79808340c03d6ba6291021af752be95144b8475a12450394f21e76c5fd80a2f6094f21d6f4af25db22f5f8d2eb79fd3494be609d6bdcdb455cb SHA512 3d6b6dec777332128858fcd62f52026fd7a4ab831f7cc0b3a3af76d52b6c6d1ff7b9687554aa5569988386e1eb0b33111172029e25f0acb9f36bb1cd70fcccbc
 DIST hydrus-test-fixes.patch 820 BLAKE2B 9d912868142cd3e7763241652e81172236094de6d0cf4df888d7203d34ed37b469c4829401a6e3bda945e3683db9f8e577ef21040cb5d57b0e6c01c2c619655b SHA512 a6a322a77638122fdd1f74ca57c23360aa8d58d97877e9517db9d185c11a8187e807b9478533a97a4654d58342b0541cc7eb89b83075bc4c38ceda0effe06ce0
-EBUILD hydrus-565.ebuild 5016 BLAKE2B d5291a005bad4893070b983c56b4fdc5de7e49224da928caf769ba01dc7fe4159641c14c1e29e8ce6fc74562ccfa92bd8215c4d912bd30d67c7213c3486d93ac SHA512 7ea6495c21d3e98733db00a6174b2f2ef51c0da8ba37cf01ccb4b2076761c582f9e3925e1ffd3cb76d925522b7e39430585224e979bfaf1ca9105ae50c328bd6
+EBUILD hydrus-565-r1.ebuild 5014 BLAKE2B a11c28e40bc5d50d81c3540b5b9837b734d3b9c51a7b267b49c89ca8f6933f0dc0949478cdad4446748d06c37d9401d35b88b8815ef4149c9a1f76bbf9e5eb63 SHA512 ef1d178be78e508ec0ed7b8fabdf7d11d21973711b5335fa790f65e39a04c3242c59bf6f9b31fe4909583967171f3bd89e76d8a72b8926323f2c7ff52926e1bc
+EBUILD hydrus-571.ebuild 5014 BLAKE2B a11c28e40bc5d50d81c3540b5b9837b734d3b9c51a7b267b49c89ca8f6933f0dc0949478cdad4446748d06c37d9401d35b88b8815ef4149c9a1f76bbf9e5eb63 SHA512 ef1d178be78e508ec0ed7b8fabdf7d11d21973711b5335fa790f65e39a04c3242c59bf6f9b31fe4909583967171f3bd89e76d8a72b8926323f2c7ff52926e1bc
 EBUILD hydrus-9999.ebuild 4694 BLAKE2B 991178a1b0492857c85fecc15e840887a63c33f1b9ed6cd8f5b7c3bdf27dbf1b6a5b8e09af0a4f9541dda9ee9dadb26d5f1b8ec4e7d77d0b8a2a5c3c24354e0a SHA512 37d888d5423c395fb77652275e44a952bd22f6b36e44aea612a2ed7d373eb925e0a3d8a9376ba2978e0468def104b6c8465cdbcc2f8ba6acf758b40e449bfaae
 MISC metadata.xml 836 BLAKE2B 049faa70763ba176b6e4930abcdb5f4b4b87bd243759aba42dec32b9f2a199b3f2c33f0415ffdd1a392af3b461d939e633ec1f9333b0ff538f74d24306790fbe SHA512 0404c79e85e51eaba13fef930e695f168074e69734d3d8a604515f77196706bae9d36a2df9b3db0530c9f17b32881602509c7e22e7383c957a67e13c2a46e7bb
diff --git a/media-gfx/hydrus/hydrus-565.ebuild b/media-gfx/hydrus/hydrus-565-r1.ebuild
index 1fd94b6ee116..07124a7dd9f9 100644
--- a/media-gfx/hydrus/hydrus-565.ebuild
+++ b/media-gfx/hydrus/hydrus-565-r1.ebuild
@@ -62,7 +62,7 @@ RDEPEND="
 		dev-python/twisted[${PYTHON_USEDEP}]
 
 		dev-python/QtPy[widgets,gui,svg,multimedia,${PYTHON_USEDEP}]
-		|| ( dev-python/QtPy[pyside2] dev-python/QtPy[pyside6] )
+		|| ( dev-python/QtPy[pyside2] dev-python/QtPy[pyqt6] )
 
 		media-libs/opencv[python,png,jpeg,${PYTHON_USEDEP}]
 		media-video/ffmpeg
diff --git a/media-gfx/hydrus/hydrus-571.ebuild b/media-gfx/hydrus/hydrus-571.ebuild
new file mode 100644
index 000000000000..07124a7dd9f9
--- /dev/null
+++ b/media-gfx/hydrus/hydrus-571.ebuild
@@ -0,0 +1,155 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_REQ_USE="sqlite"
+
+DOCS_BUILDER=mkdocs
+DOCS_DEPEND="dev-python/mkdocs-material dev-python/regex"
+
+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
+		https://github.com/vaartis/hydrus/commit/5d2505a1eb4721f7750861f7622c46adec31db8b.diff -> hydrus-3500-mpeg-error.patch
+		https://github.com/vaartis/hydrus/commit/dc20196f47ac29568a40cd04a45cf4fc5f237603.diff -> hydrus-test-fixes.patch
+"
+
+	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:
+# Python libraries with no specific requirements
+# Python libraries with specific version, slot, or use requirements
+# Non-python dependencies
+RDEPEND="
+	${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
+		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/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/twisted[${PYTHON_USEDEP}]
+
+		dev-python/QtPy[widgets,gui,svg,multimedia,${PYTHON_USEDEP}]
+		|| ( dev-python/QtPy[pyside2] dev-python/QtPy[pyqt6] )
+
+		media-libs/opencv[python,png,jpeg,${PYTHON_USEDEP}]
+		media-video/ffmpeg
+	')
+"
+BDEPEND="
+	${RDEPEND}
+	$(python_gen_cond_dep '
+		test? (
+			dev-python/httmock[${PYTHON_USEDEP}]
+			dev-python/mock[${PYTHON_USEDEP}]
+		)
+	')
+"
+
+PATCHES=(
+	"${FILESDIR}/userpath-in-local-share.patch"
+	"${DISTDIR}/hydrus-3500-mpeg-error.patch"
+	"${DISTDIR}/hydrus-test-fixes.patch"
+)
+
+src_prepare() {
+	default
+
+	# Contains pre-built binaries for other systems and a broken swf renderer for linux
+	rm -r bin/ || die
+	# Python requirements file, not needed
+	rm requirements.txt || die
+	# Remove unneeded additional scripts
+	rm *.command *.sh *.bat || 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}/hydrus_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 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
+	# .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 "memory compression in the client" "dev-python/lz4"
+	optfeature "SOCKS proxy support" "dev-python/requests[socks5]" "dev-python/PySocks"
+	optfeature "bandwidth charts support" "dev-python/pyside2[charts]" "dev-python/pyside6[charts]"
+}
diff --git a/media-gfx/pngnq/Manifest b/media-gfx/pngnq/Manifest
index ea576318a90c..a3940e89e2f6 100644
--- a/media-gfx/pngnq/Manifest
+++ b/media-gfx/pngnq/Manifest
@@ -2,6 +2,8 @@ AUX pngnq-1.0-Wimplicit-function-declaration.patch 184 BLAKE2B 61f77336540a5e5c4
 AUX pngnq-1.0-libpng14.patch 382 BLAKE2B e85fbdccf1765efff65b638dccab6d3e5afa83aa6782f8be8188414985e18000bb68273e2250d2063eac56bca4f1e0481dadf747fc05e94f1d340eb21cdfdc59 SHA512 4194becadf43c3e8c1d63a15e3de1118c386dab4e4e7e6e5622dbc896d3c1cab5ffaac6f6f8c7a504fdf303bb6c0fad44351e7d89b304cd3c4d15908e347fe4f
 AUX pngnq-1.0-libpng15.patch 359 BLAKE2B f031f310aed6a30ed48e8e0754f3e392ccbc2fe9a929443885f3e2f040fb081f5122d6e1c9b89e63bdc0594051faebdcf53e5085a01b1520f256e60d1e06e9b6 SHA512 e2542833a6950b8e8ab09a9973a0df237d5667ce9d75b2e909485398d38517bd7d7d0237d8b1c3875c4538a6157219870cf6c7e29a98e6a1dbb93d11476d1059
 AUX pngnq-1.1-autoconf-quoting.patch 299 BLAKE2B 454f2c28a31220307b0e1290030f9b28b8864349d6486039bf796e7f896085d1ce24f0ab1e2d972adb2147bde80f94d7996e899b9e16f19482f0b8311acdd745 SHA512 4fedd87a24e8024489b39ecce94ec7425fea7100c57e258c0bc3dc7440baed3db21bbbe2633e070db1716f9e59875daf3ed4279619513e5c7b69fa1d100821e1
+AUX pngnq-1.1-gcc14-build-fix.patch 1426 BLAKE2B 5a9ff973fbbe26fe7542a016274022fd934fde18b4f582d1de459631c52f4ccccd37088a30546d44665652103d881dd723f7e779c78258bb345013319ee9c7b5 SHA512 b2ca1fdc359a38d9fa73cb7c583f89e9c92e3e6cacf8090d6c523d46fb46513eab74d3cb00663979f86627eac1ff29c3276802440a94b591152748a3a99f16b2
 DIST pngnq-1.1.tar.gz 117372 BLAKE2B 94c670342d514c577c386b8fe207307f057e5c0c3816b35ab2b625258051269410b9c5ad45f89c047715bb1ad927909498a6faef5591eb61039fd68c94fc44a6 SHA512 3bbc4ace1375517a7a73bbc65ff39512ef316e4b67fc3941cd0b7269e584a26f915f30591f8aa1c44eea73fe4ebe9519063a7bc426841e412c648aaa188be234
 EBUILD pngnq-1.1-r1.ebuild 687 BLAKE2B 17bf9d6e665e0b84ecb063c7c2e32093242186f82420411c5de14b9fbf44117b5e9cc60695261a15c3da42a7a834ea25adaf61447c7a6140ae478a044a7fee60 SHA512 b61ea24e468b9a19c0bca38823a18a3b537241984813cc022d1387bc1f11dbaf80c5efa03724c571270a3075787e7f407c43d1ae154c125485c970bfd464f4ff
+EBUILD pngnq-1.1-r2.ebuild 737 BLAKE2B c903c56ce977c118203d0520e12afa07132cd9da739e1ee672aa1ecd8bb8e5f9b9ee11add6e7b627ee5e5ee6a0066bf7b9310a704af3971882960793fbfe0836 SHA512 f172fcdf9f15a984a8ff93b94b60a7a32af4f866ac53c745df10b6afbd7a97fbb77d6fb1d45bdb108ecb92b073a07e14664f87b5ed1c20e6d7bec212dd0105d4
 MISC metadata.xml 243 BLAKE2B bc28a5bf618a465e4fe0f7eb0ce8eca6f60cdfa875d7c9d96aea4071a84f17b5a3f7ce20adace95946e312fd8db0583dc2b83a81ec47184f03d6851f05620b49 SHA512 91ef91f45537a1a41d6df99d077d886c517583c7d23c48558d04308f05d9f8c13ee57709c93c4b0852f15b339e75e2b27ff0ddf12b20dec07c4e944679e555e2
diff --git a/media-gfx/pngnq/files/pngnq-1.1-gcc14-build-fix.patch b/media-gfx/pngnq/files/pngnq-1.1-gcc14-build-fix.patch
new file mode 100644
index 000000000000..aa8c1a624cdd
--- /dev/null
+++ b/media-gfx/pngnq/files/pngnq-1.1-gcc14-build-fix.patch
@@ -0,0 +1,34 @@
+Bug: https://bugs.gentoo.org/919210
+Reported upstream: https://sourceforge.net/p/pngnq/patches/7/
+--- a/src/pngcomp.c
++++ b/src/pngcomp.c
+@@ -503,7 +503,7 @@ void printstats(struct statistics* stats, struct blockstats* bstats){
+   printf("Mean pixel color error: %f \n",stats->mean_error);
+   printf("Maximum pixel color error: %f \n",stats->max_error);
+   printf("Standard Deviation of error: %f\n",stats->stddev_error);
+-  printf("Image Dimensions %ld x %ld \n",image1_info.width,image1_info.height);
++  printf("Image Dimensions %lld x %lld \n", (long long int)image1_info.width, (long long int)image1_info.height);
+   printf("Number of pixels: %ld \n",stats->n_pixels);
+   printf("Number of exact pixels: %ld\n",stats->correct_pixels);
+   printf("Percentage correct pixels: %f\n",(float)stats->correct_pixels/(float)stats->n_pixels*100.0);
+--- a/src/rwpng.h
++++ b/src/rwpng.h
+@@ -29,6 +29,7 @@
+ 
+   ---------------------------------------------------------------------------*/
+ 
++#include "pngconf.h"
+ #ifndef TRUE
+ #  define TRUE 1
+ #  define FALSE 0
+@@ -65,8 +66,8 @@ typedef struct _rwpng_color_struct {
+ 
+ typedef struct _mainprog_info {
+     double gamma;
+-    ulg width;			/* read/write */
+-    ulg height;			/* read/write */
++    png_uint_32 width;	/* read/write */
++    png_uint_32 height;	/* read/write */
+     ulg rowbytes;		/* read */
+     void *png_ptr;		/* read/write */
+     void *info_ptr;		/* read/write */
diff --git a/media-gfx/pngnq/pngnq-1.1-r2.ebuild b/media-gfx/pngnq/pngnq-1.1-r2.ebuild
new file mode 100644
index 000000000000..cdfa4f9281af
--- /dev/null
+++ b/media-gfx/pngnq/pngnq-1.1-r2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="Pngnq is a tool for quantizing PNG images in RGBA format"
+HOMEPAGE="https://pngnq.sourceforge.net/"
+SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz"
+
+LICENSE="BSD pngnq rwpng"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="media-libs/libpng:0="
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.0-libpng14.patch
+	"${FILESDIR}"/${PN}-1.0-libpng15.patch
+	"${FILESDIR}"/${PN}-1.0-Wimplicit-function-declaration.patch
+	"${FILESDIR}"/${PN}-1.1-autoconf-quoting.patch
+	"${FILESDIR}"/${PN}-1.1-gcc14-build-fix.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}