gentoo resync : 28.04.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-04-28 20:02:04 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2018-04-28 20:02:04 +0100
commit: a4e2a46beb5e4858ef27bdedbb0ff6d2ced430ad (patch)
tree: 852c90a4bf354c30ea66504f70bfab5401fba18d /media-gfx
parent: 5e8702bcbbed438e6c6cce023e7ef0cc9baa3e02 (diff)
59 files changed, 623 insertions, 1141 deletions
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 0f481273919a..bfc9d3b414c4 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/autopano-sift-C/Manifest b/media-gfx/autopano-sift-C/Manifest
index af95acd3f227..cc5826e745f7 100644
--- a/media-gfx/autopano-sift-C/Manifest
+++ b/media-gfx/autopano-sift-C/Manifest
@@ -1,4 +1,4 @@
 AUX autopano-sift-C-2.5.1-lm.patch 512 BLAKE2B 2d27dce09f989fca21be647cd028c5601535d98c7987213c0968fd93d8ee1aac6a6b32c08385b0600829b189fcaab6ee84359763fcbfb4a3710b8bd8ba5cc83d SHA512 35eb8d71f770f25a709599528679ac15e9a90c12ca3c34c1cd1411eaba852dbe9e627e4b8d8fb62adda7e2422c0de493538cbcbf14206e408b9921c895761856
 DIST autopano-sift-C-2.5.1.tar.gz 192267 BLAKE2B 552fe33230d322b5b33c31a6298058d30a8dd63110f15b1af25fa53aa762a5d9924a712523b626ba2381692c643c0bec44534bd5d2cc69b00faaf5b7fbd51d91 SHA512 4f3c9e8738c7bc29ff6284033b7b813de61ef440c3d544755be8c4ad715a6e4175801ee4c02642df5e05bac82929c5554d85a5c488a2c27da1e5e81d3cd72931
-EBUILD autopano-sift-C-2.5.1.ebuild 693 BLAKE2B d3a9f36be920816c8d9db91fc8b802d882fcd3b655452a6bf4ea68f427abb68c389d894186dcb41032aacf02225337996f4c1031b865b711d68fcb635e61ee84 SHA512 77b28173a35f5c20be1cb72ec3b26bbaf2eb5e91ebeb41ae9aab988adb14a897f8d756d0809389236e80efd263c7ddf12d71bb18d9b93b506b398548c6ded6f3
+EBUILD autopano-sift-C-2.5.1.ebuild 688 BLAKE2B 46c2c123aab689cddde0b101b8b2e8523260f6fb4cc406b281ec94653bc0257a44f3e9f35a2343db4e1a39824ac4eeb28f000200d2077748606857c87d156500 SHA512 ec794565c3c1fb5ad00a232995c3643aa6a963bcd3a1aab245913708f8a6cd99a5464fdd262ba26d441426498930383e90698bf0f8e2bc864b2be354acb1ee21
 MISC metadata.xml 472 BLAKE2B b36bfaf7b7c146cb6c5df0b50983bd6ba0e089f75d04bdc38b331fd0b3bef92380140eaef73db1811647cee1e73b955fdba54c27ae19cdfbecd67099618b349f SHA512 28eab06295fba1917784743b7103fca9ce4a54806ac9609172653896426013f0f2b18a6a4428226aeafca8d0a5de6e493e6288985564331cbc3e0a3e3f2fbb6a
diff --git a/media-gfx/autopano-sift-C/autopano-sift-C-2.5.1.ebuild b/media-gfx/autopano-sift-C/autopano-sift-C-2.5.1.ebuild
index 311bb30b7b86..3e9405ae1588 100644
--- a/media-gfx/autopano-sift-C/autopano-sift-C-2.5.1.ebuild
+++ b/media-gfx/autopano-sift-C/autopano-sift-C-2.5.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/hugin/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 S=${WORKDIR}/${PN}-"$(get_version_component_range 1-3)"
diff --git a/media-gfx/displaycal/Manifest b/media-gfx/displaycal/Manifest
index d34135ad6b2d..15cd065f5449 100644
--- a/media-gfx/displaycal/Manifest
+++ b/media-gfx/displaycal/Manifest
@@ -1,11 +1,5 @@
-DIST DisplayCAL-3.3.5.0.tar.gz 9913672 BLAKE2B de95217baf18a3b07b51a9db24e37cd965ecf5ba96392410f7f5af788b696f69260eac5c0188cbd3a2f1b90dfafe781cd711c04a9bd45dd5a2fa59fd547087b2 SHA512 7a24cbc540771fd26b504536ee0c1b9c34f013c19b5b2a4e1ce38015014e9b34e67b48a1f08bf96581cef2968883691206ddb6cefa9ac70d76251a305a5b1c37
-DIST DisplayCAL-3.4.0.0.tar.gz 10279645 BLAKE2B cf0b6d841c26d8ee4eec47fa58071e31e1ae4c8f1cd63f08216dbfd33caeb900d767988aa19f1738bdbe3c180954a13be22fdd96187b32edc8b0419b945670be SHA512 a63cda986a70cef844908c5809157af28473b564c97fa4c1b957102401b177b254cd215b1cb7c8192873e6d1b204dca66f5a08862f27e0d2f0c06b6ceeaae25e
-DIST DisplayCAL-3.5.0.0.tar.gz 10371665 BLAKE2B f3854d602857ed260ab5bee3d43f9dafc8b4a55115ea9746c75fa679026493f3d11fd79c68270390de2175639d14796ce2e4cf20e34324b0af037630d118d293 SHA512 968f14edc5fc821de692dfd200c06068c259153afa684fb639f2867a356b435a35b5c7f4120a90c7d3d5ec3b0200cf0c8593bed6c364fcd7130013ec97ac09af
 DIST DisplayCAL-3.5.1.0.tar.gz 10378539 BLAKE2B b10e3f70401b9167728c4fc9b59bf66da7e3a09040fdf0800e9697aa9bc328d7d70e4018d14856fbde1a20028ef3aec2922727282050c291ed5a8c83209178e3 SHA512 7dd0c67c8766478223f1e36a36d386b0e8d284001642e34fd1aa27e196fc36be1fd98340f4af202c4b171aa44da9f9d20a53f8dda11ba5e270a1071351fc7a6a
 DIST DisplayCAL-3.5.2.0.tar.gz 10341417 BLAKE2B 218d73756c57107b17a475101a8969af4213ce0417669b5d18f009320cab970da125ddae68a3288f61f05be99f3e2a621a727c2cf6b4aeae43252c8d257ed3af SHA512 607a63c94fbebf916009327bf473c45e6e785e5dfa57bd0b5868616a57b7af1aa3173a43cd7e371b43a8078ad350ff27178c6c13b46a3e67e28a4397c5586665
-EBUILD displaycal-3.3.5.0.ebuild 1518 BLAKE2B d6774180d9cbd3bb17572e96dfcf95b5d8e7f71efa038764dbf0012ad8f56965efb95c2c67e77a9dbf1a4bd07f7e6229a3f9fe9c35fa12417a0b8aada6fd9a18 SHA512 19671a35a80cbfb99d7f5fc2a36884990e791fc02b563efe00131b776320cac1e3c4307877152e07f972ba8aabde879ea3d7d6a4d498560f4cb96c7640459f58
-EBUILD displaycal-3.4.0.0.ebuild 1552 BLAKE2B 9de351bc65367c39bde13ccb143c62309e45f8a0ae1fc20e4b09cce8c82720fd72889d6a2992a421f5af9809cffac5a771b413fce2911babb40ef5330db919d8 SHA512 fad82ef40f25d1b68552e8038e8932ad903fa39c18d0bcf82277a1b5af864b1bb2a17455fe75770dd183f53824ba9a1ee5acad67e257fa5e31632e9f33f00b23
-EBUILD displaycal-3.5.0.0.ebuild 1552 BLAKE2B 9de351bc65367c39bde13ccb143c62309e45f8a0ae1fc20e4b09cce8c82720fd72889d6a2992a421f5af9809cffac5a771b413fce2911babb40ef5330db919d8 SHA512 fad82ef40f25d1b68552e8038e8932ad903fa39c18d0bcf82277a1b5af864b1bb2a17455fe75770dd183f53824ba9a1ee5acad67e257fa5e31632e9f33f00b23
-EBUILD displaycal-3.5.1.0.ebuild 1552 BLAKE2B 9de351bc65367c39bde13ccb143c62309e45f8a0ae1fc20e4b09cce8c82720fd72889d6a2992a421f5af9809cffac5a771b413fce2911babb40ef5330db919d8 SHA512 fad82ef40f25d1b68552e8038e8932ad903fa39c18d0bcf82277a1b5af864b1bb2a17455fe75770dd183f53824ba9a1ee5acad67e257fa5e31632e9f33f00b23
-EBUILD displaycal-3.5.2.0.ebuild 1552 BLAKE2B 9de351bc65367c39bde13ccb143c62309e45f8a0ae1fc20e4b09cce8c82720fd72889d6a2992a421f5af9809cffac5a771b413fce2911babb40ef5330db919d8 SHA512 fad82ef40f25d1b68552e8038e8932ad903fa39c18d0bcf82277a1b5af864b1bb2a17455fe75770dd183f53824ba9a1ee5acad67e257fa5e31632e9f33f00b23
+EBUILD displaycal-3.5.1.0-r1.ebuild 1521 BLAKE2B a42233e85727c294aa646dbad6759dcf78967a49ff95d5dad4c6941dbb805d7e4191c6fa12e22a28b739048b8c8a8c04fabbc89132d9d3ff4f95d06cf41b8964 SHA512 8d3c07821ca6ef5cd136e9d793b164ef743a69231e75c1872e7939b4507919e4ed32ef7d39d0862a37a3c82149f26cea44ba4e499f5f4f9f7eb6e746a4d99f63
+EBUILD displaycal-3.5.2.0-r1.ebuild 1521 BLAKE2B a42233e85727c294aa646dbad6759dcf78967a49ff95d5dad4c6941dbb805d7e4191c6fa12e22a28b739048b8c8a8c04fabbc89132d9d3ff4f95d06cf41b8964 SHA512 8d3c07821ca6ef5cd136e9d793b164ef743a69231e75c1872e7939b4507919e4ed32ef7d39d0862a37a3c82149f26cea44ba4e499f5f4f9f7eb6e746a4d99f63
 MISC metadata.xml 342 BLAKE2B e74a7767c5b6e82bd35776606de555f9d4f26a25727decc6b0216fa3ea27cee8f28a7749e46b842c52e403c5150b24b4e33e0b971bd49077814e7945ee8cc290 SHA512 f9d5979fc8525c40af8d4e64afb8264873b0ae7cda1e9c4f3b3f30957c2a4f7fcbab76002783213a896395e8b5ef78e315441c28872589a91a0035d5f346d317
diff --git a/media-gfx/displaycal/displaycal-3.3.5.0.ebuild b/media-gfx/displaycal/displaycal-3.3.5.0.ebuild
deleted file mode 100644
index a78347da3cc0..000000000000
--- a/media-gfx/displaycal/displaycal-3.3.5.0.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# 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-proto/xineramaproto-1.2
-	>=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() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/media-gfx/displaycal/displaycal-3.5.0.0.ebuild b/media-gfx/displaycal/displaycal-3.5.0.0.ebuild
deleted file mode 100644
index d955f9b1fea5..000000000000
--- a/media-gfx/displaycal/displaycal-3.5.0.0.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# 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-proto/xineramaproto-1.2
-	>=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/displaycal/displaycal-3.5.2.0.ebuild b/media-gfx/displaycal/displaycal-3.5.1.0-r1.ebuild
index d955f9b1fea5..72a722b64356 100644
--- a/media-gfx/displaycal/displaycal-3.5.2.0.ebuild
+++ b/media-gfx/displaycal/displaycal-3.5.1.0-r1.ebuild
@@ -24,7 +24,6 @@ DEPEND="
 	>=x11-libs/libX11-1.3.3
 	>=x11-apps/xrandr-1.3.2
 	>=x11-libs/libXxf86vm-1.1.0
-	>=x11-proto/xineramaproto-1.2
 	>=x11-libs/libXinerama-1.1
 "
 RDEPEND="${DEPEND}
diff --git a/media-gfx/displaycal/displaycal-3.5.1.0.ebuild b/media-gfx/displaycal/displaycal-3.5.1.0.ebuild
deleted file mode 100644
index d955f9b1fea5..000000000000
--- a/media-gfx/displaycal/displaycal-3.5.1.0.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# 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-proto/xineramaproto-1.2
-	>=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/displaycal/displaycal-3.4.0.0.ebuild b/media-gfx/displaycal/displaycal-3.5.2.0-r1.ebuild
index d955f9b1fea5..72a722b64356 100644
--- a/media-gfx/displaycal/displaycal-3.4.0.0.ebuild
+++ b/media-gfx/displaycal/displaycal-3.5.2.0-r1.ebuild
@@ -24,7 +24,6 @@ DEPEND="
 	>=x11-libs/libX11-1.3.3
 	>=x11-apps/xrandr-1.3.2
 	>=x11-libs/libXxf86vm-1.1.0
-	>=x11-proto/xineramaproto-1.2
 	>=x11-libs/libXinerama-1.1
 "
 RDEPEND="${DEPEND}
diff --git a/media-gfx/enblend/Manifest b/media-gfx/enblend/Manifest
index 4bed61bcdc42..aaf652bf2328 100644
--- a/media-gfx/enblend/Manifest
+++ b/media-gfx/enblend/Manifest
@@ -6,7 +6,7 @@ AUX enblend-4.2-doc-install-dir-fix.patch 2705 BLAKE2B a5bfb43521095bc088aef980f
 AUX enblend-4.2.0_p20161007-cmake.patch 477 BLAKE2B 9a27d95e78cc611c723824a300dbc3eaeb7c2ffe6bcacb19baeb8a24180450f2912310ae9584f450899ececca11636304d36631f8c57f6d4b7c2450043d6f147 SHA512 5b79944beabd97f71f05657ce17e31d9eab60506dfce27fefc3a8f9a10c92f33b1b4fa1411c6d1a33d23819a4020a50f130b9083fecaf3e1a072fda71e5f9ff0
 DIST enblend-4.2.0_p20161007.tar.xz 494060 BLAKE2B 8842dd70a1400a27170794246cb5c89d60b6798373e3a9d63e88738ad569e1174cb4303ccb5a2bc79846651e982e05f8cb9ac3e09b83ee33958b6ccf043ebda9 SHA512 ede037f19a7c3b358f533ecfb235f70824261eaf189d0bdcde6f9cedaa5952be2a6940884e688418b725cb3a67fc1b7d366483a76b7c62326ca857b8efe3a3f3
 DIST enblend-enfuse-4.1.3.tar.gz 862079 BLAKE2B 1ea6d909bbc32d6141090862f658cc29ee0156e898e133fa88a10d1ea1df1e3eb0b6481010a0b3c0795bce0345ff3a77d1916310bc7b39fb292478c622d4493a SHA512 0a3487783afadee896b84411330898393cda4be4cbb79d36013daa98c17ab88f97a298c21a5c398b7cb2ce83e8dc4519a80e18be472c5fec10c3114037b6db73
-EBUILD enblend-4.1.3-r1.ebuild 1832 BLAKE2B c39be499c0f0052182e5e89a0577173d21687b769462aa13c4d7a20cc5a4f46fe2824d78fa611658eeb619a96da053c33c0c48aa107324d62d050b87976d0bb6 SHA512 f71bfc3040d6413584cf9d8db2d72ca036edb5aee81a5a6c42b246f0ae5829416fe57010690c069cc83b29a224c7984152534e52bd413e5b8dd5887677ef54ae
-EBUILD enblend-4.1.3-r2.ebuild 1935 BLAKE2B c3c4f6e6cf38ccb31e61fcd8afdc9e742f006fdc3932d61aba593310d4892d3e7bb7e5dd3f557051b75b9f0eee2718e52fc06e623a9e523acd7d888c0475cc50 SHA512 bf7702b6ecd18c6a306437e2b19a7ec217c2370c735011ed7f4c0f930952950b2a995c1eedb8d55e3cf0ca63d1c113920adf01beb1f1fc0c8a4c3e933454860b
-EBUILD enblend-4.2.0_p20161007-r1.ebuild 1759 BLAKE2B 0c0a098dcf97cbcbadfd0703862ba9ebdd26da74fd73992f9a52bbaecacf2780246937a1d79cca95109f8b82744bde714e6e3ae670d734ac1d3153b23bb0cb12 SHA512 a4913e8dd999cc7b94d4ec613b2cb3e066498bb9561880a83ff38aa34dd672d4e82f9958f2b0246b357ef9117fa1eb7a832ac7caa6f0e9b64255c4428c44ba3f
+EBUILD enblend-4.1.3-r1.ebuild 1828 BLAKE2B 8b11df2857f52ddb4e1efb0d86ca577c23af0ba5b8ec0bf8f5a682bf953fc6fb822b7fe207437af2b60b905710d544d1e382801b8a62d68ec38c215add67adc9 SHA512 df0d81b83868daabf072b557b70ec0ad555682133b44165694167a98c713d84123b2736f6f7e914a2b6a366ff7b5810acb0d090422c0dbd95c4a874403007f71
+EBUILD enblend-4.1.3-r2.ebuild 1930 BLAKE2B 078a4dcde4bfb1eba7d639f22620083d72449e953e56fe56907658308221fde6b196fc172b18ea5f1622f40570fa4cd9df46b3c810bd221fdada0d1642869666 SHA512 002f38789573df33f650cd0127b8499859ee3855e4674cefecc9aa9f10be7b0b413942d40d23dd14e1dc29d8037bb452df0149ee825f320038e65dd260ec1453
+EBUILD enblend-4.2.0_p20161007-r1.ebuild 1755 BLAKE2B 651b934a2e1a63a5761b2fbd2ffc3fe2a9e45464359d7877041b65abea4cb001927a91d05159421d0e3dea042d1e6ae8f0802b40f371a00de2a17fe92219a234 SHA512 7b082d0d7716ed034b484173fef1a68beb892ca0f01048a23d00cdcd8ee99631f05bd1fd7531ebf5b1769eb927961c1ee0689a3e4bf8aeb69a289b0e12eaf2d3
 MISC metadata.xml 472 BLAKE2B acab18a5d54df3704a279c6a0a98d61f35e072f6dbe264c555e15265851472417a469f5f84678c9f8cdf889ff834ed5810a2768bc2ad656f7e402ab96d518d68 SHA512 f2623eccd20aee91ae2ffe90e3999e359865757269d8ca84cd095ee5f0d55e18000d3afb602531231799a31a14edbf1bdeea72b162976fcd51727a169045d100
diff --git a/media-gfx/enblend/enblend-4.1.3-r1.ebuild b/media-gfx/enblend/enblend-4.1.3-r1.ebuild
index 6de5ae27cfe8..6f9f1fa58337 100644
--- a/media-gfx/enblend/enblend-4.1.3-r1.ebuild
+++ b/media-gfx/enblend/enblend-4.1.3-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/enblend/${MY_P}.tar.gz"
 
 LICENSE="GPL-2 VIGRA"
 SLOT="0"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="amd64 x86"
 IUSE="debug doc gpu image-cache openmp"
 
 REQUIRED_USE="openmp? ( !image-cache )"
diff --git a/media-gfx/enblend/enblend-4.1.3-r2.ebuild b/media-gfx/enblend/enblend-4.1.3-r2.ebuild
index c1eb5442bbc4..296bc122df57 100644
--- a/media-gfx/enblend/enblend-4.1.3-r2.ebuild
+++ b/media-gfx/enblend/enblend-4.1.3-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/enblend/${MY_P}.tar.gz"
 
 LICENSE="GPL-2 VIGRA"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="debug doc gpu openmp"
 
 RDEPEND="
diff --git a/media-gfx/enblend/enblend-4.2.0_p20161007-r1.ebuild b/media-gfx/enblend/enblend-4.2.0_p20161007-r1.ebuild
index ae3bfd0176c1..b98dd3a34295 100644
--- a/media-gfx/enblend/enblend-4.2.0_p20161007-r1.ebuild
+++ b/media-gfx/enblend/enblend-4.2.0_p20161007-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~soap/distfiles/${P}.tar.xz"
 
 LICENSE="GPL-2 VIGRA"
 SLOT="0"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="amd64 x86"
 IUSE="debug doc openmp tcmalloc cpu_flags_x86_sse2"
 
 REQUIRED_USE="tcmalloc? ( !debug )"
diff --git a/media-gfx/eog-plugins/Manifest b/media-gfx/eog-plugins/Manifest
index 42675382c334..9d0bbf6bf35e 100644
--- a/media-gfx/eog-plugins/Manifest
+++ b/media-gfx/eog-plugins/Manifest
@@ -1,4 +1,4 @@
 DIST eog-plugins-3.16.6.tar.xz 398836 BLAKE2B fcd3c6dc61ca6d935580caffdf9c941d34265f8caa6cd3d682e0d7679888f6965f64ac30b807c00417e904b4e0eeff1a213a8f6d284c130abe265f9c97fc636b SHA512 e3bff786785ae36a41bc7c5fcb3cf75233595777409f373c4a6597fa6e432f72c7a75608e09ab66e1033ca0d12e3855346d7f7e0c571014b5aaef40184a3383b
-EBUILD eog-plugins-3.16.6-r1.ebuild 1605 BLAKE2B ff82bab6762937e92faac33664f81b3708f9bbb2ab76de3e72c0f8c50cf4c65d6c45b7d239931601d47da6b2f306a5b6ba51f5cbf050c5441e3f15b041220cde SHA512 f399df08431b798eef407b7aedfc5731a7378701878b730a89c2494969c34d7204be7842dadd1361ff2fdc2baffb57d6ceb3534b4e3e010bab2b91bf4e78b2a7
+EBUILD eog-plugins-3.16.6-r1.ebuild 1603 BLAKE2B f260b6b3e7f3f2710b5875bede7448dda4e717205d4abc03ff4f8d102cb3c3e6ad3d1d85108f2382f8b2aea984de910228b2b150c1cd7f9b9483264b3124c8d0 SHA512 46bbf6a0236ce8957d28beb82414c6c3bb6b7e7ae0411f1cf295e0aca0bc5296448076e1aec09f0d970217556fcbe0bdee635741db81f6eb4ef4d2423bf9cf51
 EBUILD eog-plugins-3.16.6.ebuild 1681 BLAKE2B bcda004d6f20ba29826c3637f718cdff0ee1895ce0d79dcf743285d9dd7023772580c3f05eea82871c77c2260d16f8c91b01c5a10ceff8b91ccee60f8c9f7b08 SHA512 2b3137f6b4cceee79c705db382f620e203fc7d5625662b8ec5eb1c92c349d3fa85c1bf7dbf428bd5b327af94dc614f44094e15318e0a987f3e332866c902fcf1
 MISC metadata.xml 483 BLAKE2B fc83eeea54c41053a3857d37d763caa1642ae1074bd759f1a01bf85952825289bfeae5ad0c8b63ca0aa58e78b5bfaa2b29c90de393a912fc7aecafb76cf9a726 SHA512 f1b4c8e14547335019aa74506f2c5391783cabe118aa91e8f658117a6151cd53bb1728d36ae63a5c50fe9d548ee6f6b47294ae0c0af43e869de9815cf600afed
diff --git a/media-gfx/eog-plugins/eog-plugins-3.16.6-r1.ebuild b/media-gfx/eog-plugins/eog-plugins-3.16.6-r1.ebuild
index a0b0057c5589..87ff2256e591 100644
--- a/media-gfx/eog-plugins/eog-plugins-3.16.6-r1.ebuild
+++ b/media-gfx/eog-plugins/eog-plugins-3.16.6-r1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/EyeOfGnome/Plugins"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 IUSE="+exif map picasa +python"
 REQUIRED_USE="
diff --git a/media-gfx/exiv2/Manifest b/media-gfx/exiv2/Manifest
index 634d90d8cdf3..74c8d55de5be 100644
--- a/media-gfx/exiv2/Manifest
+++ b/media-gfx/exiv2/Manifest
@@ -1,7 +1,9 @@
 AUX exiv2-0.26-fix-docs.patch 2532 BLAKE2B c648454a7c9a56c2d4a3844cbe212630ff6c3d0d687928d86487380e0b12b3b7f6458b827285806afa73034497265cae169998ab281f4687d736cc5e3e6df1b5 SHA512 de245f08860fd6fccbd4e617cb9dfe105d1a64ecb16fc37376c257f7547c91e5dffaa46531d21201497473d6708817e7015fe6c061379834b892de08bcc05ee4
-AUX exiv2-0.26-pentaxnikon-crash.patch 1712 BLAKE2B f67edf849e5f1674a81b8d33157788c946ba5eab2af3b9c6e216007131f152dda215112a82d2928f771a32558df540c0e730cc309365a0e3ff016365d62b745d SHA512 a6de44c1451e6277433223871d151b251a330799d204cb20b9bebf1a6005c683506183617647c8c218d16bc80e2cf58e732fd226223a128a1ddda2567b761bde
 AUX exiv2-0.26-tools-optional.patch 1386 BLAKE2B 84e0903934187aaa914c0a4fe04afe63ed3314ea76d6929b7435899a731bb90831418b2162e1dca4a487b88041fe7b9aa50a3c438e66ac3893dd1d12b363714f SHA512 efdd848dd728fcb0ba5dbc305fef6eb6af4385b5bd09e2c3722c0dea2009207c282b95a07cdb608fc2298d18686c764dded2fd9de4166dbecabf7eeb187e6483
+AUX exiv2-0.26_p20180319-CVE-2017-18005.patch 17451 BLAKE2B 8003fa352503d287f5f96572196cd67f4de8d90fda221588f77bdd2d053407f1e1dceba6aab317fc5a003aa5b6f0d99336f4a8e4fb21696b5d20b81a3d4af29f SHA512 94ed0a17a7ca9bd1155fc4c67ca67bf59dafedf5570cf4d7e59bda6f4b4c0749d98fd1c2d8929612a2fe5840565ce070acf21ac68d9d6882fe5c0a98ee18b343
+AUX exiv2-0.26_p20180319-CVE-2018-4868.patch 1694 BLAKE2B c288075acac8c2335da2b04cac24ac7b3a414e05d04a1e951cdbd3d90997756fa5c1dae5d2b193583e529a7eacc0cbb88d5c8345c3be76798d1897af7a7f250d SHA512 7506ccc0914dc78e369129efb0736638ee7a4ebf98d76feed0ce6a7c9d2885f5f7c984376df288f0694ec05654b89c39be42a989bcedd64d0fcecd6c605fe601
 DIST exiv2-0.26_p20171104.tar.gz 28368697 BLAKE2B 50013cf0bf30a2a476b02d5db4027fca268a4b38733762eb4c08e5f3bdfaf737038e9a62f7ef471fecb10250d8ae686ef683f9b0ea4ccc5d109440ba534371e4 SHA512 6f6a884d7978e54dceb9ce45248cd0425ff469887c85ef52b0e38cb755970f69fce96b4b5317c8e8070b833f72ca214696042aac71292a6f9c3440f6a369d474
-EBUILD exiv2-0.26_p20171104-r1.ebuild 3145 BLAKE2B 5d01fc1c512ad7890f4727e15558053d3f4baf36804405447079bfb707eb68e0c54a4ce8744fd658880c62b039f91b476557966f4e823f45dee96dfe36e70235 SHA512 df9cd6b3654630a471ef1385c364d76ff8a8a11305d47d42a30e32aa3c275c56475ed716eede15f880f2bf77e4687c40ab59769066b134a2008c1d4a064ea34e
+DIST exiv2-0.26_p20180319.tar.gz 28383543 BLAKE2B 753a2ebdb2033490c0f66cb1fb2574f02125f17813f6cbaf5eca66e053af9a2cdbc1266f0a033f0706ec22b31acd6e87271e426a335a58ee947757b52d283489 SHA512 852ce2cffcc0a2d902a939933127fdf5fa0b50020e1faf3ab0a375b129b9f61c7b97b76d4f39e376e7288d7cc045867bd1a96ae15dd0b7c0bcd1ba15259628e1
 EBUILD exiv2-0.26_p20171104.ebuild 3086 BLAKE2B 72739b426e741582b3f167f973b250333d37bd68a9a4d381eada321670ff3c41e33f344e759c47641510c724ad4da8b27ee8e2805f4be075a1de9c808b7a2baf SHA512 ddabecf71aef6461442b77ae3afed3581d13a8155b232aa3e946e043853cc8f79bd5866febbd1ca38a4c9a2b6c08afdc1b37b079a30b3d01b358da06cc08db58
+EBUILD exiv2-0.26_p20180319.ebuild 3316 BLAKE2B 14141a522f0312c2cb79f6c58d11d1a2168cc9f69cb53574de5507999c1179ce1d32d2d23d8d4011c6e9a85034eca1d41de7d45b8a32b53f14c4d4c9dd5ea085 SHA512 ff9ca1765ef9699f5027c4e826967af7821aeefa3a3dabdda80133a3422d7a84c13cbe97ce130f1e0f4c76e8cba98c0aaad8beee70ec2885e4ba57939b03fb61
 MISC metadata.xml 612 BLAKE2B f98a074e9e3a4411baf8255cd8cab5be4257469463634218b664bb9e7f159c98615f0721bb4463c6183cecc8b2be00c34a031e7b99d745b9807634cbaab8d479 SHA512 9b4926ba8420a125dc4cefd351ee1ec10a4df2fc4306a56720f6e8de7c5fd9f36a8646c8583958fca9a45ebe1b65b19c053c7da37176546bc19ae64afa87e4f5
diff --git a/media-gfx/exiv2/exiv2-0.26_p20171104-r1.ebuild b/media-gfx/exiv2/exiv2-0.26_p20180319.ebuild
index 7553fc67ec9a..09c446bf32e6 100644
--- a/media-gfx/exiv2/exiv2-0.26_p20171104-r1.ebuild
+++ b/media-gfx/exiv2/exiv2-0.26_p20180319.ebuild
@@ -9,11 +9,11 @@ if [[ ${PV} = *9999 ]]; then
 	EGIT_BRANCH="0.26"
 	GIT_ECLASS=git-r3
 else
-	COMMIT=900d2417dbeb46e14cbf65fc2798ed1d043ab76d
+	COMMIT=876b1314ab892cbfa6672b6b94adbeb90db4211f
 	SRC_URI="https://github.com/Exiv2/${PN}/tarball/${COMMIT} -> ${P}.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
-inherit cmake-multilib python-any-r1 vcs-snapshot
+inherit cmake-multilib python-any-r1
 
 DESCRIPTION="EXIF, IPTC and XMP metadata C++ library and command line utility"
 HOMEPAGE="http://www.exiv2.org/"
@@ -45,11 +45,15 @@ DEPEND="${RDEPEND}
 
 DOCS=( README doc/ChangeLog doc/cmd.txt )
 
+S="${WORKDIR}/${PN^}-${PN}-${COMMIT:0:7}"
+
 PATCHES=(
+	# master, pending backports for 0.26
+	"${FILESDIR}"/${P}-CVE-2018-4868.patch
+	"${FILESDIR}"/${P}-CVE-2017-18005.patch
 	# TODO: Take to upstream
 	"${FILESDIR}"/${PN}-0.26-fix-docs.patch
 	"${FILESDIR}"/${PN}-0.26-tools-optional.patch
-	"${FILESDIR}"/${PN}-0.26-pentaxnikon-crash.patch
 )
 
 pkg_setup() {
@@ -87,6 +91,8 @@ src_prepare() {
 		doxygen &>/dev/null -u config/Doxyfile || die
 	fi
 
+	edos2unix samples/exiv2json.cpp # workaround for CVE-2017-18005 patch
+
 	cmake-utils_src_prepare
 }
 
diff --git a/media-gfx/exiv2/files/exiv2-0.26-pentaxnikon-crash.patch b/media-gfx/exiv2/files/exiv2-0.26-pentaxnikon-crash.patch
deleted file mode 100644
index a66af8d5dc96..000000000000
--- a/media-gfx/exiv2/files/exiv2-0.26-pentaxnikon-crash.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 2dc166b04ca6152d01bff6627a332e89ddef24d1 Mon Sep 17 00:00:00 2001
-From: clanmills <robin@clanmills.com>
-Date: Tue, 12 Sep 2017 09:14:42 +0100
-Subject: [PATCH 1/2] Fix http://dev.exiv2.org/issues/1305
-
----
- src/pentaxmn.cpp | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/pentaxmn.cpp b/src/pentaxmn.cpp
-index 4fc38be0..b22cb43b 100644
---- a/src/pentaxmn.cpp
-+++ b/src/pentaxmn.cpp
-@@ -1167,6 +1167,8 @@ namespace Exiv2 {
- 
-     std::ostream& PentaxMakerNote::printShutterCount(std::ostream& os, const Value& value, const ExifData* metadata)
-     {
-+        if ( ! metadata ) return os << "undefined" ;
-+
-         ExifData::const_iterator dateIt = metadata->findKey(
-                 ExifKey("Exif.PentaxDng.Date"));
-         if (dateIt == metadata->end()) {
--- 
-2.13.6
-
-
-From 3bc0b91bcecefdad531129b1a934be1251021c95 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?M=C4=81ris=20Narti=C5=A1s?= <mn@sungis.lv>
-Date: Mon, 18 Sep 2017 23:37:40 +0300
-Subject: [PATCH 2/2] Fix crash on undefined metadata on some Nikon images.
- Identical to commit:5405d61623e82896e498c5c8342dd6f42e689115
-
----
- src/nikonmn.cpp | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/nikonmn.cpp b/src/nikonmn.cpp
-index 571ab806..34bf601c 100644
---- a/src/nikonmn.cpp
-+++ b/src/nikonmn.cpp
-@@ -299,6 +299,8 @@ namespace Exiv2 {
-                                                const Value& value,
-                                                const ExifData* exifData)
-     {
-+        if ( ! exifData ) return os << "undefined" ;
-+
-         if ( value.count() >= 9 ) {
-             ByteOrder bo = getKeyString("Exif.MakerNote.ByteOrder",exifData) == "MM" ? bigEndian : littleEndian;
-             byte      p[4];
--- 
-2.13.6
-
diff --git a/media-gfx/exiv2/files/exiv2-0.26_p20180319-CVE-2017-18005.patch b/media-gfx/exiv2/files/exiv2-0.26_p20180319-CVE-2017-18005.patch
new file mode 100644
index 000000000000..d74ca59e3c01
--- /dev/null
+++ b/media-gfx/exiv2/files/exiv2-0.26_p20180319-CVE-2017-18005.patch
@@ -0,0 +1,484 @@
+From 8e31dd8c14fdc83f387f35dda7b1b70fbdbd70db Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Luis=20D=C3=ADaz=20M=C3=A1s?= <piponazo@gmail.com>
+Date: Tue, 19 Dec 2017 19:52:41 +0100
+Subject: [PATCH 3/8] Only print items (Params::prValue) when size > 0
+
+---
+ src/actions.cpp | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/src/actions.cpp b/src/actions.cpp
+index 9f850097..3963cb67 100644
+--- a/src/actions.cpp
++++ b/src/actions.cpp
+@@ -713,8 +713,9 @@ namespace Action {
+                       << std::setfill(' ') << std::right
+                       << md.size();
+         }
+-        if (Params::instance().printItems_ & Params::prValue) {
+-            if (!first) std::cout << "  ";
++        if (Params::instance().printItems_ & Params::prValue && md.size() > 0) {
++            if (!first)
++                std::cout << "  ";
+             first = false;
+             if (   Params::instance().binary_
+                 && (   md.typeId() == Exiv2::undefined
+-- 
+2.17.0
+
+
+From 463485e5c1cc716108880f75b9c573715bf402b1 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Luis=20D=C3=ADaz=20M=C3=A1s?= <piponazo@gmail.com>
+Date: Tue, 19 Dec 2017 19:54:17 +0100
+Subject: [PATCH 4/8] Move condition in if statement to discard work earlier
+
+---
+ src/actions.cpp | 7 +++----
+ 1 file changed, 3 insertions(+), 4 deletions(-)
+
+diff --git a/src/actions.cpp b/src/actions.cpp
+index 3963cb67..f51cb488 100644
+--- a/src/actions.cpp
++++ b/src/actions.cpp
+@@ -717,11 +717,10 @@ namespace Action {
+             if (!first)
+                 std::cout << "  ";
+             first = false;
+-            if (   Params::instance().binary_
+-                && (   md.typeId() == Exiv2::undefined
++            if (md.size() > 128 && Params::instance().binary_ && (
++                       md.typeId() == Exiv2::undefined
+                     || md.typeId() == Exiv2::unsignedByte
+-                    || md.typeId() == Exiv2::signedByte)
+-                && md.size() > 128) {
++                    || md.typeId() == Exiv2::signedByte)) {
+                 std::cout << _("(Binary value suppressed)") << std::endl;
+                 return true;
+             }
+-- 
+2.17.0
+
+
+From 7fe7501c01e5d1eec16a736062dd0c34d6408833 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Luis=20D=C3=ADaz=20M=C3=A1s?= <piponazo@gmail.com>
+Date: Tue, 19 Dec 2017 19:55:50 +0100
+Subject: [PATCH 5/8] Apply clang-format to Print::printMetadatum
+
+---
+ src/actions.cpp | 110 ++++++++++++++++++++++++------------------------
+ 1 file changed, 55 insertions(+), 55 deletions(-)
+
+diff --git a/src/actions.cpp b/src/actions.cpp
+index f51cb488..b31d6ec6 100644
+--- a/src/actions.cpp
++++ b/src/actions.cpp
+@@ -636,91 +636,90 @@ namespace Action {
+ 
+     bool Print::printMetadatum(const Exiv2::Metadatum& md, const Exiv2::Image* pImage)
+     {
+-        if (!grepTag(md.key())) return false;
+-        if (!keyTag (md.key())) return false;
++        if (!grepTag(md.key()))
++            return false;
++        if (!keyTag(md.key()))
++            return false;
+ 
+-        if (   Params::instance().unknown_
+-            && md.tagName().substr(0, 2) == "0x") {
++        if (Params::instance().unknown_ && md.tagName().substr(0, 2) == "0x") {
+             return false;
+         }
++
+         bool const manyFiles = Params::instance().files_.size() > 1;
+         if (manyFiles) {
+-            std::cout << std::setfill(' ') << std::left << std::setw(20)
+-                      << path_ << "  ";
++            std::cout << std::setfill(' ') << std::left << std::setw(20) << path_ << "  ";
+         }
++
+         bool first = true;
+         if (Params::instance().printItems_ & Params::prTag) {
+-            if (!first) std::cout << " ";
++            if (!first)
++                std::cout << " ";
+             first = false;
+-            std::cout << "0x" << std::setw(4) << std::setfill('0')
+-                      << std::right << std::hex
+-                      << md.tag();
++            std::cout << "0x" << std::setw(4) << std::setfill('0') << std::right << std::hex << md.tag();
+         }
+         if (Params::instance().printItems_ & Params::prSet) {
+-            if (!first) std::cout << " ";
++            if (!first)
++                std::cout << " ";
+             first = false;
+-            std::cout << "set" ;
++            std::cout << "set";
+         }
+         if (Params::instance().printItems_ & Params::prGroup) {
+-            if (!first) std::cout << " ";
++            if (!first)
++                std::cout << " ";
+             first = false;
+-            std::cout << std::setw(12) << std::setfill(' ') << std::left
+-                      << md.groupName();
++            std::cout << std::setw(12) << std::setfill(' ') << std::left << md.groupName();
+         }
+         if (Params::instance().printItems_ & Params::prKey) {
+-            if (!first) std::cout << " ";
++            if (!first)
++                std::cout << " ";
+             first = false;
+-            std::cout << std::setfill(' ') << std::left << std::setw(44)
+-                      << md.key();
++            std::cout << std::setfill(' ') << std::left << std::setw(44) << md.key();
+         }
+         if (Params::instance().printItems_ & Params::prName) {
+-            if (!first) std::cout << " ";
++            if (!first)
++                std::cout << " ";
+             first = false;
+-            std::cout << std::setw(27) << std::setfill(' ') << std::left
+-                      << md.tagName();
++            std::cout << std::setw(27) << std::setfill(' ') << std::left << md.tagName();
+         }
+         if (Params::instance().printItems_ & Params::prLabel) {
+-            if (!first) std::cout << " ";
++            if (!first)
++                std::cout << " ";
+             first = false;
+-            std::cout << std::setw(30) << std::setfill(' ') << std::left
+-                      << md.tagLabel();
++            std::cout << std::setw(30) << std::setfill(' ') << std::left << md.tagLabel();
+         }
+         if (Params::instance().printItems_ & Params::prType) {
+-            if (!first) std::cout << " ";
++            if (!first)
++                std::cout << " ";
+             first = false;
+             std::cout << std::setw(9) << std::setfill(' ') << std::left;
+             const char* tn = md.typeName();
+             if (tn) {
+                 std::cout << tn;
+-            }
+-            else {
++            } else {
+                 std::ostringstream os;
+                 os << "0x" << std::setw(4) << std::setfill('0') << std::hex << md.typeId();
+                 std::cout << os.str();
+             }
+         }
+         if (Params::instance().printItems_ & Params::prCount) {
+-            if (!first) std::cout << " ";
++            if (!first)
++                std::cout << " ";
+             first = false;
+-            std::cout << std::dec << std::setw(3)
+-                      << std::setfill(' ') << std::right
+-                      << md.count();
++            std::cout << std::dec << std::setw(3) << std::setfill(' ') << std::right << md.count();
+         }
+         if (Params::instance().printItems_ & Params::prSize) {
+-            if (!first) std::cout << " ";
++            if (!first)
++                std::cout << " ";
+             first = false;
+-            std::cout << std::dec << std::setw(3)
+-                      << std::setfill(' ') << std::right
+-                      << md.size();
++            std::cout << std::dec << std::setw(3) << std::setfill(' ') << std::right << md.size();
+         }
+         if (Params::instance().printItems_ & Params::prValue && md.size() > 0) {
+             if (!first)
+                 std::cout << "  ";
+             first = false;
+-            if (md.size() > 128 && Params::instance().binary_ && (
+-                       md.typeId() == Exiv2::undefined
+-                    || md.typeId() == Exiv2::unsignedByte
+-                    || md.typeId() == Exiv2::signedByte)) {
++            if (md.size() > 128 && Params::instance().binary_ &&
++                (md.typeId() == Exiv2::undefined || md.typeId() == Exiv2::unsignedByte ||
++                 md.typeId() == Exiv2::signedByte)) {
+                 std::cout << _("(Binary value suppressed)") << std::endl;
+                 return true;
+             }
+@@ -738,22 +737,22 @@ namespace Action {
+             }
+             if (!done) {
+                 // #1114 - show negative values for SByte
+-                if (md.typeId() != Exiv2::signedByte){
++                if (md.typeId() != Exiv2::signedByte) {
+                     std::cout << std::dec << md.value();
+                 } else {
+                     int value = md.value().toLong();
+-                    std::cout << std::dec << (value<128?value:value-256);
++                    std::cout << std::dec << (value < 128 ? value : value - 256);
+                 }
+             }
+         }
+         if (Params::instance().printItems_ & Params::prTrans) {
+-            if (!first) std::cout << "  ";
++            if (!first)
++                std::cout << "  ";
+             first = false;
+-            if (   Params::instance().binary_
+-                && (   md.typeId() == Exiv2::undefined
+-                    || md.typeId() == Exiv2::unsignedByte
+-                    || md.typeId() == Exiv2::signedByte)
+-                && md.size() > 128) {
++            if (Params::instance().binary_ &&
++                (md.typeId() == Exiv2::undefined || md.typeId() == Exiv2::unsignedByte ||
++                 md.typeId() == Exiv2::signedByte) &&
++                md.size() > 128) {
+                 std::cout << _("(Binary value suppressed)") << std::endl;
+                 return true;
+             }
+@@ -765,16 +764,17 @@ namespace Action {
+                     done = true;
+                 }
+             }
+-            if (!done) std::cout << std::dec << md.print(&pImage->exifData());
++            if (!done)
++                std::cout << std::dec << md.print(&pImage->exifData());
+         }
+         if (Params::instance().printItems_ & Params::prHex) {
+-            if (!first) std::cout << std::endl;
++            if (!first)
++                std::cout << std::endl;
+             first = false;
+-            if (   Params::instance().binary_
+-                && (   md.typeId() == Exiv2::undefined
+-                    || md.typeId() == Exiv2::unsignedByte
+-                    || md.typeId() == Exiv2::signedByte)
+-                && md.size() > 128) {
++            if (Params::instance().binary_ &&
++                (md.typeId() == Exiv2::undefined || md.typeId() == Exiv2::unsignedByte ||
++                 md.typeId() == Exiv2::signedByte) &&
++                md.size() > 128) {
+                 std::cout << _("(Binary value suppressed)") << std::endl;
+                 return true;
+             }
+@@ -784,7 +784,7 @@ namespace Action {
+         }
+         std::cout << std::endl;
+         return true;
+-    } // Print::printMetadatum
++    }  // Print::printMetadatum
+ 
+     int Print::printComment()
+     {
+-- 
+2.17.0
+
+
+From 78ddc7a92afaaf58b78d5c49b5c2ad7b60a4e25f Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Luis=20D=C3=ADaz=20M=C3=A1s?= <piponazo@gmail.com>
+Date: Thu, 21 Dec 2017 16:39:43 +0100
+Subject: [PATCH 6/8] Do not deference value when it does not exist (Thanks
+ D4N)
+
+---
+ samples/exiv2json.cpp | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/samples/exiv2json.cpp b/samples/exiv2json.cpp
+index 505268d9..a81268f0 100644
+--- a/samples/exiv2json.cpp
++++ b/samples/exiv2json.cpp
+@@ -148,6 +148,11 @@ bool isArray(std::string& value)
+ template <class T>
+ void push(Jzon::Node& node,const std::string& key,T i)
+ {
++#define ABORT_IF_I_EMTPY          \
++    if (i->value().size() == 0) { \
++        return;                   \
++    }
++
+     std::string value = i->value().toString();
+ 
+     switch ( i->typeId() ) {
+@@ -179,6 +184,7 @@ void push(Jzon::Node& node,const std::string& key,T i)
+ 
+         case Exiv2::unsignedRational:
+         case Exiv2::signedRational: {
++             ABORT_IF_I_EMTPY
+              Jzon::Array     arr;
+              Exiv2::Rational rat = i->value().toRational();
+              arr.Add(rat.first );
+@@ -187,6 +193,7 @@ void push(Jzon::Node& node,const std::string& key,T i)
+         } break;
+ 
+         case Exiv2::langAlt: {
++             ABORT_IF_I_EMTPY
+              Jzon::Object l ;
+              const Exiv2::LangAltValue& langs = dynamic_cast<const Exiv2::LangAltValue&>(i->value());
+              for ( Exiv2::LangAltValue::ValueType::const_iterator lang = langs.value_.begin()
+-- 
+2.17.0
+
+
+From 871e6e3ced1cdec7e43bf8cb94e269a7f5c09d92 Mon Sep 17 00:00:00 2001
+From: Robin Mills <robin@clanmills.com>
+Date: Thu, 15 Mar 2018 10:43:18 +0000
+Subject: [PATCH 8/8] Fix for getopt(), #199. Use src/getopt_win32 code instead
+ of libc/getopt()
+
+---
+ config/config.mk.in |  2 +-
+ src/CMakeLists.txt  |  6 ++----
+ src/Makefile        | 13 +++++--------
+ src/getopt_win32.c  |  9 +++++++++
+ src/getopt_win32.h  |  7 +++++++
+ src/utils.cpp       |  9 +++------
+ 6 files changed, 27 insertions(+), 19 deletions(-)
+
+diff --git a/config/config.mk.in b/config/config.mk.in
+index 8d920647..4754c722 100644
+--- a/config/config.mk.in
++++ b/config/config.mk.in
+@@ -165,7 +165,7 @@ endif
+ # **********************************************************************
+ # Compilation shortcuts
+ COMPILE.cc = $(CXX) $(CXXFLAGS) $(CPPFLAGS) -c
+-COMPILE.c = $(CC) $(CFLAGS) $(CPPFLAGS) -c
++COMPILE.c  = $(CC) $(CFLAGS) -c
+ # LINK.cc does not need $(LIBS), libtool's dark magic takes care of that
+ # when linking a binary with a libtool library.
+ LINK.cc = $(CXX) $(LDFLAGS)
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index d4dc6375..dceee236 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -218,10 +218,8 @@ IF(NOT HAVE_TIMEGM )
+     SET( PATHTEST_SRC     ${PATHTEST_SRC} localtime.c    )
+ ENDIF( NOT HAVE_TIMEGM )
+ 
+-IF( MSVC )
+-    SET( EXIV2_SRC        ${EXIV2_SRC}    getopt_win32.c )
+-    SET( LIBEXIV2_SRC     ${LIBEXIV2_SRC} getopt_win32.c )
+-ENDIF( MSVC )
++SET( EXIV2_SRC        ${EXIV2_SRC}    getopt_win32.c )
++SET( LIBEXIV2_SRC     ${LIBEXIV2_SRC} getopt_win32.c )
+ 
+ ##
+ # msvn tuning
+diff --git a/src/Makefile b/src/Makefile
+index 8a8366fe..d046e331 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -131,8 +131,7 @@ CCSRC += asfvideo.cpp      \
+ 	 utilsvideo.cpp
+ endif
+ 
+-# Add library C source files to this list
+-EXIVCSRC  =
++# C source files
+ ifndef HAVE_TIMEGM
+ CSRC =   localtime.c
+ endif
+@@ -141,9 +140,7 @@ endif
+ EXIV2MAIN = exiv2.cpp
+ EXIV2SRC  = actions.cpp \
+             utils.cpp
+-
+-# C source files for the Exiv2 application
+-EXIVCSRC  =
++EXIVCSRC  = getopt_win32.c
+ 
+ # ******************************************************************************
+ # Library
+@@ -176,7 +173,7 @@ OBJ    = $(CCOBJ) $(COBJ)
+ LOBJ   = $(CCLOBJ) $(CLOBJ)
+ 
+ EXIV2OBJ  = $(EXIV2MAIN:.cpp=.o) $(EXIV2SRC:.cpp=.o)
+-EXIV2COBJ = $(EXIVCSRC:.c=.o)
++EXIVCOBJ  = $(EXIVCSRC:.c=.o)
+ EXIV2EXE  = $(EXIV2MAIN:.cpp=$(EXEEXT))
+ 
+ ifdef DEP_TRACKING
+@@ -251,9 +248,9 @@ lib: $(OBJ)
+ $(BINARY): %: %.o lib
+ 	@$(LIBTOOL) --mode=link $(LINK.cc) -o $@ $(LIBRARY) $@.o -rpath $(libdir)
+ 
+-$(EXIV2EXE): lib $(EXIV2OBJ) $(EXIV2COBJ)
++$(EXIV2EXE): lib $(EXIV2OBJ) $(EXIVCOBJ)
+ 	mkdir -pv ../bin 2>&1 > /dev/null
+-	@$(LIBTOOL) --mode=link $(LINK.cc) -o ../bin/$@ $(LIBRARY) $(EXIV2OBJ) $(EXIV2COBJ) -rpath $(libdir)
++	@$(LIBTOOL) --mode=link $(LINK.cc) -o ../bin/$@ $(LIBRARY) $(EXIV2OBJ) $(EXIVCOBJ) -rpath $(libdir)
+ 
+ install-header:
+ 	$(INSTALL_DIRS) $(DESTDIR)$(incdir)
+diff --git a/src/getopt_win32.c b/src/getopt_win32.c
+index fca29924..18dfcfbf 100644
+--- a/src/getopt_win32.c
++++ b/src/getopt_win32.c
+@@ -194,6 +194,10 @@ permute_args(panonopt_start, panonopt_end, opt_end, nargv)
+ 	}
+ }
+ 
++#ifdef __GETOPT_DEFINE_ARGV__
++char * const *__argv;
++#endif
++
+ /*
+  * getopt_internal --
+  *	Parse argc/argv argument vector.  Called by user level routines.
+@@ -205,6 +209,11 @@ getopt_internal(nargc, nargv, options)
+ 	char * const *nargv;
+ 	const char *options;
+ {
++
++#ifdef __GETOPT_DEFINE_ARGV__
++    __argv=nargv;
++#endif
++
+ 	char *oli;				/* option letter list index */
+ 	int optchar;
+ 
+diff --git a/src/getopt_win32.h b/src/getopt_win32.h
+index 6b6f643b..cd5760a3 100644
+--- a/src/getopt_win32.h
++++ b/src/getopt_win32.h
+@@ -38,6 +38,13 @@
+ extern "C" {
+ #endif
+ 
++#if !defined(_WIN32) &&  !defined(__CYGWIN__) && !defined(__MINGW__) && !defined(_MSC_VER)
++// the symbol __argv (and __argc and __progname and __env) are defined in Windows environments
++// for *ix environments, __argv is declared here, defined: getopt_win32.c, init'd: getopt_internal()
++#define __GETOPT_DEFINE_ARGV__
++extern char * const *__argv;
++#endif
++
+ extern int   opterr;      /* if error message should be printed */
+ extern int   optind;      /* index into parent argv vector */
+ extern int   optopt;      /* character checked for validity */
+diff --git a/src/utils.cpp b/src/utils.cpp
+index a3d36497..2a092330 100644
+--- a/src/utils.cpp
++++ b/src/utils.cpp
+@@ -32,18 +32,15 @@ EXIV2_RCSID("@(#) $Id$")
+ #include "config.h"
+ 
+ #include "utils.hpp"
+-
+-// + standard includes
+-#if defined(_MSC_VER) || defined(__MINGW__)
+-# include "getopt_win32.h"
+-#endif
++#include "getopt_win32.h"
+ 
+ #if defined(_MSC_VER)
+ # define S_ISREG(m)      (((m) & S_IFMT) == S_IFREG)
+ #endif
+ 
++// + standard includes
+ #ifdef EXV_HAVE_UNISTD_H
+-# include <unistd.h>                     // for getopt(), stat()
++# include <unistd.h>                     // for stat()
+ #endif
+ 
+ #include <sys/types.h>
+-- 
+2.17.0
+
diff --git a/media-gfx/exiv2/files/exiv2-0.26_p20180319-CVE-2018-4868.patch b/media-gfx/exiv2/files/exiv2-0.26_p20180319-CVE-2018-4868.patch
new file mode 100644
index 000000000000..a594a2bfad13
--- /dev/null
+++ b/media-gfx/exiv2/files/exiv2-0.26_p20180319-CVE-2018-4868.patch
@@ -0,0 +1,39 @@
+From ce4f575e106697c0e513091e95a7cd12ed6a488b Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= <dan.cermak@cgc-instruments.com>
+Date: Tue, 9 Jan 2018 21:18:36 +0100
+Subject: [PATCH 1/8] Add check for DataBuf.size_ in Jp2Image::readMetadata()
+
+When parsing a subBox that is a ColorHeader, a length is extracted
+from the input file and fed directly into DataBuf() (which calls
+malloc). A crafted input file can provide arbitrarily (up to
+max(uint32_t)-8) large values and result in excessive memory
+allocation.
+
+This commit adds a check for the new size of DataBuf so that it is not
+larger than the remaining size of the file.
+
+This fixes #202 aka CVE-2018-4868
+---
+ src/jp2image.cpp | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/src/jp2image.cpp b/src/jp2image.cpp
+index a308bfd9..3cebc2a8 100644
+--- a/src/jp2image.cpp
++++ b/src/jp2image.cpp
+@@ -272,7 +272,12 @@ namespace Exiv2
+ #endif
+ 
+                             const long pad = 3 ; // 3 padding bytes 2 0 0
+-                            DataBuf data(Safe::add(subBox.length, static_cast<uint32_t>(8)));
++			    const size_t data_length = Safe::add(subBox.length, static_cast<uint32_t>(8));
++			    // data_length makes no sense if it is larger than the rest of the file
++			    if (data_length > io_->size() - io_->tell()) {
++				throw Error(58);
++			    }
++                            DataBuf data(data_length);
+                             io_->read(data.pData_,data.size_);
+                             const long    iccLength = getULong(data.pData_+pad, bigEndian);
+                             // subtracting pad from data.size_ is safe:
+-- 
+2.17.0
diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest
index 875e38f790e8..f2570203987d 100644
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -12,7 +12,6 @@ AUX gimp-2.9.8-cve-2017-17784.patch 1087 BLAKE2B 2398e735ccd7b0a5cc393f297b60d4a
 DIST gimp-2.8.22.tar.bz2 20873278 BLAKE2B 673246fd2354f1cecc74bf389df698f594b7553cc88a1d2679ae410ad39923abae843dfe9623ec195b4f967b5eccd199769a6300bf028ae04b8df4932df11505 SHA512 84a78d428282538b606b3cd1ff571e52c3d828fceade171b2012bc1cdcb85919fc7734e7e6c45ed3a8683657fa580412b32c1b511b8a512172a8c1df930493e6
 DIST gimp-2.9.8.tar.bz2 26161474 BLAKE2B f00a58d33848a818a2cb3b74920b33156330a26423a2b567cd8372258f87b44ae1ad812f2b3ee9a093b919d022e8b71ef518d40b76ab94c616f9916b3d1effec SHA512 897092aa823961e6ed5dac47eaadd3a25c419364d6ca791987d99e495d0d4eba1d75e08c809dfa305e8feec9da606193b608e3470e0ef18fcfaa98ee8aedfe02
 EBUILD gimp-2.8.22-r1.ebuild 5186 BLAKE2B 10a8d7c1074b14a4a7b79ec2e157a189597d16caaa1c225704f3c1c7a348cfaa53e711e7e8977f5eb21bf36d5bb2e465e4218e17402858484592c5c10a3b699b SHA512 ccfc14a7e358d66e100a5a4d2d47818a049eb93f64c01ec67f431e7113c4b23355420524413981d68ea4fd53545c9f126867201f0bebe57abfdf7ab3ee337d56
-EBUILD gimp-2.8.22.ebuild 4739 BLAKE2B 1f9f5b643fa9c061a1b8bb982df80261c481b362ea7140f4f6921419fa6fa23487df7547976dfbdae9a61eed461199ed0059ab68ce6748f1169b637750638dd4 SHA512 6c6e4c124eb106a22d6a3149e190cb0e3acaad34948e46c3de6be581641667e5841e844f3f79ecd05d67706de5a96d33b098baf8ca9066040200288e3d627e9d
 EBUILD gimp-2.9.8-r1.ebuild 5734 BLAKE2B a176bcbabc8298b9e29b755f7d3dbdc26c3e6a77335e826762c6ce0273aeea38341378bc719df8e617a69bd6f8570442e46f92116119fd40043669201ecdcf50 SHA512 2778c83c74d87fd8492a1107b1b64aab8114ea167aaf8d7ca2290cec314ed9640d60096a04c7834b718159f242cf3e2a2c46c6293a03927d8084d834bc415ff5
 EBUILD gimp-9999.ebuild 5375 BLAKE2B 1a33e0b4106e98872afaf1c664b72a8b88c813575121d1538fd63fa3b52b6915868f1b432d85e51cf0800bc12aff6adaa8ad84015015e25616ef325703faeace SHA512 b9c0c738acebae699385af18cfdfd9f200a616cb48e565b40768f96d5bbce80914a81a1066de5116ba750d46a2ad3c3b51dc04604dd8e3eaf77aab3084dfd2e5
 MISC metadata.xml 388 BLAKE2B 2e779c672c788e3631b0532be9a6081767215bf9687cb2546c92d3c6f4a00d8e8f6e32cca607019847200ed416336f752cfbfaf43b2f600b4bea63eb985e63d5 SHA512 e3a626ac39cea422d1b4660731048d764c4b6f1985e09577865f0047ecbc61c8677d6f15626dbbc03ceb3cb18887ba58747df5d91f5f4b2126afb9ad12eaccb0
diff --git a/media-gfx/gimp/gimp-2.8.22.ebuild b/media-gfx/gimp/gimp-2.8.22.ebuild
deleted file mode 100644
index 55ab71f2660c..000000000000
--- a/media-gfx/gimp/gimp-2.8.22.ebuild
+++ /dev/null
@@ -1,165 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit versionator virtualx autotools eutils gnome2 fdo-mime multilib python-single-r1
-
-DESCRIPTION="GNU Image Manipulation Program"
-HOMEPAGE="https://www.gimp.org/"
-SRC_URI="mirror://gimp/v$(get_version_component_range 1-2)/${P}.tar.bz2"
-LICENSE="GPL-3 LGPL-3"
-SLOT="2"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-
-LANGS="am ar ast az be bg br ca ca@valencia cs csb da de dz el en_CA en_GB eo es et eu fa fi fr ga gl gu he hi hr hu id is it ja ka kk km kn ko lt lv mk ml ms my nb nds ne nl nn oc pa pl pt pt_BR ro ru rw si sk sl sr sr@latin sv ta te th tr tt uk vi xh yi zh_CN zh_HK zh_TW"
-IUSE="alsa aalib altivec aqua bzip2 curl dbus debug doc exif gnome postscript jpeg jpeg2k lcms cpu_flags_x86_mmx mng pdf png python smp cpu_flags_x86_sse svg tiff udev wmf xpm"
-
-RDEPEND=">=dev-libs/glib-2.30.2:2
-	>=dev-libs/atk-2.2.0
-	>=x11-libs/gtk+-2.24.10:2
-	>=x11-libs/gdk-pixbuf-2.24.1:2
-	>=x11-libs/cairo-1.10.2
-	>=x11-libs/pango-1.29.4
-	xpm? ( x11-libs/libXpm )
-	>=media-libs/freetype-2.1.7
-	>=media-libs/fontconfig-2.2.0
-	sys-libs/zlib
-	dev-libs/libxml2
-	dev-libs/libxslt
-	x11-themes/hicolor-icon-theme
-	>=media-libs/babl-0.1.10
-	>=media-libs/gegl-0.2.0:0
-	aalib? ( media-libs/aalib )
-	alsa? ( media-libs/alsa-lib )
-	aqua? ( x11-libs/gtk-mac-integration )
-	curl? ( net-misc/curl )
-	dbus? ( dev-libs/dbus-glib )
-	gnome? ( gnome-base/gvfs )
-	jpeg? ( virtual/jpeg:0 )
-	jpeg2k? ( media-libs/jasper:= )
-	exif? ( >=media-libs/libexif-0.6.15 )
-	lcms? ( >=media-libs/lcms-2.2:2 )
-	mng? ( media-libs/libmng )
-	pdf? ( >=app-text/poppler-0.12.4[cairo] )
-	png? ( >=media-libs/libpng-1.2.37:0 )
-	python?	(
-		${PYTHON_DEPS}
-		>=dev-python/pygtk-2.10.4:2[${PYTHON_USEDEP}]
-	)
-	tiff? ( >=media-libs/tiff-3.5.7:0 )
-	svg? ( >=gnome-base/librsvg-2.36.0:2 )
-	wmf? ( >=media-libs/libwmf-0.2.8 )
-	x11-libs/libXcursor
-	sys-libs/zlib
-	bzip2? ( app-arch/bzip2 )
-	postscript? ( app-text/ghostscript-gpl )
-	udev? ( virtual/libgudev:= )"
-DEPEND="${RDEPEND}
-	sys-apps/findutils
-	virtual/pkgconfig
-	>=dev-util/intltool-0.40.1
-	>=sys-devel/gettext-0.19
-	doc? ( >=dev-util/gtk-doc-1 )
-	>=sys-devel/libtool-2.2
-	>=sys-devel/automake-1.11
-	dev-util/gtk-doc-am"  # due to our call to eautoreconf below (bug #386453)
-
-DOCS="AUTHORS ChangeLog* HACKING NEWS README*"
-
-S="${WORKDIR}"/${P}
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-pkg_setup() {
-	G2CONF="--enable-default-binary \
-		--disable-silent-rules \
-		$(use_with !aqua x) \
-		$(use_with aalib aa) \
-		$(use_with alsa) \
-		$(use_enable altivec) \
-		$(use_with bzip2) \
-		$(use_with curl libcurl) \
-		$(use_with dbus) \
-		$(use_with gnome gvfs) \
-		--without-webkit \
-		$(use_with jpeg libjpeg) \
-		$(use_with jpeg2k libjasper) \
-		$(use_with exif libexif) \
-		$(use_with lcms lcms lcms2) \
-		$(use_with postscript gs) \
-		$(use_enable cpu_flags_x86_mmx mmx) \
-		$(use_with mng libmng) \
-		$(use_with pdf poppler) \
-		$(use_with png libpng) \
-		$(use_enable python) \
-		$(use_enable smp mp) \
-		$(use_enable cpu_flags_x86_sse sse) \
-		$(use_with svg librsvg) \
-		$(use_with tiff libtiff) \
-		$(use_with udev gudev) \
-		$(use_with wmf) \
-		--with-xmc \
-		$(use_with xpm libxpm) \
-		--without-xvfb-run"
-
-	if use python; then
-		python-single-r1_pkg_setup
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.8.14-blend-center.patch  # bug 558878
-	epatch "${FILESDIR}"/${PN}-2.7.4-no-deprecation.patch  # bug 395695, comment 9 and 16
-	epatch "${FILESDIR}"/${PN}-2.8.10-clang.patch # bug 449370 compile with clang
-
-	sed -i -e 's/== "xquartz"/= "xquartz"/' configure.ac || die #494864
-	eautoreconf  # If you remove this: remove dev-util/gtk-doc-am from DEPEND, too
-
-	gnome2_src_prepare
-}
-
-_clean_up_locales() {
-	[[ -z ${LINGUAS+set} ]] && return
-	einfo "Cleaning up locales..."
-	for lang in ${LANGS}; do
-		has ${lang} ${LINGUAS} && {
-			einfo "- keeping ${lang}"
-			continue
-		}
-		rm -Rf "${ED}"/usr/share/locale/"${lang}" || die
-	done
-}
-
-src_test() {
-	Xemake check
-}
-
-src_install() {
-	gnome2_src_install
-
-	if use python; then
-		python_optimize
-	fi
-
-	# Workaround for bug #321111 to give GIMP the least
-	# precedence on PDF documents by default
-	mv "${ED}"/usr/share/applications/{,zzz-}gimp.desktop || die
-
-	prune_libtool_files --all
-
-	# Prevent dead symlink gimp-console.1 from downstream man page compression (bug #433527)
-	local gimp_app_version=$(get_version_component_range 1-2)
-	mv "${ED}"/usr/share/man/man1/gimp-console{-${gimp_app_version},}.1 || die
-
-	_clean_up_locales
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-}
diff --git a/media-gfx/gnome-photos/Manifest b/media-gfx/gnome-photos/Manifest
index a28cdfe51dee..e3eb269358d0 100644
--- a/media-gfx/gnome-photos/Manifest
+++ b/media-gfx/gnome-photos/Manifest
@@ -1,5 +1,5 @@
 DIST gnome-photos-3.24.5.tar.xz 985864 BLAKE2B d5e7dd48a6f81c9ca6efa7dcb2b17fdeb781070d1789514098b8cf30bcd12eba145e57e584f42f66286579ad40ef31f370c471abaab30ba684bada9878afc3c4 SHA512 8dcdb9962a55d6e2e9aa28ef86dcc9100f80fa9739763cea1475052379050a23428e09e8416ed75b9a9b1c85a9bc27d94a75faeefde3d546195c21f04f85379d
 DIST gnome-photos-3.24.6.tar.xz 986200 BLAKE2B 656737326f594958ea1cc956f85e50c7eaebc227491d95342acab9a1fa0e3c5c109efe932cd0465e48ada62beab238e6eef0e01033b145de72a1fb64ce2f3c89 SHA512 47fd858b643fe0bca9a4801d43bd7eb181db08d7e09941a60a134247df97b0e900cd062efef70da5161a9fceb1d33b998b87ad5eca0a5937a10c4e06b908de22
 EBUILD gnome-photos-3.24.5.ebuild 1776 BLAKE2B c4868a2dfe4d4dbbfa7a396ffaf2667844ac63f767162fa4fff975de27aa81cb86b3736f0b9461663a8a311e5e5f9fcce28934cf9e4da9fc8b74f2025810e2c8 SHA512 469751ff495f9a15ada2a680cc6191e5aef9a5e51770075a69578dfbfb1253a2d7e04e0cb5da850f0968e8d3224686f5f354683cd7718262f6f3b3caaee1bc24
-EBUILD gnome-photos-3.24.6.ebuild 1778 BLAKE2B 249861a0ccc669815789c31280347e95aa0d8c121f26d219fc952a08e20fab2eee8a74b2e7894c2b13a9d5fa1ce7a7295496d4e4586645fafcc818d9dc4d6d22 SHA512 a64839505aaf0aa0e4e825c48a184477d80107e86b2aa4080c128e46e05879a4cde64df74527faad6fbcd7a72b969d71cea13436fb24e7c16a02017375862e1e
+EBUILD gnome-photos-3.24.6.ebuild 1776 BLAKE2B c4868a2dfe4d4dbbfa7a396ffaf2667844ac63f767162fa4fff975de27aa81cb86b3736f0b9461663a8a311e5e5f9fcce28934cf9e4da9fc8b74f2025810e2c8 SHA512 469751ff495f9a15ada2a680cc6191e5aef9a5e51770075a69578dfbfb1253a2d7e04e0cb5da850f0968e8d3224686f5f354683cd7718262f6f3b3caaee1bc24
 MISC metadata.xml 320 BLAKE2B b66fb85cefaafccf9575d4f85c017cc07cb55b75d377e8a95bf482b6cb7817f902c5fd3987e08c3d77b604f10710cb6f9820f5e4451e402b186e7714444abf4a SHA512 86c99b12ed97b3f09e9469dcb093e18f844f5b3efb3a3169e62e10fe446075c7839ba7ca00e3537744d3c839522cf5ed2ee33215cd5988466e35d0f4dd739b11
diff --git a/media-gfx/gnome-photos/gnome-photos-3.24.6.ebuild b/media-gfx/gnome-photos/gnome-photos-3.24.6.ebuild
index 3e27e6227774..d802c9d1eb7b 100644
--- a/media-gfx/gnome-photos/gnome-photos-3.24.6.ebuild
+++ b/media-gfx/gnome-photos/gnome-photos-3.24.6.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Photos"
 
 LICENSE="GPL-2+ LGPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="flickr test upnp-av"
 
 COMMON_DEPEND="
diff --git a/media-gfx/gphoto2/Manifest b/media-gfx/gphoto2/Manifest
index 4d1a7f0e9ee3..1343fbf41e56 100644
--- a/media-gfx/gphoto2/Manifest
+++ b/media-gfx/gphoto2/Manifest
@@ -1,5 +1,5 @@
 DIST gphoto2-2.5.14.tar.bz2 784442 BLAKE2B 185bd0d18e0b8d280c0ec366738850bd1fe2d1405179700fe25678c04a88b2092820aa5f049bcc6f97c964b5875bd32e3f8c7c5240ef3a71f2af04d6bfdaadb9 SHA512 47cb0d212673c9c0dbc996e0a67191a307599c844293a67184bd1529d9e3b417e154c6de64f4563f6f7e599a1bd6b127266f85f5baa97bd7d86922405bf45331
 DIST gphoto2-2.5.15.tar.bz2 790513 BLAKE2B e8a22d014ebd33f5e0976d72c5df8373e29106def5da575b69d21f2a58e9408c6ce399476135909e57111196d6e61ead953f66a00c9f440b7cf92e0da0f4a0f6 SHA512 46058a12a81379f3311911e103cf934b6eb616d7f81180615b385d01e855bf6ce998eb12811b9d032328ebed6acfc4456f3a383cfedb93c6967c9699654d4f40
 EBUILD gphoto2-2.5.14.ebuild 1392 BLAKE2B d9dad5be797d3f5e2f789c42060c62499d59f8f8aa5129608eea7f023b0257a38d1d3e2d54b4889128f0a867368a3abcac4e3f47bddf98c675049f0b9f24f314 SHA512 6ef5220aaf64e480a95e71d5596093179a41d93912c1d17614034e4814832ba8788a1e282a8711096482eb94c284a65365fb85c67a748fb060a38ef921349a8c
-EBUILD gphoto2-2.5.15.ebuild 1399 BLAKE2B b49450a5c5695f093ef6cc2f8396e861320a12c7dac9edc1f0a2399c9b3347b5fc02e197e220d1f7ebc97cde4b81d382c0b5c601ba88ca47d4137f1c3f46562a SHA512 a1352287960faed91dcba03af16b7127b574442bdf9182646327081668c35e7c6dfe26cad16dc09af18c35660207b6963dddaa7660edae6e89bf183d0ae5d98c
+EBUILD gphoto2-2.5.15.ebuild 1396 BLAKE2B c9743b76aeff4bcdadb370a72ec20ce54227a09ca705f6e2ac38687d670c7c63f3d7f3da1d48c389ed8a89c00fb7c24c30ad8ef74e5b512c3d5edef076f0f008 SHA512 d6033c6038034d705244d4b5e7fa4e0a03649a2e6498bc3aed8c437152d44803ccda23324b94c2b8a78e94b6afa4e1865ea61c9da4f050c609cd4b85e57eb61d
 MISC metadata.xml 449 BLAKE2B 324e2ea46a0f8199033bf628d6719a51968a02af01fa3e8abcd1caaf7a4dcd892bfb6b8347a030edf4b2e8529aba47d7103789103a3b03adaa538338ab2ec91f SHA512 f938819a203e0119b1d81aa1dc812717d6ef02c3012f8ed667db452c7712bb7b142cee36d519ec33f4cf65ebcba7a660e2f67f6b66087ec6be832a4987e10c53
diff --git a/media-gfx/gphoto2/gphoto2-2.5.15.ebuild b/media-gfx/gphoto2/gphoto2-2.5.15.ebuild
index 8353fefc1836..f0fbeb6d3862 100644
--- a/media-gfx/gphoto2/gphoto2-2.5.15.ebuild
+++ b/media-gfx/gphoto2/gphoto2-2.5.15.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/gphoto/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~hppa ~ppc ~ppc64 sparc x86"
 IUSE="aalib exif ncurses nls readline"
 
 # aalib -> needs libjpeg
diff --git a/media-gfx/gscan2pdf/Manifest b/media-gfx/gscan2pdf/Manifest
index 243ca9e6a8f7..089bcdbd0b1f 100644
--- a/media-gfx/gscan2pdf/Manifest
+++ b/media-gfx/gscan2pdf/Manifest
@@ -1,5 +1,5 @@
 DIST gscan2pdf-1.8.10.tar.xz 406128 BLAKE2B 328c05f377e12742bbf8ebf92f327afddc4556533e4f7500b237d968fa07b6505f0a3be2c02f42318740e9d185611c094cf96c66804af02197097eebd16b880c SHA512 334979b10238d510da8c5807290920b50e3a06ddda99dad41ced96d33e1ca8467cafe1f3112fb81b6705f80bc232eb6f041d588a57e04d5eecd09a201f007a49
 DIST gscan2pdf-1.8.11.tar.xz 409212 BLAKE2B 37cb716f13818eaffc39c210b810b845368cc5e323569e8f9d5603b5b412c4182520798321358e4c21339fdbd5f15026a0acd6421a49e7db79ecca86633c3ab0 SHA512 1ea09b8768771be4a1700cb8a6523d5f74fcbf0ebe459d97796032b56f896fd0c50e5ca1ed4c96aedef7e61f6952a92986153cc70173dd5ad91ccfb72461c565
 EBUILD gscan2pdf-1.8.10.ebuild 1733 BLAKE2B 34eb1f1882a31569fe2dec3549a037986dd50c024aed983e2b96762507cfcee70e9428103be4a862e76c8cadee6f92fb0a597000d4b9a4a4082d38f88f60fc80 SHA512 046288f89b95875f7acb9150a6f9099ad25d17e4dfd68cbaaeb5c147352fcee2ebe306bbf58e3dba3873eb2ace0d62eef97c445b75efd4abef469d29d49d742d
-EBUILD gscan2pdf-1.8.11.ebuild 1732 BLAKE2B 3c094262c8e7ebace698992703f9e7ea4fe156d11532d80d1b8112ab347a4aebb35d2ce89e41a6413650053c654139a92dfaad2e57e00f0af54339144d39e626 SHA512 337e787f9a1500243a133bd83f66a0f2e0098221bde49fd8ce7343ea14300b2a23110ed1a6eaee66bb835514910e1203bdf207cbee25a7e7d2341f40056cfbd4
+EBUILD gscan2pdf-1.8.11.ebuild 1731 BLAKE2B 0b0f7cdfef98e666e20e44882584e0636e490429186e441d87f965e74071f5076693896e17e68184319dfaf3a1fd4487140209ef3b49603c9496cc936516333d SHA512 b94b73d3396208a8c67c2aad407815329501717c364d60189b21d96f652846e554d59a2a36f4b58383d7f49ab728d4fe251bce9ab1944befb667a9e0c09237b3
 MISC metadata.xml 439 BLAKE2B 835480b0d68a079941e94f2646d0136dfb8a8e750e0279f8a5a2e23e6690242582ffe660798f5e80ebfb4378a576aa5715332b53230555866391a99ec28f54ff SHA512 af1cc05ac693899586df81036d2fa11af187edbb3c9449862298ba05efd0dbd0c4c5b008a1a21328c1f9a27a690671bd7a9967d2e457efb31561044e45984401
diff --git a/media-gfx/gscan2pdf/gscan2pdf-1.8.11.ebuild b/media-gfx/gscan2pdf/gscan2pdf-1.8.11.ebuild
index 9cb3a35ed0e6..e9f942dadcd1 100644
--- a/media-gfx/gscan2pdf/gscan2pdf-1.8.11.ebuild
+++ b/media-gfx/gscan2pdf/gscan2pdf-1.8.11.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 # OCR tests fail with tesseract[opencl], not fixed by addpredict
 # and others on Wayland and the console
diff --git a/media-gfx/hugin/Manifest b/media-gfx/hugin/Manifest
index 39ccc6470cc1..8cf36fe419ee 100644
--- a/media-gfx/hugin/Manifest
+++ b/media-gfx/hugin/Manifest
@@ -1,8 +1,8 @@
 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 1953 BLAKE2B 86adc5c3744ec3f8ceb7a66747b3adb8143c00a5da07d6eb7935ba545d124e7dcbc7ad9d216188f280b84ec130c82510e4c33c215efe03f5431b0df9758b1a2a SHA512 3ac14ba4ce23e0081be124aeb750fcbd61f6e66f3a510680bee999a73e2d1d6a4ce96cb0f5acd1ce930583c3f295ea241d018731255c22d8ac8f8d5d10eda539
-EBUILD hugin-2017.0.ebuild 1929 BLAKE2B 6403a6bdd33ee0ccefecac86eeba844f71f22f4eead5872a0499c015e71acc95c916d062d473d78f1923952ab927ff9af3a1f4f4564c006f7cdb1e30bd2368db SHA512 2c4769e87d57cb9c7f4a287384ae7468a60985488882d9f882a71457b4ef898646206562466eed6485b379a747f460ee7828dfaee5a3acadf1912fd8c83e3258
-EBUILD hugin-2018.0.0.ebuild 1973 BLAKE2B eb8148bea08769a3991bbddca21fd5154a03503d06dfd60e8ef15c2f0a60d975e34ea06aa2dab01a9aa52603fe696a9c3f86cc7b731c212cbee3e444c6e72725 SHA512 d947ca49bf2d0b203ebbf39df1c19c7e193e624ed73729c9d6ffe02a3f57abdcf568ecfdbd2d7b6d638cce50cedcc14ceab9969ead1e4ec2772220adda867713
+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 1968 BLAKE2B 8092c22cf9e924bb47853aada5e8b9fb5c54be2752c646a9999fc78358b9c134b19f92215011a287cb6fc4e3508e958d9aac4b777b28b487cd537b80dad50d45 SHA512 74129b148b887978bc1f6d36a0c1b82c23143028ff7a6110bcd6e3096d8f46bf5807f9b7bc618566dcbd784dbd69300692106edad9e8f7e3587eb8cb7a1774c0
 EBUILD hugin-9999.ebuild 1984 BLAKE2B e7a4f4e7a7531b9b766bb7ade9087b11a74e9022a0b9d6aeea41c131d70ee2d2d6869b71e91c14403e5076071ba94afe7c888560a9f9b08d78cf7b18256647e6 SHA512 0b186e5a80fa23b4cf34a1438eacc9b01c22941d0305df391ac3188814cefcf36ac01ecda00707b590e520565127e99fe0f8d7e1e344e267dca912d599122209
 MISC metadata.xml 519 BLAKE2B bd02923a26374e3bd638778ce8100efc4694ab6bec54fd8c8cbd32d0b8c3d495fc965194692ebaf2fe909e495011978d7bb8f3c995037fc128cfd9626949549c SHA512 d4e0bfb870b5b6e5769be2c28983d914666e413333887ac7a7cdb868d2f45f6b284a99204f6e97b98e65958412c04291f6fbc21deed8de518d3ff64aae6ad01b
diff --git a/media-gfx/hugin/hugin-2016.2.0.ebuild b/media-gfx/hugin/hugin-2016.2.0.ebuild
index a679e5c2f833..6d66c2d74197 100644
--- a/media-gfx/hugin/hugin-2016.2.0.ebuild
+++ b/media-gfx/hugin/hugin-2016.2.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P/_/-}.tar.bz2"
 
 LICENSE="GPL-2 SIFT"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 x86"
 
 LANGS=" ca ca-valencia cs da de en-GB es eu fi fr hu it ja nl pl pt-BR ro ru sk sv zh-CN zh-TW"
 IUSE="debug lapack python sift $(echo ${LANGS//\ /\ l10n_})"
diff --git a/media-gfx/hugin/hugin-2017.0.ebuild b/media-gfx/hugin/hugin-2017.0.ebuild
index 36ab6ab525ab..649cba97977b 100644
--- a/media-gfx/hugin/hugin-2017.0.ebuild
+++ b/media-gfx/hugin/hugin-2017.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P/_/}.tar.bz2"
 
 LICENSE="GPL-2 SIFT"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~x86"
 
 LANGS=" ca ca-valencia cs da de en-GB es eu fi fr hu it ja nl pl pt-BR ro ru sk sv zh-CN zh-TW"
 IUSE="debug lapack python sift $(echo ${LANGS//\ /\ l10n_})"
diff --git a/media-gfx/hugin/hugin-2018.0.0.ebuild b/media-gfx/hugin/hugin-2018.0.0.ebuild
index 33d44b9ffacf..c3812f206d18 100644
--- a/media-gfx/hugin/hugin-2018.0.0.ebuild
+++ b/media-gfx/hugin/hugin-2018.0.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P/_/}.tar.bz2"
 
 LICENSE="GPL-2 SIFT"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~x86"
 
 LANGS=" ca ca-valencia cs da de en-GB es eu fi fr hu it ja nl pl pt-BR ro ru sk sv zh-CN zh-TW"
 IUSE="debug lapack python sift $(echo ${LANGS//\ /\ l10n_})"
diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index 82bb6fd4d38a..ac268028e84b 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -3,7 +3,7 @@ DIST ImageMagick-6.9.9-40.tar.xz 8919136 BLAKE2B 04b9585948194e6ba03efa549d9ef6a
 DIST ImageMagick-7.0.7-19.tar.xz 8546416 BLAKE2B 6750dba45f7971f7a7e74ac7ae3ec94732a2bd31f638afac8a91abd595e81aadca1372ddb46dcc3bf2dcb258ececfa69a8e8ad5ff753930462d46804863c0f4e SHA512 656520f719a375c837b2ddebb7e5920e9c06a9f81f3529b8a7c405958ca75f7464790ff931b7a32e104ef500570e71ff80d3dfb7c5cf777b2a5ad8207fde7928
 DIST ImageMagick-7.0.7-28.tar.xz 8611096 BLAKE2B f4e70f32c5716f5e4673d9b938ea3924fbfc1005084bfad06afab493d50bcee2e43cd8b5ca0f83945dbc80f731c914633c2a401172e8d4e0289c7c9afe4b1209 SHA512 0a370ee3b8eb42c563bb15fa469208ee70520aa148af1752721e29be90a6a95a5773674f2d685d1f2fca77903f9592ffcbb9d7214ea96818848ea9dd135aef08
 EBUILD imagemagick-6.9.9.31.ebuild 5119 BLAKE2B 5eb49251e9b0234412ee04e341d81611b4d11b1664042cc657e34788d5997b85185195a5e8a8a484012a79430a7782ab988292f0c8b4c9f40d2d0ed32d3533fe SHA512 5c2f2b6ab47415f90e2b409595a6f43545a5e77679066ddd69f43bff79b791c5ec08fec8b2fd59deb8b96b18f0a56f5cada240791fa5a06d52854745a9030712
-EBUILD imagemagick-6.9.9.40.ebuild 5128 BLAKE2B bef8ca0d8e3ec8440ed08d36a22ea5afb9a2e8598aa0b2da4c9e16dbe577886fad9606c4a4a31e3864bf04f45de18173738fc542c9eeb28a91e084a85f4a0747 SHA512 02aeb5fc77a81c31f786b9f761011ebd3ce4cd43ac275a482422aecb1a927d9b628d020a7fef796af4eafcd54d232893089bb6393ca686093d2b52859cdc3510
+EBUILD imagemagick-6.9.9.40.ebuild 5120 BLAKE2B 881ba981467f841b569cfb7cd10a39128c884e65d7b91178333b8cc49629026ee87ebbc97dd8e4ee28b3c45ce863b9e08e7100b5f5d2141f041b35075f403cf6 SHA512 54dbf1a3f07800ddf1e347ffcd4079086212412d58e0b7aa939022efffb4da35dc4c3e67991233820487a3bbfbc7080e0a09b7d5e35e83ea3df5006daac25773
 EBUILD imagemagick-7.0.7.19.ebuild 5125 BLAKE2B 1385cf3dcd1940be4adf3f29c0f29603e33aeacd11780d5ceff3919477f10214318e8652da2f03d8b9218fb480a2e5bd111855c915c02b37d64a8c7cb9fe886b SHA512 1082239813f4c064fa89f7bf6f2af71f56f00482b428a9beb67e1ba0ce77f3ac51987b0d44557c35076b999d778fc2389f15938c52d722840f242a51d3dd9063
-EBUILD imagemagick-7.0.7.28.ebuild 5134 BLAKE2B 33aabb4a32d0bd9555c5470617d9954973f615a89b8fbc9fe17d7b105402a8fc6bb73cd1311043b58673197ee1d94939c46fdce9979d5f983c26cd191d23e0f4 SHA512 58bf5277b40e8ef8fc3ff17da5c8d9f814e1c52866789748881fe2469f46d99842f3bfd5e368492ac25466a395e1141f48d0b2020d436452730fb0bf9fab58cf
+EBUILD imagemagick-7.0.7.28.ebuild 5126 BLAKE2B d3147cd64da1cd4b63183faebc48a35ee95d38afb60a651f8e9169b543544ec4ecbeb178ae2f60564e35d9ea42c184d9896e7d4a38a332ade76146c448029ec9 SHA512 3b86c740ebc2cbad8e82ee57d1824e7f88a222ea9dd5093f1363db38965618bd063f145930a561daf0dd52d6d869f9332e03abba22257c5420e7b546d6d646ac
 MISC metadata.xml 984 BLAKE2B ae695ec1fc34ad3b29269ad21cfb8b79ff6158a2ace9cd4194354448794dc183ac568757d6a7e6c07f31634dfb780e0411a0237b3c106344e6c7c7244a8aee36 SHA512 39a4c5aa27db2de81ad4621bacf43baf96415eecdf836fb2024890634c025b29f2b41dc003ac4d6f87b2365c1a4c68b6af2b9e169b3137bbee3e0a6cb435c5c7
diff --git a/media-gfx/imagemagick/imagemagick-6.9.9.40.ebuild b/media-gfx/imagemagick/imagemagick-6.9.9.40.ebuild
index cee94bf466d0..7458e47a0da7 100644
--- a/media-gfx/imagemagick/imagemagick-6.9.9.40.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.9.9.40.ebuild
@@ -13,7 +13,7 @@ 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"
+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 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 )"
diff --git a/media-gfx/imagemagick/imagemagick-7.0.7.28.ebuild b/media-gfx/imagemagick/imagemagick-7.0.7.28.ebuild
index 6d4dff609a64..5264d406ea24 100644
--- a/media-gfx/imagemagick/imagemagick-7.0.7.28.ebuild
+++ b/media-gfx/imagemagick/imagemagick-7.0.7.28.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://${PN}/${MY_P}.tar.xz"
 
 LICENSE="imagemagick"
 SLOT="0/${PV}"
-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"
+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"
 IUSE="bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri 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 )"
diff --git a/media-gfx/maim/Manifest b/media-gfx/maim/Manifest
index 23a270bb75cf..55d87e122cfb 100644
--- a/media-gfx/maim/Manifest
+++ b/media-gfx/maim/Manifest
@@ -1,4 +1,4 @@
-DIST maim-5.4.63.tar.gz 39666 BLAKE2B 0c472480f231b84c7f772347d6eeca8620947e5494f176dd4513ee41a5de29e9b90eafbec1bb7064e745e24c9b1043a7ccd9627cbab5561f30f6e8a859273e21 SHA512 d84cfe051109c9c4b79f2a006f2d73a0fa9cd40151c9d6996740326766886f8b070bc49029d0d3810fd8743cc63d76c051fc249e53b4e9ff37faf8708c149dfd
-EBUILD maim-5.4.63.ebuild 599 BLAKE2B 23481feda7a67dea9ddfe017db071e07cc39b06bdd1e3c6e6a63bb2f198b0532f7c0a57d7c9f12b7de2fb1fb855cb9051a1695c5dbc64092eaeaae44a15b04d3 SHA512 a889034dd4c81f939c7e0edcb01f1de36b54e68bd8f793b08c935ba3affec3449c7492d418b7e614cf340e0092cd27410f72fa56b914d3d6ed6b9de849d607e6
+DIST maim-5.5.tar.gz 39571 BLAKE2B 82235f4c90c32e26a4a6e3ef7cf544ae8958204383af1160bf3c8bfca9df19d0d92a4aec8acd2232afc8ae72eb6850c0cd09e2554e3affbf625b19b0beee1c50 SHA512 e98c5dfbc41c8948e9acb219e78adbc69d61caaa100bc69cc70c446dc895fb4d93d6d42cbd2da8096af9e6769f13e9af13bd4b66249eca6dd8a0eadfb11622ac
+EBUILD maim-5.5.ebuild 883 BLAKE2B 1baf00072c8680985b11af816da86dd6c3e1188a189dfe4cc7296086be06879085689d1ac877773b372c10b6b026289655aff75586af5eb067327d30a62f9c1d SHA512 cb2bbc86c5e2b1a81625bfa7b792fbd5f39ab93560899f86348629dc5c720e2745c0083f81f3ef226aee3b25e81cc8dd21355c39007bc6118f95404e7c70b525
 EBUILD maim-9999.ebuild 883 BLAKE2B 1baf00072c8680985b11af816da86dd6c3e1188a189dfe4cc7296086be06879085689d1ac877773b372c10b6b026289655aff75586af5eb067327d30a62f9c1d SHA512 cb2bbc86c5e2b1a81625bfa7b792fbd5f39ab93560899f86348629dc5c720e2745c0083f81f3ef226aee3b25e81cc8dd21355c39007bc6118f95404e7c70b525
 MISC metadata.xml 370 BLAKE2B cf97a29c8998e02c1cf3c1a2262af3b4ead910bc3b9a84a43ceb97eb6f8522b134007ba6380e5a0e014ac62b4faad27f856a847026bba576e1e1a6e4c2bfd160 SHA512 d3c3fb700a3d2c5c67a3919ae60fba9e843734875378ba682d93f728c408845f580caf940b3e39436582ddd1c3e2fe4e21f01cc74960d00f8cbddf20047abb62
diff --git a/media-gfx/maim/maim-5.4.63.ebuild b/media-gfx/maim/maim-5.4.63.ebuild
deleted file mode 100644
index 3f7ece5696d3..000000000000
--- a/media-gfx/maim/maim-5.4.63.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="Commandline tool to take screenshots of the desktop"
-HOMEPAGE="https://github.com/naelstrof/maim"
-SRC_URI="https://github.com/naelstrof/maim/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	media-libs/libjpeg-turbo
-	media-libs/libpng:0=
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXrandr
-"
-
-DEPEND="${RDEPEND}
-	x11-libs/libXcomposite
-	virtual/opengl
-	x11-misc/slop
-"
diff --git a/media-gfx/maim/maim-5.5.ebuild b/media-gfx/maim/maim-5.5.ebuild
new file mode 100644
index 000000000000..60cae2903780
--- /dev/null
+++ b/media-gfx/maim/maim-5.5.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
+inherit cmake-utils
+
+DESCRIPTION="Commandline tool to take screenshots of the desktop"
+HOMEPAGE="https://github.com/naelstrof/maim"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/naelstrof/maim.git"
+else
+	SRC_URI="https://github.com/naelstrof/maim/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="unicode"
+
+RDEPEND="
+	media-libs/libpng:0=
+	virtual/jpeg:0
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-misc/slop:=
+	unicode? ( dev-libs/icu:= )"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DMAIM_UNICODE=$(usex unicode)
+	)
+	cmake-utils_src_configure
+}
diff --git a/media-gfx/pngquant/Manifest b/media-gfx/pngquant/Manifest
index ba9647a2ff61..34de40707050 100644
--- a/media-gfx/pngquant/Manifest
+++ b/media-gfx/pngquant/Manifest
@@ -1,5 +1,5 @@
 DIST pngquant-2.11.4-src.tar.gz 142149 BLAKE2B eccf0c7a279d62981cfdf44ab0e378b2331377cd892019161b453edc7ffe73616a2aa83a07cf5f8d7292a0f96bf25612c23129348463cac73647021eae44f160 SHA512 171949977e1fd71c05bd75552f2e62535f6c15f31c3192cbe31df7451091634a6fbbfd08b47dd040f353af3b5f41fcc13db4421a212ca07cc6836f029635ddd0
 DIST pngquant-2.11.7-src.tar.gz 141959 BLAKE2B 00e36a818a2150aeb3c927daeb8621bafa41497a6fe32afe30e41ad04d788946390f382139aea9878f58fc7a84fdbaf597681c9d8769e0e23b785a10d2e0233c SHA512 5325577dcb16acf5dff81a5f3bcf8cfa2a12df07a7c2308ebb9a343b74e56ea21184ed3f87819122c8bb97b4a7ffd3b61046c60f7f339da9a93e76dfa17ebee6
-EBUILD pngquant-2.11.4.ebuild 1001 BLAKE2B b448d71c1b9b5f97cfbb96a2f400933c697cf7821f34a1e78731b6fbf23856fcaa079d9a43d9346a2899b55217f6f7ce65a0f52315f89464ea321ec2c7f75224 SHA512 e3c453cb022071993544a910d95025e88222732fd5b533b4ef7b4b4c8fbe42d052528c9329af704d9ba53e7d8e522b2f87895013a337999afd3fe5656ea805cd
-EBUILD pngquant-2.11.7.ebuild 1001 BLAKE2B a751e5cb2b1ad19dad8e91d01b8ad82d2ca27cfa6abf7327ebd8f4a6a73f371fb999fb4e90506a42f47102dadd9565499d45be6b247caaeba29d6416b06efd30 SHA512 2ae01ecc887e5e11c36e8719631f04a57a82208396839b7d22ebd6197bbd3dc5c7cc8808361ff12d7b180d98ed27a0cb9388b06243dfa24ea527dfb9aea3433a
+EBUILD pngquant-2.11.4.ebuild 1003 BLAKE2B 6e56ca1685dbbd7bf9f5e6d45a02770e59b392ffb1494e819d74afd59e54b05532ab2925fab620a19bee90291e66e8cca9ab22ccb4b6a1d81f16e29330e1f5f3 SHA512 c7540c0565652abf15efaeef55b929577265e30df9759b00d53bff81002cbbcc42bc9b27873ab76b9869d776e6ff53ef75b53729c60d3e5399141cbc44d93507
+EBUILD pngquant-2.11.7.ebuild 1003 BLAKE2B 6e56ca1685dbbd7bf9f5e6d45a02770e59b392ffb1494e819d74afd59e54b05532ab2925fab620a19bee90291e66e8cca9ab22ccb4b6a1d81f16e29330e1f5f3 SHA512 c7540c0565652abf15efaeef55b929577265e30df9759b00d53bff81002cbbcc42bc9b27873ab76b9869d776e6ff53ef75b53729c60d3e5399141cbc44d93507
 MISC metadata.xml 492 BLAKE2B c60cb6917ca56946f1941feb2de555e4ced9c56ea3f25fae727bbfd2a49567ef3b581e877b7304dffe090ed898cc285f1baf5465380eb30582bc086854fdbc8a SHA512 5afec8077fc4f303cc76de855558049bdebf0d40a76381077866fd9d3e658912936fc2cd63411d378475743f8649e68dcc08793eb066d6adf9b232b8c669cb1b
diff --git a/media-gfx/pngquant/pngquant-2.11.4.ebuild b/media-gfx/pngquant/pngquant-2.11.4.ebuild
index fb15ab76cb4f..5497e70ac515 100644
--- a/media-gfx/pngquant/pngquant-2.11.4.ebuild
+++ b/media-gfx/pngquant/pngquant-2.11.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,8 +6,8 @@ EAPI=6
 inherit toolchain-funcs
 
 DESCRIPTION="command-line utility and library for lossy compression of PNG images"
-HOMEPAGE="http://pngquant.org/"
-SRC_URI="http://pngquant.org/${P}-src.tar.gz"
+HOMEPAGE="https://pngquant.org/"
+SRC_URI="https://pngquant.org/${P}-src.tar.gz"
 
 LICENSE="GPL-3 HPND rwpng"
 SLOT="0"
diff --git a/media-gfx/pngquant/pngquant-2.11.7.ebuild b/media-gfx/pngquant/pngquant-2.11.7.ebuild
index 2da09ac80e2e..5497e70ac515 100644
--- a/media-gfx/pngquant/pngquant-2.11.7.ebuild
+++ b/media-gfx/pngquant/pngquant-2.11.7.ebuild
@@ -6,8 +6,8 @@ EAPI=6
 inherit toolchain-funcs
 
 DESCRIPTION="command-line utility and library for lossy compression of PNG images"
-HOMEPAGE="http://pngquant.org/"
-SRC_URI="http://pngquant.org/${P}-src.tar.gz"
+HOMEPAGE="https://pngquant.org/"
+SRC_URI="https://pngquant.org/${P}-src.tar.gz"
 
 LICENSE="GPL-3 HPND rwpng"
 SLOT="0"
diff --git a/media-gfx/qrencode/Manifest b/media-gfx/qrencode/Manifest
index 7cc4e02b89bf..9d0c7aa434d9 100644
--- a/media-gfx/qrencode/Manifest
+++ b/media-gfx/qrencode/Manifest
@@ -2,5 +2,5 @@ AUX qrencode-3.2.0-pngregenfix.patch 1339 BLAKE2B e4ae15f573ac9d00ae5286c41aa57f
 DIST qrencode-3.4.4.tar.bz2 369136 BLAKE2B 19e9a2089c6c22284da61dda57d1150573b72833c3e9d96d1aa8742a69cb7495b3c39b8162b0dd268e94412bbc618d1358dcfd969f12c0b3e9701414955aed46 SHA512 4835d462542e37e5460635e0dd84e291ff0976a6aec61c63f9950c1e60b446bc913220726e14f6379322bfd32ccd9bcd5fceed9ca10cb95343c952d8472b983d
 DIST qrencode-4.0.0.tar.bz2 429244 BLAKE2B 45fe8afe602e7ff20b750b5a0de8a3b52b61340ebf0bbcad2ae00e4a0ff2976077b5add4e2c1358d4ca852f79f4cdb27d9dab8c726bf72ff53964661335b5a0a SHA512 d4140d77fce3a1c39735cc3e98e3a19018daaa08c870644f71727d27ffb17711e76b4ed4e51718d90d812e78df75fe575617580ea9b1bf210438f8fd1734204e
 EBUILD qrencode-3.4.4-r1.ebuild 577 BLAKE2B 19577c82a04b248a08201344b226a236bf73b58540f0fb5c8e4d55493dfeade02cc1f0d22d096dda91a82b52f1c532f8068b755dc47be06e138e4b4a30516f7a SHA512 af41d0ff230fe92fdc21d7ee0ab93820187f1973f633dc7cc5b32140504c48729c30a9d35488cf59e90010a5852fd72111275118053789c6e5e4ccefeab35288
-EBUILD qrencode-4.0.0.ebuild 880 BLAKE2B fe7b42a39ef3e95600151cd93433f28f84cd2144d531caf365392dc33ae929be63313018c7ac83e25dafc127332cf106d2b9a80e3adc99f7e575eeeca2d0dc73 SHA512 c0ffbf774c4831d5c7fe668f76d95f060150fe88a9c16aa7d2c3fc478ae14d3fa570dd58ff3169a312837458628309f7a1e652e73ee48fcee4d05cf8dd97dccd
+EBUILD qrencode-4.0.0.ebuild 879 BLAKE2B 7f9812410de94853a2255396de53c320838b96254cb2c2c954d808c72d4b29198d9fb8ba8772d79ffaccaa011acfad052abe264b4f3c08f8a4c2641085549c44 SHA512 9d44ada6c3dc09009ca104a5a1778002918a8aa6e139181ee0ea54cc163916a8a6414b8a4a6bbbdc2826fa68d68078ec4a62041cad4afced8651bde44a63789d
 MISC metadata.xml 370 BLAKE2B af379243b15cc55c2e2c14bd20ec8b9bb41d4fbb6a87938aae5cbc39e17c78ac45b322d946eadec59fc48c13354fd9dfdffea8c2572301d8d4cb86f162d49bdc SHA512 f5987a8aab3b861bbe4961c69d0c72b07826c43320fd383075036ad63a070204c6ed41297b2490b4a14224f5c4269c37c40e5abc9bce4d1c5857e68e98d6428c
diff --git a/media-gfx/qrencode/qrencode-4.0.0.ebuild b/media-gfx/qrencode/qrencode-4.0.0.ebuild
index 313a44bd4d01..e176ad0e92fc 100644
--- a/media-gfx/qrencode/qrencode-4.0.0.ebuild
+++ b/media-gfx/qrencode/qrencode-4.0.0.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://fukuchi.org/works/${PN}/${P}.tar.bz2"
 
 LICENSE="LGPL-2"
 SLOT="0/4"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ppc64 sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="test"
 
 RDEPEND="media-libs/libpng:0="
diff --git a/media-gfx/sane-backends/Manifest b/media-gfx/sane-backends/Manifest
index b3db83363e19..8f7e65105901 100644
--- a/media-gfx/sane-backends/Manifest
+++ b/media-gfx/sane-backends/Manifest
@@ -8,6 +8,6 @@ AUX saned.initd 294 BLAKE2B 571bd4032b2330c627a31459a18baf2044852ec1b40f0216bd5b
 AUX saned.socket 132 BLAKE2B 5e9f0350a1553fc75aea88ce355fb68b881e3b2194ac0e3c6f3cecdae79111fb1db1cfe3b4933eca15af5f985fc6b89e4d9af3844b6e9cfd542828b6b9e57ed9 SHA512 a23ceeeb02bd9e214702003a3165886858ecbdd93df89cd37ad5f00581745454548ccda0ab656f2dc0acbf2896a8781568c786797e64a07014be003d6140a093
 AUX saned_at.service 434 BLAKE2B 6dad3c809e01c17c0064a52c4103486b19294ed3cf8fc71faad18edaf71b920584366ac988d354f45bc07607ea64a97ea480fe152ac9a1cd896df99ff457cbf7 SHA512 891c751261107676f8159f403e0f4d4254099b709b9ba0ac9f2af97a9ed30f677411ad6bc316c2e6e673c616ba988253479d5e30c9617e3ae279beb79f70e965
 DIST sane-backends-1.0.27.tar.gz 6430188 BLAKE2B 90f910311e31a436eaa0ca0fedd998aac3331f89a346f31613776ebc860a10cc37055fd15db8de8d743498914ea0c16e4153dbaa101380eb6e36857d730c3456 SHA512 c6552768bfc10216730fc11011c82f74ca0952182019ded3916072147ec09be5c975ce1d37dc3ccea050c488dbdf983c2ca17dcd702644060ba796ae2591f9c5
-EBUILD sane-backends-1.0.27-r1.ebuild 7735 BLAKE2B 7c7c2c40cef4625d3ad82e4bfdc3135c4206fecdeef8520acbf22ce2a1b0a489968745043628d98773001748e7849706454966be42261c9d1e2a3eabc5903f82 SHA512 f8cdacb964ae90d02627ce53abef717c84e9b6134a4e019979ba2b61100af57448b15385bc203f021d7ab3a3851caaa98ac71b74d95a3ecacda1160c59bd3048
+EBUILD sane-backends-1.0.27-r1.ebuild 7734 BLAKE2B 244fc0246a9fbacaee6a3a97a7abafe1a0065c181ba34b72551108b7e2e620ffc5dab6f93d94f24b74d6a35cca5650463b8752fa09a2183b6b4d7bd820e34ec5 SHA512 b418d94c56128f2291dce34b13de4b6a56a16ac4d42550f896996fbda78555adc24328eb026a03fc09a88a1ac542c72f6525f3d9e40df8e093ef300f64b72aeb
 EBUILD sane-backends-1.0.27.ebuild 7913 BLAKE2B f6cdfc03d373fbad3872fdc6f7686d3b006e365860851f821eded0f0cbc661f8ed1d176f6032ca2abfd706afc2846185f09a134ace637e896f3c2e067b748385 SHA512 c228f459e1e62095aa57f75018cd63773cf6c55ef6e24ff28123476f43d8a9798d27d6cc2b6f4d85a79736d824ebc5ca4216199e527158781cf698bcc62b2620
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/media-gfx/sane-backends/sane-backends-1.0.27-r1.ebuild b/media-gfx/sane-backends/sane-backends-1.0.27-r1.ebuild
index 72982170d550..76ad3f8ec0e5 100644
--- a/media-gfx/sane-backends/sane-backends-1.0.27-r1.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.0.27-r1.ebuild
@@ -122,7 +122,7 @@ SRC_URI="https://alioth.debian.org/frs/download.php/file/${FRS_ID}/${P}.tar.gz"
 
 LICENSE="GPL-2 public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	sane_backends_dc210? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
diff --git a/media-gfx/shotwell/Manifest b/media-gfx/shotwell/Manifest
index 60153753ef00..fb6f3a618661 100644
--- a/media-gfx/shotwell/Manifest
+++ b/media-gfx/shotwell/Manifest
@@ -1,27 +1,7 @@
-DIST shotwell-0.24.6.tar.xz 5401300 BLAKE2B 99d013c0703fe15ff3ab99767528f50c4c9a5eef186329bef889f66aff2f654a9e75a3659b2cde87896edf8784d7d6cc4972b1403e55fbac36bc008f21c9d0c7 SHA512 48f4595950700b3d193b7d73d4ff45abda1544de66c6252fcf98e94e58f284a0491b08d11045a96b8581f3370d759346739d3da1ef85311717908c33ab1c25c6
-DIST shotwell-0.25.0.1.tar.xz 5398404 BLAKE2B 8e40b80369b04db44cc1fd6b13703b4d230f82f7367df625491d9e3741f11302317dc09363008d58fec47c2d95dfbc72952ceb78490cd7ae0dbb8994624c00da SHA512 6a071b0b7d84bf78727b84e0ba707d6d7f5408a0b942962771b24a79381c102c58c06b4895eba69527215103279946f4e33b14410a1ce6dd58d3dba3870975df
-DIST shotwell-0.26.0.tar.xz 5583732 BLAKE2B db258833af0803c763e1ebcb71ea34a26cc92c9b43d2372c55d66706b2a1a92b8652d18a8aa56ffa615c132dfc1223912391a7c7a89765a027ebef4918e98704 SHA512 fd25bd24593360ae3d1f4cf5960d8ff2023f965e5d3bb70b80801a4c23103b570ae856e243c08e486b428c746b6f82bf3c3982a21689e72be7d2dfc3aec16ccf
-DIST shotwell-0.26.1.tar.xz 5593092 BLAKE2B 975872593e726922da721700e8ecb664cbc43afcb5d689cf1001046b314457df5db16241b3b788571dc5566ed903108b1354cf4c335354e0045fc59fdb954fbf SHA512 82cc95b3b173fbcd3cbb4f5d42f24fcb951b34039af1fdbd062d3f334aa2c305640833a7279cb79e02f0334da8b3a85cd8aadff45a80161ab0d2fbcd14278cd1
-DIST shotwell-0.26.2.tar.xz 5575388 BLAKE2B 7a3b63d73d614e2aa85fe00710cceedd25c3545be57419ab40ec6532d2eed2f64fadf774bacbeb70b21099baa3d4511763acbd25acde2ce2a46768986bfe8ff7 SHA512 a38681cb1b192372381d67abdc6c088c80fcc1db0d8d328330ee8f1ab78608c742de5e33030ccb1b941f1583a2b7028caadf61ce10ba7f2a93863bd2c3019813
-DIST shotwell-0.26.3.tar.xz 5581204 BLAKE2B 1b28be1bef1b5b9305020d92bca8b535b7a4f2bdbb5d2815e2679e20c6ae7944db2cfc971f8532eaa68a145f735d1b841c7d7a71d2f14d03fde3619db99e2068 SHA512 8d54ffec947b81517840f4f9d223edb6673e6ef66c6cc4333c2353b7c197c0630c10fbf7ae5d3ff5963322f19e5b7adfd6aac5e391262c6edb3b22a01de9a18f
 DIST shotwell-0.26.4.tar.xz 5619280 BLAKE2B 0ca9ecf6e96019aa8e9bd4bae09d1b888902fc054633271854e09e1fa9b474774b7b5f2e6e3bcfed60a5b0f3ba30a2d89133d2676a94db5f4da6ee6a0af41102 SHA512 6a0772a40759d636807652ef27814306cbc2217119b071590db36c628b6e9d04f876ae1748c88476fbebc1db0c83e6a108c9f74261b7faa348c6bd37c1da198d
-DIST shotwell-0.27.0.tar.xz 5574988 BLAKE2B 30ab9ebe5fa12f8d7be3775d044b983c644b1b88e6ca4a69522db0c3859f55846b785761ced8e1af8da8c4ec72c4b46925c6a77dd2f995936c12638913856c2c SHA512 e7b5fe153fff96e04507588b4b8a1e71c121787cb6d28b7e14bb31824f1a09ca1948edc4bccfa069b2ffebe1ac753580257c1af4b7aec0ed49af74944ee91fbb
-DIST shotwell-0.27.1.tar.xz 5619824 BLAKE2B 7ba1606b1604ca156aacd71d014bdec507abd2a5447696b60ce4400cf835dd484b39e737ec7659a8744e0a5f72b9e9a561fb297db6f256db7008ca5e4b2ae0d8 SHA512 b26c25b45af305903cf0698e65d5230820dda447b70175c92a66e25148e47d620847b3fa2b3bdb8d70656186d5b30d98edf3eee4138f07db9f8260e81a95a7d6
-DIST shotwell-0.27.2.tar.xz 5619692 BLAKE2B 0a532d6d2f7391f0783cb0fb91fbc15a681e87041d12355ca75581d4b7f4ebe7fe3feeaca7fc12b0fd82710bf2d906c1d3abd382b61a5dfac3041cec482edd38 SHA512 a64fec52ff1ba3bca0e4b07be557ea3b838845998ae64ac7504cd9a8c976380cf0d7aae4aaccf931f1f40b5d247e081ec98472da8e8835363779dd39d9d2f69b
-DIST shotwell-0.27.3.tar.xz 5623408 BLAKE2B 582c0b4bb0636dda4aab7e0a8ca69098b1af455d8c393bd8b5d37337cc85ae38036c6020eb54eeb9fc21f2fe603631305965351bb20f8824b50b5606829a7a47 SHA512 204fd348493f25fd855955735f575da9b6de7209f27e677670b5c016cb668558a6909b71e0b1a50fcda47e29a8ac9edc40619dfff2117f637ffebfe022e12275
-DIST shotwell-0.27.4.tar.xz 5626284 BLAKE2B 2f17546c190dbd04bdf467e12a092c2558ec5bbac1e13a3054c746c391876a1ac4eeddbb4578a575cd0b73f402432ea3763fd90e214a2b0f11a6f281a77a8bac SHA512 9f67893018a750199b51ac42e357c850195a356db8fdb5b1f8836375e01291d716f82257b2b030aa41e9ead59227b442fd38239fad5b5f46bf2701ec968e383f
 DIST shotwell-0.28.2.tar.xz 5582276 BLAKE2B 20d35f714543d35bd04fe81617040419664e662664ae504cbfb0b3bb160d97a5469478e1e134b6432b174fc19bb4fc370b5eb38c576c805e876d00999fb7d979 SHA512 dc00f45e55eabadaaf825de5a4152d40db2eb652f966b870a08d36006887a18aacf570b05d232a9fc7ef7df097a468a497778022bf7b86ae2143877c02540cc0
-EBUILD shotwell-0.24.6.ebuild 1444 BLAKE2B a9882a2e047187e613755ac71e587242a1b8e0a113a981a4e47620c07177bc2b1e4c01e6cdd3f00036dd09481e4e31c64c319fb30a708c6350c45a0e5ea5656f SHA512 559e06d8bed36ab72880dfb409d4151d9ddc040201f4bd144b67202cd103db09c1b3a428b94c5875ac50159da0e22beb7e3242e515cb8dea259dfae75f383dd9
-EBUILD shotwell-0.25.0.1.ebuild 1471 BLAKE2B 529d3e84b62254eb35fbc93c346c44e961d59ba895b6d86bc49766ab78d446967f8b8b4ad17e0efb4220a1d23a5e40cb048f4c1a0317373c3daa17629a181a61 SHA512 ff395918298ad2b4e7725149177ebcf19b30f517e3e78ec4e62aa421e4cc61ccdc41be2c4234301f10df1ec5d8e8a188f17f69048dc0decd3b77e0a2bb52d67e
-EBUILD shotwell-0.26.0.ebuild 1471 BLAKE2B 9b5c8f1541c0d9fc96923ee19e9856c1320af4065552d3fc100a55d1765677af6ba524bd9225e8b385477c016aa692bb0e4ccddb3911558771d4b8b9e36bc966 SHA512 7738e3cf9e6e545005071c01500ce091b1908b651162187bb91ee88bd954371ce9ed0962f76d4a688783f6a27374835d6c517a7c9b2c477cbca0f4b1ecbfa521
-EBUILD shotwell-0.26.1.ebuild 1471 BLAKE2B 9b5c8f1541c0d9fc96923ee19e9856c1320af4065552d3fc100a55d1765677af6ba524bd9225e8b385477c016aa692bb0e4ccddb3911558771d4b8b9e36bc966 SHA512 7738e3cf9e6e545005071c01500ce091b1908b651162187bb91ee88bd954371ce9ed0962f76d4a688783f6a27374835d6c517a7c9b2c477cbca0f4b1ecbfa521
-EBUILD shotwell-0.26.2.ebuild 1490 BLAKE2B 47029b46edd6f386842b82cf28aef5a75790a8bb9f9ce5f0437897c8e1933571013de8f82aaf97ea15076ec162b94b645c830fb55dd0f68b01d6e9b1fd030767 SHA512 c8f6fb632fb4b49aa60cbb5cbc572aaa191bbe047d434c6bd6b97a3bc9bd61540d7ab31fec1121d8faad55e622cd39e1bc10f1d2139f54daa58346542c162cf6
-EBUILD shotwell-0.26.3.ebuild 1490 BLAKE2B 47029b46edd6f386842b82cf28aef5a75790a8bb9f9ce5f0437897c8e1933571013de8f82aaf97ea15076ec162b94b645c830fb55dd0f68b01d6e9b1fd030767 SHA512 c8f6fb632fb4b49aa60cbb5cbc572aaa191bbe047d434c6bd6b97a3bc9bd61540d7ab31fec1121d8faad55e622cd39e1bc10f1d2139f54daa58346542c162cf6
+DIST shotwell-0.29.1.tar.xz 2368080 BLAKE2B b706229803528c55486219a4190d1145d98b513ff26a4a3d2989abd57ff3465ffab231b1779014b7babf7ce33cc875fa11905a95bbf108251c57d3692a5156a4 SHA512 25e7e7d303ecbe89ecf4eba219b6f10ad44d23209d2c2724c6d61afae47afc0a6e1a7a7fe99931888f7374419818c5d74e28bb6120383e191c038c967c84ce39
 EBUILD shotwell-0.26.4.ebuild 1488 BLAKE2B a18a437d65ca3a9999f0f238d7442564c012b08d209384d8b47fedd12a8eca4c1e91e28ba18b456ff860c56a16cd1059b2d7a0541d06f10d2937efcf893a607b SHA512 2cd5b9e390f61de3d0db9ff5d0ea59ff36eef745afb237ea82d87f584fda7ca200b95eb7273e1a74f401e5a7187e8eb78c98910723d68dccdf90535a094bd0d6
-EBUILD shotwell-0.27.0.ebuild 1490 BLAKE2B 47029b46edd6f386842b82cf28aef5a75790a8bb9f9ce5f0437897c8e1933571013de8f82aaf97ea15076ec162b94b645c830fb55dd0f68b01d6e9b1fd030767 SHA512 c8f6fb632fb4b49aa60cbb5cbc572aaa191bbe047d434c6bd6b97a3bc9bd61540d7ab31fec1121d8faad55e622cd39e1bc10f1d2139f54daa58346542c162cf6
-EBUILD shotwell-0.27.1.ebuild 1490 BLAKE2B 47029b46edd6f386842b82cf28aef5a75790a8bb9f9ce5f0437897c8e1933571013de8f82aaf97ea15076ec162b94b645c830fb55dd0f68b01d6e9b1fd030767 SHA512 c8f6fb632fb4b49aa60cbb5cbc572aaa191bbe047d434c6bd6b97a3bc9bd61540d7ab31fec1121d8faad55e622cd39e1bc10f1d2139f54daa58346542c162cf6
-EBUILD shotwell-0.27.2.ebuild 1490 BLAKE2B 47029b46edd6f386842b82cf28aef5a75790a8bb9f9ce5f0437897c8e1933571013de8f82aaf97ea15076ec162b94b645c830fb55dd0f68b01d6e9b1fd030767 SHA512 c8f6fb632fb4b49aa60cbb5cbc572aaa191bbe047d434c6bd6b97a3bc9bd61540d7ab31fec1121d8faad55e622cd39e1bc10f1d2139f54daa58346542c162cf6
-EBUILD shotwell-0.27.3.ebuild 1490 BLAKE2B b6ddc14476e5cccc9b2d023c4c263d7672fe0b6533f9816344be00b490d484eb01da730b1bd1635d1728a6a34dd80a5728ce6adcb8fcd7da8a6fa0776b2cac46 SHA512 4de0d6fc6c0f9a942248a49115ff1468f23f1e34714b23d7eebd44869cae5e42b7501587118e67017d703932d598a30d27325858e9989a1dd81c292dc05b095a
-EBUILD shotwell-0.27.4.ebuild 1490 BLAKE2B b6ddc14476e5cccc9b2d023c4c263d7672fe0b6533f9816344be00b490d484eb01da730b1bd1635d1728a6a34dd80a5728ce6adcb8fcd7da8a6fa0776b2cac46 SHA512 4de0d6fc6c0f9a942248a49115ff1468f23f1e34714b23d7eebd44869cae5e42b7501587118e67017d703932d598a30d27325858e9989a1dd81c292dc05b095a
 EBUILD shotwell-0.28.2.ebuild 1490 BLAKE2B b6ddc14476e5cccc9b2d023c4c263d7672fe0b6533f9816344be00b490d484eb01da730b1bd1635d1728a6a34dd80a5728ce6adcb8fcd7da8a6fa0776b2cac46 SHA512 4de0d6fc6c0f9a942248a49115ff1468f23f1e34714b23d7eebd44869cae5e42b7501587118e67017d703932d598a30d27325858e9989a1dd81c292dc05b095a
+EBUILD shotwell-0.29.1.ebuild 1490 BLAKE2B b6ddc14476e5cccc9b2d023c4c263d7672fe0b6533f9816344be00b490d484eb01da730b1bd1635d1728a6a34dd80a5728ce6adcb8fcd7da8a6fa0776b2cac46 SHA512 4de0d6fc6c0f9a942248a49115ff1468f23f1e34714b23d7eebd44869cae5e42b7501587118e67017d703932d598a30d27325858e9989a1dd81c292dc05b095a
 MISC metadata.xml 900 BLAKE2B 62d1bd65c242a5da435f9217c538250495879be4d0b2de3477111018ed456f019abeb0bf678835997ff2c567fdbb844ca257d0c4bad8d07c3ad590adc82202cf SHA512 aab4bb7556cb7fc926b59e68d16a2425af57cab5ae80c68ce2dd650bf49b9e3872771fee51552aa0aba9c50167a33b1976700f65bbc1531de44ac638cdd4a0be
diff --git a/media-gfx/shotwell/shotwell-0.24.6.ebuild b/media-gfx/shotwell/shotwell-0.24.6.ebuild
deleted file mode 100644
index 46c72d688c80..000000000000
--- a/media-gfx/shotwell/shotwell-0.24.6.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-VALA_MIN_API_VERSION="0.28"
-
-inherit gnome2 multilib toolchain-funcs vala versionator
-
-MY_PV=$(get_version_component_range 1-2)
-DESCRIPTION="Open source photo manager for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Shotwell"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-db/sqlite-3.5.9:3
-	>=dev-libs/glib-2.30.0:2
-	>=dev-libs/json-glib-0.7.6
-	>=dev-libs/libgee-0.8.5:0.8
-	>=dev-libs/libxml2-2.6.32:2
-	gnome-base/dconf
-	>=media-libs/gexiv2-0.4.90
-	media-libs/gst-plugins-base:1.0
-	media-libs/gst-plugins-good:1.0
-	media-libs/gstreamer:1.0
-	media-libs/lcms:2
-	>=media-libs/libexif-0.6.16:=
-	>=media-libs/libgphoto2-2.5:=
-	>=media-libs/libraw-0.13.2:=
-	media-plugins/gst-plugins-gdkpixbuf:1.0
-	>=net-libs/libsoup-2.26.0:2.4
-	net-libs/webkit-gtk:4
-	virtual/libgudev:=[introspection]
-	>=x11-libs/gtk+-3.12.2:3[X]
-"
-DEPEND="${RDEPEND}
-	$(vala_depend)
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.7
-	>=sys-devel/m4-1.4.13
-	virtual/pkgconfig
-"
-
-# This probably comes from libraries that
-# shotwell-video-thumbnailer links to.
-# Nothing we can do at the moment. #435048
-QA_FLAGS_IGNORED="/usr/libexec/${PN}/${PN}-video-thumbnailer"
-
-src_prepare() {
-	vala_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure --disable-static
-}
diff --git a/media-gfx/shotwell/shotwell-0.25.0.1.ebuild b/media-gfx/shotwell/shotwell-0.25.0.1.ebuild
deleted file mode 100644
index c3827990765f..000000000000
--- a/media-gfx/shotwell/shotwell-0.25.0.1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-VALA_MIN_API_VERSION="0.28"
-
-inherit gnome2 multilib toolchain-funcs vala versionator
-
-MY_PV=$(get_version_component_range 1-2)
-DESCRIPTION="Open source photo manager for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Shotwell"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-RDEPEND="
-	>=app-crypt/gcr-3[gtk]
-	>=dev-db/sqlite-3.5.9:3
-	>=dev-libs/glib-2.40.0:2
-	>=dev-libs/json-glib-0.7.6
-	>=dev-libs/libgee-0.8.5:0.8
-	>=dev-libs/libxml2-2.6.32:2
-	gnome-base/dconf
-	>=media-libs/gexiv2-0.10.4
-	media-libs/gst-plugins-base:1.0
-	media-libs/gst-plugins-good:1.0
-	media-libs/gstreamer:1.0
-	media-libs/lcms:2
-	>=media-libs/libexif-0.6.16:=
-	>=media-libs/libgphoto2-2.5:=
-	>=media-libs/libraw-0.13.2:=
-	media-plugins/gst-plugins-gdkpixbuf:1.0
-	>=net-libs/libsoup-2.42.0:2.4
-	net-libs/webkit-gtk:4
-	virtual/libgudev:=[introspection]
-	>=x11-libs/gtk+-3.14.0:3[X]
-
-"
-DEPEND="${RDEPEND}
-	$(vala_depend)
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.7
-	>=sys-devel/m4-1.4.13
-	virtual/pkgconfig
-"
-
-# This probably comes from libraries that
-# shotwell-video-thumbnailer links to.
-# Nothing we can do at the moment. #435048
-QA_FLAGS_IGNORED="/usr/libexec/${PN}/${PN}-video-thumbnailer"
-
-src_prepare() {
-	vala_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure --disable-static
-}
diff --git a/media-gfx/shotwell/shotwell-0.26.0.ebuild b/media-gfx/shotwell/shotwell-0.26.0.ebuild
deleted file mode 100644
index 5d5a82fa7382..000000000000
--- a/media-gfx/shotwell/shotwell-0.26.0.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-VALA_MIN_API_VERSION="0.28"
-
-inherit gnome2 multilib toolchain-funcs vala versionator
-
-MY_PV=$(get_version_component_range 1-2)
-DESCRIPTION="Open source photo manager for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Shotwell"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-RDEPEND="
-	>=app-crypt/gcr-3[gtk]
-	>=dev-db/sqlite-3.5.9:3
-	>=dev-libs/glib-2.40.0:2
-	>=dev-libs/json-glib-0.7.6
-	>=dev-libs/libgee-0.8.5:0.8
-	>=dev-libs/libxml2-2.6.32:2
-	gnome-base/dconf
-	>=media-libs/gexiv2-0.10.4
-	media-libs/gst-plugins-base:1.0
-	media-libs/gst-plugins-good:1.0
-	media-libs/gstreamer:1.0
-	media-libs/lcms:2
-	>=media-libs/libexif-0.6.16:=
-	>=media-libs/libgphoto2-2.5:=
-	>=media-libs/libraw-0.13.2:=
-	media-plugins/gst-plugins-gdkpixbuf:1.0
-	>=net-libs/libsoup-2.42.0:2.4
-	net-libs/webkit-gtk:4
-	virtual/libgudev:=[introspection]
-	>=x11-libs/gtk+-3.14.0:3[X]
-
-"
-DEPEND="${RDEPEND}
-	$(vala_depend)
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.7
-	>=sys-devel/m4-1.4.13
-	virtual/pkgconfig
-"
-
-# This probably comes from libraries that
-# shotwell-video-thumbnailer links to.
-# Nothing we can do at the moment. #435048
-QA_FLAGS_IGNORED="/usr/libexec/${PN}/${PN}-video-thumbnailer"
-
-src_prepare() {
-	vala_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure --disable-static
-}
diff --git a/media-gfx/shotwell/shotwell-0.26.1.ebuild b/media-gfx/shotwell/shotwell-0.26.1.ebuild
deleted file mode 100644
index 5d5a82fa7382..000000000000
--- a/media-gfx/shotwell/shotwell-0.26.1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-VALA_MIN_API_VERSION="0.28"
-
-inherit gnome2 multilib toolchain-funcs vala versionator
-
-MY_PV=$(get_version_component_range 1-2)
-DESCRIPTION="Open source photo manager for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Shotwell"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-RDEPEND="
-	>=app-crypt/gcr-3[gtk]
-	>=dev-db/sqlite-3.5.9:3
-	>=dev-libs/glib-2.40.0:2
-	>=dev-libs/json-glib-0.7.6
-	>=dev-libs/libgee-0.8.5:0.8
-	>=dev-libs/libxml2-2.6.32:2
-	gnome-base/dconf
-	>=media-libs/gexiv2-0.10.4
-	media-libs/gst-plugins-base:1.0
-	media-libs/gst-plugins-good:1.0
-	media-libs/gstreamer:1.0
-	media-libs/lcms:2
-	>=media-libs/libexif-0.6.16:=
-	>=media-libs/libgphoto2-2.5:=
-	>=media-libs/libraw-0.13.2:=
-	media-plugins/gst-plugins-gdkpixbuf:1.0
-	>=net-libs/libsoup-2.42.0:2.4
-	net-libs/webkit-gtk:4
-	virtual/libgudev:=[introspection]
-	>=x11-libs/gtk+-3.14.0:3[X]
-
-"
-DEPEND="${RDEPEND}
-	$(vala_depend)
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.7
-	>=sys-devel/m4-1.4.13
-	virtual/pkgconfig
-"
-
-# This probably comes from libraries that
-# shotwell-video-thumbnailer links to.
-# Nothing we can do at the moment. #435048
-QA_FLAGS_IGNORED="/usr/libexec/${PN}/${PN}-video-thumbnailer"
-
-src_prepare() {
-	vala_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure --disable-static
-}
diff --git a/media-gfx/shotwell/shotwell-0.26.2.ebuild b/media-gfx/shotwell/shotwell-0.26.2.ebuild
deleted file mode 100644
index 0cafa2080fcf..000000000000
--- a/media-gfx/shotwell/shotwell-0.26.2.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-VALA_MIN_API_VERSION="0.28"
-
-inherit gnome2 multilib toolchain-funcs vala versionator
-
-MY_PV=$(get_version_component_range 1-2)
-DESCRIPTION="Open source photo manager for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Shotwell"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-RDEPEND="
-	>=app-crypt/gcr-3[gtk]
-	>=dev-db/sqlite-3.5.9:3
-	>=dev-libs/glib-2.40.0:2
-	>=dev-libs/json-glib-0.7.6
-	>=dev-libs/libgee-0.8.5:0.8
-	>=dev-libs/libxml2-2.6.32:2
-	gnome-base/dconf
-	>=media-libs/gexiv2-0.10.4
-	media-libs/gst-plugins-base:1.0
-	media-libs/gst-plugins-good:1.0
-	media-libs/gstreamer:1.0
-	media-libs/lcms:2
-	>=media-libs/libexif-0.6.16:=
-	>=media-libs/libgphoto2-2.5:=
-	>=media-libs/libraw-0.13.2:=
-	media-plugins/gst-plugins-gdkpixbuf:1.0
-	>=net-libs/libsoup-2.42.0:2.4
-	net-libs/webkit-gtk:4
-	virtual/libgudev:=[introspection]
-	>=x11-libs/gtk+-3.14.0:3[X]
-	dev-libs/libgdata
-
-"
-DEPEND="${RDEPEND}
-	$(vala_depend)
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.7
-	>=sys-devel/m4-1.4.13
-	virtual/pkgconfig
-"
-
-# This probably comes from libraries that
-# shotwell-video-thumbnailer links to.
-# Nothing we can do at the moment. #435048
-QA_FLAGS_IGNORED="/usr/libexec/${PN}/${PN}-video-thumbnailer"
-
-src_prepare() {
-	vala_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure --disable-static
-}
diff --git a/media-gfx/shotwell/shotwell-0.26.3.ebuild b/media-gfx/shotwell/shotwell-0.26.3.ebuild
deleted file mode 100644
index 0cafa2080fcf..000000000000
--- a/media-gfx/shotwell/shotwell-0.26.3.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-VALA_MIN_API_VERSION="0.28"
-
-inherit gnome2 multilib toolchain-funcs vala versionator
-
-MY_PV=$(get_version_component_range 1-2)
-DESCRIPTION="Open source photo manager for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Shotwell"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-RDEPEND="
-	>=app-crypt/gcr-3[gtk]
-	>=dev-db/sqlite-3.5.9:3
-	>=dev-libs/glib-2.40.0:2
-	>=dev-libs/json-glib-0.7.6
-	>=dev-libs/libgee-0.8.5:0.8
-	>=dev-libs/libxml2-2.6.32:2
-	gnome-base/dconf
-	>=media-libs/gexiv2-0.10.4
-	media-libs/gst-plugins-base:1.0
-	media-libs/gst-plugins-good:1.0
-	media-libs/gstreamer:1.0
-	media-libs/lcms:2
-	>=media-libs/libexif-0.6.16:=
-	>=media-libs/libgphoto2-2.5:=
-	>=media-libs/libraw-0.13.2:=
-	media-plugins/gst-plugins-gdkpixbuf:1.0
-	>=net-libs/libsoup-2.42.0:2.4
-	net-libs/webkit-gtk:4
-	virtual/libgudev:=[introspection]
-	>=x11-libs/gtk+-3.14.0:3[X]
-	dev-libs/libgdata
-
-"
-DEPEND="${RDEPEND}
-	$(vala_depend)
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.7
-	>=sys-devel/m4-1.4.13
-	virtual/pkgconfig
-"
-
-# This probably comes from libraries that
-# shotwell-video-thumbnailer links to.
-# Nothing we can do at the moment. #435048
-QA_FLAGS_IGNORED="/usr/libexec/${PN}/${PN}-video-thumbnailer"
-
-src_prepare() {
-	vala_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure --disable-static
-}
diff --git a/media-gfx/shotwell/shotwell-0.27.0.ebuild b/media-gfx/shotwell/shotwell-0.27.0.ebuild
deleted file mode 100644
index 0cafa2080fcf..000000000000
--- a/media-gfx/shotwell/shotwell-0.27.0.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-VALA_MIN_API_VERSION="0.28"
-
-inherit gnome2 multilib toolchain-funcs vala versionator
-
-MY_PV=$(get_version_component_range 1-2)
-DESCRIPTION="Open source photo manager for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Shotwell"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-RDEPEND="
-	>=app-crypt/gcr-3[gtk]
-	>=dev-db/sqlite-3.5.9:3
-	>=dev-libs/glib-2.40.0:2
-	>=dev-libs/json-glib-0.7.6
-	>=dev-libs/libgee-0.8.5:0.8
-	>=dev-libs/libxml2-2.6.32:2
-	gnome-base/dconf
-	>=media-libs/gexiv2-0.10.4
-	media-libs/gst-plugins-base:1.0
-	media-libs/gst-plugins-good:1.0
-	media-libs/gstreamer:1.0
-	media-libs/lcms:2
-	>=media-libs/libexif-0.6.16:=
-	>=media-libs/libgphoto2-2.5:=
-	>=media-libs/libraw-0.13.2:=
-	media-plugins/gst-plugins-gdkpixbuf:1.0
-	>=net-libs/libsoup-2.42.0:2.4
-	net-libs/webkit-gtk:4
-	virtual/libgudev:=[introspection]
-	>=x11-libs/gtk+-3.14.0:3[X]
-	dev-libs/libgdata
-
-"
-DEPEND="${RDEPEND}
-	$(vala_depend)
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.7
-	>=sys-devel/m4-1.4.13
-	virtual/pkgconfig
-"
-
-# This probably comes from libraries that
-# shotwell-video-thumbnailer links to.
-# Nothing we can do at the moment. #435048
-QA_FLAGS_IGNORED="/usr/libexec/${PN}/${PN}-video-thumbnailer"
-
-src_prepare() {
-	vala_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure --disable-static
-}
diff --git a/media-gfx/shotwell/shotwell-0.27.1.ebuild b/media-gfx/shotwell/shotwell-0.27.1.ebuild
deleted file mode 100644
index 0cafa2080fcf..000000000000
--- a/media-gfx/shotwell/shotwell-0.27.1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-VALA_MIN_API_VERSION="0.28"
-
-inherit gnome2 multilib toolchain-funcs vala versionator
-
-MY_PV=$(get_version_component_range 1-2)
-DESCRIPTION="Open source photo manager for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Shotwell"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-RDEPEND="
-	>=app-crypt/gcr-3[gtk]
-	>=dev-db/sqlite-3.5.9:3
-	>=dev-libs/glib-2.40.0:2
-	>=dev-libs/json-glib-0.7.6
-	>=dev-libs/libgee-0.8.5:0.8
-	>=dev-libs/libxml2-2.6.32:2
-	gnome-base/dconf
-	>=media-libs/gexiv2-0.10.4
-	media-libs/gst-plugins-base:1.0
-	media-libs/gst-plugins-good:1.0
-	media-libs/gstreamer:1.0
-	media-libs/lcms:2
-	>=media-libs/libexif-0.6.16:=
-	>=media-libs/libgphoto2-2.5:=
-	>=media-libs/libraw-0.13.2:=
-	media-plugins/gst-plugins-gdkpixbuf:1.0
-	>=net-libs/libsoup-2.42.0:2.4
-	net-libs/webkit-gtk:4
-	virtual/libgudev:=[introspection]
-	>=x11-libs/gtk+-3.14.0:3[X]
-	dev-libs/libgdata
-
-"
-DEPEND="${RDEPEND}
-	$(vala_depend)
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.7
-	>=sys-devel/m4-1.4.13
-	virtual/pkgconfig
-"
-
-# This probably comes from libraries that
-# shotwell-video-thumbnailer links to.
-# Nothing we can do at the moment. #435048
-QA_FLAGS_IGNORED="/usr/libexec/${PN}/${PN}-video-thumbnailer"
-
-src_prepare() {
-	vala_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure --disable-static
-}
diff --git a/media-gfx/shotwell/shotwell-0.27.2.ebuild b/media-gfx/shotwell/shotwell-0.27.2.ebuild
deleted file mode 100644
index 0cafa2080fcf..000000000000
--- a/media-gfx/shotwell/shotwell-0.27.2.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-VALA_MIN_API_VERSION="0.28"
-
-inherit gnome2 multilib toolchain-funcs vala versionator
-
-MY_PV=$(get_version_component_range 1-2)
-DESCRIPTION="Open source photo manager for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Shotwell"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-RDEPEND="
-	>=app-crypt/gcr-3[gtk]
-	>=dev-db/sqlite-3.5.9:3
-	>=dev-libs/glib-2.40.0:2
-	>=dev-libs/json-glib-0.7.6
-	>=dev-libs/libgee-0.8.5:0.8
-	>=dev-libs/libxml2-2.6.32:2
-	gnome-base/dconf
-	>=media-libs/gexiv2-0.10.4
-	media-libs/gst-plugins-base:1.0
-	media-libs/gst-plugins-good:1.0
-	media-libs/gstreamer:1.0
-	media-libs/lcms:2
-	>=media-libs/libexif-0.6.16:=
-	>=media-libs/libgphoto2-2.5:=
-	>=media-libs/libraw-0.13.2:=
-	media-plugins/gst-plugins-gdkpixbuf:1.0
-	>=net-libs/libsoup-2.42.0:2.4
-	net-libs/webkit-gtk:4
-	virtual/libgudev:=[introspection]
-	>=x11-libs/gtk+-3.14.0:3[X]
-	dev-libs/libgdata
-
-"
-DEPEND="${RDEPEND}
-	$(vala_depend)
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.7
-	>=sys-devel/m4-1.4.13
-	virtual/pkgconfig
-"
-
-# This probably comes from libraries that
-# shotwell-video-thumbnailer links to.
-# Nothing we can do at the moment. #435048
-QA_FLAGS_IGNORED="/usr/libexec/${PN}/${PN}-video-thumbnailer"
-
-src_prepare() {
-	vala_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure --disable-static
-}
diff --git a/media-gfx/shotwell/shotwell-0.27.4.ebuild b/media-gfx/shotwell/shotwell-0.27.4.ebuild
deleted file mode 100644
index ed1f73414218..000000000000
--- a/media-gfx/shotwell/shotwell-0.27.4.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-VALA_MIN_API_VERSION="0.28"
-
-inherit gnome2 multilib toolchain-funcs vala versionator
-
-MY_PV=$(get_version_component_range 1-2)
-DESCRIPTION="Open source photo manager for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Shotwell"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-RDEPEND="
-	>=app-crypt/gcr-3[gtk]
-	>=dev-db/sqlite-3.5.9:3
-	>=dev-libs/glib-2.40.0:2
-	>=dev-libs/json-glib-0.7.6
-	>=dev-libs/libgee-0.8.5:0.8
-	>=dev-libs/libxml2-2.6.32:2
-	gnome-base/dconf
-	>=media-libs/gexiv2-0.10.4
-	media-libs/gst-plugins-base:1.0
-	media-libs/gst-plugins-good:1.0
-	media-libs/gstreamer:1.0
-	media-libs/lcms:2
-	>=media-libs/libexif-0.6.16:=
-	>=media-libs/libgphoto2-2.5:=
-	>=media-libs/libraw-0.13.2:=
-	media-plugins/gst-plugins-gdkpixbuf:1.0
-	>=net-libs/libsoup-2.42.0:2.4
-	net-libs/webkit-gtk:4
-	virtual/libgudev:=[introspection]
-	>=x11-libs/gtk+-3.14.0:3[X]
-	dev-libs/libgdata
-
-"
-DEPEND="${RDEPEND}
-	$(vala_depend)
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.7
-	>=sys-devel/m4-1.4.13
-	virtual/pkgconfig
-"
-
-# This probably comes from libraries that
-# shotwell-video-thumbnailer links to.
-# Nothing we can do at the moment. #435048
-QA_FLAGS_IGNORED="/usr/libexec/${PN}/${PN}-video-thumbnailer"
-
-src_prepare() {
-	vala_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure --disable-static
-}
diff --git a/media-gfx/shotwell/shotwell-0.27.3.ebuild b/media-gfx/shotwell/shotwell-0.29.1.ebuild
index ed1f73414218..ed1f73414218 100644
--- a/media-gfx/shotwell/shotwell-0.27.3.ebuild
+++ b/media-gfx/shotwell/shotwell-0.29.1.ebuild
diff --git a/media-gfx/tgif/Manifest b/media-gfx/tgif/Manifest
index 4285b54dce12..72fe5d03f685 100644
--- a/media-gfx/tgif/Manifest
+++ b/media-gfx/tgif/Manifest
@@ -1,4 +1,4 @@
 AUX tgif-4.2.5-wformat-security.patch 19741 BLAKE2B 53633a5012d4f49bb42654c8237c4bee08fcac5525a69b0967f3fb2a7bdfe58d6a402f74d2af5505d876e9acfa1b3014ac1e7261b00f027b0e5b15c609ada0a8 SHA512 881ef034698a0e632c257a185346cb22218b93f8668fabf0169cb1a6c59ce0ad7a81ab5e4093610a3cbd360304a007067862d672622bed7a852db93f584d3d7f
 DIST tgif-QPL-4.2.5.tar.gz 3093619 BLAKE2B 8d858c357a7c51185ee22f0e2005bd4a7c96270c701bf603fd7e6bea012794892e460d5e9dfbfdbbc17a3e6accb5f4afbc3baadc4e3315e6dd5b4e676f1ce5bf SHA512 7b007620190883e30216407bf31c4142493bbd270b4babc282994dec37d221d79f0b1cadc9efda9bc337eb323254e69beee2d4c4873877e7321df41922f456ef
-EBUILD tgif-4.2.5-r1.ebuild 945 BLAKE2B b9a8069b1158a53b283a1f306df5aee1f222c7c182e29006c5c1671a413652433d693bc6291a042add660b662abc12bc86af50c6cff490a465e20c031cf6f010 SHA512 9b94d68ced37a2da3feb29c8ab4ce3fe920f7e947bbc83c87c768c84a1b63645f8a25c700ce6c762b5ca803655095365d8cbcb212e83d148fadf53eeea0c9bc3
+EBUILD tgif-4.2.5-r2.ebuild 927 BLAKE2B fe4620932281b8aaf0c52b9118f3d5f6c38d7edd7f3f1045c378bade1a8502c12d7e7bb17d5ed18aab9e79ae985eca9f5b118363f7f3db1cd1d28041f56ef744 SHA512 1841f0523c6ce1fa3a2a100f6408a2605a09f8fc34c4eb458b348a0c2d64901c14e5a5eaf344a57b70ba8b3f5893000295b8d7f3f6cfb800a29c7ce8f583dc90
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/media-gfx/tgif/tgif-4.2.5-r1.ebuild b/media-gfx/tgif/tgif-4.2.5-r2.ebuild
index f73da72be336..e65052ca1907 100644
--- a/media-gfx/tgif/tgif-4.2.5-r1.ebuild
+++ b/media-gfx/tgif/tgif-4.2.5-r2.ebuild
@@ -22,8 +22,7 @@ DEPEND="sys-libs/zlib
 	x11-libs/libX11
 	x11-libs/libXext
 	x11-libs/libXmu
-	x11-libs/libXt
-	x11-proto/xproto"
+	x11-libs/libXt"
 RDEPEND="${DEPEND}
 	media-libs/netpbm"
author	V3n3RiX <venerix@redcorelinux.org>	2018-04-28 20:02:04 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2018-04-28 20:02:04 +0100
commit	a4e2a46beb5e4858ef27bdedbb0ff6d2ced430ad (patch)
tree	852c90a4bf354c30ea66504f70bfab5401fba18d /media-gfx
parent	5e8702bcbbed438e6c6cce023e7ef0cc9baa3e02 (diff)