18 files changed, 365 insertions, 129 deletions
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 2ca9f9644e08..71582b8592ca 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/arss/Manifest b/media-gfx/arss/Manifest
index 18b6d2d5d033..ca025f8928f7 100644
--- a/media-gfx/arss/Manifest
+++ b/media-gfx/arss/Manifest
@@ -1,4 +1,3 @@
 DIST arss-0.2.3-src.tar.gz 17597 BLAKE2B b4478a341307fb963a054897a42ab724c5f0f1fa288fc0ff8368a74a4e388d0c3446debe0a81bdb43670003b53a376d23dab4adae3dcfce4cf3effe5fb30a739 SHA512 7ef7115b310c9f4ecb7bdc8f34fb1afadabadb56d50ddef27a7688fd28af511ebaa1468f2c11a91077b8197027f9e31333c22d6b5f39d2a35d7b7dfc5b90658d
 EBUILD arss-0.2.3-r1.ebuild 489 BLAKE2B c4b882d1f316a9db22d762641b5e0d721a3a96a0f2c8c1d7bbc91aa6bc8d02e445fdeeb44423accdb7d5d407d01256863e938b6c5db08ed4dcaf66aa83f36c15 SHA512 cafea04fc6e0b34ef49f81c69b776af6c1e9535cbc3ce4650c0b8e285b791003ea0b10e6be894a12d8ca50c7e68bf41d6d7f615cc82086b127aef3e85b0e915c
-EBUILD arss-0.2.3.ebuild 483 BLAKE2B af6f58427881e815509c592875e886d698e6a6e26c004612a276991e4f3ad4c88ffe7637fb863c003525ccf8afb9b4aca8e1413a0ff33f31a89d885514c1f69a SHA512 1b18c0df8b30bd0c6d8e897f6922c0968106754da4d747fca47d8d6a5b8157f4751c79c1288ae5816af887940e9bf911773604e31a33c81dc26bca755189eba1
 MISC metadata.xml 241 BLAKE2B 3ffb7cd5ca939bb002b4aecac183f4af6c3794a327c6ede9a5113cc4eaa322daea8953e93ee77706f6e5900915d9e186062834dd09c43e0cf33b86724d5d1caf SHA512 0993824e2e047f0cb6f62a6fbe1a9519c303a1bca222e3e8cd72640ea99d1b17dc3a7fb795fafc7d0ebd075b39b118e8249ade02e3683186f4fa2f6c01c40730
diff --git a/media-gfx/arss/arss-0.2.3.ebuild b/media-gfx/arss/arss-0.2.3.ebuild
deleted file mode 100644
index 1b79cb1d088b..000000000000
--- a/media-gfx/arss/arss-0.2.3.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-CMAKE_IN_SOURCE_BUILD="true"
-MY_P=${P}-src
-
-inherit cmake-utils
-
-DESCRIPTION="Analysis & Resynthesis Sound Spectrograph"
-HOMEPAGE="http://arss.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND="sci-libs/fftw"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}/src
-
-DOCS=( ../AUTHORS ../ChangeLog )
diff --git a/media-gfx/figurine/Manifest b/media-gfx/figurine/Manifest
index 5af316e17b51..74705db3d239 100644
--- a/media-gfx/figurine/Manifest
+++ b/media-gfx/figurine/Manifest
@@ -1,4 +1,4 @@
 DIST figurine-1.0.5.tar.gz 293105 BLAKE2B 1530ee872cb80e4aa629ec4901c48b49a4aee77667286563da50c037a820ea028defb135e47c1b1b6363b7a59d55d633b30dc516f3b43819b3cc4e61439a6cba SHA512 e3b6a2d0d4b8a4837f27eb40ff158444ff59ac7d826cc780c6c13760e0d6e72844a7b6de69e482dfee12c020600e40c58fb5b4b9efa935342ada6fe62b57eff6
-EBUILD figurine-1.0.5-r1.ebuild 566 BLAKE2B b85366d0b405263ba3591c444d1bafc41fa57c87d1c8ffe5b2a7ffafdcf86bc2c6b897a3862696d785daa50f98e41669a451339281af55ad71ed458307dac9d5 SHA512 cc708c12c4a102656d9c45566becc3aa344b61e7d718d031cb5eaf0241a8009be78efe50aa8688b3a9f2ec89c9999f354730422521ceb0a4a44f299dbfd34d83
+EBUILD figurine-1.0.5-r1.ebuild 565 BLAKE2B 52a5baee14437c9097776c3d5ac581fbe4fd8f330212c6f9a8abe91316a72aefbd0de928b21f042116800fd7ca141ec50e18a0e940def7d290848a3c11d6b8fb SHA512 c74b9e752075b56be4d897553578519958f3b2fef7370b019e41b8eddd3da206eb3a3cd2c72245e52057927bdae46defe6b9aeeb8f2433d4815796042d2d3472
 EBUILD figurine-1.0.5.ebuild 598 BLAKE2B 657f9f2f940db245fba418896fa399cef1f10dd16005321dccdfbe634578f6a6695ee94388f7cce586942d17bff821db4206e5611ffac25e8473abf56b3a6a80 SHA512 15fcb3b83492e9cbd70d44a76211fbab3eb39523cdd865560dd9baf33fde631e1adebb793978da837d9918e43d190ce387efd177fe6bf458ee295e614ae7fd93
 MISC metadata.xml 245 BLAKE2B 0d2e3e7b0bbd5f0c960bf5de591a6729a33552e5e32a4f19f2b7ab79e849dad285bf7e8c88134f213d99d9c83cee8672b37250ed84ad6c6f480bab5fdab368f1 SHA512 122e29d489968047e70dd824a49ffc4dede2a4c632e203a820abe03ea2478cb94b7aad94409ca235f227a034e16141c556fbe462833edfa802f03169215d4c0d
diff --git a/media-gfx/figurine/figurine-1.0.5-r1.ebuild b/media-gfx/figurine/figurine-1.0.5-r1.ebuild
index 0f18f45c3da3..7c6fffe4dba9 100644
--- a/media-gfx/figurine/figurine-1.0.5-r1.ebuild
+++ b/media-gfx/figurine/figurine-1.0.5-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/figurine/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""
 
 RDEPEND=""
diff --git a/media-gfx/graphviz/Manifest b/media-gfx/graphviz/Manifest
index 85d44beab313..4012de6db77d 100644
--- a/media-gfx/graphviz/Manifest
+++ b/media-gfx/graphviz/Manifest
@@ -1,6 +1,4 @@
 AUX graphviz-2.34.0-Xaw-configure.patch 2445 BLAKE2B fc1b3820fd72821ac431f5d93d0b4b0c8f596ca9d2c2f516961f5baab9fd54ba870df75434d2ed59fd9034bb7e2ce38c00faef9c12a79c7ec4da2d5e416d7117 SHA512 473d2ed9070329512cbc26929267b25fb8d7726e21ed01d2921d4d8ac13b8ffaf166f07229fa7409192cfa14fabb0cf68b299bb3331b3cc953ae5363274fd15c
-AUX graphviz-2.34.0-dot-pangocairo-link.patch 882 BLAKE2B 633760e2049f035eeb1b79aedc040da71ca9707acd1ccdba7531c894a1909ebb9e8483319871f2db5e6d4e0ff275449ce682badfa33de232177474111203a62d SHA512 8e40b35d8d1ec6a9e683e4f4f39fd5e6c253015727172ba0ed1cf6d9a3b4cc20e3d4169a11bbed29c3cf3dc8ff6d14508ea6459dd62e53e7d69b62ee39ef9f26
-AUX graphviz-2.38.0-ghostscript-9.18.patch 753 BLAKE2B f9469184e815ddb153ba01a7c9ed759468b72c4394d1c96a0ef5f668bd9e8657ae09e54200149bb033845138eaa2587dc783f1e61c2496ccd926cc2aa6bc81aa SHA512 19327b3fbfecdad1990fd4d9668c3f318da5907c1a8c7e3abd1f1f5a0703c474975b7f08425eb2c0f5c32522ebea614d02b4db9e83cce7fb975458fb87cafc62
 AUX graphviz-2.40.1-qt5.patch 4140 BLAKE2B d0d92dddd6ae1efb7e24e22ac0f32025b16ad1aab5182ec410dfd527732fefdf335cda392f1036409ac3a6b86be15794b80546ff9cbfd47454bd01266d861945 SHA512 bd1d51ae10d17ef321bba7dfa619054642debbb02ea1458b0597e6c62471e7750bf5d2cfc68ccb6fd2964b0fbe072b2e7642dd8b097c7e046f8877a2e36d3f44
 DIST graphviz-2.40.1.tar.gz 25633455 BLAKE2B 96ba5a8cb94d93cf4ecd424bf29c1bf67099e39e582be97fca088de0aad6bbbb46b00af55c197894e0b63f1a96177894b6cd23498295bb524fe19a75661cbc59 SHA512 a3f358a7050523a39b91a259563a95925b37853ffec799e571211af5b686d3af42457c937882954482785745d90416b1abd945caf05f8abb52b3876e07aa70f5
 EBUILD graphviz-2.40.1-r1.ebuild 7964 BLAKE2B 86ccdfe5320c4222eca9150e3db3fd1c9bcb5c47c51d9782aab637ade7fd07f28a5c8c701fd430848532fe03ed86680fbe3d2b1674779bbb202138981577b0a6 SHA512 d5327a4a2f8d659352fdcecbb4d9981d8181d3706a4098218b146b37706227006a2c687056ce49689ca12d24dd895fcdc6deb8cff6502a9c152d38b4162b620b
diff --git a/media-gfx/graphviz/files/graphviz-2.34.0-dot-pangocairo-link.patch b/media-gfx/graphviz/files/graphviz-2.34.0-dot-pangocairo-link.patch
deleted file mode 100644
index df5ea34d3297..000000000000
--- a/media-gfx/graphviz/files/graphviz-2.34.0-dot-pangocairo-link.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/cmd/dot/Makefile.am
-+++ b/cmd/dot/Makefile.am
-@@ -115,12 +115,8 @@
- dot_static_LDADD += $(top_builddir)/plugin/webp/.libs/libgvplugin_webp_C.a $(WEBP_LIBS)
- dot_builtins_LDADD += $(top_builddir)/plugin/webp/libgvplugin_webp.la $(WEBP_LIBS)
- endif
--dot_static_LDADD += $(top_builddir)/plugin/pango/.libs/libgvplugin_pango_C.a $(PANGOCAIRO_LIBS)
--dot_builtins_LDADD += $(top_builddir)/plugin/pango/libgvplugin_pango.la $(PANGOCAIRO_LIBS)
--if WITH_WEBP
--dot_static_LDADD += $(top_builddir)/plugin/webp/.libs/libgvplugin_webp_C.a $(WEBP_LIBS)
--dot_builtins_LDADD += $(top_builddir)/plugin/webp/libgvplugin_webp.la $(WEBP_LIBS)
--endif
-+dot_static_LDADD += $(top_builddir)/plugin/pango/.libs/libgvplugin_pango_C.a $(PANGOCAIRO_LIBS) $(PANGOFT2_LIBS)
-+dot_builtins_LDADD += $(top_builddir)/plugin/pango/libgvplugin_pango.la $(PANGOCAIRO_LIBS) $(PANGOFT2_LIBS)
- endif
- 
- if WITH_LASI
diff --git a/media-gfx/graphviz/files/graphviz-2.38.0-ghostscript-9.18.patch b/media-gfx/graphviz/files/graphviz-2.38.0-ghostscript-9.18.patch
deleted file mode 100644
index 9d0d78a1580a..000000000000
--- a/media-gfx/graphviz/files/graphviz-2.38.0-ghostscript-9.18.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 8da53964edec8a665c3996d483df243eb150c2c4 Mon Sep 17 00:00:00 2001
-From: Jakob Nixdorf <flocke@shadowice.org>
-Date: Fri, 22 Jan 2016 20:10:42 +0100
-Subject: [PATCH] Fix build with ghostscript-9.18.
-
---- a/plugin/gs/gvloadimage_gs.c
-+++ b/plugin/gs/gvloadimage_gs.c
-@@ -32,6 +32,24 @@
- #include <ghostscript/ierrors.h>
- #include <cairo/cairo.h>
- 
-+
-+/**
-+ * Ensure compatibility with Ghostscipt versions newer than 9.18
-+ * while maintaining compatibility with the older versions.
-+ **/
-+
-+#ifndef e_VMerror
-+#define e_VMerror gs_error_VMerror
-+#endif
-+
-+#ifndef e_unregistered
-+#define e_unregistered gs_error_unregistered
-+#endif
-+
-+#ifndef e_invalidid
-+#define e_invalidid gs_error_invalidid
-+#endif
-+
- #ifdef WIN32
- #define NUL_FILE "nul"
- #else
diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index 3426cbe85164..e909da16b0b8 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -1,4 +1,6 @@
 AUX krita-3.2.0-tests-optional.patch 8806 BLAKE2B 90355102edb82e69539dbbedae83a9bb51f98a34fdfd85758e4b4427ed5ec058cfe28931fb6a1c604a9631ff1b3b5c86651a7d6fde80d2002d7e7a2ef6f6aa69 SHA512 aeba8043f7a31a24fad6b515608a881b34bffd0f05502ddd7591f8bb7a7c82eae5ec21bcab4c17091255f94422817ca5e89d97836ab0ce9298f29350a1666b34
 DIST krita-3.3.3.tar.gz 207582956 BLAKE2B 36fd2978956fbba870ff8d8c28c31db0731742385620d6b5fd0cc275d74bf6352635c4fd4a537a87b7994fa41d140ee05000593d5a95cd288fd07959e8ef1693 SHA512 b6dc30809e0d6c19fee4bbb240aa53c65e88361ebe273c73c2f24f43904c3cd51719dadb9c11fb7f691f17d75732374295ce904810d8893b7f95b45f859901e0
+DIST krita-4.0.0.tar.gz 237309220 BLAKE2B bbc4fe9b32359348ca1f9a83a6f66cd5972ece2ba6e17c79799e94ff2e8d3968ad0cf6a02c8466c37bd562dc1ee47ce4bacf790f44aa63e02f867cd266d919ce SHA512 026f15c747eedf1335791a607984acbda049a63550b94fe19c99028499668ccbc723dcd66d8b4d3f981035a040121a5fd6a8f35ced911748578af5c88408eaab
 EBUILD krita-3.3.3.ebuild 2553 BLAKE2B a1d97fa3af8a79da72fa2dbdddd73135892d9df066f9316359036eed49d0bf21cc57ff2aab2d9e43549bab839d3949e0623aea9fc946337fbd1004ef10df6404 SHA512 c750f5904eddcee56469a463c0421250d905d9d6bb3f97711e19ee98b1e3b614c07e6fd68cc46597b4e500d8c8b51f9b10401cdb54622243cdc6491807657662
+EBUILD krita-4.0.0.ebuild 3030 BLAKE2B acbf119bdac45ed6badfb1fb79586e998f6d46652d70c3dc666259de586d7b9d755561404c8b376a527bb34906aa50875e52d2ded26d76519c2c2827e6f7f940 SHA512 f25696276b5fcf5574b3484deff8a755e067071311bd6995de166cbae5caf87ec304c481ff9ce229279a09a2566adab230b7cc17786b721f91909a1102e33053
 MISC metadata.xml 569 BLAKE2B 7609e8cfc1f63fd04b3306a37a9b429eddaf56bf4bcca32d707b529d0267d7f63979a850edf8fcb5b1043134b1baa7210e849903a65243ac300596ccbdb473bd SHA512 44b2dc2f5d0e737a780e16f4d88cb3c2ff1dbab8b1878ae3561659c3a191040ef0f0f2ef0e7325b16ca6c149e29d417c10bec18bfcf06d8e847000e1e8279b27
diff --git a/media-gfx/krita/krita-4.0.0.ebuild b/media-gfx/krita/krita-4.0.0.ebuild
new file mode 100644
index 000000000000..04f2354e07d3
--- /dev/null
+++ b/media-gfx/krita/krita-4.0.0.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="forceoptional-recursive"
+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%.1}/${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 python qtmedia +raw tiff vc"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+COMMON_DEPEND="
+	$(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:=
+	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] )
+	python? (
+		${PYTHON_DEPS}
+		dev-python/PyQt5[${PYTHON_USEDEP}]
+		dev-python/sip[${PYTHON_USEDEP}]
+	)
+	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"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_configure() {
+	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 python PyQt5)
+		$(cmake-utils_use_find_package python SIP)
+		$(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/nomacs/Manifest b/media-gfx/nomacs/Manifest
index a0b7c1eb91e3..bc79948eb9cf 100644
--- a/media-gfx/nomacs/Manifest
+++ b/media-gfx/nomacs/Manifest
@@ -2,6 +2,6 @@ AUX nomacs-3.6.1-batch-resize.patch 757 BLAKE2B 0eba44f34bcde704fcb5ae907ee25fba
 DIST nomacs-3.6.1.tar.gz 28604636 BLAKE2B 74045163d5dabf9858de4e11a2300a298c15d691b3991a56dc802e6b16ee484637de05674aa13ba1d31848bce2df4724c3e083c5d35f82dba926b16aeaf81327 SHA512 cfbda2be5ed015a5ea39cc3c3c9273e3164bb67f0c5fd4fac0e3c607075cf67cfea2311b21420585363a841d65a53c03e100af57c209786243c2c3dcaba11f8e
 DIST nomacs-3.8.0.tar.gz 32240476 BLAKE2B b0bf2832cda09c01b98c5ef540a0d3d61046ca652c2c0b8b382ba69b7623327f6bcaf030cce2b87719a4bda1141b2118cb184700bfbff83fc86b496622178a16 SHA512 90ffd1ea7f6d8e2f07b2b093ebc7cfec682f11b874d95e249f3d35a2ceb8b75e7a0c55f19c978231c3c8342abe5cb251359771fd90aa39b50ee0a6d1514e88e1
 EBUILD nomacs-3.6.1-r1.ebuild 1598 BLAKE2B 95aa8b0faf792aa1a6fdd92f1b3ef1f3ab740eb3900e454f2ba45a7f4700b0ddd20ecf9f40cbe086932058b2a9a670d71c3c11c0b7f7e57d1efc57b1abd1cdfa SHA512 57fce8366da69eff7739e5cd05c461ab1a577e59caf194d2b472ab1db83c29ad2ed12da6372d651d15339ae0307d58e260686e78f67ede84fcfd71f86b6054a8
-EBUILD nomacs-3.6.1.ebuild 1525 BLAKE2B 83b19ed4151eae94e9790808785f5df97612fb73c382bc37ee8f5b7bac4500a44ed84a9d98bce0ed066c8751042025503be9a0a8b8b652f7503713654c22a085 SHA512 6d70ba584e61c30d9cb5d3f3c6d5aa716d6ca02549f7079236e1bdfede378eee9699817971793fff1eacd802af0049c0c6feb4bf3b2f14e782a031a79e299bdf
+EBUILD nomacs-3.6.1.ebuild 1516 BLAKE2B 6f90ecc2401786a6ff3c06649006fd7994fe8dc53c1507937923eea49592b629102c5d49bf3047901a0d1464eb452e9294af482c0b75b3757870126914763513 SHA512 7852f9e0d3c4091b5326f4081bd3fa90d729910a036832a901f83880f55a196c26b12ff89e7f2c0cd2514af67e86c89ee939342aa459c333e0d580e17e9615bc
 EBUILD nomacs-3.8.0.ebuild 1661 BLAKE2B 286200d262f759b648747fb014ca76c24718153b9cbca0630b645637976a1b8871126809ab47971a1b03ac010ee3b3b163936c31d6a35e736c4eeead0dd8d528 SHA512 1edc2400b6f53cfbcc900cb8e3c94d82b3a1a4fc216383de413a73b9c76eada1bf5a8ffbb03a3aa35ccdd229171451352a334e34f1b90906bfc5c038c4f1fd31
 MISC metadata.xml 588 BLAKE2B 544009f8f7b184b666e5b7bbb88ce395028032bd060a7abe16f2ed096accb11b0819c19b3898ca1fc96c61aacc9cf0bb5960716f711ba77c5f545f040dd31567 SHA512 f681a8f2f1ec2c2902d34829245790edd014eca1829479f2a47b9179f370d3c3d3c562c32dae1918a7616c8f75c7d94b525beec410ad39704b25fd502cefb5fb
diff --git a/media-gfx/nomacs/nomacs-3.6.1.ebuild b/media-gfx/nomacs/nomacs-3.6.1.ebuild
index c88239195c8f..7d4943b91dc7 100644
--- a/media-gfx/nomacs/nomacs-3.6.1.ebuild
+++ b/media-gfx/nomacs/nomacs-3.6.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit cmake-utils fdo-mime
+inherit cmake-utils xdg-utils
 
 DESCRIPTION="Qt-based image viewer"
 HOMEPAGE="https://nomacs.org/"
@@ -65,9 +65,9 @@ src_configure() {
 }
 
 pkg_postinst() {
-	fdo-mime_desktop_database_update
+	xdg_desktop_database_update
 }
 
 pkg_postrm() {
-	fdo-mime_desktop_database_update
+	xdg_desktop_database_update
 }
diff --git a/media-gfx/scantailor-advanced/Manifest b/media-gfx/scantailor-advanced/Manifest
new file mode 100644
index 000000000000..9fa9959de39b
--- /dev/null
+++ b/media-gfx/scantailor-advanced/Manifest
@@ -0,0 +1,4 @@
+AUX scantailor-advanced-1.0.14-qt-5.11.patch 4884 BLAKE2B 58c0c2f66c157b4520a1a6ac43a4adc07b3b23bd63c946f546550589ac5d22d18e36f0b55e2ed2fdd92c64e1444fe339c5241e6feb596b90e6c09064b2dacf6b SHA512 03124ada946bdef52ac09aa19c2dec0c4855214bc457c6a126a43c383db125bfd9c1fe1b1f66f42df333e7bed941633bded3e5cbc0236b5510f687106600c4e6
+DIST scantailor-advanced-1.0.14.tar.gz 926267 BLAKE2B 2d901afebf3d9b405365ba71868f7aa29c23c537af72679a89a29351557a1a12692223b961dfd0ced3ea540c45f90dde8ea13bcd1667aa355e90a1c24a21e932 SHA512 113723b8a62da1b7141e03b5ad8ac7c426a2943f882cd229c9c51d10de75ee85d019ac21fc2d9eb4cc0d5bfb9ce66a4c41cf523698adc5a9a5d99da02369baf7
+EBUILD scantailor-advanced-1.0.14.ebuild 999 BLAKE2B 6c07ef5f2b066e4dedc224e22b65d5ef9c2a1ca876c66e5dab728186e3c8b250c150df21eeaf2aba3efbca4f291fa7b5b9c1bf3b13b8afaeb0de431bf432c796 SHA512 e3a994978db112e8bcaf5ef8b6bd11e6ea64a04d487ebeda4dcf4e71723b92eb77324d4d80bd65e22a3ad0756996fbe8832227439104d0387ca3a26b8611d908
+MISC metadata.xml 349 BLAKE2B 78647c133687609629962b66aad8c9d2507cdba556647750d4f17131be10ebaf2ebc72491ba4d820e9112e9be19be521ced81f6e9f08684ee0b200f0c9843ae9 SHA512 e3482b130afb2fe9fbce9d33eb62fddf11baf938c14c1def86294e8b8fe57a1121c1b917265714868ef55b8035cd02f9e73c7885bd564fec282ad478452186de
diff --git a/media-gfx/scantailor-advanced/files/scantailor-advanced-1.0.14-qt-5.11.patch b/media-gfx/scantailor-advanced/files/scantailor-advanced-1.0.14-qt-5.11.patch
new file mode 100644
index 000000000000..6443809c102a
--- /dev/null
+++ b/media-gfx/scantailor-advanced/files/scantailor-advanced-1.0.14-qt-5.11.patch
@@ -0,0 +1,182 @@
+From 64a151a3795013f58880d2a5f4ce4688ecb88838 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date: Tue, 10 Apr 2018 11:58:00 +0200
+Subject: [PATCH] Fix build with Qt 5.11
+
+---
+ DefaultParamsDialog.h                  | 9 ++++++---
+ ErrorWidget.cpp                        | 3 +++
+ filters/deskew/ApplyDialog.h           | 3 +++
+ filters/fix_orientation/ApplyDialog.h  | 3 +++
+ filters/output/ApplyColorsDialog.h     | 3 +++
+ filters/output/ChangeDewarpingDialog.h | 3 +++
+ filters/output/ChangeDpiDialog.h       | 3 +++
+ filters/page_layout/ApplyDialog.h      | 3 +++
+ filters/page_split/SplitModeDialog.h   | 3 +++
+ filters/select_content/ApplyDialog.h   | 3 +++
+ 10 files changed, 33 insertions(+), 3 deletions(-)
+
+diff --git a/DefaultParamsDialog.h b/DefaultParamsDialog.h
+index d9ec86e..043446c 100644
+--- a/DefaultParamsDialog.h
++++ b/DefaultParamsDialog.h
+@@ -2,14 +2,17 @@
+ #ifndef SCANTAILOR_DEFAULTPARAMSDIALOG_H
+ #define SCANTAILOR_DEFAULTPARAMSDIALOG_H
+ 
+-#include <QtWidgets/QWidget>
+-#include <unordered_map>
+-#include <set>
+ #include "ui_DefaultParamsDialog.h"
+ #include "OrthogonalRotation.h"
+ #include "DefaultParamsProfileManager.h"
+ #include "DefaultParams.h"
+ 
++#include <QButtonGroup>
++#include <QWidget>
++
++#include <unordered_map>
++#include <set>
++
+ class DefaultParamsDialog : public QDialog, private Ui::DefaultParamsDialog {
+     Q_OBJECT
+ private:
+diff --git a/ErrorWidget.cpp b/ErrorWidget.cpp
+index fb76cc4..6fb4c68 100644
+--- a/ErrorWidget.cpp
++++ b/ErrorWidget.cpp
+@@ -18,6 +18,9 @@
+ 
+ #include "ErrorWidget.h"
+ 
++#include <QIcon>
++#include <QStyle>
++
+ ErrorWidget::ErrorWidget(const QString& text, Qt::TextFormat fmt) {
+     setupUi(this);
+     textLabel->setTextFormat(fmt);
+diff --git a/filters/deskew/ApplyDialog.h b/filters/deskew/ApplyDialog.h
+index bf1a055..69f18e1 100644
+--- a/filters/deskew/ApplyDialog.h
++++ b/filters/deskew/ApplyDialog.h
+@@ -22,7 +22,10 @@
+ #include "PageId.h"
+ #include "PageSequence.h"
+ #include "intrusive_ptr.h"
++
++#include <QButtonGroup>
+ #include <QDialog>
++
+ #include <set>
+ 
+ class QButtonGroup;
+diff --git a/filters/fix_orientation/ApplyDialog.h b/filters/fix_orientation/ApplyDialog.h
+index dcd25d5..e46d30d 100644
+--- a/filters/fix_orientation/ApplyDialog.h
++++ b/filters/fix_orientation/ApplyDialog.h
+@@ -24,7 +24,10 @@
+ #include "PageRange.h"
+ #include "PageSequence.h"
+ #include "intrusive_ptr.h"
++
++#include <QButtonGroup>
+ #include <QDialog>
++
+ #include <vector>
+ #include <set>
+ 
+diff --git a/filters/output/ApplyColorsDialog.h b/filters/output/ApplyColorsDialog.h
+index 4c525c7..81f4177 100644
+--- a/filters/output/ApplyColorsDialog.h
++++ b/filters/output/ApplyColorsDialog.h
+@@ -23,7 +23,10 @@
+ #include "PageId.h"
+ #include "PageSequence.h"
+ #include "intrusive_ptr.h"
++
++#include <QButtonGroup>
+ #include <QDialog>
++
+ #include <set>
+ 
+ class PageSelectionAccessor;
+diff --git a/filters/output/ChangeDewarpingDialog.h b/filters/output/ChangeDewarpingDialog.h
+index de4f2c3..31ee19d 100644
+--- a/filters/output/ChangeDewarpingDialog.h
++++ b/filters/output/ChangeDewarpingDialog.h
+@@ -24,8 +24,11 @@
+ #include "PageId.h"
+ #include "PageSequence.h"
+ #include "intrusive_ptr.h"
++
++#include <QButtonGroup>
+ #include <QDialog>
+ #include <QString>
++
+ #include <set>
+ 
+ class PageSelectionAccessor;
+diff --git a/filters/output/ChangeDpiDialog.h b/filters/output/ChangeDpiDialog.h
+index 7ce6f58..1b86ac7 100644
+--- a/filters/output/ChangeDpiDialog.h
++++ b/filters/output/ChangeDpiDialog.h
+@@ -23,8 +23,11 @@
+ #include "PageId.h"
+ #include "PageSequence.h"
+ #include "intrusive_ptr.h"
++
++#include <QButtonGroup>
+ #include <QDialog>
+ #include <QString>
++
+ #include <set>
+ 
+ class PageSelectionAccessor;
+diff --git a/filters/page_layout/ApplyDialog.h b/filters/page_layout/ApplyDialog.h
+index ba25154..07f83c3 100644
+--- a/filters/page_layout/ApplyDialog.h
++++ b/filters/page_layout/ApplyDialog.h
+@@ -24,7 +24,10 @@
+ #include "PageRange.h"
+ #include "PageSequence.h"
+ #include "intrusive_ptr.h"
++
++#include <QButtonGroup>
+ #include <QDialog>
++
+ #include <set>
+ 
+ class PageSelectionAccessor;
+diff --git a/filters/page_split/SplitModeDialog.h b/filters/page_split/SplitModeDialog.h
+index 2cf9e91..351f1e2 100644
+--- a/filters/page_split/SplitModeDialog.h
++++ b/filters/page_split/SplitModeDialog.h
+@@ -25,7 +25,10 @@
+ #include "PageId.h"
+ #include "PageSequence.h"
+ #include "intrusive_ptr.h"
++
++#include <QButtonGroup>
+ #include <QDialog>
++
+ #include <set>
+ 
+ class ProjectPages;
+diff --git a/filters/select_content/ApplyDialog.h b/filters/select_content/ApplyDialog.h
+index f0f7041..a7ff19e 100644
+--- a/filters/select_content/ApplyDialog.h
++++ b/filters/select_content/ApplyDialog.h
+@@ -24,7 +24,10 @@
+ #include "PageRange.h"
+ #include "PageSequence.h"
+ #include "intrusive_ptr.h"
++
++#include <QButtonGroup>
+ #include <QDialog>
++
+ #include <vector>
+ #include <set>
+ 
+-- 
+2.17.0
+
diff --git a/media-gfx/scantailor-advanced/metadata.xml b/media-gfx/scantailor-advanced/metadata.xml
new file mode 100644
index 000000000000..ac1f5ba3f485
--- /dev/null
+++ b/media-gfx/scantailor-advanced/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>graphics@gentoo.org</email>
+		<name>Gentoo Graphics Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">4lex4/scantailor-advanced</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-gfx/scantailor-advanced/scantailor-advanced-1.0.14.ebuild b/media-gfx/scantailor-advanced/scantailor-advanced-1.0.14.ebuild
new file mode 100644
index 000000000000..902fbb1a3918
--- /dev/null
+++ b/media-gfx/scantailor-advanced/scantailor-advanced-1.0.14.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils desktop virtualx
+
+DESCRIPTION="Interactive post-processing tool for scanned pages"
+HOMEPAGE="http://scantailor.org/ https://github.com/4lex4/scantailor-advanced"
+SRC_URI="https://github.com/4lex4/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2 GPL-3 public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtopengl:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	media-libs/libpng:0=
+	media-libs/tiff:0
+	sys-libs/zlib
+	virtual/jpeg:0
+	x11-libs/libXrender
+"
+DEPEND="${RDEPEND}
+	dev-libs/boost
+	dev-qt/linguist-tools:5
+	!media-gfx/scantailor
+"
+
+PATCHES=( "${FILESDIR}/${P}-qt-5.11.patch" )
+
+src_test() {
+	cd "${CMAKE_BUILD_DIR}" || die
+	virtx emake test
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	newicon resources/appicon.svg ${PN}.svg
+	make_desktop_entry ${PN} "Scan Tailor Advanced"
+}
diff --git a/media-gfx/tgif/Manifest b/media-gfx/tgif/Manifest
index 9d41066dcfde..4285b54dce12 100644
--- a/media-gfx/tgif/Manifest
+++ b/media-gfx/tgif/Manifest
@@ -1,5 +1,4 @@
 AUX tgif-4.2.5-wformat-security.patch 19741 BLAKE2B 53633a5012d4f49bb42654c8237c4bee08fcac5525a69b0967f3fb2a7bdfe58d6a402f74d2af5505d876e9acfa1b3014ac1e7261b00f027b0e5b15c609ada0a8 SHA512 881ef034698a0e632c257a185346cb22218b93f8668fabf0169cb1a6c59ce0ad7a81ab5e4093610a3cbd360304a007067862d672622bed7a852db93f584d3d7f
 DIST tgif-QPL-4.2.5.tar.gz 3093619 BLAKE2B 8d858c357a7c51185ee22f0e2005bd4a7c96270c701bf603fd7e6bea012794892e460d5e9dfbfdbbc17a3e6accb5f4afbc3baadc4e3315e6dd5b4e676f1ce5bf SHA512 7b007620190883e30216407bf31c4142493bbd270b4babc282994dec37d221d79f0b1cadc9efda9bc337eb323254e69beee2d4c4873877e7321df41922f456ef
 EBUILD tgif-4.2.5-r1.ebuild 945 BLAKE2B b9a8069b1158a53b283a1f306df5aee1f222c7c182e29006c5c1671a413652433d693bc6291a042add660b662abc12bc86af50c6cff490a465e20c031cf6f010 SHA512 9b94d68ced37a2da3feb29c8ab4ce3fe920f7e947bbc83c87c768c84a1b63645f8a25c700ce6c762b5ca803655095365d8cbcb212e83d148fadf53eeea0c9bc3
-EBUILD tgif-4.2.5.ebuild 1008 BLAKE2B b2f9d2c50edc3a37b4123901dfe45a03754822c641d8f4cee4e6bfc659a62080cd7446d993db0d4f0ae73f358561874d28faf746e868d637fa6e3835bf4d9e4d SHA512 7a140abaa7b0ce77f7e416ee8fcc67f796795112c04e2bd832a33f3cf4ce593c2ff09ad7b31b50f186b07f3a579629f03090c6b31ecf9d77db4426a894edb6d4
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/media-gfx/tgif/tgif-4.2.5.ebuild b/media-gfx/tgif/tgif-4.2.5.ebuild
deleted file mode 100644
index db08aabc841c..000000000000
--- a/media-gfx/tgif/tgif-4.2.5.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=1
-AUTOTOOLS_IN_SOURCE_BUILD=1
-inherit autotools-utils eutils flag-o-matic
-
-MY_P="${PN}-QPL-${PV}"
-
-DESCRIPTION="Xlib base 2-D drawing facility under X11"
-HOMEPAGE="http://bourbon.usc.edu/tgif/index.html"
-SRC_URI="ftp://bourbon.usc.edu/pub/${PN}/${MY_P}.tar.gz"
-
-LICENSE="QPL-1.0"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE=""
-
-DEPEND="sys-libs/zlib
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXmu
-	x11-libs/libXt
-	x11-proto/xproto"
-RDEPEND="${DEPEND}
-	media-libs/netpbm"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=( AUTHORS ChangeLog HISTORY NEWS README )
-
-src_prepare() {
-	sed -i \
-		-e 's/^CFLAGS=/CFLAGS+=/' \
-		-e 's:^TGIFDIR.*:TGIFDIR = $(datadir)/tgif:' \
-		Makefile.am || die 'sed on Makefile.am failed'
-
-	append-cppflags -D_DONT_USE_MKTEMP -DHAS_STREAMS_SUPPORT
-
-	autotools-utils_src_prepare
-}