gentoo resync : 25.09.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-09-25 19:33:39 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2019-09-25 19:33:39 +0100
commit: a5b65c81168c90928784a1e92cda84ed5d6b9eb3 (patch)
tree: 4aa7483cd0ad7de54338afc8e7971417abe1dd81 /media-gfx
parent: e8f81810baa21f490d6910e8e2d424546b72a333 (diff)
46 files changed, 841 insertions, 461 deletions
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index bd2f862323cc..e3d7080d5d72 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/ahoviewer/Manifest b/media-gfx/ahoviewer/Manifest
index 47e74c4e5c5b..36b72c81ff8b 100644
--- a/media-gfx/ahoviewer/Manifest
+++ b/media-gfx/ahoviewer/Manifest
@@ -1,3 +1,3 @@
 DIST ahoviewer-1.6.5.tar.gz 227653 BLAKE2B 691a9eaa62b55d91b2d215d41ce402c39ca7490a44506a489061aaadd97fac2ac84aa1b28a7d1b4c097d69153ffe146fac105e9b086adc6b66b9f459e6b98eb5 SHA512 30309cff22008d444eec113bd5d79bdc0e9ff1bbc1b117bd3ecefabfdef79773fd17347766115bb0a192db76dbb24f30c853b27123f0a333c8625b94dc2a8775
-EBUILD ahoviewer-1.6.5.ebuild 1750 BLAKE2B 6c4d365732f480ce61f4d99b0b7a505bdc8bf8698b6698d48c8f9656bb73a3ab5548f715a165fc594be1ca6d7c920bd6a357743fe04746e02e306656527c6246 SHA512 73d6616d4ff8413091a45d867e02e373f6b6a5112ae4d8ee1278c90ac45def3649655f92871a939d5f8854d6b8a962182cd3d177f9e29249eaf0d14730b6bf12
+EBUILD ahoviewer-1.6.5.ebuild 1748 BLAKE2B b2bd89770e6dd99b421f01833a9a2c4adb42fc0dd8f55808237ba748899acd9de1a6b3baa5f54be81979a0543567b841b75064c65475be5bd7dfaebc4e56a2b7 SHA512 5dc5b7d36e745c62517294006ae999e0cc5f7b90f318669b859a35ff8bafd8262a27f0ad82beeb5a9ea0df69df198032a810c69e5a54be8e091b487f9c619bef
 MISC metadata.xml 410 BLAKE2B 1344e377cacd46abde3ab09e9aebd4c35390e6f403dc856cf4f04f4f1d9bff5b51930a89f94060d183853e6c98d2dd9c0d7dc31947e5752fd015e8b2276827f5 SHA512 784da6432d4f8d0f574fe17507cf49dee620a685de39f806d5455baa9e6625629d1aa0ca735706193d4b3cdf03696328a4ebed4bc3692efcf22d899eaa5258dc
diff --git a/media-gfx/ahoviewer/ahoviewer-1.6.5.ebuild b/media-gfx/ahoviewer/ahoviewer-1.6.5.ebuild
index 9bf5639b9434..64f4f1013499 100644
--- a/media-gfx/ahoviewer/ahoviewer-1.6.5.ebuild
+++ b/media-gfx/ahoviewer/ahoviewer-1.6.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ahodesuka/ahoviewer/archive/${PV}.tar.gz -> ${P}.tar
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="gnutls +gstreamer libsecret +rar +ssl +zip"
 
 DEPEND="
diff --git a/media-gfx/album/Manifest b/media-gfx/album/Manifest
index 70bec3dab63c..a3250325ba00 100644
--- a/media-gfx/album/Manifest
+++ b/media-gfx/album/Manifest
@@ -4,5 +4,5 @@ DIST album-4.15.tar.gz 651380 BLAKE2B da6728f65586b242297bb7c8d8ae676de636177539
 DIST data-4.05.tar.gz 6468036 BLAKE2B 3e11911dabcf024934653f5fb5c3c3b65bd2ad5e6607c67ee1dade392540bb0b7c90de521effa5d72d2f40dc6c02016e23d373f714a3b62c15af53ebb4d438d3 SHA512 a7c577df6d10dc2db53fa6d469d2cf9c5115de99df47e79f31ecc0b009bd12e654e4ca7b9e6e78abe90a8a87d5f52ca9946a2d632e3f219d9bcb5ab7838ce42e
 EBUILD album-4.07.ebuild 898 BLAKE2B 7bd2dd060bed7655f159eaa858da473f9b40da8886777cd22ca3302a26ab3c9d378d0501ccf7eff792c3abd837a904878f6901f7e36392981127c3d6a54c3062 SHA512 ad9aae9a19a84cfe0afb7ad39950025e435abfc3d3ff7d09122801975ea70c436973ecab74ec2fe9bc4717ae216c062d17aefce86e6520db4ae5b4fae90a0964
 EBUILD album-4.13-r1.ebuild 899 BLAKE2B ec2ec1d85335f477a07fdb0b5d5c69cea71593db8515e9d28d41514601c4accc23fc9719b018d03ff313390109824413517d491337a3d9facd99ef22e935b6e1 SHA512 459d5f73f0229da36a2ad154acbb4afc6c7b93e7a0691672c07a9bff297a50ee926c7e641bdd7219bdf541243fcf60777e6f81ad58892d8384bc567cd5025fea
-EBUILD album-4.15.ebuild 907 BLAKE2B b48499b10e5154483347ecd163776030797ef3b2b77d2f6af5adf54a8b87e21cc3c4b68625551c05b91cd7638a44df94d807cb24d0e9ef9a380430bb22096d2f SHA512 dda597bd90fbe06909ad95be660c748302891dc3897f35c802687a452125a9b2d450635bb627e67b547e71bedf24b436ff7803ec407f0f12da717998a43c2143
+EBUILD album-4.15.ebuild 942 BLAKE2B d451d96c4591a0a66d42e2e62149bb0d58cb546911956318daee089a16fdfb820778096c4484a4e0d4488e16aa43f3aa1e0349c39586c6cbc95b0bafae42c0cd SHA512 da75dcbd607886d54837c915997d4fb63b4d628eb37fbaed2e81aa221b49a0627fd42539737ee012d7078f83c12dab15563d22a567e12fcf3016b2481f83fefa
 MISC metadata.xml 374 BLAKE2B 05c713b2922350914356e8a0073f22c635b6c1b84bd6d0dd8031b0515fba8580da54636e1e75dd4bfd903fd10b3f465cfbda325e4e826bffee3a40badd9cf8e8 SHA512 b0e38d10966a2d98b1f8d8235e9f8c96c294037e503179531e795ffedcf8517ddcab991d692fc7dae7d64e354510a36e07671fb216b94a62b3d78c938667d530
diff --git a/media-gfx/album/album-4.15.ebuild b/media-gfx/album/album-4.15.ebuild
index 29747bb6555f..ce30184d4956 100644
--- a/media-gfx/album/album-4.15.ebuild
+++ b/media-gfx/album/album-4.15.ebuild
@@ -23,11 +23,15 @@ src_install() {
 	dobin album
 	doman album.1
 	dodoc License.txt CHANGELOG
-	use doc && dohtml -r Docs/*
+
+	if use doc ; then
+		docinto html
+		dodoc -r Docs/.
+	fi
 
 	dodir /usr/share/album
 	insinto /usr/share/album
-	cd ..
+	cd .. || die
 	doins -r lang
 	use themes && doins -r Themes
 	use plugins && doins -r plugins
diff --git a/media-gfx/darktable/Manifest b/media-gfx/darktable/Manifest
index 53a84562a50d..4f62ea364325 100644
--- a/media-gfx/darktable/Manifest
+++ b/media-gfx/darktable/Manifest
@@ -1,8 +1,10 @@
+AUX darktable-2.6.2-exiv2-0.27.patch 598 BLAKE2B 724290bb5c1344c0113abde04688009b3db10f530684f3f53e0fcc935a9ebef4b3680a36cb5d005e8826ea1512f0ec505b06e404d144006848601699d33d1416 SHA512 77fc92bf8d373552fc82de1927a1708b989caf0b080c8ef279692c0b9f2e95526a70d2bf4af5f62abb68ccb733af08237f9e143773cc8a75d72dfb6ba434df6c
 AUX darktable-find-opencl-header.patch 601 BLAKE2B 0102ea562ec0addb619f06b59cc73834d734c454a7c561654bc27f052de55db6c62f454927b2c701b7f4f6c52d5d2fac0b7c230b90ef89bdc9431856bd4ae69a SHA512 93023a318158850a5bac4a1d871ea6e69a3c9f2bc57f8af47bc83bb131f96e8972c23b07945df2eddfb05bffdd950e8250da77c47d1543b776a7e9405adad020
 DIST darktable-2.6.1.tar.xz 3473300 BLAKE2B e2194d9d967872b3dbc5dd608b3aa946424ff8a20a00b8cd8e1e9dd7ad3146acd791d2a7f20652d4673fdaac7bec86e405e055bab664c41b601b5788f0f15e72 SHA512 0d92fa35629ca02ca7cbb2910966b3fad57e536c967fd05381ad02dc9645106e6baaf1a93c1c186618624850c876f23305704e41d7151150e3367e21c415a967
+DIST darktable-2.6.2-gcc9.patch.tar.xz 25864 BLAKE2B 857803d4c46b47b1e06e962533c231621fa23e72dffae617bc4e078316fc22c5883df404b30e63d7ed2111078d0d7b54bfa3510524c92fa739238904e2ec17f0 SHA512 29b208fa0b04aa11a2c45312763ba471785b2d0f669c07a6092b82adc0284428d7dc9ea8ebae7bd851414f04191e6aafb434fcc127f062ef66d075208c7d49cb
 DIST darktable-2.6.2.tar.xz 3512572 BLAKE2B ee3070ac0f6b6b1c401865801631fb28397f484f30778065b7f899204813530a47ff6e752504b645f59bc29f868e1498e39f5f4e70f8259d8fecf5abc3f15cd6 SHA512 e7a90535747a8615fa2dbd1eb05f81314cc61c689a8a85fda0e2be40208ab0248e6f6ef296bb0894d3d527ed47c6cf6640538029c0c2d58a38d2d5ce10f6f5c0
 DIST darktable-usermanual-2.6.0.pdf 15623135 BLAKE2B a7a254e49dd57ee03480d52f4506a436210324cc4a2651f3c2fd70ca65cb7aa1735934a5e046ffa662b2aa1f081042d2d1e6ce0f70b6768719c52e2d14c358ce SHA512 e68005ee8706f2342755ce3e4dcd6c2907c1607bc9b750154dceb4b52dcccf50c581ab65212efc8ffb2447f5d828e0fdb61d0471c3d14938e098528e50f32e14
 EBUILD darktable-2.6.1.ebuild 3763 BLAKE2B df499fa003b19a7f98fac89c5ba73209dd0922e733d596e9ceff9d5ec7034777eee8e57cf6418af3d37afb628bc7ce3bc616617034477be54c62b4d36ec454b9 SHA512 8a9504b625666b88ab790a250a725907d068fccd66cb2e70d17b0b7a55824eb3512fa320b4009f6300af242b8533a0a766c8ad5f10b3cd89c28b7d1f5a4a32f5
-EBUILD darktable-2.6.2.ebuild 3768 BLAKE2B 177d62db7bc383244eadfb2cad1806d1e7cba958656bc597252b57431746807cf3bf2a310b577bc6b91a753e6d5198fce0935a46c0d3cf3c2fef50fe9ac8a782 SHA512 ca6cb3a3b140d1cb914a0e64beba5e7e97804fbc42a8419ea824d2ca6d68502eea60d7673cf093dd86b500739562a714e3f9bdbef16e95aea78687f56f274789
+EBUILD darktable-2.6.2.ebuild 3905 BLAKE2B c39ab5dba83d8392d42217b2b4ba1a4a2a7207361247fd0dcef8d7feef73608b4ce6a9a0544046c51f80576bd0ea175b416cd54e35540c1816ec89310fc10a54 SHA512 fd6d86928b84d443ad3e087dac9b115787ad2efdfeac42c360f9727294b225ece9861e1b21ebf5d7e8aa5b05623f3dc6c3d3db79b012b1737f10b1ec86b436b6
 EBUILD darktable-9999.ebuild 3159 BLAKE2B 3baf702f5ac1c0bbab2797e3ff2fdf63477b5f0050d2f23fe1bbf8090021ba30c68a491f34dffc18b5034d5d24fe3cc0625bc52a87062605e9e9dcdda55c7af8 SHA512 e5baeaa66d89d7a05b584a8d3b7d035b4a3c8f143a2d51cc800f7b3769ab9d71f85f171d362cb20ac64f79d538f1ef5bf428e216733928695ba3e0a0d4b87e3c
 MISC metadata.xml 784 BLAKE2B 7e7f55f709fa5d7da777b272232cece75e55e2754701f759630afe0857f971341fa0d4b2b1a6c96391b3de2bd94966ccb0ed6e8fb17089de71f34418ed397cba SHA512 ae9a9f28be76a93c0b5c90892489c0e8397ea84f043fa03787e6ad774b8c79c834059fd5e55d6f46e63bd9a9411218585e99e59acef7e21493ff4543bb0210c4
diff --git a/media-gfx/darktable/darktable-2.6.2.ebuild b/media-gfx/darktable/darktable-2.6.2.ebuild
index 48d249ae7306..c098e19ec258 100644
--- a/media-gfx/darktable/darktable-2.6.2.ebuild
+++ b/media-gfx/darktable/darktable-2.6.2.ebuild
@@ -12,6 +12,7 @@ MY_P="${P/_/.}"
 DESCRIPTION="A virtual lighttable and darkroom for photographers"
 HOMEPAGE="https://www.darktable.org/"
 SRC_URI="https://github.com/darktable-org/${PN}/releases/download/release-${MY_PV}/${MY_P}.tar.xz
+	https://dev.gentoo.org/~asturm/distfiles/${P}-gcc9.patch.tar.xz
 	doc? ( https://github.com/darktable-org/${PN}/releases/download/release-${DOC_PV}/${PN}-usermanual.pdf -> ${PN}-usermanual-${DOC_PV}.pdf )"
 
 LICENSE="GPL-3 CC-BY-3.0"
@@ -68,7 +69,11 @@ RDEPEND="${COMMON_DEPEND}
 	kwallet? ( >=kde-frameworks/kwallet-5.34.0-r1 )
 "
 
-PATCHES=( "${FILESDIR}"/"${PN}"-find-opencl-header.patch )
+PATCHES=(
+	"${FILESDIR}"/"${PN}"-find-opencl-header.patch
+	"${WORKDIR}"/"${P}"-gcc9.patch
+	"${FILESDIR}"/"${P}"-exiv2-0.27.patch
+)
 
 S="${WORKDIR}/${P/_/~}"
 
diff --git a/media-gfx/darktable/files/darktable-2.6.2-exiv2-0.27.patch b/media-gfx/darktable/files/darktable-2.6.2-exiv2-0.27.patch
new file mode 100644
index 000000000000..c0eb59bc639d
--- /dev/null
+++ b/media-gfx/darktable/files/darktable-2.6.2-exiv2-0.27.patch
@@ -0,0 +1,21 @@
+From 556887d7a973bdf0611fcc57231e107b503d9949 Mon Sep 17 00:00:00 2001
+From: Bertrand Antoine <nexus6b@gmail.com>
+Date: Wed, 22 May 2019 21:49:59 +0200
+Subject: [PATCH] Fix build with exif2 >= 0.27
+
+---
+ tools/basecurve/exif-wrapper.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/tools/basecurve/exif-wrapper.cpp b/tools/basecurve/exif-wrapper.cpp
+index 72550721f6..f4d4d46e12 100644
+--- a/tools/basecurve/exif-wrapper.cpp
++++ b/tools/basecurve/exif-wrapper.cpp
+@@ -17,6 +17,7 @@
+ */
+ 
+ #include <exiv2/exif.hpp>
++#include <exiv2/error.hpp>
+ #include <exiv2/image.hpp>
+ 
+ #include <cstdio>
+\ No newline at end of file
diff --git a/media-gfx/displaycal/Manifest b/media-gfx/displaycal/Manifest
index 2a141d808c7a..c0eb66c1423b 100644
--- a/media-gfx/displaycal/Manifest
+++ b/media-gfx/displaycal/Manifest
@@ -2,8 +2,10 @@ DIST DisplayCAL-3.7.2.0.tar.gz 10536990 BLAKE2B c3e0c1b75c10911b1624d56f4e5d612e
 DIST DisplayCAL-3.8.1.1.tar.gz 10611516 BLAKE2B 797c20aa7d26014ce5d039de352639b6d9f045eb06701044a0cb4a1b34c9744b0ca4f659a33cd23d16fe918e5d7e270def4ecd5007ddfc82682b486d3a413e44 SHA512 75d4ff038ad4f98b2d234b99d473a9e951983a607c28bc4eadcaa89bcfaa02ca13ed18fca8d4608cd881f215cbb37c36f91f7862a8c83541423524aca35b4688
 DIST DisplayCAL-3.8.3.0.tar.gz 10602825 BLAKE2B f74df1b9c1c9a63c84c3f78e1d38324075a65c54e289fe6c1a1871af69046f49e2b893f82db0542ad6062cd5bab4c3ffa98a25f21f428a9cb50483337a84e3c6 SHA512 8ede8200910dbef3d81e7d3aee89dd67f1f7ee3f22a8205780c63a05673ca7273e9e4138c418c7bc1e6c57240aab79453949d97a0651fbbbc4926b80cd50a8cd
 DIST DisplayCAL-3.8.5.0.tar.gz 10605505 BLAKE2B fa268780e34f485e7c90caccc5a76b70131520730be41b74f7b855e843c32ee10af1aad64412842dc85c9a1fbe28e74b9062f23183fa7cf3cde0381c64c8b7d4 SHA512 8c44a4524796174755d306a93e9f03c06b1c219b5173c081ed6456d6bcbb725a8e9c424acdf420dc444f10eedcff935bc93e399f1609b6d8a454e486e8207974
+DIST DisplayCAL-3.8.7.0.tar.gz 10619677 BLAKE2B 9b697d3548bd3a2a7a5f2bb38589bdd7e67ff964b613371a83ae11ec1a114874283d67a442f4336a1d50e86fe127ae755ea68865de112ea83520def404a6e715 SHA512 f47cda64648ef59c211aa54993ee423e80caf26f8942de88672e430bec7976d83f15c58fe9df8217217be48a1b36e8c3342fc3baf862077fe229da214fd38400
 EBUILD displaycal-3.7.2.0-r1.ebuild 1597 BLAKE2B b916779c94482492e7c5afb4c14df42112e57aacc9abd225ff6734aa1b826329a60077dfcf4f36ca2a0d423036e16126a151226b47a992770b1048735c7a07d0 SHA512 6be4e0594baa19567b31f7a1daeabcfc1bb6a9a21c8212003de604588dfcff97ec97c17f18c2dd7ab910e6dcf69697c0f50a1e4be623e3f798bc8661bceb3e82
 EBUILD displaycal-3.8.1.1.ebuild 1597 BLAKE2B b916779c94482492e7c5afb4c14df42112e57aacc9abd225ff6734aa1b826329a60077dfcf4f36ca2a0d423036e16126a151226b47a992770b1048735c7a07d0 SHA512 6be4e0594baa19567b31f7a1daeabcfc1bb6a9a21c8212003de604588dfcff97ec97c17f18c2dd7ab910e6dcf69697c0f50a1e4be623e3f798bc8661bceb3e82
 EBUILD displaycal-3.8.3.0.ebuild 1597 BLAKE2B b916779c94482492e7c5afb4c14df42112e57aacc9abd225ff6734aa1b826329a60077dfcf4f36ca2a0d423036e16126a151226b47a992770b1048735c7a07d0 SHA512 6be4e0594baa19567b31f7a1daeabcfc1bb6a9a21c8212003de604588dfcff97ec97c17f18c2dd7ab910e6dcf69697c0f50a1e4be623e3f798bc8661bceb3e82
 EBUILD displaycal-3.8.5.0.ebuild 1597 BLAKE2B b916779c94482492e7c5afb4c14df42112e57aacc9abd225ff6734aa1b826329a60077dfcf4f36ca2a0d423036e16126a151226b47a992770b1048735c7a07d0 SHA512 6be4e0594baa19567b31f7a1daeabcfc1bb6a9a21c8212003de604588dfcff97ec97c17f18c2dd7ab910e6dcf69697c0f50a1e4be623e3f798bc8661bceb3e82
+EBUILD displaycal-3.8.7.0.ebuild 1597 BLAKE2B b916779c94482492e7c5afb4c14df42112e57aacc9abd225ff6734aa1b826329a60077dfcf4f36ca2a0d423036e16126a151226b47a992770b1048735c7a07d0 SHA512 6be4e0594baa19567b31f7a1daeabcfc1bb6a9a21c8212003de604588dfcff97ec97c17f18c2dd7ab910e6dcf69697c0f50a1e4be623e3f798bc8661bceb3e82
 MISC metadata.xml 342 BLAKE2B e74a7767c5b6e82bd35776606de555f9d4f26a25727decc6b0216fa3ea27cee8f28a7749e46b842c52e403c5150b24b4e33e0b971bd49077814e7945ee8cc290 SHA512 f9d5979fc8525c40af8d4e64afb8264873b0ae7cda1e9c4f3b3f30957c2a4f7fcbab76002783213a896395e8b5ef78e315441c28872589a91a0035d5f346d317
diff --git a/media-gfx/displaycal/displaycal-3.8.7.0.ebuild b/media-gfx/displaycal/displaycal-3.8.7.0.ebuild
new file mode 100644
index 000000000000..6d9baac97b2a
--- /dev/null
+++ b/media-gfx/displaycal/displaycal-3.8.7.0.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 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[${PYTHON_USEDEP}]
+	>=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/faulthandler[${PYTHON_USEDEP}]
+	>=dev-python/numpy-1.2.1[${PYTHON_USEDEP}]
+"
+
+# 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/eog-plugins/Manifest b/media-gfx/eog-plugins/Manifest
index d99053cfb264..3de9a9833457 100644
--- a/media-gfx/eog-plugins/Manifest
+++ b/media-gfx/eog-plugins/Manifest
@@ -1,3 +1,5 @@
 DIST eog-plugins-3.26.3.tar.xz 470712 BLAKE2B cd5845481006b681555f35d1f353ed624baa83fc8fc45bb889b2418f31a776bf9e08e270f911f61f431123825a5b96fa684f72e378ddd0ad1107ff44a5c98519 SHA512 5ea0bbf692fa71fa77b0b78307cceee067c95e80c2e69e173990c1154df8014912f24f8d023eda79da56b7c1bdf0870e5e92b968a68c4961af3fc1382d4f468c
+DIST eog-plugins-3.26.4.tar.xz 477772 BLAKE2B 104ddf58d33e5513349839312fef820af20d7a3e64a3a8cbd7d964d8250564d6cd62c58cf95fb5359ab95eac8fe2b83ed051e6f3dc8144a8884ec72c74a12622 SHA512 95f2cf2c6ed84b4801517a708f18e1cd673f814d849029a41491f3719512d6a3a2cb5cb11898a7f972f8b674c682245c99964ba2da19b285ed175b720d5396e8
 EBUILD eog-plugins-3.26.3.ebuild 1643 BLAKE2B 2a215a9e8543aa1375f76010b86549570cb94dfad3456b32edbc34331c11edae91863ab578e14a8a01f542d5ba81f08afa179e5a14e7d1a5dc095c1e6f60d79e SHA512 804238ae08418988ca0d9c081856534102df03be217c79f6a159b4fff33d85bbeadd055dbae6b6a73056e133c461def676e2e41ad34e6d301fd86525f102b5e7
+EBUILD eog-plugins-3.26.4.ebuild 1645 BLAKE2B 3612e4ba2e617760703c89ac8b0b767a667030e463f66c02b96a7573b8477211179367609b255068ab19ecf6f7666cb7c914202bc02e242a0a9faadfb7b99316 SHA512 0a34bc3225f031a17fece2dd6ba65c27a191cadd7a8c363548674c3094d954ca33988d433d646ee71b04b4d936152089a75712bd7f5fb7699e39440e10adb024
 MISC metadata.xml 428 BLAKE2B b10706bb7638538d5ce63c9787e7a1730e01c8383f2d2a093e38184b031933d2b3749241aa2f3254be4c84fac104bb8ec72940cdf8cd5a9f7bc0944541b015c6 SHA512 9684f07846ce7e49ad82843c2b8b7ac5c9d7124bddb07778292d6810162e89a3d41e7ca426f331e4bae6ecfbe53f71409b35418affba6382e874c78b64ed102f
diff --git a/media-gfx/eog-plugins/eog-plugins-3.26.4.ebuild b/media-gfx/eog-plugins/eog-plugins-3.26.4.ebuild
new file mode 100644
index 000000000000..8cdfa42dd1c0
--- /dev/null
+++ b/media-gfx/eog-plugins/eog-plugins-3.26.4.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python{3_5,3_6} )
+
+inherit gnome2 python-single-r1
+
+DESCRIPTION="Eye of GNOME plugins"
+HOMEPAGE="https://wiki.gnome.org/Apps/EyeOfGnome/Plugins"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="+exif map picasa +python"
+REQUIRED_USE="
+	map? ( exif )
+	python? ( ${PYTHON_REQUIRED_USE} )
+"
+
+RDEPEND="
+	>=dev-libs/glib-2.38:2
+	>=dev-libs/libpeas-0.7.4:=
+	>=media-gfx/eog-3.15.90
+	>=x11-libs/gtk+-3.14:3
+	exif? ( >=media-libs/libexif-0.6.16 )
+	map? (
+		media-libs/libchamplain:0.12[gtk]
+		>=media-libs/clutter-1.9.4:1.0
+		>=media-libs/clutter-gtk-1.1.2:1.0 )
+	picasa? ( >=dev-libs/libgdata-0.9.1:= )
+	python? (
+		${PYTHON_DEPS}
+		>=dev-libs/glib-2.32:2[dbus]
+		dev-libs/libpeas:=[gtk,python,${PYTHON_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+		gnome-base/gsettings-desktop-schemas
+		media-gfx/eog[introspection]
+		x11-libs/gtk+:3[introspection]
+		x11-libs/pango[introspection] )
+"
+# libxml2 required for glib-compile-resources
+DEPEND="${RDEPEND}
+	dev-libs/libxml2:2
+	>=sys-devel/gettext-0.19.7
+	virtual/pkgconfig
+"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_configure() {
+	local plugins="fit-to-width,send-by-mail,hide-titlebar,light-theme"
+	use exif && plugins="${plugins},exif-display"
+	use map && plugins="${plugins},map"
+	use picasa && plugins="${plugins},postasa"
+	use python && plugins="${plugins},slideshowshuffle,pythonconsole,fullscreenbg,export-to-folder,maximize-windows"
+	gnome2_src_configure \
+		$(use_enable python) \
+		--with-plugins=${plugins}
+}
diff --git a/media-gfx/eog/Manifest b/media-gfx/eog/Manifest
index e34ea267defe..c2aacde198fb 100644
--- a/media-gfx/eog/Manifest
+++ b/media-gfx/eog/Manifest
@@ -1,3 +1,5 @@
 DIST eog-3.28.4.tar.xz 5732396 BLAKE2B 9adf7e6793add9298dd879a0fe5ea7c736854d3a40473b2def84851a1e5a78ef84316b20b172c85c85f070278a51b06c1019aef1e5e9c5f31a87243c9229a579 SHA512 57ccb6269b2829a0606cbae08fc376bcd13028d3affe03d76c929a95faf9106dfd497872a12019158aeff5e8e101640d912cae0cece435121319820df7262c00
+DIST eog-3.32.2.tar.xz 4601712 BLAKE2B 84803acf2e2c2cb7451b357d18c7553854dd9a440ee8f951db479641ebf7fe49d8b8185124301c8b272db22d424c31197146e58d0907248cb87aa822441184d6 SHA512 c1093db4bce6bfde758a42fddc7ce7437d2adf3aa44a633b253ca3cb75c910e8862a323d182394696c617cb92114919dc576b992e7a65aa5fefb504062382d81
 EBUILD eog-3.28.4.ebuild 1555 BLAKE2B e22cfc02eb83d4f8a33be1573f0976b0a4d0d7bc32d164d13f3aa147f20a66008747e98b43213c8b12103970d12fc5318d1d7d934ba9d216d1affa9456b5cba5 SHA512 eaa46f027cd9110e3243171dde0a0b94a9a1742700cdff0653fa90d20c8f7d1b2b238c94269faa2f40be4dc7b64a15c6e5ad2327281294c4c503593ff0aaa241
+EBUILD eog-3.32.2.ebuild 1568 BLAKE2B 4267e68439d079e3b0baf371af11a34a3d9a795ea63759f368e2d96220089a9a943a2f92a0f78b57be11b0f2fbf6ce7a6b9a638621fe215bdfe729e53187c6e0 SHA512 af7b4b6456d5a4e41ea850769d6e8a550757c0b987f5df64829c13725a727e1d221607c90463e754fc55e869072c85d222ea90ae6eae244997574129ea9d8e08
 MISC metadata.xml 481 BLAKE2B 2c12b594b9a5b1e4ce3983131d1911f62026c5186d8f5c5af13842cfedfa4d20abdc5ee82e11db3a2e1b45e2b8d4d95fa1a62e668936956e8453b166daff00b4 SHA512 141ec1d6923697f744de806804279b602120ce3d5494257de36b8c8b71185d101692f2e438d7ba0e4a4c946d0aaba068117f16c8344abe891e0ddd4f768ded26
diff --git a/media-gfx/eog/eog-3.32.2.ebuild b/media-gfx/eog/eog-3.32.2.ebuild
new file mode 100644
index 000000000000..382b119f00e6
--- /dev/null
+++ b/media-gfx/eog/eog-3.32.2.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome.org gnome2-utils meson xdg
+
+DESCRIPTION="The Eye of GNOME image viewer"
+HOMEPAGE="https://wiki.gnome.org/Apps/EyeOfGnome"
+
+LICENSE="GPL-2+"
+SLOT="1"
+
+IUSE="+exif gtk-doc +introspection +jpeg lcms +svg xmp tiff"
+REQUIRED_USE="exif? ( jpeg )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+
+RDEPEND="
+	>=dev-libs/glib-2.53.4:2
+	>=dev-libs/libpeas-0.7.4:=[gtk]
+	>=gnome-base/gnome-desktop-2.91.2:3=
+	>=gnome-base/gsettings-desktop-schemas-2.91.92
+	>=x11-misc/shared-mime-info-0.20
+	>=x11-libs/gdk-pixbuf-2.36.5:2[jpeg?,tiff?]
+	>=x11-libs/gtk+-3.22.0:3[introspection,X]
+	sys-libs/zlib
+
+	exif? ( >=media-libs/libexif-0.6.14 )
+	lcms? ( media-libs/lcms:2 )
+	xmp? ( media-libs/exempi:2 )
+	jpeg? ( virtual/jpeg:0 )
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+	svg? ( >=gnome-base/librsvg-2.36.2:2 )
+
+	x11-libs/libX11
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	gtk-doc? ( >=dev-util/gtk-doc-1.16
+		app-text/docbook-xml-dtd:4.1.2 )
+	dev-util/glib-utils
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use exif libexif)
+		$(meson_use lcms cms)
+		$(meson_use xmp)
+		$(meson_use jpeg libjpeg)
+		$(meson_use svg librsvg)
+		$(meson_use gtk-doc gtk_doc)
+		$(meson_use introspection)
+		-Dinstalled_tests=false
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/media-gfx/ephoto/Manifest b/media-gfx/ephoto/Manifest
index b8b3f6c252b0..b7a7a4dae5ca 100644
--- a/media-gfx/ephoto/Manifest
+++ b/media-gfx/ephoto/Manifest
@@ -1,3 +1,3 @@
 DIST ephoto-1.5-1.tar.xz 327004 BLAKE2B 73b6f72085c845e3bc39a70f1a5b087741ee9d2b6d0a7678af90b78dd08cd68defd7256a12e4ce2f9acab1fc93aafcfcac0f2ee689e9ef0b68f8837446fbf58d SHA512 2c56103e6018ef0252dd5efcb0996e9346c383887b6d272f4fddc0b22e0f98dc032049c8521bca6707f1a5d172abc2d6c8e037104f4aa7a5f920fd55a2fad23e
-EBUILD ephoto-1.5.ebuild 564 BLAKE2B 4de5f23ddd9eacc9b5adc740e639c32470e1d2fd2d287fd612a8794f948e5cc32bc82eb699c9f7057101923e7ba8996dbea224b019f203c7b11f6660fc1212ee SHA512 b12b92b4f309aac575f03e91a9b8fa1a8e7d61a08a0cb8235e78c72a4d0f6af9033bdbc1fd0e840396be3d13fe48495a92d12e570e4366ded35b81124df716ba
+EBUILD ephoto-1.5.ebuild 562 BLAKE2B d22dc7f708b783d07c55319623d528d4602fa370b81056c148c1d6c0a3181396d0e8915cde663e679128c9e0e01db2bd87bd9e56b03f20c74e91bf199bc73ff6 SHA512 1a4e48f84811e6df14110137f2c47cade278989a888cb1f692bd97c98762a0d5269eef17fb60558edbc14f75c4b6d3cf5b6bdfb23a91a61deeaa48e442ff9ee0
 MISC metadata.xml 1113 BLAKE2B 26731e35dd88df506debdf22fe037093433f03f3639a87ddff42770b63309b3c69e5a2caed1cd717043f7b353d1d6da7f2f3a7c3a2bd8bd922e86c6f6eec9784 SHA512 d044c92df38d066afc19253852fed55696aa6d4cd5d7bb227040a4d35f3a297348073834b75c177abf4a75602ebfbee525f74e5c0cb308cedff96263ad187bdf
diff --git a/media-gfx/ephoto/ephoto-1.5.ebuild b/media-gfx/ephoto/ephoto-1.5.ebuild
index d7c2a75e3e21..4279e7ce070d 100644
--- a/media-gfx/ephoto/ephoto-1.5.ebuild
+++ b/media-gfx/ephoto/ephoto-1.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="https://download.enlightenment.org/rel/apps/${PN}/${P}.tar.xz -> ${P}-1
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="nls"
 
 RDEPEND="dev-libs/efl[eet,X]"
diff --git a/media-gfx/gscan2pdf/Manifest b/media-gfx/gscan2pdf/Manifest
index 742391786214..c858b48d8c57 100644
--- a/media-gfx/gscan2pdf/Manifest
+++ b/media-gfx/gscan2pdf/Manifest
@@ -1,7 +1,7 @@
 DIST gscan2pdf-1.8.11.tar.xz 409212 BLAKE2B 37cb716f13818eaffc39c210b810b845368cc5e323569e8f9d5603b5b412c4182520798321358e4c21339fdbd5f15026a0acd6421a49e7db79ecca86633c3ab0 SHA512 1ea09b8768771be4a1700cb8a6523d5f74fcbf0ebe459d97796032b56f896fd0c50e5ca1ed4c96aedef7e61f6952a92986153cc70173dd5ad91ccfb72461c565
-DIST gscan2pdf-2.5.3.tar.xz 447188 BLAKE2B e34441c4680fbe2a03bafb12c754df143c800ca6aa56c33623ff5e26fc86d08e120794d84c1e33aa25d76498138098249ace4a7f79023fc1ff97372dcf7e76a7 SHA512 d8f798eadc3c2fbc8a1553bbf542f2636861aba793ab61b66449938bbe115d5e765e018f6afdcd7280b34ccadeb77febda924334f35cf5b7459f93f93c58e782
 DIST gscan2pdf-2.5.5.tar.xz 450016 BLAKE2B b5f4da6d4c5076f67a45312d5ec2ee0ac1c5420a97df963c3e03e9651f853e7423ffcc5d7fa22b18398c54cca1e8164e73989b52fac0e628898c2ef4271452c7 SHA512 924987a852fceeb04823cf70af08fa0652b436ebe108e5fba4379e7879277c891f4132e27df72e9ac5edbb5e7e105efc18923df1a80d5a44df48e293765b69c4
+DIST gscan2pdf-2.5.6.tar.xz 450940 BLAKE2B 497442bfd09bc5869c599486e03155fe37a6a3f28dbd78aea2b77a5c11db665fb61023f471a47ffc6d15b7ee0509d6a2b6e3034a32279538321c73e544a3190d SHA512 c202b98ba3a1ce5b1cea6541c4dcae88595d46525e87238326d1d53396d3af6f552d601b057fa460db9eb5419505d4ac332f3eb81ff7ff1d28e1aa71700c434a
 EBUILD gscan2pdf-1.8.11.ebuild 1731 BLAKE2B 0b0f7cdfef98e666e20e44882584e0636e490429186e441d87f965e74071f5076693896e17e68184319dfaf3a1fd4487140209ef3b49603c9496cc936516333d SHA512 b94b73d3396208a8c67c2aad407815329501717c364d60189b21d96f652846e554d59a2a36f4b58383d7f49ab728d4fe251bce9ab1944befb667a9e0c09237b3
-EBUILD gscan2pdf-2.5.3.ebuild 2240 BLAKE2B 1e7091ea3be2653e55f1dcc27f5303ee63d6054e74b02b1257c85a6b2bdc3ab6e9250a78245f53b987397b3c4dd854cfe0519d4916321199d26c1278992025dc SHA512 1a6ae1f8dc0f7752161b08e5cf1e407a8c7b598263c7f256be160a21aa757d904fbab90ae9280b6ad846a932580a453489c3d0ab9fbfa0f2a777861b8fbf6a98
 EBUILD gscan2pdf-2.5.5.ebuild 2240 BLAKE2B 1e7091ea3be2653e55f1dcc27f5303ee63d6054e74b02b1257c85a6b2bdc3ab6e9250a78245f53b987397b3c4dd854cfe0519d4916321199d26c1278992025dc SHA512 1a6ae1f8dc0f7752161b08e5cf1e407a8c7b598263c7f256be160a21aa757d904fbab90ae9280b6ad846a932580a453489c3d0ab9fbfa0f2a777861b8fbf6a98
+EBUILD gscan2pdf-2.5.6.ebuild 2289 BLAKE2B 72a06ee2f6f32bec3df79337cefb946e446ef81e00b9c711c64f44056497fa5a08d4d279ca5a56cb8ecd56a80527b1f85cc66e027427dffccaca2f15c2ab20e3 SHA512 efc58c3648f93766b9f433788db64cdf3658b8c7e2d19e3178e7c0478532ffa0b666923d46da145de842e96f5ad193a67628631d0ae3f5f0b0f1044fe1118ef8
 MISC metadata.xml 439 BLAKE2B 835480b0d68a079941e94f2646d0136dfb8a8e750e0279f8a5a2e23e6690242582ffe660798f5e80ebfb4378a576aa5715332b53230555866391a99ec28f54ff SHA512 af1cc05ac693899586df81036d2fa11af187edbb3c9449862298ba05efd0dbd0c4c5b008a1a21328c1f9a27a690671bd7a9967d2e457efb31561044e45984401
diff --git a/media-gfx/gscan2pdf/gscan2pdf-2.5.3.ebuild b/media-gfx/gscan2pdf/gscan2pdf-2.5.6.ebuild
index 9c77f58fad76..8a9a2d1d40f9 100644
--- a/media-gfx/gscan2pdf/gscan2pdf-2.5.3.ebuild
+++ b/media-gfx/gscan2pdf/gscan2pdf-2.5.6.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 DIST_TEST="do"
 
@@ -46,14 +46,14 @@ RDEPEND="
 	media-gfx/sane-backends
 	media-libs/tiff"
 
-DEPEND="test? (
+BDEPEND="test? (
 		${RDEPEND}
 		dev-perl/Sub-Override
 		media-libs/fontconfig
 
 		app-text/djvu[tiff]
 		app-text/poppler[utils]
-		app-text/tesseract[-opencl,osd,tiff]
+		app-text/tesseract[-opencl,osd(+),tiff]
 		app-text/unpaper
 		media-gfx/imagemagick[djvu,png,tiff,perl]
 		media-gfx/sane-backends[sane_backends_test]
@@ -66,6 +66,7 @@ mydoc="History"
 
 pkg_postinst() {
 	optfeature "DjVu file support" "app-text/djvu[tiff] media-gfx/imagemagick[djvu]"
+	optfeature "encrypting PDFs" app-text/pdftk
 	optfeature "creating PostScript files from PDFs" app-text/poppler[utils]
 	optfeature "adding to an existing PDF" app-text/poppler[utils]
 	optfeature "Optical Character Recognition" app-text/tesseract[osd,tiff]
diff --git a/media-gfx/imv/Manifest b/media-gfx/imv/Manifest
index adb0728f71c5..745fab7650f7 100644
--- a/media-gfx/imv/Manifest
+++ b/media-gfx/imv/Manifest
@@ -1,4 +1,4 @@
 DIST imv-2.1.3.tar.gz 27664 BLAKE2B f873863d897161675b4cfbcc3c4136eebd0176317f30d656dd4c7a92615c926d1a0410d6c80283bb3a25055f3a9b710fa0763ffb86ff63ed1dd919ad3f0dfe8c SHA512 0ecdaad9b4518c2107a14969cf9348542c2ef88707be7b2b5eed435915292687d63e4ebd29cb42297cbc3dfee408ec29fd019ad6ae4f0cd789753aad84aa8128
 EBUILD imv-2.1.3.ebuild 659 BLAKE2B f7809e0abc7215ab526563d1e4052a433e0f1bc630534fdedb5e74c0a865e0495ea51a9c61402650281f570dedc4ae747dd410a9688d7546c1678d5c3af3c3ee SHA512 e6e76eb3e757ae23e12d78563865cc079a7868807ec44c1fa9b865ecdb0f2b65079577284e80ee034a6b6166fe007d7f97ae519fd72eaab6fc6796a02e7abbe5
 EBUILD imv-9999.ebuild 626 BLAKE2B 0e49ff992814d480949b2c1dd191941bdad490e300804d85616586ddd29842a1489540cd5ec912818bd8ae1cdc82534b2ca4da48b9b4370713b8b2bb7301179c SHA512 7e3a72ebd8dc20e0b743338df6e96b7f656b4a4e7a7fbce9f2e5b9e57e07d0b3caef8714dc6196170ce6fb75b1e3e164612851df580dbc9c48e440d35ae7bd8b
-MISC metadata.xml 458 BLAKE2B 31013dab8f94b3aaef099092b67b14afa74be0e8affd244677f8214b0e0d56a996ca0f607f52c3e7b87a9ff86bd513f2a565fa4c1224a7d263a54d36a321134e SHA512 50c52ee98f3dc37c68a2d4034ea3eb6809b46db6dce50520a10553280758dc34eb0670954d1cb8ee8b0cb2fbf3362d381901a0370123eccb61177bffc2485eb4
+MISC metadata.xml 242 BLAKE2B a66b698c79419467b610a75590ee09e217a9b54de470c963269438ca410e7ca224feb08636610af377a388be317aafdf9d7ea647c30be96705da00d5f07e21e5 SHA512 e0d5b53af8e82f684d21217559b6e832935670c8186c6514ca9f3af14b024f39421f297cf23127af2ef3f1874b732f963e88bb180403cae7ac1834a1808664f4
diff --git a/media-gfx/imv/metadata.xml b/media-gfx/imv/metadata.xml
index 4272ef098767..457f62f9ff76 100644
--- a/media-gfx/imv/metadata.xml
+++ b/media-gfx/imv/metadata.xml
@@ -1,14 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>hilobakho@gmail.com</email>
-		<name>Mykyta Holubakha</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Gentoo Proxy Maintainers Project</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">eXeC64/imv</remote-id>
 	</upstream>
diff --git a/media-gfx/iscan/Manifest b/media-gfx/iscan/Manifest
index 82a68d62770c..9480f640e3ca 100644
--- a/media-gfx/iscan/Manifest
+++ b/media-gfx/iscan/Manifest
@@ -4,8 +4,11 @@ AUX iscan-2.29.1-png-libs.patch 1309 BLAKE2B debdebb6753d3f71ec5af8a16082dcb8b9f
 AUX iscan-2.30.1-fix-g++-test.patch 1394 BLAKE2B 6ff018b0be888d4415a40f0d94ab3482590a4b3f627b00f6f1fdd17cbf2aea57b52715eebda678833ec2ea9543470a4b7a5c9f07fced84808b337edd43c11c5e SHA512 b11667e6698955b482c9cffd88413180d77b700ca040bf70969ce10be652cfa38fe2fb3de930519bdfe098f18ce258f24859ab79a93032dbe5052e0e1059ce63
 AUX iscan-2.30.1.1-gcc6.patch 564 BLAKE2B a80e24742c9d142ea88c2884c061efda09391aaa75885ac53de85594c5fa0c5f4b3b8f008165b647647658bbd420bcfb9a631deae3211b01f4848e3d7e22a390 SHA512 4c0ef22323f26282596d5705b0a3982bc8bca17e84f54ad9b1a23290cadbc617ae55492fd3d25e9edd283509e0a8ea1de047b18fd98fdfaf8bb22fd90c096e32
 AUX iscan-2.30.3.1-fix-x86-unknown-types.patch 362 BLAKE2B c791249488661dbe3fcf3301cfd46c04cda85ad95f8e21bae8e8f87e63e787ea69d494d7ae152dbce368ccb9fda44781201d1630e1c487cb9ad0d5d2a33e6d77 SHA512 723c3d5b6522da913ed93abaa1797f661e7eecc3974faa2bf730ced27c6a4adb3ffc87bfb38d42c4929b5afafb3cfe3e9111870aa796ea4872a053302b29ec6f
+AUX iscan-2.30.4.2-sscanf.patch 779 BLAKE2B 8e8255c0558e225b3c1bcb5faaf42f0d794177e463119595b53fd0e194b7918703d3b9ac3c8d8fa1939cc86799deda4605764f99b2aa666f3c2047ed21333f31 SHA512 345ac7ae1c75b6da24f16f9abd5f7f4352cfd3497d24229db8a15d26d767e62c8273220a7f40f18c452ab90094b56774eaf738c880c613f0463db04b6d5d9f3d
 DIST iscan_2.30.3-1.tar.gz 1216848 BLAKE2B 8a5f485c1dd814248c46aec6accedd331105c3ccc0f70a582e60dfb62b1cc1f1ebab358f0896b15cbf842ea06f8a35447d91f76391b10bad07df371512856c32 SHA512 5f68b2f7b7c1d1b5d3d65a55c3a80538fda5d2bdf9cd50fbf942e0eb49dcb84983ede66ed2f6354f9591692808df54415400fe02ed47e7373082869612a47872
+DIST iscan_2.30.4-2.tar.gz 1236167 BLAKE2B 598e55aa7099f7973b38f5c3227415c8ddfa7e8c645521981b4e8979047ab692427f5c1719fd83fe0635f2d4604f32f0baff8542f3e1a333298799c4cad7b980 SHA512 b12f374ff8ee1e1879fc6dbc579de39d7bcd4777ec7ad6e4345046f77b4ec13ae45ebdc2803d6907bc2747776aa7e32c313866138c7b8c7bcb53110a214154d2
 DIST userg_revQ_e.pdf 627189 BLAKE2B ff57871c58dc541e30d65127bd8f4cc2a20ec5341c1d0914116f7ec4ae002d896853b99488eec71e5f8cb150e6b63d353efb9be11977de26d017701bc051014a SHA512 b09d5143855a759e0fa3e74794762566b6fbf734642f9d7f712e5f2f20e3dce6b830465fd65f83f9cc368292ce7a2c0cec709b0eba6356d95e1ba5114b3348fc
 DIST userg_revQ_j.pdf 734920 BLAKE2B ed2cffdc2dbf0a2403dcbd93cef3349b9e35afb305f9b36f92b8f11bd42b5281fc7bfbec108703f327fb538868c530418406d37505e6eb6afa621d2d49d007ba SHA512 d5cb0cebaae0ac36951379cad516f0575e85e0bb509cf88549239e300c7d6c6a4996497145acaa9e9783de6b08c6e352c7ffbedb23ed04c15eefbe9c3cf0bc90
 EBUILD iscan-2.30.3.1.ebuild 3517 BLAKE2B 2c9aa0bf5e12e34c1637951936db597ea0d5fe70509355bf28cef8d7c0c917ed07e940632eae42f2903e00780dc05cead627a90f733ea2f532fc2b5e6d8acc9d SHA512 1331ded32c9d88312c517e5ba5447e87471a0223747d46c22ded7c3a185f715b3a9b4d2d905bb0239cbe31edc1197c7a71a5626af0bf8084b0834124d7745de1
+EBUILD iscan-2.30.4.2.ebuild 3962 BLAKE2B 9909e1c577437861e7020ed0760b4a98a7c844cd7a84cc910db628d46c7a8da5f42d19f46b47a5f8762f35f40f0ce3e79aa801744d24ef392bb2e39df737ae41 SHA512 89b4e30259cdedce969a2186440a5e4b52f1bfcb6dfbe1deec54a88dc61da35495cf8663340a0cbc0fb4f5ff1909f8abdea63129266876c051a8686ee2eee770
 MISC metadata.xml 779 BLAKE2B 715d705e7775dc8aefea2c58afaf0520819abe2508ee9dde67298a2acdd847b953ac46750bc711e018eea5ddceef2ef3e7f16308c32fade334622cb9a16f745e SHA512 9ead68d2de8d4b5e09e2d478b6f198d8a83985eaa779e941189f1017beb081910fcc6c7d3c1f41db84b91df55399e5e005c326c7bb2841b2ef745d735aef562f
diff --git a/media-gfx/iscan/files/iscan-2.30.4.2-sscanf.patch b/media-gfx/iscan/files/iscan-2.30.4.2-sscanf.patch
new file mode 100644
index 000000000000..fd8709705320
--- /dev/null
+++ b/media-gfx/iscan/files/iscan-2.30.4.2-sscanf.patch
@@ -0,0 +1,21 @@
+diff -ur iscan-2.30.3/backend/cfg-obj.c b/iscan-2.30.3/backend/cfg-obj.c
+--- iscan-2.30.3/backend/cfg-obj.c	2019-05-31 13:26:41.530042108 +0200
++++ iscan-2.30.3/backend/cfg-obj.c	2019-05-31 14:05:13.040056748 +0200
+@@ -1026,7 +1026,7 @@
+       char *vendor = NULL;
+       char *model  = NULL;
+ 
+-      sscanf (string, "%*s %as %as", &vendor, &model);
++      sscanf (string, "%*s %ms %ms", &vendor, &model);
+ 
+       if (list_append (_cfg->seen[CFG_KEY_SCSI], info))
+         {
+@@ -1108,7 +1108,7 @@
+       char *library  = NULL;
+       char *firmware = NULL;
+ 
+-      sscanf (string, "%*s %*s %x %x %as %as",
++      sscanf (string, "%*s %*s %x %x %ms %ms",
+               &vendor, &product, &library, &firmware);
+ 
+       if (library && _cfg_have_interpreter (library, firmware)
diff --git a/media-gfx/iscan/iscan-2.30.4.2.ebuild b/media-gfx/iscan/iscan-2.30.4.2.ebuild
new file mode 100644
index 000000000000..a82b27d06c6f
--- /dev/null
+++ b/media-gfx/iscan/iscan-2.30.4.2.ebuild
@@ -0,0 +1,152 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_DOC="userg_revQ"
+inherit autotools desktop flag-o-matic
+
+# HINTS:
+# -> non-free modules are x86 and amd64 only
+# -> iscan frontend needs non-free modules
+# -> sane-epkowa should be usable on every arch
+# -> ${P}-${SRC_REV}.tar.gz    (for gcc 3.2/3.3)
+# -> ${P}-${SRC_REV}.c2.tar.gz (for gcc 3.4 or later)
+
+# FIXME:
+# iscan doesn't compile w/o libusb, this should be fixed somehow.
+
+# TODO:
+# (re)add closed-source binary modules which are needed for some scanners.
+
+DESCRIPTION="EPSON Image Scan! for Linux (including sane-epkowa backend)"
+HOMEPAGE="http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX"
+SRC_URI="http://support.epson.net/linux/src/scanner/iscan/${PN}_$(ver_rs 3 -).tar.gz
+	doc? (
+		https://dev.gentoo.org/~flameeyes/avasys/${MY_DOC}_e.pdf
+		l10n_ja? ( https://dev.gentoo.org/~flameeyes/avasys/${MY_DOC}_j.pdf )
+	)"
+
+LICENSE="GPL-2 AVASYS"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc gimp l10n_ja nls X"
+
+REQUIRED_USE="gimp? ( X )"
+
+DEPEND="
+	dev-libs/libxml2:2
+	media-gfx/sane-backends
+	virtual/libusb:1
+	virtual/udev
+	gimp? ( media-gfx/gimp:2 )
+	X? (
+		dev-libs/glib:2
+		media-libs/libpng:=
+		media-libs/tiff:=
+		virtual/jpeg:=
+		x11-libs/gtk+:2
+	)
+"
+RDEPEND="${DEPEND}
+	media-gfx/iscan-data
+"
+BDEPEND="
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+"
+# Upstream ships broken sanity test
+RESTRICT="test"
+
+S="${WORKDIR}/${PN}-$(ver_cut 1-3)"
+
+DOCS=( AUTHORS NEWS README )
+
+PATCHES=(
+	"${FILESDIR}"/iscan-2.29.1-drop-ltdl.patch
+	"${FILESDIR}"/iscan-2.28.1.3+libpng-1.5.patch
+	"${FILESDIR}"/iscan-2.29.1-png-libs.patch
+	"${FILESDIR}"/iscan-2.30.1-fix-g++-test.patch
+	"${FILESDIR}"/iscan-2.30.1.1-gcc6.patch
+	"${FILESDIR}"/iscan-2.30.3.1-fix-x86-unknown-types.patch
+	"${FILESDIR}"/iscan-2.30.4.2-sscanf.patch
+)
+
+QA_PRESTRIPPED="usr/lib.*/libesmod.so.*"
+QA_TEXTRELS="${QA_PRESTRIPPED}"
+QA_FLAGS_IGNORED="${QA_PRESTRIPPED}"
+
+src_prepare() {
+	default
+
+	if ! use X; then
+		sed -i -e "s:PKG_CHECK_MODULES(GTK,.*):AC_DEFINE([HAVE_GTK_2], 0):g" \
+			-e "s:\(PKG_CHECK_MODULES(GDK_IMLIB,.*)\):#\1:g" configure.ac || die
+	fi
+
+	eautoreconf
+}
+
+src_configure() {
+	append-cppflags -D_GNU_SOURCE	# needed for 'strndup'
+	replace-flags "-O[0-9s]" "-O1"	# fix selector box bug 388073
+
+	local myeconfargs=(
+		--enable-dependency-reduction
+		--disable-static
+		$(use_enable nls)
+		$(use_enable gimp)
+		$(use_enable X frontend)
+		$(use_enable X jpeg)
+		$(use_enable X png)
+		$(use_enable X tiff)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	use l10n_ja && DOCS+=( {NEWS,README}.ja )
+	use doc && DOCS+=( "${DISTDIR}/${MY_DOC}_$(usex l10n_ja j e).pdf" )
+	default
+
+	# install sane config
+	insinto /etc/sane.d
+	doins backend/epkowa.conf
+
+	# link iscan so it is seen as a plugin in gimp
+	local gimpplugindir
+	local gimptool
+	if use gimp; then
+		for gimptool in gimptool gimptool-2.0; do
+			if [[ -x /usr/bin/${gimptool} ]]; then
+				einfo "Setting plugin link for GIMP version     $(/usr/bin/${gimptool} --version)"
+				gimpplugindir=$(/usr/bin/${gimptool} --gimpplugindir)/plug-ins
+				break
+			fi
+		done
+		if [[ "/plug-ins" != "${gimpplugindir}" ]]; then
+			dodir ${gimpplugindir}
+			dosym "${ED%/}"/usr/bin/iscan "${gimpplugindir}"/iscan
+		else
+			ewarn "No idea where to find the gimp plugin directory"
+		fi
+	fi
+
+	use X && make_desktop_entry iscan "Image Scan! for Linux ${PV}" scanner
+}
+
+pkg_postinst() {
+	local DLL_CONF="${EPREFIX}/etc/sane.d/dll.conf"
+	local EPKOWA_CONF="${EPREFIX}/etc/sane.d/epkowa.conf"
+
+	if grep -q "^[ \t]*\<epkowa\>" ${DLL_CONF}; then
+		elog "Please edit ${EPKOWA_CONF} to suit your needs."
+	elif grep -q "\<epkowa\>" ${DLL_CONF}; then
+		elog "Hint: to enable the backend, add 'epkowa' to ${DLL_CONF}"
+		elog "Then edit ${EPKOWA_CONF} to suit your needs."
+	else
+		echo "epkowa" >> ${DLL_CONF} || die
+		elog "A new entry 'epkowa' was added to ${DLL_CONF}"
+		elog "Please edit ${EPKOWA_CONF} to suit your needs."
+	fi
+}
diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index f592067e1fd2..d6e4a739db74 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -3,9 +3,7 @@ AUX krita-4.1.8-fix-pre-5.12-tablet-support.patch 1794 BLAKE2B d67cfe9a758e26416
 AUX krita-4.1.8-qt-5.12-fix-unsupported-composition-mode.patch 1591 BLAKE2B d11c8b3a7f5a70c40fe5c0f19bcb06c9a2b047e651a27ce3de9e8ecc41287171b50566b481a8ca49b7625aae1ffd0db0a507b1ad7928b6c959de15ec7b7c2dc5 SHA512 3d1d9c09abb2b72d6d7ef5061e7fdb4ca98a4d7f7d1356833fa518da6bce52f9959532f0417b7e30a305ef052acc59dd2b27ef71e1de5fa138fe4f107528517a
 AUX krita-4.2.4-tests-optional.patch 12292 BLAKE2B a30463dcc6e02e877b308c4add529f0657d96ace7a13ba7424f4cdf260f3b636d03b2bac224d6239253393650163b622ac54d8d81bbdced2fb153bf216b5fb2d SHA512 1d5045b35981822bc16c4b23e573a299a8325353c8be347c56a4e2fc4e3cd9e937e8eb253f9c6cdc0197a3db7989b822fb41274afe3cd506b9c907daf1867df3
 DIST krita-4.1.8.tar.gz 244065767 BLAKE2B ba2cbb6d1575cec189e8f10461b720a081f185e1e078fc1e8194c9e6d455dade45f35f1ae5a891717918b3c03863a2a7f3f819753a106ede5695003cfa260157 SHA512 d027444415bffbd6abd29ca69598fdb1e6a652fd4f1944092ff12016a57ff2ee3bab209c93e065905ec9bfea395e50f833915bb924b97a2c119d101057cba6c9
-DIST krita-4.2.5.tar.xz 170060232 BLAKE2B fba124653edad23826fd6d4d932cb1ea4c63450d460bebf2b2e2d9167e437331a31d76b19d57d9f15f603195c0eea367463ea6d9e610e74d0844bb80d21f0741 SHA512 5134c0a889cb039c5253759965acfba5cef0c431e8230236c1288e0253628feba52a493eaa42c93adb1716014c17818232294c1c90ade760ad89940833599d9e
 DIST krita-4.2.6.tar.xz 164332440 BLAKE2B d60c87743de77d300b2c2c9d1f1b3a31b238e8ef434981d3762713094eeebbe5e51547987c981b9f50d82f2363881ec74ef488b35d27cd5271d568987607557e SHA512 c6c6bb0b2d46b421c6edd38427f7a71636c78267413a4265a61123509ebac8f24d981ce5b5540f0813e26b89e655d44c2cc32395694161eb925f2789b0e8119e
 EBUILD krita-4.1.8-r1.ebuild 3390 BLAKE2B 4cb6c211221e5a0e13ce674b7a10c984539a5e5f529a533d6e56f1facfe591e7d1b57707a84c8d87266221cb5445ad7fd15b57954d3a67b114c46c90329730a8 SHA512 14e135e8d6451489127ca1653179de82d7460d182ad6a18bd4fbabd81d16851fcaa783d06be2bbc8cef9ea435f90f5a3f799cf87a338888188acb26ee9b3564a
-EBUILD krita-4.2.5.ebuild 3134 BLAKE2B 286e53a3758f23f90c0f972158d125779dc91d7d0ad2a552dacaf5447a14321dbaa81a59a6f5a2c263720641b9a146141f9571961db7ba7acc0a79c451f1f35d SHA512 e20075fb679c828347155280315f368faab8aafa5d25d35765ba2516fbcf868e1de54071c185cc7409806e3b39df08e969b0ff35743a8eb2887b3547bffeed26
 EBUILD krita-4.2.6.ebuild 3134 BLAKE2B 286e53a3758f23f90c0f972158d125779dc91d7d0ad2a552dacaf5447a14321dbaa81a59a6f5a2c263720641b9a146141f9571961db7ba7acc0a79c451f1f35d SHA512 e20075fb679c828347155280315f368faab8aafa5d25d35765ba2516fbcf868e1de54071c185cc7409806e3b39df08e969b0ff35743a8eb2887b3547bffeed26
 MISC metadata.xml 696 BLAKE2B 433ca97e92c2e6c8a0f5bfbd4cba667576be6cc8c93330b689e0088663ac6df263d62b7be6d42debf3480b706721f06be089c5e9a139451e49b609ea4a081ae2 SHA512 becd89686babf0fde2a7e53196715bbca2a4f0d6bad0bc3a55128c9ee19dbe5819be1020db6458ec0c053cf7370a390ff1e84fd9c49331fc28e5a60348fd34dd
diff --git a/media-gfx/krita/krita-4.2.5.ebuild b/media-gfx/krita/krita-4.2.5.ebuild
deleted file mode 100644
index 0cb6e37c9883..000000000000
--- a/media-gfx/krita/krita-4.2.5.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-PYTHON_COMPAT=( python3_{5,6,7} )
-inherit kde5 python-single-r1
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Free digital painting application. Digital Painting, Creative Freedom!"
-HOMEPAGE="https://kde.org/applications/graphics/krita/ https://krita.org/"
-LICENSE="GPL-3"
-IUSE="color-management fftw gif +gsl heif +jpeg openexr pdf qtmedia +raw tiff vc"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-BDEPEND="
-	dev-cpp/eigen:3
-	dev-lang/perl
-	sys-devel/gettext
-"
-COMMON_DEPEND="${PYTHON_DEPS}
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kitemmodels)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtconcurrent)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui '-gles2' '' '5=')
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtx11extras)
-	$(add_qt_dep qtxml)
-	dev-libs/boost:=
-	dev-libs/quazip
-	dev-python/PyQt5[${PYTHON_USEDEP}]
-	dev-python/sip[${PYTHON_USEDEP}]
-	media-gfx/exiv2:=
-	media-libs/lcms
-	media-libs/libpng:0=
-	sys-libs/zlib
-	virtual/opengl
-	x11-libs/libX11
-	x11-libs/libxcb
-	x11-libs/libXi
-	color-management? ( media-libs/opencolorio )
-	fftw? ( sci-libs/fftw:3.0= )
-	gif? ( media-libs/giflib )
-	gsl? ( sci-libs/gsl:= )
-	jpeg? ( virtual/jpeg:0 )
-	heif? ( media-libs/libheif:= )
-	openexr? (
-		media-libs/ilmbase:=
-		media-libs/openexr
-	)
-	pdf? ( app-text/poppler[qt5] )
-	qtmedia? ( $(add_qt_dep qtmultimedia) )
-	raw? ( media-libs/libraw:= )
-	tiff? ( media-libs/tiff:0 )
-"
-DEPEND="${COMMON_DEPEND}
-	vc? ( >=dev-libs/vc-1.1.0 )
-"
-RDEPEND="${COMMON_DEPEND}
-	!app-office/calligra:4[calligra_features_krita]
-	!app-office/calligra-l10n:4[calligra_features_krita(+)]
-"
-
-# bug 630508
-RESTRICT+=" test"
-
-PATCHES=( "${FILESDIR}"/${PN}-4.2.4-tests-optional.patch )
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	kde5_pkg_setup
-}
-
-src_configure() {
-	# Prevent sandbox violation from FindPyQt5.py module
-	# See Gentoo-bug 655918
-	addpredict /dev/dri
-
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package color-management OCIO)
-		$(cmake-utils_use_find_package fftw FFTW3)
-		$(cmake-utils_use_find_package gif GIF)
-		$(cmake-utils_use_find_package gsl GSL)
-		$(cmake-utils_use_find_package heif HEIF)
-		$(cmake-utils_use_find_package jpeg JPEG)
-		$(cmake-utils_use_find_package openexr OpenEXR)
-		$(cmake-utils_use_find_package pdf Poppler)
-		$(cmake-utils_use_find_package qtmedia Qt5Multimedia)
-		$(cmake-utils_use_find_package raw LibRaw)
-		$(cmake-utils_use_find_package tiff TIFF)
-		$(cmake-utils_use_find_package vc Vc)
-	)
-
-	kde5_src_configure
-}
diff --git a/media-gfx/luminance-hdr/Manifest b/media-gfx/luminance-hdr/Manifest
index a1ef1658aba0..8d7958356c13 100644
--- a/media-gfx/luminance-hdr/Manifest
+++ b/media-gfx/luminance-hdr/Manifest
@@ -4,6 +4,11 @@ AUX luminance-hdr-2.5.1-exiv2-0.27.patch 878 BLAKE2B f8c1cfc71deabab465f0f427413
 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
+AUX luminance-hdr-2.6.0-cmake.patch 855 BLAKE2B 2656ec16d554199a8cb0dca0df77ab710b6c2b16f5ae006ab07c06d8898fe2c0048222b80714d0343f105a623acbd535119853831e2d207a50e6407e1de33aff SHA512 694106851d29a97485e7e438db206c5d08d37dc5d7a2c9a3f207f31c2b673d42b4c539429a658390d31f5f985bd8f330d9387f3eb19964aa4e5683f2031b0a33
+AUX luminance-hdr-2.6.0-docs.patch 948 BLAKE2B 5ac822b10ffc61c552292806adc3f5470a7f03a9b2df7ba385435904963e52af583a892762867abb6a76a5351ffbbf0ffbd67107310e84bab9b649cc33666e09 SHA512 2b242a558c3b734a653943f3128c4cbc2440f940407faa096505ac7abe945c729bd0b4c5e9d06f53141bdb1271b097d7de15e87cd31db75ef1e30839a64f32b0
+AUX luminance-hdr-2.6.0-no-git.patch 377 BLAKE2B 454a9973831aa3ba312926190a84622c8c3bd9481c67ece8ccf8916517f6b314931a09adf8a4168d8a1c7cd8a7694db27291009b9fae8a9cacc8356d32c7f5c3 SHA512 fba84a0415c8e514fb85b229adb29fbda238e8146d2dfff296d92fde33aeb22562e5ac98fed2422326354be9c0096cc2bd1b8947edfa9e7ca160d207ba0db476
 DIST luminance-hdr-2.5.1.tar.bz2 10238826 BLAKE2B 02cc275e2433281e9305e07efb6f77a611ca8e8167ca478a0c4a4c16feab260203aeef501b24b52b54ff9ad92923fd52b2c6925d81e60b492f0ac2465e65b604 SHA512 5d2165ca69080b67426cbc7e30c3ad5545f1a9dacf09e76684c619633cd40b03ed2d0e32181a5dce9463addf20dce1afb58cbf4c0710688e143112687448be2c
+DIST luminance-hdr-2.6.0.tar.bz2 11556372 BLAKE2B 0026768202d35126b82101eb2dc7cdc2917728b519c1cadc62ffb6470204077b4b6ae220ebf09c7f903839fe0c714715efe796ee4830cc92174370cd2741d576 SHA512 6cfb21b1ddc9cac612e3d176323e34c5181333f1b52953c02ad5aec28cc86bf519ecede248847082085879c5c2fd2c5570b05f5d3bffa96ba3781ff8cd1967d1
 EBUILD luminance-hdr-2.5.1-r1.ebuild 2163 BLAKE2B ca1aea6abad91acadef5b7d729ef87d750dd81c48db728bb31a4c62b3daa051b2d745ad0bf019c7096fcc757c43c7801816d1f23b39403c0858e3f23924ce80b SHA512 814852444ee4f41218a20e4b7eb9e29bd61ec9bac8f0cd5cc6ccb4183ad0d265ea8cce05baa649e1fdc3efceb1ce8e9440e641d2e97aaa650f89e9f10944883b
+EBUILD luminance-hdr-2.6.0.ebuild 1836 BLAKE2B 8a4a05b6da97aed587749d8b092f81a8c3c6218c9cc4a8c406bbae3e6ea61eaf1ea698ac1d89662abebc1d3c872041542141686966e919d05240d12b0f60d4e5 SHA512 a2a4763c155f6fc87ab5848f2bc4e84b5881ec82fc430535e3cab2e32ec8e77b1d33af08149b43fc42ac1d7e9f75317484a256f0a9e208abcfc1d0deeb6db8d2
 MISC metadata.xml 1276 BLAKE2B 5b913b3c342f4d5a6fc67c30008d8eb9469c61cea7f6a10b8c29d1e60324da71e662a4f4d16a0d4a20c7431f5bab3dc9e157efbeae5dacbdadf4b2f5989e9058 SHA512 f1c9daadf3632c1f22297fe5987484a72cb7f0fa3f0758883c7d3c4fe798a6cad7838b855267b1ccc4ca74574692d915e725940c77e9891652a7cc80604a2597
diff --git a/media-gfx/luminance-hdr/files/luminance-hdr-2.6.0-cmake.patch b/media-gfx/luminance-hdr/files/luminance-hdr-2.6.0-cmake.patch
new file mode 100644
index 000000000000..5564ebadc951
--- /dev/null
+++ b/media-gfx/luminance-hdr/files/luminance-hdr-2.6.0-cmake.patch
@@ -0,0 +1,22 @@
+--- a/CMakeLists.txt	2019-06-09 21:18:38.000000000 +0200
++++ b/CMakeLists.txt	2019-09-15 23:53:19.496802424 +0200
+@@ -5,19 +5,6 @@
+ CMAKE_POLICY(SET CMP0053 NEW)
+ PROJECT("Luminance HDR")
+ 
+-string(TOLOWER ${CMAKE_BUILD_TYPE} LOWERCASE_CMAKE_BUILD_TYPE)
+-if(LOWERCASE_CMAKE_BUILD_TYPE MATCHES "^(debug|release|relwithdebinfo|minsizerel)$")
+-    message(STATUS "CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}")
+-else()
+-    message(FATAL_ERROR "Invalid value for CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}\n"
+-        "CMAKE_BUILD_TYPE should be one of:\nDebug, Release, RelWithDebInfo, MinSizeRel")
+-endif()
+-
+-if(LOWERCASE_CMAKE_BUILD_TYPE MATCHES "^(release|minsizerel)$")
+-    message(STATUS "Adding definitions: -DQT_NO_DEBUG_OUTPUT")
+-    add_definitions("-DQT_NO_DEBUG_OUTPUT")
+-endif()
+-
+ # assume built-in pthreads on MacOS
+ IF(APPLE)
+     enable_language(CXX)
diff --git a/media-gfx/luminance-hdr/files/luminance-hdr-2.6.0-docs.patch b/media-gfx/luminance-hdr/files/luminance-hdr-2.6.0-docs.patch
new file mode 100644
index 000000000000..982c7ebfac21
--- /dev/null
+++ b/media-gfx/luminance-hdr/files/luminance-hdr-2.6.0-docs.patch
@@ -0,0 +1,15 @@
+--- a/CMakeLists.txt	2019-06-09 21:18:38.000000000 +0200
++++ b/CMakeLists.txt	2019-09-15 23:43:41.005292354 +0200
+@@ -413,12 +413,6 @@
+     INSTALL(FILES ${CMAKE_SOURCE_DIR}/program-icons/luminance-hdr.png DESTINATION share/icons/hicolor/48x48/apps) # icon
+     INSTALL(FILES ${CMAKE_SOURCE_DIR}/net.sourceforge.qtpfsgui.LuminanceHDR.desktop DESTINATION share/applications) #desktop entry
+     INSTALL(FILES ${CMAKE_SOURCE_DIR}/net.sourceforge.qtpfsgui.LuminanceHDR.appdata.xml DESTINATION share/appdata) #appstream
+-    INSTALL(FILES
+-    ${CMAKE_SOURCE_DIR}/AUTHORS
+-    ${CMAKE_SOURCE_DIR}/README.md
+-    ${CMAKE_SOURCE_DIR}/LICENSE
+-    ${CMAKE_SOURCE_DIR}/Changelog
+-    DESTINATION share/luminance-hdr/doc) #info files
+     INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/help DESTINATION share/luminance-hdr) # help directory
+     INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/hdrhtml DESTINATION share/luminance-hdr) # hdrhtml directory
+ # Microsoft Windows
diff --git a/media-gfx/luminance-hdr/files/luminance-hdr-2.6.0-no-git.patch b/media-gfx/luminance-hdr/files/luminance-hdr-2.6.0-no-git.patch
new file mode 100644
index 000000000000..95fc805e83f9
--- /dev/null
+++ b/media-gfx/luminance-hdr/files/luminance-hdr-2.6.0-no-git.patch
@@ -0,0 +1,15 @@
+--- a/CMakeLists.txt	2019-06-09 21:18:38.000000000 +0200
++++ b/CMakeLists.txt	2019-09-15 23:41:24.684413834 +0200
+@@ -103,11 +103,7 @@
+     set(LIBS ${LIBS} ${QT_QTWEBKIT_LIBRARIES})
+ endif()
+ 
+-FIND_PACKAGE(Git)
+-IF(GIT_FOUND)
+-    include(GetGitRevisionDescription)
+-    get_git_head_revision(GIT_REFSPEC GIT_SHA1)
+-ENDIF()
++SET(GIT_SHA1 "-- Gentoo build --")
+ 
+ IF(WIN32)
+ 
diff --git a/media-gfx/luminance-hdr/luminance-hdr-2.6.0.ebuild b/media-gfx/luminance-hdr/luminance-hdr-2.6.0.ebuild
new file mode 100644
index 000000000000..e81c86dd57d8
--- /dev/null
+++ b/media-gfx/luminance-hdr/luminance-hdr-2.6.0.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils toolchain-funcs flag-o-matic xdg-utils
+
+DESCRIPTION="Graphical user interface that provides a workflow for HDR imaging"
+HOMEPAGE="http://qtpfsgui.sourceforge.net https://github.com/LuminanceHDR/LuminanceHDR"
+SRC_URI="mirror://sourceforge/qtpfsgui/${P/_/.}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="cpu_flags_x86_sse2 fits openmp test"
+
+BDEPEND="
+	dev-qt/linguist-tools:5
+"
+RDEPEND="
+	dev-libs/boost:0=
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtsql:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwebengine:5[widgets]
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	media-gfx/exiv2:=
+	media-libs/ilmbase:=
+	media-libs/lcms:2
+	media-libs/libpng:0=
+	media-libs/libraw:=
+	media-libs/openexr:=
+	media-libs/tiff:0
+	sci-libs/fftw:3.0=[threads]
+	sci-libs/gsl:=
+	virtual/jpeg:0
+	fits? ( sci-libs/cfitsio:= )
+"
+DEPEND="${RDEPEND}
+	dev-cpp/eigen:3
+	test? ( dev-cpp/gtest )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-cmake.patch
+	"${FILESDIR}"/${P}-no-git.patch
+	"${FILESDIR}"/${P}-docs.patch
+	"${FILESDIR}"/${PN}-2.5.1-openmp-automagic.patch
+)
+
+pkg_pretend() {
+	if use cpu_flags_x86_sse2 ; then
+		append-flags -msse2
+	else
+		eerror "This package requires a CPU supporting the SSE2 instruction set."
+		die "SSE2 support missing"
+	fi
+
+	if use openmp ; then
+		tc-has-openmp || die "Please switch to an openmp compatible compiler"
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package fits CFITSIO)
+		-DUSE_OPENMP="$(usex openmp)"
+	)
+	cmake-utils_src_configure
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
diff --git a/media-gfx/pixie/Manifest b/media-gfx/pixie/Manifest
deleted file mode 100644
index 81f83fd94451..000000000000
--- a/media-gfx/pixie/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX Makefile.shaders 192 BLAKE2B bcc477099df3fb7dc7c332d91bce560bf120be8ea3a145850f8b248430342f576071fabe0be4200c18a7e478e365a8dbc68b971832013d6f77c08283ef754afc SHA512 61bdde5f5d74d9c1e66d023d21d86a86f5a00d8b318b53042bbb25c3459fe9c29ba228ef7baceb3c2361d6716981ccfb6192362c7a72813aa0ecaa92d724b365
-AUX pixie-2.2.6-autotools.patch 680 BLAKE2B a4cb4e3e4db1e5c2cb8f83c42761fd2069a552de9de5e31397aa181a0a391bd76f13699fe66636fd12ac990acbe4de7a6edebec2cb208a6242ca9bc460d382cc SHA512 7212c644118af829c3bdc87998eb009b9235fc608054a1ebd1bc0f00c2e6a00f3959c2176db3ad451276351678008d312ecefbf4736eaf63989965c55eb1ac92
-AUX pixie-2.2.6-zlib-1.2.5.2.patch 2064 BLAKE2B ab891b633ff3c8d964e3bd73e32d46cb008f06d88bd8358cecfcee961a0a84f22f497b48ecdd8dc77219e7ec61555137b58082c4c359a4e30b82ae17b5e35b9b SHA512 f0cc7956117dc09cae574d5042a897c0f5ef9b26040c75d4c7b2ceef317c89431cceb7d32f61b5b5151efdc043e8968ac9129e1d1d6a7ac9720f9056e6db05d3
-DIST Pixie-src-2.2.6.tgz 9993504 BLAKE2B 59e04cd2294f1a0e8c841fd5c652fff184acf237dcf005207cd7f3d38195cc15b3246ae4ae8250dd245d7a4f7db65722ad8747798ae9c27c40c9411510016cfe SHA512 9b5256f5028d6091da293557e5385e53d8bdb2b3bfc7a89228b436b75424d7bd400d04e95cc04b71526aff026085f2bc2bd49e1ac0c54d3055f827fd5d05cc95
-DIST pixie-2.2.6-gcc6.patch.gz 16661 BLAKE2B 5d6f785e45f046fb9ff7ebbc9de18ccabd5ac566def3c48cc508aaec4387133aecdb48ba5d4b9eba93743c068a9d12a79ef4e13d3d23e2666bdca494ef979d32 SHA512 2cada11c95df1dde44119b97b44ab8550608427a2351540117655055d98a5ca142bc1fc78e8fc5ab25b8bb33385a7914114796a88cf83a232480e5b84bec57fb
-EBUILD pixie-2.2.6-r2.ebuild 2782 BLAKE2B 86e6ca562d4909d934dcae801fbea495773e4757865d745eac923bfa53e6256d142c691a36a0e3941fa734bfacf914499a523d6482ffdc8cb4f12faf961c6803 SHA512 13b4c9df5996fb31f6ba5bfe6c252078305954e305b4e1a57c333595e2ccfddf2ca296eea98736985f1602d33cece6f07d2cc4eb66d9ba80678886fff8d31b63
-MISC metadata.xml 544 BLAKE2B dc06ba2d4e26190f38a162a227970bf47c87320a17ef4cad43e8349311441dcc8852e14d34ab9ae2bc3b9caa35bf84f04a42b10a1621d1b82c7966e7d7473e8f SHA512 961588ff38565e8a709b30f704d099676d73f0d1cbe5b266cc26542d511648a740ca430ef845b290c4ad0bc2ffdbe15706534b1f6421d975e66eedf6b6853c89
diff --git a/media-gfx/pixie/files/Makefile.shaders b/media-gfx/pixie/files/Makefile.shaders
deleted file mode 100644
index fbc261c0c9bf..000000000000
--- a/media-gfx/pixie/files/Makefile.shaders
+++ /dev/null
@@ -1,15 +0,0 @@
-SDRC = ../src/sdrc/sdrc
-SDRCFLAGS +=
-
-%.sdr: %.sl
-	$(SDRC) $(SDRCFLAGS) $<
-
-OBJECT1 := $(wildcard *.sl)
-OBJECT := $(OBJECT1:.sl=.sdr)
-
-all: clean $(OBJECT)
-
-clean:
-	rm -f *.sdr
-
-.PHONY: clean
diff --git a/media-gfx/pixie/files/pixie-2.2.6-autotools.patch b/media-gfx/pixie/files/pixie-2.2.6-autotools.patch
deleted file mode 100644
index 7fd9f0ce76b0..000000000000
--- a/media-gfx/pixie/files/pixie-2.2.6-autotools.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/src/ri/Makefile.in	2009-09-23 18:10:13.414866323 +0200
-+++ b/src/ri/Makefile.in	2009-09-23 18:11:15.629864395 +0200
-@@ -214,7 +214,7 @@
- host_os = @host_os@
- host_vendor = @host_vendor@
- htmldir = @htmldir@
--includedir = $(prefix)/include
-+includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
- libdir = @libdir@
---- a/src/sdr/Makefile.in	2009-09-23 18:14:54.194865868 +0200
-+++ b/src/sdr/Makefile.in	2009-09-23 18:15:18.297863856 +0200
-@@ -199,7 +199,7 @@
- host_os = @host_os@
- host_vendor = @host_vendor@
- htmldir = @htmldir@
--includedir = $(prefix)/include
-+includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
- libdir = @libdir@
diff --git a/media-gfx/pixie/files/pixie-2.2.6-zlib-1.2.5.2.patch b/media-gfx/pixie/files/pixie-2.2.6-zlib-1.2.5.2.patch
deleted file mode 100644
index 7e0afe3a7c27..000000000000
--- a/media-gfx/pixie/files/pixie-2.2.6-zlib-1.2.5.2.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-http://bugs.gentoo.org/406899
-
---- a/src/ri/rib.l
-+++ b/src/ri/rib.l
-@@ -17,7 +17,7 @@
- 
- // Overwrite the YYinput so that it uses libz
- #undef YY_INPUT
--#define YY_INPUT(buf, retval, maxlen)	if ( (retval = gzread(ribin,buf,maxlen)) < 0) 			\
-+#define YY_INPUT(buf, retval, maxlen)	if ( (retval = gzread((gzFile)ribin,buf,maxlen)) < 0) 			\
- 											YY_FATAL_ERROR( "input in flex scanner failed" );
- 
- #endif
-@@ -223,7 +223,7 @@
- 															TRibFile	*nextFile	=	ribStack->next;
- 															rib_delete_buffer( YY_CURRENT_BUFFER );
- #ifdef HAVE_ZLIB
--															gzclose(ribin);
-+															gzclose((gzFile)ribin);
- #else
- 															fclose(ribin);
- #endif
-@@ -243,7 +243,7 @@
- 															rib_delete_buffer( YY_CURRENT_BUFFER );
- 															
- #ifdef HAVE_ZLIB
--															gzclose(ribin);
-+															gzclose((gzFile)ribin);
- #else
- 															fclose(ribin);
- #endif
---- a/src/ri/ribOut.cpp
-+++ b/src/ri/ribOut.cpp
-@@ -162,7 +162,7 @@
- 
- #ifdef HAVE_ZLIB
- 			if (outputCompressed) {
--				gzclose(outFile);
-+				gzclose((gzFile)outFile);
- 			} else {
- 				fclose(outFile);
- 			}
---- a/src/ri/ribOut.h
-+++ b/src/ri/ribOut.h
-@@ -237,7 +237,7 @@
- 												const int	l	=	vsprintf(scratch,mes,args);
- 
- 												#ifdef HAVE_ZLIB
--													if (outputCompressed)	gzwrite(outFile,scratch,l);
-+													if (outputCompressed)	gzwrite((gzFile)outFile,scratch,l);
- 													else					fwrite(scratch,1,l,outFile);
- 												#else
- 													fwrite(scratch,1,l,outFile);
-@@ -258,7 +258,7 @@
- 												const int l	=	vsprintf(scratch,mes,args);
- 
- 												#ifdef HAVE_ZLIB
--													if (outputCompressed)	gzwrite(outFile,scratch,l);
-+													if (outputCompressed)	gzwrite((gzFile)outFile,scratch,l);
- 													else					fwrite(scratch,1,l,outFile);
- 												#else
- 													fwrite(scratch,1,l,outFile);
---- a/src/ri/rib.y
-+++ b/src/ri/rib.y
-@@ -2940,7 +2940,7 @@
- 		
- 		if (ribin != NULL) {
- #ifdef HAVE_ZLIB
--			gzclose(ribin);
-+			gzclose((gzFile)ribin);
- #else
- 			fclose(ribin);
- #endif
diff --git a/media-gfx/pixie/metadata.xml b/media-gfx/pixie/metadata.xml
deleted file mode 100644
index 2f6247ed93fe..000000000000
--- a/media-gfx/pixie/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->  
-  <longdescription>
-    Pixie is an open source photorealistic renderer that uses a RenderMan-like
-    interface. Features include programmable shading, motion blur, depth of
-    field, raytracing, scan-line rendering, occlusion culling, global
-    illumination, caustics ...
-  </longdescription>
-  <upstream>
-    <remote-id type="sourceforge">pixie</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/media-gfx/pixie/pixie-2.2.6-r2.ebuild b/media-gfx/pixie/pixie-2.2.6-r2.ebuild
deleted file mode 100644
index 3766fa36d3d1..000000000000
--- a/media-gfx/pixie/pixie-2.2.6-r2.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-WANT_AUTOMAKE="1.10"
-
-inherit autotools
-
-MY_PN="Pixie"
-S="${WORKDIR}/${MY_PN}"
-
-DESCRIPTION="RenderMan like photorealistic renderer"
-HOMEPAGE="http://www.okanarikan.com/project/2005/05/24/Pixie.html"
-SRC_URI="mirror://sourceforge/${PN}/${MY_PN}-src-${PV}.tgz https://dev.gentoo.org/~dilfridge/distfiles/pixie-2.2.6-gcc6.patch.gz"
-
-LICENSE="GPL-2+"
-IUSE="X static-libs"
-SLOT="0"
-KEYWORDS="amd64 ppc ~sparc x86"
-
-RDEPEND="media-libs/libpng
-	media-libs/tiff
-	media-libs/openexr
-	sys-libs/zlib
-	virtual/jpeg
-	virtual/opengl
-	x11-libs/fltk:1[opengl]
-	X? (
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libX11
-		x11-libs/libXau
-		x11-libs/libxcb
-		x11-libs/libXdmcp
-		x11-libs/libXext
-		x11-libs/libXi
-		x11-libs/libXmu
-		x11-libs/libXt
-	)"
-DEPEND="${RDEPEND}
-	sys-devel/bison
-	sys-devel/flex"
-
-src_prepare() {
-	default
-	eapply "${FILESDIR}"/${P}-zlib-1.2.5.2.patch
-	# FIX: missing @includedir@
-	# https://sf.net/tracker/?func=detail&aid=2923415&group_id=59462&atid=491094
-	eapply "${FILESDIR}"/${P}-autotools.patch
-	# bug 594354
-	eapply "${WORKDIR}"/${P}-gcc6.patch
-
-	mv configure.{in,ac} || die
-
-	eautoreconf
-
-	# FIX: removing pre-compiled shaders
-	# shaders must be removed before of their compilation or make
-	# parallelism can break the regeneration process, with resulting
-	# missing shaders.
-	rm "${S}"/shaders/*.sdr || die
-
-	# FIX: flex does not translate variable name in custom YY_DECL
-	sed -i -e '/define YY_DECL/ s/yylval/riblval/' src/ri/rib.l || die
-}
-
-src_configure() {
-	# NOTE: the option program-transform-name is used to avoid binary name
-	# conflict with package: mail-client/nmh (see #295996)
-	econf \
-		$(use_with X x) \
-		$(use_enable static-libs static) \
-		--includedir=/usr/include/pixie \
-		--libdir=/usr/$(get_libdir)/pixie \
-		--with-docdir=/usr/share/doc/${PF}/html \
-		--with-shaderdir=/usr/share/Pixie/shaders \
-		--with-ribdir=/usr/share/Pixie/ribs \
-		--with-texturedir=/usr/share/Pixie/textures \
-		--with-displaysdir=/usr/$(get_libdir)/pixie/displays \
-		--with-modulesdir=/usr/$(get_libdir)/pixie/modules \
-		--enable-openexr-threads \
-		--disable-static-fltk \
-		--mandir=/usr/share/man \
-		--bindir=/usr/bin \
-		--program-transform-name="s/show/pixie-show/"
-}
-
-src_compile() {
-	default
-
-	# regenerating Pixie shaders - see upstream bug report:
-	# https://sf.net/tracker/?func=detail&aid=2923407&group_id=59462&atid=491094
-	einfo "Re-building Pixie Shaders for v${PV} format"
-	emake -f "${FILESDIR}/Makefile.shaders" -C "${S}/shaders"
-}
-
-src_install() {
-	default
-
-	insinto /usr/share/Pixie/textures
-	doins "${S}"/textures/*
-
-	# remove useless .la files
-	find "${D}" -name '*.la' -delete || die "removal of libtool archive files failed"
-}
diff --git a/media-gfx/rawtherapee/Manifest b/media-gfx/rawtherapee/Manifest
index c5cee437f1b7..95b4444a1b86 100644
--- a/media-gfx/rawtherapee/Manifest
+++ b/media-gfx/rawtherapee/Manifest
@@ -1,5 +1,3 @@
-DIST rawtherapee-5.5.tar.xz 12163556 BLAKE2B 6251655b5bcc8b805eda584e386771b14dec15a2d8a96518bdb79d7e31354c78eb263f6964d7f6ffaeb35a127d3f775c9c39dfebf072a0bfc14d284358acd03c SHA512 fcb546ad6e420200a821c89555ec259140995a3bc69429d2ecb648632c02e10ffceebbd7296e879c93b53ad8efa45ea71336d936cd90cead723e70e8932a413a
 DIST rawtherapee-5.6.tar.xz 12083264 BLAKE2B a0eb09e98e1041b393ad3aa671641a2a4855379cef6245ca3cca2588ff5f50fedf8becd88bad1ab70f63dfb575f5f22c141040defa10b47268947415999d8e79 SHA512 2c751c7631ea2ef65c334fa0baab16d4c3161fae66487870c476f07f1ea3604a5e28a251fd98d9688cafc088302af7aa6e28e9b27a37f916715708ed5e731f0f
-EBUILD rawtherapee-5.5.ebuild 1630 BLAKE2B e97a9f3cd46273c7eb61006f7d9f7225792838a3b4465705103ad9d5f13e40348d0c7d691dd899daeb24a1ac568e303be150aad3319d555b502ae0664a88c842 SHA512 34b18eddacacad43a444eca19556a4e1ab237b56ae85fe82344464cebe6148921feb28771979242d09b8585cf3993338ba0ae89b561241b9963362c540b84fb8
 EBUILD rawtherapee-5.6.ebuild 1621 BLAKE2B 9f963fabf47cc479f8b840648b227058c232cfaeefc8904fe2ae2ee38e4b219b427633b8575ffd27172bc49c0fc4c99973e55e193883bc1f6fb35f0176d19e2e SHA512 557b60056ab12fb8b9dea4702e7fae0d2438abc89a5f414d75cdd353ee7a99ea6cbafc4df118ad7272c880dfc0f1a107a4ffff190e9a317b75de68471c15a336
 MISC metadata.xml 484 BLAKE2B 672746e8291016ad6467a9b3c9baa84abac42df9f7de4b4bdb79374bba8e84f7cbfe140a076ebee49ec50587154612b73c6a7022461d01fd7fbdc63a6ddfcd98 SHA512 91f11609c7472bb7cebff5d440ee3d4b0560e0832e1bfb6ffd5b239e8e60647e067894d77ccb6e40a379680775f80b91250c3feab5cd2ce32d7991e0776d0cd9
diff --git a/media-gfx/rawtherapee/rawtherapee-5.5.ebuild b/media-gfx/rawtherapee/rawtherapee-5.5.ebuild
deleted file mode 100644
index 707036915c1b..000000000000
--- a/media-gfx/rawtherapee/rawtherapee-5.5.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils flag-o-matic gnome2-utils toolchain-funcs xdg-utils
-
-MY_P=${P/_rc/-rc}
-DESCRIPTION="A powerful cross-platform raw image processing program"
-HOMEPAGE="https://www.rawtherapee.com/"
-SRC_URI="https://rawtherapee.com/shared/source/${MY_P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-IUSE="openmp"
-
-RDEPEND="
-	dev-libs/expat
-	dev-libs/libsigc++:2
-	media-libs/lcms:2
-	media-libs/lensfun
-	media-libs/libcanberra[gtk3]
-	media-libs/libiptcdata
-	media-libs/libpng:0
-	media-libs/tiff:0
-	sci-libs/fftw:3.0
-	sys-libs/zlib
-	virtual/jpeg:0
-	x11-libs/gtk+:3"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	dev-cpp/gtkmm:3.0
-	virtual/pkgconfig"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_pretend() {
-	if use openmp ; then
-		tc-has-openmp || die "Please switch to an openmp compatible compiler"
-	fi
-}
-
-src_configure() {
-	# upstream tested that "fast-math" give wrong results, so filter it
-	# https://bugs.gentoo.org/show_bug.cgi?id=606896#c2
-	filter-flags -ffast-math
-	# -Ofast enable "fast-math" both in gcc and clang
-	replace-flags -Ofast -O3
-	# In case we add an ebuild for klt we can (i)use that one,
-	# see http://cecas.clemson.edu/~stb/klt/
-	local mycmakeargs=(
-		-DOPTION_OMP=$(usex openmp)
-		-DDOCDIR=/usr/share/doc/${PF}
-		-DCREDITSDIR=/usr/share/${PN}
-		-DLICENCEDIR=/usr/share/${PN}
-		-DCACHE_NAME_SUFFIX=""
-		-DWITH_SYSTEM_KLT="off"
-	)
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/media-gfx/sane-frontends/Manifest b/media-gfx/sane-frontends/Manifest
index 47726079a726..93e2f61d49bf 100644
--- a/media-gfx/sane-frontends/Manifest
+++ b/media-gfx/sane-frontends/Manifest
@@ -3,4 +3,4 @@ DIST sane-frontends-1.0.14.tar.gz 231892 BLAKE2B 3d3af2ded774fa90ba4b9545a00df1f
 DIST sane-frontends-upstream-1.0.14.tar.gz 233587 BLAKE2B 69e34ed783cff68879b92d478195fe8c67f29d8904e22bdc62deb7310e8ac73d1ce6fc89ee0eafe3e2460f54cec257dbfe28843aec679cfe8669be6c5fc0e2bd SHA512 ffb854f4f4fd08a98395f325c22aa81924ac1e0827e795107bf01f3c42c2cd64bc204c79bc5ec8fd570746d039eae87a2da9cdf30b7f4640442a33c6495d35f8
 EBUILD sane-frontends-1.0.14-r3.ebuild 1327 BLAKE2B 15e8425ed7db7301ded095f2652f8214a40f8381f67f90077835dcb9d03c6e024be07de4eb85279a6b8d728865d989c66d238a17d00d685546f05775ef1af251 SHA512 0e7c3cfcd8df0bba6fec4ece1188b3907d33fa57878a0d38265dda4d29c3b295c7128ce84507b55ca21a373926d15bf66d82f91a49a4fea0009c4c9e4d1305ca
 EBUILD sane-frontends-1.0.14-r4.ebuild 1477 BLAKE2B 51ac9358562198a79a391efec2f00b120b1a36f9d0e8fe39305bf6943449365bec1606f414cb0853f00a633ae1a4e439cb92f6d9d4ede4c01196936e4ee5b6fd SHA512 fb36d5fb3e1ceec7d226ce4d18e32822fc0e68d1aa55a86b517b05b1726a3be807456e5fd8a211e1991a32c724d786d782bc21262c2be1951eaaf2514923c6a3
-MISC metadata.xml 165 BLAKE2B ed7e2ebe9f71491aa6163627bdb6606e798b98ca85c053b50442182a245074a9e09b290835e7c8fb4a10e4e8227c16ec306fd16f337cb66904095d864e698e8b SHA512 bebe508b4e0a7ca4a046f9befd3d7ddb702756024756a5f0d9fb5ace5fe3f5a98f9d42afda4597b7d1338607b8d43e41c8fcd6d20d31da3ebad2b420edd2cb59
+MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/media-gfx/sane-frontends/metadata.xml b/media-gfx/sane-frontends/metadata.xml
index 58f638b2ac3e..7a38bb900964 100644
--- a/media-gfx/sane-frontends/metadata.xml
+++ b/media-gfx/sane-frontends/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!--maintainer-needed-->
+	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/media-gfx/ufraw/Manifest b/media-gfx/ufraw/Manifest
index 0a237843410c..9d0401086fe7 100644
--- a/media-gfx/ufraw/Manifest
+++ b/media-gfx/ufraw/Manifest
@@ -1,10 +1,14 @@
 AUX ufraw-0.17-cfitsio-automagic.patch 933 BLAKE2B 06de9b807a9a491af2db83bfc07e3727409494a0925f01c0493e7cc5ce7b4a326f9c041d11dc30a38c6c71b42cc07e83017ffb01873a2d4f44d78a65a5c7c3ed SHA512 84aadb7dc41927a26ac37a801e136628380e79f032f87a925e737ec76c349c96c410750234f4870fe2fa61680085472a028e47c13cf01b2bd7fc7a55dad6de1b
+AUX ufraw-0.22-CVE-2015-8366.patch 498 BLAKE2B 98ff63a7ea66579877a7b1733111633df53241761cb4b56b745a9f34290fe72e6f802f602dfc1b69fc5210fc5007966bd7070aecaadc71ea5ddde15c849cd7ec SHA512 de55e5e2050ee648a889537d56410adb16adffb51d2ea03614932e0cb76d9a82c625ee2429493d89c389121ca30d8133ab4347602e55625f533611519d15db43
+AUX ufraw-0.22-CVE-2018-19655.patch 1292 BLAKE2B f4d89eff3392191cc1ac196b97e67d0df4e2710a15e2e08859b7c0b6fd2b8ab38173d2268b3e919965257e58d7341de4150ae690c1d864d3f90fcec4d8689a34 SHA512 a6b9e1b669f3aef9af98a57b04d0a225e24556a7ea4d19fb973d94fca209fdff1e2a9045743f2ceae8f6d608f42ccfc8a2041bdd7106f7bb21de263ff4b70d9c
 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-exiv2-0.27.patch 738 BLAKE2B 5392f37396074b1188b4c9f3bac06eb4168d68f53d367cc5107dbf71a66d5aab56a62489a826ac8fc0a4add74666bf232fde96f41f0ffc9604f5e6fd09d5d4fd SHA512 d37a132dc06ce186f177d6720ad23bc5f1e8ce84743b6e506242efee20cf628a4192d2bdaf1718260dba7bdef82d78bae2eb366df44e3dd3de13e318f812b76d
 AUX ufraw-0.22-fix-unsigned-char.patch 748 BLAKE2B 30a8dfcfb71f78449838ade5f77074d667fc1e71ca079f8042869a9e82ff8b9422ddbdc892c7458e05ad411d552352b5f530ae2da4a629d449857a1e62be0c78 SHA512 0ea99fe69adeeae1e6c07bcf9d583f6b8247ad0f01ddf3435edb605618b0c24d80c5662442250020b92352ebba12757bb69ad7b107ab8a8f464d5cf2b642664b
+AUX ufraw-0.22-gcc9.patch 3569 BLAKE2B ce417eb79994190666b842f6017f18eadead284bb763f1248ab4c0dd6132977fc56c79c11e3782a33d507aceec193e9ab2be423bea4335521e4308cb617b04d7 SHA512 aaf902c4a96ba1d9f21ff31e5499fd9d9216ff17812b41276e15a7150a4a90aa8a7a9e4aec70a006e68930e0e05c4a1da38abc78175de521752f1c6152e77b5a
 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 1951 BLAKE2B bedb97bbc87eb73770146b8fa6f27689cf000aa3b29611222e2f73ae1bd5de6b3dbedcb807c683c26f1c1aff52abf160ad78ff2d45e280b8e64ca5de771ae6bf SHA512 8f720c4a740dfa8b3df0f0868f5d2a03a22ac08765308eb2ca79f9e70686e800ef636062c277eef21bf21d34ade891037a8c5879739183dfe2d7aa66646d3d6a
+EBUILD ufraw-0.22-r3.ebuild 2094 BLAKE2B 413c318609901fa6eacdf7c239da47f9aedb32e5d973667588f8d50e1bf9dda9570c787752764d51cf4575afddb48c15ac47106e003539b0ec160e6d81c4d0dc SHA512 4547d4b12fb3b66891870122254680ba6f71fb0a3cbfa75d1ca59b96da52e2b0d34234a52ee1fbdf4ba4450b9fbfb3b185b05dacc5f13743dc0a0c2b80f2654f
 MISC metadata.xml 588 BLAKE2B 3e6ec0c8b11a3c30d1b20b5df4303fc1bc10b4e6459a24358ac50bcfaa414b307efe6d392d23fd7ce1443917865deae0dfa89cc7a068567f227cdc387f99d1cb SHA512 3d161ddfe0da5620312603d66acbc24244317da4dcb905558eddda9d54bf96024881ffbdcaa49f9daf73d779d5e7dbb47a523e05cc6c614756b468f14ef66ab9
diff --git a/media-gfx/ufraw/files/ufraw-0.22-CVE-2015-8366.patch b/media-gfx/ufraw/files/ufraw-0.22-CVE-2015-8366.patch
new file mode 100644
index 000000000000..9d59ca413fbe
--- /dev/null
+++ b/media-gfx/ufraw/files/ufraw-0.22-CVE-2015-8366.patch
@@ -0,0 +1,17 @@
+Fix a buffer overflow bug.  See
+https://github.com/LibRaw/LibRaw/commit/89d065424f09b788f443734d44857289489ca9e2
+
+--- a/dcraw.cc
++++ b/dcraw.cc
+@@ -3013,7 +3013,10 @@
+       diff = diff ? -diff : 0x80;
+     if (ftell(ifp) + 12 >= (int) seg[1][1])
+       diff = 0;
+-    raw_image[pix] = pred[pix & 1] += diff;
++    if(pix>=raw_width*raw_height)
++      derror();
++    else
++      raw_image[pix] = pred[pix & 1] += diff;
+     if (!(pix & 1) && HOLE(pix / raw_width)) pix += 2;
+   }
+   maximum = 0xff;
diff --git a/media-gfx/ufraw/files/ufraw-0.22-CVE-2018-19655.patch b/media-gfx/ufraw/files/ufraw-0.22-CVE-2018-19655.patch
new file mode 100644
index 000000000000..78b46b4452e0
--- /dev/null
+++ b/media-gfx/ufraw/files/ufraw-0.22-CVE-2018-19655.patch
@@ -0,0 +1,44 @@
+Description: stack-based buffer overflow bug
+Bug-Debian: https://bugs.debian.org/890086
+Bug-Debian-Security: https://security-tracker.debian.org/tracker/CVE-2018-19655
+Author: Filip Hroch <hroch@physics.muni.cz>
+Reviewed-by: Salvatore Bonaccorso <carnil@debian.org>
+Last-Update: 2018-12-02
+
+--- a/dcraw.cc
++++ b/dcraw.cc
+@@ -8505,9 +8505,15 @@ float CLASS find_green (int bps, int bit
+ {
+   UINT64 bitbuf=0;
+   int vbits, col, i, c;
+-  ushort img[2][2064];
++  ushort *img;
+   double sum[]={0,0};
+ 
++#define IMG2D(row,col) \
++  img[(row)*width+(col)]
++
++  img = (ushort *) malloc(2*width*sizeof(ushort));
++  merror (img, "find_green()");
++
+   FORC(2) {
+     fseek (ifp, c ? off1:off0, SEEK_SET);
+     for (vbits=col=0; col < width; col++) {
+@@ -8516,13 +8522,14 @@ float CLASS find_green (int bps, int bit
+ 	for (i=0; i < bite; i+=8)
+ 	  bitbuf |= (unsigned) (fgetc(ifp) << i);
+       }
+-      img[c][col] = bitbuf << (64-bps-vbits) >> (64-bps);
++      IMG2D(c,col) = bitbuf << (64-bps-vbits) >> (64-bps);
+     }
+   }
+   FORC(width-1) {
+-    sum[ c & 1] += ABS(img[0][c]-img[1][c+1]);
+-    sum[~c & 1] += ABS(img[1][c]-img[0][c+1]);
++    sum[ c & 1] += ABS(IMG2D(0,c)-IMG2D(1,c+1));
++    sum[~c & 1] += ABS(IMG2D(1,c)-IMG2D(0,c+1));
+   }
++  free(img);
+   return 100 * log(sum[0]/sum[1]);
+ }
+ 
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
index b5b4140fff8e..2cd888ebc096 100644
--- a/media-gfx/ufraw/files/ufraw-0.22-exiv2-0.27.patch
+++ b/media-gfx/ufraw/files/ufraw-0.22-exiv2-0.27.patch
@@ -1,6 +1,6 @@
---- 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 @@
+--- a/ufraw_exiv2.cc
++++ b/ufraw_exiv2.cc
+@@ -15,9 +15,8 @@
  #include "ufraw.h"
  
  #ifdef HAVE_EXIV2
@@ -8,10 +8,11 @@
 -#include <exiv2/easyaccess.hpp>
 -#include <exiv2/exif.hpp>
 +#include <exiv2/exiv2.hpp>
++#include <iostream>
  #include <sstream>
  #include <cassert>
  
-@@ -67,7 +65,11 @@
+@@ -67,7 +66,11 @@ extern "C" int ufraw_exif_read_input(ufraw_data *uf)
          if (exifData.empty()) {
              std::string error(uf->filename);
              error += ": No Exif data found in the file";
diff --git a/media-gfx/ufraw/files/ufraw-0.22-gcc9.patch b/media-gfx/ufraw/files/ufraw-0.22-gcc9.patch
new file mode 100644
index 000000000000..f2cf1dc88a86
--- /dev/null
+++ b/media-gfx/ufraw/files/ufraw-0.22-gcc9.patch
@@ -0,0 +1,97 @@
+From ac8c74699cba65d65f918b3f4cba2de64e039ada Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= <sergio@serjux.com>
+Date: Thu, 14 Feb 2019 03:26:02 +0000
+Subject: [PATCH] Fix GCC 9 OpenMP issues by drop default(none)
+
+---
+ dcraw_api.cc  | 4 ++--
+ dcraw_indi.c  | 4 ----
+ ufraw_ufraw.c | 6 +++---
+ 3 files changed, 5 insertions(+), 9 deletions(-)
+
+diff --git a/dcraw_api.cc b/dcraw_api.cc
+index c3d2902..6096cb7 100644
+--- a/dcraw_api.cc
++++ b/dcraw_api.cc
+@@ -686,7 +686,7 @@ extern "C" {
+             rgbWB[3] = rgbWB[1];
+         if (dark) {
+ #ifdef _OPENMP
+-            #pragma omp parallel for schedule(static) default(none) \
++            #pragma omp parallel for schedule(static) \
+             shared(h,dark,rgbWB)
+ #endif
+             for (int i = 0; i < pixels; i++) {
+@@ -699,7 +699,7 @@ extern "C" {
+             }
+         } else {
+ #ifdef _OPENMP
+-            #pragma omp parallel for schedule(static) default(none) \
++            #pragma omp parallel for schedule(static) \
+             shared(h,dark,rgbWB)
+ #endif
+             for (int i = 0; i < pixels; i++) {
+diff --git a/dcraw_indi.c b/dcraw_indi.c
+index a291af2..777ce39 100644
+--- a/dcraw_indi.c
++++ b/dcraw_indi.c
+@@ -137,12 +137,10 @@ void CLASS wavelet_denoise_INDI(ushort(*image)[4], const int black,
+ #ifdef _OPENMP
+ #if defined(__sun) && !defined(__GNUC__)	/* Fix bug #3205673 - NKBJ */
+     #pragma omp parallel for				\
+-    default(none)					\
+     shared(nc,image,size,noise)				\
+     private(c,i,hpass,lev,lpass,row,col,thold,fimg,temp)
+ #else
+     #pragma omp parallel for				\
+-    default(none)					\
+     shared(nc,image,size)				\
+     private(c,i,hpass,lev,lpass,row,col,thold,fimg,temp)
+ #endif
+@@ -413,7 +411,6 @@ void CLASS vng_interpolate_INDI(ushort(*image)[4], const unsigned filters,
+     progress(PROGRESS_INTERPOLATE, -height);
+ #ifdef _OPENMP
+     #pragma omp parallel				\
+-    default(none)					\
+     shared(image,code,prow,pcol,h)			\
+     private(row,col,g,brow,rowtmp,pix,ip,gval,diff,gmin,gmax,thold,sum,color,num,c,t)
+ #endif
+@@ -496,7 +493,6 @@ void CLASS ppg_interpolate_INDI(ushort(*image)[4], const unsigned filters,
+ 
+ #ifdef _OPENMP
+     #pragma omp parallel				\
+-    default(none)					\
+     shared(image,dir,diff)				\
+     private(row,col,i,d,c,pix,guess)
+ #endif
+diff --git a/ufraw_ufraw.c b/ufraw_ufraw.c
+index ce9d262..48a0d91 100644
+--- a/ufraw_ufraw.c
++++ b/ufraw_ufraw.c
+@@ -1043,7 +1043,7 @@ static void ufraw_shave_hotpixels(ufraw_data *uf, dcraw_image_type *img,
+     delta = rgbMax / (uf->conf->hotpixel + 1.0);
+     count = 0;
+ #ifdef _OPENMP
+-    #pragma omp parallel for schedule(static) default(none) \
++    #pragma omp parallel for schedule(static) \
+     shared(uf,img,width,height,colors,rgbMax,delta) \
+     reduction(+:count) \
+     private(h,p,w,c,t,v,hi,i)
+@@ -1365,7 +1365,7 @@ static void ufraw_convert_reverse_wb(ufraw_data *uf, UFRawPhase phase)
+         mul[i] = (guint64)0x10000 * 0x10000 / uf->developer->rgbWB[i];
+     size = img->height * img->width;
+ #ifdef _OPENMP
+-    #pragma omp parallel for schedule(static) default(none) \
++    #pragma omp parallel for schedule(static) \
+     shared(uf,phase,img,mul,size) \
+     private(i,p16,c,px)
+ #endif
+@@ -1390,7 +1390,7 @@ static void ufraw_convert_image_tca(ufraw_data *uf, ufraw_image_data *img,
+         return;
+     int y;
+ #ifdef _OPENMP
+-    #pragma omp parallel for schedule(static) default(none) \
++    #pragma omp parallel for schedule(static) \
+     shared(uf,img,outimg,area)
+ #endif
+     for (y = area->y; y < area->y + area->height; y++) {
diff --git a/media-gfx/ufraw/ufraw-0.22-r3.ebuild b/media-gfx/ufraw/ufraw-0.22-r3.ebuild
new file mode 100644
index 000000000000..f31268404678
--- /dev/null
+++ b/media-gfx/ufraw/ufraw-0.22-r3.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools gnome2-utils toolchain-funcs xdg-utils
+
+DESCRIPTION="RAW Image format viewer and GIMP plugin"
+HOMEPAGE="http://ufraw.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+IUSE="contrast fits gimp gnome gtk openmp timezone"
+
+REQUIRED_USE="gimp? ( gtk )"
+
+BDEPEND="virtual/pkgconfig"
+RDEPEND="
+	dev-libs/glib:2
+	media-gfx/exiv2:=
+	media-libs/lcms:2=
+	>=media-libs/lensfun-0.2.5:=
+	media-libs/libpng:0=
+	media-libs/tiff
+	virtual/jpeg:0=
+	fits? ( sci-libs/cfitsio:= )
+	gimp? ( >=media-gfx/gimp-2 )
+	gnome? ( >=gnome-base/gconf-2 )
+	gtk? (
+		>=media-gfx/gtkimageview-1.5
+		>=x11-libs/gtk+-2.6:2
+	)
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.17-cfitsio-automagic.patch
+	"${FILESDIR}"/${P}-jasper-automagic.patch
+	"${FILESDIR}"/${P}-crashfix.patch
+	"${FILESDIR}"/${P}-drop_superfluous_abs.patch
+	"${FILESDIR}"/${P}-fix-unsigned-char.patch
+	"${FILESDIR}"/${P}-jpeg9.patch
+	"${FILESDIR}"/${P}-exiv2-0.27.patch
+	"${FILESDIR}"/${P}-gcc9.patch
+	"${FILESDIR}"/${P}-CVE-2015-8366.patch
+	"${FILESDIR}"/${P}-CVE-2018-19655.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--disable-jasper
+		$(use_enable contrast)
+		$(use_with fits cfitsio)
+		$(use_with gimp)
+		$(use_enable gnome mime)
+		$(use_with gtk)
+		$(use_enable openmp)
+		$(use_enable timezone dst-correction)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	emake AR="$(tc-getAR)"
+}
+
+src_install() {
+	emake DESTDIR="${D}" schemasdir=/etc/gconf/schemas install
+	einstalldocs
+}
+
+pkg_preinst() {
+	if use gnome; then
+		gnome2_gconf_savelist
+	fi
+}
+
+pkg_postinst() {
+	if use gnome; then
+		xdg_mimeinfo_database_update
+		xdg_desktop_database_update
+		gnome2_gconf_install
+	fi
+}
+
+pkg_postrm() {
+	if use gnome; then
+		xdg_desktop_database_update
+		xdg_mimeinfo_database_update
+	fi
+}
author	V3n3RiX <venerix@redcorelinux.org>	2019-09-25 19:33:39 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2019-09-25 19:33:39 +0100
commit	a5b65c81168c90928784a1e92cda84ed5d6b9eb3 (patch)
tree	4aa7483cd0ad7de54338afc8e7971417abe1dd81 /media-gfx
parent	e8f81810baa21f490d6910e8e2d424546b72a333 (diff)