gentoo resync : 31.10.2017

14 files changed, 69 insertions, 86 deletions

diff --git a/media-gfx/fbgrab/Manifest b/media-gfx/fbgrab/Manifest
index 856568399150..50221edfc39c 100644
--- a/media-gfx/fbgrab/Manifest
+++ b/media-gfx/fbgrab/Manifest
@@ -3,7 +3,7 @@ AUX fbgrab-1.0-zlib_h.patch 263 SHA256 fffbd6136989d303ecbaceae285973e3cca9e3c14
 DIST fbgrab-1.0.tar.gz 11928 SHA256 9158241a20978dcc4caf0692684da9dd3640fd6f5c8b72581bd099198d670510 SHA512 83346be21b3dc393165cfbb210284679e9fc746380fde9939d96d8174cd320d71cc6bfbf23a9495a107c8f0a6ded43342f843b530996f695ebba0388669a35f0 WHIRLPOOL 9b697c073dfb38bd50c426b20217eb979429fea70728002aa90c1466094dc384b10cbe9879ea0fde85053c56f88b8a4099ac5dcdbaa8e1fd2bc9b8a3782fe6ab
 DIST fbgrab-1.3.tar.gz 13027 SHA256 5fab478cbf8731fbacefaa76236a8f8b38ccff920c53b3a8253bc35509fba8ed SHA512 2d1166890f41d7de813a6c9b722db148980fcc802da38dea1a42d1f150cbdc16d0dd6757bc334586402f109b382e5039d44b03f9f19024f546958bdf21ca5d52 WHIRLPOOL 55bd2d203592312a661fd0699b375b1e4c2699e61d41acaa56426146ba42f34744b8a6748af6e54f9d7b548ef0308c7874d8337ad250b3dc2fd0559cb9f9b162
 EBUILD fbgrab-1.0-r2.ebuild 685 SHA256 7a4c27ac4af654ebabe14acbd2f6b906c20f34c33f0679b75a6b367761b34bf1 SHA512 14d6ae3aeb8fa23f7356b97c13b7918c8385242081b45159139678bddb1d7a4d28789b1474fdd0049a89d9f8034672a55e9602ad216d4253d45ef086ec813ca9 WHIRLPOOL e7f6aa1e264010f39bb3d4075f46ab47c75350cbc6a4cadc55c97fdf0e7a4f608799374b6ad7947a78de02b53ecdc9348fb3bb83e4759363ae1f3ff199d44dd0
-EBUILD fbgrab-1.3.ebuild 627 SHA256 1a4f59ef57732854ae57273c9284623f0506679eb4f015047ca66c29cd5b60a0 SHA512 02dea52feb8122551828713210d1eac914c83c23db299db60bd443de84505d625aff0198c6950bd34708a10736842f5fcf0bc4fcf5d0f440f4c83e06ad9167be WHIRLPOOL 83dc363f4c139a3f84641fd1021327a139613795de6625e11bddaf4e744c7011cb3ef1ed252e267b76599fd5b17931af99049ac7db75a83985deb2f73b7df97c
+EBUILD fbgrab-1.3.ebuild 625 SHA256 64c204505a3b02b6c7780b2aa5800b650bfa8c40850996b2655806408700cdad SHA512 3af9bd0e54f88faeef9aea4eedec5a90160c1d6a528a7cadc650faffa190acb5c88f92e3f27a44f1a2e69983859f5b3e7f9345707c3035172a5b165a7d59a784 WHIRLPOOL c7f565f5d744734d4372cad72aa5a327bbf25ef1d0387bd9d32322456cfee366198d3d502b872924e92e39f39d02b828069d22e798e94c169150c40cce7013a6
 MISC ChangeLog 2459 SHA256 4c93a18672c9d63b649059f97b8e186fe42dedd0962917a4b450f683185176f9 SHA512 72f55ff29c6bd95b06910b307c4136939eca8e2e3bcade7a65ad4ca81e88afe3a5c04c89e7ddab08024848d65662a2804561507e9a6b16712b230d64234e6c5d WHIRLPOOL 7aa455af2c48fa0d6b032e61f531f6dd371ddbe84ca1833027595905a0e29fc66ad4e8fe440c33322426239738336752b53590879881359ae61e2996c7d1dae8
 MISC ChangeLog-2015 4123 SHA256 11f4ddcace8ef94ef4568862fa401d03e30d5995d223a287dcab75a26f265dc5 SHA512 527c23ad6c7cfae0d0a8f029a3526b3f65c541f1b59f832b6092b47a01c7858ef7d4c8b8369836adb842d2c37dfaf533c82343006ebba44d2ae3967f9e040379 WHIRLPOOL 6270eca1a61039e148a7709b8cccb620791ae7d701955714cbf58a241c460444fda98cac456c5861e35a2b485f364b61d75f68f174bdf2e1683dba986887bda6
 MISC metadata.xml 355 SHA256 e068e9fb4db701dfb5f944b88e8ff83ed61c32384660c9e7b32a7539d8ca8044 SHA512 31b407791cd97b141997fff192ac75298957edee59fe3a9c46d7a08f839b99ca2e4f3536632beca933d74a8e22464dbd7fd34fa61c106829c62c8dc69b1b8231 WHIRLPOOL c788c7b91a8921fad524e903abc6b88ab159f5baecd90c7879e41388b41f786cf4669b6fb8155caef9eef7a1d5400e9f7048951e8aad1f5cfe2ef4bdec9a03c5
diff --git a/media-gfx/fbgrab/fbgrab-1.3.ebuild b/media-gfx/fbgrab/fbgrab-1.3.ebuild
index c1b9e87b65a0..acfe7b11d98d 100644
--- a/media-gfx/fbgrab/fbgrab-1.3.ebuild
+++ b/media-gfx/fbgrab/fbgrab-1.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://fbgrab.monells.se/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ~ppc64 ~s390 ~sparc x86"
 IUSE=""
 
 RDEPEND="media-libs/libpng:=
diff --git a/media-gfx/gphoto2/Manifest b/media-gfx/gphoto2/Manifest
index 367b8f9f2e53..617dbffdcfba 100644
--- a/media-gfx/gphoto2/Manifest
+++ b/media-gfx/gphoto2/Manifest
@@ -1,7 +1,5 @@
-DIST gphoto2-2.5.10.tar.bz2 784459 SHA256 66cc2f535d54b7e5a2164546a8955a58e23745e91e916757c0bf070699886690 SHA512 b6bca41b9787a475eaa0d094a2de261d1013fb2845fd7f3735099100df243860e50d3cce8a1e5afd8c29a4dcfc65367f83b0fc85185b80f5de732bf3faa0e06d WHIRLPOOL 2f3c15c675803206cfad5f4189e47f9e5a03b4ad1c45b1c94f87aaebda69ad7929f51496b3c1e511cb7f809c50aedae29ad1171e96eb0790118b4efd47e09d41
 DIST gphoto2-2.5.11.tar.bz2 785251 SHA256 392844d6a06512b0d85e7983a5a0c85c8039feb6ab3bc420674ffdbf7536f9e9 SHA512 e1393797eaf94f4d6226fdbc390145c7a0caa5ed3422ab34185b27666887cd79bf832f7ff3a580aa5ea8740b429b235079e54f40a1bc92e37e0051cfeea5fa9a WHIRLPOOL d9a5b48ea230fcdbe7bdeba2337d6276d78bb8c8c83fe06a5a5272a8339bb2462c035bd943f021ff30029fcbf93b74811f2a55198f832cdf06bd417bf5279c61
 DIST gphoto2-2.5.14.tar.bz2 784442 SHA256 9302d02fb472d4936988382b7277ccdc4edaf7ede56c490278912ffd0627699c SHA512 47cb0d212673c9c0dbc996e0a67191a307599c844293a67184bd1529d9e3b417e154c6de64f4563f6f7e599a1bd6b127266f85f5baa97bd7d86922405bf45331 WHIRLPOOL 333bc0925b36ff5254a5e1d740536129ed08bdbfde7c57ba337aec7fe8cd2dcf8720ab6e1b13dc469b86cd10918926daa65f378e12cf0f29ebe2ff71a5cf62d4
-EBUILD gphoto2-2.5.10.ebuild 1258 SHA256 07cf6cd804166f391501dcef1689ee97c905e56845c3cf5f3ef6b8f1797bee86 SHA512 3566fa93cf6afa51f4673a862c9f26689a8d64e127b9eb8f268d278335171333051ea7bb809efce21d4ad69a4b8936af50db3e2d02b8e22b5298147a3494c341 WHIRLPOOL 7d9468c6ea58253239f22110bf9d31f3be2073e39c23e8fe5613d04fd8aabcfa500ba3135b172573c85f48a5471f6f43d420bb7d3b0b25c20a9d04bc953042bd
 EBUILD gphoto2-2.5.11.ebuild 1393 SHA256 7b34c6f5dc94184f5e135fe78cd8f31e9cf673d34da511343fecf9ca010effea SHA512 c467516e247d1c0b6579ea1b5e0b6e706883a52ffc8848ee6a5d8533d69387d675362621b47a45c5b2fc1f4681aa9793d6dd2e1421da7e04f1a8895163bc397a WHIRLPOOL f64749e0a108cbda6cb2dd12d9ae8b15500a3a04c1ccbb446c48fb57221f76faf5aa480e2682a2c86791e9c6b6d87dd5b3f8c0d79d241ff4cfa7df93210f75eb
 EBUILD gphoto2-2.5.14.ebuild 1394 SHA256 6ab0f48523a5c5dcdd8b170fe6579a463425a19b8054f5e690caeaa64016b99b SHA512 784091f949aaa895bcc0a4b04f8b9ccb7c7953adce5c512ed9019b72fc321e2951f426fb413cefeddcd572fcf853e9c19173b864aaaeb870341617b85d1970ab WHIRLPOOL c91431f176da9f4635084ca67c85c37fd947d0caddc135e9cba234e674b571e486f68e5ec05d0ed53b12a0942481379b06fe9b71f3a03a63254bbf23d2eeb250
 MISC ChangeLog 6553 SHA256 f8ecc7ea4f29c4d7685825c7202177b3f921a5d1aaa3d3b651939d50ddc147ee SHA512 76d83584319485d19314f6432533aeb8adc43a99c8f34151a21ddad065f17286eebfba52a0d1c515dc60dc2b85fe434a1b0c5276529a150830152f63d7975d8d WHIRLPOOL 49228705dce8fa812215b238c99811f41dc91a771b4d3c410cdafa0027179b7b2a5a580c7d05c24895fd894f70735240d4c233aef8cb540797a4b27484cd20dc
diff --git a/media-gfx/gphoto2/gphoto2-2.5.10.ebuild b/media-gfx/gphoto2/gphoto2-2.5.10.ebuild
deleted file mode 100644
index e5942a1eb4ab..000000000000
--- a/media-gfx/gphoto2/gphoto2-2.5.10.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools
-
-DESCRIPTION="Free, redistributable digital camera software application"
-HOMEPAGE="http://www.gphoto.org/"
-SRC_URI="mirror://sourceforge/gphoto/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ppc ppc64 ~sparc x86"
-IUSE="aalib exif ncurses nls readline"
-
-# aalib -> needs libjpeg
-RDEPEND="
-	dev-libs/popt
-	>=media-libs/libgphoto2-2.5.10:=[exif?]
-	aalib? (
-		media-libs/aalib
-		virtual/jpeg:0 )
-	exif? (	media-libs/libexif )
-	ncurses? ( dev-libs/cdk )
-	readline? ( sys-libs/readline:0 )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( >=sys-devel/gettext-0.14.1 )
-"
-
-src_prepare() {
-	default
-	# Leave GCC debug builds under user control
-	sed -r '/(C|LD)FLAGS/ s/ -g( |")/\1/' \
-		-i configure{.ac,} || die
-	eautoreconf
-}
-
-src_configure() {
-	CPPFLAGS="-I/usr/include/cdk" \
-		econf \
-			$(use_with aalib) \
-			$(use_with aalib jpeg) \
-			$(use_with exif libexif auto) \
-			$(use_with ncurses cdk) \
-			$(use_enable nls) \
-			$(use_with readline)
-}
-
-src_install() {
-	emake DESTDIR="${D}" \
-		HTML_DIR="${D}"/usr/share/doc/${PF}/sgml \
-		install
-
-	einstalldocs
-	rm -rf "${D}"/usr/share/doc/${PF}/sgml/gphoto2
-}
diff --git a/media-gfx/icoutils/Manifest b/media-gfx/icoutils/Manifest
index 53701107eb95..9db3dcd5a5cd 100644
--- a/media-gfx/icoutils/Manifest
+++ b/media-gfx/icoutils/Manifest
@@ -3,9 +3,11 @@ AUX icoutils-0.29.1-locale.patch 831 SHA256 dcbe19a6826c339bcde7773b18947ec47931
 DIST icoutils-0.31.0.tar.bz2 559836 SHA256 a895d9d74a418d65d39a667e58ae38be79c9e726711384551d36531696f3af71 SHA512 f6ee954784abd9f6cf1f6a2424b89e917de2e3950a5411c6790f1a7a34522e067308677ab00bd34781d179fde1192ec91dcd400207edb09bdb20d503507b5cca WHIRLPOOL 92a3905315973ed016bb2000881d5c39f7306c792feaed302bf183d62056217a9aa76e90dc25a44ffb43434053f3c5ced90e100bd59c284a26fa14b7ffbe0b4a
 DIST icoutils-0.31.1.tar.bz2 573484 SHA256 26e29d3c78f25d4cdf402501ac0414c51a9a092daebf6c9dee3b837dee693093 SHA512 47fe41429cee73b6aff90e2b385b621314700dedfe09989318e439b19a484d806a9428652008be2db70598ba1337e860fba30b6d8104525f9e0bcbb4dc61dc56 WHIRLPOOL 893fbbf7f4dd1ebb06c14d22baf0ac1c126941688ac451b4976e1d0d505056714361f8ab99e2c8f080e20b0d1a8670e375cc2f663ab2bb8861e0af1152fb7504
 DIST icoutils-0.31.3.tar.bz2 593403 SHA256 d4651de8e3f9e28d24b5343a2b7564f49754e5fe7d211c5d4dd60dcd65c8a152 SHA512 3c25dfff0d947ad4688e57871888b7d03ecc1d5aaf2dd957bbfd5d034cbde03238a03446a719b637d2f0c309af424359435d98bddfbdf1ea9d4c08bb23f154d8 WHIRLPOOL 4c0d34484d956f8817b25ed87e36d868ad35ec74d49ad02b4503c3029ab0253b8bbf38b5687f965fe609b4e6d42a1be1da8debe2f8ec5e168136fe7833e341ab
-EBUILD icoutils-0.31.0.ebuild 1004 SHA256 207b9fb11d387366e03218bcbb24c9ec8460eaf72b6da4e145a7465e55f87015 SHA512 5e82edbd17a21b2ed1526738cf508ae3fe01b4b29176d78702f0eeca7fa36f4b3421eedad22cb6b83723a18408b84be480c607cf2755458905bf1ad2385f6a2b WHIRLPOOL 19b0c7f843f3ad164d56ff39939b15f6a928953a2e028cea2305041103efb6a0e7b9d30d60833b830e9c98f9ef9ed817c0615d408903f1893a7de49c64b5b638
-EBUILD icoutils-0.31.1.ebuild 1007 SHA256 4dacb5c5a9599d50d94bdd0e68fc90676cd96149a65f05f04c79cdfa508e0b2b SHA512 cf84f5caf427ce6a5aa454a698888338c46c3f2e99b084a0dba71030ce4048d62c7491e2d1d1cc20fc0c7f653ecbeb67c6f948c51a0eb8c5da34cafa10b5e236 WHIRLPOOL 8281e7a183404bdce1e89fd4825744fbabf1019664feea8a5c542524ff56773ab7e0fb454f57af605078e8ab2dd05542d6341a98891ce99b4484ab558bc08b67
-EBUILD icoutils-0.31.3.ebuild 1038 SHA256 43a080d957d2d2fe623568188ece6ed2798e9041f0ac2c023bfc8a2bfea4dec3 SHA512 90954b017763bfd24a215189739b5b0fd7572113b1a5bbf24a184429d4125713811aaf08bd6212fea89745ae2bae82bb91d2264843ead403936f936fc576395c WHIRLPOOL a34e9ab609517ea838a83b24ad8e3cdc2b76d7f5783570774ec52a9d0d7dcf55fa09b814f321d7f8858abf125765af893723dd4a75276cccb160d79e0d2095ca
+DIST icoutils-0.32.0.tar.bz2 593699 SHA256 17234d6e922f5dcd2dc8351a4b3535a2f348bb9b92c17ca3e438132147019ca6 SHA512 35fb584611edefe4445784e61e9cc10bdc039fc4106b7dca7faf66ca1a252ad6dc6e3511b4a5aba744ba74b51315a757addce2f8d5b20a1d7e38886e3eecd878 WHIRLPOOL 2d19d75271c0cd4abae9d80671e8422f33a8e95c4252323292c8d89eaebd1a3442e2f37c680a2068b5a740b77003fb8479c00f6d21647b6116ae8f31577ff46e
+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 1025 SHA256 8dc0a7f3cca43fb97fc59d8c5c257743d121bd96b7482e5f1392a7b069608f04 SHA512 5f4c2cd6c800edfc8601f4de3dd0494fa6bac397ce3be888c6d3dcd00073c4253acb54c62e1c758b880823d9f0a1dc267f1285872d53f2b902e78be9c588791e WHIRLPOOL 625ef6df9099d167c675d8596d444e943815d04d068a1fe2602d74892c46545bc56bf1f91fb0be3aee5953edae4911ac6e83c501954521a70088a1b48cd047f5
 MISC ChangeLog 2510 SHA256 16bb342dc64591f7a55a8eccb53a4437aa5de0c0d54683639d5f619f65b40b1c SHA512 3a3eb3226ac14a51798e9d5eccba44b0e008158487423fd6d0b4ac2a07ca2972d6a1700c8cb9a2f3952e7f789222ae8e7399e20fd97ebb421e06ca776ec36648 WHIRLPOOL b213562329abab32308e7ff7f3b621b30c09547095128af9da2bbe6e29d5729c3dc2ae7caafb2d0a1efb10bd86651de4b6e3e834a636e25574a77ae5f1132be5
 MISC ChangeLog-2015 4903 SHA256 b54828e070b7eac9017d1ec4e59e82ac0bb4d05c4b0357d48e72e9ac3ef958e2 SHA512 106efa193f846b6a13e0e7f7756998843cbba042c7c8b957e49c1b496360a74bcd517dc31a2088feebdf707adb6bce3591eb70433965aff89f0eeb065d322383 WHIRLPOOL 55ff0ac9c4a5ad4921d90ff0ce1c42a47c7a3ad110d05a91089e42f32101043f71651df828e95c0c08294849708bd0f1187c2cdf346fdc0bca583e2fe3a4d95c
-MISC metadata.xml 607 SHA256 8dbe241b0fb3ba0cccadaa8f635a29d0430cc6a4a16b132ed30d8285513acb73 SHA512 5e47301ff2b8831e681251443f94c4008c0406e03b691e648566f1208829c6d56e4a42bb7add3c00dfcd5167fc169ba5de5244e8d18333e2b75e597f85318544 WHIRLPOOL 1d3dc72efe319a19676a7cd33ad6e584dc99657ffc2df69c01c4faed594a507b1b6ccf303b7e8f964e2f74e3a8927d4bafcd0ff5295049f95cf0c9d988963148
+MISC metadata.xml 243 SHA256 cd3f53e40471c5030fe79b91a8d0dab307792eddd4b2d5e9ba9b6fb2425060b4 SHA512 3b619672a798fcaa808248ae187a6e6253bf1f693d2d9808ffb5b60d4d909130299512b623f7c9dbe6971ad15af7dbb6dd51e4b80f512abe0966dc46861fb775 WHIRLPOOL 0b98ded4f5352f03b68d62d5ed07b1f1b4fa09a6c4a39952fd28d589aad820b458a95ded468af6e3134bc10d4fe45d6acc46254ac3f9c8a891aa341d9810340f
diff --git a/media-gfx/icoutils/icoutils-0.31.0.ebuild b/media-gfx/icoutils/icoutils-0.31.0.ebuild
index db7c409d2c2f..5e675e469406 100644
--- a/media-gfx/icoutils/icoutils-0.31.0.ebuild
+++ b/media-gfx/icoutils/icoutils-0.31.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
 inherit autotools eutils flag-o-matic
 
-DESCRIPTION="A set of programs for extracting and converting images in icon and cursor files (.ico, .cur)"
+DESCRIPTION="Tools to extract and convert images in icon and cursor files (.ico, .cur)"
 HOMEPAGE="http://www.nongnu.org/icoutils/"
 SRC_URI="mirror://nongnu/${PN}/${P}.tar.bz2"
 
diff --git a/media-gfx/icoutils/icoutils-0.31.1.ebuild b/media-gfx/icoutils/icoutils-0.31.1.ebuild
index 772d516133f4..07c8686f4234 100644
--- a/media-gfx/icoutils/icoutils-0.31.1.ebuild
+++ b/media-gfx/icoutils/icoutils-0.31.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=4
 inherit autotools eutils flag-o-matic
 
-DESCRIPTION="A set of programs for extracting and converting images in icon and cursor files (.ico, .cur)"
+DESCRIPTION="Tools to extract and convert images in icon and cursor files (.ico, .cur)"
 HOMEPAGE="http://www.nongnu.org/icoutils/"
 SRC_URI="mirror://nongnu/${PN}/${P}.tar.bz2"
 
diff --git a/media-gfx/icoutils/icoutils-0.31.3.ebuild b/media-gfx/icoutils/icoutils-0.31.3.ebuild
index 4241e878763a..853d0d254623 100644
--- a/media-gfx/icoutils/icoutils-0.31.3.ebuild
+++ b/media-gfx/icoutils/icoutils-0.31.3.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 inherit autotools flag-o-matic
 
-DESCRIPTION="A set of programs for extracting and converting images in icon and cursor files (.ico, .cur)"
+DESCRIPTION="Tools to extract and convert images in icon and cursor files (.ico, .cur)"
 HOMEPAGE="http://www.nongnu.org/icoutils/"
 SRC_URI="mirror://nongnu/${PN}/${P}.tar.bz2"
 
diff --git a/media-gfx/icoutils/icoutils-0.32.0.ebuild b/media-gfx/icoutils/icoutils-0.32.0.ebuild
new file mode 100644
index 000000000000..e8bb27ce8147
--- /dev/null
+++ b/media-gfx/icoutils/icoutils-0.32.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+inherit autotools flag-o-matic
+
+DESCRIPTION="Tools to extract and convert images in icon and cursor files (.ico, .cur)"
+HOMEPAGE="http://www.nongnu.org/icoutils/"
+SRC_URI="mirror://nongnu/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="nls"
+
+RDEPEND="
+	>=dev-lang/perl-5.6
+	>=dev-perl/libwww-perl-5.64
+	media-libs/libpng:0
+	sys-libs/zlib
+	nls? ( virtual/libintl )
+"
+DEPEND="
+	${RDEPEND}
+	nls? ( sys-devel/gettext )
+"
+
+DOCS=( AUTHORS ChangeLog NEWS README TODO )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.29.1-{locale,gettext}.patch
+)
+
+src_prepare() {
+	default
+	rm m4/po.m4* || die
+	cp /usr/share/aclocal/po.m4 m4/
+	AT_M4DIR=m4 eautoreconf
+}
+
+src_configure() {
+	use !elibc_glibc && use !elibc_musl && use nls && append-libs -lintl
+	econf $(use_enable nls)
+}
+
+src_install() {
+	emake DESTDIR="${D}" mkinstalldirs="mkdir -p" install
+	einstalldocs
+}
diff --git a/media-gfx/icoutils/metadata.xml b/media-gfx/icoutils/metadata.xml
index 5753237ba130..43b420a338cf 100644
--- a/media-gfx/icoutils/metadata.xml
+++ b/media-gfx/icoutils/metadata.xml
@@ -1,16 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-		<maintainer type="person">
-                <email>res@crystalspace3d.org</email>
-                <name>Frank Richter (upstream)</name>
-        </maintainer>
-        <maintainer type="person">
-                <email>patrick@gentoo.org</email>
-                <name>Patrick Lauer (proxy)</name>
-        </maintainer>
-<maintainer type="project">
-                <email>proxy-maint@gentoo.org</email>
-                <name>Proxy Maintainers</name>
-        </maintainer>
+<maintainer type="person">
+	<email>patrick@gentoo.org</email>
+	<name>Patrick Lauer</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index 1a85c9687817..af1254dbff0d 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -7,7 +7,7 @@ DIST ImageMagick-7.0.7-6.tar.xz 8556160 SHA256 52ae1acad9cfbba871b9d3cf033235067
 DIST ImageMagick-7.0.7-8.tar.xz 8797060 SHA256 547826f95a23ad3a1a6a514c0bff16ae875f6b7211809dff566e5994f65a0313 SHA512 0852df3bc996032a713ce6dc274cc36c3818c1c8304223de391e58bce8230aa12ac9778b4b28278c0ab4e42f2a7b4094052a5e4e6e4208329848948237fb41d2 WHIRLPOOL 13a6baf033b4caa0543fa36e4d91d82dc03b7875582e63a0803f152796041870b798ee8fdb0a923b6da08836fd7f1be5faffe36cf5e3241cb8154c3287ce294d
 EBUILD imagemagick-6.9.9.0.ebuild 5158 SHA256 4822fa883719ae3c6bb7d9e0056326f7a4970483c617c1becb7db7fac2068f7d SHA512 ddec64d6ede1cf433bce3a4da1fb74c0346349b922cc1dd164acfb6cce99df1c207296a2334a7b59163a34250e91a80b8a7cb4a607fbca1bdb84bb3ee3c9f36c WHIRLPOOL 6e34e09dffaeaa9da599cc2b3536f16a455c6dd0fc872ff3ac7b8b07040ca77f487bdb7d09d54992356584bfc7203c7124952dbf7467f46f9fff2620bae82abb
 EBUILD imagemagick-6.9.9.18.ebuild 5128 SHA256 69585ea6cefba51c7f455a1ae8b70ad42b55ca1dee9cb4e592daf6817096e65d SHA512 86114b9cd2ffb6aa94808060abb78a03897e7ae0611b3c326ba60fe2ff17506209c413fc863a32ac63ae36d24ae2960cdc931b7b0493a8cb04189fa163990c68 WHIRLPOOL 940edc57060600983539f50dfcb635e36e9a642fa5cabe4874f95acc8a1a37b2fe96b2b715b546feb9aa7d30d75f8e5adf5af0f731f3c3b455428e34747c23d3
-EBUILD imagemagick-6.9.9.20.ebuild 5128 SHA256 69585ea6cefba51c7f455a1ae8b70ad42b55ca1dee9cb4e592daf6817096e65d SHA512 86114b9cd2ffb6aa94808060abb78a03897e7ae0611b3c326ba60fe2ff17506209c413fc863a32ac63ae36d24ae2960cdc931b7b0493a8cb04189fa163990c68 WHIRLPOOL 940edc57060600983539f50dfcb635e36e9a642fa5cabe4874f95acc8a1a37b2fe96b2b715b546feb9aa7d30d75f8e5adf5af0f731f3c3b455428e34747c23d3
+EBUILD imagemagick-6.9.9.20.ebuild 5122 SHA256 61fd0ca7c15179d6216497a15eaa415c8fc62d47c8ff1ed13ca9d9f80d9046a7 SHA512 0f7f64c7324a9e2584c09e3ae2b4c776c28364f343e3644c22f47e113f6e422555b3cffa8bb399ccdd86e42ebb277c228fabde5079a2dd5937559b032b00a119 WHIRLPOOL 044a3f446c7e78baeeb28267a3b4f7db37958fdb31962751cd6c961d77ebee82f6f7f3619a5fc7c9ed5095444b24196351a3572f280353f8a1d23d519bd33054
 EBUILD imagemagick-6.9.9.9.ebuild 5128 SHA256 69585ea6cefba51c7f455a1ae8b70ad42b55ca1dee9cb4e592daf6817096e65d SHA512 86114b9cd2ffb6aa94808060abb78a03897e7ae0611b3c326ba60fe2ff17506209c413fc863a32ac63ae36d24ae2960cdc931b7b0493a8cb04189fa163990c68 WHIRLPOOL 940edc57060600983539f50dfcb635e36e9a642fa5cabe4874f95acc8a1a37b2fe96b2b715b546feb9aa7d30d75f8e5adf5af0f731f3c3b455428e34747c23d3
 EBUILD imagemagick-7.0.6.9.ebuild 5134 SHA256 8af6a6b8deb0b4e8de1796d6d13fd6fafeb732b95fe421a46ea4da39dc662ceb SHA512 e16e30d01265170f4e39cce0d9d4385246dbff419d021f80bae3c1138b076b14e8cfb58fa8e4adde535c2866c62d3a2c3fac4adf07be5c118e0ea15d3b5c6ae0 WHIRLPOOL ccd9a043a143f3da3af17dcf5253ed1cb66fd34d9d343239d4a65bdbb63855a8c5727610ad352c8dce6289316a315e8ae3799947096028c2b5cc10553c4f56a2
 EBUILD imagemagick-7.0.7.6.ebuild 5134 SHA256 8af6a6b8deb0b4e8de1796d6d13fd6fafeb732b95fe421a46ea4da39dc662ceb SHA512 e16e30d01265170f4e39cce0d9d4385246dbff419d021f80bae3c1138b076b14e8cfb58fa8e4adde535c2866c62d3a2c3fac4adf07be5c118e0ea15d3b5c6ae0 WHIRLPOOL ccd9a043a143f3da3af17dcf5253ed1cb66fd34d9d343239d4a65bdbb63855a8c5727610ad352c8dce6289316a315e8ae3799947096028c2b5cc10553c4f56a2
diff --git a/media-gfx/imagemagick/imagemagick-6.9.9.20.ebuild b/media-gfx/imagemagick/imagemagick-6.9.9.20.ebuild
index d91b5ff35eef..faab02f93ca2 100644
--- a/media-gfx/imagemagick/imagemagick-6.9.9.20.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.9.9.20.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/imageworsener/Manifest b/media-gfx/imageworsener/Manifest
index 0b75bc4ef82f..bb4cef9f89da 100644
--- a/media-gfx/imageworsener/Manifest
+++ b/media-gfx/imageworsener/Manifest
@@ -1,7 +1,7 @@
 DIST imageworsener-1.3.1.tar.gz 661055 SHA256 beb0c988c02b1d461dccdb3d6c4fc229316a692ea38689874013ba349dff66d1 SHA512 a44589e720bc91662e286096f744347e3ec3669c33791f81c3f2aeb9d0514ed909dc73615db1d7631139df72aba9ccfbada61b7dcf82f6ffac622ab64a186b49 WHIRLPOOL a7d995a63f9e637ce4ab5da4967ef8e1b8a9108b4ace256e6ddf2b33c9a5445cd85caf74f83f51635789971676124c5b175c16df2cccf85f93e6544cd59ba096
 DIST imageworsener-1.3.2.tar.gz 661710 SHA256 0946f8e82eaf4c51b7f3f2624eef89bfdf73b7c5b04d23aae8d3fbe01cca3ea2 SHA512 99b30ac838f437a85985eb830d0557f22c69bc40ef2dafe3493f145b70a89b72699e134f061719fa0dcc8b585ed2b418a6afc0c2f7ce67e2e9383d48a7b7b668 WHIRLPOOL 439e38478334fb66455a77fe674a58c9392f009420f9465e533f0101824e18d9c537910af6d5eaa1f0f32f8ee22b710ec2963f9003e6e39bc92e44115f6b7abe
 EBUILD imageworsener-1.3.1.ebuild 1007 SHA256 5d7b952adb0fc2442a0b804c99edb4a74b83541e911f105ebcd20e01b6ef98ec SHA512 bfe07f2ebb359e3b53cf2f86a7bb766084633b6a5f14a0aba8d8997797f5a36da8e81a30ba62715d73461bdbdf56dea887951663d8891a1514b1dc8c31f398e7 WHIRLPOOL 32c7c389eb8ae64b07158a36b8839ffab1bf8fcae3df97840da48894a684a31716939b0db499439d2fcecf11b1f11017f3da2fae76375be2294d3cafab77c93f
-EBUILD imageworsener-1.3.2.ebuild 1008 SHA256 a5f5c46ed34fa4ec084a1951f5ab2f7e946faa854f42dc2386c7d1d4eb373b60 SHA512 72c50b8541e541e664b0c8277b590a77225365e569db65d78db4eabd5fd1970d411c8e770a83ca9605597a6d22eea3469c52726cd93150ceddb0776cbc3fc784 WHIRLPOOL 432615515138d26b7f3398d81f1ac898d98b7c78e53e9326543349366bf61bb83f51dd02dca35e52c04abef89303e0f4da95616a3d6cd3ebfe149283fdeebf3e
+EBUILD imageworsener-1.3.2.ebuild 1007 SHA256 5d7b952adb0fc2442a0b804c99edb4a74b83541e911f105ebcd20e01b6ef98ec SHA512 bfe07f2ebb359e3b53cf2f86a7bb766084633b6a5f14a0aba8d8997797f5a36da8e81a30ba62715d73461bdbdf56dea887951663d8891a1514b1dc8c31f398e7 WHIRLPOOL 32c7c389eb8ae64b07158a36b8839ffab1bf8fcae3df97840da48894a684a31716939b0db499439d2fcecf11b1f11017f3da2fae76375be2294d3cafab77c93f
 MISC ChangeLog 2880 SHA256 4b8517955d6e569a2e82cb4c3b8dc899f72be4221acd2b1c195b1c0ac4b7f7ba SHA512 9efddf99bb2f5951768f06d750390b977b005345bf0480ea4fcb0910dd05dc127e70ef79fb982eb5d5a0a7a5b4803c694c213b1ed97c8a0f785fe5d24d585fa3 WHIRLPOOL 5eca88843ec7e23725a166d40494b1904ccfe8a53c01e4f5056e4fd00c5020b5d74a0a25cc4a7478c5aeec7878e6a701f4b625363bb12c3f024f30795706f83f
 MISC ChangeLog-2015 4803 SHA256 de31e91ac68d5ce7c33e999f39d72dbd91db0dd49e232a11f819faa9645a217b SHA512 1fb53a2cd82449db3ed3c853f93a4fa73e079052dcdf0e650e049a4a433481ee39685ba01005522bd8df76960cffbb87825c94b6f98b0fbdbb9840a6a2fd15c7 WHIRLPOOL a2ef88194d3b0255b0dc8dbe46ddfcb6fbce30e6ddb0e30a5bdb51d41c4d2a5a14b53bdbddda9f6818ea320b00cb9b21b1fb7cfe3a58d5c41bb44e91eb9a0049
 MISC metadata.xml 317 SHA256 5d10bd548020dee0cd77c547cb2cf7da3c2e0325320bf519e2c82b53711d6640 SHA512 128c5649fb194a4fef505f3445de2e4f114a966ddde1af3ac3ca5af23b260e0c038b743a7f95f7cc5e3268aeebbdfa9afeca7d152b5cb7a297d69c1ad4ef4e6a WHIRLPOOL babda29d7160676bdc4920a0f5a2f83c84f6978188cc04227c6b02df5f5f6de01956a55ce7e6fe1acbde094fe4a015d20453414ab550d80cae187bc1af9bc9f7
diff --git a/media-gfx/imageworsener/imageworsener-1.3.2.ebuild b/media-gfx/imageworsener/imageworsener-1.3.2.ebuild
index c13007166677..39edd7cfaa89 100644
--- a/media-gfx/imageworsener/imageworsener-1.3.2.ebuild
+++ b/media-gfx/imageworsener/imageworsener-1.3.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://entropymine.com/${PN}/${P}.tar.gz"
 
 LICENSE="MIT-with-advertising"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="jpeg png static-libs test webp zlib"
 
 DEPEND="png? ( media-libs/libpng:0 )