gentoo resync : 18.11.2018

39 files changed, 920 insertions, 577 deletions

diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index fbf3d40e327c..00180d371758 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/asymptote/Manifest b/media-gfx/asymptote/Manifest
index 3bd117139d39..e3a66c414dcd 100644
--- a/media-gfx/asymptote/Manifest
+++ b/media-gfx/asymptote/Manifest
@@ -4,6 +4,11 @@ AUX asymptote-2.41-configure-ac.patch 475 BLAKE2B fbc6e09ab9bfba21bd0deb6cf12514
 AUX asymptote-2.41-info.patch 436 BLAKE2B 71987cc6fa4df197bed0dca7d4df27058ce28732cf8aea6a58f9bbd83e378757569bc39aa6fe0ff14f5dfbf7044e4f4ad27014814c318bb7a4993f9aafac761e SHA512 7d3ae35b2eb2b226ae3b7326d2e7d50524402d49be90303035a2872b5a109bb104f53376b9da681cc8d6922ddadec6a606540842745109edd3b55ce50725a6fb
 AUX asymptote-2.41-perl-5.26.patch 400 BLAKE2B 68d346f18f4021ac486dc06dd9dde7e118acb3050284e5aac8a5ef33baaed43a06bacbaaa0a75b0a49a7b8d03f7af65c8daf759d7a9e13b152ad6f7946a7a5df SHA512 bb333f4f42063be1c4a19d4cfd4209ac7b7d3c4318a5c3634581d63af2183cc27918b80e47148b1cbc256049b38cb85982ef7e00f7f021be3e714adabf15c87b
 AUX asymptote-2.41-xdg-utils.patch 744 BLAKE2B 9e36f5f04c7be761abb026fd894417ff5b7a90f46d2af14392d5a9e6fa6e666703892379954dd45044953519f59a235858b3ca91a84c9056d147591544bca09e SHA512 370fb078d926185ab7e10cbbc8afc4bfe0829e682fe89729a5d41bb3bda5dda96711f1fdcb99b9da69606563ce120383e5a1211372f3d8dd54ea3ddfc0838d7f
+AUX asymptote-2.47-configure-ac.patch 475 BLAKE2B d47a0b93bc890f2bbe528458768f1ea66745d8f3341b8870a155fb066fecdc224bdfb8fde78bdb00f671ee11f2222c43d83d79dfd32b47cc8cc26a61fac223bc SHA512 20a3b965aa892f70de432cd201025bea61e1635767b43a890e0c40d3098f982b2c6de663b613b5fac0ceb6c2392935df85f590716f7d92beb0880d0250e28a0e
+AUX asymptote-2.47-info.patch 436 BLAKE2B bb74a841ea91483fb46845d6f5fe7a5ff98d6b890632fd1bc6fdb24a182aed1a7ba531f8ad472201b1b6e898985ca3981f3a3ad6eea312059081188077fb9082 SHA512 df36a1a7987538ec93acdb99513da5bd45835137b0e82b17a686daf1821a4111b24400fb090d79de9d477930a6258b91af526bf653e8ca8cf5c7e88969f253d3
+AUX asymptote-2.47-xdg-utils.patch 727 BLAKE2B e49045dac05319382a1c1b649ce525d8bc806dbd4e9cf080103b4371025e57880d82b578c7e85f0f41c9b728ad29acce073629a5b04e4382897632c2ed18dbf8 SHA512 c30b8190f008730846364b4e97667053fc31308eac5173226617d7f1d41f828ebb8f9307012be9eab7dfa99163aa00d5c0d7d49c3765740561acc9e90772208b
 DIST asymptote-2.41.src.tgz 3516426 BLAKE2B d4623609be58566e32de82c5c47f635ed737459fa27cd2da0622d639cd8207fc69988a7ecbf82993b051435fbf223c1f1178d213aea258a2b57fd3a698eee9cb SHA512 93f737a44b085c2290c4553c765cf49679820e6623bc5b6d0229818409868876275d6f0571abeb76033955fa95ee594e37d10c9901c54755b085e36760fd96cb
+DIST asymptote-2.47.src.tgz 3621676 BLAKE2B 575032093276b9df6b8d74897a4721dd0d5419b3380bce7962afc9dcdd20ec3bd47b5c4b882f2276a2ac4c0d99e657d7385122d7dc400efbfb52ceec753ee8f4 SHA512 9efc4a70e8d29d6d50ba49c54c48da38beb00f64e5b39f23dbaec5cb12b714e427473fdffbf71f2d636a007cbfc993fa3237a8beab01e3419c1da1287823c159
 EBUILD asymptote-2.41-r1.ebuild 4666 BLAKE2B b08d0c753cd411fa0c0c6d32a9c28874e3f035481a5a52277e3e0c43dcab2fc98a51671859ec4542cbbd8d65b0a7519e15cc665053d1e28cc190a8547ae088b3 SHA512 3160eada27c3c6a905df3b622019fb2f759a13ce7c261eabbd84d64483e55fbecc3ae13a5fb42d61b70e4a2874dd32187df1d0bb63f64e02fa6899dc1efeac80
+EBUILD asymptote-2.47.ebuild 4609 BLAKE2B 72b9016f520f39be0841b5363935e0e8fed242c2b1389d3c483f607495c7f432f58384072c760de9869c2d64b5864e19d93b124f9ba8650d44ca08c74f827ef7 SHA512 32f999eead1c5a8875b29ab01b268f4e1724bf4ba80d8e90665d5229fd6b9f267aa1f692b531d137d48175aaa49fe6abb87a05a8950635c80faa890abd8a8bda
 MISC metadata.xml 1105 BLAKE2B 4b7d588a861ed68910f0d5a7b7f5691b3e97b6cf4514c3544c8610c77340797354575b49b70980320e55ecf5ea8188bbe8f6cc8fce55d18dc466f1d0fd83ade3 SHA512 f115ea831900270542ffe545260eda1ed51d321eca5aa7772f336bcc0e0c6471be3cbde2991c3e48ea5b3fbf51b8541b13de850406af15e42c992da0f2ed08ee
diff --git a/media-gfx/asymptote/asymptote-2.47.ebuild b/media-gfx/asymptote/asymptote-2.47.ebuild
new file mode 100644
index 000000000000..ed3c4ae957a9
--- /dev/null
+++ b/media-gfx/asymptote/asymptote-2.47.ebuild
@@ -0,0 +1,214 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{5,6,7} )
+
+inherit autotools elisp-common latex-package multilib 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"
+
+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-8 )
+	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? ( virtual/emacs )
+	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=(
+	# gc.h -> gc/gc.h
+	"${FILESDIR}/${P}-configure-ac.patch"
+
+	# 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 /usr/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 \
+			examples/*.eps \
+			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
+		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*
+		cd FAQ || die
+		dodoc asy-faq.ascii
+		doinfo asy-faq.info
+		insinto /usr/share/doc/${PF}/html/FAQ
+		doins asy-faq.html/*
+		cd .. || die
+		insinto /usr/share/doc/${PF}
+		doins ${PN}.pdf CAD.pdf
+	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.47-configure-ac.patch b/media-gfx/asymptote/files/asymptote-2.47-configure-ac.patch
new file mode 100644
index 000000000000..e0c372a095d2
--- /dev/null
+++ b/media-gfx/asymptote/files/asymptote-2.47-configure-ac.patch
@@ -0,0 +1,13 @@
+Index: asymptote-2.47/configure.ac
+===================================================================
+--- asymptote-2.47.orig/configure.ac
++++ asymptote-2.47/configure.ac
+@@ -169,7 +169,7 @@ if test "x$ac_cv_use_gc" != "xno" ; then
+       fi
+       CPPFLAGS_SAVE=$CPPFLAGS
+       CPPFLAGS=$CPPFLAGS" $INCL"
+-      AC_CHECK_HEADER(gc.h,
++      AC_CHECK_HEADER([gc/gc.h],
+ 	AC_CHECK_LIB([gc],[GC_malloc],[
+ 	  LIBS=$LIBS"-lgc "
+ 	  AC_MSG_NOTICE([enabling system $GCNAME])],[
diff --git a/media-gfx/asymptote/files/asymptote-2.47-info.patch b/media-gfx/asymptote/files/asymptote-2.47-info.patch
new file mode 100644
index 000000000000..dd2850211c1a
--- /dev/null
+++ b/media-gfx/asymptote/files/asymptote-2.47-info.patch
@@ -0,0 +1,13 @@
+Index: asymptote-2.47/doc/asymptote.texi
+===================================================================
+--- asymptote-2.47.orig/doc/asymptote.texi
++++ asymptote-2.47/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.47-xdg-utils.patch b/media-gfx/asymptote/files/asymptote-2.47-xdg-utils.patch
new file mode 100644
index 000000000000..d26b6c098d62
--- /dev/null
+++ b/media-gfx/asymptote/files/asymptote-2.47-xdg-utils.patch
@@ -0,0 +1,23 @@
+Index: asymptote-2.47/settings.cc
+===================================================================
+--- asymptote-2.47.orig/settings.cc
++++ asymptote-2.47/settings.cc
+@@ -91,15 +91,15 @@ bool msdos=false;
+ string HOME="HOME";
+ string docdir=ASYMPTOTE_DOCDIR;
+ const char pathSeparator=':';
+-string defaultPSViewer="gv";
++string defaultPSViewer="xdg-open";
+ #ifdef __APPLE__
+ string defaultPDFViewer="open";
+ #else  
+-string defaultPDFViewer="acroread";
++string defaultPDFViewer="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/displaycal/Manifest b/media-gfx/displaycal/Manifest
index 85293e34981a..e0d376bd6560 100644
--- a/media-gfx/displaycal/Manifest
+++ b/media-gfx/displaycal/Manifest
@@ -2,8 +2,10 @@ DIST DisplayCAL-3.5.3.0.tar.gz 10559161 BLAKE2B a3eb968dcd0b5edbcf22a0ec84da55d8
 DIST DisplayCAL-3.6.0.0.tar.gz 10565171 BLAKE2B 394a925d28f513ededc1bc40b3ce7b5a2687a0c172006fd14b9081188e3ca80c0cd5f634ac84a9917d6aa301e083bffd05db622e292262f6d41db2a86c23a920 SHA512 6d0cff6344bb0dfcff58e88f93e2d0f7a3cf5f8e32b596f9f5e07b0e80ccb9b4ff429aa9fa63b5941f7622e0a7dcd227d0a1066e82d0843454f01d96dea97993
 DIST DisplayCAL-3.6.1.1.tar.gz 10433827 BLAKE2B 3e06ea90d820bcc96eb8de8d2fabf9d60997092e1529b3a0a6544bfd42f89380bb2525e27c075a3b8c55721d659b485188e8e7f2e872622ed9e6b6ebc87ac662 SHA512 03835117f53fb8c9d7cedfe67719b70878c3b62c20894a999c971d1d820dc7ec386ad68b8d4cf19496005abf2235e789526e6632b11d82f971f944b5f4dfdac6
 DIST DisplayCAL-3.6.2.0.tar.gz 10437261 BLAKE2B c476c7834e2c723c48fb9ad9d2ea7f4919c2636814078d8f1a83a6af0e91586e0762ea3787c90f8625cba672ac72ef5e1d2dd6906fd3fd7f3b67637a180b81e3 SHA512 e66a20edf46d460caf5d2f7ddbc93cfe7c37937cd4933d2a2b7d141676696c6f22aadc07d229fbaefe0ced62066fc99d3290352c3e8fc9db4b95a8d0541f0be7
+DIST DisplayCAL-3.7.1.1.tar.gz 10472440 BLAKE2B 2e53537a7570c37120a462102269b5c042299df3de0926b0221bef8b5c29d75e7983b359d9ad162e2d9df2819c624d5f0c00c65fa181cce3fa831f1791d7a1fd SHA512 d5d18b25dd4ce6a2b328db6adb55c43ffcb3e3a495be38004d9e6a6e5c8d576b9477dc895668f82210ce955e7854a578218cb8c9ca2c206f58c47a011ad99c09
 EBUILD displaycal-3.5.3.0.ebuild 1521 BLAKE2B a42233e85727c294aa646dbad6759dcf78967a49ff95d5dad4c6941dbb805d7e4191c6fa12e22a28b739048b8c8a8c04fabbc89132d9d3ff4f95d06cf41b8964 SHA512 8d3c07821ca6ef5cd136e9d793b164ef743a69231e75c1872e7939b4507919e4ed32ef7d39d0862a37a3c82149f26cea44ba4e499f5f4f9f7eb6e746a4d99f63
 EBUILD displaycal-3.6.0.0.ebuild 1521 BLAKE2B a42233e85727c294aa646dbad6759dcf78967a49ff95d5dad4c6941dbb805d7e4191c6fa12e22a28b739048b8c8a8c04fabbc89132d9d3ff4f95d06cf41b8964 SHA512 8d3c07821ca6ef5cd136e9d793b164ef743a69231e75c1872e7939b4507919e4ed32ef7d39d0862a37a3c82149f26cea44ba4e499f5f4f9f7eb6e746a4d99f63
 EBUILD displaycal-3.6.1.1.ebuild 1521 BLAKE2B a42233e85727c294aa646dbad6759dcf78967a49ff95d5dad4c6941dbb805d7e4191c6fa12e22a28b739048b8c8a8c04fabbc89132d9d3ff4f95d06cf41b8964 SHA512 8d3c07821ca6ef5cd136e9d793b164ef743a69231e75c1872e7939b4507919e4ed32ef7d39d0862a37a3c82149f26cea44ba4e499f5f4f9f7eb6e746a4d99f63
 EBUILD displaycal-3.6.2.0.ebuild 1521 BLAKE2B a42233e85727c294aa646dbad6759dcf78967a49ff95d5dad4c6941dbb805d7e4191c6fa12e22a28b739048b8c8a8c04fabbc89132d9d3ff4f95d06cf41b8964 SHA512 8d3c07821ca6ef5cd136e9d793b164ef743a69231e75c1872e7939b4507919e4ed32ef7d39d0862a37a3c82149f26cea44ba4e499f5f4f9f7eb6e746a4d99f63
+EBUILD displaycal-3.7.1.1.ebuild 1518 BLAKE2B fcfb6bce3ff0c5270cff1b0c2c6f2de246c44087fef7d59fecffcf36afe87e21b1cf4b5c560a4363ead2e26f418c2413b1365efe4aa6b901198ab5cac4ae8d76 SHA512 70f7398a8221c504bbe9fa48ed041ba3bf207baf96e5f8e0ff4ab2ea65611921033ba04fac82cfd648e09b7b07b47d289569242a1513150a62ff89cb1b26f1b7
 MISC metadata.xml 342 BLAKE2B e74a7767c5b6e82bd35776606de555f9d4f26a25727decc6b0216fa3ea27cee8f28a7749e46b842c52e403c5150b24b4e33e0b971bd49077814e7945ee8cc290 SHA512 f9d5979fc8525c40af8d4e64afb8264873b0ae7cda1e9c4f3b3f30957c2a4f7fcbab76002783213a896395e8b5ef78e315441c28872589a91a0035d5f346d317
diff --git a/media-gfx/displaycal/displaycal-3.7.1.1.ebuild b/media-gfx/displaycal/displaycal-3.7.1.1.ebuild
new file mode 100644
index 000000000000..02f4e0b4a7e5
--- /dev/null
+++ b/media-gfx/displaycal/displaycal-3.7.1.1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 gnome2-utils xdg
+
+MY_PN="DisplayCAL"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Display calibration and characterization powered by Argyll CMS"
+HOMEPAGE="https://displaycal.net/"
+SRC_URI="mirror://sourceforge/dispcalgui/${MY_P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=media-gfx/argyllcms-1.1.0
+	dev-python/wxpython:3.0
+	>=x11-libs/libX11-1.3.3
+	>=x11-apps/xrandr-1.3.2
+	>=x11-libs/libXxf86vm-1.1.0
+	>=x11-libs/libXinerama-1.1
+"
+RDEPEND="${DEPEND}
+	>=dev-python/numpy-1.2.1
+"
+
+# Just in case someone renames the ebuild
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	# Do not generate udev/hotplug files
+	sed -e '/if os.path.isdir/s#/etc/udev/rules.d\|/etc/hotplug#\0-non-existant#' \
+		-i DisplayCAL/setup.py || die
+	# Prohibit setup from running xdg-* programs, resulting to sandbox violation
+	sed -e '/if which/s#xdg-icon-resource#\0-non-existant#' \
+		-e '/if which/s#xdg-desktop-menu#\0-non-existant#' \
+		-i DisplayCAL/postinstall.py || die
+
+	# Remove deprecated Encoding key from .desktop file
+	sed -e '/Encoding=UTF-8/d' -i misc/*.desktop  || die
+
+	# Remove x-world Media Type
+	sed -e 's/x\-world\/x\-vrml\;//g' \
+		-i misc/displaycal-vrml-to-x3d-converter.desktop || die
+
+	distutils-r1_src_prepare
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_icon_cache_update
+}
diff --git a/media-gfx/gnome-raw-thumbnailer/Manifest b/media-gfx/gnome-raw-thumbnailer/Manifest
index 5e114267c194..89bf9b2b82a4 100644
--- a/media-gfx/gnome-raw-thumbnailer/Manifest
+++ b/media-gfx/gnome-raw-thumbnailer/Manifest
@@ -3,5 +3,4 @@ AUX gnome-raw-thumbnailer-3.0.0-fix-downscale.patch 1030 BLAKE2B 49c4e566963e31f
 AUX gnome-raw-thumbnailer-3.0.0-libopenraw-0.1.patch 696 BLAKE2B c790781d81b5e4b4793c2a2f4aea2893b964e607b5cfc55eb658defb4748c7958558ae85435c0d18986f7267ac58b8c8b41471ce7cdcae7b04100f0c23d560b0 SHA512 ac12cf060a1f40abecb2ff86429766662632e1a448dd84c5205c8def987d7e20c1738402cfd7d6c76b4a5f908872c77ddc046e6379705c1e69277543828bdab7
 DIST raw-thumbnailer-3.0.0.tar.bz2 270499 BLAKE2B e08d78ba44f160ba1903b78b5e85d9237610c81ac9a63c25c7b2c308139b8e18c9041e2c35aaf44eb87017be17f7bb3968798e165c28349703a5306a78999bbd SHA512 b6b477af0ec604e100a67829bc9262a3aa54db9beb644e60a9ae95f916fd641ad7ccaa908fc6458be2eee60ecdb47bda9449720bc078f1c4fe0135fabf0bd9eb
 EBUILD gnome-raw-thumbnailer-3.0.0-r1.ebuild 891 BLAKE2B d694b4ab4dd5928137b12552c66ea674cb092f820559df66b15651fbeb70e6a6aa1c4d72dcb41928e90391310ea832597c79c840f8aa88609cce8af722944db0 SHA512 7bade2926a93fb5684d2f6c22a869fd603a8d46a453737890616c689544af4c9b68f6be7272fd25255ad419cbdfdd4119e0f9d581e4972362f9be332de74a52a
-EBUILD gnome-raw-thumbnailer-3.0.0.ebuild 648 BLAKE2B 60b014ff0392ef596738db5a9abd2bbd434f03b8389cedd0cefaf08c874eda4525e80ca84cf89b81c150937ecf00282ab79bbb5600c1a6dcda0fd815adf90577 SHA512 c129fee26c644d9f1577aa53c0bca841047cf93a0c5d65442ae141b21bd82ce4097e932969a745df528a1703ceee65a0d9c667c7888321e3347997fd156787b8
 MISC metadata.xml 259 BLAKE2B 32f8c5208a55a1dda504b7df969127393a2c70e672aba383fcdc870de8fe778366d3dde3c3313bd043068d2e7831d1e18bad6fb428e82266fc2a630104e0a193 SHA512 fbef629394690b3a5608abc6344816f6acf1e8e2663f29949fd14a662c628f16fee77a1ec1641066806d143fb94c1571bc5b46b829dc53620af6956377fe15cc
diff --git a/media-gfx/gnome-raw-thumbnailer/gnome-raw-thumbnailer-3.0.0.ebuild b/media-gfx/gnome-raw-thumbnailer/gnome-raw-thumbnailer-3.0.0.ebuild
deleted file mode 100644
index b42ec755b1f2..000000000000
--- a/media-gfx/gnome-raw-thumbnailer/gnome-raw-thumbnailer-3.0.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2
-
-MY_P="${PN/gnome-}-${PV}"
-
-DESCRIPTION="A lightweight and fast raw image thumbnailer for GNOME"
-HOMEPAGE="https://libopenraw.freedesktop.org/wiki/RawThumbnailer"
-SRC_URI="https://libopenraw.freedesktop.org/download/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
-	>=media-libs/libopenraw-0.0.9[gtk]
-	>=x11-libs/gdk-pixbuf-2:2
-	>=dev-libs/glib-2.26:2
-	!media-gfx/raw-thumbnailer
-"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	virtual/pkgconfig
-	sys-devel/gettext
-"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/media-gfx/inkscape/Manifest b/media-gfx/inkscape/Manifest
index 51373471c3f9..84cd787e70ee 100644
--- a/media-gfx/inkscape/Manifest
+++ b/media-gfx/inkscape/Manifest
@@ -8,9 +8,11 @@ AUX inkscape-0.92.3-freetype_pkgconfig.patch 948 BLAKE2B 4a21ed3ef6c002a6fd756b3
 AUX inkscape-0.92.3-poppler-0.64-2.patch 5692 BLAKE2B 17791aa18b04262214b9e504eb5ced2731ae7dec029329c5f57670339f9c5ec018013a16bb8bd65a18852183d2ef89ba59d942b0832974ca27f2f4aeae325e0f SHA512 48c3466ba1ee01a05b6b644096b286a4047923b13e0f0ddbbd3a06100a82dc26ac43a401d252f4b63b062ee2e10c546b595dd2d6c8a1885a5c1349a84ad73412
 AUX inkscape-0.92.3-poppler-0.64.patch 4493 BLAKE2B 3ee9635cf8b287c1a530a8a70876c92c1e941e6d89a9a74e4f6bb3fdd445bc60a47c8adb6f567f8bc539241c0884ca093add00ede19dfba3220ffcccde0a5384 SHA512 dbfc28ec5dd7b96c7994ab57bcde95baa57ec600d2ec5458c242273407d822f0947d8fd2ef0ce7ac07125f108314a25eb1646aaad474fa150e3010031c1807bb
 AUX inkscape-0.92.3-poppler-0.65.patch 904 BLAKE2B cd31960bf20fbc3cff762949d435838864ebff18dbcef99a658ed5732a3c7fe647c2a7e4b15bdf79a6c445f523dd2b7c19b3c3bc71cc656f0dabfc2bf5ce7ce4 SHA512 38887caacfd8c37f017b8b9c3a6de09aaa1d1ea7caffe9ab91d234b162a36bb4fc19e4985acd9a120929f4941126be31fc9d51a84628803157746834b60de8bb
+AUX inkscape-0.92.3-poppler-0.69.patch 15760 BLAKE2B 5efe38900e8954232ecf2336b1d84c2c1ce78a4c3044dd8d0eb5dbc1222307da0411dd4ee7b0c4cc4ddf882e87b81cf6a410c1384d274bc86cdf650dc4969b0a SHA512 ba153fa5fbcad7ed86dd63511aae191200c227a7f812dbf01d8f474b71eb65d38ce2baee889ae984be02d31453578841d24c236fdbdd781d7075c326caadaaa0
+AUX inkscape-0.92.3-poppler-0.71.patch 947 BLAKE2B eac6ad73f72da8cfd8e0d7cab5977a7586161ff5db455b1c42a87fc5f6aa0a2241fa0cf7857ef0abad6404bf52d5030514bf1318b2c7dfda32bddb5b42625de9 SHA512 b53a1319608a57d2fb11db0659e11ab38b69932d2a54136550d1a16ffc1b072aeddf6507a6ea58c3d6d43c0599397868c66046e7fadfdbd2a87d63b90819fdbd
 DIST inkscape-0.92.1-poppler.patch 44142 BLAKE2B 4431a4185cfeb6c41f08da656db4335017fc08a62e154f75ef4ef1a2ae92dd510f22a4f9cd1cf8bb1fae09770f47a398b7b789c8bad4e47bc4941b9e8f79c1f0 SHA512 4a0504c236c816f413b3bf055754513bb53b52eb5f0323faa28ab445ce3fb83b6f41de5bc6e3865909e50fc9be937e3f99282e8414f4cdc954e04b974d7f15ab
 DIST inkscape-0.92.2.tar.bz2 31224100 BLAKE2B c0a7b01220d1b0b0863f71f3e1c8ba7bdb58bd86e79c2d3f214831a344c992a1084d64813de00e6f88d77b1b1f1b8562c7a0ee98824149cb867eba586314d27d SHA512 e790cafb7cc2be2eb75f04ac4c18ae8558ae997f4261c38dac9c2a3383c7a12a0f4a090956770d1341b212fc9698d31d212f2c1609421907255f8af650569b30
 DIST inkscape-0.92.3.tar.bz2 31606442 BLAKE2B bc90dc160ca059395a2951b7b2daeb8730753c551f78e6af88b51b41322a438256499f754fb6b07946d77b80e1ddfe5514944f9b5cbb19d2bfdecb8625328db0 SHA512 af3c0f672a108e583f3c92cde1451b3f1f5319c1669891005c230e73b3485aa8951af6d7b21c7ccd9e4acbca8eaa5a3bb61ae1d828e81885bc7b61a8ae933687
 EBUILD inkscape-0.92.2.ebuild 3875 BLAKE2B 980f69de82cfd74d88e0dccd55fa8500847aba1614ee291e990bcc167dd409e61dccc473d6a62711a125d6586ab26cb9d4c661dcbdea4af6adcca5508785fad9 SHA512 258802353c77b8a1cbec4df73aacc0edfb6b601d6a9a8200f7cf82c97f5bd7582033d547c9f7df1d8ebefd1d8fab2a6ccdd5c9efebbfa05df21990cedcb5a500
-EBUILD inkscape-0.92.3-r1.ebuild 3980 BLAKE2B cea0a705ca29033a5bedd87547a54565281854e3a7847d1d09f1272109e0b84662085f011971467923778e26cbfdf62e43632030dfa332463efe38deb9c6e89f SHA512 d130279688318e0a35647a8fbe341a12dedf3e101ba2f87196a04f57dad0dd61712365fb16a7195a4a987d56adca7ae474f5a4459fcb1ac0b8490945b755db07
+EBUILD inkscape-0.92.3-r1.ebuild 4074 BLAKE2B 1db4afc8585fd09e4d08c7331ca30a2ed291a16a078726e1c0fad6627997342a39427e4c4613319ec8e60064bfb5a81957e7e2805714e1c9f206c1d3a3572f03 SHA512 a43e8d5e50d04b0930ce0f09040da708dc772f442d0b4aaf9e61dea81d00acd58cbc5ac122d967fdb2e58f959e907b1b07f28ee09034621eeaef1e372219e220
 MISC metadata.xml 812 BLAKE2B 9b06a44ec7ded4b7b4618813bb4b2b5deed3bbc45fd43cffcf435594f3141943a45e592bf2947b00895f0f40d40b0fbe51109daa63f73f3276f50afec620d9fa SHA512 dbe4bb2e918a4c8a20c9a273cef29976d8cfe74e6c2ae1ba8cb77f592c885e8353b7bc3ca8f529e00629f6a0ac7627877cdef68fe07472fc1f417abba5d0268b
diff --git a/media-gfx/inkscape/files/inkscape-0.92.3-poppler-0.69.patch b/media-gfx/inkscape/files/inkscape-0.92.3-poppler-0.69.patch
new file mode 100644
index 000000000000..593ba242db4d
--- /dev/null
+++ b/media-gfx/inkscape/files/inkscape-0.92.3-poppler-0.69.patch
@@ -0,0 +1,400 @@
+From 96781f5cea8af9777d87e056506b2bce660c397e Mon Sep 17 00:00:00 2001
+From: Thomas Holder <thomas@thomas-holder.de>
+Date: Fri, 28 Sep 2018 18:05:30 +0000
+Subject: [PATCH] fix 1789208 poppler 0.69
+
+---
+ CMakeScripts/DefineDependsandFlags.cmake      | 12 -----
+ src/extension/internal/pdfinput/pdf-input.cpp |  2 +-
+ src/extension/internal/pdfinput/pdf-input.h   |  1 +
+ .../internal/pdfinput/pdf-parser.cpp          | 46 ++++++++-----------
+ src/extension/internal/pdfinput/pdf-parser.h  | 12 +++--
+ .../pdfinput/poppler-transition-api.h         | 39 ++++++++++++++++
+ .../internal/pdfinput/svg-builder.cpp         | 22 ++++-----
+ src/extension/internal/pdfinput/svg-builder.h |  3 +-
+ 8 files changed, 80 insertions(+), 57 deletions(-)
+ create mode 100644 src/extension/internal/pdfinput/poppler-transition-api.h
+
+diff --git a/CMakeScripts/DefineDependsandFlags.cmake b/CMakeScripts/DefineDependsandFlags.cmake
+index c0fce145be..c1244055d5 100644
+--- a/CMakeScripts/DefineDependsandFlags.cmake
++++ b/CMakeScripts/DefineDependsandFlags.cmake
+@@ -116,18 +116,6 @@ if(ENABLE_POPPLER)
+ 		set(HAVE_POPPLER_GLIB ON)
+ 	    endif()
+ 	endif()
+-	if(POPPLER_VERSION VERSION_GREATER "0.26.0" OR
+-		POPPLER_VERSION VERSION_EQUAL   "0.26.0")
+-	    set(POPPLER_EVEN_NEWER_COLOR_SPACE_API ON)
+-	endif()
+-	if(POPPLER_VERSION VERSION_GREATER "0.29.0" OR
+-		POPPLER_VERSION VERSION_EQUAL   "0.29.0")
+-	    set(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API ON)
+-	endif()
+-	if(POPPLER_VERSION VERSION_GREATER "0.58.0" OR
+-		POPPLER_VERSION VERSION_EQUAL   "0.58.0")
+-            set(POPPLER_NEW_OBJECT_API ON)
+-	endif()
+     else()
+ 	set(ENABLE_POPPLER_CAIRO OFF)
+     endif()
+diff --git a/src/extension/internal/pdfinput/pdf-input.cpp b/src/extension/internal/pdfinput/pdf-input.cpp
+index e3115620e3..9621e306a0 100644
+--- a/src/extension/internal/pdfinput/pdf-input.cpp
++++ b/src/extension/internal/pdfinput/pdf-input.cpp
+@@ -793,7 +793,7 @@ PdfInput::open(::Inkscape::Extension::Input * /*mod*/, const gchar * uri) {
+             dlg->getImportSettings(prefs);
+ 
+         // Apply crop settings
+-        PDFRectangle *clipToBox = NULL;
++        _POPPLER_CONST PDFRectangle *clipToBox = NULL;
+         double crop_setting;
+         sp_repr_get_double(prefs, "cropTo", &crop_setting);
+ 
+diff --git a/src/extension/internal/pdfinput/pdf-input.h b/src/extension/internal/pdfinput/pdf-input.h
+index 6e36603c31..73bbfe2a71 100644
+--- a/src/extension/internal/pdfinput/pdf-input.h
++++ b/src/extension/internal/pdfinput/pdf-input.h
+@@ -15,6 +15,7 @@
+ #endif
+ 
+ #ifdef HAVE_POPPLER
++#include "poppler-transition-api.h"
+ 
+ #include <gtkmm/dialog.h>
+ 
+diff --git a/src/extension/internal/pdfinput/pdf-parser.cpp b/src/extension/internal/pdfinput/pdf-parser.cpp
+index ea9f902e09..4a7fd8a5e5 100644
+--- a/src/extension/internal/pdfinput/pdf-parser.cpp
++++ b/src/extension/internal/pdfinput/pdf-parser.cpp
+@@ -295,8 +295,8 @@ PdfParser::PdfParser(XRef *xrefA,
+                      int /*pageNum*/,
+ 		     int rotate,
+ 		     Dict *resDict,
+-                     PDFRectangle *box,
+-		     PDFRectangle *cropBox) :
++                     _POPPLER_CONST PDFRectangle *box,
++                     _POPPLER_CONST PDFRectangle *cropBox) :
+     xref(xrefA),
+     builder(builderA),
+     subPage(gFalse),
+@@ -318,7 +318,7 @@ PdfParser::PdfParser(XRef *xrefA,
+   builder->setDocumentSize(Inkscape::Util::Quantity::convert(state->getPageWidth(), "pt", "px"),
+                            Inkscape::Util::Quantity::convert(state->getPageHeight(), "pt", "px"));
+ 
+-  double *ctm = state->getCTM();
++  const double *ctm = state->getCTM();
+   double scaledCTM[6];
+   for (int i = 0; i < 6; ++i) {
+     baseMatrix[i] = ctm[i];
+@@ -353,7 +353,7 @@ PdfParser::PdfParser(XRef *xrefA,
+ PdfParser::PdfParser(XRef *xrefA,
+ 		     Inkscape::Extension::Internal::SvgBuilder *builderA,
+                      Dict *resDict,
+-		     PDFRectangle *box) :
++		     _POPPLER_CONST PDFRectangle *box) :
+     xref(xrefA),
+     builder(builderA),
+     subPage(gTrue),
+@@ -572,7 +572,7 @@ const char *PdfParser::getPreviousOperator(unsigned int look_back) {
+ 
+ void PdfParser::execOp(Object *cmd, Object args[], int numArgs) {
+   PdfOperator *op;
+-  char *name;
++  const char *name;
+   Object *argPtr;
+   int i;
+ 
+@@ -620,7 +620,7 @@ void PdfParser::execOp(Object *cmd, Object args[], int numArgs) {
+   (this->*op->func)(argPtr, numArgs);
+ }
+ 
+-PdfOperator* PdfParser::findOp(char *name) {
++PdfOperator* PdfParser::findOp(const char *name) {
+   int a = -1;
+   int b = numOps;
+   int cmp = -1;
+@@ -1752,7 +1752,7 @@ void PdfParser::doShadingPatternFillFallback(GfxShadingPattern *sPat,
+                                              GBool stroke, GBool eoFill) {
+   GfxShading *shading;
+   GfxPath *savedPath;
+-  double *ctm, *btm, *ptm;
++  const double *ctm, *btm, *ptm;
+   double m[6], ictm[6], m1[6];
+   double xMin, yMin, xMax, yMax;
+   double det;
+@@ -1994,7 +1994,7 @@ void PdfParser::doFunctionShFill1(GfxFunctionShading *shading,
+   GfxColor color0M, color1M, colorM0, colorM1, colorMM;
+   GfxColor colors2[4];
+   double functionColorDelta = colorDeltas[pdfFunctionShading-1];
+-  double *matrix;
++  const double *matrix;
+   double xM, yM;
+   int nComps, i, j;
+ 
+@@ -2174,7 +2174,7 @@ void PdfParser::doPatchMeshShFill(GfxPatchMeshShading *shading) {
+   }
+ }
+ 
+-void PdfParser::fillPatch(GfxPatch *patch, int nComps, int depth) {
++void PdfParser::fillPatch(_POPPLER_CONST GfxPatch *patch, int nComps, int depth) {
+   GfxPatch patch00 = blankPatch();
+   GfxPatch patch01 = blankPatch();
+   GfxPatch patch10 = blankPatch();
+@@ -2595,7 +2595,7 @@ void PdfParser::doShowText(GooString *s) {
+   double x, y, dx, dy, tdx, tdy;
+   double originX, originY, tOriginX, tOriginY;
+   double oldCTM[6], newCTM[6];
+-  double *mat;
++  const double *mat;
+   Object charProc;
+   Dict *resDict;
+   Parser *oldParser;
+@@ -3669,7 +3669,6 @@ void PdfParser::opBeginImage(Object /*args*/[], int /*numArgs*/)
+ Stream *PdfParser::buildImageStream() {
+   Object dict;
+   Object obj;
+-  char *key;
+   Stream *str;
+ 
+   // build dictionary
+@@ -3687,26 +3686,17 @@ Stream *PdfParser::buildImageStream() {
+       obj.free();
+ #endif
+     } else {
+-      key = copyString(obj.getName());
+-#if defined(POPPLER_NEW_OBJECT_API)
+-      obj = parser->getObj();
+-#else
+-      obj.free();
+-      parser->getObj(&obj);
+-#endif
+-      if (obj.isEOF() || obj.isError()) {
+-	gfree(key);
++      Object obj2;
++      _POPPLER_CALL(obj2, parser->getObj);
++      if (obj2.isEOF() || obj2.isError()) {
++        _POPPLER_FREE(obj);
+ 	break;
+       }
+-#if defined(POPPLER_NEW_OBJECT_API)
+-      dict.dictAdd(key, std::move(obj));
++      _POPPLER_DICTADD(dict, obj.getName(), obj2);
++      _POPPLER_FREE(obj);
++      _POPPLER_FREE(obj2);
+     }
+-    obj = parser->getObj();
+-#else
+-      dict.dictAdd(key, &obj);
+-    }
+-    parser->getObj(&obj);
+-#endif
++    _POPPLER_CALL(obj, parser->getObj);
+   }
+   if (obj.isEOF()) {
+     error(errSyntaxError, getPos(), "End of file in inline image");
+diff --git a/src/extension/internal/pdfinput/pdf-parser.h b/src/extension/internal/pdfinput/pdf-parser.h
+index ed28274f42..0a04c81d46 100644
+--- a/src/extension/internal/pdfinput/pdf-parser.h
++++ b/src/extension/internal/pdfinput/pdf-parser.h
+@@ -9,6 +9,7 @@
+ #define PDF_PARSER_H
+ 
+ #ifdef HAVE_POPPLER
++#include "poppler-transition-api.h"
+ 
+ #ifdef USE_GCC_PRAGMAS
+ #pragma interface
+@@ -128,11 +129,14 @@ public:
+ 
+   // Constructor for regular output.
+   PdfParser(XRef *xrefA, SvgBuilder *builderA, int pageNum, int rotate,
+-            Dict *resDict, PDFRectangle *box, PDFRectangle *cropBox);
++            Dict *resDict,
++            _POPPLER_CONST PDFRectangle *box,
++            _POPPLER_CONST PDFRectangle *cropBox);
+ 
+   // Constructor for a sub-page object.
+   PdfParser(XRef *xrefA, Inkscape::Extension::Internal::SvgBuilder *builderA,
+-            Dict *resDict, PDFRectangle *box);
++            Dict *resDict,
++            _POPPLER_CONST PDFRectangle *box);
+ 
+   virtual ~PdfParser();
+ 
+@@ -186,7 +190,7 @@ private:
+ 
+   void go(GBool topLevel);
+   void execOp(Object *cmd, Object args[], int numArgs);
+-  PdfOperator *findOp(char *name);
++  PdfOperator *findOp(const char *name);
+   GBool checkArg(Object *arg, TchkType type);
+   int getPos();
+ 
+@@ -257,7 +261,7 @@ private:
+ 			   double x2, double y2, GfxColor *color2,
+ 			   int nComps, int depth);
+   void doPatchMeshShFill(GfxPatchMeshShading *shading);
+-  void fillPatch(GfxPatch *patch, int nComps, int depth);
++  void fillPatch(_POPPLER_CONST GfxPatch *patch, int nComps, int depth);
+   void doEndPath();
+ 
+   // path clipping operators
+diff --git a/src/extension/internal/pdfinput/poppler-transition-api.h b/src/extension/internal/pdfinput/poppler-transition-api.h
+new file mode 100644
+index 0000000000..898e64bf2b
+--- /dev/null
++++ b/src/extension/internal/pdfinput/poppler-transition-api.h
+@@ -0,0 +1,39 @@
++#ifndef SEEN_POPPLER_TRANSITION_API_H
++#define SEEN_POPPLER_TRANSITION_API_H
++
++#include <glib/poppler-features.h>
++
++#if POPPLER_CHECK_VERSION(0,70,0)
++#define _POPPLER_CONST const
++#else
++#define _POPPLER_CONST
++#endif
++
++#if POPPLER_CHECK_VERSION(0,69,0)
++#define _POPPLER_DICTADD(dict, key, obj) (dict).dictAdd(key, std::move(obj))
++#elif POPPLER_CHECK_VERSION(0,58,0)
++#define _POPPLER_DICTADD(dict, key, obj) (dict).dictAdd(copyString(key), std::move(obj))
++#else
++#define _POPPLER_DICTADD(dict, key, obj) (dict).dictAdd(copyString(key), &obj)
++#endif
++
++#if POPPLER_CHECK_VERSION(0,58,0)
++#define POPPLER_NEW_OBJECT_API
++#define _POPPLER_FREE(obj)
++#define _POPPLER_CALL(ret, func) (ret = func())
++#define _POPPLER_CALL_ARGS(ret, func, ...) (ret = func(__VA_ARGS__))
++#else
++#define _POPPLER_FREE(obj) (obj).free()
++#define _POPPLER_CALL(ret, func) (*func(&ret))
++#define _POPPLER_CALL_ARGS(ret, func, ...) (*func(__VA_ARGS__, &ret))
++#endif
++
++#if POPPLER_CHECK_VERSION(0, 29, 0)
++#define POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API
++#endif
++
++#if POPPLER_CHECK_VERSION(0, 25, 0)
++#define POPPLER_EVEN_NEWER_COLOR_SPACE_API
++#endif
++
++#endif
+diff --git a/src/extension/internal/pdfinput/svg-builder.cpp b/src/extension/internal/pdfinput/svg-builder.cpp
+index 767c8af4d4..d449d1af52 100644
+--- a/src/extension/internal/pdfinput/svg-builder.cpp
++++ b/src/extension/internal/pdfinput/svg-builder.cpp
+@@ -625,7 +625,7 @@ gchar *SvgBuilder::_createPattern(GfxPattern *pattern, GfxState *state, bool is_
+     if ( pattern != NULL ) {
+         if ( pattern->getType() == 2 ) {  // Shading pattern
+             GfxShadingPattern *shading_pattern = static_cast<GfxShadingPattern *>(pattern);
+-            double *ptm;
++            const double *ptm;
+             double m[6] = {1, 0, 0, 1, 0, 0};
+             double det;
+ 
+@@ -672,7 +672,7 @@ gchar *SvgBuilder::_createTilingPattern(GfxTilingPattern *tiling_pattern,
+ 
+     Inkscape::XML::Node *pattern_node = _xml_doc->createElement("svg:pattern");
+     // Set pattern transform matrix
+-    double *p2u = tiling_pattern->getMatrix();
++    const double *p2u = tiling_pattern->getMatrix();
+     double m[6] = {1, 0, 0, 1, 0, 0};
+     double det;
+     det = _ttm[0] * _ttm[3] - _ttm[1] * _ttm[2];    // see LP Bug 1168908
+@@ -698,7 +698,7 @@ gchar *SvgBuilder::_createTilingPattern(GfxTilingPattern *tiling_pattern,
+     pattern_node->setAttribute("patternUnits", "userSpaceOnUse");
+     // Set pattern tiling
+     // FIXME: don't ignore XStep and YStep
+-    double *bbox = tiling_pattern->getBBox();
++    const double *bbox = tiling_pattern->getBBox();
+     sp_repr_set_svg_double(pattern_node, "x", 0.0);
+     sp_repr_set_svg_double(pattern_node, "y", 0.0);
+     sp_repr_set_svg_double(pattern_node, "width", bbox[2] - bbox[0]);
+@@ -751,7 +751,7 @@ gchar *SvgBuilder::_createTilingPattern(GfxTilingPattern *tiling_pattern,
+  */
+ gchar *SvgBuilder::_createGradient(GfxShading *shading, double *matrix, bool for_shading) {
+     Inkscape::XML::Node *gradient;
+-    Function *func;
++    _POPPLER_CONST Function *func;
+     int num_funcs;
+     bool extend0, extend1;
+ 
+@@ -865,7 +865,7 @@ static bool svgGetShadingColorRGB(GfxShading *shading, double offset, GfxRGB *re
+ 
+ #define INT_EPSILON 8
+ bool SvgBuilder::_addGradientStops(Inkscape::XML::Node *gradient, GfxShading *shading,
+-                                   Function *func) {
++                                   _POPPLER_CONST Function *func) {
+     int type = func->getType();
+     if ( type == 0 || type == 2 ) {  // Sampled or exponential function
+         GfxRGB stop1, stop2;
+@@ -877,9 +877,9 @@ bool SvgBuilder::_addGradientStops(Inkscape::XML::Node *gradient, GfxShading *sh
+             _addStopToGradient(gradient, 1.0, &stop2, 1.0);
+         }
+     } else if ( type == 3 ) { // Stitching
+-        StitchingFunction *stitchingFunc = static_cast<StitchingFunction*>(func);
+-        double *bounds = stitchingFunc->getBounds();
+-        double *encode = stitchingFunc->getEncode();
++        auto stitchingFunc = static_cast<_POPPLER_CONST StitchingFunction*>(func);
++        const double *bounds = stitchingFunc->getBounds();
++        const double *encode = stitchingFunc->getEncode();
+         int num_funcs = stitchingFunc->getNumFuncs();
+ 
+         // Add stops from all the stitched functions
+@@ -890,7 +890,7 @@ bool SvgBuilder::_addGradientStops(Inkscape::XML::Node *gradient, GfxShading *sh
+             svgGetShadingColorRGB(shading, bounds[i + 1], &color);
+             // Add stops
+             if (stitchingFunc->getFunc(i)->getType() == 2) {    // process exponential fxn
+-                double expE = (static_cast<ExponentialFunction*>(stitchingFunc->getFunc(i)))->getE();
++                double expE = (static_cast<_POPPLER_CONST ExponentialFunction*>(stitchingFunc->getFunc(i)))->getE();
+                 if (expE > 1.0) {
+                     expE = (bounds[i + 1] - bounds[i])/expE;    // approximate exponential as a single straight line at x=1
+                     if (encode[2*i] == 0) {    // normal sequence
+@@ -1148,7 +1148,7 @@ void SvgBuilder::updateFont(GfxState *state) {
+     Inkscape::CSSOStringStream os_font_size;
+     double css_font_size = _font_scaling * state->getFontSize();
+     if ( font->getType() == fontType3 ) {
+-        double *font_matrix = font->getFontMatrix();
++        const double *font_matrix = font->getFontMatrix();
+         if ( font_matrix[0] != 0.0 ) {
+             css_font_size *= font_matrix[3] / font_matrix[0];
+         }
+@@ -1193,7 +1193,7 @@ void SvgBuilder::updateTextPosition(double tx, double ty) {
+ void SvgBuilder::updateTextMatrix(GfxState *state) {
+     _flushText();
+     // Update text matrix
+-    double *text_matrix = state->getTextMat();
++    const double *text_matrix = state->getTextMat();
+     double w_scale = sqrt( text_matrix[0] * text_matrix[0] + text_matrix[2] * text_matrix[2] );
+     double h_scale = sqrt( text_matrix[1] * text_matrix[1] + text_matrix[3] * text_matrix[3] );
+     double max_scale;
+diff --git a/src/extension/internal/pdfinput/svg-builder.h b/src/extension/internal/pdfinput/svg-builder.h
+index 55daacee74..34b42e17b8 100644
+--- a/src/extension/internal/pdfinput/svg-builder.h
++++ b/src/extension/internal/pdfinput/svg-builder.h
+@@ -15,6 +15,7 @@
+ #endif
+ 
+ #ifdef HAVE_POPPLER
++#include "poppler-transition-api.h"
+ 
+ class SPDocument;
+ namespace Inkscape {
+@@ -174,7 +175,7 @@ private:
+     void _addStopToGradient(Inkscape::XML::Node *gradient, double offset,
+                             GfxRGB *color, double opacity);
+     bool _addGradientStops(Inkscape::XML::Node *gradient, GfxShading *shading,
+-                           Function *func);
++                           _POPPLER_CONST Function *func);
+     gchar *_createTilingPattern(GfxTilingPattern *tiling_pattern, GfxState *state,
+                                 bool is_stroke=false);
+     // Image/mask creation
+-- 
+2.19.1
+
diff --git a/media-gfx/inkscape/files/inkscape-0.92.3-poppler-0.71.patch b/media-gfx/inkscape/files/inkscape-0.92.3-poppler-0.71.patch
new file mode 100644
index 000000000000..fe6ee81260cf
--- /dev/null
+++ b/media-gfx/inkscape/files/inkscape-0.92.3-poppler-0.71.patch
@@ -0,0 +1,31 @@
+From 493aa253fe5c5b1879c0aa26bdad0aa84ba5d6db Mon Sep 17 00:00:00 2001
+From: Lars Wendler <polynomial-c@gentoo.org>
+Date: Wed, 7 Nov 2018 16:36:22 +0100
+Subject: [PATCH] Fix build with poppler-0.71.0
+
+Fix blatantly backported from
+https://launchpadlibrarian.net/396085203/inkscape-poppler-v071.patch
+---
+ src/extension/internal/pdfinput/poppler-transition-api.h | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/src/extension/internal/pdfinput/poppler-transition-api.h b/src/extension/internal/pdfinput/poppler-transition-api.h
+index 6ed911b04b..4437052593 100644
+--- a/src/extension/internal/pdfinput/poppler-transition-api.h
++++ b/src/extension/internal/pdfinput/poppler-transition-api.h
+@@ -3,6 +3,12 @@
+ 
+ #include <glib/poppler-features.h>
+ 
++#if POPPLER_CHECK_VERSION(0,71,0)
++typedef bool GBool;
++#define gTrue true
++#define gFalse false
++#endif
++
+ #if POPPLER_CHECK_VERSION(0,70,0)
+ #define _POPPLER_CONST const
+ #else
+-- 
+2.19.1
+
diff --git a/media-gfx/inkscape/inkscape-0.92.3-r1.ebuild b/media-gfx/inkscape/inkscape-0.92.3-r1.ebuild
index c022c704d3a7..bc4433cc9962 100644
--- a/media-gfx/inkscape/inkscape-0.92.3-r1.ebuild
+++ b/media-gfx/inkscape/inkscape-0.92.3-r1.ebuild
@@ -101,6 +101,8 @@ PATCHES=(
 	"${FILESDIR}/${PN}-0.92.3-poppler-0.64.patch"
 	"${FILESDIR}/${PN}-0.92.3-poppler-0.65.patch"
 	"${FILESDIR}/${PN}-0.92.3-poppler-0.64-2.patch"
+	"${FILESDIR}/${PN}-0.92.3-poppler-0.69.patch"
+	"${FILESDIR}/${PN}-0.92.3-poppler-0.71.patch"
 )
 
 S="${WORKDIR}/${MY_P}"
diff --git a/media-gfx/jigl/Manifest b/media-gfx/jigl/Manifest
index 7b9468919e8a..fef44602aebc 100644
--- a/media-gfx/jigl/Manifest
+++ b/media-gfx/jigl/Manifest
@@ -1,3 +1,4 @@
 DIST jigl-2.0.1.tar.gz 35423 BLAKE2B 598371156095a75e20c175dbdb50fd7207d72827f24839c456b96308e876a2d0438ad1191e831efd61d6a62704ab2315c26b2c5c83bc14c5a797eea985da8e07 SHA512 648d00d5c6b57ade66da388dc6168289260006f08f971b9a353529191c06357604a341df371c9638762ad3232efc275cd685c2c3c258472c8503742113c41e77
+EBUILD jigl-2.0.1-r1.ebuild 451 BLAKE2B cdd329dc3317deac3bfb3a425692b48254c8a1071d925a429201dcc4c5e919bd8a4707efb3ac90e2320bc2d8f40647952e0cb37036bc94fd035d130a1c22dd91 SHA512 c729d07b9c30096aabcfcd4ff3c82761262ffe656a9e9cf578d45c11679f9d362656a5c266413876d1e7d98a30b0f944b90cc8763040e18703e2fd380207c6ff
 EBUILD jigl-2.0.1.ebuild 452 BLAKE2B c82dccfddebcfbbda12b57113baeeb42125956af90a2d213183500d375dcdaa581c0a5007967ba4bb4a69c474d1026399b6e71f81b0b35620cea2133186c13e4 SHA512 9c705745ecce1148eae2d8f608facf77491fdbf39618f4753fbbfef9145ad7a351231126a014183ea68f5308404a8bc11d4a7f64951e3348061118714e6eb69a
 MISC metadata.xml 265 BLAKE2B 5e9da641ca1949fb00cecaed654cfc3cad540c14b19043c2032e2c6593d47793d6ad7ee461667575ee51a919890ff1ec63195a43c2a35c8b56c12257668fa2b5 SHA512 65fd64249e8dde8eb2ddcb67c58c05b36b10e51956e2237f60dd3ae50872492f3d5872b64106acb13e453a41960f4f817161be3c8b89e6b9a2367b8f1403ffaf
diff --git a/media-gfx/jigl/jigl-2.0.1-r1.ebuild b/media-gfx/jigl/jigl-2.0.1-r1.ebuild
new file mode 100644
index 000000000000..64125ecee7e1
--- /dev/null
+++ b/media-gfx/jigl/jigl-2.0.1-r1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Jason's Image Gallery"
+HOMEPAGE="http://xome.net/projects/jigl/"
+SRC_URI="http://xome.net/projects/jigl/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-lang/perl
+	media-gfx/jhead
+	virtual/imagemagick-tools
+"
+DEPEND=""
+
+src_install() {
+	newbin jigl.pl jigl
+	dodoc ChangeLog Themes Todo
+}
diff --git a/media-gfx/kgraphviewer/Manifest b/media-gfx/kgraphviewer/Manifest
index 7314c4d8a4dc..9a4da0573fb2 100644
--- a/media-gfx/kgraphviewer/Manifest
+++ b/media-gfx/kgraphviewer/Manifest
@@ -1,6 +1,4 @@
 AUX kgraphviewer-2.4.2-unused-dependency.patch 1421 BLAKE2B 92206b24d8fff9efbca0a5e847b856fbea313429f0c922107dd23d07bd2868ea24b9849d79cd0e858e95b20d91bf3595c2aa127f9645ae19ee9e9f2e7d69be57 SHA512 f54c2b1806da3e12988e88d593f0a09414ff9574a9f6df0bdaacb340127824292a29425791cfb3ccdff99c03ca1cba0940e3bd8bb49a59c2954ef192cd03facf
-DIST kgraphviewer-2.4.2.tar.xz 1565692 BLAKE2B 53d4822303f7ff99af3b986586bf17d817480d82203b0dcedb775b341c72518f468b9e97c7c72e41201df2274370807b66f17b516905aef2189215220846ac29 SHA512 2a25f8493881ffa057602e7a141ea610b8db7c43da2db007aea118e2ec7b1f069fbfa6ca80b0e1048c9b20535764679c8d77027337c47a4c18e5240c3058d935
 DIST kgraphviewer-2.4.3.tar.xz 1491328 BLAKE2B b51cf825ad4763538139f917a7d16d15a7244c19b3cab9c79bbd938ee3dd80e4e35e37012199e1256bcc9a9404d756cdb0f5ffb975484d527577c208ecf1d3fa SHA512 d18146ba380efe73e1ec716dd1cc310fe1eac23eccb10e2a699b107451637b9332cc25d62a4de762df4706cea182c9474ba1e885801c9832e1bb9bff1648e72d
-EBUILD kgraphviewer-2.4.2.ebuild 1030 BLAKE2B 601473bd2bfc3686572fcf5c17f7207176d1baba6039f5e8612222984fd6adb020575c9ec4b8c2e44a937f87409b1a2af6e5fc9d061e6e36ec5f4627c5efebc6 SHA512 f793f2c2c8bdc522abf9a7d4ae08281090b0e1210c44ad2c5e570502463dedfaa44a02459ab162a1ec0c3372e87016b810bcaa79f37f64a9f1771028964c34a2
-EBUILD kgraphviewer-2.4.3.ebuild 972 BLAKE2B f4d3706fcdb61c2043880f05d15399fa94b858d266d3b29d17e179c4064340e20ab73ad8741f9620e78c15f9470e60796c5dc786fe451b53a8dd66af859cd213 SHA512 c03b2e479b15ebb885104a88ac5cf84565c34782759576982f594792d1a0181d4c4f9607417668a8ca1ef68c56ecdecb6509e336bd90bd13934092175c3c0c72
+EBUILD kgraphviewer-2.4.3.ebuild 971 BLAKE2B cd38fbfe2c701f736ec608f1c3f658dc315254f398bc1b82a88b72588408dedfbfff09d392b43aaf86eaf39f1833cae9373f029d65d37fc2235ed438cc8bf53b SHA512 33d7d4e16eb680de6dd39b2e93bed30ddf28bcb35ff20ccf804bf81daf04e4fbbb609e7e8aa6be9c2b562d1a4fd7901cf2858124f32938687521b7907dacbfb5
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/media-gfx/kgraphviewer/kgraphviewer-2.4.2.ebuild b/media-gfx/kgraphviewer/kgraphviewer-2.4.2.ebuild
deleted file mode 100644
index b916dd4c59ed..000000000000
--- a/media-gfx/kgraphviewer/kgraphviewer-2.4.2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="Graphviz dot graph file viewer"
-HOMEPAGE="https://www.kde.org/applications/graphics/kgraphviewer/"
-[[ ${PV} != *9999* ]] && SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2 GPL-2+ LGPL-2+ LGPL-2.1+ handbook? ( FDL-1.2 )"
-KEYWORDS="amd64 ~x86"
-IUSE=""
-
-COMMON_DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	>=media-gfx/graphviz-2.30
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/boost
-"
-RDEPEND="${COMMON_DEPEND}
-	!media-gfx/kgraphviewer:4
-"
-
-PATCHES=( "${FILESDIR}/${P}-unused-dependency.patch" )
diff --git a/media-gfx/kgraphviewer/kgraphviewer-2.4.3.ebuild b/media-gfx/kgraphviewer/kgraphviewer-2.4.3.ebuild
index c2eb074f242a..3bc5085a5a82 100644
--- a/media-gfx/kgraphviewer/kgraphviewer-2.4.3.ebuild
+++ b/media-gfx/kgraphviewer/kgraphviewer-2.4.3.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://www.kde.org/applications/graphics/kgraphviewer/"
 [[ ${PV} != *9999* ]] && SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2 GPL-2+ LGPL-2+ LGPL-2.1+ handbook? ( FDL-1.2 )"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 COMMON_DEPEND="
diff --git a/media-gfx/kphotoalbum/Manifest b/media-gfx/kphotoalbum/Manifest
index f76e0da32387..fb01cbe6b03c 100644
--- a/media-gfx/kphotoalbum/Manifest
+++ b/media-gfx/kphotoalbum/Manifest
@@ -1,6 +1,3 @@
-AUX kphotoalbum-5.3-gcc8.patch 1127 BLAKE2B 6bc06c6b30ef6027199c0ad0dd3bcc539ec191faf71d168afeccf2a019e045508a41190b5b93a735c6cea5a7dcb2052e4b550525707bedbd8973b28e2e090a0f SHA512 1b59fa217efa9f5a784f520d2230785b23825184b89a4e58738c10e41e1a43be2a372fe706ed603e8f42fa15731f4226d4f99cacf460c6d03a1c0437522bdadd
-DIST kphotoalbum-5.3.tar.xz 11378768 BLAKE2B d71a52fdd5b389bb6353596c50ca4c5e1318128a0158048534512528a9315b7974da2b6685dc26fa74edb5b7f0f399c7910ba2ea5c5bbf50f9b15a7a0a8ebed3 SHA512 8296e9db17d7cc5b34dd29fbe9aeb8f7ab05e286e5d4a692c05f00cd1438dfd32bc48e1c4fd740c5fb932c463ba92fdb0620b9af49d3419ffcfa1354336dd26f
 DIST kphotoalbum-5.4.tar.xz 11658792 BLAKE2B 5f91dac910cc7022ca8a20f49f286a84586bf7adaed57448c1d811c370a9fb8661469d4e8e73809990e1e1800aaaff8f53c86446d93f99fd55cdddbece01eddc SHA512 d528905f3af9d23c89c89f902abe8358f8e90c402e437bc7cdd67837649f5dcd7f7416c77cc824532f928f41e7590f6005f13c97be4d608e433aad285a6a8bba
-EBUILD kphotoalbum-5.3.ebuild 1660 BLAKE2B 099b204d845146d55eb25cc914dc48d49e7bc0143e216a0c7313f7e4b6a5de458cdf3153b8ebb19473e8d5214f1b17805357f3fbb4498190d9154c8b3a87bc12 SHA512 47d0fee77e027563d5cf1d7a4838493ec4c7fc0ee48e2df66b0c7fdbd013df11654d687b71a1a5cb302bf0f04c3483af19728ad27614b09e63fc3c3244fa5737
-EBUILD kphotoalbum-5.4.ebuild 1525 BLAKE2B 572b7ef7477fbafdfc31422453073f83787c86b4bfbbeb304588379dfaf100b36bfdf400b018c5285e46f23a250d6e093750f69b98aadfbed59793a00dbfe5e1 SHA512 451454cd62874e151dcb4b5ecc3eb7bb25f1b4bf4e6397fe884202d5e04deeb48cf7d572cad60f093def2d0acd9f013c834c3ec4b8096b82cefbadb23b889a88
+EBUILD kphotoalbum-5.4.ebuild 1523 BLAKE2B dae204842bce4e3069d95fc50aa91d5e852387c622faee5a74af801e4b84d23748723d56a393eb656593e0a9845b15315afcf4520d1f923892beb574bf37da8b SHA512 9b413ce49a9968d55a656c2923b3d98968116f55f2dc23c03b6ff7cf5bdb0a235c2360f33797db7f97ef420784fee8ee14dedde3b4e43d613093f604a8dfe335
 MISC metadata.xml 424 BLAKE2B e5e77a618c93044474c0a049bfd37dddbddaaed85bf84fa2e5e7233064176032cc255dbce77607aceca20e431f43f98e29295c977e7841dc86b2c5b286c6df8e SHA512 ec0c2fb381cc5d4b38576c6d5c5b002a07d01027881906bdc1d786311d1d738f6dd67074a6c768a10bbefd3c2c5f01b88bc78cd3456c5884a6d5646593d0dbca
diff --git a/media-gfx/kphotoalbum/files/kphotoalbum-5.3-gcc8.patch b/media-gfx/kphotoalbum/files/kphotoalbum-5.3-gcc8.patch
deleted file mode 100644
index ce52589b23cc..000000000000
--- a/media-gfx/kphotoalbum/files/kphotoalbum-5.3-gcc8.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 47f4c00adaa442cd03b02d44517b5503718f2813 Mon Sep 17 00:00:00 2001
-From: Christophe Giboudeaux <christophe@krop.fr>
-Date: Tue, 12 Jun 2018 22:52:06 +0200
-Subject: Fix build with Qt 5.11.
-
-Summary: 'id' is an int, it doesn't need qPrintable.
-
-Reviewers: johanneszarl
-
-Differential Revision: https://phabricator.kde.org/D13329
----
- RemoteControl/RemoteConnection.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/RemoteControl/RemoteConnection.cpp b/RemoteControl/RemoteConnection.cpp
-index 1dacb72..8bc18d0 100644
---- a/RemoteControl/RemoteConnection.cpp
-+++ b/RemoteControl/RemoteConnection.cpp
-@@ -105,7 +105,7 @@ void RemoteConnection::dataReceived()
-             std::unique_ptr<RemoteCommand> command = RemoteCommand::create(static_cast<CommandType>(id));
-             command->decode(stream);
-             protocolDebug() << qPrintable(QTime::currentTime().toString(QString::fromUtf8("hh:mm:ss.zzz")))
--                               << ": Received " << qPrintable(id);
-+                               << ": Received " << id;
- 
-             emit gotCommand(*command);
-         }
--- 
-cgit v0.11.2
diff --git a/media-gfx/kphotoalbum/kphotoalbum-5.3.ebuild b/media-gfx/kphotoalbum/kphotoalbum-5.3.ebuild
deleted file mode 100644
index c5416d5f9a77..000000000000
--- a/media-gfx/kphotoalbum/kphotoalbum-5.3.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit flag-o-matic kde5
-
-DESCRIPTION="Tool for indexing, searching, and viewing images"
-HOMEPAGE="https://www.kphotoalbum.org/"
-SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2+ FDL-1.2"
-KEYWORDS="amd64 x86"
-IUSE="+kipi +map +raw"
-
-COMMON_DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtsql 'sqlite')
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	media-gfx/exiv2:=
-	media-libs/phonon[qt5(+)]
-	virtual/jpeg:0
-	kipi? ( $(add_kdeapps_dep libkipi) )
-	map? ( $(add_kdeapps_dep libkgeomap) )
-	raw? ( $(add_kdeapps_dep libkdcraw) )
-"
-DEPEND="${COMMON_DEPEND}
-	sys-devel/gettext
-"
-RDEPEND="${COMMON_DEPEND}
-	media-video/mplayer
-	kipi? ( media-plugins/kipi-plugins:5 )
-	!media-gfx/kphotoalbum:4
-"
-
-DOCS=( ChangeLog README )
-
-PATCHES=( "${FILESDIR}/${P}-gcc8.patch" )
-
-src_configure() {
-	append-ldflags -fuse-ld=gold #bug #623566
-
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package kipi KF5Kipi)
-		$(cmake-utils_use_find_package map KF5KGeoMap)
-		$(cmake-utils_use_find_package raw KF5KDcraw)
-	)
-
-	kde5_src_configure
-}
diff --git a/media-gfx/kphotoalbum/kphotoalbum-5.4.ebuild b/media-gfx/kphotoalbum/kphotoalbum-5.4.ebuild
index ff37b76cc7ca..5e0e4683ac6e 100644
--- a/media-gfx/kphotoalbum/kphotoalbum-5.4.ebuild
+++ b/media-gfx/kphotoalbum/kphotoalbum-5.4.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://www.kphotoalbum.org/"
 SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2+ FDL-1.2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+kipi +map +raw"
 
 DEPEND="
diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index c5fe3b5f877c..ad742ac65df5 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -1,8 +1,5 @@
-AUX krita-4.0.3-libraw-0.19.patch 3124 BLAKE2B c84c94b2e0032b4f1f78f1ca944940688775c91a48a0a6449343af36d03f5a754a48749e67365a028314757c0b822db7bda5e9b4e7c7c58796b032306abcd19b SHA512 90e2d40a6d30990b7de7365c06a769e500d2df75281767f3d724b7e5288e131b4cfcfff989a75e66642e374f624bdb8da2e6afe8c12de0ba3282ebd362189140
 AUX krita-4.0.3-tests-optional.patch 10001 BLAKE2B d31e7e89c745642e6cf5fec9f464122954bc050104f1f3dacff2001b8a594a376cd9a61243ca3e6eafc842c68a63c8d1a3b5dc75e737ff8ef8b0e2f1f08d61a2 SHA512 753af31735cd9df6d17e9323fa6699b2b27b60f58d0597e84a30f749c97c7a0595b3719e94235a34e3e51a90b0f6c183e4864ea6a0c5e5f70f27c41e3da0ffdb
 AUX krita-4.1.5-desktopfile.patch 1587 BLAKE2B 7155223dfa5a9bace62729f71a298953c9c2b9ec426693b539bcab961287ee172d8c6151f028508efdfc4e0983b3a8903affefc8ee1a30eb48a51f807c3545df SHA512 ad2a265d287a8e5de9752a83f697f49470ec9984b69a24dd351708372f7c3f1b5dabbbd671a53e5e0fdfa4dae2a0ab1b90ebfc19e6e8ba745a673f1cff607707
-DIST krita-4.0.4.tar.gz 241431012 BLAKE2B c8bb51132f089276761d5a6897fee416a23154267fef72ad525660125770d0fe4b6ab93f70b67ba11c8344f2b27f82bbadc96306d111ff77145b4056ec2c7601 SHA512 a1d82366f7b145c5db4c74ea8c31672a96a3dccd1b31fe2758606de50a4a8e5f8fd794e319127f98cc80f067d851edd4bc6e2f842eba76b807cc3a075a997f45
 DIST krita-4.1.5.tar.gz 243929094 BLAKE2B 7288717978e3370b435d73dc1f7005dc339f3d11e0023cb29abf964d16a5751107287d0eca31b053a2068978c4ed40b745358afc5667b71df98e41373171ff82 SHA512 7790e3e61c18f5a2f5ba0c5d08f09bf78bcfba563b46751689db00814b9775db85cc64c162aa1c1dc47b5e73e49598b24e6a4599b8350a9e07c15aa4eb463499
-EBUILD krita-4.0.4.ebuild 3092 BLAKE2B d1fbb96ff445244a35e16411cf49fbcd3e81317a1759965ccde6b492568a7b69d30430582fa74e3239c66238fe80ad070456ae4c7b3fda36d9ddf14c81f90ba3 SHA512 4af6eabe2319395ac019a5679ae4176ae5629722ef57544a12a1c7a6b5c3f7ba108099b13c3e304fc6979a2bf9a7a65748321639cfa49ccc3b212897912dbc7a
-EBUILD krita-4.1.5.ebuild 3170 BLAKE2B 8fc7a641bb7a93f28bc2d2e75c48aae389668591090b47dd12939473011e7c7ed27cae149621408eba4aa2e6ae8cd0889dd17b72444a04a188da693898ef6c87 SHA512 52b3357a184cc2857fc095cde08a8fc7ca52b61de0c13b73d01d8b494720a61ef3973cf2a0d755f406a3446b5043f52532ebcb531ba43e9dee34720ac80c0b0e
+EBUILD krita-4.1.5.ebuild 3169 BLAKE2B bb899ccaecd54bb8ba069631692aac6a64a0ed9618175b4e685ff9198818fae355814af4cb550f025f6093c6e2eb314b63a3f33da64d1e5d48c002189e6ea5a6 SHA512 33b4e2e836b187428f92620d590cfd3ed068ca48d6811a9290cf582db11e118463b13fc933b3948b5f4dd9d4addefc416f8cdf41cbdf51a1e2930060a28221f2
 MISC metadata.xml 696 BLAKE2B 433ca97e92c2e6c8a0f5bfbd4cba667576be6cc8c93330b689e0088663ac6df263d62b7be6d42debf3480b706721f06be089c5e9a139451e49b609ea4a081ae2 SHA512 becd89686babf0fde2a7e53196715bbca2a4f0d6bad0bc3a55128c9ee19dbe5819be1020db6458ec0c053cf7370a390ff1e84fd9c49331fc28e5a60348fd34dd
diff --git a/media-gfx/krita/files/krita-4.0.3-libraw-0.19.patch b/media-gfx/krita/files/krita-4.0.3-libraw-0.19.patch
deleted file mode 100644
index 03dd3c6bc758..000000000000
--- a/media-gfx/krita/files/krita-4.0.3-libraw-0.19.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-From 9fd6b44701e674058b0eaa5d3f98a99e410a1e03 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Wed, 29 Aug 2018 17:50:28 +0200
-Subject: [PATCH] Fix build with libraw 0.19
-
-Summary:
-Patch taken from arojas in https://phabricator.kde.org/D15132 applied
-with little offset.
-
-Test Plan: Built fine against libraw-0.19 with krita.git master.
-
-Reviewers: rempt, #krita
-
-Subscribers: lbeltrame, rdieter, pino, arojas
-
-Tags: #krita
-
-Differential Revision: https://phabricator.kde.org/D15148
----
- plugins/impex/raw/3rdparty/libkdcraw/src/kdcraw_p.cpp | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/plugins/impex/raw/3rdparty/libkdcraw/src/kdcraw_p.cpp b/plugins/impex/raw/3rdparty/libkdcraw/src/kdcraw_p.cpp
-index 1c761f8563..adc26d2662 100644
---- a/plugins/impex/raw/3rdparty/libkdcraw/src/kdcraw_p.cpp
-+++ b/plugins/impex/raw/3rdparty/libkdcraw/src/kdcraw_p.cpp
-@@ -375,6 +375,7 @@ bool KDcraw::Private::loadFromLibraw(const QString& filePath, QByteArray& imageD
-             raw.imgdata.params.fbdd_noiserd = lround(m_parent->m_rawDecodingSettings.NRThreshold / 100.0);
-             break;
-         }
-+#if !LIBRAW_COMPILE_CHECK_VERSION_NOTLESS(0, 19)
-         case RawDecodingSettings::LINENR:
-         {
-             // (100 - 1000) => (0.001 - 0.02) conversion.
-@@ -391,23 +392,28 @@ bool KDcraw::Private::loadFromLibraw(const QString& filePath, QByteArray& imageD
-             raw.imgdata.params.cfa_clean    = true;
-             break;
-         }
-+#endif
-         default:   // No Noise Reduction
-         {
-             raw.imgdata.params.threshold    = 0;
-             raw.imgdata.params.fbdd_noiserd = 0;
-+#if !LIBRAW_COMPILE_CHECK_VERSION_NOTLESS(0, 19)
-             raw.imgdata.params.linenoise    = 0;
-             raw.imgdata.params.cfaline      = false;
-             raw.imgdata.params.lclean       = 0;
-             raw.imgdata.params.cclean       = 0;
-             raw.imgdata.params.cfa_clean    = false;
-+#endif
-             break;
-         }
-     }
- 
-+#if !LIBRAW_COMPILE_CHECK_VERSION_NOTLESS(0, 19)
-     // Chromatic aberration correction.
-     raw.imgdata.params.ca_correc  = m_parent->m_rawDecodingSettings.enableCACorrection;
-     raw.imgdata.params.cared      = m_parent->m_rawDecodingSettings.caMultiplier[0];
-     raw.imgdata.params.cablue     = m_parent->m_rawDecodingSettings.caMultiplier[1];
-+#endif
- 
-     // Exposure Correction before interpolation.
-     raw.imgdata.params.exp_correc = m_parent->m_rawDecodingSettings.expoCorrection;
-@@ -461,8 +467,10 @@ bool KDcraw::Private::loadFromLibraw(const QString& filePath, QByteArray& imageD
- 
-     raw.imgdata.params.dcb_iterations = m_parent->m_rawDecodingSettings.dcbIterations;
-     raw.imgdata.params.dcb_enhance_fl = m_parent->m_rawDecodingSettings.dcbEnhanceFl;
-+#if !LIBRAW_COMPILE_CHECK_VERSION_NOTLESS(0, 19)
-     raw.imgdata.params.eeci_refine    = m_parent->m_rawDecodingSettings.eeciRefine;
-     raw.imgdata.params.es_med_passes  = m_parent->m_rawDecodingSettings.esMedPasses;
-+#endif
- 
-     //-------------------------------------------------------------------------------------------
- 
--- 
-2.18.0
-
diff --git a/media-gfx/krita/krita-4.0.4.ebuild b/media-gfx/krita/krita-4.0.4.ebuild
deleted file mode 100644
index 8e5ccf9eb204..000000000000
--- a/media-gfx/krita/krita-4.0.4.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-PYTHON_COMPAT=( python3_{4,5,6} )
-inherit kde5 python-single-r1
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.gz"
-	KEYWORDS="amd64 ~x86"
-fi
-
-DESCRIPTION="Free digital painting application. Digital Painting, Creative Freedom!"
-HOMEPAGE="https://www.kde.org/applications/graphics/krita/ https://krita.org/"
-LICENSE="GPL-3"
-IUSE="color-management fftw gif +gsl +jpeg openexr pdf qtmedia +raw tiff vc"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-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 kio)
-	$(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')
-	$(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-python/PyQt5[${PYTHON_USEDEP}]
-	dev-python/sip[${PYTHON_USEDEP}]
-	media-gfx/exiv2:=
-	media-libs/lcms
-	media-libs/libpng:0=
-	sys-libs/zlib
-	virtual/opengl
-	x11-libs/libX11
-	x11-libs/libxcb
-	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 )
-	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}
-	dev-cpp/eigen:3
-	dev-lang/perl
-	sys-devel/gettext
-	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.0.3-tests-optional.patch"
-	"${FILESDIR}/${PN}-4.0.3-libraw-0.19.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-utils_use_find_package color-management OCIO)
-		$(cmake-utils_use_find_package fftw FFTW3)
-		$(cmake-utils_use_find_package gif GIF)
-		$(cmake-utils_use_find_package gsl GSL)
-		$(cmake-utils_use_find_package jpeg JPEG)
-		$(cmake-utils_use_find_package openexr OpenEXR)
-		$(cmake-utils_use_find_package pdf Poppler)
-		$(cmake-utils_use_find_package qtmedia Qt5Multimedia)
-		$(cmake-utils_use_find_package raw LibRaw)
-		$(cmake-utils_use_find_package tiff TIFF)
-		$(cmake-utils_use_find_package vc Vc)
-	)
-
-	kde5_src_configure
-}
diff --git a/media-gfx/krita/krita-4.1.5.ebuild b/media-gfx/krita/krita-4.1.5.ebuild
index 24e0eeb67a37..71d42ec6cccf 100644
--- a/media-gfx/krita/krita-4.1.5.ebuild
+++ b/media-gfx/krita/krita-4.1.5.ebuild
@@ -10,7 +10,7 @@ inherit kde5 python-single-r1
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	SRC_URI="mirror://kde/stable/${PN}/${PV%.1}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 ~x86"
 fi
 
 DESCRIPTION="Free digital painting application. Digital Painting, Creative Freedom!"
diff --git a/media-gfx/mkgallery/Manifest b/media-gfx/mkgallery/Manifest
index ca0cd2a10e4f..3ea42f6cc482 100644
--- a/media-gfx/mkgallery/Manifest
+++ b/media-gfx/mkgallery/Manifest
@@ -1,3 +1,4 @@
 DIST mkgallery-1.1.tgz 6514 BLAKE2B 3ac077de99e2c8e05424425eb640a6684eb199c99d0eca879aab23645b392d3b19184d0a93e7dd4a92cd643d261c22a0677919e26b1866507c35d782ee6ec390 SHA512 6d3cbe6bbf3673c26bedde0eef1b03409766324836296205b6dab0a32eb23c7f8cbd27db2778bf710c7d3641e01eb57dbac5493ab97862cd501b3858f1db6a4d
+EBUILD mkgallery-1.1-r1.ebuild 512 BLAKE2B 2ac706c6420d4fffadd0d150342b1cfeec1216ad730212eeb8ceb16861647e19c63862e6b8eb46c2e8ab51d2aa12879de0be2236ce7120b00063dde50e106387 SHA512 24a12dec85a61730c93cc93febb87e1dca2b62412c00ab6e7e7e180de74ed879681f292f7bcca27f676e462bda197636d4c3cc3ad15d52bad8cdba6d767d4068
 EBUILD mkgallery-1.1.ebuild 528 BLAKE2B a114ec974e314ca71f0a107eb040697874432358989f66fb947ace0efed2d7a33edd3917ed229d9f9bdb36673d498521f516db2226bc50105396c3c093f08235 SHA512 a4e141929b498c0de8dc896ae94797a8eaf72b4a2744aca6105030b479af7b31e7093541d9090054e057d1282780430c6fab7ec8575903748cbdbf3aa7dc3e82
 MISC metadata.xml 246 BLAKE2B ae3650aa087620727ede47f5c455bcaf1c88078b720cc601aa399305760d957ab0ce54674ef2f3c0afc4e832637acd1f0758926c14ecbe22eb7c1c693235e46e SHA512 06b51a14b7a00428ccf8399b124bdf7ad7909af339489562a36e3e470da8c8cbdf09324fd01c14dd515ee0fb8d4849ef25f4117c56076a4590fd31b7f76b8651
diff --git a/media-gfx/mkgallery/mkgallery-1.1-r1.ebuild b/media-gfx/mkgallery/mkgallery-1.1-r1.ebuild
new file mode 100644
index 000000000000..3795844f753b
--- /dev/null
+++ b/media-gfx/mkgallery/mkgallery-1.1-r1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Creates thumbnails and a HTML index file for a directory of jpg files"
+HOMEPAGE="http://mkgallery.sourceforge.net/"
+SRC_URI="http://mkgallery.sourceforge.net/${P}.tgz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE=""
+SLOT="0"
+
+DEPEND=""
+RDEPEND="
+	sys-devel/bc
+	virtual/imagemagick-tools
+"
+
+src_install() {
+	dobin mkgallery
+	einstalldocs
+}
diff --git a/media-gfx/phototonic/Manifest b/media-gfx/phototonic/Manifest
index 2a751dc3313d..cc963ef9763e 100644
--- a/media-gfx/phototonic/Manifest
+++ b/media-gfx/phototonic/Manifest
@@ -1,5 +1,3 @@
-DIST phototonic-2.0.tar.gz 283185 BLAKE2B 0c86fa991fd2c05721d19c603becd27f93139377416ff4c9b2749488c5d5753263d3223d3bd71d3a4670289243b471ccdcb7f937d2f080cbd7dd6442cf7257f4 SHA512 e72952c76332b592043a39a4920ab941f20b3494d66e9855becf09438e36c0edbdbf1a384a08a9b825c5e48ac4c87b5e4cb7d1eaff7076140ad2537868aa4357
 DIST phototonic-2.1.tar.gz 488640 BLAKE2B bfbc14d06760c6f9d9244d5ed38d033a769f1eaf8116f55ea6aa5373578aa105fd28ef8e352d394939306af2ab3b617314aebc443a13f7abe9bb8be2fd0cb0cd SHA512 4789311cefa2d5a07ca5e2fd3c0530267f9ea2ffcbf6295c687db3d2aa55e0b7d91228047b2ca24590868b22ce93d0228785fcf49a105ee65c9826b0d9a8fa42
-EBUILD phototonic-2.0.ebuild 905 BLAKE2B c373ed731c845695e8ba0908509889f916bbeb4940c99080b02fa7854376638979d05035be04ad706559862ee1b82d0245c8470a4ad180de7f58bf7fc2ba563b SHA512 d4a6b425dbd83f89cec6b18da3376f8c56a5888a5e7b936e14bf13fc06a30b5f43890d9a357c02f16609e297ec3758a272ac33e1783f2cc7ba13dd5c3e855bff
 EBUILD phototonic-2.1.ebuild 905 BLAKE2B c373ed731c845695e8ba0908509889f916bbeb4940c99080b02fa7854376638979d05035be04ad706559862ee1b82d0245c8470a4ad180de7f58bf7fc2ba563b SHA512 d4a6b425dbd83f89cec6b18da3376f8c56a5888a5e7b936e14bf13fc06a30b5f43890d9a357c02f16609e297ec3758a272ac33e1783f2cc7ba13dd5c3e855bff
 MISC metadata.xml 339 BLAKE2B 047cc0980ff832366db731e064eb31e5569fdc799057841b91bcea87139a4f9cd471055843b38b4994e3850caf8cb2adc59f620f75d1c5b427861d63c3339fec SHA512 7793436a2c6de004c369473dada585f2ade8105984db831f889da06ec98d6e20213e6256fc0b0817531dc5f7729f4737e08e2d5f4dad5b8922f7ef99b46f16f9
diff --git a/media-gfx/phototonic/phototonic-2.0.ebuild b/media-gfx/phototonic/phototonic-2.0.ebuild
deleted file mode 100644
index 46087619b847..000000000000
--- a/media-gfx/phototonic/phototonic-2.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils qmake-utils xdg-utils
-
-DESCRIPTION="Image viewer and organizer"
-HOMEPAGE="https://github.com/oferkv/phototonic"
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/oferkv/phototonic.git"
-else
-	SRC_URI="https://github.com/oferkv/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-3+"
-SLOT="0"
-IUSE="svg tiff"
-
-RDEPEND="
-	dev-qt/qtwidgets:5
-	dev-qt/qtgui:5
-	dev-qt/qtcore:5
-	media-gfx/exiv2:=
-	svg? ( dev-qt/qtsvg:5 )
-	tiff? ( dev-qt/qtimageformats:5 )
-"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	eqmake5
-}
-
-src_install() {
-	emake install INSTALL_ROOT="${D}"
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/media-gfx/ristretto/Manifest b/media-gfx/ristretto/Manifest
index b4c61579c59b..5b6479b0fa59 100644
--- a/media-gfx/ristretto/Manifest
+++ b/media-gfx/ristretto/Manifest
@@ -1,5 +1,3 @@
-DIST ristretto-0.8.2git-rd21ed3c.tar.bz2 584418 BLAKE2B 50d24fa81f4ce59a3a9acdb71a532e8d57399aafc4c20790b4a08ef3584bf3c71af978cb4e53ba6f4821fd4fc02e12600d39b84309ee29a764581855fd43bc75 SHA512 17fe6b5c24d4f4f3b6d28e1c435afbb0140e81a77f2b1c628ab7e05ed380a55a902368dabbb8e92647f08bb8853df8099b8de779d94dc91d3426cc7e33cbcbe3
 DIST ristretto-0.8.3.tar.bz2 564745 BLAKE2B 74f6fe50dbbcb538ff370fdefc934921e5878f7422dde577b86acc0ee63a03edaada860f0a91301de4b4ed4ae2fab89d74eccc5f3b9faababa4c71ee07159c33 SHA512 c43b48dfdf9e8ed0ea3c5f2bbac1c837881aa6a467c78377b6f53dcce030b5a3b8134a7b8cbad1008ae758295953fde50a916c284e54e8c5490158e776554514
-EBUILD ristretto-0.8.2_p20170821.ebuild 949 BLAKE2B 118693c9ce2ac41f5dfce5410cf4951c3f05ea5334a84b04c43e4d877d14021eb08b30a99c343270af2ccb1611ee898695f9d20fada95888a28516a6ff1dfa26 SHA512 01e5b950ff9684ade413e33532e0f81b0ea214bd13203cfe68f2cfa7bd278be50d27cb9a1196b0ab69d80a0f48384aa11e0686074d7919e17fcb0cd8d8b40d12
 EBUILD ristretto-0.8.3.ebuild 879 BLAKE2B 7f7473ecbbf739f47d1cb0370e15b2f487862792487e894b76dab4681adb2c433ea9a782c820bb95111bd83212badeb333ce21e2d10ec8cb455d6acf5224900d SHA512 faf62c22bba201b3136d30843ecca5d11dceb79b64ad97102a9b7ae3242e35264cccc41e66f37b32cd08fa63b599eb40be7a45a51e6bd219cab6757b7a076f63
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/media-gfx/ristretto/ristretto-0.8.2_p20170821.ebuild b/media-gfx/ristretto/ristretto-0.8.2_p20170821.ebuild
deleted file mode 100644
index 1aa62d01ec91..000000000000
--- a/media-gfx/ristretto/ristretto-0.8.2_p20170821.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils xdg-utils
-
-MY_P=${P%_p*}git-rd21ed3c
-DESCRIPTION="A fast and lightweight picture viewer for Xfce"
-HOMEPAGE="https://docs.xfce.org/apps/ristretto/start"
-SRC_URI="https://dev.gentoo.org/~mgorny/dist/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE=""
-
-RDEPEND=">=dev-libs/dbus-glib-0.98:0=
-	>=dev-libs/glib-2.24:2=
-	media-libs/libexif:0=
-	x11-libs/cairo:0=
-	>=x11-libs/gtk+-2.20:2=
-	x11-libs/libX11:0=
-	>=xfce-base/libxfce4ui-4.10:0=
-	>=xfce-base/libxfce4util-4.10:0=
-	>=xfce-base/xfconf-4.10:0="
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	virtual/pkgconfig
-	sys-devel/gettext"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-}
diff --git a/media-gfx/slic3r/Manifest b/media-gfx/slic3r/Manifest
index a40652e99642..8573c867abfe 100644
--- a/media-gfx/slic3r/Manifest
+++ b/media-gfx/slic3r/Manifest
@@ -4,10 +4,8 @@ AUX slic3r-1.2.9-c++11.patch 1102 BLAKE2B 3cb6c1ab196a73da820190e2f00f65654a1e3a
 AUX slic3r-1.3.0-no-locallib.patch 15462 BLAKE2B 0fd73fbf341573392ebdab3c4d010e1a11cbf424ded6b5b6fab18c05ffde049a8816c2884a06acdbacf0f41ed30b4d136a849eb6bf92e5fb72591e6e0081592d SHA512 cdf791f721ab3a2356631ee9c74c796c48626c8313dd31dab59e880ab181734e892fa341bbb1a648d35303f4fb4a8e3c4615d360c317438876f67de1ef9f9187
 AUX slic3r-9999-no-locallib.patch 15462 BLAKE2B 0fd73fbf341573392ebdab3c4d010e1a11cbf424ded6b5b6fab18c05ffde049a8816c2884a06acdbacf0f41ed30b4d136a849eb6bf92e5fb72591e6e0081592d SHA512 cdf791f721ab3a2356631ee9c74c796c48626c8313dd31dab59e880ab181734e892fa341bbb1a648d35303f4fb4a8e3c4615d360c317438876f67de1ef9f9187
 DIST slic3r-1.1.7.tar.gz 2079200 BLAKE2B b3aa45741bb92a75dd09be783cb9a8cd551c7736f04022905d11587d8b2a533db85c1f88a9d0185b2b6414ba56d44e0feb104bcfcaf52a0a35a1db912c6976db SHA512 0c3a12890f57f422084b20152ede3467a8624db4ba8be774258df0af963c1f6f41fda7d96967f6355bd95727539e6aad51c30cf45284a7ee3fff294839acc650
-DIST slic3r-1.2.9.tar.gz 2165322 BLAKE2B 49643284520e6c85ff0e32fada165c8d4c75c15e484555aac1004bc9527bacd552c6aa4916cbb56e304553a47ef6c2db703f6e9d705a585cfbac909c2e84bb79 SHA512 c0284f40de43c54e775baccdb2a67813a6ca4b69db78a788f2023b3f34127e780e6d0160144b9df1e17a2992b3255ef9a372b61a594f503b21efad7334387a51
 DIST slic3r-1.3.0.tar.gz 2104094 BLAKE2B 74c58690cf196f89ecff5eec853215c87c648df5a504725fea9f14b0343bca105190de1d63e2e8e76d47fcaf8dbe7b6d26f61b304ce7336412effa1c9a3fba41 SHA512 ff0f7747e166826ff1c53220974ee9d3a217d0e19964dbe4a5fa3e81f262a6810a47632686b7f1b3128384ae05c6f98d8aab980524079bdf9811445fe23a0f0d
 EBUILD slic3r-1.1.7.ebuild 2909 BLAKE2B e27ded00dbfe3869bd08b5a7d969f78d23c96c34611e50997a57f9331a0b142de3e984e5a15eea219414b39c97fcd99633014bce2df072117ea334db2d41a868 SHA512 03a2ffd9a3290b582da0feb1eaff5445ec1baa991faa5dde9899f68d557bd234c2f20cca24a5660093e0695ef5ca47ed76059688da48d2561b92b45d17ece834
-EBUILD slic3r-1.2.9-r2.ebuild 2472 BLAKE2B 60a07b07348bec52717fa7476286030dd0ff9bda794c634e054386d67a46d3a640429eb8d301b356cf8e01d08f0b73777ae33944a2a65a7882618bca5ef16a95 SHA512 9937794276d490f75476fa39208f7726d0ad83534acb84ab5818cd1849c580cf3ce2c9f01b9eeaaee9ed9d4f49cc24bb9c4b95c4b45bbd70fd304678e0246795
-EBUILD slic3r-1.3.0.ebuild 2602 BLAKE2B e4f9a4e793ee552d839a563427ba4ffc4458736b114dfb13f0d99ea0c34d70d1bcc247f4679a436672b1259a4e1d4caa83e652ff6f6c942229c12af734058982 SHA512 7884576a45326e4ac368f3780595ac95ab90005d1d3abe9101fb7a45a16dfb56908b787e5deca39ac0f7e47f7e8390793dd514226fd4171c5abcbcd25d5b0bf8
+EBUILD slic3r-1.3.0-r1.ebuild 2818 BLAKE2B 7c80a347937b464e5234f2823d927247c3faf577c558e6f8eae79d2e082394419f23904576e58380a43f4eb50c5f76ad29a3fbf691dc6cb18b4fdbf81c2f1c00 SHA512 e57b93f76eedfd4df9e4b7a00b81dd84fca6e31f1cc95abcaa75d970b47dfd2ec4f98a50419349a549a5a8044cde3a504f449446265107e2a681af0ccea6f4a6
 EBUILD slic3r-9999.ebuild 2621 BLAKE2B ac3c5a2f2790214a68522edae4b4e93958bd866bc236c0435ca535733a209ee05b96cee6ba1a470420ca1a9a3f66454c09b38eeb0e44d683a38977b797853626 SHA512 bfff6a690433fdd85398d841c738578e44569eb58df43b602502c062419a77b3786288944414b3114538cbc278ccb029fa074ce44e4f2fc919209052888dacdc
 MISC metadata.xml 861 BLAKE2B 91af33b7f79333028a2c77b24a4e910b93693a8aeec0e260405df9930489e4cadd3a4cf12f66e1b3b90a84113deb1c30108a7cdc000ef2097559871552385cfb SHA512 203b7d367c4eb6ff4b88fc304dac879277a2b515ed349d495d4231bbd3b097172f20a98fe4bb396b92114a78e7db3e56c2bfb3256e7ff94dfaded9e36696c6a8
diff --git a/media-gfx/slic3r/slic3r-1.2.9-r2.ebuild b/media-gfx/slic3r/slic3r-1.2.9-r2.ebuild
deleted file mode 100644
index 21f227284727..000000000000
--- a/media-gfx/slic3r/slic3r-1.2.9-r2.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils perl-module
-
-DESCRIPTION="A mesh slicer to generate G-code for fused-filament-fabrication (3D printers)"
-HOMEPAGE="http://slic3r.org"
-SRC_URI="https://github.com/alexrj/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="AGPL-3 CC-BY-3.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+gui test"
-
-RDEPEND="!=dev-lang/perl-5.16*
-	>=dev-libs/boost-1.55[threads]
-	dev-perl/Class-XSAccessor
-	>=dev-perl/Encode-Locale-1.50.0
-	dev-perl/IO-stringy
-	>=dev-perl/Math-PlanePath-53.0.0
-	>=dev-perl/Moo-1.3.1
-	dev-perl/XML-SAX-ExpatXS
-	virtual/perl-Carp
-	virtual/perl-Encode
-	virtual/perl-File-Spec
-	virtual/perl-Getopt-Long
-	virtual/perl-parent
-	virtual/perl-Scalar-List-Utils
-	virtual/perl-Test-Simple
-	virtual/perl-Thread-Semaphore
-	>=virtual/perl-threads-1.960.0
-	virtual/perl-Time-HiRes
-	virtual/perl-Unicode-Normalize
-	virtual/perl-XSLoader
-	gui? ( dev-perl/Class-Accessor
-		dev-perl/Growl-GNTP
-		dev-perl/libwww-perl
-		dev-perl/Module-Pluggable
-		dev-perl/Net-Bonjour
-		dev-perl/Net-DBus
-		dev-perl/OpenGL
-		>=dev-perl/Wx-0.991.800
-		dev-perl/Wx-GLCanvas
-		>=media-libs/freeglut-3
-		virtual/perl-Math-Complex
-		>=virtual/perl-Socket-2.16.0
-		x11-libs/libXmu
-	)"
-DEPEND="${RDEPEND}
-	>=dev-perl/ExtUtils-CppGuess-0.70.0
-	>=dev-perl/ExtUtils-Typemaps-Default-1.50.0
-	>=dev-perl/ExtUtils-XSpp-0.170.0
-	>=dev-perl/Module-Build-0.380.0
-	>=dev-perl/Module-Build-WithXSpp-0.140.0
-	>=virtual/perl-ExtUtils-MakeMaker-6.800.0
-	>=virtual/perl-ExtUtils-ParseXS-3.220.0
-	test? (	virtual/perl-Test-Harness
-		virtual/perl-Test-Simple )"
-
-S="${WORKDIR}/Slic3r-${PV}/xs"
-
-src_prepare() {
-	pushd "${WORKDIR}/Slic3r-${PV}" || die
-	eapply "${FILESDIR}/${P}-adjust_var_path.patch"
-	eapply "${FILESDIR}/${P}-c++11.patch"
-	eapply_user
-	popd || die
-}
-
-src_configure() {
-	SLIC3R_NO_AUTO=1 perl-module_src_configure
-}
-
-src_test() {
-	perl-module_src_test
-	pushd .. || die
-	prove -Ixs/blib/arch -Ixs/blib/lib/ t/ || die "Tests failed"
-	popd || die
-}
-
-src_install() {
-	perl-module_src_install
-
-	pushd .. || die
-	insinto "${VENDOR_LIB}"
-	doins -r lib/Slic3r.pm lib/Slic3r
-
-	insinto "${VENDOR_LIB}"/Slic3r
-	doins -r var
-
-	exeinto "${VENDOR_LIB}"/Slic3r
-	doexe slic3r.pl
-
-	dosym "${VENDOR_LIB}"/Slic3r/slic3r.pl /usr/bin/slic3r.pl
-
-	make_desktop_entry slic3r.pl \
-		Slic3r \
-		"${VENDOR_LIB}/Slic3r/var/Slic3r_128px.png" \
-		"Graphics;3DGraphics;Engineering;Development"
-	popd || die
-}
diff --git a/media-gfx/slic3r/slic3r-1.3.0.ebuild b/media-gfx/slic3r/slic3r-1.3.0-r1.ebuild
index 52dbf45085be..a94b46f01a75 100644
--- a/media-gfx/slic3r/slic3r-1.3.0.ebuild
+++ b/media-gfx/slic3r/slic3r-1.3.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit eutils perl-module
+inherit eutils flag-o-matic perl-module
 
 DESCRIPTION="A mesh slicer to generate G-code for fused-filament-fabrication (3D printers)"
 HOMEPAGE="http://slic3r.org"
@@ -65,12 +65,21 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/Slic3r-${PV}/xs"
 
+pkg_pretend() {
+	einfo "Checking for -std=c++11 support in compiler"
+	test-flags-CXX -std=c++11 > /dev/null || die
+}
+
 src_prepare() {
 	pushd "${WORKDIR}/Slic3r-${PV}" || die
 	sed -i lib/Slic3r.pm -e "s@FindBin::Bin@FindBin::RealBin@g" || die
 	eapply "${FILESDIR}"/${P}-no-locallib.patch
 	eapply_user
 	popd || die
+	# drop std=c++11 to compiler defaults...
+	sed \
+		-e '/c++11/d' \
+		-i Build.PL || die
 }
 
 src_configure() {
diff --git a/media-gfx/solvespace/Manifest b/media-gfx/solvespace/Manifest
new file mode 100644
index 000000000000..60990c38872d
--- /dev/null
+++ b/media-gfx/solvespace/Manifest
@@ -0,0 +1,4 @@
+DIST libdxfrw-0.6.3-87ff1082f49b1286a033ac8f38fe8dde0975bb8b.tar.gz 691867 BLAKE2B bd3414930efe8cc1185a20f889dda3ec8ea46e40d3a1a4c24975683fc444161acdff576a1f40c34203e523e88bacf3841c50928340e7865650a113e65375f930 SHA512 0f8e2561887fbc5101787f0d7818328864b5c4a679ef539fcdbda8c124ab4a808663f9ba645d397f154596eab1eb7c6f0bdf3883bf6975392863e01bada3a1f0
+DIST solvespace-2.3.tar.gz 2115940 BLAKE2B 67e2d81e0a609d0344a6f28d33a78609b01c7105785f93aa1124f0592fe0e31d4846e6dd406339b2ef2c5f3961f91302a73c5391fe2e0f435e78c3a97ed67612 SHA512 9d22e467337591cd9a4935124d18733b8337f5785ab5738f4a94300f283ffe7d313569e379ae77e509d14182ffde8c9db7beaebb46ea7c0507c6b05010fe1a56
+EBUILD solvespace-2.3.ebuild 1561 BLAKE2B 0e50f33d7fa511cacdc39bee095e87627afa0f981638fb83fd4e938576f7339536fa9ca7b8cd722327f40376cf269aadd64c939ab755e272dc760e3964f8115e SHA512 3b6801f393df905510f5e5b967a05c825219e2fce973787e46fe9a2af87931ecea38e412d3690ab601225180413b3bda63aa0156d4bad698f5c749106b0eb476
+MISC metadata.xml 1255 BLAKE2B ad5bd3d58bac3c5a6c8542944163431deeec3b219e89302db02b180c3d13af43d41f116243b8ae789af5eeb642b71e8c825241bcd42ee78ab1bd8a0baed24efe SHA512 06429b78540c7a12f28718908e3b5af16e2e99eeab4ae8ba37450dc9e7c87281ae0e2bc20e15da6796451f01f0aef9b544f03d5ac14692f349f7bbfb60d0965b
diff --git a/media-gfx/solvespace/metadata.xml b/media-gfx/solvespace/metadata.xml
new file mode 100644
index 000000000000..e63161bebc65
--- /dev/null
+++ b/media-gfx/solvespace/metadata.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+    <maintainer type="person">
+        <email>ktrace@yandex.ru</email>
+        <name>Victor Kustov</name>
+    </maintainer>
+    <maintainer type="project">
+        <email>proxy-maint@gentoo.org</email>
+        <name>Proxy Maintainers</name>
+    </maintainer>
+    <longdescription lang="en">
+    Solvespace is a parametric 2D/3D CAD tool. Applications include:
+    - modeling 3d parts — draw with extrudes, revolves, and Boolean (union / difference) operations
+    - modeling 2d parts — draw the part as a single section, and export DXF, PDF, SVG; use 3d assembly to verify fit
+    - 3d-printed parts — export the STL or other triangle mesh expected by most 3d printers
+    - preparing CAM data — export 2d vector art for a waterjet machine or laser cutter;
+      or generate STEP or STL, for import into third-party CAM software for machining
+    - mechanism design — use the constraint solver to simulate planar or spatial linkages, with pin, ball, or slide joints
+    - plane and solid geometry — replace hand-solved trigonometry and spreadsheets with a live dimensioned drawing
+    </longdescription>
+</pkgmetadata>
diff --git a/media-gfx/solvespace/solvespace-2.3.ebuild b/media-gfx/solvespace/solvespace-2.3.ebuild
new file mode 100644
index 000000000000..ca5fc5249b9e
--- /dev/null
+++ b/media-gfx/solvespace/solvespace-2.3.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+DXFRW_COMMIT="87ff1082f49b1286a033ac8f38fe8dde0975bb8b"
+DXFRW_PV="0.6.3"
+DXFRW_P="libdxfrw-${DXFRW_PV}-${DXFRW_COMMIT}"
+
+inherit cmake-utils gnome2-utils
+
+DESCRIPTION="Parametric 2d/3d CAD"
+HOMEPAGE="http://solvespace.com"
+SRC_URI="https://github.com/solvespace/solvespace/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	https://github.com/solvespace/libdxfrw/archive/${DXFRW_COMMIT}.tar.gz -> ${DXFRW_P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-cpp/gtkmm:2.4=
+	dev-cpp/pangomm:1.4
+	dev-libs/json-c:=
+	media-libs/fontconfig
+	media-libs/freetype:2
+	media-libs/glew:0=
+	media-libs/libpng:0=
+	virtual/opengl"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+# NOTE: please keep commit hash actually when version up
+GIT_COMMIT_HASH="4d1e1341d926ac356b295d5cc3d61c7a6cd7d07d"
+
+src_prepare() {
+	rm -r "extlib/libdxfrw" || die  "rm extlib/libdxfrw failed"
+	mv "${WORKDIR}/libdxfrw-${DXFRW_COMMIT}" "extlib/libdxfrw" || die "move libdxfrw-${DXFRW_COMMIT} failed"
+	sed -i '/include(GetGitCommitHash)/d' CMakeLists.txt || die 'remove GetGitCommitHash by sed failed'
+	# fixed in master already
+	sed -i -e 's/CHAR_WIDTH/CHAR_WIDTH_/' src/textwin.cpp src/toolbar.cpp src/win32/w32main.cpp src/ui.h || die 'sed failed'
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DGIT_COMMIT_HASH="${GIT_COMMIT_HASH}"
+	)
+	cmake-utils_src_configure
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}