gentoo resync : 31.12.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-12-31 13:43:35 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2018-12-31 13:43:35 +0000
commit: 2891d29af8907ce881662f4a02844926d7a293c7 (patch)
tree: 56979d96839d0827aa52008b81b746b4934d88df /media-gfx
parent: de49812990871e1705b64051c35161d5e6400269 (diff)
68 files changed, 2033 insertions, 587 deletions
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 7678eb89c6c5..dfe837a978e2 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/chafa/Manifest b/media-gfx/chafa/Manifest
new file mode 100644
index 000000000000..bfe0aab0ecc2
--- /dev/null
+++ b/media-gfx/chafa/Manifest
@@ -0,0 +1,3 @@
+DIST chafa-1.0.1.tar.xz 311616 BLAKE2B c7060cf1b20f7c2eaa6eb8265422031dea1b3b80c106b08b11b431336044e154609ad73c7654a0085a8ca0b71bc01e06377ded638081bdfaeb96aac054577ed8 SHA512 fe0dc8ecec77c7b1b4c694d6dd3f4de895a07faf39519f47c2284d76261e2c6298943fa5309cdca6d41ef0a22fe0321a2ef890f319903596bdfaad10394e7ec2
+EBUILD chafa-1.0.1.ebuild 813 BLAKE2B 2cb840de743f45a829c1adae53fd15713a7ec84fe187e068695ddf24c2d3dc316257b0148db87af0b8794eefd5350f46bf611df30c911ec0d706b60975c5db5d SHA512 18e9f8347098a84b0c27cf9bc0091c8ca041048ef745d470b01dd7e6c5494c871daf994e541b11b3b62d29b0d91602b4647a80248770c4b6b8c647b21d44ab71
+MISC metadata.xml 407 BLAKE2B ac815b6d037374042188d98d563fe87dd98fd052284d42fe594c77d58c97ff3154b0117b982adac9c0831a3b1baf85db7fd721f8dffe7c6b230ba9bb933d2ca9 SHA512 2fbb72618e83f62147fe9ad65115cd979876a461bd8a0601acb990043ce01842ad74e1a1a079759322d97c16295ad321e60fb16361b5b64345be85ebe070b2b8
diff --git a/media-gfx/chafa/chafa-1.0.1.ebuild b/media-gfx/chafa/chafa-1.0.1.ebuild
new file mode 100644
index 000000000000..53d1b3126f45
--- /dev/null
+++ b/media-gfx/chafa/chafa-1.0.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="versatile and fast Unicode/ASCII/ANSI graphics renderer"
+HOMEPAGE="https://hpjansson.org/chafa/ https://github.com/hpjansson/chafa"
+SRC_URI="https://hpjansson.org/chafa/releases/${P}.tar.xz"
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="static-libs +tools"
+
+RDEPEND="
+	dev-libs/glib:2
+	media-gfx/imagemagick:0=
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_configure() {
+	local econfargs=(
+		$(use_enable static-libs static)
+		# install manpage manually
+		--disable-man
+		$(use_with tools)
+	)
+
+	econf "${econfargs[@]}"
+}
+
+src_install() {
+	local DOCS=( AUTHORS NEWS README TODO )
+	default
+
+	use tools && doman docs/chafa.1
+
+	find "${ED}"/usr/lib* -name '*.la' -delete || die
+}
diff --git a/media-gfx/chafa/metadata.xml b/media-gfx/chafa/metadata.xml
new file mode 100644
index 000000000000..3f369d599d13
--- /dev/null
+++ b/media-gfx/chafa/metadata.xml
@@ -0,0 +1,14 @@
+<?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>
+	<use>
+		<flag name="tools">Build command-line tools</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">hpjansson/chafa</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-gfx/darktable/Manifest b/media-gfx/darktable/Manifest
index dfe95a76f933..33922d73ba71 100644
--- a/media-gfx/darktable/Manifest
+++ b/media-gfx/darktable/Manifest
@@ -2,12 +2,12 @@ AUX darktable-find-opencl-header.patch 601 BLAKE2B 0102ea562ec0addb619f06b59cc73
 DIST darktable-2.2.5.tar.xz 3092540 BLAKE2B 8196ed501c96e6738057ee593c6437257b917907a02c365bd011cbf8ba258178e2915e097d373a2dca6a03ea6920df48b8f16f477e7479959371ef19937ceed9 SHA512 fbc79398660b51e580d22dbdfc9a74d213f69335d6058e2844ef397951a1e840264b6d03d1b52b424319fb647a274ac14ff23ee9a9c60071f71497988bdf989b
 DIST darktable-2.4.3.tar.xz 3422460 BLAKE2B 2fa1d7787301b6bc83b09e8d93bda251d2f9b7cf7d47979087b6da5126272d17c15f925be26652580aad6601f8613eac593c08e91638f2d445de1981f8694798 SHA512 adc0740f866890c53a1389b43042d76a4c668dd22654d91fd5a7eb728aa6979cb7dd3703d6e7d3689b6d3840e892432b3c3ce6953a76d4355dfc1f90a8f29506
 DIST darktable-2.4.4.tar.xz 3432268 BLAKE2B 75d22187c4a32eaf240803e68b8ffe9a29b4dfeaab3eb0061dd817e65c7118a5fe3f1832ce2d7b5adf1d8501c17adff7f1e87545774ca17bd2e33b749e993886 SHA512 143739b18217cb2b47f7c5cb29bbb17e0d78b380ccd9358e96e179639d8e3526c76f3822edace605856ec3272b099a09f052867479d20879bf36ef45dafe5df6
-DIST darktable-2.6.0.rc2.tar.xz 3802132 BLAKE2B 38ce77fae71f8b988d5ad6335568d7085ee69ce8262b64fb8471c8ad14182e87c8e9c7e6399d998d3ddd23d7c3407f44c570d29b8d8651f941fa4aa24fc3c9b0 SHA512 406083bb3debf1295a794b91eff96bc75cf0a6c71eeed7f60a4b72eba15cd8c658d73c90923f73a224545c281ff628c60334320a4d229500c21f66b613278080
+DIST darktable-2.6.0.tar.xz 3358508 BLAKE2B 1d6dc414d0f5c7dc1340ce1db229e5f4629534e6ccc3d4f017dea87a1e33d897ee8d73affece22311bbb27338075e48384b86b9aece83cbd6c582f761226a863 SHA512 066a8766edf3d961b2995bd681c9be65ae118f650a34da3c87c9096b76586c4a949b4c620993bcba3e7cd29f255c19dad9c2e205ed413c309398b4bc606eb73b
 DIST darktable-usermanual-2.2.0.pdf 14998142 BLAKE2B 68332239b4d2e34a0cd9f9e9bc26a18149ef1a8c033e3d5a7a7c150e952546669d74d0eeb97ad6793955d65a3259df51932829aca3d46f5c3ce7e01b59ee709b SHA512 5408193b442a7f60783aace507d8dd39c638f5f58d8b5fb5ab68eca03ce9853477b0cbe14184375d58cd6a648de18e9ecae586376698571222be755159cc0b20
 DIST darktable-usermanual-2.4.0.pdf 15072726 BLAKE2B a10fb02bb732040e45e4b2c6b6a6e022c6095a29aac894727c8a803bf76ac50924bcd938f3c7085222f32542074cbe051afe8752059a0796db22adabecce3faf SHA512 0259ccd264ec0569a770d92a517932bf5b24ce279c699a636f36656519c400456f0bdbd5de1eacf96e0cb05c0b7e59a6c6fa02803b809bc0fabb902ffe454dd1
 EBUILD darktable-2.2.5.ebuild 3856 BLAKE2B 01adcaf0ca198b5cea7c49b5dc3844c76a7f0a0a1c83e1a9729161721aa73b390971156bb3784ec4d9c7577821da90390b5bdd1c3c3820976963d45fab510187 SHA512 daf6de876de7db156d979292562411581f06e58f8bddf5b3cb96f75c4b8d38f7dd8ac951c275192ce5d6f5f139566492aa7c08238e35da131a056113c08d9a94
 EBUILD darktable-2.4.3.ebuild 3998 BLAKE2B ab0356bea66039573ec818f3f93670cee2728230e71e07e9f4acbb89e369971112ecb8cc9186b0235847619d583dbd61edcf287c03ade0eee484d93df2f817f5 SHA512 3a33ecadd7229bce3c2645fe37ad8673a3c68ac3c071c87173206753701703819f6e1ad2e3ed07f822356fa0b0bcde70b9988a9c8e0f3705749424e7cf878079
 EBUILD darktable-2.4.4.ebuild 3999 BLAKE2B f4b1905eae4d77f485150f40bc2eaee25e5515e1872975a209e1d190442589b237065715c7e4da35f335376085f99173641c7f4b1a811422a33b28e52b1ada3e SHA512 572edf9c1f5f3a9f794bef774129b0ed751a87d60ecfa668d7a7f2199b2f76a6ccb6de640b22cd64139501130d58df8fcb5303937b51444566528330e05f7307
-EBUILD darktable-2.6.0_rc2.ebuild 4038 BLAKE2B 9800f99171a5a7c9274fc19b02373ea9f1be4e884c5e0c3fcf66e850c812ead07752f82d9dc7779bd8aa07e4fc7e7edfddcae8462c0efc5bd7cfa55655019263 SHA512 3c269e52e954c7aeba582ac3303b2973010a45d3413e2d41590a74f99fcf054e23a27986fd76702441862abee6910be4829308f3176e94f0510524ef71a26321
+EBUILD darktable-2.6.0.ebuild 3981 BLAKE2B a8dbadf93a0040703484e6b26c928bf102c4fa0f1139725efbe0caabb91efcf8408bee170f31c37aab8bee673312f54832b33dfcadb9fe273cba2471a53994b6 SHA512 4b3d972502223ac711a8d08142b0d05780306084ec156e788b3f7c2cf8b6c2c72b1b4b62cd0077939725a48cbb128cb56c0c809d472f978830a64cbe1c843ff9
 EBUILD darktable-9999.ebuild 3434 BLAKE2B 9720e4706e25b09ef6b0a652cdd2ee47fdc394fee8a7a8f3a673c8393a081e1a87b136cd6da813ca59aa4c6c6da6930ffcaead9123cf768765eb276cfc8134ab SHA512 99476f1f3742d2404bc491e3fe654e4928b714429070fc338461db8f49c2cc51c089f9426aad1470c65dd606054a90a6d69e8c52deb83e39bc0a298393bf6111
 MISC metadata.xml 871 BLAKE2B 5576cc42a46ae48d681043c22cbf206855a0770f112e42138a264950235b1af96751740800f8d9402bf5e00adf725511e557f3b65ec355abbe26de451ad5b70c SHA512 330c5e8b17daee39f3152fbcaed1979814b3b5d0aa205860e5ff309ae068037da0f4190f91672be17c138fcda91890954b2cd310b3725bada6f3916a73cebf1a
diff --git a/media-gfx/darktable/darktable-2.6.0_rc2.ebuild b/media-gfx/darktable/darktable-2.6.0.ebuild
index 2dc5ceae9ca9..ffb8b344bd5f 100644
--- a/media-gfx/darktable/darktable-2.6.0_rc2.ebuild
+++ b/media-gfx/darktable/darktable-2.6.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/darktable-org/${PN}/releases/download/release-${MY_P
 LICENSE="GPL-3 CC-BY-3.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-LANGS=" af ca cs da de el es fi fr gl he hu it ja nb nl pl pt-BR pt-PT ro ru sk sl sq sv th uk zh-CN"
+LANGS=" ca de fi fr hu ja nb nl pt-BR ru sl"
 # TODO add lua once dev-lang/lua-5.2 is unmasked
 IUSE="colord cups cpu_flags_x86_sse3 doc flickr geolocation gnome-keyring gphoto2 graphicsmagick jpeg2k kwallet
 nls opencl openmp openexr pax_kernel webp
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index 5d407ee0ea92..0fc1b16ddb9d 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -1,3 +1,5 @@
 DIST digikam-5.9.0.tar.xz 132931184 BLAKE2B cfbcbae8471c9c00bdf846d13bbc1ce3fbbd2ee4cc86500d011f9e15c1a21d7799638f94708794e8bc36a200df455667f9df8fcefdc38aaa00060630807d11cb SHA512 f6134a957dcd11343e34f0bc90f5560a28ed205c47d2ffd76a5418a4c63f76706045e9179c47f1448304b59081051b524f7a6847c3c1dcee4673047ce5d90e63
+DIST digikam-6.0.0-beta3.tar.xz 326340364 BLAKE2B ea43fcf6047a0ee9de824f91a88d49bf61e86cf77255aecec7e1761319d6d6bfbc8b8251f18594848ddaec27b6b50425b01e1d6da24859986a5b5050670a037e SHA512 4e0ee5406789618644b6af7316b922785b0cddc6ff3d5d972da1d88b5cd3fc6df8b2ccb63d65d7b61a5adff86e25a79a5075cb65302e99e5d3b522aa32fcb68e
 EBUILD digikam-5.9.0.ebuild 4758 BLAKE2B 89cb7574f20f3cd08697386b6a0cc25a6bec270062a23d68afe1148c631980f8fe9cde76d5ebf9fc129eafba06dc96c25d92614e3422abc5140d7a0f2364f576 SHA512 f758f3dfb93c15721d27cb6242779a358dbe86b976d84fb5fe7796c959d757dfc9efedecfb344df17eaf0869d5fbab1169d1bcf34cf45c68e8422caf48ccaa6c
-MISC metadata.xml 962 BLAKE2B 918fd2665df0b74bfcac369d306bd8989723db59dd436085ba7ad24e640401b8f39d2005674c4ef85c1875d2b31c9603af9b8ee7465b11f94b09ba9c93a6d9f2 SHA512 c8998f630fca57844cb258b42d6d557c7a6c65f8b0b90caf44225b62827e24eeaaa6defdf1334c7b7c80a1132aac96e178fe3b18ab59035534b605aed4665bab
+EBUILD digikam-6.0.0_beta3.ebuild 3885 BLAKE2B b64b6418f2abe65883904d17f44855bc3a3cac42b3d28d4c99101f503d90bd935527d0f939e805637bf718ef30f1c9d62cdd4ba88b004a6e9406c2fd76623c5b SHA512 07d94b8b9d16fe32a6f7028d05946b58b3c249cffa47f6a24e2c373469971dd6459ccc43d94c5f9936f0dc89d4f4fae28742b6ad470dce0f7805c7b0e2a7d911
+MISC metadata.xml 1166 BLAKE2B 0844b599bbb92d64c88ed1d4d32ffec17f71912d8736e8f6cd5829a662be59886f52ae57c3de2eb3c36c3de252d6ff9868dddff30d212f7ae7cef36775c46ec0 SHA512 41741282ed42fa5bb9ff644d0dc3cf021daaf4904d8811fe5f3e37e909432e86c489f0c1843b547f70790acdbc74163de133f078722f8c33fffd389d870d4367
diff --git a/media-gfx/digikam/digikam-6.0.0_beta3.ebuild b/media-gfx/digikam/digikam-6.0.0_beta3.ebuild
new file mode 100644
index 000000000000..48c1135b4fe0
--- /dev/null
+++ b/media-gfx/digikam/digikam-6.0.0_beta3.ebuild
@@ -0,0 +1,143 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+if [[ ${KDE_BUILD_TYPE} != live ]]; then
+	KDE_HANDBOOK="true"
+	KDE_TEST="true"
+fi
+inherit kde5 toolchain-funcs
+
+DESCRIPTION="Digital photo management application"
+HOMEPAGE="https://www.digikam.org/"
+
+LICENSE="GPL-2"
+IUSE="addressbook calendar gphoto2 jpeg2k +lensfun libav marble mediaplayer mysql opengl openmp +panorama scanner semantic-desktop vkontakte webkit X"
+
+if [[ ${KDE_BUILD_TYPE} != live ]]; then
+	KEYWORDS="~amd64 ~x86"
+	MY_PV=${PV/_/-}
+	MY_P=${PN}-${MY_PV}
+	SRC_BRANCH=stable
+	[[ ${PV} =~ beta[0-9]$ ]] && SRC_BRANCH=unstable
+	SRC_URI="mirror://kde/${SRC_BRANCH}/digikam/${MY_P}.tar.xz"
+	S="${WORKDIR}/${MY_P}"
+fi
+
+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 kio)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep knotifyconfig)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep solid)
+	$(add_qt_dep qtconcurrent)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui '-gles2')
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtsql 'mysql?')
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	$(add_qt_dep qtxmlpatterns)
+	dev-libs/expat
+	>=media-gfx/exiv2-0.26:=
+	media-libs/lcms:2
+	media-libs/liblqr
+	media-libs/libpng:0=
+	>=media-libs/opencv-3.1.0:=
+	media-libs/tiff:0
+	virtual/jpeg:0
+	addressbook? (
+		$(add_kdeapps_dep akonadi-contacts)
+		$(add_kdeapps_dep kcontacts)
+	)
+	calendar? ( $(add_kdeapps_dep kcalcore) )
+	gphoto2? ( media-libs/libgphoto2:= )
+	jpeg2k? ( media-libs/jasper:= )
+	lensfun? ( media-libs/lensfun )
+	marble? (
+		$(add_frameworks_dep kbookmarks)
+		$(add_kdeapps_dep marble)
+		$(add_qt_dep qtconcurrent)
+	)
+	mediaplayer? (
+		media-libs/qtav[opengl]
+		!libav? ( media-video/ffmpeg:= )
+		libav? ( media-video/libav:= )
+	)
+	opengl? (
+		$(add_qt_dep qtopengl)
+		virtual/opengl
+	)
+	panorama? ( $(add_frameworks_dep threadweaver) )
+	scanner? ( $(add_kdeapps_dep libksane) )
+	semantic-desktop? ( $(add_frameworks_dep kfilemetadata) )
+	vkontakte? ( net-libs/libkvkontakte:5 )
+	!webkit? ( $(add_qt_dep qtwebengine 'widgets') )
+	webkit? ( $(add_qt_dep qtwebkit) )
+	X? (
+		$(add_qt_dep qtx11extras)
+		x11-libs/libX11
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	dev-cpp/eigen:3
+	dev-libs/boost[threads]
+	sys-devel/gettext
+	panorama? (
+		sys-devel/bison
+		sys-devel/flex
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	mysql? ( virtual/mysql[server] )
+	panorama? ( media-gfx/hugin )
+"
+
+RESTRICT+=" test"
+# bug 366505
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+	kde5_pkg_pretend
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+	kde5_pkg_setup
+}
+
+# FIXME: Unbundle libraw (libs/rawengine/libraw)
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_APPSTYLES=ON
+		-DENABLE_AKONADICONTACTSUPPORT=$(usex addressbook)
+		$(cmake-utils_use_find_package calendar KF5CalendarCore)
+		$(cmake-utils_use_find_package gphoto2 Gphoto2)
+		$(cmake-utils_use_find_package jpeg2k Jasper)
+		$(cmake-utils_use_find_package lensfun LensFun)
+		$(cmake-utils_use_find_package marble Marble)
+		-DENABLE_MEDIAPLAYER=$(usex mediaplayer)
+		$(cmake-utils_use_find_package mediaplayer QtAV)
+		-DENABLE_MYSQLSUPPORT=$(usex mysql)
+		-DENABLE_INTERNALMYSQL=$(usex mysql)
+		$(cmake-utils_use_find_package opengl OpenGL)
+		$(cmake-utils_use_find_package panorama KF5ThreadWeaver)
+		$(cmake-utils_use_find_package scanner KF5Sane)
+		$(cmake-utils_use_find_package semantic-desktop KF5FileMetaData)
+		$(cmake-utils_use_find_package vkontakte KF5Vkontakte)
+		-DENABLE_QWEBENGINE=$(usex !webkit)
+		$(cmake-utils_use_find_package X X11)
+	)
+
+	kde5_src_configure
+}
diff --git a/media-gfx/digikam/metadata.xml b/media-gfx/digikam/metadata.xml
index 59e835b01838..7b233c2b9fee 100644
--- a/media-gfx/digikam/metadata.xml
+++ b/media-gfx/digikam/metadata.xml
@@ -16,5 +16,7 @@
 		<flag name="mediaplayer">Enable support for media player using <pkg>media-libs/qtav</pkg></flag>
 		<flag name="panorama">Build the panorama plugin which requires <pkg>media-gfx/hugin</pkg></flag>
 		<flag name="semantic-desktop">Enable <pkg>kde-frameworks/kfilemetadata</pkg> support</flag>
+		<flag name="vkontakte">Build <pkg>net-libs/libkvkontakte</pkg> plugin for vkontakte.ru</flag>
+		<flag name="webkit">Build with <pkg>dev-qt/qtwebkit</pkg> instead of <pkg>dev-qt/qtwebengine</pkg></flag>
 	</use>
 </pkgmetadata>
diff --git a/media-gfx/displaycal/Manifest b/media-gfx/displaycal/Manifest
index 67f8f3bcb1bb..5b2a1a5123d4 100644
--- a/media-gfx/displaycal/Manifest
+++ b/media-gfx/displaycal/Manifest
@@ -1,7 +1,9 @@
 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
 DIST DisplayCAL-3.7.1.2.tar.gz 10472879 BLAKE2B a0722af9c8a6df8af57c0a66e792886b6aecb78bec79d0bed22567bd6ce540793ed6dd51437cbf1974b9070b9adb3708f841cf8cfae0e482056d90783be6ddbd SHA512 d708110e0528ffada5fd4a0ca7da9cf02a54964bc7d5af2b98738aa3e34079c0a4890f2cf6086750045915e06d6c943fc954e0f03653d25c080522a4b24795bd
+DIST DisplayCAL-3.7.1.3.tar.gz 10474328 BLAKE2B 9c305809a9f46f3ad76eec728026b2abbd1dec3bee46db92bfe9fe4e7c31f24d61eafaca0bda12f510002d3c5d51bfba4c6d4b1bae5e1ce105a8b75d84672ef8 SHA512 9718f589ee1842f6247ea110c4c6defaf767313fb2fd9ce9fb1b35775141774ce9084c2cbf00d9c432162e8b32c8d789e5a52ca385976c4772bf644738257926
 EBUILD displaycal-3.6.2.0.ebuild 1521 BLAKE2B a42233e85727c294aa646dbad6759dcf78967a49ff95d5dad4c6941dbb805d7e4191c6fa12e22a28b739048b8c8a8c04fabbc89132d9d3ff4f95d06cf41b8964 SHA512 8d3c07821ca6ef5cd136e9d793b164ef743a69231e75c1872e7939b4507919e4ed32ef7d39d0862a37a3c82149f26cea44ba4e499f5f4f9f7eb6e746a4d99f63
 EBUILD displaycal-3.7.1.1.ebuild 1518 BLAKE2B fcfb6bce3ff0c5270cff1b0c2c6f2de246c44087fef7d59fecffcf36afe87e21b1cf4b5c560a4363ead2e26f418c2413b1365efe4aa6b901198ab5cac4ae8d76 SHA512 70f7398a8221c504bbe9fa48ed041ba3bf207baf96e5f8e0ff4ab2ea65611921033ba04fac82cfd648e09b7b07b47d289569242a1513150a62ff89cb1b26f1b7
 EBUILD displaycal-3.7.1.2.ebuild 1518 BLAKE2B fcfb6bce3ff0c5270cff1b0c2c6f2de246c44087fef7d59fecffcf36afe87e21b1cf4b5c560a4363ead2e26f418c2413b1365efe4aa6b901198ab5cac4ae8d76 SHA512 70f7398a8221c504bbe9fa48ed041ba3bf207baf96e5f8e0ff4ab2ea65611921033ba04fac82cfd648e09b7b07b47d289569242a1513150a62ff89cb1b26f1b7
+EBUILD displaycal-3.7.1.3.ebuild 1518 BLAKE2B fcfb6bce3ff0c5270cff1b0c2c6f2de246c44087fef7d59fecffcf36afe87e21b1cf4b5c560a4363ead2e26f418c2413b1365efe4aa6b901198ab5cac4ae8d76 SHA512 70f7398a8221c504bbe9fa48ed041ba3bf207baf96e5f8e0ff4ab2ea65611921033ba04fac82cfd648e09b7b07b47d289569242a1513150a62ff89cb1b26f1b7
 MISC metadata.xml 342 BLAKE2B e74a7767c5b6e82bd35776606de555f9d4f26a25727decc6b0216fa3ea27cee8f28a7749e46b842c52e403c5150b24b4e33e0b971bd49077814e7945ee8cc290 SHA512 f9d5979fc8525c40af8d4e64afb8264873b0ae7cda1e9c4f3b3f30957c2a4f7fcbab76002783213a896395e8b5ef78e315441c28872589a91a0035d5f346d317
diff --git a/media-gfx/displaycal/displaycal-3.7.1.3.ebuild b/media-gfx/displaycal/displaycal-3.7.1.3.ebuild
new file mode 100644
index 000000000000..02f4e0b4a7e5
--- /dev/null
+++ b/media-gfx/displaycal/displaycal-3.7.1.3.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/exiv2/Manifest b/media-gfx/exiv2/Manifest
index 1f175f5fa846..796fe1ace89e 100644
--- a/media-gfx/exiv2/Manifest
+++ b/media-gfx/exiv2/Manifest
@@ -1,5 +1,8 @@
 AUX exiv2-0.26-fix-docs.patch 2532 BLAKE2B c648454a7c9a56c2d4a3844cbe212630ff6c3d0d687928d86487380e0b12b3b7f6458b827285806afa73034497265cae169998ab281f4687d736cc5e3e6df1b5 SHA512 de245f08860fd6fccbd4e617cb9dfe105d1a64ecb16fc37376c257f7547c91e5dffaa46531d21201497473d6708817e7015fe6c061379834b892de08bcc05ee4
 AUX exiv2-0.26-tools-optional.patch 1386 BLAKE2B 84e0903934187aaa914c0a4fe04afe63ed3314ea76d6929b7435899a731bb90831418b2162e1dca4a487b88041fe7b9aa50a3c438e66ac3893dd1d12b363714f SHA512 efdd848dd728fcb0ba5dbc305fef6eb6af4385b5bd09e2c3722c0dea2009207c282b95a07cdb608fc2298d18686c764dded2fd9de4166dbecabf7eeb187e6483
+AUX exiv2-0.27.0-png-broken-icc-profile.patch 1699 BLAKE2B e9d019d3d885198e9945a387325435618f200dcac5a70cc96a6151f9ba8036609162fd93a7857cb8677bb7c1d3fe250f9750b8d7e660f34e31e50e3bc15e71a1 SHA512 8cb9b1f4129161861aee384e634433e3fa82aa933804d5f63de95475f6f6658f7b2f63fca1da624ea7b634f71cde5ee0de7e0466247d687494383d001df92ace
 DIST exiv2-0.26_p20180811d.tar.xz 1722216 BLAKE2B 9e1c8307eb923c340894c82c37e9f6c31d82ff1b1de3c79d4ec9b0ec9428ad1d05f945e9a4e440028335857e7fc32d50cdc5245842d743e017037bd641b654db SHA512 5453650888440028acb139a02b387eab0232551c97256ce88dd626fa4cc8800ec02ad66e093c314bbfdc60726995b6c8482572d1ffaec73a265209c98c901780
+DIST exiv2-0.27.0-Source.tar.gz 27222970 BLAKE2B a935f6a41e322dda14d11400801f6b98fd3254af45a44d9d6e9f90d955cc58bb6f7477c49f1f99612a519216cdc954bacea74c68f76545c662db37849e99367e SHA512 3037d8e84b414e3915b807c5bea39f903668c0774f9dbc1367e23c595d5abaf318c746009e994234bcaf0088ad32a820ea42c9c77c9a53c65a7b5d7781a2c6d4
 EBUILD exiv2-0.26_p20180811-r3.ebuild 2954 BLAKE2B 06ad8b544150e1f5d4f1a305d78ab3ff7772b7c797e67e47ce01a233d0afee514d7660921c33b43634da60883b2adba119a80830c2493ad01800bd9b05b34072 SHA512 172e65b6210cb383afee4f344d585fae40dc7af1b7bb5d8dd2e5acbd7fcb4086b4caca998ce3627aefb4be3f8e4cebcaef24ccfb67d61d580b674fee50b24627
+EBUILD exiv2-0.27.0.ebuild 2820 BLAKE2B 2b1f2ebe29471d06010bab528c33e04884bdb8340f70babdf133dc688b4d7cff22fdb3f8ac612f2260adf91f48528aa2dc918aee573483ad1615fc5668e547a1 SHA512 99fbcb120caa5bb211a4cd29e0718fbfc8ca3f10224dc059e8ba82f06ec324c27288e6eca3be50351a0c6efb880632ba6bceaaea8c98d30fd27dd67f96636082
 MISC metadata.xml 612 BLAKE2B f98a074e9e3a4411baf8255cd8cab5be4257469463634218b664bb9e7f159c98615f0721bb4463c6183cecc8b2be00c34a031e7b99d745b9807634cbaab8d479 SHA512 9b4926ba8420a125dc4cefd351ee1ec10a4df2fc4306a56720f6e8de7c5fd9f36a8646c8583958fca9a45ebe1b65b19c053c7da37176546bc19ae64afa87e4f5
diff --git a/media-gfx/exiv2/exiv2-0.27.0.ebuild b/media-gfx/exiv2/exiv2-0.27.0.ebuild
new file mode 100644
index 000000000000..f59464a6685d
--- /dev/null
+++ b/media-gfx/exiv2/exiv2-0.27.0.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} = *9999 ]]; then
+	EGIT_REPO_URI="https://github.com/Exiv2/exiv2.git"
+	inherit git-r3
+else
+	SRC_URI="http://exiv2.dyndns.org/builds/${P}-Source.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+fi
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+inherit cmake-multilib python-any-r1
+
+DESCRIPTION="EXIF, IPTC and XMP metadata C++ library and command line utility"
+HOMEPAGE="http://www.exiv2.org/"
+
+LICENSE="GPL-2"
+SLOT="0/27"
+IUSE="doc examples nls +png webready +xmp"
+
+RDEPEND="
+	>=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
+	nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )
+	png? ( sys-libs/zlib[${MULTILIB_USEDEP}] )
+	webready? (
+		net-libs/libssh[${MULTILIB_USEDEP}]
+		net-misc/curl[${MULTILIB_USEDEP}]
+	)
+	xmp? ( dev-libs/expat[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+	doc? (
+		${PYTHON_DEPS}
+		app-doc/doxygen
+		dev-libs/libxslt
+		media-gfx/graphviz
+		virtual/pkgconfig
+	)
+	nls? ( sys-devel/gettext )
+"
+
+DOCS=( README.md doc/ChangeLog doc/cmd.txt )
+
+PATCHES=(
+	# pending upstream
+	"${FILESDIR}"/${P}-png-broken-icc-profile.patch
+)
+
+pkg_setup() {
+	use doc && python-any-r1_pkg_setup
+}
+
+src_unpack() {
+	# FIXME @upstream: MacOS cruft is getting installed, don't let it in...
+	# https://github.com/Exiv2/exiv2/issues/620
+	tar -C "${WORKDIR}" --exclude=.* -xpf "${DISTDIR}/${A}" --gz 2> /dev/null ||
+		elog "${my_tar}: tar extract command failed at least partially - continuing"
+	mv "${P}-Source" "${S}" || die "Failed to create source dir ${S}"
+}
+
+src_prepare() {
+	# FIXME @upstream:
+	einfo "Converting doc/cmd.txt to UTF-8"
+	iconv -f LATIN1 -t UTF-8 doc/cmd.txt > doc/cmd.txt.tmp || die
+	mv -f doc/cmd.txt.tmp doc/cmd.txt || die
+
+	if use doc; then
+		einfo "Updating doxygen config"
+		doxygen &>/dev/null -u config/Doxyfile || die
+	fi
+
+	cmake-utils_src_prepare
+}
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DEXIV2_BUILD_SAMPLES=NO
+		-DEXIV2_BUILD_PO=$(usex nls)
+		-DEXIV2_ENABLE_NLS=$(usex nls)
+		-DEXIV2_ENABLE_PNG=$(usex png)
+		-DEXIV2_ENABLE_CURL=$(usex webready)
+		-DEXIV2_ENABLE_SSH=$(usex webready)
+		-DEXIV2_ENABLE_WEBREADY=$(usex webready)
+		-DEXIV2_ENABLE_XMP=$(usex xmp)
+		$(multilib_is_native_abi || echo -DEXIV2_BUILD_EXIV2_COMMAND=NO)
+	)
+
+	cmake-utils_src_configure
+}
+
+multilib_src_compile() {
+	cmake-utils_src_compile
+
+	if multilib_is_native_abi; then
+		use doc && emake -j1 doc
+	fi
+}
+
+multilib_src_install_all() {
+	use xmp && DOCS+=( doc/{COPYING-XMPSDK,README-XMP,cmdxmp.txt} )
+	use doc && HTML_DOCS=( "${S}"/doc/html/. )
+
+	einstalldocs
+	find "${D}" -name '*.la' -delete || die
+
+	if use examples; then
+		docinto examples
+		dodoc samples/*.cpp
+	fi
+}
diff --git a/media-gfx/exiv2/files/exiv2-0.27.0-png-broken-icc-profile.patch b/media-gfx/exiv2/files/exiv2-0.27.0-png-broken-icc-profile.patch
new file mode 100644
index 000000000000..ae0a0ee30dce
--- /dev/null
+++ b/media-gfx/exiv2/files/exiv2-0.27.0-png-broken-icc-profile.patch
@@ -0,0 +1,34 @@
+diff --git a/src/pngimage.cpp b/src/pngimage.cpp
+index 90844d09..b5b0cd24 100644
+--- a/src/pngimage.cpp
++++ b/src/pngimage.cpp
+@@ -501,7 +501,20 @@ namespace Exiv2 {
+                 }
+                 else if (!memcmp(cheaderBuf.pData_ + 4, "iCCP", 4))
+                 {
+-                    zlibToDataBuf(cdataBuf.pData_ +12+1,dataOffset-13,iccProfile_); // +1 = 'compressed' flag
++                    // The ICC profile name can vary from 1-79 characters.
++                    uint32_t iccOffset = 0;
++                    while (iccOffset < 80 && iccOffset < dataOffset) {
++
++                        const byte* profileName = cdataBuf.pData_ + iccOffset;
++                        ++iccOffset;
++
++                        if (*profileName == 0x00)
++                            break;
++                    }
++
++                    ++iccOffset; // +1 = 'compressed' flag
++
++                    zlibToDataBuf(cdataBuf.pData_ +iccOffset,dataOffset-iccOffset,iccProfile_);
+ #ifdef DEBUG
+                     std::cout << "Exiv2::PngImage::readMetadata: Found iCCP chunk length: " << dataOffset  << std::endl;
+                     std::cout << "Exiv2::PngImage::readMetadata: iccProfile.size_ : " << iccProfile_.size_ << std::endl;
+@@ -662,6 +675,7 @@ namespace Exiv2 {
+ 
+                         // calculate CRC
+                         uLong   tmp = crc32(0L, Z_NULL, 0);
++                        tmp         = crc32(tmp, (const Bytef*)type             ,typeLen);
+                         tmp         = crc32(tmp, (const Bytef*)header           ,headerLen);
+                         tmp         = crc32(tmp, (const Bytef*)compressed.pData_,compressed.size_);
+                         byte    crc[4];
diff --git a/media-gfx/feh/Manifest b/media-gfx/feh/Manifest
index b6cabcf05b83..d10c74976a2c 100644
--- a/media-gfx/feh/Manifest
+++ b/media-gfx/feh/Manifest
@@ -3,8 +3,10 @@ DIST feh-2.18.3.tar.bz2 2127924 BLAKE2B c667a7bea38e66afd4ed7c688c32327700419648
 DIST feh-2.26.4.tar.bz2 2132124 BLAKE2B 962af7b7e806a8cea570c1512c377b0eb9ca9924706bdce63cebe7dad240d9b5a7f16c0291aedf954abb45bbecc4f835f77bccbd42101a7f99dea92a102fc0bb SHA512 cd78081a6ab821a0c6b20fa6746ec180df97ab3412e0cc56bbccaf700c443b4fd5f95edd9b2781ebb2eb85491946809c962039346830ae6f5f85ea0ae5e7de81
 DIST feh-2.27.tar.bz2 2131975 BLAKE2B 84100beaff26454c8d33a479171b1b59402b74d04860192e5e826dcac93a288b095afee6f0676b56eae0d1f8dd3c4998767d0cd196ffd3b6a5406f5c1e6eb1d9 SHA512 6d9cf38e9b40291f6e7145705057a2c945b720b22d85020e265c2a158d5e4ca68cca958e2fae3d01a91bb4b2c52ebb5d2c298c41bf8ff3e4f635af7c006d0cc7
 DIST feh-2.28.tar.bz2 2132687 BLAKE2B 92e428250a7fc01b5ecc8783d1a0f325ab168935eb6533a5726681389c05f662d9f7b978a50c2f1ef4d5cfd6f356e758cfff781072143902dbdab41f2310b705 SHA512 565a5aa0ce1c29fb2f09995283dbf2e12e0f228294df7c1b744a545e4f550126e0b327e9903c9eb35cb7dbd96d69e4653c57f3b3cb2dc2475680b3c62b71e1d8
+DIST feh-3.1.1.tar.bz2 2109534 BLAKE2B ea02ab09791ef61a9ac5db84b5a0f69ddc76f994343660cf4072a41769a59ddd2936e0f047eeed26be0b3676711b1e440c0483325e6bb621205788ebe13c1fca SHA512 cbdf6e36831a750a6bdb9f1a5735c814662b5274d9c453392de88b98926b539cc54e2041fc0cd2a393762f14ec24b81435de6d506d9efc1ee4c7d80105aa6243
 EBUILD feh-2.18.3.ebuild 1194 BLAKE2B a9ba56ee28f45ba475db7373f3caf7534fb9cb1e020b85b6f4fa19fecd00cd23c493d862b662639e73cd2e9b38bc8703e42a36107e26cee636b0ad871b1d6990 SHA512 f23c472d2686a21fb3c81111415682d059a121eb5e0a14a6a71298395407e3aea0f5a16b9d91ca8c46c2e7a1ce455656832863ba63de2a142e056dac132e7346
 EBUILD feh-2.26.4.ebuild 1470 BLAKE2B 495d4329c2ba76a0715a7cb543b488e25770d0ddc93065c4a8dd94b39830cdc753e3fcecc3661e681aca176595a67bf52377bca3afe361b4c055dcca4ef2eddd SHA512 62e7f3e5c35080196eeeeb348ddf72e692b92914718c8ced8222248694ba99d04d49585fc5c8dcce430ff109c2ebd4ff958b7db492677debb67ec8eb76761b69
 EBUILD feh-2.27.ebuild 1470 BLAKE2B 495d4329c2ba76a0715a7cb543b488e25770d0ddc93065c4a8dd94b39830cdc753e3fcecc3661e681aca176595a67bf52377bca3afe361b4c055dcca4ef2eddd SHA512 62e7f3e5c35080196eeeeb348ddf72e692b92914718c8ced8222248694ba99d04d49585fc5c8dcce430ff109c2ebd4ff958b7db492677debb67ec8eb76761b69
 EBUILD feh-2.28.ebuild 1470 BLAKE2B 495d4329c2ba76a0715a7cb543b488e25770d0ddc93065c4a8dd94b39830cdc753e3fcecc3661e681aca176595a67bf52377bca3afe361b4c055dcca4ef2eddd SHA512 62e7f3e5c35080196eeeeb348ddf72e692b92914718c8ced8222248694ba99d04d49585fc5c8dcce430ff109c2ebd4ff958b7db492677debb67ec8eb76761b69
+EBUILD feh-3.1.1.ebuild 1467 BLAKE2B 4bb9b78432c0c676343bc23d4c2dace66e5e5cd25fcb85d68579efeacd28708337dc4e7ffed4a5867fc5044057948dbe8022fd7ce4866811230d98f15073bea0 SHA512 804f9c3b2e22fe0418488079aff2e4d17ed464c09229357a36763bd0213d9ef98f98ffd2c9461e3f86b1dd829f1617f0ab3fb0928c8e96f95a623351815fd0df
 MISC metadata.xml 358 BLAKE2B 602fb8b872f5f209abd20adbb141035c0d0396a7712839c950cfa19e78201c0c39e88fa5e8bebc6224459bb8e328e732ff30db848f6c84510f91830951f2087c SHA512 51fad9cc41f31b03f42e0ac4254ea05a848df755091cdd47ee4ce73f7189acd83e8956c230329ea0053d1f794b529e498525f6ce282a947c9809c4954a5b9a19
diff --git a/media-gfx/feh/feh-3.1.1.ebuild b/media-gfx/feh/feh-3.1.1.ebuild
new file mode 100644
index 000000000000..182155399da3
--- /dev/null
+++ b/media-gfx/feh/feh-3.1.1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit toolchain-funcs gnome2-utils xdg-utils
+
+DESCRIPTION="A fast, lightweight imageviewer using imlib2"
+HOMEPAGE="https://feh.finalrewind.org/"
+SRC_URI="https://feh.finalrewind.org/${P}.tar.bz2"
+
+LICENSE="feh"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
+IUSE="debug curl exif test xinerama"
+
+COMMON_DEPEND="media-libs/imlib2[X]
+	>=media-libs/libpng-1.2:0=
+	x11-libs/libX11
+	curl? ( net-misc/curl )
+	exif? ( media-libs/libexif )
+	xinerama? ( x11-libs/libXinerama )"
+RDEPEND="${COMMON_DEPEND}
+	virtual/jpeg:0"
+DEPEND="${COMMON_DEPEND}
+	x11-base/xorg-proto
+	x11-libs/libXt
+	test? (
+		>=dev-lang/perl-5.10
+		dev-perl/Test-Command
+	)"
+
+PATCHES=( "${FILESDIR}"/${PN}-2.6.2-debug-cflags.patch )
+
+pkg_setup() {
+	use_feh() { usex $1 1 0; }
+
+	fehopts=(
+		DESTDIR="${D}"
+		PREFIX="${EPREFIX}"/usr
+		doc_dir='${main_dir}'/share/doc/${PF}
+		example_dir='${main_dir}'/share/doc/${PF}/examples
+		curl=$(use_feh curl)
+		debug=$(use_feh debug)
+		xinerama=$(use_feh xinerama)
+		exif=$(use_feh exif)
+	)
+}
+
+src_compile() {
+	tc-export CC
+	emake "${fehopts[@]}"
+}
+
+src_install() {
+	emake "${fehopts[@]}" install
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
diff --git a/media-gfx/geeqie/Manifest b/media-gfx/geeqie/Manifest
index b581ac5f6c71..6b1c978b069d 100644
--- a/media-gfx/geeqie/Manifest
+++ b/media-gfx/geeqie/Manifest
@@ -3,4 +3,5 @@ DIST geeqie-1.3.tar.xz 1141820 BLAKE2B 7a8639a136797c85d1bf96567ed0cae74c5cd0dac
 DIST geeqie-1.4.tar.xz 35881152 BLAKE2B 2932ac379abaee2b742b66daff544f29d7bf0aac82ff97f92e10ac7902ad874badcbb143f562c665d94f6297331090d0746373979a745f338a738078b72538a4 SHA512 a88b6dcf30847e38c109f5bc6436d93f6b4e1336a094c6b8a45db117830117120bf58f390afcd8a4b7aaf2934f995c3f75ac33a7faf56bfc2bcc9bd4eebfb205
 EBUILD geeqie-1.3-r1.ebuild 1941 BLAKE2B 2ac0dfaa649219e597b6128fd65cc435edb9fb90f6e1c44defa821f9c282b18c208a3553d11dba175b69806f674b9baa0c2348dd7988971adbeb14d43d521e50 SHA512 9116a91a9459f59c9dab49bfd40b29f57ad042ae740d29809cfd55b6df829c73327ef28e1c8a69cee3b14fee2962edc5b002f2f26adb8c0d72ea1f61c17dc91b
 EBUILD geeqie-1.4-r1.ebuild 2281 BLAKE2B 71725dd5756b6d4c9db5d109a9f2dc0aa1ecdedacb789a836f139406375fa51938aab8c3ebbc43a93d253207e9591e5e27e404efdd30df9fd8fe3c7148514eb2 SHA512 b6a157767a61bb3bc22107600c6b2e3a55a63d9eabac113da06001d95a740b706da327617ced4ab65ed4cf0ff2861a931020546a3d132d619e7aa5f63d801d8e
+EBUILD geeqie-9999.ebuild 2218 BLAKE2B 57fbda4f14ebb13fe997b551fb35333324152cd2105b5d24a2ce0e8e77b415498dad9406fbe4635ce066d5a27381041df8afc68618a89473f9532288decb4e91 SHA512 84977bd2b8573df4f93f70597decb6b5ab487924c8c0a1718669a566e30f767eed3069dc74a9fcbdc2841bb19b5d0045cb81887c6d79388bc92a9d5cc3a74bb4
 MISC metadata.xml 923 BLAKE2B 49de6dd7b0380b1cc74ccabbc8f84e2c55144b80612e04c4e55c82d052027882cc293a70a52f857bded73246ccbb5351df53dc1e1e08b8c2c08e630bc24f9882 SHA512 752280a5fefc097c5ca8b1fc2e9f05220aa809e45484560edca7baa68d95b0d91fa14973c321aefcdb76052dc02e405e2fb4a32e6322f04cd8223afaa6734d58
diff --git a/media-gfx/geeqie/geeqie-9999.ebuild b/media-gfx/geeqie/geeqie-9999.ebuild
new file mode 100644
index 000000000000..a4b9efab87e3
--- /dev/null
+++ b/media-gfx/geeqie/geeqie-9999.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools git-r3 xdg-utils
+
+DESCRIPTION="A lightweight GTK image viewer forked from GQview"
+HOMEPAGE="http://www.geeqie.org"
+SRC_URI=""
+# Using github mirror, as geeqie.org does not have a valid SSL certificate
+EGIT_REPO_URI="https://github.com/BestImageViewer/geeqie.git"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+IUSE="debug doc exif ffmpegthumbnailer gpu-accel gtk3 jpeg lcms lirc lua map tiff xmp"
+
+RDEPEND="gtk3? ( x11-libs/gtk+:3 )
+	!gtk3? ( x11-libs/gtk+:2 )
+	virtual/libintl
+	doc? ( app-text/gnome-doc-utils )
+	ffmpegthumbnailer? ( media-video/ffmpegthumbnailer )
+	gpu-accel? ( media-libs/clutter-gtk )
+	jpeg? ( virtual/jpeg:0 )
+	lcms? ( media-libs/lcms:2 )
+	lirc? ( app-misc/lirc )
+	lua? ( >=dev-lang/lua-5.1:= )
+	map? ( media-libs/libchamplain:0.12 )
+	xmp? ( >=media-gfx/exiv2-0.17:=[xmp] )
+	!xmp? ( exif? ( >=media-gfx/exiv2-0.17:= ) )
+	tiff? ( media-libs/tiff:0 )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	dev-util/intltool
+	sys-devel/gettext"
+
+REQUIRED_USE="gpu-accel? ( gtk3 )
+	map? ( gpu-accel )"
+
+src_prepare() {
+	default
+
+	# Remove -Werror (gcc changes may add new warnings)
+	sed -e '/CFLAGS/s/-Werror //g' -i configure.in || die
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf="--disable-dependency-tracking
+		--with-readmedir="${EPREFIX}"/usr/share/doc/${PF}
+		$(use_enable debug debug-log)
+		$(use_enable ffmpegthumbnailer)
+		$(use_enable gpu-accel)
+		$(use_enable gtk3)
+		$(use_enable jpeg)
+		$(use_enable lcms)
+		$(use_enable lua)
+		$(use_enable lirc)
+		$(use_enable map)
+		$(use_enable tiff)"
+
+	if use exif || use xmp; then
+		myconf="${myconf} --enable-exiv2"
+	else
+		myconf="${myconf} --disable-exiv2"
+	fi
+
+	econf ${myconf}
+}
+
+src_install() {
+	default
+
+	rm -f "${D}/usr/share/doc/${PF}/COPYING"
+	# Application needs access to the uncompressed file
+	docompress -x /usr/share/doc/${PF}/README.md
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+
+	elog "Some plugins may require additional packages"
+	elog "- Image rotate plugin: media-gfx/fbida (JPEG), media-gfx/imagemagick (TIFF/PNG)"
+	elog "- RAW images plugin: media-gfx/ufraw"
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/media-gfx/gmic/Manifest b/media-gfx/gmic/Manifest
index d25ea2159dba..d1f80d1c48d0 100644
--- a/media-gfx/gmic/Manifest
+++ b/media-gfx/gmic/Manifest
@@ -1,10 +1,4 @@
-AUX gmic-1.7.8-cmake.patch 2642 BLAKE2B 3ab50c705f6b1b91546b98bb55320e42dcf2cf52bd6f315dd7ae28092ae486fc8b17d52ad0ab3081cfe10cdb08dac49ca646bcd4ca7987db980bf10f47d1287d SHA512 76efb29a43f2408c2b1bc67de561927188f8729fac5b5a82e572856ad4fb326a7c1bb438c2811596500f80580f2e669b9dd796a5ee5dd3d0ce27cfb051c069b6
-AUX gmic-1.7.9-flags.patch 645 BLAKE2B b849606737b95521ac6e55640632e4b72689b4152b247c4efbf7f67640af9b8dd5794ba1d7de1e389da2ca19f2b5c3b9eea007d51e281de657e14b52abeae90a SHA512 01ec915af54d606f947f87581b5386900e61cff7d175c01d01cc558a22b219eda255a1d2af93c1414adcdf6a6297d4b42893ee875a40e908e21de5d15a449d72
-AUX gmic-1.7.9-man.patch 857 BLAKE2B c3a2dcbbd997b1f1d0f38e9c73467b83ced0f6174644eca40e5d13e5a98a5e94305f87759b4cb22b34542ee0303cfa38dd59d671495ab08141e14b58e509cf56 SHA512 6c205a0841fd35773ab5a8845d7efbcf57ccad74b07b5d61d45e37d07a30df6db40dd6a104fef669953e0a210869661d989a0daff1630ca7c713fbea3219fcca
-DIST gmic_1.7.8.tar.gz 3013635 BLAKE2B 1e964b42358010d1c643ff976f70774e2418a42b09601f29f9838e594ba4a0145e4c019cba39523efa85846bb75df7bbc451fd2c23ababc94ace93f35587c535 SHA512 2bfa7bb9ff3a99a76c71f7c4e0d619e9c205dafc02b5a2d1f097b6285c141e5413f7016b92d974327f787010a6832d272ab21a89842eee2484151072c2d4c559
-DIST gmic_1.7.9.tar.gz 3069082 BLAKE2B bc756258adbe468a4ceb347d546e1d283b6b21bb8bac4d3ec14b5c789fa375de37babded5862bdbbf86e83e4818c00c77758c13d10041ab90903d2d01e58ca6a SHA512 749611748c9fe2a141efc9b0a445411c1ece842f4c576b68b3b17cbbffdc1cf43a2aee55dc399b899dc03882f240289beaef96d9ec85b10ffc0ad986412cd4bc
-DIST gmic_2.0.0.tar.gz 3181386 BLAKE2B 4e6300388e62c915bf41ed04f70e487de8f5e460855f2e087c20766ef186d7dd1a4b99a053d9bd4ab02dc3f391982a9bebb20bcdd9b1e4737ba2bff77bd84a62 SHA512 08cb3bb02d072db5881dc3b2c23be766ae9909a29042777b474733afe30efeaeff35582ac69e8c5f38258c563919a17ce22294c594cbe04f792769b6609b3efb
-EBUILD gmic-1.7.8.ebuild 2117 BLAKE2B 113c3aa08e6e5c3db8801278bf9abe035c01e2b6b98a357ace9eac74d2bc3d59660f8709ac316b01a6c3f452553282069a8f9edc8308138f936096915850ee9f SHA512 69342854e08b932da43d526cbcabe13c330e8c1036e836cfd81d2c8243c9b1bb40e83220b09b89381caae17b7a609da4842eca6e4417944be33fb943ec4cb088
-EBUILD gmic-1.7.9.ebuild 2083 BLAKE2B 302bc72ee6bd6c5d504f9e0c3f33644701896fcc039f9fafccfda351f4b109426567305adae231180fec42c7ec3f5625e3980cd276b1a65c830810c12b4927ae SHA512 8d7d0d8a207298b89e395bc4f0b7204cf11584ba157c935135e9d9ae18cb7f3f849fcefb69ae7c552428d0a8a94394815f5400025cb237200dc7948310fc33ec
-EBUILD gmic-2.0.0.ebuild 2173 BLAKE2B 5388dcde5b8dc4ab2904910d4f048016a8cddffa0aa1d0316e944ad7d2335cc535cb36c3c7cbd36cbcc5eab6b5923b847abd9be291d76c496af5aecfe20e3a90 SHA512 53f36dd06ed496434fdd16ab3fa0246c21499a5104f219cbbc9606b8baa70eb099dcfc9e023750f30ab2aa685defb368358fea870a1e10ec9e8d895f6aa57a3c
-MISC metadata.xml 479 BLAKE2B da6434093beb9c4faa6740b938220be705538e6b078186ba00bd8b4643f4ff7bc95eeeace26dae218d1af90f07035334c37ba8f262fee56e2618aa3d61e15ed2 SHA512 78c266a5d1f3cf27d2cbaaaeabcaf5037e183a94d36761d23cf1691819405cadd484346b4d2573d03a96bbb9e9f48b1a8f75bd7286f9a77d67aa2421ca0bfd22
+AUX gmic-2.4.3-curl.patch 2527 BLAKE2B 8bb6a9fb4aff5a1ae19437f93ec4336d87ab61f334a56c1d2083b0a8c02c37697795ea82f37d4caaf23edb37111d201db75315169a12f256571ad081f60b9890 SHA512 1c5cef3879749ab9a62e52ae5ac1c26ab60ff4b323352af9e7fb0f55b3ca7804290d03bd63dcaedb68c3d6fe43da332681a1eeb84543a1ac30163169ccee6368
+DIST gmic_2.4.3.tar.gz 3816129 BLAKE2B 1c9dd6c7e45809d0cf8b8a45476a4b20ad321b5f34fbc5214cb149777c6e9a6aba845cd816cc1503010e281bda0b32e1059dd34d052afe2ebc086469163967be SHA512 482e70b0c82992799c5769ded1547904d16dbc9206d67279b6f524c1214258b97fa539678844a450d6f64144dc7a2715c754d6a1d85398e648bc34086fc3218f
+EBUILD gmic-2.4.3.ebuild 4306 BLAKE2B 608561cc5f9dc176f4b7951033a7a9cdcddf033bbc3f229a6a0a2ee72c08801ffc564b125eab25e1168bc8c93a8c60a6da2099337a1cd3483d087cff670bc094 SHA512 4b1501fd135e1133e6d8cf8404a20ee6155e04377821a00c0719679f8ce03e156d09a84f0c6104de356b9847f61c8d502db62bc1c2f31330f9d7b7d6b453ef99
+MISC metadata.xml 547 BLAKE2B 0da3088e531217099bf3f690059d3725ba3c62ad9337dfbf3817584f95594a328b647b0a81eb4d58c2cbc030026bf2aa94e01c817b04072aea1caee435f6ef9f SHA512 e58e976f8e80eea8e3620888858d6386e5d922c842e08c39f7ad611a5fc96e5fb85e39864bc0e805dd20a2c19e02b9fb8d1a5eaaa470075ed73759dcdcd4fbee
diff --git a/media-gfx/gmic/files/gmic-1.7.8-cmake.patch b/media-gfx/gmic/files/gmic-1.7.8-cmake.patch
deleted file mode 100644
index 2c4a6b3557b7..000000000000
--- a/media-gfx/gmic/files/gmic-1.7.8-cmake.patch
+++ /dev/null
@@ -1,76 +0,0 @@
---- gmic-1.7.8/CMakeLists.txt
-+++ gmic-1.7.8/CMakeLists.txt
-@@ -3,9 +3,11 @@
- project(gmic CXX C)
- 
- find_package(PkgConfig)
-+include(GNUInstallDirs)
- 
- # options controlling the build process
- option(BUILD_LIB "Build the GMIC shared library" ON)
-+option(BUILD_LIB_STATIC "Build the GMIC static library" ON)
- option(BUILD_CLI "Build the CLI interface" ON)
- option(BUILD_PLUGIN "Build the GIMP plug-in" ON)
- option(ENABLE_X "Add support for X11" ON)
-@@ -44,7 +46,7 @@
- if(ENABLE_OPENMP)
-   if(NOT APPLE)
-     set(COMPILE_FLAGS " ${COMPILE_FLAGS} -fopenmp -Dcimg_use_openmp ")
--    set(EXTRA_LIBRARIES "-lgomp ${EXTRA_LIBRARIES}")
-+	set(EXTRA_LIBRARIES "${EXTRA_LIBRARIES} -lgomp")
-   endif(NOT APPLE)
- endif(ENABLE_OPENMP)
- 
-@@ -187,9 +189,9 @@
-     "Choose the type of build, options are: Debug Release RelWithDebInfo."
-     FORCE)
- endif(NOT CMAKE_BUILD_TYPE)
--SET(CMAKE_CXX_FLAGS_DEBUG " -O0 -g -ansi -pedantic -Dcimg_verbosity=3 ${COMPILE_FLAGS}") 
--SET(CMAKE_CXX_FLAGS_RELEASE " -O3 -mtune=generic ${COMPILE_FLAGS}") 
--SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO " -O3 -g -mtune=generic ${COMPILE_FLAGS}") 
-+SET(CMAKE_CXX_FLAGS_DEBUG " -ansi -pedantic -Dcimg_verbosity=3 ${COMPILE_FLAGS}") 
-+SET(CMAKE_CXX_FLAGS_RELEASE " ${COMPILE_FLAGS}") 
-+SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO " ${COMPILE_FLAGS}") 
- 
- 
- # source files
-@@ -220,7 +222,7 @@
- if(BUILD_LIB)
-   add_library(libgmic SHARED ${CLI_Includes} ${CLI_Sources})
-   add_dependencies(libgmic gmic_extra_headers)
--  set_target_properties(libgmic PROPERTIES OUTPUT_NAME "gmic")
-+  set_target_properties(libgmic PROPERTIES SOVERSION "1" OUTPUT_NAME "gmic")
-   IF(NOT APPLE)
-     set_target_properties(libgmic PROPERTIES LINK_FLAGS "-Wl,-soname,libgmic.so.1")
-   ENDIF(NOT APPLE)
-@@ -236,7 +238,13 @@
-     ${FFTW3_LIBRARIES}
-     ${EXTRA_LIBRARIES}
-     )
--  
-+
-+  INSTALL(TARGETS libgmic LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}")
-+  INSTALL(FILES src/gmic.h DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
-+endif(BUILD_LIB)
-+
-+
-+if(BUILD_LIB_STATIC)
-   add_library(libgmicstatic STATIC ${CLI_Includes} ${CLI_Sources})
-   add_dependencies(libgmicstatic gmic_extra_headers)
-   set_target_properties(libgmicstatic PROPERTIES OUTPUT_NAME "gmic")
-@@ -252,11 +260,10 @@
-     ${FFTW3_LIBRARIES}
-     ${EXTRA_LIBRARIES}
-     )
--  
--  INSTALL(TARGETS libgmic LIBRARY DESTINATION lib)
--  INSTALL(TARGETS libgmicstatic ARCHIVE DESTINATION lib)
--  INSTALL(FILES src/gmic.h DESTINATION include)
--endif(BUILD_LIB)
-+
-+  INSTALL(TARGETS libgmicstatic ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}")
-+  INSTALL(FILES src/gmic.h DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
-+endif(BUILD_LIB_STATIC)
- 
- 
- if(BUILD_CLI)
diff --git a/media-gfx/gmic/files/gmic-1.7.9-flags.patch b/media-gfx/gmic/files/gmic-1.7.9-flags.patch
deleted file mode 100644
index aea11ed50a72..000000000000
--- a/media-gfx/gmic/files/gmic-1.7.9-flags.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- gmic-1.7.9/CMakeLists.txt
-+++ gmic-1.7.9/CMakeLists.txt
-@@ -190,9 +190,9 @@
-     "Choose the type of build, options are: Debug Release RelWithDebInfo."
-     FORCE)
- endif(NOT CMAKE_BUILD_TYPE)
--SET(CMAKE_CXX_FLAGS_DEBUG " -O0 -g -ansi -pedantic -Dcimg_verbosity=3 ${COMPILE_FLAGS}")
--SET(CMAKE_CXX_FLAGS_RELEASE " -O3 -mtune=generic ${COMPILE_FLAGS}")
--SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO " -O3 -g -mtune=generic ${COMPILE_FLAGS}")
-+SET(CMAKE_CXX_FLAGS_DEBUG " -ansi -pedantic -Dcimg_verbosity=3 ${COMPILE_FLAGS}")
-+SET(CMAKE_CXX_FLAGS_RELEASE " ${COMPILE_FLAGS}")
-+SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO " ${COMPILE_FLAGS}")
- 
- 
- # source files
diff --git a/media-gfx/gmic/files/gmic-1.7.9-man.patch b/media-gfx/gmic/files/gmic-1.7.9-man.patch
deleted file mode 100644
index 44353a2123ff..000000000000
--- a/media-gfx/gmic/files/gmic-1.7.9-man.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- gmic-1.7.9/CMakeLists.txt
-+++ gmic-1.7.9/CMakeLists.txt
-@@ -334,11 +334,10 @@
- if(BUILD_MAN)
-   file(MAKE_DIRECTORY ${CMAKE_SOURCE_DIR}/man)
-   add_custom_command(
--    OUTPUT ${CMAKE_SOURCE_DIR}/man/gmic.1.gz
-+    OUTPUT ${CMAKE_SOURCE_DIR}/man/gmic.1
-     DEPENDS gmic
-     COMMAND ${CMAKE_BINARY_DIR}/gmic -v - ${CMAKE_SOURCE_DIR}/src/gmic_stdlib.gmic raw:${CMAKE_SOURCE_DIR}/src/gmic_stdlib.gmic,uchar -__help man 2> ${CMAKE_SOURCE_DIR}/man/gmic.1
--    COMMAND gzip -f ${CMAKE_SOURCE_DIR}/man/gmic.1
-   )
--  add_custom_target(man ALL DEPENDS ${CMAKE_SOURCE_DIR}/man/gmic.1.gz)
--  INSTALL(FILES ${CMAKE_SOURCE_DIR}/man/gmic.1.gz DESTINATION ${CMAKE_INSTALL_MANDIR}/man1/)
-+  add_custom_target(man ALL DEPENDS ${CMAKE_SOURCE_DIR}/man/gmic.1)
-+  INSTALL(FILES ${CMAKE_SOURCE_DIR}/man/gmic.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1/)
- endif(BUILD_MAN)
diff --git a/media-gfx/gmic/files/gmic-2.4.3-curl.patch b/media-gfx/gmic/files/gmic-2.4.3-curl.patch
new file mode 100644
index 000000000000..f91f86ff0d48
--- /dev/null
+++ b/media-gfx/gmic/files/gmic-2.4.3-curl.patch
@@ -0,0 +1,100 @@
+Add curl support for the cli app and base library and make it truly optional
+for gmic-qt instead of automagic.
+
+--- gmic-2.4.3/CMakeLists.txt
++++ gmic-2.4.3/CMakeLists.txt
+@@ -83,6 +83,7 @@
+ option(BUILD_MAN "Build the manpage" ON)
+ option(BUILD_BASH_COMPLETION "Build Bash completion" ON)
+ option(CUSTOM_CFLAGS "Override default compiler optimization flags" OFF)
++option(ENABLE_CURL "Add support for curl" ON)
+ option(ENABLE_X "Add support for X11" ON)
+ option(ENABLE_FFMPEG "Add support for FFMpeg" ON)
+ option(ENABLE_FFTW "Add support for FFTW" ON)
+@@ -136,6 +137,16 @@
+   link_directories(${ZLIB_LIBRARY_DIRS})
+ endif()
+ 
++# curl support
++if(ENABLE_CURL)
++  find_package(CURL)
++endif()
++if(CURL_FOUND)
++  set(COMPILE_FLAGS "${COMPILE_FLAGS} -Dcimg_use_curl")
++  include_directories(${CURL_INCLUDE_DIRS})
++  link_directories(${CURL_LIBRARY_DIRS})
++endif()
++
+ #X11 support
+ if(ENABLE_X)
+   find_package(X11)
+@@ -288,6 +299,7 @@
+     ${OPENEXR_LIBRARIES}
+     ${OPENCV_LIBRARIES}
+     ${ZLIB_LIBRARIES}
++    ${CURL_LIBRARIES}
+     ${FFTW3_LIBRARIES}
+     ${EXTRA_LIBRARIES}
+   )
+@@ -316,6 +328,7 @@
+     ${OPENEXR_LIBRARIES}
+     ${OPENCV_LIBRARIES}
+     ${ZLIB_LIBRARIES}
++    ${CURL_LIBRARIES}
+     ${FFTW3_LIBRARIES}
+     ${EXTRA_LIBRARIES}
+   )
+@@ -345,6 +358,7 @@
+       ${OPENEXR_LIBRARIES}
+       ${OPENCV_LIBRARIES}
+       ${ZLIB_LIBRARIES}
++      ${CURL_LIBRARIES}
+       ${FFTW3_LIBRARIES}
+       ${EXTRA_LIBRARIES}
+     )
+--- gmic-2.4.3/gmic-qt/CMakeLists.txt
++++ gmic-2.4.3/gmic-qt/CMakeLists.txt
+@@ -30,6 +30,7 @@
+ message("G'MIC path: " ${GMIC_PATH})
+ 
+ option(ENABLE_DYNAMIC_LINKING "Dynamically link the binaries to the GMIC shared library" OFF)
++option(ENABLE_CURL "Add support for curl" ON)
+ set (GMIC_LIB_PATH "${GMIC_PATH}" CACHE STRING "Define the path to the GMIC shared library")
+ 
+ #
+@@ -149,10 +150,12 @@
+ #
+ # CURL
+ #
+-find_package(CURL)
+-if (CURL_FOUND)
+-    add_definitions(-Dcimg_use_curl)
+-    include_directories(SYSTEM ${CURL_INCLUDE_DIRS} )
++if(ENABLE_CURL)
++    find_package(CURL)
++    if (CURL_FOUND)
++        add_definitions(-Dcimg_use_curl)
++        include_directories(SYSTEM ${CURL_INCLUDE_DIRS} )
++    endif()
+ endif()
+ 
+ #
+@@ -187,11 +190,13 @@
+         ${ZLIB_LIBRARIES}
+ )
+ 
+-if (CURL_FOUND)
+-    set(gmic_qt_LIBRARIES
+-        ${gmic_qt_LIBRARIES}
+-        ${CURL_LIBRARIES}
+-    )
++if(ENABLE_CURL)
++    if (CURL_FOUND)
++        set(gmic_qt_LIBRARIES
++            ${gmic_qt_LIBRARIES}
++            ${CURL_LIBRARIES}
++        )
++    endif()
+ endif()
+ 
+ add_definitions(-Dgmic_build)
diff --git a/media-gfx/gmic/gmic-1.7.8.ebuild b/media-gfx/gmic/gmic-1.7.8.ebuild
deleted file mode 100644
index 985bd87c6dad..000000000000
--- a/media-gfx/gmic/gmic-1.7.8.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils bash-completion-r1
-
-DESCRIPTION="GREYC's Magic Image Converter"
-HOMEPAGE="http://gmic.eu/ https://github.com/dtschump/gmic"
-SRC_URI="http://gmic.eu/files/source/${PN}_${PV}.tar.gz"
-
-LICENSE="CeCILL-2 FDL-1.3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+cli ffmpeg fftw gimp graphicsmagick jpeg opencv openexr openmp png static-libs tiff X zlib"
-REQUIRED_USE="|| ( cli gimp )"
-
-COMMON_DEPEND="
-	fftw? ( sci-libs/fftw:3.0[threads] )
-	gimp? ( >=media-gfx/gimp-2.4.0 )
-	graphicsmagick? ( media-gfx/graphicsmagick )
-	jpeg? ( virtual/jpeg:0 )
-	opencv? ( >=media-libs/opencv-2.3.1a-r1 )
-	openexr? (
-		media-libs/ilmbase
-		media-libs/openexr
-	)
-	png? ( media-libs/libpng:0= )
-	tiff? ( media-libs/tiff:0 )
-	X? (
-		x11-libs/libX11
-		x11-libs/libXext
-	)
-	zlib? ( sys-libs/zlib )"
-RDEPEND="${COMMON_DEPEND}
-	ffmpeg? ( media-video/ffmpeg:0 )
-	gimp? ( !media-plugins/gimp-gmic )
-"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-"
-
-PATCHES=( "${FILESDIR}"/${P}-cmake.patch )
-
-pkg_pretend() {
-	if use openmp ; then
-		tc-has-openmp || die "Please switch to an openmp compatible compiler"
-	fi
-
-	if ! test-flag-CXX -std=c++11 ; then
-		die "You need at least GCC 4.7.x or Clang >= 3.3 for C++11-specific compiler flags"
-	fi
-}
-
-src_prepare() {
-	default
-	gunzip man/${PN}.1.gz || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_LIB=ON
-		-DBUILD_LIB_STATIC=$(usex static-libs)
-		-DBUILD_CLI=$(usex cli)
-		-DBUILD_PLUGIN=$(usex gimp)
-		-DENABLE_X=$(usex X)
-		-DENABLE_FFMPEG=$(usex ffmpeg)
-		-DENABLE_FFTW=$(usex fftw)
-		-DENABLE_GRAPHICSMAGICK=$(usex graphicsmagick)
-		-DENABLE_JPEG=$(usex jpeg)
-		-DENABLE_OPENCV=$(usex opencv)
-		-DENABLE_OPENEXR=$(usex openexr)
-		-DENABLE_OPENMP=$(usex openmp)
-		-DENABLE_PNG=$(usex png)
-		-DENABLE_TIFF=$(usex tiff)
-		-DENABLE_ZLIB=$(usex zlib)
-	)
-
-	local CMAKE_BUILD_TYPE="Release"
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	dodoc README
-
-	if use cli; then
-		doman man/${PN}.1
-		newbashcomp resources/${PN}_bashcompletion.sh ${PN}
-	fi
-}
diff --git a/media-gfx/gmic/gmic-1.7.9.ebuild b/media-gfx/gmic/gmic-1.7.9.ebuild
deleted file mode 100644
index f8b8e275154c..000000000000
--- a/media-gfx/gmic/gmic-1.7.9.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils bash-completion-r1
-
-DESCRIPTION="GREYC's Magic Image Converter"
-HOMEPAGE="http://gmic.eu/ https://github.com/dtschump/gmic"
-SRC_URI="http://gmic.eu/files/source/${PN}_${PV}.tar.gz"
-
-LICENSE="CeCILL-2 FDL-1.3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+cli ffmpeg fftw gimp graphicsmagick jpeg opencv openexr openmp png static-libs tiff X zlib"
-REQUIRED_USE="|| ( cli gimp )"
-
-COMMON_DEPEND="
-	fftw? ( sci-libs/fftw:3.0[threads] )
-	gimp? ( >=media-gfx/gimp-2.4.0 )
-	graphicsmagick? ( media-gfx/graphicsmagick )
-	jpeg? ( virtual/jpeg:0 )
-	opencv? ( >=media-libs/opencv-2.3.1a-r1 )
-	openexr? (
-		media-libs/ilmbase
-		media-libs/openexr
-	)
-	png? ( media-libs/libpng:0= )
-	tiff? ( media-libs/tiff:0 )
-	X? (
-		x11-libs/libX11
-		x11-libs/libXext
-	)
-	zlib? ( sys-libs/zlib )"
-RDEPEND="${COMMON_DEPEND}
-	ffmpeg? ( media-video/ffmpeg:0 )
-	gimp? ( !media-plugins/gimp-gmic )
-"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-flags.patch
-	"${FILESDIR}"/${P}-man.patch
-)
-
-pkg_pretend() {
-	if use openmp ; then
-		tc-has-openmp || die "Please switch to an openmp compatible compiler"
-	fi
-
-	if ! test-flag-CXX -std=c++11 ; then
-		die "You need at least GCC 4.7.x or Clang >= 3.3 for C++11-specific compiler flags"
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_LIB=ON
-		-DBUILD_LIB_STATIC=$(usex static-libs)
-		-DBUILD_CLI=$(usex cli)
-		-DBUILD_MAN=$(usex cli)
-		-DBUILD_PLUGIN=$(usex gimp)
-		-DENABLE_X=$(usex X)
-		-DENABLE_FFMPEG=$(usex ffmpeg)
-		-DENABLE_FFTW=$(usex fftw)
-		-DENABLE_GRAPHICSMAGICK=$(usex graphicsmagick)
-		-DENABLE_JPEG=$(usex jpeg)
-		-DENABLE_OPENCV=$(usex opencv)
-		-DENABLE_OPENEXR=$(usex openexr)
-		-DENABLE_OPENMP=$(usex openmp)
-		-DENABLE_PNG=$(usex png)
-		-DENABLE_TIFF=$(usex tiff)
-		-DENABLE_ZLIB=$(usex zlib)
-	)
-
-	local CMAKE_BUILD_TYPE="Release"
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	dodoc README
-	use cli && newbashcomp resources/${PN}_bashcompletion.sh ${PN}
-}
diff --git a/media-gfx/gmic/gmic-2.0.0.ebuild b/media-gfx/gmic/gmic-2.0.0.ebuild
deleted file mode 100644
index bf371feb3ea2..000000000000
--- a/media-gfx/gmic/gmic-2.0.0.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils bash-completion-r1
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/dtschump/gmic.git"
-	inherit git-r3
-else
-	SRC_URI="http://gmic.eu/files/source/${PN}_${PV}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="GREYC's Magic Image Converter"
-HOMEPAGE="http://gmic.eu/ https://github.com/dtschump/gmic"
-
-LICENSE="CeCILL-2 FDL-1.3"
-SLOT="0"
-IUSE="+cli ffmpeg fftw gimp graphicsmagick jpeg opencv openexr openmp png static-libs tiff X zlib"
-REQUIRED_USE="|| ( cli gimp )"
-
-COMMON_DEPEND="
-	fftw? ( sci-libs/fftw:3.0[threads] )
-	gimp? ( >=media-gfx/gimp-2.4.0 )
-	graphicsmagick? ( media-gfx/graphicsmagick )
-	jpeg? ( virtual/jpeg:0 )
-	opencv? ( >=media-libs/opencv-2.3.1a-r1 )
-	openexr? (
-		media-libs/ilmbase
-		media-libs/openexr
-	)
-	png? ( media-libs/libpng:0= )
-	tiff? ( media-libs/tiff:0 )
-	X? (
-		x11-libs/libX11
-		x11-libs/libXext
-	)
-	zlib? ( sys-libs/zlib )"
-RDEPEND="${COMMON_DEPEND}
-	ffmpeg? ( media-video/ffmpeg:0 )
-"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.7.9-flags.patch
-	"${FILESDIR}"/${PN}-1.7.9-man.patch
-)
-
-pkg_pretend() {
-	if use openmp ; then
-		tc-has-openmp || die "Please switch to an openmp compatible compiler"
-	fi
-
-	if ! test-flag-CXX -std=c++11 ; then
-		die "You need at least GCC 4.7.x or Clang >= 3.3 for C++11-specific compiler flags"
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_LIB=ON
-		-DBUILD_LIB_STATIC=$(usex static-libs)
-		-DBUILD_CLI=$(usex cli)
-		-DBUILD_MAN=$(usex cli)
-		-DBUILD_PLUGIN=$(usex gimp)
-		-DENABLE_X=$(usex X)
-		-DENABLE_FFMPEG=$(usex ffmpeg)
-		-DENABLE_FFTW=$(usex fftw)
-		-DENABLE_GRAPHICSMAGICK=$(usex graphicsmagick)
-		-DENABLE_JPEG=$(usex jpeg)
-		-DENABLE_OPENCV=$(usex opencv)
-		-DENABLE_OPENEXR=$(usex openexr)
-		-DENABLE_OPENMP=$(usex openmp)
-		-DENABLE_PNG=$(usex png)
-		-DENABLE_TIFF=$(usex tiff)
-		-DENABLE_ZLIB=$(usex zlib)
-	)
-
-	local CMAKE_BUILD_TYPE="Release"
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	dodoc README
-	use cli && newbashcomp resources/${PN}_bashcompletion.sh ${PN}
-}
diff --git a/media-gfx/gmic/gmic-2.4.3.ebuild b/media-gfx/gmic/gmic-2.4.3.ebuild
new file mode 100644
index 000000000000..0b6b7df9acb8
--- /dev/null
+++ b/media-gfx/gmic/gmic-2.4.3.ebuild
@@ -0,0 +1,170 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_BUILD_TYPE=Release
+CMAKE_MIN_VERSION=3.9
+
+inherit cmake-utils bash-completion-r1
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/dtschump/gmic.git"
+	inherit git-r3
+else
+	SRC_URI="https://gmic.eu/files/source/${PN}_${PV}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="GREYC's Magic Image Converter"
+HOMEPAGE="https://gmic.eu/ https://github.com/dtschump/gmic"
+
+LICENSE="CeCILL-2 GPL-3"
+SLOT="0"
+IUSE="+cli curl ffmpeg fftw gimp graphicsmagick jpeg krita opencv openexr openmp png qt5 static-libs tiff X zlib"
+REQUIRED_USE="
+	|| ( cli gimp krita qt5 )
+	gimp? ( png zlib fftw X )
+	krita? ( png zlib fftw X )
+	qt5? ( png zlib fftw X )
+"
+
+MIN_QT_VER="5.2.0"
+QT_DEPEND="
+	>=dev-qt/qtcore-${MIN_QT_VER}:5=
+	>=dev-qt/qtgui-${MIN_QT_VER}:5=
+	>=dev-qt/qtnetwork-${MIN_QT_VER}:5=
+	>=dev-qt/qtwidgets-${MIN_QT_VER}:5=
+"
+COMMON_DEPEND="
+	curl? ( net-misc/curl )
+	fftw? ( sci-libs/fftw:3.0=[threads] )
+	gimp? (
+		>=media-gfx/gimp-2.8.0
+		${QT_DEPEND}
+	)
+	graphicsmagick? ( media-gfx/graphicsmagick:0= )
+	jpeg? ( virtual/jpeg:0 )
+	krita? ( ${QT_DEPEND} )
+	opencv? ( >=media-libs/opencv-2.3.1a-r1:0= )
+	openexr? (
+		media-libs/ilmbase:0=
+		media-libs/openexr:0=
+	)
+	png? ( media-libs/libpng:0= )
+	qt5? ( ${QT_DEPEND} )
+	tiff? ( media-libs/tiff:0 )
+	X? (
+		x11-libs/libX11
+		x11-libs/libXext
+	)
+	zlib? ( sys-libs/zlib:0= )"
+RDEPEND="${COMMON_DEPEND}
+	ffmpeg? ( media-video/ffmpeg:0= )
+"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+	gimp? ( dev-qt/linguist-tools )
+	krita? ( dev-qt/linguist-tools )
+	qt5? ( dev-qt/linguist-tools )
+"
+
+pkg_pretend() {
+	if use openmp ; then
+		tc-has-openmp || die "Please switch to an openmp compatible compiler"
+	fi
+
+	if ! test-flag-CXX -std=c++11 ; then
+		die "You need at least GCC 4.7.x or Clang >= 3.3 for C++11-specific compiler flags"
+	fi
+}
+
+src_prepare() {
+	local PATCHES=( "${FILESDIR}"/${P}-curl.patch )
+	cmake-utils_src_prepare
+	sed -i '/CMAKE_CXX_FLAGS/s/-g //' CMakeLists.txt || die
+
+	if use gimp || use krita || use qt5; then
+		sed -i '/CMAKE_CXX_FLAGS_RELEASE/d' gmic-qt/CMakeLists.txt || die
+		local S="${S}/gmic-qt"
+		PATCHES=()
+		cmake-utils_src_prepare
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_LIB=ON
+		-DBUILD_LIB_STATIC=$(usex static-libs)
+		-DBUILD_CLI=$(usex cli)
+		-DBUILD_MAN=$(usex cli)
+		-DCUSTOM_CFLAGS=ON
+		-DENABLE_CURL=$(usex curl)
+		-DENABLE_X=$(usex X)
+		-DENABLE_FFMPEG=$(usex ffmpeg)
+		-DENABLE_FFTW=$(usex fftw)
+		-DENABLE_GRAPHICSMAGICK=$(usex graphicsmagick)
+		-DENABLE_JPEG=$(usex jpeg)
+		-DENABLE_OPENCV=$(usex opencv)
+		-DENABLE_OPENEXR=$(usex openexr)
+		-DENABLE_OPENMP=$(usex openmp)
+		-DENABLE_PNG=$(usex png)
+		-DENABLE_TIFF=$(usex tiff)
+		-DENABLE_ZLIB=$(usex zlib)
+		-DENABLE_DYNAMIC_LINKING=ON
+	)
+
+	cmake-utils_src_configure
+
+	# configure gmic-qt frontends
+	local CMAKE_USE_DIR="${S}/gmic-qt"
+	mycmakeargs=(
+		-DENABLE_DYNAMIC_LINKING=ON
+		-DENABLE_CURL=$(usex curl)
+		-DGMIC_LIB_PATH="${BUILD_DIR}"
+		-DGMIC_PATH="${S}/src"
+	)
+
+	if use gimp; then
+		mycmakeargs+=( -DGMIC_QT_HOST=gimp )
+		BUILD_DIR="${BUILD_DIR}"/gimp cmake-utils_src_configure
+	fi
+
+	if use krita; then
+		mycmakeargs+=( -DGMIC_QT_HOST=krita )
+		BUILD_DIR="${BUILD_DIR}"/krita cmake-utils_src_configure
+	fi
+
+	if use qt5; then
+		mycmakeargs+=( -DGMIC_QT_HOST=none )
+		BUILD_DIR="${BUILD_DIR}"/qt5 cmake-utils_src_configure
+	fi
+}
+
+src_compile() {
+	cmake-utils_src_compile
+
+	# build gmic-qt frontends
+	local S="${S}/gmic-qt"
+	use gimp && { BUILD_DIR="${BUILD_DIR}"/gimp cmake-utils_src_compile || die "failed building gimp plugin" ; }
+	use krita && { BUILD_DIR="${BUILD_DIR}"/krita cmake-utils_src_compile || die "failed building krita plugin" ; }
+	use qt5 && { BUILD_DIR="${BUILD_DIR}"/qt5 cmake-utils_src_compile || die "failed building qt5 GUI" ; }
+}
+
+src_install() {
+	cmake-utils_src_install
+	dodoc README
+	use cli && newbashcomp "${BUILD_DIR}"/resources/gmic_bashcompletion.sh ${PN}
+
+	local PLUGINDIR="/usr/$(get_libdir)/gimp/2.0/plug-ins"
+	insinto "${PLUGINDIR}"
+	doins resources/gmic_film_cluts.gmz
+
+	# install gmic-qt frontends
+	if use gimp; then
+		exeinto "${PLUGINDIR}"
+		doexe "${BUILD_DIR}"/gimp/gmic_gimp_qt
+	fi
+	use krita && dobin "${BUILD_DIR}"/krita/gmic_krita_qt
+	use qt5 && dobin "${BUILD_DIR}"/qt5/gmic_qt
+}
diff --git a/media-gfx/gmic/metadata.xml b/media-gfx/gmic/metadata.xml
index 97ea96d21230..1cd8c96cdcae 100644
--- a/media-gfx/gmic/metadata.xml
+++ b/media-gfx/gmic/metadata.xml
@@ -7,6 +7,7 @@
 	</maintainer>
 	<use>
 		<flag name="cli">Build CLI interface</flag>
+		<flag name="krita">Build <pkg>media-gfx/krita</pkg> plugin</flag>
 		<flag name="opencv">Enable support for webcams using the OpenCV library</flag>
 	</use>
 	<upstream>
diff --git a/media-gfx/graphite2/Manifest b/media-gfx/graphite2/Manifest
index ba7d6fa40969..1f4e1505ec1c 100644
--- a/media-gfx/graphite2/Manifest
+++ b/media-gfx/graphite2/Manifest
@@ -1,8 +1,8 @@
 AUX graphite2-1.3.5-includes-libs-perl.patch 836 BLAKE2B 0429d214ff7fd9b903e1d3bcaf0af3e6b29a0269581390f64950e42e41280e482fc9cfda9bfe24ef166eb6c24d21377a15fca4264fec69d902d8ba18810bdb01 SHA512 26ab6dda13d758a5e4237c8b5d207d3c5111afbb11b2c3984cd742913c3c7932559b23b5ea9f774f1c6373eb0f761a9400dccc95876740b3cd06c44084a10965
 DIST graphite2-1.3.10.tgz 3889647 BLAKE2B c6db80950ed5f81d5ecf77003e23e6545c2824948bdc04aa3111747c0eb1ef074b09fe4c3ec20b68b00f75958ea39c5945a7fbe2fecde55ff32d22e517c91156 SHA512 d6d578feaa2d9304dc9bcd3926958070b8c23b27437a9fcb801e08e62f33a5549b7a6aa9636c7f8eb80a2a2c6d5cac97d58050fb30fd102b9fd0f8c558f4252b
-DIST graphite2-1.3.11.tgz 4236760 BLAKE2B d02c98cb387eec1d7b238de550554384f25c873e84d6e2a14dbe352c3f1f8420fa06130c5fd9083e442994b88c483a1a9ca8dcaa0a2c632314f1847e432a7f3b SHA512 fd5e997a30492a7668ad7afd78889e40cb37195cb8e11f42817ee00901b699d6a591e8230bf7a40abd1b218ae26588948a92b23e48c9fd03164fd5e2f4031afe
 DIST graphite2-1.3.12.tgz 6667293 BLAKE2B 5008cdc6336af6d846b7d14640b1b8987eb46ff8ff25ee518f2b5cd0576dff2430fb6c83527a6ead6759e73d26fb706b98488aadacefc01f3d6138a91c32b541 SHA512 fdb5a08a64dba1bc6e830e6b7a079daaa7ee009571d159ff0edf6bcfb7dd668f60773b872f1c8636bc70e6559e1a870e1649008b4764b02e12dad0add504e664
+DIST graphite2-1.3.13.tgz 6664757 BLAKE2B 3faad44f7ba5e0729f722fd4589c5f6a4c53cffc2bb93615c8220d03c759dedf05924b1f56cafcf1c28e0a4b50fba0d319da30572fffde4baab6bc240528a0d3 SHA512 44ac2f353c1a795a55c78b4ff72df35a3a5a94700356c0eefe105d66cd499ac93f9cfd5ab7b3ea842b575156cb8df19e0b57ff8b9dbaee8a576319ff5889c131
 EBUILD graphite2-1.3.10.ebuild 2499 BLAKE2B cdfabfaeecaf58e032422d60adf6ee349ec2bdba70313138d4dd4e88e258ba9868a31a4f56109a043846e2aaf7dd242468bd49244ebf28c3b3a9cb0b2d085300 SHA512 43b767dbed5273118dd9cd42a505e659217989f4165dd41e971df02ce6042f1c8476e06eda60b66023f02df3a41b0bfe8b63df88b2035d70ccd2d5fe36a7e4ac
-EBUILD graphite2-1.3.11-r1.ebuild 2590 BLAKE2B 424e04dc5162f49de943d7d500b4c25af8accca0b1a2ebacdab2708947c156ec4141a34bc8bf67d49579641430f42c57080eb70788f6a898b0381ae23fd3fd5e SHA512 047e6ef24a8afbcf3a80f7d73480f6cb0a6e9a6aaa26039beef9bacde59105b23137c6933f2fd26150628571121f9c67df1a3d908ac7593bfdcc39a2e417b050
-EBUILD graphite2-1.3.12-r1.ebuild 2590 BLAKE2B 424e04dc5162f49de943d7d500b4c25af8accca0b1a2ebacdab2708947c156ec4141a34bc8bf67d49579641430f42c57080eb70788f6a898b0381ae23fd3fd5e SHA512 047e6ef24a8afbcf3a80f7d73480f6cb0a6e9a6aaa26039beef9bacde59105b23137c6933f2fd26150628571121f9c67df1a3d908ac7593bfdcc39a2e417b050
+EBUILD graphite2-1.3.12-r1.ebuild 2632 BLAKE2B 6ac75fbd8226f136a2387abf8dcfa183b712beda65731c1b0276bc48cb180824d9cda1e0280a0e078018f3d3af02d7dd4def31da03dca5c5780edb6b1e631570 SHA512 a163933c9aa34f167df37f3cb601834831b9bb825d68dce644e1da49e6e246cb5f4327fa645c868af21752ad01d217ac3659e1a7d66c125b1bfd7212fca5abcb
+EBUILD graphite2-1.3.13.ebuild 2672 BLAKE2B 422e9d56b0169ed9ceb3d97717d2b30280c78c83f2cf88f53ab8ce62fd35ef03c039f84744f17c4d55a5b1a7b3c714e80e35b60a51ad83041d70a7926f9a79bb SHA512 1818debfe7402c1778990e0bb713814f5aaf6ff10a47b4763024d5dc308c0e5698534571876c608ad29b70d96a1e2e91afda656867cd0c699466056200cdf721
 MISC metadata.xml 336 BLAKE2B 7069f4f7bb9ecd39581528f3f6b072d2ebf2c32b24224b9ca5b69b138490e764b740768334954f5cfc25819cab55a50fbd0933dc77fb3397886aacfd105f0853 SHA512 ac8ae39ab005c1562818a97b64bfef48ab64e2a1993aa3eef4ee4b3066b32d9211787df1273e20cb767839e42364ed72b3e99c51bb65f0c88937564d5dbb5380
diff --git a/media-gfx/graphite2/graphite2-1.3.12-r1.ebuild b/media-gfx/graphite2/graphite2-1.3.12-r1.ebuild
index 64d56a70455a..f13ec6df7f35 100644
--- a/media-gfx/graphite2/graphite2-1.3.12-r1.ebuild
+++ b/media-gfx/graphite2/graphite2-1.3.12-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/silgraphite/${PN}/${P}.tgz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="perl test"
 
 RDEPEND="
diff --git a/media-gfx/graphite2/graphite2-1.3.11-r1.ebuild b/media-gfx/graphite2/graphite2-1.3.13.ebuild
index 64d56a70455a..f95b1b001cf7 100644
--- a/media-gfx/graphite2/graphite2-1.3.11-r1.ebuild
+++ b/media-gfx/graphite2/graphite2-1.3.13.ebuild
@@ -1,20 +1,20 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python3_{6,7} )
 
 GENTOO_DEPEND_ON_PERL="no"
 inherit perl-module python-any-r1 cmake-multilib
 
 DESCRIPTION="Library providing rendering capabilities for complex non-Roman writing systems"
-HOMEPAGE="http://graphite.sil.org/"
+HOMEPAGE="https://scripts.sil.org/cms/scripts/page.php?site_id=projects&item_id=graphite_home"
 SRC_URI="mirror://sourceforge/silgraphite/${PN}/${P}.tgz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="perl test"
 
 RDEPEND="
@@ -24,21 +24,17 @@ DEPEND="${RDEPEND}
 	perl? (
 		dev-perl/Module-Build
 		dev-perl/Locale-Maketext-Lexicon
-		)
+	)
 	test? (
+		${PYTHON_DEPS}
 		dev-libs/glib:2
+		$(python_gen_any_dep 'dev-python/fonttools[${PYTHON_USEDEP}]')
 		media-libs/fontconfig
-		$(python_gen_any_dep '
-			dev-python/fonttools[${PYTHON_USEDEP}]
-		')
-		${PYTHON_DEPS}
 		perl? ( virtual/perl-Test-Simple )
 	)
 "
 
-PATCHES=(
-	"${FILESDIR}/${PN}-1.3.5-includes-libs-perl.patch"
-)
+PATCHES=( "${FILESDIR}/${PN}-1.3.5-includes-libs-perl.patch" )
 
 pkg_setup() {
 	use perl && perl_set_version
@@ -54,19 +50,18 @@ src_prepare() {
 
 	# make tests optional
 	if ! use test; then
-		sed -i \
-			-e '/tests/d' \
-			CMakeLists.txt || die
+		sed -e '/tests/d' -i CMakeLists.txt || die
 	fi
 }
 
 multilib_src_configure() {
 	local mycmakeargs=(
 		# Renamed VM_MACHINE_TYPE to GRAPHITE2_VM_TYPE
-		"-DGRAPHITE2_VM_TYPE=direct"
-		# https://sourceforge.net/p/silgraphite/bugs/49/
-		$([[ ${CHOST} == powerpc*-apple* ]] && \
-			echo "-DGRAPHITE2_NSEGCACHE:BOOL=ON")
+		-DGRAPHITE2_VM_TYPE=direct
+	)
+	# https://sourceforge.net/p/silgraphite/bugs/49/
+	[[ ${CHOST} == powerpc*-apple* ]] && mycmakeargs+=(
+		-DGRAPHITE2_NSEGCACHE:BOOL=ON
 	)
 
 	cmake-utils_src_configure
@@ -74,9 +69,8 @@ multilib_src_configure() {
 	# fix perl linking
 	if multilib_is_native_abi && use perl; then
 		# we rely on the fact that cmake-utils_src_configure sets BUILD_DIR
-		sed -i \
-			-e "s:@BUILD_DIR@:\"${BUILD_DIR}/src\":" \
-			"${S}"/contrib/perl/Build.PL || die
+		sed -e "s:@BUILD_DIR@:\"${BUILD_DIR}/src\":" \
+			-i "${S}"/contrib/perl/Build.PL || die
 	fi
 }
 
diff --git a/media-gfx/hugin/Manifest b/media-gfx/hugin/Manifest
index 1001c95a0d41..7e39cf85ac78 100644
--- a/media-gfx/hugin/Manifest
+++ b/media-gfx/hugin/Manifest
@@ -1,8 +1,9 @@
+AUX hugin-2018.0.0-exiv2-0.27.patch 1095 BLAKE2B 52cd5e31f36b22291a3a864a9f248510f0fc871f1a9ee8e49cbcda5d8876eb9e7ec0e5e1595cce015c55dfc0f53b4fa8efc82e30f8c129e81d426accb3538e5e SHA512 480cb3f5e4ba04efa863b409747029ec1ed158168705621b3ba588e6566c56c3e5b16f422daf40cc27660b48f63c1a32861f9a4cda22c0eda397922d00a828a1
 DIST hugin-2016.2.0.tar.bz2 10386216 BLAKE2B 8437a360880903fac33be7dc12fcdff7fbd16b15153de32e127bdc2b5fe5a47e9ebefe8bc4fb088ba2b818743b8bee9348560aaeb53781bfd0eeb57ec1adbe0b SHA512 9c652e685d0135afef6418bdf5fce39cec8ef1ec0dbe3a325151957c91495db0a2a3171ee04a28955a638493913c1bc800a90c37347ad17612584646c8a65510
 DIST hugin-2017.0.tar.bz2 9803272 BLAKE2B fa7475347f6b1b561132d5370172fee410afd4f8b15c2c5d7d356023716d15cdcc5ecb8a13d743ce13f3c15ebb7f4b42f0e9653b9f94e752d5e6dea3ecef05b7 SHA512 bfd39135119fddb559ecec220da36a4c15d96bda7f93e738d8815aafca94685ba879239202e2cc81c87787188ee3b1b6dc5cbe8014aa12e2f95d654591dc1969
 DIST hugin-2018.0.0.tar.bz2 9838518 BLAKE2B dc6d786e4e6a298d4dd4e48b2c42f9c9c297b4c431fbc00fa9090f129a4633f599e222402aef1f2a467aa9b498d356f3bbaca9548954cf697d331950afa6693a SHA512 30061f4af695137f349526272e8c3c2f1f6a167305acb32466a30629c46dabea3818bc2c3a77b6102fcb67aa390a803cdc5ba8d8a2ecc6065f88726392529cbc
 EBUILD hugin-2016.2.0.ebuild 1948 BLAKE2B 813e60b2a655186d9ee3042e03372e1185e07aa6fdb7a5ecd57889efb9252630d7902b36600995e02ba03677f9c11a6bc4b7fc841f852391e1c3ed168c24b24f SHA512 0fa77072010e24db9fa58b5601040baff38121342a7c187b24b6fd37626becd46b372fde844981bb00da4b840970ebff88bc2f3f2833afc584c2aad6cba8a265
 EBUILD hugin-2017.0.ebuild 1924 BLAKE2B 8d618f623ed9d53a49e138acad196d691bcd0b69b4f3318a002b88917bcfc216ce9b10c02a283b540acae345e8878a6ab233022ec1ae44f37b305e11eb592066 SHA512 7921827a90e88f68218e7d2a4b9480ab5ffcb7bcd9aff1f8245d7d9233b55d425f216fcd14c13c064fe30dc2fe65f2882fb8ba8f3a4e8d126db754d6e733737f
-EBUILD hugin-2018.0.0.ebuild 1970 BLAKE2B f756191712f7f71d7b5bbf4b58b8943a6851c231c070d42794b06a0adc04189b757541432027c4f0f1014bfd7f1bde1cbb67f11cfbeeb9e9c4ca589578b1e6d9 SHA512 45f5cf6a1d2532316834a967396b445b2686bc6aa68e6f367d82d65abbb8d986552a56b61465382001616fe1e4bceef605c1f86f9ac17116cca81665c9efcc2b
-EBUILD hugin-9999.ebuild 1988 BLAKE2B 0fa525881a25a8141a1fc2fabc176382ec1cd040ad49e3c1f90f9b239570f06c944f44d633d2c43ce304048fa48075f0432c2c89bdb6921b0a6bf476d24b9786 SHA512 40f281844a1fe6562e9c692f6ca6dee905b7dbd7e233da31a7be04940f6b7c831d50180969a6752024a15a7e667459ec5ef835f4879b3789e9c5d156016de133
+EBUILD hugin-2018.0.0.ebuild 1994 BLAKE2B 5ce3bf34d0cc0624ce414174a95bbc08b19bd162961927fb0da4e48d3c6d89eb8ca1837e77633ed54dbfa0e61411288bc048c66ab3e88eacf527027cd717b868 SHA512 9547fdc6ee37e9980f7fbddab5c2a073b6fe0ed5454657e8d4171805c043a6badd7e080bb733c0addebdc8a1cf042c5eda02d529487c505285bb05e84542431a
+EBUILD hugin-9999.ebuild 1981 BLAKE2B fd52cc7022ccdd63117c259083a0e0e34600e5b1ec4d9f5a19d7bc6fa7878a92242227efd6a6b576a17e7d1f6fd7201f32a4a507ea787df4533698c6bd9aace4 SHA512 7c918c42fb21ad9d53fb2e49d3cf48ea7e5a3897c94452770c800c7d69516bddd748e157f95d88a0c0c3ff77ee984ddddcfa64ae201895ea91a9648d2ae29f70
 MISC metadata.xml 519 BLAKE2B bd02923a26374e3bd638778ce8100efc4694ab6bec54fd8c8cbd32d0b8c3d495fc965194692ebaf2fe909e495011978d7bb8f3c995037fc128cfd9626949549c SHA512 d4e0bfb870b5b6e5769be2c28983d914666e413333887ac7a7cdb868d2f45f6b284a99204f6e97b98e65958412c04291f6fbc21deed8de518d3ff64aae6ad01b
diff --git a/media-gfx/hugin/files/hugin-2018.0.0-exiv2-0.27.patch b/media-gfx/hugin/files/hugin-2018.0.0-exiv2-0.27.patch
new file mode 100644
index 000000000000..23dd54289217
--- /dev/null
+++ b/media-gfx/hugin/files/hugin-2018.0.0-exiv2-0.27.patch
@@ -0,0 +1,28 @@
+--- a/src/hugin_base/panodata/Exiv2Helper.cpp
++++ b/src/hugin_base/panodata/Exiv2Helper.cpp
+@@ -29,6 +29,7 @@
+ #include "hugin_math/hugin_math.h"
+ #include "hugin_utils/utils.h"  
+ #include "exiv2/easyaccess.hpp"
++#include "exiv2/version.hpp"
+ 
+ namespace HuginBase
+ {
+@@ -232,7 +233,7 @@
+                     return false;
+                 };
+             };
+-#if EXIV2_TEST_VERSION(0,23,0)
++#if defined EXIV2_VERSION && EXIV2_VERSION >= EXIV2_MAKE_VERSION(0,23,0)
+             if (_getExiv2Value(exifData, "Exif.PentaxDng.RedBalance", val1) &&
+                 _getExiv2Value(exifData, "Exif.PentaxDng.BlueBalance", val2))
+             {
+@@ -563,7 +564,7 @@
+             std::string lensName;
+             // first we are reading LensModel in Exif section, this is only available
+             // with EXIF >= 2.3
+-#if EXIV2_TEST_VERSION(0,22,0)
++#if defined EXIV2_VERSION && EXIV2_VERSION >= EXIV2_MAKE_VERSION(0,22,0)
+             //the string "Exif.Photo.LensModel" is only defined in exiv2 0.22.0 and above
+             if(_getExiv2Value(exifData, "Exif.Photo.LensModel", lensName))
+ #else
diff --git a/media-gfx/hugin/hugin-2018.0.0.ebuild b/media-gfx/hugin/hugin-2018.0.0.ebuild
index 3b5e82f438dd..cb72199b0eb0 100644
--- a/media-gfx/hugin/hugin-2018.0.0.ebuild
+++ b/media-gfx/hugin/hugin-2018.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 WX_GTK_VER="3.0"
 PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 
-inherit python-single-r1 wxwidgets versionator cmake-utils
+inherit python-single-r1 wxwidgets cmake-utils eapi7-ver
 
 DESCRIPTION="GUI for the creation & processing of panoramic images"
 HOMEPAGE="http://hugin.sf.net"
@@ -55,7 +55,9 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 DOCS=( authors.txt README TODO )
 
-S=${WORKDIR}/${PN}-$(get_version_component_range 1-2).0
+PATCHES=( "${FILESDIR}/${P}-exiv2-0.27.patch" )
+
+S=${WORKDIR}/${PN}-$(ver_cut 1-2).0
 
 pkg_setup() {
 	use python && python-single-r1_pkg_setup
diff --git a/media-gfx/hugin/hugin-9999.ebuild b/media-gfx/hugin/hugin-9999.ebuild
index 8615f1c5a0b2..c46a552195e8 100644
--- a/media-gfx/hugin/hugin-9999.ebuild
+++ b/media-gfx/hugin/hugin-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 WX_GTK_VER="3.0"
 PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 
-inherit mercurial python-single-r1 wxwidgets versionator cmake-utils
+inherit mercurial python-single-r1 wxwidgets cmake-utils eapi7-ver
 
 DESCRIPTION="GUI for the creation & processing of panoramic images"
 HOMEPAGE="http://hugin.sf.net"
@@ -36,6 +36,7 @@ CDEPEND="
 	media-libs/tiff:0
 	>=media-libs/vigra-1.11.0[openexr]
 	sci-libs/fftw:3.0=
+	sci-libs/flann
 	sys-libs/zlib
 	virtual/glu
 	virtual/jpeg:0
@@ -56,7 +57,7 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 DOCS=( authors.txt README TODO )
 
-S=${WORKDIR}/${PN}-$(get_version_component_range 1-3)
+S=${WORKDIR}/${PN}-$(ver_cut 1-2).0
 
 pkg_setup() {
 	use python && python-single-r1_pkg_setup
diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index ab17767ad4b1..3ea13f40742c 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -1,13 +1,18 @@
 AUX imagemagick-6.9.10.16-fix-MagickCore-config.patch 831 BLAKE2B 87421ba8c9d9bd2e45955c4650bbb14552eea2676d87217603618f4a82fb49b884da16a89f0f084440dff9c16dfa64198db2c6f5d6722d7f2daad173932d20fa SHA512 3d6644019414ce9a14ea9794a1a3608dc7be12e9bccb920ffa804c2209fee06705ba8c8342592f313e54d074b79a6364387f2d5945c4fbe56b80a13ee323eb01
+AUX imagemagick-6.9.10.21-fix-ReadHEICImage.patch 499 BLAKE2B 1fb776d084971758d743747676ce96d4845afc772457f784a126dd3d3b7db09353e69cc4ab8d5e43a48de4c5bfdaaed9b01f68c2bd397b95a966ed70606079fc SHA512 a4b989d952b776ac855bd9eb13e29c7c1f0cf274c2fdd9694fcce569bd5a1c9f8829705024c67ce9efc107d36be5d7ccff2822ffd31ce4efc4103d4f419b22b4
 AUX policy-hardening.snippet 442 BLAKE2B d79fdbddab418fc9d8391e78992e3dda844e096052115113ff6f759c1a54541bcd7d7793547bc7140776659c98379a9e9f004aa46f757300a33f445d396fbf14 SHA512 e9e723c40d5b8c52bbc2f2b9a3ad7c7e2aee493bc37b6c3940e8486b92a1c6659e47b1e12ee2fb11c8a8b6ee48a7fc10354617ae12c36181a58e9e73b239368d
 AUX policy.test.xml 746 BLAKE2B 6bfa073606469b81cf517d9b069e48794cbda9272d12c3abb8ae3456aaf30cd1923510baddb7d813aa8ccde84e161de0b29314cef7b1a37730c7ad5236d1f5dc SHA512 22f66004324e3777393446a3df738ecd2aa405df088d39137008514cd86b436765b48ccd4355d670a42061ce4e5a7b2fd8e4be5852cd914f62ff0250a4a7ae57
 DIST ImageMagick-6.9.10-16.tar.xz 8929036 BLAKE2B 1eb3150c5725d96bb2a9f9f7c07b5037e3da7e8f3871a9ae448352a967e5d8f5ccffdb7c27b608e4d6d9c8c13f7e8a219760292b6b191d37378c17ff182a2d09 SHA512 0adc57158260797df6db68256e87848135b52eba91dc65978e255061e3b22bfe7b3fbee3626ee8fb0183d37649143f0a46cbcbd6e090604cc4bb8e0752255fbd
 DIST ImageMagick-6.9.10-19.tar.xz 8934480 BLAKE2B d456acd5c40e7149839f7fea93826ce67c8a34b45b2435e2e6e35cdf3487163e47eddc9e81d251ba75d7c7125b5cb67ca58a945f380cc2bda90d9e6b4a6271eb SHA512 17cad58549b7e195693ce8f7c4dc936136792be10a15f47af66b60c3db2c4580b56d413d3034dd597d6e9c36f01d6b9b277bfd7c3b0828792e03ff5e8803dd40
+DIST ImageMagick-6.9.10-21.tar.xz 8936048 BLAKE2B 28e522ff0a107526ff46149df8bbf7dfd93f1adacd714eacf43925b24375db005176255f5fccdad4b709d2133301a670abbfb46c93dfabcd1ec28d58074e7817 SHA512 6e3849eaab1cf9abd8ccbff32b6ece27e3bc6f9a5707737b0f9676adbed5d1ddbb352e94b8d25d66d9cccc6689f9b17731d053305310084a3a15fe13fb973e25
 DIST ImageMagick-7.0.8-16.tar.xz 8646148 BLAKE2B 5a9c287164f99886c411cbb1416aaa72bdf527ba3be097a0ea6638cc6b0ae383057acab09974c7d3954a2985ec39e0ce4f6d6a2423ff4bb020d011bd1988c337 SHA512 fbc0b0410702c15352989652c055e4e1a099878e30b859c75322e162eccd384cabb98e14cac14e3fb2c902f25f80a5b62f94380ef78f891731980de9a40b6867
 DIST ImageMagick-7.0.8-19.tar.xz 8652452 BLAKE2B 0b6507ce98a7a609b834b00fc709fc6d25266716b74eea0ff1f0208daa9966aced70294c92e181fc21e43426cfd40a4614e12e7bd1c89ff74dbd65739d3bdbeb SHA512 f00ee21a8367202ea4bb25c99894679bbc3c2dd0c0e644292b8565bfda41cd8b0a8aa45bde85066347dc182bf8396de39166556a357d91383cc0fab8f9182276
+DIST ImageMagick-7.0.8-21.tar.xz 8650808 BLAKE2B 5fb6902b71d7ec3db372e7fe9afefcd49ca1d1fe8a30ed5c952193c7a4bc55ef564ba96e32a353d912ce1a38132abeead513695ad6ff7464cd925cd0a8fb554c SHA512 91ae18896ea2d64f540328aba6ed97dd1102cf16fe256b8f304eb8964b3063e83e66df67a805db6d6c99980ae125a6d96172faa03f821df330b62d01a919eeef
 EBUILD imagemagick-6.9.10.16-r1.ebuild 6938 BLAKE2B 64aa7128cd3b932654f1d0e355cb8447f02f997cda9c177ad2e3b0905ccde30e3e4b3e4a6297b4f03ef68f161f999f78359470500943f886e994f9519f9a3d3b SHA512 ceb36ea8997802ea03082329f074f0e123c410750446cd248fce01425ea45f5e990b1c47d7506007aefa81ee7f4ffd412f2fb0977b24bda952e4df44955b8c7a
 EBUILD imagemagick-6.9.10.19.ebuild 6892 BLAKE2B d925550c450fabe11f11cf817c25e4aa3c1b25b0ca1dcae4910b8112fa8a38ed625260743046736ce23cd27b299974b22239607e9c68496262e43e5cd19da0c2 SHA512 6005a9964507d87fd0c0c1e1d1daa10e5503740ba9474f1659f7bd4255f5cc22ef8137baf3e1e61c6f9d0c93eef403637cf91833397a6a2ab16f15a7bbd48e58
+EBUILD imagemagick-6.9.10.21.ebuild 6948 BLAKE2B 8fd66ced69f92f30d55917cdaf239e38675d77909b44251700f9fdd93d07ed2546f217444a3c2bd02a1153bda9de8c42df64d2c18e194c3d2406d67a1c6414a3 SHA512 fd9dc0b47713733b76a9ef91075982b39c191eb1ae872a4910526f092532f9ce6d31cb13ef8fd85e92529821606e98186b6b17a586416163b882b2336d033e9e
 EBUILD imagemagick-7.0.8.16.ebuild 7151 BLAKE2B 100dad30713a78c3aa72a939874e295bf3c55c3015ddf833d6c5bf696448af666a5088451e3ce83d2549216041675df5d3034517172fa5bb4d7005674b37394d SHA512 7fa1d1eb8715f8cb8d674fb7c619743970dfe8ca8e7e744448fb569442242aa703e7f8d1c568e73147dcece484db1031311529b7b0482b9c2ae9c83282d02d1e
 EBUILD imagemagick-7.0.8.19.ebuild 7160 BLAKE2B 2435e94755e6e1a9d6ee4cab669b8564daaa06e7c75024463cf5df4f851f695afd2afdfb84930ff8886ceef6bed578365d7489d7febd877064621c4dd541f74b SHA512 c65b9cb286317eafefb96c63984f25850c835a81eb04fe452d8bd22bacded153c460716c06a2f924b7595925ecbb417ea809d737aa291bc174c125d97dc7cbba
+EBUILD imagemagick-7.0.8.21.ebuild 7160 BLAKE2B 2435e94755e6e1a9d6ee4cab669b8564daaa06e7c75024463cf5df4f851f695afd2afdfb84930ff8886ceef6bed578365d7489d7febd877064621c4dd541f74b SHA512 c65b9cb286317eafefb96c63984f25850c835a81eb04fe452d8bd22bacded153c460716c06a2f924b7595925ecbb417ea809d737aa291bc174c125d97dc7cbba
 EBUILD imagemagick-9999.ebuild 7160 BLAKE2B 2435e94755e6e1a9d6ee4cab669b8564daaa06e7c75024463cf5df4f851f695afd2afdfb84930ff8886ceef6bed578365d7489d7febd877064621c4dd541f74b SHA512 c65b9cb286317eafefb96c63984f25850c835a81eb04fe452d8bd22bacded153c460716c06a2f924b7595925ecbb417ea809d737aa291bc174c125d97dc7cbba
 MISC metadata.xml 1015 BLAKE2B 3fbe479f30575b11fa9e78de7bb00c231370aa4b2ca3b0e16924710189013ab91199db8c8cb7cff4611a2924c7fa01e4a43bfd9f7f61cfe45a4de3a254d4c8e2 SHA512 bf1479f91de5f8248c4a86d98017a332ab3d5eb153bb896ca1a39fce2fbff4e8248df92025987f6bfaf7e0d36677c167177c9c21969f1f0b8c2e0a53197efece
diff --git a/media-gfx/imagemagick/files/imagemagick-6.9.10.21-fix-ReadHEICImage.patch b/media-gfx/imagemagick/files/imagemagick-6.9.10.21-fix-ReadHEICImage.patch
new file mode 100644
index 000000000000..f3a382b98938
--- /dev/null
+++ b/media-gfx/imagemagick/files/imagemagick-6.9.10.21-fix-ReadHEICImage.patch
@@ -0,0 +1,13 @@
+https://github.com/ImageMagick/ImageMagick6/issues/33
+
+--- a/coders/heic.c
++++ b/coders/heic.c
+@@ -317,7 +317,7 @@ static Image *ReadHEICImage(const ImageInfo *image_info,
+     image pixels. ReadImage processes "exif:Orientation" expecting pixels to be
+     oriented accordingly. However, in HEIF the pixels are NOT rotated.
+    */
+-  SetImageProperty(image, "exif:Orientation", "1", exception);
++  SetImageProperty(image, "exif:Orientation", "1");
+   return(GetFirstImageInList(image));
+ }
+ #endif
diff --git a/media-gfx/imagemagick/imagemagick-6.9.10.21.ebuild b/media-gfx/imagemagick/imagemagick-6.9.10.21.ebuild
new file mode 100644
index 000000000000..d5e650ac2cea
--- /dev/null
+++ b/media-gfx/imagemagick/imagemagick-6.9.10.21.ebuild
@@ -0,0 +1,250 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit eapi7-ver eutils flag-o-matic libtool perl-functions toolchain-funcs multilib
+
+MY_PV="$(ver_rs 3 '-')"
+MY_P="ImageMagick-${MY_PV}"
+
+DESCRIPTION="A collection of tools and libraries for many image formats"
+HOMEPAGE="https://www.imagemagick.org/"
+SRC_URI="mirror://${PN}/${MY_P}.tar.xz"
+
+LICENSE="imagemagick"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
+
+RESTRICT="perl? ( userpriv )"
+
+RDEPEND="
+	dev-libs/libltdl:0
+	bzip2? ( app-arch/bzip2 )
+	corefonts? ( media-fonts/corefonts )
+	djvu? ( app-text/djvu )
+	fftw? ( sci-libs/fftw:3.0 )
+	fontconfig? ( media-libs/fontconfig )
+	fpx? ( >=media-libs/libfpx-1.3.0-r1 )
+	graphviz? ( media-gfx/graphviz )
+	heif? ( media-libs/libheif:= )
+	jbig? ( >=media-libs/jbigkit-2:= )
+	jpeg? ( virtual/jpeg:0 )
+	jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
+	lcms? ( media-libs/lcms:2= )
+	lqr? ( media-libs/liblqr )
+	opencl? ( virtual/opencl )
+	openexr? ( media-libs/openexr:0= )
+	pango? ( x11-libs/pango )
+	perl? ( >=dev-lang/perl-5.8.8:0= )
+	png? ( media-libs/libpng:0= )
+	postscript? ( app-text/ghostscript-gpl )
+	raw? ( media-libs/libraw:= )
+	svg? ( gnome-base/librsvg )
+	tiff? ( media-libs/tiff:0= )
+	truetype? (
+		media-fonts/urw-fonts
+		>=media-libs/freetype-2
+		)
+	webp? ( media-libs/libwebp:0= )
+	wmf? ( media-libs/libwmf )
+	X? (
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libXext
+		x11-libs/libXt
+		)
+	xml? ( dev-libs/libxml2:= )
+	lzma? ( app-arch/xz-utils )
+	zlib? ( sys-libs/zlib:= )"
+DEPEND="${RDEPEND}
+	!media-gfx/graphicsmagick[imagemagick]
+	virtual/pkgconfig
+	X? ( x11-base/xorg-proto )"
+
+REQUIRED_USE="corefonts? ( truetype )
+	test? ( corefonts )"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=( "${FILESDIR}"/${P}-fix-ReadHEICImage.patch )
+
+src_prepare() {
+	default
+
+	# Apply hardening #664236
+	cp "${FILESDIR}"/policy-hardening.snippet "${S}" || die
+	sed -i -e '/^<policymap>$/ {
+			r policy-hardening.snippet
+			d
+		}' \
+		config/policy.xml || \
+		die "Failed to apply hardening of policy.xml"
+	einfo "policy.xml hardened"
+
+	elibtoolize # for Darwin modules
+
+	# For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
+	local mesa_cards ati_cards nvidia_cards render_cards
+	shopt -s nullglob
+	ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
+	if test -n "${ati_cards}"; then
+		addpredict "${ati_cards}"
+	fi
+	mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
+	if test -n "${mesa_cards}"; then
+		addpredict "${mesa_cards}"
+	fi
+	nvidia_cards=$(echo -n /dev/nvidia** | sed 's/ /:/g')
+	if test -n "${nvidia_cards}"; then
+		addpredict "${nvidia_cards}"
+	fi
+	render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
+	if test -n "${render_cards}"; then
+		addpredict "${render_cards}"
+	fi
+	shopt -u nullglob
+	addpredict /dev/nvidiactl
+}
+
+src_configure() {
+	local depth=16
+	use q8 && depth=8
+	use q32 && depth=32
+
+	local openmp=disable
+	use openmp && { tc-has-openmp && openmp=enable; }
+
+	use perl && perl_check_env
+
+	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
+
+	local myeconfargs=(
+		$(use_enable static-libs static)
+		$(use_enable hdri)
+		$(use_enable opencl)
+		--with-threads
+		--with-modules
+		--with-quantum-depth=${depth}
+		$(use_with cxx magick-plus-plus)
+		$(use_with perl)
+		--with-perl-options='INSTALLDIRS=vendor'
+		--with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
+		$(use_with bzip2 bzlib)
+		$(use_with X x)
+		$(use_with zlib)
+		--without-autotrace
+		$(use_with postscript dps)
+		$(use_with djvu)
+		--with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu
+		$(use_with fftw)
+		$(use_with fpx)
+		$(use_with fontconfig)
+		$(use_with truetype freetype)
+		$(use_with postscript gslib)
+		$(use_with graphviz gvc)
+		$(use_with heif heic)
+		$(use_with jbig)
+		$(use_with jpeg)
+		$(use_with jpeg2k openjp2)
+		$(use_with lcms)
+		$(use_with lqr)
+		$(use_with lzma)
+		$(use_with openexr)
+		$(use_with pango)
+		$(use_with png)
+		$(use_with raw)
+		$(use_with svg rsvg)
+		$(use_with tiff)
+		$(use_with webp)
+		$(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts)
+		$(use_with wmf)
+		$(use_with xml)
+		--${openmp}-openmp
+		--with-gcc-arch=no-automagic
+	)
+	CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	# Install default (unrestricted) policy in $HOME for test suite #664238
+	local _im_local_config_home="${HOME}/.config/ImageMagick"
+	mkdir -p "${_im_local_config_home}" || \
+		die "Failed to create IM config dir in '${_im_local_config_home}'"
+	cp "${FILESDIR}"/policy.test.xml "${_im_local_config_home}/policy.xml" || \
+		die "Failed to install default blank policy.xml in '${_im_local_config_home}'"
+
+	local im_command= IM_COMMANDS=()
+	IM_COMMANDS+=( "identify -version | grep -q -- \"${MY_PV}\"" ) # Verify that we are using version we just built
+	IM_COMMANDS+=( "identify -list policy" ) # Verify that policy.xml is used
+	IM_COMMANDS+=( "emake check" ) # Run tests
+
+	for im_command in "${IM_COMMANDS[@]}"; do
+		eval "${S}"/magick.sh \
+			${im_command} || \
+			die "Failed to run \"${im_command}\""
+	done
+}
+
+src_install() {
+	# Ensure documentation installation files and paths with each release!
+	emake \
+		DESTDIR="${D}" \
+		DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
+		install
+
+	rm -f "${ED%/}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
+	dodoc {AUTHORS,README}.txt ChangeLog
+
+	if use perl; then
+		find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
+		find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
+	fi
+
+	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
+
+	if use opencl; then
+		cat <<-EOF > "${T}"/99${PN}
+		SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/renderD128"
+		EOF
+
+		insinto /etc/sandbox.d
+		doins "${T}"/99${PN} #472766
+	fi
+
+	insinto /usr/share/${PN}
+	doins config/*icm
+}
+
+pkg_postinst() {
+	local _show_policy_xml_notice=
+
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		# This is a new installation
+		_show_policy_xml_notice=yes
+	else
+		local v
+		for v in ${REPLACING_VERSIONS}; do
+			if ! ver_test "${v}" -gt "6.9.10.10-r2"; then
+				# This is an upgrade
+				_show_policy_xml_notice=yes
+
+				# Show this elog only once
+				break
+			fi
+		done
+	fi
+
+	if [[ -n "${_show_policy_xml_notice}" ]]; then
+		elog "For security reasons, a policy.xml file was installed in /etc/ImageMagick-6"
+		elog "which will prevent the usage of the following coders by default:"
+		elog ""
+		elog "  - PS"
+		elog "  - PS2"
+		elog "  - PS3"
+		elog "  - EPS"
+		elog "  - PDF"
+		elog "  - XPS"
+	fi
+}
diff --git a/media-gfx/imagemagick/imagemagick-7.0.8.21.ebuild b/media-gfx/imagemagick/imagemagick-7.0.8.21.ebuild
new file mode 100644
index 000000000000..91e101eeefc0
--- /dev/null
+++ b/media-gfx/imagemagick/imagemagick-7.0.8.21.ebuild
@@ -0,0 +1,256 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit eapi7-ver eutils flag-o-matic libtool perl-functions toolchain-funcs multilib
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/ImageMagick/ImageMagick.git"
+	inherit git-r3
+	MY_P="imagemagick-9999"
+else
+	MY_PV="$(ver_rs 3 '-')"
+	MY_P="ImageMagick-${MY_PV}"
+	SRC_URI="mirror://${PN}/${MY_P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="A collection of tools and libraries for many image formats"
+HOMEPAGE="https://www.imagemagick.org/"
+
+LICENSE="imagemagick"
+SLOT="0/${PV}"
+IUSE="bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
+
+RDEPEND="
+	dev-libs/libltdl:0
+	bzip2? ( app-arch/bzip2 )
+	corefonts? ( media-fonts/corefonts )
+	djvu? ( app-text/djvu )
+	fftw? ( sci-libs/fftw:3.0 )
+	fontconfig? ( media-libs/fontconfig )
+	fpx? ( >=media-libs/libfpx-1.3.0-r1 )
+	graphviz? ( media-gfx/graphviz )
+	heif? ( media-libs/libheif:= )
+	jbig? ( >=media-libs/jbigkit-2:= )
+	jpeg? ( virtual/jpeg:0 )
+	jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
+	lcms? ( media-libs/lcms:2= )
+	lqr? ( media-libs/liblqr )
+	opencl? ( virtual/opencl )
+	openexr? ( media-libs/openexr:0= )
+	pango? ( x11-libs/pango )
+	perl? ( >=dev-lang/perl-5.8.8:0= )
+	png? ( media-libs/libpng:0= )
+	postscript? ( app-text/ghostscript-gpl )
+	raw? ( media-libs/libraw:= )
+	svg? ( gnome-base/librsvg )
+	tiff? ( media-libs/tiff:0= )
+	truetype? (
+		media-fonts/urw-fonts
+		>=media-libs/freetype-2
+		)
+	webp? ( media-libs/libwebp:0= )
+	wmf? ( media-libs/libwmf )
+	X? (
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libXext
+		x11-libs/libXt
+		)
+	xml? ( dev-libs/libxml2:= )
+	lzma? ( app-arch/xz-utils )
+	zlib? ( sys-libs/zlib:= )"
+DEPEND="${RDEPEND}
+	!media-gfx/graphicsmagick[imagemagick]
+	virtual/pkgconfig
+	X? ( x11-base/xorg-proto )"
+
+REQUIRED_USE="corefonts? ( truetype )
+	test? ( corefonts )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+
+	# Apply hardening #664236
+	cp "${FILESDIR}"/policy-hardening.snippet "${S}" || die
+	sed -i -e '/^<policymap>$/ {
+			r policy-hardening.snippet
+			d
+		}' \
+		config/policy.xml || \
+		die "Failed to apply hardening of policy.xml"
+	einfo "policy.xml hardened"
+
+	elibtoolize # for Darwin modules
+
+	# For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
+	local ati_cards mesa_cards nvidia_cards render_cards
+	shopt -s nullglob
+	ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
+	if test -n "${ati_cards}"; then
+		addpredict "${ati_cards}"
+	fi
+	mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
+	if test -n "${mesa_cards}"; then
+		addpredict "${mesa_cards}"
+	fi
+	nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g')
+	if test -n "${nvidia_cards}"; then
+		addpredict "${nvidia_cards}"
+	fi
+	render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
+	if test -n "${render_cards}"; then
+		addpredict "${render_cards}"
+	fi
+	shopt -u nullglob
+	addpredict /dev/nvidiactl
+}
+
+src_configure() {
+	local depth=16
+	use q8 && depth=8
+	use q32 && depth=32
+
+	local openmp=disable
+	use openmp && { tc-has-openmp && openmp=enable; }
+
+	use perl && perl_check_env
+
+	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
+
+	local myeconfargs=(
+		$(use_enable static-libs static)
+		$(use_enable hdri)
+		$(use_enable opencl)
+		--with-threads
+		--with-modules
+		--with-quantum-depth=${depth}
+		$(use_with cxx magick-plus-plus)
+		$(use_with perl)
+		--with-perl-options='INSTALLDIRS=vendor'
+		--with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
+		$(use_with bzip2 bzlib)
+		$(use_with X x)
+		$(use_with zlib)
+		--without-autotrace
+		$(use_with postscript dps)
+		$(use_with djvu)
+		--with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu
+		$(use_with fftw)
+		$(use_with fpx)
+		$(use_with fontconfig)
+		$(use_with truetype freetype)
+		$(use_with postscript gslib)
+		$(use_with graphviz gvc)
+		$(use_with heif heic)
+		$(use_with jbig)
+		$(use_with jpeg)
+		$(use_with jpeg2k openjp2)
+		$(use_with lcms)
+		$(use_with lqr)
+		$(use_with lzma)
+		$(use_with openexr)
+		$(use_with pango)
+		$(use_with png)
+		$(use_with raw)
+		$(use_with svg rsvg)
+		$(use_with tiff)
+		$(use_with webp)
+		$(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts)
+		$(use_with wmf)
+		$(use_with xml)
+		--${openmp}-openmp
+		--with-gcc-arch=no-automagic
+	)
+	CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	# Install default (unrestricted) policy in $HOME for test suite #664238
+	local _im_local_config_home="${HOME}/.config/ImageMagick"
+	mkdir -p "${_im_local_config_home}" || \
+		die "Failed to create IM config dir in '${_im_local_config_home}'"
+	cp "${FILESDIR}"/policy.test.xml "${_im_local_config_home}/policy.xml" || \
+		die "Failed to install default blank policy.xml in '${_im_local_config_home}'"
+
+	local im_command= IM_COMMANDS=()
+	if [[ ${PV} == "9999" ]] ; then
+		IM_COMMANDS+=( "magick -version" ) # Show version we are using -- cannot verify because of live ebuild
+	else
+		IM_COMMANDS+=( "magick -version | grep -q -- \"${MY_PV}\"" ) # Verify that we are using version we just built
+	fi
+	IM_COMMANDS+=( "magick -list policy" ) # Verify that policy.xml is used
+	IM_COMMANDS+=( "emake check" ) # Run tests
+
+	for im_command in "${IM_COMMANDS[@]}"; do
+		eval "${S}"/magick.sh \
+			${im_command} || \
+			die "Failed to run \"${im_command}\""
+	done
+}
+
+src_install() {
+	# Ensure documentation installation files and paths with each release!
+	emake \
+		DESTDIR="${D}" \
+		DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
+		install
+
+	rm -f "${ED%/}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
+	dodoc {AUTHORS,README}.txt ChangeLog
+
+	if use perl; then
+		find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
+		find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
+	fi
+
+	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
+
+	if use opencl; then
+		cat <<-EOF > "${T}"/99${PN}
+		SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/renderD128"
+		EOF
+
+		insinto /etc/sandbox.d
+		doins "${T}"/99${PN} #472766
+	fi
+
+	insinto /usr/share/${PN}
+	doins config/*icm
+}
+
+pkg_postinst() {
+	local _show_policy_xml_notice=
+
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		# This is a new installation
+		_show_policy_xml_notice=yes
+	else
+		local v
+		for v in ${REPLACING_VERSIONS}; do
+			if ! ver_test "${v}" -gt "7.0.8.10-r2"; then
+				# This is an upgrade
+				_show_policy_xml_notice=yes
+
+				# Show this elog only once
+				break
+			fi
+		done
+	fi
+
+	if [[ -n "${_show_policy_xml_notice}" ]]; then
+		elog "For security reasons, a policy.xml file was installed in /etc/ImageMagick-7"
+		elog "which will prevent the usage of the following coders by default:"
+		elog ""
+		elog "  - PS"
+		elog "  - PS2"
+		elog "  - PS3"
+		elog "  - EPS"
+		elog "  - PDF"
+		elog "  - XPS"
+	fi
+}
diff --git a/media-gfx/kphotoalbum/Manifest b/media-gfx/kphotoalbum/Manifest
index fb01cbe6b03c..cf72e5ca5b5b 100644
--- a/media-gfx/kphotoalbum/Manifest
+++ b/media-gfx/kphotoalbum/Manifest
@@ -1,3 +1,3 @@
 DIST kphotoalbum-5.4.tar.xz 11658792 BLAKE2B 5f91dac910cc7022ca8a20f49f286a84586bf7adaed57448c1d811c370a9fb8661469d4e8e73809990e1e1800aaaff8f53c86446d93f99fd55cdddbece01eddc SHA512 d528905f3af9d23c89c89f902abe8358f8e90c402e437bc7cdd67837649f5dcd7f7416c77cc824532f928f41e7590f6005f13c97be4d608e433aad285a6a8bba
-EBUILD kphotoalbum-5.4.ebuild 1523 BLAKE2B dae204842bce4e3069d95fc50aa91d5e852387c622faee5a74af801e4b84d23748723d56a393eb656593e0a9845b15315afcf4520d1f923892beb574bf37da8b SHA512 9b413ce49a9968d55a656c2923b3d98968116f55f2dc23c03b6ff7cf5bdb0a235c2360f33797db7f97ef420784fee8ee14dedde3b4e43d613093f604a8dfe335
+EBUILD kphotoalbum-5.4.ebuild 1522 BLAKE2B cf41ba05300b2cb3f210b7bea9f37646780694bb234abd58aa9995ac6f82b37c9fa075367e891252657a37c852a570f4e3c17fb42e62e0a0e0ab89521b95ef84 SHA512 0be6c52c90397e7e2ce363b0bbe70b4b4c416bfc0d2100d5e41e2006f042047348ddb67e5dc0b071c54dff186390a63edee0ece6c1ff5d8b88cfe42a597047d7
 MISC metadata.xml 424 BLAKE2B e5e77a618c93044474c0a049bfd37dddbddaaed85bf84fa2e5e7233064176032cc255dbce77607aceca20e431f43f98e29295c977e7841dc86b2c5b286c6df8e SHA512 ec0c2fb381cc5d4b38576c6d5c5b002a07d01027881906bdc1d786311d1d738f6dd67074a6c768a10bbefd3c2c5f01b88bc78cd3456c5884a6d5646593d0dbca
diff --git a/media-gfx/kphotoalbum/kphotoalbum-5.4.ebuild b/media-gfx/kphotoalbum/kphotoalbum-5.4.ebuild
index 5e0e4683ac6e..ce7c3284e2af 100644
--- a/media-gfx/kphotoalbum/kphotoalbum-5.4.ebuild
+++ b/media-gfx/kphotoalbum/kphotoalbum-5.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2+ FDL-1.2"
 KEYWORDS="amd64 x86"
-IUSE="+kipi +map +raw"
+IUSE="+kipi map +raw"
 
 DEPEND="
 	$(add_frameworks_dep karchive)
diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index c26fca0d2869..64f4820b8b8f 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -1,7 +1,8 @@
 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
+AUX krita-4.1.7-exiv2-0.27.patch 14937 BLAKE2B 9ccfbb4fd023895aff49a9cff0f4e30b687b2285881d7fe489ac546589f44c722a36279b16ec2efa8b4c1c86a37494768565e8c5137f5894a84df5944cdd0b60 SHA512 d48928a86fcb6b7d80c79fb17fe20c6be46184e9ca67755723633c3a340127af336f1c1c845a8a6861d4967cbff32f61cbf5f6398c7868a4dcf158f29b67cbd6
 DIST krita-4.1.5.tar.gz 243929094 BLAKE2B 7288717978e3370b435d73dc1f7005dc339f3d11e0023cb29abf964d16a5751107287d0eca31b053a2068978c4ed40b745358afc5667b71df98e41373171ff82 SHA512 7790e3e61c18f5a2f5ba0c5d08f09bf78bcfba563b46751689db00814b9775db85cc64c162aa1c1dc47b5e73e49598b24e6a4599b8350a9e07c15aa4eb463499
 DIST krita-4.1.7.101.tar.gz 243977488 BLAKE2B 84cfb0f7e6e7b63c3bb9303793c2b74f180982f66ed0756c8878bf8db64b5d9bf9d3cbdb28afba11a952737b02e46759a465d90a2e8822fbb382ae679ba3c3de SHA512 8558501684bc686f431660f3dffeb75575fea3bd23662b6c598c27173cce3145c3ec2caff32b56dd597c50907a69b2faab5259cc6f518f5a0e160cae89004791
 EBUILD krita-4.1.5.ebuild 3169 BLAKE2B bb899ccaecd54bb8ba069631692aac6a64a0ed9618175b4e685ff9198818fae355814af4cb550f025f6093c6e2eb314b63a3f33da64d1e5d48c002189e6ea5a6 SHA512 33b4e2e836b187428f92620d590cfd3ed068ca48d6811a9290cf582db11e118463b13fc933b3948b5f4dd9d4addefc416f8cdf41cbdf51a1e2930060a28221f2
-EBUILD krita-4.1.7.ebuild 3242 BLAKE2B 8c72fdf5dcb6860bdd64dc2bde0cd2034b1992c34da03949eb4f7c2752b2670be40e5ed4145632dcb3e547f4038f6382d10aaf067b9385f5027e836228f45e59 SHA512 e5f402188757181f806126fec2030dc0479747bcffcff9c397efbc5c225db426bbd66d908453323d0c427247f3be14e758ab5ab7f778c29bf8fca41d0e1ca406
+EBUILD krita-4.1.7.ebuild 3280 BLAKE2B d95bac7e59fda438c564500330f7f291dcb04b4772a050af065d3d45dca7660a7726ce5cc7bf7c329c4983ccf86bdf7b6aac4292db5ebadf6a6a1cacefa44967 SHA512 0aaabe637dfeb809b36fd32ef572344439021f2d0432ee08e342447d5ccc404028c73bbd63877c334c76b3ca22a8c2f4a21196459af1bc09d7a065bc3bea3411
 MISC metadata.xml 696 BLAKE2B 433ca97e92c2e6c8a0f5bfbd4cba667576be6cc8c93330b689e0088663ac6df263d62b7be6d42debf3480b706721f06be089c5e9a139451e49b609ea4a081ae2 SHA512 becd89686babf0fde2a7e53196715bbca2a4f0d6bad0bc3a55128c9ee19dbe5819be1020db6458ec0c053cf7370a390ff1e84fd9c49331fc28e5a60348fd34dd
diff --git a/media-gfx/krita/files/krita-4.1.7-exiv2-0.27.patch b/media-gfx/krita/files/krita-4.1.7-exiv2-0.27.patch
new file mode 100644
index 000000000000..41b290852eb5
--- /dev/null
+++ b/media-gfx/krita/files/krita-4.1.7-exiv2-0.27.patch
@@ -0,0 +1,354 @@
+From 6b6758bb37da4997be36a7e2a839b07278160559 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date: Thu, 27 Dec 2018 22:40:44 +0100
+Subject: [PATCH] Fix building against exiv2-0.27
+
+Summary:
+Copied FindLibExiv2.cmake from ECM 5.53.0 until we raise min version.
+
+Thanks-to: Boudewijn Rempt <boud@valdyas.org>
+for final fix to kis_xmp_io.cpp.
+
+CCBUG: 402566
+
+Test Plan: Built fine against exiv2-0.26 and exiv2-0.27.
+
+Reviewers: #krita, rempt
+
+Reviewed By: #krita, rempt
+
+Subscribers: pino
+
+Tags: #krita
+
+Differential Revision: https://phabricator.kde.org/D17810
+---
+ CMakeLists.txt                    |   6 +-
+ cmake/modules/FindLibExiv2.cmake  | 115 ++++++++++++++++++++++++++++++
+ libs/ui/CMakeLists.txt            |   3 +-
+ libs/ui/kisexiv2/kis_exif_io.cpp  |  14 ++--
+ libs/ui/kisexiv2/kis_exiv2.h      |   2 +-
+ libs/ui/kisexiv2/kis_iptc_io.cpp  |   4 +-
+ libs/ui/kisexiv2/kis_xmp_io.cpp   |   6 +-
+ plugins/impex/jpeg/CMakeLists.txt |   5 +-
+ 8 files changed, 130 insertions(+), 25 deletions(-)
+ create mode 100644 cmake/modules/FindLibExiv2.cmake
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 5558088200..b2d2cd497e 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -607,11 +607,7 @@ set_package_properties(Eigen3 PROPERTIES
+ ##
+ ## Test for exiv2
+ ##
+-find_package(Exiv2 0.16 REQUIRED)
+-set_package_properties(Exiv2 PROPERTIES
+-    DESCRIPTION "Image metadata library and tools"
+-    URL "http://www.exiv2.org"
+-    PURPOSE "Required by Krita")
++find_package(LibExiv2 0.16 REQUIRED)
+ 
+ ##
+ ## Test for lcms
+diff --git a/cmake/modules/FindLibExiv2.cmake b/cmake/modules/FindLibExiv2.cmake
+new file mode 100644
+index 0000000000..935cee2c55
+--- /dev/null
++++ b/cmake/modules/FindLibExiv2.cmake
+@@ -0,0 +1,115 @@
++#.rst:
++# FindLibExiv2
++# ------------
++#
++# Try to find the Exiv2 library.
++#
++# This will define the following variables:
++#
++# ``LibExiv2_FOUND``
++#     System has LibExiv2.
++#
++# ``LibExiv2_VERSION``
++#     The version of LibExiv2.
++#
++# ``LibExiv2_INCLUDE_DIRS``
++#     This should be passed to target_include_directories() if
++#     the target is not used for linking.
++#
++# ``LibExiv2_LIBRARIES``
++#     The LibExiv2 library.
++#     This can be passed to target_link_libraries() instead of
++#     the ``LibExiv2::LibExiv2`` target
++#
++# If ``LibExiv2_FOUND`` is TRUE, the following imported target
++# will be available:
++#
++# ``LibExiv2::LibExiv2``
++#     The Exiv2 library
++#
++# Since 5.53.0.
++#
++#=============================================================================
++# Copyright (c) 2018, Christophe Giboudeaux, <christophe@krop.fr>
++# Copyright (c) 2010, Alexander Neundorf, <neundorf@kde.org>
++# Copyright (c) 2008, Gilles Caulier, <caulier.gilles@gmail.com>
++#
++#
++# Redistribution and use in source and binary forms, with or without
++# modification, are permitted provided that the following conditions
++# are met:
++#
++# 1. Redistributions of source code must retain the copyright
++#    notice, this list of conditions and the following disclaimer.
++# 2. Redistributions in binary form must reproduce the copyright
++#    notice, this list of conditions and the following disclaimer in the
++#    documentation and/or other materials provided with the distribution.
++# 3. The name of the author may not be used to endorse or promote products
++#    derived from this software without specific prior written permission.
++#
++# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
++# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
++# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
++# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
++# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
++# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
++# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
++# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
++# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
++# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
++#=============================================================================
++
++find_package(PkgConfig QUIET)
++pkg_check_modules(PC_EXIV2 QUIET exiv2)
++
++find_path(LibExiv2_INCLUDE_DIRS NAMES exiv2/exif.hpp
++    HINTS ${PC_EXIV2_INCLUDEDIR}
++)
++
++find_library(LibExiv2_LIBRARIES NAMES exiv2 libexiv2
++    HINTS ${PC_EXIV2_LIBRARY_DIRS}
++)
++
++set(LibExiv2_VERSION ${PC_EXIV2_VERSION})
++
++if(NOT LibExiv2_VERSION AND DEFINED LibExiv2_INCLUDE_DIRS)
++    # With exiv >= 0.27, the version #defines are in exv_conf.h instead of version.hpp
++    foreach(_exiv2_version_file "version.hpp" "exv_conf.h")
++        if(EXISTS "${LibExiv2_INCLUDE_DIRS}/exiv2/${_exiv2_version_file}")
++            file(READ "${LibExiv2_INCLUDE_DIRS}/exiv2/${_exiv2_version_file}" _exiv_version_file_content)
++            string(REGEX MATCH "#define EXIV2_MAJOR_VERSION[ ]+\\([0-9]+\\)" EXIV2_MAJOR_VERSION_MATCH ${_exiv_version_file_content})
++            string(REGEX MATCH "#define EXIV2_MINOR_VERSION[ ]+\\([0-9]+\\)" EXIV2_MINOR_VERSION_MATCH ${_exiv_version_file_content})
++            string(REGEX MATCH "#define EXIV2_PATCH_VERSION[ ]+\\([0-9]+\\)" EXIV2_PATCH_VERSION_MATCH ${_exiv_version_file_content})
++            if(EXIV2_MAJOR_VERSION_MATCH)
++                string(REGEX REPLACE ".*_MAJOR_VERSION[ ]+\\((.*)\\)" "\\1" EXIV2_MAJOR_VERSION ${EXIV2_MAJOR_VERSION_MATCH})
++                string(REGEX REPLACE ".*_MINOR_VERSION[ ]+\\((.*)\\)" "\\1" EXIV2_MINOR_VERSION ${EXIV2_MINOR_VERSION_MATCH})
++                string(REGEX REPLACE ".*_PATCH_VERSION[ ]+\\((.*)\\)" "\\1"  EXIV2_PATCH_VERSION  ${EXIV2_PATCH_VERSION_MATCH})
++            endif()
++        endif()
++    endforeach()
++
++    set(LibExiv2_VERSION "${EXIV2_MAJOR_VERSION}.${EXIV2_MINOR_VERSION}.${EXIV2_PATCH_VERSION}")
++endif()
++
++include(FindPackageHandleStandardArgs)
++find_package_handle_standard_args(LibExiv2
++    FOUND_VAR LibExiv2_FOUND
++    REQUIRED_VARS  LibExiv2_LIBRARIES LibExiv2_INCLUDE_DIRS
++    VERSION_VAR  LibExiv2_VERSION
++)
++
++mark_as_advanced(LibExiv2_INCLUDE_DIRS LibExiv2_LIBRARIES)
++
++if(LibExiv2_FOUND AND NOT TARGET LibExiv2::LibExiv2)
++    add_library(LibExiv2::LibExiv2 UNKNOWN IMPORTED)
++    set_target_properties(LibExiv2::LibExiv2 PROPERTIES
++        IMPORTED_LOCATION "${LibExiv2_LIBRARIES}"
++        INTERFACE_INCLUDE_DIRECTORIES "${LibExiv2_INCLUDE_DIRS}"
++    )
++endif()
++
++include(FeatureSummary)
++set_package_properties(LibExiv2 PROPERTIES
++    URL "http://www.exiv2.org"
++    DESCRIPTION "Image metadata support"
++)
+diff --git a/libs/ui/CMakeLists.txt b/libs/ui/CMakeLists.txt
+index f14d3591bc..ff57f53158 100644
+--- a/libs/ui/CMakeLists.txt
++++ b/libs/ui/CMakeLists.txt
+@@ -1,6 +1,5 @@
+ include_directories(
+     ${CMAKE_CURRENT_SOURCE_DIR}/qtlockedfile
+-    ${EXIV2_INCLUDE_DIR}
+ )
+ 
+ include_directories(SYSTEM
+@@ -544,7 +543,7 @@ add_library(kritaui SHARED ${kritaui_HEADERS_MOC} ${kritaui_LIB_SRCS} )
+ generate_export_header(kritaui BASE_NAME kritaui)
+ 
+ target_link_libraries(kritaui KF5::CoreAddons KF5::Completion KF5::I18n KF5::ItemViews Qt5::Network
+-                      kritaimpex kritacolor kritaimage kritalibbrush kritawidgets kritawidgetutils ${PNG_LIBRARIES} ${EXIV2_LIBRARIES}
++                      kritaimpex kritacolor kritaimage kritalibbrush kritawidgets kritawidgetutils ${PNG_LIBRARIES} LibExiv2::LibExiv2
+ )
+ 
+ if (HAVE_QT_MULTIMEDIA)
+diff --git a/libs/ui/kisexiv2/kis_exif_io.cpp b/libs/ui/kisexiv2/kis_exif_io.cpp
+index 1a01fedf33..4a7857aa9c 100644
+--- a/libs/ui/kisexiv2/kis_exif_io.cpp
++++ b/libs/ui/kisexiv2/kis_exif_io.cpp
+@@ -438,11 +438,10 @@ bool KisExifIO::saveTo(KisMetaData::Store* store, QIODevice* ioDevice, HeaderTyp
+                     if (entry.value().asArray().size() > 0) {
+                         creator = entry.value().asArray()[0];
+                     }
+-#if EXIV2_MAJOR_VERSION == 0 && EXIV2_MINOR_VERSION <= 20
++#if !EXIV2_TEST_VERSION(0,21,0)
+                     v = kmdValueToExivValue(creator, Exiv2::ExifTags::tagType(exifKey.tag(), exifKey.ifdId()));
+ #else
+                     v = kmdValueToExivValue(creator, exifKey.defaultTypeId());
+-
+ #endif
+                 } else if (exivKey == "Exif.Photo.OECF") {
+                     v = kmdOECFStructureToExifOECF(entry.value());
+@@ -456,13 +455,13 @@ bool KisExifIO::saveTo(KisMetaData::Store* store, QIODevice* ioDevice, HeaderTyp
+                     Q_ASSERT(entry.value().type() == KisMetaData::Value::LangArray);
+                     QMap<QString, KisMetaData::Value> langArr = entry.value().asLangArray();
+                     if (langArr.contains("x-default")) {
+-#if EXIV2_MAJOR_VERSION == 0 && EXIV2_MINOR_VERSION <= 20
++#if !EXIV2_TEST_VERSION(0,21,0)
+                         v = kmdValueToExivValue(langArr.value("x-default"), Exiv2::ExifTags::tagType(exifKey.tag(), exifKey.ifdId()));
+ #else
+                         v = kmdValueToExivValue(langArr.value("x-default"), exifKey.defaultTypeId());
+ #endif
+                     } else if (langArr.size() > 0) {
+-#if EXIV2_MAJOR_VERSION == 0 && EXIV2_MINOR_VERSION <= 20
++#if !EXIV2_TEST_VERSION(0,21,0)
+                         v = kmdValueToExivValue(langArr.begin().value(), Exiv2::ExifTags::tagType(exifKey.tag(), exifKey.ifdId()));
+ #else
+                         v = kmdValueToExivValue(langArr.begin().value(), exifKey.defaultTypeId());
+@@ -470,7 +469,7 @@ bool KisExifIO::saveTo(KisMetaData::Store* store, QIODevice* ioDevice, HeaderTyp
+                     }
+                 } else {
+                     dbgMetaData << exifKey.tag();
+-#if EXIV2_MAJOR_VERSION == 0 && EXIV2_MINOR_VERSION <= 20
++#if !EXIV2_TEST_VERSION(0,21,0)
+                     v = kmdValueToExivValue(entry.value(), Exiv2::ExifTags::tagType(exifKey.tag(), exifKey.ifdId()));
+ #else
+                     v = kmdValueToExivValue(entry.value(), exifKey.defaultTypeId());
+@@ -487,7 +486,7 @@ bool KisExifIO::saveTo(KisMetaData::Store* store, QIODevice* ioDevice, HeaderTyp
+             dbgMetaData << "exiv error " << e.what();
+         }
+     }
+-#if EXIV2_MAJOR_VERSION == 0 && EXIV2_MINOR_VERSION <= 17
++#if !EXIV2_TEST_VERSION(0,18,0)
+     Exiv2::DataBuf rawData = exifData.copy();
+     ioDevice->write((const char*) rawData.pData_, rawData.size_);
+ #else
+@@ -514,7 +513,7 @@ bool KisExifIO::loadFrom(KisMetaData::Store* store, QIODevice* ioDevice) const
+     QByteArray arr = ioDevice->readAll();
+     Exiv2::ExifData exifData;
+     Exiv2::ByteOrder byteOrder;
+-#if EXIV2_MAJOR_VERSION == 0 && EXIV2_MINOR_VERSION <= 17
++#if !EXIV2_TEST_VERSION(0,18,0)
+     exifData.load((const Exiv2::byte*)arr.data(), arr.size());
+     byteOrder = exifData.byteOrder();
+ #else
+@@ -529,7 +528,6 @@ bool KisExifIO::loadFrom(KisMetaData::Store* store, QIODevice* ioDevice) const
+         dbgKrita << "Received unknown exception trying to parse exiv data";
+         return false;
+     }
+-
+ #endif
+     dbgMetaData << "Byte order = " << byteOrder << ppVar(Exiv2::bigEndian) << ppVar(Exiv2::littleEndian);
+     dbgMetaData << "There are" << exifData.count() << " entries in the exif section";
+diff --git a/libs/ui/kisexiv2/kis_exiv2.h b/libs/ui/kisexiv2/kis_exiv2.h
+index 9343265f1e..6b66aa7852 100644
+--- a/libs/ui/kisexiv2/kis_exiv2.h
++++ b/libs/ui/kisexiv2/kis_exiv2.h
+@@ -21,7 +21,7 @@
+ 
+ 
+ #include <metadata/kis_meta_data_value.h>
+-#include <exiv2/value.hpp>
++#include <exiv2/exiv2.hpp>
+ #include "kritaui_export.h"
+ 
+ /// Convert an exiv value to a KisMetaData value
+diff --git a/libs/ui/kisexiv2/kis_iptc_io.cpp b/libs/ui/kisexiv2/kis_iptc_io.cpp
+index d2eb7c9b2f..0ac881f61b 100644
+--- a/libs/ui/kisexiv2/kis_iptc_io.cpp
++++ b/libs/ui/kisexiv2/kis_iptc_io.cpp
+@@ -126,7 +126,7 @@ bool KisIptcIO::saveTo(KisMetaData::Store* store, QIODevice* ioDevice, HeaderTyp
+             }
+         }
+     }
+-#if EXIV2_MAJOR_VERSION == 0 && EXIV2_MINOR_VERSION <= 17
++#if !EXIV2_TEST_VERSION(0,18,0)
+     Exiv2::DataBuf rawData = iptcData.copy();
+ #else
+     Exiv2::DataBuf rawData = Exiv2::IptcParser::encode(iptcData);
+@@ -167,7 +167,7 @@ bool KisIptcIO::loadFrom(KisMetaData::Store* store, QIODevice* ioDevice) const
+     ioDevice->open(QIODevice::ReadOnly);
+     QByteArray arr = ioDevice->readAll();
+     Exiv2::IptcData iptcData;
+-#if EXIV2_MAJOR_VERSION == 0 && EXIV2_MINOR_VERSION <= 17
++#if !EXIV2_TEST_VERSION(0,18,0)
+     iptcData.load((const Exiv2::byte*)arr.data(), arr.size());
+ #else
+     Exiv2::IptcParser::decode(iptcData, (const Exiv2::byte*)arr.data(), arr.size());
+diff --git a/libs/ui/kisexiv2/kis_xmp_io.cpp b/libs/ui/kisexiv2/kis_xmp_io.cpp
+index c4663efe7d..72fa5c5d38 100644
+--- a/libs/ui/kisexiv2/kis_xmp_io.cpp
++++ b/libs/ui/kisexiv2/kis_xmp_io.cpp
+@@ -17,7 +17,6 @@
+ #include "kis_xmp_io.h"
+ 
+ #include <string>
+-#include <exiv2/xmp.hpp>
+ 
+ #include "kis_exiv2.h"
+ 
+@@ -277,9 +276,8 @@ bool KisXMPIO::loadFrom(KisMetaData::Store* store, QIODevice* ioDevice) const
+                 const Exiv2::XmpArrayValue* xav = dynamic_cast<const Exiv2::XmpArrayValue*>(value.get());
+                 Q_ASSERT(xav);
+                 QList<KisMetaData::Value> array;
+-                for (std::vector< std::string >::const_iterator it = xav->value_.begin();
+-                        it != xav->value_.end(); ++it) {
+-                    QString value = it->c_str();
++                for (int i = 0; i < xav->size(); ++i) {
++                    QString value = QString::fromStdString(xav->toString(i));
+                     if (parser) {
+                         array.push_back(parser->parse(value));
+                     } else {
+diff --git a/plugins/impex/jpeg/CMakeLists.txt b/plugins/impex/jpeg/CMakeLists.txt
+index 347e46dbe3..50edb05c96 100644
+--- a/plugins/impex/jpeg/CMakeLists.txt
++++ b/plugins/impex/jpeg/CMakeLists.txt
+@@ -4,7 +4,6 @@ set(ICCJPEG_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/lcms")
+ 
+ include_directories(
+     ${ICCJPEG_SOURCE_DIR}
+-    ${EXIV2_INCLUDE_DIR}
+ )
+ 
+ include_directories(SYSTEM
+@@ -25,7 +24,7 @@ set(kritajpegimport_SOURCES
+ 
+ add_library(kritajpegimport MODULE ${kritajpegimport_SOURCES})
+ 
+-target_link_libraries(kritajpegimport kritaui  ${JPEG_LIBRARIES} ${LCMS2_LIBRARIES} ${EXIV2_LIBRARIES} )
++target_link_libraries(kritajpegimport kritaui  ${JPEG_LIBRARIES} ${LCMS2_LIBRARIES} LibExiv2::LibExiv2 )
+ 
+ install(TARGETS kritajpegimport  DESTINATION ${KRITA_PLUGIN_INSTALL_DIR})
+ 
+@@ -38,7 +37,7 @@ ki18n_wrap_ui(kritajpegexport_SOURCES kis_wdg_options_jpeg.ui )
+ 
+ add_library(kritajpegexport MODULE ${kritajpegexport_SOURCES})
+ 
+-target_link_libraries(kritajpegexport kritaui kritaimpex ${JPEG_LIBRARIES} ${LCMS2_LIBRARIES} ${EXIV2_LIBRARIES} )
++target_link_libraries(kritajpegexport kritaui kritaimpex ${JPEG_LIBRARIES} ${LCMS2_LIBRARIES} LibExiv2::LibExiv2 )
+ 
+ install(TARGETS kritajpegexport  DESTINATION ${KRITA_PLUGIN_INSTALL_DIR})
+ install( PROGRAMS  krita_jpeg.desktop  DESTINATION ${XDG_APPS_INSTALL_DIR})
+-- 
+2.20.1
+
diff --git a/media-gfx/krita/krita-4.1.7.ebuild b/media-gfx/krita/krita-4.1.7.ebuild
index 9982412f267b..efe9923bc337 100644
--- a/media-gfx/krita/krita-4.1.7.ebuild
+++ b/media-gfx/krita/krita-4.1.7.ebuild
@@ -86,7 +86,10 @@ RDEPEND="${COMMON_DEPEND}
 # bug 630508
 RESTRICT+=" test"
 
-PATCHES=( "${FILESDIR}/${PN}-4.0.3-tests-optional.patch" )
+PATCHES=(
+	"${FILESDIR}/${PN}-4.0.3-tests-optional.patch"
+	"${FILESDIR}/${P}-exiv2-0.27.patch"
+)
 
 S="${S}.101"
 
diff --git a/media-gfx/libimagequant/Manifest b/media-gfx/libimagequant/Manifest
index c886cd02a2a6..5d9a171ee8b3 100644
--- a/media-gfx/libimagequant/Manifest
+++ b/media-gfx/libimagequant/Manifest
@@ -2,6 +2,6 @@ AUX libimagequant-2.12.2-fix-pkgconfig.patch 840 BLAKE2B 6b16c3b0a7b916c60814817
 AUX libimagequant-2.12.2-respect-CFLAGS.patch 449 BLAKE2B fb3679a05e024a276b5ae1070f90d4c59584a2b9dac062febb7bdeb1efbbd1cb4f39f8fd1aa94f81ac4318bd0413bdde44f75d418f69b916a70883220d9ef031 SHA512 68c2bf917d60da653abff4fc20c44a9f692213aed87a220a3ffb03ec308107eda7be1a6e135393658ef54d2d63bb0675f5e2a95bdf4b02628fcf5d367c0ce9ef
 DIST libimagequant-2.11.7.tar.gz 74311 BLAKE2B 204fbe794014c11d767991a03e729b234978fb1edb1fdffcb7d332461ccaa1a536a1e9dbc7b44a8838db61cc76fdbc1eb75087b480f4fc42bf791fea913639a2 SHA512 8816811c06eec27232e39725c581e382b7076f3bc23b017810de0e92236e6e4eb480def7b50347c9b75f7d792245669398c39a17359eb81077badf12e6f0a172
 DIST libimagequant-2.12.2.tar.gz 75611 BLAKE2B 23f5d3666fd21696d4f4dab9db3669642a9e3f6ca971804b914e845018df538136c3db900419ac35230be9fd487b48e0ab672b653e2ee82387c19569b49d6cfc SHA512 7e7bfcffd163d8b73a46d523dc441e4a4726f5dde804f306f13900f74afae6f6e7cf780bf157b5823a71c790bcdd0e9c9c34cf43f84a21289e470fc78835d8d8
-EBUILD libimagequant-2.11.7.ebuild 1184 BLAKE2B dfc603c736d9d8061b406152a4cc73f0bf0ddd7acff0ff734646b976e5d972195a04f3d10327bf713b549d17ec4286b31063e7b0f452112e0c8c8e7f090cc861 SHA512 a43f2e98875b9e3dd68062c47e74adf7b0e5a1bffe5eaa21850e26929edc0af41b09a352e1feae12e3dbe23d3af1a296e78874cc6e82ea05860ffb4fa08956bd
-EBUILD libimagequant-2.12.2.ebuild 1438 BLAKE2B ebcfdc7e952468596aafab3f9c822c790bdccad8548647410b18b6a57c2121ddd14d98c9ec14cf7a461c9268283c1c1334773ee7124bbe2db30094513fe97d35 SHA512 20ef40f430fd9bcde1370e71c9b4d5413bbf94050199b70c81910639da7658e66e5e9d4e399203cbd0d807fea08f93b2c817a15c49b24aa7f362c50e39bd2179
+EBUILD libimagequant-2.11.7.ebuild 1191 BLAKE2B 61db0687381d1ad9c124e94be50b93bba3d70a3758dfdde81bbf3fe2a9a9ffd26cc73ef29ee1fc7bbd3fdab8947b7316c76622ca1c5f28f923212c63ca2c81fa SHA512 38db43ddfb6c4e8aad817dde0cc20ccf5397f4bcc4a3183a33d1256122a42a79ba6b079677746b31d17625b275f2e3d9e346e314a1311981b86d4add48238dce
+EBUILD libimagequant-2.12.2.ebuild 1445 BLAKE2B 5c9e32c997db0c6551fc94ca12e1bed60555967f08495406edf1d35232adcda9f2f8c9b10d0ff62ef0ebd5e61a494808e2d364450c7a0a70f78eadde18a1488b SHA512 ef68d3065ba9ad164f2fa3e61c5b046e2dbd3edc9d78e7d270351874cf4ecef053802e9b6d38db45c843b571774db0fc8ff88ab3b92f52303a5c63faa76a880d
 MISC metadata.xml 527 BLAKE2B c3fa42153fa6cfede4de3d59e12063aeb44f67ce89d36be63c7df4671c57ecfdd43d08aee89bd96387ecbee2e41b1d5921e9ad2486b4dd8f06e6e93529afb0a8 SHA512 82b458b27288b6b49df16d5778f6c75b492d958bcc1c2f2950dee741bfddc82f561be50f590d3f891bf736ee67e5325ae297bf49f99c769ca97ac68042beee11
diff --git a/media-gfx/libimagequant/libimagequant-2.11.7.ebuild b/media-gfx/libimagequant/libimagequant-2.11.7.ebuild
index ba95dbc6cf98..d884ee7fac2d 100644
--- a/media-gfx/libimagequant/libimagequant-2.11.7.ebuild
+++ b/media-gfx/libimagequant/libimagequant-2.11.7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ImageOptim/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="GPL-3"
 SLOT="0/0"
-KEYWORDS="amd64 arm ~arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ~arm64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="cpu_flags_x86_sse2 debug openmp static-libs"
 
 DEPEND=""
diff --git a/media-gfx/libimagequant/libimagequant-2.12.2.ebuild b/media-gfx/libimagequant/libimagequant-2.12.2.ebuild
index f9e1c3ed54cb..1cfe04f72c2b 100644
--- a/media-gfx/libimagequant/libimagequant-2.12.2.ebuild
+++ b/media-gfx/libimagequant/libimagequant-2.12.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ImageOptim/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="GPL-3"
 SLOT="0/0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="cpu_flags_x86_sse2 debug openmp static-libs"
 
 DEPEND=""
diff --git a/media-gfx/luminance-hdr/Manifest b/media-gfx/luminance-hdr/Manifest
index d35a7c9c808f..64126270952b 100644
--- a/media-gfx/luminance-hdr/Manifest
+++ b/media-gfx/luminance-hdr/Manifest
@@ -1,7 +1,8 @@
 AUX luminance-hdr-2.5.1-docs.patch 908 BLAKE2B de7c675599a74ef7622c037eeec85546d99f2b3341c6df09f7f8880c7515468295b84962163f147bcf093adbce8425de8f8d86517c81b5c57a3b2dd3afe15ef0 SHA512 d675e6ec2b47c604002a1fa54578fd6d363c0f55079f519e0da3e3b06993b4a77024bd0e35101d22b06c2e7d5fa87bde52b1cbe6c9726ad6e6c02ebe1753bee2
+AUX luminance-hdr-2.5.1-exiv2-0.27.patch 878 BLAKE2B f8c1cfc71deabab465f0f427413dbf5dc47aa69833445e564a7e95ec8cc95a137af122f762d8a7af0a8db5ec0e954034a54336a773f9aaf3b0341ac36a10288d SHA512 60fcc806963ce4ffc8b7ebef8ddfc1bfef08a4a45b311ab7b5080327f058c5f0ebc4e680fdd4b7d114b4ee4e31643166bbc2bb0de70bfbd2330e6c04a2e8b2e1
 AUX luminance-hdr-2.5.1-fits-automagic.patch 518 BLAKE2B 47af51ffa1b521d8dd949e2b89c6990896e1b82e64c3cb9f93342bd4343b12ed2824d1b05fe378bb52cd9027fd86848d5a558a787545e86423ebf6da2d402e18 SHA512 49b127165c22864b0910a2cf0ebf694e74b0a8343577f06b752f3d4cdf50ae5990f1fa88b83d78565f16ddcddd0f7f87664a34602ebb1d11efafd0ab979e53ce
 AUX luminance-hdr-2.5.1-no-git.patch 513 BLAKE2B b9a2a460538b709cf76fa3713b26709455bc604e1d30ef355db254b3b6dab7420d81d83e77f6aba7f0f62a8c1b4dfcb3c503004e0235b65ef15d81e461f8a14a SHA512 96e5096a5b1a482f4604e6a6067836268e4988f32907f67ceeee25978d4dd1c1b1e394102145e5241e663595156dddc9c69ab9b22e0e1710e1a0507016b10108
 AUX luminance-hdr-2.5.1-openmp-automagic.patch 1574 BLAKE2B e8c289b8a66e258dd0ea99baa54bdf76e6345b652071a8e37b2a8ab35d98dd006973f266c8d008ccc70330fa8e9f9082261eee9d08756b1d59a4575714c5d6a8 SHA512 6ccfbf8d75bdc27beb10b3632bd07d8679f9ae8bdd78588ff0bbad59b75c43a4ad3b443a42183541cbf5b53d426b4ac19f43f54e296542d3a1b4235ba302acaa
 DIST luminance-hdr-2.5.1.tar.bz2 10238826 BLAKE2B 02cc275e2433281e9305e07efb6f77a611ca8e8167ca478a0c4a4c16feab260203aeef501b24b52b54ff9ad92923fd52b2c6925d81e60b492f0ac2465e65b604 SHA512 5d2165ca69080b67426cbc7e30c3ad5545f1a9dacf09e76684c619633cd40b03ed2d0e32181a5dce9463addf20dce1afb58cbf4c0710688e143112687448be2c
-EBUILD luminance-hdr-2.5.1-r1.ebuild 2117 BLAKE2B 554ead589c71d2b5581e0343e195560d239cccdc458307f0f5528e127f6b80289de45005c6c90e87f24487c3eba7a3ddd50e8805a926aa96dc3a682a8471b0c2 SHA512 3431350fb91a0499dc0478f3d5e73a4325c9cb5619b9381343af42ee7d8a2203d78fbaf046457ac5b8002ec24dbafea0f963825de853989488e7aaa145fea2e2
+EBUILD luminance-hdr-2.5.1-r1.ebuild 2158 BLAKE2B 4116afcf7417657970b688af6d5443fb47d1aff67fc69147381530afc7391470a5c5e4c742896b315f3810658d9ccb5b9122c8193fcdb9e78bbf09d94e08bfc1 SHA512 93b05a5ae0bc7ce5053a67c4c4a6742b8b7432614a108718ae3914e5339414440a318d5519aaec51230b87b11f53547aa1b1c14905f4912f63feb684356c3105
 MISC metadata.xml 1276 BLAKE2B 5b913b3c342f4d5a6fc67c30008d8eb9469c61cea7f6a10b8c29d1e60324da71e662a4f4d16a0d4a20c7431f5bab3dc9e157efbeae5dacbdadf4b2f5989e9058 SHA512 f1c9daadf3632c1f22297fe5987484a72cb7f0fa3f0758883c7d3c4fe798a6cad7838b855267b1ccc4ca74574692d915e725940c77e9891652a7cc80604a2597
diff --git a/media-gfx/luminance-hdr/files/luminance-hdr-2.5.1-exiv2-0.27.patch b/media-gfx/luminance-hdr/files/luminance-hdr-2.5.1-exiv2-0.27.patch
new file mode 100644
index 000000000000..7b52c883e40b
--- /dev/null
+++ b/media-gfx/luminance-hdr/files/luminance-hdr-2.5.1-exiv2-0.27.patch
@@ -0,0 +1,25 @@
+From e733c24baf0c87e0b3c45351ff916c5f3a652826 Mon Sep 17 00:00:00 2001
+From: Benitoite <kd6kxr@gmail.com>
+Date: Sun, 16 Dec 2018 22:18:37 -0800
+Subject: [PATCH] Define EXIV2_TEST_VERSION by including exiv2.hpp
+
+AppleClang 10 did not allow compilation without exiv2/exiv2.hpp or exiv2/version.hpp
+Also, version.hpp says use exiv2.hpp
+
+* 2018-12-29 asturm@gentoo.org: Backported to 2.5.1
+---
+ src/TransplantExif/TransplantExifDialog.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/TransplantExif/TransplantExifDialog.cpp b/src/TransplantExif/TransplantExifDialog.cpp
+index c38a51e4..1fac2e0f 100644
+--- a/src/TransplantExif/TransplantExifDialog.cpp
++++ b/src/TransplantExif/TransplantExifDialog.cpp
+@@ -26,6 +26,7 @@
+ #include <QFileInfo>
+ #include <image.hpp>
+ #include <exif.hpp>
++#include <exiv2/exiv2.hpp>
+ 
+ #include "Common/global.h"
+ #include "Common/config.h"
diff --git a/media-gfx/luminance-hdr/luminance-hdr-2.5.1-r1.ebuild b/media-gfx/luminance-hdr/luminance-hdr-2.5.1-r1.ebuild
index 39c345486d1c..e8bae1039b5b 100644
--- a/media-gfx/luminance-hdr/luminance-hdr-2.5.1-r1.ebuild
+++ b/media-gfx/luminance-hdr/luminance-hdr-2.5.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -50,6 +50,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-2.5.1-docs.patch
 	"${FILESDIR}"/${PN}-2.5.1-openmp-automagic.patch
 	"${FILESDIR}"/${PN}-2.5.1-fits-automagic.patch
+	"${FILESDIR}"/${PN}-2.5.1-exiv2-0.27.patch
 )
 
 pkg_pretend() {
diff --git a/media-gfx/nomacs/Manifest b/media-gfx/nomacs/Manifest
index 9614dfd57ed0..69f598f17bde 100644
--- a/media-gfx/nomacs/Manifest
+++ b/media-gfx/nomacs/Manifest
@@ -1,7 +1,9 @@
 AUX nomacs-3.10.2_fix_move_crop_area_tooltip.patch 1254 BLAKE2B 5dec4f07fc0cdcd1316a61c179da94bdeaf01d56bb8c2d5327261280d176a976dc406c851f2f2b84d6ac5c62df5646ac8be64de1561edf8ad3220a353a95b887 SHA512 2866be24f07534bb34f15374145240580552fcfd3c33c0193236f597d9edaa256809b5a0da88cb58230d7d0efc19ae56bbf5247b789d5b82ae3ae89c489828ed
 AUX nomacs-3.8.1-qt-5.11.patch 4507 BLAKE2B 5473253ebd9405ee31dc8fa230dc3548f15f3b01cbeadf388339f836091c4a0880346a1d06344e1935c79fa1f25d30f76e1bba87363b777235a181c28aba713b SHA512 14495e3f1a93c5559fef6bfa3a141ec8b9b84e11cce09d3f362f1a8f9de1ab2b31b6c3f1407fa3f79f828b79d65f940118a311c69ae0aefee9c19cd87880bb3c
 DIST nomacs-3.10.2.tar.gz 32302506 BLAKE2B 14f9eb9188f74c91cf088bac757a4023f6590bc05687b4809794a70bdd1e2dbcc2b58ad65062db14cfec9f4c639ceb21e64df19f1c1584256ee9586ab588d8af SHA512 977dbe24e09b00001dd8a33b18c1dbbb3a59106715746b07892f289918205818664fd7b4213028d4288009bcf14a0195759ac1eafca076f81ee72a1e2ae027dd
+DIST nomacs-3.12.tar.gz 1736648 BLAKE2B 533e18dec4be5d945213ccd629262a2cbae1eba93599f43be0a98d32d0b54d9caad7d963809f2fc9bb5c1ba682a39f44763b5d04e50c6e86658f6cd84324f3d2 SHA512 4508354d48a6115cd40f701cc90cbbcb84490e99eaac0295db48f6fea99550d5e2b3e7365128d0c9cc4eeb621906f55e275603d84cb8b6bb164d0b5e2e192119
 DIST nomacs-3.8.1.tar.gz 32184536 BLAKE2B 3ba4e0b0220797991c5999164e27fb3c57218d87d17858f5cf6098d8b91ddd0b3330836642999ce953f3ce9b538dcb35ecb48400f94f11805cd8eedeed05b110 SHA512 ff27570bc15096d0e331ad2c871b2f504a414927b8e64166668dedbbbc41f8cd031d9fb142c89c22cff76bf79156f93decf1038e30eecfc3de3e328a325f0134
 EBUILD nomacs-3.10.2.ebuild 1753 BLAKE2B 83873ae4347c1241de2fe0ff82a25189422e747379dade0a9133dca36ed669b78da12a3c98a49d40db7450893b31c8134072210afeaca9cd7378ec4a9b48dd6a SHA512 0b21878384690aff25570114cc1b9a32cf2024d8c95ba92aee61da1a5abde45698678e75e8a2fd49c75077cdea853b5343c47696042258cf9c718f6bda20b442
+EBUILD nomacs-3.12.ebuild 1341 BLAKE2B 66c969a82102d950b72e0b2fdce39d4970bf4fe8b3d36ac2e751f6e31616f551f2bb6615c4586236de9fd7b0ce374f9da2e2c3eb4af6f28783ccc87a7b3c9af5 SHA512 7edc9b02d4721c46be37d77aad4912a65081098c50084753ab501974033dc3bc383860b7a4a7667eeacbd12a0c60a41a9c5a511b2ba1eae692dfd71ad44cc6f0
 EBUILD nomacs-3.8.1.ebuild 1733 BLAKE2B 52eaaba8455349581f26a583159df4ad8494e68fca503fa1659455dea921a9829145e2ac4302e36325fc33fc77424b6b263191995f7d8be7ab8a9051f9eb7860 SHA512 894b46f2662f472253b281b007018caace584076517bd010908a506533b7b299325a4fd5c43443096b66bcd9a80a976b43a05c2938caca5748cf684b17986ec4
-MISC metadata.xml 531 BLAKE2B fc54042c41205b0a44c1b2dcd266e1311b306ee928149b3806e16260be85a65bf0da0716706653f82ff3dc83351fca6a68ca47930a08f3d170d00416515e2eac SHA512 ac9d022d7b0883217b77513e6d913ed816e414402cd4028428f6b239d97c8f5eaab48d709821675529af8a5a3d945105997235dcb63b826fd669f1b5fb2660a4
+MISC metadata.xml 658 BLAKE2B 72c4850c61d0aa0c068870eb15f33471279182f0b4fb09a18f24b4a497df4f0928492a2cb24d6f47bd6adc54f3e8be95d937c65f95db01dfc5a4bda83830e3ea SHA512 7388bf834b7483835054cf4550984916a6ccd56902d7992b24f83affd39e2aac8a50599b81370f85683882425c93bfd081fffa5f7e693b6d1683b5429be1cae0
diff --git a/media-gfx/nomacs/metadata.xml b/media-gfx/nomacs/metadata.xml
index b27b6fcfc0e4..462a1644b167 100644
--- a/media-gfx/nomacs/metadata.xml
+++ b/media-gfx/nomacs/metadata.xml
@@ -11,6 +11,7 @@
 		<remote-id type="sourceforge">nomacs</remote-id>
 	</upstream>
 	<use>
+		<flag name="heif">Enable support for ISO/IEC 23008-12:2017 HEIF/HEIC image format using <pkg>media-libs/libheif</pkg></flag>
 		<flag name="opencv">Build support for <pkg>media-libs/opencv</pkg></flag>
 	</use>
 </pkgmetadata>
diff --git a/media-gfx/nomacs/nomacs-3.12.ebuild b/media-gfx/nomacs/nomacs-3.12.ebuild
new file mode 100644
index 000000000000..cd9011453890
--- /dev/null
+++ b/media-gfx/nomacs/nomacs-3.12.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils xdg-utils
+
+DESCRIPTION="Qt-based image viewer"
+HOMEPAGE="https://nomacs.org/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
+IUSE="heif +jpeg +opencv raw tiff zip"
+
+REQUIRED_USE="
+	raw? ( opencv )
+	tiff? ( opencv )
+"
+
+RDEPEND="
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5[jpeg?]
+	dev-qt/qtnetwork:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	media-gfx/exiv2:=
+	heif? ( media-libs/libheif:= )
+	opencv? ( >=media-libs/opencv-3.4:= )
+	raw? ( media-libs/libraw:= )
+	tiff? (
+		dev-qt/qtimageformats:5
+		media-libs/tiff:0
+	)
+	zip? ( dev-libs/quazip[qt5(+)] )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig
+"
+
+S="${WORKDIR}/${P}/ImageLounge"
+
+DOCS=( src/changelog.txt )
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_CODE_COV=OFF
+		-DUSE_SYSTEM_QUAZIP=ON
+		-DENABLE_TRANSLATIONS=ON
+		-DENABLE_HEIF=$(usex heif)
+		-DENABLE_OPENCV=$(usex opencv)
+		-DENABLE_RAW=$(usex raw)
+		-DENABLE_TIFF=$(usex tiff)
+		-DENABLE_QUAZIP=$(usex zip)
+	)
+	cmake-utils_src_configure
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/media-gfx/photoqt/Manifest b/media-gfx/photoqt/Manifest
index 36b39a2b4144..7afa414a018f 100644
--- a/media-gfx/photoqt/Manifest
+++ b/media-gfx/photoqt/Manifest
@@ -1,5 +1,6 @@
+AUX photoqt-1.7.1-cmake.patch 358 BLAKE2B ecadfc9f5ff6cac0535f5db36efc87f37705e77bc6d4b2445a77430c606c642081bff5c6c5733804dcf6cc3878d424bce4c39fd590478ee596f63e23f022506b SHA512 3a5b74999bc6765c37252dd2b34e36ed910c0f3c58e30dbdc84b38b361b45bf6e9131525069b1184c7e2b4e820674742233359120c63c37324fb802e0d9c1726
 DIST photoqt-1.5.1.tar.gz 1596831 BLAKE2B 306beaf97cb9e81a2a219e9549abba35eecfaa0f2ad79d769095014d73708f525d5efa3ff4d83f75e89e0f9971a3a46da8b98ca7259b3666e27fc9addc9e836a SHA512 ccb4ada12e76b611475ec66ceaa2ad3a15f92311d2b7c22aa8b94cd145a062bf502af6ff40fa9bb681c5dad97b2941c2a8203da4ac937c8d86c34d805084ec7c
 DIST photoqt-1.7.1.tar.gz 1324774 BLAKE2B b739508511cdc34b6de5736260692c48186a49d0cf62d8283238ee274d2fdf73716589277fa602f86c8c15fff87b49d1700202d260480e002dfa18380b47d328 SHA512 50cee1a77a5e69d05f19a8f1ac8ab18d1ef420962b05f3a76e12ce0f3202db7037c894bbd7631674504f0e51c2be690aff4248ed343d0da2dc8a1ccce2d8e078
-EBUILD photoqt-1.5.1-r1.ebuild 1139 BLAKE2B 896daff470d196b0be36ce30011ac6308edd1eca1633d0c9a5757f8a8920e72116169d76c5f7028b3437759cfbada31000d5f0873a4f9a06435fe8a4da08fd0f SHA512 d3e9a337162a71118b8434a90581421583c0f642b7e81c46c37d0186160aad7752d9e4543c22c65d3dcd1717243e9d414e6ffca597a397fbdfa53b2d05974c83
-EBUILD photoqt-1.7.1.ebuild 1375 BLAKE2B ee5a7007cc86be781b936e9d194aae64f804da4c746f53d85d9143fbdb6b181c652fe573fe61c2479f8fc6ddce3eaa949f15d041c0e62cac45af1a208d0f4e71 SHA512 f49af8a780d3f4e347d1e5a4207d8568898fef4e58231c520e9b9f8da4268ef85605ee5fe061be769e7379e00f6cb440e3beb84b2216db6e9b9d66f535f2d411
-MISC metadata.xml 563 BLAKE2B 78b8cf15864ab806162ac48ff45b7dd5644a5170d336a05a2b4402e7eff5be9d56df31b8f825bfa21bac38ca4d17784c4faa146791d35b7a426064cf07c88d9d SHA512 f1d5950bbf5b29645058ef0cfd620fb142dab8a4bdfe3b8ce218ae7e530ff56153d3756e5743e7ec9b4d7c6cf7b609e16fd62228fd19571ac1b30a007e48dc67
+EBUILD photoqt-1.5.1-r1.ebuild 1133 BLAKE2B 3b5bf5a7baff887bc09653a2799c3372713252c9668f3d95650e2dfbdcba77dd82e637d9a9a3688039d305e8ec154e7d0a53351dbe8774f45f4f9feb204a6417 SHA512 991c545c015dc3fb89fc3311472e5fa46433015311ae7b8b26e704d910ca3fb8a405dc69241fe2074ed23339f7b185f070e31ccc0d238880e9b7cf43cd08960a
+EBUILD photoqt-1.7.1.ebuild 1413 BLAKE2B 74faf1e176770f1b8f965a96b8e4be9c730ea791c951152be9ade3523e35c898e56d439699841d7f44407aa3a9cf9e2b11c3c1de5cf45915bb0571f3813a4828 SHA512 86f48c17776705332b504df6ba1ea5cf354ba597252884cbd693f69a3a13e86aaadeec6804dde92faa99c1c95b334d6ddf49a00299ed4abb908cd5073260df47
+MISC metadata.xml 474 BLAKE2B 44114be5222dc1c0ad5a926fc6ff85da5b284a929a0991795632896c0f56ad24021591260c899549eda9b36557dc251363d17eef52928930afaaafebdf29bcf3 SHA512 50c4bf4437dec5d9919e3a16fdc4e429e3fdbc8d23656ecca57ae7674bc90bd6e8e33949191d7c15d49cbfe5451e72155e1bf441f020a44ab98b35115a29b6e0
diff --git a/media-gfx/photoqt/files/photoqt-1.7.1-cmake.patch b/media-gfx/photoqt/files/photoqt-1.7.1-cmake.patch
new file mode 100644
index 000000000000..5dfacf435a0e
--- /dev/null
+++ b/media-gfx/photoqt/files/photoqt-1.7.1-cmake.patch
@@ -0,0 +1,13 @@
+--- a/CMake/FindExiv2.cmake	2018-06-03 05:21:04.143148857 +0200
++++ b/CMake/FindExiv2.cmake	2018-12-29 22:35:40.770393025 +0100
+@@ -13,8 +13,8 @@
+     "${EXIV2_LOCATION}"
+     "${EXIV2_LOCATION}/include"
+     /usr/include
+-    /usr/include/Exiv2
+-    /opt/local/include/Exiv2
++    /usr/include/exiv2
++    /opt/local/include/exiv2
+ )
+ 
+ IF(EXIV2_INCLUDE_DIR)
diff --git a/media-gfx/photoqt/metadata.xml b/media-gfx/photoqt/metadata.xml
index c0acf63798da..b44c7e9f4433 100644
--- a/media-gfx/photoqt/metadata.xml
+++ b/media-gfx/photoqt/metadata.xml
@@ -10,10 +10,7 @@
 			Support additional image formats using <pkg>media-libs/devil</pkg>
 		</flag>
 		<flag name="freeimage">
-			Support additional iamge formats using <pkg>media-libs/freeimage</pkg>
-		</flag>
-		<flag name="exiv2">
-			Use <pkg>media-gfx/exiv2</pkg> as optional dependency
+			Support additional image formats using <pkg>media-libs/freeimage</pkg>
 		</flag>
 	</use>
 </pkgmetadata>
diff --git a/media-gfx/photoqt/photoqt-1.5.1-r1.ebuild b/media-gfx/photoqt/photoqt-1.5.1-r1.ebuild
index ff02aa7771cc..7702e5284c0f 100644
--- a/media-gfx/photoqt/photoqt-1.5.1-r1.ebuild
+++ b/media-gfx/photoqt/photoqt-1.5.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="https://photoqt.org/pkgs/${P}.tar.gz"
 LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE="exiv2 graphicsmagick raw"
+IUSE="exif graphicsmagick raw"
 
 RDEPEND="
 	dev-qt/qtcore:5
@@ -27,7 +27,7 @@ RDEPEND="
 	dev-qt/qtsvg:5
 	dev-qt/qtwidgets:5
 	dev-qt/qtxml:5
-	exiv2? ( media-gfx/exiv2:= )
+	exif? ( media-gfx/exiv2:= )
 	graphicsmagick? ( >=media-gfx/graphicsmagick-1.3.20:= )
 	raw? ( media-libs/libraw:= )
 "
@@ -37,7 +37,7 @@ DEPEND="${RDEPEND}
 
 src_configure() {
 	local mycmakeargs=(
-		-DEXIV2=$(usex exiv2)
+		-DEXIV2=$(usex exif)
 		-DGM=$(usex graphicsmagick)
 		-DRAW=$(usex raw)
 	)
diff --git a/media-gfx/photoqt/photoqt-1.7.1.ebuild b/media-gfx/photoqt/photoqt-1.7.1.ebuild
index b1e9fd011dee..a865dab8014b 100644
--- a/media-gfx/photoqt/photoqt-1.7.1.ebuild
+++ b/media-gfx/photoqt/photoqt-1.7.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="https://photoqt.org/pkgs/${P}.tar.gz"
 LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="devil exiv2 freeimage graphicsmagick pdf raw"
+IUSE="devil exif freeimage graphicsmagick pdf raw"
 
 RDEPEND="
 	dev-qt/qtcore:5
@@ -30,7 +30,7 @@ RDEPEND="
 	app-arch/libarchive:=
 	app-arch/unrar
 	devil? ( media-libs/devil )
-	exiv2? ( media-gfx/exiv2:= )
+	exif? ( media-gfx/exiv2:= )
 	freeimage? ( media-libs/freeimage )
 	graphicsmagick? ( >=media-gfx/graphicsmagick-1.3.20:= )
 	pdf? ( app-text/poppler[qt5] )
@@ -41,10 +41,12 @@ DEPEND="${RDEPEND}
 	kde-frameworks/extra-cmake-modules:5
 "
 
+PATCHES=( "${FILESDIR}/${P}-cmake.patch" )
+
 src_configure() {
 	local mycmakeargs=(
 		-DDEVIL=$(usex devil)
-		-DEXIV2=$(usex exiv2)
+		-DEXIV2=$(usex exif)
 		-DFREEIMAGE=$(usex freeimage)
 		-DGM=$(usex graphicsmagick)
 		-DPOPPLER=$(usex pdf)
diff --git a/media-gfx/psftools/Manifest b/media-gfx/psftools/Manifest
index 70a4c14f6e1f..ab329b0c8d4e 100644
--- a/media-gfx/psftools/Manifest
+++ b/media-gfx/psftools/Manifest
@@ -1,3 +1,5 @@
+DIST psftools-1.0.10.tar.gz 764867 BLAKE2B bd92ba1b65772dd5a7393fdd6e6350c0faa0bfc43d7fa3ce1018e464a9c1729bb0977a10094253947f6e1cac97ac4d120e0f60c85c7f15b13a47194a3527d1d1 SHA512 83759e0282af8dee26839561bac0987bba74e3173eb5091e70031849a67b189c5c10dfb64241fedf1513b319554238d4147acdd6ed3d0f15eafac3e7fc4a26b1
 DIST psftools-1.0.7.tar.gz 547537 BLAKE2B e3f3acc79efbfdf42a804f665553d7cbeb6c431cd36f3d26b3af37251197fb697d28127ed94ec2f409d4793272b7a5c293b1ba12ec8b94206790aadcfee4a509 SHA512 9135f4aa8ea4a4cfdaebc7764db0409b304dc34310ebe84d6fc786d42a392c79da4f097b6b3526edaf862305edf8794ef62f6bf48a3de5dac22c8e0c0c77aa14
+EBUILD psftools-1.0.10.ebuild 553 BLAKE2B 6efdb4c116339a2a058f127ad36896e61c0e358bf012c537baac7754a252bc96317f4504047861f36718d8cdf7be7bcb8a06a6584f3a8d37967ee374fdd6772c SHA512 be96d4a5caf040c23a8fa59ae93bf2c7d69ecdbeba1bad587303c6c5ccdbe9f2b5ff790b68233966e8319cb63c15b2f0f1f41397ebc2494ae0ccc0d335bfc2aa
 EBUILD psftools-1.0.7.ebuild 451 BLAKE2B a90833253dd9858128716ee954d6290e3befdb4473f527a953210ccf01c89c6c7f33eb838b51d359bdd305c05c1adc7c3d45588431e1073ebf6b2219f0c042d6 SHA512 b4cd1316903e27803bf9de32adfae88fb74c79574a537d6a3a342b123facf4ee9d4e0c49872fbc6078936d3fc7560382f58ce19631c7a9c8d5f482b99f201fb9
 MISC metadata.xml 234 BLAKE2B 1fff66672cffbf45f59f81eb07ced35707962cf8cd6a10b7596e848489abc2b3f6bd00f629762ac99c59c6edbe687bcaffb61442674bb94c50649e09250d6c68 SHA512 582b5859e81dd9914f3a2665bcdec86d1ba10026f0b0c8207fa0a6a621eaedd40286fc01250e8fed3d63750a4f39c6c8e4e5d358d360c0113e0904f297624ff5
diff --git a/media-gfx/psftools/psftools-1.0.10.ebuild b/media-gfx/psftools/psftools-1.0.10.ebuild
new file mode 100644
index 000000000000..c86937556375
--- /dev/null
+++ b/media-gfx/psftools/psftools-1.0.10.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Utilities for manipulation of console fonts in PSF format"
+HOMEPAGE="https://www.seasip.info/Unix/PSF/"
+SRC_URI="https://www.seasip.info/Unix/PSF/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="static-libs"
+
+DEPEND=""
+RDEPEND=""
+
+DOCS="AUTHORS NEWS TODO doc/*.txt"
+
+src_configure() {
+	econf $(use_enable static-libs static)
+}
+
+src_install() {
+	default
+	use static-libs || find "${ED}"/usr -name '*.la' -delete
+}
diff --git a/media-gfx/termtosvg/Manifest b/media-gfx/termtosvg/Manifest
index 83cdf37974ad..6fcb8d8e0b97 100644
--- a/media-gfx/termtosvg/Manifest
+++ b/media-gfx/termtosvg/Manifest
@@ -1,3 +1,5 @@
 DIST termtosvg-0.4.0.tar.gz 88543 BLAKE2B a45e15e7d681bb649670d4c73cf09306fa09276b2a34f762db66f4cf2d640d2163f4e98b16dc609e92b4145978e76a00e80950634d1599ee0766c4f08afb15a5 SHA512 c0c90fc9e74c892ebe6b7fcd25ff2757a7a8b9ee4da459fc608c96295d0f9b40bf6c98a0ac56f42c3e2a60cb60e9404a9b50863bdf74335d2b4758b124c04fcb
+DIST termtosvg-0.7.0.tar.gz 276936 BLAKE2B 530bd3ef17aa19cbc23e46e7aea4716dda9369979ae97609ac6f976fecd4f75652b23f47ccf4da8035175f281d1a80b340acc714391882365c01764a92e4588b SHA512 085f6b9728cc641b058c8a060420e8221659a9447119d2c1211cfcd6452c63a187c5dc1e4f98fc7aca2018161ae49a9a71b2264108c5e06167eaaaf18f5aa291
 EBUILD termtosvg-0.4.0.ebuild 535 BLAKE2B 36a601396f720ded522dacd4754deb2a26adbd9a8cbda06ae0239490038f3faa9d00c66835e41e01ab5007c483acd97a450276e6bde501919085797836007f4f SHA512 ccd3929947cbf35b573e9502d8c5122f2339f55f169d6a98c2edcee5cee28c17d410d029e56d0402ed43a6f1030a3f9648e07c79f48124dc2e2daf160b3d7f20
+EBUILD termtosvg-0.7.0.ebuild 651 BLAKE2B befbc29b26d535e58bc34a7a9eb2237abe14f01ee5aa4680bad97458dd2c0506535e53084edd6b911ca5e9f7577f2fd448d935daface86efe5658d87506d57b0 SHA512 9984d0743ad68982ec762ac42bc3b9488c4e0669257d4990c8b1d50489b0601abdd0cfa6229a18b6a86d90c7133df8c097bda815719602c8b90ab8df55503939
 MISC metadata.xml 212 BLAKE2B cc81de7077d569b2a0afc40390d2be47ddc84045da2c51b7a2e19fca5a5f28548ec0bbc2010b6936d5ab5c96442011ddd0833b7b594df2c2cf9abab99d99a3ed SHA512 1d2f2ca333bf8a1aba058691921bf03d664a0d4c213c4435a068893b2e50a6e86c01e07a17819600eaee93b72d9deff052fc12b10ee3ae8437e13eb17a40bc08
diff --git a/media-gfx/termtosvg/termtosvg-0.7.0.ebuild b/media-gfx/termtosvg/termtosvg-0.7.0.ebuild
new file mode 100644
index 000000000000..7bc556998fa8
--- /dev/null
+++ b/media-gfx/termtosvg/termtosvg-0.7.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{5,6,7} )
+inherit distutils-r1
+
+DESCRIPTION="Record terminal sessions as SVG animations"
+HOMEPAGE="https://github.com/nbedos/termtosvg"
+SRC_URI="https://github.com/nbedos/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-python/pyte-0.8.0[${PYTHON_USEDEP}]
+	dev-python/lxml[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	"${PYTHON}" -m unittest discover -v || die "tests failed with ${EPYTHON}"
+}
diff --git a/media-gfx/ufraw/Manifest b/media-gfx/ufraw/Manifest
index 5fc6e4286948..dcb4bfcf640f 100644
--- a/media-gfx/ufraw/Manifest
+++ b/media-gfx/ufraw/Manifest
@@ -1,9 +1,10 @@
 AUX ufraw-0.17-cfitsio-automagic.patch 933 BLAKE2B 06de9b807a9a491af2db83bfc07e3727409494a0925f01c0493e7cc5ce7b4a326f9c041d11dc30a38c6c71b42cc07e83017ffb01873a2d4f44d78a65a5c7c3ed SHA512 84aadb7dc41927a26ac37a801e136628380e79f032f87a925e737ec76c349c96c410750234f4870fe2fa61680085472a028e47c13cf01b2bd7fc7a55dad6de1b
 AUX ufraw-0.22-crashfix.patch 563 BLAKE2B 98dfd70be0cb7ec82b9f87c946a0638d7c0d444e0eb09a169609eb82f6d192cf3c0a9c4efd58a185bd83ca14a1fb795b47130c8491fb71cff372136d27c00fad SHA512 e02e71ef5660e83f49f7787c1819b6f86ed0de939db1bcd0e988f1c432ead9bd7f9e180e6974964305ab0ea65ba679b3363994213f8ffa04715176cfe45173cf
 AUX ufraw-0.22-drop_superfluous_abs.patch 448 BLAKE2B eae5b9f2dd6d12922b5fcd483447bc88a3ba4af249724f7c2dce5110d008934ce6e1601970ad7a42a952c8197b49605c3534c458e87ff804ccb1be861442d029 SHA512 847c5081225236d3728400d2d4f19f25fc971d9ee7b8a87395400f04d4ca82403d6fc10876f4884a3dcee7d1b2ac9a418132fa839d35f370484cc47fb6381a60
+AUX ufraw-0.22-exiv2-0.27.patch 736 BLAKE2B f8529ff60d93cc2333f9c083c780ad8892ccfb79f5290b9b594c7aa7d9ce3330af4966bc7dc2e5dc1358c5c31b85c26db475083ed49809409c89d23ef08668d0 SHA512 0dabac819a8bbe4a51d3b6a523aee7b80807343c28e9d03a1dc9bc378a7d353f61a592187f1e7c6067833e7fe0354fbd643bca74c0fac3c58b3c92a4b48d74af
 AUX ufraw-0.22-fix-unsigned-char.patch 748 BLAKE2B 30a8dfcfb71f78449838ade5f77074d667fc1e71ca079f8042869a9e82ff8b9422ddbdc892c7458e05ad411d552352b5f530ae2da4a629d449857a1e62be0c78 SHA512 0ea99fe69adeeae1e6c07bcf9d583f6b8247ad0f01ddf3435edb605618b0c24d80c5662442250020b92352ebba12757bb69ad7b107ab8a8f464d5cf2b642664b
 AUX ufraw-0.22-jasper-automagic.patch 613 BLAKE2B 100e6b31540030a20c8cff8e99329a738378788b2ab11665c0c8ab2f3246c821a176dba8b26cea354e8b0d127d2c601c21b0ac94f5264327916d0f8779618165 SHA512 855337bf109ebc0ea7b9bd429bcc429bd9caa561e2a815352c51e860a6e405d500913b70414ded7f47e053332c89b964d1817c8f22627504cf157f1565f3c7a4
 AUX ufraw-0.22-jpeg9.patch 1076 BLAKE2B 84448c537706d7b29f54d4735a75bf9501eac7927529c6d8e43d6cd746763ab753715d54cf943bb8bb5ddd8a29891f7522a680426acd2eb52af450492656ae3e SHA512 520e9351d7b8aa84f79a7c2841c2f56eaca849e67e448dc9503d248e31c1aa9fecaa64a332c0a155b6ba1ab7debec8734f3f2ef710bcb534a5fca34e9b5c8f7c
 DIST ufraw-0.22.tar.gz 1103554 BLAKE2B 5ffa4c660602553853221d7b31bfb78b02644bfeb4461cf752186d83ed8087b7905e414c7d741916ca9460c05849ab679b2f3098c99e5246f54a49b6a915268f SHA512 a42eff5052c18afec90245cf97ceeade78e3f288186cf697ac4abf2e8290d4081db8ac4de3ae47b3774f30a6cb4cbda392099e6fd2125fe751abb40d9b065ad2
-EBUILD ufraw-0.22-r2.ebuild 1968 BLAKE2B 32eec969ce988629e5e0b3d8c54f200c866909a6b4556ec52dbdb3f7cf6b9712a74193b36afc9e35f465507be7a0a2c769979746d0a991092a254567173b1912 SHA512 aeb94e7987b34ee68a618b18129695ad7d9151803f18decc3dd1b20934109e4d3c1f1bb2d825981a37761f11ef099f42e86a2e82e26cde11fbb2cd514fb7199a
+EBUILD ufraw-0.22-r2.ebuild 2002 BLAKE2B c3c54bbcc51a514f98f540d410cc93cd509af6686ada5a8c948d9c9d38bab063189881a99bfbd9b88ed3fbe6b5ce96e55903ed3e9ab1f6020d6e43b9a0331973 SHA512 9f455ad03021159f589bb3a78b718854395ce56f937cd18169f1a2f3ed11ee59566c4203574d7feff3d466cf91f39beafa825b7fcda9237a7ae125ed90449405
 MISC metadata.xml 588 BLAKE2B 3e6ec0c8b11a3c30d1b20b5df4303fc1bc10b4e6459a24358ac50bcfaa414b307efe6d392d23fd7ce1443917865deae0dfa89cc7a068567f227cdc387f99d1cb SHA512 3d161ddfe0da5620312603d66acbc24244317da4dcb905558eddda9d54bf96024881ffbdcaa49f9daf73d779d5e7dbb47a523e05cc6c614756b468f14ef66ab9
diff --git a/media-gfx/ufraw/files/ufraw-0.22-exiv2-0.27.patch b/media-gfx/ufraw/files/ufraw-0.22-exiv2-0.27.patch
new file mode 100644
index 000000000000..b5b4140fff8e
--- /dev/null
+++ b/media-gfx/ufraw/files/ufraw-0.22-exiv2-0.27.patch
@@ -0,0 +1,25 @@
+--- a/ufraw_exiv2.cc	2015-06-16 05:58:38.000000000 +0200
++++ b/ufraw_exiv2.cc	2018-12-29 22:51:23.291894430 +0100
+@@ -15,9 +15,7 @@
+ #include "ufraw.h"
+ 
+ #ifdef HAVE_EXIV2
+-#include <exiv2/image.hpp>
+-#include <exiv2/easyaccess.hpp>
+-#include <exiv2/exif.hpp>
++#include <exiv2/exiv2.hpp>
+ #include <sstream>
+ #include <cassert>
+ 
+@@ -67,7 +65,11 @@
+         if (exifData.empty()) {
+             std::string error(uf->filename);
+             error += ": No Exif data found in the file";
++#if EXIV2_TEST_VERSION(0,27,0)
++            throw Exiv2::Error(Exiv2::kerErrorMessage, error);
++#else
+             throw Exiv2::Error(1, error);
++#endif
+         }
+ 
+         /* List of tag names taken from exiv2's printSummary() in actions.cpp */
diff --git a/media-gfx/ufraw/ufraw-0.22-r2.ebuild b/media-gfx/ufraw/ufraw-0.22-r2.ebuild
index 53994be42a82..9bbc7e771218 100644
--- a/media-gfx/ufraw/ufraw-0.22-r2.ebuild
+++ b/media-gfx/ufraw/ufraw-0.22-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -44,6 +44,7 @@ PATCHES=(
 	"${FILESDIR}"/${P}-drop_superfluous_abs.patch
 	"${FILESDIR}"/${P}-fix-unsigned-char.patch
 	"${FILESDIR}"/${P}-jpeg9.patch
+	"${FILESDIR}"/${P}-exiv2-0.27.patch
 )
 
 src_prepare() {
diff --git a/media-gfx/zbar/Manifest b/media-gfx/zbar/Manifest
index abebb2977bfe..201c2ba651f2 100644
--- a/media-gfx/zbar/Manifest
+++ b/media-gfx/zbar/Manifest
@@ -2,8 +2,6 @@ AUX zbar-0.10-errors.patch 178 BLAKE2B 588e8d227bf8d7f47346dcc4a9c99ad5b372af5e2
 AUX zbar-0.10-python-crash.patch 604 BLAKE2B 463f23b6338455b0029fce845fcbb02168c86b9ddc116f34f15668459d8ac86d77dabe388cd61af9182c02be37475363ff832d7c8c705d29bf1829f7ccb167b3 SHA512 56e1848466b2178fb25a1f88f1a35113c01d370927b5778af96f1b96bcdaa8349308ac7ef14fb247bc5ec4165b2f7daa717159f3f7786ced9c043428afd641ba
 AUX zbar-0.10-v4l2-uvcvideo.patch 1487 BLAKE2B 61486465183a50ee0e515d6232923c63819e707d4a429a653f94ea6b7f404e8a5ab54602e074df0fab3f0188c50e8f4fc12a6ac5a63509484d7cd24925bb1957 SHA512 6a53eb54ed3ad83cacb9a09d0b119550d364e586990725f0a423a180fab790e18c2c6d8201d185a51bd26ea3955018416b2993fbdb5e5a555e13183b3bce7b1a
 AUX zbar-0.10_p20121015-ImageMagick-7.patch 1135 BLAKE2B 103cfe85d547cd3087a08676abdfd5966b9b4dd32de4c35e1aee144247af8562e6425d65d170fcb98bcb43e0bc18dcd39d4cf3baf46eea4a1c81814a14946bb0 SHA512 c67dee821338d0bbb54b3c4b22a75616e876ad56e5bbcaad856fe16b39ef3e07b7b80dcb6c25023857ebd561c55ac4faab144fa4ead05424df24d5af7c2509dc
-DIST zbar-0.10_p20121015.zip 991578 BLAKE2B 021dfa3920a838fd7bab12b09600ac6949c1495045691c4cc547bfb6ec647658c60984da248b882eabfc0bb123b90401dd3a32adcd66726b1e7072662e303d18 SHA512 7bb74ea5b096093b283c44787547ad0b886281628d012aa7b03ddb477732feb1e12d4d5a661191d34b53b7b272a237f67840e219b0ac5e2803da478a1ddba7a1
 DIST zbar-0.20.1.tar.gz 555199 BLAKE2B f224a2207fa0603da4cc3a0e1d05bc73f3cf0cc9d13c26b3b801d3418f4f6a001b52e468b721552af61f4c8d7357934abd0560c24d3b233107785c69cfe14753 SHA512 21ad9d8fcdecb41bd4b8979366ab8ec6e8eac815f52270b0dc72ce6a126ccef933d048ce8bbe28f46ada5defadf85ba8c97c5c1870c9560a9dab28c585dfaf42
-EBUILD zbar-0.10_p20121015-r3.ebuild 3548 BLAKE2B 24e764ae81a68d9d98c9b8e8c8cf7a8dd7b39575c7f24069a466cdd042e1b86029f23fb72247dee0dfccf0505c6126f06cac9ac0f3b731d9d02082bec4380618 SHA512 2ff8dd34f79079d14e09b7a206a2f1f6944be1b6ff24e8b8b0ff1a27857aa6ccd34c5777cbf23e32736cbf39be3acc803c459259fe501f6784122a5a19cafd16
-EBUILD zbar-0.20.1.ebuild 3692 BLAKE2B 58f3c764c385c869bd62e26942631c0e4da54b9cc7a9cc36c65eefb3e6b92d3c8392bd6bd2b30ce0a37cbacc640124d6c6d6afa3b19f70f67e25dfb53cc09b4a SHA512 9dd2b3770af1385288f3e69bef96a3f92428dde72b7a8c938d1a6591e337d9e4f1b9c527833f89b6d5e09de56adad2db498d58bf9a4156493d6d525f92ffc6d0
+EBUILD zbar-0.20.1.ebuild 3691 BLAKE2B 189ed71aaefad1f83cf257ff7963198abb196fc0ada528f303f2d10ebe6564351c256328716dbf0f58a84cd02c2ec5acf64a505dff9611adb91f3ef68d1603d1 SHA512 6e9bc1e749fefc3d0502b5115f6f0f64ba70035916df793c0110d259d1a91f122dd34c11c2b387a192b7a0df2d7d59fd39955b8a900af9b423b93ed5cf78b4e4
 MISC metadata.xml 353 BLAKE2B 7b2ecbdb282d7be372b33efc762ff91d574edf1f176e65c300a2a1cdab0d9c86a12be1d4c49f48a684237eb265ee7491ef9bebbfd62a6005246031f7271b7e32 SHA512 8547b611ca96a01ec0d6dcd01c61203984af10306223a77071fe9be348d1ca7ceb290c4160ca9eb8ebc04227caa9b9f5bf3d3d436b97f140fc534fbd3236826c
diff --git a/media-gfx/zbar/zbar-0.10_p20121015-r3.ebuild b/media-gfx/zbar/zbar-0.10_p20121015-r3.ebuild
deleted file mode 100644
index 6990df2d2b35..000000000000
--- a/media-gfx/zbar/zbar-0.10_p20121015-r3.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-inherit autotools flag-o-matic java-pkg-opt-2 multilib-minimal python-single-r1 virtualx
-
-DESCRIPTION="Library and tools for reading barcodes from images or video"
-HOMEPAGE="https://github.com/mchehab/zbar"
-SRC_URI="https://dev.gentoo.org/~xmw/zbar-0.10_p20121015.zip"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE="gtk imagemagick java jpeg python static-libs test +threads v4l X xv"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
-	test? ( X ${PYTHON_REQUIRED_USE} )"
-
-CDEPEND="gtk? ( dev-libs/glib:2[${MULTILIB_USEDEP}]
-		x11-libs/gtk+:2[${MULTILIB_USEDEP}] )
-	imagemagick? ( virtual/imagemagick-tools )
-	jpeg? ( virtual/jpeg:0[${MULTILIB_USEDEP}] )
-	python? (
-		${PYTHON_DEPS}
-		gtk? ( >=dev-python/pygtk-2[${PYTHON_USEDEP}] )
-	)
-	X? (
-		x11-libs/libXext[${MULTILIB_USEDEP}]
-		xv? ( x11-libs/libXv[${MULTILIB_USEDEP}] )
-	)"
-RDEPEND="${CDEPEND}
-	java? ( >=virtual/jre-1.4 )"
-DEPEND="${CDEPEND}
-	java? ( >=virtual/jdk-1.4
-		test? ( dev-java/junit:4
-			dev-java/hamcrest-core:1.3 ) )
-	test? ( ${PYTHON_DEPS} )
-	app-arch/unzip
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-pkg_setup() {
-	if use python || use test; then
-		python-single-r1_pkg_setup
-	fi
-	java-pkg-opt-2_pkg_setup
-}
-
-src_unpack() {
-	#vcs-snapshot doesn't work on .zip
-	default
-	mv * ${P} || die
-}
-
-src_prepare() {
-	eapply "${FILESDIR}"/${PN}-0.10-errors.patch \
-		"${FILESDIR}"/${PN}-0.10-python-crash.patch \
-		"${FILESDIR}"/${PN}-0.10-v4l2-uvcvideo.patch
-
-	# fix use of deprecated qt4 function, bug 572488
-	sed -e 's:numBytes:byteCount:g' \
-		-i "${S}"/include/zbar/QZBarImage.h || die
-
-	if has_version '>=media-gfx/imagemagick-7.0.1.0' ; then
-		eapply "${FILESDIR}/${P}-ImageMagick-7.patch"
-	fi
-
-	use python && python_fix_shebang examples/upcrpc.py test/*.py
-	java-pkg-opt-2_src_prepare
-
-	sed -e '/AM_INIT_AUTOMAKE/s: -Werror : :' \
-		-e '/^AM_CFLAGS=/s: -Werror::' \
-		-i configure.ac || die
-	sed "s|javadir = \$(pkgdatadir)|javadir = /usr/$(get_libdir)/zbar|" \
-		-i java/Makefile.am
-	eautoreconf
-}
-
-multilib_src_configure() {
-	if multilib_is_native_abi && use java; then
-		export JAVACFLAGS="$(java-pkg_javac-args)"
-		export JAVA_CFLAGS="$(java-pkg_get-jni-cflags)"
-		if use test ; then # bug 629078
-			java-pkg_append_ CLASSPATH .
-			java-pkg_append_ CLASSPATH $(java-pkg_getjar --build-only junit-4 junit.jar)
-			java-pkg_append_ CLASSPATH $(java-pkg_getjar --build-only hamcrest-core-1.3 hamcrest-core.jar)
-		fi
-	fi
-
-	append-cppflags -DNDEBUG
-
-	# different flags for image/graphics magick (bug 552350)
-	myimagemagick="--without-imagemagick"
-	has_version media-gfx/imagemagick &&
-		myimagemagick="$(multilib_native_use_with imagemagick)"
-	mygraphicsmagick="--without-graphicsmagick"
-	has_version media-gfx/graphicsmagick &&
-		mygraphicsmagick="$(multilib_native_use_with imagemagick graphicsmagick)"
-	ECONF_SOURCE=${S} \
-	econf \
-		$(multilib_native_use_with java) \
-		$(use_with jpeg) \
-		$(use_with gtk) \
-		${myimagemagick} \
-		${mygraphicsmagick} \
-		$(multilib_native_use_with python) \
-		--without-qt \
-		$(use_enable static-libs static) \
-		$(use_enable threads pthread) \
-		$(use_with X x) \
-		$(use_with xv xv) \
-		$(use_enable v4l video)
-
-	# work-around out-of-source build issue
-	mkdir gtk pygtk qt test || die
-}
-
-src_test() {
-	virtx multilib-minimal_src_test
-}
-
-multilib_src_install_all() {
-	dodoc HACKING NEWS README TODO
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_preinst() {
-	java-pkg-opt-2_pkg_preinst
-}
diff --git a/media-gfx/zbar/zbar-0.20.1.ebuild b/media-gfx/zbar/zbar-0.20.1.ebuild
index 1299e249e153..700328f75383 100644
--- a/media-gfx/zbar/zbar-0.20.1.ebuild
+++ b/media-gfx/zbar/zbar-0.20.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://linuxtv.org/downloads/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="graphicsmagick gtk imagemagick java jpeg python qt5 static-libs test +threads v4l X xv"
 REQUIRED_USE="
 	python? ( ${PYTHON_REQUIRED_USE} )
author	V3n3RiX <venerix@redcorelinux.org>	2018-12-31 13:43:35 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2018-12-31 13:43:35 +0000
commit	2891d29af8907ce881662f4a02844926d7a293c7 (patch)
tree	56979d96839d0827aa52008b81b746b4934d88df /media-gfx
parent	de49812990871e1705b64051c35161d5e6400269 (diff)