gentoo auto-resync : 29:07:2022 - 09:06:52

16 files changed, 60 insertions, 90 deletions

diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 06679ba1e826..0af4e81ef67f 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/cairosvg/Manifest b/media-gfx/cairosvg/Manifest
index 8b6c83176ad4..128e6490a065 100644
--- a/media-gfx/cairosvg/Manifest
+++ b/media-gfx/cairosvg/Manifest
@@ -1,4 +1,4 @@
 AUX cairosvg-2.5.1-no-ref.patch 923 BLAKE2B 4a14bdd5f19f9abbb9415c19cb15aecc6dee8bf34feef0cb551f4185c16e4a93ac29d6e46f81dab03f479b2e982c9d0a85a622c1292cfe6d52c6acc1c896aa7f SHA512 f1a45ba47fc3f1f4b91799d6d45b2388a2ac6b0be08695f2507b4bf34818b6a7e8c23cbfbb270c3d603d81acbe3c9bc0a867e5864b684f67540b449d684e6f0e
 DIST CairoSVG-2.5.2.tar.gz 8397659 BLAKE2B f2f45aa01015f5ccebe3dede303b6a701c0183b7b53f0d69c8756d5f0e6c0898826939f0b5bcc9e00e4185c83ff507d6fa886a020ad0b63c80a565a181807f58 SHA512 070fbb549614401a7d8290497b0eb7702330ee264c5f625cd1e7aac4aea7d71ee7d2d8899297212e1a3c11c93903b191c0c699336d9000796318b11f4e075576
 EBUILD cairosvg-2.5.2.ebuild 1071 BLAKE2B b011e6c9dd76c3c705ff285fa038a2dcf8419a7c076da8e75c364253d6acb5bf9197211cfce1a5617cc1f6874e9574f39729bcce798d15a03f1020ecd5b6b890 SHA512 3bf7d1e24307953c24f8b134ffc02ac8b204fcfd1d43c7561f96baceb743a8b9976a4835e578641fe095a5877e923a96b3387563cd7d28cffca3f3cd38c02c3e
-MISC metadata.xml 354 BLAKE2B 01ecfbcda4662e6db257770b23748d81858cd91ac18524bbbc1b5758f6cc5733b9c93abc8ba2435b3e3c3e3d8be92d374699980b8fa89a76a44b1abb56d931db SHA512 74a398d386aa1bb1638005ef44fef0a99e4fcdde38a0efa95f94c9a52a76357262e50221afe7b9e2b05f0e7fed22c0a3823701957b741527dc0bbaf47e718a20
+MISC metadata.xml 410 BLAKE2B f7c96b4115d2f5493a3820b25cf493eed52a45df1c36c45bd84684424678555e141f7438903b3e1fd87ad29006533e280d085e7f8b4d314a8a1e535c719e67ed SHA512 3aadc33cf29d2605234752d0dae2110d3ea496258be5b90b6e2ca867caef5d6b93b5239c9afca2ccb8f68a59869369ffdae0c364380a0473eff0b5de53ba4ac0
diff --git a/media-gfx/cairosvg/metadata.xml b/media-gfx/cairosvg/metadata.xml
index f177f78171ec..65dc4666d904 100644
--- a/media-gfx/cairosvg/metadata.xml
+++ b/media-gfx/cairosvg/metadata.xml
@@ -7,6 +7,7 @@
   </maintainer>
   <stabilize-allarches/>
   <upstream>
+    <remote-id type="github">Kozea/CairoSVG</remote-id>
     <remote-id type="pypi">CairoSVG</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/media-gfx/exiv2/Manifest b/media-gfx/exiv2/Manifest
index 0f2fbe7aa23b..2997620e3ec4 100644
--- a/media-gfx/exiv2/Manifest
+++ b/media-gfx/exiv2/Manifest
@@ -1,3 +1,3 @@
 DIST exiv2-0.27.5-Source.tar.gz 32720608 BLAKE2B 803cb853fd049b28d309952c2332589a8544ff90c16fc1a588b6f1a2d4ae5e96da7ae746cf2247954ac54e155b84e0ad1f4f2d89f22d07e7bbd34038f0e292a5 SHA512 0f2d2dfbc976052a428dfeb597225d3ea3c725f584d05b99316bd4aa9cbf0ba5e1e37bcde71f9041975cf003b4fdb578c559adb144268d784bfd64494f451491
-EBUILD exiv2-0.27.5-r1.ebuild 2800 BLAKE2B 631a024e8bde65a10d4a122feb8e7219d7a426b03edf1f8f7dc5459d2e01f525cf9ea23318592a945e6f2f3d680f3c8ebd879994e2b05d4fc4aac5b3ff7804ca SHA512 10ec51a45485672b6226d36ab7d7f849775c3f2cb8d42939d64adc6d74e224ca6616c3dcc98000122610dc63995d8119d91efa4591968a18c5d64325c7216842
-MISC metadata.xml 555 BLAKE2B 307d753da1e5a2f09b4d95de756ad3f4ef905a1c2f9b2d7dc1cbc5e0e93718bb376dcbbd7f3abcee20697dce519ab795af7b71f8826ad7d55fa1cd13546dfbbc SHA512 4c504152172835df649036f2aa6f80a7ac12e2c034bc44e762c43bc39a72729e8c7a227ca59066c9b3ec3911b1c8f2a3633449cd611911f8f33a6c07f0a3420d
+EBUILD exiv2-0.27.5-r1.ebuild 2796 BLAKE2B 722afd20b40d471d6c6f1dc0aa03c3de942892b0c237c30b5dac45a08d346b2954cb2eda480feb712a806b6cb2ddd8d9217e01ea6b57a11f84bd302190d63970 SHA512 a70c68d01ac5a961746bcda28b235e400227a39bc051a7563a314d5f6437a653e04e83845e5b2605fe9c0e2303c910247147515eb39ce6252898699652378045
+MISC metadata.xml 631 BLAKE2B f56eead7809df86d63d30f14af67d4af80f04d012d275e387b10daf9736caa6e9d234576a05c8867cfdb6f8bf598f06615d7f4e618d4809978e1a0cd71d29500 SHA512 7bde3126869346c08d949cee95fd61a1a5d5c77081260b102c84e4e1918596bc17b47433fe5a351e28a560efbad0bab0d6813b5b8aad353bfc2bad8b14ed2d33
diff --git a/media-gfx/exiv2/exiv2-0.27.5-r1.ebuild b/media-gfx/exiv2/exiv2-0.27.5-r1.ebuild
index 754fb2a9597e..8655bd0c7eac 100644
--- a/media-gfx/exiv2/exiv2-0.27.5-r1.ebuild
+++ b/media-gfx/exiv2/exiv2-0.27.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,7 +17,7 @@ PYTHON_COMPAT=( python3_{8..10} )
 inherit cmake-multilib python-any-r1
 
 DESCRIPTION="EXIF, IPTC and XMP metadata C++ library and command line utility"
-HOMEPAGE="https://www.exiv2.org/"
+HOMEPAGE="https://exiv2.org/"
 
 LICENSE="GPL-2"
 # In 0.27.5, ABI seemed to be broken for bmff functions
diff --git a/media-gfx/exiv2/metadata.xml b/media-gfx/exiv2/metadata.xml
index 06b54e427aa0..08e5c12f096c 100644
--- a/media-gfx/exiv2/metadata.xml
+++ b/media-gfx/exiv2/metadata.xml
@@ -13,4 +13,7 @@
 		<flag name="bmff">Add support for the ISOBMFF format</flag>
 		<flag name="webready">Support reading metadata over the internet</flag>
 	</use>
+	<upstream>
+		<remote-id type="github">Exiv2/exiv2</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-gfx/freecad/Manifest b/media-gfx/freecad/Manifest
index 5bbf4593891a..0a26bf83c355 100644
--- a/media-gfx/freecad/Manifest
+++ b/media-gfx/freecad/Manifest
@@ -7,6 +7,6 @@ DIST freecad-0.19.2-0005-Make-smesh-compile-with-vtk9.patch.xz 5368 BLAKE2B 69ba
 DIST freecad-0.19.4.tar.gz 296990652 BLAKE2B 6b252198616f7731144d000307a7f186eb2b24e07b85e008d0aae0f60a732fef5598c06c5c66b70fa44114f05afbc7d81b15c71bbb147bc2e458ea90cc81ee45 SHA512 58e5e6bb4ed40ce7f3a0b653cdb0371208189b9ca266f1c29a8f9077c4e56861b3925f695718fba34781254220f8a8919a2e2a501d43573b2c733f8b21c12c1f
 DIST freecad-0.20.tar.gz 75452957 BLAKE2B 600baf30541dabb7cf5df22a2d0fef0972d1b9cbf7c8425b9e2fadae54a0b0a1b75bb252fa18ecbf68fa5649ce459a88c71d69e000899e4b46d5c59fe956fcd1 SHA512 b1d91efa873f180bf635f6006d6c4b7a33b64b630955c639fe923bb340ce8104474688e05eea151d1ac1557388947ae81618cfc8a578f14706aa07b5cdc45cda
 EBUILD freecad-0.19.4-r1.ebuild 10840 BLAKE2B 66755fe7c9b95e8cd3daf49b095449fe5df3e22ac0f04aa121c1b334b236a7c4d10fe79d5b14c2a37294ac121685940fba80619de765adb16af33e224c5d3af6 SHA512 79a1f85d6394125c1ebfdb4614fa1528cd414313f65728ccad87cf32f75d3d764da7691b277255b96db71de247102d25fc48acb9a58623660dd88e40c1381d60
-EBUILD freecad-0.20.ebuild 10755 BLAKE2B 4d5608c56d23486fe29f6d613f4a1a301676d5d811c80e8cf6e90bba238f63bb0b4d9e2d53354f21e8b2345c1a8bc60929df0fb82ce40c271fb3d826bbd487de SHA512 ad7cf1b3ab8bddb1b476a94ca4aac65c594c27f87a7bb7ead5c3b01c9ee62c52facdcb8db8513dd9bc8d6b37f6fafffced67153ff49c54fd8d91eb49b3975e3b
-EBUILD freecad-9999.ebuild 10687 BLAKE2B 8750d9f805c932ded40a10403889b3b3f0c54fed0f1f2609a2c32c5dbbd93da0646baea52f4afb870d997a452106a36790c0e603b32e71b6f46e29ac64fb8d2a SHA512 d8c3a3b98d69df0513710955e5667326bc9c5b7b130bf9deccdac4c9bbf9dd80dd9196a1eb0b562c8e54dcc03edc06aee295fb2312e301a04a63a700a49e3373
+EBUILD freecad-0.20-r1.ebuild 10089 BLAKE2B 6908e3649aded456371a6bc466752a50f18e2d717be78f1b025dbbe0f7fa8371ab3d639f29bc6ec15fb730523afa58410d5805e39f39dd8fafc10627d6c5c870 SHA512 38641dd48eaa0f2bb7afe2dc2c269b9a8721ffd1bd7804c1b28d0c6c8558310407e56183760e367da8d84b2815c1fd1b9fe74cfb8c754d4daef5280ef839c30a
+EBUILD freecad-9999.ebuild 9750 BLAKE2B 44215b1fc2d8e92490fd48040adebc6b52e79ec83d65cbe8021d486daa318817d17d02773299166a3148bfbc289907e9fcc658b9a3ad7ed03e0433d45b243b14 SHA512 fcb32629aac20410dbdd2cdd0ae977ca09395021c2229a10d029ba97c97617e67dd90c94af9d4f76098176b4ff460ef79fe2fede7d6c8afc2aa3ac249ffc1128
 MISC metadata.xml 3712 BLAKE2B 1ad9603f7dd92dbbd8bfc77cb345c907c3e19a4a6cedfa3aab64abf5b8131de33c11adbc1cee7e2351f4da3046bfe5a2964a32262bc3e28706ac2704065b3fd1 SHA512 f9a47de41d6082d7e06795398161a79e88077bacae4d8d2006a24357a48624fcbb7afe8f69eff4ca17c7cb57dad5c5a609791967bbd689069b0a5a42059606f7
diff --git a/media-gfx/freecad/freecad-0.20.ebuild b/media-gfx/freecad/freecad-0.20-r1.ebuild
index d71ea49e2be3..52b99f2e863f 100644
--- a/media-gfx/freecad/freecad-0.20.ebuild
+++ b/media-gfx/freecad/freecad-0.20-r1.ebuild
@@ -17,8 +17,6 @@ if [[ ${PV} = *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/${MY_PN}/${MY_PN}.git"
 	S="${WORKDIR}/freecad-${PV}"
 else
-	MY_PV=$(ver_cut 1-2)
-	MY_PV=$(ver_rs 1 '_' ${MY_PV})
 	SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64"
 	S="${WORKDIR}/FreeCAD-${PV}"
@@ -32,7 +30,7 @@ SLOT="0"
 # see https://forum.freecadweb.org/viewtopic.php?f=4&t=69450
 IUSE="debug headless test"
 
-FREECAD_EXPERIMENTAL_MODULES="cloud pcl plot ship"
+FREECAD_EXPERIMENTAL_MODULES="cloud pcl"
 FREECAD_STABLE_MODULES="addonmgr fem idf image inspection material
 	openscad part-design path points raytracing robot show surface
 	techdraw tux"
@@ -121,7 +119,6 @@ REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
 	inspection? ( points )
 	path? ( robot )
-	ship? ( image plot )
 "
 
 PATCHES=(
@@ -181,13 +178,11 @@ src_configure() {
 		-DBUILD_PART=ON
 		-DBUILD_PART_DESIGN=$(usex part-design)
 		-DBUILD_PATH=$(usex path)
-		-DBUILD_PLOT=$(usex plot)				# conflicts with possible external workbench
 		-DBUILD_POINTS=$(usex points)
 		-DBUILD_QT5=ON							# OFF means to use Qt4
 		-DBUILD_RAYTRACING=$(usex raytracing)
 		-DBUILD_REVERSEENGINEERING=OFF			# currently only an empty sandbox
 		-DBUILD_ROBOT=$(usex robot)
-		-DBUILD_SHIP=$(usex ship)				# conflicts with possible external workbench
 		-DBUILD_SHOW=$(usex show)
 		-DBUILD_SKETCHER=ON						# needed by draft workspace
 		-DBUILD_SMESH=ON
@@ -280,18 +275,6 @@ src_install() {
 pkg_postinst() {
 	xdg_pkg_postinst
 
-	if use plot; then
-		einfo "Note: You are enabling the 'plot' USE flag."
-		einfo "This conflicts with the plot workbench that can be loaded"
-		einfo "via the addon manager! You can only install one of those."
-	fi
-
-	if use ship; then
-		einfo "Note: You are enabling the 'ship' USE flag."
-		einfo "This conflicts with the ship workbench that can be loaded"
-		einfo "via the addon manager! You can only install one of those."
-	fi
-
 	einfo "You can load a lot of additional workbenches using the integrated"
 	einfo "AddonManager."
 
diff --git a/media-gfx/freecad/freecad-9999.ebuild b/media-gfx/freecad/freecad-9999.ebuild
index d10e47f1f6e1..b9adba360983 100644
--- a/media-gfx/freecad/freecad-9999.ebuild
+++ b/media-gfx/freecad/freecad-9999.ebuild
@@ -17,10 +17,7 @@ if [[ ${PV} = *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/${MY_PN}/${MY_PN}.git"
 	S="${WORKDIR}/freecad-${PV}"
 else
-	MY_PV=$(ver_cut 1-2)
-	MY_PV=$(ver_rs 1 '_' ${MY_PV})
-	SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz
-		https://raw.githubusercontent.com/waebbl/waebbl-gentoo/master/patches/${P}-0005-Make-smesh-compile-with-vtk9.patch.xz"
+	SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64"
 	S="${WORKDIR}/FreeCAD-${PV}"
 fi
@@ -31,7 +28,7 @@ LICENSE="LGPL-2 CC-BY-SA-4.0"
 SLOT="0"
 IUSE="debug designer headless test"
 
-FREECAD_EXPERIMENTAL_MODULES="cloud pcl plot ship"
+FREECAD_EXPERIMENTAL_MODULES="cloud pcl"
 FREECAD_STABLE_MODULES="addonmgr fem idf image inspection material
 	openscad part-design path points raytracing robot show surface
 	techdraw tux"
@@ -69,7 +66,7 @@ RDEPEND="
 	sci-libs/flann[openmp]
 	sci-libs/hdf5:=[fortran,zlib]
 	>=sci-libs/med-4.0.0-r1[python,${PYTHON_SINGLE_USEDEP}]
-	sci-libs/opencascade:=[vtk(+)]
+	sci-libs/opencascade:=[json,vtk(+)]
 	sci-libs/orocos_kdl:=
 	sys-libs/zlib
 	virtual/glu
@@ -120,7 +117,6 @@ REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
 	inspection? ( points )
 	path? ( robot )
-	ship? ( image plot )
 "
 
 PATCHES=(
@@ -139,10 +135,6 @@ pkg_setup() {
 }
 
 src_prepare() {
-	# the upstream provided file doesn't find the coin doc tag file,
-	# but cmake ships a working one, so we use this.
-	rm "${S}/cMake/FindCoin3D.cmake" || die
-
 	# Fix desktop file
 	sed -e 's/Exec=FreeCAD/Exec=freecad/' -i src/XDGData/org.freecadweb.FreeCAD.desktop || die
 
@@ -178,13 +170,11 @@ src_configure() {
 		-DBUILD_PART=ON
 		-DBUILD_PART_DESIGN=$(usex part-design)
 		-DBUILD_PATH=$(usex path)
-		-DBUILD_PLOT=$(usex plot)				# conflicts with possible external workbench
 		-DBUILD_POINTS=$(usex points)
 		-DBUILD_QT5=ON							# OFF means to use Qt4
 		-DBUILD_RAYTRACING=$(usex raytracing)
 		-DBUILD_REVERSEENGINEERING=OFF			# currently only an empty sandbox
 		-DBUILD_ROBOT=$(usex robot)
-		-DBUILD_SHIP=$(usex ship)				# conflicts with possible external workbench
 		-DBUILD_SHOW=$(usex show)
 		-DBUILD_SKETCHER=ON						# needed by draft workspace
 		-DBUILD_SMESH=ON
@@ -277,18 +267,6 @@ src_install() {
 pkg_postinst() {
 	xdg_pkg_postinst
 
-	if use plot; then
-		einfo "Note: You are enabling the 'plot' USE flag."
-		einfo "This conflicts with the plot workbench that can be loaded"
-		einfo "via the addon manager! You can only install one of those."
-	fi
-
-	if use ship; then
-		einfo "Note: You are enabling the 'ship' USE flag."
-		einfo "This conflicts with the ship workbench that can be loaded"
-		einfo "via the addon manager! You can only install one of those."
-	fi
-
 	einfo "You can load a lot of additional workbenches using the integrated"
 	einfo "AddonManager."
 
@@ -299,23 +277,23 @@ pkg_postinst() {
 	einfo "https://wiki.freecadweb.org/Installing#External_software_supported_by_FreeCAD"
 	optfeature_header "Computational utilities"
 	optfeature "BLAS library" sci-libs/openblas
-	optfeature "statistical computation with Python" dev-python/pandas
-	optfeature "scientific computation with Python" dev-python/scipy
-	optfeature "symbolic math with Python" dev-python/sympy
+	optfeature "Statistical computation with Python" dev-python/pandas
+	optfeature "Use scientific computation with Python" dev-python/scipy
+	optfeature "Use symbolic math with Python" dev-python/sympy
 	optfeature_header "Imaging, Plotting and Rendering utilities"
-	optfeature "dependency graphs" media-gfx/graphviz
+	optfeature "Dependency graphs" media-gfx/graphviz
 	optfeature "PBR Rendering" media-gfx/povray
 	optfeature_header "Import / Export"
-	optfeature "interacting with git repositories" dev-python/GitPython
-	optfeature "working with COLLADA documents" dev-python/pycollada
+	optfeature "Interact with git repositories" dev-python/GitPython
+	optfeature "Work with COLLADA documents" dev-python/pycollada
 	optfeature "YAML importer and emitter" dev-python/pyyaml
-	optfeature "importing and exporting 2D AutoCAD DWG files" media-gfx/libredwg
-	optfeature "importing and exporting geospatial data formats" sci-libs/gdal
-	optfeature "working with projection data" sci-libs/proj
+	optfeature "Importing and exporting 2D AutoCAD DWG files" media-gfx/libredwg
+	optfeature "Importing and exporting geospatial data formats" sci-libs/gdal
+	optfeature "Working with projection data" sci-libs/proj
 	optfeature_header "Meshing and FEM"
 	optfeature "FEM mesh generator" sci-libs/gmsh
-	optfeature "triangulating meshes" sci-libs/gts
-	optfeature "visualization" sci-visualization/paraview
+	optfeature "Triangulating meshes" sci-libs/gts
+	optfeature "Visualization" sci-visualization/paraview
 }
 
 pkg_postrm() {
diff --git a/media-gfx/hydrus/Manifest b/media-gfx/hydrus/Manifest
index 9b9d0ff8a865..254a28b4f68d 100644
--- a/media-gfx/hydrus/Manifest
+++ b/media-gfx/hydrus/Manifest
@@ -1,13 +1,13 @@
 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-482.tar.gz 40181613 BLAKE2B bdb98ae88efb9e83bda28d01dcdb624ce884682893e84087bfc99420e82ff12c1543f89a5015ac997596188a3b32fec9e5776f1c89fe1864f55d73ae52ca19d7 SHA512 c99a0ea60c0b3a565b57b4f4201eb6ff732ea2fb9f419d8b9e8170476bb230bdf0e474e5f82f909b4aca0a442fe89e47d4d0f58b0e722b3f309940d98664ac51
 DIST hydrus-484.tar.gz 40079506 BLAKE2B 7d3c817511f20476647058bc83ba297f7e597f1fc24cb6c6dc46bb4e1821a0073e4d39fd95a130a89270e77d4b1b749e4a2845ab3c8b471f6cc8b5bba8c65480 SHA512 7eb42fbd15b6140258dd8931d0ff07464fd5ac1d0c8323a84bc89f6f820756cce2a2a3d5e6cd8f536f00f2b6f6d1ea36ab7ce8e4ea08272d30122b46ede69124
 DIST hydrus-488.tar.gz 40428970 BLAKE2B 7a6252276cf60ab4969591d6cf44bf13eec167b432ed0cd5c0ced96f32363640aa246db1256e20e452fe1a6521011c2d46100c3148c0d3241cb810fcde47ad1b SHA512 cbb6a2d1794c5de4c5495a61f115722b1bbad79f3458315586c383eaff79a1f0c144c4498a7c8f651b8ce5592c22ffcc61496a3637471d9ffdeffaef500cd998
 DIST hydrus-490.tar.gz 40610222 BLAKE2B 7a6b8fbab2ae64baeeaaa7f0a89a69f5e54719d42b473e7bccd2e549f5d6bc7005831803bd6966af04f4a69d48cf0139a63a2ec17cf34c1190bfb47e422bc821 SHA512 619349d383114774303b6ca5a9239d9d7adfd43db2fde22c17322c630c27b747953932f3d9622b64727714afcb3c70c2b3b065afb75f83dc95ec84eb0c0976ba
-EBUILD hydrus-482.ebuild 4463 BLAKE2B b510bb557193669bc1d09a11ab66902f1f474878d8b740f9dff8746508264f225ad781f6e0058b0ef6d7fa2377da151734ff1cbae608e7587c46114b6c81bca5 SHA512 791eaac87779f9abe34fca92baad624b7c87dfa43fd1507cce6acad47c53e1acabe2f38e3e5cfba658ca5b3a013696db166fe66d332cb1ed63e69f3bd778cabd
+DIST hydrus-493.tar.gz 40623287 BLAKE2B 16d5a4a280fe8f0c80bb3a59596ebe72681a5cb88942f3d02985d338b3a92e3d602983b2b2d294aebe3af98672914e866c33206cc7db3511313e5d5aa994386d SHA512 b0d1d2266ca1d18281144585fc71362d2998eda6fb93363c9309b5f2428484f9a74bbc1102659db6e184239a099ad364182ba0560be72c649181a0ac81f83abd
 EBUILD hydrus-484.ebuild 4464 BLAKE2B 84c6dcc21a234316e5a01cb10a91be4fed4dc59f6f43d98b5cd62eb792dd4838bba31ce7e01e0b94f411c2e66a082ef5aa1f04aa9777c20c45e9226a63a074e5 SHA512 ef48ab5030804ba6d11040897eb28a6b37dfcd7abb3164185836e08ab38b425743d274ac1ebe5031fa00567c5bdbc58143785a48ca4ba6b0092cf5524fe59237
 EBUILD hydrus-488.ebuild 4464 BLAKE2B 84c6dcc21a234316e5a01cb10a91be4fed4dc59f6f43d98b5cd62eb792dd4838bba31ce7e01e0b94f411c2e66a082ef5aa1f04aa9777c20c45e9226a63a074e5 SHA512 ef48ab5030804ba6d11040897eb28a6b37dfcd7abb3164185836e08ab38b425743d274ac1ebe5031fa00567c5bdbc58143785a48ca4ba6b0092cf5524fe59237
 EBUILD hydrus-490.ebuild 4464 BLAKE2B 84c6dcc21a234316e5a01cb10a91be4fed4dc59f6f43d98b5cd62eb792dd4838bba31ce7e01e0b94f411c2e66a082ef5aa1f04aa9777c20c45e9226a63a074e5 SHA512 ef48ab5030804ba6d11040897eb28a6b37dfcd7abb3164185836e08ab38b425743d274ac1ebe5031fa00567c5bdbc58143785a48ca4ba6b0092cf5524fe59237
+EBUILD hydrus-493.ebuild 4464 BLAKE2B 84c6dcc21a234316e5a01cb10a91be4fed4dc59f6f43d98b5cd62eb792dd4838bba31ce7e01e0b94f411c2e66a082ef5aa1f04aa9777c20c45e9226a63a074e5 SHA512 ef48ab5030804ba6d11040897eb28a6b37dfcd7abb3164185836e08ab38b425743d274ac1ebe5031fa00567c5bdbc58143785a48ca4ba6b0092cf5524fe59237
 EBUILD hydrus-9999.ebuild 4464 BLAKE2B 84c6dcc21a234316e5a01cb10a91be4fed4dc59f6f43d98b5cd62eb792dd4838bba31ce7e01e0b94f411c2e66a082ef5aa1f04aa9777c20c45e9226a63a074e5 SHA512 ef48ab5030804ba6d11040897eb28a6b37dfcd7abb3164185836e08ab38b425743d274ac1ebe5031fa00567c5bdbc58143785a48ca4ba6b0092cf5524fe59237
-MISC metadata.xml 751 BLAKE2B 05dfcd30440ca7bc1375206469123c5bb93ff7fbb7612191faabee7abe87334bfb4f25db3291cd3a989264516c315eeb489eaac2c83c95b2436446966ba27880 SHA512 f2e7c839e4567355bb6ff1cdbf1355ab7a2fbf166a3f87ac7a8af92fc80efa7833010376317a38e2594a203be66bfcb3e0df9dc7346ac3d37d8466bb0368b50e
+MISC metadata.xml 836 BLAKE2B 049faa70763ba176b6e4930abcdb5f4b4b87bd243759aba42dec32b9f2a199b3f2c33f0415ffdd1a392af3b461d939e633ec1f9333b0ff538f74d24306790fbe SHA512 0404c79e85e51eaba13fef930e695f168074e69734d3d8a604515f77196706bae9d36a2df9b3db0530c9f17b32881602509c7e22e7383c957a67e13c2a46e7bb
diff --git a/media-gfx/hydrus/hydrus-482.ebuild b/media-gfx/hydrus/hydrus-493.ebuild
index eeb2fa504f8a..86568b05547c 100644
--- a/media-gfx/hydrus/hydrus-482.ebuild
+++ b/media-gfx/hydrus/hydrus-493.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 PYTHON_REQ_USE="sqlite"
 
 DOCS_BUILDER=mkdocs
diff --git a/media-gfx/hydrus/metadata.xml b/media-gfx/hydrus/metadata.xml
index 94d2b5d6cda9..98c608c2c8b4 100644
--- a/media-gfx/hydrus/metadata.xml
+++ b/media-gfx/hydrus/metadata.xml
@@ -15,4 +15,7 @@
 		anonymously through custom servers that any user may run
 	</longdescription>
 	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="github">hydrusnetwork/hydrus</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index ff5c112b9c5a..fa6975f9d2a4 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -14,4 +14,4 @@ EBUILD imagemagick-7.1.0.13.ebuild 7485 BLAKE2B 896feef5fe189b78077bf00f94a6c97d
 EBUILD imagemagick-7.1.0.43.ebuild 7583 BLAKE2B 0699e694a47615e142f4a9cead718f97b546642a28e03385f28a997104a5fc28831ede22c16db6e37af00d9ab51c2e809ba40a8445f94d679a27a80156d95b12 SHA512 85235f8ccf7cbc95ad65993a86dadbcb692bc3d60a55d2ae6a1b53dd8906a3d8800ef44cf101910a05c0e24999a43e7a0b2b47e1f7beb07923c3378b22650b59
 EBUILD imagemagick-7.1.0.44.ebuild 7583 BLAKE2B 0699e694a47615e142f4a9cead718f97b546642a28e03385f28a997104a5fc28831ede22c16db6e37af00d9ab51c2e809ba40a8445f94d679a27a80156d95b12 SHA512 85235f8ccf7cbc95ad65993a86dadbcb692bc3d60a55d2ae6a1b53dd8906a3d8800ef44cf101910a05c0e24999a43e7a0b2b47e1f7beb07923c3378b22650b59
 EBUILD imagemagick-9999.ebuild 7583 BLAKE2B 0699e694a47615e142f4a9cead718f97b546642a28e03385f28a997104a5fc28831ede22c16db6e37af00d9ab51c2e809ba40a8445f94d679a27a80156d95b12 SHA512 85235f8ccf7cbc95ad65993a86dadbcb692bc3d60a55d2ae6a1b53dd8906a3d8800ef44cf101910a05c0e24999a43e7a0b2b47e1f7beb07923c3378b22650b59
-MISC metadata.xml 1227 BLAKE2B de893eae7e8f8e299ae10df13d202819b60df3b85858eacbe3455c4f27627689e7790a6fdded32d11d3157c35b5a2e08cab958e84b8f5799bb298deca15a1d4c SHA512 726e0c2cea973806fef1a3f51da11fb525b6a2e75bf2221a0939adbe50d2d8e267c5e627eca571e39769e4c14b134d2b9be3792047523540620c2eac149dd066
+MISC metadata.xml 1318 BLAKE2B 8095c278f2dcaaf79ea8ccec1ebeebaf613331b00b49699c80b1d4c6f9c24cb6ef91e9d50f4de191ab19b3794838efdd95e76ce5b6d4bdc1c8a690891d449a2e SHA512 98d867c68ef82d426272f8c1be954289afd5351f426800dc7d70c4efe1f343b18fae85288c3b0cdb7d5063f522e0e2fe7d3af54d8e70db735f15c9ecf58207ce
diff --git a/media-gfx/imagemagick/metadata.xml b/media-gfx/imagemagick/metadata.xml
index 93dce2319e4b..20c1759c99ee 100644
--- a/media-gfx/imagemagick/metadata.xml
+++ b/media-gfx/imagemagick/metadata.xml
@@ -1,26 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>codec@gentoo.org</email>
-    <name>Gentoo Codec Project</name>
-  </maintainer>
-  <maintainer type="person">
-    <email>dilfridge@gentoo.org</email>
-    <name>Andreas K. Huettel</name>
-  </maintainer>
-  <use>
-    <flag name="corefonts">Use <pkg>media-fonts/corefonts</pkg> which is required by some commands</flag>
-    <flag name="fpx">Enable <pkg>media-libs/libfpx</pkg> support</flag>
-    <flag name="heif">Enable support for ISO/IEC 23008-12:2017 HEIF/HEIC image format using <pkg>media-libs/libheif</pkg></flag>
-    <flag name="hdri">Enable High Dynamic Range Images formats</flag>
-    <flag name="lqr">Enable experimental liquid rescale support using <pkg>media-libs/liblqr</pkg></flag>
-    <flag name="opencl">Enable OpenCL support</flag>
-    <flag name="pango">Enable Pango support using <pkg>x11-libs/pango</pkg></flag>
-    <flag name="q32">Set quantum depth value to 32</flag>
-    <flag name="q8">Set quantum depth value to 8</flag>
-  </use>
-  <upstream>
-    <remote-id type="cpe">cpe:/a:imagemagick:imagemagick</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>codec@gentoo.org</email>
+		<name>Gentoo Codec Project</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>dilfridge@gentoo.org</email>
+		<name>Andreas K. Huettel</name>
+	</maintainer>
+	<use>
+		<flag name="corefonts">Use <pkg>media-fonts/corefonts</pkg> which is required by some commands</flag>
+		<flag name="fpx">Enable <pkg>media-libs/libfpx</pkg> support</flag>
+		<flag name="heif">Enable support for ISO/IEC 23008-12:2017 HEIF/HEIC image format using <pkg>media-libs/libheif</pkg></flag>
+		<flag name="hdri">Enable High Dynamic Range Images formats</flag>
+		<flag name="lqr">Enable experimental liquid rescale support using <pkg>media-libs/liblqr</pkg></flag>
+		<flag name="opencl">Enable OpenCL support</flag>
+		<flag name="pango">Enable Pango support using <pkg>x11-libs/pango</pkg></flag>
+		<flag name="q32">Set quantum depth value to 32</flag>
+		<flag name="q8">Set quantum depth value to 8</flag>
+	</use>
+	<upstream>
+		<remote-id type="cpe">cpe:/a:imagemagick:imagemagick</remote-id>
+		<remote-id type="github">ImageMagick/ImageMagick</remote-id>
+		<remote-id type="github">ImageMagick/ImageMagick6</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-gfx/shotwell/Manifest b/media-gfx/shotwell/Manifest
index 172a18ddc67d..b198309fcf38 100644
--- a/media-gfx/shotwell/Manifest
+++ b/media-gfx/shotwell/Manifest
@@ -3,5 +3,5 @@ AUX 0.30.16-optional-wayland.patch 2111 BLAKE2B 9d928c8b449792b198314c9f169dc2dd
 DIST shotwell-0.30.15.tar.xz 6533632 BLAKE2B a973c22f06b2c05561db72974fa8f8a72006e4795ca282bd7c94e99f1b59c411917a30dd00b896cf606b80596c1510fe50e81c1a1c8fa6b98bcd75f8b25c5769 SHA512 aded4c8ec015546cb64189cc1a85b6bc233861367ec514cce041607a1deec9d69687f26e448865783c686813c1caec78df17c29d38c4296c4a255ff20c7cde0e
 DIST shotwell-0.30.16.tar.xz 6532812 BLAKE2B caa2ff2f4536d8f04900d7ba7c583b7ec0d0244d6253bc17971e2b4e04aa3790b17e932b3367e1be40d4a0bb566bab31396aa5dfdb6dbb5c9803272cd7f94e97 SHA512 4ed725a34b1663b9cb63dcd13c98795fb2ea9a5d79ee4541276bc9dc2f607ce6466cc9c983bab55e7418e69eef3d1598846aeb6750f00927663756bd11d9a084
 EBUILD shotwell-0.30.15.ebuild 1910 BLAKE2B 414fb09249cb5354982841ed268d8ccb58b7ecdc460132489c71aea275bc42c31a5e645d1f7081c4cc9240576920941ff93b10b47c1337bab37da5875ec5bbc5 SHA512 3666499bfaf923981fc5965e06f23a871006c11ea8d93b630bcf3d75a86f2640a3a75c485800c37af36cb12a9107176675adea83f65db84e2ebfd6903194ac0b
-EBUILD shotwell-0.30.16.ebuild 1950 BLAKE2B 37ac6c5510d225b82a2ab003e68a7577b12a742ca137da062639f73b417c67dc5bb1e4a55eb7bec9159d4fbdd2327cfc6b60ecb17739f4ec20c3e376e06f1ed8 SHA512 c89d9e6c9d126f4b9430d3200cb86dcfa39d6bc2ae4e5a03d6467373d21eb036fd9d6becbebf7bb2a41d1e11ca12566c4f42e0ccc1b98a6148330b0f2b74b252
+EBUILD shotwell-0.30.16.ebuild 1949 BLAKE2B 0b12b63f36a451444423449637d90e91d1f291499195f4047b5dbc460453ef64bb313ea603bd1962c5c3633a923201b48d99ca7720e0889faa94f8df10dc8d0c SHA512 2d5984ab3a3ad41250ba8f7fa149ade6a014bba48ff15e63bc868807c69394c1e549f5b3dc4abc307c02d62acb4e25ccc0041fe22f9c22a30c192d7e8eabd4e1
 MISC metadata.xml 685 BLAKE2B 60a7448a9542a8663c25966bfa7dae2bbd50fb727795300e6483ea39147521b2d6ebd3c4dd894c553cbd94df18f4e39e1d88359d9da346a02cb7a02709d19f11 SHA512 da9730037e4d473898cfa537446b9ea3dae77bb915c54df139738a4e19b824ff273c36c2e3a43f421d91e2de09789843ccc84bd4cb4bcda258eee37fd9dec425
diff --git a/media-gfx/shotwell/shotwell-0.30.16.ebuild b/media-gfx/shotwell/shotwell-0.30.16.ebuild
index e5ed861303a2..869bc0e6b82d 100644
--- a/media-gfx/shotwell/shotwell-0.30.16.ebuild
+++ b/media-gfx/shotwell/shotwell-0.30.16.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Shotwell"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 ~arm arm64 ~ppc64 ~riscv ~sparc ~x86"
 IUSE="opencv udev wayland"
 
 DEPEND="