gentoo auto-resync : 31:08:2022 - 10:50:20

14 files changed, 374 insertions, 14 deletions

diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 5221a2c8a156..94955d3281fd 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/chafa/Manifest b/media-gfx/chafa/Manifest
index ed5c4df414d2..947a7569022d 100644
--- a/media-gfx/chafa/Manifest
+++ b/media-gfx/chafa/Manifest
@@ -1,5 +1,5 @@
 DIST chafa-1.10.3.tar.xz 512808 BLAKE2B cc0d18f06936d3c26a5d073cf8982c5c49bca307833885edf346e392987fb743ee560ca891db5533ee5e856dbeb4ca9f9a68d601961d0ab6b2dcb80c58fdda1d SHA512 29bcd5315a1c5bf08b214b9b58fabc64340e995a383b88e5f8245ba130b0506e4d13c34878d6cb32d1493fa1b8326520cbd176aeef22d932c72ede0430a38fda
 DIST chafa-1.12.3.tar.xz 659136 BLAKE2B 2b9878b93c46be37fc7cfaf9ffadf58a84445b2e081c712a9824f323b0aee5725fd0b229a0a073afd0a7e3354d418669c411e02ac0f98a4e2eeaff9c19f6f93c SHA512 00d186aa3e5a184b5fe985909118fe856c7889e6674d55de6fe409f04ccac0a8698ef8063a2049e8b100ea0e9abfa5f89c959333a18cd6f934608b86f256ee5d
 EBUILD chafa-1.10.3.ebuild 751 BLAKE2B 620759963bbe5fa317ad60b080f9138bc9cd1c151cb8ce5c2d6c2d5bd6d774ded495d3956fb6e5d4427740804e91cd326f5257f265f4dec0cdb9b3ec7666e262 SHA512 5c7fee149c9b2130f1d8678b83364257d3209ee3d25bcf4d497b000eb8d75cb2a872117322aa2c1037aea6f0620ae5caf0d45a1c0695d4adf57d877cbd07c47e
-EBUILD chafa-1.12.3.ebuild 754 BLAKE2B b3e92b1cd0f3c81e8626c27031e091ae76e044e15c03d38e1ac9d156a058941deb4a4dca69feca321207ed0738f8e4b0d3a955da340a5fcfd82b9f5be6778c5b SHA512 b9f94e704afcd7177e75c861b0ba9527e974dcb3105cd154ffa98f4a3d288fca9d2c2df360158e336a973fb222ba86fb57559b1fe0c4a767a3624608bdb54c26
+EBUILD chafa-1.12.3.ebuild 751 BLAKE2B 620759963bbe5fa317ad60b080f9138bc9cd1c151cb8ce5c2d6c2d5bd6d774ded495d3956fb6e5d4427740804e91cd326f5257f265f4dec0cdb9b3ec7666e262 SHA512 5c7fee149c9b2130f1d8678b83364257d3209ee3d25bcf4d497b000eb8d75cb2a872117322aa2c1037aea6f0620ae5caf0d45a1c0695d4adf57d877cbd07c47e
 MISC metadata.xml 396 BLAKE2B fc22be32275227f194b224a340dcd08e55a565fa68b102eb9cb55406402ed38d4f593aa6f59f3c40a24480c8d002ea0ce4a9a831055bb6821fdbe1a1dfd103ff SHA512 46617cd84ec16190865a896432df30443d31123b790d871bf634cd446b520ed9b1728951e49217b0619a91d0d46d3013ce7f41e142893298ad7e8c2522d1552d
diff --git a/media-gfx/chafa/chafa-1.12.3.ebuild b/media-gfx/chafa/chafa-1.12.3.ebuild
index 9a2b941734b1..98ac22f2a0ca 100644
--- a/media-gfx/chafa/chafa-1.12.3.ebuild
+++ b/media-gfx/chafa/chafa-1.12.3.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://hpjansson.org/chafa/releases/${P}.tar.xz"
 
 LICENSE="LGPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv x86"
 IUSE="+tools"
 
 RDEPEND="
diff --git a/media-gfx/converseen/Manifest b/media-gfx/converseen/Manifest
index f1433f73aca1..9cee7302e59d 100644
--- a/media-gfx/converseen/Manifest
+++ b/media-gfx/converseen/Manifest
@@ -2,5 +2,7 @@ AUX converseen-0.9.9.0-appdata-path.patch 604 BLAKE2B ca524ae4a52f74b687e0e0246d
 AUX converseen-0.9.9.0-gnuinstalldirs.patch 5272 BLAKE2B b2f0faa57923c5d452e3a2ef2b397a743cc84c65d8ebee4ac415301669045190b1b3fb075ed51726e63bc016da7b32432f4b887b50dab823bab3a10bdc96fcc3 SHA512 97109e00cfdb9d1288bd04466e455a514cc7f8e3f5f40caaa819d0f886df71c259e18f66ef921ef60f7301c2ac745fb33869b1af486fd1acc2e2e7b034a2afa7
 AUX converseen-0.9.9.0-no-update.patch 540 BLAKE2B b8a7bcf561a4be48fdf9137a40c1f5b1451915a6cf4b2043f9adaf8dd1aa853b331ee1499bb34d05ae9e7da2d9f3f0515c62dca8146d4957126054557ebfcceb SHA512 b5ed008bd7a01cb99ec97faa6c9bd412009f1d438c420e201d2605c713ff57c346391d5389ed019c0538a263154d1ed36c4a581d0582d2c2eadf8dc77a67b97b
 DIST converseen-0.9.9.0.tar.gz 280547 BLAKE2B 978df93748cd5585b99f371f9538f9ae0a6fa683c9a452a8fb3eceb0c6a7b972423dbd396f8702a4db839852d39bb7c3b654603a08a5dc61481ed74c6aa3aa0b SHA512 8ec01de40fc32bc83c97b3e1d1d0400b9ae5c8c5f374dfae452a75f1bec648d6db26ea036103e15c84e4360ed83f27ce5d35a64592289de083e9701e6153ca63
+DIST converseen-0.9.9.6.tar.gz 290947 BLAKE2B 56772a2c1f55952d7531311fd1a915084810038677c91616e791cf99085cfb6548fd7d6aa86336ba3df2770c1ffd866523e9f96d3c0d572bc52246d81fb2b6cd SHA512 77b93752085f0f8ab086a30d8c327eb476756e1069736874ec914f99ac64b1fb5c8abd9a4ef7fc45d21edf7c1223c3c5e4e738755f6a71a997374622c98dc78e
 EBUILD converseen-0.9.9.0.ebuild 918 BLAKE2B a9acffbb4629cd80bc519849a9b219014c2d00466f6302354aafde0a36b46613f16bf48a5830f1a180118c99353d380768303cb8fdd0b335c8a540af137a0553 SHA512 8778b312f059d35458c6c393bb4d7939dc7a66d461679a9726cfda5ec8c448bd6ac5e42e71dc3c2d85afc76c64d1c56e897773749e9c4e7eff02caca6cbf1b45
-MISC metadata.xml 253 BLAKE2B 63b1521999967e81f63d9817b5ce195df042b073fbd3e93d45fb39666663ee174bb0e2248a901bb99074d8c1367bac286522d1fa3f85351118ec8008a29e8b3c SHA512 048df5b5c0ffc085126595e8d4d3c44cda8a70f8bae8bf3d2eec389a7fa829d5d37ce893f6374f68ff796035ba447c1e0fa6e667582a0f89c0f0fa9fed6303b8
+EBUILD converseen-0.9.9.6.ebuild 1267 BLAKE2B f26e05cbfbec5e51537eb94937481643e8b70c523845be83e41172d2d6adb4711286d1afebf94843a000e90ddc96cd8344044f6c0a779e313307ea8912f8e565 SHA512 287399af1bfe691899f9257a1be6d3a9b6c7caa70611241eb67b947e37634bb09ed7407debb48a756f9fad42519baf6f6e8cc25880c8e7e7ab28edeef9741431
+MISC metadata.xml 490 BLAKE2B 7ee59abe13eee7dff622a3e7b701f6e0128a208e3e49f5b22b3fcaf06357991a50ece3ffa9cb607675f94a7784efcec37c2176464e4c7741efbfb8b8427cb5dc SHA512 a56719d55ea41683315c5d3f98b8351d3b15b68fd8f598a9e692691c771a94bec23b8263c8a017e29d63a20a8de8b440db1acfd26558c6f8d51add12e4016ba6
diff --git a/media-gfx/converseen/converseen-0.9.9.6.ebuild b/media-gfx/converseen/converseen-0.9.9.6.ebuild
new file mode 100644
index 000000000000..17f9357eeb89
--- /dev/null
+++ b/media-gfx/converseen/converseen-0.9.9.6.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Batch image converter and resizer based on ImageMagick"
+HOMEPAGE="https://converseen.fasterland.net/
+	https://github.com/Faster3ck/Converseen/"
+SRC_URI="https://github.com/Faster3ck/Converseen/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+# FIXME: graphicsmagick dependency does not work properly, failures when compiling
+#	|| ( media-gfx/imagemagick[cxx] media-gfx/graphicsmagick[cxx,imagemagick] )
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	media-gfx/imagemagick:=[cxx]
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-qt/linguist-tools:5
+"
+
+S="${WORKDIR}/${P^}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.9.9.0-appdata-path.patch"
+	"${FILESDIR}/${PN}-0.9.9.0-no-update.patch"
+)
+
+pkg_postinst() {
+	elog "Please note that due to security policy restrictions"
+	elog "on media-gfx/imagemagick the support for PS, PDF and"
+	elog "XPS files must be explicitly enabled by commenting out"
+	elog "the respective policies in /etc/ImageMagick-7/policy.xml."
+	elog "See https://wiki.gentoo.org/wiki/ImageMagick#Troubleshooting"
+	elog "for more information."
+}
diff --git a/media-gfx/converseen/metadata.xml b/media-gfx/converseen/metadata.xml
index e5d671718a2c..a620e17cf85a 100644
--- a/media-gfx/converseen/metadata.xml
+++ b/media-gfx/converseen/metadata.xml
@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person" proxied="yes">
+		<email>rndxelement@protonmail.com</email>
+		<name>Philipp Rösner</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">Faster3ck/Converseen</remote-id>
 	</upstream>
diff --git a/media-gfx/freecad/Manifest b/media-gfx/freecad/Manifest
index 0a26bf83c355..04ffaad04fcd 100644
--- a/media-gfx/freecad/Manifest
+++ b/media-gfx/freecad/Manifest
@@ -5,8 +5,10 @@ AUX freecad-0.19.4-backport-correctly-find-PySide2Tools.patch 4425 BLAKE2B 74920
 AUX freecad-0.19_pre20201231-0003-Gentoo-specific-don-t-check-vcs.patch 881 BLAKE2B 8d8327a283fc46b9f195b4dfe68ac6594ed020154f5f65eab5fe86bde2d32bb3d1081fdf9c5d50e30c24ffdc0504a61c047088e24ab4c377aca6e8f5a14e9760 SHA512 17bdf85c6c25d38a46d643666cbf594f5d16952504344af34b1f4960b53a2a534ccac1594d6ae9b5f827fe3403e08a26edb0c40346a9837316307bd484f35088
 DIST freecad-0.19.2-0005-Make-smesh-compile-with-vtk9.patch.xz 5368 BLAKE2B 69bafefd049effe3c31719bb2c23d32e8ba7ad58235c58ac8279ba6c036feaf1b97d5751cf2d68896e7489803103b2d0f92f76e61b3ccc97ef05a95b337ca5c2 SHA512 66585cc13fb3b0b026cf9dbd761c8ba1c1fe4d4f7db2e144ddd97706e02ccd78f4a43ac7cd93ddcae6e73933bf41d4cbd4d94bcdff8804b81378a6d946c7b070
 DIST freecad-0.19.4.tar.gz 296990652 BLAKE2B 6b252198616f7731144d000307a7f186eb2b24e07b85e008d0aae0f60a732fef5598c06c5c66b70fa44114f05afbc7d81b15c71bbb147bc2e458ea90cc81ee45 SHA512 58e5e6bb4ed40ce7f3a0b653cdb0371208189b9ca266f1c29a8f9077c4e56861b3925f695718fba34781254220f8a8919a2e2a501d43573b2c733f8b21c12c1f
+DIST freecad-0.20.1.tar.gz 75545072 BLAKE2B be2d2970b80523b34f7400a2762f997b815a5ae90dcb6cee6e560316712ebe3ab8a64053bd73e9f50548ff076920af0304a6780c94c4f3708d30b82bbee3b5d9 SHA512 ab4cfab4008300b8273769b9395602261c88c19f0893dabe6498a2eac020f1fe3fbf7284928144f1d4147d8627a47d83a40a1777a298673da2e24d956006d827
 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-r1.ebuild 10089 BLAKE2B 6908e3649aded456371a6bc466752a50f18e2d717be78f1b025dbbe0f7fa8371ab3d639f29bc6ec15fb730523afa58410d5805e39f39dd8fafc10627d6c5c870 SHA512 38641dd48eaa0f2bb7afe2dc2c269b9a8721ffd1bd7804c1b28d0c6c8558310407e56183760e367da8d84b2815c1fd1b9fe74cfb8c754d4daef5280ef839c30a
+EBUILD freecad-0.20.1.ebuild 9818 BLAKE2B a1c92208b1d15e63d712f58e08292feade0472011d0000217eeda712b3bcf8b066be43ce156d6a85892b91f6a3feec06e65bbb207b5316cbad56eb71c0adfe37 SHA512 5e2ba04c19ece98a43ad977cd05bfa305368460e26478a093d9d0d8d3da88fc6a554b8cbcb97b54b0a0b632c0146284822edf53e1daaec0f2672e4f65a85bac3
 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.1.ebuild b/media-gfx/freecad/freecad-0.20.1.ebuild
new file mode 100644
index 000000000000..89036988794b
--- /dev/null
+++ b/media-gfx/freecad/freecad-0.20.1.ebuild
@@ -0,0 +1,303 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit check-reqs cmake optfeature python-single-r1 xdg
+
+DESCRIPTION="QT based Computer Aided Design application"
+HOMEPAGE="https://www.freecad.org/ https://github.com/FreeCAD/FreeCAD"
+
+MY_PN=FreeCAD
+
+if [[ ${PV} = *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/${MY_PN}/${MY_PN}.git"
+	S="${WORKDIR}/freecad-${PV}"
+else
+	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
+
+# code is licensed LGPL-2
+# examples are licensed CC-BY-SA (without note of specific version)
+LICENSE="LGPL-2 CC-BY-SA-4.0"
+SLOT="0"
+IUSE="debug designer headless test"
+
+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"
+
+for module in ${FREECAD_STABLE_MODULES}; do
+	IUSE="${IUSE} +${module}"
+done
+for module in ${FREECAD_EXPERIMENTAL_MODULES}; do
+	IUSE="${IUSE} ${module}"
+done
+unset module
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	dev-libs/OpenNI2[opengl(+)]
+	dev-libs/libspnav[X]
+	dev-libs/xerces-c[icu]
+	dev-qt/designer:5
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtopengl:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwebengine:5[widgets]
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	dev-qt/qtxml:5
+	>=media-libs/coin-4.0.0
+	media-libs/freetype
+	media-libs/qhull:=
+	sci-libs/flann[openmp]
+	sci-libs/hdf5:=[fortran,zlib]
+	>=sci-libs/med-4.0.0-r1[python,${PYTHON_SINGLE_USEDEP}]
+	sci-libs/opencascade:=[json,vtk]
+	sci-libs/orocos_kdl:=
+	sys-libs/zlib
+	virtual/glu
+	virtual/libusb:1
+	virtual/opengl
+	cloud? (
+		dev-libs/openssl:=
+		net-misc/curl
+	)
+	fem? ( sci-libs/vtk:=[boost(+),python,qt5,rendering,${PYTHON_SINGLE_USEDEP}] )
+	openscad? ( media-gfx/openscad )
+	pcl? ( >=sci-libs/pcl-1.8.1:=[opengl,openni2,qt5,vtk] )
+	$(python_gen_cond_dep '
+		dev-libs/boost:=[python,threads(+),${PYTHON_USEDEP}]
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		>=dev-python/pivy-0.6.5[${PYTHON_USEDEP}]
+		dev-python/pybind11[${PYTHON_USEDEP}]
+		dev-python/pyside2[gui,svg,webchannel,webengine,${PYTHON_USEDEP}]
+		dev-python/shiboken2[${PYTHON_USEDEP}]
+		addonmgr? ( dev-python/GitPython[${PYTHON_USEDEP}] )
+		fem? ( dev-python/ply[${PYTHON_USEDEP}] )
+	')
+"
+DEPEND="
+	${RDEPEND}
+	>=dev-cpp/eigen-3.3.1:3
+"
+BDEPEND="
+	app-text/dos2unix
+	dev-lang/swig
+"
+
+# To get required dependencies:
+# 'grep REQUIRES_MODS cMake/FreeCAD_Helpers/CheckInterModuleDependencies.cmake'
+# We set the following requirements by default:
+# arch, draft, drawing, import, mesh, part, qt5, sketcher, spreadsheet, start, web.
+#
+# Additionally, we auto-enable mesh_part, flat_mesh and smesh
+# Fem actually needs smesh, but as long as we don't have a smesh package, we enable
+# smesh through the mesh USE flag. Note however, the fem<-smesh dependency isn't
+# reflected by the REQUIRES_MODS macro, but at
+# cMake/FreeCAD_Helpers/InitializeFreeCADBuildOptions.cmake:187.
+#
+# The increase in auto-enabled workbenches is due to their need in parts of the
+# test suite when compiled with a minimal set of USE flags.
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	inspection? ( points )
+	path? ( robot )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.19.4-Gentoo-specific-don-t-check-vcs.patch
+	"${FILESDIR}"/${PN}-0.19.1-0001-Gentoo-specific-Remove-ccache-usage.patch
+)
+
+DOCS=( CODE_OF_CONDUCT.md ChangeLog.txt README.md )
+
+CHECKREQS_DISK_BUILD="2G"
+
+pkg_setup() {
+	check-reqs_pkg_setup
+	python-single-r1_pkg_setup
+	[[ -z ${CASROOT} ]] && die "\${CASROOT} not set, please run eselect opencascade"
+}
+
+src_prepare() {
+	# Fix desktop file
+	sed -e 's/Exec=FreeCAD/Exec=freecad/' -i src/XDGData/org.freecadweb.FreeCAD.desktop || die
+
+	find "${S}" -type f -exec dos2unix -q {} \; || die "failed to convert to unix line endings"
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_ADDONMGR=$(usex addonmgr)
+		-DBUILD_ARCH=ON
+		-DBUILD_ASSEMBLY=OFF					# deprecated
+		-DBUILD_CLOUD=$(usex cloud)
+		-DBUILD_COMPLETE=OFF					# deprecated
+		-DBUILD_DRAFT=ON
+		-DBUILD_DESIGNER_PLUGIN=$(usex designer)
+		-DBUILD_DRAWING=ON
+		-DBUILD_ENABLE_CXX_STD:STRING="C++17"	# needed for >=boost-1.77.0
+		-DBUILD_FEM=$(usex fem)
+		-DBUILD_FEM_NETGEN=OFF
+		-DBUILD_FLAT_MESH=ON
+		-DBUILD_FORCE_DIRECTORY=ON				# force building in a dedicated directory
+		-DBUILD_FREETYPE=ON						# automagic dep
+		-DBUILD_GUI=$(usex !headless)
+		-DBUILD_IDF=$(usex idf)
+		-DBUILD_IMAGE=$(usex image)
+		-DBUILD_IMPORT=ON						# import module for various file formats
+		-DBUILD_INSPECTION=$(usex inspection)
+		-DBUILD_JTREADER=OFF					# code has been removed upstream, but option is still there
+		-DBUILD_MATERIAL=$(usex material)
+		-DBUILD_MESH=ON
+		-DBUILD_MESH_PART=ON
+		-DBUILD_OPENSCAD=$(usex openscad)
+		-DBUILD_PART=ON
+		-DBUILD_PART_DESIGN=$(usex part-design)
+		-DBUILD_PATH=$(usex path)
+		-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_SHOW=$(usex show)
+		-DBUILD_SKETCHER=ON						# needed by draft workspace
+		-DBUILD_SMESH=ON
+		-DBUILD_SPREADSHEET=ON
+		-DBUILD_START=ON
+		-DBUILD_SURFACE=$(usex surface)
+		-DBUILD_TECHDRAW=$(usex techdraw)
+		-DBUILD_TEST=ON							# always build test workbench for run-time testing
+		-DBUILD_TUX=$(usex tux)
+		-DBUILD_VR=OFF
+		-DBUILD_WEB=ON							# needed by start workspace
+		-DBUILD_WITH_CONDA=OFF
+
+		-DCMAKE_INSTALL_DATADIR=/usr/share/${PN}/data
+		-DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF}
+		-DCMAKE_INSTALL_INCLUDEDIR=/usr/include/${PN}
+		-DCMAKE_INSTALL_PREFIX=/usr/$(get_libdir)/${PN}
+
+		-DFREECAD_BUILD_DEBIAN=OFF
+
+		-DFREECAD_USE_EXTERNAL_KDL=ON
+		-DFREECAD_USE_EXTERNAL_SMESH=OFF		# no package in Gentoo
+		-DFREECAD_USE_EXTERNAL_ZIPIOS=OFF		# doesn't work yet, also no package in Gentoo tree
+		-DFREECAD_USE_FREETYPE=ON
+		-DFREECAD_USE_OCC_VARIANT:STRING="Official Version"
+		-DFREECAD_USE_PCL=$(usex pcl)
+		-DFREECAD_USE_PYBIND11=ON
+		-DFREECAD_USE_QT_FILEDIALOG=ON
+		-DFREECAD_USE_QTWEBMODULE:STRING="Qt WebEngine"
+
+		# install python modules to site-packages' dir. True only for the main package,
+		# sub-packages will still be installed inside /usr/lib64/freecad
+		-DINSTALL_TO_SITEPACKAGES=ON
+
+		# Use the version of shiboken2 that matches the selected python version
+		-DPYTHON_CONFIG_SUFFIX="-${EPYTHON}"
+		-DPython3_EXECUTABLE=${PYTHON}
+	)
+
+	if use debug; then
+		# BUILD_SANDBOX currently broken, see
+		# https://forum.freecadweb.org/viewtopic.php?f=4&t=36071&start=30#p504595
+		mycmakeargs+=(
+			-DBUILD_SANDBOX=OFF
+			-DBUILD_TEMPLATE=ON
+		)
+	else
+		mycmakeargs+=(
+			-DBUILD_SANDBOX=OFF
+			-DBUILD_TEMPLATE=OFF
+		)
+	fi
+
+	cmake_src_configure
+}
+
+# We use the FreeCADCmd binary instead of the FreeCAD binary here
+# for two reasons:
+# 1. It works out of the box with USE=headless as well, not needing a guard
+# 2. We don't need virtualx.eclass and it's dependencies
+# The exported environment variables are needed, so freecad does know
+# where to save it's temporary files, and where to look and write it's
+# configuration. Without those, there are sandbox violation, when it
+# tries to create /var/lib/portage/home/.FreeCAD directory.
+src_test() {
+	pushd "${BUILD_DIR}" > /dev/null || die
+	export FREECAD_USER_HOME="${HOME}"
+	export FREECAD_USER_DATA="${T}"
+	export FREECAD_USER_TEMP="${T}"
+	nonfatal ./bin/FreeCADCmd --run-test 0
+	popd > /dev/null || die
+}
+
+src_install() {
+	cmake_src_install
+
+	dobin src/Tools/freecad-thumbnailer
+
+	if ! use headless; then
+		dosym -r /usr/$(get_libdir)/${PN}/bin/FreeCAD /usr/bin/freecad
+		mv "${ED}"/usr/$(get_libdir)/${PN}/share/* "${ED}"/usr/share || die "failed to move shared resources"
+	fi
+	dosym -r /usr/$(get_libdir)/${PN}/bin/FreeCADCmd /usr/bin/freecadcmd
+
+	python_optimize "${ED}"/usr/share/${PN}/data/Mod/Start/StartPage "${ED}"/usr/$(get_libdir)/${PN}{/Ext,/Mod}/
+	# compile main package in python site-packages as well
+	python_optimize
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	einfo "You can load a lot of additional workbenches using the integrated"
+	einfo "AddonManager."
+
+	# ToDo: check opencv, pysolar (::science), elmerfem (::science)
+	#		ifc++, ifcopenshell, netgen, z88 (no pkgs), calculix-ccx (::waebbl)
+	einfo "There are a lot of additional tools, for which FreeCAD has builtin"
+	einfo "support. Some of them are available in Gentoo. Take a look at"
+	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 "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 "PBR Rendering" media-gfx/povray
+	optfeature_header "Import / Export"
+	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_header "Meshing and FEM"
+	optfeature "FEM mesh generator" sci-libs/gmsh
+	optfeature "Triangulating meshes" sci-libs/gts
+	optfeature "Visualization" sci-visualization/paraview
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+}
diff --git a/media-gfx/graphicsmagick/Manifest b/media-gfx/graphicsmagick/Manifest
index eb87eb406aa1..dcc78facfd6b 100644
--- a/media-gfx/graphicsmagick/Manifest
+++ b/media-gfx/graphicsmagick/Manifest
@@ -3,7 +3,7 @@ AUX graphicsmagick-1.3.36-flags.patch 2009 BLAKE2B 1d58f03cfeac9be92e2e85a2b6274
 AUX graphicsmagick-1.3.38-configure-bashism.patch 1203 BLAKE2B 0aa4a6cccd1f7e392446db33446b706df0e5a82b77abba3901ea7e8190ed592a4ce17b0544f08b59900cd48b3e57e029862ef94120ceca75536959fba15b9f7f SHA512 e45bc482381e4c58cd854d9d28b8a3a7bf83bc707f5d3a6290f28b1b333c84778c5e185f0a637348a2fbaac56790d6b9ddee1f2ee660ba67912300039d872330
 DIST GraphicsMagick-1.3.38.tar.xz 5958352 BLAKE2B 132c8b2303690dbe84b0e9ab33db0c0861845ef0260915e33197912dbcae02ae70c27bce634cfe0ab6b739ef6f3e828cbea9043fc90be993fb2c4a5e33e20ee9 SHA512 478f9e2907d4cb1099b0cbd1a73e4ab58aef94edf6cb1636ce48a378084ec1671599fd4f369455e5af898e94d1386f7149f6933b7c668027a6f6952bc763ec3a
 DIST GraphicsMagick-1.3.38.tar.xz.sig 119 BLAKE2B 166b7bb6de30af22d1f2317812f76dee43dd69c5557613deea35de3767624466c07001fe029ec9d33d0c61ed2fe5ca3f48bf435853374c722963a1293bfaa7a1 SHA512 c6dfee7e4b63b646460f9045ca5c8f3105d1a761ec3cd3471b53293178ed9a963884539c8026d934ce1915654d517a9b30232d7260a13f6d7dbeb5a592485b09
-EBUILD graphicsmagick-1.3.38-r2.ebuild 3904 BLAKE2B 4e310be38bb67c4d8ca27ff8075e88b5a410d1b290e7e7bfc40cdf2e596751298e36f9dfdd66f1832900e13fb2fb93c1cca1e7e7f1a4e9e502ba6a11f7cfbea8 SHA512 ceaa03f05154208e1a83e10b756144ced6db2a55578a11403cb86489765ed4dc86de011c98f452b40df0bc4c3b65f688db8b26ca94b407351c50fd1385d5243d
+EBUILD graphicsmagick-1.3.38-r2.ebuild 3900 BLAKE2B 39c9db8e20b5b640bebab2a1f8c16d1cd6bc70f0e95e5c0efd4251da1193ab48df7881c04637768526045edcf040b99956698182a2f3630ad9f3ad87da761f59 SHA512 88bd009a0f72b428e78c74f357b2129191ff916bf88e2bf913e766b93be1eb5c9fe5b2aea69aaf12808483aa75ce13739907c6fadfbd1d2a35fffef37b7df172
 EBUILD graphicsmagick-1.3.38.ebuild 3638 BLAKE2B 7e1d36212824ba42e77ec729b79002f566c667ee4a8e17e6c8d205485d976eee5b07308116f06aecb2cfa9763d47380acacd1796d3082f1e424bdcaef38cc562 SHA512 eeeda1a6e9cf3f8e038355249147f63444e009a7ca8b2432e6f6d76f12bb39ec4916ce4e2d98a68a2e0e9d2af68dc9471d23514dc30c86a724fb588bcb7b0882
 EBUILD graphicsmagick-9999.ebuild 3863 BLAKE2B de21652d2106509ffd3ba88039f2a8eb71d33a5dab2a8b7a715bed7c9c15fc1c8577a8eb2749c15a39421cd0f7a61635e9c0a601084f00a427300b3756c4a046 SHA512 7ed019f0b6991cd17bd64ac9df5af809b2a0f1381a5fbf965ef3982b17d87974829dce568ac633b1cf9337ee87082b11a0e9c458c9bc1ac7b70734625cdb8693
 MISC metadata.xml 1354 BLAKE2B 06f26407c7bbdbea6bb6ed510c3f497960a3ce8bf2ec296d3ff69eea8377774b7f7a1b37cb43eb63f7e7a31c4f74d978bb1ef863db9f87dba8d769aeca5e80c5 SHA512 9caa2359b6b15b397ce6108ebe941fd029e6b3d371c779a7bb3df5e0276b681067502aa10d12f5ab3eb427679818fdaa525dfdfba09c1fccf2511e23156aef7c
diff --git a/media-gfx/graphicsmagick/graphicsmagick-1.3.38-r2.ebuild b/media-gfx/graphicsmagick/graphicsmagick-1.3.38-r2.ebuild
index b5c50bed9b04..3bada7096c9f 100644
--- a/media-gfx/graphicsmagick/graphicsmagick-1.3.38-r2.ebuild
+++ b/media-gfx/graphicsmagick/graphicsmagick-1.3.38-r2.ebuild
@@ -19,7 +19,7 @@ else
 	SRC_URI+=" verify-sig? ( mirror://sourceforge/${PN}/${MY_P}.tar.xz.sig )"
 	S="${WORKDIR}/${MY_P}"
 
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 	BDEPEND="verify-sig? ( sec-keys/openpgp-keys-bobfriesenhahn )"
 fi
diff --git a/media-gfx/mscgen/Manifest b/media-gfx/mscgen/Manifest
index 7eb872800164..0043ce521639 100644
--- a/media-gfx/mscgen/Manifest
+++ b/media-gfx/mscgen/Manifest
@@ -1,3 +1,3 @@
 DIST mscgen-src-0.20.tar.gz 204818 BLAKE2B c4ae701ead1ec5845ea80e1fd19b88ff77e3cf2f462c843a2561cf06a5a3faacd8fcd891031256f9014b069ccae02c82221b3b6bb173a68aa747fe7051bc2225 SHA512 12fdea38633a42d6d235520550b16bea0cd3fb67d198b1f956845f4057239d7f80fa961e37f6f8bad9fb03f29ff8c6ffab4f4ae7402eea3083dfddeaf39687e3
-EBUILD mscgen-0.20.ebuild 922 BLAKE2B c29da57c2c150873aece76521daa335161b922b1759958148c0bdf6aaed9f1bbc870ec98374cf380eefd3492530c30f6055d78a8f97e3e212c73f7825b558bbe SHA512 2256af9f011a632e73104cdfcf7854796bc4a2a2193f1b38b94fb8fa999d52a244c9bef2287c8a7f5a00010db3c9272a855250e0b5559bd2732db773f4cfed05
+EBUILD mscgen-0.20.ebuild 923 BLAKE2B a76d6888823f1ec1b098fca9130071bbc7f02a6237f14ab7a3a927dfad2b8052756a1f388ff1af39da78b9ea99bbc237b16b38a9e6aa126f4ec31b8b2de508c9 SHA512 4f7f221fc4911a9c4e216afd365e02c86ffbd627ba809ec2f2b942dc2af938fa456276a6c66f79d03c5c84791e5134ae6afd2b8ba29e5e2199140afe58d6d381
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/media-gfx/mscgen/mscgen-0.20.ebuild b/media-gfx/mscgen/mscgen-0.20.ebuild
index 523b6dcfabed..c0703608abf4 100644
--- a/media-gfx/mscgen/mscgen-0.20.ebuild
+++ b/media-gfx/mscgen/mscgen-0.20.ebuild
@@ -5,13 +5,13 @@ EAPI=7
 
 inherit autotools
 
-DESCRIPTION="A message sequence chart generator"
-HOMEPAGE="http://www.mcternan.me.uk/mscgen/"
-SRC_URI="http://www.mcternan.me.uk/${PN}/software/${PN}-src-${PV}.tar.gz"
+DESCRIPTION="Message sequence chart generator"
+HOMEPAGE="https://www.mcternan.me.uk/mscgen/"
+SRC_URI="https://www.mcternan.me.uk/${PN}/software/${PN}-src-${PV}.tar.gz"
 
 KEYWORDS="amd64 arm ~arm64 ppc ppc64 x86 ~x64-solaris"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 IUSE="png truetype"
 REQUIRED_USE="truetype? ( png )"
diff --git a/media-gfx/svg2rlg/Manifest b/media-gfx/svg2rlg/Manifest
index 24791e0f3bcf..0e45b181932a 100644
--- a/media-gfx/svg2rlg/Manifest
+++ b/media-gfx/svg2rlg/Manifest
@@ -1,3 +1,3 @@
 DIST svg2rlg-0.4.0.tar.gz 504861 BLAKE2B bfd147d824d5a49f8621e705f6bdeefdaa571918db94afea8e839d048d2089a8c8ebf8e2763caa9866f55a7142e1bb3522b01f53eaf5b8343164a08ee0983ef3 SHA512 e3813a22784c2199a1df69574c64093347a153fa2b7a40e2f38f52e5d46d7ca8d6e8e3bbe54ab59381f6c7246352c016ff3e19b1278c6f2c8dcfbe8bd7017b12
-EBUILD svg2rlg-0.4.0.ebuild 761 BLAKE2B bba55bb06407c1c7ad581bd8b92c3da529dd39e7bcb063619faf6c901ca889986f17cc635a0ae1de1c604ef67ea32979e05abd98dca8f1fa197011a4f00aadb7 SHA512 c016b034bcc7d5edda641c7c736b3609bab097764fa1008dee627aa73b7e50bf2153756232b7058fb628d583282979734c6ee06ba09c9ce7120d18b69205f897
+EBUILD svg2rlg-0.4.0.ebuild 757 BLAKE2B 992e5ed74a3eb2acaa44e453f8749f94059db700175150465b2d937b14ce11fb5d7574a2e0d56b3efea9b67982aefeaac84b03b1093d5861aff938a9d4cb50e3 SHA512 09327a8025fa0eb650ded78d95b417e6cfa9e229dfa7a35673e8b35b0f84c30304b3ef80a019f3f1f17071766b25daeff764a0db1a02d4fe3c77cf094fe94830
 MISC metadata.xml 248 BLAKE2B b8c3f3218b1a5b5a815a2a09751730237a898cdfe3b4efddbbe6cf0289c4784c1317447a7d511af25cd83e9b24cf0a1d2ead158ffd3917f2e83d83ff9868743b SHA512 403566e808f63d98634f04fa0953a6e1ec6d679a2d68cc88d38c8b150388bc93960ce9ef3134d16d72602a531ffa4dde18c8bb09c1f1d82658e381e514c859af
diff --git a/media-gfx/svg2rlg/svg2rlg-0.4.0.ebuild b/media-gfx/svg2rlg/svg2rlg-0.4.0.ebuild
index 54e19aeeca83..0c86b5cb4198 100644
--- a/media-gfx/svg2rlg/svg2rlg-0.4.0.ebuild
+++ b/media-gfx/svg2rlg/svg2rlg-0.4.0.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
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
 DESCRIPTION="Converts SVG files to PDFs or reportlab graphics"
-HOMEPAGE="https://github.com/sarnold/svg2rlg https://pypi.python.org/pypi/svg2rlg/"
+HOMEPAGE="https://github.com/sarnold/svg2rlg https://pypi.org/project/svg2rlg/"
 
 if [[ ${PV} = 9999* ]]; then
 	EGIT_REPO_URI="https://github.com/sarnold/svg2rlg.git"