gentoo resync : 11.02.2018

44 files changed, 203 insertions, 327 deletions

diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 7ddb80283a41..ba2e11a000fb 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/aaphoto/Manifest b/media-gfx/aaphoto/Manifest
index a144f723debf..232c7f18ce08 100644
--- a/media-gfx/aaphoto/Manifest
+++ b/media-gfx/aaphoto/Manifest
@@ -2,4 +2,4 @@ DIST aaphoto-0.43.1.tar.gz 135261 BLAKE2B d5408dccf6071c2403c67138d62ac95533f1f7
 DIST aaphoto_sources_0.45.tar.gz 134057 BLAKE2B 95a55a1f612a9e30967083ad5d59c6be0f815e2dfc55531660ae20eef9bfe7411aa2c852d0b016e04506ba4956b65674efe3797a66831c39a473ea49c8e8ecbe SHA512 203343a51a64a0422f4af2f80523bb7cb90aa04c10b64bd3aa3091460cf5de1bb86d677c564809813703a2c65f15736bc8d4e3c9273b3f3a72ca7c89f3311599
 EBUILD aaphoto-0.43.1.ebuild 892 BLAKE2B ef29d27eadfb75d392d6686882537c00d850c889b98fc1acc0660476325b1c2d475c57ed9166b91c3b421ee40dea875bd2118f40c84225a43bc98df838ce5b75 SHA512 9f8699ac45e05a1be21d28e7d0f9aca15cf13884f93932c0f1349153bcdb586295e4e41ed5b155e794eb2cb0402929a445e85734ddd692ea0cd1af7d32df6d69
 EBUILD aaphoto-0.45.ebuild 773 BLAKE2B 49e18b0128a2ac3a415d942ee9ad55ae05da96d3e5a6910c75d60b22ea42a650fa75abf03293df09eb30472ca755f31d40cce8ca693eb0382e9c680f93b3bf11 SHA512 5b14a1f1b07417bade253fc21badc0b6eeeba6a0cfa20c1e2e91089f78a11cfd689039ab6c3c03b40d2fb91de0593db725fb69c846a735dec7fb829e672a5dbd
-MISC metadata.xml 502 BLAKE2B e6800839353d4f03044e179370ee58e7b92a1d865f5d780761cb96e4e3d5db01b2179a7509fe4cd613efc5444de192872f558d4e6888f00373417dbf198cf4cb SHA512 84b4ba57110fa35e756fe06e137b3c891cb3595b2c240533b147184e4a24fc3987edbe818a12d5a2313be06367dce9445b44e9ca73d20445d0c154b1aa344160
+MISC metadata.xml 442 BLAKE2B 99ddebd8a8796f5939503bbc98e678dc24106ab658846bbb598dae2fb5db2d7f4c8e53167441c97c4974a9bdac755b466f7129cc814237b206fb727f17b34312 SHA512 1eace312288be3ac4aef3dea8cff7c119a61c9f97ef8ea7de3b2fd6afada044a2ee3f6a189164333c4eec7cffab87eb869dd004ba7cceb82fb8aa87559b3d8fe
diff --git a/media-gfx/aaphoto/metadata.xml b/media-gfx/aaphoto/metadata.xml
index e15c53d9908b..63c0cc7c9a30 100644
--- a/media-gfx/aaphoto/metadata.xml
+++ b/media-gfx/aaphoto/metadata.xml
@@ -4,7 +4,6 @@
 	<maintainer type="person">
 		<email>erkiferenc@gmail.com</email>
 		<name>Ferenc Erki</name>
-		<description>Maintainer. Assign bugs to him</description>
 	</maintainer>
 	<maintainer type="project">
 		<email>proxy-maint@gentoo.org</email>
diff --git a/media-gfx/ebdftopcf/Manifest b/media-gfx/ebdftopcf/Manifest
index 1453069d16d1..c00ccd7ec39e 100644
--- a/media-gfx/ebdftopcf/Manifest
+++ b/media-gfx/ebdftopcf/Manifest
@@ -1,3 +1,3 @@
 DIST ebdftopcf-2.tar.bz2 7774 BLAKE2B 4dc1bde62b796f441332511e1b9206f9eadd216ab66dc1a6858dc467f9dfbbaaeb4a7de494eaae4584d8a57d59a0eb96f69047d1a57bd007cbb8e2f7aaccd1c6 SHA512 4631f1591290e0ddc778d5c557aff1e698d8dd7e5ac7e659fda7752642034fbabb091c840dcfad5695e9fc19909203a7fdc0b7a69d57a162ce6bb8fe710ef0f4
 EBUILD ebdftopcf-2.ebuild 649 BLAKE2B 1f73a61084a3e38838958b603d92a4749ca1867da8272c9f31eb226a30e88e67f788bea60642b41ddbd9a4fe6eb64beaa2610fc412cce480c888987440e14615 SHA512 8769a7991c41dd2da207d9d5bfb9e9ccb6d79a5b64915c5dc0ac93b1fb715cb2e458df52c4f47f1cc5bce3aae7df9546f05bb764e6dbef4e5f777a07edec861e
-MISC metadata.xml 370 BLAKE2B 97a407a7c02dad01096696e7fb880f8c587d16c018d52986577798aeca76fdfafad94de27aa20de7596038535f0aec1a79fdb5fc1d18df4878b56f08041a99f0 SHA512 80e86496a4c296be5257f1859ab0c482c1dfd0f535090f8c8dd7bcbb6909e102f83d91dd97507251a737091b2a2a5fa5a85fff718f2b9a598a14e8f2a17a8e9f
+MISC metadata.xml 310 BLAKE2B d6b0416573d232c5715df5dcb05139b22609ce8ffb46530c2fd7a0cecc87b37ce2ce286310a80244b1911d5750eb29b55eef6b8c01f6d62c8d007ad2a9b5aae2 SHA512 1923349dde66e8078b37566097a21ead2555a73fdfd97b89beb44a714958dc80f4387ceb642d238419ce0ec388c335ba5db1db5f23b380131f0fbbd51ecd8f22
diff --git a/media-gfx/ebdftopcf/metadata.xml b/media-gfx/ebdftopcf/metadata.xml
index ede6f53a84df..4ade55bae664 100644
--- a/media-gfx/ebdftopcf/metadata.xml
+++ b/media-gfx/ebdftopcf/metadata.xml
@@ -3,7 +3,6 @@
 <pkgmetadata>
 <maintainer type="person">
 	<email>robbat2@gentoo.org</email>
-	<description>Maintainer and upstream author.</description>
 </maintainer>
 <maintainer type="project">
 	<email>fonts@gentoo.org</email>
diff --git a/media-gfx/eom/Manifest b/media-gfx/eom/Manifest
index 94cec24a4348..9d64219f75fc 100644
--- a/media-gfx/eom/Manifest
+++ b/media-gfx/eom/Manifest
@@ -2,9 +2,9 @@ AUX eom-1.12.2-gtk3-svg.patch 1329 BLAKE2B 4f4660aae9a5376beedd68f7f18738e25fcc4
 DIST eom-1.12.2.tar.xz 2213260 BLAKE2B f05264c5b0a5185d1bda8a27e140910e8a1bcf23104a20ff9af78052b9b0a513da50e797ac90da7973dab7d868d10f72098c3ac13f22d369b4c2561a981def69 SHA512 03283cb1cae817c7c21219913fe2f3ab64e0fa6662a63193d4fa012bd0b5c286cbd25131a5bd5e52c1d9304b4b10ae8c37d38a88ea985215c5b277303d7b8cc4
 DIST eom-1.14.2.tar.xz 2254180 BLAKE2B 4ee974fa38fb10ae6984bf32bdbe428e6eefd6b9871fb7bc93df809659d3faaff76ef8afe9c0581bb8f34da64a2b58fdbf4a12d520524fde6c94e6387d3e4e06 SHA512 87d7c5e62249d598474324f24bac1f5f3388bb11517fc54531792fc0291ef42199f3339e492dfc1a1caafed575cf3b21e36ea91f15d0a03b8e912a3d16e5f3b7
 DIST eom-1.16.1.tar.xz 2215676 BLAKE2B 78ac0049c36008ae56fe4d59b908728b49925a1e678ad6b61dcc4dcf450633bc56279bc04d9f64c2631f9a78c957a0f51ab385cdb770b48d3c5dad6ab38f2e01 SHA512 6154f8423eb825fea3cba975e15ac46bd9c46c139966c02365c1fe5d0a0144c4a4bffc80801eddd41506ae0ef86909ca8acb1591f39260aedb6cbb0db9335b4f
-DIST eom-1.18.2.tar.xz 2196228 BLAKE2B 6689a3b3b0954b7f29f12bd951adfe2d2a89de8c964e3c8b9a7b2754ccea6dc6e8bbadaa332a8c6014e529a3e31c22463052a1db79cc63345080cee4e994e387 SHA512 d0d8aaa7837564fafd949da26e477e675a6cbecf6efd799ea0f29ba23800d4df36147f83bf059dcf38f9c4a9601e8501ec78065e02125fb18261011e1c3ac12c
+DIST eom-1.18.3.tar.xz 2198324 BLAKE2B efdee3c56fec54342184ae75f7ecb3ebda0227ab0586b2cfcd8c1b793e1b9ae2fdea79202c8b3e0bcb45d9cd5c0eaf6ad51d59b5508126d9160806bf4b7c8239 SHA512 64244d5f8c354c53e479027f38c359e38c1dba3cc937440e1af6e4a05f54fc4a65327311998575b90055b5e65bd0dc24dae81e40e0f82b99b3e41c44685d5188
 EBUILD eom-1.12.2-r3.ebuild 1897 BLAKE2B acdf2fa81bae0814e7f9891810b146b58f77a959ae5fab53349868499d58c971c3af040fae0e49500a47253f65638d10beecd11fc84885eec1059f6da357356b SHA512 41e360632bd653ef941714e45bca87f8ff940729070ab1a31046f87726e92ba2c73b71eb092ffc258f7674a3cf420c0bad5726442d35fbd49fbaf354f067e795
 EBUILD eom-1.14.2.ebuild 1892 BLAKE2B 0298f92977d6368dfe624a78cbde84291db5a7f06774f2935b60ed33432dd06ab996661d8fdcc88525b2027d21627c4c7e9f46e30e8d857b1725a8147de4c4d6 SHA512 4d7e22033498bff1cad886de6d850977e913dce452f46d71c580c263103bb66cca9f4ee6ff3331d9b68e294fd52978bbda39df583be7472072957c0db4f56955
 EBUILD eom-1.16.1.ebuild 1892 BLAKE2B ce4075caa97a575077a77657abc68539a5e6076f04dda697cec172dd168bc564698f9853aa88a09175ea238a9ee40107074136d4b56e38dc26d505996ca59759 SHA512 88eb94a745dc8bf09867dbd0671dfb89a931d274a2eb9c95d900b6a7c25d3a79a4afef4c066e18bed09609969d6e1b1f72b2dbd86d6d83fcda1542f57129d713
-EBUILD eom-1.18.2.ebuild 1480 BLAKE2B 1b7cbb148fb9ffb72d91219a880f13461353715d48c81614b416dbe32d16c109e57b4ec4a6e99df909a3868cc79d1ee773b482af6395259cd8154df9c948c430 SHA512 1120a5126289d462ce1b8737ac8ec51abfe297f5cb686cc29c73cf1698b94ebd152159f5f68f7c8c5813ca9bd18c3abb55835c74aead4f47ee0eed7e5dda689a
+EBUILD eom-1.18.3.ebuild 1480 BLAKE2B 1b7cbb148fb9ffb72d91219a880f13461353715d48c81614b416dbe32d16c109e57b4ec4a6e99df909a3868cc79d1ee773b482af6395259cd8154df9c948c430 SHA512 1120a5126289d462ce1b8737ac8ec51abfe297f5cb686cc29c73cf1698b94ebd152159f5f68f7c8c5813ca9bd18c3abb55835c74aead4f47ee0eed7e5dda689a
 MISC metadata.xml 408 BLAKE2B 3aa045b7f75c60605aead480120e080ce799255190b0ffddb3a204b9fdaad92451bd42717fa70232056dc073a29fca96c96b01cdce2125f9e357c06aaf874880 SHA512 948981426d592856f20cfcf6cfc8d0505acc76144ca32211ed1a5c9d6106aa71e2d7987c1a0ab6373903b5a413da6e22f5fd9d10894bc89eefbac12d48cd7b30
diff --git a/media-gfx/eom/eom-1.18.2.ebuild b/media-gfx/eom/eom-1.18.3.ebuild
index ed91e1376aa2..ed91e1376aa2 100644
--- a/media-gfx/eom/eom-1.18.2.ebuild
+++ b/media-gfx/eom/eom-1.18.3.ebuild
diff --git a/media-gfx/gnome-raw-thumbnailer/Manifest b/media-gfx/gnome-raw-thumbnailer/Manifest
index 7b7ccb3f7b70..4aae549c9516 100644
--- a/media-gfx/gnome-raw-thumbnailer/Manifest
+++ b/media-gfx/gnome-raw-thumbnailer/Manifest
@@ -2,6 +2,6 @@ AUX gnome-raw-thumbnailer-3.0.0-deprecation-warning.patch 1715 BLAKE2B 62d10ead9
 AUX gnome-raw-thumbnailer-3.0.0-fix-downscale.patch 1030 BLAKE2B 49c4e566963e31f7f6293cc420157e0e33a8cfdd169e65771019fd00acf2d8a760c522ce6f0c2a2c13052804ed726b2eb35e378a43a1110328ea694449cfdf77 SHA512 b4985090dad9a06087d2b598eed03333a80d71343a244db3c08fc0f5ef1fc8baae1969b0cdaad460cdd54106173fdd9aa52086203727e823e20bb830deee1242
 AUX gnome-raw-thumbnailer-3.0.0-libopenraw-0.1.patch 696 BLAKE2B c790781d81b5e4b4793c2a2f4aea2893b964e607b5cfc55eb658defb4748c7958558ae85435c0d18986f7267ac58b8c8b41471ce7cdcae7b04100f0c23d560b0 SHA512 ac12cf060a1f40abecb2ff86429766662632e1a448dd84c5205c8def987d7e20c1738402cfd7d6c76b4a5f908872c77ddc046e6379705c1e69277543828bdab7
 DIST raw-thumbnailer-3.0.0.tar.bz2 270499 BLAKE2B e08d78ba44f160ba1903b78b5e85d9237610c81ac9a63c25c7b2c308139b8e18c9041e2c35aaf44eb87017be17f7bb3968798e165c28349703a5306a78999bbd SHA512 b6b477af0ec604e100a67829bc9262a3aa54db9beb644e60a9ae95f916fd641ad7ccaa908fc6458be2eee60ecdb47bda9449720bc078f1c4fe0135fabf0bd9eb
-EBUILD gnome-raw-thumbnailer-3.0.0-r1.ebuild 866 BLAKE2B 99a498a6567af4032bef087eff4a00bb95758df59c4cbd9f9d0ddc86bd412b1bdb0c5c91ebe88cbd3c8aaa67b6281bbb1acb46db897ddb20d1ec9d5b360ec895 SHA512 06ac66c3e701c12aeeb9756d48bcb7b7cf166a9a97795f2cae8c553298f3859f468bd1f9ab5fc6c1bfe4132146b9811e3398c2ab8e80e6e34121d060491a967c
+EBUILD gnome-raw-thumbnailer-3.0.0-r1.ebuild 871 BLAKE2B 8fd8f023bb4c97e8c87bc81d79c2d704102e284a7bcf250a6b5cb23e4a89997e333f239b3902fc51864a35d806c684e07c0e652a340d929fad405d17754a2422 SHA512 a40bd067165528ca7a0541faeccff8db2d0220969019e16925b299635297e9a5cc9325c41bdf0f69eaa491ece9542e1bfa8bcab566b9227cb3b3f1223dce93ab
 EBUILD gnome-raw-thumbnailer-3.0.0.ebuild 648 BLAKE2B 60b014ff0392ef596738db5a9abd2bbd434f03b8389cedd0cefaf08c874eda4525e80ca84cf89b81c150937ecf00282ab79bbb5600c1a6dcda0fd815adf90577 SHA512 c129fee26c644d9f1577aa53c0bca841047cf93a0c5d65442ae141b21bd82ce4097e932969a745df528a1703ceee65a0d9c667c7888321e3347997fd156787b8
 MISC metadata.xml 259 BLAKE2B 32f8c5208a55a1dda504b7df969127393a2c70e672aba383fcdc870de8fe778366d3dde3c3313bd043068d2e7831d1e18bad6fb428e82266fc2a630104e0a193 SHA512 fbef629394690b3a5608abc6344816f6acf1e8e2663f29949fd14a662c628f16fee77a1ec1641066806d143fb94c1571bc5b46b829dc53620af6956377fe15cc
diff --git a/media-gfx/gnome-raw-thumbnailer/gnome-raw-thumbnailer-3.0.0-r1.ebuild b/media-gfx/gnome-raw-thumbnailer/gnome-raw-thumbnailer-3.0.0-r1.ebuild
index 710d2a6cde41..973602d4e11c 100644
--- a/media-gfx/gnome-raw-thumbnailer/gnome-raw-thumbnailer-3.0.0-r1.ebuild
+++ b/media-gfx/gnome-raw-thumbnailer/gnome-raw-thumbnailer-3.0.0-r1.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
@@ -12,7 +12,7 @@ SRC_URI="https://libopenraw.freedesktop.org/download/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ia64 ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/media-gfx/graphviz/Manifest b/media-gfx/graphviz/Manifest
index 5bdd4c355ef2..a402279c7809 100644
--- a/media-gfx/graphviz/Manifest
+++ b/media-gfx/graphviz/Manifest
@@ -5,6 +5,6 @@ AUX graphviz-2.40.1-qt5.patch 4140 BLAKE2B d0d92dddd6ae1efb7e24e22ac0f32025b16ad
 DIST graphviz-2.38.0.tar.gz 25848858 BLAKE2B 2c35e7bde3824d7b99008d7879c08ee15bbf4c31272bfccc2be18e6ebf81622030fd856a6d48f7c62a03c8807c181593918f2841d8c0fd393e3b1c868dce81bd SHA512 0e51a97dae595f4e80bc9e4a12ba3c48485fab19941a28d522f5a0624b6a767e0ba720e9e55bff8efe8308dd1cd3793e2c99cb5fdfceb2d5cafb0cbee907e531
 DIST graphviz-2.40.1.tar.gz 25633455 BLAKE2B 96ba5a8cb94d93cf4ecd424bf29c1bf67099e39e582be97fca088de0aad6bbbb46b00af55c197894e0b63f1a96177894b6cd23498295bb524fe19a75661cbc59 SHA512 a3f358a7050523a39b91a259563a95925b37853ffec799e571211af5b686d3af42457c937882954482785745d90416b1abd945caf05f8abb52b3876e07aa70f5
 EBUILD graphviz-2.38.0-r1.ebuild 7863 BLAKE2B 838148d8be4b0c860c4686fd7415846e2e71edcf3a47595fa88550dcfe739c64dc999494b6571d6830207a8286d3bd58aa71e54bace259f28152745546bf66ba SHA512 2ba52aa50713c7a54318ac96ad60382eb389c94407203f6f96a85aafdb74c904d83b96a8d6174d8458d1686f956fa3e1bda41b96f38b23ed73d1a949d9ccc983
-EBUILD graphviz-2.40.1-r1.ebuild 7926 BLAKE2B 2c765f8e8f0bf799eb8e3b7e76bf2edfc656594207e39fef930b5ae4389c63dbb26ecd4f3581dbf83df7bbfad25d8bc065a87257315dbb03dc47fb68ba388a84 SHA512 c16d7653b1e9b021d2f27cb8b32f46b653cc1d45a9703783896f115a9f79dd83a30ef9cd39eb064f6dc2190d05a62ce999665f34afa9dc0f3445c3cdc199d090
+EBUILD graphviz-2.40.1-r1.ebuild 7924 BLAKE2B 1f73c19010dbb2cd8b73bff57fa5e53a6c09be81eaec25a0c0607f0d82f1a92c71cba9de0abf001873c6eafded19fec5e8fb47833814dffab9460992305093a8 SHA512 3639222d8b0cb929cd2c899f09da97cd21fc88f0ff6356553b25a1f46ffd1c27e06a6a3233c49f36d59a7ab8de94f23cb9fd952cc83d8b76a94ffe89e1befa70
 EBUILD graphviz-2.40.1.ebuild 7780 BLAKE2B d881286b10f52fd2167119ca979dcdd35e584262a0e324a71aece5a87d0b1280166f1d6b791c7f6dc511daf5e6ad8682027afd246e6558821a4adb7d649ae693 SHA512 222e64973188fe8287d764a7ae68e69ced364afd18393790b0e253030ba41783d1058814911f13099bc0dbef72855f4de169bd6ea4dd17215ebabdb1e428e874
 MISC metadata.xml 2204 BLAKE2B cc6012ca977a477d6a557df8343e980e926f1e67f737064f3fea406db213e53c416db5fc50692b1132ebcd5b5ce52d4bb2f5a2cec91b0af846b905d36748e48c SHA512 cd26813c5d7d6341ae9a21be50ca4451657c9813e25b2d0d69cd972fbdecdacf63e763ecd1f1a56fee10f07a25e1063822f7b2e9a96df48e3bcf8c7d1d05de3a
diff --git a/media-gfx/graphviz/graphviz-2.40.1-r1.ebuild b/media-gfx/graphviz/graphviz-2.40.1-r1.ebuild
index 74292713eeb4..fafa72676f2a 100644
--- a/media-gfx/graphviz/graphviz-2.40.1-r1.ebuild
+++ b/media-gfx/graphviz/graphviz-2.40.1-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://www.graphviz.org/pub/graphviz/stable/SOURCES/${P}.tar.gz"
 
 LICENSE="CPL-1.0"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE="+cairo devil doc examples gdk-pixbuf gtk gts guile java lasi nls pdf perl postscript python qt5 ruby static-libs svg tcl X elibc_FreeBSD"
 
 REQUIRED_USE="
diff --git a/media-gfx/hugin/Manifest b/media-gfx/hugin/Manifest
index fac6e00c9f00..39ccc6470cc1 100644
--- a/media-gfx/hugin/Manifest
+++ b/media-gfx/hugin/Manifest
@@ -1,8 +1,8 @@
 DIST hugin-2016.2.0.tar.bz2 10386216 BLAKE2B 8437a360880903fac33be7dc12fcdff7fbd16b15153de32e127bdc2b5fe5a47e9ebefe8bc4fb088ba2b818743b8bee9348560aaeb53781bfd0eeb57ec1adbe0b SHA512 9c652e685d0135afef6418bdf5fce39cec8ef1ec0dbe3a325151957c91495db0a2a3171ee04a28955a638493913c1bc800a90c37347ad17612584646c8a65510
 DIST hugin-2017.0.tar.bz2 9803272 BLAKE2B fa7475347f6b1b561132d5370172fee410afd4f8b15c2c5d7d356023716d15cdcc5ecb8a13d743ce13f3c15ebb7f4b42f0e9653b9f94e752d5e6dea3ecef05b7 SHA512 bfd39135119fddb559ecec220da36a4c15d96bda7f93e738d8815aafca94685ba879239202e2cc81c87787188ee3b1b6dc5cbe8014aa12e2f95d654591dc1969
-DIST hugin-2018.0.tar.bz2 9838518 BLAKE2B dc6d786e4e6a298d4dd4e48b2c42f9c9c297b4c431fbc00fa9090f129a4633f599e222402aef1f2a467aa9b498d356f3bbaca9548954cf697d331950afa6693a SHA512 30061f4af695137f349526272e8c3c2f1f6a167305acb32466a30629c46dabea3818bc2c3a77b6102fcb67aa390a803cdc5ba8d8a2ecc6065f88726392529cbc
+DIST hugin-2018.0.0.tar.bz2 9838518 BLAKE2B dc6d786e4e6a298d4dd4e48b2c42f9c9c297b4c431fbc00fa9090f129a4633f599e222402aef1f2a467aa9b498d356f3bbaca9548954cf697d331950afa6693a SHA512 30061f4af695137f349526272e8c3c2f1f6a167305acb32466a30629c46dabea3818bc2c3a77b6102fcb67aa390a803cdc5ba8d8a2ecc6065f88726392529cbc
 EBUILD hugin-2016.2.0.ebuild 1953 BLAKE2B 86adc5c3744ec3f8ceb7a66747b3adb8143c00a5da07d6eb7935ba545d124e7dcbc7ad9d216188f280b84ec130c82510e4c33c215efe03f5431b0df9758b1a2a SHA512 3ac14ba4ce23e0081be124aeb750fcbd61f6e66f3a510680bee999a73e2d1d6a4ce96cb0f5acd1ce930583c3f295ea241d018731255c22d8ac8f8d5d10eda539
 EBUILD hugin-2017.0.ebuild 1929 BLAKE2B 6403a6bdd33ee0ccefecac86eeba844f71f22f4eead5872a0499c015e71acc95c916d062d473d78f1923952ab927ff9af3a1f4f4564c006f7cdb1e30bd2368db SHA512 2c4769e87d57cb9c7f4a287384ae7468a60985488882d9f882a71457b4ef898646206562466eed6485b379a747f460ee7828dfaee5a3acadf1912fd8c83e3258
-EBUILD hugin-2018.0.ebuild 1973 BLAKE2B eb8148bea08769a3991bbddca21fd5154a03503d06dfd60e8ef15c2f0a60d975e34ea06aa2dab01a9aa52603fe696a9c3f86cc7b731c212cbee3e444c6e72725 SHA512 d947ca49bf2d0b203ebbf39df1c19c7e193e624ed73729c9d6ffe02a3f57abdcf568ecfdbd2d7b6d638cce50cedcc14ceab9969ead1e4ec2772220adda867713
+EBUILD hugin-2018.0.0.ebuild 1973 BLAKE2B eb8148bea08769a3991bbddca21fd5154a03503d06dfd60e8ef15c2f0a60d975e34ea06aa2dab01a9aa52603fe696a9c3f86cc7b731c212cbee3e444c6e72725 SHA512 d947ca49bf2d0b203ebbf39df1c19c7e193e624ed73729c9d6ffe02a3f57abdcf568ecfdbd2d7b6d638cce50cedcc14ceab9969ead1e4ec2772220adda867713
 EBUILD hugin-9999.ebuild 1984 BLAKE2B e7a4f4e7a7531b9b766bb7ade9087b11a74e9022a0b9d6aeea41c131d70ee2d2d6869b71e91c14403e5076071ba94afe7c888560a9f9b08d78cf7b18256647e6 SHA512 0b186e5a80fa23b4cf34a1438eacc9b01c22941d0305df391ac3188814cefcf36ac01ecda00707b590e520565127e99fe0f8d7e1e344e267dca912d599122209
 MISC metadata.xml 519 BLAKE2B bd02923a26374e3bd638778ce8100efc4694ab6bec54fd8c8cbd32d0b8c3d495fc965194692ebaf2fe909e495011978d7bb8f3c995037fc128cfd9626949549c SHA512 d4e0bfb870b5b6e5769be2c28983d914666e413333887ac7a7cdb868d2f45f6b284a99204f6e97b98e65958412c04291f6fbc21deed8de518d3ff64aae6ad01b
diff --git a/media-gfx/hugin/hugin-2018.0.ebuild b/media-gfx/hugin/hugin-2018.0.0.ebuild
index 33d44b9ffacf..33d44b9ffacf 100644
--- a/media-gfx/hugin/hugin-2018.0.ebuild
+++ b/media-gfx/hugin/hugin-2018.0.0.ebuild
diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index 720aff0c307c..3426cbe85164 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -1,6 +1,4 @@
 AUX krita-3.2.0-tests-optional.patch 8806 BLAKE2B 90355102edb82e69539dbbedae83a9bb51f98a34fdfd85758e4b4427ed5ec058cfe28931fb6a1c604a9631ff1b3b5c86651a7d6fde80d2002d7e7a2ef6f6aa69 SHA512 aeba8043f7a31a24fad6b515608a881b34bffd0f05502ddd7591f8bb7a7c82eae5ec21bcab4c17091255f94422817ca5e89d97836ab0ce9298f29350a1666b34
-DIST krita-3.3.2.1.tar.xz 132385220 BLAKE2B c1d6d11435f3b6edf91000bcd395ac982e039b236a311635ada33eabf8afc507661e0930a4a418c808970d07ab12854f7044bb095816954b1c5599123635a471 SHA512 e10a0a0400cd88889fce8b87afa133450401d9b2482d9442fde3b69eb73e5b6ef6f2ca7109599e11aafaf3de2965319b8a6e10c952e039fa23ded31a1346cb6b
 DIST krita-3.3.3.tar.gz 207582956 BLAKE2B 36fd2978956fbba870ff8d8c28c31db0731742385620d6b5fd0cc275d74bf6352635c4fd4a537a87b7994fa41d140ee05000593d5a95cd288fd07959e8ef1693 SHA512 b6dc30809e0d6c19fee4bbb240aa53c65e88361ebe273c73c2f24f43904c3cd51719dadb9c11fb7f691f17d75732374295ce904810d8893b7f95b45f859901e0
-EBUILD krita-3.3.2.1.ebuild 2553 BLAKE2B 0716dec5a5140e917f63b00bc0ebf9eddaa8aa2be02df27723bf2750f951864e76288867d93a7cc89a34fc1924cdbfedea5b90a5cf77cc4565a414d38eb09572 SHA512 01541dbb987080133677738e003e0e912a89d30f8750ee2268373b7cca4efd432ce3b89a20dddabeedbdd9d4b9d934eb195afa5c03b918006f41f5d26b1fe530
-EBUILD krita-3.3.3.ebuild 2554 BLAKE2B 830865c1597bcd6320228edadd44b525913f00d7a6c5897eb8865a11ea3f1cbe176c0673b5b370ffa7dad28403471f7ab189646b7bc63717f672ff6df36f0f14 SHA512 875f92e0af525ec0f12f564a0184b9b96d4e21580930fbeb3addf8d20aca77069ba499af08b895a30763fa0f05f45871cfbf8be5973f65a331dbe82929283818
+EBUILD krita-3.3.3.ebuild 2553 BLAKE2B a1d97fa3af8a79da72fa2dbdddd73135892d9df066f9316359036eed49d0bf21cc57ff2aab2d9e43549bab839d3949e0623aea9fc946337fbd1004ef10df6404 SHA512 c750f5904eddcee56469a463c0421250d905d9d6bb3f97711e19ee98b1e3b614c07e6fd68cc46597b4e500d8c8b51f9b10401cdb54622243cdc6491807657662
 MISC metadata.xml 569 BLAKE2B 7609e8cfc1f63fd04b3306a37a9b429eddaf56bf4bcca32d707b529d0267d7f63979a850edf8fcb5b1043134b1baa7210e849903a65243ac300596ccbdb473bd SHA512 44b2dc2f5d0e737a780e16f4d88cb3c2ff1dbab8b1878ae3561659c3a191040ef0f0f2ef0e7325b16ca6c149e29d417c10bec18bfcf06d8e847000e1e8279b27
diff --git a/media-gfx/krita/krita-3.3.2.1.ebuild b/media-gfx/krita/krita-3.3.2.1.ebuild
deleted file mode 100644
index 7bbbcef30e18..000000000000
--- a/media-gfx/krita/krita-3.3.2.1.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Free digital painting application. Digital Painting, Creative Freedom!"
-HOMEPAGE="https://www.kde.org/applications/graphics/krita/ https://krita.org/"
-SRC_URI="mirror://kde/stable/${PN}/${PV%.1}/${P}.tar.xz"
-
-LICENSE="GPL-3"
-KEYWORDS="amd64 ~x86"
-IUSE="color-management fftw +gsl +jpeg openexr pdf qtmedia +raw tiff vc"
-
-COMMON_DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemmodels)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtconcurrent)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui '-gles2')
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtx11extras)
-	$(add_qt_dep qtxml)
-	dev-libs/boost:=
-	media-gfx/exiv2:=
-	media-libs/lcms
-	media-libs/libpng:0=
-	sys-libs/zlib
-	virtual/opengl
-	x11-libs/libX11
-	x11-libs/libxcb
-	x11-libs/libXi
-	color-management? ( media-libs/opencolorio )
-	fftw? ( sci-libs/fftw:3.0= )
-	gsl? ( sci-libs/gsl:= )
-	jpeg? ( virtual/jpeg:0 )
-	openexr? (
-		media-libs/ilmbase:=
-		media-libs/openexr
-	)
-	pdf? ( app-text/poppler[qt5] )
-	qtmedia? ( $(add_qt_dep qtmultimedia) )
-	raw? ( media-libs/libraw:= )
-	tiff? ( media-libs/tiff:0 )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-cpp/eigen:3
-	dev-lang/perl
-	sys-devel/gettext
-	vc? ( >=dev-libs/vc-1.1.0 )
-"
-RDEPEND="${COMMON_DEPEND}
-	!app-office/calligra:4[calligra_features_krita]
-	!app-office/calligra-l10n:4[calligra_features_krita(+)]
-"
-
-RESTRICT+=" test"
-
-PATCHES=( "${FILESDIR}"/${PN}-3.2.0-tests-optional.patch )
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package color-management OCIO)
-		$(cmake-utils_use_find_package fftw FFTW3)
-		$(cmake-utils_use_find_package gsl GSL)
-		$(cmake-utils_use_find_package jpeg JPEG)
-		$(cmake-utils_use_find_package openexr OpenEXR)
-		$(cmake-utils_use_find_package pdf Poppler)
-		$(cmake-utils_use_find_package qtmedia Qt5Multimedia)
-		$(cmake-utils_use_find_package raw LibRaw)
-		$(cmake-utils_use_find_package tiff TIFF)
-		$(cmake-utils_use_find_package vc Vc)
-	)
-
-	kde5_src_configure
-}
diff --git a/media-gfx/krita/krita-3.3.3.ebuild b/media-gfx/krita/krita-3.3.3.ebuild
index 9ad864df24e8..24bf800d2a04 100644
--- a/media-gfx/krita/krita-3.3.3.ebuild
+++ b/media-gfx/krita/krita-3.3.3.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://www.kde.org/applications/graphics/krita/ https://krita.org/"
 SRC_URI="mirror://kde/stable/${PN}/${PV%.1}/${P}.tar.gz"
 
 LICENSE="GPL-3"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="color-management fftw +gsl +jpeg openexr pdf qtmedia +raw tiff vc"
 
 COMMON_DEPEND="
diff --git a/media-gfx/mandelbulber/Manifest b/media-gfx/mandelbulber/Manifest
index d1472766c00e..8498dda676eb 100644
--- a/media-gfx/mandelbulber/Manifest
+++ b/media-gfx/mandelbulber/Manifest
@@ -1,10 +1,6 @@
-AUX mandelbulber-1.11-qa.patch 1313 BLAKE2B 85b4dd8143edfc8324c1fa24c7472f79d2d9acc820bc6623ec7647d4b0f5df2db9be087a9c17d70abd42dfd0814c7aa418fb8e731836b24c58f32d10f6ed23d9 SHA512 d4ec5a1e6f475a518414a402942240b5679b0eae15d1ac83cb73148759ade31e69cb5bf61081ec9a9e9349697ed4eccd61f180b67588937d84cc990202393770
-AUX mandelbulber-1.12.1-memcpy_and_memset.patch 358 BLAKE2B 3611058bd93c36508a8db5cb13800ee9b14577c8444f49cfc0a868c0feb40b3d7eea0039e790f89427f9bafe65f162809865ce155837c3009c2d3009fd4be57a SHA512 3ace39be67fc5ee66c66a7d6ff6b81f8939c2d1c598effe676f6b8f750fa904c294197aea5f4a62519f1c129580ed8f037a55af0d88da0e02cbe993b2630082c
 AUX mandelbulber-1.21.1-qa.patch 1254 BLAKE2B 082adc25eb99578470b572680d770113916cdf6972df8ba878247e14ce734375b13c3ca9226c6132ca211a6dffe199ea9e2012b36b9417e9a69c3065a7ba7963 SHA512 90a7638b702a40af9c5f0927d8e13c8db6f67c1dc0fc144910a5a3da1872e05b4cba137a8f16856fc7d9c6883fec9e0bdb0e801d9d5d685c324a708a63a8e9c0
-DIST mandelbulber1.11.tar.gz 1176248 BLAKE2B 6a5eb1391aa94630ba2b24e1f811202c2e1b642a6b5122c43dd8352d339286a4f0c894fb83870be5472ed542b510475dca4ba8cad298fb4be7db24c716c3c80e SHA512 fddd351fd235e42899b5dbf26099cb5c315539b1352f1c4dad7a59e39fe34a07aba41140349e1bfd8dddd69ef4f39c39ca017285b3726557e52fb9ec4f82291b
-DIST mandelbulber1.12-1.tar.gz 1179684 BLAKE2B 726315b34e0785846e0184fa2702a27329d4f61a9674e08626a2059dd9c6c418a0d9f83c0e225be09ce321fa76e0f957cd7e6c73aabfe53c9c3cdd5d38901778 SHA512 c198c71648ad4d674dac980c77fe2573617e122bdddb7775fccf74e1a929900691a421561f8717e4df741db65421cbdb8e464fd031ff5c38a56f63f5259b5512
 DIST mandelbulber1.21-1.orig.tar.gz 1076836 BLAKE2B 6cb17351d8070abb092faa48a2254c76af40cd95942e8ecb46f3fd651423b5e8be8555906c946fb5b28024f23015680abce2f92adc33a742fadea8c0e10c6fac SHA512 caaa27a4aa67e83045e9cfc84593770d26d0b12d44e6f37f1f37e04eb62f7d2038c07d82541eca2ef8c64c787bae2fac9c487f69c98936310946f27c07760ce3
-EBUILD mandelbulber-1.11.ebuild 853 BLAKE2B c672df734327ef5b8b6d74500b67b00a44d1089cd46323f8fb337497e6fe0c65221d6d6a7cf7711548b472fe59c5a0da7cebe2903f44737e2de0d741762a33f5 SHA512 14e43a6284b891993ab8c45c6ba2d76eb71b74538e85594e5806ed6e7631766c9f1202f975274564a8fe1bc5bc08992d77bea0dacb1bdd3740e0d4b510477fe5
-EBUILD mandelbulber-1.12.1.ebuild 954 BLAKE2B 063845be577cf6104d160e6d6976d02380fcf13dce742f0431dab8a98b8ad25e5ef2203b0a3c83d980667ba36135ba502761fed70ec854ca817a9d1ca1e1c3f1 SHA512 84dfbdb0aaae1723dfe8d3347cc4103f7567d6bd819e092647670092ebd119e303180a16ebf96e10793a51f8d9786eef91b53c7c698ffb6052b96c626e58b4bc
+DIST mandelbulber2-2.12-1.tar.gz 47092910 BLAKE2B 1e5ca64a4819052882bc7cdc047c6d755046f2ceebcf7b26db41511fde219aa523a3c6884f0667aed1365104c4502a6e6b1b2d7d40a4a024fdb5051d5ac13cd2 SHA512 5dc8dcaa45bc8747024ed16379cc4d622535099c925abf3c2aa01c0338fe8c1f272e6113b6bf28da6a4bb087e6d6e6a4c6634feca993d2c89f12b79582ff271c
 EBUILD mandelbulber-1.21.1.ebuild 962 BLAKE2B 7e30bea64d0b790c287cec38fc3041844cb440af59b1c5921b7b04e3b32325c3e996b03f7f6670db880e5466844c4650e268209a7994146350d8a095e98f45ef SHA512 e7ece0314fef4fa0ea0812cd61b42eb02f06dbb751c0efec5f03b11bad6e5c8a960bc4b1ffe32a41018db438ea1ca865fb32b5f284fbb88f4a5647ac3878eeaa
-MISC metadata.xml 613 BLAKE2B 30eed2c5a6b80b41165f0d3e05f33ccc501d4a60531baf249827e53fce5d5aff43b8ea273fe0cedb09dff09963332ec6c7171da1cc99f343689e798a99a280bc SHA512 ff9d6feda80e64a4f5c18c0c951f9f1578323f4fee378223c1580d3210d0d0b265c8f996cc645410117e2676837fd3e2edb1cd574cdb04923b6bd8cf1da9ebce
+EBUILD mandelbulber-2.12-r1.ebuild 1697 BLAKE2B 85e269a30efbc6474644330d6391d2fadad82ca1f4121626c0b65f078da9190168ccc5afe52f6e8f336fc288d361a3cd1f5b5d1239b9c2ca74d9491e5ba9b44e SHA512 97d0c3b61054e5cfc65874cee87ac3a109c6440a01a9c93b88fbea06fc3d8e83c3189e30dcde732c1f25b75ebcc16962f31d1a51fb1b2b94a33a357e3140c2f5
+MISC metadata.xml 699 BLAKE2B d9aa974727aa0bb7cf821cc6a982477aaf59d6e2cae666e4476196507a22233feac875347797799df4babd9dffbaa97f0d5fc5d190bcc11a03554f6755e6f458 SHA512 a6d7cfc42cf2bd56454f7834ff4aaa907772052d855f7a471c57ba18d21437af5ff0ec48f0ea1929d18aa2e0eed9073b903dc34b4de19d304d4839f2c267b535
diff --git a/media-gfx/mandelbulber/files/mandelbulber-1.11-qa.patch b/media-gfx/mandelbulber/files/mandelbulber-1.11-qa.patch
deleted file mode 100644
index f457c1902c8f..000000000000
--- a/media-gfx/mandelbulber/files/mandelbulber-1.11-qa.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- a/makefiles/makefile
-+++ b/makefiles/makefile
-@@ -5,6 +5,7 @@
- -include ../makefile.init
- 
- RM := rm -rf
-+CXX ?= g++
- 
- # All of the sources participating in the build are defined here
- -include sources.mk
-@@ -44,7 +45,7 @@
- mandelbulber: $(OBJS) $(USER_OBJS)
- 	@echo 'Building target: $@'
- 	@echo 'Invoking: GCC C++ Linker'
--	g++ -o"mandelbulber" -L/usr/lib/x86_64-linux-gnu/ $(OBJS) $(USER_OBJS) $(LIBS)  `pkg-config --libs gtk+-2.0 gthread-2.0`
-+	$(CXX) $(LDFLAGS) -o"mandelbulber" -L/usr/lib/x86_64-linux-gnu/ $(OBJS) $(USER_OBJS) $(LIBS)  `pkg-config --libs gtk+-2.0 gthread-2.0`
- 	@echo 'Finished building target: $@'
- 	@echo ' '
- 
---- a/makefiles/src/subdir.mk
-+++ b/makefiles/src/subdir.mk
-@@ -63,12 +63,14 @@
- ./src/undo.d \
- ./src/cl_support.d 
- 
-+CXX ?= g++
-+CXXFLAGS ?= -O2 -fast-math
- 
- # Each subdirectory must supply rules for building sources it contributes
- src/%.o: ../src/%.cpp
- 	@echo 'Building file: $<'
- 	@echo 'Invoking: GCC C++ Compiler'
--	g++ -O2 -ffast-math -Wall -c -fmessage-length=0 `pkg-config --cflags gtk+-2.0 gthread-2.0;` -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o"$@" "$<"
-+	$(CXX) $(CXXFLAGS) -Wall -c -fmessage-length=0 `pkg-config --cflags gtk+-2.0 gthread-2.0;` -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o"$@" "$<"
- 	@echo 'Finished building: $<'
- 	@echo ' '
- 
diff --git a/media-gfx/mandelbulber/files/mandelbulber-1.12.1-memcpy_and_memset.patch b/media-gfx/mandelbulber/files/mandelbulber-1.12.1-memcpy_and_memset.patch
deleted file mode 100644
index 43fb0b982dbd..000000000000
--- a/media-gfx/mandelbulber/files/mandelbulber-1.12.1-memcpy_and_memset.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-http://bugs.gentoo.org/464972
-
---- src/texture.cpp
-+++ src/texture.cpp
-@@ -5,6 +5,7 @@
-  *      Author: krzysztof
-  */
- #include <stdio.h>
-+#include <string.h>
- #include "texture.hpp"
- #include "files.h"
- 
---- src/timeline.cpp
-+++ src/timeline.cpp
-@@ -6,6 +6,7 @@
-  */
- 
- #include <cstdlib>
-+#include <cstring>
- 
- #include "timeline.hpp"
- #include "files.h"
diff --git a/media-gfx/mandelbulber/mandelbulber-1.11.ebuild b/media-gfx/mandelbulber/mandelbulber-1.11.ebuild
deleted file mode 100644
index e3761ae9b170..000000000000
--- a/media-gfx/mandelbulber/mandelbulber-1.11.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils toolchain-funcs
-
-MY_P=${PN}${PV}
-
-DESCRIPTION="Tool to render 3D fractals"
-HOMEPAGE="https://sites.google.com/site/mandelbulber/home"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="x11-libs/gtk+:2
-	>=media-libs/libsndfile-1
-	>=media-libs/libpng-1.4
-	virtual/jpeg"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-qa.patch
-}
-
-src_compile() {
-	emake CXX="$(tc-getCXX)" -C makefiles all
-}
-
-src_install() {
-	dobin makefiles/${PN}
-	dodoc README NEWS
-	insinto /usr/share/${PN}
-	doins -r usr/share/*
-}
-
-pkg_postinst() {
-	elog "Before you run ${PN} please copy /usr/share/${PN}/* to \${HOME}/.${PN}"
-}
diff --git a/media-gfx/mandelbulber/mandelbulber-1.12.1.ebuild b/media-gfx/mandelbulber/mandelbulber-1.12.1.ebuild
deleted file mode 100644
index cfeefff2b52e..000000000000
--- a/media-gfx/mandelbulber/mandelbulber-1.12.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils toolchain-funcs versionator
-
-MY_P=${PN}$(replace_version_separator 2 '-' )
-
-DESCRIPTION="Tool to render 3D fractals"
-HOMEPAGE="https://sites.google.com/site/mandelbulber/home"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="x11-libs/gtk+:2
-	>=media-libs/libsndfile-1
-	>=media-libs/libpng-1.4:0=
-	virtual/jpeg"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-1.11-qa.patch \
-		"${FILESDIR}"/${P}-memcpy_and_memset.patch
-}
-
-src_compile() {
-	emake CXX="$(tc-getCXX)" -C makefiles all
-}
-
-src_install() {
-	dobin makefiles/${PN}
-	dodoc README NEWS
-	insinto /usr/share/${PN}
-	doins -r usr/share/*
-}
-
-pkg_postinst() {
-	elog "Before you run ${PN} please copy /usr/share/${PN}/* to \${HOME}/.${PN}"
-}
diff --git a/media-gfx/mandelbulber/mandelbulber-2.12-r1.ebuild b/media-gfx/mandelbulber/mandelbulber-2.12-r1.ebuild
new file mode 100644
index 000000000000..31967ec72549
--- /dev/null
+++ b/media-gfx/mandelbulber/mandelbulber-2.12-r1.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_P="${PN}2-${PV}-1"
+inherit desktop gnome2-utils qmake-utils
+
+DESCRIPTION="Tool to render 3D fractals"
+HOMEPAGE="http://www.mandelbulber.com"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+
+LICENSE="CC-BY-4.0 GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="opencl openexr sndfile tiff"
+
+RDEPEND="
+	dev-libs/lzo
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtmultimedia:5
+	dev-qt/qtnetwork:5
+	dev-qt/qttest:5
+	dev-qt/qtwidgets:5
+	media-libs/libpng:0=
+	sci-libs/gsl:=
+	opencl? ( virtual/opencl )
+	openexr? (
+		media-libs/ilmbase:=
+		media-libs/openexr:=
+	)
+	sndfile? ( media-libs/libsndfile )
+	tiff? ( media-libs/tiff:0 )
+"
+DEPEND="${RDEPEND}
+	dev-qt/designer:5
+	virtual/pkgconfig
+"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	default
+
+	# not packaged yet, but may be in the future
+	sed -i -e "s/qtHaveModule(gamepad)/false/" makefiles/common.pri || die
+
+	use openexr || sed -i -e "s/packagesExist(IlmBase)/false/" makefiles/common.pri || die
+	use sndfile || sed -i -e "s/packagesExist(sndfile)/false/" makefiles/common.pri || die
+	use tiff || sed -i -e "s/packagesExist(libtiff-4)/false/" makefiles/common.pri || die
+}
+
+src_configure() {
+	if use opencl; then
+		eqmake5 makefiles/${PN}-opencl.pro
+	else
+		eqmake5 makefiles/${PN}.pro
+	fi
+}
+
+src_install() {
+	dobin ${PN}2
+
+	dodoc README NEWS usr/share/doc/${PN}2/Mandelbulber_Manual.pdf
+
+	insinto /usr/share/${PN}2
+	doins -r usr/share/${PN}2/*
+
+	insinto /usr/share/applications
+	doins ${PN}2.desktop
+
+	newicon -s 256 qt/icons/${PN}.png ${PN}2.png
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/media-gfx/mandelbulber/metadata.xml b/media-gfx/mandelbulber/metadata.xml
index b170ece12c0e..2942a4cc4a6f 100644
--- a/media-gfx/mandelbulber/metadata.xml
+++ b/media-gfx/mandelbulber/metadata.xml
@@ -11,6 +11,9 @@
 		and some other kind of 3D fractals like Mandelbox, Bulbbox, Juliabulb, 
 		Menger Sponge.
 	</longdescription>
+	<use>
+		<flag name="opencl">Enable GPU rendering support using OpenCL</flag>
+	</use>
 	<upstream>
 		<remote-id type="sourceforge">mandelbulber</remote-id>
 	</upstream>
diff --git a/media-gfx/metapixel/Manifest b/media-gfx/metapixel/Manifest
index 5c9c62fe7492..b7e775848de7 100644
--- a/media-gfx/metapixel/Manifest
+++ b/media-gfx/metapixel/Manifest
@@ -2,5 +2,4 @@ AUX metapixel-1.0.2-giflib5.patch 529 BLAKE2B 760b6f3c846a48e64e57d650584f56b506
 AUX metapixel-1.0.2-libpng15.patch 4395 BLAKE2B 37f1834c834bbcb2e5f21eb6ef76d9de2e216466c6fe4cc130d477cc44cf609f24067b39be705b732911e21767557b2517b63f230d7710e66e45462802df84db SHA512 5edf6adb335de038996589bbfa799df471aeb8aec41d46f639ff4165fe9574b8a103bfdbdf086ac48de29d11dd263166e0787aad8ebc1298a9865837cc2d3282
 DIST metapixel-1.0.2.tar.gz 63197 BLAKE2B ba5efaed9c3a305b9659af6d910e0c9597637510ed9d1d03a27feaeb1687751609bd60f009761c599593c02904f0c583324fc4b392af100fc60560cb4be2be8d SHA512 88a718fc349b9063c61a8ac24fc41923c742b25fb7e84c6b565ac92a301a04b46870750d5c06f751b2104c3f36108365b45214b52a6ede98da83441e2e30e156
 EBUILD metapixel-1.0.2-r1.ebuild 906 BLAKE2B 12715377a30588a8fe9855b197d51295a1240786850909266eae98efb2741847c670996abc02b7face838ef6b5405950f80295153e29bf3ea78f469b2e887f31 SHA512 36cb8e252ac3cd90d168e9780b43d236fc9bd7afd80ed5034cfdc03db7264bf08fb79a063d0fe5ff94523363d418fa50b5a1c3f7c986d200ff586d70cac7b4e2
-EBUILD metapixel-1.0.2.ebuild 849 BLAKE2B 157c37bf7a232385a7c636ef0cd97708c42bf75e1b3d73250e62f68c96c949a17150b81da4f3d6485710a36cfcf89df8f27c008e572f375bd62335ba30e69327 SHA512 d533ea2001fd5d02e33b724a1b2afac2e2f63b25c3f7ee1cda02544684b732257e0139da1ec42b88da5e0047d5a6f9aeb413cd442f598d682e79c27aa65edf9f
 MISC metadata.xml 255 BLAKE2B f12a1ca502ad96bd6de4c8b83dfb8887ab70dec78f10a8b52dcd4618eb182192477ddca18738d734a43f3c7ac3b5e0955f4ae9347ea80e788a92974c7d50a574 SHA512 b7bc93530a1726c2d4dfbc71ae29cfbb57712fd9fdd2e76fd52f35ab4368cba0497b50145d1527a3b79e465d459a380821bb1371a01c2e915dc9adc6c7fafd5f
diff --git a/media-gfx/metapixel/metapixel-1.0.2.ebuild b/media-gfx/metapixel/metapixel-1.0.2.ebuild
deleted file mode 100644
index 3f70113b8623..000000000000
--- a/media-gfx/metapixel/metapixel-1.0.2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit eutils toolchain-funcs
-
-DESCRIPTION="a program for generating photomosaics"
-HOMEPAGE="http://www.complang.tuwien.ac.at/schani/metapixel"
-SRC_URI="http://www.complang.tuwien.ac.at/schani/${PN}/files/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="dev-lang/perl
-	media-libs/giflib
-	>=media-libs/libpng-1.4
-	virtual/jpeg"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-libpng15.patch
-
-	sed -i -e 's:/usr/X11R6:/usr:g' Makefile || die
-	sed -i -e 's:ar:$(AR):' rwimg/Makefile || die
-}
-
-src_compile() {
-	emake AR="$(tc-getAR)" CC="$(tc-getCC)" OPTIMIZE="${CFLAGS}" LDOPTS="${LDFLAGS}"
-}
-
-src_install() {
-	dobin ${PN}{,-prepare,-imagesize,-sizesort}
-	doman ${PN}.1
-	dodoc NEWS README
-}
diff --git a/media-gfx/pinta/Manifest b/media-gfx/pinta/Manifest
index 8e7b1c4b5efe..cbbf5fc1c466 100644
--- a/media-gfx/pinta/Manifest
+++ b/media-gfx/pinta/Manifest
@@ -2,4 +2,4 @@ AUX pinta-1.6-mono-4.patch 4938 BLAKE2B 015d3cb4e3975aeb96defcdc45f50a2246953d17
 DIST pinta-1.6.tar.gz 1444709 BLAKE2B 6b560e9f6934d966632126cdcd5adf3debcfe790d61f8cad41bf7bafc8696c0b0e991597eaadae01c6de06fceb5a84fe0459bedbeffbd0d2cdce5114852c041f SHA512 b22ac05c639f9b0f2a49efc7b1f2c10774b3f2fb436dddd58f0005afadc103d4e77d6044479db0b3df04221922634502b1c16aa78d00894bca6a49931889f834
 EBUILD pinta-1.6-r2.ebuild 951 BLAKE2B 203537214fec387af80e427a34a4af0705553b33159172e147d465d13e009328057deec2d4889bad9c0c83cdd6eff72ac846c8dd47b257177417941a2a1ebcb4 SHA512 bce49d2782edc4c21ee0f625abdda158118a6c1d4a5a4e8c861b0e1c6f9999408e3f46c402d1014c76ebbd25c0ad09d83247c9eb140aaa2c582fde15fcfbe8f1
 EBUILD pinta-9999.ebuild 908 BLAKE2B 57fcae22057e858eaa03adba1e38cd61502f31031201181745f80706461d0490fb7cb6ad830881dbf32f9dd32dce106b1692e988a0c8e0fc64031064c0030916 SHA512 57d870e05e533bd8e3984ec3d8bb01e6e0417aecf155ece81cd868993970617c836383a8ff9c1f2691c4053a64bb7b60c4e7558d95dade2cc477747d3e755402
-MISC metadata.xml 1099 BLAKE2B 2042a81804ba21fb83bec7f3f9c93d7a98a532adad2a1e4345a767b379fb03d2bfe2da4868b5cfba4aae53a6d6a678d5d51cfa6783e5a9114731f0456d1ebcb2 SHA512 963852e443a489f0c49d174d1415c4004c9c274204c63f6be14a8e8c013d9ad3d840d03709ac572249a06ac490eac107180e259a4b2e1a41543cce89ee338306
+MISC metadata.xml 1022 BLAKE2B be4b0fd76d575104a3a081fd250cf049896de38b1a0e78d64285fd3b991b119b9c0a4023f92b3f2cd2d6d4cef84fd8fee56e83b03441dcf2fc228974b1413f4e SHA512 813e960846f8390c3ac16155d51ba4accb3de3d6530010dc062becfdc48006331ed87115b4ca0f55223f5f1e48a71bd4a9aee469f740896edf5f8175bfc7d5c9
diff --git a/media-gfx/pinta/metadata.xml b/media-gfx/pinta/metadata.xml
index bca9f7f689f6..71170bb50854 100644
--- a/media-gfx/pinta/metadata.xml
+++ b/media-gfx/pinta/metadata.xml
@@ -4,7 +4,6 @@
 	<maintainer type="person">
 		<email>axelgenus@gmail.com</email>
 		<name>Alessandro Calorì</name>
-		<description>Proxied maintainer; set to assignee in all bugs</description>
 	</maintainer>
 	<maintainer type="project">
 		<email>proxy-maint@gentoo.org</email>
diff --git a/media-gfx/pngquant/Manifest b/media-gfx/pngquant/Manifest
index 5ba6b30dad15..0ea881e3b732 100644
--- a/media-gfx/pngquant/Manifest
+++ b/media-gfx/pngquant/Manifest
@@ -4,4 +4,4 @@ DIST pngquant-2.7.2-src.tar.gz 91721 BLAKE2B d8f1952e9188956cfcad802aec9f0972829
 EBUILD pngquant-2.11.4.ebuild 1001 BLAKE2B b448d71c1b9b5f97cfbb96a2f400933c697cf7821f34a1e78731b6fbf23856fcaa079d9a43d9346a2899b55217f6f7ce65a0f52315f89464ea321ec2c7f75224 SHA512 e3c453cb022071993544a910d95025e88222732fd5b533b4ef7b4b4c8fbe42d052528c9329af704d9ba53e7d8e522b2f87895013a337999afd3fe5656ea805cd
 EBUILD pngquant-2.5.2.ebuild 946 BLAKE2B 1331a1223d2b795427398ffb3c002ab4ec8e3ace914aa9dd45bedcd927c09e325894346f5f164827180a2651cb4953148c64f71c9bcd5ed516989ae0aeddc398 SHA512 0a9e059e99d0c96b4d4506c75edfce6f70ba73b0395bbb4953fbd67b2d790ecc949b111563396b8295168d91a5f196a404d3892e6a16f3fa1b1916db97a4b314
 EBUILD pngquant-2.7.2.ebuild 949 BLAKE2B f1cab7bef58f710abc1ff6a6a190ab47e79f689add003de67877e495855516330268df9a6f467abccdb779a2a3eaf369c3a91c29b10540c1b845171acede851e SHA512 f895a15658ad06e9f18bcd388877bc0519f4131d6cf6aca3924300073dc684bac4d5d07c403040870d14a18ad88e7832506fceba0da38ca2063829d5e398fed8
-MISC metadata.xml 542 BLAKE2B 689fca130bae0cd3fbe8401a272fc6cf243f278536aea44b81d1695b720950cb14883291875abb60a6cec3ba7acbf58af36ceb7003816ff8c339d1b4f994fe55 SHA512 77bc685becffe4e065318a0f5310402fc72d5b52a5a29d2c812b3797ff40761599b7d1df9d4e6ae73308de5c41763004798c30053a9005cafc8282760c4b7225
+MISC metadata.xml 492 BLAKE2B c60cb6917ca56946f1941feb2de555e4ced9c56ea3f25fae727bbfd2a49567ef3b581e877b7304dffe090ed898cc285f1baf5465380eb30582bc086854fdbc8a SHA512 5afec8077fc4f303cc76de855558049bdebf0d40a76381077866fd9d3e658912936fc2cd63411d378475743f8649e68dcc08793eb066d6adf9b232b8c669cb1b
diff --git a/media-gfx/pngquant/metadata.xml b/media-gfx/pngquant/metadata.xml
index 0f41a1d113c4..9d80573338cf 100644
--- a/media-gfx/pngquant/metadata.xml
+++ b/media-gfx/pngquant/metadata.xml
@@ -4,7 +4,6 @@
   <maintainer type="person">
     <email>alex_y_xu@yahoo.ca</email>
     <name>Alex Xu</name>
-    <description>Proxied maintainer</description>
   </maintainer>
 <maintainer type="project">
     <email>graphics@gentoo.org</email>
diff --git a/media-gfx/povray/Manifest b/media-gfx/povray/Manifest
index d3dc42a3198c..5fecc0366f9f 100644
--- a/media-gfx/povray/Manifest
+++ b/media-gfx/povray/Manifest
@@ -6,6 +6,6 @@ AUX povray-3.7.0.0-user-conf.patch 1491 BLAKE2B ee99672c70a5d7e12048acbfc50a3ef4
 AUX povray-3.7.0_rc6-darwin-defaults.patch 920 BLAKE2B 9cffcda18626cfdbea9a6b00ae99ee300d6b29a79e22229e35d116070b4a1ac1fbb4869242a043155a4fa189f701e6bc318cd3ba8fbc743d497db26c763926c8 SHA512 17ae635430f0d57157c9915ce5b25a88afcb34f6dd9552b27a42b32d638fdfbcb8b4e41ec89b52048db9d054812535b7b41f328ffe4554e719e4a3de21cbfdee
 DIST povray-3.7.0.0.tar.gz 38191521 BLAKE2B 5d936bdcdf9910ede2247cfa5e3881211da00762ac4bc08225dc6b53addc9e09546de9493e642b5d41228d81a50a4bcfbb5e606eb8bd9a224bb1afc5fc82db6e SHA512 82e3dbcd58b7ae921fe3b953815ca4dbbfb22eda434554baee4accabd1455b18cb511061f1cf9cf93128fab0a042df374fe2f68186d78c19853a465bd4bcbe10
 DIST povray-3.7.0.0_p20160914-fix-c++14.patch.bz2 12876 BLAKE2B b1c458764f04a57420a4562e9faacae4ae955c3d9ce4343ffd49176bb575f63830fcd58d0777dea22b975df118aa14e2bdd91509758d33d659daa3fbbaba5880 SHA512 3329da12a822762559445e208a746ff208c39f7b63e27ba84a390074bb52a105c9a2f66180e58c5157795bb16346e11b5b05efaf077ee0d8246179975a692b04
-EBUILD povray-3.7.0.0-r1.ebuild 4457 BLAKE2B e440c2f9f60f1d3b51654c55cd8f3f99551e4f0f38e7ac9fd27a461e8a20f80ceed8f26a74f3bb14c97f4a6f63aee7e648f8a91e0fb154b3f227e1b4259a1e8b SHA512 8739f1de5bfe0308dd484d980a4550c555940aedc2ae036e3195d501a7f4406f6690f920e278983ba9646d3ce4faadfc229e49b49bbd1acc1eb6a7e84ee34603
-EBUILD povray-3.7.0.0.ebuild 4391 BLAKE2B 5be21cb9cabf1e74bc87b9970a38127b27d98650eabcfad7ad5dd5c0b5c0fd7a2b112c9fec8313ba078b16fa37bf6664bb8e897e73e445a7d7bd9fd7a981c104 SHA512 1f213b1860b156d6f5cd6a19c41c6582f47ff96b5653f5d23e7baad787c2ce7ee592e80d03ff515ccffef7bacae0c7dcd8adb45a9f61b71055245a00e69221f7
+EBUILD povray-3.7.0.0-r1.ebuild 4458 BLAKE2B c79b313eb47ecfe82a712e8ac44b3ad556ded679bc2fd96de5741b605d64f5d8a06717d0133389b258cc669e17645a6278d2e96284f86d13c09cc27f6b2d7e59 SHA512 227579890ea76e496c3c09c6783cdf96320659da73c365d3b96fba82b0241320a39be0a3a3cf6f29ab34fa4b93784a8aa1d205755ef6a009f3dbb383cfc06df8
+EBUILD povray-3.7.0.0.ebuild 4392 BLAKE2B 7889135b1482356090f1073d4680e17905335c7586f20d47d8dc29c375e802c3440786ede36715e3f873c70d2ff61f30fff0ab2125024aaa12dfe36b99b871d1 SHA512 c74582d9f9534c9b1c3976e2c7bb5d61a4e24afcdf4ffe08ea2626125e96a5549805d0ab5fca60410da4842e446932dcacea2d628391282f8c6dc06980c56a5c
 MISC metadata.xml 504 BLAKE2B f0b8ba895e8949a452dc4ddac0f3e78513b3c91107131d288e9e4ea7d1dd406622ac8a3ddeacd0b3df039ce95ab6f3dd339b80bf91f48ea99ab6d5c74a6cb4d8 SHA512 e2146892acd26bd3fc03fe1733f67073a1db1106f568ac886548b7c3e4fef508d1f3a619d74b8573696f007ae764d26e1f8556c3dbb03b9434b71258f0bcbb00
diff --git a/media-gfx/povray/povray-3.7.0.0-r1.ebuild b/media-gfx/povray/povray-3.7.0.0-r1.ebuild
index ac091168ba6a..097bd61ed04b 100644
--- a/media-gfx/povray/povray-3.7.0.0-r1.ebuild
+++ b/media-gfx/povray/povray-3.7.0.0-r1.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
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/POV-Ray/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="AGPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 ~arm ~hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="debug +io-restrictions openexr static-libs tiff X"
 
 DEPEND="
diff --git a/media-gfx/povray/povray-3.7.0.0.ebuild b/media-gfx/povray/povray-3.7.0.0.ebuild
index 9a8ae2aa94b5..ca52087701ed 100644
--- a/media-gfx/povray/povray-3.7.0.0.ebuild
+++ b/media-gfx/povray/povray-3.7.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -22,7 +22,7 @@ SRC_URI="https://github.com/POV-Ray/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="AGPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 ~arm ~hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="debug +io-restrictions mkl openexr static-libs tiff X"
 
 DEPEND="
diff --git a/media-gfx/raw-thumbnailer/Manifest b/media-gfx/raw-thumbnailer/Manifest
index 80475d929b41..37c21e5048d3 100644
--- a/media-gfx/raw-thumbnailer/Manifest
+++ b/media-gfx/raw-thumbnailer/Manifest
@@ -1,5 +1,5 @@
 AUX raw-thumbnailer-0.2.1-libopenraw.patch 897 BLAKE2B 26065ada735e744b0bac662110f8f6a8d70f808721452adab0c7b4cf6927152ab255e424b2978147895e36833cf525893d3f601a09871e712a2dcd348d05e1f0 SHA512 c9b582a6f7d8ccd5958da96d4773105e17b9047b1081d5a4e2a48384831f83e79ef32b9fafd3cd2436472ac86554ffa2232b1d039f06d9890425c5b2d6da185d
 DIST raw-thumbnailer-0.2.1.tar.gz 89468 BLAKE2B 8041cfee56f9be900c6f7bfa6dfb9b21b482ee8eb7dacb83ed37603c32edf6e1dee122de3e98b06d158b6725a1900c73c7e1aee1b8e6a53545428ff7aca47b53 SHA512 cc3c107b060add00b4af811bb548b597493ff0d54d863c530d183970ac8bdd4f6b9f4c25cf978e1d2bf80b11424dbbfb20e73c6dd1abeff3a15a08843bcd41e1
-EBUILD raw-thumbnailer-0.2.1-r1.ebuild 673 BLAKE2B 31b8d6cf186846ff436aad1438cb0928b29da1ac3b33c9dd63bc598579d0f6ab3f0f263eaa44b584397d0aecdfc815f1712962d5061a7a1f6cd35d00c723d210 SHA512 bf5287011b888be6c12e13a1be5de9d8b76a30d16f3bc19e0ac129f5b0b9c9f8107ad370349adb803463d306d46828dad2ca5ab4276368587b5131236606d6dc
+EBUILD raw-thumbnailer-0.2.1-r1.ebuild 672 BLAKE2B 5bed28827654af33af9909dde82a4d977966680bb30686968a51a9936e163275230e5fa5de167597de521982ac85b6600aeb8fd88f59a92bea506acc3db1432e SHA512 2a5dbc2b8a9b0796f540d03fec695a364838e4bd69300e09dadb07c9eef4218595b90c15e24fd5697420f137054ace4fab42beaaf2fb4886ccc2d3ea3060a854
 EBUILD raw-thumbnailer-0.2.1.ebuild 540 BLAKE2B e414123881d1b4f1d3aa8b2b8a37e7a9cc7b14ed05337f9f5091f2281f30661541d5bcfbae9b5b96815a88a5fc4cd523ef9adba9b7599dce7c942341002ad292 SHA512 c2c23998a3af64a083872e64654539e02ece59ca37375c81f2c4bdf96e84d57f51129b78cd73bffb67c66edabe9e81dcc2b94c0284b07b7d7a6a4b8d660cae7a
 MISC metadata.xml 407 BLAKE2B 713244da2a69bfc59fb7a82373bba128e0d08fe7c12645245fb01df403e3affc792fc26ca28967dcc6c499145e90f9a34eb7c984164ccf4396a8924c4c153312 SHA512 7383547238ca395a6cffde72366521dd7e3e04218f8840f19f093cfa61d0788d10138d39250702085a5669f715aaf3d0da5e357829a0e0fd44a70d20c14ed46a
diff --git a/media-gfx/raw-thumbnailer/raw-thumbnailer-0.2.1-r1.ebuild b/media-gfx/raw-thumbnailer/raw-thumbnailer-0.2.1-r1.ebuild
index 8d3bedb4b406..7affd0c6df8a 100644
--- a/media-gfx/raw-thumbnailer/raw-thumbnailer-0.2.1-r1.ebuild
+++ b/media-gfx/raw-thumbnailer/raw-thumbnailer-0.2.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://${PN}.googlecode.com/files/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 RDEPEND=">=media-libs/libopenraw-0.1:=[gtk]
diff --git a/media-gfx/shotwell/Manifest b/media-gfx/shotwell/Manifest
index 5bedb5128269..ea4a6193b402 100644
--- a/media-gfx/shotwell/Manifest
+++ b/media-gfx/shotwell/Manifest
@@ -9,6 +9,7 @@ DIST shotwell-0.27.0.tar.xz 5574988 BLAKE2B 30ab9ebe5fa12f8d7be3775d044b983c644b
 DIST shotwell-0.27.1.tar.xz 5619824 BLAKE2B 7ba1606b1604ca156aacd71d014bdec507abd2a5447696b60ce4400cf835dd484b39e737ec7659a8744e0a5f72b9e9a561fb297db6f256db7008ca5e4b2ae0d8 SHA512 b26c25b45af305903cf0698e65d5230820dda447b70175c92a66e25148e47d620847b3fa2b3bdb8d70656186d5b30d98edf3eee4138f07db9f8260e81a95a7d6
 DIST shotwell-0.27.2.tar.xz 5619692 BLAKE2B 0a532d6d2f7391f0783cb0fb91fbc15a681e87041d12355ca75581d4b7f4ebe7fe3feeaca7fc12b0fd82710bf2d906c1d3abd382b61a5dfac3041cec482edd38 SHA512 a64fec52ff1ba3bca0e4b07be557ea3b838845998ae64ac7504cd9a8c976380cf0d7aae4aaccf931f1f40b5d247e081ec98472da8e8835363779dd39d9d2f69b
 DIST shotwell-0.27.3.tar.xz 5623408 BLAKE2B 582c0b4bb0636dda4aab7e0a8ca69098b1af455d8c393bd8b5d37337cc85ae38036c6020eb54eeb9fc21f2fe603631305965351bb20f8824b50b5606829a7a47 SHA512 204fd348493f25fd855955735f575da9b6de7209f27e677670b5c016cb668558a6909b71e0b1a50fcda47e29a8ac9edc40619dfff2117f637ffebfe022e12275
+DIST shotwell-0.27.4.tar.xz 5626284 BLAKE2B 2f17546c190dbd04bdf467e12a092c2558ec5bbac1e13a3054c746c391876a1ac4eeddbb4578a575cd0b73f402432ea3763fd90e214a2b0f11a6f281a77a8bac SHA512 9f67893018a750199b51ac42e357c850195a356db8fdb5b1f8836375e01291d716f82257b2b030aa41e9ead59227b442fd38239fad5b5f46bf2701ec968e383f
 EBUILD shotwell-0.24.6.ebuild 1444 BLAKE2B a9882a2e047187e613755ac71e587242a1b8e0a113a981a4e47620c07177bc2b1e4c01e6cdd3f00036dd09481e4e31c64c319fb30a708c6350c45a0e5ea5656f SHA512 559e06d8bed36ab72880dfb409d4151d9ddc040201f4bd144b67202cd103db09c1b3a428b94c5875ac50159da0e22beb7e3242e515cb8dea259dfae75f383dd9
 EBUILD shotwell-0.25.0.1.ebuild 1471 BLAKE2B 529d3e84b62254eb35fbc93c346c44e961d59ba895b6d86bc49766ab78d446967f8b8b4ad17e0efb4220a1d23a5e40cb048f4c1a0317373c3daa17629a181a61 SHA512 ff395918298ad2b4e7725149177ebcf19b30f517e3e78ec4e62aa421e4cc61ccdc41be2c4234301f10df1ec5d8e8a188f17f69048dc0decd3b77e0a2bb52d67e
 EBUILD shotwell-0.26.0.ebuild 1471 BLAKE2B 9b5c8f1541c0d9fc96923ee19e9856c1320af4065552d3fc100a55d1765677af6ba524bd9225e8b385477c016aa692bb0e4ccddb3911558771d4b8b9e36bc966 SHA512 7738e3cf9e6e545005071c01500ce091b1908b651162187bb91ee88bd954371ce9ed0962f76d4a688783f6a27374835d6c517a7c9b2c477cbca0f4b1ecbfa521
@@ -20,4 +21,5 @@ EBUILD shotwell-0.27.0.ebuild 1490 BLAKE2B 47029b46edd6f386842b82cf28aef5a75790a
 EBUILD shotwell-0.27.1.ebuild 1490 BLAKE2B 47029b46edd6f386842b82cf28aef5a75790a8bb9f9ce5f0437897c8e1933571013de8f82aaf97ea15076ec162b94b645c830fb55dd0f68b01d6e9b1fd030767 SHA512 c8f6fb632fb4b49aa60cbb5cbc572aaa191bbe047d434c6bd6b97a3bc9bd61540d7ab31fec1121d8faad55e622cd39e1bc10f1d2139f54daa58346542c162cf6
 EBUILD shotwell-0.27.2.ebuild 1490 BLAKE2B 47029b46edd6f386842b82cf28aef5a75790a8bb9f9ce5f0437897c8e1933571013de8f82aaf97ea15076ec162b94b645c830fb55dd0f68b01d6e9b1fd030767 SHA512 c8f6fb632fb4b49aa60cbb5cbc572aaa191bbe047d434c6bd6b97a3bc9bd61540d7ab31fec1121d8faad55e622cd39e1bc10f1d2139f54daa58346542c162cf6
 EBUILD shotwell-0.27.3.ebuild 1490 BLAKE2B b6ddc14476e5cccc9b2d023c4c263d7672fe0b6533f9816344be00b490d484eb01da730b1bd1635d1728a6a34dd80a5728ce6adcb8fcd7da8a6fa0776b2cac46 SHA512 4de0d6fc6c0f9a942248a49115ff1468f23f1e34714b23d7eebd44869cae5e42b7501587118e67017d703932d598a30d27325858e9989a1dd81c292dc05b095a
+EBUILD shotwell-0.27.4.ebuild 1490 BLAKE2B b6ddc14476e5cccc9b2d023c4c263d7672fe0b6533f9816344be00b490d484eb01da730b1bd1635d1728a6a34dd80a5728ce6adcb8fcd7da8a6fa0776b2cac46 SHA512 4de0d6fc6c0f9a942248a49115ff1468f23f1e34714b23d7eebd44869cae5e42b7501587118e67017d703932d598a30d27325858e9989a1dd81c292dc05b095a
 MISC metadata.xml 900 BLAKE2B 62d1bd65c242a5da435f9217c538250495879be4d0b2de3477111018ed456f019abeb0bf678835997ff2c567fdbb844ca257d0c4bad8d07c3ad590adc82202cf SHA512 aab4bb7556cb7fc926b59e68d16a2425af57cab5ae80c68ce2dd650bf49b9e3872771fee51552aa0aba9c50167a33b1976700f65bbc1531de44ac638cdd4a0be
diff --git a/media-gfx/shotwell/shotwell-0.27.4.ebuild b/media-gfx/shotwell/shotwell-0.27.4.ebuild
new file mode 100644
index 000000000000..ed1f73414218
--- /dev/null
+++ b/media-gfx/shotwell/shotwell-0.27.4.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+VALA_MIN_API_VERSION="0.28"
+
+inherit gnome2 multilib toolchain-funcs vala versionator
+
+MY_PV=$(get_version_component_range 1-2)
+DESCRIPTION="Open source photo manager for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Shotwell"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND="
+	>=app-crypt/gcr-3[gtk]
+	>=dev-db/sqlite-3.5.9:3
+	>=dev-libs/glib-2.40.0:2
+	>=dev-libs/json-glib-0.7.6
+	>=dev-libs/libgee-0.8.5:0.8
+	>=dev-libs/libxml2-2.6.32:2
+	gnome-base/dconf
+	>=media-libs/gexiv2-0.10.4
+	media-libs/gst-plugins-base:1.0
+	media-libs/gst-plugins-good:1.0
+	media-libs/gstreamer:1.0
+	media-libs/lcms:2
+	>=media-libs/libexif-0.6.16:=
+	>=media-libs/libgphoto2-2.5:=
+	>=media-libs/libraw-0.13.2:=
+	media-plugins/gst-plugins-gdkpixbuf:1.0
+	>=net-libs/libsoup-2.42.0:2.4
+	net-libs/webkit-gtk:4
+	virtual/libgudev:=[introspection]
+	>=x11-libs/gtk+-3.14.0:3[X]
+	dev-libs/libgdata
+
+"
+DEPEND="${RDEPEND}
+	$(vala_depend)
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.7
+	>=sys-devel/m4-1.4.13
+	virtual/pkgconfig
+"
+
+# This probably comes from libraries that
+# shotwell-video-thumbnailer links to.
+# Nothing we can do at the moment. #435048
+QA_FLAGS_IGNORED="/usr/libexec/${PN}/${PN}-video-thumbnailer"
+
+src_prepare() {
+	vala_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure --disable-static
+}
diff --git a/media-gfx/swftools/Manifest b/media-gfx/swftools/Manifest
index a8fed9f94138..77a60c59366e 100644
--- a/media-gfx/swftools/Manifest
+++ b/media-gfx/swftools/Manifest
@@ -1,7 +1,8 @@
+AUX swftools-0.9.2-jpeg-9.patch 336 BLAKE2B 2ad16996d39ff263cfc3ae93ff0341e60108cd232f2056b299f1da88ffa6e12a1c4b5256834207767aea559c34f023535df73a71d6911daa65ff50ca40c2c281 SHA512 09ace71ef3481bb79e13c82538666f7099de779a0742d2260dd957b099993281cb88d1245d6122a7bf35cc435e8f3233d4f6d4f1379e4acb2143b3ba4e6c9614
 AUX swftools-0.9.2_general.patch 1747 BLAKE2B 3c7453bfe98a97c2a909a70d3cc5292526e7288d10e4fa63bb4ad6e5e4b9c4ab8dfedafe5320f4394efca205708f0d02e68b73a3b8449ccd432e96e7b1dc784f SHA512 c6874f0a12939f67f93a1c7615e3dfe5ecdfadffe1bb9f790be44815b4329758566e8a10eb7d4ed6757580f4c8c0251ced12908a1555c500efb41727ef05307c
 AUX swftools-0.9.2_giflib.patch 2687 BLAKE2B 566dc5e27dd334e73c5d44b62ec987289c298d9c2ba44af589b892a740c1134f11afb290fd0b16feee99db1f37754351cff6079951b0f222acd8e9a1b1d00162 SHA512 88f8bf4d75578656ff37498cdfb4c577dda85f192222b749708dabffc27314605ca930aa6a8686e2205f0dd81f5b53988432685430ac0f8f15ac538658e6a03c
 AUX swftools-0.9.2_giflib5.patch 678 BLAKE2B 1bd7e82f2faa13d0c56c6e769efca3b01b583d6226315119a320bd24f8082a428ded545d4291457f5a8a4633fdd31283672974b13407b45792db510048913a4e SHA512 91a6bc2dd57aec2979b9b7eada5990b8dfa68748acf6d2c4f58c379e0312a9581637c0dfd0899107ba3805e72f34c6652fe4e59f07629a457534ee5d93663800
 AUX swftools-0.9.2_nopdf.patch 2366 BLAKE2B fe2b7f826a557d9a67d18851b085b3f3e045347d789d8c9988298b082b834bdbfe21a02eca195f49757ac14e2e8407b98590d31bdd90a736328ff20fdd1810a8 SHA512 aaecc86d3cea1b97d748959fdf00c4249891bc3ff4d668e7d7a2ec5277e53cc9bda9281a2de065c9395aab49175f5438822d82641a24768997ec48cd4bcd213b
 DIST swftools-0.9.2.tar.gz 2675939 BLAKE2B e5d2edcb5a23f4c174da61bee97eb708e71a0b14657b27dc01294ee8b368fd53cca08c7c354c9c038a02c4a3e0220d90e80f8637c86469eea169a431f35d0573 SHA512 91bbd48914f9a8a1cdf85532b371721b01982c5f88648b908fbe99fbf4e17e9893ce575e4fd699927e9bc1c79d846f6bcd4f1d868578fb17403467cc1e28259b
-EBUILD swftools-0.9.2-r1.ebuild 998 BLAKE2B 89b54cd88d8cb0d0d661f7dc6dbdd50cceacb4739db99e91c930c1beaefa317092157c2f95e70c197435c2ae1ae17143d91cb2c79578b170db94f0b9532fadbd SHA512 f76750fefac4b480fd43131e1f4577c171fd8e3b11b6f056c95c8e588428149deaf9f9b43eec614d648ee49a2eb6eb61ab7dc9f34b748c41e34991eada7fdfbb
-MISC metadata.xml 373 BLAKE2B e226b5f58855b90fe96708acc7be4a0eb70a5072fd234c7cc80a6a9bb36c8792055f6ae705d68e51f395aa868ac1bcced7d1843c87fb4dce85d21d065dc0a525 SHA512 3c13254770c4b250796162893d0fa4b3ae78993a371db8cf927ff5e469acf394085c65a03975c84575ea2302ed99f7a6dea649a83bccaf1bde68338dbba7148c
+EBUILD swftools-0.9.2-r1.ebuild 1038 BLAKE2B 3388878b979a979759875aa42a8b1804362950404ef7b216507058085a7637b6f3a9c6e0d82a298ee47e50cd67c532c78a936ef64f298395e6db28f251d9e1ed SHA512 c015470a0880dda540c2ba139bb5c45a55877ba821e0216a5c0bc917d4115ba948f6235d0eaad26391d845c63ba16e6827630eb0931514cf756917019981b192
+MISC metadata.xml 326 BLAKE2B 29728e600aa2567624be3be97b43bd4be59bddf2c30fe55df8a918891050233d5c9278262d5622ee14c47ba29bc41d978e41d1b6cf5bf9ac1cf702e3c0e09741 SHA512 87b54a21fac364103ca858170d5fa36b7eec93d29f73ef748e0afa89665900c62f046cdb4fb62169b241ecdfdffaaf2b8049fcbad708d5baff3d7ed77a926c01
diff --git a/media-gfx/swftools/files/swftools-0.9.2-jpeg-9.patch b/media-gfx/swftools/files/swftools-0.9.2-jpeg-9.patch
new file mode 100644
index 000000000000..7f809ea99836
--- /dev/null
+++ b/media-gfx/swftools/files/swftools-0.9.2-jpeg-9.patch
@@ -0,0 +1,17 @@
+Patch kindly borrowed from macports.org.
+
+--- a/lib/jpeg.c	2011-10-14 15:46:10.000000000 -0500
++++ b/lib/jpeg.c	2014-08-06 20:15:51.000000000 -0500
+@@ -5,6 +5,12 @@
+ #include "../config.h"
+ 
+ #ifdef HAVE_JPEGLIB
++#ifndef FALSE
++#define FALSE 0
++#endif
++#ifndef TRUE
++#define TRUE 1
++#endif
+ #define HAVE_BOOLEAN
+ #include <jpeglib.h>
+ 
diff --git a/media-gfx/swftools/metadata.xml b/media-gfx/swftools/metadata.xml
index 60b965ace907..7e0acf82177c 100644
--- a/media-gfx/swftools/metadata.xml
+++ b/media-gfx/swftools/metadata.xml
@@ -3,7 +3,6 @@
 <pkgmetadata>
 <maintainer type="person">
 	<email>dblaci@dblaci.hu</email>
-	<description>Please assign bugs</description>
 </maintainer>
 <maintainer type="project">
 	<email>proxy-maint@gentoo.org</email>
diff --git a/media-gfx/swftools/swftools-0.9.2-r1.ebuild b/media-gfx/swftools/swftools-0.9.2-r1.ebuild
index de698a91aa5b..cbdcdb3e1c78 100644
--- a/media-gfx/swftools/swftools-0.9.2-r1.ebuild
+++ b/media-gfx/swftools/swftools-0.9.2-r1.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
@@ -29,6 +29,7 @@ src_prepare() {
 	epatch "${FILESDIR}"/${P}_general.patch
 	epatch "${FILESDIR}"/${P}_giflib.patch
 	epatch "${FILESDIR}"/${P}_giflib5.patch
+	epatch "${FILESDIR}"/${P}-jpeg-9.patch
 }
 
 src_configure() {
diff --git a/media-gfx/xfig/Manifest b/media-gfx/xfig/Manifest
index cd3689f9764f..a52a4aa8b9f1 100644
--- a/media-gfx/xfig/Manifest
+++ b/media-gfx/xfig/Manifest
@@ -17,5 +17,5 @@ DIST xfig-full-3.2.6a.tar.xz 5502944 BLAKE2B 3a83feeb5647ffa9586b9ce40116e9854a4
 DIST xfig.3.2.5c.full.tar.gz 6078933 BLAKE2B 44ccad26fa3d7a57b0e8798d6ebfe6682baf15046d9e360d7a7569cac54c403c0068671e27a5289dbb4f70dafd12c1653a61709749a8298874bc49528783973b SHA512 763bd6fd43bff9b44f934dd6e16b0aa5142041f895e74564d28e7252e012f1c7728bbee40e3970357c7d3fd15aa109dbfcbc1d0a2203fa1a2ed770aabacd9525
 EBUILD xfig-3.2.5c-r1.ebuild 3203 BLAKE2B 7525f53b1b9a9d05fee6c04c53486e5b6954122b0898c0658869432a36730a91e47c4cfe694755e27baf4fe7328f7b4380adc6b4ed08248b9c7adba884e685c7 SHA512 45971e1e43c8f54d0c1a4a57596edae08e52239dd06dd066ff6186c6da759a823b78becd86d3249e17b98f1ef0aafe8aec552669120ebae634391a8d5d3d7b35
 EBUILD xfig-3.2.5c.ebuild 3303 BLAKE2B ca99f5134de4c15df3ae3f656684b3f6bea7f6e7a20e2bae0899e684025475f46bfa2c41792b507db3982637c985e67522261abaa78fda4f399e4ae134cd9139 SHA512 538cee1a1626c417a967f4c4810a0b8924169f61c153b67e8479243dab39041d05cda40e98e5bbc8c2fe5e571fb85acbe0425072c56906d08c53e4bce8be8c1b
-EBUILD xfig-3.2.6a.ebuild 1208 BLAKE2B 9e027ffd88df9abb674fe431e999918913970685c759c1a0f25bac735de849cbcd6da7f0db63e9dfe15a538bbb2524db7f195a188fb215e6c0c06c19a3ae8752 SHA512 88ed355f7b227fd8475e5efbc1c4301a8e7202bd522a3449dfe4c456f685225852920ac34b2c5251285516a219ce46ef27be24038959c75afaa5b0da6b6cd57c
+EBUILD xfig-3.2.6a.ebuild 1207 BLAKE2B bea38ebc749e077fed56f3d6f4a97a25ae7aa40bdf81e6f9bbed9b78462ad41930957efa3af37c82eec653905a59da5af48253ee4496720896286ddb76a361bf SHA512 22b7b0f96d4459081e8978cc6219c7bcef30861df54b0211bd8ce334a32f61b9199be8ed0c78008bd2b4ee699f8276ab30dc5865849b918e5c16928335e3a958
 MISC metadata.xml 212 BLAKE2B 71dabc83d0433b968a559d72c4d8a18ff9477e154e5b7e72ca22b859a0fec0ae23b0fdad7233686c6c1e20178142f5c60bf93f58db30c5109106e4d86b9f1cef SHA512 05c3af7b4c872998a64d3d6dce356ad1bfeb67f4ec845e82e022a89c96945ba5fe8848df48b8736feb39bd4d9a7d6714f0895a9c824e3c67d903ea3da1ca0f22
diff --git a/media-gfx/xfig/xfig-3.2.6a.ebuild b/media-gfx/xfig/xfig-3.2.6a.ebuild
index 6c83b8de6c69..fbbb1770fb4e 100644
--- a/media-gfx/xfig/xfig-3.2.6a.ebuild
+++ b/media-gfx/xfig/xfig-3.2.6a.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/mcj/${PN}-full-${PV}.tar.xz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="jpeg nls postscript"
 
 RDEPEND="
diff --git a/media-gfx/zbar/Manifest b/media-gfx/zbar/Manifest
index b570daefd3f0..6f183956f1d4 100644
--- a/media-gfx/zbar/Manifest
+++ b/media-gfx/zbar/Manifest
@@ -7,5 +7,5 @@ DIST zbar-0.10.tar.bz2 592602 BLAKE2B e3379bb915d52912e9d64b4166c60e0625b1c3aae0
 DIST zbar-0.10_p20121015.zip 991578 BLAKE2B 021dfa3920a838fd7bab12b09600ac6949c1495045691c4cc547bfb6ec647658c60984da248b882eabfc0bb123b90401dd3a32adcd66726b1e7072662e303d18 SHA512 7bb74ea5b096093b283c44787547ad0b886281628d012aa7b03ddb477732feb1e12d4d5a661191d34b53b7b272a237f67840e219b0ac5e2803da478a1ddba7a1
 EBUILD zbar-0.10-r6.ebuild 1742 BLAKE2B 1ef919eae08a5aca610dcede6c34b5f6325f20cd384a406642d3f040efc7ff2b01f8e2d8d6a75a9abac290bf9dcd4e2b9dbcf5e197c1e8b9842d9d83d039eda9 SHA512 6a03ed2a6ed2b3a1c28cd58703600869148428030151f779324fc06d32d6fd1eae74584c40c53aba3f38b999229a01e2ce275fbb8e31885d951efa5ad42f9897
 EBUILD zbar-0.10_p20121015-r1.ebuild 2397 BLAKE2B 2fa90db3ece690a7b988139e1fcdd089892967d9141a4dff719af8b4d91a8ff3bd16168a978ab298bac54338c41b8cedd9e03cb9cda9bdda2d8186142cf16067 SHA512 b5f6232d3fce9cb1842d5630537ff52056b185036506bae78f605dc5d2f0ec54f5d41edb2d58b6caa379e1f7dfdd266fcc9bd0d454eada9c73507924ae9dad55
-EBUILD zbar-0.10_p20121015-r2.ebuild 3645 BLAKE2B 48d4d4e8259f6031e42e60b9731e399bcdb94bf82193f05ed1f7fd776fe00aa4dd7d18701680e0ff568cbd69c38b9ad7acd88b85ef7c620cacad9c64c5930c4b SHA512 0c9a99326378cb8846d33f97120ac6e430200759c1628abb2bd03a06b07b5c179239486a8962347874d867bb403e5665feaa692844a5a682bb44a03d775a2b2c
+EBUILD zbar-0.10_p20121015-r2.ebuild 3644 BLAKE2B cd003a0f9801fa2474602024116fcc90cee831deef02920503ac47ee4eec0b347e663941141902b599c20e37c865929bdf29eccde9308cce5157a41269f83612 SHA512 77657b8a159511b20573c04064c710b4a92514a41cad0104d8b955b631330b89939eed3e05289c4ef0f6344d1dfecd6bc73173c56c154fc6b6866aaf508486a4
 MISC metadata.xml 317 BLAKE2B f900040957f979d0931359e9399f89d60de14ef9e7d359de21f5c02807748a3efb0004926ab2890708511908b21aba7b824eace5bd13f5194c7f6bb633d4bd98 SHA512 911dee4073890017c8816d892b3e77e460328fc8e25e59c3ba74eafc909de73d743ac8c1c3015385bcbba1e7f175796704f6b1be6b1f37e0ce652da1749ee830
diff --git a/media-gfx/zbar/zbar-0.10_p20121015-r2.ebuild b/media-gfx/zbar/zbar-0.10_p20121015-r2.ebuild
index 3e5f42adf8ab..6c764241f4d0 100644
--- a/media-gfx/zbar/zbar-0.10_p20121015-r2.ebuild
+++ b/media-gfx/zbar/zbar-0.10_p20121015-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=6
@@ -14,7 +14,7 @@ SRC_URI="https://dev.gentoo.org/~xmw/zbar-0.10_p20121015.zip"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="gtk imagemagick java jpeg python qt4 static-libs test +threads v4l X xv"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
 	test? ( X ${PYTHON_REQUIRED_USE} )"