gentoo resync : 18.05.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-05-18 00:10:51 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2019-05-18 00:10:51 +0100
commit: eccb70a7f91b2d22582587f26d1a28bb31408b45 (patch)
tree: 3223e1fd54201bcf4ebecac6fbe87361cbe643e2 /media-gfx
parent: a2810985afabcc31d3eace5e61d8ea25b852ba17 (diff)
54 files changed, 942 insertions, 353 deletions
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 2f7d7106dfbf..61ecc725b505 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/alembic/Manifest b/media-gfx/alembic/Manifest
index 435a73fa065a..7c4cc535ddf6 100644
--- a/media-gfx/alembic/Manifest
+++ b/media-gfx/alembic/Manifest
@@ -1,5 +1,7 @@
 AUX alembic-1.7.9-CMakeLists-fix_lib.patch 7317 BLAKE2B 8739f5808cb8821cf8404dcbd492620bd1b0fc4ac09600f345a89b813d07e24fb305a5615a9d58b11ae36f7754a9527bf583586017d1018eff658760370f9777 SHA512 000d31ffd5c5843a33532fbf02c2410cbeb7504fd89d9133f4a91d435682572df0cee7d59f039b0e32e98c05df7685ac2a3880630cebd6782e38161a8bca4c31
+AUX alembic-1.7.9-find-boost-python-for-cmake-ge-3.11.patch 794 BLAKE2B b19aabcc393e2cd218d055e00b7ca1e0e69206326b756e4ee9f5cc67678f0e519b6f788593e33e833b61b71ee98fbd8e2a3e633548144601ce47b2aa8f625380 SHA512 bd1ebeaf3e1e28badb9e5a6914bf3073cfa8935c74a044ebe5dfb84117c8058696ae10866898fb6dd122fd4b7de926070e422e1487f0f6749226fe87e646b52c
 AUX alembic-1.7.9-find-pyilmbase-python-module.patch 542 BLAKE2B 448114ef30e6131229b6e789af7a231e766e2584c64eca9f4e09cd7bae8555d1c9f00b62c3e53136fa20be25530ed15019ea5f55a32ee286b925b726678092fb SHA512 4dfef7da97b1fe82b7c210ff8cfc7e664d56b7379dde0246ab18311fc28188dd59251b745644f75debaffe9e5eeff61c965ee9bcf6102ff6f50af7f9db4c8a2e
+AUX alembic-1.7.9-fix-boost-python-naming.patch 721 BLAKE2B bcd2857b7afb29017c0e538ea8bf9588c744f1471c106009f225affc576750967a05e42a94f84ca5194823f7abbe3762e5d7b58cee9497218e59927e3ea6b1cd SHA512 a7140894cdcd2d796b0fc514f36e8318ef372f1fbe456f06c80f9697bcd9cc6333d609fd2be2c7788329a60685abd5030ae572f952deb54dfc9f0b6db72b7159
 AUX alembic-1.7.9-fix-python-import.patch 1254 BLAKE2B 091d7fa6b55508425b7017f2bc7832e798ccdf65beb885ad0db9e13e8685458696fcc05dc76477a14907799755aeaf71ca748a14452abb0747df210f549a7604 SHA512 e62bbcf20028c57c41b935e49e947f02905e390fbf0788c668b9a517813bbc259f266f9d14fc2197884d9632739eda7d412267aba44a8c7495125c2f06a184d5
 AUX alembic-1.7.9-prman.patch 822 BLAKE2B ed5faf9b8e4eb165b82a5001b129403ce0afcb00c448ce011889d8672ea0df1d666839ff0d515b86bdf01304f0605312bd317140944fc59cbd0fbadab7240655 SHA512 59060bb8b29d2c5e0e2003115e6fecc7744bc11c39419486e3743e810f85256c66af6976b5764cfce04fd87c8b715939ce382e252999ff26a3ad06df2c3550dd
 AUX alembic-CMakeLists-fix_lib.patch 4760 BLAKE2B a5365176200b40a31d274bab9ef126cb0ea380c6afeb2ec152bc5edd4c7abb0cbc514a5324ff6df6ad791b585af8cc48984e0eaaf12f1abd2629d405e39c6e18 SHA512 5ef90e477ceeddd9a1040c024e3775141d693b99361dc3d943ee6014c700b13a2ef8d83d60e53cf32611c828bd1f7b789544468fec97cc4b56963338b3fc604a
@@ -8,5 +10,5 @@ AUX alembic-fix-importerror.patch 662 BLAKE2B 140f80ff08522ec84a43cb5e988e7e532b
 DIST alembic-1.7.4.tar.gz 805503 BLAKE2B b8a8b986d0323dbe3748e1dde5436d66e08620a28852c3331ee612d43a414e381a1cdbbb63200b8f146ce94ebb0e3d0ae6f70f33575bd9ff25e9121f2cd73d1a SHA512 8e752d6d85bea3b6a53582d35a589fc40824456098d950974effe0a6a0e359fec1e056af1ea1379f7e23b7ffed2c05c7f5269fa4b64757631b7d57fb60ee98b0
 DIST alembic-1.7.9.tar.gz 813379 BLAKE2B 599edeb5ad805656755b3e150fba56182d1d60673951b0c1702b3e3e82d9499ec4fcb938303103c27f84458f61ab8de4b872eaa322380ae7713e3b4cd3831af7 SHA512 8025c20525ffbd5bdc9dd5a33ad8238e49f063d244ab9d112e7d1ddb7ee7cf9b36ceb74cb45d658ce22d3033552c89bddf6b818cf466ea46aa1a70a41fdeddb2
 EBUILD alembic-1.7.4.ebuild 2398 BLAKE2B b22d682575c1bd1a75f073d6ad82e92e39bfbd15439848ee9b00ce434a366e1fa0dac7fbb3d079a8dacc6cb088c7d21cbee887d9f1d5f1ffb3d7f65728b1fd26 SHA512 9e9d10622ccda6a79d3bd69a5d5441c9a2612ff9e4ed67c1e80e4a03e270e887860e92f355d057715f62faa8ecba7bb7f5eeeea2f98e0c8d922b90e43e57cf31
-EBUILD alembic-1.7.9.ebuild 3063 BLAKE2B 5d4c244b3c514a177fcb90e855911fbbc7f765a9a3bd7ecc384913f33cd9c2e08ea2818e6ed6ad2f2b0c0e1543b335994468f56462fa38b08dc692e69169a0f3 SHA512 fb52f995805883489d0359b587fcdb12316c40092d5a5647f2f6775fae9ea03a811322ff66ff00920dd1b4f2099dcfa535d85da72edec6c364a503d76eef16aa
+EBUILD alembic-1.7.9.ebuild 3015 BLAKE2B dd6e430c4b1d11e7bcab88de6ee6c5bb2c6bb176ec700c59448c31477069fc42dda77fee34694ff983c25bec7854b3adaa7c1b120b61648e4f41b0d6d41e40aa SHA512 6ed134efe406b41b3187f33edbc092076cff7f42eabb110d5bd9f0191f984a040ce86e5ccd0ab4f9bcaa7ea86de58b4002424684f9f68bd5600bc511dbdfba7f
 MISC metadata.xml 1489 BLAKE2B 436a0537ec36495d3c87ced52ed779f60646d57df10e6f04c65d7037f169f865ecc18f4fef2c5b109352427af25206a7ef5913be4e16ef5e6115015aec22fca3 SHA512 91e4fb6528e65716926ef053712f40dcb8d8de4337653edc7f562419c227c4adc4c6837d8790bfdfee2330e90d9e31185f7265b74cba21599e1e4d21b80a82f5
diff --git a/media-gfx/alembic/alembic-1.7.9.ebuild b/media-gfx/alembic/alembic-1.7.9.ebuild
index 638b12a639b9..a6eebf37327a 100644
--- a/media-gfx/alembic/alembic-1.7.9.ebuild
+++ b/media-gfx/alembic/alembic-1.7.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,10 +14,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD"
 
 SLOT="0"
-# TODO: ~x86 currently depends on new =dev-python/pyilmbase-2.3.0 which has
-# ~x86 keyword. As soon as it's updated in the tree, the keyword can be
-# added here.
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="arnold +boost doc examples hdf5 maya prman python test zlib"
 
 # pyalembic python bindings need boost
@@ -49,6 +46,8 @@ PATCHES=(
 	"${FILESDIR}/${P}-prman.patch"
 	"${FILESDIR}/${P}-fix-python-import.patch"
 	"${FILESDIR}/${P}-find-pyilmbase-python-module.patch"
+	"${FILESDIR}/${P}-find-boost-python-for-cmake-ge-3.11.patch"
+	"${FILESDIR}/${P}-fix-boost-python-naming.patch"
 )
 
 src_configure() {
diff --git a/media-gfx/alembic/files/alembic-1.7.9-find-boost-python-for-cmake-ge-3.11.patch b/media-gfx/alembic/files/alembic-1.7.9-find-boost-python-for-cmake-ge-3.11.patch
new file mode 100644
index 000000000000..d8abfce72f57
--- /dev/null
+++ b/media-gfx/alembic/files/alembic-1.7.9-find-boost-python-for-cmake-ge-3.11.patch
@@ -0,0 +1,20 @@
+diff --git a/cmake/AlembicBoost.cmake b/cmake/AlembicBoost.cmake
+index 21b3515..ba6f396 100644
+--- a/cmake/AlembicBoost.cmake
++++ b/cmake/AlembicBoost.cmake
+@@ -79,7 +79,14 @@ IF (USE_PYALEMBIC AND APPLE)
+ ENDIF()
+ 
+ IF (USE_PYALEMBIC)
+-    FIND_PACKAGE(Boost 1.42.0 COMPONENTS program_options python)
++    # At least cmake-3.11 has introduced a new syntax while looking for
++    # boost python libraries. It might apply to version 10 too, but I
++    # couldn't check due to cmake-3.10 compile error.
++    IF (CMAKE_MINOR_VERSION VERSION_GREATER 10)
++        FIND_PACKAGE(Boost 1.42.0 COMPONENTS program_options python2.7)
++    ELSE()
++        FIND_PACKAGE(Boost 1.42.0 COMPONENTS program_options python)
++    ENDIF()
+ ELSE()
+     FIND_PACKAGE(Boost 1.42.0 COMPONENTS program_options)
+ ENDIF()
diff --git a/media-gfx/alembic/files/alembic-1.7.9-fix-boost-python-naming.patch b/media-gfx/alembic/files/alembic-1.7.9-fix-boost-python-naming.patch
new file mode 100644
index 000000000000..c14d7ad960c7
--- /dev/null
+++ b/media-gfx/alembic/files/alembic-1.7.9-fix-boost-python-naming.patch
@@ -0,0 +1,17 @@
+diff --git a/python/PyAlembic/CMakeLists.txt b/python/PyAlembic/CMakeLists.txt
+index 5a75e63..492be6a 100644
+--- a/python/PyAlembic/CMakeLists.txt
++++ b/python/PyAlembic/CMakeLists.txt
+@@ -33,10 +33,10 @@
+ ##
+ ##-*****************************************************************************
+ 
+-MESSAGE(STATUS "Boost_PYTHON_LIBRARY: ${Boost_PYTHON_LIBRARY}")
++MESSAGE(STATUS "Boost_PYTHON2.7_LIBRARY_RELEASE: ${Boost_PYTHON2.7_LIBRARY_RELEASE}")
+ 
+ # set core libs
+-IF (Boost_PYTHON_LIBRARY AND ALEMBIC_PYTHON_LIBRARY)
++IF (Boost_PYTHON2.7_LIBRARY_RELEASE AND ALEMBIC_PYTHON_LIBRARY)
+     MESSAGE(STATUS "Found libboost_python: ${Boost_PYTHON_LIBRARY}")
+     SET(PLIBS ${ALEMBIC_PYTHON_LIBRARY} ${Boost_PYTHON_LIBRARY})
+ 
diff --git a/media-gfx/argyllcms/Manifest b/media-gfx/argyllcms/Manifest
index 6b78ef2c966b..7f2164dbb711 100644
--- a/media-gfx/argyllcms/Manifest
+++ b/media-gfx/argyllcms/Manifest
@@ -3,7 +3,7 @@ DIST Argyll_V1.9.2_src.zip 13624924 BLAKE2B 7035a1cd43b320acd3ccb6eeee46681e39f7
 DIST Argyll_V2.0.0_src.zip 13588152 BLAKE2B a299d7b4b2c76ac22c6761b4e25b4ee5751bd0771fb3d4c58dcb722aec1b413ab07fef35263e2dcb311d893bb16105072a83dd640720efbf160a59369fc88768 SHA512 44e9a2307bc39a8e455c15b2f4126de652a9ecd43bec94a841cb3da56896effcb023740d7e6b8991d109766c83426eee4b131a6c56cda5ff28b22a06ea470b5d
 DIST Argyll_V2.0.1_src.zip 13606682 BLAKE2B 156c94d538a868a90e59a009999ed35536ab84e27434c071613540c4afac1c7374f77eca73a38ca87220a0f1cff7213286312cb681d50a7e7e14b946788b8e0b SHA512 d0755d1837fa000278f390d9d101c1e9de3f2e294583c8b67b37f74f0ca6190917bfddd5ce50a39a274aefeeca304aaebdfd11db391521e222da2368a2881c0e
 DIST Argyll_V2.1.0_src.zip 13823910 BLAKE2B 344520ba06055333858ebc1991939589fb276ee434a5d16c6eedbb318da1cff27a910298fdd0ced86f292d1e3564c6e0d6a2663cf7b80cbd4afcf2d49982b3f2 SHA512 9a74828c8cea8aac5795ab48b1531b2cbd43ea613e856eceb55ee291412eb5e8816f25f6bc620bd1bfb32eb8c08e87e85e821a2dcf0c25eac68d96184e8f8bca
-EBUILD argyllcms-1.9.2.ebuild 2091 BLAKE2B fcd58b111e342dbbb5036704767e94f3006eb3930bcfadfecd4df678d28ee461fedd04b38dec6f0447fe5821edade9fbc5a326f11d88c4f7c1e129c1db3bbfaf SHA512 965976aa88fea6cf5455a778e0e36559db03e7a073d05d65f1fe5305b5d9ac86652da77ed2085d38a5d025349ead3248e5e041aeabbec4446aef348b5339b950
+EBUILD argyllcms-1.9.2.ebuild 2087 BLAKE2B e20ba736ce25cbe2b8957ef60cd16d4a667ba606c564aa5c28c11949403c44dd014f06ce3a156f99d3f24d0d9a1f5c70dee723451867f65bcdd3310a72e8c904 SHA512 8485775e762c057e59407758788a5982b3a07c33516381ca6bf229452737d4a226e83e151109d6f8afcf70a68581d48009aa8d9722d180cc906796c010580ad6
 EBUILD argyllcms-2.0.0.ebuild 2042 BLAKE2B 2d8c8f9bdaffd551fd69ccd2ba9d7ec26055fc1b52dfd367d32da5a71629e4c50bcb529a1635ceb5dd397cdad8cfdf9fc1c28b5cc6d19206e1e7b0111af45d20 SHA512 e41a6c9053b2bd8a3814a89875d714a4af8d00143277aa120d509ed2d24a3a4f31b10559bfa92141abd0b5131ed5344932e198350959221b48faaadf5f5d86a9
 EBUILD argyllcms-2.0.1.ebuild 2042 BLAKE2B f9560bb31b6f74a37bb7fbe3927ffe8d7435a8057f109f976e9fe8dd433703393a7ca5ffdb086e287ace418093a01ba89d720a6e90aea68819d9d485a0031b4a SHA512 825b1047f6a2c8b49e175442b1cd6f85831527d852ddddee12f0e8bdf119a3234afd672c19b96583f8c18f06e70bbfe19feef9a04ff81eef9398c9261a3d31e7
 EBUILD argyllcms-2.1.0.ebuild 2032 BLAKE2B ab27af1801046c31cce2b24267e3ad372ec5fce441cf4a42b5981bb278d6499178c76c188c935b12db27f0138019a68a4366de7891f0c3a8eb2106696b9a0200 SHA512 430d091e3421deee3fc1a5ab53ba549f677d143cbc5ccfffbc7434bf2b24d5017554b4eaf06895d0124a5c28adb19acf88401d974b2d385057054af0557b596b
diff --git a/media-gfx/argyllcms/argyllcms-1.9.2.ebuild b/media-gfx/argyllcms/argyllcms-1.9.2.ebuild
index 4e1b6da07f5d..a7169af6a018 100644
--- a/media-gfx/argyllcms/argyllcms-1.9.2.ebuild
+++ b/media-gfx/argyllcms/argyllcms-1.9.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="http://www.argyllcms.com/${MY_P}_src.zip"
 
 LICENSE="AGPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 hppa x86"
+KEYWORDS="amd64 arm64 hppa x86"
 IUSE="doc"
 
 RDEPEND="
diff --git a/media-gfx/dcraw/Manifest b/media-gfx/dcraw/Manifest
index 45b340ff29fc..431740897ce7 100644
--- a/media-gfx/dcraw/Manifest
+++ b/media-gfx/dcraw/Manifest
@@ -4,6 +4,6 @@ AUX dcwrap 437 BLAKE2B ec88784e059ab07990acf3a47517f243502a140b451040c77f9320bd7
 DIST dcraw-9.28.0.tar.gz 194193 BLAKE2B d39a2d76dbbe74a2aed21c6b132ac25c9dd17312813e7f640a4a6d4abd4e8f1868ad596296ca9bfe61427b8b4764821e32679128747ff5a9452988814b77c638 SHA512 04609c4ddd5d1c9fa0ee1617d2ef25efdc22451e1fa6cf669d93abb1fa630a18198b30a289400f1814c8dca285547da8b081a1b00b085c00bb9318ad25c48a30
 DIST parse-1.73.tar.bz2 8186 BLAKE2B 4d7d69bbaad3fd69caeae24e4dfc77fa580d969f903c925f76cf0a7bdb13ff34c96ab6dc9917609ce886365f6971290b3af63aec9fed43b1876aa44dd951521d SHA512 06ffaf72695dc86bfc2bdd10d4f732bc428b72d427f4c10e93fc58536513477cf297adb56fb9cfc5ba5fd5b6b4cd197c33d8dac957a0a1bbe65b23393b64278c
 DIST rawphoto-1.32.tar.bz2 3841 BLAKE2B db7a80af4b06fc3709a9ae69d9f166c3323097821bb561af4e0ac9a1ef677cab6cfd5cd7896d1e1fce85e6fab545ced7d00ce809f97332bec594b94a27f77e23 SHA512 6ee5b6c4e4266c8e04221c894c4e737f8a6d2c6f0cc9c82db73064afd68488bd60de19b86b2d7b82780283bbb9f8156ef3149c1c730f09a00dce632744b44d56
-EBUILD dcraw-9.28.0-r1.ebuild 3079 BLAKE2B f52a4ea3b8b1bd95597ae48fbab7a3d538520dc07d233d233bfd91f180dc7fd1b2de07a24dd838ec8865873c8fe9785f009ec08a857427c7603254d0044e9675 SHA512 d467db8fc86d45757854d21abfa9ad93f7d0d4d8b4defd81cd01206743c4a0c9f40cd59c6a2f76d19c723fb99e860332a796cae72d497b3aa04a9d27a75ac844
+EBUILD dcraw-9.28.0-r1.ebuild 3076 BLAKE2B 9932e2d7368cab8917b8cbccd91da8ad0554176550d406fe8b2cbcb0d55cd8d4efd0d9d5e0d50206d2c7368a11a00cd92629d08d7d9ebada9c027c5b7545c149 SHA512 d757f02645522a2be7c704205cd6bad997ed17fce67d65aae6f313f4d23e08399fdb07dfad82fe0d9fd72708a0c5fd0ef431b8d13d05534641885a30d06d3b43
 EBUILD dcraw-9.28.0.ebuild 2963 BLAKE2B 7ba95ebd63edcf718d263183ec26860ee7e7a2d9a835a01028a5b7cc29ee6ca8a9af3f2c0f411eebcf88c168a2891b87cedcbd7517ff415cb674f1121f2c7194 SHA512 f2082082748c6006cf81fd7888d9ed0a9b9373aaf1855ae8f699d7c51eb79cde748b3a702792f0bcd0a40b6c8eb4e8c0e8e838847c70a6841997b01d40a844e4
 MISC metadata.xml 701 BLAKE2B ad6e3ac7425a35fb16cfde74a0d540ab47676008f1de56cdf3ca101e3724e3c8147cf76f548f22a38862b09c67f34411f44718359e6467bdf8b94b9d041cf82a SHA512 0758eece42b5007b53e04f0ddb6385fbdea360afc8a4cfd94d3f5234e4a677819cbebdca3a78c7f3765770e6ccb5b2d74f20199b7c167137fd15554cc14d0755
diff --git a/media-gfx/dcraw/dcraw-9.28.0-r1.ebuild b/media-gfx/dcraw/dcraw-9.28.0-r1.ebuild
index 31216b8a0849..46c8e71db852 100644
--- a/media-gfx/dcraw/dcraw-9.28.0-r1.ebuild
+++ b/media-gfx/dcraw/dcraw-9.28.0-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www.cybercom.net/~dcoffin/dcraw/archive/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ia64 ~ppc ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 LANGS=" ca cs de da eo es fr hu it nl pl pt ru sv zh_CN zh_TW"
 IUSE="nls gimp jpeg jpeg2k lcms"
 
diff --git a/media-gfx/eog-plugins/Manifest b/media-gfx/eog-plugins/Manifest
index b523a26310c2..97f6b1a29ab9 100644
--- a/media-gfx/eog-plugins/Manifest
+++ b/media-gfx/eog-plugins/Manifest
@@ -1,5 +1,5 @@
 DIST eog-plugins-3.16.6.tar.xz 398836 BLAKE2B fcd3c6dc61ca6d935580caffdf9c941d34265f8caa6cd3d682e0d7679888f6965f64ac30b807c00417e904b4e0eeff1a213a8f6d284c130abe265f9c97fc636b SHA512 e3bff786785ae36a41bc7c5fcb3cf75233595777409f373c4a6597fa6e432f72c7a75608e09ab66e1033ca0d12e3855346d7f7e0c571014b5aaef40184a3383b
 DIST eog-plugins-3.26.3.tar.xz 470712 BLAKE2B cd5845481006b681555f35d1f353ed624baa83fc8fc45bb889b2418f31a776bf9e08e270f911f61f431123825a5b96fa684f72e378ddd0ad1107ff44a5c98519 SHA512 5ea0bbf692fa71fa77b0b78307cceee067c95e80c2e69e173990c1154df8014912f24f8d023eda79da56b7c1bdf0870e5e92b968a68c4961af3fc1382d4f468c
 EBUILD eog-plugins-3.16.6-r1.ebuild 1596 BLAKE2B b567b54448539ec6131d31976bc05084d0dce25e1dd4c56e68159b53bf59bbdf6b95adbeecc9c60b81618d1ee2d57b62be91dd930a8604196c083a3185d9b5f8 SHA512 6c5319369b6453cc98c2a28721add88f404547c9e5ef7ac94fe21b99567a827a54d6404ff85270550b9fd5719b1e56350a515d73912460bed98666556bf85159
-EBUILD eog-plugins-3.26.3.ebuild 1645 BLAKE2B 3612e4ba2e617760703c89ac8b0b767a667030e463f66c02b96a7573b8477211179367609b255068ab19ecf6f7666cb7c914202bc02e242a0a9faadfb7b99316 SHA512 0a34bc3225f031a17fece2dd6ba65c27a191cadd7a8c363548674c3094d954ca33988d433d646ee71b04b4d936152089a75712bd7f5fb7699e39440e10adb024
+EBUILD eog-plugins-3.26.3.ebuild 1643 BLAKE2B 2a215a9e8543aa1375f76010b86549570cb94dfad3456b32edbc34331c11edae91863ab578e14a8a01f542d5ba81f08afa179e5a14e7d1a5dc095c1e6f60d79e SHA512 804238ae08418988ca0d9c081856534102df03be217c79f6a159b4fff33d85bbeadd055dbae6b6a73056e133c461def676e2e41ad34e6d301fd86525f102b5e7
 MISC metadata.xml 428 BLAKE2B b10706bb7638538d5ce63c9787e7a1730e01c8383f2d2a093e38184b031933d2b3749241aa2f3254be4c84fac104bb8ec72940cdf8cd5a9f7bc0944541b015c6 SHA512 9684f07846ce7e49ad82843c2b8b7ac5c9d7124bddb07778292d6810162e89a3d41e7ca426f331e4bae6ecfbe53f71409b35418affba6382e874c78b64ed102f
diff --git a/media-gfx/eog-plugins/eog-plugins-3.26.3.ebuild b/media-gfx/eog-plugins/eog-plugins-3.26.3.ebuild
index 8cdfa42dd1c0..b37c5733944f 100644
--- a/media-gfx/eog-plugins/eog-plugins-3.26.3.ebuild
+++ b/media-gfx/eog-plugins/eog-plugins-3.26.3.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/EyeOfGnome/Plugins"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 IUSE="+exif map picasa +python"
 REQUIRED_USE="
diff --git a/media-gfx/eog/Manifest b/media-gfx/eog/Manifest
index 9db67c8056ef..3996db705e68 100644
--- a/media-gfx/eog/Manifest
+++ b/media-gfx/eog/Manifest
@@ -1,5 +1,5 @@
 DIST eog-3.24.1.tar.xz 4632496 BLAKE2B 24d6957285d5dae7fa2299165b1bac236e75dfa77938132c1d3f8f7312ed4a07d5d3a770fdbdbcf5ee1966a43b4443d331fbedec47575836e2170fa3022e657f SHA512 c007b6f2cd2b59747db72a5b86ecb34ac87fe0910a2d33df466eb05ebe5ff638fb9e57b15f2ea9328c95037334a2fd9010895241ff285628b7ed7b6d65912fb0
 DIST eog-3.28.4.tar.xz 5732396 BLAKE2B 9adf7e6793add9298dd879a0fe5ea7c736854d3a40473b2def84851a1e5a78ef84316b20b172c85c85f070278a51b06c1019aef1e5e9c5f31a87243c9229a579 SHA512 57ccb6269b2829a0606cbae08fc376bcd13028d3affe03d76c929a95faf9106dfd497872a12019158aeff5e8e101640d912cae0cece435121319820df7262c00
 EBUILD eog-3.24.1.ebuild 1361 BLAKE2B 346a3d7b927c624f13d56dd40800e6bf15221eb3fd9b8592019979ed84dff3d6fef815f5d7b3039da2440f9028f7775bb0f37b1c5e49f8f65e6ed6c104f45e6b SHA512 26d67acc6add7c8c0ddb1314b511286c310acfdd6c7372221ec2bb4dba69394b8a75e6d5ff04506720e5e911fc3998d810bc03fc7dad50a2556e25c1d4520758
-EBUILD eog-3.28.4.ebuild 1550 BLAKE2B 051a1673bb0287d59697dfca6daf6cd75f1b1d10fa24ad0827f26dc7671625077fdd65418a63c862167e7d0ad8ec101a55353bae1909cd083ae1fd0140a26e57 SHA512 1d34e6b49845a6c115ce9f12db495a7c048efcdd2786a6800a715975abdb0f1823b48efa3ac3474a9478a84e84cdeea12e203ac90b9115b8aae743736a5b5dfa
+EBUILD eog-3.28.4.ebuild 1548 BLAKE2B 30a8e18db97f9bbe86308530aa943cb3d35eb611665fe704bb12b5ea3fcb78bb4602d5d3cfc3f60db98ac30b1191ec4264bbc7338428c1d1a16bbc15fb89fdee SHA512 ee8e69916c99e40d5855b98b3b9bb8ea62789116ad9d8dc98f1a6414acc450b47b8440adec382d164fecdbf6b5d3cd8e27fd5b673ab74b3d954134faadd01c80
 MISC metadata.xml 481 BLAKE2B 2c12b594b9a5b1e4ce3983131d1911f62026c5186d8f5c5af13842cfedfa4d20abdc5ee82e11db3a2e1b45e2b8d4d95fa1a62e668936956e8453b166daff00b4 SHA512 141ec1d6923697f744de806804279b602120ce3d5494257de36b8c8b71185d101692f2e438d7ba0e4a4c946d0aaba068117f16c8344abe891e0ddd4f768ded26
diff --git a/media-gfx/eog/eog-3.28.4.ebuild b/media-gfx/eog/eog-3.28.4.ebuild
index b385ab287a64..f63fb81652ee 100644
--- a/media-gfx/eog/eog-3.28.4.ebuild
+++ b/media-gfx/eog/eog-3.28.4.ebuild
@@ -14,7 +14,7 @@ SLOT="1"
 IUSE="+exif gtk-doc +introspection +jpeg lcms +svg xmp tiff"
 REQUIRED_USE="exif? ( jpeg )"
 
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
 
 RDEPEND="
 	>=dev-libs/glib-2.53.4:2
diff --git a/media-gfx/eom/Manifest b/media-gfx/eom/Manifest
index 27bd583c4e79..c68d05ddb3b7 100644
--- a/media-gfx/eom/Manifest
+++ b/media-gfx/eom/Manifest
@@ -1,3 +1,5 @@
 DIST eom-1.22.0.tar.xz 2171992 BLAKE2B 5fc1dc872dabd6c7e06c3df778ed1616ecd66487a7ffae94744b299d54df840623759fb559727db1e4e6089021f26a21568bf4682c33fdd434bc2e0924c9a698 SHA512 1e086d1e2a0adc02978ffb45a4636e9b614a52d53a7a821af4050029f3fa3a774c29c2d43b5f2e0c58a100311eccc34e9424caf44e7e2139b4fa8d695b77cea0
+DIST eom-1.22.1.tar.xz 2142132 BLAKE2B c68f6d6ee4284de7dea3f3d9761f4b67a2edc0a169b3c3ac04ac6efd13e9f1044cf0be023e36891672b31ff73815d7ce765d8db656bbeb69f324e0ee412eb231 SHA512 f510de62b9b6f11d02df067128042d6905484e0509a939b7919405d0c1dd03fe4b6735dcd8ccf780d36c5713f4585b50b2727645a454da148307a74cf542be87
 EBUILD eom-1.22.0.ebuild 1368 BLAKE2B 974c39063c4666a9c6c7a5748d41d5f7f80748423e6941cb120aab9369a52f2f23888013e1bf1519ade27abb540290c607a95357ad48db2899a4ed21be2e8ac4 SHA512 56ef038a5e994fea720703b4cdb5a7b7b9d6f6202a76d2e40f3973899e0b78546e3ac1fce01799225712bd0ead9f91570b05eac4b4943d186688030c99e7ecdd
+EBUILD eom-1.22.1.ebuild 1370 BLAKE2B 93858e4db6e7d57a1441574cf300d40116d9bd17019cd3d2b1df5336c102271a8f7d4d3501cec0ed42c3d572fe3615ef437934c1e19f9c76d010fdf6baa77671 SHA512 39d1518981d77d54232f237d9cce8a63891b4e8872f79a4cf1188f47311e8f002f4d4724b61790c38f81eafc46767f608210ff1445d6e94e0885a910adab5cdc
 MISC metadata.xml 332 BLAKE2B f99f5d545ed10be2869ef90b4b80eeb7a8ffbdc291f5808a121842d7f6faa1de8ebd0b2cbe13db7ae04b6073387a29dcf78fa90dc6ef3b31cab07551f7c02f5d SHA512 e915e0cb254f2e1a431eccd93b45be28d85b33f0d988508031dea48a87be182a54cea01fcffecc202c029b0b6156860471841ed871e00c929fde1fb0dceb4317
diff --git a/media-gfx/eom/eom-1.22.1.ebuild b/media-gfx/eom/eom-1.22.1.ebuild
new file mode 100644
index 000000000000..e6779fb6b7d2
--- /dev/null
+++ b/media-gfx/eom/eom-1.22.1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit mate
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+DESCRIPTION="The MATE image viewer"
+LICENSE="GPL-2"
+SLOT="0"
+
+IUSE="X debug exif +introspection jpeg lcms svg tiff xmp"
+
+RDEPEND="
+	dev-libs/atk
+	>=dev-libs/glib-2.50:2
+	>=dev-libs/libpeas-1.8.0[gtk]
+	>=dev-libs/libxml2-2:2
+	gnome-base/dconf
+	>=mate-base/mate-desktop-1.17.0
+	sys-libs/zlib
+	x11-libs/cairo
+	>=x11-libs/gdk-pixbuf-2.30:2[introspection?,jpeg?,tiff?]
+	>=x11-libs/gtk+-3.22:3[introspection?]
+	x11-libs/libX11
+	>=x11-misc/shared-mime-info-0.20
+	virtual/libintl
+	exif? (
+		>=media-libs/libexif-0.6.14
+		virtual/jpeg:0
+	)
+	introspection? ( >=dev-libs/gobject-introspection-0.9.3:= )
+	jpeg? ( virtual/jpeg:0 )
+	lcms? ( media-libs/lcms:2 )
+	svg? ( >=gnome-base/librsvg-2.36.2:2 )
+	xmp? ( >=media-libs/exempi-1.99.5:2 )
+	!!media-gfx/mate-image-viewer"
+
+DEPEND="${RDEPEND}
+	app-text/yelp-tools
+	dev-util/glib-utils
+	dev-util/gtk-doc
+	dev-util/gtk-doc-am
+	>=dev-util/intltool-0.50.1
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+src_configure() {
+	mate_src_configure \
+		$(use_enable debug) \
+		$(use_enable introspection) \
+		$(use_with X x) \
+		$(use_with exif libexif) \
+		$(use_with jpeg libjpeg) \
+		$(use_with lcms cms) \
+		$(use_with svg librsvg) \
+		$(use_with xmp)
+}
diff --git a/media-gfx/exiv2/Manifest b/media-gfx/exiv2/Manifest
index e10f5e7cab97..28ec4b765486 100644
--- a/media-gfx/exiv2/Manifest
+++ b/media-gfx/exiv2/Manifest
@@ -2,5 +2,7 @@ AUX exiv2-0.27.0-doc.patch 1024 BLAKE2B 102557142367e36a3632c8c742e35aa820bed92b
 AUX exiv2-0.27.0-fix-pkgconfig.patch 710 BLAKE2B eb4952dc49f3a464ee2041c19de9dee404197814086bef869d99d30acb3a0eb13faa716472926c69dc0b44bdcd8d60494aa06855d9eec183fe4920e728f33cfe SHA512 2eb56a1641efbdb5abb6ed62259850f4cc9630d60c213782fc1cf44a705ca9d0fbde22eb6503c9a06dafcaf4eced4d21704442626b6e8b082457de31ae49fcf8
 AUX exiv2-0.27.0-png-broken-icc-profile.patch 1699 BLAKE2B e9d019d3d885198e9945a387325435618f200dcac5a70cc96a6151f9ba8036609162fd93a7857cb8677bb7c1d3fe250f9750b8d7e660f34e31e50e3bc15e71a1 SHA512 8cb9b1f4129161861aee384e634433e3fa82aa933804d5f63de95475f6f6658f7b2f63fca1da624ea7b634f71cde5ee0de7e0466247d687494383d001df92ace
 DIST exiv2-0.27.0a-Source.tar.gz 27168207 BLAKE2B 3f5c4fbe4f41c1114c0a54433c810ed0fb28ae3fbe8258eb7a02da716b833d62a94725f839accf22600c420ace5cdbead599440d335ff694a4f123820613ecd9 SHA512 9873d6815c2a87b7cdc49e8863f72c713fe1054f2f46d2c9aaa7ca2cd42096a36c2970e6a396af9000faba32fa9ff054b9d2c5e22f3e2624669440e553239f9c
+DIST exiv2-0.27.1-Source.tar.gz 27210365 BLAKE2B 1ce9a0b26c0908b876e35b5488fc5680789eb864376b379d9bd57977d456a5c6dc5983c4a8ef3e3558ffc061c0b7cda1d1f89a1629af920de1747fd4afbdbb39 SHA512 038b51241f5bfb323eb298695b5397a7d88d5c7d7303828e5e20b3f82c3df2615cee3e7e3426ea17438ca05d5abea10984cfd41f0649ddab72df1d1415bf3529
 EBUILD exiv2-0.27.0-r2.ebuild 2541 BLAKE2B 64153fbdd34708a6ae6e71e90a9183f0e588ef102c618027ef4b006c965aa4543e998f4e4a2a03406395fdc1f4e00c158a344e1e1627f1ff37c05ca6c24e3951 SHA512 eabce178bab383cd95511a9259983f6af6ad5a7af5bd23c037a2041c82d6549dfa88753129721a6c4eeb5569030850c63f6ef987a72ca6b7a4ab1a902f68b4f4
+EBUILD exiv2-0.27.1.ebuild 2377 BLAKE2B 12e939213b09d4ce072f9dbc299c00d8e1123c0ef1042d66804bf288f60f0bca0ef789a7e6383ad187ab180fd217f034d49fdbcd79133cd12afd7fa1de8b773c SHA512 f0c9b3f4858de436900db4850f71eaf1bdee5d121bc54db5211b48cdb0786b218d0665bb08d2d4d0250e5c2b663b2f837848d63179ac474adc493933be13d644
 MISC metadata.xml 612 BLAKE2B f98a074e9e3a4411baf8255cd8cab5be4257469463634218b664bb9e7f159c98615f0721bb4463c6183cecc8b2be00c34a031e7b99d745b9807634cbaab8d479 SHA512 9b4926ba8420a125dc4cefd351ee1ec10a4df2fc4306a56720f6e8de7c5fd9f36a8646c8583958fca9a45ebe1b65b19c053c7da37176546bc19ae64afa87e4f5
diff --git a/media-gfx/exiv2/exiv2-0.27.1.ebuild b/media-gfx/exiv2/exiv2-0.27.1.ebuild
new file mode 100644
index 000000000000..cec021ce43bc
--- /dev/null
+++ b/media-gfx/exiv2/exiv2-0.27.1.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} = *9999 ]]; then
+	EGIT_REPO_URI="https://github.com/Exiv2/exiv2.git"
+	inherit git-r3
+else
+	SRC_URI="https://exiv2.org/builds/${P}-Source.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+fi
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+inherit cmake-multilib python-any-r1
+
+DESCRIPTION="EXIF, IPTC and XMP metadata C++ library and command line utility"
+HOMEPAGE="https://www.exiv2.org/"
+
+LICENSE="GPL-2"
+SLOT="0/27"
+IUSE="doc examples nls +png webready +xmp"
+
+BDEPEND="
+	doc? (
+		${PYTHON_DEPS}
+		app-doc/doxygen
+		dev-libs/libxslt
+		media-gfx/graphviz
+		virtual/pkgconfig
+	)
+	nls? ( sys-devel/gettext )
+"
+DEPEND="
+	>=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
+	nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )
+	png? ( sys-libs/zlib[${MULTILIB_USEDEP}] )
+	webready? (
+		net-libs/libssh[${MULTILIB_USEDEP}]
+		net-misc/curl[${MULTILIB_USEDEP}]
+	)
+	xmp? ( dev-libs/expat[${MULTILIB_USEDEP}] )
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( README.md doc/ChangeLog doc/cmd.txt )
+
+S="${S}-Source"
+
+pkg_setup() {
+	use doc && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	# FIXME @upstream:
+	einfo "Converting doc/cmd.txt to UTF-8"
+	iconv -f LATIN1 -t UTF-8 doc/cmd.txt > doc/cmd.txt.tmp || die
+	mv -f doc/cmd.txt.tmp doc/cmd.txt || die
+
+	cmake-utils_src_prepare
+}
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DEXIV2_BUILD_SAMPLES=NO
+		-DEXIV2_BUILD_PO=$(usex nls)
+		-DEXIV2_ENABLE_NLS=$(usex nls)
+		-DEXIV2_ENABLE_PNG=$(usex png)
+		-DEXIV2_ENABLE_CURL=$(usex webready)
+		-DEXIV2_ENABLE_SSH=$(usex webready)
+		-DEXIV2_ENABLE_WEBREADY=$(usex webready)
+		-DEXIV2_ENABLE_XMP=$(usex xmp)
+		$(multilib_is_native_abi || echo -DEXIV2_BUILD_EXIV2_COMMAND=NO)
+		$(multilib_is_native_abi && echo -DEXIV2_BUILD_DOC=$(usex doc))
+		-DCMAKE_INSTALL_DOCDIR="${EPREFIX}"/usr/share/doc/${PF}/html
+	)
+
+	cmake-utils_src_configure
+}
+
+multilib_src_compile() {
+	cmake-utils_src_compile
+
+	if multilib_is_native_abi; then
+		use doc && eninja doc
+	fi
+}
+
+multilib_src_install_all() {
+	use xmp && DOCS+=( doc/{COPYING-XMPSDK,README-XMP,cmdxmp.txt} )
+
+	einstalldocs
+	find "${D}" -name '*.la' -delete || die
+
+	if use examples; then
+		docinto examples
+		dodoc samples/*.cpp
+	fi
+}
diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest
index 7f631254987f..c0331d3e21d4 100644
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -14,7 +14,7 @@ DIST gimp-2.10.8.tar.bz2 31954568 BLAKE2B 11f88b1068fa1fe216a54bed27b26b94c3fdb2
 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.10.10-r1.ebuild 6019 BLAKE2B 95f0b465a05852fa14ee4ec2ba24cd9e950a3f8ca177934ad44a557612eb05401c83bb178d76d82993fce4fd4d44ff07ba6c49b67c1474a42a1ead89aa4303e7 SHA512 67daa7288ced9a24f25be60b66774a3a62c9b65625b00b7928a3de80dec36e1bd951614e32c55df47a1f48a7a5997961b435f96a95b0afd17b37e8a3d3ff8f68
-EBUILD gimp-2.10.8-r1.ebuild 6098 BLAKE2B 2dffeb74b087ff4f23c829233174fe64539c1486542736285f3c3883b01c2a82d95e49596ded37fa4bdf3f2e1d06515db578057c81e43e9092dad162f567b375 SHA512 db116dc47eff4508592976c6a9b6bef3b3f9b5492bd3751db1d0b7bf84137c87e9a383def2869b0a2bc5223c9e45195da6020c6603e987412b6b649060400ef3
+EBUILD gimp-2.10.8-r1.ebuild 6097 BLAKE2B 463588fa18c1769f9b6ef9ece9f52a3fc6b0a09c1dc8fe16d565a7f1d7ff81a4a77af44d4e6c3c1f254461d4f788ed07bcedc0094d1e61dc1962dd34b1d49e9a SHA512 1cfd53bf7073c86ebe7e8104a8192291c04c8c693b4200c92a922bb71cdf2f67ae0953a6ff075574a67813b6ccbc4c96d063bbc0859bf1ae0c1de16cb995ae71
 EBUILD gimp-2.8.22-r1.ebuild 5175 BLAKE2B 01d76aae6190f14fdc12ad47a22109610a6622b0ee45e2d00ad352ff2a5e1f5b37ee36f15e6bf270cb842ce7f87ec13e92ce386ac908628115a8453706e95bc2 SHA512 f34e4a3d1e7ae474e07b985e5a0c9162bbdb6beec2e65473e0bb421d188e5fae37fe5a2618b9479511b625e3798f29e500f82d0e392b0b820257ebc542cf281c
 EBUILD gimp-2.9.8-r1.ebuild 5712 BLAKE2B f09f553f5d7eb8e8df0af0a316d2d98e9b0a32a204bb43c563927eae5a6dcb3bb4f5ff882bc05ce6ef3f8914939be6296683c382af45bcab877889042c96bc66 SHA512 7474ecdd5a1c785684b79c0007d77f45e475d7220f74960c48e686e7f6b15d82145b154caa802e2774eb34b46b03c5c4a1fc43a8ebc3716fb5f836be4d412886
 EBUILD gimp-9999.ebuild 6006 BLAKE2B ecd0f406ea0d0d12dd45b60ad683e30004af185debd83532302d86f3281fc8b37ec98bfed7a7b0ea5d61351b7fa28e04df8f28a0af25db8f9045faa1923d5479 SHA512 445d1518bc26b92122f5cf8048b0c9dadcb24117a6dda98e6097f32162d80169fa278984f8188c87d8a96d29482f7899fafe16a58d8e7cb5d503038136a042d2
diff --git a/media-gfx/gimp/gimp-2.10.8-r1.ebuild b/media-gfx/gimp/gimp-2.10.8-r1.ebuild
index 020456b1fee7..f324c16ed1aa 100644
--- a/media-gfx/gimp/gimp-2.10.8-r1.ebuild
+++ b/media-gfx/gimp/gimp-2.10.8-r1.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://www.gimp.org/"
 SRC_URI="mirror://gimp/v$(get_version_component_range 1-2)/${MY_P}.tar.bz2"
 LICENSE="GPL-3 LGPL-3"
 SLOT="2"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 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 heif postscript jpeg2k cpu_flags_x86_mmx mng python cpu_flags_x86_sse udev unwind vector-icons webp wmf xpm"
diff --git a/media-gfx/gliv/Manifest b/media-gfx/gliv/Manifest
deleted file mode 100644
index 9f16af674ad1..000000000000
--- a/media-gfx/gliv/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX gliv-1.9.7-as-needed.patch 2374 BLAKE2B 2b8ee4ddd7c9c587ca7b592a8797dde3eea655e88367aadb03d4bcf0407a4d14008a09d79026d75d26d75c0eb079c786f1cdc7fd9e3511fb7b8561e05290eff0 SHA512 8923b579d87079cffec3db5e5f00cc35c3bd516f1a878bc4d0e916150617a4f06d5ba3604d44dd128110e4398de5ab26ee8eef1d85dac74b4122e589eb6ad19d
-AUX gliv-1.9.7-destdir.patch 914 BLAKE2B 78f14a26e60282c2afa7e768affe442c9123c2b5860690b427067d732b46aed745a3ebb51ecf5bd424b3ff7c9dd186666843a88a0330fa10c57d58890a3aade7 SHA512 1d83c62b470889260365a5ac24de591a8e817dd9d0d10d68cbf1a7ca27b544f44940b37f316956b5a4d79ce33eafb7c41a8c6cd6d943e35fba8e9fbfd1f0c9ed
-DIST gliv-1.9.7.tar.bz2 644305 BLAKE2B 9f31c9fbedff833966bf16366fc3ef73aae0dc190146fc42f67d9abfc426ebc0c496931f3c9ca14df0e9c4e18310d7d54603c13e4d4cc6d1cae93b84b8737235 SHA512 c2276bde4b13d0dc910062e8cdec8836d751ce25e5120f4fd7987c9ba5bd62844a71a5e92c1ccf766393b47f2ff95fc3298051d3729e38696fccc024be388c4e
-EBUILD gliv-1.9.7.ebuild 972 BLAKE2B 7bf0a69a25b47ce9e727c5f8e1f1514adb02c0233c4c5729dba90da64b7f81d88c2beb8321c4fcef65f520dd1fd9d31113ddf7d8017aaa34fa7880402b817cce SHA512 b3bfad666ab3aeb0abc354ce92a0f733e4618e5a8bf74b9e5de1b79b0c14e0087222150f3eb9c2d73f49f037b0ca4cedd89ecd020334b7de9cb141765dc7df5f
-MISC metadata.xml 255 BLAKE2B f12a1ca502ad96bd6de4c8b83dfb8887ab70dec78f10a8b52dcd4618eb182192477ddca18738d734a43f3c7ac3b5e0955f4ae9347ea80e788a92974c7d50a574 SHA512 b7bc93530a1726c2d4dfbc71ae29cfbb57712fd9fdd2e76fd52f35ab4368cba0497b50145d1527a3b79e465d459a380821bb1371a01c2e915dc9adc6c7fafd5f
diff --git a/media-gfx/gliv/files/gliv-1.9.7-as-needed.patch b/media-gfx/gliv/files/gliv-1.9.7-as-needed.patch
deleted file mode 100644
index 6998e5fd988d..000000000000
--- a/media-gfx/gliv/files/gliv-1.9.7-as-needed.patch
+++ /dev/null
@@ -1,87 +0,0 @@
---- gliv-1.9.7.orig/configure.ac
-+++ gliv-1.9.7/configure.ac
-@@ -17,18 +17,17 @@
- # Checks for programs.
- AC_PROG_CC
- AC_PROG_RANLIB
--
-+AC_USE_SYSTEM_EXTENSIONS
- 
- # Default CFLAGS.
--if test "x$GCC" = "xyes" && test "$DEFAULT_CFLAGS" = "yes"; then
--  CFLAGS="-Wall -O2 -fomit-frame-pointer -ffast-math"
--fi
--CFLAGS="$CFLAGS -I${srcdir}/../lib"
-+#if test "x$GCC" = "xyes" && test "$DEFAULT_CFLAGS" = "yes"; then
-+#  CFLAGS="-Wall -O2 -fomit-frame-pointer -ffast-math"
-+#fi
-+#CFLAGS="$CFLAGS -I${srcdir}/../lib"
- 
- # Checks for LFS flags, we may not handle big files, but it doesn't hurt.
- AC_SYS_LARGEFILE
- 
--
- AC_DEFUN([CHECK_MATH],
-          [OLD_CFLAGS="$CFLAGS"]
-          [CFLAGS="$CFLAGS -w"]
-@@ -128,35 +127,22 @@
- 
- # Checks for X.
- AC_PATH_XTRA
--CFLAGS="$X_CFLAGS $CFLAGS"
--LDFLAGS="$X_PRE_LIBS $X_LIBS -lX11 $X_EXTRA_LIBS $LDFLAGS"
- 
- # Checks for GtkGLExt.
- PKG_CHECK_MODULES(GTKGLEXT, [gtkglext-1.0 >= 0.7.0])
--CFLAGS="$GTKGLEXT_CFLAGS $CFLAGS"
--LDFLAGS="$GTKGLEXT_LIBS $LDFLAGS"
- GTKGL_VERSION="$($PKG_CONFIG --modversion gtkglext-1.0)"
- 
- # Checks for OpenGL.
--AC_TRY_LINK([#include "GL/gl.h"],
--            [glBegin(GL_QUADS);],
--            [ogl="yes"],
--            [ogl="no"])
--
-+AC_SEARCH_LIBS([glBegin],[GL],[ogl="yes"],[ogl="no"],)
- if test "x$ogl" = "xno"; then
-  AC_MSG_NOTICE([maybe libGL requires libpthread...])
-- OLD_LDFLAGS="$LDFLAGS"
-- LDFLAGS="$LDFLAGS -lpthread"
-- AC_TRY_LINK([#include "GL/gl.h"],
--             [glBegin(GL_QUADS);],
--             [],
--             AC_MSG_ERROR([cannot use -lGL]))
-+ AC_SEARCH_LIBS([glBegin],[GL],[ogl="yes"],[ogl="no"],[-lpthread])
- fi
- 
- # Checks for gtk.
- AM_PATH_GTK_2_0([2.6.0], [
-   CFLAGS="$GTK_CFLAGS $CFLAGS"
--  LDFLAGS="$GTK_LIBS $LDFLAGS"
-+  LIBS="$LIBS $GTK_LIBS"
-   GTK_VERSION="$($PKG_CONFIG --modversion gtk+-2.0)"
-  ], [exit 1], [gthread])
- 
-@@ -164,9 +150,6 @@
- ALL_LINGUAS=$(echo po/*.po | sed -e 's|\.po||g' -e 's|po/||g')
- AM_GNU_GETTEXT_VERSION
- AM_GNU_GETTEXT
--CFLAGS="$CFLAGS -I../${srcdir}/intl"
--LIBS="$LIBS $LIBINTL"
--
- 
- AC_CONFIG_FILES([ intl/Makefile
-  Makefile
---- gliv-1.9.7.orig/src/Makefile.am
-+++ gliv-1.9.7/src/Makefile.am
-@@ -64,6 +64,9 @@
- gliv_LDADD =        -L../lib -lreplacements
- endif
- 
-+gliv_CFLAGS = @GTKGLEXT_CFLAGS@
-+gliv_LDADD  = @GTKGLEXT_LIBS@
-+
- AM_CPPFLAGS = -I$(srcdir)/include -D_REENTRANT -D_THREAD_SAFE \
-               -DSYSCONFDIR=\"$(sysconfdir)\"
- 
diff --git a/media-gfx/gliv/files/gliv-1.9.7-destdir.patch b/media-gfx/gliv/files/gliv-1.9.7-destdir.patch
deleted file mode 100644
index 827c6adb10d8..000000000000
--- a/media-gfx/gliv/files/gliv-1.9.7-destdir.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- gliv-1.9.7/Makefile.am.orig
-+++ gliv-1.9.7/Makefile.am
-@@ -31,9 +31,9 @@
- 	@echo
- 	@if desktop-file-install --help > /dev/null 2>&1; then              \
- 	 echo "Installing the GLiv desktop file with desktop-file-install"; \
--	 mkdir -p $(datadir)/{pixmaps,applications} || true;                \
--	 cp gliv.png $(datadir)/pixmaps/gliv.png || true;                   \
--	 desktop-file-install --vendor=gnome --dir=$(datadir)/applications  \
-+	 mkdir -p $(DESTDIR)$(datadir)/{pixmaps,applications} || true;                \
-+	 cp gliv.png $(DESTDIR)$(datadir)/pixmaps/gliv.png || true;                   \
-+	 desktop-file-install --vendor=gnome --dir=$(DESTDIR)$(datadir)/applications  \
-                                              gliv.desktop || true;          \
- 	else                                                                \
- 	 echo "No desktop-file-install(1), skipping gliv.desktop";          \
diff --git a/media-gfx/gliv/gliv-1.9.7.ebuild b/media-gfx/gliv/gliv-1.9.7.ebuild
deleted file mode 100644
index 9d1aac1ef1d3..000000000000
--- a/media-gfx/gliv/gliv-1.9.7.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils autotools
-
-DESCRIPTION="An image viewer that uses OpenGL"
-HOMEPAGE="http://guichaz.free.fr/gliv/"
-SRC_URI="http://guichaz.free.fr/gliv/files/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="nls"
-
-RDEPEND="
-	>=x11-libs/gtk+-2.6:2
-	virtual/opengl
-	>x11-libs/gtkglext-1.0.6
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	>=sys-devel/bison-1.875
-	nls? ( sys-devel/gettext )
-"
-
-src_prepare() {
-	# Fix build with gettext-0.19, bug #512624
-	# using gettextize no-interactive example from dev-util/bless package
-	if use nls; then
-		cp $(type -p gettextize) "${T}"/
-		sed -i -e 's:read dummy < /dev/tty::' "${T}/gettextize" || die
-		"${T}"/gettextize -f --no-changelog --intl > /dev/null
-	fi
-
-	epatch 	"${FILESDIR}"/${P}-as-needed.patch \
-		"${FILESDIR}/${P}-destdir.patch"
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_enable nls)
-}
diff --git a/media-gfx/gliv/metadata.xml b/media-gfx/gliv/metadata.xml
deleted file mode 100644
index 19bf1be2581e..000000000000
--- a/media-gfx/gliv/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>graphics@gentoo.org</email>
-	<name>Gentoo Graphics Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/media-gfx/gnome-photos/Manifest b/media-gfx/gnome-photos/Manifest
index b8c0b927d856..bc21f8771710 100644
--- a/media-gfx/gnome-photos/Manifest
+++ b/media-gfx/gnome-photos/Manifest
@@ -2,5 +2,5 @@ AUX 3.26.4-support-tracker1.patch 1094 BLAKE2B 224f4052fe379d79ca9fa02dc0d7e1919
 DIST gnome-photos-3.26.4.tar.xz 1101324 BLAKE2B 81e851bdeb39455cad6d4ba99194229507a809c3bd8c9ff0c24992cbbf90001d87f96d1c2b3c3a07101982e6ea169cba0e2249431138e962850f55fffc2c54ec SHA512 0a49b7eb29918ccf87af4211db6ffbb3c55ab40f4eaa1437317fda32de43b3b0c9033397d5b06fbc5012d0fa322a79dafdf46817cfaea57ef2f4df1a975fb489
 DIST gnome-photos-3.30.1.tar.xz 1118728 BLAKE2B b3de35fb9c2ae7b731cf76a7b02b689997e3cf063037c49a51dbdf8bb37d9217c9bd5380bc872b984eca4e53c5996eb6370f3acc82a90e56dabe9d47999d5578 SHA512 4fa386c3d93f2b15468601e56bfcbdcc83a9e78ed5c4d0a1e51e9adf4ba313bb69e07aae52404026546dd68584e355c5e5100fc12f95fe078ccf2d6160a0a24b
 EBUILD gnome-photos-3.26.4.ebuild 2060 BLAKE2B f5a8f491495c415fb3c0a3adae4e19f28f9c4fd1327cad0a197ac0612dcb6a8650d125db298977e641ef10264942a04968d3b722c97f406a6be86499641115ce SHA512 14d25f1d2f6e95de682c020eef13ab0d79b6246b5e4495a795021545dc49590b3c155ac33fc90bc3bb1add1aa5cac61294aea6080142698b9586cc83c0cbcf66
-EBUILD gnome-photos-3.30.1.ebuild 1951 BLAKE2B 0abd314d897dc1f6ab6fa76ba518e848550018ebd86ec80ac7d546959e3b7dfef3bf9adab9669b949cb6025e054922db032baa32e4f231721d7f990f4c7fcf57 SHA512 b7ed7697606e80043df70668ddd81e2591cffd0574ae8488a4e1ec92b210ceb689a5c12034353500b458c5f2f04cc5666c91bc32032d4f5dac6d7e6e51a43913
+EBUILD gnome-photos-3.30.1.ebuild 1949 BLAKE2B cc4d0e2567d89777bc47c560f189f195122d05aa9300dec9f72309f4e2059ecb0ad92d38986811f8518ad1136063c51ebaeee173d7cf6c4c407b265ccd5b0067 SHA512 33bff54c100442f3a1f8e439705629374c650aa34c0e3e54e05f59ec1dcc0daaf243a00243f649dbb0a3e14bc0ded6c81517a79ba8d62944cb712ff829628346
 MISC metadata.xml 992 BLAKE2B beda29ca65d25e5d68c014fbb70fb539cf17b55d64255d6d74305d710f3979b5156eda764d75992f057416f5eb96af899b988633dd8444fcf22c6a5f73fe9b9b SHA512 3c47be6c01072a0b4845dd42b6d3561d340eb703bd9cb5c727ec24b653ab76eee38e35ba63c4cd71b93514ab0cb8bd75663febeed1901cccedfd30f223e870df
diff --git a/media-gfx/gnome-photos/gnome-photos-3.30.1.ebuild b/media-gfx/gnome-photos/gnome-photos-3.30.1.ebuild
index 5a60791ae408..ece773240cf8 100644
--- a/media-gfx/gnome-photos/gnome-photos-3.30.1.ebuild
+++ b/media-gfx/gnome-photos/gnome-photos-3.30.1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Photos"
 
 LICENSE="GPL-3+ LGPL-2+ CC0-1.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="flickr test upnp-av"
 
 COMMON_DEPEND="
diff --git a/media-gfx/gnome-screenshot/Manifest b/media-gfx/gnome-screenshot/Manifest
index 04a5062ee9f6..6ae669702a36 100644
--- a/media-gfx/gnome-screenshot/Manifest
+++ b/media-gfx/gnome-screenshot/Manifest
@@ -1,5 +1,5 @@
 DIST gnome-screenshot-3.22.0.tar.xz 258888 BLAKE2B 48f997832a8e0f937283a2cfba8880dc9032ea7a3254b0f45dd1ffd3951d096f03899199497ca78fc9be22f83ae8c60bb4f72662a323dad3afc05d2229fd914c SHA512 a532e9cc8615ce22db5805c1857a3bad5bf69a3436a45574384c6c8f848ae67d6991dbfc5556e7cf08f630915c0666bba0c4bee9e4190340bbad57faa9af2ff9
 DIST gnome-screenshot-3.30.0.tar.xz 225244 BLAKE2B 69c75bb8e3d18578317343b549d4ad837b6e58420c6b49efbc01338697bc2251032d9158e658c9f4ae4e086a1c117eac818c18b6ed95d031c2b60c2ba62a56b6 SHA512 a42ff4f14bbb3a3feb438ee64f1dff3d3a792a6585fef92fde8546b9c3fc07013e8bd2ef42ddc880f2529cbc4241a50d441d4de2a4b26923036f1724aabafdba
 EBUILD gnome-screenshot-3.22.0.ebuild 1203 BLAKE2B dc1efcbc247c271b2d9b070d13f2e9bcacd9045d948cf0fb359904da7277dae7b7547d88d6f5b098611d576a60645339e3a43098eecfc744136e26bdb92e72da SHA512 bf9c4c8079ae8cf8716eadf646e013508e6363db4fdc5d35147d17561c28f9244fe32133572a01df712c675076add6cd35c7783b58749bbeed4043d91e31408d
-EBUILD gnome-screenshot-3.30.0.ebuild 1241 BLAKE2B 7fa3570a4e43f428010042396552b247780a284d6e03551c0d6cac369c86469fd9f26e11d37a689d363de97bbb2fe4746aa10e4cdc7da9062827fcdca86ac59a SHA512 2a092210cff2550c175a1429e6ddf08ba2539f742ecc97891622acbed7b152db780e23f508d4e72da51e51f58457d24542dbcf40ccf647f87c15e1418b92d736
+EBUILD gnome-screenshot-3.30.0.ebuild 1239 BLAKE2B a5c9c78fdc5bc13f32dafee5bb2a8f62a52865c9eda3eb2f0de34548b32a0a88836b36e481b0b8b3fa94c23abcbe2e0d2add7f529d91e8cc098866ecfeed01c4 SHA512 3d0e8916c5c447cab2b5bb78c2dfae89aa01dfddafe5f02c5b0d52128c209948e7e84479a73dedfab62f42ca1ac2f2510044a0ec790ab6ec20ee5b77b4393912
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/media-gfx/gnome-screenshot/gnome-screenshot-3.30.0.ebuild b/media-gfx/gnome-screenshot/gnome-screenshot-3.30.0.ebuild
index b3a90dc58263..065ab6f6f7b0 100644
--- a/media-gfx/gnome-screenshot/gnome-screenshot-3.30.0.ebuild
+++ b/media-gfx/gnome-screenshot/gnome-screenshot-3.30.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-screenshot"
 LICENSE="GPL-2+"
 SLOT="0"
 IUSE=""
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 
 # libcanberra 0.26-r2 is needed for gtk+:3 fixes
 COMMON_DEPEND="
diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index 6d81f83319a9..595496185fcd 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -1,8 +1,12 @@
 AUX policy-hardening.snippet 442 BLAKE2B d79fdbddab418fc9d8391e78992e3dda844e096052115113ff6f759c1a54541bcd7d7793547bc7140776659c98379a9e9f004aa46f757300a33f445d396fbf14 SHA512 e9e723c40d5b8c52bbc2f2b9a3ad7c7e2aee493bc37b6c3940e8486b92a1c6659e47b1e12ee2fb11c8a8b6ee48a7fc10354617ae12c36181a58e9e73b239368d
 AUX policy.test.xml 746 BLAKE2B 6bfa073606469b81cf517d9b069e48794cbda9272d12c3abb8ae3456aaf30cd1923510baddb7d813aa8ccde84e161de0b29314cef7b1a37730c7ad5236d1f5dc SHA512 22f66004324e3777393446a3df738ecd2aa405df088d39137008514cd86b436765b48ccd4355d670a42061ce4e5a7b2fd8e4be5852cd914f62ff0250a4a7ae57
 DIST ImageMagick-6.9.10-42.tar.xz 8944092 BLAKE2B c616030d5624cc67879f698c52a906dede56db5f594cd1efef67ae7a7ce555f385b60b442e87904e3cb9f95840448e2a58d5121bd8e408812a3099864be880f0 SHA512 49ca335a7f0f83fb925995fa4249790cbb93142a0a30387f4d6c6ee9278599801da8b8644f3828afff8be841f55b64e31fda3bb4c6eea2c540bb94be4c926cb6
+DIST ImageMagick-6.9.10-45.tar.xz 8936232 BLAKE2B 7fb58bb55765efb0d0789334d91b11d95f62b49bef9810e5188291d20bb6fdce0c4e9d9bb9857a76ed3c23ec2c9747d366d1ace696687a7d95fd1ee838f6defb SHA512 a45f9d9d1080b7771b4ccecd4e36dce042e82d3bf18fe0b0d1d4dd82f25ce0a175f0ec6ec31a26f516c6517f2b76aac68a1b4a5471fa4af3d58e1c5f1193031a
 DIST ImageMagick-7.0.8-42.tar.xz 9455976 BLAKE2B c3cc7353da73fea92c51febad8816c333970b91069ee54756acf7f1b9f57481fceec066dcb21845b2ebf1a9a97b17b9f8b6859d1becdbfc9553bfa148b5c0433 SHA512 88f57b69ece3b93b0af41e85bacb0b232cf07e7d0aab34e1479ce6c5fe29b1cfcdcd8bc6b2b87773c2109122614a0f64847629029470d945409b08b19032d936
+DIST ImageMagick-7.0.8-45.tar.xz 9450936 BLAKE2B 6fa1260d98249ebf370bba0cd8352a6acb3b9e27df779881a77ca9701b804e513f6f6e4f8d008c2b86e3b9823d86d1de06c85cbed99c06f20aa50b261745458b SHA512 a54068d68b97adb4ffc3920f93a44166e1ce8c6a79304c60c20f020852e31502810d2f8cede4043ec3870febc3b7aebf2c06c06401813ce054a6b67cc343f1d2
 EBUILD imagemagick-6.9.10.42.ebuild 6883 BLAKE2B 1f0a8acce9f7c79171822ba87d131aa0457f1d9afa6621a29972b77958f9abc6150b8ce756065e9e51b2c399c78115393ab04c56b35074c2ff42cddb00f95c15 SHA512 b96f189b6b59ce49628ddc311fef7a7c21c8e81aa268b4958a71b832ecc329c6ce0ffd858f9b0d036c3f5d3de43926d2d2486c0313177362278b999b2ea91fa8
+EBUILD imagemagick-6.9.10.45.ebuild 6892 BLAKE2B 9a7579489c9e2ccd38b3ae9f91393680f13ebe29745ee90fef5e8a72059a731da47a8d8f0394621baf2261d9e848166783738c3fd881372630ce8bb82fd67de8 SHA512 83f54f846c25d858c8a093f5058b764690c1b15d69c09519ee492f0ec4d13555c191991f241fe75a5438fd421d6bc036b655d8d0febfba575897db979cd157bf
 EBUILD imagemagick-7.0.8.42.ebuild 7150 BLAKE2B 52a9342ec82c516f5bc3339c4f41f016448950bc7dd486babdc57d1a62ecc005dd0937073ebad7a4e170f050c11ed7ca4dca9ce39cd18d6498807259eeea643b SHA512 e9f3ab662260bc535d27a6d7166a52d8e29bd999923fa6995b2ffd3b5161de41e62d9e3774bfbdded2bc447b8c0087ed597a0c6a0a79954e06478d3113418a1f
+EBUILD imagemagick-7.0.8.45.ebuild 7160 BLAKE2B 276ed8dc19455db44ec6a14244f07070e5b9a8a6158e0d06ef2ab0ab4541e607244c216a7ffbaefcf166439edf4a00aab2a5f826a4fc917dade1f710f47b66cb SHA512 5c6f6ce5a3801c56b550c78f8ca5a1a2f812ea39db7fcd9eb65fa6e9130d3035102eef379e9fe5617ec62910ebff039fde9ce9f02eac96a62431d18b5b954245
 EBUILD imagemagick-9999.ebuild 7160 BLAKE2B 2435e94755e6e1a9d6ee4cab669b8564daaa06e7c75024463cf5df4f851f695afd2afdfb84930ff8886ceef6bed578365d7489d7febd877064621c4dd541f74b SHA512 c65b9cb286317eafefb96c63984f25850c835a81eb04fe452d8bd22bacded153c460716c06a2f924b7595925ecbb417ea809d737aa291bc174c125d97dc7cbba
 MISC metadata.xml 1015 BLAKE2B 3fbe479f30575b11fa9e78de7bb00c231370aa4b2ca3b0e16924710189013ab91199db8c8cb7cff4611a2924c7fa01e4a43bfd9f7f61cfe45a4de3a254d4c8e2 SHA512 bf1479f91de5f8248c4a86d98017a332ab3d5eb153bb896ca1a39fce2fbff4e8248df92025987f6bfaf7e0d36677c167177c9c21969f1f0b8c2e0a53197efece
diff --git a/media-gfx/imagemagick/imagemagick-6.9.10.45.ebuild b/media-gfx/imagemagick/imagemagick-6.9.10.45.ebuild
new file mode 100644
index 000000000000..b09291336ccb
--- /dev/null
+++ b/media-gfx/imagemagick/imagemagick-6.9.10.45.ebuild
@@ -0,0 +1,248 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit eapi7-ver eutils flag-o-matic libtool perl-functions toolchain-funcs multilib
+
+MY_PV="$(ver_rs 3 '-')"
+MY_P="ImageMagick-${MY_PV}"
+
+DESCRIPTION="A collection of tools and libraries for many image formats"
+HOMEPAGE="https://www.imagemagick.org/"
+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"
+IUSE="bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri heif 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 )"
+
+RDEPEND="
+	dev-libs/libltdl:0
+	bzip2? ( app-arch/bzip2 )
+	corefonts? ( media-fonts/corefonts )
+	djvu? ( app-text/djvu )
+	fftw? ( sci-libs/fftw:3.0 )
+	fontconfig? ( media-libs/fontconfig )
+	fpx? ( >=media-libs/libfpx-1.3.0-r1 )
+	graphviz? ( media-gfx/graphviz )
+	heif? ( media-libs/libheif:= )
+	jbig? ( >=media-libs/jbigkit-2:= )
+	jpeg? ( virtual/jpeg:0 )
+	jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
+	lcms? ( media-libs/lcms:2= )
+	lqr? ( media-libs/liblqr )
+	opencl? ( virtual/opencl )
+	openexr? ( media-libs/openexr:0= )
+	pango? ( x11-libs/pango )
+	perl? ( >=dev-lang/perl-5.8.8:0= )
+	png? ( media-libs/libpng:0= )
+	postscript? ( app-text/ghostscript-gpl )
+	raw? ( media-libs/libraw:= )
+	svg? ( gnome-base/librsvg )
+	tiff? ( media-libs/tiff:0= )
+	truetype? (
+		media-fonts/urw-fonts
+		>=media-libs/freetype-2
+		)
+	webp? ( media-libs/libwebp:0= )
+	wmf? ( media-libs/libwmf )
+	X? (
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libXext
+		x11-libs/libXt
+		)
+	xml? ( dev-libs/libxml2:= )
+	lzma? ( app-arch/xz-utils )
+	zlib? ( sys-libs/zlib:= )"
+DEPEND="${RDEPEND}
+	!media-gfx/graphicsmagick[imagemagick]
+	virtual/pkgconfig
+	X? ( x11-base/xorg-proto )"
+
+REQUIRED_USE="corefonts? ( truetype )
+	test? ( corefonts )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+
+	# Apply hardening #664236
+	cp "${FILESDIR}"/policy-hardening.snippet "${S}" || die
+	sed -i -e '/^<policymap>$/ {
+			r policy-hardening.snippet
+			d
+		}' \
+		config/policy.xml || \
+		die "Failed to apply hardening of policy.xml"
+	einfo "policy.xml hardened"
+
+	elibtoolize # for Darwin modules
+
+	# For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
+	local mesa_cards ati_cards nvidia_cards render_cards
+	shopt -s nullglob
+	ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
+	if test -n "${ati_cards}"; then
+		addpredict "${ati_cards}"
+	fi
+	mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
+	if test -n "${mesa_cards}"; then
+		addpredict "${mesa_cards}"
+	fi
+	nvidia_cards=$(echo -n /dev/nvidia** | sed 's/ /:/g')
+	if test -n "${nvidia_cards}"; then
+		addpredict "${nvidia_cards}"
+	fi
+	render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
+	if test -n "${render_cards}"; then
+		addpredict "${render_cards}"
+	fi
+	shopt -u nullglob
+	addpredict /dev/nvidiactl
+}
+
+src_configure() {
+	local depth=16
+	use q8 && depth=8
+	use q32 && depth=32
+
+	local openmp=disable
+	use openmp && { tc-has-openmp && openmp=enable; }
+
+	use perl && perl_check_env
+
+	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
+
+	local myeconfargs=(
+		$(use_enable static-libs static)
+		$(use_enable hdri)
+		$(use_enable opencl)
+		--with-threads
+		--with-modules
+		--with-quantum-depth=${depth}
+		$(use_with cxx magick-plus-plus)
+		$(use_with perl)
+		--with-perl-options='INSTALLDIRS=vendor'
+		--with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
+		$(use_with bzip2 bzlib)
+		$(use_with X x)
+		$(use_with zlib)
+		--without-autotrace
+		$(use_with postscript dps)
+		$(use_with djvu)
+		--with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu
+		$(use_with fftw)
+		$(use_with fpx)
+		$(use_with fontconfig)
+		$(use_with truetype freetype)
+		$(use_with postscript gslib)
+		$(use_with graphviz gvc)
+		$(use_with heif heic)
+		$(use_with jbig)
+		$(use_with jpeg)
+		$(use_with jpeg2k openjp2)
+		$(use_with lcms)
+		$(use_with lqr)
+		$(use_with lzma)
+		$(use_with openexr)
+		$(use_with pango)
+		$(use_with png)
+		$(use_with raw)
+		$(use_with svg rsvg)
+		$(use_with tiff)
+		$(use_with webp)
+		$(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts)
+		$(use_with wmf)
+		$(use_with xml)
+		--${openmp}-openmp
+		--with-gcc-arch=no-automagic
+	)
+	CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	# Install default (unrestricted) policy in $HOME for test suite #664238
+	local _im_local_config_home="${HOME}/.config/ImageMagick"
+	mkdir -p "${_im_local_config_home}" || \
+		die "Failed to create IM config dir in '${_im_local_config_home}'"
+	cp "${FILESDIR}"/policy.test.xml "${_im_local_config_home}/policy.xml" || \
+		die "Failed to install default blank policy.xml in '${_im_local_config_home}'"
+
+	local im_command= IM_COMMANDS=()
+	IM_COMMANDS+=( "identify -version | grep -q -- \"${MY_PV}\"" ) # Verify that we are using version we just built
+	IM_COMMANDS+=( "identify -list policy" ) # Verify that policy.xml is used
+	IM_COMMANDS+=( "emake check" ) # Run tests
+
+	for im_command in "${IM_COMMANDS[@]}"; do
+		eval "${S}"/magick.sh \
+			${im_command} || \
+			die "Failed to run \"${im_command}\""
+	done
+}
+
+src_install() {
+	# Ensure documentation installation files and paths with each release!
+	emake \
+		DESTDIR="${D}" \
+		DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
+		install
+
+	rm -f "${ED%/}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
+	dodoc {AUTHORS,README}.txt ChangeLog
+
+	if use perl; then
+		find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
+		find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
+	fi
+
+	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
+
+	if use opencl; then
+		cat <<-EOF > "${T}"/99${PN}
+		SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/renderD128"
+		EOF
+
+		insinto /etc/sandbox.d
+		doins "${T}"/99${PN} #472766
+	fi
+
+	insinto /usr/share/${PN}
+	doins config/*icm
+}
+
+pkg_postinst() {
+	local _show_policy_xml_notice=
+
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		# This is a new installation
+		_show_policy_xml_notice=yes
+	else
+		local v
+		for v in ${REPLACING_VERSIONS}; do
+			if ! ver_test "${v}" -gt "6.9.10.10-r2"; then
+				# This is an upgrade
+				_show_policy_xml_notice=yes
+
+				# Show this elog only once
+				break
+			fi
+		done
+	fi
+
+	if [[ -n "${_show_policy_xml_notice}" ]]; then
+		elog "For security reasons, a policy.xml file was installed in /etc/ImageMagick-6"
+		elog "which will prevent the usage of the following coders by default:"
+		elog ""
+		elog "  - PS"
+		elog "  - PS2"
+		elog "  - PS3"
+		elog "  - EPS"
+		elog "  - PDF"
+		elog "  - XPS"
+	fi
+}
diff --git a/media-gfx/imagemagick/imagemagick-7.0.8.45.ebuild b/media-gfx/imagemagick/imagemagick-7.0.8.45.ebuild
new file mode 100644
index 000000000000..69c412db11b7
--- /dev/null
+++ b/media-gfx/imagemagick/imagemagick-7.0.8.45.ebuild
@@ -0,0 +1,256 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit eapi7-ver eutils flag-o-matic libtool perl-functions toolchain-funcs multilib
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/ImageMagick/ImageMagick.git"
+	inherit git-r3
+	MY_P="imagemagick-9999"
+else
+	MY_PV="$(ver_rs 3 '-')"
+	MY_P="ImageMagick-${MY_PV}"
+	SRC_URI="mirror://${PN}/${MY_P}.tar.xz"
+	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"
+fi
+
+DESCRIPTION="A collection of tools and libraries for many image formats"
+HOMEPAGE="https://www.imagemagick.org/"
+
+LICENSE="imagemagick"
+SLOT="0/${PV}"
+IUSE="bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri heif 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"
+
+RDEPEND="
+	dev-libs/libltdl:0
+	bzip2? ( app-arch/bzip2 )
+	corefonts? ( media-fonts/corefonts )
+	djvu? ( app-text/djvu )
+	fftw? ( sci-libs/fftw:3.0 )
+	fontconfig? ( media-libs/fontconfig )
+	fpx? ( >=media-libs/libfpx-1.3.0-r1 )
+	graphviz? ( media-gfx/graphviz )
+	heif? ( media-libs/libheif:= )
+	jbig? ( >=media-libs/jbigkit-2:= )
+	jpeg? ( virtual/jpeg:0 )
+	jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
+	lcms? ( media-libs/lcms:2= )
+	lqr? ( media-libs/liblqr )
+	opencl? ( virtual/opencl )
+	openexr? ( media-libs/openexr:0= )
+	pango? ( x11-libs/pango )
+	perl? ( >=dev-lang/perl-5.8.8:0= )
+	png? ( media-libs/libpng:0= )
+	postscript? ( app-text/ghostscript-gpl )
+	raw? ( media-libs/libraw:= )
+	svg? ( gnome-base/librsvg )
+	tiff? ( media-libs/tiff:0= )
+	truetype? (
+		media-fonts/urw-fonts
+		>=media-libs/freetype-2
+		)
+	webp? ( media-libs/libwebp:0= )
+	wmf? ( media-libs/libwmf )
+	X? (
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libXext
+		x11-libs/libXt
+		)
+	xml? ( dev-libs/libxml2:= )
+	lzma? ( app-arch/xz-utils )
+	zlib? ( sys-libs/zlib:= )"
+DEPEND="${RDEPEND}
+	!media-gfx/graphicsmagick[imagemagick]
+	virtual/pkgconfig
+	X? ( x11-base/xorg-proto )"
+
+REQUIRED_USE="corefonts? ( truetype )
+	test? ( corefonts )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+
+	# Apply hardening #664236
+	cp "${FILESDIR}"/policy-hardening.snippet "${S}" || die
+	sed -i -e '/^<policymap>$/ {
+			r policy-hardening.snippet
+			d
+		}' \
+		config/policy.xml || \
+		die "Failed to apply hardening of policy.xml"
+	einfo "policy.xml hardened"
+
+	elibtoolize # for Darwin modules
+
+	# For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
+	local ati_cards mesa_cards nvidia_cards render_cards
+	shopt -s nullglob
+	ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
+	if test -n "${ati_cards}"; then
+		addpredict "${ati_cards}"
+	fi
+	mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
+	if test -n "${mesa_cards}"; then
+		addpredict "${mesa_cards}"
+	fi
+	nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g')
+	if test -n "${nvidia_cards}"; then
+		addpredict "${nvidia_cards}"
+	fi
+	render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
+	if test -n "${render_cards}"; then
+		addpredict "${render_cards}"
+	fi
+	shopt -u nullglob
+	addpredict /dev/nvidiactl
+}
+
+src_configure() {
+	local depth=16
+	use q8 && depth=8
+	use q32 && depth=32
+
+	local openmp=disable
+	use openmp && { tc-has-openmp && openmp=enable; }
+
+	use perl && perl_check_env
+
+	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
+
+	local myeconfargs=(
+		$(use_enable static-libs static)
+		$(use_enable hdri)
+		$(use_enable opencl)
+		--with-threads
+		--with-modules
+		--with-quantum-depth=${depth}
+		$(use_with cxx magick-plus-plus)
+		$(use_with perl)
+		--with-perl-options='INSTALLDIRS=vendor'
+		--with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
+		$(use_with bzip2 bzlib)
+		$(use_with X x)
+		$(use_with zlib)
+		--without-autotrace
+		$(use_with postscript dps)
+		$(use_with djvu)
+		--with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu
+		$(use_with fftw)
+		$(use_with fpx)
+		$(use_with fontconfig)
+		$(use_with truetype freetype)
+		$(use_with postscript gslib)
+		$(use_with graphviz gvc)
+		$(use_with heif heic)
+		$(use_with jbig)
+		$(use_with jpeg)
+		$(use_with jpeg2k openjp2)
+		$(use_with lcms)
+		$(use_with lqr)
+		$(use_with lzma)
+		$(use_with openexr)
+		$(use_with pango)
+		$(use_with png)
+		$(use_with raw)
+		$(use_with svg rsvg)
+		$(use_with tiff)
+		$(use_with webp)
+		$(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts)
+		$(use_with wmf)
+		$(use_with xml)
+		--${openmp}-openmp
+		--with-gcc-arch=no-automagic
+	)
+	CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	# Install default (unrestricted) policy in $HOME for test suite #664238
+	local _im_local_config_home="${HOME}/.config/ImageMagick"
+	mkdir -p "${_im_local_config_home}" || \
+		die "Failed to create IM config dir in '${_im_local_config_home}'"
+	cp "${FILESDIR}"/policy.test.xml "${_im_local_config_home}/policy.xml" || \
+		die "Failed to install default blank policy.xml in '${_im_local_config_home}'"
+
+	local im_command= IM_COMMANDS=()
+	if [[ ${PV} == "9999" ]] ; then
+		IM_COMMANDS+=( "magick -version" ) # Show version we are using -- cannot verify because of live ebuild
+	else
+		IM_COMMANDS+=( "magick -version | grep -q -- \"${MY_PV}\"" ) # Verify that we are using version we just built
+	fi
+	IM_COMMANDS+=( "magick -list policy" ) # Verify that policy.xml is used
+	IM_COMMANDS+=( "emake check" ) # Run tests
+
+	for im_command in "${IM_COMMANDS[@]}"; do
+		eval "${S}"/magick.sh \
+			${im_command} || \
+			die "Failed to run \"${im_command}\""
+	done
+}
+
+src_install() {
+	# Ensure documentation installation files and paths with each release!
+	emake \
+		DESTDIR="${D}" \
+		DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
+		install
+
+	rm -f "${ED%/}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
+	dodoc {AUTHORS,README}.txt ChangeLog
+
+	if use perl; then
+		find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
+		find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
+	fi
+
+	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
+
+	if use opencl; then
+		cat <<-EOF > "${T}"/99${PN}
+		SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/renderD128"
+		EOF
+
+		insinto /etc/sandbox.d
+		doins "${T}"/99${PN} #472766
+	fi
+
+	insinto /usr/share/${PN}
+	doins config/*icm
+}
+
+pkg_postinst() {
+	local _show_policy_xml_notice=
+
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		# This is a new installation
+		_show_policy_xml_notice=yes
+	else
+		local v
+		for v in ${REPLACING_VERSIONS}; do
+			if ! ver_test "${v}" -gt "7.0.8.10-r2"; then
+				# This is an upgrade
+				_show_policy_xml_notice=yes
+
+				# Show this elog only once
+				break
+			fi
+		done
+	fi
+
+	if [[ -n "${_show_policy_xml_notice}" ]]; then
+		elog "For security reasons, a policy.xml file was installed in /etc/ImageMagick-7"
+		elog "which will prevent the usage of the following coders by default:"
+		elog ""
+		elog "  - PS"
+		elog "  - PS2"
+		elog "  - PS3"
+		elog "  - EPS"
+		elog "  - PDF"
+		elog "  - XPS"
+	fi
+}
diff --git a/media-gfx/kxstitch/Manifest b/media-gfx/kxstitch/Manifest
index 043f296a202f..02f526947b63 100644
--- a/media-gfx/kxstitch/Manifest
+++ b/media-gfx/kxstitch/Manifest
@@ -1,4 +1,5 @@
+AUX kxstitch-2.1.1-imagemagick-fix.patch 4051 BLAKE2B f7f19ec8e5168fd421e08b4b19a3ab51964d5747d129b65f4e6eb1436dbc5638c4d7077f7fcf044e5e2ae89a09324b82be89de26e864f34c605d7382ebe64cbd SHA512 f13c4bacde6973aafc186d9576bd04e49574ffe8d42bc475017c1f2f353d39debebd8a81671e86ef67863306269339ae1542289f222874bd03a06a22c785090b
 AUX kxstitch-2.1.1-qt-5.11.patch 992 BLAKE2B f0be157270ddd27e1f997f57afbb8e3d80c31816334664a7a2804c4c9971a81c11ecd775820b7fe0db36dff7ea00d046c7f005a0bf715e9336f4f238a36c2b18 SHA512 93d6a5ddc2fa928369b09637ee6b856ba60d35d02e5e93f16fc08c4fdbc2ebead44224d2ad98fa2ffe6efcea8b93a0211eb00ad83c9cd91b8ddc30edff17602e
 DIST kxstitch-2.1.1.tar.xz 1726364 BLAKE2B 47257408f31ca7db4bddf984150baac6cd850206cedb95c73b0d62ee9f966028afd97bb3653b385104a1c679512c35f41aa25c5b703c715e565d48cfda59da36 SHA512 d5a6b6d06bfb894dd7404cb81350389f1ebf5c8a463eb792358abd67f362d1e1f578d06319461a006625864f1c4a69ebb4ccd0db422870c3eae0516c9132a3b3
-EBUILD kxstitch-2.1.1-r1.ebuild 964 BLAKE2B 19695be54baf8f3a0f8d21eb48f02f13d9513672d89d7c3d0f22ca8d51356bf52360424fdb2b097d0f22890103b56e95a9afaedb6d98688384dd94c5f164b952 SHA512 6d962753cad9e1fec89043d9039e14996bc161d343447a8d674a1defceb1d4eaeec55e47f463b7685390282da01525cdaad0610ccabba1eb393e15a6f1160dd7
+EBUILD kxstitch-2.1.1-r2.ebuild 1007 BLAKE2B 1a4af1f260e79a82893e1d3b34feed8c6f1e603d52ac9de54492792f07d1b330504db0f0742bc653545a3e73cd48c44da5d6a57da453526af28ede84d898949e SHA512 9250c6dec14536960ed0b365dfae6d857353901a6ad48ad6e173af3c23e6f80f6be7129e94385f26d335f927c14f2e0bcf44decd1e9e2bd89c9e8fcdad0ab42c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/media-gfx/kxstitch/files/kxstitch-2.1.1-imagemagick-fix.patch b/media-gfx/kxstitch/files/kxstitch-2.1.1-imagemagick-fix.patch
new file mode 100644
index 000000000000..bf8c5e14096b
--- /dev/null
+++ b/media-gfx/kxstitch/files/kxstitch-2.1.1-imagemagick-fix.patch
@@ -0,0 +1,99 @@
+From 75a129d3c2f21914a47b970df822e485aca625ac Mon Sep 17 00:00:00 2001
+From: Steve Allewell <steve.allewell@gmail.com>
+Date: Sun, 11 Nov 2018 15:48:50 +0000
+Subject: Fix for importing images for V6 of ImageMagick
+
+The getPixelColor in V6 of ImageMagick does not appear to return the
+same information as in V7, consequently importing images has resulted in
+a black image when using V6 of ImageMagick.  This fix reverts the change
+made in commit 295773f44bfda1227d85edf065a8de14dc889159 when using V6.
+
+Big thanks to Sean Enck for reporting and helping diagnose the problem.
+---
+ src/ImportImageDlg.cpp | 16 ++++++++++++++++
+ src/MainWindow.cpp     | 17 +++++++++++++++++
+ 2 files changed, 33 insertions(+)
+
+diff --git a/src/ImportImageDlg.cpp b/src/ImportImageDlg.cpp
+index e6396c6..340ff1d 100644
+--- a/src/ImportImageDlg.cpp
++++ b/src/ImportImageDlg.cpp
+@@ -391,9 +391,21 @@ void ImportImageDlg::renderPixmap()
+     QProgressDialog progress(i18n("Rendering preview"), i18n("Cancel"), 0, pixelCount, this);
+     progress.setWindowModality(Qt::WindowModal);
+ 
++/*
++ * ImageMagick prior to V7 used matte (opacity) to determine if an image has transparency.
++ * 0.0 for transparent to 1.0 for opaque
++ * 
++ * ImageMagick V7 now uses alpha (transparency).
++ * 1.0 for transparent to 0.0 for opaque
++ * 
++ * Access to pixels has changed too, V7 can use pixelColor to access the color of a particular
++ * pixel, but although this was available in V6, it doesn't appear to produce the same result
++ * and has resulted in black images when importing.
++ */
+ #if MagickLibVersion < 0x700
+     bool hasTransparency = m_convertedImage.matte();
+     double transparent = 1.0;
++    const Magick::PixelPacket *pixels = m_convertedImage.getConstPixels(0, 0, width, height);
+ #else
+     bool hasTransparency = m_convertedImage.alpha();
+     double transparent = 0.0;
+@@ -408,7 +420,11 @@ void ImportImageDlg::renderPixmap()
+         }
+ 
+         for (int dx = 0 ; dx < width ; dx++) {
++#if MagickLibVersion < 0x700
++            Magick::ColorRGB rgb = Magick::Color(*pixels++);
++#else
+             Magick::ColorRGB rgb = m_convertedImage.pixelColor(dx, dy);
++#endif
+ 
+             if (hasTransparency && (rgb.alpha() == transparent)) {
+                 //ignore this pixel as it is transparent
+diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp
+index 1f12f5b..ecf552a 100644
+--- a/src/MainWindow.cpp
++++ b/src/MainWindow.cpp
+@@ -541,13 +541,26 @@ void MainWindow::convertImage(const QString &source)
+ 
+         bool useFractionals = importImageDlg->useFractionals();
+ 
++/*
++ * ImageMagick prior to V7 used matte (opacity) to determine if an image has transparency.
++ * 0.0 for transparent to 1.0 for opaque
++ * 
++ * ImageMagick V7 now uses alpha (transparency).
++ * 1.0 for transparent to 0.0 for opaque
++ * 
++ * Access to pixels has changed too, V7 can use pixelColor to access the color of a particular
++ * pixel, but although this was available in V6, it doesn't appear to produce the same result
++ * and has resulted in black images when importing.
++ */
+ #if MagickLibVersion < 0x700
+         bool hasTransparency = convertedImage.matte();
+         double transparent = 1.0;
++        const Magick::PixelPacket *pixels = convertedImage.getConstPixels(0, 0, imageWidth, imageHeight);
+ #else
+         bool hasTransparency = convertedImage.alpha();
+         double transparent = 0.0;
+ #endif
++        
+         bool ignoreColor = importImageDlg->ignoreColor();
+         Magick::Color ignoreColorValue = importImageDlg->ignoreColorValue();
+ 
+@@ -579,7 +592,11 @@ void MainWindow::convertImage(const QString &source)
+             }
+ 
+             for (int dx = 0 ; dx < imageWidth ; dx++) {
++#if MagickLibVersion < 0x700
++                Magick::ColorRGB rgb = Magick::Color(*pixels++); // is this a memory leak
++#else
+                 Magick::ColorRGB rgb = convertedImage.pixelColor(dx, dy);
++#endif
+                 
+                 if (hasTransparency && (rgb.alpha() == transparent)) {
+                     // ignore this pixel as it is transparent
+-- 
+cgit v1.1
diff --git a/media-gfx/kxstitch/kxstitch-2.1.1-r1.ebuild b/media-gfx/kxstitch/kxstitch-2.1.1-r2.ebuild
index bf995e2e238c..232c67d1a141 100644
--- a/media-gfx/kxstitch/kxstitch-2.1.1-r1.ebuild
+++ b/media-gfx/kxstitch/kxstitch-2.1.1-r2.ebuild
@@ -40,4 +40,7 @@ RDEPEND="${DEPEND}
 	!media-gfx/kxstitch:4
 "
 
-PATCHES=( "${FILESDIR}/${P}-qt-5.11.patch" )
+PATCHES=(
+	"${FILESDIR}/${P}-qt-5.11.patch"
+	"${FILESDIR}/${P}-imagemagick-fix.patch"
+)
diff --git a/media-gfx/mypaint-brushes/Manifest b/media-gfx/mypaint-brushes/Manifest
index 091a009967f1..22498c4bbb41 100644
--- a/media-gfx/mypaint-brushes/Manifest
+++ b/media-gfx/mypaint-brushes/Manifest
@@ -1,3 +1,3 @@
 DIST mypaint-brushes-1.3.0.tar.gz 2447093 BLAKE2B 26fc22ef7669f5d88b1cb2bbc4562baffe257c112baf4a782f5045becd17a0bea577f79f290ae51b38cb3030478ea9d2e251033cc95101caacc823d139fe4ce1 SHA512 f8e0050cd700358d75cd25e40acd73905e2a53f21c6177cf67e8012aa4fbba8dc445109f07601c3846f95532a40feff4441081c0aa4e958049fc0ed8008fb414
-EBUILD mypaint-brushes-1.3.0-r1.ebuild 524 BLAKE2B 045c7f500357e223f3501940732fc0971f04147e6eedd3bab3973b9ce56774cf6fbe4451377ff74beb1598186ca1adf0537f0d9576cd628cb8f341a0f5ceb0a5 SHA512 dabb86ddf090db1373465d88735e5b8474cecbf5248805defd14fd80222203680b6b9c1164d515e48c7072135e0ac6d05b5544015bdd299f792dfe1c10cfb623
+EBUILD mypaint-brushes-1.3.0-r1.ebuild 523 BLAKE2B df17567c715af5a9cf4ba9f0f65d69e72074c30648f9805cd8e39936c7c0d04c9b21928dfaf322dd843aa1cd64fc60700717c157f702ce88cdbcffbf94904d00 SHA512 18ccf11a117e293494ca85c261d173b6d495881d47992e2b529388a6a5e9d981d433e19b21a376fa82b343c664b023b7f7566145b3674205cc2facaa2f0fa24c
 MISC metadata.xml 216 BLAKE2B a7f17874d9514cafd0bbab739d143a00ac66ad8446bce8e05932d122c1631d29ad8077c2bcda021bc92b7e89b77c03d55e8997cf250f3bb55f8a1aca046bb2a7 SHA512 1de1c9f4b223876125a0321126f2d7b1b564a113d24ae86b380c4d67bdf58ed4f2ae1a1f5d686211ccf4851eea8e970c20109977abbc79d0cd855164b6474e23
diff --git a/media-gfx/mypaint-brushes/mypaint-brushes-1.3.0-r1.ebuild b/media-gfx/mypaint-brushes/mypaint-brushes-1.3.0-r1.ebuild
index a54ba289fde0..3a39bb582fd6 100644
--- a/media-gfx/mypaint-brushes/mypaint-brushes-1.3.0-r1.ebuild
+++ b/media-gfx/mypaint-brushes/mypaint-brushes-1.3.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/Jehan/mypaint-brushes/archive/v1.3.0.tar.gz -> ${P}.
 
 LICENSE="CC0-1.0"
 SLOT="1.0"  # due to pkgconfig name "mypaint-brushes-1.0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DOCS=( AUTHORS NEWS README.md )  # to exclude README symlink
diff --git a/media-gfx/openscad/Manifest b/media-gfx/openscad/Manifest
index 90199d16e73a..fb31d71d4905 100644
--- a/media-gfx/openscad/Manifest
+++ b/media-gfx/openscad/Manifest
@@ -1,6 +1,7 @@
 AUX 50openscad-gentoo.el 167 BLAKE2B 36292439057e2b9a5993c73cf5d46e5b6b0b56695f46307114fcfffa79990be0b0622ec3a6918726d4a5f7e4343525b9e67f785996ec4eb7abb938b6df1cb2f7 SHA512 ce669eba45ab90e9dbcd770a7470ca9ed7088b1acabbc876fe4d31dc7a6edd36076063e4bd417d348c3e073113e3ad2bc2dd0ac89e02d3d8aeca7627ad7d2a1e
 AUX openscad-2015.03_p2_uic_tr_fix.patch 345 BLAKE2B 46f19ba25f9a19b2b6841493877d14a0c6c3c8dcf7d8e5ec65d4d0d8fc5c79b15467b71dd29bfeb38decd4f100d06e9fe185c1670f336672998ef02e9e59794c SHA512 9f4bd1deb85a52e1ab8fd35b384552f902b03d1f06b58144013e722d906604b96c17abf4e4074042487c945419c51432e639120ddecda143a6cb9a2b902548e2
+AUX openscad-2015.03_p3_fix-boost-1.70.0-build.patch 697 BLAKE2B 093b04177e9222e6b41cae806bd8feedf1135ffe26f966f291accb1f72e1683cab4b7339827c8720873e6d45475faabb680a3e5b40dee9e4d03f356cc49888b7 SHA512 4640dac7ee1c8dc8078c33141c08948ec45144275db84c07a079d624210516ed4795d7ff0cbea4842aac9342e07fa0ec6ad938d0fd637a2f1bee2e1055e6baf4
 DIST openscad-2015.03-3.src.tar.gz 13309147 BLAKE2B 77f4e934474882e454dad683d9da6a2c9fe699a84c86ed5ebe1755de037f6930870ffb432dedeef3bea7a76cbc98d0f0d0694e5d0f7b469830370ca3548a650c SHA512 b2cee90563bdf2cb9f7b5a0d637b2266f5fcd62add6147c9326b843a5b0975b8ec900d13a2aa86485fce4a5e7e53a08cf4171a3d1d66355e813d01ca9096faee
-EBUILD openscad-2015.03_p3-r1.ebuild 1552 BLAKE2B 99950ff5682870f6068b2c5b22d89980df3328924603eb87316038d1b32b11591c08c153809b390188a24232762f177687b71879f385b96774529e2f6de6577c SHA512 30775ffdb75080c69eea9aa1d8d7b4c093c33760f490b5f695ef9bba30dab412d8fe001cdff66b69623169eb0d6b3399bf469cce023b4b79e53b7ddd7ee41c21
+EBUILD openscad-2015.03_p3-r1.ebuild 1614 BLAKE2B 6893c841c57595f2139d339c29ec5a47fc3ccedeee1ddd33b7d47c295ef01ba75383918c48c4821bcd520b0e072eb73492f7e6d5cbea4a0755ccc2d5ba688431 SHA512 ab06488d537004e0aff0668e688078fa98820ed9948c1a3ff11a6c20685cee1d28d743d1b2cb6a1f8f97ea35c84e5064a11157da31d437f604b9a92326b52fa7
 EBUILD openscad-9999.ebuild 1365 BLAKE2B 2d00f343fd981e771b5215146d26017949dfa2c29f358a5430ce353a5bfc11e481b04b270e89a7f5717c1a535d3c93ae5b794fd2cad5834f86294927708ec3ca SHA512 d3dc21a02a29fca95aa8df5e8b650eae61f31b3fd1ab61a0dbe4c303b974f5bd27a75f92b873b3f4c0e56699afbf37ee0bf53f44fc62c59c099e1caf9cf84977
 MISC metadata.xml 1025 BLAKE2B f1d33e8f6f5f045c0993882d461e9bd8457fc33ee5c32b115540abe18e66b8020ae2ba0f6a593b3e7feb3e48c1d85554bb8340ee0606541964770a40dafc76b6 SHA512 951f3c8d8f68fa60d56f2c01014ab757fc4a72a7d1c98518c3d4c80db55878740a8c267b87e734cc29284fe2bd05e0b54a13c0b09eb9fd8f10fb67a051b687be
diff --git a/media-gfx/openscad/files/openscad-2015.03_p3_fix-boost-1.70.0-build.patch b/media-gfx/openscad/files/openscad-2015.03_p3_fix-boost-1.70.0-build.patch
new file mode 100644
index 000000000000..7684eba92e82
--- /dev/null
+++ b/media-gfx/openscad/files/openscad-2015.03_p3_fix-boost-1.70.0-build.patch
@@ -0,0 +1,13 @@
+diff --git a/src/CSGTermEvaluator.cc b/src/CSGTermEvaluator.cc
+index 6416f29..b3753cf 100644
+--- a/src/CSGTermEvaluator.cc
++++ b/src/CSGTermEvaluator.cc
+@@ -109,7 +109,7 @@ static shared_ptr<CSGTerm> evaluate_csg_term_from_geometry(const State &state,
+ 			shared_ptr<const PolySet> ps = dynamic_pointer_cast<const PolySet>(geom);
+ 			// Since is_convex() doesn't handle non-planar faces, we need to tessellate
+ 			// also in the indeterminate state so we cannot just use a boolean comparison. See #1061
+-			bool convex = ps->convexValue();
++			bool convex{ps->convexValue()};
+ 			if (ps && !convex) {
+ 				assert(ps->getDimension() == 3);
+ 				PolySet *ps_tri = new PolySet(3, ps->convexValue());
diff --git a/media-gfx/openscad/openscad-2015.03_p3-r1.ebuild b/media-gfx/openscad/openscad-2015.03_p3-r1.ebuild
index 1b34fa207c5e..043c1d22a21c 100644
--- a/media-gfx/openscad/openscad-2015.03_p3-r1.ebuild
+++ b/media-gfx/openscad/openscad-2015.03_p3-r1.ebuild
@@ -41,7 +41,10 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-PATCHES=( "${FILESDIR}/${PN}-2015.03_p2_uic_tr_fix.patch" )
+PATCHES=(
+	"${FILESDIR}/${PN}-2015.03_p2_uic_tr_fix.patch"
+	"${FILESDIR}/${PN}-2015.03_p3_fix-boost-1.70.0-build.patch"
+)
 
 S="${WORKDIR}/${PN}-${MY_PV}"
 
diff --git a/media-gfx/pixie/Manifest b/media-gfx/pixie/Manifest
index 38798945b38b..81f83fd94451 100644
--- a/media-gfx/pixie/Manifest
+++ b/media-gfx/pixie/Manifest
@@ -3,6 +3,5 @@ AUX pixie-2.2.6-autotools.patch 680 BLAKE2B a4cb4e3e4db1e5c2cb8f83c42761fd2069a5
 AUX pixie-2.2.6-zlib-1.2.5.2.patch 2064 BLAKE2B ab891b633ff3c8d964e3bd73e32d46cb008f06d88bd8358cecfcee961a0a84f22f497b48ecdd8dc77219e7ec61555137b58082c4c359a4e30b82ae17b5e35b9b SHA512 f0cc7956117dc09cae574d5042a897c0f5ef9b26040c75d4c7b2ceef317c89431cceb7d32f61b5b5151efdc043e8968ac9129e1d1d6a7ac9720f9056e6db05d3
 DIST Pixie-src-2.2.6.tgz 9993504 BLAKE2B 59e04cd2294f1a0e8c841fd5c652fff184acf237dcf005207cd7f3d38195cc15b3246ae4ae8250dd245d7a4f7db65722ad8747798ae9c27c40c9411510016cfe SHA512 9b5256f5028d6091da293557e5385e53d8bdb2b3bfc7a89228b436b75424d7bd400d04e95cc04b71526aff026085f2bc2bd49e1ac0c54d3055f827fd5d05cc95
 DIST pixie-2.2.6-gcc6.patch.gz 16661 BLAKE2B 5d6f785e45f046fb9ff7ebbc9de18ccabd5ac566def3c48cc508aaec4387133aecdb48ba5d4b9eba93743c068a9d12a79ef4e13d3d23e2666bdca494ef979d32 SHA512 2cada11c95df1dde44119b97b44ab8550608427a2351540117655055d98a5ca142bc1fc78e8fc5ab25b8bb33385a7914114796a88cf83a232480e5b84bec57fb
-EBUILD pixie-2.2.6-r1.ebuild 2896 BLAKE2B 2fd66808d3df415b6a91c1a00c4b7d75e3143f4f973fb6921a03bc3bb2b2985505b1cdccdf66fccdfecd48d1348eba35f4598c0d7208a2706bf190d700b4d2f4 SHA512 ecf1d7b3eed32bae79bfa88c63f5df5adb4da9eb7d697a920cdf10b4e167e7b8b894859e0c705150663cc8183004d6fb9ba0daadbc3bda8ef9b94401f3f6bda9
-EBUILD pixie-2.2.6-r2.ebuild 2785 BLAKE2B b0033e953b2f98fecdb546f79ecbc31345948e1aac6e24668487ebeba021fcfd9e95e6a08f60f28209d977fa2638f02b9c3e5580ba89e769befffa86235da917 SHA512 fca68562e0be29a013769e91d271e19fc9efb32c8447bcff016cb3bc4f142ff972a20c4cfabffbd8718d103b7c1c2a4f2f76cf61a7ed348678bfe1a4e91f1878
+EBUILD pixie-2.2.6-r2.ebuild 2782 BLAKE2B 86e6ca562d4909d934dcae801fbea495773e4757865d745eac923bfa53e6256d142c691a36a0e3941fa734bfacf914499a523d6482ffdc8cb4f12faf961c6803 SHA512 13b4c9df5996fb31f6ba5bfe6c252078305954e305b4e1a57c333595e2ccfddf2ca296eea98736985f1602d33cece6f07d2cc4eb66d9ba80678886fff8d31b63
 MISC metadata.xml 544 BLAKE2B dc06ba2d4e26190f38a162a227970bf47c87320a17ef4cad43e8349311441dcc8852e14d34ab9ae2bc3b9caa35bf84f04a42b10a1621d1b82c7966e7d7473e8f SHA512 961588ff38565e8a709b30f704d099676d73f0d1cbe5b266cc26542d511648a740ca430ef845b290c4ad0bc2ffdbe15706534b1f6421d975e66eedf6b6853c89
diff --git a/media-gfx/pixie/pixie-2.2.6-r1.ebuild b/media-gfx/pixie/pixie-2.2.6-r1.ebuild
deleted file mode 100644
index f8863d0b8183..000000000000
--- a/media-gfx/pixie/pixie-2.2.6-r1.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-WANT_AUTOMAKE="1.10"
-
-inherit eutils multilib autotools
-
-MY_PN="Pixie"
-S="${WORKDIR}/${MY_PN}"
-
-DESCRIPTION="RenderMan like photorealistic renderer"
-HOMEPAGE="http://www.okanarikan.com/project/2005/05/24/Pixie.html"
-SRC_URI="mirror://sourceforge/${PN}/${MY_PN}-src-${PV}.tgz https://dev.gentoo.org/~dilfridge/distfiles/pixie-2.2.6-gcc6.patch.gz"
-
-LICENSE="GPL-2+"
-IUSE="X static-libs"
-SLOT="0"
-KEYWORDS="amd64 ~ppc sparc x86"
-
-RDEPEND="virtual/jpeg
-	media-libs/tiff
-	media-libs/libpng
-	x11-libs/fltk:1[opengl]
-	media-libs/openexr
-	virtual/opengl
-	sys-libs/zlib
-	X? (
-		x11-libs/libXext
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libX11
-		x11-libs/libXau
-		x11-libs/libxcb
-		x11-libs/libXdmcp
-		x11-libs/libXi
-		x11-libs/libXmu
-		x11-libs/libXt
-	)"
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	sys-devel/bison"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-zlib-1.2.5.2.patch
-	# FIX: missing @includedir@
-	# https://sf.net/tracker/?func=detail&aid=2923415&group_id=59462&atid=491094
-	epatch "${FILESDIR}"/${P}-autotools.patch
-	# bug 594354
-	epatch "${WORKDIR}"/${P}-gcc6.patch
-	eautoreconf
-
-	# FIX: removing pre-compiled shaders
-	# shaders must be removed before of their compilation or make
-	# parallelism can break the regeneration process, with resulting
-	# missing shaders.
-	rm "${S}"/shaders/*.sdr
-
-	# FIX: flex does not translate variable name in custom YY_DECL
-	sed -i -e '/define YY_DECL/ s/yylval/riblval/' src/ri/rib.l || die
-}
-
-src_configure() {
-	# NOTE: the option program-transform-name is used to avoid binary name
-	# conflict with package: mail-client/nmh (see #295996)
-	econf \
-		$(use_with X x) \
-		$(use_enable static-libs static) \
-		--includedir=/usr/include/pixie \
-		--libdir=/usr/$(get_libdir)/pixie \
-		--with-docdir=/usr/share/doc/${PF}/html \
-		--with-shaderdir=/usr/share/Pixie/shaders \
-		--with-ribdir=/usr/share/Pixie/ribs \
-		--with-texturedir=/usr/share/Pixie/textures \
-		--with-displaysdir=/usr/$(get_libdir)/pixie/displays \
-		--with-modulesdir=/usr/$(get_libdir)/pixie/modules \
-		--enable-openexr-threads \
-		--disable-static-fltk \
-		--mandir=/usr/share/man \
-		--bindir=/usr/bin \
-		--program-transform-name="s/show/pixie-show/"
-}
-
-src_compile() {
-	emake || die "emake failed"
-
-	# regenerating Pixie shaders - see upstream bug report:
-	# https://sf.net/tracker/?func=detail&aid=2923407&group_id=59462&atid=491094
-	einfo "Re-building Pixie Shaders for v${PV} format"
-	emake -f "${FILESDIR}/Makefile.shaders" -C "${S}/shaders" || die "shaders rebuild failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "installation failed."
-
-	insinto /usr/share/Pixie/textures
-	doins "${S}"/textures/*
-
-	# remove useless .la files
-	find "${D}" -name '*.la' -delete || die "removal of libtool archive files failed"
-
-	dodoc README AUTHORS ChangeLog || die
-}
diff --git a/media-gfx/pixie/pixie-2.2.6-r2.ebuild b/media-gfx/pixie/pixie-2.2.6-r2.ebuild
index c0fd04d6ab9b..3766fa36d3d1 100644
--- a/media-gfx/pixie/pixie-2.2.6-r2.ebuild
+++ b/media-gfx/pixie/pixie-2.2.6-r2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_PN}-src-${PV}.tgz https://dev.gentoo.or
 LICENSE="GPL-2+"
 IUSE="X static-libs"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ppc ~sparc x86"
 
 RDEPEND="media-libs/libpng
 	media-libs/tiff
diff --git a/media-gfx/pngrewrite/Manifest b/media-gfx/pngrewrite/Manifest
index a1156816dc55..35b8d5c9122a 100644
--- a/media-gfx/pngrewrite/Manifest
+++ b/media-gfx/pngrewrite/Manifest
@@ -1,6 +1,3 @@
-AUX pngrewrite-1.3.0-gcc44.patch 411 BLAKE2B c1df75d9f27385c4f71a6cb87007d9eb50bc688624d95096f909c94ef853a51ccd7d681b8c5999ba63e2a0ea1c1043a99f180ebb37518a34c8ea5fde69943b10 SHA512 e0a4b22fb59d524f1936c0ff78977e6c75ef815fb1aa89fcd1be6b3e05fbed8d48c290bed83a45dc400c537d49a3c5d8a640de9531795e25181b94f1e90b69b9
-DIST pngrewrite-1.3.0.zip 105995 BLAKE2B f09ce3b542e7013136e9244f89f6be5389df0522296bab609ad2023acb0a9792ee4ae5f9ba3666682c5d81c2364530225f5b306417a8e26d468f39e74d99cd68 SHA512 f146d69780309c61246f71cbc58081e1e357ea0cb58ee7ae5908075ab9cf86218f3eed956ff32df39efcebad7a743bf303ce1a50753d4d4c3710968002a75f1d
 DIST pngrewrite-1.4.0.zip 149760 BLAKE2B 7ae0acabe8d231233bfab3fe0c6a71da4f835d5c6c6943aa394ec0e83f126c93127d5f798e2206f2c45ed5b9b016a14c45a99ea450b40fd63af09a321fb5d2bd SHA512 9ed9d220a4d8066f752d7ba123dd831ce6550072e7f8dd2327bf257b3d8e886f781c4878896c633a9a251a1311a10af56434e2c9ff773d174233a340a1f37e42
-EBUILD pngrewrite-1.3.0.ebuild 702 BLAKE2B fb84c0a1afcb918156f2db5ae747efa3e846ccf77e0f04f04022bed5473b09f5270812874fd00abec6dabeea1b8c5b11e7da549497201c933a5a968885cf94e2 SHA512 f4afe06f24b456c3ba90988540bc618cf07e521256bd247047e33c15e794bebf2ac36ae51c8f5b07ab5560dc681622c94be14935dd74bc1f7ba00d942dc94e56
-EBUILD pngrewrite-1.4.0.ebuild 636 BLAKE2B fb51d370ae9f7b3db9e89b9621e770a400335180f1a87afab6eee5470ececddcb2463187e6626d3b042d15884070cacbf19a53a3352850cfaf47eefd56c5d5f4 SHA512 21c50bf23b8af7e15fc5e095c182f8e4d78f1d51e5a75a838c5bcc8b28e9f09d95f4927c99a81834e6446ef510e8b91a85ee3581b92aa4e9541fb0db840b0cf2
+EBUILD pngrewrite-1.4.0.ebuild 635 BLAKE2B a2e0c5cee40b1219fae402d7aed9f03bace33baa0f5b01637d5259d49592afb1a41173ce2e478fb6a2c2fb94c453d3432785882f417aefb761cef25d82081cff SHA512 599d88c3157f519a47a7965f683d88a37738f82e2660535663a3ce04b50abf09408843668e3b9fd0a6d3cb0ac9c216b076fa755c7b6a4853473f160119b18540
 MISC metadata.xml 255 BLAKE2B f12a1ca502ad96bd6de4c8b83dfb8887ab70dec78f10a8b52dcd4618eb182192477ddca18738d734a43f3c7ac3b5e0955f4ae9347ea80e788a92974c7d50a574 SHA512 b7bc93530a1726c2d4dfbc71ae29cfbb57712fd9fdd2e76fd52f35ab4368cba0497b50145d1527a3b79e465d459a380821bb1371a01c2e915dc9adc6c7fafd5f
diff --git a/media-gfx/pngrewrite/files/pngrewrite-1.3.0-gcc44.patch b/media-gfx/pngrewrite/files/pngrewrite-1.3.0-gcc44.patch
deleted file mode 100644
index e514c5d3fa7c..000000000000
--- a/media-gfx/pngrewrite/files/pngrewrite-1.3.0-gcc44.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- pngrewrite.c.orig	2009-06-01 21:12:19.000000000 +0200
-+++ pngrewrite.c	2009-06-01 21:12:29.000000000 +0200
-@@ -89,6 +89,7 @@
- //#define PNGRW_SUPPORT_1_ARG_MODE
- #define PNGRW_PALSORT_BY_FREQUENCY
- 
-+#include <png.h>
- 
- #include <stdio.h>
- #include <string.h>
-@@ -109,8 +110,6 @@
- #include <unistd.h>  /* for isatty() */
- #endif
- 
--#include <png.h>
--
- struct errstruct {
- 	jmp_buf jbuf;
- 	char errmsg[200];
diff --git a/media-gfx/pngrewrite/pngrewrite-1.3.0.ebuild b/media-gfx/pngrewrite/pngrewrite-1.3.0.ebuild
deleted file mode 100644
index 62bb8328e0f3..000000000000
--- a/media-gfx/pngrewrite/pngrewrite-1.3.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit toolchain-funcs base
-
-DESCRIPTION="A utility which reduces large palettes in PNG images"
-HOMEPAGE="http://entropymine.com/jason/pngrewrite/"
-SRC_URI="http://entropymine.com/jason/${PN}/${P}.zip"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="alpha amd64 ppc sparc x86 ~x86-linux ~ppc-macos"
-IUSE=""
-
-RDEPEND="media-libs/libpng"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-S=${WORKDIR}
-PATCHES=( "${FILESDIR}"/${P}-gcc44.patch )
-
-src_compile() {
-	$(tc-getCC) ${LDFLAGS} ${CFLAGS} ${PN}.c -lpng -o ${PN} \
-		|| die "compile failed."
-}
-
-src_install() {
-	dobin ${PN} || die "dobin failed."
-}
diff --git a/media-gfx/pngrewrite/pngrewrite-1.4.0.ebuild b/media-gfx/pngrewrite/pngrewrite-1.4.0.ebuild
index 839e5ce3368c..02fff6cf2812 100644
--- a/media-gfx/pngrewrite/pngrewrite-1.4.0.ebuild
+++ b/media-gfx/pngrewrite/pngrewrite-1.4.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://entropymine.com/jason/${PN}/${P}.zip"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="alpha amd64 ppc sparc ~x86 ~x86-linux ~ppc-macos"
+KEYWORDS="alpha amd64 ppc sparc x86 ~x86-linux ~ppc-macos"
 IUSE=""
 
 BDEPEND="app-arch/unzip"
diff --git a/media-gfx/rawtherapee/Manifest b/media-gfx/rawtherapee/Manifest
index 249fd247af23..2399c7582305 100644
--- a/media-gfx/rawtherapee/Manifest
+++ b/media-gfx/rawtherapee/Manifest
@@ -1,5 +1,7 @@
 DIST rawtherapee-5.4.tar.xz 11991988 BLAKE2B 625b4e04b82f34d994e0f23f6aea6af4b0a2af2b6a325e916e7b51f8a83b568b65bef47a489be547d1e2437f9637b2ecea0d69d95bfabd53b61b11b46d9e36bc SHA512 6dc9a82202b80675f90eeb8f08c4484700561861f296546ae9425c6e9603f6e84bdc0859896c333d2367cc0b371c6bb6ab2fe36ff3d6f56419cbf18a58d8ef89
 DIST rawtherapee-5.5.tar.xz 12163556 BLAKE2B 6251655b5bcc8b805eda584e386771b14dec15a2d8a96518bdb79d7e31354c78eb263f6964d7f6ffaeb35a127d3f775c9c39dfebf072a0bfc14d284358acd03c SHA512 fcb546ad6e420200a821c89555ec259140995a3bc69429d2ecb648632c02e10ffceebbd7296e879c93b53ad8efa45ea71336d936cd90cead723e70e8932a413a
+DIST rawtherapee-5.6.tar.xz 12083264 BLAKE2B a0eb09e98e1041b393ad3aa671641a2a4855379cef6245ca3cca2588ff5f50fedf8becd88bad1ab70f63dfb575f5f22c141040defa10b47268947415999d8e79 SHA512 2c751c7631ea2ef65c334fa0baab16d4c3161fae66487870c476f07f1ea3604a5e28a251fd98d9688cafc088302af7aa6e28e9b27a37f916715708ed5e731f0f
 EBUILD rawtherapee-5.4.ebuild 1626 BLAKE2B c85d316a1e741e3bb34b278429c35a01312bfb33ff413fdca05d3d14b329ed57f207ba56537711943c9afef4c3177c421af9f46bcf1d95a96a361cef5c3bac7b SHA512 f9645dfa2bda00054821956bc1a9de57066c06c8f74ec1d8ebdaf0b1ed2e4453b253fb66ae4ff7a8f0e55d8a455176cea71b5502e76a8004f435a65bc877bcf9
 EBUILD rawtherapee-5.5.ebuild 1631 BLAKE2B 4bb476be966428d80824b7c9245acb9fa528534b45feac35e6b9e35ef9513342b115224331bed6bbfecf6d51f569f641337592f4611eb14998b477c8b5177890 SHA512 4be114ac1158e205c607bd551c87cbe271567cf8fedc82b6ef3581f30e977533660ecc790fe6a149e0b73a6821ddcb1da7afefd6927372ae5274df9dc64357e6
+EBUILD rawtherapee-5.6.ebuild 1623 BLAKE2B bf3e2d94b876c48aeedcbb2030d282753a78da2a4c905b5565446ede991e854277fb2ccd99f409d52ccdb5df986f50525cccaf42e0b1124f68a22c0ca7311865 SHA512 4aeee80c36f123d97d55ff343dc326428f597f74d282f1186cbb9255d0ef2f29dab7ad56cb886e7b20dcbe1353a1988ff205b7d2cc3fc2c1580bbf18b8c6d8c4
 MISC metadata.xml 484 BLAKE2B 672746e8291016ad6467a9b3c9baa84abac42df9f7de4b4bdb79374bba8e84f7cbfe140a076ebee49ec50587154612b73c6a7022461d01fd7fbdc63a6ddfcd98 SHA512 91f11609c7472bb7cebff5d440ee3d4b0560e0832e1bfb6ffd5b239e8e60647e067894d77ccb6e40a379680775f80b91250c3feab5cd2ce32d7991e0776d0cd9
diff --git a/media-gfx/rawtherapee/rawtherapee-5.6.ebuild b/media-gfx/rawtherapee/rawtherapee-5.6.ebuild
new file mode 100644
index 000000000000..48b8dca754d1
--- /dev/null
+++ b/media-gfx/rawtherapee/rawtherapee-5.6.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_P=${P/_rc/-rc}
+inherit cmake-utils flag-o-matic toolchain-funcs xdg-utils
+
+DESCRIPTION="A powerful cross-platform raw image processing program"
+HOMEPAGE="https://www.rawtherapee.com/"
+SRC_URI="https://rawtherapee.com/shared/source/${MY_P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="openmp"
+
+RDEPEND="
+	dev-libs/expat
+	dev-libs/libsigc++:2
+	media-libs/lcms:2
+	media-libs/lensfun
+	media-libs/libcanberra[gtk3]
+	media-libs/libiptcdata
+	media-libs/libpng:0
+	media-libs/tiff:0
+	sci-libs/fftw:3.0
+	sys-libs/zlib
+	virtual/jpeg:0
+	x11-libs/gtk+:3"
+DEPEND="${RDEPEND}
+	dev-cpp/gtkmm:3.0
+	gnome-base/librsvg"
+BDEPEND="virtual/pkgconfig"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_pretend() {
+	if use openmp ; then
+		tc-has-openmp || die "Please switch to an openmp compatible compiler"
+	fi
+}
+
+src_configure() {
+	# upstream tested that "fast-math" give wrong results, so filter it
+	# https://bugs.gentoo.org/show_bug.cgi?id=606896#c2
+	filter-flags -ffast-math
+	# -Ofast enable "fast-math" both in gcc and clang
+	replace-flags -Ofast -O3
+	# In case we add an ebuild for klt we can (i)use that one,
+	# see http://cecas.clemson.edu/~stb/klt/
+	local mycmakeargs=(
+		-DOPTION_OMP=$(usex openmp)
+		-DDOCDIR=/usr/share/doc/${PF}
+		-DCREDITSDIR=/usr/share/${PN}
+		-DLICENCEDIR=/usr/share/${PN}
+		-DCACHE_NAME_SUFFIX=""
+		-DWITH_SYSTEM_KLT="off"
+	)
+	cmake-utils_src_configure
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/media-gfx/ristretto/Manifest b/media-gfx/ristretto/Manifest
index 302ec7d8bde1..d4fb065dd017 100644
--- a/media-gfx/ristretto/Manifest
+++ b/media-gfx/ristretto/Manifest
@@ -1,5 +1,5 @@
 DIST ristretto-0.8.3.tar.bz2 564745 BLAKE2B 74f6fe50dbbcb538ff370fdefc934921e5878f7422dde577b86acc0ee63a03edaada860f0a91301de4b4ed4ae2fab89d74eccc5f3b9faababa4c71ee07159c33 SHA512 c43b48dfdf9e8ed0ea3c5f2bbac1c837881aa6a467c78377b6f53dcce030b5a3b8134a7b8cbad1008ae758295953fde50a916c284e54e8c5490158e776554514
 DIST ristretto-0.8.4.tar.bz2 581374 BLAKE2B 8d4dc91daa1aebf7d8193d8a48c3be29ad6fed86b7fbea68effb63f6a56d2d39898b5ab0c93933adf9d65cce327109dca5ecff96855c4311494de7cc4182213f SHA512 c5479cde66e4f0903b9b8d9b1b8f4c7cde35ebfa334e414c8202e783c332bd4bfec650f85d308c7151d31fe84b27a13bb4048290b0a82ce7b8ba4baf3e4088b8
 EBUILD ristretto-0.8.3.ebuild 879 BLAKE2B 7f7473ecbbf739f47d1cb0370e15b2f487862792487e894b76dab4681adb2c433ea9a782c820bb95111bd83212badeb333ce21e2d10ec8cb455d6acf5224900d SHA512 faf62c22bba201b3136d30843ecca5d11dceb79b64ad97102a9b7ae3242e35264cccc41e66f37b32cd08fa63b599eb40be7a45a51e6bd219cab6757b7a076f63
-EBUILD ristretto-0.8.4.ebuild 878 BLAKE2B 8d6acf62aab78bc684a29dc50714da1cba6c6f2c20243e0e82ccdd5ee52718551c74078c9e076ad2dfaa9f2fdbf314149a2a0f8978d63231b66566f7c8519128 SHA512 171906c898d2e8ca4e43da0bc93b9d0827c54641aaafb4b980bcdea609fe6d5925f3cb78d97d9229c46213ed11f5f6cc5cc50e3e995fbcdcfa4dc59cba82f963
+EBUILD ristretto-0.8.4.ebuild 876 BLAKE2B c950d825ab3ba23f9a0660a45c18874d591271a86e03c32d77be2908af0628cd1936290505f03a3b523ffd8932a453a8467d5c37062b6e19800635b8835c812f SHA512 42a4b7741c85d52878adc859fe4b9c9a7c5680c59be2c9c52bc9768371c2f39b89da1f01130c63aa4e66420b7d637531355c9eaea418d761b80024bfceb8c337
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/media-gfx/ristretto/ristretto-0.8.4.ebuild b/media-gfx/ristretto/ristretto-0.8.4.ebuild
index fd92a6e06f88..b7c14b8a7667 100644
--- a/media-gfx/ristretto/ristretto-0.8.4.ebuild
+++ b/media-gfx/ristretto/ristretto-0.8.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND=">=dev-libs/glib-2.24:2
diff --git a/media-gfx/shotwell/Manifest b/media-gfx/shotwell/Manifest
index 4f6d063a2a81..9d35d0f3d7e9 100644
--- a/media-gfx/shotwell/Manifest
+++ b/media-gfx/shotwell/Manifest
@@ -3,5 +3,5 @@ DIST shotwell-0.28.4.tar.xz 5529712 BLAKE2B a8ee8243cf1a800fd1c1a91ade81decf9187
 DIST shotwell-0.30.2.tar.xz 6461648 BLAKE2B d54f34c05dcb092149129977bf59f0434ec4082929e3c87d9b4e774f85b47d73ecce1e80a6a29965194e9791eecb018405b43f082fb8b334c8d012f06a00b817 SHA512 ee74b9d3fbc5b2a5ca87cbc351fa99f6afaec4ce717166f55d79f41f1b039c272ed9028eb3919874f086f934197806738a54f428e790bca50dd8c9af61c21c36
 EBUILD shotwell-0.28.3.ebuild 1432 BLAKE2B 2bd4e420c1dfe788e5df463bf4caff3aa419c808db085f8213a1f66d4050a093c7ecb37337ecee770f91e4b0f7f895e08f54a480b2b51a2de8ded06bd60b04bb SHA512 53212e5aa3d691c8a8fb5ee50a3e3b1bcc17c78f340b9f2d6d8c2e6811fc6587309004c196a63a00d789652fc2329231b24f8d69263d041ce6ac6affcd513c39
 EBUILD shotwell-0.28.4.ebuild 1434 BLAKE2B d88d9a0be4f4e01c152755155afe28ea862101b2f10e7bc053cc8d6c67ddf77f7aaf2143eb3cbd22ac85d1fa82f88d8167054be81f40bf2ba3a82bc4f6d80aab SHA512 f0050d5cb6c3757aaee2d1b39d252d4c6f6f317a8824314aba12479dfa3f379df51d637924fce617e3ae391d6b98324eb96674c3d492ae2979390cb641dd1a04
-EBUILD shotwell-0.30.2.ebuild 1784 BLAKE2B 3041ee251f26919a4cea223771eabc24f44846b4746d697cae976b06218274ce57a3c6debe0336bdcbca09185ec01a155454b8e2820b45f53aa051ebd7712f2b SHA512 38379de15d76e00f42530903beabf18067bed88d2eb7c065ed05458fc6333ac62fee2c6b19b52d666745fdd3872d49aa7693cd0c186a72aed85a6273041b4667
+EBUILD shotwell-0.30.2.ebuild 1782 BLAKE2B b828d36afa8651eaf3aac2bef84a35d17a1254cf4f58616e81055bc1e5da313f6cdf712a71a9490d1cb9db5ca7a7c251355931d770dd0bc347441f15f45b66d9 SHA512 eecf747b03d04d0b8fcee5be53191a449a48cd3e4f0b8e46a627ba48b3fa5d779314249af4f222eeda1d691352e3622ba2591c80e9c2d1774acbbbc41de40235
 MISC metadata.xml 915 BLAKE2B 7f83fe936f9a575c6dd12b014007cd97c5a8ada9aa5e55ddeaddefa4eb05d724a068c81d2f6f41c5b1bae01ed2c4326eb5eba5d4bdccf48619edeb43a8eaabfd SHA512 1b226f7fabfd7f5ee4d82b28ce2998273225319b055c01509cc5e493fdc037941c0edd0099df5dada00228fb225bf5e35d0035d3cd244890ad0cbd929b84d214
diff --git a/media-gfx/shotwell/shotwell-0.30.2.ebuild b/media-gfx/shotwell/shotwell-0.30.2.ebuild
index 167dc43d928a..c985cea9a6ba 100644
--- a/media-gfx/shotwell/shotwell-0.30.2.ebuild
+++ b/media-gfx/shotwell/shotwell-0.30.2.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Shotwell"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="opencv udev"
 
 COMMON_DEPEND="
diff --git a/media-gfx/simple-scan/Manifest b/media-gfx/simple-scan/Manifest
index 4dfa9909a89c..723916a9cca3 100644
--- a/media-gfx/simple-scan/Manifest
+++ b/media-gfx/simple-scan/Manifest
@@ -3,6 +3,6 @@ DIST simple-scan-3.24.1.tar.xz 669452 BLAKE2B 927c3479a96525e2996aab7c8d37b585f9
 DIST simple-scan-3.30.2.tar.xz 512540 BLAKE2B 908af68fbd297e2cc0c0c5440166ebc706f6c0a1a88948e9cdfe30a2e9e548125b31e6a00684a8a0db8e4c37c9d0930765b74e2ba9e1d540e4ae705cfd404349 SHA512 3a4d19bd36a88124ba43d388807afd1d6a51fc691ed83570a095e3b9719b5db5f3eb457a41bc8e36f2f1bf25ff4ab83edc150d4cdddd0d528e9280ea2da6cdb6
 DIST simple-scan-3.32.2.tar.xz 790800 BLAKE2B 98e502cbc280285dbe20a0c843d5f8d8b38707e973f2ba6aba2ccef9d739165371f5f30d7d6658853c5a6a280ba2919a98acd02b4757b4e881f96d5a7b53449b SHA512 10322ae72461efe43a4e230443c3aca24aff6f0cab07750c6eab9ebb718889e51d8c77ff722c337f333a8952ac84f69d03ad88eedfd4432ef11f7c7493170e14
 EBUILD simple-scan-3.24.1.ebuild 1335 BLAKE2B 63576693a802db62460e1082dff99268639ee3253dd261facd0db3bde5b399461e0e268a417dd4b3e7346de47287b1dee9321be09ba80fa03462d08961718a31 SHA512 071db78d53b4c1dede6c5509b9de07ccebe9f46664ad023764e352cb8c1c87ce3e17321a8e78602e6cda6c8f4a3a7e98fac8a4b19b60c4e4271ee3237d73410d
-EBUILD simple-scan-3.30.2.ebuild 1385 BLAKE2B 0f406f83606d4203dd0d7785b5330db5a0cf7d5a6c00d7a86b8d5768388d8de0016100184ce6afbd95e0e4ab9e598b8d635a8abbcad00024bf7dabe491dc9799 SHA512 6176fa51739f6975a17a0e7147a152464566d3192bc7414e6239351189674768a5d83bb80575f38968e8cc57266a028947c1e10a38c16697736853023e1449b0
+EBUILD simple-scan-3.30.2.ebuild 1383 BLAKE2B 76b6cc19646c33c5b05720430990568ee30e707c4a88cc78b8c38a4fbe7f6111263c102dbcc5ea64009a6af2e4fa5abaf8b41fc71c1054f021d9f51530c45b0e SHA512 4b148cda38532b523f8b7f1eefa4183e7d1bb6801e895a774b62fe57b83cfc39f10cd0037b5c5a6a656851dbca352b02e854adc9817530c81b659ee122b8e06c
 EBUILD simple-scan-3.32.2.ebuild 1385 BLAKE2B 0f406f83606d4203dd0d7785b5330db5a0cf7d5a6c00d7a86b8d5768388d8de0016100184ce6afbd95e0e4ab9e598b8d635a8abbcad00024bf7dabe491dc9799 SHA512 6176fa51739f6975a17a0e7147a152464566d3192bc7414e6239351189674768a5d83bb80575f38968e8cc57266a028947c1e10a38c16697736853023e1449b0
 MISC metadata.xml 718 BLAKE2B 46e5929721e967a667f32a8993903b635599ae06c5b5179edf0579070b2b393f750a044bc280519b820f336843d1b98a795f73ef9500a27951a64b61794901e5 SHA512 82244c0dc32c4ded72048a387cee5f350a66148ecaa12a941e4a86d9d9079f1769f1f240ee564c7f991f9d53c050e9fd3e9113024fc8831a6766ec3d88b665ca
diff --git a/media-gfx/simple-scan/simple-scan-3.30.2.ebuild b/media-gfx/simple-scan/simple-scan-3.30.2.ebuild
index c3f42c9f23b3..d142269fcf07 100644
--- a/media-gfx/simple-scan/simple-scan-3.30.2.ebuild
+++ b/media-gfx/simple-scan/simple-scan-3.30.2.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/simple-scan"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~ppc64 x86"
 IUSE="colord webp" # packagekit
 
 COMMON_DEPEND="
author	V3n3RiX <venerix@redcorelinux.org>	2019-05-18 00:10:51 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2019-05-18 00:10:51 +0100
commit	eccb70a7f91b2d22582587f26d1a28bb31408b45 (patch)
tree	3223e1fd54201bcf4ebecac6fbe87361cbe643e2 /media-gfx
parent	a2810985afabcc31d3eace5e61d8ea25b852ba17 (diff)