gentoo resync : 14.12.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-12-14 13:26:14 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2020-12-14 13:26:14 +0000
commit: 6abbf81ef2f298e3221ff5e67a1f3c5f23958212 (patch)
tree: 25413d1cb3a0cbfe36029db32398c0f333609215 /media-gfx
parent: 9c417bacd51da6d8b57fa9f37425161d30d4b95b (diff)
88 files changed, 1362 insertions, 1441 deletions
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index b16b5bf68bb6..4d1ddeaa0aad 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/argyllcms/Manifest b/media-gfx/argyllcms/Manifest
index 5f45da5eb0dc..9a7f20e18bea 100644
--- a/media-gfx/argyllcms/Manifest
+++ b/media-gfx/argyllcms/Manifest
@@ -1,5 +1,5 @@
 AUX argyllcms-2.1.2-fno-common.patch 5132 BLAKE2B 5398d60a364a36ea24d6cce682330db177aaaec874a39e4f2a9c754a8862504938471851a14ce0871bb7863a9fd9a794f7ede2144090e1f44718f001344032e8 SHA512 d60f0eb9bd6d32b85d8ac88aa32558d1446357c6643fbdb393e90eba08f8f701ba8185741879b2320bda73e08ed14989cc1a16ffd4d2996d5e9afb05774e4e76
 DIST Argyll_V2.1.2_src.zip 13837056 BLAKE2B cf6181549e37b1deda11bdd4a63b27e101180a1e82b132ea8dca5af6830a74d5e2f940633f5aecf9a8d62fe8c2b0cdce8f2af44124ce7432b33d2a1bdbaa2c21 SHA512 f49b588c5f0a39edcc30a068a8bde8c7b74611d3feb15d07d4a61b205ed1231c288629f65e1a5a60a3921d552a28e075667ada555401a0d9694fd882bddd4b06
-EBUILD argyllcms-2.1.2-r1.ebuild 2171 BLAKE2B fc3fc692cf31bbbf4e37bac3b1cdc46b9645c7ffe800b5171414f95b576b429dfb1a51987941f9ef1d3f3b4bc69b033eaf8821e4fb7fe5979b1eb7d94c7a10c5 SHA512 39b5fe40c05827a85bfdfa0b466abc8a90a4311926b50fb8ff933a84f762aa7dd1d7e30580d185706913c9dea859eded7044d3d64a4fcc196e8192c0f6053e02
+EBUILD argyllcms-2.1.2-r1.ebuild 2168 BLAKE2B 9f31f838f55186b1dd84012ef0b9d4e77abae1be314779a55436344c836c7f0bba82ecb94631b620f82e929819783c0bc367fa8bee3f2d6b81af0e0df2afff2c SHA512 76c28a28da11740e2ee16f0b347e014b09386990d5f3814eabfc58085915df2da96da5811c9acd453b15217eb23721d62f6ba616f1551af6d0ac97862ce538bd
 EBUILD argyllcms-2.1.2.ebuild 2109 BLAKE2B d6877c236e18b35ea0305d61ae11942cc87a79c8c1adb37e86d941532d0f46a6983101d45c7d375fd33637f249215d06fab56fb756d9fceeaa6d5d1eb965e24d SHA512 047b0fc549fa038b0ad6584a36ff160ff31b608abdb7d95a905a9a7ec30f42492bbba2544080db7b9496e8dc8530e79de6d1463fd86c00145b69c41d8f0d3a02
 MISC metadata.xml 252 BLAKE2B f7125c07f7cb9fe1a8d301f198091320ba83ef3547e579b9825298715066ba3506be216900b5317106da011f95df9411b99b100f14f741832ab500fda6acb788 SHA512 6a56c24e3731dd9512fa264d3dce1fe36ace891a17394c483586e0be1fffd153e901228d3ee9c471a226b04cec27d3f78ed2de491e46238de4b06538dab7e724
diff --git a/media-gfx/argyllcms/argyllcms-2.1.2-r1.ebuild b/media-gfx/argyllcms/argyllcms-2.1.2-r1.ebuild
index 25461f6d1758..f2066c75a01d 100644
--- a/media-gfx/argyllcms/argyllcms-2.1.2-r1.ebuild
+++ b/media-gfx/argyllcms/argyllcms-2.1.2-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://www.argyllcms.com/${MY_P}_src.zip"
 
 LICENSE="AGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~hppa ~x86"
+KEYWORDS="~amd64 arm64 hppa x86"
 IUSE="doc libressl"
 
 RDEPEND="
diff --git a/media-gfx/asymptote/Manifest b/media-gfx/asymptote/Manifest
index b630945633a1..bfefce696fef 100644
--- a/media-gfx/asymptote/Manifest
+++ b/media-gfx/asymptote/Manifest
@@ -1,19 +1,15 @@
 AUX 64asymptote-gentoo.el 337 BLAKE2B 56b028184573dd8db6babd90ae45838b9788671134d625df5960744b71b377db3cacf1dd4fc78d9800ffdf4e83a2413b7e87680ab0fcf45c31ecad9dc538388a SHA512 c8c74d5464f500e9bc3ca2fd89065e4f68a834c1b82a444820efd70abf9d2bd7c52ecbecd7ea5fad916259512acf4aedf8aed803a707733121211e59ef300c86
 AUX asy-ftd.vim 60 BLAKE2B 2ef690e6c1906378872aff97ed956b0c8fd1cf2e492787edd3bbd928d50724eec7b5b65f2b1b70c83e520b849c1cfe1539dcc7aabb0f8ba38b448ef58f36b802 SHA512 f4b62341f1482386d3e402f9d70a0f6b4c103a412a63dd8947aa45a5d43f12970902615b6c13e8cd8123f1cd44bf72e4204118d3bcfa7969fce078924bf150fd
-AUX asymptote-2.61-info.patch 436 BLAKE2B 34787bb4afb276074a16bbf36bf31ed71a1fd213d96f6124f4552497901c6b315009b33da74dbd554806089ce2ca1a35d3efbb4ce6388e4e05339c4ed36ab688 SHA512 4ec89ac4ddd7eb1b4b1757453000b88f509323f20995631e82a2923cd275d4ba3f7ffabef8293da943ab2ecf406e20e239ef7d2c956d6c441b287ae79e34da20
-AUX asymptote-2.61-xdg-utils.patch 752 BLAKE2B e73ad1bdda49fe95f494815571b21c7987e256450885077b89bb1dc6e192fb0cb5389dcbc1864750f6a3b6bb2762056df3c3ccea01edc42ca8f5cb435d1fc4f8 SHA512 a967c529c9e487fea3fedc46cfde81347aca98e470f7bae17879f4ca7c661ea658e764dfb352c73dc0860e152d5a0969e4ced034e1bbbd59f78d495365ce5f70
-AUX asymptote-2.62-info.patch 436 BLAKE2B f4994502868851fc175d05bdd83b3a099d67a2aa4d188656c24860ac167bb54b61a68497233536854656964b7fd7b71f050ec4b9c7c797a0e852936d3a2c7ce6 SHA512 77dea1306a90df1030b0789a0a6bf2c95c03805c13664d1b4599fc4a00fac7218425b33e506d1fb52b8e9da67d468b64de990a2ed3fb3853185ebc16ce74033b
-AUX asymptote-2.62-xdg-utils.patch 752 BLAKE2B 887e0ad34c0b24e20b50556eb070da9c4bcc00af60873b9da84445125f1129eef41050002fd8aa04ea796c14916041692c335a6d04833bf5c374e6c9aec5bad9 SHA512 cee63bbaf975ccb9fdece0728f62026b7e59e945790c6ffa1c182db814c87b0acdf38b9f1939532edf36e8f248d09f8f540c4223f7f6933c3d8a5f2a1ad0602e
 AUX asymptote-2.65-info.patch 436 BLAKE2B 0ddf2454a1ad2370c153d74d8fe4b8f36c2f702d6f732608097865885cb71681e1564e2a25b107bb0d3ff5bc0db746a86f58be49179d6b825459fce02b51b88e SHA512 77e47570629ba0370e43f0e872feb58739958ba939d29edb8411681cf638a00866a892a3dcb9a41de82f463c8e4e21fa1a7e76003075f7d78d938ab38ca636e9
 AUX asymptote-2.65-xdg-utils.patch 754 BLAKE2B 6697eabd3cded5ac11c4802805e1c55a05d41ad35fa46d57ea0534d85a2d34d6fabf1b119d94b83ad8387e9de4537d933f25c24fbe2e376eba4bc02925f2a2fc SHA512 85d85f15d8ebeb3d272d1e619ec7a97cac71b673c03a9811c1e051ef6c49ba41399409eb26b24523145eb758c353233dc50d8b105979723d903c9da3bcbc4d52
 AUX asymptote-2.67-info.patch 436 BLAKE2B 2ec0525ed1695f55bb25d6d5fdbdbf8d77eb85385ab13e5c292b6937fe1e60c51976101b5e1aa0c4036504a7a7b9133aab294220c92f7412fea9e62838c6d0a2 SHA512 d4ea5c8d914b09434ef92bc66e4847c40b82bd8c58581f7d5b305ae759e6e01082dcc31a615081bf77a09e630b5a27f245c2b60b056467000c1237c73939a207
 AUX asymptote-2.67-xdg-utils.patch 791 BLAKE2B 90e37b056462ef70ee34e8d1503ebd194c16f80e62987de776cc40bb0e6efda5a6c8d5e53f85842aa2554f4814423a3ac0bcebf4767996c004cdffa652bc1ecc SHA512 9cb5b2eaf19d3805167bba763333b1ac804d1ef426a59e41a19aa6213a35c5c2088d27fd9f22caf2b36cd6405bb84516e6d1a4de5d6fc5afb57337625e15b010
-DIST asymptote-2.61.src.tgz 4623504 BLAKE2B 8432f07ce21f630c5bdae609650c0bb2bcd237a121df68030dc19d1cae986f0bfa56dd0e241570809f9fcb202440e8b9b3c6d47a22eeaabe3eb9523360a166ca SHA512 34bb610360b4536da70ca9edf1e069ebbf0c9225948b92b3d59ea25e8684587364fa7bbb03909ba02617e6ee81d41a2e530c9ed639141e4cda42096143cab5f7
-DIST asymptote-2.62.src.tgz 4625853 BLAKE2B 49a5c75f936149139576cc224b005e76d2465a6c813bcb152f2534e98e042685c1500eafb0954b9e53ac0e667b47ab88a8b3387f1627d58828008d0e4d4cc0c8 SHA512 f7e817cdbb3c079a10c5f6f56a1eb47b1aaf8230902c06870bc8feacfed5f7af3d8ed22e4c60cc7130828ced8d36ec035533de1074cb049d3de9006ee542ac2e
+AUX asymptote-2.68-info.patch 436 BLAKE2B 2ec0525ed1695f55bb25d6d5fdbdbf8d77eb85385ab13e5c292b6937fe1e60c51976101b5e1aa0c4036504a7a7b9133aab294220c92f7412fea9e62838c6d0a2 SHA512 d4ea5c8d914b09434ef92bc66e4847c40b82bd8c58581f7d5b305ae759e6e01082dcc31a615081bf77a09e630b5a27f245c2b60b056467000c1237c73939a207
+AUX asymptote-2.68-xdg-utils.patch 791 BLAKE2B 90e37b056462ef70ee34e8d1503ebd194c16f80e62987de776cc40bb0e6efda5a6c8d5e53f85842aa2554f4814423a3ac0bcebf4767996c004cdffa652bc1ecc SHA512 9cb5b2eaf19d3805167bba763333b1ac804d1ef426a59e41a19aa6213a35c5c2088d27fd9f22caf2b36cd6405bb84516e6d1a4de5d6fc5afb57337625e15b010
 DIST asymptote-2.65.src.tgz 4640419 BLAKE2B a508532b9697a0744d48f8109d5b04ca71eb1ee7a08f15eccd2b95d63c16c980621ef03d01a03917a767c774f14a239a13f8fe50ad98b154b092f710917af1ad SHA512 c6879689192c1646a318b389de222accc55c8d5e9df17fab3c88c37f627d2cff8133cdefe9e6dec2784cf72edf261e557ad83f7fac6e67fd49c483e9d8971026
 DIST asymptote-2.67.src.tgz 4668696 BLAKE2B 30be754a0e5869caad4d605f162dffe688d2dc09a0163a8c37d15fd9d6dd05652b7b0b2710ab31edaa8f4b36484df256d032f8826f3547e755eb90e5dbb179ec SHA512 5854ce51bc7a3d330eeb0887376645c3d292a368b06d01ec84c15ee5beee90ae429abfee1bff5025bdfb51edfa7f66e535c1187f66440df0c6626c79e3de6210
-EBUILD asymptote-2.61.ebuild 4627 BLAKE2B 211e3136584bbf32862382b9e8320493c2380430b92f79fee46a35174db8dcbd73140c4460f31f37c3aff378cc45ae5fc6d188d859e162209fb843c1c48e19fa SHA512 52f15e395335622fdd219b9c589ba5c296bbf39de02e69275f70016e865a71206c40424a236022212d793bca2847fb7ceefa5819197a18cc9ffed44377050e15
-EBUILD asymptote-2.62.ebuild 4629 BLAKE2B c19da5209a22a836a6c9c59870c1a7456c5724886296de32d668258990ac221a49059c81dd8b5fab8f376fd42e20f53a6e0a30d71d86251c3c4ab3828d1c87a4 SHA512 b6d960457b9ffaadaf842ab6fc335a15a62b576b83ba0d76bdacbc1cb3d961f494901a16cb31bfc9305faebf85716a0b5a1b18fc9e4270825d56382e816b9833
+DIST asymptote-2.68.src.tgz 4672007 BLAKE2B 96c1a99815cf04180ea2fe01528615390faf8d1e5853d4e2e5f4fcdf48f0ec7e774ab0facdb86ad427e6ac11f5ce684902997f7d1e4855460ad450f6d6c64cfd SHA512 20aa3ae5116b93f266020a1d45178d7120cf39980634108b86a0bc8a4202e28b2cf0a1ac6fa5e921506db150e9077a1e3d7b8ad04869bc9bd22bae447f45fd46
 EBUILD asymptote-2.65.ebuild 4629 BLAKE2B b79215e02d3e4f59e190025daae4a4d6f328d0eebec055da2ae73ba81afb42534d41a1c81b2b9f6cfb2b1857fa099985ef57d15a433cc80ed1095718f8e4368f SHA512 94bf7f665139cc77125185918e2236ac31c0c7a1a8732eb2cc37d777c54d7b30bb2bd850502243bc219c55e38204c175d1017011e03a6bfa3a1d70dd16fe97d0
 EBUILD asymptote-2.67.ebuild 4816 BLAKE2B 6d7e6563239cfca0317d25ea4180b1e1079578148969375018782bea8bd234376da6516be67f89f40746e8b8fa0c57ddaaefa087a31614e8521aca00cdbfa896 SHA512 0af77d5679a84feaca0ab4ae6cbb95b77fa415056d4f38306d34debfde4c480fd8668c3a57c3e74a071222f6dae2f671b42e4bb1618ee7d8c9b0aa9b5b05bf10
+EBUILD asymptote-2.68.ebuild 4816 BLAKE2B 6d7e6563239cfca0317d25ea4180b1e1079578148969375018782bea8bd234376da6516be67f89f40746e8b8fa0c57ddaaefa087a31614e8521aca00cdbfa896 SHA512 0af77d5679a84feaca0ab4ae6cbb95b77fa415056d4f38306d34debfde4c480fd8668c3a57c3e74a071222f6dae2f671b42e4bb1618ee7d8c9b0aa9b5b05bf10
 MISC metadata.xml 1105 BLAKE2B 4b7d588a861ed68910f0d5a7b7f5691b3e97b6cf4514c3544c8610c77340797354575b49b70980320e55ecf5ea8188bbe8f6cc8fce55d18dc466f1d0fd83ade3 SHA512 f115ea831900270542ffe545260eda1ed51d321eca5aa7772f336bcc0e0c6471be3cbde2991c3e48ea5b3fbf51b8541b13de850406af15e42c992da0f2ed08ee
diff --git a/media-gfx/asymptote/asymptote-2.61.ebuild b/media-gfx/asymptote/asymptote-2.61.ebuild
deleted file mode 100644
index 0117ea06a1dd..000000000000
--- a/media-gfx/asymptote/asymptote-2.61.ebuild
+++ /dev/null
@@ -1,211 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-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 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="+boehm-gc doc emacs examples fftw gsl +imagemagick latex 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=
-	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} )
-	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
-		)
-	emacs? ( >=app-editors/emacs-23.1:* )
-	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )"
-DEPEND="${RDEPEND}
-	doc? (
-		dev-lang/perl
-		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}/${P}-xdg-utils.patch"
-
-	# Bug #322473
-	"${FILESDIR}/${P}-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 \
-		$(use_enable boehm-gc gc system) \
-		$(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
-	if use doc; then
-		# info
-		einfo "Making info"
-		emake ${PN}.info
-		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
-	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 base/*.asy
-
-	# documentation
-	dodoc BUGS ChangeLog README ReleaseNotes TODO
-	doman doc/asy.1
-
-	# X GUI
-	if use X; then
-		insinto /usr/share/${PN}
-		doins -r GUI
-		chmod +x "${D}"/usr/share/${PN}/GUI/xasy.py
-		dosym ../share/${PN}/GUI/xasy.py /usr/bin/xasy
-		doman doc/xasy.1x
-	fi
-
-	# examples
-	if use examples; then
-		insinto /usr/share/${PN}/examples
-		doins \
-			examples/*.asy \
-			doc/*.asy \
-			doc/*.csv \
-			doc/*.dat \
-			doc/extra/*.asy
-		insinto /usr/share/${PN}/examples/animations
-		doins examples/animations/*.asy
-	fi
-
-	# LaTeX style
-	if use latex; then
-		cd doc || die
-		insinto "${TEXMF}"/tex/latex/${PN}
-		doins ${PN}.sty asycolors.sty
-		if use examples; then
-			insinto /usr/share/${PN}/examples
-			doins latexusage.tex
-			insinto /usr/share/${PN}/examples/animations
-			doins ../examples/animations/*.tex
-		fi
-		cd .. || die
-	fi
-
-	# asymptote.py
-	if use python; then
-		python_foreach_impl python_domodule base/${PN}.py
-	fi
-
-	# emacs mode
-	if use emacs; then
-		elisp-install ${PN} base/*.el base/*.elc
-		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 "${FILESDIR}"/asy-ftd.vim
-	fi
-
-	# extra documentation
-	if use doc; then
-		cd doc || die
-		doinfo ${PN}.info*
-		dodoc ${PN}.pdf CAD.pdf
-		cd FAQ || die
-		dodoc asy-faq.ascii
-		doinfo asy-faq.info
-		docinto html/FAQ
-		dodoc asy-faq.html/*
-	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/asymptote-2.62.ebuild b/media-gfx/asymptote/asymptote-2.68.ebuild
index af22df7d3e9b..1e7593538a89 100644
--- a/media-gfx/asymptote/asymptote-2.62.ebuild
+++ b/media-gfx/asymptote/asymptote-2.68.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit autotools elisp-common latex-package python-r1
 
@@ -123,7 +123,7 @@ src_install() {
 
 	# .asy files
 	insinto /usr/share/${PN}
-	doins base/*.asy
+	doins -r base/*.asy base/shaders base/webgl
 
 	# documentation
 	dodoc BUGS ChangeLog README ReleaseNotes TODO
@@ -143,9 +143,15 @@ src_install() {
 		insinto /usr/share/${PN}/examples
 		doins \
 			examples/*.asy \
+			examples/*.views \
+			examples/*.dat \
+			examples/*.bib \
+			examples/piicon.png \
+			examples/100d.pdb1 \
 			doc/*.asy \
 			doc/*.csv \
 			doc/*.dat \
+			doc/pixel.pdf \
 			doc/extra/*.asy
 		insinto /usr/share/${PN}/examples/animations
 		doins examples/animations/*.asy
@@ -158,7 +164,7 @@ src_install() {
 		doins ${PN}.sty asycolors.sty
 		if use examples; then
 			insinto /usr/share/${PN}/examples
-			doins latexusage.tex
+			doins latexusage.tex externalprc.tex
 			insinto /usr/share/${PN}/examples/animations
 			doins ../examples/animations/*.tex
 		fi
@@ -172,7 +178,7 @@ src_install() {
 
 	# emacs mode
 	if use emacs; then
-		elisp-install ${PN} base/*.el base/*.elc
+		elisp-install ${PN} base/*.el base/*.elc asy-keywords.el
 		elisp-site-file-install "${FILESDIR}"/64${PN}-gentoo.el
 	fi
 
@@ -181,7 +187,7 @@ src_install() {
 		insinto /usr/share/vim/vimfiles/syntax
 		doins base/asy.vim
 		insinto /usr/share/vim/vimfiles/ftdetect
-		doins "${FILESDIR}"/asy-ftd.vim
+		doins base/asy_filetype.vim
 	fi
 
 	# extra documentation
diff --git a/media-gfx/asymptote/files/asymptote-2.61-info.patch b/media-gfx/asymptote/files/asymptote-2.61-info.patch
deleted file mode 100644
index 0046ab9628a0..000000000000
--- a/media-gfx/asymptote/files/asymptote-2.61-info.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: asymptote-2.61/doc/asymptote.texi
-===================================================================
---- asymptote-2.61.orig/doc/asymptote.texi
-+++ asymptote-2.61/doc/asymptote.texi
-@@ -23,7 +23,7 @@ file LICENSE in the top-level source dir
-      
- @dircategory Languages
- @direntry
--* asymptote: (asymptote/asymptote). Vector graphics language.
-+* asymptote: (asymptote). Vector graphics language.
- @end direntry
- 
- @titlepage
diff --git a/media-gfx/asymptote/files/asymptote-2.61-xdg-utils.patch b/media-gfx/asymptote/files/asymptote-2.61-xdg-utils.patch
deleted file mode 100644
index 269691eecfe9..000000000000
--- a/media-gfx/asymptote/files/asymptote-2.61-xdg-utils.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: asymptote-2.61/settings.cc
-===================================================================
---- asymptote-2.61.orig/settings.cc
-+++ asymptote-2.61/settings.cc
-@@ -98,13 +98,13 @@ string defaultPSViewer="open";
- string defaultPDFViewer="open";
- string defaultHTMLViewer="open";
- #else  
--string defaultPSViewer="gv";
--string defaultPDFViewer="acroread";
--string defaultHTMLViewer="google-chrome";
-+string defaultPSViewer="xdg-open";
-+string defaultPDFViewer="xdg-open";
-+string defaultHTMLViewer="xdg-open";
- #endif  
- string defaultGhostscript="gs";
- string defaultGhostscriptLibrary="";
--string defaultDisplay="display";
-+string defaultDisplay="xdg-open";
- string defaultAnimate="animate";
- void queryRegistry() {}
- const string dirsep="/";
diff --git a/media-gfx/asymptote/files/asymptote-2.62-info.patch b/media-gfx/asymptote/files/asymptote-2.68-info.patch
index ffc8ac7c8fb5..c0812477115f 100644
--- a/media-gfx/asymptote/files/asymptote-2.62-info.patch
+++ b/media-gfx/asymptote/files/asymptote-2.68-info.patch
@@ -1,7 +1,7 @@
-Index: asymptote-2.62/doc/asymptote.texi
+Index: asymptote-2.67/doc/asymptote.texi
 ===================================================================
---- asymptote-2.62.orig/doc/asymptote.texi
-+++ asymptote-2.62/doc/asymptote.texi
+--- asymptote-2.67.orig/doc/asymptote.texi
++++ asymptote-2.67/doc/asymptote.texi
 @@ -23,7 +23,7 @@ file LICENSE in the top-level source dir
       
  @dircategory Languages
diff --git a/media-gfx/asymptote/files/asymptote-2.62-xdg-utils.patch b/media-gfx/asymptote/files/asymptote-2.68-xdg-utils.patch
index b26bc78fda23..a6a2c7daba0c 100644
--- a/media-gfx/asymptote/files/asymptote-2.62-xdg-utils.patch
+++ b/media-gfx/asymptote/files/asymptote-2.68-xdg-utils.patch
@@ -1,18 +1,19 @@
-Index: asymptote-2.62/settings.cc
+Только в asymptote-2.67.orig: .pc
+Index: asymptote-2.67/settings.cc
 ===================================================================
---- asymptote-2.62.orig/settings.cc
-+++ asymptote-2.62/settings.cc
-@@ -98,13 +98,13 @@ string defaultPSViewer="open";
+--- asymptote-2.67.orig/settings.cc
++++ asymptote-2.67/settings.cc
+@@ -100,13 +100,13 @@ string defaultPSViewer="open";
  string defaultPDFViewer="open";
  string defaultHTMLViewer="open";
- #else  
+ #else
 -string defaultPSViewer="gv";
 -string defaultPDFViewer="acroread";
 -string defaultHTMLViewer="google-chrome";
 +string defaultPSViewer="xdg-open";
 +string defaultPDFViewer="xdg-open";
 +string defaultHTMLViewer="xdg-open";
- #endif  
+ #endif
  string defaultGhostscript="gs";
  string defaultGhostscriptLibrary="";
 -string defaultDisplay="display";
diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest
index 61d0c227951e..37e6d4e02f85 100644
--- a/media-gfx/blender/Manifest
+++ b/media-gfx/blender/Manifest
@@ -1,5 +1,7 @@
 DIST blender-2.83.4.tar.xz 38528352 BLAKE2B 54596207cbee34fcaa6b81a0d829976b42c28c793b88de81d78c1c3fdfe9dd2a0189a314be281b2a0f1829a0b7fd30d37bceaa28d35c9794dcb0f009fa71e83d SHA512 061735273159742784ed210d13fb39ad076efbbfd5f0291bab1b983699d43b20462dc7e4795e28dab0cd191c9879b43d9ad0f0545c24ef5da23c74679e5ccab5
 DIST blender-2.90.1.tar.xz 38836408 BLAKE2B 42622e742ebd397dc035c85cf26ab72ffee64f2cd46f1523de78dc8861bc19286a7d87b9e31a0d6afdf9a931da7018ccbdb9b4185b8535b4529656c6d85efc34 SHA512 e7d6f8df598f2a2a99f64716331ec4e981a5a49c76b307caf7856480c778455cfc4bbb56fbedc8b22d1e10951ebaeb6844d1ead9476847bf2824dddf5b135992
-EBUILD blender-2.83.4-r1.ebuild 8560 BLAKE2B 295b8bdf8d2dfc2d260911fa07deb04ecd5ace532e5358fc99a2be61f972b44aac993becde6b708b38b3c08967979ed1e595c6f62f4570f3ea032e9ed0e93907 SHA512 7fe110617b574ae4ad11056a7748891556f20f41b907c6f38a714469a5f544ac8a59a4f2d400e3d4e594080b86476e6e281a20b7edf01aa87d0906f9de0cf754
-EBUILD blender-2.90.1-r1.ebuild 8594 BLAKE2B 1eea748af879ef517c436f8105dfa6f63537e4cc43fa3bd5f07e003afd418940c7f47a2b3fab8e5605a7e5afc7ca582cc71c6c14d00d3b05a523dae94d7bec86 SHA512 f0a5797d2aa739e47311dc66e6464431f6620d6bdd322dbca3cfd9dd1daa4e5e7df4d4665ae855690c3701d72b89dc917cffd566d72c8e98c8c1168c0f6c26cc
-MISC metadata.xml 2961 BLAKE2B 77f0031737c448bac4387ca94430ccebbb75f1cdf6fa5780e3c1bdf2118382dbba29479e680c009685cc86105ed3f64d73b7ce2c1a882a1dd18bf4e00a1a249b SHA512 67031dc5c4428e1e7d15fc499f1cb3abd666e2c365d423c845fd587ac87712a72b171df5d7ca2a0b5d2cbe2850081212a77f66c11196700aa7f253b0c5963442
+DIST blender-2.91.0.tar.xz 41528920 BLAKE2B f28bce92b0b63e380c7ce2c9dae0ae4235792ae7c7dff52c2c9c0c5baa81b4d540f853f49d7622f6feca8c7f403b254b55f200758a64e4d95bd43709e5509c1d SHA512 a4b6cb09765d735274fb4a61ac301cbd6ee16f09ab77b19a6e283454b9b8a8c76f1b181501dc285b288130da9e283d3343b948b2855eea00bcb9e114636d55aa
+EBUILD blender-2.83.4-r1.ebuild 8590 BLAKE2B d1f5765922114878d629e653248491878f1ae7003f0ad8dad49713e083d28b5133b2e1a0b1ba6b9a2600a7f9512c9a98aa0a551e9e368aa2cfe46346ed5c7914 SHA512 36f33f65151a8c98a42a2f014209d2bf0552779c8b5e52513fc8063c5202ba77c1cf3c744e3e818387ada59a3ec88805f35f96bcefcc3c000da331b73a756780
+EBUILD blender-2.90.1-r1.ebuild 8628 BLAKE2B 6f432315a7bf13dc3635ab915e9c72668aef526358f74b324067ebe4d5a34c5fa6daa207fdb753adaa756be9d53617896ec5545071755459ed0799a56618d18b SHA512 1b4bc3de4447577cd062283fde8ef091c0800968a0129a833b4d3c9acf8992e143a204bbc32b887254cdf4977ea083cb262e47242b5b2f1d581cf183339374a7
+EBUILD blender-2.91.0.ebuild 9051 BLAKE2B da48e82f25971c9322553734d18a7d8a60f51d728ebe965a1b2d3b49478b42fb89f2bb7db820e925c79ff66db26a03ca40ce5de7324633b37673a24ded423a27 SHA512 6c6544ea48980a3f4e3a8173f611daeee94ee9d6f5dcccf358a890a0d8321f797737c498afa88a401ac1f6bc155ed03448415c585103b9a9d178cf83d435ae48
+MISC metadata.xml 2795 BLAKE2B 6a3b2ec4f6c57286f41e4304bd394dd2d9c23830678e2a29fd7657eb9aae760c5061f5a5fcf43e65993ccbdf4c3e42bbd933857e22355ef4069f870ec7d180bb SHA512 20ba570f24a0daaa50a07991d0b6ec6620b080ad3a253af2dff7008c504fea3ac2fc11301e1947d81f38b0398d878de0c299700fd99880b021e5e8e5f41afc95
diff --git a/media-gfx/blender/blender-2.83.4-r1.ebuild b/media-gfx/blender/blender-2.83.4-r1.ebuild
index a4a6501ff7a4..f28ba088062c 100644
--- a/media-gfx/blender/blender-2.83.4-r1.ebuild
+++ b/media-gfx/blender/blender-2.83.4-r1.ebuild
@@ -88,7 +88,7 @@ RDEPEND="${PYTHON_DEPS}
 		~media-gfx/openvdb-7.0.0[abi6-compat(-)?,abi7-compat(-)?]
 		dev-libs/c-blosc:=
 	)
-	osl? ( media-libs/osl )
+	osl? ( media-libs/osl:= )
 	sdl? ( media-libs/libsdl2[sound,joystick] )
 	sndfile? ( media-libs/libsndfile )
 	tbb? ( dev-cpp/tbb )
@@ -114,6 +114,8 @@ BDEPEND="
 	nls? ( sys-devel/gettext )
 "
 
+CMAKE_BUILD_TYPE="Release"
+
 blender_check_requirements() {
 	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
 
diff --git a/media-gfx/blender/blender-2.90.1-r1.ebuild b/media-gfx/blender/blender-2.90.1-r1.ebuild
index 7ad59e31836d..8c7494285e83 100644
--- a/media-gfx/blender/blender-2.90.1-r1.ebuild
+++ b/media-gfx/blender/blender-2.90.1-r1.ebuild
@@ -30,7 +30,7 @@ RESTRICT="!test? ( test )"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	alembic? ( openexr )
 	cuda? ( cycles )
-	cycles? ( openexr tiff openimageio )
+	cycles? ( openexr tbb tiff openimageio )
 	elbeem? ( tbb )
 	opencl? ( cycles )
 	openvdb? (
@@ -88,7 +88,7 @@ RDEPEND="${PYTHON_DEPS}
 		~media-gfx/openvdb-7.0.0[abi6-compat(-)?,abi7-compat(-)?]
 		dev-libs/c-blosc:=
 	)
-	osl? ( media-libs/osl )
+	osl? ( media-libs/osl:= )
 	sdl? ( media-libs/libsdl2[sound,joystick] )
 	sndfile? ( media-libs/libsndfile )
 	tbb? ( dev-cpp/tbb )
@@ -114,6 +114,8 @@ BDEPEND="
 	nls? ( sys-devel/gettext )
 "
 
+CMAKE_BUILD_TYPE="Release"
+
 blender_check_requirements() {
 	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
 
diff --git a/media-gfx/blender/blender-2.91.0.ebuild b/media-gfx/blender/blender-2.91.0.ebuild
new file mode 100644
index 000000000000..d3373af60b12
--- /dev/null
+++ b/media-gfx/blender/blender-2.91.0.ebuild
@@ -0,0 +1,335 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8} )
+
+inherit check-reqs cmake flag-o-matic pax-utils python-single-r1 \
+	toolchain-funcs xdg-utils
+
+DESCRIPTION="3D Creation/Animation/Publishing System"
+HOMEPAGE="https://www.blender.org"
+
+SRC_URI="https://download.blender.org/source/${P}.tar.xz"
+
+# Blender can have letters in the version string,
+# so strip off the letter if it exists.
+MY_PV="$(ver_cut 1-2)"
+
+SLOT="0"
+LICENSE="|| ( GPL-2 BL )"
+KEYWORDS="~amd64 ~x86"
+IUSE="+bullet +dds +elbeem +openexr +system-python +system-numpy +tbb \
+	abi6-compat abi7-compat alembic collada color-management cuda cycles \
+	debug doc ffmpeg fftw headless jack jemalloc jpeg2k llvm \
+	man ndof nls openal opencl openimageio openmp opensubdiv \
+	openvdb osl sdl sndfile standalone test tiff valgrind"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	alembic? ( openexr )
+	cuda? ( cycles )
+	cycles? ( openexr tbb tiff openimageio )
+	elbeem? ( tbb )
+	opencl? ( cycles )
+	openvdb? (
+		^^ ( abi6-compat abi7-compat )
+		tbb
+	)
+	osl? ( cycles llvm )
+	standalone? ( cycles )"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-libs/boost:=[nls?,threads(+)]
+	dev-libs/gmp
+	dev-libs/pugixml
+	dev-libs/lzo:2=
+	$(python_gen_cond_dep '
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+	')
+	media-gfx/potrace
+	media-libs/fontconfig:=
+	media-libs/freetype:=
+	media-libs/glew:*
+	media-libs/libpng:=
+	media-libs/libsamplerate
+	sys-libs/zlib:=
+	virtual/glu
+	virtual/jpeg
+	virtual/libintl
+	virtual/opengl
+	alembic? ( >=media-gfx/alembic-1.7.12[boost(+),hdf(+)] )
+	collada? ( >=media-libs/opencollada-1.6.68 )
+	color-management? ( media-libs/opencolorio )
+	cuda? ( dev-util/nvidia-cuda-toolkit:= )
+	cycles? ( media-libs/freeglut )
+	ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?] )
+	fftw? ( sci-libs/fftw:3.0= )
+	!headless? (
+		x11-libs/libX11
+		x11-libs/libXi
+		x11-libs/libXxf86vm
+	)
+	jack? ( virtual/jack )
+	jemalloc? ( dev-libs/jemalloc:= )
+	jpeg2k? ( media-libs/openjpeg:2= )
+	llvm? ( sys-devel/llvm:= )
+	ndof? (
+		app-misc/spacenavd
+		dev-libs/libspnav
+	)
+	nls? ( virtual/libiconv )
+	openal? ( media-libs/openal )
+	opencl? ( virtual/opencl )
+	openimageio? ( media-libs/openimageio:= )
+	openexr? (
+		media-libs/ilmbase:=
+		media-libs/openexr:=
+	)
+	opensubdiv? ( >=media-libs/opensubdiv-3.4.0[cuda=,opencl=] )
+	openvdb? (
+		~media-gfx/openvdb-7.0.0[abi6-compat(-)?,abi7-compat(-)?]
+		dev-libs/c-blosc:=
+	)
+	osl? ( media-libs/osl:= )
+	sdl? ( media-libs/libsdl2[sound,joystick] )
+	sndfile? ( media-libs/libsndfile )
+	tbb? ( dev-cpp/tbb )
+	tiff? ( media-libs/tiff )
+	valgrind? ( dev-util/valgrind )
+"
+
+DEPEND="${RDEPEND}
+	dev-cpp/eigen:=
+"
+
+BDEPEND="
+	virtual/pkgconfig
+	doc? (
+		app-doc/doxygen[dot]
+		dev-python/sphinx[latex]
+		dev-texlive/texlive-bibtexextra
+		dev-texlive/texlive-fontsextra
+		dev-texlive/texlive-fontutils
+		dev-texlive/texlive-latex
+		dev-texlive/texlive-latexextra
+	)
+	nls? ( sys-devel/gettext )
+"
+
+CMAKE_BUILD_TYPE="Release"
+
+blender_check_requirements() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+
+	if use doc; then
+		CHECKREQS_DISK_BUILD="4G" check-reqs_pkg_pretend
+	fi
+}
+
+pkg_pretend() {
+	blender_check_requirements
+}
+
+pkg_setup() {
+	blender_check_requirements
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	# we don't want static glew, but it's scattered across
+	# multiple files that differ from version to version
+	# !!!CHECK THIS SED ON EVERY VERSION BUMP!!!
+	local file
+	while IFS="" read -d $'\0' -r file ; do
+		sed -i -e '/-DGLEW_STATIC/d' "${file}" || die
+	done < <(find . -type f -name "CMakeLists.txt")
+
+	# Disable MS Windows help generation. The variable doesn't do what it
+	# it sounds like.
+	sed -e "s|GENERATE_HTMLHELP      = YES|GENERATE_HTMLHELP      = NO|" \
+		-i doc/doxygen/Doxyfile || die
+}
+
+src_configure() {
+	# FIX: forcing '-funsigned-char' fixes an anti-aliasing issue with menu
+	# shadows, see bug #276338 for reference
+	append-flags -funsigned-char
+	append-lfs-flags
+
+	if use openvdb; then
+		local version
+		if use abi6-compat; then
+			version=6;
+		elif use abi7-compat; then
+			version=7;
+		else
+			die "Openvdb abi version not compatible"
+		fi
+		append-cppflags -DOPENVDB_ABI_VERSION_NUMBER=${version}
+	fi
+
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=OFF
+		-DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
+		-DPYTHON_LIBRARY="$(python_get_library_path)"
+		-DPYTHON_VERSION="${EPYTHON/python/}"
+		-DWITH_ALEMBIC=$(usex alembic)
+		-DWITH_ASSERT_ABORT=$(usex debug)
+		-DWITH_BOOST=ON
+		-DWITH_BULLET=$(usex bullet)
+		-DWITH_CODEC_FFMPEG=$(usex ffmpeg)
+		-DWITH_CODEC_SNDFILE=$(usex sndfile)
+		-DWITH_CXX_GUARDEDALLOC=$(usex debug)
+		-DWITH_CYCLES_DEVICE_CUDA=$(usex cuda TRUE FALSE)
+		-DWITH_CYCLES=$(usex cycles)
+		-DWITH_CYCLES_DEVICE_OPENCL=$(usex opencl)
+		-DWITH_CYCLES_EMBREE=OFF
+		-DWITH_CYCLES_STANDALONE=$(usex standalone)
+		-DWITH_CYCLES_STANDALONE_GUI=$(usex standalone)
+		-DWITH_CYCLES_OSL=$(usex osl)
+		-DWITH_DOC_MANPAGE=$(usex man)
+		-DWITH_FFTW3=$(usex fftw)
+		-DWITH_GHOST_X11=$(usex !headless)
+		-DWITH_GTESTS=$(usex test)
+		-DWITH_HEADLESS=$(usex headless)
+		-DWITH_INSTALL_PORTABLE=OFF
+		-DWITH_IMAGE_DDS=$(usex dds)
+		-DWITH_IMAGE_OPENEXR=$(usex openexr)
+		-DWITH_IMAGE_OPENJPEG=$(usex jpeg2k)
+		-DWITH_IMAGE_TIFF=$(usex tiff)
+		-DWITH_INPUT_NDOF=$(usex ndof)
+		-DWITH_INTERNATIONAL=$(usex nls)
+		-DWITH_JACK=$(usex jack)
+		-DWITH_LLVM=$(usex llvm)
+		-DWITH_MEM_JEMALLOC=$(usex jemalloc)
+		-DWITH_MEM_VALGRIND=$(usex valgrind)
+		-DWITH_MOD_FLUID=$(usex elbeem)
+		-DWITH_MOD_OCEANSIM=$(usex fftw)
+		-DWITH_OPENAL=$(usex openal)
+		-DWITH_OPENCOLLADA=$(usex collada)
+		-DWITH_OPENCOLORIO=$(usex color-management)
+		-DWITH_OPENIMAGEIO=$(usex openimageio)
+		-DWITH_OPENMP=$(usex openmp)
+		-DWITH_OPENSUBDIV=$(usex opensubdiv)
+		-DWITH_OPENVDB=$(usex openvdb)
+		-DWITH_OPENVDB_BLOSC=$(usex openvdb)
+		-DWITH_PYTHON_INSTALL=$(usex system-python OFF ON)
+		-DWITH_PYTHON_INSTALL_NUMPY=$(usex system-numpy OFF ON)
+		-DWITH_SDL=$(usex sdl)
+		-DWITH_STATIC_LIBS=OFF
+		-DWITH_SYSTEM_EIGEN3=ON
+		-DWITH_SYSTEM_GLEW=ON
+		-DWITH_SYSTEM_LZO=ON
+		-DWITH_TBB=$(usex tbb)
+	)
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+
+	if use doc; then
+		# Workaround for binary drivers.
+		addpredict /dev/ati
+		addpredict /dev/dri
+		addpredict /dev/nvidiactl
+
+		einfo "Generating Blender C/C++ API docs ..."
+		cd "${CMAKE_USE_DIR}"/doc/doxygen || die
+		doxygen -u Doxyfile || die
+		doxygen || die "doxygen failed to build API docs."
+
+		cd "${CMAKE_USE_DIR}" || die
+		einfo "Generating (BPY) Blender Python API docs ..."
+		"${BUILD_DIR}"/bin/blender --background --python doc/python_api/sphinx_doc_gen.py -noaudio || die "sphinx failed."
+
+		cd "${CMAKE_USE_DIR}"/doc/python_api || die
+		sphinx-build sphinx-in BPY_API || die "sphinx failed."
+	fi
+}
+
+src_test() {
+	if use test; then
+		einfo "Running Blender Unit Tests ..."
+		cd "${BUILD_DIR}"/bin/tests || die
+		local f
+		for f in *_test; do
+			./"${f}" || die
+		done
+	fi
+}
+
+src_install() {
+	# Pax mark blender for hardened support.
+	pax-mark m "${BUILD_DIR}"/bin/blender
+
+	if use standalone; then
+		dobin "${BUILD_DIR}"/bin/cycles
+	fi
+
+	if use doc; then
+		docinto "html/API/python"
+		dodoc -r "${CMAKE_USE_DIR}"/doc/python_api/BPY_API/.
+
+		docinto "html/API/blender"
+		dodoc -r "${CMAKE_USE_DIR}"/doc/doxygen/html/.
+	fi
+
+	cmake_src_install
+
+	# fix doc installdir
+	docinto "html"
+	dodoc "${CMAKE_USE_DIR}"/release/text/readme.html
+	rm -r "${ED}"/usr/share/doc/blender || die
+
+	python_fix_shebang "${ED}/usr/bin/blender-thumbnailer.py"
+	python_optimize "${ED}/usr/share/blender/${MY_PV}/scripts"
+}
+
+pkg_postinst() {
+	elog
+	elog "Blender uses python integration. As such, may have some"
+	elog "inherent risks with running unknown python scripts."
+	elog
+	elog "It is recommended to change your blender temp directory"
+	elog "from /tmp to /home/user/tmp or another tmp file under your"
+	elog "home directory. This can be done by starting blender, then"
+	elog "dragging the main menu down do display all paths."
+	elog
+	ewarn
+	ewarn "This ebuild does not unbundle the massive amount of 3rd party"
+	ewarn "libraries which are shipped with blender. Note that"
+	ewarn "these have caused security issues in the past."
+	ewarn "If you are concerned about security, file a bug upstream:"
+	ewarn "  https://developer.blender.org/"
+	ewarn
+
+	if use python_single_target_python3_8; then
+		elog "You've enabled python-3.8 support for blender, which is still experimental."
+		elog "If you experience breakages with e.g. plugins, please switch to"
+		elog "python_single_target_python3_7 instead."
+		elog "Bug: https://bugs.gentoo.org/737388"
+		elog
+	fi
+
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+
+	ewarn ""
+	ewarn "You may want to remove the following directory."
+	ewarn "~/.config/${PN}/${MY_PV}/cache/"
+	ewarn "It may contain extra render kernels not tracked by portage"
+	ewarn ""
+}
diff --git a/media-gfx/blender/metadata.xml b/media-gfx/blender/metadata.xml
index 0dff6db1f81c..56a4c98b6a4c 100644
--- a/media-gfx/blender/metadata.xml
+++ b/media-gfx/blender/metadata.xml
@@ -42,9 +42,6 @@
 		<flag name="dds">
 			Adds DDS textures support to Blender.
 		</flag>
-		<flag name="doc">
-			Build C and Python API documentation directly from the source code.
-		</flag>
 		<flag name="elbeem">
 			Adds surface fluid simulation to Blender using El'Beem library.
 		</flag>
@@ -86,9 +83,6 @@
 		<flag name="tbb">
 			Use threading building blocks library from <pkg>dev-cpp/tbb</pkg>.
 		</flag>
-		<flag name="test">
-			Build the provided unit tests.
-		</flag>
 		<flag name="valgrind">
 			Add support for memory debugging using
 			<pkg>dev-util/valgrind</pkg>
diff --git a/media-gfx/cura/Manifest b/media-gfx/cura/Manifest
index 4e69e15b3e5b..cb33f920e242 100644
--- a/media-gfx/cura/Manifest
+++ b/media-gfx/cura/Manifest
@@ -1,7 +1,6 @@
 AUX cura-4.6.1-fix-install-paths.patch 1478 BLAKE2B 177cd0d14fdecd0da4da0cbc4d1ff86082adbc4182c3789dd9d4ec056ab76b43d6ce7b48e027c5fc5d7b1684a15e310101361e6896fa980cd3370b1d2f2860c5 SHA512 4ddf154f398b9d285fb51e9255a7dd5d10caef0a1980bcf3f37c231d1c3c91433cfa9d351b7c96404364db1924f1fed63a98e8f317eef6905fd14e96171af3b0
-DIST cura-4.6.1.tar.gz 36080329 BLAKE2B 5d86734334a2c65afd62eea6b3324b0fc543670b48f5410eac16561590706feed2320c45b22e60c9835973f965a00f222280441daf44866ffc93ebcf1295c750 SHA512 8802993a98e75428d11bfdc7721d5d48e8939ef1c783789db2941cb40b6fc8014eacbdea09c559c6d68cb1dd99def15bfb503d5c164f057a384c8a7620b15dc2
 DIST cura-4.7.0.tar.gz 29712949 BLAKE2B b208a669aa38b07012099fe01ec453232c2bd3007befe649a4fd4cb0a0b12473762a5069d09218a3f2fe865141bbb8c8b7d5a26168fed02900abb20d78b0ad3f SHA512 0b3383042b9c8cf2ce27caee95c365be786c9eb40898c74ea4e0fb903241087e48a6e908d85635a9e43cf21ca3623098c6fe980d0cec3fc6a59c01c9c9cb4d9d
-EBUILD cura-4.6.1-r1.ebuild 1555 BLAKE2B e85dd7c3db1b31a5a00b59786cb34ad397c009317df00685d4b1bfbbe8807e1dbb63fc0143b34c37dcdb328bb4918cfca20f4bd56cbefc2e8a208091dfd6fade SHA512 085dcb0e2548540af6aa8389016ea80576ff95cbf69412efebceec675e4d58d40785fb552fbbd9e5a9e862129241b86da34d9e6a46eff42cc37ce92af4eae46e
+DIST cura-4.8.0.tar.gz 31930258 BLAKE2B 0a10a03f5fa34ec0279b9476063f71d8ae904e05485b84fac011fa5061812cd74f4be6df7e6d93046365799fc2fb1bcf4d10d89c69d2c8455080f99c12cec153 SHA512 0a34438299908021242e47e74418e56fe61c41cff5c29df938b4705b5d23ceb6e1bd17b9eb8110f8ec75c7a08afe8928857d4f2fd5befa00c187bce717105711
 EBUILD cura-4.7.0-r1.ebuild 1875 BLAKE2B 62d221c6fe448597843fedacc46ba5b9183f3afac3a56c12f890f8babf2a37b55617a8103236b696649d9f674cc332b7cfa1fdb4e360140d64e2ae693bf74418 SHA512 9e3b797621690107ecb38c5e1ab27fe2b8f5a904835d49e5712a3b6ea49f5f0d621913e8f9f857205499e185dfcbe85fdfbf3f7233cfb9e17e0427ee11a31000
-EBUILD cura-4.7.0.ebuild 1562 BLAKE2B 5013051eab23a054a73afda2d283a34ec352eaf5d7a738a1d851566fd95ab27d229b05613c4039598b42034ec5caa597356fc5b54e8fd62cb26d4155275d1e09 SHA512 76beb567cbff2cb0888b8c265c8f70856910600f4430b275f1ff5164da2150d559c72259ff177074a81190c7bdab3a15bc0bca8faf6d4daf7097d38bf47cae57
+EBUILD cura-4.8.0.ebuild 1966 BLAKE2B fb232dbe948e892b71ae184225b8c0a36feb34375dafd510332aa950bc0490512983a1ae15378f94beb863c3c4c012e7c5f6fd06c5f181558ad17c569c4ab73e SHA512 05d22e7c757079fa99eeeacd2f398526ff64373b450f46f058d627e85660a59b9d9ae8eb59222b07f364a381a0d9e8e16cbb16c112c69c7f4a46b2150332bcfe
 MISC metadata.xml 924 BLAKE2B 98684c30170538865b264d21a025a558b66ef0f5b46dd4cc291dacd71367cf775135d66fc379bf6bf0edfacab6e33c939a750fdcc8f036cedb7d9daf5b442072 SHA512 b09e1e1251f3171721bea6ea7ace38beed877525b1a83282035bb34fa871123c0995674d899a486b3ff67ac34429cabc12f9e90ffd1b1e3f60257389a900e483
diff --git a/media-gfx/cura/cura-4.6.1-r1.ebuild b/media-gfx/cura/cura-4.6.1-r1.ebuild
deleted file mode 100644
index 74ad049667a8..000000000000
--- a/media-gfx/cura/cura-4.6.1-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-inherit cmake desktop python-single-r1 xdg
-
-MY_PN=Cura
-
-DESCRIPTION="A 3D model slicing application for 3D printing"
-HOMEPAGE="https://github.com/Ultimaker/Cura"
-SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+usb zeroconf"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-BDEPEND="sys-devel/gettext"
-RDEPEND="${PYTHON_DEPS}
-	~dev-libs/libarcus-${PV}:=[python,${PYTHON_SINGLE_USEDEP}]
-	~dev-libs/libcharon-${PV}[${PYTHON_SINGLE_USEDEP}]
-	~dev-libs/libsavitar-${PV}:=[python,${PYTHON_SINGLE_USEDEP}]
-	~dev-python/uranium-${PV}[${PYTHON_SINGLE_USEDEP}]
-	~media-gfx/curaengine-${PV}
-	~media-gfx/fdm-materials-${PV}
-	$(python_gen_cond_dep '
-		dev-python/requests[${PYTHON_MULTI_USEDEP}]
-		dev-python/sentry-sdk[${PYTHON_MULTI_USEDEP}]
-		usb? ( dev-python/pyserial[${PYTHON_MULTI_USEDEP}] )
-		zeroconf? ( dev-python/zeroconf[${PYTHON_MULTI_USEDEP}] )
-	')"
-DEPEND="${RDEPEND}"
-
-DOCS=( README.md )
-PATCHES=( "${FILESDIR}/${PN}-4.6.1-fix-install-paths.patch" )
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_prepare() {
-	sed -i "s/set(CURA_VERSION \"master\"/set(CURA_VERSION \"${PV}\"/" CMakeLists.txt || die
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DPYTHON_SITE_PACKAGES_DIR="$(python_get_sitedir)"
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	doicon icons/*.png
-	python_optimize "${D}${get_libdir}"
-}
diff --git a/media-gfx/cura/cura-4.7.0.ebuild b/media-gfx/cura/cura-4.8.0.ebuild
index 4264d19b6a62..615180db9eed 100644
--- a/media-gfx/cura/cura-4.7.0.ebuild
+++ b/media-gfx/cura/cura-4.8.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=(python3_{7..8})
 inherit cmake desktop python-single-r1 xdg
 
 MY_PN=Cura
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.
 LICENSE="LGPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="+usb zeroconf"
+IUSE="debug +usb zeroconf"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 BDEPEND="sys-devel/gettext"
@@ -23,29 +23,38 @@ RDEPEND="${PYTHON_DEPS}
 	~dev-libs/libarcus-${PV}:=[python,${PYTHON_SINGLE_USEDEP}]
 	~dev-libs/libcharon-${PV}[${PYTHON_SINGLE_USEDEP}]
 	~dev-libs/libsavitar-${PV}:=[python,${PYTHON_SINGLE_USEDEP}]
+	~dev-python/pynest2d-${PV}[${PYTHON_SINGLE_USEDEP}]
 	~dev-python/uranium-${PV}[${PYTHON_SINGLE_USEDEP}]
 	~media-gfx/curaengine-${PV}
 	~media-gfx/fdm-materials-${PV}
 	$(python_gen_cond_dep '
-		dev-python/requests[${PYTHON_MULTI_USEDEP}]
-		dev-python/sentry-sdk[${PYTHON_MULTI_USEDEP}]
-		usb? ( dev-python/pyserial[${PYTHON_MULTI_USEDEP}] )
-		zeroconf? ( dev-python/zeroconf[${PYTHON_MULTI_USEDEP}] )
+			dev-python/mypy[${PYTHON_MULTI_USEDEP}]
+			dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+			dev-python/PyQt5[${PYTHON_MULTI_USEDEP}]
+			dev-python/requests[${PYTHON_MULTI_USEDEP}]
+			dev-python/sentry-sdk[${PYTHON_MULTI_USEDEP}]
+			sci-libs/shapely[${PYTHON_MULTI_USEDEP}]
+			usb? ( dev-python/pyserial[${PYTHON_MULTI_USEDEP}] )
+			zeroconf? ( dev-python/zeroconf[${PYTHON_MULTI_USEDEP}] )
 	')"
 DEPEND="${RDEPEND}"
 
-DOCS=( README.md )
-PATCHES=( "${FILESDIR}/${PN}-4.6.1-fix-install-paths.patch" )
+DOCS=(README.md)
 S="${WORKDIR}/${MY_PN}-${PV}"
 
 src_prepare() {
-	sed -i "s/set(CURA_VERSION \"master\"/set(CURA_VERSION \"${PV}\"/" CMakeLists.txt || die
+	sed -i -e "s:lib\${LIB_SUFFIX}/python\${Python3_VERSION_MAJOR}.\${Python3_VERSION_MINOR}/site-packages:$(python_get_sitedir):g" CMakeLists.txt || die
+
 	cmake_src_prepare
 }
 
 src_configure() {
+	# trimesh not available in portage
 	local mycmakeargs=(
-		-DPYTHON_SITE_PACKAGES_DIR="$(python_get_sitedir)"
+	  -DCURA_BUILDTYPE="ebuild"
+	  -DCURA_VERSION=${PV}
+		-DCURA_NO_INSTALL_PLUGINS="AMFReader;Toolbox;TrimeshReader"
+		-DCURA_DEBUGMODE=$(usex debug)
 	)
 	cmake_src_configure
 }
@@ -53,5 +62,6 @@ src_configure() {
 src_install() {
 	cmake_src_install
 	doicon icons/*.png
+	python_fix_shebang "${D}/usr/bin/cura"
 	python_optimize "${D}${get_libdir}"
 }
diff --git a/media-gfx/curaengine/Manifest b/media-gfx/curaengine/Manifest
index 58fb1d65cf9f..5e051ac42189 100644
--- a/media-gfx/curaengine/Manifest
+++ b/media-gfx/curaengine/Manifest
@@ -1,6 +1,6 @@
 AUX curaengine-4.7.0-fix-tests.patch 359 BLAKE2B a84af3a8b47f2bca74f8aa3bc774a55719fc642048edca310dea0568fddff6cc90269f1711006c26dcca2b64d997a34858442fd674bc99b03aeffcafb93820bd SHA512 9ef48243ada474e2639cbf804be381ac1dabfd656ac58a2a296265b3d16bf416a867147a2f7415256bb0af14ff994e5eeb2e42e61a6f36afa29f7a96bc7ad0e0
-DIST curaengine-4.6.1.tar.gz 1685119 BLAKE2B 352c5b4b98866ebe6f90dc095960d2417ccf9c023334b4006b604da45aed1e3b6066700b08be3727214433fd505de87cad4da8e17d9067571d91dd0ec7660ebe SHA512 8b3a65fb00bebc37acd24a6d4277c1f09849c0318fca00867479d62c0f64b8628064a898128e1ffc5fb99eed2c1d45a310df2f97fde9c37a9ccc311f5ba4d057
 DIST curaengine-4.7.0.tar.gz 1684860 BLAKE2B da25da5656eb2c2d9cd9bd1c8ea0f633284a6d300f2b5ab7a916be262d20106d07a17a5c5ac63b854b32e98f616ecadbc05a912146f4f6d396c646ca69637116 SHA512 4c5f2eb70912315595e7f090ba9a34196ecb740eb25b5b2da2decf6485260999e8a87f7c2619c6efab9b46280e9eecf11f7e6bb021359c3b72da9fb900b0c1c3
-EBUILD curaengine-4.6.1.ebuild 955 BLAKE2B 733f85ddaec6e24923289023a83bba47c0f9fbd29be348ff0a338d39bdf8655255cddc54afe14d53600195c178169d3c1a83b26f25739884fee166498280596b SHA512 92d6924c086f4e8b022105d235467dce86d7f65466a9df97026f625eed054a6ec45f2901202c5cd70f5d11ddb9093de0632530e64e04957b1a86dea7eec3f569
+DIST curaengine-4.8.0.tar.gz 1690082 BLAKE2B 7c582ad0743a937ad4efa2a224e052383b90632c8f33f666a4139a74954a7243e17107ac39b35c1a5e41df89e303d618e4407d7e9a75efc5d96913aaaf498273 SHA512 be0d12cfe61932bf03dde61df8fb7f31cbd0aef6a44292130a7a67e318891f37db685722ba5d3cf66e88d4ff1de64ac86be5e494b750f8f7ff4b52d7976cb670
 EBUILD curaengine-4.7.0.ebuild 2287 BLAKE2B edf6a643b44302269a589d8040ed39d54d26ef5a602f9d8d2e6a196e754f78b0e3e0f3439781f6b29afa39424642b57914b34538ccfc510f2de1a8291394a5c7 SHA512 5b83c30d7ace834f57ea23f3a963bfbbf407a46d87175181df73d1e367725eb0d1fed080204f90a352965ba83ce45c70ae81b7f6852bfd7cb70af525049893ed
+EBUILD curaengine-4.8.0.ebuild 2233 BLAKE2B a4454674fbfc4c81334a21090a10fa324a1a594db66302105ba2fb8d448154dfdc6334ccf27984b210ed93ac9ccf67f7d846cab36b4c0af147603ab63ba6b724 SHA512 dbb6cb64ab13d53deff7f34d9acf9d7ceb0ea847ff0870255cb956fa3f5c7adf02009da850d404f3cdfb69ea9e5b8664d6cf561cbf62e1eab3aa90c1fb34b604
 MISC metadata.xml 1468 BLAKE2B 7aec44b3b8d90adfa9c95365a7e299907fb0879c2358d5770b96b41f175d0d916e6786b25cc7a3b39f599d2a3e61a00cd4b3a0d039c95cd6e0fd122d2be54e4e SHA512 3ab874f2117073a17297234b29e95b70fe73ab90fbddcfe024586dc2b0b47af23998e0cc5ae271614be95f4c41fc2a9485f097ba3eefea0345d8d592d5e0f390
diff --git a/media-gfx/curaengine/curaengine-4.6.1.ebuild b/media-gfx/curaengine/curaengine-4.6.1.ebuild
deleted file mode 100644
index 9a634cff090d..000000000000
--- a/media-gfx/curaengine/curaengine-4.6.1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake toolchain-funcs
-
-MY_PN="CuraEngine"
-
-DESCRIPTION="A 3D model slicing engine for 3D printing"
-HOMEPAGE="https://github.com/Ultimaker/CuraEngine"
-SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="|| ( sys-devel/gcc sys-devel/clang )
-	doc? ( app-doc/doxygen )"
-RDEPEND="${PYTHON_DEPS}
-	~dev-libs/libarcus-${PV}:*
-	dev-libs/protobuf
-	dev-libs/stb"
-DEPEND="${RDEPEND}"
-
-DOCS=( README.md )
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_configure() {
-	local mycmakeargs=( "-DBUILD_TESTS=$(usex test ON OFF)" )
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_build
-	if use doc; then
-		doxygen || die
-		mv docs/html . || die
-		find html -name '*.md5' -or -name '*.map' -delete || die
-		HTML_DOCS=( html )
-	fi
-}
diff --git a/media-gfx/curaengine/curaengine-4.8.0.ebuild b/media-gfx/curaengine/curaengine-4.8.0.ebuild
new file mode 100644
index 000000000000..2f4c30faf728
--- /dev/null
+++ b/media-gfx/curaengine/curaengine-4.8.0.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake toolchain-funcs
+
+MY_PN="CuraEngine"
+
+DESCRIPTION="A 3D model slicing engine for 3D printing"
+HOMEPAGE="https://github.com/Ultimaker/CuraEngine"
+SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="+arcus doc openmp test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	arcus? (
+		~dev-libs/libarcus-${PV}:*
+		dev-libs/protobuf:=
+	)
+	dev-libs/clipper
+	dev-libs/rapidjson
+	dev-libs/stb"
+
+DEPEND="${RDEPEND}
+	test? ( dev-cpp/gtest )"
+BDEPEND="doc? ( app-doc/doxygen )"
+
+DOCS=( README.md )
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_prepare() {
+	rm -r "${S}"/libs || die
+
+	# remove static linking
+	# respect cflags
+	sed -i \
+		-e "s/-static-libstdc++//g" \
+		-e 's/set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")//g' \
+		-e 's/set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_RELEASE_INIT}")//g' \
+		CMakeLists.txt || die
+
+	if use test; then
+		find "${S}"/tests/arcus "${S}"/tests/integration "${S}"/tests/settings "${S}"/tests/utils \
+		 -type f -name '*.cpp' | xargs sed -i \
+			-e 's <../src/utils/AABB.h> "../../src/utils/AABB.h" g'\
+			-e 's <../src/utils/IntPoint.h> "../../src/utils/IntPoint.h" g' \
+			-e 's <../src/utils/polygon.h> "../../src/utils/polygon.h" g'\
+			-e 's <../src/utils/PolygonConnector.h> "../../src/utils/PolygonConnector.h" g'\
+			-e 's <../src/utils/polygonUtils.h> "../../src/utils/polygonUtils.h" g'\
+			-e 's <../src/utils/string.h> "../../src/utils/string.h" g' \
+			-e 's <../src/utils/SVG.h> "../../src/utils/SVG.h" g' \
+			-e 's#include "../src#include "../../src#g'|| die
+	fi
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTS=$(usex test ON OFF)
+		-DENABLE_ARCUS=$(usex arcus ON OFF)
+		-DENABLE_MORE_COMPILER_OPTIMIZATION_FLAGS=OFF
+		-DENABLE_OPENMP=$(usex openmp ON OFF)
+		-DUSE_SYSTEM_LIBS=ON
+	)
+
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+
+	if use doc; then
+		doxygen || die "generating docs failed"
+		mv docs/html . || die
+		find html -type f \(-name '*.md5' -o -name '*.map'\) -delete || die
+		HTML_DOCS=( html/. )
+	fi
+}
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index 4e0d7e0a8c54..a62386f26021 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -1,3 +1,3 @@
 DIST digikam-7.1.0.tar.xz 593501044 BLAKE2B dcd124a18299a75c02b51642cc33d2a053f1fce4abd82b3f50ea93cc17e8b302b73284106ed716e815741cc38326695f1303e018998a6687f8cd92ab539faeb0 SHA512 df7138a45ff8de6c1e32cb0eea83e1cd4b67f027b149a696d8feb8008ceaae55934c1f1d9625c1ba29de850ad70aa01dc73f1b7517253ca6aa99f0f97b84a3a4
-EBUILD digikam-7.1.0.ebuild 3997 BLAKE2B d8408390ff16b7e10cf1b8c4c88dec147bfc79cee9edf86a08d2ef84017698f128373dfa17adafc76770457285bee20d5f4a67483a3c0677ccf7ce81fce9fbed SHA512 ce6b78314d5e64ea5c3710afcf44f426ea1220162d2a0ab0888f8bd6e8f1d79a010614a913bc249976ab4cdbf1aff1c9264f5ce81f975e5be44af6d4a47db305
+EBUILD digikam-7.1.0-r1.ebuild 4000 BLAKE2B ab10f960037cb269d0dd758624e2c263e8697f4c1c9ba8b1d88a4bd1684b364555b6704b765d003eca271626fe352e8dff0fa115154ce6762287ac23905800ad SHA512 2111860137feff79c9812f2aede64069ad4a68c0180063722e43b0c74ce7f3316fb44f59a4820671944f965329409932fe4e0c71fbbee76ce1c6cf2c9d85636a
 MISC metadata.xml 1097 BLAKE2B 1870f4bef0643db48fa2e6241f25d33c718010556b79bb54339f4ff9a13d7d005cea8e358e83d54ee94860b191969c834b9e5fd8152a17d7a5cc464a6813000e SHA512 25c2fcb533b644cf4aa376518a77f35bab0676c6f8853998f50e1eebbb2de20ca49e02fc110b1d6f55d2502f4e353803f12a2b336b98d85321b891a42ba16ccd
diff --git a/media-gfx/digikam/digikam-7.1.0.ebuild b/media-gfx/digikam/digikam-7.1.0-r1.ebuild
index 3fcf93ec3dc5..194a341e7771 100644
--- a/media-gfx/digikam/digikam-7.1.0.ebuild
+++ b/media-gfx/digikam/digikam-7.1.0-r1.ebuild
@@ -81,7 +81,7 @@ COMMON_DEPEND="
 		>=kde-frameworks/kbookmarks-${KFMIN}:5
 	)
 	mediaplayer? (
-		media-libs/qtav[opengl]
+		media-libs/qtav[opengl(+)]
 		media-video/ffmpeg:=
 	)
 	opengl? (
diff --git a/media-gfx/ebdftopcf/Manifest b/media-gfx/ebdftopcf/Manifest
index 730886449be7..7616c900d996 100644
--- a/media-gfx/ebdftopcf/Manifest
+++ b/media-gfx/ebdftopcf/Manifest
@@ -1,3 +1,3 @@
 DIST ebdftopcf-2.tar.bz2 7774 BLAKE2B 4dc1bde62b796f441332511e1b9206f9eadd216ab66dc1a6858dc467f9dfbbaaeb4a7de494eaae4584d8a57d59a0eb96f69047d1a57bd007cbb8e2f7aaccd1c6 SHA512 4631f1591290e0ddc778d5c557aff1e698d8dd7e5ac7e659fda7752642034fbabb091c840dcfad5695e9fc19909203a7fdc0b7a69d57a162ce6bb8fe710ef0f4
-EBUILD ebdftopcf-2.ebuild 625 BLAKE2B ee05e16d1e57a434885fd45c0ec5c70aed6c22950bd72e58158746fb7fd8e21b7c120694f1b44bfbdc0cc522697de2ba9b98334d4b525cba55f5a7448815d790 SHA512 a4c41306beb2ce5817f1984a7c13c75a1698cbcde378be28389c965741b8bfa4daf8ee7779b676a5bbf21bd5cc54900d8d8124ab2f97c57bcc6f05febc58444e
+EBUILD ebdftopcf-2.ebuild 632 BLAKE2B df4926970eea1c2007b86a0e2413b46f72095c2d08031c28f99b9269241f94642183ff1dafcb50859faddb87bd50aad14e6012a2da05050c7b34b1121ac5f92a SHA512 d4531f9fe0fb31c38ddf493877322ffc67ea462706a7a04c07741e7b5d51bd16eeb135fa8bc1945a4ab2d44c1e7626d04cb763dda0d7bf8d132aa6b7d02d711b
 MISC metadata.xml 310 BLAKE2B d6b0416573d232c5715df5dcb05139b22609ce8ffb46530c2fd7a0cecc87b37ce2ce286310a80244b1911d5750eb29b55eef6b8c01f6d62c8d007ad2a9b5aae2 SHA512 1923349dde66e8078b37566097a21ead2555a73fdfd97b89beb44a714958dc80f4387ceb642d238419ce0ec388c335ba5db1db5f23b380131f0fbbd51ecd8f22
diff --git a/media-gfx/ebdftopcf/ebdftopcf-2.ebuild b/media-gfx/ebdftopcf/ebdftopcf-2.ebuild
index 1d890acb3b8e..c906736906c8 100644
--- a/media-gfx/ebdftopcf/ebdftopcf-2.ebuild
+++ b/media-gfx/ebdftopcf/ebdftopcf-2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE=""
 
 # these apps are used at runtime by ebdftopcf
diff --git a/media-gfx/fdm-materials/Manifest b/media-gfx/fdm-materials/Manifest
index 40d1f8a52e09..bed82a0006c1 100644
--- a/media-gfx/fdm-materials/Manifest
+++ b/media-gfx/fdm-materials/Manifest
@@ -1,5 +1,5 @@
-DIST fdm-materials-4.6.1.tar.gz 36321 BLAKE2B bbdc28bf9d05b14f4b0545c4c50c67c31668f97aa9b6fcb8d51c5c958523ebe3307deb07587239df6a73e47c523db6c15f0ea4eb3c2560931a055c784d2b30cc SHA512 784b89acfb2a5bdc6a0e8ce864326ab21f4785887baa215ffcfe472853cc8386d32ed237199df3744c25d12abbef89605445e74b104770f0f3f8363944008c6e
 DIST fdm-materials-4.7.0.tar.gz 41139 BLAKE2B a372d8273809a7d1a14e0b6e35a9c7266d626f26013f53a5d6c8462e2b1054bd65c72745ed1afdf96b17d6573f74b8555c946ef76c94acb8d860efa459d9955e SHA512 cbc42e2777d1332b5187cf1f826f73bf5c1c5a1106d851dc08d8082f41bde6846f349ed2339ae60ad00b2005b0983f01850931adc765d545de0a700f1d9cccaf
-EBUILD fdm-materials-4.6.1-r1.ebuild 544 BLAKE2B 62876b85725d6065e9ecf53c100ab9787c5147b1b4428e641a89837b9e01a38bc5c7a17ba0c55b6e25a8863f6e17bf0b732922c1f99298d3b8e8fac5579b3801 SHA512 a9d88895a40efca25e88c795a357cca743dab6d89c0366eeff6081ae73ae129ddbe3575469d9ff76f571ca882db868ed02c9e9a01f2332cb807b91f896130ab3
+DIST fdm-materials-4.8.0.tar.gz 43850 BLAKE2B d9fa025eeb4f11c027fd64a2615d214a47024df62d53ee6b43391ac5383812581ae2ca075804277b6f7094639238646211cb5b978580edf91d004e83ef7ce405 SHA512 6e2812dc61ad00437d4c7943c3746cd915e1e49edef49f89ea2c4ca4cf023d67c400d1ae1e3c40923928d20ac09b184fc0632b828900b6236f9dfd346f19036d
 EBUILD fdm-materials-4.7.0.ebuild 544 BLAKE2B 62876b85725d6065e9ecf53c100ab9787c5147b1b4428e641a89837b9e01a38bc5c7a17ba0c55b6e25a8863f6e17bf0b732922c1f99298d3b8e8fac5579b3801 SHA512 a9d88895a40efca25e88c795a357cca743dab6d89c0366eeff6081ae73ae129ddbe3575469d9ff76f571ca882db868ed02c9e9a01f2332cb807b91f896130ab3
+EBUILD fdm-materials-4.8.0.ebuild 544 BLAKE2B 62876b85725d6065e9ecf53c100ab9787c5147b1b4428e641a89837b9e01a38bc5c7a17ba0c55b6e25a8863f6e17bf0b732922c1f99298d3b8e8fac5579b3801 SHA512 a9d88895a40efca25e88c795a357cca743dab6d89c0366eeff6081ae73ae129ddbe3575469d9ff76f571ca882db868ed02c9e9a01f2332cb807b91f896130ab3
 MISC metadata.xml 949 BLAKE2B d84bebe6a29c4eb2a6e644347492fe06a60e758efcaba9158d2395d2e3714565f805d01ed029bf8906c54ed286e49902adf6b4e8cef9870219cf3fd13912f5e7 SHA512 d7f04589e2e66b471a721aafa2d2be2d531211f2e5003ed7ffed918e770e6980cf891bc5728a0d1a27c3bcaebf2706ac9dd6d9dac847c412e1b7adde091a7594
diff --git a/media-gfx/fdm-materials/fdm-materials-4.6.1-r1.ebuild b/media-gfx/fdm-materials/fdm-materials-4.8.0.ebuild
index 99506a67b867..99506a67b867 100644
--- a/media-gfx/fdm-materials/fdm-materials-4.6.1-r1.ebuild
+++ b/media-gfx/fdm-materials/fdm-materials-4.8.0.ebuild
diff --git a/media-gfx/feh/Manifest b/media-gfx/feh/Manifest
index 15b40802a9de..00e7a53fc240 100644
--- a/media-gfx/feh/Manifest
+++ b/media-gfx/feh/Manifest
@@ -3,8 +3,10 @@ DIST feh-3.3.tar.bz2 2112880 BLAKE2B 56042367c0acce966e115e77f3afa1acd3f942a956b
 DIST feh-3.4.1.tar.bz2 2114441 BLAKE2B c24e5f54762439cfbb031b4b24ded03f1c0c9c75233ae5b6dc66a7a56922902c672606a1b36fef9b30789c09946c8ccc5f9a60fe201db07e70bcf0ce0638c0c1 SHA512 d674d3134819cf6731aebf8af87a2f890d54dd7f8c64071e8816a032aeeb95c31f56752bb3477be0dfb653f813872b32dc2daf4e0514fed03e3f6bba36896c66
 DIST feh-3.4.tar.bz2 2114146 BLAKE2B 0bc65db77c67c42b693122b877417c3dc4db7a0551cdf62723b3f7c134e5f2bb73ee6d0aa5a0c81402cf5a5f723ceb29a45fb5e4aef1911dc643aeb82c3ef17d SHA512 50cb7fd33b583ee802cbbba8ed7a74e9eb72a141ffa28ab998a196f9f8d030a8192420fc084136f699cb33b1b8c4d8c2c111fa90695dd82a1366330a428383ce
 DIST feh-3.5.tar.bz2 2115162 BLAKE2B 8300cfc0e480afb070d40e35390edb30dc451dc5581add5f377a370bf606f7e7730a99c8a4773accb38b01a4e9b47fe5c95d8e9c2dcf9d71e96a71c4fd11a388 SHA512 69b4c73a8009c5b5e031bdf3c6a628da2f3cd71927d6c546ba2b2cfb6d10912e4a44e5d0de93704645a4dd33d71f1445749abe03383cc2298fa10c2d5d88fb5e
+DIST feh-3.6.tar.bz2 2116101 BLAKE2B 8ad47c6b456746d951728fd8a0ba1a2fed4ceb4a7e15554f68b4de071da7b3f4e9e16a10b1a05e51291b8b4127bab98f2b96231298fd181d8dc544bc089a772f SHA512 1df017adcf0650ff2cdc26556cbea5a6b8c9dad1dd44128cccc79312334d0140ab9e5c9c8bac7249dcfbdd7985ae75d847752eadad14216102d8ab7bcb2c42c7
 EBUILD feh-3.3.ebuild 1462 BLAKE2B 6a15abb299ed6f7667e2bb72cc615f8ed9b0c19a85363970f6338703a71650b73a124a6674d2d632ebf282792dc509fd06478cebdcf7cb30d850fed331cfe047 SHA512 0112815c065ba37ad9574bc497d2d6617de4bec7e6fe8a7b2ab94dbdb41fbd1e81631e0d674638026459ff3021a76cab6d1a76370ed87af5b0044ba6eb7f9b4c
 EBUILD feh-3.4.1.ebuild 1473 BLAKE2B eb858644d7a10d27e7bc9258534312c8223431bc364a1714bf6189b8d910ba39fe89c3c78bc0163aeda4576afb8268931917b0137dd4f9fcf066836a9768dcf5 SHA512 acedb3528aeda464305fd704223bb42a6c6f45c10ac93a28b8a09a8097e08924b6a2beda5b7c1bbe71a2c4d08940d9e2c1d916f02a7ee65d477d18f9d0d07d4a
 EBUILD feh-3.4.ebuild 1466 BLAKE2B 7f802e0c0e92c003602a60f1b1faf1c132c88de3ed6b92138075fe3497fb24f0b8fccef12c7e034e31b407b56cea1a751558ae4b8bb723eb29feca80a6a8fe23 SHA512 52cf87f2fffc675074444ba45bb97a6aebce8c144d29799091040fe9e590a83229bed60120561e0fad18134220f3f9de211b3fb0b19a8d57a8b42c8b00327117
 EBUILD feh-3.5.ebuild 1473 BLAKE2B eb858644d7a10d27e7bc9258534312c8223431bc364a1714bf6189b8d910ba39fe89c3c78bc0163aeda4576afb8268931917b0137dd4f9fcf066836a9768dcf5 SHA512 acedb3528aeda464305fd704223bb42a6c6f45c10ac93a28b8a09a8097e08924b6a2beda5b7c1bbe71a2c4d08940d9e2c1d916f02a7ee65d477d18f9d0d07d4a
+EBUILD feh-3.6.ebuild 1473 BLAKE2B eb858644d7a10d27e7bc9258534312c8223431bc364a1714bf6189b8d910ba39fe89c3c78bc0163aeda4576afb8268931917b0137dd4f9fcf066836a9768dcf5 SHA512 acedb3528aeda464305fd704223bb42a6c6f45c10ac93a28b8a09a8097e08924b6a2beda5b7c1bbe71a2c4d08940d9e2c1d916f02a7ee65d477d18f9d0d07d4a
 MISC metadata.xml 252 BLAKE2B c64921f238c2751f1f0746df3d109951ebf79c5e1ed5a2fa6d9c33f5420a6ff87c52a5387048a35c148e8cdd29beb406001a9aca3f6cc0f396a78ccb37ae2e3e SHA512 39fbe572d744f1a6f2a23b85a7d62706c478d05f2c74c30e48ccfca5ffd8f26d968fe0869fb9eed4b6494c655f950ab6445346da6eacf85d10da0c1a627cf59b
diff --git a/media-gfx/feh/feh-3.6.ebuild b/media-gfx/feh/feh-3.6.ebuild
new file mode 100644
index 000000000000..7d87a35ace60
--- /dev/null
+++ b/media-gfx/feh/feh-3.6.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit toolchain-funcs xdg-utils
+
+DESCRIPTION="A fast, lightweight imageviewer using imlib2"
+HOMEPAGE="https://feh.finalrewind.org/"
+SRC_URI="https://feh.finalrewind.org/${P}.tar.bz2"
+
+LICENSE="feh"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86"
+IUSE="debug curl exif test xinerama"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="media-libs/imlib2[X]
+	>=media-libs/libpng-1.2:0=
+	x11-libs/libX11
+	curl? ( net-misc/curl )
+	exif? ( media-libs/libexif )
+	xinerama? ( x11-libs/libXinerama )"
+RDEPEND="${COMMON_DEPEND}
+	virtual/jpeg:0"
+DEPEND="${COMMON_DEPEND}
+	x11-base/xorg-proto
+	x11-libs/libXt
+	test? (
+		>=dev-lang/perl-5.10
+		dev-perl/Test-Command
+		media-libs/imlib2[gif,jpeg,png]
+	)"
+
+PATCHES=( "${FILESDIR}"/${PN}-3.2-debug-cflags.patch )
+
+pkg_setup() {
+	use_feh() { usex $1 1 0; }
+
+	fehopts=(
+		DESTDIR="${D}"
+		PREFIX="${EPREFIX}"/usr
+		doc_dir='${main_dir}'/share/doc/${PF}
+		example_dir='${main_dir}'/share/doc/${PF}/examples
+		curl=$(use_feh curl)
+		debug=$(use_feh debug)
+		xinerama=$(use_feh xinerama)
+		exif=$(use_feh exif)
+	)
+}
+
+src_compile() {
+	tc-export CC
+	emake "${fehopts[@]}"
+}
+
+src_install() {
+	emake "${fehopts[@]}" install
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
diff --git a/media-gfx/flameshot/Manifest b/media-gfx/flameshot/Manifest
index 2787b3eaba50..e0d59cb71df5 100644
--- a/media-gfx/flameshot/Manifest
+++ b/media-gfx/flameshot/Manifest
@@ -1,5 +1,5 @@
 AUX flameshot-0.6.0-missing-include-fix.patch 869 BLAKE2B edccee0ef880470652535d65797800dc675e40556e4cdf560e257e60e649924316e5a0fdc271507763d90734fc60290e1ddecab417148542e8b318041ca9690c SHA512 852a3c12e1fee4a90e6a31c5c17a371a2b44fe1a399a6e11f8a760d5436ea73fa7aed9ebb906f67f7efbd4315e9c092c7cdf76a464f916df6893cc13bd361f7c
 AUX flameshot-0.6.0-unbundle-qtsingleapplication.patch 1505 BLAKE2B 51b8c59945f580d7777d4f9aeb954196bbd7e473301153053d451e0e07f08abb50a21fb993f940ab6ab40bfbbc6a14e04852d8e6a54e7ce4047ab64feb8cc2b5 SHA512 7543862bdead4f58435be97d09e4045ec1a9e77f90947c55076510da891627e189dc052cbd4ec8947203d5fa2c985220c2cd3fbb6cb9470222b3f5d42c61cf14
 DIST flameshot-0.6.0.tar.gz 641561 BLAKE2B f9e87373d84c1a841f70cd9c13b504865a0ef23d0fb29848f2270171459afe9c6852e12c712ebdc7cf3cfc62214d7b7507b85cf21838d0ebed33bee1e39f4aad SHA512 194127032ab0f62a6ba2698688e11b2d4e6f0e04a282144f5fbb6c232eeebc71371af2d55abbb6e98b8649dee036e6f0a6ef55710e4321a60fd5ac6e453ab975
-EBUILD flameshot-0.6.0.ebuild 1128 BLAKE2B b6a122c46a3f69e662ef2ef9e12b5d7d82a032f6da62db2b833039acdd6f1991a7bea39e4ee90298a37ea341d9e78f0189e515f8769bd861ed9e8b56899a3bee SHA512 ab7825e1ef995c7df8896a7f682df8f719835f1a65f28c8dc92ce26b00c80b17eaed7e32de16cabb1b163bc1f950ee7e01f3eb92a4af002f00082e50000e0ce2
+EBUILD flameshot-0.6.0.ebuild 1126 BLAKE2B dc0f3b785a508b06a24f6427c661f0cf3b4b3dd4cac145da7930336abcb717f66cbe2650fd40f8cba7e1b9d3c0af30cb70f5bdeab09848ec32a1d10d5a86d81d SHA512 307f2d58679069fa4047abf3b154499d30790a1b8a38757939dab11cce03e83218ffaecdd8f7e889ea1058740fbccf289a017b2bff5bf7894cbac5817cf99ab2
 MISC metadata.xml 366 BLAKE2B d8c8e83d8fb96199510eb45285312ca146aed73d76fd29ef52cd12cedd3b792621206b8ef064694ee60e12f73b932c6466051c85d0e1e2d8782aa2c00cb0bca4 SHA512 1bf8b212a62d64e14786dcf7ba6f97db414e04655fe0625d5ddc5b86d0e36f0c285f9722cdc1fedd39284e1331b167b947546c37b8a3a5441d59dcdf792a2506
diff --git a/media-gfx/flameshot/flameshot-0.6.0.ebuild b/media-gfx/flameshot/flameshot-0.6.0.ebuild
index 7c9bcc840ba2..bf095c3de1b4 100644
--- a/media-gfx/flameshot/flameshot-0.6.0.ebuild
+++ b/media-gfx/flameshot/flameshot-0.6.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/lupoDharkael/${PN}/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="FreeArt GPL-3 Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/media-gfx/fontforge/Manifest b/media-gfx/fontforge/Manifest
index 9a2c3f184230..6edbc7b98260 100644
--- a/media-gfx/fontforge/Manifest
+++ b/media-gfx/fontforge/Manifest
@@ -7,5 +7,5 @@ AUX fontforge-doc-no-warn-error.patch 834 BLAKE2B c8bd1cfcf320b7831cc64d67d8de52
 DIST fontforge-20200314.tar.xz 13850076 BLAKE2B 5e6ae3b7940a5b3b08811abdfc9d151f231e6d457b219eb0c666e1b831db815b696f345eda0d4d423b7e340f56fca67205734ae19903b3815381080d34b5e95c SHA512 09f5dc93f87ca63668d72d108690604489d6b3cec7eedff1c07ad6d1ce5eae442ab60e79e71ae8b99e9808f3551011788025a86ffc3a9738518d99761d849975
 DIST fontforge-20201107.tar.xz 14163424 BLAKE2B 8ce9148eef6e5b7206ab5c70310ff36fac67c392117e3c0b28060803a54306bf21c179b62b98734e11253739eac29e2ea8bcf3014c09432bb3a0b2b0f3ec631a SHA512 cf9666395405ab02943f0160959f04251bd2a80e279a8f60431089ad19a4c5a232efd42097050ed9f6c1fb39d01488176262949fd81f5f0960fe853b497437dc
 EBUILD fontforge-20200314.ebuild 3071 BLAKE2B 55e4a654b8172aff3934d2b646b4f444bc8368f3bb66cd4b747cdf0fc7cf1a7ec3db9b680de6cafdc3f37f97346dcdb767bb60b230a383d58c2532dd74c76e7c SHA512 84c50f07b0079562a5c30250bcc302739a6297b598f8f5e9f8df258cad660c6a09ee72fdd3fded1e7d68346358e8635cdfebdb472a40e824756d97bd83620d5c
-EBUILD fontforge-20201107.ebuild 2871 BLAKE2B b8e7c8aaf7fb36e8cab1d5e9b4ea449b8e20c90e5d2b5fe9bfcd37927e07f5245fc960af874b426bf20580a1d84eb48577f848c544826a3512a11a786f813e2e SHA512 b6ed5eb401c6b7af8f95b7e0e5d39e303adf43e290b62275caae44a4031db6e5ab4079d49d7d794d633f8df28d45e7b6fa1eb7cf01a061334cae689e9561401b
+EBUILD fontforge-20201107.ebuild 2878 BLAKE2B 0a3006cf2ecf5f4d1635a262a6a1358c9db24998363f33b387d7d7547fb34223f76651afbc19bcb76360918aaa3fae1ee61b3ed12be05e1e71c14ae395dd2818 SHA512 5c172c9ebd2ab775c596f9d8a12dc90b123eebd77400ec596a102a37c64ba3a77a62e526279139926f9b94b1d9d5c2ca76bce2b6d3805bf1b742b4752bb2ad7d
 MISC metadata.xml 861 BLAKE2B 124399e55210b51cd13640775c816694e8ac20aa897984124bb6b62491494bf754e8ad772f0c322044853c8000ba882491193213a749dc696bf0d63d781cd8df SHA512 cde1be6966688ea55af73b02cf4fbffae5141bdfebf45211ca84c0f3651e39916b9abeb6bab652663ff5a68ed0b359df35e0420447a5f1c9a0ab16368f74e479
diff --git a/media-gfx/fontforge/fontforge-20201107.ebuild b/media-gfx/fontforge/fontforge-20201107.ebuild
index 96f32a9698ba..8c57c756d099 100644
--- a/media-gfx/fontforge/fontforge-20201107.ebuild
+++ b/media-gfx/fontforge/fontforge-20201107.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/fontforge/fontforge/releases/download/${PV}/fontforg
 
 LICENSE="BSD GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="doc truetype-debugger gif gtk jpeg png +python readline test tiff svg unicode woff2 X"
 RESTRICT="!test? ( test )"
 
diff --git a/media-gfx/fotoxx/Manifest b/media-gfx/fotoxx/Manifest
index 4a6f2d779be7..c1aedbda5c44 100644
--- a/media-gfx/fotoxx/Manifest
+++ b/media-gfx/fotoxx/Manifest
@@ -1,4 +1,4 @@
 AUX fotoxx-15.05.patch 460 BLAKE2B 95f19579fecaa13dacf5249cae1e05561070f2ac9cf8856d17d0bbf0e4b4c55ea476960f5e49580200e190d0f84daa3c29862a1414848a14b6d72a058b694767 SHA512 e4d2ddd827de492ac4890c8c8b34719b9dcc6acd555de60c7d5bef35d8c0dca032635fac9b989c92594ea92d5bd47c0300acca9074696058321bd401fdbb7b0b
 DIST fotoxx-15.05.tar.gz 3573278 BLAKE2B 0a7f564b2a31cf7db131d8a09a8624f087b7a5beb377949843d99d5933d5b16fb270177fe233f943af7f26753fffc6a52a5a5feea18c065f0dd99a74256a33f0 SHA512 07155e5f32c0ada33dd95de333a4a124c9fc56b3807bb2edc2b078f0eab37968f374f84701bb8ce9b200f00ed4587c83f772899ba39527378d3527050960ac0e
-EBUILD fotoxx-15.05.ebuild 1151 BLAKE2B e57effd1bcc1ef9f867e9c93a0080c55f108ed87a9c7e1ee58faeb4632e23f06939f8aa2d97347ef25e58cdd96784e00960abf944886d0450873e259a021de64 SHA512 7fbb27c242856ea797982b6799a558394da5e245b1adad434fcfa087a8f4b11ab5665f1ca8419943ca7ae74ff7f96e16c0c1a4dede948fbb93e0842d1af69f7f
+EBUILD fotoxx-15.05.ebuild 1158 BLAKE2B e2885489ef78b828f1141a268876333168088c3a042208cbcedbf068613711e47526ca8fb79121d61f067030d6cb2cc7cb671161c8d2a26a5e6480c7915965f7 SHA512 374c9c7e979a9427003ed76f36aa0b7233667407fc2a7ee1498e7bbba9e351ba3202efaaa676eed84ddb5997a9d0cba1f5f38ee878c3f75aac5054d7ba8100d8
 MISC metadata.xml 773 BLAKE2B 75c03d8cf914e9aeb25db837d5e945908082d8711b19fbeb8694371ebb8c2ff6c69088dd4c887ce4f29eb456e2f412f6d992ac04c447a31e814838dbf5932aa1 SHA512 1fbf87c22810a242a8d7f0e91e6ee6bcb6b1a08cb39c3e827171e110bdcc5468a2440c42d56f1630860555a54fee0133483d8551dac164492bb630fcb45c7cc8
diff --git a/media-gfx/fotoxx/fotoxx-15.05.ebuild b/media-gfx/fotoxx/fotoxx-15.05.ebuild
index dd440e48f705..b0b0b1e02756 100644
--- a/media-gfx/fotoxx/fotoxx-15.05.ebuild
+++ b/media-gfx/fotoxx/fotoxx-15.05.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="http://www.kornelix.com/uploads/1/3/0/3/13035936/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/media-gfx/freewrl/Manifest b/media-gfx/freewrl/Manifest
index 986d671a41c6..bcc8e47ad764 100644
--- a/media-gfx/freewrl/Manifest
+++ b/media-gfx/freewrl/Manifest
@@ -1,9 +1,4 @@
-AUX freewrl-1.22.13-desktop.patch 350 BLAKE2B 196fd1708c7dbc6350381081012c97f2c26e54de3e59850008be4ab59b7e37328f10fab68444ec180996d2f953bf608ceccb431d3160ca51e816f599254f1abc SHA512 3e8a2e2275243ac55a0a62b105aeff1166a39798e34f94878b46e02fdacc038d386768e388529b550d755c737e574f988b2ffacbc64f224ed6e5d6d67de2b4e2
-AUX freewrl-1.22.13-fontconfig-match.patch 666 BLAKE2B 5e4a1e818214c3f4361d3a90c105db254ef34829d28ca15082b49424d649840e0dd3bb0f334b535e40b2f495f505808588e46b6f88e06c523ee796fed05504e4 SHA512 8f92238be4568bea9959ffd9ac81920633340e583d175e6a35add48edbaa41aa937aa9d7494261e2edf83bbdfeadbfe597b5881c3dbf2ef9e9bf2f3ce4a508f5
-AUX freewrl-1.22.13-java-fix.patch 1942 BLAKE2B 2358d7862f179f8c98babfb241fdc281a84eaf0073529f549f435bcbd363f0aad7d44027f221b3ea85109fa06721d7cacb7584d1aaefe4333dc982964b5c940d SHA512 e8224e249e28918e04117542c710b093f90e31666312c7b3f62444d68158832893cf81237c8d9c7677ac4e0b571c0a74457721f0778996a975fbdacffdebb82a
-AUX freewrl-1.22.13-mozjs187-config.patch 486 BLAKE2B 4d130a4f8adc59ae97c83dd697d543b3fdd8bdd5c9b9e6253b8c1aa936648a9212e0a1d3c899bf5dd217579142e84714d1d783901e3aa61184122b2530e99fca SHA512 69985ba98ca8c12e59b6aba2fda004931778f138dfd90a45fd9a65027961401f6a377bfbc55f9fb2614ada5ac291922809dc87ea8ad7bdf93bdc78ddb3c3b298
-AUX freewrl-2.3.3-ld.gold.patch 1120 BLAKE2B 86f6b8baf403b70b3fd346265b20bd39b76fcdeb9f953b8a653c1999c7f8ea0be1faed609ddb5a74c01f4536f7cfae8484815422a2fdfa21cb9debabc0dd9f3c SHA512 010369ab9ec5f03f3055594b88001deb14a58e3d69cd5f8312a7a25d34ec4bef81940d911a7c13aa8872c82fe66c14284d292a33e1629ab9dfe52cd9a4412e3b
 DIST freewrl-3.0.0.tar.bz2 1567282 BLAKE2B 84bf924ce51d70aca0baa504dba0726af82b3d2ff93de87bd18ab772f6bdbcc50807a496c14264006894b6c52bfe9844e672412162f3df1107453fa1f8b066a3 SHA512 12e75c6891238fbc9c750a9449c8a6a9f4b86124ac12871adbfb3c68b7ef09f35d3709dcb63693e50f8ac824170aef3b97854a72de0b324e67fbbb7c081675a0
 EBUILD freewrl-3.0.0-r1.ebuild 4430 BLAKE2B 7145155adf968a057b3ab817fe496fd8fa7e618e53996a27967d7937ecaa1c0f45e318e83d470d9bfc225aca797675a95f78160e07aa46afbb81e98750fd389b SHA512 0a02299bc0698e022b8eaca0aa6e9151cdb08b16155137d05a4404a467ef66ff04e0d1e0a22b86ad9d557a61210966b7a960f63c6cc478cc889b93e39f775c3a
 EBUILD freewrl-9999.ebuild 4489 BLAKE2B 8d5f07f5fbb46894e75b62994794738dcf50fa2025eeddc5a0c5c4aada55169e15c2ae5ec90434ed8f96a4a12f1f0b20b1195eee7ffc4a391280f1b9842d56c6 SHA512 9d9dd93cdc9e6dae64d0bdb068b56fa2c6a0f478708be6e48aa771e10526b30c73ae039cc83fe3f62d00bab2571e60bb013ee796c7cd613c8b3c7fa8a7cc60dc
-MISC metadata.xml 1381 BLAKE2B 566f615062dd20b88fb1a040961df6e117477544c38d0c53ed7350d1311829b086af1a5c3f763e24d3d63e044a2193c07ac16ed3238826a10fce987d94122db0 SHA512 04a5283d1d9006fcb92806f9eed0033d3f173e7c3d8db54bc5d09f3c26536714f1c090036ae902fbbd9dd801353139a2e896bb462cb28d50d2717fd4d16e7c8d
+MISC metadata.xml 1302 BLAKE2B eb8522dbaadd9c9ebc8d3b5e03072fc7b57f6d87046f52104985a5e0e8f40669b53906921286d1d2c79e393853cac4c88f5a351c7bd0c38e3b9905308c0a890e SHA512 f7581007975722b3d16cf349c55ab67b5cf92a47316399adefb38a9413669f544c9fa5cc922f02f5a7473d4570d884d561dc8ef397347eca80494964f2f4faf0
diff --git a/media-gfx/freewrl/files/freewrl-1.22.13-desktop.patch b/media-gfx/freewrl/files/freewrl-1.22.13-desktop.patch
deleted file mode 100644
index 6d620b7ab94b..000000000000
--- a/media-gfx/freewrl/files/freewrl-1.22.13-desktop.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/freewrl-1.22.13/data/freewrl.desktop	2009-06-08 06:26:21.000000000 -0400
-+++ b/freewrl-1.22.13/data/freewrl.desktop	2013-12-23 10:45:54.916307951 -0500
-@@ -3,7 +3,7 @@
- Name=FreeWRL
- Comment=View X3D and VRML files
- Exec=/usr/bin/freewrl
--Icon=freewrl.png
-+Icon=freewrl
- Terminal=false
- Type=Application
- Categories=Graphics;3DGraphics;Viewer;
diff --git a/media-gfx/freewrl/files/freewrl-1.22.13-fontconfig-match.patch b/media-gfx/freewrl/files/freewrl-1.22.13-fontconfig-match.patch
deleted file mode 100644
index 36b844ea8b62..000000000000
--- a/media-gfx/freewrl/files/freewrl-1.22.13-fontconfig-match.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- src/lib/scenegraph/Component_Text.c	15 Aug 2012 13:31:45 -0000	1.56
-+++ src/lib/scenegraph/Component_Text.c	29 Aug 2012 14:18:43 -0000	1.57
-@@ -370,6 +370,7 @@
-     FcPattern *FW_fp=NULL;
-     FcPattern *FW_fm=NULL;
-     FcChar8 *FW_file=NULL;
-+    FcResult fcjunkresult;
-     #else
- 
-     if (!p->font_directory) {
-@@ -487,7 +488,7 @@
-     #ifdef HAVE_FONTCONFIG
-     FcConfigSubstitute(0,FW_fp,FcMatchPattern);
-     FcDefaultSubstitute(FW_fp);
--    if (!(FW_fm = FcFontMatch(0,FW_fp,0))) {
-+    if (!(FW_fm = FcFontMatch(0,FW_fp,&fcjunkresult))) {
- 	/* do whatever is done when no match found */
- 	printf ("could not find font for id %x\n",num);
-     } else {
diff --git a/media-gfx/freewrl/files/freewrl-1.22.13-java-fix.patch b/media-gfx/freewrl/files/freewrl-1.22.13-java-fix.patch
deleted file mode 100644
index 882062cb7e10..000000000000
--- a/media-gfx/freewrl/files/freewrl-1.22.13-java-fix.patch
+++ /dev/null
@@ -1,54 +0,0 @@
---- a/src/java/Makefile.sources
-+++ b/src/java/Makefile.sources
-@@ -1,4 +1,4 @@
--dist_noinst_JAVA = \
-+noinst_JAVA = \
- 	org/web3d/x3d/sai/Browser.java \
- 	org/web3d/x3d/sai/BrowserEvent.java \
- 	org/web3d/x3d/sai/BrowserFactoryImpl.java \
-@@ -309,6 +309,7 @@ noinst_JAVA = \
- 	vrml/InvalidFieldException.java \
- 	vrml/InvalidRouteException.java \
- 	vrml/InvalidVRMLSyntaxException.java \
-+	vrml/InvalidX3DSyntaxException.java \
- 	vrml/MField.java \
- 	vrml/field/ConstMFColor.java \
- 	vrml/field/ConstMFFloat.java \
---- /dev/null
-+++ b/src/java/vrml/InvalidX3DSyntaxException.java
-@@ -0,0 +1,6 @@
-+package vrml;
-+
-+public class InvalidX3DSyntaxException extends Exception {
-+    public InvalidX3DSyntaxException() { super(); }
-+    public InvalidX3DSyntaxException(String s) { super(s); }
-+}
---- a/src/java/Makefile.am	2014-03-10 10:37:09.000000000 -0400
-+++ b/src/java/Makefile.am	2014-03-12 12:29:42.000000000 -0400
-@@ -1,5 +1,10 @@
- # Java Classes for EAI/SAI/etc.
- 
-+# NOTE - automake-1.11.6 changed how class*.stamp is generated, now need
-+# to use noinst_JAVA and EXTRA_DIST instead of dist_noinst_JAVA to
-+# keep behaviour consistent and compatible with both automake-1.11.6 and
-+# older automake
-+
- # Get global variables for Makefile defined by toplevel Makefile.globals
- include $(top_srcdir)/Makefile.globals
- 
-@@ -9,11 +14,12 @@
- jarfile = vrml.jar
- jardir = $(JAVA_DIR)
- 
--$(jarfile): $(dist_noinst_JAVA) classdist_noinst.stamp
--	$(JAR) cmf $(JAVAROOT)/manifest.extras $@ -C $(JAVAROOT) $$(echo $(dist_noinst_JAVA:.java=.class))
-+$(jarfile): $(noinst_JAVA) manifest.extras classnoinst.stamp
-+	$(JAR) cmf $(JAVAROOT)/manifest.extras $@ -C $(JAVAROOT) $$(echo $(noinst_JAVA:.java=.class))
- 
- jar_DATA = $(jarfile)	
- 
--CLEANFILES = $(jarfile) $$(echo $(dist_noinst_JAVA:.java=.class))
-+CLEANFILES = $(jarfile) $$(echo $(noinst_JAVA:.java=.class))
-+EXTRA_DIST = $(noinst_JAVA) java.policy manifest.extras
- 
- include Makefile.sources
diff --git a/media-gfx/freewrl/files/freewrl-1.22.13-mozjs187-config.patch b/media-gfx/freewrl/files/freewrl-1.22.13-mozjs187-config.patch
deleted file mode 100644
index 645a2315c161..000000000000
--- a/media-gfx/freewrl/files/freewrl-1.22.13-mozjs187-config.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/configure.ac	2012-06-13 13:17:43.000000000 -0400
-+++ b/configure.ac	2012-06-18 15:34:59.000000000 -0400
-@@ -192,6 +192,7 @@
-         AC_MY_CHECK_MODULE(JAVASCRIPT_ENGINE,[spidermonkey],[>=],[1.7.0])
-         ;;
-      *)
-+        AC_MY_CHECK_MODULE(JAVASCRIPT_ENGINE,[mozjs187])
-         AC_MY_CHECK_MODULE(JAVASCRIPT_ENGINE,[mozjs185])
-         AC_MY_CHECK_MODULE(JAVASCRIPT_ENGINE,[mozilla-js],[>=],[1.9])
-         AC_MY_CHECK_MODULE(JAVASCRIPT_ENGINE,[xulrunner-js],[>=],[1.8])
diff --git a/media-gfx/freewrl/files/freewrl-2.3.3-ld.gold.patch b/media-gfx/freewrl/files/freewrl-2.3.3-ld.gold.patch
deleted file mode 100644
index 6660f175b502..000000000000
--- a/media-gfx/freewrl/files/freewrl-2.3.3-ld.gold.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-commit 57d2d3b900c7d57e167fb7c90b36ca8c9c80b8bd
-Author: Ian Stakenvicius <axs@gentoo.org>
-Date:   Mon Apr 28 10:53:57 2014 -0400
-
-    autotools: fixed underlinking issue with libm
-    
-    Signed-off-by: Ian Stakenvicius <axs@gentoo.org>
-
-diff --git a/freex3d/configure.ac b/freex3d/configure.ac
-index 49db07c..48b09c8 100644
---- a/freex3d/configure.ac
-+++ b/freex3d/configure.ac
-@@ -73,6 +73,8 @@ AC_PROG_GCC_TRADITIONAL
- dnl AC_FUNC_MALLOC
- AC_CHECK_FUNCS([strchr strrchr strdup strndup strerror getopt getopt_long getopt_long_only malloc calloc realloc usleep gettimeofday])
- 
-+# Check for math
-+AC_CHECK_LIBM
- 
- # ====================================================
- # FreeWRL specific configuration: target system
-diff --git a/freex3d/src/lib/Makefile.am b/freex3d/src/lib/Makefile.am
-index ae7fb05..1b1af8a 100644
---- a/freex3d/src/lib/Makefile.am
-+++ b/freex3d/src/lib/Makefile.am
-@@ -40,7 +40,8 @@ EXTERNAL_LIBS = \
- 				$(PNG_LIBS) \
- 				$(LIBCURL_LIBS) \
- 				$(IMLIB2_LIBS) \
--				$(LIBLO_LIBS)
-+				$(LIBLO_LIBS) \
-+				$(LIBM)
- 
- 
- # X11 flags specific to x11 target (default on Linux -- optional on Mac)
diff --git a/media-gfx/freewrl/metadata.xml b/media-gfx/freewrl/metadata.xml
index 51d17f440b62..46c0887e1b14 100644
--- a/media-gfx/freewrl/metadata.xml
+++ b/media-gfx/freewrl/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>axs@gentoo.org</email>
-		<name>Ian Stakenvicius</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription>
 FreeWRL is a VRML97 (VRML-2.0) and X3D interactive viewer, providing both a traditional Xorg application 
 and a nsbrowser plugin for use with many available web browsers.  The package depends heavily on OpenGL 
diff --git a/media-gfx/geeqie/Manifest b/media-gfx/geeqie/Manifest
index 55c1610421ce..102ea166a119 100644
--- a/media-gfx/geeqie/Manifest
+++ b/media-gfx/geeqie/Manifest
@@ -1,6 +1,8 @@
 AUX geeqie-1.5.1-no_common.patch 2168 BLAKE2B 3949807b4bdd99a9283ca1ff1108fbfcc6cc034d56339875bf1d65513461ccd2da447c4923e5c1c0c14af8f204503c8b2fa72bce4faa4e270a8309cae2fd75e1 SHA512 3198780bc3840691cf2239fdf8d963bb9ead90b38fdf32d4276bd55c70fbb69d0e88f55ed901990c50907dde5b242e0f1af96ca6733ccb767b9e5e2d82ffeda9
 DIST geeqie-1.5.1.tar.xz 1587116 BLAKE2B f8742a88eefd90fb1e7e1d1365058cef190b6231fcb001faa9f110676e8403c8e5959f9af398d6fa1ddc4e4c62439728904c6c39f5095f476014a5b7b74b4d16 SHA512 265eade90afe45856855e856c5f640786ca2e3add57c3ade8ca380d075297f96bf44c6e0c4fd6eabbc2666a37f898b50d37dd2e01d77875b8a622d72d8a0e6ac
+DIST geeqie-1.6.tar.xz 1693488 BLAKE2B ee5369884c4c0e60fe827d43ef336c5aaa89d55aec8905bb8cdd4edb2ee12e15d525577a3c85403e2e8955a08c817007b72d1d1e3614063377a21aaba317acee SHA512 4acd05c6012c80581e9c594c7dc7d12265528aa8d3868afef9def36798945afb851da9376bbe5f205ac3c5e1e2362188cc0e2891b49f3ea4396bbc6974c143ef
 EBUILD geeqie-1.5.1-r1.ebuild 2282 BLAKE2B 4030d0db0a455bff639f2f6ec1f3d7005240ead319a4ca8882c6417a1a6204839d698859dbd745e13a754130f47d100a3643c824367ecb4cbfc6210fb3244dd3 SHA512 077244b2b9ec5c7db5c96329abf79ef004ba8b497c87f780d5a90689bb931409906e36d56bef0e09467a0dd4ace46db608e7ad03a205d50e1d2c8b98f64e176b
-EBUILD geeqie-1.5.1.ebuild 2221 BLAKE2B d55676b39a62b450cad26488920f2af5bec2915c93e2fa25f78e843db43e136538daaab7122cf512da3917bfdbb8008459e35e1293d631a291898b5f0490d1c9 SHA512 ba79b67a40834c520140359ac316738d19b23ee641683b4a3a513a465c5101cd2fb17e1a3316b5647bcda8bb51ed93a050892bc7d14c7593aed760960920b940
+EBUILD geeqie-1.5.1.ebuild 2222 BLAKE2B c725f6902608cd0483fcfb056c7328cc3ecbc0b010da93970c14e1f0400fa2f2577c00622e773b9531ee1472d58b9d319bb0f54c870762c852f9f1e8abf1f871 SHA512 69a7e41f601ffba26e13d42fb2b63325293aee00f8c5838d171b26e2c09738a87b4c6c95debbc433b6e357ae202098eeef4e9b9d660d04ce2458696c7280bda1
+EBUILD geeqie-1.6.ebuild 2235 BLAKE2B cf7aff0c366ba4399c5f6622bdb6d1d5c9e74fbd8b29be0526d12a24ce8a577fc160c0388f4c5718bef6ca91cf0070e03a8c32aadea7fd3841eba2e202dcaf93 SHA512 3ba5b3cca3da8b7d14560628983d2a39650cd714df97295ef809f573aa9789f92db3966a517760d5806b4482abf3294d4922c25d2c81d6d36512dc5aaa9bd53b
 EBUILD geeqie-9999.ebuild 2330 BLAKE2B 5663c258cc045098f835f35484648755e87b7223f4caee2bacc746c78bbeaa683e3fa5b7ad8bef4198853bb1628c09e103df94e8d0a98b2961d2a1a36fbbc104 SHA512 e911efd079f9b6c8455302d2f02f55de4050ecda2a17beb2ab945753c8e1c6ce0fb1947f107e4218354441b912970d5687c0ac5c72b5e87346dfc06668a6c2b2
 MISC metadata.xml 923 BLAKE2B 49de6dd7b0380b1cc74ccabbc8f84e2c55144b80612e04c4e55c82d052027882cc293a70a52f857bded73246ccbb5351df53dc1e1e08b8c2c08e630bc24f9882 SHA512 752280a5fefc097c5ca8b1fc2e9f05220aa809e45484560edca7baa68d95b0d91fa14973c321aefcdb76052dc02e405e2fb4a32e6322f04cd8223afaa6734d58
diff --git a/media-gfx/geeqie/geeqie-1.5.1.ebuild b/media-gfx/geeqie/geeqie-1.5.1.ebuild
index 63b12f277dca..4e7557f90024 100644
--- a/media-gfx/geeqie/geeqie-1.5.1.ebuild
+++ b/media-gfx/geeqie/geeqie-1.5.1.ebuild
@@ -24,7 +24,7 @@ RDEPEND="
 	jpeg? ( virtual/jpeg:0 )
 	lcms? ( media-libs/lcms:2 )
 	lirc? ( app-misc/lirc )
-	lua? ( >=dev-lang/lua-5.1:= )
+	lua? ( >=dev-lang/lua-5.1:0= )
 	map? ( media-libs/libchamplain:0.12 )
 	pdf? ( >=app-text/poppler-0.62[cairo] )
 	tiff? ( media-libs/tiff:0 )
diff --git a/media-gfx/geeqie/geeqie-1.6.ebuild b/media-gfx/geeqie/geeqie-1.6.ebuild
new file mode 100644
index 000000000000..39216c027930
--- /dev/null
+++ b/media-gfx/geeqie/geeqie-1.6.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+LUA_COMPAT=( lua5-{1..3} )
+
+inherit autotools lua-single xdg
+
+DESCRIPTION="A lightweight GTK image viewer forked from GQview"
+HOMEPAGE="http://www.geeqie.org"
+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"
+
+RDEPEND="
+	virtual/libintl
+	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] )
+	!xmp? ( exif? ( >=media-gfx/exiv2-0.17:= ) )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/glib-utils
+	dev-util/intltool
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )
+	gpu-accel? ( gtk3 )
+	map? ( gpu-accel )"
+
+src_prepare() {
+	default
+
+	# Remove -Werror (gcc changes may add new warnings)
+	sed -e '/CFLAGS/s/-Werror //g' -i configure.ac || die
+
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--with-readmedir="${EPREFIX}"/usr/share/doc/${PF}
+		$(use_enable debug debug-log)
+		$(use_enable ffmpegthumbnailer)
+		$(use_enable gpu-accel)
+		$(use_enable gtk3)
+		$(use_enable jpeg)
+		$(use_enable lcms)
+		$(use_enable lua)
+		$(use_enable lirc)
+		$(use_enable map)
+		$(use_enable nls)
+		$(use_enable pdf)
+		$(use_enable tiff)
+	)
+
+	if use exif || use xmp; then
+		myeconfargs+=( --enable-exiv2 )
+	else
+		myeconfargs+=( --disable-exiv2)
+	fi
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	rm -f "${D}/usr/share/doc/${PF}/COPYING"
+	# Application needs access to the uncompressed file
+	docompress -x /usr/share/doc/${PF}/README.md
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	elog "Some plugins may require additional packages"
+	elog "- Image rotate plugin: media-gfx/fbida (JPEG), media-gfx/imagemagick (TIFF/PNG)"
+	elog "- RAW images plugin: media-gfx/ufraw"
+}
diff --git a/media-gfx/graphite2/Manifest b/media-gfx/graphite2/Manifest
index 192ee7c234fc..4c92bada4069 100644
--- a/media-gfx/graphite2/Manifest
+++ b/media-gfx/graphite2/Manifest
@@ -1,4 +1,4 @@
 AUX graphite2-1.3.5-includes-libs-perl.patch 836 BLAKE2B 0429d214ff7fd9b903e1d3bcaf0af3e6b29a0269581390f64950e42e41280e482fc9cfda9bfe24ef166eb6c24d21377a15fca4264fec69d902d8ba18810bdb01 SHA512 26ab6dda13d758a5e4237c8b5d207d3c5111afbb11b2c3984cd742913c3c7932559b23b5ea9f774f1c6373eb0f761a9400dccc95876740b3cd06c44084a10965
 DIST graphite2-1.3.14.tgz 6630061 BLAKE2B 72bf6736aaa8476a89e44ef53c5b6c94f45d815fe1a451ba6b3696bfe023971210975dee4a9c8cb3042f36442e4efecf5baf171ef4230ad2b10694a89865f918 SHA512 14b5eb2ba8158b8b62ffa7fb142100a0af1de0f0c45b2673801b636714a106b46fcd423b05c722d963c9543fafcf10fec811975308211a54f20a3ba322d7b295
-EBUILD graphite2-1.3.14.ebuild 2663 BLAKE2B a854792c11d2b5e2a1d7d8bb4d7273202fad4a462434d47e4e9c9a87fe7b0602482fc464f327e7861fa5615e60d43725f125e865bc0451528026127ba863883d SHA512 b38a2c21778512f8c390b96868cdd64cc1685c22fb6906be7dc71ece4a5f55c3514668a835105279090179bc8f654d7259934ae95ba4c054bc781034ef61cd77
+EBUILD graphite2-1.3.14.ebuild 2670 BLAKE2B 69227df63c4b4e2e31035cba0f084a3157d858ea883714e3bc5e806b98adb5d1d51519450ccd843cf6d0f5880fafadc8add88e917ea1165603700c5da76af7fb SHA512 fb1cfb255c8727681ddd48b2cddcfed90efd070a0835b946fd768b92dcd680cde6a417bacece0985f7f1963b15360a5c233e65044eda74a8bf56326a1e34cd5b
 MISC metadata.xml 336 BLAKE2B 7069f4f7bb9ecd39581528f3f6b072d2ebf2c32b24224b9ca5b69b138490e764b740768334954f5cfc25819cab55a50fbd0933dc77fb3397886aacfd105f0853 SHA512 ac8ae39ab005c1562818a97b64bfef48ab64e2a1993aa3eef4ee4b3066b32d9211787df1273e20cb767839e42364ed72b3e99c51bb65f0c88937564d5dbb5380
diff --git a/media-gfx/graphite2/graphite2-1.3.14.ebuild b/media-gfx/graphite2/graphite2-1.3.14.ebuild
index ce5d97c4eeb0..b48a803f1911 100644
--- a/media-gfx/graphite2/graphite2-1.3.14.ebuild
+++ b/media-gfx/graphite2/graphite2-1.3.14.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/silgraphite/${PN}/${P}.tgz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="perl test"
 RESTRICT="!test? ( test )"
 
diff --git a/media-gfx/graphviz/Manifest b/media-gfx/graphviz/Manifest
index 2580db4342e0..1bbf9a5cc225 100644
--- a/media-gfx/graphviz/Manifest
+++ b/media-gfx/graphviz/Manifest
@@ -3,5 +3,5 @@ AUX graphviz-2.34.0-Xaw-configure.patch 2445 BLAKE2B fc1b3820fd72821ac431f5d93d0
 DIST graphviz-2.42.3.tar.gz 26246717 BLAKE2B 71c61dcd056c9a2e2655c3be995d1da17b3af0d3374e74400fc38da11ab81849f7b5e528f99fc2046294958a4bab0a411ab204e434360f316a5367403472e8a1 SHA512 e03ca6da0ddb1162bd179d159d7dbb379d55012d63bb922aa800260fce52b65beb1a9b5ca1a5199ad3537201b0b4841efc9facee6e03065c6bd02e840f8a29c9
 DIST graphviz-2.44.1.tar.gz 34079677 BLAKE2B 90183afa6affedb097eab237fae148a9c085c3a724fb74d370f7c042b53d09b44ba0cb755a2ac74175d89d3a45687b60f0e210bdd404fc72da98bdf61b9eaa8d SHA512 42e6137c7cce18daf6f17e6fcbbdfe8e0a531de1bdd3ac7b8751445214aa0d85713b65ba896a234a02670827b0d608bd64b758ef60a4d0384ffa3355ee0dbc42
 EBUILD graphviz-2.42.3-r1.ebuild 7864 BLAKE2B 4390c7d22ec3e914d25445eda9ffab4bd879c5a1316355a69cd0cea756a3d85c15c3dc31bcbf97161de877eb70605e230b7a43b2c3201d980387f49653231278 SHA512 9105485fa2e67399edd207249ad80ed7b16c2f9378b33e2f844f402a4e7cbef53868ef8fb4800d06672deb75f62a51ec68949fd2d16c2cf345846116c0e68b74
-EBUILD graphviz-2.44.1-r1.ebuild 7830 BLAKE2B 19f5260cf992b446d4b1e9ea745abdf1f63f1055326a0c72b563884578404b3d30bb5b174a984bf632770280e9fcdb58ef39f786562f35f278df9c8931f31ba7 SHA512 a4393ed01752bb891ec10c7a78d83b3eede794c3734d85b7dfece62efe6d6f1df05dbdc35a25e55e88be8e9fc5dc23879a2f1abfecfcd31d967196e990a79184
+EBUILD graphviz-2.44.1-r1.ebuild 7837 BLAKE2B eb30898121035261a7bf7bd92d1ec865acf862228777562db4ff2598113cf2a427264ba6bf0beedd599a8105e5bc988e86400b08aa1022a9e90506b2876d331e SHA512 1b209908a66e85ea977d5aebff2d4e9aaaae7ed60d855d38bbb7a2a117033b8d56d1cee9d4e501c33854f1803e7439a93ea18219c3428066236c134580b56ca3
 MISC metadata.xml 2244 BLAKE2B 61cc818a6f736cee316c026bef8f02dc03ffa3c63f620832fd063f00111178b07be4c5224f5d4fc0f1cddbfc3180e31ac277d493107e0d716d0d2f05c7272633 SHA512 e8c8d5b2abf9c21c6fe8dd7e3489210275065a2f0f64023f5aa52fac2b2646b974fc36c60aa189be022728384ff223aae5856095846dc5ea85638d1b882ad7e0
diff --git a/media-gfx/graphviz/graphviz-2.44.1-r1.ebuild b/media-gfx/graphviz/graphviz-2.44.1-r1.ebuild
index cc8390a654b3..99dae78ef38b 100644
--- a/media-gfx/graphviz/graphviz-2.44.1-r1.ebuild
+++ b/media-gfx/graphviz/graphviz-2.44.1-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www2.graphviz.org/Packages/stable/portable_source/${P}.tar.gz"
 
 LICENSE="CPL-1.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE="+cairo devil doc examples gtk gts guile java lasi nls pdf perl postscript python qt5 ruby static-libs svg tcl X elibc_FreeBSD"
 
 REQUIRED_USE="
diff --git a/media-gfx/hugin/Manifest b/media-gfx/hugin/Manifest
index 951ad8d3abc3..b29cef438c57 100644
--- a/media-gfx/hugin/Manifest
+++ b/media-gfx/hugin/Manifest
@@ -1,4 +1,4 @@
 DIST hugin-2019.2.0.tar.bz2 10335030 BLAKE2B 4fbcb974eea01dbd8d722f64b5cadfd1b3fe101e5e7849d069c531e55e1ea71c226bcb1550b59374bbe8adf111b7c0bc5e48c14f45bdb685486cbeccde5add70 SHA512 2ddfe7468a474c385ef66a88c3a5a2491183765ae431e5044f504d2e95ec3cb99c0b97b98dda282ba7950f6f2001f46b2f2ea39b9025718c2a329dea967685c1
 EBUILD hugin-2019.2.0.ebuild 2337 BLAKE2B 9ca08518fef5bb7d3167cc01caa64da8bd076142174e000cd3881f855644e8e95021149104d86ef82973c6d073eddbaccaf7ea0e8621e3a8e458562d4b7f5b6f SHA512 a17162e5db9fad823f35f867f96e13bb443e2150da84b54d71577a4c33cdbf9497da3d1b3cc0ee051ee7ed607a877133dd6e4483e2a86f150f27f7558e8627cc
-EBUILD hugin-9999.ebuild 2210 BLAKE2B 141192648c323a010a27b1b2b4da162f15ea47d4a8a610d3c4f22a4f9101df9c653601f9a887a314dfa44c4771fa7831caf79d58975dcbd49f37cb46277f2718 SHA512 cc2633109a207a4c7d6a9a409b55a86395bad1beb3f1cbf5b951a58816cd3032597be32bbe251e69db75421fde406aa686ba36b24381e5e95c58f8e747850295
+EBUILD hugin-9999.ebuild 2058 BLAKE2B d7f7ab9b065dcc31cc85033a044b3e8da912779069709e2c1c02c3958744896c9c84cfb2bbf9c802b444e92ce6f6cd86d402254d3b2e5eb5f2b2b766eef069e0 SHA512 65ead2eab2416af88e8529704ee0c936901d3512558e1433eaff5ec3b3db5ba8659b2f72fd4613cc305afb9461003841ce7e3c04b8bbd201c8842ab7ddb5c5c7
 MISC metadata.xml 546 BLAKE2B efad9c27562890b23594411333a0ef827b7e54acde132ffdec4f664eae37fb3ab270950ef650e6caaea4bd3b69a7bed469e794dce51d59850cd06ff844e08836 SHA512 0d096754e2f6ef1468e6bdf7464e6f5cc1de06f20136b68be7aaf199cd78a10e4213678d875ff61d829f692dbd5b0728d50bb35eefb1de6af4e5e0fd7d91d350
diff --git a/media-gfx/hugin/hugin-9999.ebuild b/media-gfx/hugin/hugin-9999.ebuild
index 34db3dfeb053..3eb92a7c66c7 100644
--- a/media-gfx/hugin/hugin-9999.ebuild
+++ b/media-gfx/hugin/hugin-9999.ebuild
@@ -80,10 +80,6 @@ src_install() {
 	cmake-utils_src_install
 	use python && python_optimize
 
-	mkdir -p "${ED}"/usr/share/metainfo || die
-	mv "${ED}"/usr/share/appdata/* "${ED}"/usr/share/metainfo/ || die
-	rmdir "${ED}"/usr/share/appdata || die
-
 	local lang
 	for lang in ${LANGS} ; do
 		case ${lang} in
diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index 72dd23175083..3c3b1e778bb6 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -1,12 +1,12 @@
 AUX policy-hardening.snippet 442 BLAKE2B d79fdbddab418fc9d8391e78992e3dda844e096052115113ff6f759c1a54541bcd7d7793547bc7140776659c98379a9e9f004aa46f757300a33f445d396fbf14 SHA512 e9e723c40d5b8c52bbc2f2b9a3ad7c7e2aee493bc37b6c3940e8486b92a1c6659e47b1e12ee2fb11c8a8b6ee48a7fc10354617ae12c36181a58e9e73b239368d
 AUX policy.test.xml 746 BLAKE2B 6bfa073606469b81cf517d9b069e48794cbda9272d12c3abb8ae3456aaf30cd1923510baddb7d813aa8ccde84e161de0b29314cef7b1a37730c7ad5236d1f5dc SHA512 22f66004324e3777393446a3df738ecd2aa405df088d39137008514cd86b436765b48ccd4355d670a42061ce4e5a7b2fd8e4be5852cd914f62ff0250a4a7ae57
-DIST ImageMagick-6.9.11-35.tar.xz 9214584 BLAKE2B a482a8134b321395437178bcc25963931738f73925698c860f6d7088fe1ed79917d6e7d4a4da3b5fe71aeb29695901341fdc20336f68e64ae63bba1bd5ef9ce2 SHA512 3d04e1add469486b6c9d1e562f7623bed516a64e797abd3113c34937723333550f52245f89395da7126f656a58c0c2d3516cec14abe0a3d6ab2a75a1ccde1645
-DIST ImageMagick-6.9.11-41.tar.xz 9163764 BLAKE2B 943dbed16e096adb88ac81c9fb50190bb9bbfd4fda24145b49bb147034f2b69403ed17c61a5edf52d28f22c4d729d4704ad10084f395b8d6890e87c800cc5486 SHA512 7331885b5dc0b1048e961e9c357fbfc0eabb71c265387842eb42530b0f02210d017f7e0536602780f294f48c6077932abd7d10322584da9b392a7a18e7460cc9
-DIST ImageMagick-7.0.10-35.tar.xz 9656888 BLAKE2B 3b1da9c2a6118cd4885eeaa366f2fbcda1a16a9a81025b810431262510ec70d2397512e3b1a5eedf95a3a29bebdff16399b2cb308a0da67b512472c86a6505ca SHA512 340395496b1d41f52ffd6c5928d9426edbc3e79aa1d3ad38b41eac361b6291a2ede3d3997ced61500fd34a32b74f774e7335e6d13de0b7c5e70d7039ec95887c
-DIST ImageMagick-7.0.10-41.tar.xz 9645036 BLAKE2B 3e90fc739cc271a20be49e1cf7b2a637e1b3916ae2934d7874f28339039ce5c331c35eb8863ef6144270586afd85ac9475a0603d64b9a8189a9f06de6f47f42e SHA512 62439bcc7a2447593bedf165c2c05e67e27d672823523d611439fa2dc288e948772389772dcf1f8633ca7dbf38b514cf5fc3bfb5fb3d61e2efdd38fe7a2ad040
-EBUILD imagemagick-6.9.11.35.ebuild 7044 BLAKE2B c60176b4c63910d2e47dbe4ac5a4fffa8723eba62404c184ed9e3eff79f2240a80dd8f07d67c8da466abf7b13b504fb220972d8a2d1548504b67e416fe1b8a11 SHA512 b72d98b36e26ef58f5d90e5ce614085c57f0606abf450790c22779a59e7af48969f2e186734827465375ba86159bd044b6e7d91f65444f035f391b39f698dbbc
-EBUILD imagemagick-6.9.11.41-r1.ebuild 7054 BLAKE2B c1f4280b7d3380b01a44f33af60b062eeb2c98f0850dcd3d4fe88ebe292ad5c2e299c018983724b96f18461c0acdb6f9807ccaf8b233328a5ff2c00582734255 SHA512 9aa1c7e617fe258be2eb1f7f0f9d462a51d6d0884edab102fbfa70936891b3371e1d86fa059648fccfb52a25645fb6376171d55ce20f7d6de267445c0f958b97
-EBUILD imagemagick-7.0.10.35.ebuild 7353 BLAKE2B f630da70a10987d339b433551781f27c8fff1a309e8fc755ef152ffb273a8219e861fd0b8819d6d7e4c4f4d7f07367e5581edf25308ea80f9daded8586fc73e9 SHA512 fb26e0c6a3578f1c4d02e551b6f96519f567f1a5cc94ab81b3a764fb8d0f477f775c21989050cc0c6c0cde114b4e8e7b63e91f741ecb8ff4e4c0cd8e48551749
-EBUILD imagemagick-7.0.10.41-r1.ebuild 7364 BLAKE2B 5067a5a79b93c7ea8364940352cc4988393ceb86a08e617dd95a309022be37b60dd9ffd1621c1a799cb372608f75c213d7fc1ddb13340225ad4643c408630bc4 SHA512 85560f10889069420c6459e696aa96d7306486bea2410d8f3bdc9160995eaad65b10ca171c2a39a170ba21043bb4cd84f5e6e0776e020ecf1286b84611430981
-EBUILD imagemagick-9999.ebuild 7235 BLAKE2B 17a5da6495c2c2a8f6b7215d62b5328caa34eb223af014047ebaab23175f4970567f2f39f21b49f78b237a676f35acef6371d6f23e31e2880400942dde249857 SHA512 41293ffa8582738c7908d0c56260fbe0294e13bebfd91106b0548fccc4abe42bc4f20bbbb1406ecf61aba259ca98d77181b4608075fbeea43c150bc1d275d86e
+DIST ImageMagick-6.9.11-44.tar.xz 9155096 BLAKE2B efd52ca6d30a385f29f0fda102c58d89dff6b80d702391a39d52cb59835fe258a21b171a64dfefd91f15d377177219de1a1db1b2e8bb2e3337119497a38b272e SHA512 dcf2965f1751c50649c74160b29f6909b6fa2dfdf64520d0f55be9fe0eef02aac32f9c376756295c90b9c89b2947890249ca0e41f0cc56e2ec4b37678bc92372
+DIST ImageMagick-6.9.11-46.tar.xz 9165256 BLAKE2B 5fb2c7ef90c165388bf9c9b42d752823e62b94a631f8dd8161d8c71b718154b5f577474a7074f42644e994af1aec99f28c4d69913be3045865cbc87533c05fca SHA512 63022225e694dccbfb52eec3793332bc92ff2d6a51a6ed161d63e044a33c8d13f0a2630afc1935cb139ca2d0e141d99a9bec23f5eac82a488a461ed30baf85f5
+DIST ImageMagick-7.0.10-44.tar.xz 9649740 BLAKE2B b721532e267c2832252519b52fd6f88795e0bc22cc165020478dc80164784a0407e0eec066ecf8db68409e04a48e877d16f882e773f34c50797784ba771ec997 SHA512 246567c84ecaaba4f7742c215b2d79f181fedd3ba953d318f177916e5a3757ddbae111837657a5df4b420da3b1337b1ec78c871c57b3e738585ee847a7b9d768
+DIST ImageMagick-7.0.10-46.tar.xz 9649132 BLAKE2B 8083aa4fa26d59c4bea4bd9a45ab5b1a46d3fe0ecdbb0090588d16bcc31ad044171a59dc7e8681c878e885d83c7b34a4bbfa21273d5711181bbefdee457ac895 SHA512 7008286a05a1794a3061bd598bf6acc70dcfe1aec3a6b5632dce9dd87bb6c28385af0d469b47996d5576c4b39c5d48a4fcd7752b9353ec28b7f7d8160f4c5023
+EBUILD imagemagick-6.9.11.44.ebuild 7047 BLAKE2B c8a589ac24fb824399cdf0459e46d52fa5aa08b184befdb8d7c991778e41fa91a30e89d6e1cab206969c47d9d438977528c6ad533da242398c380c434b0cf8db SHA512 ea9007174ea7d0eb0c583e659e761f25904f63981d88c41e03ffb6680e58885f8cc6faa6bb2f63686e69137b1ad0acd815e646993fe6b2ec7d25be51b6c5e3c9
+EBUILD imagemagick-6.9.11.46.ebuild 7054 BLAKE2B c1f4280b7d3380b01a44f33af60b062eeb2c98f0850dcd3d4fe88ebe292ad5c2e299c018983724b96f18461c0acdb6f9807ccaf8b233328a5ff2c00582734255 SHA512 9aa1c7e617fe258be2eb1f7f0f9d462a51d6d0884edab102fbfa70936891b3371e1d86fa059648fccfb52a25645fb6376171d55ce20f7d6de267445c0f958b97
+EBUILD imagemagick-7.0.10.44.ebuild 7356 BLAKE2B d2f907df96ed9c207652de11dc4178b3ac6c6ced8ee759a78bfeb7d8c8e152a73dbd03ff146a1dd8eb66155cc09612621c0c5aaee394461127b2f80707e20eab SHA512 26ee49e6b467c1c777ef2acfa5740601ae529b1a4aed6dd07c287ad2246d21edfa72285a63c4f27e1241e81b485b3ccad14ddf9aa58eea63949cb6f68c7e9c1b
+EBUILD imagemagick-7.0.10.46.ebuild 7364 BLAKE2B 5067a5a79b93c7ea8364940352cc4988393ceb86a08e617dd95a309022be37b60dd9ffd1621c1a799cb372608f75c213d7fc1ddb13340225ad4643c408630bc4 SHA512 85560f10889069420c6459e696aa96d7306486bea2410d8f3bdc9160995eaad65b10ca171c2a39a170ba21043bb4cd84f5e6e0776e020ecf1286b84611430981
+EBUILD imagemagick-9999.ebuild 7364 BLAKE2B 5067a5a79b93c7ea8364940352cc4988393ceb86a08e617dd95a309022be37b60dd9ffd1621c1a799cb372608f75c213d7fc1ddb13340225ad4643c408630bc4 SHA512 85560f10889069420c6459e696aa96d7306486bea2410d8f3bdc9160995eaad65b10ca171c2a39a170ba21043bb4cd84f5e6e0776e020ecf1286b84611430981
 MISC metadata.xml 1106 BLAKE2B e77cabff89df6b98687290ef0ee06d85111a7ddca6f5e1e31f820e6d186a6510c2afd0b85ba31004f102fd7f7b88f46af101f4ba45011aac75afa40b0a714857 SHA512 68a5f9a80b1e3f2e3004252703f9b3176d7c59880a2724ae431fdfd97e8f2adcd7ff7ad2cd8ea8bd35645a3b559052f2c38713647ce7ae889ff1a6061e6b2d92
diff --git a/media-gfx/imagemagick/imagemagick-6.9.11.35.ebuild b/media-gfx/imagemagick/imagemagick-6.9.11.44.ebuild
index 45ebf61e641e..2093cc705f7b 100644
--- a/media-gfx/imagemagick/imagemagick-6.9.11.35.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.9.11.44.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://www.imagemagick.org/"
 SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
 
 LICENSE="imagemagick"
-SLOT="0/6.9.11"
+SLOT="0/6.9.11-37"
 KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
 
diff --git a/media-gfx/imagemagick/imagemagick-6.9.11.41-r1.ebuild b/media-gfx/imagemagick/imagemagick-6.9.11.46.ebuild
index 671132b9e8fb..671132b9e8fb 100644
--- a/media-gfx/imagemagick/imagemagick-6.9.11.41-r1.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.9.11.46.ebuild
diff --git a/media-gfx/imagemagick/imagemagick-7.0.10.35.ebuild b/media-gfx/imagemagick/imagemagick-7.0.10.44.ebuild
index 9407d6f5b2d6..e5576b5108a8 100644
--- a/media-gfx/imagemagick/imagemagick-7.0.10.35.ebuild
+++ b/media-gfx/imagemagick/imagemagick-7.0.10.44.ebuild
@@ -20,7 +20,7 @@ DESCRIPTION="A collection of tools and libraries for many image formats"
 HOMEPAGE="https://www.imagemagick.org/"
 
 LICENSE="imagemagick"
-SLOT="0/7.0.10"
+SLOT="0/7.0.10-37"
 IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
 RESTRICT="!test? ( test )"
 
diff --git a/media-gfx/imagemagick/imagemagick-7.0.10.41-r1.ebuild b/media-gfx/imagemagick/imagemagick-7.0.10.46.ebuild
index c476290b8c6a..c476290b8c6a 100644
--- a/media-gfx/imagemagick/imagemagick-7.0.10.41-r1.ebuild
+++ b/media-gfx/imagemagick/imagemagick-7.0.10.46.ebuild
diff --git a/media-gfx/imagemagick/imagemagick-9999.ebuild b/media-gfx/imagemagick/imagemagick-9999.ebuild
index 542b188a2826..c476290b8c6a 100644
--- a/media-gfx/imagemagick/imagemagick-9999.ebuild
+++ b/media-gfx/imagemagick/imagemagick-9999.ebuild
@@ -13,14 +13,14 @@ else
 	MY_PV="$(ver_rs 3 '-')"
 	MY_P="ImageMagick-${MY_PV}"
 	SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="A collection of tools and libraries for many image formats"
 HOMEPAGE="https://www.imagemagick.org/"
 
 LICENSE="imagemagick"
-SLOT="0/7.0.10"
+SLOT="0/7.0.10-37"
 IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
 RESTRICT="!test? ( test )"
 
diff --git a/media-gfx/imageworsener/Manifest b/media-gfx/imageworsener/Manifest
index 127343f344c8..567437df06f2 100644
--- a/media-gfx/imageworsener/Manifest
+++ b/media-gfx/imageworsener/Manifest
@@ -1,5 +1,5 @@
 DIST imageworsener-1.3.2.tar.gz 661710 BLAKE2B ac79b9d883be34b93e935dc813e6f1edb4806203a20d1f7663d7cbeec74d62227aa88c92b9e96cb940f2a952e92d9724f98fe69dcbd7d2a9dccc2c0a2e9d19c2 SHA512 99b30ac838f437a85985eb830d0557f22c69bc40ef2dafe3493f145b70a89b72699e134f061719fa0dcc8b585ed2b418a6afc0c2f7ce67e2e9383d48a7b7b668
 DIST imageworsener-1.3.3.tar.gz 662243 BLAKE2B 6b34dc111c5b2dcc25fdc717b7ec8d4268ca1b67c31cca58b5e1983643f1e3b78543a3bdba24b3692a05cb83a887bfcf0e7b09307535994d280056a0047c8b0d SHA512 ebe8a31819cf665d8d8d7e789d873de03206e74e100ea99b2d8dc6ac2590025ff0058066daeb17ebfaa6cf49222e33c8a9efa83f39f5e2b9b49d27a3ee1b027f
 EBUILD imageworsener-1.3.2.ebuild 1039 BLAKE2B 37de87bcc96ea9f69b39025f37dd5648711ceec6712c113896db21848504ad40c03d119852a6790c988a581ee512876f33ce81da422db1cf561075ef00a7c69c SHA512 ca237686311d12e133d71b7f97475e816295b78adaf1097936443a5275bf0d843cc2d734fcd755dcc7a9a409d8aef50b77b507ff6e963ad41341d2190a889f5e
-EBUILD imageworsener-1.3.3.ebuild 1053 BLAKE2B 84eb784b282c7066380f2164bf04c0fb39d098fb4a04abffe156bd74fbc61ff4c513215864beebcfeee386f1c4870fd5bfa3c83c6992c3a8133c490660ac4375 SHA512 426c33e0f91e3893d415520cd35b7f84e6cf753a9b13357c6c9ac02751d548ab54f1e3c776422b067e6e253fb71ab864e2253c87465a480a58f2397ed42ee884
+EBUILD imageworsener-1.3.3.ebuild 1051 BLAKE2B 43356b73389511107b05407879eb78d796672e18c3f31ab9e2af270bd2dd6f1eb716c3e3bfb8e5df1b9a454f499793032daf6141e6a8ae942900dddd3d3230fb SHA512 af31bee059e18397f64910922ade7e8202a0eb8aa506d0f4229bd03061ae7fc0ea4fa6c94e8c8cbc60d852c054ef7834cb6215d703cd86f6eb27c578e1c6079e
 MISC metadata.xml 245 BLAKE2B 72d076c6c3242be9c56106016a71f78c926c6c7fe92ae2d22c9cb5084eb1cf3cb4f930e6439c43b57e12c261fe77ef99c469b5629ecafb052dcedef6e346dc86 SHA512 385f7a990e82a7352c25fdf12ac028a67cc41112a9b5cde2e66140d26fdca910e6187d7965b622c3026843f6064d352a1884d5ff7b36aef0d0fab49d364a8a56
diff --git a/media-gfx/imageworsener/imageworsener-1.3.3.ebuild b/media-gfx/imageworsener/imageworsener-1.3.3.ebuild
index c51206e3f3eb..0b004e603e38 100644
--- a/media-gfx/imageworsener/imageworsener-1.3.3.ebuild
+++ b/media-gfx/imageworsener/imageworsener-1.3.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://entropymine.com/${PN}/${P}.tar.gz"
 
 LICENSE="MIT-with-advertising"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="jpeg png static-libs test webp zlib"
 
 DEPEND="png? ( media-libs/libpng:0 )
diff --git a/media-gfx/mcomix/Manifest b/media-gfx/mcomix/Manifest
index ed2f9afcb24d..a97915d6a91c 100644
--- a/media-gfx/mcomix/Manifest
+++ b/media-gfx/mcomix/Manifest
@@ -1,4 +1,6 @@
 DIST mcomix-1.3.0_pre20200206.tar.gz 3292571 BLAKE2B ad76316020645495042d27bf831588e628da11077efe29b302a57be4e688558b4db8d3f850200bf4a54b84b428a16a52f88ea5e20be85b628ef3630a5f624643 SHA512 c98d4a7022993af3a5c0b5425df52f14b586549472bcd4576a72039c8c6d4fde31df4255df45ab7467acb0280bda02b92d4803b7f92b7c1c818b58df7b52a3ff
+DIST mcomix-1.3.0_pre20201123.tar.gz 3888279 BLAKE2B 0bce5d8b3d6e20fc3c422d137963fa8cf506ce969bb5c8062b1db4dcd85d5c1912352fa1eb8c752719b0ac95715486ae47d56e0bf24119f9f55af56f6fbf657c SHA512 24b470e1dca266851bb241f109b39c785443ece36d12a01e579c8a59cb7585ad3978b3696829318f04d4b172cfcf57cf100d76c7c25765260bf26f698d85ba2a
 EBUILD mcomix-1.3.0_pre20200206.ebuild 1801 BLAKE2B 9503275bf00c885a3549dfdcd168013b6c11bca743ae339e0865db26b2d2985cd8c50d3f6b47c69e63d787cf41faaebb260e4a8e828c0116609a163aadce8743 SHA512 90d21b3e9b83c3b97a713f94155c9b914a5716d4b9443139ee0824fca03538549be6706e2a02a14762e04875189d0b9fe9d9666dec3408bf95b90ba09291616f
-EBUILD mcomix-9999.ebuild 1646 BLAKE2B 1d3b03cf2a5584f446b8b59501c044be9a7c4a10fd0aa20e8fa2f8fcd71f24c0e4a7b3d24e90e9ad152eccb639daaeba8aecb6e92724e5e6429f5e8fd367434c SHA512 3c5f49c2808abbe48dac1ff1ab6f2d92bf48e8882c972c325c2ab78a6ab4a2120f8c32a32e78bfae73da31fb78aec38e1d854737b8b9032592567fb71ae5e4d6
+EBUILD mcomix-1.3.0_pre20201123.ebuild 1745 BLAKE2B 841eaedeb156d6983f8f7f6e3baefb5d4b6208ccbc4633f34b4a1de2908cbb6221d7f46ceb19e500ed1f38e182e7e236d4a85b608679f3977c0a5f3be9320518 SHA512 c008603dcd034776966f4464a317fd5319a64141ca4a0576a61a5ef03e9547a2bce4c1678f447ac7c87d451471e95c7f9f7920407672524ff2ee6cc7031d4537
+EBUILD mcomix-9999.ebuild 1588 BLAKE2B 7d1a9c6baae95d6cdafab53697649decb1d7da988cf433687d3289511f98633f72dcd088be05cb3f262b9de37521333b63de77455042d8181683adac9eaaf1d5 SHA512 03bf0d5ae2392116ed456bf2618c8f58a634fb26dbcd1a3682fd787c8d2664e797b96c0f3d885bd93e12bfa5e988f4b35d32151518e905c8d70a3d1ed8636b87
 MISC metadata.xml 397 BLAKE2B 35568ccc8d25ece0069a6f8c404ec0a15f6709dbdb13f235c262f70ddab42ef3c3c431ac989c5ccf2c64c924dd22b1d830c8971576ca11f2358050eec98f138a SHA512 72c698bdfa865d64cb9062e7247fcb0b11195a72d19ad83f7295319a665c4b2a36f4f33cf43a84cb03c3308101a0aa4bf0185756c6cc0bb8a14637cefeb33d97
diff --git a/media-gfx/mcomix/mcomix-1.3.0_pre20201123.ebuild b/media-gfx/mcomix/mcomix-1.3.0_pre20201123.ebuild
new file mode 100644
index 000000000000..5f6da1834a5f
--- /dev/null
+++ b/media-gfx/mcomix/mcomix-1.3.0_pre20201123.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+inherit desktop python-r1 xdg
+
+# Hash used for this version
+GIT_PV="cdcb27533dc7ee2ebf7b0a8ab5ba10e61c0b8ff8"
+
+DESCRIPTION="GTK image viewer for comic book archives"
+HOMEPAGE="https://github.com/multiSnow/mcomix3"
+SRC_URI="https://github.com/multiSnow/mcomix3/archive/${GIT_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+DEPEND="${PYTHON_DEPS}"
+RDEPEND="${DEPEND}
+	virtual/jpeg
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/pygobject[${PYTHON_USEDEP}]
+	!media-gfx/comix"
+BDEPEND="sys-devel/gettext"
+
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+S=${WORKDIR}/mcomix3-${GIT_PV}
+
+src_prepare() {
+	default
+
+	for file in mcomix/mcomix/messages/*/LC_MESSAGES/*po
+	do
+		msgfmt ${file} -o ${file/po/mo} || die
+		rm ${file} || die
+	done
+}
+
+src_install() {
+	python_foreach_impl python_domodule mcomix/mcomix
+	python_foreach_impl python_newscript mcomix/mcomixstarter.py mcomix
+
+	for size in 16 22 24 32 48
+	do
+		doicon -s ${size} \
+			mime/icons/${size}x${size}/*png \
+			mcomix/mcomix/images/${size}x${size}/mcomix.png
+	done
+	doicon mcomix/mcomix/images/mcomix.png
+	domenu mime/mcomix.desktop
+	doman man/mcomix.1
+
+	insinto /usr/share/metainfo
+	doins mime/mcomix.appdata.xml
+
+	dodoc README.rst TODO
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	echo
+	elog "Additional packages are required to open the most common comic archives:"
+	elog
+	elog "    cbr: app-arch/unrar"
+	elog "    cbz: app-arch/unzip"
+	elog
+	elog "You can also add support for 7z or LHA archives by installing"
+	elog "app-arch/p7zip or app-arch/lha. Install app-text/mupdf for"
+	elog "pdf support."
+	echo
+}
diff --git a/media-gfx/mcomix/mcomix-9999.ebuild b/media-gfx/mcomix/mcomix-9999.ebuild
index 15afb7c558eb..da1210c5e2bf 100644
--- a/media-gfx/mcomix/mcomix-9999.ebuild
+++ b/media-gfx/mcomix/mcomix-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 inherit desktop git-r3 python-r1 xdg
 
 DESCRIPTION="GTK image viewer for comic book archives"
@@ -52,9 +52,6 @@ src_install() {
 	insinto /usr/share/metainfo
 	doins mime/mcomix.appdata.xml
 
-	insinto /usr/share/mime/packages
-	doins mime/mcomix.xml
-
 	dodoc README.rst TODO
 }
 
diff --git a/media-gfx/openscad/Manifest b/media-gfx/openscad/Manifest
index e64e73eb0395..e65fce8aeb12 100644
--- a/media-gfx/openscad/Manifest
+++ b/media-gfx/openscad/Manifest
@@ -1,9 +1,11 @@
 AUX 50openscad-gentoo.el 167 BLAKE2B 36292439057e2b9a5993c73cf5d46e5b6b0b56695f46307114fcfffa79990be0b0622ec3a6918726d4a5f7e4343525b9e67f785996ec4eb7abb938b6df1cb2f7 SHA512 ce669eba45ab90e9dbcd770a7470ca9ed7088b1acabbc876fe4d31dc7a6edd36076063e4bd417d348c3e073113e3ad2bc2dd0ac89e02d3d8aeca7627ad7d2a1e
 AUX openscad-2019.05-0001-Fix-build-with-boost-1.73.patch 827 BLAKE2B 3450919d7c92e20fccbe61174dcfb56c96930e43a75baa1632bcb706c3c61d2c77bf290098337a6b6cfcdd7f97f47419c62d8153081b3d5951935be07ab34b1b SHA512 8cea77da618ba6a258357640fc1ab479cc3b10a42ce9b2d0f70dbafde959de68a889b6234143b6f43a3b15c8abc0765e658f5cc81cc22572f9a228f089c0eb23
 AUX openscad-2019.05-0002-Gentoo-specific-Disable-ccache-building.patch 820 BLAKE2B abfa2f4067dca1bdd2a1169cb3d9e1b4a804fa27bf8ec3a6a98106861713a3273f401a4e51c2fb8afab397b6326960609ae2700d0755b3b819ede749bc202b5e SHA512 87031a2f1b132434b349ead74e1e6d247f51ed48b0f2f8970dc99d9c47a441022ea169728302f680142325888433f07f4888a52727b31fda8e26e28d8b5d2100
+AUX openscad-2019.05-0003-change-C-standard-to-c-14.patch 1961 BLAKE2B faa9a935b50b5ae05d79658c236e7662626624cb752637e3643105a8558ff0135435543c2fe0080aaecc702240f7c48ae516b17d7ce20dfda0f98923eb30e8b6 SHA512 aa64ed7eca1c49ffd7e6d0a67206033ea360e6fb3d8ef31a02617393624f6f0eb6021ab5d3b8f6ce147559e49575f99745d7ed6e566c0eb3376af00bc188f5d8
 AUX openscad-2019.05_fix-boost-1.72.0-build.patch 689 BLAKE2B b8aea0ab3793b3f3202f7d4154c1aaca235de2450321958819531dd9dd70c1e375c28c9004a9fb348d5116815e99e4190efd2443057991b2e97873c80f52cc80 SHA512 20bc2baf50f23e6b5ccce0d8c22eb3a5004198a0c97c8c955b15a681a64102537be35a12a37692418159de6664a36689a4c3b65b3a520d51ab086aa091a1e48c
 AUX openscad-9999-0002-Gentoo-specific-Disable-ccache-building.patch 822 BLAKE2B ae4c7dc441e5a7391ecd2e704c644877fa7d73f8900fbe6082e070a3d9ecce74f368ead39be3f0321fb47095becf60057fafdee2a5e961106402dffff73687be SHA512 7bae2af4c627cc2f465e75890284bcca8e738dcbe5accf0511fcca2ee845ce9ef5602b752d61ecab7afd92f3a45975287db4e42379ede7875123a8c0a721f2c3
 DIST openscad-2019.05.tar.gz 14604881 BLAKE2B ed7d6088606fab44284363da73643e556f07c0f0a7a223bdf718dcc36a82158bf23e315724ea520d63a3f1331207df0ea7b0ade817f01dd39b67ca6f36529d56 SHA512 073053f625ffa4fea6ed836396b7ff4b87b26cf7500b06c804983afc0f1dfd3d78bfb81b3fd217c3939b0ec915d85b0c7990773eaf968512a150deaa0399df13
 EBUILD openscad-2019.05-r3.ebuild 2069 BLAKE2B 04ea91d2e612adf7ed8b4d94c30c769713a99893da2120eb8675081c862a2804c0aabf21da51dfa78a10240d01b71144c1586d7859b69f4a639e22a5e090138c SHA512 0663545e9fb542b534bd7fcc98ca8e131de799a8f8ceac29a8aad31e5a1283fff22efa1a5a4677f991b8319ff824643e088e124d5b07d0fe7105f649e45e04d3
+EBUILD openscad-2019.05-r4.ebuild 2369 BLAKE2B 95903f34bfe2c81a4449cd1e63b1a4bc3b3abcb806bda09ee237ec56cd784f10e669f863f2672e0c45531d31d59ccb8e36d5bbd7b18f8df445a4ba9345b15dcd SHA512 ba74ea5aadf631a650756f30fca4781dec31b459799f3fcf0637156df3e31d292c4532fc3630c31316a2df4a70dfb8b1ce869c1b02018075001b4e5b961892db
 EBUILD openscad-9999.ebuild 1900 BLAKE2B b7da0c8a17bcc88faa4c9367b4a664a8f58aafe8177d984001fd23ab0ea39f00f40349963691d4aa667d994761c7f60ee7bf0104c023ab43d85e51bde4349b4d SHA512 6378969e22ca27c2ef80928559b2f122e4b86df35a3858ae70537782b1f9209951fa34c55bd791f10cc23a9f0572a6305ba854f3270e4ea11eb045058e9c5b77
 MISC metadata.xml 1123 BLAKE2B d182b2b81115ec212b553802174d5305dd37af439aaafb25dd05368b1431b960cb4e35e65bec0519438e9c1ed767124fc686e293d07e5d44807bbf4ca8d74ea2 SHA512 10fda921c2d18d8e3a12d986cd2de9eebf47d9d2f843381b4ea2874d2483a42b84c6aa6c216ceb4c1ecf4183bbc8d43d7202bafbfcddc15de1bcd6b0f297f29c
diff --git a/media-gfx/openscad/files/openscad-2019.05-0003-change-C-standard-to-c-14.patch b/media-gfx/openscad/files/openscad-2019.05-0003-change-C-standard-to-c-14.patch
new file mode 100644
index 000000000000..3863d5631b9a
--- /dev/null
+++ b/media-gfx/openscad/files/openscad-2019.05-0003-change-C-standard-to-c-14.patch
@@ -0,0 +1,76 @@
+From 02f9a4eca87d7713a8345b8513423d9d4a5127e0 Mon Sep 17 00:00:00 2001
+From: Bernd Waibel <waebbl@gmail.com>
+Date: Fri, 27 Nov 2020 18:49:09 +0100
+Subject: [PATCH] change C++ standard to c++14
+
+Signed-off-by: Bernd Waibel <waebbl@gmail.com>
+---
+ c++11.pri => c++std.pri | 21 ++++++++-------------
+ common.pri              |  2 +-
+ 2 files changed, 9 insertions(+), 14 deletions(-)
+ rename c++11.pri => c++std.pri (74%)
+
+diff --git a/c++11.pri b/c++std.pri
+similarity index 74%
+rename from c++11.pri
+rename to c++std.pri
+index 0a2c3b6..aac656d 100644
+--- a/c++11.pri
++++ b/c++std.pri
+@@ -4,16 +4,16 @@ macx {
+   dirs = $${BOOSTDIR} $${QMAKE_LIBDIR}
+   for(dir, dirs) {
+     system(otool -L $${dir}/libboost_thread*  | grep libc++ >& /dev/null ) {
+-      message("Using libc++11")
++      message("Using libc++")
+       CONFIG += libc++
+     }
+     else {
+       message("Using libstdc++")
+       CONFIG += libstdc++
+-      c++11 {
+-        # libc++ is a requirement for using C++11 
+-        warning("Disabling C++11 since libstdc++ dependencies were found")
+-        CONFIG -= c++11
++      c++std {
++        # libc++ is a requirement for using C++14 
++        warning("Disabling C++14 since libstdc++ dependencies were found")
++        CONFIG -= c++std
+       }
+     }
+   }
+@@ -25,9 +25,9 @@ macx {
+   }
+ }
+ 
+-c++11 {
+-  QMAKE_CXXFLAGS += -std=c++11
+-  message("Using C++11")
++c++std {
++  QMAKE_CXXFLAGS += -std=c++14
++  message("Using C++14")
+ 
+   *clang*: {
+       # 3rd party libraries will probably violate this for a long time
+@@ -41,8 +41,3 @@ c++11 {
+     QMAKE_OBJECTIVE_CFLAGS_WARN_ON += $$CXX11_SUPPRESS_WARNINGS
+   }
+ }
+-else {
+-  *clang* {
+-    QMAKE_CXXFLAGS_WARN_ON += -Wno-c++11-extensions
+-  }
+-}
+diff --git a/common.pri b/common.pri
+index 1110757..d1d5edc 100644
+--- a/common.pri
++++ b/common.pri
+@@ -30,4 +30,4 @@ include(win.pri)
+ include(flex.pri)
+ include(bison.pri)
+ include(opengl.pri)
+-include(c++11.pri)
++include(c++std.pri)
+-- 
+2.29.2
+
diff --git a/media-gfx/openscad/openscad-2019.05-r4.ebuild b/media-gfx/openscad/openscad-2019.05-r4.ebuild
new file mode 100644
index 000000000000..2ac3f77c9665
--- /dev/null
+++ b/media-gfx/openscad/openscad-2019.05-r4.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit elisp-common qmake-utils xdg
+
+SITEFILE="50${PN}-gentoo.el"
+
+DESCRIPTION="The Programmers Solid 3D CAD Modeller"
+HOMEPAGE="https://www.openscad.org/"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.src.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="ccache emacs"
+RESTRICT="test"
+
+PATCHES=(
+	"${FILESDIR}/${P}_fix-boost-1.72.0-build.patch"
+	"${FILESDIR}/${P}-0001-Fix-build-with-boost-1.73.patch"
+	"${FILESDIR}/${P}-0003-change-C-standard-to-c-14.patch"
+)
+
+RDEPEND="
+	dev-cpp/eigen:3
+	dev-libs/boost:=
+	dev-libs/double-conversion:=
+	dev-libs/glib:2
+	dev-libs/gmp:0=
+	dev-libs/hidapi
+	dev-libs/libspnav
+	dev-libs/libzip:=
+	dev-libs/mpfr:0=
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5[-gles2-only]
+	dev-qt/qtmultimedia:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtopengl:5
+	dev-qt/qtwidgets:5
+	media-gfx/opencsg
+	media-libs/fontconfig
+	media-libs/freetype
+	>=media-libs/glew-2.0.0:0=
+	media-libs/harfbuzz:=
+	media-libs/lib3mf
+	sci-mathematics/cgal:=
+	>=x11-libs/qscintilla-2.10.3:=
+	emacs? ( >=app-editors/emacs-23.1:* )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/itstool
+	sys-devel/bison
+	sys-devel/flex
+	sys-devel/gettext
+	virtual/pkgconfig
+	ccache? ( dev-util/ccache )
+"
+
+src_prepare() {
+	default
+
+	# fix path prefix
+	sed -i "s/\/usr\/local/\/usr/g" ${PN}.pro || die
+
+	# change c++ standard
+	sed -e 's/CONFIG += c++11/CONFIG += c++std/' -i openscad.pro || die
+
+	# disable ccache
+	if ! use ccache; then
+		eapply "${FILESDIR}/${P}-0002-Gentoo-specific-Disable-ccache-building.patch"
+	fi
+}
+
+src_configure() {
+	eqmake5 "${PN}.pro"
+}
+
+src_compile() {
+	default
+
+	if use emacs ; then
+		elisp-compile contrib/*.el
+	fi
+}
+
+src_install() {
+	emake install INSTALL_ROOT="${D}"
+
+	if use emacs; then
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+		elisp-install ${PN} contrib/*.el contrib/*.elc
+	fi
+
+	mv -i "${ED}"/usr/share/openscad/locale "${ED}"/usr/share || die "failed to move locales"
+	ln -sf ../locale "${ED}"/usr/share/openscad/locale || die
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
diff --git a/media-gfx/pstoedit/Manifest b/media-gfx/pstoedit/Manifest
index 4e44c8d9e427..e0e18767beda 100644
--- a/media-gfx/pstoedit/Manifest
+++ b/media-gfx/pstoedit/Manifest
@@ -4,5 +4,5 @@ AUX pstoedit-3.75-libdl.patch 432 BLAKE2B 19d6b192c7fa1497f40baff8c039139248be34
 DIST pstoedit-3.70.tar.gz 1013949 BLAKE2B ec459dc56851d942076adf4352ef974188b0b8273a6f9150c8767c1d63c3c9b6d993ea8c0b1a0b59663b31652eb7a4b8697e4c38c23d5aa0572d554120a5e900 SHA512 63668ea039fdf988ba007bafb8dc1f23f06d4eb430a92b97fb93c71b819f63e2708b99476ec9b096598db2ddd30d29a69101f078e7d4fdfec314677f50293cf9
 DIST pstoedit-3.75.tar.gz 1290057 BLAKE2B 607a265ea6f058e1ba432d55c4602452cd52a48302441ecee542a113d90b090ce888cc6fa5e3a8e3a2fdbf94dce9b1ab1f7f5ba58ab81f1f509eea9052a3cd82 SHA512 54b8cf7e78e52027d45e7550821476d9a9c4df4f63af83792b6a2909bc62236450ba6b619f95eede9f61a715f4937f1fbaf2ce4ae4b486daa0294c396a882a28
 EBUILD pstoedit-3.70-r1.ebuild 1297 BLAKE2B 125a79a689158f4a159b94af9e414361c2afd3895fe5ad916a1d50e8f2cf4a7e95828878cb345d6d89a96f5242bd2f3e33045d769cde9fb7df8b92778014fb6f SHA512 a22378c7c78ea1f46843a30d31a99e35579dd8ee7d53fd9512fd93d02c2f22dc84532649929692cf16df6164550aaaadc827c97b9e37653720ba26c30da47db5
-EBUILD pstoedit-3.75.ebuild 1300 BLAKE2B 0b768119f2ee332b2b0ca8aceb1c4607c7ee3a7583f7714812487164755f3d39eccea233abe4fa6d58a7d60478816c36ed269a726163959ae2a69671d687a95a SHA512 b888cd1b2bff870246cac853938c5534c00ea31d5aa9f448b9a74653c995b082bbe319ea300ed3f7e1a91fc4959ac728c650846d43bcb03c3b343fb05c552999
+EBUILD pstoedit-3.75.ebuild 1299 BLAKE2B 32a35eb42f1c53ac8cb773f8ccfae30b64ef3f66b9474c17f6b2d9035e88097adc08a11e8ca07ecfce2ee090dc9731ddcf3bfcc65a2b72c3e98147073c448087 SHA512 124f74bdc4923a40d628a8088b4618397ede09880392bed184dcb1a24803d2f0d43c9a07121ba2bb1369d8fc719edf005f0edcf21e54edf8dcd859c16a27998b
 MISC metadata.xml 633 BLAKE2B 3a142022d38aaf0e5bd5d6df58b8a6e2f94589992eba8a48d875138af60bb44d8893ed91a7dcb169246ff2d2405940c406d5d37f84bfc9c621b8771b96678f05 SHA512 6d62633c23d2b45c5bdf75e8e09e3f58def09a2512e540699857809ea79ddc41c823cc382a9a412b6dc061e02c3b5574c8addc7bebd6e7bb10caa2c2408162a6
diff --git a/media-gfx/pstoedit/pstoedit-3.75.ebuild b/media-gfx/pstoedit/pstoedit-3.75.ebuild
index da2b4e71c73b..cbabf444e239 100644
--- a/media-gfx/pstoedit/pstoedit-3.75.ebuild
+++ b/media-gfx/pstoedit/pstoedit-3.75.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="emf imagemagick plotutils pptx"
 
 BDEPEND="
diff --git a/media-gfx/qrencode/Manifest b/media-gfx/qrencode/Manifest
index b7eb1f61aa02..4429c64c69a5 100644
--- a/media-gfx/qrencode/Manifest
+++ b/media-gfx/qrencode/Manifest
@@ -1,3 +1,3 @@
 DIST qrencode-4.1.1.tar.bz2 461562 BLAKE2B ae3abb4a162518c0204d09c9df7434fb348e24c20e790a261841220b0a7165168137d5acbdbc53e40558724eac2e1e21786f11013f384b545d56a1c9caaff61d SHA512 981b3242c213e1b40ac88711912dd8c27ea11f3437d1a04b6b226499a6e991a8f0b3b10f818bcc104812192a1dac4ce05f16ecd847a50cb03d4859b84bad89b8
-EBUILD qrencode-4.1.1.ebuild 791 BLAKE2B 46e8735214b66eda2cef2f9c44d21dfcd4fd61038d784a0ba3c2122d3a79965178252923c2552f5eac98f75420548b80399125e6f7562da4f59818cd1b162f1e SHA512 a64177f469b74fa426c1759db00cd575f67b35140df80a3f82f6bf71df7a554b7cd2a299fbb800b53ed647f3bb57e083924bc0214c2be1c31f25571514c0ed71
+EBUILD qrencode-4.1.1.ebuild 798 BLAKE2B 4e4401e03853b7dc705541352950a11f26b4c6d0bf1782c1fe6cef1f30a8cbfa92f6bd11f9cce1e50924e4b7b002f265d72af45d319b8ecffe8e1aab04c89e14 SHA512 9a48a486f86db49f998940767a1af249606c211079fcb7bbf1aec4f86631acb00004b866002a525b8b5ba18f7501e884a69daea55c1ac24546b1d936b405dda2
 MISC metadata.xml 370 BLAKE2B af379243b15cc55c2e2c14bd20ec8b9bb41d4fbb6a87938aae5cbc39e17c78ac45b322d946eadec59fc48c13354fd9dfdffea8c2572301d8d4cb86f162d49bdc SHA512 f5987a8aab3b861bbe4961c69d0c72b07826c43320fd383075036ad63a070204c6ed41297b2490b4a14224f5c4269c37c40e5abc9bce4d1c5857e68e98d6428c
diff --git a/media-gfx/qrencode/qrencode-4.1.1.ebuild b/media-gfx/qrencode/qrencode-4.1.1.ebuild
index 4819e67172dd..0ab8038558c1 100644
--- a/media-gfx/qrencode/qrencode-4.1.1.ebuild
+++ b/media-gfx/qrencode/qrencode-4.1.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://fukuchi.org/works/${PN}/${P}.tar.bz2"
 
 LICENSE="LGPL-2"
 SLOT="0/4"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/media-gfx/simple-scan/Manifest b/media-gfx/simple-scan/Manifest
index 462f191f0d62..7e680490bdf5 100644
--- a/media-gfx/simple-scan/Manifest
+++ b/media-gfx/simple-scan/Manifest
@@ -1,4 +1,4 @@
 AUX 3.26-add-control-optional-deps.patch 2773 BLAKE2B e6c3faa98ecda13c926752defef389fd155f615df2010d8499aba7870b929f520662f5c718f457edd5f14f68c26d63ab58a5ee1a583af9f5721d4cf4141385a8 SHA512 e786172609ca64afa85663077794cb146edf7f59bd6187bc253d2ab682f5cf244f5238df18648641f7450ce6add97f2db1adfa11b52a3ba5e29c16356e9fac08
 DIST simple-scan-3.36.4.tar.xz 914688 BLAKE2B ae972cf6b5085d0e79fdfa9250aed655051b97239988b410e175b3058dda3ed5dc19b6574c015dd9a7afcbefd4d05cce6120b3648c061ff1e52043f866769a62 SHA512 780eeabd9593f14b2b04b9474bb1faebe3a32a7fd7e6b067c144fe44ad9b880f307bf80a8a925fb2549ca0b8172357c9a393146dfabd4b68bfc4396c32de4fa8
-EBUILD simple-scan-3.36.4.ebuild 1327 BLAKE2B 9fc4b9c2f9d3536f3bd43c6902576f8241555a98ce6a0789572ec3169f783053e5a30462021221a324547ff5e8e19d51fd0bfe63c31875173b5e612fb3c7d192 SHA512 99364ee3c39e21e47bdb790780f48c74b2132a9f2c658f7a6dd87a2c634981372c0499e72b4f6aee28b90d3ffe2901b3381e8252d6d86413ddeb3079be9b0ee7
+EBUILD simple-scan-3.36.4.ebuild 1325 BLAKE2B d7a8eb204425d66cd2fb1aaad25a91a8d8c2ae153066f1a828bdd416c37d204f747119cb252e7f778d05be51fef3ea290e737bfcbc1f7c78e994ac9b933890d9 SHA512 6d211475e250bcaa86eb452669062a5727cfcc6285927b6ba61cba7c68e07a0c9d1dd826c5b2b9b43cc7861e21af090750641aaf53a8f97b4298fbad19a00e62
 MISC metadata.xml 616 BLAKE2B 576d986402f8cc708eae60f661640808751747c764d5fe729dd014f33758e0b484a2b80a214d9a3d1ed4bce7e455e34803a62048240e5de8e203184446cdc0df SHA512 6377cb9c20b1ce2db22ba959d386e4389939b72503d87da956d659144b8a6f8b521abdd19dd4c82ac0cb32e260ce6633b75136a353f63b86593f5e1f12394d47
diff --git a/media-gfx/simple-scan/simple-scan-3.36.4.ebuild b/media-gfx/simple-scan/simple-scan-3.36.4.ebuild
index a519c8b9e1ba..ef472faa37e6 100644
--- a/media-gfx/simple-scan/simple-scan-3.36.4.ebuild
+++ b/media-gfx/simple-scan/simple-scan-3.36.4.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/simple-scan"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm ppc ppc64 x86"
 IUSE="colord webp"
 
 DEPEND="
diff --git a/media-gfx/slic3r/Manifest b/media-gfx/slic3r/Manifest
index 9f33509616c0..2894b9bb6862 100644
--- a/media-gfx/slic3r/Manifest
+++ b/media-gfx/slic3r/Manifest
@@ -1,12 +1,11 @@
-AUX slic3r-1.1.7-adjust_var_path.patch 274 BLAKE2B 7f360a202f1bcbeb42619ed7293a5997ebc47ab754fc2fed0c88bbf514bf32b6c72f7c64e9c86efef90d8aec93a72662da599af910c14f6186e0f3cc5b1e9482 SHA512 c13cf1a6f37aa13a9b85093e75de0d2368b4ca4623b28be17e7cfef5740b2b4f4cee69492c099bf936e4ee553e37389b8ffa9ea0df804a80a1cb6295cd198653
-AUX slic3r-1.3.0-boost.patch 338 BLAKE2B 8ae2f8fa44f932f3b43254c027039930a22209a31ac60fe572c0e3b883b5caf3f5b99e76acc0dd64f0b121eb31318d865bb19da1c918855910b36ac8ddb3a289 SHA512 3068908d72c3ddf54b063ac61edd01acec031462b36e25af2a69a635d286477d17f4937fc407fb1c69f6d3d2c2511c83cd40992bd3255c085deeeaa4a55b3213
+AUX slic3r-1.3.0-boost-1.73.patch 3740 BLAKE2B d4327b262928a13ea05cc9edd3db647f35f4216e801a557cdebc76638fd3c7c3c6d20a91e5081a629b3c2e18ea8bf9bdba08db05a64fa05e3153ebd7ccea92b5 SHA512 ea45b30181a91576b9a4b23d45dd0bf39c3c18d80579b28d8dcf54af29daa9d8fef7ec59cfed30f2278da070c965943740255508cf1bbd910a1b3ac7b08b0461
 AUX slic3r-1.3.0-no-locallib.patch 15462 BLAKE2B 0fd73fbf341573392ebdab3c4d010e1a11cbf424ded6b5b6fab18c05ffde049a8816c2884a06acdbacf0f41ed30b4d136a849eb6bf92e5fb72591e6e0081592d SHA512 cdf791f721ab3a2356631ee9c74c796c48626c8313dd31dab59e880ab181734e892fa341bbb1a648d35303f4fb4a8e3c4615d360c317438876f67de1ef9f9187
-AUX slic3r-9999-boost-173.patch 1152 BLAKE2B 5f37ed2bff40f4f7da867ffb547e7f34f03864b313c8b085d13a8fd9bac9c3ef672e9dc730ac810ccbd5f2032e87f79a5d6d4afe0486c9feaa2fa6f57ed01c5b SHA512 f8045ca3f32a74fb2f657552ea4f85aa5e75bde84ac2db2e05810d8df934e5ce902bc45adfcc02b4ca33c759e0b7e2f6b25db941563a7d3c46ea9ca97240689d
-AUX slic3r-9999-no-locallib.patch 15462 BLAKE2B 0fd73fbf341573392ebdab3c4d010e1a11cbf424ded6b5b6fab18c05ffde049a8816c2884a06acdbacf0f41ed30b4d136a849eb6bf92e5fb72591e6e0081592d SHA512 cdf791f721ab3a2356631ee9c74c796c48626c8313dd31dab59e880ab181734e892fa341bbb1a648d35303f4fb4a8e3c4615d360c317438876f67de1ef9f9187
-DIST slic3r-1.1.7.tar.gz 2079200 BLAKE2B b3aa45741bb92a75dd09be783cb9a8cd551c7736f04022905d11587d8b2a533db85c1f88a9d0185b2b6414ba56d44e0feb104bcfcaf52a0a35a1db912c6976db SHA512 0c3a12890f57f422084b20152ede3467a8624db4ba8be774258df0af963c1f6f41fda7d96967f6355bd95727539e6aad51c30cf45284a7ee3fff294839acc650
+AUX slic3r-1.3.0-use-system-clipper.patch 1047 BLAKE2B ee3948e20db610d67c4132732037a1769a620a975b58cf54d02f9a3aae2b7d09a5d9bd5d9ae4ee24d0150b6dec7d13183838116877591adcc08436a2793e186c SHA512 b6a6ed07d57ef6b0f71c2f267543018cd3460fa03fc8ed8f5a9b8cdcd782edd191f35c73ed1829d4bb32da9460d076574f49af0b2e1cd19bc195c0ac3c0fdd25
+AUX slic3r-1.3.0-wayland.patch 224 BLAKE2B 71395194aed291387897eae5e5af8d58bee0e4af45075588fc456b733710716e5dc743ea2e734c816e32b2593f395dc7c7a23c92c75e466e54f49e1fbb4a6d9e SHA512 17f662af318c23dab656c8ae320ef9823bfc6cf71f9b33bdfebeaf9c53fec299062bf76b89b7422628072cc055b4790083491300a5d205f06cd1e6625654463e
+AUX slic3r-1.3.1_pre20200824-boost-1.73.patch 3928 BLAKE2B 24c2e497a7dd80fa4212e21652abd85b439917a1d4c84866591be2c2fb4d6acc999468edc4a50ed065b64611ffe3b3f11415f383e2298904986d585b0acd0f67 SHA512 9100c93537a8a40ccd17fc8486797b02e426d853d443ec40b85feaf92bba38d26c97bd4b3aa66609ab3cb8116d7ce94588302761e337153e2f37006770698875
 DIST slic3r-1.3.0.tar.gz 2104094 BLAKE2B 74c58690cf196f89ecff5eec853215c87c648df5a504725fea9f14b0343bca105190de1d63e2e8e76d47fcaf8dbe7b6d26f61b304ce7336412effa1c9a3fba41 SHA512 ff0f7747e166826ff1c53220974ee9d3a217d0e19964dbe4a5fa3e81f262a6810a47632686b7f1b3128384ae05c6f98d8aab980524079bdf9811445fe23a0f0d
-EBUILD slic3r-1.1.7.ebuild 2934 BLAKE2B 12740144adbadb8ef668003b7c1391b5e124208d02a5f9fe89d17a95e2ced01c04421f985b2aca1e3ddb4df34e7fdedc71af3d0e8dcbc76d85805fcc7c030b2a SHA512 b6b2c92e011e473cdd4934ae43e0ab32556fee66008bab3a397a2ac2f9b78d747eca30a4b794d3955d04f040e260fb5857ebbd6ab08250f611eb76f3faa1c623
-EBUILD slic3r-1.3.0-r1.ebuild 2885 BLAKE2B ef50ccee25ce363aea8b5a678e9e0d3e49182739c71311dcc1417420ab028663e1f74011b8b710e900710eda870c632f783cbe3428a5f6c786256b41e421b60a SHA512 5cf3b715822f7217b38d2fb8ceef29de8684742b16b27f7ac50aeaf3d7df326373e9ff1f9112b816e5c7728a06ebd49292b4376f948671940e6b1577078fe177
-EBUILD slic3r-1.3.0-r2.ebuild 2896 BLAKE2B b02342bf78e7a0a90af62a5dc5d0c430763e04d7ea6bd474404ae60380e75edecc9f86e6bd26433081461a9903d7c01487b9eca1938e4c7bf08a4a100746323f SHA512 9f40f4d2e8e454bb9f3419e96b05ed8ee0363f3e61ecea3828deb2bcd24debb7d856ecd7693fe8053c7a126c2be46b054b5effdd3bab034c3e9af7c56aed239f
-EBUILD slic3r-9999.ebuild 2700 BLAKE2B 3977555fb2da32181d4ef307e7666ed1ff33d1384644e724cec22e7e7f185b6f2bb5faa8d8f020a217a3fcab1ffe61a6332302ec3db258a623cb3d7b9a6787bc SHA512 af562137cbb1306cfaae9b7cb017d2fb44c17147c9101fee74c1f9e96eee22aa6558567b42777cf8711ce182f0587e1049f5231100fbfff53f99fea8f40f0fca
+DIST slic3r-1.3.1_pre20200824.tar.gz 2432288 BLAKE2B 37e767b6cb12909ea3a6411532103ea30500903cf3d6a221c2fa3d3109fb733db5d0cb0e9d0eec5033dad9acec2f89258242cdab316ea26392a8386097d9dd38 SHA512 fd7198f7c4a60911b2009f617d37485bf73964a626a53d02bd13baae963d28e74dc2f8314888e7c0fcacb389e0b481f3357c6ea595ac8f92d99f7a228c5cc2b7
+EBUILD slic3r-1.3.0-r3.ebuild 2748 BLAKE2B 823f3341684d705f34faa66ee361c91f0ca1b8916ca9773e5dd6817d06d5b0a4b048abd60f747670531969ca63a673ff228156f6e05f1a1b2c9d85d7e21fb7d3 SHA512 6937adaab0083e646c74fbf4b1c0a7daab521c37c160d5220ef6fb7cdaff44815388a7e449460bd56ab05b80c3714cb0f69e7452fe2ee1460344f4b58f69ecc5
+EBUILD slic3r-1.3.1_pre20200824.ebuild 2751 BLAKE2B 05edb3259beed74f87a666e4d06394e1a86a8fedb80d715e5b3b1e155541304bdbca067b45bba5629b40654ea8946c49c97776f96797f61d9fc7bb7a3733a036 SHA512 1e1b28d2fb58101122b08999c6d5ad76f3739b7efd9e492281bc223a714367e9314d3edd3359f05ee076df2ee0edc64a1759477bcbe48a2aad9e95bca366cf45
+EBUILD slic3r-9999.ebuild 2758 BLAKE2B 2c49616aff2a3964f43d00f74aa014adfb364ee100b4f1dc6c7f86fe4469fa80e9f7eb311f4d9f27fe66a3de84d13c95a966acd7e29e7833a7a72882831f0a41 SHA512 0a77983538340eebcc19d9c3054104a8b4cfae18ac6f3eebe478b9ae99297b8ca5207b16699048b861f0f812892877850224f7b55f343c79ad683040cfd33920
 MISC metadata.xml 797 BLAKE2B bc34024c8f935d21985d572971a3c28b809dd54e8af65092c98f0f18e9229f9e945732bd36e9620c542260d692e3259aebc38de68c9baca8ba9fa67c3c312cc5 SHA512 13a72e511f2341c9cecc05eca767c348c595d77de4a41a154da93d6bcb31710f24bc51a23abefb08719718194ab3961d3f94697ed97319936e5d9ce625f82da5
diff --git a/media-gfx/slic3r/files/slic3r-1.1.7-adjust_var_path.patch b/media-gfx/slic3r/files/slic3r-1.1.7-adjust_var_path.patch
deleted file mode 100644
index ee4d75d0122a..000000000000
--- a/media-gfx/slic3r/files/slic3r-1.1.7-adjust_var_path.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/lib/Slic3r.pm	2016-03-31 13:27:59.431548980 +0200
-+++ b/lib/Slic3r.pm	2016-03-31 13:28:21.658675137 +0200
-@@ -29,7 +29,7 @@
-     if $^V >= v5.16;
- 
- use FindBin;
--our $var = "$FindBin::Bin/var";
-+our $var = "$FindBin::RealBin/var";
- 
- use Encode;
- use Encode::Locale;
diff --git a/media-gfx/slic3r/files/slic3r-1.3.0-boost-1.73.patch b/media-gfx/slic3r/files/slic3r-1.3.0-boost-1.73.patch
new file mode 100644
index 000000000000..6b710a18f3af
--- /dev/null
+++ b/media-gfx/slic3r/files/slic3r-1.3.0-boost-1.73.patch
@@ -0,0 +1,146 @@
+--- a/xs/src/boost/nowide/cstdlib.hpp
++++ b/xs/src/boost/nowide/cstdlib.hpp
+@@ -8,7 +8,7 @@
+ #ifndef BOOST_NOWIDE_CSTDLIB_HPP_INCLUDED
+ #define BOOST_NOWIDE_CSTDLIB_HPP_INCLUDED
+
+-#include <boost/nowide/cenv.hpp>
++#include <boost/nowide/cstdlib.hpp>
+ #include <boost/nowide/system.hpp>
+
+ #endif
+--- a/xs/src/admesh/stl.h
++++ b/xs/src/admesh/stl.h
+@@ -26,11 +26,6 @@
+ #include <stdio.h>
+ #include <stdint.h>
+ #include <stddef.h>
+-#include <boost/detail/endian.hpp>
+-
+-#ifndef BOOST_LITTLE_ENDIAN
+-#error "admesh works correctly on little endian machines only!"
+-#endif
+
+ #if defined(_WIN32) || defined(__WIN32__) || defined(WIN32)
+     #include "windows.h"
+
+--- a/xs/src/libslic3r/PrintObject.cpp
++++ b/xs/src/libslic3r/PrintObject.cpp
+@@ -2,11 +2,14 @@
+ #include "BoundingBox.hpp"
+ #include "ClipperUtils.hpp"
+ #include "Geometry.hpp"
++#include <boost/bind/bind.hpp>
+ #include <algorithm>
+ #include <vector>
+
+ namespace Slic3r {
+
++using boost::placeholders::_1;
++
+ PrintObject::PrintObject(Print* print, ModelObject* model_object, const BoundingBoxf3 &modobj_bbox)
+ :   layer_height_spline(model_object->layer_height_spline),
+     typed_slices(false),
+--- a/xs/src/libslic3r/GCodeSender.hpp
++++ b/xs/src/libslic3r/GCodeSender.hpp
+@@ -7,13 +7,17 @@
+ #include <string>
+ #include <vector>
+ #include <boost/asio.hpp>
+-#include <boost/bind.hpp>
++#include <boost/bind/bind.hpp>
++#include <boost/core/noncopyable.hpp>
+ #include <boost/thread.hpp>
+
+ namespace Slic3r {
+
+ namespace asio = boost::asio;
+
++using boost::placeholders::_1;
++using boost::placeholders::_2;
++
+ class GCodeSender : private boost::noncopyable {
+     public:
+     GCodeSender();
+--- a/xs/src/libslic3r/TriangleMesh.cpp
++++ b/xs/src/libslic3r/TriangleMesh.cpp
+@@ -14,6 +14,7 @@
+ #include <stdexcept>
+ #include <boost/config.hpp>
+ #include <boost/nowide/convert.hpp>
++#include <boost/bind/bind.hpp>
+
+ #ifdef SLIC3R_DEBUG
+ #include "SVG.hpp"
+@@ -21,6 +22,8 @@
+
+ namespace Slic3r {
+
++using boost::placeholders::_1;
++
+ TriangleMesh::TriangleMesh()
+     : repaired(false)
+ {
+--- a/xs/src/libslic3r/Config.cpp
++++ b/xs/src/libslic3r/Config.cpp
+@@ -14,6 +14,7 @@
+ #include <boost/foreach.hpp>
+ #include <boost/lexical_cast.hpp>
+ #include <boost/nowide/cenv.hpp>
++#include <boost/nowide/cstdlib.hpp>
+ #include <boost/nowide/fstream.hpp>
+ #include <boost/property_tree/ini_parser.hpp>
+ #include <boost/property_tree/ptree.hpp>
+--- a/xs/src/libslic3r/SLAPrint.cpp
++++ b/xs/src/libslic3r/SLAPrint.cpp
+@@ -7,9 +7,12 @@
+ #include <iostream>
+ #include <complex>
+ #include <cstdio>
++#include <boost/bind/bind.hpp>
+
+ namespace Slic3r {
+
++using boost::placeholders::_1;
++
+ void
+ SLAPrint::slice()
+ {
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -22,7 +22,7 @@
+ set(Boost_USE_STATIC_LIBS ON)
+ set(Boost_USE_STATIC_RUNTIME ON)
+ set(CMAKE_FIND_LIBRARY_SUFFIXES ".a")
+-find_package(Boost COMPONENTS system thread filesystem)
++find_package(Boost MODULE REQUIRED)
+
+ set(LIBDIR ${CMAKE_CURRENT_SOURCE_DIR}/../xs/src/)
+
+--- a/xs/src/libslic3r/GCodeTimeEstimator.cpp
++++ b/xs/src/libslic3r/GCodeTimeEstimator.cpp
+@@ -1,9 +1,12 @@
+ #include "GCodeTimeEstimator.hpp"
+-#include <boost/bind.hpp>
++#include <boost/bind/bind.hpp>
+ #include <cmath>
+
+ namespace Slic3r {
+
++using boost::placeholders::_1;
++using boost::placeholders::_2;
++
+ void
+ GCodeTimeEstimator::parse(const std::string &gcode)
+ {
+--- a/xs/Build.PL
++++ b/xs/Build.PL
+@@ -142,7 +142,7 @@
+ }
+ # In order to generate the -l switches we need to know how Boost libraries are named
+ my $have_boost = 0;
+-my @boost_libraries = qw(system thread filesystem);  # we need these
++my @boost_libraries = qw(system thread filesystem nowide);  # we need these
+ # check without explicit lib path (works on Linux)
+ if (! $mswin) {
+     $have_boost = 1
diff --git a/media-gfx/slic3r/files/slic3r-1.3.0-boost.patch b/media-gfx/slic3r/files/slic3r-1.3.0-boost.patch
deleted file mode 100644
index e77e50b3c998..000000000000
--- a/media-gfx/slic3r/files/slic3r-1.3.0-boost.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- Slic3r-1.3.0/xs/src/libslic3r/GCodeSender.hpp.old	2019-11-04 19:31:05.714869400 -0800
-+++ Slic3r-1.3.0/xs/src/libslic3r/GCodeSender.hpp	2019-11-04 19:34:10.656330929 -0800
-@@ -9,6 +9,7 @@
- #include <boost/asio.hpp>
- #include <boost/bind.hpp>
- #include <boost/thread.hpp>
-+#include <boost/core/noncopyable.hpp>
- 
- namespace Slic3r {
- 
diff --git a/media-gfx/slic3r/files/slic3r-1.3.0-use-system-clipper.patch b/media-gfx/slic3r/files/slic3r-1.3.0-use-system-clipper.patch
new file mode 100644
index 000000000000..9f9a5ef2fbd0
--- /dev/null
+++ b/media-gfx/slic3r/files/slic3r-1.3.0-use-system-clipper.patch
@@ -0,0 +1,44 @@
+--- a/xs/src/libslic3r/ClipperUtils.hpp
++++ b/xs/src/libslic3r/ClipperUtils.hpp
+@@ -2,7 +2,7 @@
+ #define slic3r_ClipperUtils_hpp_
+ 
+ #include <libslic3r.h>
+-#include "clipper.hpp"
++#include <polyclipping/clipper.hpp>
+ #include "ExPolygon.hpp"
+ #include "Polygon.hpp"
+ #include "Surface.hpp"
+--- a/xs/src/libslic3r/Geometry.cpp
++++ b/xs/src/libslic3r/Geometry.cpp
+@@ -3,7 +3,7 @@
+ #include "ExPolygon.hpp"
+ #include "Line.hpp"
+ #include "PolylineCollection.hpp"
+-#include "clipper.hpp"
++#include <polyclipping/clipper.hpp>
+ #include <algorithm>
+ #include <cassert>
+ #include <cmath>
+--- a/xs/src/libslic3r/SVG.hpp
++++ b/xs/src/libslic3r/SVG.hpp
+@@ -2,7 +2,7 @@
+ #define slic3r_SVG_hpp_
+ 
+ #include "libslic3r.h"
+-#include "clipper.hpp"
++#include <polyclipping/clipper.hpp>
+ #include "ExPolygon.hpp"
+ #include "Line.hpp"
+ #include "TriangleMesh.hpp"
+--- a/xs/xsp/Clipper.xsp
++++ b/xs/xsp/Clipper.xsp
+@@ -2,7 +2,7 @@
+ 
+ %{
+ #include <xsinit.h>
+-#include "clipper.hpp"
++#include <polyclipping/clipper.hpp>
+ #include "libslic3r/ClipperUtils.hpp"
+ %}
+ 
diff --git a/media-gfx/slic3r/files/slic3r-1.3.0-wayland.patch b/media-gfx/slic3r/files/slic3r-1.3.0-wayland.patch
new file mode 100644
index 000000000000..d2dea0208d86
--- /dev/null
+++ b/media-gfx/slic3r/files/slic3r-1.3.0-wayland.patch
@@ -0,0 +1,10 @@
+--- a/slic3r.pl
++++ b/slic3r.pl
+@@ -20,6 +20,7 @@ use Time::HiRes qw(gettimeofday tv_interval);
+ $|++;
+ binmode STDOUT, ':utf8';
+ binmode STDERR, ':utf8';
++$ENV{GDK_BACKEND} = 'x11';
+ 
+ our %opt = ();
+ my %cli_options = ();
diff --git a/media-gfx/slic3r/files/slic3r-1.3.1_pre20200824-boost-1.73.patch b/media-gfx/slic3r/files/slic3r-1.3.1_pre20200824-boost-1.73.patch
new file mode 100644
index 000000000000..d2aafecdb1e9
--- /dev/null
+++ b/media-gfx/slic3r/files/slic3r-1.3.1_pre20200824-boost-1.73.patch
@@ -0,0 +1,133 @@
+--- a/xs/src/libslic3r/TriangleMesh.cpp	(revision 92abbc42dfdd5385c1f9c3a450e2f3da835f8b8d)
++++ b/xs/src/libslic3r/TriangleMesh.cpp	(date 1607117258000)
+@@ -22,6 +22,8 @@
+
+ namespace Slic3r {
+
++using boost::placeholders::_1;
++
+ TriangleMesh::TriangleMesh()
+     : repaired(false)
+ {
+
+--- a/src/CMakeLists.txt	(revision 92abbc42dfdd5385c1f9c3a450e2f3da835f8b8d)
++++ b/src/CMakeLists.txt	(date 1607117046000)
+@@ -115,7 +115,7 @@
+ find_package(Threads REQUIRED)
+
+ set(Boost_NO_BOOST_CMAKE ON)
+-find_package(Boost REQUIRED COMPONENTS system thread filesystem)
++find_package(Boost REQUIRED COMPONENTS system thread filesystem nowide)
+
+ set(LIBDIR ${CMAKE_CURRENT_SOURCE_DIR}/../xs/src/)
+ set(GUI_LIBDIR ${CMAKE_CURRENT_SOURCE_DIR}/GUI/)
+
+--- a/xs/src/libslic3r/PrintObject.cpp	(revision 92abbc42dfdd5385c1f9c3a450e2f3da835f8b8d)
++++ b/xs/src/libslic3r/PrintObject.cpp	(date 1607117227000)
+@@ -4,12 +4,15 @@
+ #include "Geometry.hpp"
+ #include "Log.hpp"
+ #include "TransformationMatrix.hpp"
++#include <boost/bind/bind.hpp>
+ #include <algorithm>
+ #include <vector>
+ #include <limits>
+
+ namespace Slic3r {
+
++using boost::placeholders::_1;
++
+ PrintObject::PrintObject(Print* print, ModelObject* model_object, const BoundingBoxf3 &modobj_bbox)
+ :   layer_height_spline(model_object->layer_height_spline),
+     typed_slices(false),
+
+--- a/xs/src/libslic3r/GCodeSender.hpp	(revision 92abbc42dfdd5385c1f9c3a450e2f3da835f8b8d)
++++ b/xs/src/libslic3r/GCodeSender.hpp	(date 1607117162000)
+@@ -7,7 +7,7 @@
+ #include <string>
+ #include <vector>
+ #include <boost/asio.hpp>
+-#include <boost/bind.hpp>
++#include <boost/bind/bind.hpp>
+ #include <boost/thread.hpp>
+ #include <boost/core/noncopyable.hpp>
+
+@@ -15,6 +15,9 @@
+
+ namespace asio = boost::asio;
+
++using boost::placeholders::_1;
++using boost::placeholders::_2;
++
+ class GCodeSender : private boost::noncopyable {
+     public:
+     GCodeSender();
+
+--- a/xs/src/libslic3r/SLAPrint.cpp	(revision 92abbc42dfdd5385c1f9c3a450e2f3da835f8b8d)
++++ b/xs/src/libslic3r/SLAPrint.cpp	(date 1607117248000)
+@@ -7,9 +7,12 @@
+ #include <iostream>
+ #include <complex>
+ #include <cstdio>
++#include <boost/bind/bind.hpp>
+
+ namespace Slic3r {
+
++using boost::placeholders::_1;
++
+ void
+ SLAPrint::slice()
+ {
+
+--- a/xs/src/libslic3r/ConfigBase.cpp	(revision 92abbc42dfdd5385c1f9c3a450e2f3da835f8b8d)
++++ b/xs/src/libslic3r/ConfigBase.cpp	(date 1607117107000)
+@@ -16,7 +16,7 @@
+ #include <boost/config.hpp>
+ #include <boost/foreach.hpp>
+ #include <boost/lexical_cast.hpp>
+-#include <boost/nowide/cenv.hpp>
++#include <boost/nowide/cstdlib.hpp>
+ #include <boost/nowide/fstream.hpp>
+ #include <boost/property_tree/ini_parser.hpp>
+ #include <boost/property_tree/ptree.hpp>
+
+--- a/xs/src/libslic3r/GCodeTimeEstimator.cpp	(revision 92abbc42dfdd5385c1f9c3a450e2f3da835f8b8d)
++++ b/xs/src/libslic3r/GCodeTimeEstimator.cpp	(date 1607117194000)
+@@ -1,9 +1,12 @@
+ #include "GCodeTimeEstimator.hpp"
+-#include <boost/bind.hpp>
++#include <boost/bind/bind.hpp>
+ #include <cmath>
+
+ namespace Slic3r {
+
++using boost::placeholders::_1;
++using boost::placeholders::_2;
++
+ void
+ GCodeTimeEstimator::parse(const std::string &gcode)
+ {
+
+--- a/xs/Build.PL	(revision 92abbc42dfdd5385c1f9c3a450e2f3da835f8b8d)
++++ b/xs/Build.PL	(date 1607117077000)
+@@ -151,7 +151,7 @@
+ }
+ # In order to generate the -l switches we need to know how Boost libraries are named
+ my $have_boost = 0;
+-my @boost_libraries = qw(system thread filesystem);  # we need these
++my @boost_libraries = qw(system thread filesystem nowide);  # we need these
+ # check without explicit lib path (works on Linux)
+ if (! $mswin) {
+     $have_boost = 1
+
+--- a/xs/src/libslic3r/SupportMaterial.cpp	(revision 92abbc42dfdd5385c1f9c3a450e2f3da835f8b8d)
++++ b/xs/src/libslic3r/SupportMaterial.cpp	(date 1607118181000)
+@@ -4,6 +4,8 @@
+ namespace Slic3r
+ {
+
++using boost::placeholders::_1;
++
+ PolylineCollection _fill_surface(Fill *fill, Surface *surface)
+ {
+     PolylineCollection ps;
diff --git a/media-gfx/slic3r/files/slic3r-9999-boost-173.patch b/media-gfx/slic3r/files/slic3r-9999-boost-173.patch
deleted file mode 100644
index ef7289afcd8c..000000000000
--- a/media-gfx/slic3r/files/slic3r-9999-boost-173.patch
+++ /dev/null
@@ -1,39 +0,0 @@
---- a/xs/src/libslic3r/SLAPrint.cpp	2020-05-10 23:32:00.044962439 -0600
-+++ b/xs/src/libslic3r/SLAPrint.cpp	2020-05-10 23:40:48.867348908 -0600
-@@ -7,6 +7,7 @@
- #include <iostream>
- #include <complex>
- #include <cstdio>
-+#include "boost/bind.hpp"
- 
- namespace Slic3r {
- 
---- a/xs/src/libslic3r/PrintObject.cpp	2020-05-10 23:32:00.044962439 -0600
-+++ b/xs/src/libslic3r/PrintObject.cpp	2020-05-10 23:46:22.614152088 -0600
-@@ -7,6 +7,7 @@
- #include <algorithm>
- #include <vector>
- #include <limits>
-+#include "boost/bind.hpp"
- 
- namespace Slic3r {
- 
---- a/xs/src/libslic3r/SupportMaterial.cpp	2020-05-10 23:32:00.044962439 -0600
-+++ b/xs/src/libslic3r/SupportMaterial.cpp	2020-05-10 23:54:17.078033850 -0600
-@@ -1,5 +1,6 @@
- #include "SupportMaterial.hpp"
- #include "Log.hpp"
-+#include "boost/bind.hpp"
- 
- namespace Slic3r
- {
---- a/xs/src/libslic3r/TriangleMesh.cpp	2020-05-10 23:32:00.045962432 -0600
-+++ b/xs/src/libslic3r/TriangleMesh.cpp	2020-05-10 23:35:44.778426800 -0600
-@@ -15,6 +15,7 @@
- #include <stdexcept>
- #include <boost/config.hpp>
- #include <boost/nowide/convert.hpp>
-+#include "boost/bind.hpp"
- 
- #ifdef SLIC3R_DEBUG
- #include "SVG.hpp"
diff --git a/media-gfx/slic3r/files/slic3r-9999-no-locallib.patch b/media-gfx/slic3r/files/slic3r-9999-no-locallib.patch
deleted file mode 100644
index 8cb7fd6d16dc..000000000000
--- a/media-gfx/slic3r/files/slic3r-9999-no-locallib.patch
+++ /dev/null
@@ -1,609 +0,0 @@
-commit 6f7e42a4707788d079d865800d9fdb65ed7d5f1f
-Author: Ian Stakenvicius <axs@gentoo.org>
-Date:   Wed Sep 27 12:22:14 2017 -0400
-
-    Revert "Use --local-lib when calling cpanm"
-    
-    This reverts commit e5412b5d69dc4d5415c92a7daaa47fb4860ca4ea and others
-    that add local::lib dependency
-
-diff --git a/Build.PL b/Build.PL
-index 2dd18435..18befbf8 100644
---- a/Build.PL
-+++ b/Build.PL
-@@ -109,16 +109,7 @@ EOF
-         if !$cpanm;
-     my @cpanm_args = ();
-     push @cpanm_args, "--sudo" if $sudo;
--    
--    # install local::lib without --local-lib otherwise it's not usable afterwards
--    if (!eval "use local::lib qw(local-lib); 1") {
--        my $res = system $cpanm, @cpanm_args, 'local::lib';
--        warn "Warning: local::lib is required. You might need to run the `cpanm --sudo local::lib` command in order to install it.\n"
--            if $res != 0;
--    }
--    
--    push @cpanm_args, ('--local-lib', 'local-lib');
--    
-+
-     # make sure our cpanm is updated (old ones don't support the ~ syntax)
-     system $cpanm, @cpanm_args, 'App::cpanminus';
-     
-diff --git a/slic3r.pl b/slic3r.pl
-index 11dc2fad..76885c90 100755
---- a/slic3r.pl
-+++ b/slic3r.pl
-@@ -6,7 +6,6 @@ use warnings;
- BEGIN {
-     use FindBin;
-     use lib "$FindBin::Bin/lib";
--    use local::lib '--no-create', "$FindBin::Bin/local-lib";
- }
- 
- use File::Basename qw(basename);
-diff --git a/t/adaptive_slicing.t b/t/adaptive_slicing.t
-index 64c3769f..5ab631fe 100644
---- a/t/adaptive_slicing.t
-+++ b/t/adaptive_slicing.t
-@@ -5,7 +5,6 @@ use warnings;
- BEGIN {
-     use FindBin;
-     use lib "$FindBin::Bin/../lib";
--    use local::lib "$FindBin::Bin/../local-lib";
- }
- 
- use List::Util qw(first sum);
-diff --git a/t/adaptive_width.t b/t/adaptive_width.t
-index 7a0baa75..c200f844 100644
---- a/t/adaptive_width.t
-+++ b/t/adaptive_width.t
-@@ -7,7 +7,6 @@ plan tests => 32;
- BEGIN {
-     use FindBin;
-     use lib "$FindBin::Bin/../lib";
--    use local::lib "$FindBin::Bin/../local-lib";
- }
- 
- use List::Util qw(first);
-diff --git a/t/angles.t b/t/angles.t
-index 2ae00b4e..1e1a6c9c 100644
---- a/t/angles.t
-+++ b/t/angles.t
-@@ -7,9 +7,6 @@ plan tests => 34;
- BEGIN {
-     use FindBin;
-     use lib "$FindBin::Bin/../lib";
--    use lib "$FindBin::Bin/../lib";
--    use lib "$FindBin::Bin/../lib";
--    use local::lib "$FindBin::Bin/../local-lib";
- }
- 
- use Slic3r;
-diff --git a/t/arcs.t b/t/arcs.t
-index ec85dfbc..65b83de4 100644
---- a/t/arcs.t
-+++ b/t/arcs.t
-@@ -7,7 +7,6 @@ plan tests => 24;
- BEGIN {
-     use FindBin;
-     use lib "$FindBin::Bin/../lib";
--    use local::lib "$FindBin::Bin/../local-lib";
- }
- 
- use Slic3r;
-diff --git a/t/avoid_crossing_perimeters.t b/t/avoid_crossing_perimeters.t
-index 7cd04e50..dd6c3e7b 100644
---- a/t/avoid_crossing_perimeters.t
-+++ b/t/avoid_crossing_perimeters.t
-@@ -5,7 +5,6 @@ use warnings;
- BEGIN {
-     use FindBin;
-     use lib "$FindBin::Bin/../lib";
--    use local::lib "$FindBin::Bin/../local-lib";
- }
- 
- use List::Util qw(first sum);
-diff --git a/t/bridges.t b/t/bridges.t
-index 677115b8..3dc6b84a 100644
---- a/t/bridges.t
-+++ b/t/bridges.t
-@@ -5,7 +5,6 @@ use warnings;
- BEGIN {
-     use FindBin;
-     use lib "$FindBin::Bin/../lib";
--    use local::lib "$FindBin::Bin/../local-lib";
- }
- 
- use List::Util qw(first sum);
-diff --git a/t/clean_polylines.t b/t/clean_polylines.t
-index 50c6f5bb..4526bd60 100644
---- a/t/clean_polylines.t
-+++ b/t/clean_polylines.t
-@@ -7,7 +7,6 @@ plan tests => 6;
- BEGIN {
-     use FindBin;
-     use lib "$FindBin::Bin/../lib";
--    use local::lib "$FindBin::Bin/../local-lib";
- }
- 
- use Slic3r;
-diff --git a/t/clipper.t b/t/clipper.t
-index 3c983814..a898a53f 100644
---- a/t/clipper.t
-+++ b/t/clipper.t
-@@ -7,7 +7,6 @@ plan tests => 6;
- BEGIN {
-     use FindBin;
-     use lib "$FindBin::Bin/../lib";
--    use local::lib "$FindBin::Bin/../local-lib";
- }
- 
- use List::Util qw(sum);
-diff --git a/t/collinear.t b/t/collinear.t
-index b28a3602..9dee7770 100644
---- a/t/collinear.t
-+++ b/t/collinear.t
-@@ -7,7 +7,6 @@ plan tests => 11;
- BEGIN {
-     use FindBin;
-     use lib "$FindBin::Bin/../lib";
--    use local::lib "$FindBin::Bin/../local-lib";
- }
- 
- use Slic3r;
-diff --git a/t/combineinfill.t b/t/combineinfill.t
-index 66e461d4..6661cdd6 100644
---- a/t/combineinfill.t
-+++ b/t/combineinfill.t
-@@ -5,7 +5,6 @@ use warnings;
- BEGIN {
-     use FindBin;
-     use lib "$FindBin::Bin/../lib";
--    use local::lib "$FindBin::Bin/../local-lib";
- }
- 
- use List::Util qw(first);
-diff --git a/t/config.t b/t/config.t
-index 829ef5f3..7f85dae8 100644
---- a/t/config.t
-+++ b/t/config.t
-@@ -5,7 +5,6 @@ use warnings;
- BEGIN {
-     use FindBin;
-     use lib "$FindBin::Bin/../lib";
--    use local::lib "$FindBin::Bin/../local-lib";
- }
- 
- use Slic3r;
-diff --git a/t/cooling.t b/t/cooling.t
-index 80819bdc..5b2d4b4c 100644
---- a/t/cooling.t
-+++ b/t/cooling.t
-@@ -7,7 +7,6 @@ plan tests => 13;
- BEGIN {
-     use FindBin;
-     use lib "$FindBin::Bin/../lib";
--    use local::lib "$FindBin::Bin/../local-lib";
- }
- 
- use List::Util qw(none all);
-diff --git a/t/custom_gcode.t b/t/custom_gcode.t
-index 9b58344e..3ff7c35d 100644
---- a/t/custom_gcode.t
-+++ b/t/custom_gcode.t
-@@ -5,7 +5,6 @@ use warnings;
- BEGIN {
-     use FindBin;
-     use lib "$FindBin::Bin/../lib";
--    use local::lib "$FindBin::Bin/../local-lib";
- }
- 
- use List::Util qw(first);
-diff --git a/t/fill.t b/t/fill.t
-index 765cfd47..d422d27a 100644
---- a/t/fill.t
-+++ b/t/fill.t
-@@ -7,7 +7,6 @@ plan tests => 95;
- BEGIN {
-     use FindBin;
-     use lib "$FindBin::Bin/../lib";
--    use local::lib "$FindBin::Bin/../local-lib";
- }
- 
- use List::Util qw(first sum max);
-diff --git a/t/flow.t b/t/flow.t
-index 37e9deaf..071d290c 100644
---- a/t/flow.t
-+++ b/t/flow.t
-@@ -5,7 +5,6 @@ use warnings;
- BEGIN {
-     use FindBin;
-     use lib "$FindBin::Bin/../lib";
--    use local::lib "$FindBin::Bin/../local-lib";
- }
- 
- use List::Util qw(first sum);
-diff --git a/t/gaps.t b/t/gaps.t
-index 01ec1b4e..16baa036 100644
---- a/t/gaps.t
-+++ b/t/gaps.t
-@@ -5,7 +5,6 @@ use warnings;
- BEGIN {
-     use FindBin;
-     use lib "$FindBin::Bin/../lib";
--    use local::lib "$FindBin::Bin/../local-lib";
- }
- 
- use List::Util qw(first);
-diff --git a/t/gcode.t b/t/gcode.t
-index ec9b7bb2..525356df 100644
---- a/t/gcode.t
-+++ b/t/gcode.t
-@@ -5,7 +5,6 @@ use warnings;
- BEGIN {
-     use FindBin;
-     use lib "$FindBin::Bin/../lib";
--    use local::lib "$FindBin::Bin/../local-lib";
- }
- 
- use List::Util qw(first);
-diff --git a/t/geometry.t b/t/geometry.t
-index 9c6eef55..4e6e7097 100644
---- a/t/geometry.t
-+++ b/t/geometry.t
-@@ -7,7 +7,6 @@ plan tests => 44;
- BEGIN {
-     use FindBin;
-     use lib "$FindBin::Bin/../lib";
--    use local::lib "$FindBin::Bin/../local-lib";
- }
- 
- use Slic3r;
-diff --git a/t/layers.t b/t/layers.t
-index a8599807..57fd2576 100644
---- a/t/layers.t
-+++ b/t/layers.t
-@@ -5,7 +5,6 @@ use warnings;
- BEGIN {
-     use FindBin;
-     use lib "$FindBin::Bin/../lib";
--    use local::lib "$FindBin::Bin/../local-lib";
- }
- 
- use List::Util qw(first);
-diff --git a/t/loops.t b/t/loops.t
-index d2bf7717..725154c9 100644
---- a/t/loops.t
-+++ b/t/loops.t
-@@ -7,7 +7,6 @@ plan tests => 4;
- BEGIN {
-     use FindBin;
-     use lib "$FindBin::Bin/../lib";
--    use local::lib "$FindBin::Bin/../local-lib";
- }
- 
- use Slic3r;
-diff --git a/t/multi.t b/t/multi.t
-index fb8cad81..4d6f8193 100644
---- a/t/multi.t
-+++ b/t/multi.t
-@@ -5,7 +5,6 @@ use warnings;
- BEGIN {
-     use FindBin;
-     use lib "$FindBin::Bin/../lib";
--    use local::lib "$FindBin::Bin/../local-lib";
- }
- 
- use List::Util qw(first);
-diff --git a/t/perimeters.t b/t/perimeters.t
-index 513c76ef..3ddde0b8 100644
---- a/t/perimeters.t
-+++ b/t/perimeters.t
-@@ -5,7 +5,6 @@ use warnings;
- BEGIN {
-     use FindBin;
-     use lib "$FindBin::Bin/../lib";
--    use local::lib "$FindBin::Bin/../local-lib";
- }
- 
- use Slic3r::ExtrusionLoop ':roles';
-diff --git a/t/polyclip.t b/t/polyclip.t
-index 0808c7be..1292d321 100644
---- a/t/polyclip.t
-+++ b/t/polyclip.t
-@@ -7,7 +7,6 @@ plan tests => 18;
- BEGIN {
-     use FindBin;
-     use lib "$FindBin::Bin/../lib";
--    use local::lib "$FindBin::Bin/../local-lib";
- }
- 
- use Slic3r;
-diff --git a/t/pressure.t b/t/pressure.t
-index dde23695..6bbb81d8 100644
---- a/t/pressure.t
-+++ b/t/pressure.t
-@@ -5,7 +5,6 @@ use warnings;
- BEGIN {
-     use FindBin;
-     use lib "$FindBin::Bin/../lib";
--    use local::lib "$FindBin::Bin/../local-lib";
- }
- 
- use List::Util qw();
-diff --git a/t/print.t b/t/print.t
-index b78739e4..28cf1ee4 100644
---- a/t/print.t
-+++ b/t/print.t
-@@ -5,7 +5,6 @@ use warnings;
- BEGIN {
-     use FindBin;
-     use lib "$FindBin::Bin/../lib";
--    use local::lib "$FindBin::Bin/../local-lib";
- }
- 
- use List::Util qw(first);
-diff --git a/t/retraction.t b/t/retraction.t
-index 237af3ab..37dcb64b 100644
---- a/t/retraction.t
-+++ b/t/retraction.t
-@@ -5,7 +5,6 @@ use warnings;
- BEGIN {
-     use FindBin;
-     use lib "$FindBin::Bin/../lib";
--    use local::lib "$FindBin::Bin/../local-lib";
- }
- 
- use List::Util qw(any);
-diff --git a/t/shells.t b/t/shells.t
-index 2347ff36..d64eb28c 100644
---- a/t/shells.t
-+++ b/t/shells.t
-@@ -5,7 +5,6 @@ use warnings;
- BEGIN {
-     use FindBin;
-     use lib "$FindBin::Bin/../lib";
--    use local::lib "$FindBin::Bin/../local-lib";
- }
- 
- use List::Util qw(first sum);
-diff --git a/t/skirt_brim.t b/t/skirt_brim.t
-index d6181ba2..cfa0698e 100644
---- a/t/skirt_brim.t
-+++ b/t/skirt_brim.t
-@@ -5,7 +5,6 @@ use warnings;
- BEGIN {
-     use FindBin;
-     use lib "$FindBin::Bin/../lib";
--    use local::lib "$FindBin::Bin/../local-lib";
- }
- 
- use List::Util qw(first);
-diff --git a/t/slice.t b/t/slice.t
-index 51b52163..301ae164 100644
---- a/t/slice.t
-+++ b/t/slice.t
-@@ -8,7 +8,6 @@ plan tests => 16;
- BEGIN {
-     use FindBin;
-     use lib "$FindBin::Bin/../lib";
--    use local::lib "$FindBin::Bin/../local-lib";
- }
- 
- # temporarily disable compilation errors due to constant not being exported anymore
-diff --git a/t/speed.t b/t/speed.t
-index 5d9fb54c..3deab75b 100644
---- a/t/speed.t
-+++ b/t/speed.t
-@@ -5,7 +5,6 @@ use warnings;
- BEGIN {
-     use FindBin;
-     use lib "$FindBin::Bin/../lib";
--    use local::lib "$FindBin::Bin/../local-lib";
- }
- 
- use List::Util qw(none);
-diff --git a/t/support.t b/t/support.t
-index 8d4655b3..b4f9ce04 100644
---- a/t/support.t
-+++ b/t/support.t
-@@ -5,7 +5,6 @@ use warnings;
- BEGIN {
-     use FindBin;
-     use lib "$FindBin::Bin/../lib";
--    use local::lib "$FindBin::Bin/../local-lib";
- }
- 
- use List::Util qw(first);
-diff --git a/t/svg.t b/t/svg.t
-index 6092efe2..9299eeef 100644
---- a/t/svg.t
-+++ b/t/svg.t
-@@ -5,7 +5,6 @@ use warnings;
- BEGIN {
-     use FindBin;
-     use lib "$FindBin::Bin/../lib";
--    use local::lib "$FindBin::Bin/../local-lib";
- }
- 
- use Slic3r;
-diff --git a/t/thin.t b/t/thin.t
-index 2d256d28..51461480 100644
---- a/t/thin.t
-+++ b/t/thin.t
-@@ -5,7 +5,6 @@ use warnings;
- BEGIN {
-     use FindBin;
-     use lib "$FindBin::Bin/../lib";
--    use local::lib "$FindBin::Bin/../local-lib";
- }
- 
- use Slic3r;
-diff --git a/t/threads.t b/t/threads.t
-index 7fcd86f0..106a68af 100644
---- a/t/threads.t
-+++ b/t/threads.t
-@@ -5,7 +5,6 @@ use warnings;
- BEGIN {
-     use FindBin;
-     use lib "$FindBin::Bin/../lib";
--    use local::lib "$FindBin::Bin/../local-lib";
- }
- 
- use List::Util qw(first);
-diff --git a/t/vibrationlimit.t b/t/vibrationlimit.t
-index 1a5488a6..7bfa27ac 100644
---- a/t/vibrationlimit.t
-+++ b/t/vibrationlimit.t
-@@ -5,7 +5,6 @@ use warnings;
- BEGIN {
-     use FindBin;
-     use lib "$FindBin::Bin/../lib";
--    use local::lib "$FindBin::Bin/../local-lib";
- }
- 
- use Slic3r;
-diff --git a/utils/amf-to-stl.pl b/utils/amf-to-stl.pl
-index 56df2e23..7edc1460 100755
---- a/utils/amf-to-stl.pl
-+++ b/utils/amf-to-stl.pl
-@@ -7,7 +7,6 @@ use warnings;
- BEGIN {
-     use FindBin;
-     use lib "$FindBin::Bin/../lib";
--    use local::lib "$FindBin::Bin/../local-lib";
- }
- 
- use File::Basename qw(basename);
-diff --git a/utils/config-bundle-to-config.pl b/utils/config-bundle-to-config.pl
-index e1d7f614..beecd666 100755
---- a/utils/config-bundle-to-config.pl
-+++ b/utils/config-bundle-to-config.pl
-@@ -9,7 +9,6 @@ use warnings;
- BEGIN {
-     use FindBin;
-     use lib "$FindBin::Bin/../lib";
--    use local::lib "$FindBin::Bin/../local-lib";
- }
- 
- use Getopt::Long qw(:config no_auto_abbrev);
-diff --git a/utils/dump-stl.pl b/utils/dump-stl.pl
-index 6da275ab..4df94268 100644
---- a/utils/dump-stl.pl
-+++ b/utils/dump-stl.pl
-@@ -8,7 +8,6 @@ use warnings;
- BEGIN {
-     use FindBin;
-     use lib "$FindBin::Bin/../lib";
--    use local::lib "$FindBin::Bin/../local-lib";
- }
- 
- use Slic3r;
-diff --git a/utils/estimate-gcode-time.pl b/utils/estimate-gcode-time.pl
-index 43c558b6..eab4f6da 100755
---- a/utils/estimate-gcode-time.pl
-+++ b/utils/estimate-gcode-time.pl
-@@ -6,7 +6,6 @@ use warnings;
- BEGIN {
-     use FindBin;
-     use lib "$FindBin::Bin/../lib";
--    use local::lib "$FindBin::Bin/../local-lib";
- }
- 
- use Slic3r;
-diff --git a/utils/gcode_sectioncut.pl b/utils/gcode_sectioncut.pl
-index b94a2fc4..4d9619e4 100644
---- a/utils/gcode_sectioncut.pl
-+++ b/utils/gcode_sectioncut.pl
-@@ -7,7 +7,6 @@ use warnings;
- BEGIN {
-     use FindBin;
-     use lib "$FindBin::Bin/../lib";
--    use local::lib "$FindBin::Bin/../local-lib";
- }
- 
- use Getopt::Long qw(:config no_auto_abbrev);
-diff --git a/utils/pdf-slices.pl b/utils/pdf-slices.pl
-index 30c41ae4..fa7612bb 100755
---- a/utils/pdf-slices.pl
-+++ b/utils/pdf-slices.pl
-@@ -7,7 +7,6 @@ use warnings;
- BEGIN {
-     use FindBin;
-     use lib "$FindBin::Bin/../lib";
--    use local::lib "$FindBin::Bin/../local-lib";
- }
- 
- use Getopt::Long qw(:config no_auto_abbrev);
-diff --git a/utils/send-gcode.pl b/utils/send-gcode.pl
-index d87e6826..6f529b90 100644
---- a/utils/send-gcode.pl
-+++ b/utils/send-gcode.pl
-@@ -6,7 +6,6 @@ use warnings;
- BEGIN {
-     use FindBin;
-     use lib "$FindBin::Bin/../lib";
--    use local::lib "$FindBin::Bin/../local-lib";
- }
- 
- use Slic3r;
-diff --git a/utils/split_stl.pl b/utils/split_stl.pl
-index eb659b9c..16cf5a9d 100755
---- a/utils/split_stl.pl
-+++ b/utils/split_stl.pl
-@@ -7,7 +7,6 @@ use warnings;
- BEGIN {
-     use FindBin;
-     use lib "$FindBin::Bin/../lib";
--    use local::lib "$FindBin::Bin/../local-lib";
- }
- 
- use File::Basename qw(basename);
-diff --git a/utils/stl-to-amf.pl b/utils/stl-to-amf.pl
-index cb041893..81648b8e 100755
---- a/utils/stl-to-amf.pl
-+++ b/utils/stl-to-amf.pl
-@@ -7,7 +7,6 @@ use warnings;
- BEGIN {
-     use FindBin;
-     use lib "$FindBin::Bin/../lib";
--    use local::lib "$FindBin::Bin/../local-lib";
- }
- 
- use File::Basename qw(basename);
-diff --git a/utils/view-mesh.pl b/utils/view-mesh.pl
-index 91cd20a2..b122faed 100644
---- a/utils/view-mesh.pl
-+++ b/utils/view-mesh.pl
-@@ -7,7 +7,6 @@ use warnings;
- BEGIN {
-     use FindBin;
-     use lib "$FindBin::Bin/../lib";
--    use local::lib "$FindBin::Bin/../local-lib";
- }
- 
- use Getopt::Long qw(:config no_auto_abbrev);
-diff --git a/utils/view-toolpaths.pl b/utils/view-toolpaths.pl
-index d4c47f07..4bbbaab4 100755
---- a/utils/view-toolpaths.pl
-+++ b/utils/view-toolpaths.pl
-@@ -7,7 +7,6 @@ use warnings;
- BEGIN {
-     use FindBin;
-     use lib "$FindBin::Bin/../lib";
--    use local::lib "$FindBin::Bin/../local-lib";
- }
- 
- use Getopt::Long qw(:config no_auto_abbrev);
-diff --git a/utils/wireframe.pl b/utils/wireframe.pl
-index f49b66e5..053581de 100644
---- a/utils/wireframe.pl
-+++ b/utils/wireframe.pl
-@@ -8,7 +8,6 @@ use warnings;
- BEGIN {
-     use FindBin;
-     use lib "$FindBin::Bin/../lib";
--    use local::lib "$FindBin::Bin/../local-lib";
- }
- 
- use Getopt::Long qw(:config no_auto_abbrev);
diff --git a/media-gfx/slic3r/slic3r-1.1.7.ebuild b/media-gfx/slic3r/slic3r-1.1.7.ebuild
deleted file mode 100644
index f144a2980def..000000000000
--- a/media-gfx/slic3r/slic3r-1.1.7.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils perl-module
-
-DESCRIPTION="A mesh slicer to generate G-code for fused-filament-fabrication (3D printers)"
-HOMEPAGE="https://slic3r.org"
-SRC_URI="https://github.com/alexrj/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="AGPL-3 CC-BY-3.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+gui test"
-RESTRICT="!test? ( test )"
-
-# check Build.PL for dependencies
-RDEPEND="!=dev-lang/perl-5.16*
-	>=dev-libs/boost-1.55[threads]
-	dev-perl/Class-XSAccessor
-	dev-perl/Encode-Locale
-	dev-perl/IO-stringy
-	>=dev-perl/Math-PlanePath-53.0.0
-	>=dev-perl/Moo-1.3.1
-	dev-perl/XML-SAX-ExpatXS
-	virtual/perl-Carp
-	virtual/perl-File-Spec
-	virtual/perl-Getopt-Long
-	virtual/perl-parent
-	virtual/perl-Scalar-List-Utils
-	virtual/perl-Test-Simple
-	virtual/perl-Thread-Semaphore
-	>=virtual/perl-threads-1.960.0
-	virtual/perl-Time-HiRes
-	virtual/perl-XSLoader
-	gui? ( dev-perl/Class-Accessor
-		dev-perl/Growl-GNTP
-		dev-perl/libwww-perl
-		dev-perl/Module-Pluggable
-		dev-perl/Net-Bonjour
-		dev-perl/Net-DBus
-		dev-perl/OpenGL
-		>=dev-perl/Wx-0.991.800
-		dev-perl/Wx-GLCanvas
-		>=media-libs/freeglut-3
-		virtual/perl-Math-Complex
-		>=virtual/perl-Socket-2.16.0
-		x11-libs/libXmu
-	)"
-DEPEND="${RDEPEND}
-	>=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 )"
-
-DIST_TEST="do"
-S="${WORKDIR}/Slic3r-${PV}/xs"
-
-src_prepare() {
-	pushd "${WORKDIR}/Slic3r-${PV}" || die
-	eapply "${FILESDIR}/${P}-adjust_var_path.patch"
-	eapply_user
-	popd || die
-}
-
-src_configure() {
-	SLIC3R_NO_AUTO=1 perl-module_src_configure
-}
-
-src_test() {
-	perl-module_src_test
-	# 1.1.7 Is kinda broken after Perl 5.16
-	pushd .. || die
-	ewarn "Some Tests Skipped due to consuming 100% of RAM"
-	local bad_files=(
-		t/combineinfill.t t/cooling.t t/custom_gcode.t t/fill.t
-		t/flow.t t/gaps.t t/gcode.t t/layers.t t/multi.t
-		t/perimeters.t t/print.t t/retraction.t t/shells.t
-		t/skirt_brim.t t/support.t t/threads.t t/vibrationlimit.t
-	);
-	for filename in "${bad_files[@]}"; do
-		einfo "Removing bad test ${filename}";
-		rm -f "./${filename}" || die "Cannot remove ./${filename}";
-	done
-	prove -Ixs/blib/arch -Ixs/blib/lib/ t/ || die "Tests failed"
-	popd || die
-}
-
-src_install() {
-	perl-module_src_install
-
-	pushd .. || die
-	insinto "${VENDOR_LIB}"
-	doins -r lib/Slic3r.pm lib/Slic3r
-
-	insinto "${VENDOR_LIB}"/Slic3r
-	doins -r var
-
-	exeinto "${VENDOR_LIB}"/Slic3r
-	doexe slic3r.pl
-
-	dosym "${VENDOR_LIB}"/Slic3r/slic3r.pl /usr/bin/slic3r.pl
-
-	make_desktop_entry slic3r.pl \
-		Slic3r \
-		"${VENDOR_LIB}/Slic3r/var/Slic3r_128px.png" \
-		"Graphics;3DGraphics;Engineering;Development"
-	popd || die
-}
diff --git a/media-gfx/slic3r/slic3r-1.3.0-r1.ebuild b/media-gfx/slic3r/slic3r-1.3.0-r3.ebuild
index 67feefd30fac..5917a9210b8d 100644
--- a/media-gfx/slic3r/slic3r-1.3.0-r1.ebuild
+++ b/media-gfx/slic3r/slic3r-1.3.0-r3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit eutils flag-o-matic perl-module
+inherit desktop eutils perl-module
 
 DESCRIPTION="A mesh slicer to generate G-code for fused-filament-fabrication (3D printers)"
 HOMEPAGE="https://slic3r.org"
@@ -17,7 +17,7 @@ RESTRICT="!test? ( test )"
 
 # check Build.PL for dependencies
 RDEPEND="!=dev-lang/perl-5.16*
-	>=dev-libs/boost-1.55[threads]
+	>=dev-libs/boost-1.73[threads]
 	dev-perl/Class-XSAccessor
 	dev-perl/Devel-CheckLib
 	dev-perl/Devel-Size
@@ -53,6 +53,7 @@ RDEPEND="!=dev-lang/perl-5.16*
 		x11-libs/libXmu
 	)"
 DEPEND="${RDEPEND}
+	dev-libs/clipper
 	dev-perl/Devel-CheckLib
 	>=dev-perl/ExtUtils-CppGuess-0.70.0
 	>=dev-perl/ExtUtils-Typemaps-Default-1.50.0
@@ -64,38 +65,33 @@ DEPEND="${RDEPEND}
 	test? (	virtual/perl-Test-Harness
 		virtual/perl-Test-Simple )"
 
-S="${WORKDIR}/Slic3r-${PV}/xs"
+S="${WORKDIR}/Slic3r-${PV}"
+PERL_S="${S}/xs"
 
-pkg_pretend() {
-	einfo "Checking for -std=c++11 support in compiler"
-	test-flags-CXX -std=c++11 > /dev/null || die
-}
+PATCHES=(
+	"${FILESDIR}/${P}-boost-1.73.patch"
+	"${FILESDIR}/${P}-no-locallib.patch"
+	"${FILESDIR}/${P}-use-system-clipper.patch"
+	"${FILESDIR}/${P}-wayland.patch"
+)
 
 src_prepare() {
-	pushd "${WORKDIR}/Slic3r-${PV}" || die
 	sed -i lib/Slic3r.pm -e "s@FindBin::Bin@FindBin::RealBin@g" || die
-	eapply "${FILESDIR}"/${P}-no-locallib.patch
-	eapply "${FILESDIR}"/${P}-boost.patch
-	eapply_user
-	popd || die
-	# drop std=c++11 to compiler defaults...
-	sed \
-		-e '/c++11/d' \
-		-i Build.PL || die
+	perl-module_src_prepare
 }
 
 src_configure() {
+	cd "${PERL_S}" || die
 	SLIC3R_NO_AUTO=1 perl-module_src_configure
 }
 
 src_test() {
+	cd "${PERL_S}" || die
 	perl-module_src_test
-	pushd .. || die
-	prove -Ixs/blib/arch -Ixs/blib/lib/ t/ || die "Tests failed"
-	popd || die
 }
 
 src_install() {
+	cd "${PERL_S}" || die
 	perl-module_src_install
 
 	pushd .. || die
@@ -108,9 +104,9 @@ src_install() {
 	exeinto "${VENDOR_LIB}"/Slic3r
 	doexe slic3r.pl
 
-	dosym "${VENDOR_LIB}"/Slic3r/slic3r.pl /usr/bin/slic3r.pl
+	dosym "${VENDOR_LIB}/Slic3r/slic3r.pl" "${EPREFIX}/usr/bin/slic3r.pl"
 
-	make_desktop_entry slic3r.pl \
+	make_desktop_entry "slic3r.pl --gui %F" \
 		Slic3r \
 		"${VENDOR_LIB}/Slic3r/var/Slic3r_128px.png" \
 		"Graphics;3DGraphics;Engineering;Development"
diff --git a/media-gfx/slic3r/slic3r-1.3.0-r2.ebuild b/media-gfx/slic3r/slic3r-1.3.1_pre20200824.ebuild
index 60c8950aab45..c8ca66784afd 100644
--- a/media-gfx/slic3r/slic3r-1.3.0-r2.ebuild
+++ b/media-gfx/slic3r/slic3r-1.3.1_pre20200824.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit eutils flag-o-matic perl-module
+inherit desktop eutils perl-module
 
 DESCRIPTION="A mesh slicer to generate G-code for fused-filament-fabrication (3D printers)"
 HOMEPAGE="https://slic3r.org"
@@ -53,6 +53,7 @@ RDEPEND="!=dev-lang/perl-5.16*
 		x11-libs/libXmu
 	)"
 DEPEND="${RDEPEND}
+	dev-libs/clipper
 	dev-perl/Devel-CheckLib
 	>=dev-perl/ExtUtils-CppGuess-0.70.0
 	>=dev-perl/ExtUtils-Typemaps-Default-1.50.0
@@ -64,38 +65,32 @@ DEPEND="${RDEPEND}
 	test? (	virtual/perl-Test-Harness
 		virtual/perl-Test-Simple )"
 
-S="${WORKDIR}/Slic3r-${PV}/xs"
+S="${WORKDIR}/Slic3r-92abbc42dfdd5385c1f9c3a450e2f3da835f8b8d"
+PERL_S="${S}/xs"
 
-pkg_pretend() {
-	einfo "Checking for -std=c++11 support in compiler"
-	test-flags-CXX -std=c++11 > /dev/null || die
-}
+PATCHES=(
+	"${FILESDIR}/${P}-boost-1.73.patch"
+	"${FILESDIR}/${PN}-1.3.0-no-locallib.patch"
+	"${FILESDIR}/${PN}-1.3.0-use-system-clipper.patch"
+)
 
 src_prepare() {
-	pushd "${WORKDIR}/Slic3r-${PV}" || die
 	sed -i lib/Slic3r.pm -e "s@FindBin::Bin@FindBin::RealBin@g" || die
-	eapply "${FILESDIR}"/${P}-no-locallib.patch
-	eapply "${FILESDIR}"/${P}-boost.patch
-	eapply_user
-	popd || die
-	# drop std=c++11 to compiler defaults...
-	sed \
-		-e '/c++11/d' \
-		-i Build.PL || die
+	perl-module_src_prepare
 }
 
 src_configure() {
+	cd "${PERL_S}" || die
 	SLIC3R_NO_AUTO=1 perl-module_src_configure
 }
 
 src_test() {
+	cd "${PERL_S}" || die
 	perl-module_src_test
-	pushd .. || die
-	prove -Ixs/blib/arch -Ixs/blib/lib/ t/ || die "Tests failed"
-	popd || die
 }
 
 src_install() {
+	cd "${PERL_S}" || die
 	perl-module_src_install
 
 	pushd .. || die
@@ -108,7 +103,7 @@ src_install() {
 	exeinto "${VENDOR_LIB}"/Slic3r
 	doexe slic3r.pl
 
-	dosym "${VENDOR_LIB}"/Slic3r/slic3r.pl /usr/bin/slic3r.pl
+	dosym "${VENDOR_LIB}/Slic3r/slic3r.pl" /usr/bin/slic3r.pl
 
 	make_desktop_entry "slic3r.pl --gui %F" \
 		Slic3r \
diff --git a/media-gfx/slic3r/slic3r-9999.ebuild b/media-gfx/slic3r/slic3r-9999.ebuild
index 404994de740e..6c8f1b5b6d9e 100644
--- a/media-gfx/slic3r/slic3r-9999.ebuild
+++ b/media-gfx/slic3r/slic3r-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit eutils git-r3 perl-module
 
@@ -54,6 +54,7 @@ RDEPEND="!=dev-lang/perl-5.16*
 		x11-libs/libXmu
 	)"
 DEPEND="${RDEPEND}
+	dev-libs/clipper
 	dev-perl/Devel-CheckLib
 	>=dev-perl/ExtUtils-CppGuess-0.70.0
 	>=dev-perl/ExtUtils-Typemaps-Default-1.50.0
@@ -65,46 +66,49 @@ DEPEND="${RDEPEND}
 	test? (	virtual/perl-Test-Harness
 		virtual/perl-Test-Simple )"
 
-S="${WORKDIR}/slic3r-${PV}/xs"
+S="${WORKDIR}/slic3r-${PV}"
+PERL_S="${S}/xs"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.3.1_pre20200824-boost-1.73.patch"
+	"${FILESDIR}/${PN}-1.3.0-no-locallib.patch"
+	"${FILESDIR}/${PN}-1.3.0-use-system-clipper.patch"
+)
 
 src_unpack() {
 	git-r3_src_unpack
 }
 
 src_prepare() {
-	pushd "${WORKDIR}/slic3r-${PV}" || die
 	sed -i lib/Slic3r.pm -e "s@FindBin::Bin@FindBin::RealBin@g" || die
-	eapply "${FILESDIR}"/${P}-no-locallib.patch
-	eapply "${FILESDIR}"/${P}-boost-173.patch
-	eapply_user
-	popd || die
+	perl-module_src_prepare
 }
 
 src_configure() {
+	cd "${PERL_S}" || die
 	SLIC3R_NO_AUTO=1 perl-module_src_configure
 }
 
 src_test() {
+	cd "${PERL_S}" || die
 	perl-module_src_test
-	pushd .. || die
-	prove -Ixs/blib/arch -Ixs/blib/lib/ t/ || die "Tests failed"
-	popd || die
 }
 
 src_install() {
+	cd "${PERL_S}" || die
 	perl-module_src_install
 
 	pushd .. || die
 	insinto "${VENDOR_LIB}"
 	doins -r lib/Slic3r.pm lib/Slic3r
 
-	insinto "${VENDOR_LIB}"/Slic3r
+	insinto "${VENDOR_LIB}/Slic3r"
 	doins -r var
 
-	exeinto "${VENDOR_LIB}"/Slic3r
+	exeinto "${VENDOR_LIB}/Slic3r"
 	doexe slic3r.pl
 
-	dosym "${VENDOR_LIB}"/Slic3r/slic3r.pl /usr/bin/slic3r.pl
+	dosym "${VENDOR_LIB}/Slic3r/slic3r.pl" "${EPREFIX}/usr/bin/slic3r.pl"
 
 	make_desktop_entry "slic3r.pl --gui %F" \
 		Slic3r \
diff --git a/media-gfx/viewnior/Manifest b/media-gfx/viewnior/Manifest
index 9745befdc6f4..2f8eb58b90c5 100644
--- a/media-gfx/viewnior/Manifest
+++ b/media-gfx/viewnior/Manifest
@@ -4,5 +4,5 @@ DIST viewnior-1.6.tar.gz 168966 BLAKE2B 1a04ec6ee4e05da8d0721115826d2550c7d24b42
 DIST viewnior-1.7.tar.gz 165719 BLAKE2B 906ab0b632fcc102ac62dd77d6742c2121c46cd92adc0dfe9ba772bf697eff356519dbb6219016a6470903c855aa4c9081f0d61ca1607d8d1b6d8e03236a19bc SHA512 5ba17d7b5ceeffa65b04213f179c1439b09ac44e412e0750dde159b118a714f28d3a290509a402b234e4e7ba5b185fc73eef65d418598f344911e4e2c1373fe5
 EBUILD viewnior-1.6.ebuild 932 BLAKE2B 421cec0425ef6008090cdea7df88f90c45641f0a26355fcedaaf86c9f11f797cdcdcded489c233ca128ed87dd0863f1965013899c6421584f44d6d7e1dbb5d18 SHA512 847f9cd4e8c24460e77df21e99899507f2adf634fdc605bf3884ba0ba317b84e468218ce5f0b46a6d96b8b6c94966c0dd0b170d330cd22ba2c4069bcd4529303
 EBUILD viewnior-1.7-r1.ebuild 1279 BLAKE2B 4302bd5b94b27ff3e5b0f8db78a3f5e7fc092a7f861c3edec053f050368b136b44d19ae151331c4f4a7c915d56c5609fda2099c075fb2e3a944e7ecd598b7a35 SHA512 c974ab91c7110447b9d51a2e6a0481730452bfd8d3d0090ea6b631df0e890a3e0fbfb280e6836a28e01c1f26ecaf36b67ee848d9842bd1268e8f9e9949f3f2c9
-EBUILD viewnior-1.7-r2.ebuild 1162 BLAKE2B 0be864a12245dafbcb199f774478a17ea23715f9b160bdfc3ae2b498a9bc7849ab3ecf8f5588cccd23aabce0a3bebb5ead3526a5cf713fb32152f46e4f16f0cb SHA512 3533cd649c5619a44679a2316a67862812706eb625b6ed19b0435e077e312836e8ce63aa6732e3e818417f2a6201864d1dc8de0d8a4b0313643c04846ceeb0d7
+EBUILD viewnior-1.7-r2.ebuild 1169 BLAKE2B 242cbb29e603adc30d320265849cc5b48d75e174b7e1949c98d160aa9e75537afd48c86882208b2b6326dfb1c27c49b4b3b943f1261c76c221d2497f427e7ff6 SHA512 aabf358b22d8258791f7f60ce062070bc9fe72f1c5f9cd8b2bb5281194b3bb5b2a21d38f8f1dcbe07e157366e62e3594fc2c3a9952c41b45fb96b6d0bf9d6f67
 MISC metadata.xml 522 BLAKE2B 3f08e8b96d95c32bc0c2265afa2b580b92258060f4964c9f595da738fe96814406f8d8cc67965b985b714abded06d848df43bbd9fb72641b1123bbe1fd6f348a SHA512 94a9310a1eb358b2468caf0c21a5d799b81049483443b87e0fd4abe644295390f1703ec1b7a58562db89b353632f682f555cec64f41969e3a3e90017cb5913da
diff --git a/media-gfx/viewnior/viewnior-1.7-r2.ebuild b/media-gfx/viewnior/viewnior-1.7-r2.ebuild
index 60e6b46a431e..1c67cf68d566 100644
--- a/media-gfx/viewnior/viewnior-1.7-r2.ebuild
+++ b/media-gfx/viewnior/viewnior-1.7-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/hellosiyan/${PN^}/archive/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/media-gfx/zbar/Manifest b/media-gfx/zbar/Manifest
index 8846fe4240e0..e4f5727910b1 100644
--- a/media-gfx/zbar/Manifest
+++ b/media-gfx/zbar/Manifest
@@ -9,5 +9,5 @@ AUX zbar-0.23_reset_conversion_descriptor_after_close.patch 829 BLAKE2B b39c63a1
 DIST zbar-0.23.1.tar.gz 1019268 BLAKE2B 5aa8725a0945b6f50eb78bb7b8a61e5b46356b18f07e8af778a63d46b94c894d9e827ed71bd89060898ecbdaebc5b4bb6e638939d7bc0dede390f7137770049f SHA512 ae7741cf750a10cf53dc11abcd482c3885507153ee37f6e3364ed5ed72184ebb009560b8c40d8090603a551fb681700a962838a59ce77d005d080ee49fbfa54b
 DIST zbar-0.23.tar.gz 1301948 BLAKE2B dd74ce44bcb10f8a7cf180b982e5bd82f1f5674540931377d207ab730bb2d080fe222bfc42d4a3d70895ad53b78638e73c2294018b80d30dc28f7e6ecc14c761 SHA512 9737f9dca42c29f92aa1eca5c0808da34f1d16c88c65241c9e3984c487e502f398437e7a707a1edd2c440f784db537ba33ea4008a2d1c1caaf5eea6431b1400b
 EBUILD zbar-0.23-r1.ebuild 5030 BLAKE2B 53eda120af7cfab90e0894f8e8e07a92f2a45b0c4e4187e161ba877d49bfa044f9c207c7f6123ef3605bca451aa8f56f5a4537eb29d96a4474f8e251d44c9991 SHA512 6968f47c8a701b8d97c4abecccad03c26ba9e52cd58247a89ad34a4c1817e7d46763757dc4e92647ea3dbf637496397c85842de141aa0261b62665824d6afe95
-EBUILD zbar-0.23.1.ebuild 5234 BLAKE2B 5cd8187f7d4e8fd901faa4b2a19440961bc9b0006c7c99c7006df1eee938700d3de6484267435e93d1022fe6dddc33cd4ab138e26d3ee8b9150ae8196122ea98 SHA512 3af907e799c8f213358930af9740c8a66007863970246ac3103b5dadafc8f9e6a694a74f57a5c24dc415b9cbc965d45f7c90e6fe2282dccf3495e1b61ccec6f5
+EBUILD zbar-0.23.1.ebuild 5241 BLAKE2B a12707675a5728cae8288934bc3711761bd6415b14b1e072823068409fea3e62134a89335fc39e8b598a1be457c3d24cefccc12e7224e44185644b56176b5b2f SHA512 09a19a365daed240ef4fbe586870c338ef5faed2dff6c29ff2fd7836e458d1f42a598aa8ce4786b5e2a24ca2c25a41d1e1c97437c454ef4fe2cc2acdf834aa32
 MISC metadata.xml 931 BLAKE2B a8c611d728a6fd0dbc94f333681a5a0ec4fc2bd8529cca7dcebfa8e1774c1d5e069c870baffd29fa033ce0529d2c2cb2ee3a1a54c089b1fd988b0d2c1ce82aae SHA512 c42caef53bc9c8743f8f02f5c96f687b605248a4311efea44777781a85a4b5a31e586cbdd7d85b07a6b2aca8138f5c7238b1f35a37b13741a297e9751731da19
diff --git a/media-gfx/zbar/zbar-0.23.1.ebuild b/media-gfx/zbar/zbar-0.23.1.ebuild
index 79c9d2c02b86..23cc7fc62545 100644
--- a/media-gfx/zbar/zbar-0.23.1.ebuild
+++ b/media-gfx/zbar/zbar-0.23.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/mchehab/zbar/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 
 IUSE="dbus graphicsmagick gtk +imagemagick introspection java jpeg nls python qt5 static-libs test +threads v4l X xv"
 REQUIRED_USE="
author	V3n3RiX <venerix@redcorelinux.org>	2020-12-14 13:26:14 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2020-12-14 13:26:14 +0000
commit	6abbf81ef2f298e3221ff5e67a1f3c5f23958212 (patch)
tree	25413d1cb3a0cbfe36029db32398c0f333609215 /media-gfx
parent	9c417bacd51da6d8b57fa9f37425161d30d4b95b (diff)