gentoo resync : 04.01.2022

author: V3n3RiX <venerix@koprulu.sector> 2022-01-04 01:27:12 +0000
committer: V3n3RiX <venerix@koprulu.sector> 2022-01-04 01:27:12 +0000
commit: 3517852e3b8a68d1e997770fc0650c5053bafc6c (patch)
tree: 44068672445b1418489aed82de58df3c470289e7 /media-gfx
parent: 0f15659d48c193027158492acb726297501202c5 (diff)
44 files changed, 733 insertions, 197 deletions
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index bf93d97364f7..5c2beefb6ca8 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/ansilove/Manifest b/media-gfx/ansilove/Manifest
index 2464dd0fed37..d2bcefb83852 100644
--- a/media-gfx/ansilove/Manifest
+++ b/media-gfx/ansilove/Manifest
@@ -1,4 +1,4 @@
 DIST ansilove-4.1.5.tar.gz 41325 BLAKE2B fa0943406b5a905f30fd114ed9760a37da1bcb7bd8bb7575272d1cffadaf0302650c65af64e97f911cff7b9eb4283bedd6fc0fc13c9aa5be88c582c44925c30b SHA512 a84253b07d82b4d0598cf6936115476933636a978805fe243a671bbdbe15d0e589b45f9e4d7b6137e5f7ab22559b9d1a84a0508db5226ccc17e20687e190e553
-EBUILD ansilove-4.1.5.ebuild 636 BLAKE2B f4c92385468b8511070a7e05efe1a784eb58ebb0d0351a149e2f920c614bd1f34991d83b6838989ed9d2a36114cc452ef6e329b0555d554a206a34a1462d81a9 SHA512 9b213e63bc0c2efd4db33d1de335250b762b1e6d4fd6790bed7b17c208169a3ed317d38cdbe8beb3a5d63f4d1b538201e7e043bf2b8191a81853439ad545271e
-EBUILD ansilove-9999.ebuild 636 BLAKE2B f4c92385468b8511070a7e05efe1a784eb58ebb0d0351a149e2f920c614bd1f34991d83b6838989ed9d2a36114cc452ef6e329b0555d554a206a34a1462d81a9 SHA512 9b213e63bc0c2efd4db33d1de335250b762b1e6d4fd6790bed7b17c208169a3ed317d38cdbe8beb3a5d63f4d1b538201e7e043bf2b8191a81853439ad545271e
+EBUILD ansilove-4.1.5.ebuild 655 BLAKE2B 7cc834fed7e11c03823a0d183b83bdf7c317824a621fe231479f8db015a5dc7f38ee764126ff9bc20492332e7171dc4cc7874baaee12e7ae5eced7bde8529cad SHA512 7b358acee93c27d8ade686d6d934fdf36a6f97a0dacde8eafadf4aac790813d13005f615075e5d10592182e2f3de21ad3adca0f968de7744b240e99fba8c5279
+EBUILD ansilove-9999.ebuild 643 BLAKE2B 50f0657591a07a80fb4390d0d3bb7a3bf29c6f0875bb32ef05eda7ffcf8b1e1a6004bbd58256884d8fd7d058deb1e47540a530e3f65b6903abe3008c0dccfc8b SHA512 17f01ca575484ec8c383272254b5e0526faff6e39211d46954423e9412364fac15f6100ee16935f37ce1f6e13bda7e8e6d566f5169cb5f070aadf48cad960e99
 MISC metadata.xml 1125 BLAKE2B 31e6d5d634610b818cd0bdc5b93f37613499492d7f2366d10f40149a64b7b44806db396d118175e296a3d709f4a283ca8c06bafcbac6901d6fd2176ba5a9b9c1 SHA512 53407cbca0a8fea14265519645230b0baddea348fc4cc2008ab963019c26eb83004e7cacef0415e139049fa5d9316f6d2933628d437aa886954ed2270c8a9be8
diff --git a/media-gfx/ansilove/ansilove-4.1.5.ebuild b/media-gfx/ansilove/ansilove-4.1.5.ebuild
index 747102f7845f..37c8d92aff51 100644
--- a/media-gfx/ansilove/ansilove-4.1.5.ebuild
+++ b/media-gfx/ansilove/ansilove-4.1.5.ebuild
@@ -13,7 +13,7 @@ if [[ "${PV}" == *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/ansilove/${PN}.git"
 else
 	SRC_URI="https://github.com/ansilove/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
+	KEYWORDS="~amd64 ~arm ~arm64 ~riscv"
 fi
 
 LICENSE="BSD-2"
diff --git a/media-gfx/ansilove/ansilove-9999.ebuild b/media-gfx/ansilove/ansilove-9999.ebuild
index 747102f7845f..31678da8b02c 100644
--- a/media-gfx/ansilove/ansilove-9999.ebuild
+++ b/media-gfx/ansilove/ansilove-9999.ebuild
@@ -13,7 +13,7 @@ if [[ "${PV}" == *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/ansilove/${PN}.git"
 else
 	SRC_URI="https://github.com/ansilove/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
+	KEYWORDS="~amd64 ~riscv"
 fi
 
 LICENSE="BSD-2"
diff --git a/media-gfx/argyllcms/Manifest b/media-gfx/argyllcms/Manifest
index 92e59d0cfa4a..c922ff43370b 100644
--- a/media-gfx/argyllcms/Manifest
+++ b/media-gfx/argyllcms/Manifest
@@ -2,7 +2,9 @@ AUX argyllcms-2.1.2-fno-common.patch 5132 BLAKE2B 5398d60a364a36ea24d6cce682330d
 DIST Argyll_V2.1.2_src.zip 13837056 BLAKE2B cf6181549e37b1deda11bdd4a63b27e101180a1e82b132ea8dca5af6830a74d5e2f940633f5aecf9a8d62fe8c2b0cdce8f2af44124ce7432b33d2a1bdbaa2c21 SHA512 f49b588c5f0a39edcc30a068a8bde8c7b74611d3feb15d07d4a61b205ed1231c288629f65e1a5a60a3921d552a28e075667ada555401a0d9694fd882bddd4b06
 DIST Argyll_V2.2.0_src.zip 14020205 BLAKE2B e278f31de2c09e7d736d13b0ada01a6ff8b0641dcbef2e82ba83987f7835d3cfbe71e479314c76be91725698dbdff8f5a77b607dbdda340a9c583c82477cc9d0 SHA512 42552ebd10280df16ec419e3c7ce6700db2c290e26ab4ab62296bf92abc90dd50265aef04b5b8f0a5bee735d485760bab4278e38d27b2a245c5a3122cbf2ba88
 DIST Argyll_V2.2.1_src.zip 14030108 BLAKE2B 22785536a3a5113998947294c34512e3b6dd5d080a11dbcfe3c4b0c22e34277656ba8dc6fa8f59a9dd20cf69692bd24b4e53044086d21bcf7c6d93820c6dbc4e SHA512 58339dfc550950703a5ab6708765a4f01e5fcdeeac54c750e8db82b7ea0dd9b42e9f1163524811a93beabb86cbf557b37302fc4a6a5c1a339cba8af9dcd3e239
+DIST Argyll_V2.3.0_src.zip 14042268 BLAKE2B 3611198746bc443d3425bd297ee6c36f3ae28ace24bfa011a7b0fa491ac1185418f0fba004c2d076f350a27d176d1a6295c26584906744de6002bff6b55035e4 SHA512 959ee656967de583d3061f8c345b6c6cdb86bb23aab21f961271563b7ce33da9e64492a9f1bb248a92ff16709b1c13ef6ccbd4478df92e4b90c62a992d79eedd
 EBUILD argyllcms-2.1.2-r1.ebuild 2109 BLAKE2B 613f7e41d8f53956e534b962f21f8c0ac95ce5658fc63228b75bc9610a13bfa73c25e18b8c5c0cfaa49af53105a6389ebd2b926337b73cf732bf072dca448db2 SHA512 a2b8af905f634fbebf45073fa5fd7f9885b483e2e9c16015c701b79bdb7802840d5f3fa4ce67fee29c801448efaa7947160a808b9a4e229de56ea4b881d62aac
 EBUILD argyllcms-2.2.0.ebuild 2070 BLAKE2B 96061849cc2b8601111b30ab9f301216fbe0a7e90da29e04f628ecb631c9e062a30df128857f583fc70bbf40ee5400497b4c0f331ea3bfb7d6ae9263abab2d15 SHA512 601dbe59b9e94f45cc0f2cdac3156c77bcaa97672a018d664de88e998a0021bc9eb7f700d6d4da61cd1505994dc7be2c8a82c81164d103f54818f2a31b16d948
 EBUILD argyllcms-2.2.1.ebuild 2070 BLAKE2B 96061849cc2b8601111b30ab9f301216fbe0a7e90da29e04f628ecb631c9e062a30df128857f583fc70bbf40ee5400497b4c0f331ea3bfb7d6ae9263abab2d15 SHA512 601dbe59b9e94f45cc0f2cdac3156c77bcaa97672a018d664de88e998a0021bc9eb7f700d6d4da61cd1505994dc7be2c8a82c81164d103f54818f2a31b16d948
+EBUILD argyllcms-2.3.0.ebuild 2070 BLAKE2B 96061849cc2b8601111b30ab9f301216fbe0a7e90da29e04f628ecb631c9e062a30df128857f583fc70bbf40ee5400497b4c0f331ea3bfb7d6ae9263abab2d15 SHA512 601dbe59b9e94f45cc0f2cdac3156c77bcaa97672a018d664de88e998a0021bc9eb7f700d6d4da61cd1505994dc7be2c8a82c81164d103f54818f2a31b16d948
 MISC metadata.xml 253 BLAKE2B 8557c513beef73e834b0a000c523a3241da961c6307b6e98ac857dad0888c4bbd028c98f8499f01086c24e8f2f57c64bc75db20154dab232adefc2510fccac03 SHA512 67dd372ef7b684101d9198c6199a6403f8750132d80aab4f4daa4b31ebaea3d82eb9a18e904734e2ac10c77b237d67210055949ff1c6d5aad4f75951a096884a
diff --git a/media-gfx/argyllcms/argyllcms-2.3.0.ebuild b/media-gfx/argyllcms/argyllcms-2.3.0.ebuild
new file mode 100644
index 000000000000..d4e795b9baee
--- /dev/null
+++ b/media-gfx/argyllcms/argyllcms-2.3.0.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic multiprocessing toolchain-funcs udev
+
+MY_P="Argyll_V${PV}"
+
+DESCRIPTION="Open source, ICC compatible color management system"
+HOMEPAGE="http://www.argyllcms.com/"
+SRC_URI="http://www.argyllcms.com/${MY_P}_src.zip"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~hppa ~riscv ~x86"
+IUSE="doc"
+
+RDEPEND="
+	media-libs/tiff:0
+	sys-libs/zlib
+	virtual/jpeg:0
+	x11-libs/libX11
+	x11-libs/libXau
+	x11-libs/libXdmcp
+	x11-libs/libXext
+	x11-libs/libXinerama
+	x11-libs/libXrandr
+	x11-libs/libXxf86vm
+	x11-libs/libXScrnSaver
+	dev-libs/openssl:0=
+"
+DEPEND="${RDEPEND}"
+BDEPEND="app-arch/unzip
+	dev-util/ftjam"
+
+S="${WORKDIR}/${MY_P}"
+
+src_compile() {
+	# Make it respect LDFLAGS
+	echo "LINKFLAGS += ${LDFLAGS} ;" >> Jamtop
+
+	# Evil hack to get --as-needed working. The build system unfortunately lists all
+	# the shared libraries by default on the command line _before_ the object to be built...
+	echo "STDLIBS += -ldl -lrt -lX11 -lXext -lXxf86vm -lXinerama -lXrandr -lXau -lXdmcp -lXss -ltiff -ljpeg ;" >> Jamtop
+
+	append-cflags -DUNIX -D_THREAD_SAFE
+
+	sed \
+		-e 's:CCFLAGS:CFLAGS:g' \
+		-e "s:ar rusc:$(tc-getAR) rusc:g" \
+		-i Jambase || die
+
+	tc-export CC RANLIB
+
+	jam -dx -fJambase "-j$(makeopts_jobs)" || die
+}
+
+src_install() {
+	jam -dx -fJambase install || die
+
+	rm bin/License.txt || die
+
+	pushd bin > /dev/null
+	local binname
+	for binname in * ; do
+		newbin ${binname} argyll-${binname}
+	done
+	popd > /dev/null
+
+	dodoc log.txt Readme.txt ttbd.txt notes.txt
+	if use doc;  then
+		docinto html
+		dodoc doc/*html doc/*jpg doc/*gif
+	fi
+
+	insinto /usr/share/${PN}
+	doins -r ref
+
+	udev_dorules usb/55-Argyll.rules
+}
+
+pkg_postinst() {
+	elog "If you have a Spyder2 you need to extract the firmware"
+	elog "from the CVSpyder.dll of the windows driver package"
+	elog "and store it as /usr/share/color/spyd2PLD.bin"
+	echo
+	elog "For further info on setting up instrument access read"
+	elog "http://www.argyllcms.com/doc/Installing_Linux.html"
+	echo
+}
diff --git a/media-gfx/asymptote/Manifest b/media-gfx/asymptote/Manifest
index 6594db4b53a2..191b9d8324ec 100644
--- a/media-gfx/asymptote/Manifest
+++ b/media-gfx/asymptote/Manifest
@@ -2,5 +2,7 @@ AUX 64asymptote-gentoo.el 337 BLAKE2B 56b028184573dd8db6babd90ae45838b9788671134
 AUX asymptote-2.70-info.patch 436 BLAKE2B 70eac7625341e21f9cf03cf1ea08e4864fe102627349f2411680b9c18f4df508f5cd6972f9e6dc719795f0323c51b6a5d096e9e3cae81cc1ee497f3f9325fafd SHA512 5b7494351bef5240bd4dba531a3eb68d3a6025990f32fe4064df31e351df9cfb27be29c69b16309929a63ec8d164eb4f2b14315406e546c7dba9dc416ae6b8d4
 AUX asymptote-2.70-xdg-utils.patch 791 BLAKE2B 971b2f1c6a4db7e39cc2d4bac0e3e6cc951733fb0718ace6e6807f63585fe8f4aa6f8519c6e03ed75f0176dca87e705d1b7175e0c1c7a1e79eb6c15dc4f2df76 SHA512 f78359aa71adfcea4ba31e3cae4c30aca47e39337b647f6fb2ad5264bd318a45071fcc47b1bbe5cc4c59c6b707b7b17461af62add2ee2477027d95d369f29994
 DIST asymptote-2.70.src.tgz 4674495 BLAKE2B 126b2e99222e6ae438aaef89df00b8eae19118c3ef42d2fab0b0117f343911939e680d22e903b784213186a5d2eeeecb112afba1467562e7127c34de4bc66773 SHA512 24d60af361e3f0309a896ce8163da6fc0a9d6587efe726c5acf874dcb74f4d51b4bad8146a615ff54173ef06dac53117fd1cc09c77940271adc9f64cac6bcfe6
+DIST asymptote-2.74.src.tgz 12510904 BLAKE2B 8c899f44c8572594fc1526204cfb8f4c3d503dcbd32ebf713eb507ab03966eb335fff8d1b071b568d226588e8b99a6c494b14602d30d1f654cb68b52874ff12e SHA512 cc9a4e6f4ceca5ed356b8ec0dd2d21c23fe19d28492e42cb9cc020759886aedcac1f909c35f6759a1cc6b2f8a2fe6569cc9f5e4686da139188354551e21c183b
 EBUILD asymptote-2.70-r1.ebuild 5403 BLAKE2B 0f0b33d281fb4c971ecd93b87ed42089892f070de136dc433b368eb9e0602844e09618b2290b112c16392668f5ae8724aa81bf0ab2115a38e79dda2e64098ea4 SHA512 9a6037b44a252dab2c24f0febd6089e87b4a023819485ba9506fd129d24c86b95a93fb82b007c8ce6f0ee4ca08194115ca6bce2295f8e86ae94ec1e98c10b13b
-MISC metadata.xml 1364 BLAKE2B 001773c7fee48e9cf4fc1de2ed78b0b7d50c7cb435a0b67fa78806db279b51791aa362533df23dfce7e4704e2fe35be1f6943edb82f0a5bbe8a1ce55798a07cb SHA512 e30f36b4848cdb871089604fbc5eba1eff5b4f34db18982caedde9e40d61c9663684a11d02027e1e72b34e44191271d6b60131299da26c281ce40ee0df8390da
+EBUILD asymptote-2.74.ebuild 5510 BLAKE2B 90660ec67790a803c98bf4ebb25da8285cacecac45322a0c5deef710e521c5136456d14adbc0e0f21d44e3487919a7029bcaa7506c2fabcf1b3858e10afa7ccb SHA512 20e8c041842ba54d18dc4d517e5b8201187847e1573ac2710ac5a682082a4aaaa6bc23329c0c0473b8c82caf1420adcc7b7bc34e529985d97d8f9ed8532eb373
+MISC metadata.xml 1423 BLAKE2B 64dd5d6c928a11d4a47297362223164cb19d91f6a08a0582b66831e2e8e2d7594389c2244fa1527dfe945da0e67985f5c639e3dae2482f57b510bf828a4605ed SHA512 1561e416e56bca130a72f90886981f63224c21e2a077a7b93e6fdd877f38dd12dfa9e0b747840e7f459e2df16c5b08e0177d26c526eb21bebe00fa8c91326bc9
diff --git a/media-gfx/asymptote/asymptote-2.74.ebuild b/media-gfx/asymptote/asymptote-2.74.ebuild
new file mode 100644
index 000000000000..78ed3422c1b1
--- /dev/null
+++ b/media-gfx/asymptote/asymptote-2.74.ebuild
@@ -0,0 +1,242 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit autotools elisp-common latex-package python-r1
+
+DESCRIPTION="A vector graphics language that provides a framework for technical drawing"
+HOMEPAGE="https://asymptote.sourceforge.io/"
+SRC_URI="mirror://sourceforge/asymptote/${P}.src.tgz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="+boehm-gc context curl doc emacs examples fftw gsl +imagemagick latex lsp offscreen +opengl python sigsegv svg test vim-syntax X"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	offscreen? ( opengl )
+	doc? ( boehm-gc )"
+
+RDEPEND="
+	>=sys-libs/ncurses-5.4-r5:0=
+	>=sys-libs/readline-4.3-r5:0=
+	net-libs/libtirpc:=
+	imagemagick? ( media-gfx/imagemagick[png] )
+	opengl? ( media-libs/mesa[X(+)] media-libs/freeglut media-libs/glew:0 media-libs/glm )
+	offscreen? ( media-libs/mesa[osmesa] )
+	svg? ( app-text/dvisvgm )
+	sigsegv? ( dev-libs/libsigsegv )
+	boehm-gc? ( >=dev-libs/boehm-gc-7.0[cxx,threads] )
+	fftw? ( >=sci-libs/fftw-3.0.1:= )
+	gsl? ( sci-libs/gsl:= )
+	python? ( ${PYTHON_DEPS} )
+	curl? ( net-misc/curl )
+	lsp? (
+		dev-libs/boost
+		dev-libs/rapidjson
+		dev-libs/utfcpp
+	)
+	X? (
+		${PYTHON_DEPS}
+		dev-python/PyQt5[${PYTHON_USEDEP},gui,widgets,svg]
+		dev-python/numpy
+		dev-python/pycson
+		>=gnome-base/librsvg-2.40
+	)
+	latex? (
+		virtual/latex-base
+		>=dev-texlive/texlive-latexextra-2013
+	)
+	context? ( dev-texlive/texlive-context )
+	emacs? ( >=app-editors/emacs-23.1:* )
+	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )"
+DEPEND="${RDEPEND}
+	dev-lang/perl
+	doc? (
+		media-gfx/imagemagick[png]
+		virtual/texi2dvi
+		virtual/latex-base
+		app-text/ghostscript-gpl )
+	test? ( app-text/ghostscript-gpl )"
+
+TEXMF=/usr/share/texmf-site
+
+PATCHES=(
+	# Changing pdf, ps, image viewers to xdg-open
+	"${FILESDIR}/${PN}-2.70-xdg-utils.patch"
+
+	# Bug #322473
+	"${FILESDIR}/${PN}-2.70-info.patch"
+)
+
+src_prepare() {
+	sed -e "s:Datadir/doc/asymptote:Datadir/doc/${PF}:" \
+		-i configure.ac \
+		|| die "sed configure.ac failed"
+
+	default
+	eautoreconf
+}
+
+src_configure() {
+	# for the CPPFLAGS see
+	# https://sourceforge.net/forum/forum.php?thread_id=1683277&forum_id=409349
+	econf \
+		CPPFLAGS=-DHAVE_SYS_TYPES_H \
+		CFLAGS="${CXXFLAGS}" \
+		--disable-gc-debug \
+		--disable-gc-full-debug \
+		--with-latex=/usr/share/texmf-site/tex/latex \
+		--with-context=/usr/share/texmf-site/tex/context \
+		$(use_enable boehm-gc gc system) \
+		$(use_enable curl) \
+		$(use_enable lsp) \
+		$(use_enable fftw) \
+		$(use_enable gsl) \
+		$(use_enable opengl gl) \
+		$(use_enable offscreen) \
+		$(use_enable sigsegv)
+}
+
+src_compile() {
+	default
+
+	cd doc || die
+	emake asy.1
+	einfo "Making info"
+	cd png || die
+	emake ${PN}.info
+	cd .. || die
+	if use doc; then
+		cd FAQ || die
+		emake
+		cd .. || die
+		# pdf
+		einfo "Making pdf docs"
+		export VARTEXFONTS="${T}"/fonts
+		# see bug #260606
+		emake -j1 asymptote.pdf
+		emake CAD.pdf asy-latex.pdf asyRefCard.pdf
+	fi
+	cd .. || die
+
+	if use emacs; then
+		einfo "Compiling emacs lisp files"
+		elisp-compile base/*.el
+	fi
+}
+
+src_install() {
+	# the program
+	dobin asy
+
+	# .asy files
+	insinto /usr/share/${PN}
+	doins -r base/*.asy base/*.js base/*.sh base/*.ps base/shaders base/webgl
+	chmod 755 "${D}"/usr/share/${PN}/shaders/*
+
+	# documentation
+	dodoc README ReleaseNotes ChangeLog
+	cd doc || die
+	doman asy.1
+	doinfo png/${PN}.info
+	if use doc; then
+		dodoc FAQ/asy-faq.ascii
+		dodoc CAD.pdf asy-latex.pdf asyRefCard.pdf asymptote.pdf
+	fi
+	cd .. || die
+
+	# asymptote.py
+	if use python; then
+		python_moduleinto ${PN}
+		python_foreach_impl python_domodule aspy.py
+		python_foreach_impl python_domodule base/${PN}.py
+	fi
+
+	# X GUI
+	if use X; then
+		cd GUI || die
+		python_setup
+		sed -e 1d -i xasy.py
+		echo "#!/usr/bin/env ${EPYTHON}" > xasy1
+		cat xasy1 xasy.py > xasy
+		rm xasy1 xasy.py
+		mv xasy xasy.py
+		cd .. || die
+		python_domodule GUI
+		chmod 755 "${D}/$(python_get_sitedir)/${PN}/GUI/xasy.py"
+		dosym "$(python_get_sitedir)/${PN}/GUI/xasy.py" /usr/bin/xasy
+		doman doc/xasy.1x
+	fi
+
+	# examples
+	if use examples; then
+		docinto examples
+		dodoc \
+			examples/*.asy \
+			examples/*.views \
+			examples/*.dat \
+			examples/*.bib \
+			examples/*.png \
+			examples/*.pdb1 \
+			doc/*.asy \
+			doc/*.csv \
+			doc/*.dat \
+			doc/pixel.pdf \
+			doc/extra/*.asy
+		docinto examples/animations
+		dodoc examples/animations/*.asy
+	fi
+
+	# LaTeX style
+	if use latex; then
+		cd doc || die
+		insinto "${TEXMF}"/tex/latex/${PN}
+		doins *.sty latexmkrc
+		if use examples; then
+			docinto examples
+			dodoc latexusage.tex externalprc.tex
+			docinto examples/animations
+			dodoc ../examples/animations/*.tex
+		fi
+		cd .. || die
+	fi
+
+	# ConTeXt
+	if use context; then
+		insinto /usr/share/texmf-site/tex/context
+		doins doc/colo-asy.tex
+	fi
+
+	# emacs mode
+	if use emacs; then
+		elisp-install ${PN} base/*.el base/*.elc asy-keywords.el
+		elisp-site-file-install "${FILESDIR}"/64${PN}-gentoo.el
+	fi
+
+	# vim syntax
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles/syntax
+		doins base/asy.vim
+		insinto /usr/share/vim/vimfiles/ftdetect
+		doins base/asy_filetype.vim
+	fi
+}
+
+pkg_postinst() {
+	use latex && latex-package_rehash
+	use emacs && elisp-site-regen
+
+	elog 'Use the variable ASYMPTOTE_PSVIEWER to set the postscript viewer'
+	elog 'Use the variable ASYMPTOTE_PDFVIEWER to set the PDF viewer'
+}
+
+pkg_postrm() {
+	use latex && latex-package_rehash
+	use emacs && elisp-site-regen
+}
diff --git a/media-gfx/asymptote/metadata.xml b/media-gfx/asymptote/metadata.xml
index e9eec6f0fe79..ae70c43a3e24 100644
--- a/media-gfx/asymptote/metadata.xml
+++ b/media-gfx/asymptote/metadata.xml
@@ -22,6 +22,7 @@
 		<flag name="boehm-gc">Enables using the Boehm-Demers-Weiser conservative garbage collector</flag>
 		<flag name="context">Enables support for ConTeXt format (<pkg>dev-texlive/texlive-context</pkg>)</flag>
 		<flag name="curl">Enables running remote programs via <pkg>net-misc/curl</pkg></flag>
+		<flag name="lsp">Enables Language Server Protocol</flag>
 		<flag name="sigsegv">Enables using <pkg>dev-libs/libsigsegv</pkg></flag>
 		<flag name="offscreen">Enables off-screen rendering</flag>
 	</use>
diff --git a/media-gfx/cropgui/Manifest b/media-gfx/cropgui/Manifest
index 9a67ef145012..d9ba7c59c87c 100644
--- a/media-gfx/cropgui/Manifest
+++ b/media-gfx/cropgui/Manifest
@@ -1,5 +1,7 @@
 DIST cropgui-0.4.1.tar.gz 852958 BLAKE2B dcc6ba775e49af9a9fe1054fe5246e87e044f47cb7ca20712e5048dd1fa0fda35ee90c38cf733540913d0220eb58ab0a6dcfe93c7b02ebb9e022529b8add6c1c SHA512 85b0c2c57faecdd7db15e417234f2ea50fc5edbdcacaedcfc53cda68c3a070f4ba0201bff9afbaa3de7c51552309df1ac3e87586b4021e68bbb255a2545d92da
 DIST cropgui-0.5.tar.gz 853934 BLAKE2B ac7cf32495e3ac728223994f79252fd98a0a5cf7da79a9c6796ce3d7b213c797b16250be5d23a1bc6bed492f142a95411d6cbd42fe34242016c4e0181bfd90c4 SHA512 2babea9ea6089c74637c9023ea08c2ae4f666fbf44bb73d7a301de6fee6848e65a86fab312e765f7bd05e8e03bf3e92942d718ea84a950412385a8e0b6aa0630
+DIST cropgui-0.6.tar.gz 855329 BLAKE2B d54098cdf8d8a0eb863ba7cf13d798db8102e147c30d64d246fc9955c4ee5aead253273fd66f0f2cd2d5aaf7abd10cfed01936c08daccdd92e342a56923bd95b SHA512 dff9b1ea832c657c4407aea7ddeac880faaa4647bfe51ed43f9c1658f848cf9b6f9608451dcc006fe735012b52d318ebe5b59a31dc293cfabfb5ec5772612b68
 EBUILD cropgui-0.4.1.ebuild 1096 BLAKE2B 2005691ab239e023ca2a4d864744f9bae1348e3c7d6fe43925359fd119a53ea5562e3daade2c9d929296c7b61cd6e46a8ed978d8defd1c928e568ac36e8e6eea SHA512 59a123bd2e8d6c69bbf8aaf3f4f1cbe67de5834dda7439f76a3ca31da46048aaf5e78c32c3b438400fc128bfa42a295b10f468e507349c7f2cae66c6a9b0df9d
 EBUILD cropgui-0.5.ebuild 1098 BLAKE2B 3318e877827c04f942ce5963567524659b6db686d7f27be34f7a9da79af855213aa065d42f1741a769a42cb027a7019197eb42da18b0c1253a7bf633d5246de0 SHA512 89c2284f236870bfcfa46e1b2842cc9b4fa56447e318fdbab67c7160ce6146668d74ef7431d621969523b905345e63f68faf6bab38f61d7ce38be12b414e7e89
+EBUILD cropgui-0.6.ebuild 1098 BLAKE2B f9ce8fa8320eefae10367d16b93067c7f701bda080f1ca930bf27ea5749bd527e8fe9ad545954d9b166bb577a05750b517f176d329aecf65dc00b55fc7c05946 SHA512 6177045e980293670ef084b8e2fdd057ec85a8d359fd6f82f3f3e6dee546a5807c1ed0eb2cd9b5e19e5a474faa90fddf4c3bb0cc5100b9571af2a3cf4147ddda
 MISC metadata.xml 323 BLAKE2B 4f4655c7441d04e7d3840d96e9230c3f479955d01b44344b2b424af910b48e60fdf33a21c5ba6cc5490255a38bcb7f6359516e41ac5569446c7e000e23dda693 SHA512 b40805e072a6f3588784f689fcf6c90525f1b9c23c20570ecc5e647e6d151ab3fd81b953a0263a3c0429947cfca5ef23f2a48a242ee9aa789e2c543ca29eaf86
diff --git a/media-gfx/cropgui/cropgui-0.6.ebuild b/media-gfx/cropgui/cropgui-0.6.ebuild
new file mode 100644
index 000000000000..d0e7fdc45109
--- /dev/null
+++ b/media-gfx/cropgui/cropgui-0.6.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+inherit eutils python-r1 desktop xdg-utils
+
+DESCRIPTION="GUI for lossless cropping of jpeg images"
+HOMEPAGE="https://emergent.unpythonic.net/01248401946"
+SRC_URI="https://github.com/jepler/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}"
+RDEPEND="${PYTHON_DEPS}
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]"
+
+install_cropgui_wrapper() {
+	python_domodule cropgtk.py cropgui_common.py filechooser.py cropgui.glade
+	make_wrapper "${PN}.tmp" "${PYTHON} $(python_get_sitedir)/${PN}/cropgtk.py"
+	python_newexe "${ED}/usr/bin/${PN}.tmp" "${PN}"
+	rm "${ED}/usr/bin/${PN}.tmp" || die
+}
+
+src_install() {
+	python_moduleinto "${PN}"
+	python_foreach_impl install_cropgui_wrapper
+
+	domenu "${PN}.desktop"
+	doicon "${PN}.png"
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/media-gfx/darktable/Manifest b/media-gfx/darktable/Manifest
index bd80d226d40c..044b3d54e1bf 100644
--- a/media-gfx/darktable/Manifest
+++ b/media-gfx/darktable/Manifest
@@ -6,7 +6,12 @@ AUX darktable-3.6.1_openexr.patch 1806 BLAKE2B 3f05c8fbb4dd5a76e98ef3d9a9432fb2c
 DIST darktable-3.6.1.tar.xz 4685928 BLAKE2B 8ff6224e21b44f9e881adb8f020a2ea5ff5abb2c38da1aeaed312f89e548918c6d3bba210dbb4fb6901fbf0872c6e14c2e12c5b5b27932914a00428a709e8965 SHA512 d53eb8472531c62ceebe97769c6e53f7c9ed6efb404905295f00b5bf547fd0f0c395b8b926ccafc78d6cf9fed0745da655a77eeb84d92fce5d6a7a576f277416
 DIST darktable-3.8.0.tar.xz 5415532 BLAKE2B a2295d9145806720c702d30a334f4d1c483fc651dfda8a39617daed4a71a436bfaa5b6b379f5ec0ee4bbec5f6f5eabbcb589b63644b5698100dd1672710d1531 SHA512 ce95983cbe3ca899103b4f5ee560fdbeeb441dccd453ac4d858b14a25050229e1e780595c66bfb491c88db35c128054f649b365d701ef4b19cf252bd847ffa59
 DIST darktable-usermanual-3.6.pdf 34290182 BLAKE2B 407223f6dfc25e53e2de31a05b0468a3d50ec5ccf836fa4cca61b16d43e91827c0276027ea73dd543750f240889b7325538eb474e19df86eeff4d380bf0b8829 SHA512 62c2723e5fc0434703f21bc4f5efdb997db1c0cfb800a9df217d6682325949ce18ab458a179bd20a888b73a7bd384bbbb2ea8888cba26278510abaab1e0cc335
-EBUILD darktable-3.6.1-r2.ebuild 4399 BLAKE2B 644124ce8549752a377e4f758a6e78a89e238cebe2deb07f1f214e7b2228d9f827f1bb24fc3a12aac6ce1ad8ae404d5cc183a1780d998cdb9998bde9deaaf53f SHA512 b8e3604d7c6fc288ef00d68e797144e20b9aabfc63202c3ba5aabfbdf891cc03342a60a71b2a2c05c43bc8ccf468b983345eb8524d24660e857012b93c78ff97
-EBUILD darktable-3.6.1-r3.ebuild 4848 BLAKE2B 45bc6ec76b9032b9da84ceec43705e83c98f4b5b48eedb3a6aee8c9575f6ed467a73a57b4d15bf9218240211978d54809bfbc7369d1c16ee86d7b3cfa1e2961a SHA512 f3b5bdded1c1a33c23cb1e46ef77898b348d80dd402ddee25464a0be89177b539fe5dabe0f083e27432518b7883b6479cd468b447c321ac5e4ba408a2162e6ce
-EBUILD darktable-3.8.0.ebuild 4407 BLAKE2B 289a6b9813d2af04aedb11df7479149dcef67c4825a271bf6e1a678abf237eb3df0c1f6c38ea178d22fd39b46c1602dd84636e475704ced058e4010f0dad6755 SHA512 cfa020c2687edf82350bd1e507ac6f2652869506d4303cc949760a87fad4a0dc52633f9aaed08cfab199a77ab1501b6115ed44606947c3323cd8d21e879f4994
+DIST darktable-usermanual-3.8.de.pdf 32795040 BLAKE2B f8669e1982be19bc739add60d125a5818894a7a4a6414ba15aae5e5df41ec6729c99f907e3008c42acbd6f60bc4a5d33e20d7180621d135f9fd342e6190ae6a5 SHA512 ff77afcc9a20fec36891d4487d167e40d30a1deef6418dc6bb73c94d8171b42e5edc5420457c96e08ab8581175e691f8adf91ef5259367edba55f1441d4a86d3
+DIST darktable-usermanual-3.8.en.pdf 33484632 BLAKE2B 90a4e1021917f5fad7a5a9a58e2fec95af14119ca4b48325f3e5b55e96b89f9d82b8aaa676268a255fa97cf834a109b410004a549d16742a1b33db880c46fb67 SHA512 b21683f200daca3d0ed7c3364d0c6703d976fd800d1d2ffe51df1c6cfcf2188de681cdddbf92962629a3866e18014377a58ea0e54a9fa727b663972b7f1de79a
+DIST darktable-usermanual-3.8.fr.pdf 33479509 BLAKE2B 988824b60277ea0264fec61a1157a1de048cd512a172bc86276a043c06da3a684e971cef04c31122a78b3e7305157331e6cb86cfce7a4dc4dd9dc8697eddf743 SHA512 1383bb54face948bbbad895be2470c1b13ece71c325edf40402b3416a5d9653d2e1f8c4dbfa30edd10f02c1df8b8243c9e86948c5da8d2033e28ee3c6e04bbcc
+DIST darktable-usermanual-3.8.pt_br.pdf 33648057 BLAKE2B afb6d3c1ea6b709e535e10ae2a491fb6a87c84dcfe17823a518931bda0cd8595cda72905cffc01698e60c3df991451a5cccbfcdea82966a506b2d29d61298f09 SHA512 8734a9e6c57ba37f32966873b85584c50968c1c895fa4e9d953e129bb5834f254ca46e20741d5664429ef7d6379e5a35e59f8ecb517ca88ff536b49a8216b603
+DIST darktable-usermanual-3.8.uk.pdf 33663424 BLAKE2B abeb7a04b58e7ef508b415fe11073396c78964e91fbd3face8481cd6b09cf88525b1b6bdd2988bd57d25112cd59c8c05e209931f94004349cf5b8a7a3ca59e39 SHA512 e1a81771006f5d6b7e4088455b6b444ea87b27a788cc196c2bc0b0b5d0afde241ea9e2bdbd3ffe79871f39d756d710d8e16c082a21b1194efb71f78e8724af9a
+EBUILD darktable-3.6.1-r2.ebuild 4402 BLAKE2B cd7e0a3147afb25cf1382bd009daaf5dd3c3c79da8db38e7d4471e454806c66af2594d9f1d1601524156d319c514578f790221a6ce470acd0183a642f78350a6 SHA512 16c91c5684a8184a8d0826204bba9d010f9f83b03e5f0592572236c53584dd679e14d7f6a4303434070670d401aaefc60cae7e134dd9e2d70fa50120170b1ff3
+EBUILD darktable-3.6.1-r3.ebuild 4851 BLAKE2B de2ab5411fc69f7d9cc97bebe15c9645a521daec063d03f4eeac366c8cb102053d2dee56b39c13cfd6e28b34def5f5d08034b918d387e5b9d55bc1c0b42cd5cc SHA512 e20509c07903607e9f4029b9419fedbfea3c7312faebd9ee25f7d38dd7000fc30c86ac1ab691798d914322d80e2a685a98c17b17a8b4ebb7f1ca4616933425f1
+EBUILD darktable-3.8.0-r1.ebuild 5005 BLAKE2B 957688c7fe0fb3ab9d1daafeb526aa0d580e0938767136c8ed3e7493197ccfca494b9775c679441c6c7309dbd16f954edc2ba7b99705b6baba25458b2714d844 SHA512 2cde68ff349c0e07d6c0cbe66e463f720163b4b5c48a6066db91c1c80f6444ceceffa03e33726ad9c0d0c4a5efb4604d70d8d1a25fa5a6a2422660ad0749aa94
 MISC metadata.xml 1152 BLAKE2B c43582dd3a0607de751a816c9856738d73b504422d6b21745a8f7948e2238a6be5c178bb224d787eb712aef222a592c6a712239a4a8dada4c66a453e158fc5de SHA512 8a20f53798359fec9eb45c1d2fdbe6cca623b2308f8391ece25c4100161a2056b52c44f3eba91d6d3c083f49843bac8e355982998d2c4217efdc976eb0d1a14c
diff --git a/media-gfx/darktable/darktable-3.6.1-r2.ebuild b/media-gfx/darktable/darktable-3.6.1-r2.ebuild
index 68737e363aca..ff087a4c98dc 100644
--- a/media-gfx/darktable/darktable-3.6.1-r2.ebuild
+++ b/media-gfx/darktable/darktable-3.6.1-r2.ebuild
@@ -23,7 +23,7 @@ else
 	MY_P="${P/_/.}"
 
 	SRC_URI="https://github.com/darktable-org/${PN}/releases/download/release-${MY_PV}/${MY_P}.tar.xz
-		doc? ( https://docs.darktable.org/usermanual/${DOC_PV}/${PN}_user_manual.pdf -> ${PN}-usermanual-${DOC_PV}.pdf )"
+		doc? ( https://docs.darktable.org/usermanual/${DOC_PV}/en/${PN}_user_manual.pdf -> ${PN}-usermanual-${DOC_PV}.pdf )"
 
 	KEYWORDS="amd64 arm64 -x86"
 	LANGS=" af de eo es fr he hu it nl pt-BR ru sl uk"
diff --git a/media-gfx/darktable/darktable-3.6.1-r3.ebuild b/media-gfx/darktable/darktable-3.6.1-r3.ebuild
index 746a8b4aaf9b..12c0099cc5d1 100644
--- a/media-gfx/darktable/darktable-3.6.1-r3.ebuild
+++ b/media-gfx/darktable/darktable-3.6.1-r3.ebuild
@@ -23,7 +23,7 @@ else
 	MY_P="${P/_/.}"
 
 	SRC_URI="https://github.com/darktable-org/${PN}/releases/download/release-${MY_PV}/${MY_P}.tar.xz
-		doc? ( https://docs.darktable.org/usermanual/${DOC_PV}/${PN}_user_manual.pdf -> ${PN}-usermanual-${DOC_PV}.pdf )"
+		doc? ( https://docs.darktable.org/usermanual/${DOC_PV}/en/${PN}_user_manual.pdf -> ${PN}-usermanual-${DOC_PV}.pdf )"
 
 	KEYWORDS="~amd64 ~arm64 -x86"
 	LANGS=" af de eo es fr he hu it nl pt-BR ru sl uk"
diff --git a/media-gfx/darktable/darktable-3.8.0.ebuild b/media-gfx/darktable/darktable-3.8.0-r1.ebuild
index 40c02a22666f..b2adbe18b7ed 100644
--- a/media-gfx/darktable/darktable-3.8.0.ebuild
+++ b/media-gfx/darktable/darktable-3.8.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-LUA_COMPAT=( lua5-3 )
+LUA_COMPAT=( lua5-4 )
 
 inherit cmake flag-o-matic lua-single toolchain-funcs xdg
 
@@ -18,18 +18,24 @@ if [[ ${PV} == *9999 ]]; then
 
 	LANGS=" af ca cs da de el es fi fr gl he hu it ja nb nl pl pt-BR pt-PT ro ru sk sl sq sv th uk zh-CN zh-TW"
 else
-	DOC_PV="3.6"
+	DOC_PV=$(ver_cut 1-2)
 	MY_PV="${PV/_/}"
 	MY_P="${P/_/.}"
 
 	SRC_URI="https://github.com/darktable-org/${PN}/releases/download/release-${MY_PV}/${MY_P}.tar.xz
-		doc? ( https://docs.darktable.org/usermanual/${DOC_PV}/${PN}_user_manual.pdf -> ${PN}-usermanual-${DOC_PV}.pdf )"
+		doc? (
+			https://docs.darktable.org/usermanual/${DOC_PV}/en/${PN}_user_manual.pdf -> ${PN}-usermanual-${DOC_PV}.en.pdf
+			l10n_de? ( https://docs.darktable.org/usermanual/${DOC_PV}/de/${PN}_user_manual.pdf -> ${PN}-usermanual-${DOC_PV}.de.pdf )
+			l10n_fr? ( https://docs.darktable.org/usermanual/${DOC_PV}/fr/${PN}_user_manual.pdf -> ${PN}-usermanual-${DOC_PV}.fr.pdf )
+			l10n_pt-BR? ( https://docs.darktable.org/usermanual/${DOC_PV}/pt_br/${PN}_user_manual.pdf -> ${PN}-usermanual-${DOC_PV}.pt_br.pdf )
+			l10n_uk? ( https://docs.darktable.org/usermanual/${DOC_PV}/uk/${PN}_user_manual.pdf -> ${PN}-usermanual-${DOC_PV}.uk.pdf )
+		)"
 
 	KEYWORDS="~amd64 ~arm64 -x86"
 	LANGS=" de eo es fi fr he hu it ja pl pt-BR sl uk zh-CN"
 fi
 
-IUSE="avif colord cups cpu_flags_x86_sse3 doc flickr geolocation gmic gnome-keyring gphoto2 graphicsmagick jpeg2k kwallet
+IUSE="avif colord cpu_flags_x86_avx cpu_flags_x86_sse3 cups doc flickr geolocation gmic gnome-keyring gphoto2 graphicsmagick jpeg2k kwallet
 	lto lua nls opencl openmp openexr test tools webp
 	${LANGS// / l10n_}"
 
@@ -102,6 +108,7 @@ pkg_setup() {
 }
 
 src_prepare() {
+	use cpu_flags_x86_avx && append-flags -mavx
 	use cpu_flags_x86_sse3 && append-flags -msse3
 
 	sed -i -e 's:/appdata:/metainfo:g' data/CMakeLists.txt || die
@@ -143,7 +150,7 @@ src_configure() {
 src_install() {
 	cmake_src_install
 	# This USE flag is masked for -9999
-	use doc && dodoc "${DISTDIR}"/${PN}-usermanual-${DOC_PV}.pdf
+	use doc && dodoc "${DISTDIR}"/${PN}-usermanual-${DOC_PV}.*.pdf
 
 	if use nls; then
 		for lang in ${LANGS} ; do
diff --git a/media-gfx/fotoxx/Manifest b/media-gfx/fotoxx/Manifest
index dc047f1e2030..1e1b2c35c81c 100644
--- a/media-gfx/fotoxx/Manifest
+++ b/media-gfx/fotoxx/Manifest
@@ -1,8 +1,6 @@
 AUX fotoxx-21.40-documentation.patch 1511 BLAKE2B da0443a6b1ff8684e43005239f0184c742cd59727e3c55460713680b14b5d39ba528b7a17a87b893a9585824f1e402b5f46bbe45451dd8888b62d1752524db44 SHA512 d0f79f986b605c3f981de99c533f57a60aac47844d1434482e507a7e7e4d2be2b581419e211f034213c7c23db0e56f4fe5d789f39624a33aee283c8b8a489509
-DIST fotoxx-21.50.tar.gz 8693590 BLAKE2B d3bed82c3e856d6ce2433e0357955f32d462d0dfcf8de673a7c0fbe8aeeea766711c2617730c6a83501b07bd5f5ab60c9d56caeacd6ea938428758a39b5a75b3 SHA512 018735ff4b1fc99a64eccb05af05e9858f9dfce3c6925704f1739c22a49d3209f66d668b21cb6030d971bbe116c978c5d491aaba033683d5ed5268ee0e46ff9e
-DIST fotoxx-21.55.tar.gz 8667304 BLAKE2B 9a324883ba29d8847763985ff33d3e7eaf2a73449fab9c60dee05144c5dc98caf8bef8ce886736fcfae38a7f58526bfb3868da3d3ae2a283ecfabf1bb8858061 SHA512 a207a861b1bc2d8a41ec36a58b1bc9f61db380ae651dee98faf295a1e98730b7fed5a361ab0f09630d8d0f170e58bdf897424ca1d86f27cb669e75f305ea3fb8
 DIST fotoxx-21.60.tar.gz 8679841 BLAKE2B ec3dcbd0b937d730692e225fec7530ac46390328ae960e8960df7d252bc0cd8630de84bf47dfaf74c1e07855b4b0959e596e5e515ea00a6c430872359b2b4576 SHA512 ac999fcc70acd92c54e85ad276112aaa7f1b7606ea70381d6f833d829fd92c14aacad7a967838e5d28fce80cfa6da8ef05e0ee49b463210cb66a3f8ffc3d22e7
-EBUILD fotoxx-21.50.ebuild 2260 BLAKE2B 5d3fecfa601f41c29f00474e810b928dc9bd12218be8d4acaa886640062b00966385884afb449b9fb15c804b1f3df11bda98bc4b2e70a68805411acec56163fc SHA512 342230c7481c9134b8ee93f774f9433c8ac4121714413cc518a2db1bfd3798e6a3a88c880bb035e4c55ca2e325f772ec04f4bbec3ce441894bed75e657ba0159
-EBUILD fotoxx-21.55.ebuild 2262 BLAKE2B 5716c0160390c9ca7efb4b12208249d96ffb6751220d4153bbb428927e279842d1a8cacef93524ab46b326a64193c248966711fa0bbda551d836bbde85c624ac SHA512 7fb41c1418894314bbc8e5b06101ed27d3231d245cbfa8366bdb3bcd28a310e673c2cfdfca4be2c3900e6ae6a3bdc42359f383e619f03d54e529c7cf9dc14918
+DIST fotoxx-22.1.tar.gz 8801382 BLAKE2B 9090d2ea0ddfcb91758fbe0b8c6b81fd3c764eef1cac8098c5ae5f4dba37b5426bc4d5dee6b7d36519f62b28bee7f3f45aa29a7c6f92209f193a5a5f0775ae7b SHA512 41335113cd37490d02112760845b6e0bc631c448a0bdfe0435082836c86a1e125fbbe8a0efd30aae4ec7e86f43a67c9b6697e47263424e5093c7a475450ee7bc
 EBUILD fotoxx-21.60.ebuild 2260 BLAKE2B 5d3fecfa601f41c29f00474e810b928dc9bd12218be8d4acaa886640062b00966385884afb449b9fb15c804b1f3df11bda98bc4b2e70a68805411acec56163fc SHA512 342230c7481c9134b8ee93f774f9433c8ac4121714413cc518a2db1bfd3798e6a3a88c880bb035e4c55ca2e325f772ec04f4bbec3ce441894bed75e657ba0159
+EBUILD fotoxx-22.1.ebuild 2262 BLAKE2B f3f8a52c2487101ba3b99ff6ba234550f39df389198d43683cba6c573bf01786116b72ac6c642813061343db86f9bd16785524e08a01511c7e433c46d3657e65 SHA512 7c73f159b3931c4edd5ef61dea1f773f4d50f3f5f7aa22c412223ea591ff3f519c92827bcc20561465af532b50824fda75a58b49d4282dc65c760af1e5a5fdcb
 MISC metadata.xml 851 BLAKE2B a6c60b79fb5646c3bd7d6959d4a1b974ee714bf6ed64f205d9c00d684b3da94672005658336c1c5fcb903605d11c9a5607616151b2f6262f3173e15b8fc44655 SHA512 2794ae92afa076875c7f725969efdcf9cb84435d0ea033adc28f5860a69438b754f4d22b0db27dc7392683439e51b51ae581a6da450719276e8df51a2a306ad9
diff --git a/media-gfx/fotoxx/fotoxx-21.50.ebuild b/media-gfx/fotoxx/fotoxx-21.50.ebuild
deleted file mode 100644
index d9e91deab328..000000000000
--- a/media-gfx/fotoxx/fotoxx-21.50.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit optfeature xdg-utils
-
-DESCRIPTION="Program for improving image files made with a digital camera"
-HOMEPAGE="https://kornelix.net/fotoxx/fotoxx.html"
-SRC_URI="https://kornelix.net/downloads/downloads/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-# For required dependencies read doc/README, for required tools read
-# data/userguide [INSTALLATION]. xdg-open (x11-misc/xdg-utils) is an
-# alternative to firefox and chromium-browser. `grep '"which ' * -R`
-# is helpful to report some required tools run via the shell.
-
-DEPEND="
-	media-libs/clutter
-	media-libs/clutter-gtk
-	media-libs/lcms:2
-	media-libs/libpng:0
-	media-libs/tiff:0
-	media-libs/libchamplain[gtk]
-	virtual/jpeg
-	x11-libs/gtk+:3"
-RDEPEND="
-	${DEPEND}
-	media-gfx/dcraw
-	media-libs/exiftool
-	x11-misc/xdg-utils
-"
-
-S="${WORKDIR}/${PN}"
-
-PATCHES=( "${FILESDIR}/${PN}-21.40-documentation.patch" )
-
-DOCS=()
-HTML_DOCS=()
-
-src_prepare() {
-	sed -i -e "/^DOCDIR/ s/${PN}$/${PF}/" Makefile || die
-	default
-}
-
-src_install() {
-	# For the Help menu items to work, *.html must be in /usr/share/doc/${PF},
-	# and README, changelog, copyright, license, etc. must not be compressed.
-	emake DESTDIR="${D}" install
-	rm -f "${D}"/usr/share/doc/${PF}/*.man || die
-	docompress -x /usr/share/doc
-}
-
-pkg_postinst() {
-	optfeature "HEIC file support" media-libs/libheif
-	optfeature "additional RAW file support" media-gfx/rawtherapee
-	optfeature "additional RAW file support" media-gfx/darktable
-	optfeature "video thumbnails & playback" media-video/ffmpeg
-	optfeature "copying images to optical media" app-cdr/dvd+rw-tools
-	optfeature "additional panorama support" media-gfx/hugin
-	optfeature "WEBP file support" media-libs/libwebp
-
-	elog
-	elog "Please read the Help > User Guide for details. The source location is"
-	elog "/usr/share/fotoxx/data/userguide and after running fotoxx a copy will"
-	elog "be placed at /home/<user>/.fotoxx/userguide."
-	elog
-	elog "To play videos, in Tools > Preferences set 'Video File Play Command'."
-	elog
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/media-gfx/fotoxx/fotoxx-21.55.ebuild b/media-gfx/fotoxx/fotoxx-22.1.ebuild
index 12a78336fe75..852e25423552 100644
--- a/media-gfx/fotoxx/fotoxx-21.55.ebuild
+++ b/media-gfx/fotoxx/fotoxx-22.1.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
diff --git a/media-gfx/geeqie/Manifest b/media-gfx/geeqie/Manifest
index ff1543bd390b..64efffdc7453 100644
--- a/media-gfx/geeqie/Manifest
+++ b/media-gfx/geeqie/Manifest
@@ -4,7 +4,7 @@ DIST geeqie-1.5.1.tar.xz 1587116 BLAKE2B f8742a88eefd90fb1e7e1d1365058cef190b623
 DIST geeqie-1.6.tar.xz 1693488 BLAKE2B ee5369884c4c0e60fe827d43ef336c5aaa89d55aec8905bb8cdd4edb2ee12e15d525577a3c85403e2e8955a08c817007b72d1d1e3614063377a21aaba317acee SHA512 4acd05c6012c80581e9c594c7dc7d12265528aa8d3868afef9def36798945afb851da9376bbe5f205ac3c5e1e2362188cc0e2891b49f3ea4396bbc6974c143ef
 DIST geeqie-1.6_p20211016.tar.xz 36433388 BLAKE2B e8932398ce7354c08ad4199834870e2844555ee1a8ae2beebd9a512100784a5cb62e00993b3ef1854a7ab1bd37eb0742ebcfc17605429f99b61e1af2fbaf859e SHA512 9e536beac39028fdcbe04d014460de2b02039b2c027f9603a71554339b2d14116f8dff11bb09c6e73d51550188daf40031535f978fbbc2d355d30593f4f29e9d
 EBUILD geeqie-1.5.1-r1.ebuild 2280 BLAKE2B 9653c0f0ac69e5a18812a86534e5ff6025e754545f2d53e3f06e538f59a600c98b27fff34f425e1d342a3c0ac8ef229f58ef8da99b9cd4c5f1f54e91246eead9 SHA512 26a4d709e1c8c6f3a6db159d4e912def9ce7ed7cb7a7d1a261d2428b46440aad882d450b1f8d54f513fd02a1f637bd0328403c9c143281b889dc3f34dfca7a31
-EBUILD geeqie-1.6.ebuild 2277 BLAKE2B b18ff3f6442d5cee699071956f76b8b1db414df41a72d40b421420f249b348db49ca17f4b7c8881d3622d2551cb21af3f636827457f9ee18cbf7dd7d5eb95d4b SHA512 77bf5123cbc000f6801a2b56f397ecde58cfb944b6cd903653241b1744df788acec0eb39836982abf61bb73b10c7928a574519ac038122fc372330ef95790996
+EBUILD geeqie-1.6-r1.ebuild 2087 BLAKE2B b72278d1f36cbaed2cd0eccf1f2d8c8126ffd798c476b7432e7695221f1524f14b07d0ff98fbe281bb911cb94f80a5c8142bf2f8ad667e3aa3192bdeca8950de SHA512 d8280d69c8638a192c2875f10e807e0286d09f8820dfc91a47b62f495a508770a394bd33dd1fdfc077a6f4581d8069a7bc33edae239ad754d6f6427253d7fa19
 EBUILD geeqie-1.6_p20211016.ebuild 2412 BLAKE2B ec74ea03a4f7d9431b2fa1fa8eb474ac4c8a1e8a46b1887d7f7a67bc4af1b389c4581299aff6a301e490958412bf91561294bc8dd015220b7ad6e5e470d7e213 SHA512 23a6a0c2d60d4498b99195a87e158683a312276c1d0b29d0dbd3ca334eb0ac96e19e3985a9be1c88fce9d528ca0a74c41a739dd90bde3d3b04728321d5f94fa4
 EBUILD geeqie-9999.ebuild 2260 BLAKE2B fb20a91012f7771197f763e9cfbda5c201c51241e494dca0d6e499d9f6e7a8bc2887ed8c4efabfbcdcb86dd0cc7a4463506b8a7cb31c261a6c4cc82d1cce634d SHA512 4a0efeda56009c9dea7a5bcab831b251b54070a370d2f915bbb3f74be3e727e5cae1c0e8aaa0f239aa7208e052548b69e605a2b97ef817dceb78d4d5e8b49ea8
 MISC metadata.xml 924 BLAKE2B 9bafd79f0d60d1237da4b35aeb2142384c188b503c151f8e0a26cd6ea9a2658876c66fb6f248af34eb33f6d2218bafeb1f34521d23c55e244c7ee1b4c0234dda SHA512 73f82d929d6479d81dde14c922ac048feaccf4bf5ea8ffe8aea56cf7cbe0cc8f76c528f3363bbbad3e881640608265a2e583d8b675fce3aa43ad7646023167fc
diff --git a/media-gfx/geeqie/geeqie-1.6.ebuild b/media-gfx/geeqie/geeqie-1.6-r1.ebuild
index 7952fb0e1995..39c6dc86cac5 100644
--- a/media-gfx/geeqie/geeqie-1.6.ebuild
+++ b/media-gfx/geeqie/geeqie-1.6-r1.ebuild
@@ -12,21 +12,18 @@ SRC_URI="http://www.geeqie.org/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
-IUSE="debug doc exif ffmpegthumbnailer gpu-accel +gtk3 jpeg lcms lirc lua map nls pdf tiff xmp"
+KEYWORDS="amd64 ~ppc x86"
+IUSE="debug doc exif ffmpegthumbnailer jpeg lcms lirc lua nls pdf tiff xmp"
 
 RDEPEND="
 	virtual/libintl
+	x11-libs/gtk+:2
 	doc? ( app-text/gnome-doc-utils )
 	ffmpegthumbnailer? ( media-video/ffmpegthumbnailer )
-	gpu-accel? ( media-libs/clutter-gtk )
-	gtk3? ( x11-libs/gtk+:3 )
-	!gtk3? ( x11-libs/gtk+:2 )
 	jpeg? ( virtual/jpeg:0 )
 	lcms? ( media-libs/lcms:2 )
 	lirc? ( app-misc/lirc )
 	lua? ( ${LUA_DEPS} )
-	map? ( media-libs/libchamplain:0.12 )
 	pdf? ( >=app-text/poppler-0.62[cairo] )
 	tiff? ( media-libs/tiff:0 )
 	xmp? ( >=media-gfx/exiv2-0.17:=[xmp] )
@@ -38,9 +35,7 @@ BDEPEND="
 	virtual/pkgconfig
 	nls? ( sys-devel/gettext )"
 
-REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )
-	gpu-accel? ( gtk3 )
-	map? ( gpu-accel )"
+REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
 
 PATCHES=( "${FILESDIR}"/${P}-yelp.patch )
 
@@ -58,13 +53,13 @@ src_configure() {
 		--with-readmedir="${EPREFIX}"/usr/share/doc/${PF}
 		$(use_enable debug debug-log)
 		$(use_enable ffmpegthumbnailer)
-		$(use_enable gpu-accel)
-		$(use_enable gtk3)
+		--disable-gpu-accel
+		--disable-gtk3
 		$(use_enable jpeg)
 		$(use_enable lcms)
 		$(use_enable lua)
 		$(use_enable lirc)
-		$(use_enable map)
+		--disable-map
 		$(use_enable nls)
 		$(use_enable pdf)
 		$(use_enable tiff)
diff --git a/media-gfx/gmic/Manifest b/media-gfx/gmic/Manifest
index b478513d78ca..5ce8bfd1c79f 100644
--- a/media-gfx/gmic/Manifest
+++ b/media-gfx/gmic/Manifest
@@ -3,5 +3,5 @@ AUX gmic-3.0.0_ipa-sra.patch 665 BLAKE2B d1b47e2f0e8e63251172ee6cbc2c5b1bd86d100
 DIST gmic_2.9.9.tar.gz 7325061 BLAKE2B 256b4f1180edfc8ebb3a3e7f7666c7b44d95cd36a52c1b5539a355f022471eeef776c77b820864ca05b2ccc4a58a2e85970994cfdbce9e55aff31112af4e6000 SHA512 fcc129f5acfb32a3154d4c987f574c18ad68dd35e9e357fdc391166211747f5d7eed63a2fcde29c110a79e8665f2a6d1e70b68c81e19bb02be43a84ec7f1cc64
 DIST gmic_3.0.0.tar.gz 10225122 BLAKE2B 1066c62c2c56fafbfd11608eb9e3b7c7e9a87b404aae1e7e673e21d9b7b76a599e241f16656786bfa35687f3b3921fcba96368227753105aa25e2fa451962bfa SHA512 89353d16d6304e322400c93bafb50f7557df93c933ed2994f33a17d877e4e12ec511a355b38058680f356bccab5aa84b607fab225354c19d4b8ab3e64424c87c
 EBUILD gmic-2.9.9.ebuild 4259 BLAKE2B 5958f96d7bab5481fe3b3800a2f7327e1d4d6fe4b46e318206379ecf3b4b2e6e6a34963568eafe35e9426732a9fe81d6b45be6f80d6f2385a6f44b1fb3210234 SHA512 01867f8b3377db39ffb365033d2545bd2c73a4684bd4e3fd1a3b1b8ad4996f7a2fb036a44096aaee09123e9596ba635f9435a04791b973c40f084bef7c05bdb0
-EBUILD gmic-3.0.0.ebuild 4207 BLAKE2B 2c57f970c3267a82f13cab009ba59285f95db21baeeccf8a0eb84e1026341e2d8be1f7429513dc2cc903751d1ed77bd0b94bb5a456af819a75f888664b771253 SHA512 076726fa59a2b6d083ea0ef855532305d914611c081cb1967783b31ca9a7059e3b0842280257460bd8a66be8d41e14418c08976e9a5b79ee46a5039fa4708c74
+EBUILD gmic-3.0.0.ebuild 4221 BLAKE2B 8551d6173a0f218b079d16fe9452a11b3b21a32a62e47a9f7cacb1bc049a2d928c8520f529e8737964995e1b278703f1be7fb9f4a7cbd82fe76e7f972e505944 SHA512 4c3a41b7d5f64bf2e27400aebec50c8c649ff62703a15ed0a298391281d2cce5a8ad24d3eddac79119620d4fe8197714318e783f855d0a45d73c94b995e8aa7c
 MISC metadata.xml 534 BLAKE2B f229329b6cd7c9a79b7be93c64ce6e84e65391084c7d76b99ada95762c643fc445fe12fa55acc9b355b5f1fb86de7c0845ec34f921494df8cba3d90ca8c2a408 SHA512 e36403a679467cba0b0580810a27076214d676a74deb09a55f13a38bc06f5ff0999560e1ae00629047a682bcbf3b9e73243db8da3eaa24b275c24a0d1995fe3c
diff --git a/media-gfx/gmic/gmic-3.0.0.ebuild b/media-gfx/gmic/gmic-3.0.0.ebuild
index 8f9fa857f2b0..f8eead423554 100644
--- a/media-gfx/gmic/gmic-3.0.0.ebuild
+++ b/media-gfx/gmic/gmic-3.0.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=8
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://gmic.eu/files/source/${PN}_${PV}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 fi
 
 DESCRIPTION="GREYC's Magic Image Converter"
diff --git a/media-gfx/gnome-photos/Manifest b/media-gfx/gnome-photos/Manifest
index 05bbd8cc1b7d..46ef5e8b0020 100644
--- a/media-gfx/gnome-photos/Manifest
+++ b/media-gfx/gnome-photos/Manifest
@@ -1,3 +1,3 @@
 DIST gnome-photos-40.0.tar.xz 632440 BLAKE2B 4a3be35e627169afa4b3b9aca2c675f6035f3e46822450fc479550a3e48aebba6f9e335dc528a6593f1bd844fde501b8535ed368be9825f229280a08d5ead7e6 SHA512 70641e7fc6375e15cadc62ad75804d3ffb1d2193dd0bbed21b291b38f1d271ba7d34a4714a1658b9f13345f20e421190958b4713aae64f4f46913628079ba814
-EBUILD gnome-photos-40.0.ebuild 2419 BLAKE2B 7e1bf5caffab09245cb49a0aca4161f049e8fee76cc3dba099c3a5cb3f0a10a58d17358672309ff0f849835b27fe0d3ded7d4b34e32d3130c6ac68e422dc30c0 SHA512 588d21c213052d7440ace3af2176ef7a127bd40023843a30b50f40d57169e83ee28ec3171ded51b4fc19d397f92b176e3432c031878614e8d20abe3b86d8e91b
+EBUILD gnome-photos-40.0.ebuild 2426 BLAKE2B 44675ac89e656fc79a4940ca8bebcbfb09b56ec493b04a7702107b6b329b1b21a12f941d29eb3d016524ed61f60a130b16fb34562da9c46e51946b26a4dd4526 SHA512 d88388a40c4536fd3b2650504cb0d88793a7f39b858ba9f38e152450580a0dc30f4ee895518aad3da1c886ddcd1d431fab8f3f42e5a0d551bd804afd39b481cf
 MISC metadata.xml 993 BLAKE2B 19e15d88f2176fa80739650a2d3ae57e34a662e5a4424a00a33bc785e4e4a35d57fc28d678885e4e18564318e93957b689ff36ea96bea69038a377400c6217f2 SHA512 19300545f23b83e06df0db74a605b48a62f5dd462db1ef69de903123209b50331ceffec783bd9564a15ee10dd1f0a6fc9e396f1384e56f7bb0cc83af08d1fda4
diff --git a/media-gfx/gnome-photos/gnome-photos-40.0.ebuild b/media-gfx/gnome-photos/gnome-photos-40.0.ebuild
index 08d3447e9cd4..3e60765e15a2 100644
--- a/media-gfx/gnome-photos/gnome-photos-40.0.ebuild
+++ b/media-gfx/gnome-photos/gnome-photos-40.0.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Photos"
 
 LICENSE="GPL-3+ LGPL-2+ CC0-1.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86"
 IUSE="flickr test upnp-av"
 RESTRICT="!test? ( test )"
 
diff --git a/media-gfx/graphite2/Manifest b/media-gfx/graphite2/Manifest
index de09f43eac44..10a0c19255b3 100644
--- a/media-gfx/graphite2/Manifest
+++ b/media-gfx/graphite2/Manifest
@@ -1,6 +1,9 @@
 AUX graphite2-1.3.14-fix-cmake-files-libdir.patch 637 BLAKE2B 5bf2dfae7cf3af8a99a5095f618d3625d6f0f3b07f714c1101ac77058aa5ab969115cf2ce6a6164666488183fb5482d3f8b6fd8dea4df3ca1ecba9adb02788f2 SHA512 55805cecf9cde48079a81c8ffd93503dd9302f28140b640971ddee29e7a7da38840c826af072b5780372b56c0f0269cbda802e3e233139f086f5194cd8eb33a5
+AUX graphite2-1.3.14-no-libtool-file.patch 2336 BLAKE2B a349e721264de1477aee5aa3e62d264b26c4665383fbe564de7b3a0420b77fcf8ce90a65a650fc9e2144969a2f00abe7ff7c9ebe6f53c7b2fdc3271fbd55f6ce SHA512 3553e237808bf981cf35e9fa8de7b77fa1ce87c72733c806df8e523ea624a0e5e2ad87a0b4cfb9330e7cace0fb016c2c729085de2d21e959790955fd370f378e
 AUX graphite2-1.3.5-includes-libs-perl.patch 836 BLAKE2B 0429d214ff7fd9b903e1d3bcaf0af3e6b29a0269581390f64950e42e41280e482fc9cfda9bfe24ef166eb6c24d21377a15fca4264fec69d902d8ba18810bdb01 SHA512 26ab6dda13d758a5e4237c8b5d207d3c5111afbb11b2c3984cd742913c3c7932559b23b5ea9f774f1c6373eb0f761a9400dccc95876740b3cd06c44084a10965
 AUX graphite2-1.35-fix-gcc-linking.patch 697 BLAKE2B 3f4f181477e5f2f5db85f0b5c76dfb2b471c41cb42bfce9a4663fc8aab7035371690077c45cff580c6a700a65466f866944e34127b307f6ef44035f47a65fabd SHA512 f8a8481f5e8e0178e38e8b8dff2e2b1d2f3143d1f1eca6b3b2ea15ea087651dff150fae8166ceaf18eb3995bb480f09e185ddf89b4ad6e352e1085d4655c71b7
 DIST graphite2-1.3.14.tgz 6630061 BLAKE2B 72bf6736aaa8476a89e44ef53c5b6c94f45d815fe1a451ba6b3696bfe023971210975dee4a9c8cb3042f36442e4efecf5baf171ef4230ad2b10694a89865f918 SHA512 14b5eb2ba8158b8b62ffa7fb142100a0af1de0f0c45b2673801b636714a106b46fcd423b05c722d963c9543fafcf10fec811975308211a54f20a3ba322d7b295
+DIST graphite2-1.3.14_p20210810.tar.gz 6656693 BLAKE2B 63a7d96b58f2779d8a4a353e1a986212b884fdf780fedcb83b22dcef2f7678d44c88c14ece2d09dc745df505a4a3825ce61d7c84bd05fd4e98c23d6e86e9326d SHA512 be54c1386578970cf65c1860336a113268181753c1e2a139e37ceeafcfa76e3162086879c54094d70cd0d36ad5852a95390aaa69572d875921e9481f1ae508ff
 EBUILD graphite2-1.3.14-r1.ebuild 2994 BLAKE2B 85a0519e9610d966b043b1ac73c58d17a1cd4729e71369dca175e3ca283a273ae2e00c552372258c20f862c250846d7f29bd252b187a2c12bbaf87595b09d5fa SHA512 8bebde5715ed78ffa35d3466638a00a57009fb16f38c330d1214e6237b4543eac9fa9b3e3919251425699641d504d13262dfd2a8042b8254da04dca6a18c7805
+EBUILD graphite2-1.3.14_p20210810.ebuild 3024 BLAKE2B f99caacdcf8a058683ef8e2ab0d1c26ce783ced212c2bea130193dfa735e0276980d76ba359aba48dab757e37c005e45f89c1c19b6c23743747620985df63ed0 SHA512 e02a9f36ba1a9f9645b5f8132991c4c28342a7d590982afcbe70120f3bfc17518f7e75260590a05fb8bd037932b8e10e2fe871f00e0a414e8b29af92423feccf
 MISC metadata.xml 337 BLAKE2B a406b2f1af9217abda601c1a860904b7897c5646bc145befae7e87038a42e6b60f5290cb7258469de61761b67f74e12eef1e5a632aad219978d021e045eaa6da SHA512 1d7d7bc940d89cad512580d43120946e028c7866f844dbbc9242b0c29bdb1058f181c38eb63bdd50007afb0e95adade98e5a5f234964c1e1dfb8d15bda961c2f
diff --git a/media-gfx/graphite2/files/graphite2-1.3.14-no-libtool-file.patch b/media-gfx/graphite2/files/graphite2-1.3.14-no-libtool-file.patch
new file mode 100644
index 000000000000..2f1056be05d8
--- /dev/null
+++ b/media-gfx/graphite2/files/graphite2-1.3.14-no-libtool-file.patch
@@ -0,0 +1,68 @@
+From https://github.com/silnrsi/graphite/pull/65
+
+From 3edb88b55c0870989778c670d555aa159a2c3abc Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+Date: Mon, 31 Aug 2020 20:56:43 +0200
+Subject: [PATCH] don't install a libtool file with static library
+
+Static library is supported since version 1.3.11 and
+https://github.com/silnrsi/graphite/commit/2f143c04da5caa43ddf4dba437b2f2bc26bf4238
+
+However, graphite2 is still installing libgraphite2.la which contains
+incorrect information (i.e. dlname set to libgraphite2.so and
+old_library set to ''):
+
+dlname='libgraphite2.so'
+
+library_names='libgraphite2.so.3.2.1 libgraphite2.so.3 libgraphite2.so'
+
+old_library=''
+
+dependency_libs=''
+
+This will result in the following build failure with any applications
+using this file such as harfbuzz:
+
+arm-linux-g++.br_real: error: /home/buildroot/autobuild/run/instance-3/output-1/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libgraphite2.so: No such file or directory
+make[5]: *** [main] Error 1
+
+Instead of trying to fix this libtool file, just disable it when
+building a static library as it is not needed
+
+Fixes:
+ - http://autobuild.buildroot.org/results/9ebe1d11e80755d59190ef2aae82bbba5cc45e44
+
+Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+
+* asturm 2021-12-28: We don't want those files at all.
+
+---
+ src/CMakeLists.txt | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index b6ac26bf..a7ace040 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -131,7 +131,9 @@ if  (${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
+         nolib_test(stdc++ $<TARGET_SONAME_FILE:graphite2>)
+     endif ()
+     set(CMAKE_CXX_IMPLICIT_LINK_LIBRARIES "")
+-    CREATE_LIBTOOL_FILE(graphite2 "/lib${LIB_SUFFIX}")
++    if (0)
++        CREATE_LIBTOOL_FILE(graphite2 "/lib${LIB_SUFFIX}")
++    endif()
+ endif()
+ 
+ if  (${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")
+@@ -146,7 +148,9 @@ if  (${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")
+     include(Graphite)
+     nolib_test(stdc++ $<TARGET_SONAME_FILE:graphite2>)
+     set(CMAKE_CXX_IMPLICIT_LINK_LIBRARIES "")
+-    CREATE_LIBTOOL_FILE(graphite2 "/lib${LIB_SUFFIX}")
++    if (0)
++        CREATE_LIBTOOL_FILE(graphite2 "/lib${LIB_SUFFIX}")
++    endif()
+ endif()
+ 
+ if  (${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
diff --git a/media-gfx/graphite2/graphite2-1.3.14_p20210810.ebuild b/media-gfx/graphite2/graphite2-1.3.14_p20210810.ebuild
new file mode 100644
index 000000000000..47a0ef22b350
--- /dev/null
+++ b/media-gfx/graphite2/graphite2-1.3.14_p20210810.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+COMMIT=80c52493ef42e6fe605a69dcddd2a691cd8a1380
+GENTOO_DEPEND_ON_PERL="no"
+PYTHON_COMPAT=( python3_{8..10} )
+inherit perl-module python-any-r1 cmake-multilib
+
+DESCRIPTION="Library providing rendering capabilities for complex non-Roman writing systems"
+HOMEPAGE="https://scripts.sil.org/cms/scripts/page.php?site_id=projects&item_id=graphite_home"
+SRC_URI="https://github.com/silnrsi/graphite/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/graphite-${COMMIT}"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="perl test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="perl? ( dev-lang/perl:= )"
+DEPEND="${RDEPEND}
+	test? ( dev-libs/glib:2 )
+"
+BDEPEND="
+	perl? (
+		dev-lang/perl
+		dev-perl/Locale-Maketext-Lexicon
+		dev-perl/Module-Build
+	)
+	test? (
+		${PYTHON_DEPS}
+		$(python_gen_any_dep 'dev-python/fonttools[${PYTHON_USEDEP}]')
+		media-libs/fontconfig
+		perl? ( virtual/perl-Test-Simple )
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.3.5-includes-libs-perl.patch"
+	"${FILESDIR}/${PN}-1.35-fix-gcc-linking.patch"
+	"${FILESDIR}/${PN}-1.3.14-fix-cmake-files-libdir.patch"
+	"${FILESDIR}/${PN}-1.3.14-no-libtool-file.patch"
+)
+
+pkg_setup() {
+	use perl && perl_set_version
+	use test && python-any-r1_pkg_setup
+}
+
+python_check_deps() {
+	has_version -b "dev-python/fonttools[${PYTHON_USEDEP}]"
+}
+
+src_prepare() {
+	cmake_src_prepare
+	use test || cmake_comment_add_subdirectory tests
+}
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		# Renamed VM_MACHINE_TYPE to GRAPHITE2_VM_TYPE
+		-DGRAPHITE2_VM_TYPE=direct
+	)
+	# https://sourceforge.net/p/silgraphite/bugs/49/
+	[[ ${CHOST} == powerpc*-apple* ]] && mycmakeargs+=(
+		-DGRAPHITE2_NSEGCACHE:BOOL=ON
+	)
+
+	if use elibc_musl ; then
+		# bug #829690
+		if use ppc || use x86 ; then
+			sed -e 's:${GRAPHITE_LINK_FLAGS}:-lssp_nonshared &:' \
+				-i "${S}"/src/CMakeLists.txt || die
+		fi
+	fi
+
+	cmake_src_configure
+
+	# fix perl linking
+	if multilib_is_native_abi && use perl; then
+		# we rely on the fact that cmake_src_configure sets BUILD_DIR
+		sed -e "s:@BUILD_DIR@:\"${BUILD_DIR}/src\":" \
+			-i "${S}"/contrib/perl/Build.PL || die
+	fi
+}
+
+src_compile() {
+	cmake-multilib_src_compile
+	if use perl; then
+		cd contrib/perl || die
+		perl-module_src_configure
+		perl-module_src_compile
+	fi
+}
+
+multilib_src_test() {
+	if multilib_is_native_abi; then
+		cmake_src_test
+	else
+		einfo "Cannot test since python is not multilib."
+	fi
+}
+
+src_test() {
+	cmake-multilib_src_test
+	if use perl; then
+		# Perl tests fail due to missing POD coverage...
+		perl_rm_files "contrib/perl/t/pod.t" "contrib/perl/t/pod-coverage.t"
+		cd contrib/perl || die
+		perl-module_src_test
+	fi
+}
+
+src_install() {
+	cmake-multilib_src_install
+	if use perl; then
+		cd contrib/perl || die
+		perl-module_src_install
+		perl_delete_localpod
+	fi
+}
diff --git a/media-gfx/gscan2pdf/Manifest b/media-gfx/gscan2pdf/Manifest
index decb7ae1259a..16ea9d8aa6aa 100644
--- a/media-gfx/gscan2pdf/Manifest
+++ b/media-gfx/gscan2pdf/Manifest
@@ -2,6 +2,6 @@ DIST gscan2pdf-2.12.3.tar.xz 504168 BLAKE2B f3c8b27903db733163114c5c8ea93b109697
 DIST gscan2pdf-2.12.4.tar.xz 503792 BLAKE2B e5b54158b5b47bd2f255c3529e132695c1735e9da92d6a426f7f5b9a9e880bd2d1a0655faf065385224892abe992156c667e50aea1f1091ac6d872b8c163c92f SHA512 f904e2fe3ec0ed829eb9166a42c7c10b56e99e1a7558c7d0014efc530d5f4d3873e9097f28372412073cbb6040bd00570f1acbb6582f5ea87485f0a0ace6f486
 DIST gscan2pdf-2.9.1.tar.xz 484740 BLAKE2B e75ac6a5296ba2f89838ae9c95dc0ceb592ea8ffaf8d89a0635043e07fedbdcf97df26ac810556da7d0e0306eb7aaff76dc18162c6a5f89cb1953bd623a594a3 SHA512 4fc3107c871a7915ebdc023476b1159c0fe03934f1a52a417a5bc285be46f7db0ed38ec4cf015b15953c728ef19d1f4f30207d418b655c950bfb64ddc5d23237
 EBUILD gscan2pdf-2.12.3.ebuild 2981 BLAKE2B 72ddfd255baa1aedfee6a3a51faf8d71d5732f47cc3ec55a3a4c6a2f4688c332064377c9935e097b649ce4326a2dc60c96836af3abf2412590a5ee76318d759a SHA512 2726e25fed0a753a083462540e9e69a221de079fe28adf5bb679ade98d007a34c9766991fdf29a750e6ed933dcbcd0d306d82a98c55caf1c10460ac0b1b69f20
-EBUILD gscan2pdf-2.12.4.ebuild 2989 BLAKE2B b7fcd6ab0a47acca89f44a1c012b71e78d56669f90fdf529af9cb521fedf5f836f2008e9ee2fd9405300873a1a8685a58aa4e6b62cad31d4254ce9961ca80166 SHA512 c84f71d496aed72176bdc50fa3c47b787f10c80b26497b335c58b26ef1b52fee346fd8f489e8cde22cc5bdd4e2db08a79da13ecef38f0907471e69866374ce9f
+EBUILD gscan2pdf-2.12.4.ebuild 2988 BLAKE2B 2307b5bb8396119e2f3af93ce1ad27adfaaf0597e8d97c9756faee7665727fc73f2f83b1200bd592c18950a47faa35883905debfd815b0ed1adf91eaaa3572fd SHA512 15757344d557b417a86404b54838b196232430ddbf1612d3430fdb216b062cc7bfbd27914921923b5f62c4e83f837edfff67d6505aee7b0bc6b259b6759e69e0
 EBUILD gscan2pdf-2.9.1.ebuild 2801 BLAKE2B 5ec319fceae00a20a15caae9cf019691523680bfa734bae36c8cac7117455438beed4c56fc79a570e87b2d4860b12a62c0fe6fdb49e1e26b24c7a58b493cfa91 SHA512 9f7b98317da72d4abeb6cd64719ddb9de39fa5505d955c6543b7ab76ba0db18c0a7e20261c6c0b7e025272d336c98126bc87c2a32f84a811d6d11649a7dd0aec
 MISC metadata.xml 470 BLAKE2B d9a9ad2f443b0bca02e6b8e91c96f22430543ee82fe8a1174739d4ad59225f73b975d31316fecd4dde6f26002ef6ba9fd39bf5d4adfd2bc82540d14e90d623a6 SHA512 ecd2fe9215c3a65760b8c101989772a73a7e9975dc38a1b11b0334cf6e1d001ccebfca1bc6d7631eb3b3e3e03d1736205563b0c836a2aea026fdfe552d72cbe0
diff --git a/media-gfx/gscan2pdf/gscan2pdf-2.12.4.ebuild b/media-gfx/gscan2pdf/gscan2pdf-2.12.4.ebuild
index 400949439485..f821ad0cbd97 100644
--- a/media-gfx/gscan2pdf/gscan2pdf-2.12.4.ebuild
+++ b/media-gfx/gscan2pdf/gscan2pdf-2.12.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/media-gfx/hugin/Manifest b/media-gfx/hugin/Manifest
index 781a7a117629..d918bfd7f731 100644
--- a/media-gfx/hugin/Manifest
+++ b/media-gfx/hugin/Manifest
@@ -1,6 +1,6 @@
 DIST hugin-2020.0.0.tar.bz2 10371301 BLAKE2B f5092dfe3c61344f8b03e14dd85903ae6f5170989b6824578bd3350408d7a11be2c2f9cd83d030a3967b81e4125cf97af075d79136a93e06de3fac8901859c6d SHA512 4c55767c630ea03faf359bda606e5e9e7709a47ab41e821772da8c6da0cf658b1d31d7d8e96ea1c41ec61bdeb2da8c86c92b5d6964a9301732a13137178ec04e
-DIST hugin-2021.0_rc1.tar.bz2 10333665 BLAKE2B f9453a8478b700a964eaae4c8e15109717b6af7361b0596e17b8a1ba4377ff9f932ed8ab9d154981d4aa46908a365ac6b05fa12f63ec743e939c8318525abb58 SHA512 076ce4260d325ed703e61e26771bae6f478475d3d2863036ae9dc3bb0465eff037ca6a2f04c0c9fe02b42b984bc7025fb7dc84e521d49baa2bb78749931f63de
+DIST hugin-2021.0.0.tar.bz2 10333565 BLAKE2B 4bde9bb491074a2f49a34c9af0e90246095c390abf2c49e924d4412e6c00148ae013e10a885799b7eeb1cd9977922a77dc5ebe032a38e2153138632ec818f038 SHA512 fb491af2543dda8c6d3c9d125936a32a04109eec39e3091347ef2856073d4e1f04017686acb8000e50e29a0ac8dcfe463b63613b277f8fb4aec0537f58a6c853
 EBUILD hugin-2020.0.0-r1.ebuild 2120 BLAKE2B c7227cd28ae5f565fd7d0c3a6d929bc6b97b3405dda05ee392556df5d2d093f73740795ea67465f573bcd8002e936483285c07be594d589bbfacd56772b346b4 SHA512 1d37c7a20063e174f15e23ad2a16cebf8a82c95b4114bd6a71e3e949beba1a61628f0775a8d4f434caf9ea0e5b4f410717f3701a89b23649dfcac361371b0586
-EBUILD hugin-2021.0_rc1.ebuild 2123 BLAKE2B f0d83482a59b4d389aa703b5ef1aa5e34db47ca62b13df457138ee94c2b441f13cf4bf3e0d961d76ca00abe655f9dadc72911e39116c5c15d72e46c897c94bc0 SHA512 412d5a6883673e9bb9d60e90d218bb53b574fcd3ab7e9583a2cd91db93f984853ecde850ab676e8d70ba766b5aa8fd0ca44267d2a3ab49401ae70a14f48f0c0a
+EBUILD hugin-2021.0.0.ebuild 2124 BLAKE2B 21c9eede14c47d62a57ad009bfa67befd535beea86d71c9e01d62894b87d99e72004a455a763de0bc8f5ab10ebcebdbbf71b3bceb682579bac4d53b8e8653624 SHA512 1847aefcce2d7dc89a3c4a35c77f29da57d34d138aa173108bdd4cfbc7390634bffaeea91e22b834fae425588cf8424baa1d5bf2d76a1b5b3f6b771e5086d847
 EBUILD hugin-9999.ebuild 2062 BLAKE2B 4a24726bf47c3ff2911c29cf6c8fe8fd3632c82ca54a1fe60c562ea3e202260c93e38d76b5ea6a1d934b3ff036019110ee15d45067e91effc43a3aafd426b56a SHA512 359170dfbae430c9210dc75945cc883eea5b7928d22ea191f9179674032a06a3d84bccbf28cefaaafca1dc7b91c1c14040f4c26dad6d0c48506fae41b6f1817c
 MISC metadata.xml 547 BLAKE2B ea55ca44dac1ccf74d4af96d42af1d4efac2f9823304b529b96aea364ec4a6f8430fd130f54c064766f0c34f9060ca076aa43de664e37177b41cc2deed0207bc SHA512 5012cb4a58bdc374f89d1a2e81e8321ff25f2de2f5682a2f8859137aa3339ce059e7823e26642f58b939e6c1d7f428356a4df5311fca1105320ebcb417129cba
diff --git a/media-gfx/hugin/hugin-2021.0_rc1.ebuild b/media-gfx/hugin/hugin-2021.0.0.ebuild
index 3e91a000b936..94cb614e8887 100644
--- a/media-gfx/hugin/hugin-2021.0_rc1.ebuild
+++ b/media-gfx/hugin/hugin-2021.0.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 WX_GTK_VER="3.0-gtk3"
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit python-single-r1 wxwidgets cmake xdg
 
diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index 911de438ebde..c510799d77e0 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -7,6 +7,6 @@ DIST ImageMagick-7.1.0-14.tar.xz 10318332 BLAKE2B ca8db5d53c05099ab8fe0e6d810ceb
 EBUILD imagemagick-6.9.12.28.ebuild 7179 BLAKE2B c82d248b8debc199150564a6e426a7364f58694581bf2a36e883feb0da9dddbe093e58d51adbb1f2ada5ae1a0e651a8a16820c681097946c3fc63d13870fba04 SHA512 c5a8f6d240e17f2948a8fcf72bc74b2b54975301ebba4273b2f03094e60e975e9b318c633ffc1940cee6da2e2c3be35a3359d2028cf5a25eef4660bc399daf5b
 EBUILD imagemagick-6.9.12.29.ebuild 7187 BLAKE2B 0e3e44083e03f09b94d07e4f8012a62ee4b28835855507daf4375397e12b0f3369705df7b3f83048b0307a6849a8451bec62f066dc7449f20950524d3237f8f6 SHA512 2a8cda81018fb6f45b07026efdcf6e64f04ef82c1d11c56fb5948bab6cfc5f1ef46e3a53f9aadb409ab22524706439631ad581d6f023f19271f6f0e78e813325
 EBUILD imagemagick-7.1.0.13.ebuild 7393 BLAKE2B 62c865149f7d907244665fbfa78b0bb2eedfdf124ec59d72a2943bfdf0cc6b7de051965d5b63a8e117709346f70b7ce066736a647238026e054c67fe2d537009 SHA512 3a6523aa2cfdfebbc325ced0db16f48c0e17f586e41140a16fbaf66ad7c8079e33e3f4a31bd774b874f3816aceb6a01ae2be2edf8337e9d89b6b92959a83962b
-EBUILD imagemagick-7.1.0.14.ebuild 7401 BLAKE2B 177c88bf09323bc3898bc99c79051f8c73450cc19e063f04f91b079172c22e02d845b94084afd5fd26143aa7f95f670bb7319b80a27dadf83a3650607dc45468 SHA512 4c087fd762f72d88baa8bf8564b3245bd21ca4cf99d009b3537bccba1638ec79623c27cabeec8570f8058e16057ed66b260889db653a949d78c36970796381f0
+EBUILD imagemagick-7.1.0.14.ebuild 7407 BLAKE2B 9488dd72e898a148ee4b58112764f64df4927b3eda0ef8c6b31dfec9a8b80f36b303ba0c3f7370ac9efcffd70b983cceaccac2487f075d39d6af8e3d977dfa9c SHA512 3765419540bd0daf103da72f7a20cc1f03f24f200d7f2b337a19b58ba0ea7ea412a19da798329f252590c498191e2b9b3c030de163a0ab42755f784174a85d37
 EBUILD imagemagick-9999.ebuild 7401 BLAKE2B 177c88bf09323bc3898bc99c79051f8c73450cc19e063f04f91b079172c22e02d845b94084afd5fd26143aa7f95f670bb7319b80a27dadf83a3650607dc45468 SHA512 4c087fd762f72d88baa8bf8564b3245bd21ca4cf99d009b3537bccba1638ec79623c27cabeec8570f8058e16057ed66b260889db653a949d78c36970796381f0
 MISC metadata.xml 1227 BLAKE2B de893eae7e8f8e299ae10df13d202819b60df3b85858eacbe3455c4f27627689e7790a6fdded32d11d3157c35b5a2e08cab958e84b8f5799bb298deca15a1d4c SHA512 726e0c2cea973806fef1a3f51da11fb525b6a2e75bf2221a0939adbe50d2d8e267c5e627eca571e39769e4c14b134d2b9be3792047523540620c2eac149dd066
diff --git a/media-gfx/imagemagick/imagemagick-7.1.0.14.ebuild b/media-gfx/imagemagick/imagemagick-7.1.0.14.ebuild
index d47b238fb192..5e98ec4873eb 100644
--- a/media-gfx/imagemagick/imagemagick-7.1.0.14.ebuild
+++ b/media-gfx/imagemagick/imagemagick-7.1.0.14.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="8"
@@ -13,7 +13,7 @@ else
 	MY_PV="$(ver_rs 3 '-')"
 	MY_P="ImageMagick-${MY_PV}"
 	SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="A collection of tools and libraries for many image formats"
diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index 251f5027170d..c72d38b851ea 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -2,9 +2,11 @@ AUX krita-4.3.1-tests-optional.patch 2583 BLAKE2B 0b5e577bc17ef6b6487ce82ff4b4bc
 AUX krita-4.4.2-quazip1.patch 1422 BLAKE2B 917bf30f1dc702276b524713b1ec01a4807f967bc974c0c9896e6972fc56554a4da954c690a0743a4d92d86e57d32028c809418cbf10b30294bf1412a1a08beb SHA512 7c55e371f4c6a5e6d3d275298bf22810b58cb845bf4abcdd3cecdd84cb228499c59e8f7e9902319009dc52ea4dde575de77668ab2d1e9cf076e8ffa6fba582b5
 AUX krita-4.4.7-pykrita-crash-on-exit.patch 1583 BLAKE2B 077ebf5108badd615d9bc1086f2890a8f45506ca8cf0b5abf089b68e469200513f9be0a5516bad17b131e4afecc9560c8903ed6b1aaecd7c245a432ac8a2cd02 SHA512 44f023f49a0c5bfd895f65a013787bf2870b06fbba6fe292fb97c791b05965de176184d6a669225748848bc0ae1c7984d0c8dfaf3fd3ccf5ae0dbee953a08f92
 AUX krita-4.4.8-prefer-newer-sip-to-build.patch 2000 BLAKE2B 762d2230e866f7db639802dcf55ba3ff57cd125d115246721e645458376e1a26864f4e0506338300c533f18b8ed52e96374d97d2da161987fc5f8786c59f0edd SHA512 da79a6c457e3b7e04370c5ff527f7ba34e49d0e2493ec747d76af5e728ca72372476dbf85a4b69064ce5cc2f6d20b028883028c0ae59c2c5af6dc2074c8bff9e
+AUX krita-5.0.0-clang.patch 1645 BLAKE2B 9f02317b40b2408cab46acbe73797c2fea9b71ca543e0c7787b2f66a088a79d121e80ee7f4d57cef125e7f73de438c60f6e24dfe00b179a1e4452058b12391e7 SHA512 b5ce85eb346e518f51c4b5c8a18056801839deeb9826e02625171e123e3d46bf8503c4d1ac49477d44231efc14e6fe8c85c79cc8cf262326cf10c364e89d1ebd
+AUX krita-5.0.0-krita_jp2.desktop.patch 710 BLAKE2B 5227648049b9977c077efd2082be43a49dc5a6c677e4f97c138ed121b9c07bbcdfe5ce8183ce9ed99e9bce53320cfe8ae732ac7524a8d38b00976aed70f6d7ce SHA512 2fadeb6099d6bedab95c72a24fe2e0ffb73444eb141e158859c1b5210336cab062377785cac384cbca5eb8b4f1cbe3f8f53f053e9a0208be45db6bca88544f1a
 DIST krita-4.2.9-patchset.tar.xz 7928 BLAKE2B 57256884edafd528cfca529e020a226613a37682df445ece24d434e816f218d822c03d668a13806f775d02757bafd9627ed8073406e5506023767d06c78c30de SHA512 36ec902afec082fcf18c0e523a83a08aa54d54bd5393691b0f17dcab0969e69973d8e842fac44fcf66232f369b36f97937f67b5c0b0bdcff019cc1d323b3bf59
 DIST krita-4.4.8.tar.gz 254887779 BLAKE2B 251c621a235b8d977c886d3d31f07187efb6d45eab1960eab84ba4078216a1ecf5c7f0b90bdbf791e0c219867c6df59bb99b47c4b23c7658e1d2990f3e869cdb SHA512 53b9814fcf61fbaee06e81f456aa9de7ab09df99e04932251984c8ae190248e48fa20762bdb7be503ea267e1fb835095b105ce4bf2078fd510ab5a8ef6d82f81
 DIST krita-5.0.0.tar.xz 179036344 BLAKE2B cde7684931363a30598e626fd21751e2b3c0418aa3908e527d2888e41f8cc26065e6d74f000530e153b9a47627b149eb0f834985a84d92b2d87a2d398b59e9eb SHA512 29ad09f00b85688b7150a2705e0b3317e449d932b9906bc994397c4686d6d1058573f5ce84449e7c611d04385ee5ec82182b361fd067630a292ec5f88f0c9007
 EBUILD krita-4.4.8-r1.ebuild 3603 BLAKE2B e3d9d8a9d6060c2b1e621627623668ae29fce652769533ad898064e7f491ee9859fabd9df154bad3346aba37a8a5024061beca045547a87cfb6aa2d8b781ebc1 SHA512 3c3a5b4d98393c6ece66e15b6ca636689da97ce4423855d36d9c02e2fbaa71d51ad91873ae03e47f0fee3c0074307225189b8194a2fa1c4a3472cccb1a6b500d
-EBUILD krita-5.0.0.ebuild 3370 BLAKE2B c15503ea089cd86a4858153d3607b473eebcfb9efb5d42940dba7ef50c8b71dcd9e032604ce1a86066be98d7830875301d4cfb1ca2aa2d4237e3656a4d02114d SHA512 bd57d037a5a8ca8446e3fc84177ad83b7d0e92f79f2b5747705473534b13e51ea8a46e88f883befddee3907c3aa09ab30bff6bcbf718b5a1954ecee6a0219196
+EBUILD krita-5.0.0-r1.ebuild 3500 BLAKE2B d1bd50a2cf2da59f312c8b43b29a7638c53be7c58e4ee9ec42a09f0116339b9d72916e555dcd8193d92a66658544ca5f81089550bbce0adf746cde24cc07abdf SHA512 4b98d38c52850d90b43e48e0aaf21d4b5f35c60160fdbba93d630177d3643cd750cc668f15d0603df943fe21c3718fa8cd7711ec8e77bdc539a0c57779aac811
 MISC metadata.xml 877 BLAKE2B 529639e044480796204d2338601d4d10ccac0aa83565469b37d838446b4e924b8440c1c3d1eac1473a1220fedea2c49c392c5c99495c27ab7899ed7909666c32 SHA512 6f826baa1918ed944b22944f85304452d34b3a326c615ba8416589facc0208351b25d6eed9a3f8b0f3614db6c3ddd26b0b54554da95aee8ed332f1645d6fda0d
diff --git a/media-gfx/krita/files/krita-5.0.0-clang.patch b/media-gfx/krita/files/krita-5.0.0-clang.patch
new file mode 100644
index 000000000000..6c9c71d4fca2
--- /dev/null
+++ b/media-gfx/krita/files/krita-5.0.0-clang.patch
@@ -0,0 +1,50 @@
+From 0b755beaa1fdba03d38f887b93a15a58fc0830c7 Mon Sep 17 00:00:00 2001
+From: Sharaf Zaman <shzam@sdf.org>
+Date: Wed, 27 Oct 2021 22:19:07 +0000
+Subject: [PATCH] Fix build on linux clang targets
+
+In CheckAtomic.cmake we include is_lock_free because these routines
+don't seem to be included in the compiler's "simple atomics". This
+triggers a failure in clang toolchain, forcing it to link libatomic.
+
+Resulting in error: ld.lld: error: undefined symbol: __atomic_is_lock_free
+
+CCBUG:444247
+CCBUG:444547
+---
+ cmake/modules/CheckAtomic.cmake | 1 +
+ libs/image/CMakeLists.txt       | 6 ++----
+ 2 files changed, 3 insertions(+), 4 deletions(-)
+
+diff --git a/cmake/modules/CheckAtomic.cmake b/cmake/modules/CheckAtomic.cmake
+index b061e2d65b..df6b70504c 100644
+--- a/cmake/modules/CheckAtomic.cmake
++++ b/cmake/modules/CheckAtomic.cmake
+@@ -46,6 +46,7 @@ function(check_working_cxx_atomics64 varname)
+ 	std::atomic<uint64_t> x (0);
+ 	int main() {
+ 		uint64_t i = x.load(std::memory_order_relaxed);
++		x.is_lock_free();
+ 		return 0;
+ 	}
+ 	" ${varname})
+diff --git a/libs/image/CMakeLists.txt b/libs/image/CMakeLists.txt
+index e883c7f1c8..43c945fad3 100644
+--- a/libs/image/CMakeLists.txt
++++ b/libs/image/CMakeLists.txt
+@@ -372,10 +372,8 @@ target_link_libraries(kritaimage
+ 
+ target_link_libraries(kritaimage PUBLIC ${Boost_SYSTEM_LIBRARY})
+ 
+-if(NOT HAVE_CXX_ATOMICS_WITHOUT_LIB)
+-    if(NOT HAVE_CXX_ATOMICS64_WITHOUT_LIB)
+-        target_link_libraries(kritaimage PUBLIC atomic)
+-    endif()
++if(HAVE_CXX_ATOMICS_WITH_LIB OR HAVE_CXX_ATOMICS64_WITH_LIB)
++   target_link_libraries(kritaimage PUBLIC atomic)
+ endif()
+ 
+ if(OpenEXR_FOUND)
+-- 
+GitLab
+
diff --git a/media-gfx/krita/files/krita-5.0.0-krita_jp2.desktop.patch b/media-gfx/krita/files/krita-5.0.0-krita_jp2.desktop.patch
new file mode 100644
index 000000000000..c678a9f05492
--- /dev/null
+++ b/media-gfx/krita/files/krita-5.0.0-krita_jp2.desktop.patch
@@ -0,0 +1,24 @@
+From e1b2760966b738f1d467013272035433f1666406 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Mon, 27 Dec 2021 15:25:25 +0100
+Subject: [PATCH] Fix duplicate "Type" key
+
+Introduced by 542dcd306e236ec776a81e389d0a601387739e48
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ plugins/impex/jp2/krita_jp2.desktop | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/plugins/impex/jp2/krita_jp2.desktop b/plugins/impex/jp2/krita_jp2.desktop
+index 26c448f48b..7de190b247 100644
+--- a/plugins/impex/jp2/krita_jp2.desktop
++++ b/plugins/impex/jp2/krita_jp2.desktop
+@@ -120,4 +120,3 @@ Icon=krita
+ StartupNotify=true
+ NoDisplay=true
+ Terminal=false
+-Type=Application
+-- 
+GitLab
+
diff --git a/media-gfx/krita/krita-5.0.0.ebuild b/media-gfx/krita/krita-5.0.0-r1.ebuild
index f6f7c94470a5..d2782068ebcc 100644
--- a/media-gfx/krita/krita-5.0.0.ebuild
+++ b/media-gfx/krita/krita-5.0.0-r1.ebuild
@@ -39,6 +39,7 @@ RDEPEND="${PYTHON_DEPS}
 	>=dev-qt/qtgui-${QTMIN}:5=[-gles2-only]
 	>=dev-qt/qtnetwork-${QTMIN}:5
 	>=dev-qt/qtprintsupport-${QTMIN}:5
+	>=dev-qt/qtsql-${QTMIN}:5
 	>=dev-qt/qtsvg-${QTMIN}:5
 	>=dev-qt/qtwidgets-${QTMIN}:5
 	>=dev-qt/qtx11extras-${QTMIN}:5
@@ -85,7 +86,11 @@ BDEPEND="
 	sys-devel/gettext
 "
 
-PATCHES=( "${FILESDIR}"/${PN}-4.3.1-tests-optional.patch )
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.3.1-tests-optional.patch
+	"${FILESDIR}"/${P}-clang.patch # bug 830225
+	"${FILESDIR}"/${P}-krita_jp2.desktop.patch # bug 829987
+)
 
 pkg_setup() {
 	python-single-r1_pkg_setup
diff --git a/media-gfx/plantuml/Manifest b/media-gfx/plantuml/Manifest
index 2ab4f73bf0ae..a7eb0583d97e 100644
--- a/media-gfx/plantuml/Manifest
+++ b/media-gfx/plantuml/Manifest
@@ -1,7 +1,5 @@
-DIST plantuml-1.2021.14.tar.gz 4756407 BLAKE2B 86261a79ed24cff626fd4c0a9a64f3912251ea0ef2a5724ceceda1daf93d8c50eebd42e8b6d1b3eb2d67a6ad62496d6b47ef92b50e2bbebb9e39270dee27eac7 SHA512 18abfb402f93a63be0ba02e6fe028bc99d25502714e4a2d92c8b7227088f6af4a10a1a8b63c001a0c2d2f5386385a7e22e1daa787617faf78efe2732cf029f50
 DIST plantuml-1.2021.15.tar.gz 4769780 BLAKE2B 7878d71964513e77d1f1412ab2e1e06db6a34863f9bd67868b915d86d38ee6ef6225af6f10b69d36825a768bb7f5a7f1baae0b33d329a385c1751ac4cbdaf58d SHA512 3918d6bb67eb142a9bafd399d2ae7b0b512bb3affcad31135970de5e54e23b7a7c5821f456c0f595958965eb9e957b855fd103e49187ee34b27bd5bd800e6932
 DIST plantuml-1.2021.16.tar.gz 5378332 BLAKE2B 717ada64ab3664eb790089520ed70106f45eb82186bd26471dcbc732ca0edf6df6d9e55598810c7b208ac5be5efd69452d48f1553b8cd13275ee7d4f0778b603 SHA512 70a0bd0453ed2457fc16a7544a82b53d45e42d3d3fe3d647e1f1509a25135b9adf3fbee70a8e64394829fc941cd5beb66494d8281431fdfe0595cdf2450cc1ec
-EBUILD plantuml-1.2021.14.ebuild 750 BLAKE2B c6f294d0ebcea2df17681fa103506693d6698b7ab87befaeafd5a67a351faedbaa4241cfbd1a38ef1b42d55bb34d20d09dfda65b18890a32669c868262b1f301 SHA512 5986d587915b3c0d5bf8733311848c78d0c0203a8e4b7d0f9281a7c2717f4275fb3311faad5625c53607fddbf2b8b74b7e5c3368450e6de207f2e07438801aa2
-EBUILD plantuml-1.2021.15.ebuild 751 BLAKE2B 893f8f933be06f96283feb2fa5ed98ec01db76209ad246710d48b83e60de122e6d1e2b32879ff20de051b5789562621b9dff77a27bf1b327410129dfbc150cc4 SHA512 d0f8074c7588849c330c9c5259092348ba4df4ca5d0de4d122ae1123e183b63893d8754419a7fa74faf6ecc42ce66a73ecbdbda307559c0f9d1f94bdeafcdeb7
+EBUILD plantuml-1.2021.15.ebuild 750 BLAKE2B 865ccd939984bee0220611676d21df2d6d9b6696cffb9befcc071cf82863852f1209b0945f9ad8f811ab497323a995ce4e060504c5bfe12bd0d8d68a1e1939e5 SHA512 2221e07a0a3b0e2a20494f9792041da9d0969050f0d8666bc75eaacdad0833fd8193081a879ecb876addb1a084caaafa8c8cdde186cf204d4a7ae5905a104b6c
 EBUILD plantuml-1.2021.16.ebuild 751 BLAKE2B 893f8f933be06f96283feb2fa5ed98ec01db76209ad246710d48b83e60de122e6d1e2b32879ff20de051b5789562621b9dff77a27bf1b327410129dfbc150cc4 SHA512 d0f8074c7588849c330c9c5259092348ba4df4ca5d0de4d122ae1123e183b63893d8754419a7fa74faf6ecc42ce66a73ecbdbda307559c0f9d1f94bdeafcdeb7
 MISC metadata.xml 822 BLAKE2B 2b2fbd2c5cac001a33c087d4fd4d3e3bd7349ede7af50e08a838a0f395375a627717e80afd658d2ce7211b0adeba2acc88f868eb5e40915c1fe35526c710e79f SHA512 9f3c1d975ce742b95c3be9c049b99a7bdb8e4f1e8eab0da18fa331214c1ef6c66263ed1226554ab0581289bf9d45b5aa7f947ec3bb64e629817d3a2333c13eae
diff --git a/media-gfx/plantuml/plantuml-1.2021.14.ebuild b/media-gfx/plantuml/plantuml-1.2021.14.ebuild
deleted file mode 100644
index 2293ae97609b..000000000000
--- a/media-gfx/plantuml/plantuml-1.2021.14.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="source"
-inherit java-pkg-2 java-ant-2 desktop xdg
-
-DESCRIPTION="Draw UML diagrams using a simple and human readable text description"
-HOMEPAGE="https://plantuml.com"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-
-DEPEND=">=virtual/jdk-1.8:*"
-
-RDEPEND="
-	>=virtual/jre-1.8:*
-	dev-java/ant-core:0
-	media-gfx/graphviz"
-
-EANT_BUILD_TARGET="dist"
-EANT_GENTOO_CLASSPATH="ant-core"
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-src_install() {
-	java-pkg_dojar ${PN}.jar
-	java-pkg_dolauncher ${PN} --jar ${PN}.jar
-	use source && java-pkg_dosrc src/*
-
-	make_desktop_entry plantuml PlantUML
-}
diff --git a/media-gfx/plantuml/plantuml-1.2021.15.ebuild b/media-gfx/plantuml/plantuml-1.2021.15.ebuild
index 6ff07a08c731..dc4ec7f18aad 100644
--- a/media-gfx/plantuml/plantuml-1.2021.15.ebuild
+++ b/media-gfx/plantuml/plantuml-1.2021.15.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
@@ -11,7 +11,7 @@ HOMEPAGE="https://plantuml.com"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 DEPEND=">=virtual/jdk-1.8:*"
 
diff --git a/media-gfx/prusaslicer/Manifest b/media-gfx/prusaslicer/Manifest
index 00533fb26f20..b414593f9cdc 100644
--- a/media-gfx/prusaslicer/Manifest
+++ b/media-gfx/prusaslicer/Manifest
@@ -2,5 +2,5 @@ AUX prusaslicer-2.3.0-miniz-zip-header.patch 284 BLAKE2B f73db5727dd6bffc39c658a
 DIST prusaslicer-2.3.3.tar.gz 40659538 BLAKE2B 1e1a1f7aeb34934bab03410e004a91e5ed76aaf930ff59e5b373b2e229018b6703d8da8ee7ab9085be25c5b3ce4ef39aeb38204336400867fac4a55f52c76bd4 SHA512 1f6b97e135202ad9de8f0bb212239ce2497de4205ea32f860b483473fb1f1783451d539a67cd97ef31f512a797b29c1067a1eff4134ea4a29b6218e5757657e2
 DIST prusaslicer-2.4.0.tar.gz 46397442 BLAKE2B 686232fddd3e2105db1325ab085b49f6f7a028a24ab90120daf94c53255f09b19411e0ff075bfe7abff138d3c276e8b5341ff6d59e267087bcd4568ac1113c47 SHA512 e923e4e6273dbcfc3e2bc0e28f9eb8cda8530747c0a834f48aea715d75ba1d02be9cfee043689efccdaee40de00114f7964e43accad245b9acd801b997868e3c
 EBUILD prusaslicer-2.3.3-r1.ebuild 2091 BLAKE2B b9193ade560bc73c04f5d09cf8ecf41ea58d18a4672df9244420935bea887a101847cc39e44f4bde6318c4091826f511890a2f48c05c682de3f11cebbea192cd SHA512 0892aa78102d8cc6984a379603ffec364750d82b34e07e0c618673e16c4185db8769a3808f3a77c267171537ce4600b2bf364d7755440a9e5c659712c758dd92
-EBUILD prusaslicer-2.4.0.ebuild 1952 BLAKE2B 32aa00a8666d6672f7761534487826cc785601b78bff19647fe1896c18d86a7b30f05f068a5722ba52b7fb0a75dbbaafc510d2fe9e65f164161d0ca766f3b841 SHA512 612ad3a547536db26b91aa268baf4e91dc0ddede7ed0b67d534fa7ae383a75f38b539ef4efc5f963c9e0a26cad0041ce7414fb58ff2aa93ef3fe9338fdbcdcec
+EBUILD prusaslicer-2.4.0-r1.ebuild 1545 BLAKE2B 2254a52fa2a97ea6c96a24121fb69397fec2fe0fe7d61a81b96f509cb9268a03fc0fc83d4ff34d72fabb580b94a03b84cfb6b8b1234b289bd3392df07b6e57a3 SHA512 bf07c03079c87a822c688aaa0f1758828acfee6f079062ae1f341a2e352302185bcc60e5729cf0613865606dc1c51f5c710cb52f24a37c7af49d07317739a330
 MISC metadata.xml 1028 BLAKE2B a267e6b0ee72a85b895046cc7d5f659cca379fd799a9ebb802dc1fafd7edfa1b989784b10eb93ac24f1ea6153153b892e28e20055b0a7d2021f6db7742e065b4 SHA512 5760ea954f5ccf09e5d69e101b6d68839a4517a9375adc3009b1bf846b98091ee0555e9c92bb0cf316670efec699cd24d04b4ebe7db5b65e363f83051d868512
diff --git a/media-gfx/prusaslicer/prusaslicer-2.4.0.ebuild b/media-gfx/prusaslicer/prusaslicer-2.4.0-r1.ebuild
index fe2b49e8810e..51a5b4378a17 100644
--- a/media-gfx/prusaslicer/prusaslicer-2.4.0.ebuild
+++ b/media-gfx/prusaslicer/prusaslicer-2.4.0-r1.ebuild
@@ -16,10 +16,8 @@ SRC_URI="https://github.com/prusa3d/${MY_PN}/archive/version_${PV}.tar.gz -> ${P
 LICENSE="AGPL-3 Boost-1.0 GPL-2 LGPL-3 MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="gui test"
+IUSE="test"
 
-# tests fail to link with USE=-gui, bug #760096
-REQUIRED_USE="test? ( gui )"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
@@ -28,9 +26,12 @@ RDEPEND="
 	>=dev-libs/boost-1.73.0:=[nls,threads(+)]
 	dev-libs/cereal
 	dev-libs/expat
+	dev-libs/glib:2
 	dev-libs/gmp:=
 	dev-libs/mpfr:=
 	>=media-gfx/openvdb-8.2
+	net-misc/curl
+	media-libs/glew:0=
 	media-libs/ilmbase:=
 	media-libs/libpng:0=
 	media-libs/qhull:=
@@ -39,15 +40,10 @@ RDEPEND="
 	>=sci-mathematics/cgal-5.0:=
 	sys-apps/dbus
 	sys-libs/zlib:=
-	gui? (
-		dev-libs/glib:2
-		media-libs/glew:0=
-		net-misc/curl
-		virtual/glu
-		virtual/opengl
-		x11-libs/gtk+:3
-		x11-libs/wxGTK:${WX_GTK_VER}[X,opengl]
-	)
+	virtual/glu
+	virtual/opengl
+	x11-libs/gtk+:3
+	x11-libs/wxGTK:${WX_GTK_VER}[X,opengl]
 "
 DEPEND="${RDEPEND}
 	media-libs/qhull[static-libs]
@@ -63,13 +59,13 @@ src_prepare() {
 src_configure() {
 	CMAKE_BUILD_TYPE="Release"
 
-	use gui && setup-wxwidgets
+	setup-wxwidgets
 
 	local mycmakeargs=(
 		-DSLIC3R_BUILD_TESTS=$(usex test)
 		-DSLIC3R_FHS=ON
 		-DSLIC3R_GTK=3
-		-DSLIC3R_GUI=$(usex gui)
+		-DSLIC3R_GUI=ON
 		-DSLIC3R_PCH=OFF
 		-DSLIC3R_STATIC=OFF
 		-DSLIC3R_WX_STABLE=ON
@@ -78,13 +74,3 @@ src_configure() {
 
 	cmake_src_configure
 }
-
-src_install() {
-	cmake_src_install
-
-	if use gui; then
-		newicon -s 128 resources/icons/PrusaSlicer_128px.png PrusaSlicer.png
-		newicon -s 128 resources/icons/PrusaSlicer-gcodeviewer_128px.png PrusaSlicer-gcodeviewer.png
-		domenu src/platform/unix/Prusa{Slicer,Gcodeviewer}.desktop
-	fi
-}
diff --git a/media-gfx/slic3r/Manifest b/media-gfx/slic3r/Manifest
index 350221901b45..a98e2469b295 100644
--- a/media-gfx/slic3r/Manifest
+++ b/media-gfx/slic3r/Manifest
@@ -6,6 +6,6 @@ AUX slic3r-1.3.1_pre20200824-boost-1.73.patch 3928 BLAKE2B 24c2e497a7dd80fa4212e
 DIST slic3r-1.3.0.tar.gz 2104094 BLAKE2B 74c58690cf196f89ecff5eec853215c87c648df5a504725fea9f14b0343bca105190de1d63e2e8e76d47fcaf8dbe7b6d26f61b304ce7336412effa1c9a3fba41 SHA512 ff0f7747e166826ff1c53220974ee9d3a217d0e19964dbe4a5fa3e81f262a6810a47632686b7f1b3128384ae05c6f98d8aab980524079bdf9811445fe23a0f0d
 DIST slic3r-1.3.1_pre20200824.tar.gz 2432288 BLAKE2B 37e767b6cb12909ea3a6411532103ea30500903cf3d6a221c2fa3d3109fb733db5d0cb0e9d0eec5033dad9acec2f89258242cdab316ea26392a8386097d9dd38 SHA512 fd7198f7c4a60911b2009f617d37485bf73964a626a53d02bd13baae963d28e74dc2f8314888e7c0fcacb389e0b481f3357c6ea595ac8f92d99f7a228c5cc2b7
 EBUILD slic3r-1.3.0-r4.ebuild 2744 BLAKE2B b6bf1e8b964ef877d3b11e02bc636265820a36dcacfa84a912fe5533511feb205e1ee91657da46ce73160279fb6cdc9a44c054edbbb2e6bf485c94382f80cd3f SHA512 353b0cb79919ad64ef7dd90d29372e9d7e796102b9759adf80bf7bd8f3bef82e2e4260083448d6568e07643f3e0c47f800f69996db231f58e99c83461756ae36
-EBUILD slic3r-1.3.1_pre20200824-r1.ebuild 2780 BLAKE2B 8f41a258bdbd10da0fd8479ca2752e45240a47f6b69c70825fda69f7ec938f4a1b28878041e548d095d541ce71ae506f7f0318b10fe8f359745aff157949a615 SHA512 da9e0ff4cf0207c5150d1d668390e4a6be172a090397f18d64acf2ae4579682cc4d7a2b43a2bd2c7110ef8fb44fc53a321a620ae487c0c1de257d50730787223
+EBUILD slic3r-1.3.1_pre20200824-r1.ebuild 2790 BLAKE2B f5e2c5025897e11c2bc2461cbff0e2def7048e14d5c4ccca2d2f339fbfd6496ac1656eb4e73288a829610a3a46a33975b9756ce7bcd67ba206457b55a75e85c4 SHA512 95adcb2ac4c75c4c3f355b95011b5f91e37021f1ed22616388aaf8209948c54de4316cc76c1ed556a6b08aa8ac1cbb8e06f4e83e8d352fd7cf30a9814d1f1845
 EBUILD slic3r-9999.ebuild 2735 BLAKE2B 894915ab09547a131f4435a786202d06b30c039c88dcee170c0cbbe2409a213079c1b10bf8d9e4aaca69b4bc69e2aa95b0aff0cd5eb251fdd7d91c74c5e530b8 SHA512 9c825dc76c78a3aa48f7dbbffdd974cef17077b37558209daa3512aa0957abd1748a1e61a8e6b253835be2ccfdb166ffa93e5b1f64852d5956b15a200d9c9152
 MISC metadata.xml 977 BLAKE2B bc737e1255bc2204a44b1aee62c3e342a8ac0c4844279c5cf404f52f6f052c6da1fcd490fc12cfa5d2158f79dd921c9c6bd29a4b99d7c62ff77a55d4073666fe SHA512 f09ea6f44124ebc24aa0d009d48af8d40190fa0d1fd9c2935341ac84f4ae900619b9557718fc38f399fcbdbe42924afc4ff6fb4676e19b3a3bfec6a7e9f6d1a6
diff --git a/media-gfx/slic3r/slic3r-1.3.1_pre20200824-r1.ebuild b/media-gfx/slic3r/slic3r-1.3.1_pre20200824-r1.ebuild
index a437470e7df1..9353f8c2f830 100644
--- a/media-gfx/slic3r/slic3r-1.3.1_pre20200824-r1.ebuild
+++ b/media-gfx/slic3r/slic3r-1.3.1_pre20200824-r1.ebuild
@@ -55,17 +55,18 @@ RDEPEND="!=dev-lang/perl-5.16*
 	)"
 DEPEND="${RDEPEND}
 	dev-libs/clipper
-	dev-perl/Devel-CheckLib
 	>=dev-perl/ExtUtils-CppGuess-0.70.0
 	>=dev-perl/ExtUtils-Typemaps-Default-1.50.0
 	>=dev-perl/ExtUtils-XSpp-0.170.0
-	>=dev-perl/Module-Build-0.380.0
-	>=dev-perl/Module-Build-WithXSpp-0.140.0
 	>=virtual/perl-ExtUtils-MakeMaker-6.800.0
 	>=virtual/perl-ExtUtils-ParseXS-3.220.0
 	test? (	virtual/perl-Test-Harness
 		virtual/perl-Test-Simple )"
 
+BDEPEND=">=dev-perl/Module-Build-0.380.0
+	>=dev-perl/Module-Build-WithXSpp-0.140.0
+	dev-perl/Devel-CheckLib"
+
 S="${WORKDIR}/Slic3r-92abbc42dfdd5385c1f9c3a450e2f3da835f8b8d"
 PERL_S="${S}/xs"
author	V3n3RiX <venerix@koprulu.sector>	2022-01-04 01:27:12 +0000
committer	V3n3RiX <venerix@koprulu.sector>	2022-01-04 01:27:12 +0000
commit	3517852e3b8a68d1e997770fc0650c5053bafc6c (patch)
tree	44068672445b1418489aed82de58df3c470289e7 /media-gfx
parent	0f15659d48c193027158492acb726297501202c5 (diff)