gentoo resync : 06.01.2018

29 files changed, 53 insertions, 108 deletions

diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 542a31135628..72016903a4a2 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/exiv2/Manifest b/media-gfx/exiv2/Manifest
index b3154aaac49e..cf7d1ee112da 100644
--- a/media-gfx/exiv2/Manifest
+++ b/media-gfx/exiv2/Manifest
@@ -2,6 +2,6 @@ AUX exiv2-0.26-fix-docs.patch 2532 BLAKE2B c648454a7c9a56c2d4a3844cbe212630ff6c3
 AUX exiv2-0.26-pentaxnikon-crash.patch 1712 BLAKE2B f67edf849e5f1674a81b8d33157788c946ba5eab2af3b9c6e216007131f152dda215112a82d2928f771a32558df540c0e730cc309365a0e3ff016365d62b745d SHA512 a6de44c1451e6277433223871d151b251a330799d204cb20b9bebf1a6005c683506183617647c8c218d16bc80e2cf58e732fd226223a128a1ddda2567b761bde
 AUX exiv2-0.26-tools-optional.patch 1386 BLAKE2B 84e0903934187aaa914c0a4fe04afe63ed3314ea76d6929b7435899a731bb90831418b2162e1dca4a487b88041fe7b9aa50a3c438e66ac3893dd1d12b363714f SHA512 efdd848dd728fcb0ba5dbc305fef6eb6af4385b5bd09e2c3722c0dea2009207c282b95a07cdb608fc2298d18686c764dded2fd9de4166dbecabf7eeb187e6483
 DIST exiv2-0.26_p20171104.tar.gz 28368697 BLAKE2B 50013cf0bf30a2a476b02d5db4027fca268a4b38733762eb4c08e5f3bdfaf737038e9a62f7ef471fecb10250d8ae686ef683f9b0ea4ccc5d109440ba534371e4 SHA512 6f6a884d7978e54dceb9ce45248cd0425ff469887c85ef52b0e38cb755970f69fce96b4b5317c8e8070b833f72ca214696042aac71292a6f9c3440f6a369d474
-EBUILD exiv2-0.26_p20171104-r1.ebuild 3214 BLAKE2B dc9d0c55d82a465c9c1cad8755eda3152d5bac601da0093f2f9525c78a28b8cfe81b77e2fe0be3bbd6b66f46d6c1728612e3781ec73d98f16e26f252d2cfa546 SHA512 5445692367b27ef49db7b38735b3937497d28f8cd5d5ca8a98d10d2909ddbd781c26080e0caa43a855a462891387b84d820150ed0012f432828228073d396477
-EBUILD exiv2-0.26_p20171104.ebuild 3156 BLAKE2B 3aa14c51da678040d927f7137bd5d93b8b4dc72c2639d8aa6d416888a923e09c15f7f1adf8e327001ef821c4475251d61aed9df01a62655c098be0ccb8310977 SHA512 28faa24036404ccc8452ef3af5f793a634b0236697f9fb727f95778b0d5a2e0729410118f0ec15f157b0c32562fccadc5536d4afe9faeebbcd497664239a870b
+EBUILD exiv2-0.26_p20171104-r1.ebuild 3145 BLAKE2B 5d01fc1c512ad7890f4727e15558053d3f4baf36804405447079bfb707eb68e0c54a4ce8744fd658880c62b039f91b476557966f4e823f45dee96dfe36e70235 SHA512 df9cd6b3654630a471ef1385c364d76ff8a8a11305d47d42a30e32aa3c275c56475ed716eede15f880f2bf77e4687c40ab59769066b134a2008c1d4a064ea34e
+EBUILD exiv2-0.26_p20171104.ebuild 3087 BLAKE2B b6e797fcd9686167274303a6868b52a59ec568b2beab685be048ec68cb7b1e4b2430a9246dfc70821e1ec6ada6328c09623b062f5c0debac9b5cb350c48600f8 SHA512 6c5472387b0d76bdf52d2b19dbff8b6c018e2b363a5bf60f9c14feaeb6ad8fdf9a8051e93392a963601fd78db3be322784bc857840a5f74d1f7bc28d43e12142
 MISC metadata.xml 612 BLAKE2B f98a074e9e3a4411baf8255cd8cab5be4257469463634218b664bb9e7f159c98615f0721bb4463c6183cecc8b2be00c34a031e7b99d745b9807634cbaab8d479 SHA512 9b4926ba8420a125dc4cefd351ee1ec10a4df2fc4306a56720f6e8de7c5fd9f36a8646c8583958fca9a45ebe1b65b19c053c7da37176546bc19ae64afa87e4f5
diff --git a/media-gfx/exiv2/exiv2-0.26_p20171104-r1.ebuild b/media-gfx/exiv2/exiv2-0.26_p20171104-r1.ebuild
index f7eb67dc5bf2..7553fc67ec9a 100644
--- a/media-gfx/exiv2/exiv2-0.26_p20171104-r1.ebuild
+++ b/media-gfx/exiv2/exiv2-0.26_p20171104-r1.ebuild
@@ -1,9 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-LINGUAS="bs de es fi fr gl ms pl pt ru sk sv ug uk vi"
 PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 if [[ ${PV} = *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/Exiv2/exiv2.git"
@@ -21,7 +20,7 @@ HOMEPAGE="http://www.exiv2.org/"
 
 LICENSE="GPL-2"
 SLOT="0/26"
-IUSE="doc examples nls png webready xmp $(printf 'linguas_%s ' ${LINGUAS})"
+IUSE="doc examples nls png webready xmp"
 
 RDEPEND="
 	>=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
@@ -63,7 +62,8 @@ src_prepare() {
 			pushd po > /dev/null || die
 			local lang
 			for lang in *.po; do
-				if [[ -e ${lang} ]] && ! has ${lang/.po/} ${LINGUAS} ; then
+				if [[ -e ${lang} ]] \
+						&& ! has ${lang/.po/} ${LINGUAS-${lang/.po/}} ; then
 					case ${lang} in
 						CMakeLists.txt | \
 						${PN}.pot)      ;;
diff --git a/media-gfx/exiv2/exiv2-0.26_p20171104.ebuild b/media-gfx/exiv2/exiv2-0.26_p20171104.ebuild
index 9450566668f1..4bd63be4e67f 100644
--- a/media-gfx/exiv2/exiv2-0.26_p20171104.ebuild
+++ b/media-gfx/exiv2/exiv2-0.26_p20171104.ebuild
@@ -1,9 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-LINGUAS="bs de es fi fr gl ms pl pt ru sk sv ug uk vi"
 PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 if [[ ${PV} = *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/Exiv2/exiv2.git"
@@ -21,7 +20,7 @@ HOMEPAGE="http://www.exiv2.org/"
 
 LICENSE="GPL-2"
 SLOT="0/26"
-IUSE="doc examples nls png webready xmp $(printf 'linguas_%s ' ${LINGUAS})"
+IUSE="doc examples nls png webready xmp"
 
 RDEPEND="
 	>=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
@@ -62,7 +61,8 @@ src_prepare() {
 			pushd po > /dev/null || die
 			local lang
 			for lang in *.po; do
-				if [[ -e ${lang} ]] && ! has ${lang/.po/} ${LINGUAS} ; then
+				if [[ -e ${lang} ]] \
+						&& ! has ${lang/.po/} ${LINGUAS-${lang/.po/}} ; then
 					case ${lang} in
 						CMakeLists.txt | \
 						${PN}.pot)      ;;
diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest
index 3511dcd34267..59d526ecb04f 100644
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -8,12 +8,11 @@ AUX gimp-2.8.22-cve-2017-17786-2.patch 1253 BLAKE2B a862581d48a990e3c4b8d185f4cf
 AUX gimp-2.8.22-cve-2017-17787.patch 1058 BLAKE2B baeffda42385b552709781a772ef5947682a6b3c8ea01d97e32dca63fdb5ddeeea85550c4116196d16e63381cffa4ba03873490936da2cb501ee8d50367c0cbd SHA512 438376075d0a46809fd5f12f3d364b914c989ca512739b69da0f609100525da8dbc525ce57c144b5388eec525fd2d7b5c8098e63ddb70c68c186dee9b2ce7b83
 AUX gimp-2.8.22-cve-2017-17788.patch 1012 BLAKE2B 90bc17b66dd40426073a2581c20e68551b1c80378e055704d36ad56cc0a2b7448c847b847aacded6b8033ee86b3bb42e679845a46c65c1ea2d3af8c90aeb53f8 SHA512 82231c53664535c66d70b4e129b24afa31a50d465968f1012e20420ee71842435acf7d43de78cdac81602d80b89a927c03f9d60159c89c41d4b88e6851ed8acc
 AUX gimp-2.8.22-cve-2017-17789.patch 1245 BLAKE2B 14d519b8b024e51b452806b4acb6f00231e535ba3502875e8e90350e62c2cd0ff634ab1b38f16bb098670dd1e9d21c88aa64e19c3f81600acc7ea448e8f22b90 SHA512 f2f4aff0f0478356513a1f6da0732c5d0986ef1deb7b8e68bd283b7259887cf9a4d4785f00e48f03892cc86aa715b9764302640b2b891ab16617ef595ab779b8
-AUX gimp-2.9.6-underlinking.patch 653 BLAKE2B eee76b9aeff7da49c102b44899df7e3a5dd8e62b8d135c5400ac5c5c114524834070e8f5c97076022fec3b68098433f8433c82dddf0c41803c41cce3d9b3d552 SHA512 3ed27297af495828d9394d7bdd067d416733ae7a3665784ee37b19273d002a585fcb22f30ec6db93164b0f0c7220af6020984820da4c78a356b2ae71fb9e61c3
 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 5207 BLAKE2B 6a023d3beaeee22a66f49e4d5d56d63472ac3f45997787c5458edc36658add3719e442d0e4f2ae16b3c07b7c77fa04e244a07b4b458879bd034f8241793254dc SHA512 f7085aa8760438d03b08dbf42c409ce0f8ea1e3690b7d5158c4c7b6b8ae35e492b92b65007c819b253d86b4a71655ac995410bb53a170cfe026878c951a5752c
-EBUILD gimp-2.8.22.ebuild 4760 BLAKE2B 99f573094528e2c4b4424c9f4867db83c16910fb1d2c8a9b27c15a797330c06596c1a2b4fb7487ea2feac80c9b873060d70919c69024b944e883772d4e2f763f SHA512 4911218b41c0b0f21af7fb8e0b31f2958d41dce51f8764bd92f8c4604a54b7e79528c819b5c464186af7c3f9890a5afc77d6ac85caaa47820d8010481c23a3e4
-EBUILD gimp-2.9.8-r1.ebuild 5787 BLAKE2B 98e530afd8152b5ca02b36cfb4de7dfaa8155e922946dfb4873912bb393dd249c31918674fb9c45538a6b4305ddafcde5b8cc2e90f65a83498b3f905ed02956e SHA512 0d89258666c4c370038d714679ddde5fccfb403b58fbed794c0a7f0928d5e93e3e671f6daec31888100743424d311585d0f29c09a1c9915b6284d5d2c0986244
-EBUILD gimp-9999.ebuild 5399 BLAKE2B 21f8e5d29e2d23ddda03b6eefb25fe96689d9e48a0412270b5020f20fe1fb2e26b43a3e00930843364387a41f429b64c3c954ec6dfca640dcb7ac7b1bee635d9 SHA512 a1990254a48dc25e0f47591f500b6605bbbe8abc3d2558a7a72d078ac28698f71f95b0ba4eac28131ea2d3e064d4c64f8741693dc37d5bef517c101092e43616
+EBUILD gimp-2.8.22-r1.ebuild 5184 BLAKE2B abc10e4f056b0587a193eb6991157cd194a8fd8a574147008add477234b83ee6e22af3270444d85abac9fd521012ff3a6bf757c4f3873ca2ece4ec285d3ace5e SHA512 2e1bc04eaf0f2fa86e71d861b040ab86f3f29d01fd5da0fb7e3d29e18db93be3be9a9f0fe5ecd2d8fbedf4c56c352ba7e1555a9e2a81a9f2e6d64097f09ccb8d
+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
 MISC metadata.xml 388 BLAKE2B 2e779c672c788e3631b0532be9a6081767215bf9687cb2546c92d3c6f4a00d8e8f6e32cca607019847200ed416336f752cfbfaf43b2f600b4bea63eb985e63d5 SHA512 e3a626ac39cea422d1b4660731048d764c4b6f1985e09577865f0047ecbc61c8677d6f15626dbbc03ceb3cb18887ba58747df5d91f5f4b2126afb9ad12eaccb0
diff --git a/media-gfx/gimp/files/gimp-2.9.6-underlinking.patch b/media-gfx/gimp/files/gimp-2.9.6-underlinking.patch
deleted file mode 100644
index 9208c2f329b3..000000000000
--- a/media-gfx/gimp/files/gimp-2.9.6-underlinking.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/libgimpbase/Makefile.am b/libgimpbase/Makefile.am
-index a1a6719..85c8518 100644
---- a/libgimpbase/Makefile.am
-+++ b/libgimpbase/Makefile.am
-@@ -22,6 +22,7 @@ uninstall-libtool-import-lib:
- 	-rm $(DESTDIR)$(libdir)/libgimpbase-$(GIMP_API_VERSION).dll.a
- 	-rm $(DESTDIR)$(libdir)/gimpbase.def
- else
-+libm = -lm
- install-libtool-import-lib:
- uninstall-libtool-import-lib:
- endif
-@@ -169,6 +170,7 @@ EXTRA_libgimpbase_@GIMP_API_VERSION@_la_DEPENDENCIES = $(gimpbase_def)
- libgimpbase_@GIMP_API_VERSION@_la_LIBADD = \
- 	$(GIO_LIBS)	\
- 	$(GEXIV2_LIBS)	\
-+	$(libm) \
- 	$(ole32_lib)
- 
- install-data-local: install-ms-lib install-libtool-import-lib
diff --git a/media-gfx/gimp/gimp-2.8.22-r1.ebuild b/media-gfx/gimp/gimp-2.8.22-r1.ebuild
index afa66f120198..63e5dfba2ce8 100644
--- a/media-gfx/gimp/gimp-2.8.22-r1.ebuild
+++ b/media-gfx/gimp/gimp-2.8.22-r1.ebuild
@@ -11,15 +11,11 @@ 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"
 
-for lang in ${LANGS}; do
-	IUSE+=" linguas_${lang}"
-done
-
 RDEPEND=">=dev-libs/glib-2.30.2:2
 	>=dev-libs/atk-2.2.0
 	>=x11-libs/gtk+-2.24.10:2
@@ -133,9 +129,10 @@ src_prepare() {
 }
 
 _clean_up_locales() {
+	[[ -z ${LINGUAS+set} ]] && return
 	einfo "Cleaning up locales..."
 	for lang in ${LANGS}; do
-		use "linguas_${lang}" && {
+		has ${lang} ${LINGUAS} && {
 			einfo "- keeping ${lang}"
 			continue
 		}
diff --git a/media-gfx/gimp/gimp-2.8.22.ebuild b/media-gfx/gimp/gimp-2.8.22.ebuild
index fc037aaa8de1..55ab71f2660c 100644
--- a/media-gfx/gimp/gimp-2.8.22.ebuild
+++ b/media-gfx/gimp/gimp-2.8.22.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -16,10 +16,6 @@ KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~arm
 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"
 
-for lang in ${LANGS}; do
-	IUSE+=" linguas_${lang}"
-done
-
 RDEPEND=">=dev-libs/glib-2.30.2:2
 	>=dev-libs/atk-2.2.0
 	>=x11-libs/gtk+-2.24.10:2
@@ -125,9 +121,10 @@ src_prepare() {
 }
 
 _clean_up_locales() {
+	[[ -z ${LINGUAS+set} ]] && return
 	einfo "Cleaning up locales..."
 	for lang in ${LANGS}; do
-		use "linguas_${lang}" && {
+		has ${lang} ${LINGUAS} && {
 			einfo "- keeping ${lang}"
 			continue
 		}
diff --git a/media-gfx/gimp/gimp-2.9.8-r1.ebuild b/media-gfx/gimp/gimp-2.9.8-r1.ebuild
index 76986e47e6ef..52e0827a8008 100644
--- a/media-gfx/gimp/gimp-2.9.8-r1.ebuild
+++ b/media-gfx/gimp/gimp-2.9.8-r1.ebuild
@@ -16,10 +16,6 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc64 ~x86"
 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 debug doc openexr gnome postscript jpeg2k cpu_flags_x86_mmx mng pdf python smp cpu_flags_x86_sse udev vector-icons webp wmf xpm"
 
-for lang in ${LANGS}; do
-	IUSE+=" linguas_${lang}"
-done
-
 RDEPEND=">=dev-libs/glib-2.40.0:2
 	>=dev-libs/atk-2.2.0
 	>=x11-libs/gtk+-2.24.10:2
@@ -162,9 +158,10 @@ src_compile() {
 }
 
 _clean_up_locales() {
+	[[ -z ${LINGUAS+set} ]] && return
 	einfo "Cleaning up locales..."
 	for lang in ${LANGS}; do
-		use "linguas_${lang}" && {
+		has ${lang} ${LINGUAS} && {
 			einfo "- keeping ${lang}"
 			continue
 		}
diff --git a/media-gfx/gimp/gimp-9999.ebuild b/media-gfx/gimp/gimp-9999.ebuild
index e448ccbf5aee..2ac820e3f5b1 100644
--- a/media-gfx/gimp/gimp-9999.ebuild
+++ b/media-gfx/gimp/gimp-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,10 +17,6 @@ KEYWORDS=""
 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 debug doc openexr gnome postscript jpeg2k cpu_flags_x86_mmx mng pdf python smp cpu_flags_x86_sse udev vector-icons webp wmf xpm"
 
-for lang in ${LANGS}; do
-	IUSE+=" linguas_${lang}"
-done
-
 RDEPEND=">=dev-libs/glib-2.40.0:2
 	>=dev-libs/atk-2.2.0
 	>=x11-libs/gtk+-2.24.10:2
@@ -102,7 +98,7 @@ src_prepare() {
 	sed -i -e 's:\$srcdir/configure:#:g' autogen.sh
 	local myconf
 	if ! use doc; then
-	    myconf="${myconf} --disable-gtk-doc"
+		myconf="${myconf} --disable-gtk-doc"
 	fi
 	./autogen.sh ${myconf} || die
 
@@ -167,9 +163,10 @@ src_compile() {
 }
 
 _clean_up_locales() {
+	[[ -z ${LINGUAS+set} ]] && return
 	einfo "Cleaning up locales..."
 	for lang in ${LANGS}; do
-		use "linguas_${lang}" && {
+		has ${lang} ${LINGUAS} && {
 			einfo "- keeping ${lang}"
 			continue
 		}
diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index f0bcabe3f8ff..ba39c3f0c4f9 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -16,12 +16,12 @@ EBUILD imagemagick-6.9.9.18.ebuild 5128 BLAKE2B c5d4f87b3ea909fa94d940f24a7f01f4
 EBUILD imagemagick-6.9.9.20.ebuild 5120 BLAKE2B b02f1bdfe05aa3a9f96bdc3596b785326753f5249bf5b19ba70a6a76ad1dfddb453acdacef7ee3d1c80bb75017912e73b9650fe5fad688620fdaadb01d87574a SHA512 f7e5492163118e23d46829613a8bd380faee2e2c6e597b1fcde7f7a1684c80a45ad0bab4b39deac083b4136cedc789c128fb6809c824469bef66c3a904738422
 EBUILD imagemagick-6.9.9.23.ebuild 5122 BLAKE2B 16f53dfb31f82f636b577bb12069741b81c2fa91e5d0db9cf8e04d4f1056a6327cb465dd2206d3ea817a0b5a0a1f42ba14d05b82736a3b98cc1ccabbd8db4c3b SHA512 65388e8d87b190ef90fbd009794442778d4faf242f9589d988db156417d769e6f7239fb0b1bcaf972952796c438431860567c3b6c64e41d72759d03770014113
 EBUILD imagemagick-6.9.9.26.ebuild 5120 BLAKE2B d326a9da7f04cdaa555fceb7bfc8d2abaa491444cbf6617158ebdb967ac8cd834159d8f34827b939cc5f62109a5c294216b986149600fc47ce022145aa0cc402 SHA512 fa9f6c396f3c40d061a69e99380af48b5c5f377c1621a9835304112bd9f0f00f0cf02ba265c03f5d19696c9a5fccacb1f4a0ef6b0b02998966145557468fdcb7
-EBUILD imagemagick-6.9.9.31.ebuild 5128 BLAKE2B bef8ca0d8e3ec8440ed08d36a22ea5afb9a2e8598aa0b2da4c9e16dbe577886fad9606c4a4a31e3864bf04f45de18173738fc542c9eeb28a91e084a85f4a0747 SHA512 02aeb5fc77a81c31f786b9f761011ebd3ce4cd43ac275a482422aecb1a927d9b628d020a7fef796af4eafcd54d232893089bb6393ca686093d2b52859cdc3510
+EBUILD imagemagick-6.9.9.31.ebuild 5123 BLAKE2B d640866948e34971bd4329a06e19afbbd2a69fec22992de17a5eb143be3391a7cc74dc287c1e599d5953d6e7040ccf5766cd4af2ca8fdc93fdad9cc358def0ec SHA512 19b072b6bcbd4fc7d51e07b060e1ec3f8980d6a31b84cfef428a7089c968faa60735ec09bfa49a441124ffa3ef682d233860b77432c8927ec30619768fa5b92a
 EBUILD imagemagick-6.9.9.9.ebuild 5128 BLAKE2B c5d4f87b3ea909fa94d940f24a7f01f4026955e874868ad0d8124d941f06ddc0b24c3e11e40d6d825c3201d2b58a1d5446ce607a73ac62e13600d609ce1dc777 SHA512 86114b9cd2ffb6aa94808060abb78a03897e7ae0611b3c326ba60fe2ff17506209c413fc863a32ac63ae36d24ae2960cdc931b7b0493a8cb04189fa163990c68
 EBUILD imagemagick-7.0.6.9.ebuild 5134 BLAKE2B 3542aaffdbab0fa1e93eed3c67b923effd7bf418fe3e95b7501d8b1d36b3f6b81a2beb4bbdd8da29ac3bb96842a1f7bf8dbb72da0e2ed5dedeb4fc1a61fce1a5 SHA512 e16e30d01265170f4e39cce0d9d4385246dbff419d021f80bae3c1138b076b14e8cfb58fa8e4adde535c2866c62d3a2c3fac4adf07be5c118e0ea15d3b5c6ae0
 EBUILD imagemagick-7.0.7.11.ebuild 5128 BLAKE2B 283c66b5aadd9c405bb9fea2a51d4fb952793a8834ae0f55fe049c73633835c5de1f2acbe9d82a5e78218bad6b54240c113d408eda547c09fa6ce2f80cd2fe36 SHA512 e404fa7e419da2c4b191b5a348e6dc6dc843d4543742f60328ebc7dfe93f4fd487915223ae90a408c3a0c298ffc48cf4775718e61eb7c7298f2da79fdc611023
 EBUILD imagemagick-7.0.7.14.ebuild 5126 BLAKE2B eb993578fe4760505ee23640be3d2ce5a22a8b98f907b8d95af31ca8be0c86e0dc73839e95714d319803b526e8552e0cabeea109cfded0380c3e826861be12ba SHA512 48fb072c9315511b07f3787c972df301cdbf62a04b7a40ae7f23228ec96ecb8070f0c83e2ba4a6b93777ba9af2536b6a2640929ca9323539a5b2bd056c850b99
-EBUILD imagemagick-7.0.7.19.ebuild 5134 BLAKE2B 33aabb4a32d0bd9555c5470617d9954973f615a89b8fbc9fe17d7b105402a8fc6bb73cd1311043b58673197ee1d94939c46fdce9979d5f983c26cd191d23e0f4 SHA512 58bf5277b40e8ef8fc3ff17da5c8d9f814e1c52866789748881fe2469f46d99842f3bfd5e368492ac25466a395e1141f48d0b2020d436452730fb0bf9fab58cf
+EBUILD imagemagick-7.0.7.19.ebuild 5129 BLAKE2B 72846deeba463bdccb9d776b033ecfed9dc8f7f3863f79826064c760a4ce5b2cac11f3c486b1d99762c6de4031ab357f287c65304f03e70a9ac5d71f74061669 SHA512 eac788200338808bc1783281757fdc2891689826163e994ecb1e3bb9ef0d8200b60914d1a32a6070f23aee0baf32d58cea79adb856ddc2b26d229fb2555d881c
 EBUILD imagemagick-7.0.7.6.ebuild 5134 BLAKE2B 3542aaffdbab0fa1e93eed3c67b923effd7bf418fe3e95b7501d8b1d36b3f6b81a2beb4bbdd8da29ac3bb96842a1f7bf8dbb72da0e2ed5dedeb4fc1a61fce1a5 SHA512 e16e30d01265170f4e39cce0d9d4385246dbff419d021f80bae3c1138b076b14e8cfb58fa8e4adde535c2866c62d3a2c3fac4adf07be5c118e0ea15d3b5c6ae0
 EBUILD imagemagick-7.0.7.8.ebuild 5134 BLAKE2B 3542aaffdbab0fa1e93eed3c67b923effd7bf418fe3e95b7501d8b1d36b3f6b81a2beb4bbdd8da29ac3bb96842a1f7bf8dbb72da0e2ed5dedeb4fc1a61fce1a5 SHA512 e16e30d01265170f4e39cce0d9d4385246dbff419d021f80bae3c1138b076b14e8cfb58fa8e4adde535c2866c62d3a2c3fac4adf07be5c118e0ea15d3b5c6ae0
 MISC metadata.xml 984 BLAKE2B ae695ec1fc34ad3b29269ad21cfb8b79ff6158a2ace9cd4194354448794dc183ac568757d6a7e6c07f31634dfb780e0411a0237b3c106344e6c7c7244a8aee36 SHA512 39a4c5aa27db2de81ad4621bacf43baf96415eecdf836fb2024890634c025b29f2b41dc003ac4d6f87b2365c1a4c68b6af2b9e169b3137bbee3e0a6cb435c5c7
diff --git a/media-gfx/imagemagick/imagemagick-6.9.9.31.ebuild b/media-gfx/imagemagick/imagemagick-6.9.9.31.ebuild
index cee94bf466d0..a88993b68f23 100644
--- a/media-gfx/imagemagick/imagemagick-6.9.9.31.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.9.9.31.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://${PN}/${MY_P}.tar.xz"
 
 LICENSE="imagemagick"
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
 
 RESTRICT="perl? ( userpriv )"
diff --git a/media-gfx/imagemagick/imagemagick-7.0.7.19.ebuild b/media-gfx/imagemagick/imagemagick-7.0.7.19.ebuild
index 6d4dff609a64..5103125fcd21 100644
--- a/media-gfx/imagemagick/imagemagick-7.0.7.19.ebuild
+++ b/media-gfx/imagemagick/imagemagick-7.0.7.19.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://${PN}/${MY_P}.tar.xz"
 
 LICENSE="imagemagick"
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
 
 RESTRICT="perl? ( userpriv )"
diff --git a/media-gfx/iscan/Manifest b/media-gfx/iscan/Manifest
index b64c21c21d07..af0a6f3308f0 100644
--- a/media-gfx/iscan/Manifest
+++ b/media-gfx/iscan/Manifest
@@ -7,6 +7,6 @@ DIST iscan_2.30.1-1.tar.gz 1217985 BLAKE2B a469b455566bb249044d1cc7994d233393139
 DIST iscan_2.30.2-2.tar.gz 1216875 BLAKE2B 73a0de2b8432df026c5755df610205085c351ef586c1225d17f3f1ceb1404dae0449aaf2e6f0dbe18b98c0c1dc793fb184c17479fa08b195e6342d53bea3512e SHA512 bc5e871fa5e3baa62eee7b8b0a73abf2640a38f71f98248b1c9e1cace17c2a32de2f64c2a7527e8618f20e9913a16d0f55a8a94b3aea88ae8a157339e8bcf8e9
 DIST userg_revQ_e.pdf 627189 BLAKE2B ff57871c58dc541e30d65127bd8f4cc2a20ec5341c1d0914116f7ec4ae002d896853b99488eec71e5f8cb150e6b63d353efb9be11977de26d017701bc051014a SHA512 b09d5143855a759e0fa3e74794762566b6fbf734642f9d7f712e5f2f20e3dce6b830465fd65f83f9cc368292ce7a2c0cec709b0eba6356d95e1ba5114b3348fc
 DIST userg_revQ_j.pdf 734920 BLAKE2B ed2cffdc2dbf0a2403dcbd93cef3349b9e35afb305f9b36f92b8f11bd42b5281fc7bfbec108703f327fb538868c530418406d37505e6eb6afa621d2d49d007ba SHA512 d5cb0cebaae0ac36951379cad516f0575e85e0bb509cf88549239e300c7d6c6a4996497145acaa9e9783de6b08c6e352c7ffbedb23ed04c15eefbe9c3cf0bc90
-EBUILD iscan-2.30.1.1.ebuild 4852 BLAKE2B 17a62e48cfb0eaafb60dc964810a9b337af5010ef88b5200088bfdf54d52b7f0fb170628910698b021c27d2b1e723bd10078aea4eb5830723278998056f2ab91 SHA512 a3189e93f15c89e9a8f89efd67f938cecbdbbe9d975c5378a67e687ffb1fad65df76f6198258f591c56749daa1d38803966e392fb1b77c9422441fe60e263411
-EBUILD iscan-2.30.2.2.ebuild 4700 BLAKE2B b098e86b07442c109c7759cff6c6a41b1187485a6337a480d5245c2b6c6d8836e67a0e68296333a8a5c846c86aaacabbd2f58f63de3d35076ce60db75b52bad6 SHA512 59c3f9daef1ab2be73aaf83e63b47ede6146001c5ee255bf82096f02e1e53b659a00528069e40f07503834a7d9f735e0bcfecaaff9a1db2073c6817aa0444298
+EBUILD iscan-2.30.1.1.ebuild 4734 BLAKE2B e38cffcc890e1cf995f5949da8549ea85e234cb2e1b3b70ac7b8bcec8d9e0ac0003aa36f6ca0666e305b85c929078fa97a2df0531421b3d4e72d2cdeb4b70b21 SHA512 d217114d62a2d5c71b91fb93291ea339c40b31e97072837e063488ea980f33883be8ffe48432223dfa72cd8d23772e8d1732939a72138c07fb90d4c86cef954b
+EBUILD iscan-2.30.2.2.ebuild 4582 BLAKE2B 27c48a10f7e146aa94e90b8827ac1fc08044e2a2fb38bddfa56946ea2c7ab5631da428b17a6e19c1537caec096c60ed360c9f489a15b6a32b032f35192848df2 SHA512 42aee5ac19f6c46d4d59bfd32db3a43235013a53d8205089401c6459069d474df1e967bc03a2e08a9bff8fbf6e4f48cbb03f847ea031dadd963724cb4a6480ae
 MISC metadata.xml 779 BLAKE2B 715d705e7775dc8aefea2c58afaf0520819abe2508ee9dde67298a2acdd847b953ac46750bc711e018eea5ddceef2ef3e7f16308c32fade334622cb9a16f745e SHA512 9ead68d2de8d4b5e09e2d478b6f198d8a83985eaa779e941189f1017beb081910fcc6c7d3c1f41db84b91df55399e5e005c326c7bb2841b2ef745d735aef562f
diff --git a/media-gfx/iscan/iscan-2.30.1.1.ebuild b/media-gfx/iscan/iscan-2.30.1.1.ebuild
index dc0a72b55cd0..1eed08b0673f 100644
--- a/media-gfx/iscan/iscan-2.30.1.1.ebuild
+++ b/media-gfx/iscan/iscan-2.30.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -41,9 +41,6 @@ LICENSE="GPL-2 AVASYS"
 SLOT="0"
 
 IUSE="X doc gimp jpeg png tiff l10n_ja"
-IUSE_LINGUAS="ar de es fr it ja ko nl pt zh_CN zh_TW"
-
-for X in ${IUSE_LINGUAS}; do IUSE="${IUSE} linguas_${X}"; done
 
 REQUIRED_USE="gimp? ( X )
 	jpeg? ( X )
diff --git a/media-gfx/iscan/iscan-2.30.2.2.ebuild b/media-gfx/iscan/iscan-2.30.2.2.ebuild
index d956e4fc1b27..3cf3ccb4a96d 100644
--- a/media-gfx/iscan/iscan-2.30.2.2.ebuild
+++ b/media-gfx/iscan/iscan-2.30.2.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -37,9 +37,6 @@ LICENSE="GPL-2 AVASYS"
 SLOT="0"
 
 IUSE="X doc gimp jpeg png tiff l10n_ja"
-IUSE_LINGUAS="ar de es fr it ja ko nl pt zh_CN zh_TW"
-
-for X in ${IUSE_LINGUAS}; do IUSE="${IUSE} linguas_${X}"; done
 
 REQUIRED_USE="gimp? ( X )
 	jpeg? ( X )
diff --git a/media-gfx/librecad/Manifest b/media-gfx/librecad/Manifest
index faeaaba18890..9336e39e6adc 100644
--- a/media-gfx/librecad/Manifest
+++ b/media-gfx/librecad/Manifest
@@ -1,5 +1,5 @@
 DIST librecad-2.1.3.zip 26086377 BLAKE2B 7f137c1f6c80f10b803ffbe8a739c230664d81003e47dc0f7b82509fdf0534e5fe046cbc6efaa75149daeaf6f0fa217c1fd08e4de83c74361c99108b6b8fd53a SHA512 9a41c17b512ccbc1a0ebb0e6da8e7297663490479f042fadaffda819e371afc7fa49b789449df9fd4e36a2e2b6f95b9b5be19df47cf3c4252111db2a7ed7f009
 EBUILD librecad-2.1.3-r1.ebuild 1418 BLAKE2B db2d3476c190f0e45b9ed1786de2369b887db0c3cdba7abfb259733123a2b96b4dd423236e05b4b8f4eba3a5254a1381ba4f9323fe171359e9cda7ff3205a2d1 SHA512 6489a761f0bad291fc536047653edfb527240fd8582428cb4811b3c5197a9e6a51b143dd650541f543ab4b312c71fc8a626248c8569ac1fbb6b5fe302e660761
-EBUILD librecad-2.1.3-r2.ebuild 1286 BLAKE2B a2e32013aae07cadbed37d15785da9e0371f746a334d70209c5271f06f8986936ae16d4399c002345ab3e9784ea81e105737aeebd0c860a30919b6f3700b6708 SHA512 ee11a46159107e2673d9885860aa0f1456658932503423d24c6965007b022703e0c1a9a2c0ea10165f35856a0adda13fa72967bc4515e956d1abff5480c44aab
+EBUILD librecad-2.1.3-r2.ebuild 1285 BLAKE2B 0dec0e60b81639a3c4850958d228c41df434ff508b83602c55ae493b7672544cb3fecf56e7a86762eb631414e83daf717f316a62d1fd2dc6d9e09cc9479f330a SHA512 639783a6be5bfb84267e6abb1c36db443f99edde1e2098705307d0888fe48d0310bcb10026a6e81ac5f1a749649863bbec789ceb7df59956bcaa973a614624bb
 EBUILD librecad-9999.ebuild 1344 BLAKE2B 7e2d33864340058bf32c0d6f541bfe7b7a16daf386d35015f39535f5ddbee51b2a46d99c7a5a7437d9763e4f953e0bbc9f4fab1d99bf42d1240247c1052e3993 SHA512 722322ffaab726f066da0497261ba9d9f4eedab1f885e1d19b587bfbae5745cfde7399c24767f303a9c76a7d456d7564b3cc9d872b875be2a4cab8c499e6589d
 MISC metadata.xml 459 BLAKE2B 8b648b5abdd62d9df306c90d182164694c753231b16ad37319863ee37feac91b2e0fcc89212b5259a899287a638a68cb2e48fcc55af8a076d23b201e6b38ebb3 SHA512 108977904dfb070a16279d3306f40982a73b1cdddfa90e8ab22f83c4a75cd620a829fea9a56a0290d2d160b1d30fd0fb67e320f526726dd57a613e781c700b6c
diff --git a/media-gfx/librecad/librecad-2.1.3-r2.ebuild b/media-gfx/librecad/librecad-2.1.3-r2.ebuild
index 517916041bd8..dfd56d2aaf24 100644
--- a/media-gfx/librecad/librecad-2.1.3-r2.ebuild
+++ b/media-gfx/librecad/librecad-2.1.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/LibreCAD/LibreCAD/archive/${PV/_/}.zip -> ${P}.zip"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 x86 ~amd64-linux ~x86-linux"
 
 IUSE="3d debug doc tools qt4 +qt5"
 REQUIRED_USE="qt5"
diff --git a/media-gfx/llgal/Manifest b/media-gfx/llgal/Manifest
index 2d79ed7eb160..b5cc41fef643 100644
--- a/media-gfx/llgal/Manifest
+++ b/media-gfx/llgal/Manifest
@@ -1,5 +1,5 @@
 DIST llgal-0.13.17.tar.bz2 81365 BLAKE2B 3af18f6f3ae699a1ddd577cd97780e9795ff77faffd50866cb11a9ee6170b718144806fb01b7959e2fe1dcfeec39bb0a34482a75e64d5eeb7df73c99ef14547c SHA512 2b100053a804985e7f59674e6a0886bffe5231cf3735a8dbbf7c8db56285a5a4ca88880299aac25d5cecb6a4f0cc024dc87fdf084eb281f7cb578f0d7cba5293
 DIST llgal-0.13.18.tar.bz2 81674 BLAKE2B 96b48e9d6ad91ad2b11cd898563c7640f047ddbfd7f5ba8d6e4fb2d304199936b3fdbc6c8bf2647ec7141b85857c79d4e2e76bab2b3c6daa07ee0b4933b79aed SHA512 d01c1060616bb602af8b75aa5ae04384c19ed4bcc717112b9d5cfe48a9a823ce9ba381d675b4f4e89f35a56d7cbf580f27405fcb65b785e8ea6b6732784b0655
-EBUILD llgal-0.13.17-r2.ebuild 989 BLAKE2B e3e402416e2acba172e9eea329f220d14f86d42d0538cf43a243fc99d5aff01cd6d33d4401c5d7eb08d4b9b2b0df2d4878af39b348f0bb8db036c3c6923bc46f SHA512 60eef8c5d8faf580b5a4827baff2a9c5f09d40158766a10c620d164dcd2ac35faaae5cdb8727f4ddb54d1f261404af346eb058710f7c5ef7d1c4d5bef5af01bd
-EBUILD llgal-0.13.18.ebuild 991 BLAKE2B 8a0ad5e1a26f097d3eb838c1f1c81b57e749a8764ec148ab1f4ffe1fecec981fc4878c9b7dca1358247d657fba6147666122ac75112d1094f5fa149d9b99310a SHA512 0721ce4bbf924c37c8b086ebe1cc67df528aea356bab0f8b13b317507aa6e3df44893d37b993469c486df982577130796a3f11e9b5017c833541997ddc3238e1
+EBUILD llgal-0.13.17-r2.ebuild 914 BLAKE2B d52a3d2ae2de6da933bbd651fa215dfd7609bf6e34afcda0b753f5be1dd5a5cf269ceb508c0c50f2b2497f6f8998904ded0f51d639a16f207da495f99d1cd05e SHA512 c7150f19b551b77c7934f4a12fe9b60c0ec2ef96eacdc0e4de192b0d8ba088609373436499ef2351983f8d279fb269908479ee12da26bcb1dbf3b50110cf419f
+EBUILD llgal-0.13.18.ebuild 916 BLAKE2B 0b6156409e0440708cd37e45d7e16c326c643c5ef35090de4e40fa8c802ee5d457db139ffb0149e59d4f80417a6c6b408deea06a1e9802f9589b3eaa67d7a690 SHA512 9960069fcf88897ddbfd5cc026ca9dea6f1bbcfa0fd5ab437af970a260db06bf52268730ea425af451fb0847c070ec07305de126884c8f550f0329c266d52b9a
 MISC metadata.xml 365 BLAKE2B 91e30c99cee02f64efac65038cd7e3e04b37f466b83d423cef36a31a071ee9ffd38fc1d46b71f736ee87d846d9787348720b49c83fd2aa6e402dd2817b18fec3 SHA512 2abbab6015809e7c8f484a40cfd646173763f54cec04f2aa71a550dcc8c4dde96f8d692d03de6280411b480a0597708da655eaf0005e3f8b4b87e65cbc44f04a
diff --git a/media-gfx/llgal/llgal-0.13.17-r2.ebuild b/media-gfx/llgal/llgal-0.13.17-r2.ebuild
index 7b8763157a21..deae0d906025 100644
--- a/media-gfx/llgal/llgal-0.13.17-r2.ebuild
+++ b/media-gfx/llgal/llgal-0.13.17-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -15,11 +15,6 @@ KEYWORDS="amd64 ~ppc x86"
 # Package warrants IUSE doc and possibly examples
 IUSE="exif"
 
-LINS="de en it fr"
-for i in ${LINS}; do
-	IUSE="${IUSE} linguas_${i}"
-done
-
 RDEPEND="media-gfx/imagemagick
 	 dev-perl/Image-Size
 	 dev-perl/URI
diff --git a/media-gfx/llgal/llgal-0.13.18.ebuild b/media-gfx/llgal/llgal-0.13.18.ebuild
index 4f2f61309ae9..f1a01aa8d536 100644
--- a/media-gfx/llgal/llgal-0.13.18.ebuild
+++ b/media-gfx/llgal/llgal-0.13.18.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -15,11 +15,6 @@ KEYWORDS="~amd64 ~ppc ~x86"
 # Package warrants IUSE doc and possibly examples
 IUSE="exif"
 
-LINS="de en it fr"
-for i in ${LINS}; do
-	IUSE="${IUSE} linguas_${i}"
-done
-
 RDEPEND="media-gfx/imagemagick
 	 dev-perl/Image-Size
 	 dev-perl/URI
diff --git a/media-gfx/mypaint/Manifest b/media-gfx/mypaint/Manifest
index 09e408c9f054..4c98ed4a6b32 100644
--- a/media-gfx/mypaint/Manifest
+++ b/media-gfx/mypaint/Manifest
@@ -4,7 +4,7 @@ AUX mypaint-1.1.0-json-c-0.11.patch 403 BLAKE2B 1608cb7706d85cb84284cc58bb78921c
 DIST mypaint-1.1.0.tar.bz2 37416388 BLAKE2B 4ced9087a51b855ad943d104801d06a03a6f78dfd39eba975cbdeddd304c12ffb0ccd48267fcf31f3608acc069b88bc3f07ed2ab750d77eb31bd64df2f6492a9 SHA512 a3eef378ddcaa0a33f9afc49cc587489ecfff6f3e46e2238aab83f89d682f2407e2760e6029eaac3591f0a8955c95280c12839adcb42ec452cefbcdb142ab9b9
 DIST mypaint-1.2.0.tar.xz 37895196 BLAKE2B fa0130a0b8ea6aba14f2994584f990c8c0cb4a784df2cbcec10a2be331c3f831dd0913e5b7d1f343ed90b9976b56fa8d55687c4421e11ea6377d2c87f218d59d SHA512 b4e75393cf6ed9b0c3c5a96979607c848d463987e3ac0f711738940ba97be6922e0cce735c56f91261bfce3e0730d69393dd57a45b3b04824c63c74cf1306790
 DIST mypaint-1.2.1.tar.xz 37897196 BLAKE2B 2d8f6b03f710febae1c2d617a6e542543786be384585ae8a973604da2eba8a0fb770d185aa3d2dfc6f794adf29ffb9c217356a96ab27d677ebb57816f62fae9c SHA512 1783765e495b9535669a83a29d27ba684e6201fdfe0875bdd2c167b1dab8af05993b19025767fe0b2770ed9e578e4709f75d8a4820ac945812cba85609f9eb9b
-EBUILD mypaint-1.1.0-r2.ebuild 2032 BLAKE2B 44a1399a9dbc5e7804a4d6a26b11590ffc030c2530b4dfe6f82a4cd0b1835807e5e121f9c65ce697e4efc723cae03ad25f63d59ad222f53da11cebf23bd2c187 SHA512 906b639cf46ebd2b87e003fe19f1dbb807b7584b73d04f481429b01abb093bd7a6767072429dcec86fb5f255f272ca0c66467cbdfe974466fbca4571df0401cb
-EBUILD mypaint-1.2.0.ebuild 1843 BLAKE2B 00b4c75f0cf28b43355f698a9a88ed00fca89affbf218228fcd3c0425169fe1d19190f67dd8029dcaae0bb0c19257ffea0a5a542408e0354a929d8fd3a011f44 SHA512 e0ccc37c46c109e61f600fce594474725ad4df7485d062f1c1786ebfc78c5c120a225a636d01e302e67c2918b1b6c424f541a49565a138135bc3e943d68ca86a
-EBUILD mypaint-1.2.1.ebuild 1986 BLAKE2B 3a427eea179c1b721970b9a9d0fe4afacb20a831a5b6507c8978e25d1876ffc83b4fc92ecfff798face23cc68d5bc397ead5ae16e8698fd0aa6f27083ebac624 SHA512 f6d8edca3abf53b8552fc4fa1f979b46513c2213489c1eb8e502d97c518b3bf7d5293facadd021f4c1cf0d239f1fa88c24a369da81701e2034e5fe3082fd5e54
+EBUILD mypaint-1.1.0-r2.ebuild 1982 BLAKE2B a8e79b602af406a52a1b83d8707fa78d80db7f7794a8bb10c6e15cebae931ec762fa4edc2c34d6a8724a4d48f592d084f34226f81ff0259742fffa2ac2d825ee SHA512 2981f47cc60dba1c20328070fcf29852dce6bc337456131b199fe8fe9c26dcd5b1d86378ca836876c28ee98821bee58938d9a41c046928e33e179c11e2fcf0c8
+EBUILD mypaint-1.2.0.ebuild 1793 BLAKE2B cb89f1cd533c3ac7e26cb166fd444f01f888bd888079044e478714bfbd4d4d41524e6c6408a7cdfff59f32bc2d0582b93164383873515400691158d2ad2ecb36 SHA512 b959e04df5e568da944d8cb297d6fd40f00b475e121088698526f25fb8edc174cc1e0b66123c4fbe26d492fcc3a313f16b5622b3afa89d2c8fd0ae39ef87f4f9
+EBUILD mypaint-1.2.1.ebuild 1936 BLAKE2B 812dc942f844091e326fa5768ad29006bec98dd89af2a3b8a55612b258b9fde5e943a3feedb67abd0b388f5ca5d4352909f951510b8a1cbca575c584cc057b23 SHA512 30e47402578220696d794cb8debe10ea0e75b32ef05e4eafa85b94e0ef7f9c18a600a88b0546fd1ffe6ac1e457905ea0b6be0025e2b941776da2582306def203
 MISC metadata.xml 330 BLAKE2B bdc4172a0253e4c0f4b53944a51b29ce97e050a22020981ef3b97eeeb6b246cbcf3a75dd9150ed54a41e33ca3841d923f1ea66c6b08889d59fa1cf44cccb948e SHA512 7e42c10fd3d1317f13955d4410f5ee5284925305bd669746695eca4e84d81b7913b1ba84fb14b27ad556c339c0772b3ef96c8063b44574def2b6d9019fdb03d1
diff --git a/media-gfx/mypaint/mypaint-1.1.0-r2.ebuild b/media-gfx/mypaint/mypaint-1.1.0-r2.ebuild
index e0a166f92e93..5cdf4d15a8f9 100644
--- a/media-gfx/mypaint/mypaint-1.1.0-r2.ebuild
+++ b/media-gfx/mypaint/mypaint-1.1.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -17,9 +17,6 @@ KEYWORDS="amd64 x86"
 IUSE=""
 
 LANGS="cs de en_CA en_GB es fr hu id it ja ko nb nn_NO pl pt_BR ro ru sl sv uk zh_CN zh_TW"
-for x in ${LANGS}; do
-	IUSE+="linguas_${x} "
-done
 
 RDEPEND="
 	dev-python/pygtk:2[${PYTHON_USEDEP}]
diff --git a/media-gfx/mypaint/mypaint-1.2.0.ebuild b/media-gfx/mypaint/mypaint-1.2.0.ebuild
index f95ce3047dfc..4a465a64cc5f 100644
--- a/media-gfx/mypaint/mypaint-1.2.0.ebuild
+++ b/media-gfx/mypaint/mypaint-1.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -17,9 +17,6 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 LANGS="cs de en_CA en_GB es fr hu id it ja ko nb nn_NO pl pt_BR ro ru sl sv uk zh_CN zh_TW"
-for x in ${LANGS}; do
-	IUSE+="linguas_${x} "
-done
 
 RDEPEND="
 	dev-python/pygobject:3[${PYTHON_USEDEP}]
diff --git a/media-gfx/mypaint/mypaint-1.2.1.ebuild b/media-gfx/mypaint/mypaint-1.2.1.ebuild
index 9b65292a4a45..ee5a95e57d0c 100644
--- a/media-gfx/mypaint/mypaint-1.2.1.ebuild
+++ b/media-gfx/mypaint/mypaint-1.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,9 +17,6 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 LANGS="cs de en_CA en_GB es fr hu id it ja ko nb nn_NO pl pt_BR ro ru sl sv uk zh_CN zh_TW"
-for x in ${LANGS}; do
-	IUSE+="linguas_${x} "
-done
 
 RDEPEND="
 	dev-python/pygobject:3[${PYTHON_USEDEP}]
diff --git a/media-gfx/openscad/Manifest b/media-gfx/openscad/Manifest
index 86a244bf4381..8c21883b8ccb 100644
--- a/media-gfx/openscad/Manifest
+++ b/media-gfx/openscad/Manifest
@@ -4,5 +4,5 @@ DIST openscad-2015.03-2.src.tar.gz 13307974 BLAKE2B f3532d77db15250abba444949cba
 DIST openscad-2015.03-3.src.tar.gz 13309147 BLAKE2B 77f4e934474882e454dad683d9da6a2c9fe699a84c86ed5ebe1755de037f6930870ffb432dedeef3bea7a76cbc98d0f0d0694e5d0f7b469830370ca3548a650c SHA512 b2cee90563bdf2cb9f7b5a0d637b2266f5fcd62add6147c9326b843a5b0975b8ec900d13a2aa86485fce4a5e7e53a08cf4171a3d1d66355e813d01ca9096faee
 EBUILD openscad-2015.03_p2-r3.ebuild 1572 BLAKE2B 747dcdacc2a08772b1d64d2908978fe16a6a04496e7ad2d053d622c733835f0055edbae1d3a400a0a3293168ee5935b7ab17b4379ee80531df0654ea49559833 SHA512 c7cbef11976633ccad4f0f947a07fffb1a7974220f46af1a2bb81ca577236126ce14d642bff0d5a182cb2c5519bbe669fcbe4806678294795cc0afe71aeca589
 EBUILD openscad-2015.03_p3.ebuild 1584 BLAKE2B b283c7b93ac0797ec7a7884047568e07773c6714ca0ea787ad8c4003fe85cfc7219bcca0dbcb1149063580109d2e6c419ce4a9a6f2ef0cbbb8a87d33907637e5 SHA512 e5ce533fce3fe8bdcdcd86b62a7aa77073a2acf572f1c386e4fded6d023bc3571757f8513c1ab538d59f70ee1e3a11c63b951e93224abbfd2baf09dec7430419
-EBUILD openscad-9999.ebuild 1356 BLAKE2B 4d2d0a81cc79d16afe4054129480eebdb3ebf40addbee9292aded12d5e32faa3e521386b7a1781021c5088cc47591aadd286001942899f3481a114d1b76581c7 SHA512 2ce6db8ef90a5364922538dee6c02f764b5bb87e6989ea2657443f7888b5c749f8cdb99e67a76a4af9a170d053b75498f7c4fc27320c83940a72fba9eb3b7810
+EBUILD openscad-9999.ebuild 1463 BLAKE2B afe4a5aa2b53e6667626605fe869a76318d9f74933cb0e1f6f8e1ad7d7e17e42bdd93cb306689fac49622fb8f62659911512cacc762406e488068fd738ec3a97 SHA512 04900830eef04f18fcb64ad35a7e60ef00247acfcdfbe63f3a685ddd39bc699198f4addf2a47141018c5c4cf551f01f60d7b3ee48088f9aaf9cbe4ae216d987b
 MISC metadata.xml 830 BLAKE2B 762f6ceb15d94a41dcdefc38f8dfc1bf652f97f687da7a336653aca1d64b31837d09cea3c1d311772e67368ddaa4876c845f5ca3cbf7a7c4e9c6b6f13219c021 SHA512 8c12064c65b8ffca0ad8ec585d3de5ed4ac17bec6e4c7340aba2980d2ddb047d1f7b0c5405cdb4b72869749f6ebaddf29bd6fa03eec8e71c8fa2ea3910767617
diff --git a/media-gfx/openscad/openscad-9999.ebuild b/media-gfx/openscad/openscad-9999.ebuild
index 54522344a955..4dd3247d891b 100644
--- a/media-gfx/openscad/openscad-9999.ebuild
+++ b/media-gfx/openscad/openscad-9999.ebuild
@@ -41,6 +41,9 @@ src_prepare() {
 	default
 
 	sed -i "s/\/usr\/local/\/usr/g" ${PN}.pro || die
+
+	# tries to call ccache even if it's not present otherwise
+	sed -i '/CONFIG += ccache/d' ${PN}.pro || die
 }
 
 src_configure() {
diff --git a/media-gfx/ristretto/Manifest b/media-gfx/ristretto/Manifest
index 051d713bad5a..559ce451c059 100644
--- a/media-gfx/ristretto/Manifest
+++ b/media-gfx/ristretto/Manifest
@@ -5,5 +5,5 @@ DIST ristretto-0.8.2.tar.bz2 559444 BLAKE2B a44cb653fca2452d787b2d69b556fddc9f6f
 DIST ristretto-0.8.2git-rd21ed3c.tar.bz2 584418 BLAKE2B 50d24fa81f4ce59a3a9acdb71a532e8d57399aafc4c20790b4a08ef3584bf3c71af978cb4e53ba6f4821fd4fc02e12600d39b84309ee29a764581855fd43bc75 SHA512 17fe6b5c24d4f4f3b6d28e1c435afbb0140e81a77f2b1c628ab7e05ed380a55a902368dabbb8e92647f08bb8853df8099b8de779d94dc91d3426cc7e33cbcbe3
 EBUILD ristretto-0.8.0-r1.ebuild 959 BLAKE2B 546b009d37ebf39e984bd0b81deefd55e66c0f6336328a79d785d866e1468483aab6eba1cfe1fbbea993b2baf1876d925342e25c8e46fd11bc5d4791d3bb6b8a SHA512 6a0829f14ac72ce3e7860412e09ea9148d39d00fd21d9cd52f2dac30c4bdc0cf10ebe8f471f519886f7d85530eced1d518cbe9eca090eb741e7b0a555f9edd38
 EBUILD ristretto-0.8.2.ebuild 853 BLAKE2B 17ad3b252cfc8b1c07e3e7c65873d0c85b69eb56e64b148efc7012ba6ce210f9443089a13aa4259ddd9c473242a15a0773f56c2f199a6c4312ed214bd772d193 SHA512 ab24be0f6c395ba7c3fae4fa1a17ca3dfb785814f05fb1ae788a2b76331647138c0c99db760656d89acb44b945f260ad061d26c79527023b09f21a95489c0ecd
-EBUILD ristretto-0.8.2_p20170821.ebuild 945 BLAKE2B 2eb1698351fdcc1f5ca96d34458b8c2575b83ff8be0b6f2a6466c180d2fd131ff9ec13a6b55ca83ee531f26d95a253d34bc457d284ca76e6abdab27824903733 SHA512 1778c675409ac056910146d5b4c89d055c8dc526019566132194ec2f93c43aaa5a122bd63dd438d9badf0de48ccaed44e21dbdb7b01b5e6a4386288b9f316821
+EBUILD ristretto-0.8.2_p20170821.ebuild 949 BLAKE2B 118693c9ce2ac41f5dfce5410cf4951c3f05ea5334a84b04c43e4d877d14021eb08b30a99c343270af2ccb1611ee898695f9d20fada95888a28516a6ff1dfa26 SHA512 01e5b950ff9684ade413e33532e0f81b0ea214bd13203cfe68f2cfa7bd278be50d27cb9a1196b0ab69d80a0f48384aa11e0686074d7919e17fcb0cd8d8b40d12
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/media-gfx/ristretto/ristretto-0.8.2_p20170821.ebuild b/media-gfx/ristretto/ristretto-0.8.2_p20170821.ebuild
index 8aac8c33c382..1aa62d01ec91 100644
--- a/media-gfx/ristretto/ristretto-0.8.2_p20170821.ebuild
+++ b/media-gfx/ristretto/ristretto-0.8.2_p20170821.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://dev.gentoo.org/~mgorny/dist/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND=">=dev-libs/dbus-glib-0.98:0=