gentoo resync 04.02.2018

25 files changed, 235 insertions, 309 deletions

diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 5496406b67d0..7ddb80283a41 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/eog/Manifest b/media-gfx/eog/Manifest
index 0fecd1b1423e..2477f3ddbb43 100644
--- a/media-gfx/eog/Manifest
+++ b/media-gfx/eog/Manifest
@@ -1,5 +1,3 @@
-DIST eog-3.20.5.tar.xz 4622880 BLAKE2B c70e9bd8c93b3443910803b6c65d49ac3e4cc67767cc7cf1632034294ecb3be5a983c8fa58583d3438cd894dbe2132c5794cbfb2d47f51c0c3c0732a8e0e3bb2 SHA512 b4256cfe5f42921efd58d7ce09fa2a82d0328e1fe4cd94e953cc161c23b5079d05b89106ec78c670079d0b6ff0f31eeff25d67c259a600dbb4a0afe25b5d93a1
 DIST eog-3.24.1.tar.xz 4632496 BLAKE2B 24d6957285d5dae7fa2299165b1bac236e75dfa77938132c1d3f8f7312ed4a07d5d3a770fdbdbcf5ee1966a43b4443d331fbedec47575836e2170fa3022e657f SHA512 c007b6f2cd2b59747db72a5b86ecb34ac87fe0910a2d33df466eb05ebe5ff638fb9e57b15f2ea9328c95037334a2fd9010895241ff285628b7ed7b6d65912fb0
-EBUILD eog-3.20.5.ebuild 1344 BLAKE2B 30b10f0b5059ec6c6d5a6f13b53cf9ab6b9cb116ff7507ad5d5aef71cd7cd70827ea29c14043abedbec9e858fcd62722e6326894158d9cbdb3fdea591a1931fe SHA512 78730d2cc6f2edfff39ec0b1ad20acaedd9e0b01f4da4834f6ce554570e716af4e8e184f13432ded774dad0e654e2710e59a2d91e4a784d1edb4f429dad80552
 EBUILD eog-3.24.1.ebuild 1343 BLAKE2B 63fa0d9614a37e9f3d40b2de61560a7642df4b14bb8196ff6de563b6afb5d0195f0832c27d41516659efbacadc977876b2ec09d736434d3026ddee8d913da0c2 SHA512 460f0f6c1e435cd970b0a67197d1885137c69d673eecd0e00dd5e7f9ebb8d52b2d22771b234786d3c31d175fcc24aad72314d0f0b14b11eea921b814fc725c50
 MISC metadata.xml 481 BLAKE2B 2c12b594b9a5b1e4ce3983131d1911f62026c5186d8f5c5af13842cfedfa4d20abdc5ee82e11db3a2e1b45e2b8d4d95fa1a62e668936956e8453b166daff00b4 SHA512 141ec1d6923697f744de806804279b602120ce3d5494257de36b8c8b71185d101692f2e438d7ba0e4a4c946d0aaba068117f16c8344abe891e0ddd4f768ded26
diff --git a/media-gfx/eog/eog-3.20.5.ebuild b/media-gfx/eog/eog-3.20.5.ebuild
deleted file mode 100644
index 24b66cdb2308..000000000000
--- a/media-gfx/eog/eog-3.20.5.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2
-
-DESCRIPTION="The Eye of GNOME image viewer"
-HOMEPAGE="https://wiki.gnome.org/Apps/EyeOfGnome"
-
-LICENSE="GPL-2+"
-SLOT="1"
-
-IUSE="debug +exif +introspection +jpeg lcms +svg tiff xmp"
-REQUIRED_USE="exif? ( jpeg )"
-
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
-
-RDEPEND="
-	>=dev-libs/glib-2.42.0:2[dbus]
-	>=dev-libs/libpeas-0.7.4:=[gtk]
-	>=gnome-base/gnome-desktop-2.91.2:3=
-	>=gnome-base/gsettings-desktop-schemas-2.91.92
-	>=x11-libs/gtk+-3.19.11:3[introspection,X]
-	>=x11-misc/shared-mime-info-0.20
-
-	>=x11-libs/gdk-pixbuf-2.30.0:2[jpeg?,tiff?]
-	x11-libs/libX11
-
-	exif? ( >=media-libs/libexif-0.6.14 )
-	introspection? ( >=dev-libs/gobject-introspection-0.9.3:= )
-	jpeg? ( virtual/jpeg:0 )
-	lcms? ( media-libs/lcms:2 )
-	svg? ( >=gnome-base/librsvg-2.36.2:2 )
-	xmp? ( media-libs/exempi:2 )
-"
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1.16
-	>=dev-util/intltool-0.50.1
-	dev-util/itstool
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_configure() {
-	gnome2_src_configure \
-		$(usex debug --enable-debug=yes ' ') \
-		$(use_enable introspection) \
-		$(use_with jpeg libjpeg) \
-		$(use_with exif libexif) \
-		$(use_with lcms cms) \
-		$(use_with xmp) \
-		$(use_with svg librsvg)
-}
diff --git a/media-gfx/feh/Manifest b/media-gfx/feh/Manifest
index a04984ecc653..3aff301b0e62 100644
--- a/media-gfx/feh/Manifest
+++ b/media-gfx/feh/Manifest
@@ -5,6 +5,7 @@ DIST feh-2.20.tar.bz2 2129466 BLAKE2B 4b0ff29b8c5859f18f01337409290e85f46dd7f924
 DIST feh-2.21.tar.bz2 2129718 BLAKE2B 6d0e60ba5f51aef6dec6df59ce3cff24f9947e2359e839f8f3c49dadc51ee6dae15db8fbfd60e63a0bdf6df4482f88c8b3bb4d5a8a37725ca0b07030251eb1ac SHA512 f869d6588976973fca55714829478293bbd89fe03c7575c48847d23caec09353dc54eddf6fa41dc7f560c92eaee49ee23008258d72f4d55a49a5166625560a43
 DIST feh-2.22.2.tar.bz2 2129840 BLAKE2B a770c535746f7e9c2163cedc1a540c7a2c691c94d6ac77f70e4054aff42eef2d45bf870cdbcf7997872fb399e5b0e0d9e74971a872ae6714521c7f59e72a5ed2 SHA512 85c5f779fecb2be7457fed0675f25860ed4f41db9ecd1fdb8d4b1e553a7a337d5af243aafbd3fae4ac42fc943d207a264756d92cd15c62e95cec1f28fde46219
 DIST feh-2.22.tar.bz2 2129914 BLAKE2B 592b26a4874bbaebe4826b53c6957ee25a95baca19da3ddeeafba81627538d53dcfbe9f54c932e1319fc9160680caf599e965976e733a7d07fa0dc0bd046ba3a SHA512 403b1e760e2b3e177768b47de5bb7bd45c11152f04a21f6788afcaec12357a085f7c9944000f78a8df41a3d60a67985622d36effd543216153ab04e539b5b85f
+DIST feh-2.23.1.tar.bz2 2130373 BLAKE2B 5233cfbad018b9fd07a983d1956683ffc188ffe57e27123f82e8ea74cb9ff2df674b2178ba298b898913d0c6f902fc5c520460f4f333f9ac5b1f089f11fcd271 SHA512 dda2fa0905dab9ea8d607224d75bda008638da35c5ee181f4b37ccbc9a76cd65269d5ab052fff77628afd7b8041654362f47ec5e8db569677cdbb19b87745614
 DIST feh-2.23.tar.bz2 2130344 BLAKE2B 730670fa38b909c26412b24d076732c9f8ec0a91c52e836dfd9a764fed35489085537073ece869e664cd8baeb1ee2fff47cc0bc69a6138e641b0a6a2be57331c SHA512 4b75f0053c3a4b1fb51251536896fd48470117ca3d59de1ac5a87f8071f37f886542e7d82730eec4579a1ebf507e4bc8a00fc45cf1364d2445b1aa82c5664ee7
 EBUILD feh-2.18.3.ebuild 1191 BLAKE2B 65a725d14fe77144ff3cc9c545e46b3a7a8df4ec71c981422a8029f9e7f61a83629a11ce687fc0d98045e935521dd59677be43b8649231c16008c11ca604028c SHA512 cfdb2067a02a31747129abe3833a2999c15e02abbabb7a389380b6351f0d87aaa0b74b29e4253a33dcf12ede43f8964fb5b099a80c438cbe7523e91de45b172a
 EBUILD feh-2.19.3.ebuild 1195 BLAKE2B 0b9713a7b41ecc2e96b520c22daabcd8504d8246183386c94e5061119dfa1613754f03824a0b2ffe9ebb0ee28765fdfc55ca8ee1601038783dafe0c25bfbf015 SHA512 000e9e481940fe89f2346d63d75bf229e642fb0e517a0c27e93e7fec47807c2b554fff3088b3ff7a1a62902d6e9d99aad69069b8e7d44bf36586780b5f2ce149
@@ -12,5 +13,6 @@ EBUILD feh-2.20.ebuild 1195 BLAKE2B 0b9713a7b41ecc2e96b520c22daabcd8504d82461833
 EBUILD feh-2.21.ebuild 1195 BLAKE2B 0b9713a7b41ecc2e96b520c22daabcd8504d8246183386c94e5061119dfa1613754f03824a0b2ffe9ebb0ee28765fdfc55ca8ee1601038783dafe0c25bfbf015 SHA512 000e9e481940fe89f2346d63d75bf229e642fb0e517a0c27e93e7fec47807c2b554fff3088b3ff7a1a62902d6e9d99aad69069b8e7d44bf36586780b5f2ce149
 EBUILD feh-2.22.2.ebuild 1195 BLAKE2B 0b9713a7b41ecc2e96b520c22daabcd8504d8246183386c94e5061119dfa1613754f03824a0b2ffe9ebb0ee28765fdfc55ca8ee1601038783dafe0c25bfbf015 SHA512 000e9e481940fe89f2346d63d75bf229e642fb0e517a0c27e93e7fec47807c2b554fff3088b3ff7a1a62902d6e9d99aad69069b8e7d44bf36586780b5f2ce149
 EBUILD feh-2.22.ebuild 1195 BLAKE2B 0b9713a7b41ecc2e96b520c22daabcd8504d8246183386c94e5061119dfa1613754f03824a0b2ffe9ebb0ee28765fdfc55ca8ee1601038783dafe0c25bfbf015 SHA512 000e9e481940fe89f2346d63d75bf229e642fb0e517a0c27e93e7fec47807c2b554fff3088b3ff7a1a62902d6e9d99aad69069b8e7d44bf36586780b5f2ce149
+EBUILD feh-2.23.1.ebuild 1195 BLAKE2B 538e485f0814564a45e6af555ae6b0437ec3ab5c03b28b393eadad8a3af5fea0b18ba81e7576a34680db9a99a56d43a44a2e936b55e95730350da3bc99c5c4cd SHA512 2919509a7c8ca99f4d0fbdcdbeb817a01877b07b0352f1a336b6e2c53932d0aa037a3eedf154ba1850d02fa3cf14ad7bfcaf59a4590ef888839dd5b28136e0cc
 EBUILD feh-2.23.ebuild 1195 BLAKE2B 0b9713a7b41ecc2e96b520c22daabcd8504d8246183386c94e5061119dfa1613754f03824a0b2ffe9ebb0ee28765fdfc55ca8ee1601038783dafe0c25bfbf015 SHA512 000e9e481940fe89f2346d63d75bf229e642fb0e517a0c27e93e7fec47807c2b554fff3088b3ff7a1a62902d6e9d99aad69069b8e7d44bf36586780b5f2ce149
 MISC metadata.xml 465 BLAKE2B 8f1b9aeb152fc8941e9cf72cf562b46d4b7b93677713b99cc7ba01cffba527cfc818e5b0dfb8d5d3878dd31f2488277036f876c01d2d85a5422b285275819eb3 SHA512 7156b24a140c6b586af743cc670b588eaba3c255fd356f689c26c737195ebcb9d36bcf7cc6291c668d8ae6a4da3d4914a0830d80d86e3831e966bc38708607c8
diff --git a/media-gfx/feh/feh-2.23.1.ebuild b/media-gfx/feh/feh-2.23.1.ebuild
new file mode 100644
index 000000000000..97faff3af810
--- /dev/null
+++ b/media-gfx/feh/feh-2.23.1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit toolchain-funcs
+
+DESCRIPTION="A fast, lightweight imageviewer using imlib2"
+HOMEPAGE="https://feh.finalrewind.org/"
+SRC_URI="https://feh.finalrewind.org/${P}.tar.bz2"
+
+LICENSE="feh"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
+IUSE="debug curl exif test xinerama"
+
+COMMON_DEPEND="media-libs/imlib2[X]
+	>=media-libs/libpng-1.2:0=
+	x11-libs/libX11
+	curl? ( net-misc/curl )
+	exif? ( media-libs/libexif )
+	xinerama? ( x11-libs/libXinerama )"
+RDEPEND="${COMMON_DEPEND}
+	virtual/jpeg:0"
+DEPEND="${COMMON_DEPEND}
+	x11-libs/libXt
+	x11-proto/xproto
+	test? (
+		>=dev-lang/perl-5.10
+		dev-perl/Test-Command
+	)"
+
+PATCHES=( "${FILESDIR}"/${PN}-2.6.2-debug-cflags.patch )
+
+pkg_setup() {
+	use_feh() { usex $1 1 0; }
+
+	fehopts=(
+		DESTDIR="${D}"
+		PREFIX="${EPREFIX}"/usr
+		doc_dir='${main_dir}'/share/doc/${PF}
+		example_dir='${main_dir}'/share/doc/${PF}/examples
+		curl=$(use_feh curl)
+		debug=$(use_feh debug)
+		xinerama=$(use_feh xinerama)
+		exif=$(use_feh exif)
+	)
+}
+
+src_compile() {
+	tc-export CC
+	emake "${fehopts[@]}"
+}
+
+src_install() {
+	emake "${fehopts[@]}" install
+}
diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest
index 1e6a5a9476e6..3e111fffc196 100644
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -11,7 +11,7 @@ AUX gimp-2.8.22-cve-2017-17789.patch 1245 BLAKE2B 14d519b8b024e51b452806b4acb6f0
 AUX gimp-2.9.8-cve-2017-17784.patch 1087 BLAKE2B 2398e735ccd7b0a5cc393f297b60d4a51038aeb146779268f78fb2f0a24ef912468510de2a0f640c5f905fe9959581686f55bccc022633b6f2a3a93ab3f12848 SHA512 5bc928860b2f2b53cc72c9c3caf6a532cf7e61b02e0716ee99a5166a07b01bdd46edfeae7bf6e333ce14ca11b5fcb963cbd42005e02f914d909431bf201dc6d5
 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 5182 BLAKE2B 704517425aff464a288684914df254eeac81ea06c8ec5ef7919371b0a10572f8746acf1099e01734fc394e72bf9349899f7b496a431c8df3456aa3764e0ef375 SHA512 3f47849a5b72548b9e547fa4066603c607e10743463e84c06ac1e5735f8fc2d2779c775f98a193d7b3d1eaba937b47ee78707aba787cbee6d8954d8bbbf5d9c3
+EBUILD gimp-2.8.22-r1.ebuild 5181 BLAKE2B 3173e56c35d450f388da9330cc5bea95cbfa2adc26594f8e4c5f92c01b5e658c63b852fe4c52439cb110c42634e0bad37dc07e81f9105b4c50ece2efcdc0fcad SHA512 a4b7dd45bbe6e21179d08ed97a83b9a9e72e53534a8221b0c37195efd676950ffffbe4c78079209517a635cb3b05cacfe9d4fad43f71c4644f367ef47d963db3
 EBUILD gimp-2.8.22.ebuild 4739 BLAKE2B 1f9f5b643fa9c061a1b8bb982df80261c481b362ea7140f4f6921419fa6fa23487df7547976dfbdae9a61eed461199ed0059ab68ce6748f1169b637750638dd4 SHA512 6c6e4c124eb106a22d6a3149e190cb0e3acaad34948e46c3de6be581641667e5841e844f3f79ecd05d67706de5a96d33b098baf8ca9066040200288e3d627e9d
 EBUILD gimp-2.9.8-r1.ebuild 5766 BLAKE2B f526bca4ce58c5ee9e1e5f4015a0a7894c36357005294058163715f9b9ffc1d6eb0db0afcb2c2ff20c8ca488f99a80d8cc82cc31f744580df2e55b7e02820f65 SHA512 4c51668d0dcb82af5e4ef2811504fc744e5be32901c6a40abe706833a4cd5a1623019a8c1eac7fee682fd62c90f7eb879abed5558f6011769b698fb1bbdf8305
 EBUILD gimp-9999.ebuild 5375 BLAKE2B 1a33e0b4106e98872afaf1c664b72a8b88c813575121d1538fd63fa3b52b6915868f1b432d85e51cf0800bc12aff6adaa8ad84015015e25616ef325703faeace SHA512 b9c0c738acebae699385af18cfdfd9f200a616cb48e565b40768f96d5bbce80914a81a1066de5116ba750d46a2ad3c3b51dc04604dd8e3eaf77aab3084dfd2e5
diff --git a/media-gfx/gimp/gimp-2.8.22-r1.ebuild b/media-gfx/gimp/gimp-2.8.22-r1.ebuild
index a8ea175628a9..1a3fccc66aea 100644
--- a/media-gfx/gimp/gimp-2.8.22-r1.ebuild
+++ b/media-gfx/gimp/gimp-2.8.22-r1.ebuild
@@ -11,7 +11,7 @@ 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"
+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"
diff --git a/media-gfx/gnome-font-viewer/Manifest b/media-gfx/gnome-font-viewer/Manifest
index 55d267ebd0e9..e98f2e28fc2f 100644
--- a/media-gfx/gnome-font-viewer/Manifest
+++ b/media-gfx/gnome-font-viewer/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-font-viewer-3.22.0.tar.xz 320680 BLAKE2B d1324c1316d1f43727a5fd38164a9f114d84f20bb73207adf4e6799dbde52cd8151d246f0452334bc1211c11d944b1471ba3b1e10031ee2e55855bcb74a4721b SHA512 deea5dce759fa7134701f5edddf4838a0221ef776777fabd071982fddc8d3a6c535a55035d4457d262db54760c3616335d9ef89e29f846a648c1d9d522018978
 DIST gnome-font-viewer-3.24.0.tar.xz 321600 BLAKE2B 85fbd170ccf3b9464f51b6c6d556fa8d9fce155581b37d2db0ff37abb703b4fefad3b2f5db7ed09edd033bc36aacd4a574b84fefdac4cb516c43f1255d9c0d8a SHA512 b951e98161dde808aaea0666c0266a3381c82a264dc7280fcd4e4debcf07bd44c940e738a2dd5134276625e404f87323f57930764ed2faeedad831ba6a8bb591
-EBUILD gnome-font-viewer-3.22.0.ebuild 603 BLAKE2B bd5ec7cd690de2baa911ca8f78719ec0146d4f53d730ff24a41a4c08e00e1fcd2c0110f81be6b9b1c94aa7843a1b5098f9e185dbf773973cedf1f7ce3e5a6284 SHA512 0f831db3a3dff5c49953f884bdb073a5b61636b3252c6600b9c0281426c3c5b3267155118595a286cfdd71565e89f609761debf4fc5dd37d144b5f7b1326620c
 EBUILD gnome-font-viewer-3.24.0.ebuild 603 BLAKE2B 2559d1e1155e5f877fbf7b74d662879b3deb7f4ffb65e58f214c86b8f62bba7537cfcb02e36e4974b88d56f249dcb7bb837ecad3b86a7708af874119fc85c7a4 SHA512 fed65120155408b85413622b6bdd607e0806cc32a2b769964119da41625a2c928a0f212ddf8738207e8e5b6a9541f167ae95606c4cf41b6d10a33161b88a1d77
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/media-gfx/gnome-font-viewer/gnome-font-viewer-3.22.0.ebuild b/media-gfx/gnome-font-viewer/gnome-font-viewer-3.22.0.ebuild
deleted file mode 100644
index 9b22738513c7..000000000000
--- a/media-gfx/gnome-font-viewer/gnome-font-viewer-3.22.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2
-
-DESCRIPTION="Font viewer for GNOME"
-HOMEPAGE="https://git.gnome.org/browse/gnome-font-viewer"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0"
-IUSE=""
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-libs/glib-2.35.1:2
-	gnome-base/gnome-desktop:3=
-	media-libs/fontconfig:1.0
-	media-libs/freetype:2
-	>=media-libs/harfbuzz-0.9.9
-	>=x11-libs/gtk+-3.20:3
-"
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.40
-	virtual/pkgconfig
-"
diff --git a/media-gfx/gnome-photos/Manifest b/media-gfx/gnome-photos/Manifest
index e747379e857c..09def641b932 100644
--- a/media-gfx/gnome-photos/Manifest
+++ b/media-gfx/gnome-photos/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-photos-3.22.6.tar.xz 962468 BLAKE2B ceb0e54801f42a681b26e95d670a7fbb0f62d9965e38452f8d5aab045c85bb0ee57558e90caa6a8090f978c5a02b6f327692460dfe5de92bf88079dd86fc8ba9 SHA512 4fb2a67b5acdbd63cf6f252d0116a4b759e0e6daae48d638ce96ec35f24deee44720c45cb0720a26b6a380e66bbde1619173de340375828bc2f4ef943606fe26
 DIST gnome-photos-3.24.5.tar.xz 985864 BLAKE2B d5e7dd48a6f81c9ca6efa7dcb2b17fdeb781070d1789514098b8cf30bcd12eba145e57e584f42f66286579ad40ef31f370c471abaab30ba684bada9878afc3c4 SHA512 8dcdb9962a55d6e2e9aa28ef86dcc9100f80fa9739763cea1475052379050a23428e09e8416ed75b9a9b1c85a9bc27d94a75faeefde3d546195c21f04f85379d
-EBUILD gnome-photos-3.22.6.ebuild 1735 BLAKE2B 95e990724288f0fe43926fd43431f860f3cad59ad28d3e6812c5c86a6d1e35bce895113243a708a536c49eef31c753be761904975f1a93b30b6340d36355dcaf SHA512 fe73b9b9a9cf368b41a06c8f4a33625a5684c9e41b376145c55aa51e990be34e8ef5066017d4d38ce7e0666fe587b3d90ec340f73837a6e0703978e94ff1a34a
 EBUILD gnome-photos-3.24.5.ebuild 1776 BLAKE2B c4868a2dfe4d4dbbfa7a396ffaf2667844ac63f767162fa4fff975de27aa81cb86b3736f0b9461663a8a311e5e5f9fcce28934cf9e4da9fc8b74f2025810e2c8 SHA512 469751ff495f9a15ada2a680cc6191e5aef9a5e51770075a69578dfbfb1253a2d7e04e0cb5da850f0968e8d3224686f5f354683cd7718262f6f3b3caaee1bc24
 MISC metadata.xml 320 BLAKE2B b66fb85cefaafccf9575d4f85c017cc07cb55b75d377e8a95bf482b6cb7817f902c5fd3987e08c3d77b604f10710cb6f9820f5e4451e402b186e7714444abf4a SHA512 86c99b12ed97b3f09e9469dcb093e18f844f5b3efb3a3169e62e10fe446075c7839ba7ca00e3537744d3c839522cf5ed2ee33215cd5988466e35d0f4dd739b11
diff --git a/media-gfx/gnome-photos/gnome-photos-3.22.6.ebuild b/media-gfx/gnome-photos/gnome-photos-3.22.6.ebuild
deleted file mode 100644
index 5a11fd322e72..000000000000
--- a/media-gfx/gnome-photos/gnome-photos-3.22.6.ebuild
+++ /dev/null
@@ -1,65 +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 gnome2 python-any-r1 virtualx
-
-DESCRIPTION="Access, organize and share your photos on GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Photos"
-
-LICENSE="GPL-2+ LGPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="flickr test upnp-av"
-
-COMMON_DEPEND="
-	>=app-misc/tracker-1:=[miner-fs]
-	>=dev-libs/glib-2.44:2
-	gnome-base/gnome-desktop:3=
-	>=dev-libs/libgdata-0.15.2:0=[gnome-online-accounts]
-	media-libs/babl
-	>=media-libs/gegl-0.3.5:0.3[cairo,jpeg2k,raw]
-	media-libs/gexiv2
-	>=media-libs/grilo-0.3.0:0.3=
-	>=media-libs/libpng-1.6:0=
-	>=net-libs/gnome-online-accounts-3.8:=
-	>=net-libs/libgfbgraph-0.2.1:0.2
-	>=x11-libs/cairo-1.14
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-3.19.1:3
-"
-# gnome-online-miners is also used for google, facebook, DLNA - not only flickr
-# but out of all the grilo-plugins, only upnp-av and flickr get used, which have USE flags here,
-# so don't pull it always, but only if either USE flag is enabled
-RDEPEND="${COMMON_DEPEND}
-	net-misc/gnome-online-miners[flickr?]
-	upnp-av? ( media-plugins/grilo-plugins:0.3[upnp-av] )
-	flickr? ( media-plugins/grilo-plugins:0.3[flickr] )
-"
-DEPEND="${COMMON_DEPEND}
-	app-text/yelp-tools
-	dev-util/desktop-file-utils
-	>=dev-util/intltool-0.50.1
-	virtual/pkgconfig
-	test? ( $(python_gen_any_dep 'dev-util/dogtail[${PYTHON_USEDEP}]') )
-"
-
-python_check_deps() {
-	use test && has_version "dev-util/dogtail[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_configure() {
-	# XXX: how to deal with rdtscp support, x86intrin
-	gnome2_src_configure \
-		$(use_enable test dogtail)
-}
-
-src_test() {
-	virtx emake check
-}
diff --git a/media-gfx/hugin/Manifest b/media-gfx/hugin/Manifest
index 1f7674e36235..fac6e00c9f00 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.0rc2.tar.bz2 9838518 BLAKE2B dc6d786e4e6a298d4dd4e48b2c42f9c9c297b4c431fbc00fa9090f129a4633f599e222402aef1f2a467aa9b498d356f3bbaca9548954cf697d331950afa6693a SHA512 30061f4af695137f349526272e8c3c2f1f6a167305acb32466a30629c46dabea3818bc2c3a77b6102fcb67aa390a803cdc5ba8d8a2ecc6065f88726392529cbc
+DIST hugin-2018.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_rc2.ebuild 1973 BLAKE2B eb8148bea08769a3991bbddca21fd5154a03503d06dfd60e8ef15c2f0a60d975e34ea06aa2dab01a9aa52603fe696a9c3f86cc7b731c212cbee3e444c6e72725 SHA512 d947ca49bf2d0b203ebbf39df1c19c7e193e624ed73729c9d6ffe02a3f57abdcf568ecfdbd2d7b6d638cce50cedcc14ceab9969ead1e4ec2772220adda867713
+EBUILD hugin-2018.0.ebuild 1973 BLAKE2B eb8148bea08769a3991bbddca21fd5154a03503d06dfd60e8ef15c2f0a60d975e34ea06aa2dab01a9aa52603fe696a9c3f86cc7b731c212cbee3e444c6e72725 SHA512 d947ca49bf2d0b203ebbf39df1c19c7e193e624ed73729c9d6ffe02a3f57abdcf568ecfdbd2d7b6d638cce50cedcc14ceab9969ead1e4ec2772220adda867713
 EBUILD hugin-9999.ebuild 1984 BLAKE2B e7a4f4e7a7531b9b766bb7ade9087b11a74e9022a0b9d6aeea41c131d70ee2d2d6869b71e91c14403e5076071ba94afe7c888560a9f9b08d78cf7b18256647e6 SHA512 0b186e5a80fa23b4cf34a1438eacc9b01c22941d0305df391ac3188814cefcf36ac01ecda00707b590e520565127e99fe0f8d7e1e344e267dca912d599122209
 MISC metadata.xml 519 BLAKE2B bd02923a26374e3bd638778ce8100efc4694ab6bec54fd8c8cbd32d0b8c3d495fc965194692ebaf2fe909e495011978d7bb8f3c995037fc128cfd9626949549c SHA512 d4e0bfb870b5b6e5769be2c28983d914666e413333887ac7a7cdb868d2f45f6b284a99204f6e97b98e65958412c04291f6fbc21deed8de518d3ff64aae6ad01b
diff --git a/media-gfx/hugin/hugin-2018.0_rc2.ebuild b/media-gfx/hugin/hugin-2018.0.ebuild
index 33d44b9ffacf..33d44b9ffacf 100644
--- a/media-gfx/hugin/hugin-2018.0_rc2.ebuild
+++ b/media-gfx/hugin/hugin-2018.0.ebuild
diff --git a/media-gfx/kxstitch/Manifest b/media-gfx/kxstitch/Manifest
index ee378fdcb792..f6bf69efdc45 100644
--- a/media-gfx/kxstitch/Manifest
+++ b/media-gfx/kxstitch/Manifest
@@ -1,6 +1,8 @@
 AUX kxstitch-2.0.0-imagemagick-7.patch 3642 BLAKE2B ba3de142cb1dae23a31b9125cbd1da736d30ffd804cd8f68b1f9179a35ebf167e898eeafd73943f062aeac12bae3aa2ec8531a423f22a8d959d8bd65e1cc6ea6 SHA512 f47a5872e2d5da00db3f3f0dd37ce567f7001073b9f273973d4b2ce615e18d8f306dcc4dd38185d65b1b065a569f376bfb3e49e977cc9d72da253268405ec2b8
 DIST kxstitch-2.0.0.tar.xz 1681648 BLAKE2B 669eda3060244636b4ad8bb6e7e7899eb183d7a0f3b264bc40c3bda7146be2a6e10b165165889b7d0043dc5921ff8153775dfa5436546e3cd7be99a4cc144434 SHA512 0ce9ec517659fd9a3163671cdb32d451487aa812355c9abb38cf143192ed49e3e32afc003a0064e9a63303b5de40d8859f92066d886dc06c6d1fe03c8790122f
 DIST kxstitch-2.1.0.tar.xz 1727616 BLAKE2B 34e362b37ef94ed9657254fc4887eb77b0937c4ebdc2b76b09ae9ebbbe6dc490fdafa4c189a87177c26bc1d24fa0b150436a547c3b82dbf74b269fd87f674928 SHA512 c31b8f4c33a86967b02ad2d6c9be84931e607644c8683c41b3160c86fee8714d77a10f770d94ae3905c81261dfdaf13957783a83d2235594656bf2884f944608
+DIST kxstitch-2.1.1.tar.xz 1726364 BLAKE2B 47257408f31ca7db4bddf984150baac6cd850206cedb95c73b0d62ee9f966028afd97bb3653b385104a1c679512c35f41aa25c5b703c715e565d48cfda59da36 SHA512 d5a6b6d06bfb894dd7404cb81350389f1ebf5c8a463eb792358abd67f362d1e1f578d06319461a006625864f1c4a69ebb4ccd0db422870c3eae0516c9132a3b3
 EBUILD kxstitch-2.0.0.ebuild 966 BLAKE2B cecfadc5596ba0b2f89fb501e8d7826b650ecb63790f43ad9809577ff52d04001d7658ebffb34ce5251297c50860536ac62e83cc3391037d075625449c3fe18f SHA512 cc2c291f040c49c5a15e4cc8c5b057121539940a68f6649fad0d6bc895c3dcef774a16fefa2d806985ea6b723ea39c72471d975e9b09ec02aa58885e4f2fe24e
 EBUILD kxstitch-2.1.0.ebuild 950 BLAKE2B b736baf0b1c971d9ad3e65334442a0fd7aa4a32937d544a52005031e682ac34a4e115c310cb68c38640769b3df07872893a0e872345335a28c2cc3f2b9d093b8 SHA512 8ed768f44f342c9d45875fe6045c51d4ab934d6d3c6bb3eef8d73e8d585eac80804d13f751972834319b097fc7046d7fb5df2fad7d928749bf6920d2d3522cd7
+EBUILD kxstitch-2.1.1.ebuild 950 BLAKE2B b736baf0b1c971d9ad3e65334442a0fd7aa4a32937d544a52005031e682ac34a4e115c310cb68c38640769b3df07872893a0e872345335a28c2cc3f2b9d093b8 SHA512 8ed768f44f342c9d45875fe6045c51d4ab934d6d3c6bb3eef8d73e8d585eac80804d13f751972834319b097fc7046d7fb5df2fad7d928749bf6920d2d3522cd7
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/media-gfx/kxstitch/kxstitch-2.1.1.ebuild b/media-gfx/kxstitch/kxstitch-2.1.1.ebuild
new file mode 100644
index 000000000000..3e24a1c98c3e
--- /dev/null
+++ b/media-gfx/kxstitch/kxstitch-2.1.1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="Program to create cross stitch patterns"
+HOMEPAGE="https://userbase.kde.org/KXStitch"
+SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="5"
+KEYWORDS="~amd64"
+IUSE=""
+
+COMMON_DEPEND="
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtx11extras)
+	$(add_qt_dep qtxml)
+	media-gfx/imagemagick[cxx]
+	x11-libs/libX11
+"
+DEPEND="${COMMON_DEPEND}
+	sys-devel/gettext
+"
+RDEPEND="${COMMON_DEPEND}
+	!media-gfx/kxstitch:4
+"
diff --git a/media-gfx/sane-backends/Manifest b/media-gfx/sane-backends/Manifest
index 4f3c3d299cce..f4a6ca209c02 100644
--- a/media-gfx/sane-backends/Manifest
+++ b/media-gfx/sane-backends/Manifest
@@ -1,5 +1,4 @@
 AUX sane-backends-1.0.24-saned_pidfile_location.patch 345 BLAKE2B dcf7cbd5787c7a225450e03663e7c1ca69dd40fc58e3de9d994fde6a66635d6a3ca20d2886fe7cbc6a7ed3202f8f3a8c7e3d9ea4072b4418a7a43048427a06c3 SHA512 49519b8fea68292b8cbd7bdcaf5b4803a1b890800e17015ace1d662e4503cc0844f191793c8f42cd6aa7e9922ee9f961d4784e30f22abc497973be1978bf1b24
-AUX sane-backends-1.0.25-disable-usb-tests.patch 428 BLAKE2B 8f88ce8320331cb21a74374ea0ad6fcec59aa9fe8a86a99df99bc86ab32b478016b7d1cc022dc2fb798506f1e321f0dc7af9c6da099df2ce494760c0325e38bb SHA512 05e3d33f127211c2dd12e174083fa307a057a207bd3112045f3d6b6a5948643e0f450ebb473dabba3536a48b42393a63e8309d8bb788b80d18c42c9531aeb6f6
 AUX sane-backends-1.0.27-disable-usb-tests.patch 336 BLAKE2B 00fd225a4426405d515f5b6641c86e6d9035a588a776aaec26eaa4e10beebf0a9fd97da991646b7964a867c422da2bc1cf93560d1ba326f0086675036338ff00 SHA512 64cce489e87de31e1a865b86d5829ae4914a30f47e27b07fba68629261cefcd617b8eed272c94b7554545e4802283c5bd5b53f79f54403d875726b38378ae74d
 AUX saned 150 BLAKE2B 306d57a0c09856b387c3c50eb27aaafdb194972c2fdb5d1cb7de3118f0c71cf234898ce958f0d6bd17a5e1f2b5bde458e014a7bfdec52403a6204ebf51aee039 SHA512 26f3d66c6b1e75d87d7d430518aa878c77d5ab8d76a45847cef3ff15566341938eedf46c50d0fa8cdeef828df9cddefdd6fdd767c5de30d3aa7d64ed1911d910
 AUX saned.confd 76 BLAKE2B cac74b6f117f7f78a71b951433bc6b155f8641e2cf1bd747871165764e97ed368d10551075761c34ff01f51f7cae1b8a9c5692fb9666a300b45134fe255ea3c1 SHA512 8f4a99ef24c19b3a7213b3d25ea16f5bca8623735cf25d21e3a706e9e0135ac8cce5d0b8fb8728845977f41dcefe6bd858076d755515fc91b00e05ee5817d751
diff --git a/media-gfx/sane-backends/files/sane-backends-1.0.25-disable-usb-tests.patch b/media-gfx/sane-backends/files/sane-backends-1.0.25-disable-usb-tests.patch
deleted file mode 100644
index 217a4408e2ff..000000000000
--- a/media-gfx/sane-backends/files/sane-backends-1.0.25-disable-usb-tests.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-do not let the tests try reading/locking usb hardware.  we also disable
-this because the test will abort() if no usb support is found at all.
-
---- a/testsuite/sanei/sanei_usb_test.c
-+++ b/testsuite/sanei/sanei_usb_test.c
-@@ -832,6 +832,8 @@ main (int argc, char **argv)
-   int detected, opened, i;
-   SANE_Int dn[MAX_DEVICES];
- 
-+  return 77;
-+
- #ifdef HAVE_LIBUSB
-   printf ("\n%s built with old libusb\n\n", argv[0]);
- #endif
diff --git a/media-gfx/simple-scan/Manifest b/media-gfx/simple-scan/Manifest
index 7a68dd9f1ed4..fa6698357d57 100644
--- a/media-gfx/simple-scan/Manifest
+++ b/media-gfx/simple-scan/Manifest
@@ -1,5 +1,3 @@
-DIST simple-scan-3.22.0.1.tar.xz 659564 BLAKE2B 6001f03b6dbdec8b84ac3098f86b131df8784cd65a6a557ecda6465e1fdeac49ad8efb43fd1ea93aa933efc1c7edb6753ede103fee35d7074da191a2bb114c03 SHA512 2513887546c1e6764cffeac26638646b03eaf2f2e5d8013d9c29dfd4fbe200b347f7ee8a94e402497d1e8bdc3ba55d2fb2a740eecc8663c692f75fda2b1607c0
 DIST simple-scan-3.24.1.tar.xz 669452 BLAKE2B 927c3479a96525e2996aab7c8d37b585f93fb07315a4f5cb0292b29befb0417df6e6afb059158d9840903d7474bf0d4fb97e634c585ca7654581b82a264e80f0 SHA512 9f0ced644b13dcaad4f1e23a6520b1cbe3c36d995fca4791383f959986cd396f123638a23dbd02a9511ef7e1c9c915b3a025e9b7e4de4542a4c180c4fe29e2b9
-EBUILD simple-scan-3.22.0.1.ebuild 1303 BLAKE2B c19801e07528697e62e756a45647474481456701ce56b76bb0576e3adc63175b08d2322e287792747f37f8d069a3e1cb76081a4dc0e02ba4c66a9673ed9c29bc SHA512 07e3f1c580eeb17e11fa287b95a729f25819bdaaa6d85b9f1c7fb814ac2c1324c5a0b567b111e0713cc259c83611b9b6a9d8de48d593105157616ee3f3c83355
 EBUILD simple-scan-3.24.1.ebuild 1303 BLAKE2B 86538dcf27e462ebc43f598d32c584235409e91610be9e03216b7384d7b296c81b050cb9f0d0d785a08afbdc4f1b7bb705fdc1654363342530d049e09a31f14e SHA512 04a4cddaf9711c7ca99bf6446c1578b955755bd8885ba405ab2f13f84b59112d8657a03b58e2d9016b506064825fd8ca43797199911dac75280514f48a168646
 MISC metadata.xml 718 BLAKE2B 46e5929721e967a667f32a8993903b635599ae06c5b5179edf0579070b2b393f750a044bc280519b820f336843d1b98a795f73ef9500a27951a64b61794901e5 SHA512 82244c0dc32c4ded72048a387cee5f350a66148ecaa12a941e4a86d9d9079f1769f1f240ee564c7f991f9d53c050e9fd3e9113024fc8831a6766ec3d88b665ca
diff --git a/media-gfx/simple-scan/simple-scan-3.22.0.1.ebuild b/media-gfx/simple-scan/simple-scan-3.22.0.1.ebuild
deleted file mode 100644
index a51727d20142..000000000000
--- a/media-gfx/simple-scan/simple-scan-3.22.0.1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2 vala versionator
-
-DESCRIPTION="Simple document scanning utility"
-HOMEPAGE="https://launchpad.net/simple-scan"
-
-MY_PV=$(get_version_component_range 1-2)
-SRC_URI="https://launchpad.net/${PN}/${MY_PV}/${PV}/+download/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE="colord" # packagekit
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.32:2
-	dev-libs/libgusb[vala]
-	>=media-gfx/sane-backends-1.0.20:=
-	>=sys-libs/zlib-1.2.3.1:=
-	virtual/jpeg:0=
-	x11-libs/cairo:=
-	>=x11-libs/gtk+-3:3
-	colord? ( >=x11-misc/colord-0.1.24:=[udev] )
-"
-# packagekit? ( app-admin/packagekit-base )
-RDEPEND="${COMMON_DEPEND}
-	x11-misc/xdg-utils
-	x11-themes/adwaita-icon-theme
-"
-DEPEND="${COMMON_DEPEND}
-	$(vala_depend)
-	app-text/yelp-tools
-	dev-libs/appstream-glib
-	>=sys-devel/gettext-0.19.7
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	# Force build from vala sources due to mismatch between generated
-	# C files and configure switches
-	# https://bugs.launchpad.net/simple-scan/+bug/1462769
-	rm -f src/simple_scan_vala.stamp || die
-	vala_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-packagekit \
-		$(use_enable colord)
-		# $(use_enable packagekit)
-}
diff --git a/media-gfx/sxiv/Manifest b/media-gfx/sxiv/Manifest
index db9619591c86..85105bdf6713 100644
--- a/media-gfx/sxiv/Manifest
+++ b/media-gfx/sxiv/Manifest
@@ -1,6 +1,4 @@
-DIST sxiv-1.3.2.tar.gz 46560 BLAKE2B bdbd8bfac7cf4575347923657f8637d2cefbb5c8345b65937e410301e9e37c70b99323734d3469959548d1d6fc74dea2aec4ec5e1de1612ec6b0ce462785f0b1 SHA512 3bcf67a778a3e40cb6ae6b6fcc685cd57e303265df34c8a56d6ebb8ad0237e7136e738c44fee5c5504c73e4722d017f1e746691fac482568b2a960931f1ecdd5
 DIST sxiv-24.tar.gz 47148 BLAKE2B 69d70d64ea6cf6ae7a044d06df78a2e1e53941ef281d6445f54a28c4368112674461bc4e71a0226946588e604de33dd0972960cb072a00efd64512e5273cef09 SHA512 e4c9d4e18b4f1999b6441256b4c0d4683a105f1f64d4f754d6f9bc4f467ee1ccc6b6996cec8a210276c5fbec59417627fb838cb4f7be37cce32fa2c5d45d347b
-EBUILD sxiv-1.3.2-r2.ebuild 1459 BLAKE2B e9d28513bc507f3a617d436d1c6b78181f0ef56b35c99441a9d1003681dcb0431365b758b0d5c8eb4b34933afbd62ed79e50dc301e1a18304005f03a0bf3cb25 SHA512 51a5493a1e8c5d31b31348f4c7ee30490f4b518e31713c48cae031cd3ecf4f280381ffd548c753450a6f27b092e87314ecf41c5f5f5998a032fdf1a7bcf8f612
-EBUILD sxiv-24.ebuild 1221 BLAKE2B 6d8f507998cb308c26051e953e975380220aecca848a6bafa492a9853186986f8916ccfc43690085aec04904b3ab701b36cac6f1852f1d92186618f07339305a SHA512 50b2442c860d83a39f666913ed497958a01142ec6e685affe8d39dda0246d7e3960a2cc52672e3a9eb8e92974442c4353f07c05d0cef5eebc3dd143873ccbf20
+EBUILD sxiv-24.ebuild 1219 BLAKE2B da05f3f295ee8c8afb247ff3e31609ddf0b8c0fe8fb0db47f7e108b4253aa6565ff9dae5fe8b1c6875d5177705a2260fcf2be2a20e0d56374d31761537f30f65 SHA512 62ba4b36f941fc709a8e83a0be2bd581493041f1f93c21acd43753f8d7d368c9a6d6b8d9d3560dd78c9ebe0c4a15fc09cc48cb8a60fe77c4691b1663d0f8a370
 EBUILD sxiv-9999.ebuild 1221 BLAKE2B 6d8f507998cb308c26051e953e975380220aecca848a6bafa492a9853186986f8916ccfc43690085aec04904b3ab701b36cac6f1852f1d92186618f07339305a SHA512 50b2442c860d83a39f666913ed497958a01142ec6e685affe8d39dda0246d7e3960a2cc52672e3a9eb8e92974442c4353f07c05d0cef5eebc3dd143873ccbf20
 MISC metadata.xml 347 BLAKE2B 0e614a8efac493e84e5b64dc4347616e6af23c5e95a84b29fe755ab73d2bec9527a3e7dfd39cb9d952df4571c2b6d6f3de10e949bd5356d9628f3761bc578a4f SHA512 9aca2dd50b12a3bc6a0175bf8fe1767990b519ba92f91eca79137383901119fb7002b0e31d817a287ec08595d32c0074d92aefb0b0ae14c8e4c0b6b366e28515
diff --git a/media-gfx/sxiv/sxiv-1.3.2-r2.ebuild b/media-gfx/sxiv/sxiv-1.3.2-r2.ebuild
deleted file mode 100644
index cbff57e39928..000000000000
--- a/media-gfx/sxiv/sxiv-1.3.2-r2.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils xdg-utils gnome2-utils savedconfig toolchain-funcs
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/muennich/sxiv.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/muennich/sxiv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 x86"
-fi
-
-DESCRIPTION="Simple (or small or suckless) X Image Viewer"
-HOMEPAGE="https://github.com/muennich/sxiv/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="exif gif"
-
-RDEPEND="
-	exif? ( media-libs/libexif )
-	gif? ( media-libs/giflib:0= )
-	media-libs/imlib2[X,gif?]
-	x11-libs/libX11
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	sed -i '/^LDFLAGS/d' Makefile || die
-
-	# disable exif support as required
-	if ! use exif; then
-		sed \
-			-e 's/^.* -DHAVE_LIBEXIF/#\0/' \
-			-e 's/^.* -lexif/#\0/' \
-			-i Makefile || die
-	fi
-
-	# disable gif support as required
-	if ! use gif; then
-		sed \
-			-e 's/^.* -DHAVE_GIFLIB/#\0/' \
-			-e 's/^.* -lgif/#\0/' \
-			-i Makefile || die
-	fi
-
-	tc-export CC
-
-	restore_config config.h
-	default
-}
-
-src_install() {
-	emake DESTDIR="${ED}" PREFIX=/usr install
-	emake -C icon DESTDIR="${ED}" PREFIX=/usr install
-	dodoc README.md
-	domenu sxiv.desktop
-
-	save_config config.h
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-}
diff --git a/media-gfx/sxiv/sxiv-24.ebuild b/media-gfx/sxiv/sxiv-24.ebuild
index 778e21dde204..67f72a7ea320 100644
--- a/media-gfx/sxiv/sxiv-24.ebuild
+++ b/media-gfx/sxiv/sxiv-24.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/muennich/sxiv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 DESCRIPTION="Simple (or small or suckless) X Image Viewer"
diff --git a/media-gfx/ufraw/Manifest b/media-gfx/ufraw/Manifest
index 6df83dc96445..64364969bf1f 100644
--- a/media-gfx/ufraw/Manifest
+++ b/media-gfx/ufraw/Manifest
@@ -3,7 +3,9 @@ AUX ufraw-0.22-crashfix.patch 563 BLAKE2B 98dfd70be0cb7ec82b9f87c946a0638d7c0d44
 AUX ufraw-0.22-drop_superfluous_abs.patch 448 BLAKE2B eae5b9f2dd6d12922b5fcd483447bc88a3ba4af249724f7c2dce5110d008934ce6e1601970ad7a42a952c8197b49605c3534c458e87ff804ccb1be861442d029 SHA512 847c5081225236d3728400d2d4f19f25fc971d9ee7b8a87395400f04d4ca82403d6fc10876f4884a3dcee7d1b2ac9a418132fa839d35f370484cc47fb6381a60
 AUX ufraw-0.22-fix-unsigned-char.patch 748 BLAKE2B 30a8dfcfb71f78449838ade5f77074d667fc1e71ca079f8042869a9e82ff8b9422ddbdc892c7458e05ad411d552352b5f530ae2da4a629d449857a1e62be0c78 SHA512 0ea99fe69adeeae1e6c07bcf9d583f6b8247ad0f01ddf3435edb605618b0c24d80c5662442250020b92352ebba12757bb69ad7b107ab8a8f464d5cf2b642664b
 AUX ufraw-0.22-jasper-automagic.patch 613 BLAKE2B 100e6b31540030a20c8cff8e99329a738378788b2ab11665c0c8ab2f3246c821a176dba8b26cea354e8b0d127d2c601c21b0ac94f5264327916d0f8779618165 SHA512 855337bf109ebc0ea7b9bd429bcc429bd9caa561e2a815352c51e860a6e405d500913b70414ded7f47e053332c89b964d1817c8f22627504cf157f1565f3c7a4
+AUX ufraw-0.22-jpeg9.patch 1076 BLAKE2B 84448c537706d7b29f54d4735a75bf9501eac7927529c6d8e43d6cd746763ab753715d54cf943bb8bb5ddd8a29891f7522a680426acd2eb52af450492656ae3e SHA512 520e9351d7b8aa84f79a7c2841c2f56eaca849e67e448dc9503d248e31c1aa9fecaa64a332c0a155b6ba1ab7debec8734f3f2ef710bcb534a5fca34e9b5c8f7c
 DIST ufraw-0.22.tar.gz 1103554 BLAKE2B 5ffa4c660602553853221d7b31bfb78b02644bfeb4461cf752186d83ed8087b7905e414c7d741916ca9460c05849ab679b2f3098c99e5246f54a49b6a915268f SHA512 a42eff5052c18afec90245cf97ceeade78e3f288186cf697ac4abf2e8290d4081db8ac4de3ae47b3774f30a6cb4cbda392099e6fd2125fe751abb40d9b065ad2
 EBUILD ufraw-0.22-r1.ebuild 1942 BLAKE2B d9e275268bacb9820d75e04386f3b5152e93f72e6d06bc9a0cb1dd98ae6b8364d28167ac83cac70994f0b318bd6cfe36fa57dd1ace6f6a287a9fca5b13067ae3 SHA512 1b10bb5090511f5bed94145e7372b7a0b2828170bfceb02ca9cddf979e7327b4dc8bff85b91b9c40f09a36b3c7fbb20d5a9d894d7b323b1010d6ac5f00e97b8d
+EBUILD ufraw-0.22-r2.ebuild 1970 BLAKE2B 169afae7cde2cbdc098115c8f12de0408d0bd0e086b63d434ac58d84701548834dcbb012fb3daff6f896e099d02b87cfba9aeee5f268ba0cc3ce7a8d8c877d57 SHA512 2302b7d3b026dfbad8fb0e7e1d7d4dec4dfc6b6780eb50e6accd7df2e6be11b2f51306c9231140e11128251496c892e0201b9dbeeed3bbc22452adc6e8cf2792
 EBUILD ufraw-0.22.ebuild 1684 BLAKE2B 8af30a9b68373d19ae65485f0c424a73f72fa560030fd2ffcb8bdbc618e8bc8b315316c9afb3040e872bbe2109298a8f62c647e85b5e13da702967cb5fe92e32 SHA512 5c9374c8eaf5ac4cbd5aeedcc72de973b9160fbe0b7022ad86a690407b013c613dba97b2116dd1a54830ecec92b5793d6f21525fb75e62c060ae6be0729ef414
 MISC metadata.xml 588 BLAKE2B 3e6ec0c8b11a3c30d1b20b5df4303fc1bc10b4e6459a24358ac50bcfaa414b307efe6d392d23fd7ce1443917865deae0dfa89cc7a068567f227cdc387f99d1cb SHA512 3d161ddfe0da5620312603d66acbc24244317da4dcb905558eddda9d54bf96024881ffbdcaa49f9daf73d779d5e7dbb47a523e05cc6c614756b468f14ef66ab9
diff --git a/media-gfx/ufraw/files/ufraw-0.22-jpeg9.patch b/media-gfx/ufraw/files/ufraw-0.22-jpeg9.patch
new file mode 100644
index 000000000000..dca3834cbe8e
--- /dev/null
+++ b/media-gfx/ufraw/files/ufraw-0.22-jpeg9.patch
@@ -0,0 +1,32 @@
+Fix build with >=jpeg-9
+Thanks-to: Moran Z. <o542018138@gmail.com>
+
+--- a/dcraw.cc	2014-09-02 07:50:38.000000000 +0300
++++ b/dcraw.cc	2015-02-21 04:54:13.957561352 +0200
+@@ -2330,7 +2330,7 @@ 
+ #endif
+   cinfo->src->next_input_byte = jpeg_buffer;
+   cinfo->src->bytes_in_buffer = nbytes;
+-  return TRUE;
++  return boolean(TRUE);
+ }
+ 
+ void CLASS kodak_jpeg_load_raw()
+@@ -2346,7 +2346,7 @@ 
+   jpeg_create_decompress (&cinfo);
+   jpeg_stdio_src (&cinfo, ifp);
+   cinfo.src->fill_input_buffer = fill_input_buffer;
+-  jpeg_read_header (&cinfo, TRUE);
++  jpeg_read_header (&cinfo, boolean(TRUE));
+   jpeg_start_decompress (&cinfo);
+   if ((cinfo.output_width      != width  ) ||
+       (cinfo.output_height*2   != height ) ||
+@@ -2419,7 +2419,7 @@ 
+     if (tile_length < INT_MAX)
+       fseek (ifp, get4(), SEEK_SET);
+     jpeg_stdio_src (&cinfo, ifp);
+-    jpeg_read_header (&cinfo, TRUE);
++    jpeg_read_header (&cinfo, boolean(TRUE));
+     jpeg_start_decompress (&cinfo);
+     buf = (*cinfo.mem->alloc_sarray)
+ 	((j_common_ptr) &cinfo, JPOOL_IMAGE, cinfo.output_width*3, 1);
diff --git a/media-gfx/ufraw/ufraw-0.22-r2.ebuild b/media-gfx/ufraw/ufraw-0.22-r2.ebuild
new file mode 100644
index 000000000000..4df5995e5355
--- /dev/null
+++ b/media-gfx/ufraw/ufraw-0.22-r2.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools gnome2-utils toolchain-funcs xdg-utils
+
+DESCRIPTION="RAW Image format viewer and GIMP plugin"
+HOMEPAGE="http://ufraw.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+IUSE="contrast fits gimp gnome gtk jpeg2k openmp timezone"
+
+REQUIRED_USE="gimp? ( gtk )"
+
+RDEPEND="
+	dev-libs/glib:2=
+	>=media-gfx/exiv2-0.11:0=
+	media-libs/lcms:2=
+	>=media-libs/lensfun-0.2.5:=
+	media-libs/libpng:0=
+	media-libs/tiff:0=
+	virtual/jpeg:0=
+	fits? ( sci-libs/cfitsio:0= )
+	gimp? ( >=media-gfx/gimp-2 )
+	gnome? ( >=gnome-base/gconf-2 )
+	gtk? (
+		>=media-gfx/gtkimageview-1.5
+		>=x11-libs/gtk+-2.6:2
+	)
+	jpeg2k? ( media-libs/jasper:= )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.17-cfitsio-automagic.patch
+	"${FILESDIR}"/${P}-jasper-automagic.patch
+	"${FILESDIR}"/${P}-crashfix.patch
+	"${FILESDIR}"/${P}-drop_superfluous_abs.patch
+	"${FILESDIR}"/${P}-fix-unsigned-char.patch
+	"${FILESDIR}"/${P}-jpeg9.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable contrast) \
+		$(use_with fits cfitsio) \
+		$(use_with gimp) \
+		$(use_enable gnome mime) \
+		$(use_with gtk) \
+		$(use_enable jpeg2k jasper) \
+		$(use_enable openmp) \
+		$(use_enable timezone dst-correction)
+}
+
+src_compile() {
+	emake AR="$(tc-getAR)"
+}
+
+src_install() {
+	emake DESTDIR="${D}" schemasdir=/etc/gconf/schemas install
+	einstalldocs
+}
+
+pkg_preinst() {
+	if use gnome; then
+		gnome2_gconf_savelist
+	fi
+}
+
+pkg_postinst() {
+	if use gnome; then
+		xdg_mimeinfo_database_update
+		xdg_desktop_database_update
+		gnome2_gconf_install
+	fi
+}
+
+pkg_postrm() {
+	if use gnome; then
+		xdg_desktop_database_update
+		xdg_mimeinfo_database_update
+	fi
+}