gentoo resync : 15.11.2017

18 files changed, 139 insertions, 108 deletions

diff --git a/media-gfx/exiv2/Manifest b/media-gfx/exiv2/Manifest
index 4e34b992cdee..105124c3726c 100644
--- a/media-gfx/exiv2/Manifest
+++ b/media-gfx/exiv2/Manifest
@@ -9,7 +9,7 @@ AUX exiv2-0.26-tools-optional.patch 1386 SHA256 6d036435885f0b9be480410732e4a8a0
 DIST exiv2-0.25.tar.gz 5434325 SHA256 c80bfc778a15fdb06f71265db2c3d49d8493c382e516cb99b8c9f9cbde36efa4 SHA512 08d4e655ffdde715e0214f4bef01d55aba9b8ba517456a60e254a0f8541c20479e407545db28ca90a69dee8def6941fdd88f9a557fb382ebebe49e363aca8e8e WHIRLPOOL f9e7a6947dac5870e0574253b8c1cb1e7d31a916a9e1c4417c73168046c0b4bed90b9c77253444604163bcf6dca204dab92a52cb03bdcb0f85c807327623f8ac
 DIST exiv2-0.26_p20171104.tar.gz 28368697 SHA256 f7a46c0b1d3d3c30518202e62dbe086029f584a064bbb531a0ab11270a454007 SHA512 6f6a884d7978e54dceb9ce45248cd0425ff469887c85ef52b0e38cb755970f69fce96b4b5317c8e8070b833f72ca214696042aac71292a6f9c3440f6a369d474 WHIRLPOOL 7baf5fcde327b2e1decde48f44b616f98fab7c65d22ee5e94e0b356fad4d7950c116db17a94b3c91954ac1565c3fe2853b83262c0a4597744dea708b304dce09
 EBUILD exiv2-0.25-r2.ebuild 3067 SHA256 74c21aab30f50186256977871d495681c93e41c8044adc052c518a49b42e1fdd SHA512 30a8a1afbb91ec8b226ea16621cacbd9726f31cd9ebddfda4c7771786a4902123b5674ac9221c990b99464eb0d471f694bf57eebc7e3a22d65ad5e61f4805dfc WHIRLPOOL fc5b37699ba112488230aa7fdd8913318e7527c772cb214b87ecd612775f3fffd6686b8db1baee3dc949fbf8ce856607205776aaea50cf67634b6bb7c74f2b0f
-EBUILD exiv2-0.26_p20171104.ebuild 3160 SHA256 21b929dab24dfa6530e9ce35cfcbc4568159742d2d3c3a660991c5efce2b27e0 SHA512 48ff2cc6c1f8498df8c561692c096421c3c9ec2c0a858d77d651ba7b2000588096ff1658265aedbd1f6867d1007548b92889aee7127ab71656cbbc2a0514e59e WHIRLPOOL 0106d1fa98dd88898a14c766af7d202332e1f9be17e202c12daccfd113850066bf1df2d2bc56c324a489244e829b2f339e265dfd0854347867e102ecc766ca2a
+EBUILD exiv2-0.26_p20171104.ebuild 3158 SHA256 269fe84c9575b1972f0156f3f92c0a8e526ab1786e2fa095971d7e79335da2f2 SHA512 1b3ecc06790fd265932282635cf12c26e947b9cdfb33d6bba30f47a70bb764f33789c35375ccfd20fef331bf771b98bff7208c1f7754abb752e4f929dc4feaf6 WHIRLPOOL ca5c8c7a708d8521f635e6564b6a24d1a799e66a3308236cb0fdbfa353a15024c4f0f2c43cc886a4801f46733cd612b21bac6f29a8dd9e3408fc36ffbdcc42f3
 MISC ChangeLog 6407 SHA256 169192c62c5737f3e30c0f97815a85216ef6c50714d94759089db57cc60468c4 SHA512 dbadbe62c5c985e88553f788bf6b22c98f9c4001d53882d8cff3a0e7fd23aa49dbc9e9dc72854578e711f5041f2f0182226d236946042f349a9ebc015b2a89fb WHIRLPOOL eb2926f593eb897554b5e4c77d4287f7718134e5d88b56ba4c48161d04834a8cd706989b456ba1c707303d6603270ae4cfb6d358c8c2f91bc8f3209caa9e2947
 MISC ChangeLog-2015 18145 SHA256 5a973e551b2244f4f36a767d98cf41bc8bb61789fc40a7809cc5a98ebe80097d SHA512 3d54f43d175e49db9e5d727eadd616fbae08e2fd1017ea6382b818bf6ec300b782d62eb037b4859b190996e63fb963da4eb7862c00c5f24fee7da05a875d69f2 WHIRLPOOL 2ed9a6717cf228be16bd1aaf6cf4820b02afbd77952685c4d8fe7cb49707c61f504c05053bcb5223626ce9b0ea22ea9e7d308b35a7a80a0c15676b9f8ca5af8c
 MISC metadata.xml 612 SHA256 2700f3a6eb0fea03635790e9e55611f58a19dace74c70d0e0106bd70ef825c60 SHA512 9b4926ba8420a125dc4cefd351ee1ec10a4df2fc4306a56720f6e8de7c5fd9f36a8646c8583958fca9a45ebe1b65b19c053c7da37176546bc19ae64afa87e4f5 WHIRLPOOL 0996d01f595fe4ab40a65fcc19d2eced4dc31a1c8efddddca353828447ff3ca974499dcc81482d47a3470d9530a1886abde9acfaa2ac75df0e845f1a70402056
diff --git a/media-gfx/exiv2/exiv2-0.26_p20171104.ebuild b/media-gfx/exiv2/exiv2-0.26_p20171104.ebuild
index c224f6ca327f..dc05f6aaed6e 100644
--- a/media-gfx/exiv2/exiv2-0.26_p20171104.ebuild
+++ b/media-gfx/exiv2/exiv2-0.26_p20171104.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} = *9999 ]]; then
 else
 	COMMIT=900d2417dbeb46e14cbf65fc2798ed1d043ab76d
 	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"
+	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
 
diff --git a/media-gfx/feh/Manifest b/media-gfx/feh/Manifest
index 279b196213bb..113e768e88ef 100644
--- a/media-gfx/feh/Manifest
+++ b/media-gfx/feh/Manifest
@@ -3,11 +3,13 @@ DIST feh-2.18.3.tar.bz2 2127924 SHA256 d82f68c7a96e1860dab3584ed58bda69446b692ae
 DIST feh-2.19.3.tar.bz2 2128692 SHA256 5ec97b655afbde3f1172543d175ec67fe35cd31397a009bda3fc3d40c1de7ed0 SHA512 0a5ee36bb9536e190b8aee11c097f5efd5f95dbb74ec299b41ec4d7d8bdfa68721b312607eb8e75941c4b79f92fcdbbc31731ab543907b2f6989bcc8e36ac6e5 WHIRLPOOL 4305cd425b20fe262fdcf4acf0ecfbeab8404bd6883fc9753f93109557b845cfe0a53edebad2d088a37bbafca7240daa4f0455d86e59793fc1f0ecc48e0716cb
 DIST feh-2.20.tar.bz2 2129466 SHA256 4b504302099ec6dd099c84dd7e285c80dc318977ebda48949593386bc26e700b SHA512 a621bc0b1327666af4ae71f6a9c286535b7951bde10f93cc5281304a1ab30e2584f94a5eb48d74dfc40deb007d9f88256a984bcfe2469bf4e11a9d8c8aa52ffc WHIRLPOOL fb2d8827b687a5b953ad3885745c78707f217cd4f3fb26940a34971d2ec8c13c2689e570882c89283877004d45e484ee3011cb9ffd0170949102743c454ecf5b
 DIST feh-2.21.tar.bz2 2129718 SHA256 520481c9908d999f8f7546103b78ff9b11f41d25b0938f0a22f10aaa48beef2b SHA512 f869d6588976973fca55714829478293bbd89fe03c7575c48847d23caec09353dc54eddf6fa41dc7f560c92eaee49ee23008258d72f4d55a49a5166625560a43 WHIRLPOOL 81db9d7b87a279468145e750392edb1e7ee477612f80e9ab51d09b313f1ee4efe0c3deffbcc3f7eb5da909a387c33bd9abe213b43f5c11601ad6e5af1ef0c10b
+DIST feh-2.22.2.tar.bz2 2129840 SHA256 05a81fbe0997f6274c7617efc351647be38e5244c2624bd203459025c9a68ecd SHA512 85c5f779fecb2be7457fed0675f25860ed4f41db9ecd1fdb8d4b1e553a7a337d5af243aafbd3fae4ac42fc943d207a264756d92cd15c62e95cec1f28fde46219 WHIRLPOOL 7c7151cbfcbe970c42dfaaad241b4197dd30ae2118c9e1c91b998101167f6d6c592ec833af4da0e6dade6883d0ec854cf58731b645d81f5ed8943e25dab52627
 DIST feh-2.22.tar.bz2 2129914 SHA256 b257267cf58bf2eef31bd955d49437e165f0f1bf4e60b9ddfb460496d6670c7b SHA512 403b1e760e2b3e177768b47de5bb7bd45c11152f04a21f6788afcaec12357a085f7c9944000f78a8df41a3d60a67985622d36effd543216153ab04e539b5b85f WHIRLPOOL e9848ed69ebcccc1d4b75c68b925f9ab0e8b803e848f30d1b4b730c8e7cd52e02c42ec8b3e5732342f484b8ca0e79cec17f277a3cf19311c261989fedfbd730c
 EBUILD feh-2.18.3.ebuild 1191 SHA256 327d5fcfc9b1fb6955c5f5032f029fd601a293d7f7e61553e2822a341e5fd191 SHA512 cfdb2067a02a31747129abe3833a2999c15e02abbabb7a389380b6351f0d87aaa0b74b29e4253a33dcf12ede43f8964fb5b099a80c438cbe7523e91de45b172a WHIRLPOOL 2b15abc27a4d985c280ca53a360184197e1040d71ed9be8a1d9ff956c6a96e5b8d2e1e2e003d02f4a864819c8e1911d407a1b750eeb7b9d28653a4621d9f475e
 EBUILD feh-2.19.3.ebuild 1195 SHA256 16e0e9064638ab86d373c8c187ccb1f8e50d148bfb8c6f1460c0221e10210e5a SHA512 000e9e481940fe89f2346d63d75bf229e642fb0e517a0c27e93e7fec47807c2b554fff3088b3ff7a1a62902d6e9d99aad69069b8e7d44bf36586780b5f2ce149 WHIRLPOOL c31fd5b30341b19ea4661d8af21f22daf1338e6d4a617d90038ef8b4bda58ca96d0d7ee60e3f5a5bdcd24f3e0fd8fe42840f6b8ef577bd9851fb2589b6477f85
 EBUILD feh-2.20.ebuild 1195 SHA256 16e0e9064638ab86d373c8c187ccb1f8e50d148bfb8c6f1460c0221e10210e5a SHA512 000e9e481940fe89f2346d63d75bf229e642fb0e517a0c27e93e7fec47807c2b554fff3088b3ff7a1a62902d6e9d99aad69069b8e7d44bf36586780b5f2ce149 WHIRLPOOL c31fd5b30341b19ea4661d8af21f22daf1338e6d4a617d90038ef8b4bda58ca96d0d7ee60e3f5a5bdcd24f3e0fd8fe42840f6b8ef577bd9851fb2589b6477f85
 EBUILD feh-2.21.ebuild 1195 SHA256 16e0e9064638ab86d373c8c187ccb1f8e50d148bfb8c6f1460c0221e10210e5a SHA512 000e9e481940fe89f2346d63d75bf229e642fb0e517a0c27e93e7fec47807c2b554fff3088b3ff7a1a62902d6e9d99aad69069b8e7d44bf36586780b5f2ce149 WHIRLPOOL c31fd5b30341b19ea4661d8af21f22daf1338e6d4a617d90038ef8b4bda58ca96d0d7ee60e3f5a5bdcd24f3e0fd8fe42840f6b8ef577bd9851fb2589b6477f85
+EBUILD feh-2.22.2.ebuild 1195 SHA256 16e0e9064638ab86d373c8c187ccb1f8e50d148bfb8c6f1460c0221e10210e5a SHA512 000e9e481940fe89f2346d63d75bf229e642fb0e517a0c27e93e7fec47807c2b554fff3088b3ff7a1a62902d6e9d99aad69069b8e7d44bf36586780b5f2ce149 WHIRLPOOL c31fd5b30341b19ea4661d8af21f22daf1338e6d4a617d90038ef8b4bda58ca96d0d7ee60e3f5a5bdcd24f3e0fd8fe42840f6b8ef577bd9851fb2589b6477f85
 EBUILD feh-2.22.ebuild 1195 SHA256 16e0e9064638ab86d373c8c187ccb1f8e50d148bfb8c6f1460c0221e10210e5a SHA512 000e9e481940fe89f2346d63d75bf229e642fb0e517a0c27e93e7fec47807c2b554fff3088b3ff7a1a62902d6e9d99aad69069b8e7d44bf36586780b5f2ce149 WHIRLPOOL c31fd5b30341b19ea4661d8af21f22daf1338e6d4a617d90038ef8b4bda58ca96d0d7ee60e3f5a5bdcd24f3e0fd8fe42840f6b8ef577bd9851fb2589b6477f85
 MISC ChangeLog 3472 SHA256 41908da7bc5ca1f4d9b9f60583e320348319107c8fc3d0b84e95aadca0926149 SHA512 f8080fc442af6463655c8a436b9feaaa9411475ee76de80a0b9519c58181ffe214f0b93da45905b23f0c0dca39a59b54fe08dfadb825510b7b3b80e06226e708 WHIRLPOOL c936075316ad96810e7c4e23edfff3bf2692179ff20d203095196c4ac78dfaec41412ed75e4ebe8760e64c2e024a99b767340cd82bf01a83646b2aa781dfd6cf
 MISC ChangeLog-2015 17231 SHA256 20acc183674f24a9cd9b020dc2c3b1f8674c3097619acc6a46380d926ab002bb SHA512 8ab0f187fa04156efbdcc4efe00fbe923d29f7b4630dde949ffa6b767543925423ae4902b6696f12fa43b08206c1be373b49239d85a1920b131576ef8f163eca WHIRLPOOL d50b1f42f3fa9024b714e25d71f4c2866d5d46e1a24aa98b7951583f54a91abad5ac3ea2dbad2a939cf2e0e1544a402dbd98517429c7ab45a3231843ce73c81d
diff --git a/media-gfx/feh/feh-2.22.2.ebuild b/media-gfx/feh/feh-2.22.2.ebuild
new file mode 100644
index 000000000000..73ad8e804e44
--- /dev/null
+++ b/media-gfx/feh/feh-2.22.2.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2017 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/fontforge/Manifest b/media-gfx/fontforge/Manifest
index ced69bd903bb..4cc4ce0a74b2 100644
--- a/media-gfx/fontforge/Manifest
+++ b/media-gfx/fontforge/Manifest
@@ -1,4 +1,3 @@
-AUX fontforge-dummy-spiro.patch 634 SHA256 702f5c16cd2d91f60d5c5fb3eb7fe84e6c67265f26bd886719ab9ed93e3810ce SHA512 5a42b0542f992dc35b9f570665b7000e59bd2c4c9d1919a02945beb3a405f62c928f3a7bd638a4ef9544e95bba148363872c3c6b966a72f4dd8b9cec9c43d0cf WHIRLPOOL 3176bd1b0fe09a24e7969c2d750f7587a11d9a6f63035ed2b20a21fe00ff78d2c7112dcd2204a3a87507d34fd2e87b27af715801a5030a6fc902d46d034a15a9
 DIST fontforge-dist-20160404.tar.gz 20906256 SHA256 6c73a556030d985e166974e5d6025255290874c2d6bb349c9930b03f17b45bcd SHA512 be94f04881b12ed3b1a34d0d7cc9149321db17d51458f135b2683ea600401e4fa55647ced4b4e014555ba1c900a684b9d5d6f2e2812ce03c432d23ca72f5c363 WHIRLPOOL 2313c7775da7f7a47ef8bae3cbef897e8b0996c8f74db099562e0a3636984e8a9a55ca5f2ca11b205a7b1aff76e7fe4e7601f15b7951147353403da0e41d692f
 DIST fontforge-dist-20170731.tar.xz 13985256 SHA256 840adefbedd1717e6b70b33ad1e7f2b116678fa6a3d52d45316793b9fd808822 SHA512 26f7a40714460716a24dd0229fdb027f3766bcc48db64b8993436ddcb6277898f9f3b67ad4fc0be515b2b38e01370d1c7d9ee3c6ece1be862b7d8c9882411f11 WHIRLPOOL 6d6e2b6322043bcd8822fb1e64a98b969ff1bba02d63442cf0646b737576ead76961a30cf146447afa0f72a2e9a30a05e6dad5f9060a00cd35e5cc2e15097889
 EBUILD fontforge-20160404.ebuild 2473 SHA256 312f3d44a8fbc19afd84fdc21aedfa1eab9ad93091012348d6b710a715079fd9 SHA512 b83e786156024e34042835af61205984e6d4c2d03dc20337b96e2228c2969073cdf130dcded5bd8e139a179b059096d62a5a88268d6645830e45932576d61e98 WHIRLPOOL cf97c18241aa93a0114c758d1bd515ffa50e20d02a1199f449271c05fb205d5ff3c03f3dd1af3b4ea1a4a8ea7b35e37d8f94298ce7022cac8af6d18822cadc6b
diff --git a/media-gfx/fontforge/files/fontforge-dummy-spiro.patch b/media-gfx/fontforge/files/fontforge-dummy-spiro.patch
deleted file mode 100644
index d2e73d5b179f..000000000000
--- a/media-gfx/fontforge/files/fontforge-dummy-spiro.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 63def02823e631cd73b763541a87d7c480be799e Mon Sep 17 00:00:00 2001
-From: Jeremy Tan <jtanx@outlook.com>
-Date: Mon, 14 Mar 2016 12:25:45 +0800
-Subject: [PATCH] Spiros: Add dummy _SpiroCP2SplineSet when compiling without
- Spiros.
-
----
- fontforge/spiro.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/fontforge/spiro.c b/fontforge/spiro.c
-index 629339a..bb2f36f 100644
---- a/fontforge/spiro.c
-+++ b/fontforge/spiro.c
-@@ -35,6 +35,10 @@
- 
- static int has_spiro = false;
- 
-+static SplineSet *_SpiroCP2SplineSet(spiro_cp *spiros) {
-+	return NULL;
-+}
-+
- SplineSet *SpiroCP2SplineSet(spiro_cp *spiros) {
-     return( NULL );
- }
diff --git a/media-gfx/icoutils/Manifest b/media-gfx/icoutils/Manifest
index 3a92eee0b06a..9505b00bf672 100644
--- a/media-gfx/icoutils/Manifest
+++ b/media-gfx/icoutils/Manifest
@@ -7,7 +7,7 @@ DIST icoutils-0.32.0.tar.bz2 593699 SHA256 17234d6e922f5dcd2dc8351a4b3535a2f348b
 EBUILD icoutils-0.31.0.ebuild 985 SHA256 9ac55e0707db7dc81de616d82884017ae6dbd052a06fa335be8d2fb0b8caa9e2 SHA512 917a7ad7167a16b4c661d0849d7dc443c409d1e0909e2c48cbcbb11d9a3aa8ed150da4ff47969f2f51268d83efc73518e17856ea8a39cf11000f8d6ca3b9923f WHIRLPOOL b05414c6de045088374ba9dffdc185b75611258022f1993e215a411c9bf19124316f5f02bd53eb703fedd51db9801fca56112ae30b7f3a2653081f4c05e4e73c
 EBUILD icoutils-0.31.1.ebuild 988 SHA256 4aa408e2a5f0e354d37d2bbfe1c09cb0576b1409a51b55089b21718e6cb022c5 SHA512 45be7bd50364f423c1cedefebf6e80afd854899f7f85084c0819ed9d3d7103c48c93243d9e80ae60992c80d6d428cc3da28120107f249b0b7152dd09120de326 WHIRLPOOL 0611443f25d876a47f8a6ad40b48461ff52e1cba51b5448def5f04366e2cca56ddfe5fabbe358c462a7010287612d6cd7edadb7fbeeef5ebe4d0b9a372f36e2f
 EBUILD icoutils-0.31.3.ebuild 1019 SHA256 1c1ac361c9ca3cebad4228447b15a3afdc6a562c094419fa0dc8248c8a111ad9 SHA512 0cd637de98d94afca95ed61ccf7bdb1ef331cc19eef08c7c13a568013a5cb3aa90b3c15c8c399b4ced503cf6d82b2a6b4bc41f55bf46caf3c69b501ae32b4bc7 WHIRLPOOL 2d780fe994f11b002c7b429dd7e5271cce9e56a5d5fc2827cc15e2ded4967884f5edf690b70d0220aad67aa3fa357cf33b9a033a69bff4de4ed858f53e753320
-EBUILD icoutils-0.32.0.ebuild 1024 SHA256 b0bccf081044322923ec604bf081c422fe42266516cd570fa7c7d1e4b6e6deba SHA512 99469f7108512c79bfca35e91575fbc696748a59da6e67a5e165b5ce591766fd896148c9623b20543e240b98fced84fbd212b68d87e13af990a84fbffb4b83b5 WHIRLPOOL 3db8c27917fd9d35c9496d54b344ace579217dfa70d8d09926c13f878dd1e966928c29a54665aa2b8148a3d2bfd56a38e45526cb92496e1558da5cac74f68b4f
+EBUILD icoutils-0.32.0.ebuild 1023 SHA256 d6f586ea2b04aa48121f2ffe4e1f50c9f1e59e64cfdd286983b27e868d7f734a SHA512 6d61698ff5051941507c585158f03fcf1809f5b98f48be1d3a5b704fb803faf9ae8943bd9ee9a78a0078c4d2641a1faf99be7d339cd601aec4c70fc3568e38d2 WHIRLPOOL d820e349279a80a7cef2f09e19e679091acdb1a121d0c1cbc07037015172c39ea23a7462f45b161be07d65bf79e0727cef8f6eaaf6fbfed416e2a00b4e3e2882
 MISC ChangeLog 2510 SHA256 16bb342dc64591f7a55a8eccb53a4437aa5de0c0d54683639d5f619f65b40b1c SHA512 3a3eb3226ac14a51798e9d5eccba44b0e008158487423fd6d0b4ac2a07ca2972d6a1700c8cb9a2f3952e7f789222ae8e7399e20fd97ebb421e06ca776ec36648 WHIRLPOOL b213562329abab32308e7ff7f3b621b30c09547095128af9da2bbe6e29d5729c3dc2ae7caafb2d0a1efb10bd86651de4b6e3e834a636e25574a77ae5f1132be5
 MISC ChangeLog-2015 4903 SHA256 b54828e070b7eac9017d1ec4e59e82ac0bb4d05c4b0357d48e72e9ac3ef958e2 SHA512 106efa193f846b6a13e0e7f7756998843cbba042c7c8b957e49c1b496360a74bcd517dc31a2088feebdf707adb6bce3591eb70433965aff89f0eeb065d322383 WHIRLPOOL 55ff0ac9c4a5ad4921d90ff0ce1c42a47c7a3ad110d05a91089e42f32101043f71651df828e95c0c08294849708bd0f1187c2cdf346fdc0bca583e2fe3a4d95c
 MISC metadata.xml 243 SHA256 cd3f53e40471c5030fe79b91a8d0dab307792eddd4b2d5e9ba9b6fb2425060b4 SHA512 3b619672a798fcaa808248ae187a6e6253bf1f693d2d9808ffb5b60d4d909130299512b623f7c9dbe6971ad15af7dbb6dd51e4b80f512abe0966dc46861fb775 WHIRLPOOL 0b98ded4f5352f03b68d62d5ed07b1f1b4fa09a6c4a39952fd28d589aad820b458a95ded468af6e3134bc10d4fe45d6acc46254ac3f9c8a891aa341d9810340f
diff --git a/media-gfx/icoutils/icoutils-0.32.0.ebuild b/media-gfx/icoutils/icoutils-0.32.0.ebuild
index da60b9007674..ec033fea47a4 100644
--- a/media-gfx/icoutils/icoutils-0.32.0.ebuild
+++ b/media-gfx/icoutils/icoutils-0.32.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://nongnu/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ~arm ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="nls"
 
 RDEPEND="
diff --git a/media-gfx/kfax/Manifest b/media-gfx/kfax/Manifest
deleted file mode 100644
index e5ee01dd9f0e..000000000000
--- a/media-gfx/kfax/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX kfax-3.3.6-kde45.patch 590 SHA256 9bb93095b05d87bb44cdf51792ed6ed6bf32c948e1d620263220086019ce2e32 SHA512 ed729a09c8bde5807f216782fd2ae0127ea9615ed65e225236bb81ffa33ec83c71dba5af30caac44a4a9401767bae30773db3724bdfa1aeba7ea4909b4331c22 WHIRLPOOL 97968e954808216da7e915e20c6d241e88a2a23ad9ff7b8c084b2241cb1716fdf7d647f362494a4d23e8e319b110b98cb7dd60ab74105e27736e45162a0314e1
-AUX kfax-3.3.6-underlinking.patch 525 SHA256 e2d1a22ae9c3b017671d15b0a7f976a1f98ec6ba6876cef0b94e9dfd8067a497 SHA512 0aed5084102b3ff03b384b67219f748c5de20ff23db257fad51180e7eaf1d0596587ff6523f94915aa10907aa84a781acdea4aeb0f0d3d576bf51aa719e900d0 WHIRLPOOL e65962cb180bdd79d4630493225ad731113b46d4d5e815b2e57e79575ec7c726d92adfc15fb5fdf0e6532faa714a50448aa6fa8847db6e2a4228f545171445fa
-DIST kfax-3.3.6-kde4.4.0.tar.bz2 311468 SHA256 6897b25f72a49c9bc0f99bf03fced5023c6d76e8746b23fd7ddf73b8a16c6d1d SHA512 a4e0cf2696878a74f190e3cf040c76c3f7c07c296b8aa4f5d80d52275e9af239e01d90b9d7965b3bbe081f81ece661d1339183ca1f6e2cb326da7ed46ee4a0f1 WHIRLPOOL 5f97ccfa73cd3871aa6a954292155ba06d6dbd66bbd579f13d880a5816522a6f9e9a4e81c785cc1dc6c1db436a04396767584e66240ea396b5051a75bb648728
-EBUILD kfax-3.3.6-r1.ebuild 897 SHA256 4aa62f8f1c2015996a6dff03dd1caea86f8716c0608d1fd6d494ec552f9f2b3d SHA512 94f4343a56e602db345a234a900e0d26127307320515e69e65dbc56f49dad2c3c54a6e9ebfbadf1c4ae6552916231b9f47734e6bc988cc84b2100d891f925157 WHIRLPOOL c94332eb1fdad876831501ede8fe7437591895e8bb002804848ab26a37c27e90f95c2bd08fea9deb990333c1b087a1cdd418fba8be2911eda9a936f9b13a9d5d
-MISC ChangeLog 2666 SHA256 d6b52125b1d55e0873a2bade21630566ccda8e07b7d82028ecd38f8b93e52344 SHA512 48d7ed70d9a915acf372e6848dc92d711e8b8acfafffb25f03bccda3f89836526dae6dc895b138056dc47abddcba6c6a6575812b1048b82e3b9a336946114b45 WHIRLPOOL 8c8255d6165599edfedc067fb488c3f62ce3a2446de354d77b116ee7e70a33a2c86f159c3fd604f2c986aaa35c45bdd2c1bb5085b30915890642da7d0fba5b7c
-MISC ChangeLog-2015 1065 SHA256 c4fac3da946e49154b33318349ac945786109a9a5f6f5b2c3c88a7c0f1bdadc9 SHA512 2b176a2a39279fd48bd93fe98ca297a258fc814760764792f72dcba5cbf1fc5ca3b881dda537704b921c28217349b3fc3ab63adcb17e27ef5e6bdb3cd620c457 WHIRLPOOL 95f87aa36d880f53ee389dc7634071ee9872cb4047ff2949aa419c24cdd2cda8e6172a865f161e4a89cb1823d14fc2546122fff76fb2cdd560408193ae048d3e
-MISC metadata.xml 245 SHA256 ae3610b0005f668b7174e8c49c0170e7642e895c8e13e7e2fedcfefee6940e1a SHA512 90bcfe500baf163912aaffc9958c9724c4a97cfca294cae6c2eea938f4ca7668c84b132b6dce55767efa47a28b9e87bb75e79634b59079ab8ef3eff3ea95968e WHIRLPOOL 7abb1ad699d5aa3a0a0ebb0e8704df297ad9a662698cb59d1b48700aeb787e6208540e1e84f583a46bdd9975e27a75f04f7463585790b4e7865d0edfdb1e13ae
diff --git a/media-gfx/kfax/files/kfax-3.3.6-kde45.patch b/media-gfx/kfax/files/kfax-3.3.6-kde45.patch
deleted file mode 100644
index 60bedf093eeb..000000000000
--- a/media-gfx/kfax/files/kfax-3.3.6-kde45.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ru kfax-3.3.6-kde4.4.0.orig/kfax.cpp kfax-3.3.6-kde4.4.0/kfax.cpp
---- kfax-3.3.6-kde4.4.0.orig/kfax.cpp	2010-02-11 21:52:12.000000000 +0100
-+++ kfax-3.3.6-kde4.4.0/kfax.cpp	2010-11-14 00:13:21.386377691 +0100
-@@ -829,7 +829,7 @@
-     statusbar->showMessage( i18n( "Saving..." ) );
- 
-     KUrl source(thispage->pathname);
--    KIO::FileCopyJob *job = KIO::file_copy(source, dest,KIO::Overwrite | KIO::HideProgressInfo);
-+    KIO::FileCopyJob *job = KIO::file_copy(source, dest, -1, KIO::Overwrite | KIO::HideProgressInfo);
-     bool ok = job->exec();
-     statusbar->clearMessage();
- 
diff --git a/media-gfx/kfax/files/kfax-3.3.6-underlinking.patch b/media-gfx/kfax/files/kfax-3.3.6-underlinking.patch
deleted file mode 100644
index 701308951b63..000000000000
--- a/media-gfx/kfax/files/kfax-3.3.6-underlinking.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ruN kfax-3.3.6-kde4.4.0.orig/CMakeLists.txt kfax-3.3.6-kde4.4.0/CMakeLists.txt
---- kfax-3.3.6-kde4.4.0.orig/CMakeLists.txt	2010-02-11 21:59:47.000000000 +0100
-+++ kfax-3.3.6-kde4.4.0/CMakeLists.txt	2011-08-11 21:33:15.262295828 +0200
-@@ -12,7 +12,7 @@
- 
- kde4_add_executable(kfax ${kfax_SRCS})
- 
--target_link_libraries(kfax  ${KDE4_KIO_LIBS} ${QT_QT3SUPPORT_LIBRARY} )
-+target_link_libraries(kfax  ${KDE4_KIO_LIBS} ${QT_QT3SUPPORT_LIBRARY} ${X11_LIBRARIES})
- 
- install(TARGETS kfax  ${INSTALL_TARGETS_DEFAULT_ARGS} )
- 
diff --git a/media-gfx/kfax/kfax-3.3.6-r1.ebuild b/media-gfx/kfax/kfax-3.3.6-r1.ebuild
deleted file mode 100644
index 7e08e6f702d4..000000000000
--- a/media-gfx/kfax/kfax-3.3.6-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-KDE_LINGUAS="af ar be bg br ca ca@valencia cs cy da de el en_GB eo es et eu fa
-fi fr ga gl he hi hne hr hu is it ja km ko lt lv mai mk ms nb nds ne nl nn oc
-pa pl pt pt_BR ro ru se sk sl sv ta tg th tr uk vi wa xh zh_CN zh_HK zh_TW"
-KDE_DOC_DIRS="doc-translations/%lingua_${PN}"
-KDE_HANDBOOK="optional"
-QT3SUPPORT_REQUIRED="true"
-inherit kde4-base
-
-KDE_VERSION=4.4.0
-MY_P=${P}-kde${KDE_VERSION}
-
-DESCRIPTION="A fax file viewer"
-HOMEPAGE="https://www.kde.org/"
-SRC_URI="mirror://kde/stable/${KDE_VERSION}/src/extragear/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="4"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-RDEPEND="
-	x11-libs/libX11
-"
-DEPEND="${RDEPEND}
-	x11-proto/xproto
-"
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=(
-	"${FILESDIR}/${P}-kde45.patch"
-	"${FILESDIR}/${P}-underlinking.patch"
-)
diff --git a/media-gfx/kfax/metadata.xml b/media-gfx/kfax/metadata.xml
deleted file mode 100644
index 0cf59224b009..000000000000
--- a/media-gfx/kfax/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>kde@gentoo.org</email>
-	<name>Gentoo KDE Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/media-gfx/sigal/Manifest b/media-gfx/sigal/Manifest
new file mode 100644
index 000000000000..40b0b395b0e8
--- /dev/null
+++ b/media-gfx/sigal/Manifest
@@ -0,0 +1,3 @@
+DIST sigal-1.3.0.tar.gz 3267422 SHA256 71074e29bdede46866a46502629f7165057d269c1b63b5fba0dc40d029926059 SHA512 132c94a472301a2cc81a4aef13afa8137a6b69dfc035821e22fca6b0598cb94f1788f1a8cf1b47412214c9480867be816070aaa938290a1d10bccc407c38aaf4 WHIRLPOOL 833aad3f72cd298c5f6ae8172845b3fbec709686ec1b2ee0537f06bff1b1af53b7ec5f0d94880a2058512817f6ec14752dbf963cf0506efc9c49f3725b5a9dc7
+EBUILD sigal-1.3.0.ebuild 819 SHA256 44e4ee77d06817e676106aff5372d6a526f6db4bb50e2ba447b007c7a9df9119 SHA512 ba97512d2ce5627ecdc6e56ffb0122dda7fda82d0193111695e19fea206923975af8cbab3b4d3df1ff2334597540b6531e95425bfd31e91728d9223f5d05e9c7 WHIRLPOOL 4357768d112bda6e02a304404ae1ef71299ba2703c39720ad6095376ad98c24410945207012b8414772a5dca53180a368d4953a4dd7a8db158bbe3f9ef3d4a47
+MISC metadata.xml 1062 SHA256 7aefb0a469bca619b9ae137562f3f58a4b9c564fb9a8be20b7c42c5ae4e0cf9b SHA512 d49289c1dbd612fe88b6ef3d883b073c4b2985839decd5d3b9d73a3c24e0aa83e37890068be8e127ad1f88f86b9b37f7f2f61299c431b3a21b6219f2671a73d3 WHIRLPOOL 678f98984adbeec737e52f9565b4523e082f7f1daa9b7ec4e003c0b2ed2d7503ee0091b6bb81bda5ec673bb212a365e97c5270e3376e2a35ac17a1cce13d2f95
diff --git a/media-gfx/sigal/metadata.xml b/media-gfx/sigal/metadata.xml
new file mode 100644
index 000000000000..8a8f5b028e46
--- /dev/null
+++ b/media-gfx/sigal/metadata.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>thomas@gstaedtner.net</email>
+		<name>Thomas Gstädtner</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription>
+		Sigal is yet another simple static gallery generator.
+		It's written in Python and it allows to build a static gallery
+		of images with the following features:
+			- Process directories recursively.
+			- Generate HTML pages using jinja2 templates.
+			- Relative links for a portable output.
+			- Support themes, videos, EXIF tags, zip download.
+			- Parallel processing.
+			- MIT licensed.
+	</longdescription>
+	<upstream>
+		<remote-id type="pypi">sigal</remote-id>
+		<remote-id type="github">saimn/sigal</remote-id>
+		<bugs-to>https://github.com/saimn/sigal/issues</bugs-to>
+	</upstream>
+	<use>
+		<flag name="s3">Enables support for the Amazon S3 service.</flag>
+	</use>
+</pkgmetadata>
diff --git a/media-gfx/sigal/sigal-1.3.0.ebuild b/media-gfx/sigal/sigal-1.3.0.ebuild
new file mode 100644
index 000000000000..735f9a67f9f2
--- /dev/null
+++ b/media-gfx/sigal/sigal-1.3.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Simple static web gallery generator"
+HOMEPAGE="http://sigal.saimon.org/"
+SRC_URI="https://github.com/saimn/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="s3 test"
+
+CDEPEND="dev-python/blinker[${PYTHON_USEDEP}]
+	dev-python/click[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/markdown[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/pilkit[${PYTHON_USEDEP}]"
+DEPEND="${CDEPEND}
+	s3? ( dev-python/boto[${PYTHON_USEDEP}] )
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+RDEPEND="${CDEPEND}"
+
+DOCS="README.rst"
+
+python_test() {
+	esetup.py test
+}
diff --git a/media-gfx/wings/Manifest b/media-gfx/wings/Manifest
index 6062e40b1d89..eb599a69bcef 100644
--- a/media-gfx/wings/Manifest
+++ b/media-gfx/wings/Manifest
@@ -3,7 +3,7 @@ AUX wings.sh-r1 181 SHA256 c5d1cebeba69189985c4ce2e98d35c20336e9f67e8b0981becb1e
 DIST wings-1.1.1.tar.bz2 1932572 SHA256 1a75a39a1a4586b242558a879d611adf1566b86785750f48ba60d851c2e40d08 SHA512 e60727328c9431738736466444655f54694973e59ad73e60874450845b080bf65c6b784ee0cb06cdff98f3717841dfbeceb5e36a1c55d98f31f280b972b7a2e3 WHIRLPOOL 9868a2ef5571291fa98db5239d767026d3cb0962c417bea77d7555ed2ff3d7fcded2200cad9347f5c0bb39591037fac9096cb7518f8285d2a3597a607c557d5e
 DIST wings-2.1.5.tar.bz2 2653117 SHA256 f0f03cfe9f0ee0ee6c734a2b7e50410d5f21238441cb1f34422b0ecde25b582c SHA512 37f363f39d0618550d7814733a4e52c18b52c7d8ee357c76dcf97ae1b530f5b941bddecfba18d63538792dda3ca3013055759595157832e11e017bfe18b34df0 WHIRLPOOL 3fd9c2008de69a6534d95c4e54d0b27d53e91efbfcabee5090abba03e23a25f8dea4a9ce5d9ec543e59dd2e773bb3ed2ad13c2824027bbe78296dad37a8db768
 EBUILD wings-1.1.1.ebuild 1046 SHA256 ba640aabbd693f3f3362776f706c06faaa91a30a09d957bc7d9f7fffdbdfc99c SHA512 8c2595e176d6f4bcc87b538c8738d5f6f10a0ce6d0d9c52401b958d41a8b04db6b31d7b41bd248517b4a9016efdf00d4dd8e694f10863516f34bdb38f198cb6e WHIRLPOOL 12c330e05773b52781c9499eb8ec27cb25072f5526497bc90d477f8096a093e7070d544f4b1dada7a748cc6b955707a5cccb513482c710758bb11dbacf250000
-EBUILD wings-2.1.5.ebuild 1035 SHA256 e33c2975238c514053fcd73e49afa74bd259db7258f722a04498be7e179516fd SHA512 beafe5ec27693942af4d2e398fd153dbc5d43a7ad6e0b7111e46e7160aee74405818b064b8d20ccc11299f1118e2857392dce7ce633c5dbaf792a274d1517366 WHIRLPOOL ae928c4a758744abf0579688d71b6e1b0a89c4ca9354522171ac88bf6f5a8cdabd2fcb578250344955215f64f2b36ce5964a46a92087286dd17d7dc6cf97ea68
+EBUILD wings-2.1.5.ebuild 1190 SHA256 ea3ab063cc1ff589f44b4f83e149e71e2505f3525027c34c7f9f2a331bbd1495 SHA512 387ae28ae4a7c06335fcf2bb4f891c1497029ae02d4f18b05819932ff17208fcd8dd6f41b2022b8dd1cc24fdc2004c64132705f555ab5a27bd95812d9ca12964 WHIRLPOOL 27f44cac7b2685dad2be3d394c6e8dcca12495df3ca7730c79382b627216cb09bd24061e139db2ab9e9af89e5cbd6427d2f602855b8ff28d1f84fb9943d5140b
 MISC ChangeLog 7681 SHA256 0d7f20b9d497cf10b14e27315ca6ff906f51f25b2b7b2b554cdfa192c0758b3c SHA512 27d89dea063105905002898f193a36c181e38e033e0a996cf030b1b02cadeeef3d0aa69e2022dd269c9c00374ac6d2b5e8efabae9e05f156110a4a95468d87ae WHIRLPOOL 35cd6409de1eeb192358038ab49968f84f2efcc2c0ce9ea1aed54199ab86d72a35a150f54920567576cd73bbe2ca1d47ba9097d35ddbc71b9ed97960ad3f7f5f
 MISC ChangeLog-2015 3731 SHA256 d4eff20d6c0d5e32e9066de7aa5544633e9964435f8b86c463aefaac13677bb8 SHA512 b7f7bb2ca7f20120f6bfc311e0d07e11e208b49c6c08f9987aea58a1f21b20067a98c1b29e75191e9cbf54e3dd621e6eef063e469adfd454c6320caec0d74aec WHIRLPOOL 9a873611ca5c01a684b64a78c04c96f0e350b2ca9ded9c818ef2011c78af96a20542116e14da8b786e995c5e3c7f38bf29ef8f1471dd1b375e52fc463db3d03a
 MISC metadata.xml 730 SHA256 2222ffd522fe8c26a81da496d19fa5941a02e7e4171634735acaa2dd0871d86f SHA512 7672ac58e0f7ba153b0a5939cf8e426e8c3f8c97366436340e1bbb65e85a785add4c6394e81e1aade634f58d8751a85ba75cbb1bb57fa822773a632736d96086 WHIRLPOOL 5f1a885377987d2d28481b98ca29bf989a8c8f80af3b3052591bc4d6b08941bf9f026d8148f31f89e73b850161240faa044d36cdd056ab86ba145c3e60a6e8f7
diff --git a/media-gfx/wings/wings-2.1.5.ebuild b/media-gfx/wings/wings-2.1.5.ebuild
index 212860eb8a20..e8f31fd40fc4 100644
--- a/media-gfx/wings/wings-2.1.5.ebuild
+++ b/media-gfx/wings/wings-2.1.5.ebuild
@@ -15,7 +15,9 @@ KEYWORDS="amd64 x86"
 RDEPEND="
 	>=dev-lang/erlang-18.1[smp,wxwidgets]
 	dev-libs/cl
+	media-libs/glu
 	media-libs/libsdl[opengl]
+	virtual/opengl
 "
 DEPEND="${RDEPEND}"
 
@@ -26,6 +28,13 @@ src_prepare() {
 		-e '/include_lib/s|"wings/|"../|' \
 		$(find . -name '*'.erl) \
 		|| die
+
+	sed -i \
+		-e 's|-O3||g' \
+		-e 's|-Werror||g' \
+		-e 's|CFLAGS = |CFLAGS += |g' \
+		$(find . -name Makefile) \
+		|| die
 }
 
 src_configure() {