gentoo (leap year) resync : 29.02.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-02-29 18:01:47 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2020-02-29 18:01:47 +0000
commit: ceeeb463cc1eef97fd62eaee8bf2196ba04bc384 (patch)
tree: 9f47ee47c31a0f13f9496879cd88a1042550aa81 /media-gfx
parent: 53cba99042fa967e2a93da9f8db806fe2d035543 (diff)
68 files changed, 677 insertions, 555 deletions
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 1f6d0e64fc9c..11e4d2cfae16 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/asymptote/Manifest b/media-gfx/asymptote/Manifest
index 076ad6b561e0..b67b2de37c30 100644
--- a/media-gfx/asymptote/Manifest
+++ b/media-gfx/asymptote/Manifest
@@ -2,6 +2,10 @@ AUX 64asymptote-gentoo.el 337 BLAKE2B 56b028184573dd8db6babd90ae45838b9788671134
 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
 DIST asymptote-2.61.src.tgz 4623504 BLAKE2B 8432f07ce21f630c5bdae609650c0bb2bcd237a121df68030dc19d1cae986f0bfa56dd0e241570809f9fcb202440e8b9b3c6d47a22eeaabe3eb9523360a166ca SHA512 34bb610360b4536da70ca9edf1e069ebbf0c9225948b92b3d59ea25e8684587364fa7bbb03909ba02617e6ee81d41a2e530c9ed639141e4cda42096143cab5f7
+DIST asymptote-2.62.src.tgz 4625853 BLAKE2B 49a5c75f936149139576cc224b005e76d2465a6c813bcb152f2534e98e042685c1500eafb0954b9e53ac0e667b47ab88a8b3387f1627d58828008d0e4d4cc0c8 SHA512 f7e817cdbb3c079a10c5f6f56a1eb47b1aaf8230902c06870bc8feacfed5f7af3d8ed22e4c60cc7130828ced8d36ec035533de1074cb049d3de9006ee542ac2e
 EBUILD asymptote-2.61.ebuild 4627 BLAKE2B e96e10d46b053e2f4e77a7ff95d4462ada1d67c46ada65d5c5f2cf7904c8470ca08a9801a09ea51f3a59e0a2e7371a1a86735b544e25c63ead28ea6f5a9a6879 SHA512 5ad08eabea089f9e96d0f79eb50c1c428a2e3bdb002b0d34417a58af5ed59d4e24eb41adb45241890cbadadc6cb745c00811a0fcd2d5d878e091a210cfcfc095
+EBUILD asymptote-2.62.ebuild 4629 BLAKE2B 325473944f50c21e9b7f1336cb406569a1b85c902ff14e37aca970a5586c45adadda1fdeed9c9e9d5858aa2f0ef1d7fd45e8bc4a145d57cda7da4398fb82483f SHA512 31f06d0ca6e5ed329ee76e69ea26fe4868806aecc047a552efa7a1e6cfb06b9f9c2d9fa9f0db16098185342820a997716479361c4ac68b41ad496315283e0bf9
 MISC metadata.xml 1105 BLAKE2B 4b7d588a861ed68910f0d5a7b7f5691b3e97b6cf4514c3544c8610c77340797354575b49b70980320e55ecf5ea8188bbe8f6cc8fce55d18dc466f1d0fd83ade3 SHA512 f115ea831900270542ffe545260eda1ed51d321eca5aa7772f336bcc0e0c6471be3cbde2991c3e48ea5b3fbf51b8541b13de850406af15e42c992da0f2ed08ee
diff --git a/media-gfx/asymptote/asymptote-2.62.ebuild b/media-gfx/asymptote/asymptote-2.62.ebuild
new file mode 100644
index 000000000000..5f683b025c14
--- /dev/null
+++ b/media-gfx/asymptote/asymptote-2.62.ebuild
@@ -0,0 +1,211 @@
+# 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="http://asymptote.sourceforge.net/"
+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/files/asymptote-2.62-info.patch b/media-gfx/asymptote/files/asymptote-2.62-info.patch
new file mode 100644
index 000000000000..ffc8ac7c8fb5
--- /dev/null
+++ b/media-gfx/asymptote/files/asymptote-2.62-info.patch
@@ -0,0 +1,13 @@
+Index: asymptote-2.62/doc/asymptote.texi
+===================================================================
+--- asymptote-2.62.orig/doc/asymptote.texi
++++ asymptote-2.62/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.62-xdg-utils.patch b/media-gfx/asymptote/files/asymptote-2.62-xdg-utils.patch
new file mode 100644
index 000000000000..b26bc78fda23
--- /dev/null
+++ b/media-gfx/asymptote/files/asymptote-2.62-xdg-utils.patch
@@ -0,0 +1,22 @@
+Index: asymptote-2.62/settings.cc
+===================================================================
+--- asymptote-2.62.orig/settings.cc
++++ asymptote-2.62/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/dpic/Manifest b/media-gfx/dpic/Manifest
index a15b6ca23870..74e1d47faf40 100644
--- a/media-gfx/dpic/Manifest
+++ b/media-gfx/dpic/Manifest
@@ -1,5 +1,5 @@
 DIST dpic-2013.03.10.tar.gz 583366 BLAKE2B 22b2d67e619bd1f1bd324edfbd5cd12ac55a121d1b419572ff889d8b835f57c583120b128430522da692292af47e94b6dd24c76fb753940a317f66003d0d8169 SHA512 a1c29f32bddeabfcfba1e0253ab502ca2c32c9ad4d490c8b2a7569643972a65ebdc26215888aaba7b2954b217e1667b469d49affb0a771832e98aa5ad25dd9f5
 DIST dpic-2016.08.24.tar.gz 1241900 BLAKE2B fe065892006de496b53ebaa9db5f15758f8e772569ad69cc2972b7b00e2f9a90643efb38f482f71935e958220d42964a033e3ce26dac03241b29e097afb570f1 SHA512 5e8fae76d79f8bdf8ca4427c4cb4ea6be272edc74ff5f8ab4c9434283fe9c5443fe4fb2d4a0fba1c17f14ed05f2d82aeb26cf186c797e3a93d92508f3557d630
-EBUILD dpic-20130310.ebuild 714 BLAKE2B 761fef05b02d2c3d06905800d42a898c50761a9ae5a62ec062fb6070672b049fbc07867731521700cbcea1184e47a26fe2519d07d96c21c525f54e4418408f08 SHA512 7a1f65008c5b431531024f708757833f450e0e79a19ebd2577c8ce18baf0c26b6aa319e757aef48f9f995a57073ae4f1b99d4e1a2de797262b8fd52880702f1b
-EBUILD dpic-20160824.ebuild 711 BLAKE2B df2b59597ce67dd8793746e54c16d1a26d0698eed345278e1d2b8fab03e396178ac5e14566cfd2ca475cd138b83df2a059e8b01c7b42cda54ac4cb1bd8945bfd SHA512 3c8c61a130b3c807c41102894995966a51a30591fe9b4507d72b41c32beb4b46b7cf2a35019f9f7948031475d7c3c37501c729a652ae48d78bfad88f5159508f
+EBUILD dpic-20130310.ebuild 709 BLAKE2B ad12b6c2e21c35713d68e8e353f6669e05bd3f7a0a1f7f223a07e6cdb0aa6998b0ce526fa00475737064d9b346e2a76738d0f227cfc59c1e09c9ad403b6b7409 SHA512 71941028f67cf0f21a7e393a7411bdee2deaa4b0d2e5741256066a92a497f9e95c61f601a7ecdd5b37cda5f4d18b9a4161a9f55fd8eb2ffca08fafb6246a98a7
+EBUILD dpic-20160824.ebuild 707 BLAKE2B bbd3270bf45db76dc094c662e4c323c4d5d41cc467f6e0f8f1aebaa062a658c4b95b683c49853b1cbac32f7d780f02eb744df92827cdc143ee4edfe761e4c92e SHA512 e4a9a48b15cfd00a3db5336bb23beffcb8c38c038c99b33938123f9547351a14579250d6461f8a8575a9420a855995ebc7e40ddc4f553c7ba709793477f9b7f9
 MISC metadata.xml 670 BLAKE2B 1387329f346524328caa10bb9bd449b2e2e83d1f98ef809980218e7e9feffa2ab2fd90d6b9030e3040084948e96a085886bee9bfa64e26f3df5b0441bd0b6e12 SHA512 c236776d4cdc5c202ef03aad5eb4b94906ea9d2981773d0bf05460147cd73b2ef9f64b354ba3782e95c0effa5b9b0564f427e78cd3c776f7bae9e57471db0eeb
diff --git a/media-gfx/dpic/dpic-20130310.ebuild b/media-gfx/dpic/dpic-20130310.ebuild
index a21a1659b42e..6fb72b844180 100644
--- a/media-gfx/dpic/dpic-20130310.ebuild
+++ b/media-gfx/dpic/dpic-20130310.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -19,11 +19,11 @@ RDEPEND=""
 
 S="${WORKDIR}/${PN}"
 
-src_compile () {
+src_compile() {
 	emake CC="$(tc-getCC)"
 }
 
-src_install () {
+src_install() {
 	dobin dpic
 	doman doc/dpic.1
 	dodoc README CHANGES doc/dpicdoc.pdf doc/gpic.pdf
diff --git a/media-gfx/dpic/dpic-20160824.ebuild b/media-gfx/dpic/dpic-20160824.ebuild
index c102eef74e4c..1340997077ff 100644
--- a/media-gfx/dpic/dpic-20160824.ebuild
+++ b/media-gfx/dpic/dpic-20160824.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -20,7 +20,7 @@ S="${WORKDIR}/${PN}-2016.08.24"
 
 DOCS=( "README" "doc/dpicdoc.pdf" )
 
-src_install () {
+src_install() {
 	dobin ${PN}
 	doman doc/${PN}.1
 
diff --git a/media-gfx/geeqie/Manifest b/media-gfx/geeqie/Manifest
index 9efd8d75d7c1..918c4f7b69d7 100644
--- a/media-gfx/geeqie/Manifest
+++ b/media-gfx/geeqie/Manifest
@@ -1,5 +1,5 @@
 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
-EBUILD geeqie-1.5.1.ebuild 2253 BLAKE2B a239b59a09826ee473bb40c64a717a42ad69b3a31c4c4b237a802b25bff67fe58de072599463f5ebf57b0b40ed88bd343d3057be8d6bfea6adc2e006d4355798 SHA512 1a0545f0d0a500d3ad0192ca27ad8f21c7591332a2f3b17903d264eaf5c4042c2b524351fb99dcffe54590ccfe0d36b50932c0c96ae25d509ee5c979e07de59c
-EBUILD geeqie-9999.ebuild 2303 BLAKE2B 843adc3720b57e36eea9891895fc88bc3a464a6e8384feec8af492c3f30033a4f2cb689ba1ab1b22eaf2f2e80c67ad1e7aff104660fda969669212ee0a1cb6d1 SHA512 2dbec10b4da1df46897f58906678a63a207882451ec3107d55e2a58e1ac25d923cccd61a9679449effa1db854051acc4d14d1ef543a54d5e183bdfa601643005
+EBUILD geeqie-1.5.1.ebuild 2221 BLAKE2B d55676b39a62b450cad26488920f2af5bec2915c93e2fa25f78e843db43e136538daaab7122cf512da3917bfdbb8008459e35e1293d631a291898b5f0490d1c9 SHA512 ba79b67a40834c520140359ac316738d19b23ee641683b4a3a513a465c5101cd2fb17e1a3316b5647bcda8bb51ed93a050892bc7d14c7593aed760960920b940
+EBUILD geeqie-9999.ebuild 2271 BLAKE2B 2515899a7b95323a57e493b938dbe7108da67e6609777d469c184ba0b6adfeaa9309d91873db80157699cb2b3d8feec529b4b14bcf6a2252e2b77c0238e2bba5 SHA512 e424be1e9892eadba760355d55158ba55f303b53f42c6ad293117c1cbd3b23427f47bba0051d659a49c3dfb98062ce72c9b49873e6f37867ba85d16f964c9fcf
 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 85d8651bf878..63b12f277dca 100644
--- a/media-gfx/geeqie/geeqie-1.5.1.ebuild
+++ b/media-gfx/geeqie/geeqie-1.5.1.ebuild
@@ -53,7 +53,6 @@ src_prepare() {
 
 src_configure() {
 	local myeconfargs=(
-		--disable-dependency-tracking
 		--with-readmedir="${EPREFIX}"/usr/share/doc/${PF}
 		$(use_enable debug debug-log)
 		$(use_enable ffmpegthumbnailer)
diff --git a/media-gfx/geeqie/geeqie-9999.ebuild b/media-gfx/geeqie/geeqie-9999.ebuild
index a0e3b2f1b761..aef56eaf8bab 100644
--- a/media-gfx/geeqie/geeqie-9999.ebuild
+++ b/media-gfx/geeqie/geeqie-9999.ebuild
@@ -53,7 +53,6 @@ src_prepare() {
 
 src_configure() {
 	local myeconfargs=(
-		--disable-dependency-tracking
 		--with-readmedir="${EPREFIX}"/usr/share/doc/${PF}
 		$(use_enable debug debug-log)
 		$(use_enable ffmpegthumbnailer)
diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest
index e70cd24d8930..4a001542504a 100644
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -15,8 +15,8 @@ DIST gimp-2.10.8.tar.bz2 31954568 BLAKE2B 11f88b1068fa1fe216a54bed27b26b94c3fdb2
 DIST gimp-2.8.22.tar.bz2 20873278 BLAKE2B 673246fd2354f1cecc74bf389df698f594b7553cc88a1d2679ae410ad39923abae843dfe9623ec195b4f967b5eccd199769a6300bf028ae04b8df4932df11505 SHA512 84a78d428282538b606b3cd1ff571e52c3d828fceade171b2012bc1cdcb85919fc7734e7e6c45ed3a8683657fa580412b32c1b511b8a512172a8c1df930493e6
 DIST gimp-2.9.8.tar.bz2 26161474 BLAKE2B f00a58d33848a818a2cb3b74920b33156330a26423a2b567cd8372258f87b44ae1ad812f2b3ee9a093b919d022e8b71ef518d40b76ab94c616f9916b3d1effec SHA512 897092aa823961e6ed5dac47eaadd3a25c419364d6ca791987d99e495d0d4eba1d75e08c809dfa305e8feec9da606193b608e3470e0ef18fcfaa98ee8aedfe02
 EBUILD gimp-2.10.14-r1.ebuild 6128 BLAKE2B 76a1ce0fe3defafb47cf2f853661e3a5f3ef0be8107fcf52b1df9b4018780a716bc7a6f76dc9a3142583483b7819180b0d9980d8b2b1861238f424a77c3c37ae SHA512 dd91a497d1cf7a4d587a2d7c926c3d1750ff5944c94e64ede97010213975be80893402ac5055be0107b9706ab14a3725652f4b8eb09db6b8ac8da0fd46d5e0ca
-EBUILD gimp-2.10.8-r2.ebuild 6149 BLAKE2B 51647e9a4673cd19e921554e1529a171205d74f3b32c54325f9e03fa08ddb140162fc9cd205da2303fede40e64fc55dbc2345dbff4c9b86df5564d568beff690 SHA512 7a2cdc2ea67f6a1bb0bf36b25e1018fb71aaeb052d05ab086310d9bd03a0b1d20be62485ac1516bd02d3d667a69d3cc64eca1c05f9ea4783e2a9f177a47aca8f
-EBUILD gimp-2.8.22-r2.ebuild 5171 BLAKE2B 003abf6e668ad7a409c67d18d41a5cfcd5f68b90801cb07377b3ab6b97d968b2db8686f1173c3175c59cd7a28d5714a12f3eeade0de19be7a2c08340efabe012 SHA512 a1104e3cbd6104af8111578d35908043e2e8090f74a7252d52f3d21dac046fca33bbdf8b207e92ba039c217a7e50c801c37e3bc5921836a6f46f1683796804d8
-EBUILD gimp-2.9.8-r1.ebuild 6095 BLAKE2B abec863e179bba25bf55594f9ab5fb03ed4601d2191ff3a53a13142b8d535a82f37b60ce84ada8b1161307bd77e1fc01203178d18a3083719ec2aad4cfae245e SHA512 571b4a9f149470816aa21b6d9100e50e82ed586776818156001b0dcfda7ee5a14d3f9a44c5b25fb007ea6477918af9b98ae6b9690e83068ace27034d97aab2ee
+EBUILD gimp-2.10.8-r2.ebuild 6122 BLAKE2B 7c9920ac058c8943f16bdc96414fc435f19edb14a5d930755aed8f82986682ba6486f64458f8eda6ddd0eafde676b0d1668645f9e06d93d92375c7f8075e77cd SHA512 199885da291857914cc9ece95f3754ea60d323621faab7db2fc06becde6567d849a7161489711d61289ffe6a906c2d4c99d25f90f8fe8bea1da19e3d1fd1e893
+EBUILD gimp-2.8.22-r2.ebuild 5144 BLAKE2B ee9b42725954a93b53c27a06c0902b0fdafef788fb43075a4b2c8f1be42b230f359fef2962b603bbea8e805e85a6059bd6215d766c6f145bc2eff405b65a80c2 SHA512 1fb1267d470d2427706c5d16cd93a324123437e128aea441318534205c365cd7797c78ac79e6adedc70aa1de01cd8fd5e7ae18324695664d7d0c30069c673ed7
+EBUILD gimp-2.9.8-r1.ebuild 6068 BLAKE2B 86c853189f8a7aa5e6247d1f973337e3149ea44e13f4adc022b2e6f15eb51ecd4473e862721fd3ee841f5f36108230b2444039e5cb21898c274c97506a285800 SHA512 da7b01a4dafbd9d991ce050b3c8c5d1ce6b1f2d9cc8c4bde6463d5ebfcba2a8399c1f8f61062f1fb564c530acfea5036b6f8d5c3b4b1a291cd575a00df9deb28
 EBUILD gimp-9999.ebuild 6152 BLAKE2B 26ca217a370be419450cf6f9ef66ceed8c8d77bc260de37ab74c5f6706b6c032befe261ada5e9a82fe4c6bc8b4893080e1ee64435fd25c39e829b29a499db581 SHA512 6565b9cbe478c9c311a036897cf3c1f9b3841aea0b3095665e0d482ad85cb22274660b1800dbc50f9225e88d2e262c5995d6763d28ef99caa2021f231924ebd8
 MISC metadata.xml 628 BLAKE2B f1326f51db692d6e64d1bb7b44dfada65799d7ab94279771e6bd729189145a8a4bbe7a83c776bfc46acf682ad9f34c84598d25fb0a3606aabfa30383b35a9694 SHA512 cec60cde9763bdb9012fec754b95018f09da5cf7ff2f577206417651df5c18251dd5c58b1e32fb45e7c2121e06c0a5b7dc86d08b9511da4cf103bcf2fa1b6e52
diff --git a/media-gfx/gimp/gimp-2.10.8-r2.ebuild b/media-gfx/gimp/gimp-2.10.8-r2.ebuild
index 936e49178bae..81f9d5d67b15 100644
--- a/media-gfx/gimp/gimp-2.10.8-r2.ebuild
+++ b/media-gfx/gimp/gimp-2.10.8-r2.ebuild
@@ -126,10 +126,7 @@ src_configure() {
 	local myconf=(
 		GEGL="${EPREFIX}"/usr/bin/gegl-0.4
 		GDBUS_CODEGEN="${EPREFIX}"/bin/false
-
 		--enable-default-binary
-		--disable-silent-rules
-
 		$(use_with !aqua x)
 		$(use_with aalib aa)
 		$(use_with alsa)
diff --git a/media-gfx/gimp/gimp-2.8.22-r2.ebuild b/media-gfx/gimp/gimp-2.8.22-r2.ebuild
index 2019f5fca97e..aba75474c081 100644
--- a/media-gfx/gimp/gimp-2.8.22-r2.ebuild
+++ b/media-gfx/gimp/gimp-2.8.22-r2.ebuild
@@ -75,7 +75,6 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 pkg_setup() {
 	G2CONF="--enable-default-binary \
-		--disable-silent-rules \
 		$(use_with !aqua x) \
 		$(use_with aalib aa) \
 		$(use_with alsa) \
diff --git a/media-gfx/gimp/gimp-2.9.8-r1.ebuild b/media-gfx/gimp/gimp-2.9.8-r1.ebuild
index 76a5a7bea1a6..1213fde7aff4 100644
--- a/media-gfx/gimp/gimp-2.9.8-r1.ebuild
+++ b/media-gfx/gimp/gimp-2.9.8-r1.ebuild
@@ -116,10 +116,7 @@ src_configure() {
 	local myconf=(
 		GEGL=${EPREFIX}/usr/bin/gegl-0.3
 		GDBUS_CODEGEN=${EPREFIX}/bin/false
-
 		--enable-default-binary
-		--disable-silent-rules
-
 		$(use_with !aqua x)
 		$(use_with aalib aa)
 		$(use_with alsa)
diff --git a/media-gfx/gqview/Manifest b/media-gfx/gqview/Manifest
index f4c8d9a4c53f..d08fddb59fe1 100644
--- a/media-gfx/gqview/Manifest
+++ b/media-gfx/gqview/Manifest
@@ -6,5 +6,5 @@ AUX gqview-2.1.5-readmedir.patch 257 BLAKE2B 9db86f9542121dd8f0a0c3004b945adae8a
 AUX gqview-2.1.5-windows.patch 561 BLAKE2B 142f068e495c2dcd090649f93b8f3a55ca894c76d31deed0403f99b0830750e133ffb1e6ad651454c6ef01e95c35571b3f30f3502a2eef2d3e01174a20251441 SHA512 f4382d81362efca9decd18f93ffcabc5eeb36251b67377d35a6de87eb0672b24e15d82610b64865415fa23f6e26090c557b7f1df8092cf34b38f7106dd7a33c3
 DIST gqview-2.1.5.tar.gz 1685061 BLAKE2B f47c0e5937ea87223c2110b148c5a52b912d6c65476e5f2d67377e544bb42cae919796d1714992cda6f0e7e7409a7bd0dd6689ac37d2da41254118b699327b9c SHA512 a9e184f9bfbcb789fa732f490b5b1883aaa4c153fb924e2995f36ddef2d170ad9d0695689221d7a0ccae587f5de07b34ca03fa407f774ed3505d0183bf44b555
 EBUILD gqview-2.1.5-r1.ebuild 969 BLAKE2B 6a2e18f895633b97c3f437a6eda7a0229d6ffcd8853a518198071e6401e23bd181d4a3d3ebb2f319bce2d4bbd2be0ed325d91e0a0d4e52055d3c55657e25fc34 SHA512 a2ad1697208f0f963886e6551ab455cfa002ab2461bac416ea7e53134d0d50e31c5bf7c4b4ef72655c485773b42842d11fc657897f1c8ebf07909cee23a4d1d0
-EBUILD gqview-2.1.5-r2.ebuild 1180 BLAKE2B db15f09b99c6e6c2e4ec13b0b177f97377033d99b2540a9e5b663c5658b8b6cb3a4299bc08efbe406e5fac5424c7887d9f7eef984b47878a7a023393b223dbfb SHA512 66e738c61485b8048e53b26da3a13bef78656e216166f4f0e040f073a0361ac9a1885bd333f64d9102f52eb55ea8a9a6ef20e226571b0fdb7197f3219e42351c
+EBUILD gqview-2.1.5-r2.ebuild 1130 BLAKE2B 81a8185e80bda2b8dc752fdfbb4f5c7d3738f2ad6cc4a5fcdbb5af7b72876b379e19534c6827a4ccb1e00a4901fa31851e68ad3a395eacd13590d80202bf8f75 SHA512 4ad8e2bd540df505047b19d55f8a051c30ba9b0307d5a4215168799499cb69d79ba8b9fe546e0cb25f1a1306508fb886a41a518e3fdce4f91d514d72465170c5
 MISC metadata.xml 447 BLAKE2B 632ee924036fc4dde09ca3a05043ccd38e4fbc9583ee9498c1fdf87f6d91ac944b1c600f9da68d33a498c137d4133c2a53f8d03677c50f228ef30e5c108a42d3 SHA512 f6a5af4d1e5effb6e9cf58edb237be34d69bd9927ae8f2f9fefe88303bd2936e6f58f09367977bf9c9c814d299465e0acf949c045df9177bcae15598fbd6534f
diff --git a/media-gfx/gqview/gqview-2.1.5-r2.ebuild b/media-gfx/gqview/gqview-2.1.5-r2.ebuild
index f64729a5a87a..a05ba7269432 100644
--- a/media-gfx/gqview/gqview-2.1.5-r2.ebuild
+++ b/media-gfx/gqview/gqview-2.1.5-r2.ebuild
@@ -42,9 +42,7 @@ src_prepare() {
 }
 
 src_configure() {
-	econf \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
-		--without-lcms
+	econf --without-lcms
 }
 
 src_install() {
diff --git a/media-gfx/gscan2pdf/Manifest b/media-gfx/gscan2pdf/Manifest
index cb0816b2b1bd..fd8bce9575ad 100644
--- a/media-gfx/gscan2pdf/Manifest
+++ b/media-gfx/gscan2pdf/Manifest
@@ -2,6 +2,6 @@ DIST gscan2pdf-1.8.11.tar.xz 409212 BLAKE2B 37cb716f13818eaffc39c210b810b845368c
 DIST gscan2pdf-2.6.3.tar.xz 459276 BLAKE2B 395260a2034e9ac782c4c6104af5dc24561d271b45a359762cef990fce9f8343c6dc3c863ad66fc0ba56991df20945384edb695e3d94fa5fcc58c78ad039d380 SHA512 77478e7d35a90fd737a28f302bac214d3946cd5f0ce93f8d22b3485a6d1150ff2834433d028487fea4433a36a532714b4f47e8fbba3307c178fc161a0adbdbb0
 DIST gscan2pdf-2.6.4.tar.xz 460636 BLAKE2B 80d6123f8849ce305ca9b914da267f5b8898d6b3b660026ba075e5f8e10fc78093bb49d3186ec6a90d32b8c6ae0dade70fc146dcb677540810c06e91186bdbd7 SHA512 10d08b10f3101759757a2d98f2c2b41813a5f67234471f746ecda5ffebe085cb0d435343d05fa9107ed942785f707c7c2d8db6e430b1af335afe30b1d9079f08
 EBUILD gscan2pdf-1.8.11.ebuild 1731 BLAKE2B 0b0f7cdfef98e666e20e44882584e0636e490429186e441d87f965e74071f5076693896e17e68184319dfaf3a1fd4487140209ef3b49603c9496cc936516333d SHA512 b94b73d3396208a8c67c2aad407815329501717c364d60189b21d96f652846e554d59a2a36f4b58383d7f49ab728d4fe251bce9ab1944befb667a9e0c09237b3
-EBUILD gscan2pdf-2.6.3.ebuild 2318 BLAKE2B f0b8c7ddcfd7fb1033b4214b3cf49ebf440e50c517ae212c24ce5b9ac055526d356e09ce3dc5df0dd1f7745bc80e7791e1a9ec8f13d188c9be08fcd0e98239d8 SHA512 404b6aceff7b758f2f6ae45c8187564e242f3d24e69db2012c155e4bf17a18a95202c9a3f1f3fc1aa5bff04bb6b0a27701cbb3e636e9a37d98d03f5a90092904
-EBUILD gscan2pdf-2.6.4.ebuild 2420 BLAKE2B 4e1824b65e2b7f696ed5fc73073a2e49263fb052af14c0a46f88a308f345d6663b125df3b60ae1d5c1b86122b61206991aaf8c82ca1820354216b378dee0b845 SHA512 889325f26253e3d389c9db922591ff803e7ac3f02eeb659e669645564eb92dac13c7ebe4fc8df8930ac854f30d232f4346ee80e8c65ba5575c7368f3af2ff4ff
+EBUILD gscan2pdf-2.6.3.ebuild 2319 BLAKE2B 4c29240a5b5fc984cb4b6b10643c918e696ec6a8564dfaa2a1a0e2a1e1457d2c24a79725c8b70767d59abc9b5fbfcc763fbdf24334f7806a29e54aefa4f81891 SHA512 e8ff79b2a675db017e5af440c5772ab3e1076613213d219da2f68976f8f1631fa8b7c9c3ab08c7d2bce50dba624fcd5f40832b8e4de2f70cf030af5f2429aa4a
+EBUILD gscan2pdf-2.6.4.ebuild 2421 BLAKE2B 0fa711b09f01a9ac476fc921ab6365a785ce4c027f3068a63618d6c7f9a76fb908336e3061fb978a9d76535d60184f475dcc37d5865b1925565ba96d4e7494ac SHA512 cc0d0790aa2dcb1b9faef6ecdee6f14ab0a4f89a0c91099a254695884447dbdc072ba31841aa0d3276ba4e7a43473bf68cfaac2b885e6acd80e1cffb2a146873
 MISC metadata.xml 439 BLAKE2B 835480b0d68a079941e94f2646d0136dfb8a8e750e0279f8a5a2e23e6690242582ffe660798f5e80ebfb4378a576aa5715332b53230555866391a99ec28f54ff SHA512 af1cc05ac693899586df81036d2fa11af187edbb3c9449862298ba05efd0dbd0c4c5b008a1a21328c1f9a27a690671bd7a9967d2e457efb31561044e45984401
diff --git a/media-gfx/gscan2pdf/gscan2pdf-2.6.3.ebuild b/media-gfx/gscan2pdf/gscan2pdf-2.6.3.ebuild
index 0029080be8df..a415292cfd59 100644
--- a/media-gfx/gscan2pdf/gscan2pdf-2.6.3.ebuild
+++ b/media-gfx/gscan2pdf/gscan2pdf-2.6.3.ebuild
@@ -77,7 +77,7 @@ pkg_postinst() {
 	optfeature "sending PDFs as email attachments" x11-misc/xdg-utils
 }
 
-src_test(){
+src_test() {
 	local confdir="${HOME}/.config/ImageMagick"
 	mkdir -p "${confdir}" || die
 	cat > "${confdir}/policy.xml" <<-EOT || die
diff --git a/media-gfx/gscan2pdf/gscan2pdf-2.6.4.ebuild b/media-gfx/gscan2pdf/gscan2pdf-2.6.4.ebuild
index 58c42016341f..cda89719399f 100644
--- a/media-gfx/gscan2pdf/gscan2pdf-2.6.4.ebuild
+++ b/media-gfx/gscan2pdf/gscan2pdf-2.6.4.ebuild
@@ -83,7 +83,7 @@ pkg_postrm() {
 	xdg_desktop_database_update
 }
 
-src_test(){
+src_test() {
 	local confdir="${HOME}/.config/ImageMagick"
 	mkdir -p "${confdir}" || die
 	cat > "${confdir}/policy.xml" <<-EOT || die
diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index 50a8239877ca..cc5555ca103a 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.10-86.tar.xz 9064960 BLAKE2B 02adf3a7cf942f01fb5f3fb72cda4f407360fa223768f6988220df5be5210e19973c7ac2243df9b295d5a3e1c43515088b157502204c14e665611764c575e62c SHA512 6d3362a83168ecc5b710bc020db2fa30495d442ffff72a77a99fb8be56225283660cd00ac2d1f75c5d19b44c64b212221aadda90fc0a0d76cc2e1e32bca62ffa
 DIST ImageMagick-6.9.10-92.tar.xz 9071556 BLAKE2B 4b50c9c9d84592ee0073f2cb7f0174fd681624188a42a8ce074c0727df72894fd81df19c7c8c6f4ed68c56f709f8d558de4fd729513cf0ce781d5627151231bc SHA512 7fd74c2e59f373e457a8b60b8d2ae84e2511901c3d7d06fd4e715b821e2d4e72b9f64f3f9c1c0c543c2fce7e4855381ec30d8f0d007d4d3249502dd2c408cede
-DIST ImageMagick-7.0.9-16.tar.xz 9480896 BLAKE2B 182217c8c4a9425ca69722785da14bb8575ba50aaf9909fc39626ec34f54ff33b7cb5e627640005a00c1e94282b68a041a937e658eb6b06768149fc72f3807c3 SHA512 8f0c20cb863cfe0df30ef5140180273461d7bdb501670d0527bb6b17ac1adff3d500ba3c13e920c81935b4808cac11282808dd3cc81d1edac8429419fa34de26
+DIST ImageMagick-6.9.10-96.tar.xz 9071708 BLAKE2B e122275c2b18527ecd1e1086ccb636c5cea7c895b5540fffc39a98a7f0ac44dfddfc706668dd5a5c0bfd0f3d3037efe4576d200391e4f9dee821b82db3b02f75 SHA512 d1502c287bf0d592e4271d84bdbe9b17c8bd0aeff2bcb374d13b482c3c19deade1b96360a58972872a46c0677ebab8b84af6d0e4036a7a271cf615362e6086b9
 DIST ImageMagick-7.0.9-22.tar.xz 9485092 BLAKE2B ab1be450d9566943e8da0de33b47ba1dafe600fd5453d6df30682c7b0f881b78528cc5d97c14d42b3a7ad44a75d9a50b36a5cc1aacf7ec699f8c03e09d2324e3 SHA512 dc6d9c3e480d532efcbc6b0ba6d34985a86d5f280ed635fedd04898225e7002f56543e6ec13a603bda8d9d85861146c0f859f95c4729911c1e330cd158f9cec6
-EBUILD imagemagick-6.9.10.86.ebuild 6923 BLAKE2B db33249935f9938e01a1c271fc9f2874ec8a8eef00b2f1f024563d2aa27ca4d73bc80bdb796337b11bf9a496b239771b72a090d6e82669924a141a946051961d SHA512 60b9d3d71a8cb753e48f9edf5159bddb4a2471b439ad2ecae61f3237501220a7ca644889ffa8734676a65b50b5da410232457dde208bfe467cfd0e3d95f0b906
-EBUILD imagemagick-6.9.10.92.ebuild 6931 BLAKE2B 590e91832dbe44c3b3dedf956b0f01d3537251f09e7e2a96ed7b0cfd9b9a054597fc3f664bac68182e94fb5c9931d2d7e1f0c9fe83b711a2703fcb3c9f8df541 SHA512 662f13698db0a5fcbb34d04e8bb85e52f2469f003ca9dc337ce0a2c03dd9a381bbee2d4ef43979ff4f9991f9bab6c3d6701725a1df8135f4b052ae76317a7c42
-EBUILD imagemagick-7.0.9.16.ebuild 7198 BLAKE2B 6cec58bcde0421af89dc9c5049a77652fe46205cf9a391f742703fe8ee121439c5f43373677a39c88217f2017cc6e4aee2033c480af039ac6fdc646777ebb2fe SHA512 fbafdeab636fc3c4918e805efadaa7b1d063dd94b2e7bc8d3763185655f5fc01c801ae33ef3b59718d56ad8c1d082e2b26b6cc21dbacee6adf94ce94ea7bb4da
-EBUILD imagemagick-7.0.9.22.ebuild 7207 BLAKE2B 004df3bd1f94e9e8c082bc82bbdf949d1d981c8517c5f5033f0ed55c3e9d472565ed8a088292b389325922925dc57733c7a39e14d4d987bb20f50ede87789be4 SHA512 e03e1322c70b842799ce7e90984d940007cf75895ba6d35bd7cb32b39599bebf83feefa67704225d845c82c7f789cc1f9cc7a4269c7a49c48b8336aa350e4c58
+DIST ImageMagick-7.0.9-26.tar.xz 9493028 BLAKE2B 84d3f0bb59238db3e3a0c0f40b4b4b428dc81168468d4d9e7a0f00c74e46102c9c9444891236b105f293080f9601c7ed63ad4592a8ef622554b3aa0c043bf2fb SHA512 0488c6e0e0315bd5390cea952f7acb217e3c651c325f2cd4cb02475c25f7f721a31b20b53bb8b6dce064cedfbfd51711a34627fbb8a8c515636e7627ceda67ed
+EBUILD imagemagick-6.9.10.92.ebuild 6923 BLAKE2B db33249935f9938e01a1c271fc9f2874ec8a8eef00b2f1f024563d2aa27ca4d73bc80bdb796337b11bf9a496b239771b72a090d6e82669924a141a946051961d SHA512 60b9d3d71a8cb753e48f9edf5159bddb4a2471b439ad2ecae61f3237501220a7ca644889ffa8734676a65b50b5da410232457dde208bfe467cfd0e3d95f0b906
+EBUILD imagemagick-6.9.10.96.ebuild 6931 BLAKE2B 590e91832dbe44c3b3dedf956b0f01d3537251f09e7e2a96ed7b0cfd9b9a054597fc3f664bac68182e94fb5c9931d2d7e1f0c9fe83b711a2703fcb3c9f8df541 SHA512 662f13698db0a5fcbb34d04e8bb85e52f2469f003ca9dc337ce0a2c03dd9a381bbee2d4ef43979ff4f9991f9bab6c3d6701725a1df8135f4b052ae76317a7c42
+EBUILD imagemagick-7.0.9.22.ebuild 7198 BLAKE2B 6cec58bcde0421af89dc9c5049a77652fe46205cf9a391f742703fe8ee121439c5f43373677a39c88217f2017cc6e4aee2033c480af039ac6fdc646777ebb2fe SHA512 fbafdeab636fc3c4918e805efadaa7b1d063dd94b2e7bc8d3763185655f5fc01c801ae33ef3b59718d56ad8c1d082e2b26b6cc21dbacee6adf94ce94ea7bb4da
+EBUILD imagemagick-7.0.9.26.ebuild 7207 BLAKE2B 004df3bd1f94e9e8c082bc82bbdf949d1d981c8517c5f5033f0ed55c3e9d472565ed8a088292b389325922925dc57733c7a39e14d4d987bb20f50ede87789be4 SHA512 e03e1322c70b842799ce7e90984d940007cf75895ba6d35bd7cb32b39599bebf83feefa67704225d845c82c7f789cc1f9cc7a4269c7a49c48b8336aa350e4c58
 EBUILD imagemagick-9999.ebuild 7207 BLAKE2B 4fc6e4d61f5e851d55546614830dbc3d9a23003033f55ac521bbe990d845aa2b7b7623c66da431f896df16ee71d6539bac7fdf0204c61f00d010c9013b92fef5 SHA512 97ebbef19227007aa32140de833e25d49c9a8f648fda30a9a0abe8073329b0df5a79a74968d5056b3d342e87d435072d64d360ec4270aca53491938c4cfb7f42
 MISC metadata.xml 1111 BLAKE2B 3592f2d81f67d91239152d723c736437a5e8056f8dba1fc5c97e2ead08efd4e913400b441eb6d6b90f26cccf3b89f115c18a5551bc070d1fd81e68dd218493c9 SHA512 33bd68bc4f88cd6029528b0feab9cc9fde0d60475ba5fad8c4f92ff6d373666628e6525d54268735e99182abd2658aa32c7c72ff22106c65f81ed8af5e4f7ea2
diff --git a/media-gfx/imagemagick/imagemagick-6.9.10.92.ebuild b/media-gfx/imagemagick/imagemagick-6.9.10.92.ebuild
index 57ae3d2ccac0..ce112a772a73 100644
--- a/media-gfx/imagemagick/imagemagick-6.9.10.92.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.9.10.92.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
 
 LICENSE="imagemagick"
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh 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"
 
 REQUIRED_USE="corefonts? ( truetype )
diff --git a/media-gfx/imagemagick/imagemagick-6.9.10.86.ebuild b/media-gfx/imagemagick/imagemagick-6.9.10.96.ebuild
index ce112a772a73..57ae3d2ccac0 100644
--- a/media-gfx/imagemagick/imagemagick-6.9.10.86.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.9.10.96.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
 
 LICENSE="imagemagick"
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~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"
 
 REQUIRED_USE="corefonts? ( truetype )
diff --git a/media-gfx/imagemagick/imagemagick-7.0.9.22.ebuild b/media-gfx/imagemagick/imagemagick-7.0.9.22.ebuild
index db7f1fb9468a..447fb88f37fb 100644
--- a/media-gfx/imagemagick/imagemagick-7.0.9.22.ebuild
+++ b/media-gfx/imagemagick/imagemagick-7.0.9.22.ebuild
@@ -13,7 +13,7 @@ else
 	MY_PV="$(ver_rs 3 '-')"
 	MY_P="ImageMagick-${MY_PV}"
 	SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh 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"
diff --git a/media-gfx/imagemagick/imagemagick-7.0.9.16.ebuild b/media-gfx/imagemagick/imagemagick-7.0.9.26.ebuild
index 447fb88f37fb..db7f1fb9468a 100644
--- a/media-gfx/imagemagick/imagemagick-7.0.9.16.ebuild
+++ b/media-gfx/imagemagick/imagemagick-7.0.9.26.ebuild
@@ -13,7 +13,7 @@ else
 	MY_PV="$(ver_rs 3 '-')"
 	MY_P="ImageMagick-${MY_PV}"
 	SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~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"
diff --git a/media-gfx/inkscape/Manifest b/media-gfx/inkscape/Manifest
index e51902325fbf..09bdd6f4b577 100644
--- a/media-gfx/inkscape/Manifest
+++ b/media-gfx/inkscape/Manifest
@@ -12,6 +12,6 @@ AUX inkscape-1.0_beta1-do-not-compress-man.patch 454 BLAKE2B d680993be80d9069c79
 DIST inkscape-0.92.4.tar.bz2 31929728 BLAKE2B 892bf4ed913019b27a9b8897e3ae32c44152163ded0eb345d59915ffdc9818d29f210de3294ef1b05601141185b5e3b10779778551b860f31e7df5c659492c77 SHA512 b9034605a79cd8aea808edf42e284819951ae1ea67778f0922f4c10224e94aca6c844acbc2294625773f0a7047d4e32ccdada876238a792a2c17db172c88e120
 DIST inkscape-1.0beta2_2019-12-03_2b71d25d45.tar.xz 39508392 BLAKE2B fd48f22439d1182aff1db5afd74870a6c1d291afb310fc9fa5036fa3c2547ead8c17f6cd67f77a56f655c56af8ffaa7a349b17166c7b18ef3ddf234aa6e57805 SHA512 029508d4867ac0890b2c9c4d274408f849a17e8a7978853df38543d94e7c08d33546a8a40fbcd940da1ba847f11e37ff2bafa285174b65d45ee5de59e907e78f
 EBUILD inkscape-0.92.4-r2.ebuild 3836 BLAKE2B 39efa33d21c2ae8054827c76cfe451a60fbca48b12a4eeb106bd0b03895ecf02102df8fd2c28626d7daf4a720eaeb67d4e3642f214d9f4ad68b3c183826a4e47 SHA512 8c2304ac76e116472f726b952ebc3a47478ca78d50686c1594ea55555b7e39d1f1003118ec6572244735f871a18f55ec49391fbde3d327b204d518cf84978f03
-EBUILD inkscape-1.0_beta2-r1.ebuild 3976 BLAKE2B 683f82a3d9a6c38b300b32d7fa068d9a0f48742c795b96983479b97220fcc9f5b55c5fe5a0db1f4bbbb0db8e7b99ace1f7b6cf55099c53158db92f609b06f194 SHA512 3fa193291787d0cc72538254e0bb078ce1f52f1737a3d73507ec214b1ace7fd1ebd368dfe1bb520017b9204e15b1e504ba6e950c784e93bb4be628c99d287783
-EBUILD inkscape-9999.ebuild 3872 BLAKE2B c6c462f94bcdd5008970dc87ecedd04a92df986896e2d20549f4079abd7d89bc116d963591a84ed14b0088836ed9a9c077992f53a9f5bc453ef0057bf60e0212 SHA512 ff66fcc652da60c452fe883da71cfc09eeb9586595ff91355aa7466784112f872851e8c58acc5d35eac4d2779800ff517a73b013479fef5f35e33ba781fe2729
+EBUILD inkscape-1.0_beta2-r1.ebuild 4160 BLAKE2B ff8fe48e09e96ce2ff5b1a9eca34c4fc249ae22a1b057cdf7ef714fbb43878e9bed4e2811a260eb5cb03920b4fd2eeda988fb27f290714fa3e1b6bd2947427e2 SHA512 2363a42f4053c03ab8d02beed5f51054f517d0814780d93f3b68315bc594f1a0d4906af7ab8cf68de965edc12104da726ebb0d70613b9aba988ce4fb22159d59
+EBUILD inkscape-9999.ebuild 4056 BLAKE2B a24e811d39011b09d28b5e4d44db85f4d225219d14b80c7b8527dad38fc46e4365471616ae582eb261a518d48827f57cf0e25cb1c3f534ff540162e7a9d95472 SHA512 cdccb07f6f0f6c7c6b6448f1fb1662a9cacc58f52bbbdb1ea9ca2fde52b5170e7ea5640c56ee0909312b8e9a09eec071b9192096bfda46d76baa17fcd51d8e3c
 MISC metadata.xml 951 BLAKE2B 5610cce03a912f378f4bbb997bb9acc028f2f02c1ec40034ed523b7f7cee2cc980f1f24fb8fbd26b40d494a514769b722ca64e93078c82ad75c9db94a9f19ca4 SHA512 f62078fa96c501f4d8e01d4e539b74b91cbf90997392e903e30db9c3a117c2ccc7f2d3e1c2e62c85362cd0a2d504dd565cfd70f92e5b947d416f8a3f2cd88f8e
diff --git a/media-gfx/inkscape/inkscape-1.0_beta2-r1.ebuild b/media-gfx/inkscape/inkscape-1.0_beta2-r1.ebuild
index 52bc56d18a54..6350c33d3374 100644
--- a/media-gfx/inkscape/inkscape-1.0_beta2-r1.ebuild
+++ b/media-gfx/inkscape/inkscape-1.0_beta2-r1.ebuild
@@ -132,13 +132,20 @@ src_configure() {
 		-DWITH_GRAPHICS_MAGICK=$(usex graphicsmagick $(usex imagemagick)) # both must be enabled to use GraphicsMagick
 		-DWITH_JEMALLOC=$(usex jemalloc)
 		-DENABLE_LCMS=$(usex lcms)
-		-DWITH_NLS=$(usex nls)
 		-DWITH_OPENMP=$(usex openmp)
 		-DBUILD_SHARED_LIBS=$(usex !static-libs)
 		-DWITH_SVG2=$(usex svg2)
 		-DWITH_LIBVISIO=$(usex visio)
 		-DWITH_LIBWPG=$(usex wpg)
 	)
+	# We should also have,
+	#
+	#   -DWITH_NLS=$(usex nls)
+	#
+	# in this list, but it's broken upstream at the moment:
+	#
+	#  * https://bugs.gentoo.org/699658
+	#  * https://gitlab.com/inkscape/inkscape/issues/168
 
 	cmake_src_configure
 }
diff --git a/media-gfx/inkscape/inkscape-9999.ebuild b/media-gfx/inkscape/inkscape-9999.ebuild
index bc57307639b5..aa29d78aa48f 100644
--- a/media-gfx/inkscape/inkscape-9999.ebuild
+++ b/media-gfx/inkscape/inkscape-9999.ebuild
@@ -131,13 +131,20 @@ src_configure() {
 		-DWITH_GRAPHICS_MAGICK=$(usex graphicsmagick $(usex imagemagick)) # both must be enabled to use GraphicsMagick
 		-DWITH_JEMALLOC=$(usex jemalloc)
 		-DENABLE_LCMS=$(usex lcms)
-		-DWITH_NLS=$(usex nls)
 		-DWITH_OPENMP=$(usex openmp)
 		-DBUILD_SHARED_LIBS=$(usex !static-libs)
 		-DWITH_SVG2=$(usex svg2)
 		-DWITH_LIBVISIO=$(usex visio)
 		-DWITH_LIBWPG=$(usex wpg)
 	)
+	# We should also have,
+	#
+	#   -DWITH_NLS=$(usex nls)
+	#
+	# in this list, but it's broken upstream at the moment:
+	#
+	#  * https://bugs.gentoo.org/699658
+	#  * https://gitlab.com/inkscape/inkscape/issues/168
 
 	cmake_src_configure
 }
diff --git a/media-gfx/jhead/Manifest b/media-gfx/jhead/Manifest
index 9515ace331de..c925a40ad631 100644
--- a/media-gfx/jhead/Manifest
+++ b/media-gfx/jhead/Manifest
@@ -3,6 +3,6 @@ AUX jhead-2.90-mkstemp_respect_flags.patch 892 BLAKE2B 3a0c4ae7bf32391b32a405541
 DIST jhead-2.97.tar.gz 68361 BLAKE2B ed13d637dc491ad1c6ed7f9a5b0b526c80f69b8c521e3618289b16523ebb12690fa53a0a273f3f5793f970f390430d56c8504bed30fb45c5e9e2a9ac248f7667 SHA512 9b33451546e5ad3b82fe6001515fd572925a1e2c11af763ae32d71ad2cb056ffa8d97abe14bd48ae5f6144da9d8322965387537d61e22d22b02624ebf351c230
 DIST jhead-3.00.tar.gz 69151 BLAKE2B 23522718f07cd0b52b3d7fbd6d0f69ca5ecd5499174b06c6572be1319b275dc93eacd270f33cd7b3380ef85e6615aa79adf1fa9a1a86404876b35c31cdb0c95e SHA512 daedfe7ea6be051f769e9a1e0946ea0fa741f387bbc5ba55eec394fb3f37b18a66aa8826190c790eb50a5b9d445ee0d5a28a08d181db3be469686b0675540fbe
 EBUILD jhead-2.97.ebuild 743 BLAKE2B 4df5635844b53852f0fbc56a12130d338d99ed6ff19f5c6aec3727df51f89eab5937cc1cc11405ccb56a5dd5bc64f8b55c6155426722f7b386a979ab8b66f94b SHA512 1c95628553d0bd1d8e93b405e95c68bb5890a878a2e49ab8eba67b176626976199db8d224dbb409364120c79c99c7e0626464089b7c02ac9e097a398a3b14483
-EBUILD jhead-3.00-r2.ebuild 711 BLAKE2B fd9cd6299a0a6d4955e58e4f5ee3af77f14155aff3687fcff8c3a6b91cd4095cf950987893f3d30fdeb6936fc4f081c877c52e0c868120e2392e0436e9fa3347 SHA512 98ba55bf301b2cdcd5ab8b53e1e1612b62da19aa5c41f884eb1e72936487b747b45ab06375489d8999a91d549a57c816079f0d219c6ac929bc9164d425a27e84
+EBUILD jhead-3.00-r2.ebuild 712 BLAKE2B 5ab22c7fb0d1137d7a18f4020737dd30934eea11c00509288255205ee574e255af1b0de1092f8f3822d0dd7b86e3a9dc8b5b50fb327df7fccb5b83add9353464 SHA512 1c44c47e0a404a8a0aff91f4e0e97e0d0edbc1e120361fb068bdfa2d9a74e31ed3420d82f006d4d86cdc1bf218904d40a13f45d5ddb46ac66f91694a098728df
 EBUILD jhead-3.00.ebuild 746 BLAKE2B 576096a432b63a988861a85e05ebb92f1a4346bd012f74269629a2b868254a372699a4ed3be74ae78cb90df792ee61e77842da6da46ec98ae6a570faedf3fb89 SHA512 2f711c62175a02cc968fc698fffff784743a8befe3c315d294e78978357de5df3ee0c665ae70baf64091db4c3744f1c2aa3853fcae87754eb8a67d0a08ebe4a5
 MISC metadata.xml 255 BLAKE2B f12a1ca502ad96bd6de4c8b83dfb8887ab70dec78f10a8b52dcd4618eb182192477ddca18738d734a43f3c7ac3b5e0955f4ae9347ea80e788a92974c7d50a574 SHA512 b7bc93530a1726c2d4dfbc71ae29cfbb57712fd9fdd2e76fd52f35ab4368cba0497b50145d1527a3b79e465d459a380821bb1371a01c2e915dc9adc6c7fafd5f
diff --git a/media-gfx/jhead/jhead-3.00-r2.ebuild b/media-gfx/jhead/jhead-3.00-r2.ebuild
index bdd27b31809c..f5953484db7e 100644
--- a/media-gfx/jhead/jhead-3.00-r2.ebuild
+++ b/media-gfx/jhead/jhead-3.00-r2.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
@@ -12,7 +12,7 @@ SLOT="0"
 KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE=""
 
-src_prepare(){
+src_prepare() {
 	# bug 275200 - respect flags and use mktemp instead of mkstemp
 	eapply "${FILESDIR}/${PN}-2.90-mkstemp_respect_flags.patch"
 	cp "${FILESDIR}/Makefile" makefile || die
diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index 9bb42a0ef04c..18b3aa14e159 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -1,8 +1,5 @@
 AUX krita-4.2.4-tests-optional.patch 12292 BLAKE2B a30463dcc6e02e877b308c4add529f0657d96ace7a13ba7424f4cdf260f3b636d03b2bac224d6239253393650163b622ac54d8d81bbdced2fb153bf216b5fb2d SHA512 1d5045b35981822bc16c4b23e573a299a8325353c8be347c56a4e2fc4e3cd9e937e8eb253f9c6cdc0197a3db7989b822fb41274afe3cd506b9c907daf1867df3
-DIST krita-4.2.7.1.tar.xz 164304772 BLAKE2B 99a4c3b6a48d1d695ee5bb8f6576c9a4593e1ff3a10846340974588ff8b3c061a7838b862c1ecdc4f0635ffa270cb272f1155b1efca4dbf50a11096ee1e92d48 SHA512 28f4af4131a0f364b285596031a3f59a8bd7e97930cd740a4767dbe95540dc403bd6ae0a99ff2bef95e2bac6f23931873404e4fed3ea4afd4b614b5f7d823a35
 DIST krita-4.2.8.2-patchset.tar.xz 13848 BLAKE2B 86059e08833541b7d4dfda2c36cd1479809452171353b755ab3a264fa41fb99fc7ffacf064af3767aa095fda81aa9a2212b63c7242c72f94ca23a83b34c0502f SHA512 79532700c967f94479af22e2fbd33c0b6d8c4295c872316935800b99258dceaedbac2b1c6314251d4d621c25a328ea602f49d415cc9275095bc3cd2f29756a61
 DIST krita-4.2.8.2.tar.xz 169994064 BLAKE2B fc390db9e3aaf3f4355e600a98ea479aa510895c26cb82e8800fbff64031bab7a26e0c37d6d274e6397a38c1bc33cff6b48cb5a7c6e61b56579e92e33279b1c4 SHA512 5482ebd62c530764b43439d6782fa7e1793877657620967ea0f6cdad166e3ff508b36cd04bd99c192d35a237c4a0da08477069e333ebaf2093785e207402dea7
-EBUILD krita-4.2.7.1-r1.ebuild 3085 BLAKE2B d74af4a0f54c2d32891331f56af901c53784dfc5225107f6964e0d3233c6bde8ef7448886fac2452e97086b6a0f7274d318c500d579bb1f26f012fcf9dc7d671 SHA512 a21571b44aad77ad5e6d2bed068f2bd847ebe1022604c4e5c7df13439d38811312e4d0943dfb30f276105e52278055c17ab36c04fcb8621be022ca9dde428bd8
-EBUILD krita-4.2.8.2-r1.ebuild 3078 BLAKE2B f750a48f852abf028e06ea9c68c1dffe7fa0d855e9be0d5c426825e0e1155c089f114022d7be8355e441701dde776bb516fe9e06288284050ffd92c756a8e684 SHA512 27c41cba15503acb849278c14678228a445ec0534d80d370200a68f9ab5bfa48d13d903ce9f6bbeffa8aba757ebee8e43e75638575b49cc51844cdc97a5e7cb1
-EBUILD krita-4.2.8.2-r2.ebuild 3231 BLAKE2B 154fc4eb751841d36fd99381a98398481e046770edf3bdf5686baa119c539cecb1a374e380a35dacad1fbce44de382fa506fea974265848c0791396a3ef38aa8 SHA512 8f91ad1ebc4cf806c97f606c8572345d94c432cfb047bf2e0ed2e7f1c9d64448f5eabbc99b47bb4d0400bdedfb3c9b7963bcd3e3444fffab3f90f966105879c9
+EBUILD krita-4.2.8.2-r2.ebuild 3230 BLAKE2B e6435fc3caf8dca8889b2a31666cdddb9e59f3a343c7ee63ec2d07426cd287ca1ff6505508cb391ba939119cfa972c85ec7e8765adb49115b0baee05b5ce44a2 SHA512 c61389ddb2442246ed73be81b180e12c6a5a7c12d30553b03bed86b9aa2d0a71eeb75eabb65c4f157c34ae8b3d40b76c520b51da20216053c9ea81ff22e1f152
 MISC metadata.xml 696 BLAKE2B 433ca97e92c2e6c8a0f5bfbd4cba667576be6cc8c93330b689e0088663ac6df263d62b7be6d42debf3480b706721f06be089c5e9a139451e49b609ea4a081ae2 SHA512 becd89686babf0fde2a7e53196715bbca2a4f0d6bad0bc3a55128c9ee19dbe5819be1020db6458ec0c053cf7370a390ff1e84fd9c49331fc28e5a60348fd34dd
diff --git a/media-gfx/krita/krita-4.2.7.1-r1.ebuild b/media-gfx/krita/krita-4.2.7.1-r1.ebuild
deleted file mode 100644
index 2d2e1b4c6547..000000000000
--- a/media-gfx/krita/krita-4.2.7.1-r1.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-PYTHON_COMPAT=( python3_{6,7} )
-inherit kde5 python-single-r1
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~x86"
-fi
-
-DESCRIPTION="Free digital painting application. Digital Painting, Creative Freedom!"
-HOMEPAGE="https://kde.org/applications/graphics/krita/ https://krita.org/"
-LICENSE="GPL-3"
-IUSE="color-management fftw gif +gsl heif +jpeg openexr pdf qtmedia +raw tiff vc"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-BDEPEND="
-	dev-cpp/eigen:3
-	dev-lang/perl
-	sys-devel/gettext
-"
-COMMON_DEPEND="${PYTHON_DEPS}
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kitemmodels)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtconcurrent)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui '-gles2' '' '5=')
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtx11extras)
-	$(add_qt_dep qtxml)
-	dev-libs/boost:=
-	dev-libs/quazip
-	$(python_gen_cond_dep '
-		dev-python/PyQt5[${PYTHON_MULTI_USEDEP}]
-		dev-python/sip[${PYTHON_MULTI_USEDEP}]
-	')
-	media-gfx/exiv2:=
-	media-libs/lcms
-	media-libs/libpng:0=
-	sys-libs/zlib
-	virtual/opengl
-	x11-libs/libX11
-	x11-libs/libXi
-	color-management? ( media-libs/opencolorio )
-	fftw? ( sci-libs/fftw:3.0= )
-	gif? ( media-libs/giflib )
-	gsl? ( sci-libs/gsl:= )
-	jpeg? ( virtual/jpeg:0 )
-	heif? ( media-libs/libheif:= )
-	openexr? (
-		media-libs/ilmbase:=
-		media-libs/openexr
-	)
-	pdf? ( app-text/poppler[qt5] )
-	qtmedia? ( $(add_qt_dep qtmultimedia) )
-	raw? ( media-libs/libraw:= )
-	tiff? ( media-libs/tiff:0 )
-"
-DEPEND="${COMMON_DEPEND}
-	vc? ( >=dev-libs/vc-1.1.0 )
-"
-RDEPEND="${COMMON_DEPEND}
-	!app-office/calligra:4[calligra_features_krita]
-	!app-office/calligra-l10n:4[calligra_features_krita(+)]
-"
-
-# bug 630508
-RESTRICT+=" test"
-
-PATCHES=( "${FILESDIR}"/${PN}-4.2.4-tests-optional.patch )
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	kde5_pkg_setup
-}
-
-src_configure() {
-	# Prevent sandbox violation from FindPyQt5.py module
-	# See Gentoo-bug 655918
-	addpredict /dev/dri
-
-	local mycmakeargs=(
-		$(cmake_use_find_package color-management OCIO)
-		$(cmake_use_find_package fftw FFTW3)
-		$(cmake_use_find_package gif GIF)
-		$(cmake_use_find_package gsl GSL)
-		$(cmake_use_find_package heif HEIF)
-		$(cmake_use_find_package jpeg JPEG)
-		$(cmake_use_find_package openexr OpenEXR)
-		$(cmake_use_find_package pdf Poppler)
-		$(cmake_use_find_package qtmedia Qt5Multimedia)
-		$(cmake_use_find_package raw LibRaw)
-		$(cmake_use_find_package tiff TIFF)
-		$(cmake_use_find_package vc Vc)
-	)
-
-	kde5_src_configure
-}
diff --git a/media-gfx/krita/krita-4.2.8.2-r1.ebuild b/media-gfx/krita/krita-4.2.8.2-r1.ebuild
deleted file mode 100644
index 2348b287dfb9..000000000000
--- a/media-gfx/krita/krita-4.2.8.2-r1.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="forceoptional-recursive"
-PYTHON_COMPAT=( python3_{6,7,8} )
-KFMIN=5.60.0
-QTMIN=5.12.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org python-single-r1
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	SRC_URI="mirror://kde/stable/${PN}/$(ver_cut 1-3)/${P}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Free digital painting application. Digital Painting, Creative Freedom!"
-HOMEPAGE="https://kde.org/applications/graphics/krita/ https://krita.org/"
-
-LICENSE="GPL-3"
-SLOT="5"
-IUSE="color-management fftw gif +gsl heif +jpeg openexr pdf qtmedia +raw tiff vc"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-BDEPEND="
-	dev-cpp/eigen:3
-	dev-lang/perl
-	sys-devel/gettext
-"
-RDEPEND="${PYTHON_DEPS}
-	dev-libs/boost:=
-	dev-libs/quazip
-	$(python_gen_cond_dep '
-		dev-python/PyQt5[${PYTHON_MULTI_USEDEP}]
-		dev-python/sip[${PYTHON_MULTI_USEDEP}]
-	')
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5=[-gles2]
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtx11extras-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kguiaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	media-gfx/exiv2:=
-	media-libs/lcms
-	media-libs/libpng:0=
-	sys-libs/zlib
-	virtual/opengl
-	x11-libs/libX11
-	x11-libs/libXi
-	color-management? ( media-libs/opencolorio )
-	fftw? ( sci-libs/fftw:3.0= )
-	gif? ( media-libs/giflib )
-	gsl? ( sci-libs/gsl:= )
-	jpeg? ( virtual/jpeg:0 )
-	heif? ( media-libs/libheif:= )
-	openexr? (
-		media-libs/ilmbase:=
-		media-libs/openexr
-	)
-	pdf? ( app-text/poppler[qt5] )
-	qtmedia? ( >=dev-qt/qtmultimedia-${QTMIN}:5 )
-	raw? ( media-libs/libraw:= )
-	tiff? ( media-libs/tiff:0 )
-"
-DEPEND="${RDEPEND}
-	vc? ( >=dev-libs/vc-1.1.0 )
-"
-
-# bug 630508
-RESTRICT+=" test"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	ecm_pkg_setup
-}
-
-src_configure() {
-	# Prevent sandbox violation from FindPyQt5.py module
-	# See Gentoo-bug 655918
-	addpredict /dev/dri
-
-	local mycmakeargs=(
-		$(cmake_use_find_package color-management OCIO)
-		$(cmake_use_find_package fftw FFTW3)
-		$(cmake_use_find_package gif GIF)
-		$(cmake_use_find_package gsl GSL)
-		$(cmake_use_find_package heif HEIF)
-		$(cmake_use_find_package jpeg JPEG)
-		$(cmake_use_find_package openexr OpenEXR)
-		$(cmake_use_find_package pdf Poppler)
-		$(cmake_use_find_package qtmedia Qt5Multimedia)
-		$(cmake_use_find_package raw LibRaw)
-		$(cmake_use_find_package tiff TIFF)
-		$(cmake_use_find_package vc Vc)
-	)
-
-	ecm_src_configure
-}
diff --git a/media-gfx/krita/krita-4.2.8.2-r2.ebuild b/media-gfx/krita/krita-4.2.8.2-r2.ebuild
index 1507a29d7b47..a5a59ceb2b39 100644
--- a/media-gfx/krita/krita-4.2.8.2-r2.ebuild
+++ b/media-gfx/krita/krita-4.2.8.2-r2.ebuild
@@ -13,7 +13,7 @@ inherit ecm kde.org python-single-r1
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	SRC_URI="mirror://kde/stable/${PN}/$(ver_cut 1-3)/${P}.tar.xz
 		https://dev.gentoo.org/~asturm/distfiles/${P}-patchset.tar.xz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 ~x86"
 fi
 
 DESCRIPTION="Free digital painting application. Digital Painting, Creative Freedom!"
diff --git a/media-gfx/mcomix/Manifest b/media-gfx/mcomix/Manifest
index 5f7847bf61df..3ff381835e78 100644
--- a/media-gfx/mcomix/Manifest
+++ b/media-gfx/mcomix/Manifest
@@ -1,3 +1,6 @@
 DIST mcomix-1.2.1.tar.bz2 571128 BLAKE2B fa00e55e5cf2ef676a625b97ca467ade6b629fa08bfd920b8c370dc7d33c6602c5614d120d7279df32d063db646da8b635712ba90793175eea2c74c2c1973a8a SHA512 efa4d57edc3a48d9e711767fb3e233ef9b334ff8ba467999e572e60ed747a4ee4aa420c8aa7788b16d7eb6e0901d454d6a405fcec47a8c74098a49491e915cd0
+DIST mcomix-1.3.0_pre20200206.tar.gz 3292571 BLAKE2B ad76316020645495042d27bf831588e628da11077efe29b302a57be4e688558b4db8d3f850200bf4a54b84b428a16a52f88ea5e20be85b628ef3630a5f624643 SHA512 c98d4a7022993af3a5c0b5425df52f14b586549472bcd4576a72039c8c6d4fde31df4255df45ab7467acb0280bda02b92d4803b7f92b7c1c818b58df7b52a3ff
 EBUILD mcomix-1.2.1.ebuild 1684 BLAKE2B 593e3bffc8bb970f7839bc4ded48bef0505cfe30982d1432b357e4d4ab5607feb9999898afbafbc3855892249b2c5c18bae1586fd8db89d0b31a6c5bebbf11d2 SHA512 4b799f1e6d4a40f1aa88cbe34c27d787046b65ed05c55e0a5ca9918762b345481b7ed5bd8fbde10508e2f14f68ad16c8029aaf8a56c922e16fb635fc5809a1f1
-MISC metadata.xml 345 BLAKE2B 5b642c2387884d75cef7f8121f65d121dd6c83c3b0abc78cb2d81eed5195653fffd4c1e1ad4f441bfc7ee391fa5e356a10e28d05438dca5aaad25ece60d15f41 SHA512 2abfc4450db91c8b5a4645600e2a289d81d416e5f01f5f45020e5626a008bde48e6864c13a132c755b9dbafa1ebcd4756da7a1be30c897f02aad0aebaab38d5e
+EBUILD mcomix-1.3.0_pre20200206.ebuild 1796 BLAKE2B 6059407c351ea46238728e1545cba3be40cb433888f3ac8128d928c07c8eff86ba67b16f01f3218b470340871b7a280227c9e091e2511d84ad6526475442861e SHA512 b6e1e084514ec3fe38faed2e45d2ccb36a7897ca160a8290ecab5a78101f77133fa158a74eb113dc3944af80bbb613fb3d49a9bc6639154c44aaa214a57aca79
+EBUILD mcomix-9999.ebuild 1646 BLAKE2B 1d3b03cf2a5584f446b8b59501c044be9a7c4a10fd0aa20e8fa2f8fcd71f24c0e4a7b3d24e90e9ad152eccb639daaeba8aecb6e92724e5e6429f5e8fd367434c SHA512 3c5f49c2808abbe48dac1ff1ab6f2d92bf48e8882c972c325c2ab78a6ab4a2120f8c32a32e78bfae73da31fb78aec38e1d854737b8b9032592567fb71ae5e4d6
+MISC metadata.xml 523 BLAKE2B adac37e097094bc3704967b0ecd2c1366168e39e2fb86805846e2a9b92c1aabaff6e36e39d3318d45ed4147f9e8a253e561a75645d9672ec4a0d32f78673a3f6 SHA512 d36ee6da57cd276e16a95507ec3982a8a0f481044695185161b1a37bf95f709e972634397dd2aaa635c64b0dbf17406557a47e9e1f1a85ad18799ebe4eb367b1
diff --git a/media-gfx/mcomix/mcomix-1.3.0_pre20200206.ebuild b/media-gfx/mcomix/mcomix-1.3.0_pre20200206.ebuild
new file mode 100644
index 000000000000..dcfc08d61190
--- /dev/null
+++ b/media-gfx/mcomix/mcomix-1.3.0_pre20200206.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{5,6,7,8} )
+inherit desktop python-r1 xdg
+
+# Hash used for this version
+GIT_PV="b80f3485b6ec324aec1dc20f28296a8891ad70dd"
+
+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 ~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
+
+	insinto /usr/share/mime/packages
+	doins mime/mcomix.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
new file mode 100644
index 000000000000..15afb7c558eb
--- /dev/null
+++ b/media-gfx/mcomix/mcomix-9999.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{5,6,7,8} )
+inherit desktop git-r3 python-r1 xdg
+
+DESCRIPTION="GTK image viewer for comic book archives"
+HOMEPAGE="https://github.com/multiSnow/mcomix3"
+EGIT_REPO_URI="https://github.com/multiSnow/mcomix3"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+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}
+
+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
+
+	insinto /usr/share/mime/packages
+	doins mime/mcomix.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/metadata.xml b/media-gfx/mcomix/metadata.xml
index 266193ff5e3b..dc6d17f3b83c 100644
--- a/media-gfx/mcomix/metadata.xml
+++ b/media-gfx/mcomix/metadata.xml
@@ -1,11 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+  <maintainer type="person">
+    <email>voyageur@gentoo.org</email>
+    <name>Bernard Cafarelli</name>
+  </maintainer>
   <maintainer type="project">
     <email>graphics@gentoo.org</email>
     <name>Gentoo Graphics Project</name>
   </maintainer>
   <upstream>
     <remote-id type="sourceforge">mcomix</remote-id>
+    <remote-id type="github">multiSnow/mcomix3</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/media-gfx/meshlab/Manifest b/media-gfx/meshlab/Manifest
index a065de09e4ef..76273534c942 100644
--- a/media-gfx/meshlab/Manifest
+++ b/media-gfx/meshlab/Manifest
@@ -23,7 +23,7 @@ AUX 2016.12/remove-edit_mutualcorrs.patch 475 BLAKE2B 925756e7bed4fd9474b2a011f9
 AUX 2016.12/remove-io_TXT.patch 416 BLAKE2B 60aa9c033a4902c4a9acb76b1ac130076cfdef314ac57a144c0a83d59e1d7f2aa5e55c01c41ba671661cdeef249aa09e021085440214910c8153fa6303833c2f SHA512 2ff0391e5c0bd171bb06fc61cbe84112f5e480667f7a7caacbb3b3a0e566c6c2f31f443d8c6026298c3a86bf2979db534989b4eab368baaee67491b95e76723a
 DIST meshlab-2016.12.tar.gz 94194402 BLAKE2B 53dda75b51198d529d35ae64e1b9d8ec240ec6031835e6cde2ff1ad21403086112a6f4b9acf5c6f53328787078b3e1a90cc177f5e009834b310cdf6b168c59b0 SHA512 68bf863fc390725a949578b545bc749bbe2c07ca75d1461772c7777fd6a4b095f11b64b5b0e8b729f83fea1bb9e3ca4b41123cdea3799a8eee0de587eb7bf1d8
 DIST vcglib-1.0.1.tar.gz 9063634 BLAKE2B 91fba7ebf1ac18d0dfb33d3e26656e546b7c35ae753777730c44ebdf327413dfe94dd5e84907eb7e1644d70bfdf7d00ae8ecd0a81587d790a31354f7db09d626 SHA512 55d1854054744abae2d41e7b5041df89253bae108df5fc1cfe777013de7192dce04bc474475cb11a1d0343ebcab1ea61b381d9d9c36c452528043e85e75bc211
-EBUILD meshlab-2016.12-r2.ebuild 3499 BLAKE2B 091b524a914ae4e97ddeb36d280e00cfcfe73562528f701dc979bbe8b48d993ee542c3e62f02e21093c678d7c99918f18705f011db51fc376c64a384d4534123 SHA512 ca7e94c0b96acaedcbce13456e4cba2e58d8f98bbd1b0fe860703776c9c31d30658b05ad81c172a79fb1dadd06f5eb51156ff4bc44f4ac97e8f4159e162e11f0
-EBUILD meshlab-2016.12-r3.ebuild 3541 BLAKE2B fa43f8db5d083a4ff06cf5ed7063916c0c751db887b6c1dc99fd22c788c05460a4caa6f3ee9c846e6812a5ccc2b537f05a4b9655e7282ca9fdf18db3d1039d44 SHA512 c821471fc31987425988cc65112b8945f2b22f159ba43ad4a1028b52bfeba346e268f4209b6a032c01192180db10e3154497f5658442be1e01c29f768cb63e99
-EBUILD meshlab-2016.12-r4.ebuild 3627 BLAKE2B 3b2919f0861a6cabb15013b48cbb4c17e5ad2ab6c89b1f2d5926b8b62316df17a3278fb011b816f42fd215453895c37ebaaba5432eed8af736d1f1ea77715db4 SHA512 b8957fe1bf8e48e764a6b78830a40936315bef60c084bc62f07832d31fa6c29c2cb7d50de4dbec66aa874c16f6e837290b9b23a6f904a7a6312d0689861e511e
+EBUILD meshlab-2016.12-r2.ebuild 3497 BLAKE2B 9e3de165ab7cb48eec6289e55f2e1df0f88c9476ee0b67b7d99fdf052d0255143d48fac4002b3554d36ba967493ae3754fddd0a8c617b3aa30860cb887e6d547 SHA512 50433f5f61a00c4ecf33f901300156845ddc404ee427af7214fb42edd292cfe91cf26f5dc96d9cb7316e6b97d3934d9534a513c8d278d327fb82ff82df49712a
+EBUILD meshlab-2016.12-r3.ebuild 3539 BLAKE2B ce73969c0caf822ce458b4e3e40c591479f032fe9780b61bb2eb852cf9ae12eb933fb4b355b36b2af70f201a6a29135d8cba814be87af2369366b0fa798a6684 SHA512 a1df95a5610db88be56ed83e16ba4fd4fc71a7ff138435f1cfbaefe71d8dd9a56c193bdc32f9f7affd303c6ac4db4ffc244452cb20571e350d2f0a6dde6246f9
+EBUILD meshlab-2016.12-r4.ebuild 3628 BLAKE2B 4a8b4b1890378d70d4fa282d9814c9d39333c9b2b0cdd51e9ccf50f56d53b3bb5e9c723721f1e09bdff8728243266cd89f76af6b059197828ad2f99c6bedf547 SHA512 00166cb5e1f9ed0196ed6f96d8579be126a5778de93840545b5c536641204bac75365ea5f2430abc2f812090bca6ad18fe532e874d843c9de2861eba75cd27b7
 MISC metadata.xml 729 BLAKE2B 5c89ef346791f1aaecf313a580c18e32d37a116e87aa5955d21445816fd7a9fae30af5763dafe32f019fcda1333b3bfe48280abb1845fe096f223642badb9629 SHA512 f1d3b39a1c612b895463f0cb674411fce2614ff55855b964dee1b9c999aa1ad4bb6ec0a000cab9a1767f54474597836a92fda48722a3d8a90d21f412316e2b71
diff --git a/media-gfx/meshlab/meshlab-2016.12-r2.ebuild b/media-gfx/meshlab/meshlab-2016.12-r2.ebuild
index adc2830aa0fc..2c5cb0f61d06 100644
--- a/media-gfx/meshlab/meshlab-2016.12-r2.ebuild
+++ b/media-gfx/meshlab/meshlab-2016.12-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -60,7 +60,7 @@ PATCHES=(
 		"${FILESDIR}/${PV}/${P}-align2.patch"
 	)
 
-src_prepare(){
+src_prepare() {
 	mv "${WORKDIR}/vcglib-${VCG_VERSION}" "${WORKDIR}/vcglib" || die "vcglib mv failed"
 	default
 	#proof of patchset
diff --git a/media-gfx/meshlab/meshlab-2016.12-r3.ebuild b/media-gfx/meshlab/meshlab-2016.12-r3.ebuild
index 4fc8458b15a7..9cd64b0952cc 100644
--- a/media-gfx/meshlab/meshlab-2016.12-r3.ebuild
+++ b/media-gfx/meshlab/meshlab-2016.12-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -61,7 +61,7 @@ PATCHES=(
 		"${FILESDIR}/${PV}/${P}-asString.patch"
 	)
 
-src_prepare(){
+src_prepare() {
 	mv "${WORKDIR}/vcglib-${VCG_VERSION}" "${WORKDIR}/vcglib" || die "vcglib mv failed"
 	default
 	#proof of patchset
diff --git a/media-gfx/meshlab/meshlab-2016.12-r4.ebuild b/media-gfx/meshlab/meshlab-2016.12-r4.ebuild
index b9df6e46bbc5..bea9e2857554 100644
--- a/media-gfx/meshlab/meshlab-2016.12-r4.ebuild
+++ b/media-gfx/meshlab/meshlab-2016.12-r4.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
@@ -63,7 +63,7 @@ PATCHES=(
 		"${FILESDIR}/${PV}/${P}-qt-includes.patch"
 	)
 
-src_prepare(){
+src_prepare() {
 	mv "${WORKDIR}/vcglib-${VCG_VERSION}" "${WORKDIR}/vcglib" || die "vcglib mv failed"
 	default
 	#proof of patchset
diff --git a/media-gfx/mscgen/Manifest b/media-gfx/mscgen/Manifest
index 0c1b025a268d..184d58a0c199 100644
--- a/media-gfx/mscgen/Manifest
+++ b/media-gfx/mscgen/Manifest
@@ -1,3 +1,3 @@
 DIST mscgen-src-0.20.tar.gz 204818 BLAKE2B c4ae701ead1ec5845ea80e1fd19b88ff77e3cf2f462c843a2561cf06a5a3faacd8fcd891031256f9014b069ccae02c82221b3b6bb173a68aa747fe7051bc2225 SHA512 12fdea38633a42d6d235520550b16bea0cd3fb67d198b1f956845f4057239d7f80fa961e37f6f8bad9fb03f29ff8c6ffab4f4ae7402eea3083dfddeaf39687e3
-EBUILD mscgen-0.20.ebuild 884 BLAKE2B 25756e982831cab9563dc1c333b51ff445239a9a1d5c95709616d197688084471f4bcef76297027d96ce6bb58dca927c57862df5b79cc8407b1f94d9d7e22c08 SHA512 77d7758bd6d3dd7784e0c99e55f92a18d226229794affbf4f511d2546ef96c10af8e4a2c3cd8c0af108665857a03eb15a83be10e11353a3f07282f2eff1f94af
+EBUILD mscgen-0.20.ebuild 834 BLAKE2B 402b2e18d34beb0fc7db68865024a6db50bb82591b8df41435285bce15c1c2a609451f96a1256c4eec7e75193d0407895c5393f06fad762003744621f44f0532 SHA512 d66d519ee8c18edbba470f26f7a1db5be583bb199b079821243a9cbd34bf32bf051b43f5274d77da4c0a9ce90b86d9e4ef2428838a23279b066118648aab278e
 MISC metadata.xml 255 BLAKE2B f12a1ca502ad96bd6de4c8b83dfb8887ab70dec78f10a8b52dcd4618eb182192477ddca18738d734a43f3c7ac3b5e0955f4ae9347ea80e788a92974c7d50a574 SHA512 b7bc93530a1726c2d4dfbc71ae29cfbb57712fd9fdd2e76fd52f35ab4368cba0497b50145d1527a3b79e465d459a380821bb1371a01c2e915dc9adc6c7fafd5f
diff --git a/media-gfx/mscgen/mscgen-0.20.ebuild b/media-gfx/mscgen/mscgen-0.20.ebuild
index 8d84d1356b30..974df47549b7 100644
--- a/media-gfx/mscgen/mscgen-0.20.ebuild
+++ b/media-gfx/mscgen/mscgen-0.20.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=7
@@ -39,7 +39,5 @@ src_configure() {
 		myconf="--without-png"
 	fi
 
-	econf \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
-		${myconf}
+	econf ${myconf}
 }
diff --git a/media-gfx/mypaint/Manifest b/media-gfx/mypaint/Manifest
index 7bebf1f375d0..0b6332fca219 100644
--- a/media-gfx/mypaint/Manifest
+++ b/media-gfx/mypaint/Manifest
@@ -1,3 +1,3 @@
 DIST mypaint-1.2.1.tar.xz 37897196 BLAKE2B 2d8f6b03f710febae1c2d617a6e542543786be384585ae8a973604da2eba8a0fb770d185aa3d2dfc6f794adf29ffb9c217356a96ab27d677ebb57816f62fae9c SHA512 1783765e495b9535669a83a29d27ba684e6201fdfe0875bdd2c167b1dab8af05993b19025767fe0b2770ed9e578e4709f75d8a4820ac945812cba85609f9eb9b
-EBUILD mypaint-1.2.1-r5.ebuild 1959 BLAKE2B 2275a7b1cd2792808f710ebecd9545accccf935c8e27557474e8af53a64dc697da551df4158dcf72cdea480fa548e1c6617eb1aa2ace433d86f6237bb924a8b4 SHA512 7d220b043c0186402d2ef9a79cefc220f32d22b370eb64335d92d271b670d7d70aad9c5a9810617d450d6ffe0a28e6f0f93518d74d0bd04b97f9dcde6e2a5208
+EBUILD mypaint-1.2.1-r5.ebuild 1958 BLAKE2B 23392b56efece4806587d51024cd0338f31db243e171aa8e0ea99cbde9b84fe726e7fc6b9fea0221c25deafca74196cf387a50dd549542bfe415ed1aceef93b6 SHA512 034c0036442e5edf4ec1b97593e98b4569d6f3cc48398c13c67dd7b85634c89c8b73027af91977d25545236d490ac027bc9badf28754e0178d94fba29dee3478
 MISC metadata.xml 247 BLAKE2B 3a8d267e6befd2f46c41982b7196470f32b4fcf5dc6a42ead10b13e81bdcb7975ea998a51d0deb2c3c1a49f00b5f9216d8e43ad7e6dd0aea0f3352b19532d0a0 SHA512 21b957bb801d29dfed1d0aeceac553c9ba039a7fe94ebf899e7ab5c3316bbad116c7bd63a07ccbbb8277d2ce19f27b964499d2ccd942028290519e465e989dbb
diff --git a/media-gfx/mypaint/mypaint-1.2.1-r5.ebuild b/media-gfx/mypaint/mypaint-1.2.1-r5.ebuild
index a55e00599696..ed192d39fbdb 100644
--- a/media-gfx/mypaint/mypaint-1.2.1-r5.ebuild
+++ b/media-gfx/mypaint/mypaint-1.2.1-r5.ebuild
@@ -54,7 +54,7 @@ src_compile() {
 	escons
 }
 
-src_install () {
+src_install() {
 	escons prefix="${D}/usr" install
 	newicon pixmaps/${PN}_logo.png ${PN}.png
 	for x in ${LANGS}; do
diff --git a/media-gfx/nvidia-cg-toolkit/Manifest b/media-gfx/nvidia-cg-toolkit/Manifest
index db114eaaa1fc..5048a723242b 100644
--- a/media-gfx/nvidia-cg-toolkit/Manifest
+++ b/media-gfx/nvidia-cg-toolkit/Manifest
@@ -4,5 +4,5 @@ AUX nvidia-cg-toolkit-gl.pc.in 278 BLAKE2B ef0bfb9b76386c078e36b700166069fd961b0
 AUX nvidia-cg-toolkit.pc.in 242 BLAKE2B 45f19a2791310975169f8a31bf65d77a86b4e4487502c40101622070a28e316ae3bb910e7bb3d8af0073ac281ab4ca0786a081e1c1ff8955c125bd3fe1b5403b SHA512 601505a228eb4f70813d3ab6346a51c1552751278549c81b7721273dd58c053639cad49cfe82982455b1399d8b494f8351a0a479efbdb33171d28c3dd0b69073
 DIST Cg-3.1_April2012_x86.tgz 23332348 BLAKE2B e8253cfd1b569e1eb083ca394ae969ca43677641763eb77c24381198914cb1508bd41489224d8cc1afefca2affb485320022bd35e7ffaa48aaadafcf42f89183 SHA512 7b2addad157e151eb42b320aea31ccddfd53ec5640cb97bc86a3d461c1b08a2dff280bfc3f7859d124c311e1710e39d40405c387e5724ebc82d95303b250837a
 DIST Cg-3.1_April2012_x86_64.tgz 24829131 BLAKE2B f1425f391022aa57fe2b23581786576ab8762a48e9ffc875853d55399d3a996ac85debb099d0b906dcce6c95989a06c3980bfb59dc69edc16d1378ba5dc89c73 SHA512 591b51195193e7e3bbb9f1c2579336d24a179b0a88b955a01f4661bda55543fbccd73cac53033912f2eea8a1068e4c1394c6d286f195963cfb33a0d8b4428e27
-EBUILD nvidia-cg-toolkit-3.1.0013-r5.ebuild 3177 BLAKE2B 75152e6051dbe1fbb6c9c1f176b1733a7a7910fc47f4998e2e14ef109dd89cca1f21e20afd74b092078bd87154defb9a7269f9d1af51dbffce265ba1fe66a21b SHA512 194f642e56728a90c69115281ec7fdd0d346b50755ed337f8c1f31d4e877b1b6942cbf0ff562d3c05d478a8c20b32fdda9b82b6a25aa17b6d486ad7c18732dae
+EBUILD nvidia-cg-toolkit-3.1.0013-r5.ebuild 2922 BLAKE2B 5af69be5db5e7bde21b3503e0e65703c03e6473eabf7e48539fc035f917564c57c89433d5df153b46553ddb6a75db5d69f6c1c5bb4b0cfa6f86eae86cdc4244f SHA512 0d438981abc65c0e53f758488372059c12c10b466a8b23a136ef482df219452635db7fd59500d43520d05f50584ce5fdc32a4b718dd3079a84864a2f57e8514f
 MISC metadata.xml 652 BLAKE2B 8bb1f448a07402e9de7b8265b50318595c3b7de92b8b444b92dce29ac428682ab856f6d4ed668579a8fcda48b8d17f975b69d08154a54cefe7dce8916db0e0a3 SHA512 cde9ca3c2c16c3a83593c4fbdd1b05f5b79596f42d77df5f20470d7e2cbca2e445fcac254dcc7f31e41938f756d1bd5b314c7aa1a2dc6a7bc19f170a4d7e1656
diff --git a/media-gfx/nvidia-cg-toolkit/nvidia-cg-toolkit-3.1.0013-r5.ebuild b/media-gfx/nvidia-cg-toolkit/nvidia-cg-toolkit-3.1.0013-r5.ebuild
index 9b989032fff8..d1edb0448661 100644
--- a/media-gfx/nvidia-cg-toolkit/nvidia-cg-toolkit-3.1.0013-r5.ebuild
+++ b/media-gfx/nvidia-cg-toolkit/nvidia-cg-toolkit-3.1.0013-r5.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=5
@@ -129,11 +129,3 @@ multilib_src_install_all() {
 	eprefixify "${T}"/80cgc-opt
 	doenvd "${T}"/80cgc-opt
 }
-
-pkg_postinst() {
-	if [[ ${REPLACING_VERSIONS} < 2.1.0016 ]]; then
-		einfo "Starting with ${CATEGORY}/${PN}-2.1.0016, ${PN} is installed in"
-		einfo "${DEST}. Packages might have to add something like:"
-		einfo "  append-cppflags -I${DEST}/include"
-	fi
-}
diff --git a/media-gfx/plantuml/Manifest b/media-gfx/plantuml/Manifest
index e974034db88f..94c9df0d971f 100644
--- a/media-gfx/plantuml/Manifest
+++ b/media-gfx/plantuml/Manifest
@@ -1,5 +1,3 @@
-DIST plantuml-1.2019.13.tar.gz 4552633 BLAKE2B f6ea05bdd1e4e3cf748dc4d48ca9a89f06246d135bfcc410ec1b2094d1e53ab6ae415c2b39a3fc56441d17999794c1862b95718932d6a20152550deaa42a6c0e SHA512 8d2a2520821a5f75c3508bf2598186718469c6cf2c411f3b975de1abbb4792be8ae70ec84da7ae0bf4668738ca052de5463701dafc5805f362876f1d770ad494
 DIST plantuml-1.2020.0.tar.gz 4552164 BLAKE2B c78da31cffbeb0cf1a8852e53d07126c9b0dc80bf12f36f1039c806651c6802dd63456610307836207158bc871c4e2a8d9cf12a80bafa9dbde3b2be29b02f2e8 SHA512 1c3a7f735a197e5fd044547a6c48f21c2ee774d553d3de82d4931b2684a56dc4ef8af5f524e6aa4eebcb16f214620f6c99c038101d6703f03642a5b94f124fa8
-EBUILD plantuml-1.2019.13.ebuild 752 BLAKE2B 395c0b2d0670037c7f3d402bcf744eaf01bab1a30b4bbfe6723b9d3e7e74977d3191ce62e445d96210ddd3a7a46a55e0f422d46f57740f1a5f0c8cf46450dddc SHA512 e3df33845c7db1bf360fa282ee8db7ade401637a01a06dc89d576399ec85c615a2435e7055dfcdb2783935a1cf89c28317d6ed63e6aefc6d93d3471f869262a8
-EBUILD plantuml-1.2020.0.ebuild 753 BLAKE2B 74d93df19f2376a3232794a3ab871fb6e3ca82a652e33f54462776b68b43fcebbec887773e70a2c89f5fd44e7925861629a4ceb4a25ba97a796f1970d2f7677c SHA512 cb330aef4d784295e07d91a8c865cb6e3eab75d671dcea73df740d6f9461b8bb974757a9292bb4966beb1c6c92637cd96012828bdd84e8f975c8330ca1002535
+EBUILD plantuml-1.2020.0.ebuild 752 BLAKE2B 395c0b2d0670037c7f3d402bcf744eaf01bab1a30b4bbfe6723b9d3e7e74977d3191ce62e445d96210ddd3a7a46a55e0f422d46f57740f1a5f0c8cf46450dddc SHA512 e3df33845c7db1bf360fa282ee8db7ade401637a01a06dc89d576399ec85c615a2435e7055dfcdb2783935a1cf89c28317d6ed63e6aefc6d93d3471f869262a8
 MISC metadata.xml 821 BLAKE2B dd2177671848872c7a33108b012327639d40e2664ae85619bd94810e99a385dfa39111a95922a59e451ee4be7c9eebdc288934ef7a79ef33ce0683c09c13cb51 SHA512 8b2400bb96cbac0403ef0865bdb3d72a00dfad45f1c3807ca1a1ba0d98aa3f7777bc8d65089d82c6132ffb75a7395312b374ffaa88f67866512978be1eae9b98
diff --git a/media-gfx/plantuml/plantuml-1.2019.13.ebuild b/media-gfx/plantuml/plantuml-1.2019.13.ebuild
deleted file mode 100644
index e02996fa69cd..000000000000
--- a/media-gfx/plantuml/plantuml-1.2019.13.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="source"
-inherit java-pkg-2 java-ant-2 desktop xdg
-
-DESCRIPTION="Draw UML diagrams using a simple and human readable text description"
-HOMEPAGE="http://plantuml.com"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-
-DEPEND=">=virtual/jdk-1.8"
-
-RDEPEND=">=virtual/jre-1.8
-	dev-java/ant-core:0
-	>=media-gfx/graphviz-2.26.3"
-
-EANT_BUILD_TARGET="dist"
-EANT_GENTOO_CLASSPATH="ant-core"
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-src_install() {
-	java-pkg_dojar ${PN}.jar
-	java-pkg_dolauncher ${PN} --jar ${PN}.jar
-	use source && java-pkg_dosrc src/*
-
-	make_desktop_entry plantuml PlantUML
-}
diff --git a/media-gfx/plantuml/plantuml-1.2020.0.ebuild b/media-gfx/plantuml/plantuml-1.2020.0.ebuild
index 62b6323d8b9f..e02996fa69cd 100644
--- a/media-gfx/plantuml/plantuml-1.2020.0.ebuild
+++ b/media-gfx/plantuml/plantuml-1.2020.0.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://plantuml.com"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 DEPEND=">=virtual/jdk-1.8"
 
diff --git a/media-gfx/printrun/Manifest b/media-gfx/printrun/Manifest
index 6b7a30633a72..171487b2a591 100644
--- a/media-gfx/printrun/Manifest
+++ b/media-gfx/printrun/Manifest
@@ -2,5 +2,5 @@ AUX printrun-x11.patch 1075 BLAKE2B 171019c49324dbf8618152abdd409b2e8105f8f9d3d9
 DIST printrun-20150310.tar.gz 906153 BLAKE2B 60671cab6661deb4f4d127f276b4ce545df161023e57e6ef8ca857c0fd8a41ccdfc1f1811fe854dc156fa8b328b4e3d12038f07bb43aa1b20f03ed612c15aaa4 SHA512 359a4a6128b274a6709fb5c35a2d6c510bb57e010cfb12ddefa39cdb371f2141e2cab394be7d9d2f1dbc0175cc24deba61941d73b6c19fb299083afbf1141f1e
 DIST printrun-gtk3.tar.xz 3824 BLAKE2B cc45bcc7f7ddc8a961e86b83d731a9860285206d06f3a2b2bf70327b88d1e496f6bda3756182d99d85ae237d20188959e0efa94002371c0ffaa3a185fbe32c4e SHA512 8eece239ac40fe293709117b42111a5bc31e95edd0cbdfc52ae38c5d91dded777a365fdd52d996c159fe83ecbd9fb6b3318a7622eb524db316771756a684cc9e
 EBUILD printrun-20150310-r4.ebuild 1048 BLAKE2B 7faa81a1dda46d6dc9a05a3a67a0b212b297577db164d0743674fe6e3b557b893b7b3b2a44490deb657bfb8d74b2850d6152bdfb1e8ec53aba6648ad25794784 SHA512 fa9a7af2dd583ff8ea4db48c9e9ca30a31707397ffe4ce9547dd7b9da9c96b0120f866f15e61c52d4778f6689afe8753a4c7c82d7dde3d88b7464aedabc7b870
-EBUILD printrun-99999999.ebuild 988 BLAKE2B 26dc94e2e10182326a96cc60e5d46978cbc9a72bb07dc747c977a5971a571581b1642d55e71bd72aa0477b877b826aa51f67595df29b83eb1e408599dc992745 SHA512 27fbb70e7badeb3a11e6267249e37f40c6b27e5db3e5df4eee9b469cd697883675e5736ba55eb6627e422e33ff4307f766f4336625b53dccc04eac98a15fe9a1
+EBUILD printrun-99999999.ebuild 989 BLAKE2B e775307b94b2100d8813f04fe481da9bdb18257996e3733a03e0246e04ea0bc262a69b4b9c1d17e70e0fb7c85c6ce06f62a5aa1de90743c162675c6fe4f7b9f8 SHA512 d2d683d96415060be7be4b7d9c4f7ac27562dd4b1221414ff9611e07bf368c49ce2c6f2511138292bd8da839240265d0124344438ca6c4592257219462141bc2
 MISC metadata.xml 733 BLAKE2B 974af1352e4ea808c0160859b515c005fca1c18f1324f248eae861570f37a55aa38c85425e6dc0e754a1d82bb86a3d891f3fc8fd4c9452cc0850f0bfdacf1ce2 SHA512 93eb29b57b903a06fddc055e0699782265dc7e1603872954ac6581fae061089f0368d7b46c6c37811bbc197ce2edf8395090e1ada742920eec0e20c5be6176f8
diff --git a/media-gfx/printrun/printrun-99999999.ebuild b/media-gfx/printrun/printrun-99999999.ebuild
index 8b8f31fa4ec5..4491857f4d6a 100644
--- a/media-gfx/printrun/printrun-99999999.ebuild
+++ b/media-gfx/printrun/printrun-99999999.ebuild
@@ -37,7 +37,7 @@ PATCHES=(
 	"${WORKDIR}/${PN}-gtk3.patch"
 )
 
-src_unpack(){
+src_unpack() {
 	default_src_unpack
 	git-r3_src_unpack
 }
diff --git a/media-gfx/pycam/Manifest b/media-gfx/pycam/Manifest
deleted file mode 100644
index ba9341aa6e56..000000000000
--- a/media-gfx/pycam/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST pycam-0.6.4.tar.gz 3079871 BLAKE2B 41368b177e8ead933e898d316349adc40d40e23d5c7b56943f3f46acf2ff3634e797636e0723b9470453bb2e12f8fd9c70fd4aaedc207ea4638d9d422948f3dc SHA512 4095d45b6c561c2e706469f12772ede8063fa0216cef4a52412fe4d5e892882aa62a65a6159d97c6c066aec20d4915a7a05724dc0e2b66f2309e0fa3bbc0253f
-EBUILD pycam-0.6.4.ebuild 618 BLAKE2B b74e2f58cda5a1ca5c822e2de5fb2df9debee0645bc47a7c4e8d1a95fc584393278533115298baf213771b0ec64f01a7f5a2d952a6acea16c8f1c5a4811d1237 SHA512 091cc13aa72c87d0b7212a3d9784ab1d592750f1aff4c477de6d86fe5f04572f68a6b460a89e3c15aa13c8ab65290e1e62512228a60f86459f405384e56de430
-MISC metadata.xml 242 BLAKE2B 36ad0b4e5b9871185d814e8deaeb36feb9b92c692d6edad5abaaca3c79c05e733525ecc012f7bf4c5de365a2e3384c5c61c99c21fb4d75cdbe6fb077896959b2 SHA512 b6114ff75cd247836e796cb8418d513394083eae631a98dbcb0b411fd51840450e955d884a56bbe4de8ff315d32cc7e4b22130b8b3a8b97197aa213270bf4db9
diff --git a/media-gfx/pycam/pycam-0.6.4.ebuild b/media-gfx/pycam/pycam-0.6.4.ebuild
deleted file mode 100644
index ec46298199f0..000000000000
--- a/media-gfx/pycam/pycam-0.6.4.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 python-r1
-
-DESCRIPTION="Open Source CAM - Toolpath Generation for 3-Axis CNC machining"
-HOMEPAGE="http://pycam.sourceforge.net/"
-SRC_URI="https://github.com/SebKuzminsky/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-
-DEPEND="
-	dev-python/pygtk[${PYTHON_USEDEP}]
-	dev-python/pygtkglext[${PYTHON_USEDEP}]
-	dev-python/pyopengl[${PYTHON_USEDEP}]
-	dev-python/librsvg-python[${PYTHON_USEDEP}]
-"
-RDEPEND="${DEPEND}"
diff --git a/media-gfx/rawtherapee/Manifest b/media-gfx/rawtherapee/Manifest
index c645444c0b9e..762c9ccaa16a 100644
--- a/media-gfx/rawtherapee/Manifest
+++ b/media-gfx/rawtherapee/Manifest
@@ -1,5 +1,7 @@
 DIST rawtherapee-5.6.tar.xz 12083264 BLAKE2B a0eb09e98e1041b393ad3aa671641a2a4855379cef6245ca3cca2588ff5f50fedf8becd88bad1ab70f63dfb575f5f22c141040defa10b47268947415999d8e79 SHA512 2c751c7631ea2ef65c334fa0baab16d4c3161fae66487870c476f07f1ea3604a5e28a251fd98d9688cafc088302af7aa6e28e9b27a37f916715708ed5e731f0f
 DIST rawtherapee-5.7.tar.xz 12092496 BLAKE2B 40d97d09106d7d2b843376b4c58daac87f99315604bd8e704e1f231c17d01896cd732da2449f84a59ed221fbf6a929a5db8e728977431fdcc07f3d30120b633a SHA512 8101ec66d9be4cab0c0b91336a3f83a32a6220a2f342f1c74d604c15686ee08bc7dbc090232916f13d5436957d800b64b284a8a9d3352f2f721266b07e005162
+DIST rawtherapee-5.8.tar.xz 12653148 BLAKE2B f6d4b9b177ad3b6a32b460ecfc7caf5d42a01b5dd4f24da29739f5a2e5936a8d36f9857c0e24bca11f077ab0626f08bbad59ef756792d12f93ef9516427cd2c4 SHA512 bc79586cd937dcaefc053e65faa2162de887d514e44980956d937c157c6d55c4f6e6a7a9b8f91f2d657ed2054814737b96d5d741674c1e5a961d7177433efe4e
 EBUILD rawtherapee-5.6.ebuild 1609 BLAKE2B 44239bb8e54a9149b70d36a1ff582b6f0708c0747f9ee4c021c01438092cec1cb9a64bc64b5fd165ddfc338bbfe533506a14d07c695f5bfba57d6848f6a3b719 SHA512 a1dd100d0f59c2a7642e2f85a34773d37c6c7f1e4d95e865d38c9463dc58151347004860dd320acbe944701c0a8170df89ca0180e915cee93cf7581756a9d51a
 EBUILD rawtherapee-5.7.ebuild 1611 BLAKE2B 098b45f91d7944f5b932b583b39579a217c31538d9816c8942efe683d5f0602919e22b7308cf10eb2e6581b4804ac611c336312722abbf66deea4777f59a9e50 SHA512 dcf827bbf5ba0b7ff77a03f1a7558317164355b8acff4596ae27b88f0ef5a6a17245343f7de349c9486cb471d19345b5ebf966c32776bd6728c96210ded9f4d1
+EBUILD rawtherapee-5.8.ebuild 1699 BLAKE2B a89a6c3d0fb17679bd282a1aeef89b103000a89626d14e32d4fb94a883b6e1c46bf7667b5f181147c89318e21cfc354fbd89a13e753da05ec67551025197f04d SHA512 73df4a6a1aa89176f0703afb66d3cfdd74645c752f44817afd6f792ccd769f59574e11db79e6920f41038b8b8a002e57beea5506a7601ba5791bd00d82977dd2
 MISC metadata.xml 484 BLAKE2B 672746e8291016ad6467a9b3c9baa84abac42df9f7de4b4bdb79374bba8e84f7cbfe140a076ebee49ec50587154612b73c6a7022461d01fd7fbdc63a6ddfcd98 SHA512 91f11609c7472bb7cebff5d440ee3d4b0560e0832e1bfb6ffd5b239e8e60647e067894d77ccb6e40a379680775f80b91250c3feab5cd2ce32d7991e0776d0cd9
diff --git a/media-gfx/rawtherapee/rawtherapee-5.8.ebuild b/media-gfx/rawtherapee/rawtherapee-5.8.ebuild
new file mode 100644
index 000000000000..425c6e3abbce
--- /dev/null
+++ b/media-gfx/rawtherapee/rawtherapee-5.8.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_P=${P/_rc/-rc}
+inherit cmake flag-o-matic toolchain-funcs xdg-utils
+
+DESCRIPTION="A powerful cross-platform raw image processing program"
+HOMEPAGE="https://www.rawtherapee.com/"
+SRC_URI="https://rawtherapee.com/shared/source/${MY_P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="openmp tcmalloc"
+
+RDEPEND="
+	dev-libs/expat
+	dev-libs/libsigc++:2
+	media-libs/lcms:2
+	media-libs/lensfun
+	media-libs/libcanberra[gtk3]
+	media-libs/libiptcdata
+	media-libs/libpng:0=
+	media-libs/tiff:0
+	sci-libs/fftw:3.0=
+	sys-libs/zlib
+	virtual/jpeg:0
+	x11-libs/gtk+:3
+	tcmalloc? ( dev-util/google-perftools )"
+DEPEND="${RDEPEND}
+	dev-cpp/gtkmm:3.0
+	gnome-base/librsvg"
+BDEPEND="virtual/pkgconfig"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_pretend() {
+	if use openmp ; then
+		tc-has-openmp || die "Please switch to an openmp compatible compiler"
+	fi
+}
+
+src_configure() {
+	# upstream tested that "fast-math" give wrong results, so filter it
+	# https://bugs.gentoo.org/show_bug.cgi?id=606896#c2
+	filter-flags -ffast-math
+	# -Ofast enable "fast-math" both in gcc and clang
+	replace-flags -Ofast -O3
+	# In case we add an ebuild for klt we can (i)use that one,
+	# see http://cecas.clemson.edu/~stb/klt/
+	local mycmakeargs=(
+		-DOPTION_OMP=$(usex openmp)
+		-DDOCDIR=/usr/share/doc/${PF}
+		-DCREDITSDIR=/usr/share/${PN}
+		-DLICENCEDIR=/usr/share/${PN}
+		-DCACHE_NAME_SUFFIX=""
+		-DWITH_SYSTEM_KLT="off"
+		-DENABLE_TCMALLOC=$(usex tcmalloc)
+	)
+	cmake_src_configure
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/media-gfx/simple-scan/Manifest b/media-gfx/simple-scan/Manifest
index b55044ac66e6..426abb4dfac6 100644
--- a/media-gfx/simple-scan/Manifest
+++ b/media-gfx/simple-scan/Manifest
@@ -1,5 +1,7 @@
 AUX 3.26-add-control-optional-deps.patch 2773 BLAKE2B e6c3faa98ecda13c926752defef389fd155f615df2010d8499aba7870b929f520662f5c718f457edd5f14f68c26d63ab58a5ee1a583af9f5721d4cf4141385a8 SHA512 e786172609ca64afa85663077794cb146edf7f59bd6187bc253d2ab682f5cf244f5238df18648641f7450ce6add97f2db1adfa11b52a3ba5e29c16356e9fac08
 AUX simple-scan-3.32.2-unasigned-variable.patch 1294 BLAKE2B 7e513d96237872f5afc8c5a942d40f0f98632129eb9a2476099d8d28b1eb3660c0f5831d161c1c58f989327ff9eaeb4c5d426c3812fd1fe57270176b5dd37d29 SHA512 f3bcde7dd03ff9ade43f10b14124390aa08e0f2c00b7dc3b1cf08c5870c280a1e21dbdce7029a1f4c3372f72bac5f596026e7f70c7ee36c219d0c3f4df7e31a1
+DIST simple-scan-3.32.2.1.tar.xz 790848 BLAKE2B ded17193c29698a4e07e3d82689fbf84babceb36b2dedb09da5e81ed35399084d6db5b448d3bed56af559a6dc9c8708b4cda1730a248a094e005755b7dd49e95 SHA512 c49620c4be4289b18c792e35a01494a56a28b46e4f246a4c58203cf86cd34a1aa8f42738ef8b50ae6e99150630ec60f999b2000a8ee9674abc4f307db4c6c0cb
 DIST simple-scan-3.32.2.tar.xz 790800 BLAKE2B 98e502cbc280285dbe20a0c843d5f8d8b38707e973f2ba6aba2ccef9d739165371f5f30d7d6658853c5a6a280ba2919a98acd02b4757b4e881f96d5a7b53449b SHA512 10322ae72461efe43a4e230443c3aca24aff6f0cab07750c6eab9ebb718889e51d8c77ff722c337f333a8952ac84f69d03ad88eedfd4432ef11f7c7493170e14
+EBUILD simple-scan-3.32.2.1.ebuild 1528 BLAKE2B 821ca0207431cafe2cf83a4bb676df2fdade54289184bc4f248a7a326949534753d27adb63a74c195a92cfc430518bcf7efb955b5c98190539a7e6a6169337ab SHA512 0b44fb7b8837fe822085cae5dd5f10e98e56367559121a0932d24a57fec5bad475c4d495a6612095036246a625777690b466d614e7f40a7ae4cda50dbdd6ac9a
 EBUILD simple-scan-3.32.2.ebuild 1526 BLAKE2B 759f8334d42a2296fceb82b2a3dd7268ea2d650247e31e72266ed34073dcc2686ab162cece76d75ff6de9239c947e1bee3b9b214b88b053b6f04971cd99a4859 SHA512 bc3b9c5722eb613e4325f21c47e0fbd23b0cb6cde2180a938dc7630e63438e37362054e3342024a3cb0af68144b00213261a13074929c076d6943503988f0813
 MISC metadata.xml 616 BLAKE2B 576d986402f8cc708eae60f661640808751747c764d5fe729dd014f33758e0b484a2b80a214d9a3d1ed4bce7e455e34803a62048240e5de8e203184446cdc0df SHA512 6377cb9c20b1ce2db22ba959d386e4389939b72503d87da956d659144b8a6f8b521abdd19dd4c82ac0cb32e260ce6633b75136a353f63b86593f5e1f12394d47
diff --git a/media-gfx/simple-scan/simple-scan-3.32.2.1.ebuild b/media-gfx/simple-scan/simple-scan-3.32.2.1.ebuild
new file mode 100644
index 000000000000..a353c2802059
--- /dev/null
+++ b/media-gfx/simple-scan/simple-scan-3.32.2.1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+VALA_MIN_API_VERSION="0.34"
+
+inherit gnome.org gnome2-utils meson vala xdg
+
+DESCRIPTION="Simple document scanning utility"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/simple-scan"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+IUSE="colord webp" # packagekit
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.38:2
+	>=x11-libs/gtk+-3.22:3
+	>=sys-libs/zlib-1.2.3.1:=
+	x11-libs/cairo:=
+	x11-libs/gdk-pixbuf:2
+	>=dev-libs/libgusb-0.2.7
+	colord? ( >=x11-misc/colord-0.1.24:=[udev] )
+	webp? ( media-libs/libwebp )
+	>=media-gfx/sane-backends-1.0.20:=
+
+	virtual/jpeg:0=
+"
+# packagekit? ( >=app-admin/packagekit-base-1.1.5 )
+RDEPEND="${COMMON_DEPEND}
+	x11-misc/xdg-utils
+"
+DEPEND="${COMMON_DEPEND}
+	$(vala_depend)
+	dev-libs/libxml2:2
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	>=dev-libs/libgusb-0.2.7[vala]
+	colord? ( >=x11-misc/colord-0.1.24:=[vala] )
+"
+
+PATCHES=(
+	# Add control for optional dependencies
+	"${FILESDIR}"/3.26-add-control-optional-deps.patch
+	# libwepmix: Fix use of possibly unassigned local variable 'data'
+	# (from 3.34 branch)
+	"${FILESDIR}"/${PN}-3.32.2-unasigned-variable.patch
+)
+
+src_prepare() {
+	vala_src_prepare
+	xdg_src_prepare
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use colord)
+		-Dpackagekit=false
+		$(meson_use webp)
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/media-gfx/tuxpaint/Manifest b/media-gfx/tuxpaint/Manifest
index 103555a33e10..b1dd9a0a7a47 100644
--- a/media-gfx/tuxpaint/Manifest
+++ b/media-gfx/tuxpaint/Manifest
@@ -3,5 +3,5 @@ AUX tuxpaint-0.9.21-LDFLAGS.patch 853 BLAKE2B 2f68ff92e99697342b1046848b489c7281
 AUX tuxpaint-0.9.21-libpng1.5.patch 838 BLAKE2B bbc335be723205a673896279fdbe21c1b817214e54a470b06170c45e9e0ec78563a600b9251675063ba37a5d97fb63e2f13f37f3e50b0ffa3038e7027c0c0599 SHA512 c860141816023bf0d36d7aac33134e213d0dfb111d9e123c4e1470753eb2a34c6e93046def09ee2a566de1f7b6a9aeb1638f408f935ddbf9c62285129bee7d0a
 AUX tuxpaint-0.9.21-underlinking.patch 592 BLAKE2B 1af0a14e4512b748fb2294e9ebe7ce0f72fa7b9df269ff1ac6c7756327f7fa3728ffd2808e888ab035d6f56ddeae20b269a75ef76e1560b4ce391c60372ea02d SHA512 66f0cea73c2e89353bd0085ae9de280ccf197dd3e253e00b05f4c0aeac2e2489ec94e21ad26a41ca09cce717533bd0010c655498cf9267bba6019bf78e2a836f
 DIST tuxpaint-0.9.21.tar.gz 9543034 BLAKE2B 196a743542d72e3dc5cea69b9e66a3baecdde7e3b288cb6759632d2b472f69db8d70ad404737416afe7f2ef4d0c0d21c7b2caadb64ca8d21a909e275ee6fcc46 SHA512 fafd80fe7a5a4d65236c8b5a4f15c644c76180e0e4ed7e774795572b70cc38ddb3273be2a93f041d74a1e536a5a9386c18e51987425ea1a3ff910661e4b0afb3
-EBUILD tuxpaint-0.9.21-r2.ebuild 1691 BLAKE2B 254117d1aee01c50e01fd3f9c5529ed2c1d69bf0cff4f1b0329159c2ade8e70bb5f730de2d0777593578180c518330842c2cf91956cc242ca91a5b392a4d9cb3 SHA512 7c315b28434ebf2e015097d038902f0217477ad63dc1ee7c36ef9291206c59d832e655dcc5fec1c94d7a639f103c1090eb38055f9759dbab9ca2b8ce23dd927d
+EBUILD tuxpaint-0.9.21-r2.ebuild 1687 BLAKE2B 8129f5e37296aa3bce37269fa3d99f3d3b97b274d2ee0fa0ddca06322009a514a58a29ebe0a77b58a5f1bafe0f381d061da1681f5c78e1b2fb72a70197cadfd3 SHA512 0cf622a7f6eb1867905de448d7f4448b3c071e513b38195e5921ad6c01a777e41d4fc9b563fe9ff855418af1037abf7c5535c9d8f5f0f702f4f435d9f1bb6980
 MISC metadata.xml 715 BLAKE2B c0f5080575ab237355510f12f2592d4389b20ccf44ce60733570f510dc24ee26e6036f5eefa73c303772bdb778b87d76d0cdcdb8de3e7725bc1d4a6aef510b3f SHA512 1230a0b47a1e315e22dfb367454200018aad9936cee1e9c54a3dbe24ae4cc5c01fe5e76beeed02329a056396f0a28bbd54982064708c044f7bdc0884b1f62f04
diff --git a/media-gfx/tuxpaint/tuxpaint-0.9.21-r2.ebuild b/media-gfx/tuxpaint/tuxpaint-0.9.21-r2.ebuild
index dec024b26b23..fd4b7f65c002 100644
--- a/media-gfx/tuxpaint/tuxpaint-0.9.21-r2.ebuild
+++ b/media-gfx/tuxpaint/tuxpaint-0.9.21-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -54,7 +54,7 @@ src_compile() {
 		$(use nls && echo ENABLE_GETTEXT=1)
 }
 
-src_install () {
+src_install() {
 	emake -j1 PKG_ROOT="${D}" \
 		$(use nls && echo ENABLE_GETTEXT=1) install
 
diff --git a/media-gfx/word_cloud/Manifest b/media-gfx/word_cloud/Manifest
new file mode 100644
index 000000000000..78de99cafc30
--- /dev/null
+++ b/media-gfx/word_cloud/Manifest
@@ -0,0 +1,4 @@
+AUX word_cloud-1.6.0-bundled-font.patch 238 BLAKE2B 0c62c4e8d76b3f5beb5e7e031bf25727809e2cf3c4c5954dfd748a0c60d1c118531321664c146889c88f8652c9a0ef05e1fc63c06bcac97719f6db937af6cea1 SHA512 f28a37c1c48ea878c6ba702a5bac100c6204b4f2ce9452cb93f37da62b0bf961e78f3ac082a6d1fd238da362f9019e29f337c6bc6f01e65749e2a836c7d6963e
+DIST word_cloud-1.6.0.tar.gz 27524706 BLAKE2B 751b78fca97ec6e93c6a766c5b960dbb5fd91c012637e9c905ef96eea0dc60882ef1604a9868cfb3ca91a2c9ac6f50132ad5d820e6dd52114e68112bbe6decb0 SHA512 cb67570e2f6206c92316ef398382703b4ff0f1740688cd4a9ec66a093a663e903da66daaef666d634a7fddc5ec19da859d706693940a963a3bf58c52e9054056
+EBUILD word_cloud-1.6.0.ebuild 623 BLAKE2B 8d307dde7291f9660d49dc08e5bddab75ed81d2f83367d1d30bf367ef9ab28bcf464fd20c93ce74f788222de01f88090fc66480cf80bb60f6ae5d65e9827e544 SHA512 9703bb931a38315a1968ded0a757d14074d220adfc14424d7b5e169ec8ffec5e4e784a4c1e248c832d63f11f7eaa704f3e40cbb98fad72cab30c3b7cd1a37e26
+MISC metadata.xml 212 BLAKE2B ecb53eb3efac6ceef048d345601c5ca0430e2f62d6409dc2a18494ee188f792d4763892816f197418d2e9a6d04452091a0c69d83afc207b366fca816632209ee SHA512 3919b8b096abf61c7edaa6a76898603b6ca2e206e2eccd27c671957a9d085bc2591a2fb4839a85ef2a51dcbf887bb2c752d4b38e82ea19c48dfd6d99b67954fa
diff --git a/media-gfx/word_cloud/files/word_cloud-1.6.0-bundled-font.patch b/media-gfx/word_cloud/files/word_cloud-1.6.0-bundled-font.patch
new file mode 100644
index 000000000000..3c43b30ce42b
--- /dev/null
+++ b/media-gfx/word_cloud/files/word_cloud-1.6.0-bundled-font.patch
@@ -0,0 +1,9 @@
+Don't install bundled DroidSansMono font.
+
+--- a/setup.py
++++ b/setup.py
+@@ -24,3 +24,3 @@
+     packages=['wordcloud'],
+-    package_data={'wordcloud': ['stopwords', 'DroidSansMono.ttf']}
++    package_data={'wordcloud': ['stopwords']}
+ )
diff --git a/media-gfx/pycam/metadata.xml b/media-gfx/word_cloud/metadata.xml
index 2be7eaf5b916..c665e48637be 100644
--- a/media-gfx/pycam/metadata.xml
+++ b/media-gfx/word_cloud/metadata.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="sourceforge">pycam</remote-id>
-	</upstream>
+<maintainer type="person">
+  <email>ulm@gentoo.org</email>
+</maintainer>
 </pkgmetadata>
diff --git a/media-gfx/word_cloud/word_cloud-1.6.0.ebuild b/media-gfx/word_cloud/word_cloud-1.6.0.ebuild
new file mode 100644
index 000000000000..a8a60e0fb337
--- /dev/null
+++ b/media-gfx/word_cloud/word_cloud-1.6.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+DISTUTILS_USE_SETUPTOOLS="rdepend"
+
+inherit distutils-r1
+
+DESCRIPTION="A little word cloud generator in Python"
+HOMEPAGE="https://amueller.github.io/word_cloud/"
+SRC_URI="https://github.com/amueller/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="dev-python/matplotlib[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	media-fonts/droid"
+
+PATCHES=( "${FILESDIR}"/${P}-bundled-font.patch )
diff --git a/media-gfx/zbar/Manifest b/media-gfx/zbar/Manifest
index af7c283a4248..54bd8c86cc17 100644
--- a/media-gfx/zbar/Manifest
+++ b/media-gfx/zbar/Manifest
@@ -5,8 +5,6 @@ AUX zbar-0.23_fix_Qt5X11Extras_detect.patch 643 BLAKE2B 27485c866503189670424eaf
 AUX zbar-0.23_fix_detection_of_errors_in_the_v4l_read.patch 1122 BLAKE2B e4330ca4ce75a4659466faa618a99280ad7868aa21d1fe30db837917460cb9fc3594421cb2cb70457813611764c7e976e5ba9acc414be5fa95808f91d995eb0b SHA512 c6d6b3bf93f59f87687e03294742ec7a4803308d7395869d8cccefdb186c69ad429c631f2f4d0c4de0a2dd495f3b99342622d01acb1e823ceb9250380549ca20
 AUX zbar-0.23_fix_python_detect.patch 351 BLAKE2B d5261e9adb3c9b43f1208a41a655718b952d06ce0ec003bb08bf30979d6c467b2b50e6fb9a6cd06f95230ed4ae55e14599c276f9f41f03677b4d18167c6665c4 SHA512 d24d75f840d84488986cede3378e067ac68d218acac34a8c34888c88611df8f4b1b397cfd5ecfcda82480fd56ea2bada29d8373cc6e93ae8050b84e801c36ca7
 AUX zbar-0.23_reset_conversion_descriptor_after_close.patch 829 BLAKE2B b39c63a1aa11a79123226ebf91ba0b4d047412b96b12d8ed591e85625c96e3de1fcfd0624b622c4f59c98d4e4e3483c74d6699ae2579a18352d12698b3b0f430 SHA512 c641b83c81c07e850a17672a8ad5a16ab650330ccffcba98d209ed105058cc66664aff76d391803503b6d784daaf2b31d9faad2aa9dd69221598b13187e27dd1
-DIST zbar-0.20.1.tar.gz 555199 BLAKE2B f224a2207fa0603da4cc3a0e1d05bc73f3cf0cc9d13c26b3b801d3418f4f6a001b52e468b721552af61f4c8d7357934abd0560c24d3b233107785c69cfe14753 SHA512 21ad9d8fcdecb41bd4b8979366ab8ec6e8eac815f52270b0dc72ce6a126ccef933d048ce8bbe28f46ada5defadf85ba8c97c5c1870c9560a9dab28c585dfaf42
 DIST zbar-0.23.tar.gz 1301948 BLAKE2B dd74ce44bcb10f8a7cf180b982e5bd82f1f5674540931377d207ab730bb2d080fe222bfc42d4a3d70895ad53b78638e73c2294018b80d30dc28f7e6ecc14c761 SHA512 9737f9dca42c29f92aa1eca5c0808da34f1d16c88c65241c9e3984c487e502f398437e7a707a1edd2c440f784db537ba33ea4008a2d1c1caaf5eea6431b1400b
-EBUILD zbar-0.20.1-r2.ebuild 3795 BLAKE2B a2d47958dd6175ab9bad3f4cfb34e14cb41ff8265848784ade15d5e7de7e4d105d206b0a34739de7119dd35398cdc3f041a6917734234ad0dab9a3d34ca90e30 SHA512 f2fe964c7196ac539aaf95324855b024f594461af471d9bcbb4d611f76b99a25ee430616a2213398beb1e25a66ea511a816ecd0b711be08b8b54ef9cd2f0e616
-EBUILD zbar-0.23-r1.ebuild 5032 BLAKE2B ff4c538a9afacc4007dee2b186cdf5dbf086c93f7915305b6d882b5e326cace8bc25942475b6bb64ce4915c04e08dd4730c7ed537ef5fee3632e664c4806a064 SHA512 f15df43d499480c3d7c85f6207ee3cef58609d5d8723fce35f4c027e136efe9fc8277576a307e8ecd5b9fdb356402bf0dfd38f5e4ed66d908946cf74ec0611f9
+EBUILD zbar-0.23-r1.ebuild 5030 BLAKE2B 53eda120af7cfab90e0894f8e8e07a92f2a45b0c4e4187e161ba877d49bfa044f9c207c7f6123ef3605bca451aa8f56f5a4537eb29d96a4474f8e251d44c9991 SHA512 6968f47c8a701b8d97c4abecccad03c26ba9e52cd58247a89ad34a4c1817e7d46763757dc4e92647ea3dbf637496397c85842de141aa0261b62665824d6afe95
 MISC metadata.xml 931 BLAKE2B a8c611d728a6fd0dbc94f333681a5a0ec4fc2bd8529cca7dcebfa8e1774c1d5e069c870baffd29fa033ce0529d2c2cb2ee3a1a54c089b1fd988b0d2c1ce82aae SHA512 c42caef53bc9c8743f8f02f5c96f687b605248a4311efea44777781a85a4b5a31e586cbdd7d85b07a6b2aca8138f5c7238b1f35a37b13741a297e9751731da19
diff --git a/media-gfx/zbar/zbar-0.20.1-r2.ebuild b/media-gfx/zbar/zbar-0.20.1-r2.ebuild
deleted file mode 100644
index 5aba21e790d8..000000000000
--- a/media-gfx/zbar/zbar-0.20.1-r2.ebuild
+++ /dev/null
@@ -1,168 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools flag-o-matic java-pkg-opt-2 multilib-minimal python-single-r1 virtualx
-
-DESCRIPTION="Library and tools for reading barcodes from images or video"
-HOMEPAGE="https://github.com/mchehab/zbar"
-SRC_URI="https://linuxtv.org/downloads/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-
-IUSE="graphicsmagick gtk imagemagick java jpeg python qt5 static-libs test +threads v4l X xv"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="
-	python? ( ${PYTHON_REQUIRED_USE} )
-	test? ( X ${PYTHON_REQUIRED_USE} )
-"
-
-COMMON_DEPEND="
-	gtk? (
-		dev-libs/glib:2[${MULTILIB_USEDEP}]
-		x11-libs/gtk+:2[${MULTILIB_USEDEP}]
-	)
-	imagemagick? (
-		!graphicsmagick? ( media-gfx/imagemagick:= )
-		graphicsmagick? ( media-gfx/graphicsmagick:= )
-	)
-	jpeg? ( virtual/jpeg:0[${MULTILIB_USEDEP}] )
-	python? (
-		${PYTHON_DEPS}
-		gtk? (
-			$(python_gen_cond_dep '
-				>=dev-python/pygtk-2[${PYTHON_MULTI_USEDEP}]
-			')
-		)
-	)
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-		dev-qt/qtx11extras:5
-	)
-	v4l? ( media-libs/libv4l:0= )
-	X? (
-		x11-libs/libX11[${MULTILIB_USEDEP}]
-		x11-libs/libXext[${MULTILIB_USEDEP}]
-		xv? ( x11-libs/libXv[${MULTILIB_USEDEP}] )
-	)
-"
-RDEPEND="${COMMON_DEPEND}
-	java? ( >=virtual/jre-1.8 )
-"
-DEPEND="${COMMON_DEPEND}
-	sys-devel/gettext
-	virtual/pkgconfig
-	gtk? ( dev-util/glib-utils )
-	java? (
-		>=virtual/jdk-1.8
-		test? (
-			dev-java/junit:4
-			dev-java/hamcrest-core:1.3
-		)
-	)
-	test? ( ${PYTHON_DEPS} )
-"
-
-PATCHES=( "${FILESDIR}"/${PN}-0.10-errors.patch )
-
-pkg_setup() {
-	if use python || use test; then
-		python-single-r1_pkg_setup
-	fi
-	java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	if has_version '>=media-gfx/imagemagick-7.0.1.0' ; then
-		eapply "${FILESDIR}/${PN}-0.10_p20121015-ImageMagick-7.patch"
-	fi
-
-	use python && python_fix_shebang examples/upcrpc.py test/*.py
-	java-pkg-opt-2_src_prepare
-
-	sed -e '/AM_INIT_AUTOMAKE/s: -Werror : :' \
-		-e '/^AM_CFLAGS=/s: -Werror::' \
-		-i configure.ac || die
-	sed "s|javadir = \$(pkgdatadir)|javadir = /usr/$(get_libdir)/zbar|" \
-		-i java/Makefile.am || die
-	eautoreconf
-}
-
-multilib_src_configure() {
-	append-cppflags -DNDEBUG
-
-	local myeconfargs=(
-		$(use_with gtk)
-		$(multilib_native_use_with graphicsmagick graphicsmagick)
-		$(multilib_native_use_with imagemagick)
-		$(multilib_native_use_with java)
-		$(use_with jpeg)
-		$(multilib_native_use_with python python2)
-		$(use_enable static-libs static)
-		$(use_enable threads pthread)
-		$(use_enable v4l video)
-		$(use_with X x)
-		$(use_with X xshm)
-		$(use_with xv xv)
-	)
-
-	if multilib_is_native_abi; then
-		if use java; then
-			export JAVACFLAGS="$(java-pkg_javac-args)"
-			export JAVA_CFLAGS="$(java-pkg_get-jni-cflags)"
-			if use test ; then # bug 629078
-				java-pkg_append_ CLASSPATH .
-				java-pkg_append_ CLASSPATH $(java-pkg_getjar --build-only junit-4 junit.jar)
-				java-pkg_append_ CLASSPATH $(java-pkg_getjar --build-only hamcrest-core-1.3 hamcrest-core.jar)
-			fi
-		fi
-		if use qt5; then
-			myeconfargs+=(
-				$(use_with qt5 qt)
-				$(use_with qt5)
-			)
-		else
-			myeconfargs+=( --without-qt )
-		fi
-	else
-			myeconfargs+=( --without-qt )
-	fi
-
-	ECONF_SOURCE=${S} \
-		econf "${myeconfargs[@]}"
-
-	# work around out-of-source build issues for multilib systems
-	# https://bugs.gentoo.org/672184
-	mkdir gtk pygtk qt test zbarcam || die
-}
-
-src_test() {
-	virtx multilib-minimal_src_test
-}
-
-src_install() {
-	if use qt5; then
-		local MULTILIB_WRAPPED_HEADERS=(
-			/usr/include/zbar/QZBar.h
-			/usr/include/zbar/QZBarImage.h
-		)
-	fi
-	multilib-minimal_src_install
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_preinst() {
-	java-pkg-opt-2_pkg_preinst
-}
diff --git a/media-gfx/zbar/zbar-0.23-r1.ebuild b/media-gfx/zbar/zbar-0.23-r1.ebuild
index 87656810dce6..015ed0d88df6 100644
--- a/media-gfx/zbar/zbar-0.23-r1.ebuild
+++ b/media-gfx/zbar/zbar-0.23-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://linuxtv.org/downloads/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 
 IUSE="dbus graphicsmagick gtk +imagemagick introspection java jpeg python qt5 static-libs test +threads v4l X xv"
 REQUIRED_USE="
author	V3n3RiX <venerix@redcorelinux.org>	2020-02-29 18:01:47 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2020-02-29 18:01:47 +0000
commit	ceeeb463cc1eef97fd62eaee8bf2196ba04bc384 (patch)
tree	9f47ee47c31a0f13f9496879cd88a1042550aa81 /media-gfx
parent	53cba99042fa967e2a93da9f8db806fe2d035543 (diff)