gentoo resync : 14.04.2018

31 files changed, 237 insertions, 104 deletions

diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index bcee71b5fdc0..10e18547e5fd 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/build-docbook-catalog/Manifest b/app-text/build-docbook-catalog/Manifest
index 7069e8a584c8..27b113c57ac7 100644
--- a/app-text/build-docbook-catalog/Manifest
+++ b/app-text/build-docbook-catalog/Manifest
@@ -3,5 +3,5 @@ DIST build-docbook-catalog-1.20.tar.xz 4620 BLAKE2B d927e451e5cdc3635ec85f3d283b
 DIST build-docbook-catalog-1.21.tar.xz 4620 BLAKE2B ed4aa645a5bb8e168c291c05891a2359114c9148a81588d93542528a0c74828a1824dc98a14468e8ba65525edf5aae8c936f29190d54063064cd54e2af8dbc3c SHA512 0becc1bae100101b072c62bee844157151336aebc39a046030c8b7b501e13f1b3552097b244ac51339abd2e724304f4fe728861b7d5f070c26973998936861bc
 EBUILD build-docbook-catalog-1.19.1.ebuild 761 BLAKE2B 56ddbfc1f8cdd9d6531452671b1bc92b3a81eb9ab4af31980af6a82207b23c260c09ea26f4f2f9d535e78159f7868838b10d69b96207ff067e55582d0ab659b5 SHA512 32814eae6c8dd46b00d1567922631e38d000930bbd4b7aecd7c97c9d404439938e70f27dfbfbfbf0d138d119026b9eb239ce0877f24f37fbc179beca71cd718b
 EBUILD build-docbook-catalog-1.20.ebuild 1140 BLAKE2B b7c3f81d3a899d34ff27dad7e726f288fdbe781e8d359918abf726eafdcfc67f9565df9a7f0ef92c7a226036c42069f5c6c1cf56de6a571770759968f7c97626 SHA512 0330a064028c41aa8d2386118e7eb27a7a0c5e24f76cb3f619bd704244a058315692a7452694f8f3d4dc942f1be86bc65e3901654b7a7073d4b9116d081cd5a0
-EBUILD build-docbook-catalog-1.21.ebuild 1098 BLAKE2B 457f55b2ddd73b54364adec74bacadebc37f58d074aab7a0304e05543160b9710735437eb27d449f089acced13d3edc9f91785421bfa7cfcb188b0722991099c SHA512 29b24e0ce3ac1efad12013a425dfb696c09976ccff8a8a206720f0659a079806c48927893f9390d75f68867d77a92264c0687fea8209e90904bebc74f052c4ad
+EBUILD build-docbook-catalog-1.21.ebuild 1097 BLAKE2B f28b94ffa307f806c068c69a0d7798fb59da42af7f07d30858f1cfc80dfc7e4d2baca352380092a9431f220d27bc98becbc29329d88a0ee51b5d05ac7e21285b SHA512 ad584449fe76557175fa16ce2b947149bee33b6830daea14d237e801e71f0429c6209e327cab6b68d75ba38c24ff1fb6bff9deecbaa7e58304fc7cfd741d0483
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-text/build-docbook-catalog/build-docbook-catalog-1.21.ebuild b/app-text/build-docbook-catalog/build-docbook-catalog-1.21.ebuild
index 695c53e1f99b..a2f559cf7235 100644
--- a/app-text/build-docbook-catalog/build-docbook-catalog-1.21.ebuild
+++ b/app-text/build-docbook-catalog/build-docbook-catalog-1.21.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://gentoo/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="|| ( sys-apps/util-linux app-misc/getopt )
diff --git a/app-text/editorconfig-core-c/Manifest b/app-text/editorconfig-core-c/Manifest
index 0322a4b4e195..c523910632f9 100644
--- a/app-text/editorconfig-core-c/Manifest
+++ b/app-text/editorconfig-core-c/Manifest
@@ -1,5 +1,5 @@
 DIST editorconfig-core-c-0.12.1.tar.gz 65369 BLAKE2B 30296b64bd215a8b51d3b4d6146ce5eac13cb1a8ba8a25d0faabcc22989503d9d73bc138240b475eb7ea4eecd5f5bbbf347519b1696373daf55ffd27fc772f4c SHA512 3517f7db84d632615ba651eeafab6730739b7bf01f4ea34fbca65f58463fbbcbabc101587b289a7922b55708453262c65569077c51087424d47d0676dc1db686
 DIST editorconfig-core-c-0.12.2.tar.gz 67002 BLAKE2B 6b808366acc8d0a96fc47cb74d620a4028978d7114b4a64d6799527276442f1d39ba8d5611530f873c78b7c49893c5edecec84dcc6f2616ba2663cb36fa92d0d SHA512 6ab3e4f7f95c83c0781064ca15bb70394bb947f9d4cd1348224f02e25c65021d14439b913775d7cfafb93476158799c34438fa548adf3c7ec6dbfd6f1052a046
-EBUILD editorconfig-core-c-0.12.1.ebuild 891 BLAKE2B 52eb0995e90c239264a5157438552a958c0ca00d5211e4991c04811e78a2b5fa20a803293c42d4c8c8c24f652b692a07a3b10d8cee363744bd82d4a4ee38ab10 SHA512 527ce58ed36cca79ab12695cbbc05d7e9f5b5761932bf1cea6ad24e1d7117edc4df6ae79af0549d99b2f833877b33d7c66424ff5748db878cf9a6ba634246fcf
+EBUILD editorconfig-core-c-0.12.1.ebuild 905 BLAKE2B c775e5af2fd5c0833d528b791b2bcc100e3fb7ca1f41dd5196bfc7525c9d003b261763bb69bb2015c759f984ea468768912a20cfa967c7bcaa2a78a14a5d8585 SHA512 352392031c02ede3b966bae19b4ed60c3e9575e221ee40ff2e3162a5f41f981dae0629c8b62f13b90195de274983119e152fbd6f45b19a10532c69c64ae2a6b3
 EBUILD editorconfig-core-c-0.12.2.ebuild 907 BLAKE2B 5d210b84b242c0ef32d601bb34674a0583aa9e8fbc0fddb39b41dca08a2e80a5c62d92b86761ce63f49cdda6aaa8803a607a9404c4ab7fa83b4829433596f7a2 SHA512 eec1a6c04c3ae5c18fb54d37765ab947dc99c6e113c8a81bf3036bbb2209cbc07cbf0eb5cef274dcbcc766a39885c9293beb6dc626e63ac273e5af8fee716b59
 MISC metadata.xml 388 BLAKE2B d2a5f28be0aea3f3aefd1b8e82e337b87e67192b96bea1e2e0e5073e44f8c54d3f0380a089118d405c417d42ee6d978919dc8e0212a36ee0d3808b706846ad70 SHA512 fbaff22b9f648c2e94d68904cbb23de8ee0340641c626d5a533992837ec6405b65a96872bfdedce3a75351ac73e344d5faed1a51f63a4330f65e4aa8190ffed4
diff --git a/app-text/editorconfig-core-c/editorconfig-core-c-0.12.1.ebuild b/app-text/editorconfig-core-c/editorconfig-core-c-0.12.1.ebuild
index d9b1f574e805..48e7e80a5aab 100644
--- a/app-text/editorconfig-core-c/editorconfig-core-c-0.12.1.ebuild
+++ b/app-text/editorconfig-core-c/editorconfig-core-c-0.12.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 inherit cmake-utils
 
 DESCRIPTION="EditorConfig core library written in C"
-HOMEPAGE="https://github.com/editorconfig/${PN}/"
+HOMEPAGE="https://github.com/editorconfig/editorconfig-core-c/"
 SRC_URI="https://github.com/editorconfig/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
diff --git a/app-text/fbreader/Manifest b/app-text/fbreader/Manifest
index f491c8cca2b2..87002ed81ac6 100644
--- a/app-text/fbreader/Manifest
+++ b/app-text/fbreader/Manifest
@@ -8,5 +8,5 @@ AUX fbreader-0.99.4.patch 472 BLAKE2B a34f27d9f53f3faed5889dcb7a841a1c045e7bd408
 DIST fbreader-sources-0.99.4.tgz 2345664 BLAKE2B 29d921a953df98def51740d9b7fed5a7164f5df6410c70daf03f30ba8f77e9aa898d6f50038945155dc46243165860ffaf13abc81f662abccdeb6dc91652b3d5 SHA512 d4b11d7ab03df002ad4212db805b10b80a24ea4384e92122b12c25a3f817a0eb343509ae30e31d68417fd4ce27f77e043235436f0081ff2c785a2830d6211dc7
 EBUILD fbreader-0.99.4-r3.ebuild 2279 BLAKE2B 1e22f5cbdc916be2543a79ccc95c753726e946c56c85e9dcd53c89b643fea39edefda496de67bc603d8c885858802a89e7d09c5d1a4d635fd5a32ff0333e0e24 SHA512 f93ebe20622e94f54b68ecd62d76520d3455595e3433b875d76654479939f34ba21ed80b580c1b46824473e9f927b4349e8a5df37e4b2f350daf824cb07eb27e
 EBUILD fbreader-0.99.4-r4.ebuild 2111 BLAKE2B 955873c4d80c35e8579e97140bc4eab256cff750ef844a68de99418666bb93f61824486c48983ed366993d8496e1d7396d4e8e2c5ebeb11f1513a3ddefb5e8bc SHA512 28195b8b7d246fd7057ba9c30835e263b37932206d07a26fa3f01d240b44c19a58196e575ffaf8fb4e4cdf76d50682ecf97a4b5bca2dc4c18582fdfdea2eb1a2
-EBUILD fbreader-0.99.4-r5.ebuild 1935 BLAKE2B 5af5fcce48058a00b62c21071c59f3572ef853a390fe5736ab86504541745eb586ba3d15cad087ae90b9d79f32d2bcc87ecd0c5f970286043e29500cbd8ee8ad SHA512 c9f198c10bb69b49df860d3d0ba8fed4556588b67b7ba234bafb504c1fab9a7b0693ea6c00bb63fa7dacb5777c1a8f30a54bff2e2716f84d45abd718faf17ff2
+EBUILD fbreader-0.99.4-r5.ebuild 1934 BLAKE2B e12e5cdb9714e1f97e6a375c3e64dc65aedd93b9214417e7d3b3f2dfb4b39f53a8cb540cf2636bed5940b202f64ab7f8817d541d32b212ac5a1835656e923fe9 SHA512 48a634082045cdc346d06473db3ac1b17e1ff91451fae50900ef7b19e5a7529b82c683d8ff93435b9d0053f69ccee8e924ec82854b06f213895657cec26aaad6
 MISC metadata.xml 320 BLAKE2B b537c430018e9035438033df51325115040dc2468f03721c678a60c40654ed99be77a154ba34bb6cc1b7afd54191912906a007a50924cefddb2b6bba908eceb8 SHA512 d215791adfc4cb16e4c25d0dfea7dcf6439fa12916d0c0e51be65d62dd8d48bd63c7e983080027101c6cac1220f4e622c580f7ced4dc895e8b4898f14e921539
diff --git a/app-text/fbreader/fbreader-0.99.4-r5.ebuild b/app-text/fbreader/fbreader-0.99.4-r5.ebuild
index 9f6a95bccb92..7c47fc4ac07a 100644
--- a/app-text/fbreader/fbreader-0.99.4-r5.ebuild
+++ b/app-text/fbreader/fbreader-0.99.4-r5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.fbreader.org/files/desktop/${PN}-sources-${PV}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~x86"
+KEYWORDS="amd64 ~arm ~ppc x86"
 IUSE="debug"
 
 RDEPEND="
diff --git a/app-text/grip/Manifest b/app-text/grip/Manifest
index c49fb245fa2d..452f564de1e3 100644
--- a/app-text/grip/Manifest
+++ b/app-text/grip/Manifest
@@ -1,3 +1,3 @@
 DIST grip-4.2.0.zip 43079 BLAKE2B b7aa31c554d646fdedee88f54e2ad825d56eed26cb18ec364cc0e2638f3d002f2fb3192daa15085b2db5a9d608e37df8c74b19466042c57fa62b80f7bc259eef SHA512 2989a1cc2cb98254e932d5bf6679a205992e74802e68fe45d11cf087747d2379778df254bbf1cf980bb8993dc5568c5112707c645babbb32aae49f443319ff6b
-EBUILD grip-4.2.0.ebuild 602 BLAKE2B 2de49181b47ce12268a8bce223767f2005ce7c734d21cdcd037b0206e65639168f2d34441b020856c26d923af3d5253d36780b67692501fdc684fe96e5bbc8f2 SHA512 43b7b1419d247608f14a4c59f545cf443024d30d467494afbac56912768b7b355c51cb2bf7576fffed432d9475803e3b17cdaf947d4d7090def77033a6aa28e9
+EBUILD grip-4.2.0.ebuild 602 BLAKE2B fde77a5097a56f4ec4d6d27c49bf0d7698da77b8ea2ccb5e2fd04b534f8fd6a3b5e65adab4d0de0723f915db9ece67c4a5e6043c095f4aaca342b2d4d653312a SHA512 326080a495036c7ccdc99f2041b177ff8570bb9dcd0abac5899a719489a9e32a1662a7bfb637045a64c9d2aa87693c227ca08c7ddf74a3de72ab4a3f1d5736d0
 MISC metadata.xml 287 BLAKE2B 97d6c8c5b9fa03b5b8435a9719b819a9e071d1310656d97e6a203a8cf86d2414034e8642de7f010aa8f64955bcdc849bc66ef64a1e0e80fd23e355af50c6bbc1 SHA512 047bdd78979d55e9e37b92f51b52190c6a5780d6b3475560ae8908fdc98274949372918e1ab150821f09bff97cc12f25097f4e89ee4431861b608be79bd942bc
diff --git a/app-text/grip/grip-4.2.0.ebuild b/app-text/grip/grip-4.2.0.ebuild
index 32493d9a31af..fabda5f42c93 100644
--- a/app-text/grip/grip-4.2.0.ebuild
+++ b/app-text/grip/grip-4.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,14 +7,14 @@ PYTHON_COMPAT=( python2_7 pypy{,3} python3_{4,5} )
 
 inherit distutils-r1
 
-DESCRIPTION='Preview GitHub Markdown files like Readme locally before committing them'
-HOMEPAGE='https://github.com/joeyespo/grip'
-LICENSE='MIT'
+DESCRIPTION="Preview GitHub Markdown files like Readme locally before committing them"
+HOMEPAGE="https://github.com/joeyespo/grip"
+LICENSE="MIT"
 
-SLOT='0'
+SLOT="0"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
 
-KEYWORDS='~amd64'
+KEYWORDS="~amd64"
 
 RDEPEND="
 	>=dev-python/docopt-0.6.2
diff --git a/app-text/llpp/Manifest b/app-text/llpp/Manifest
index 909a70756a8f..a23ef06ab535 100644
--- a/app-text/llpp/Manifest
+++ b/app-text/llpp/Manifest
@@ -2,5 +2,5 @@ AUX llpp-26b-WM_CLASS.patch 860 BLAKE2B adcd60863d72d5328d6918c7904c58f160651a91
 DIST llpp-26b.tar.gz 169385 BLAKE2B 9a80c22d013af063e3908bda69108ce6a4e0f72efb1c0b930308591d2b8a0f94f7b71a5f1057543e102b95b01440d567e6648d1ed77f1e85728f5ea31718ea28 SHA512 ce7d743d8ec998a93cf272083dc5926ce6a250aee6ac768814f511ecb309ffe94fb0e2561ca1778e1c7fbd5824545477937618c8e66d32fd273f9b5e5e3fd143
 DIST llpp-26b_p20180114.tar.gz 170204 BLAKE2B c7f46491d69350e8e94b444f0be4d7375f5658cccded792ecce2a246c907ae98bcca45d73e3b6c15765bd926d559327491559b5e5eec63bf2645cba84f6ee0d3 SHA512 1bc544f4bae268f573c2c111b69f7129bd3d1c1c8cc635c06f76e12670ad9476b4c2a2776e3959203ab6e53ea8ad1c68be290619298f7ebc1ae8203875f88314
 EBUILD llpp-26b.ebuild 3115 BLAKE2B 03813d97d89259ddb09a0b7fc5f90ce7bfbb99464573aab532f8af232d33432b5a2406b8c455d34d2f2f87d0d6a1c095dd563ea7d419088ed83b1c594c77c9a0 SHA512 f7afd8b79aece96846f5bf5cedf3f4f3a92aa34aa9974f0243729da72f4470a942239af21c6697969b2401f4eb10743d498e425bdaacc0101775cc21cd348196
-EBUILD llpp-26b_p20180114.ebuild 3034 BLAKE2B 942e9c475792336fc386354774bd1c8c8f1e7a6b56c892af9a6b93c840bbb02159840dfb63df9c7dc14503399d1dbfb9132ad04f5ebb6704ab93ad70ab1aa9f7 SHA512 c4beb5daeba76088b37aafcad5d9e7833da46bae24ba5d706a47d7ca3f7824b589e4eff14d6857e0f66070243e96f0164800e0fa0bad394dd9665dc5f47a6297
+EBUILD llpp-26b_p20180114.ebuild 3033 BLAKE2B caebe9df3f7185cd9c965b341aef4b1c3484ac4ff80ff3812c6a09ce43750f9d99fc7cbb6360cdaf98cc63b2e87dcb4dad12855d62d33f5bbd0ae07b7fb24714 SHA512 a3cf494930b97aef03b93588217f2f7ec055f2fe1c56c875a31c3ece8c8ea45abe3cb8b002a9294f2cda67cfd869d872ba9ee7a5eeb1ede0de28274d3f88568e
 MISC metadata.xml 237 BLAKE2B f22c3926ba75c18fce7667217807f3710a315b12b1341622c949e7bc0056cd1cb403ea6c66d838675f3cb5dcd53d2fc4ec71425ec3f96aaffb94b70b73e99320 SHA512 ae2360aa6b1b00c67e0acea4935c02b64585b9a15e126fec9d5d99637021c542c0a495e5116205f3da287def46fa5b19cb1a7f3042c12c5f7a78d66d92fcb03f
diff --git a/app-text/llpp/llpp-26b_p20180114.ebuild b/app-text/llpp/llpp-26b_p20180114.ebuild
index 296e6579cdbd..4c39269b6b5b 100644
--- a/app-text/llpp/llpp-26b_p20180114.ebuild
+++ b/app-text/llpp/llpp-26b_p20180114.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://distfiles.gentoo.org/distfiles/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc x86"
 IUSE="+ocamlopt static"
 
 LIB_DEPEND=">=app-text/mupdf-1.12.0:0=[static-libs]
diff --git a/app-text/mupdf/Manifest b/app-text/mupdf/Manifest
index 50249ac2e9b9..154018127e67 100644
--- a/app-text/mupdf/Manifest
+++ b/app-text/mupdf/Manifest
@@ -2,6 +2,7 @@ AUX mupdf-1.10a-add-desktop-pc-xpm-files.patch 13387 BLAKE2B e0100380b328cfd8ce6
 AUX mupdf-1.11-CFLAGS.patch 234 BLAKE2B d1ee80c2315101b3210ad13a78eb920edec9e524809fb5aff43e5db045f63fdd881f2993184a0181f60118aacb5cfab41bd1f8daa13bec362fbca6cbb18bc4d2 SHA512 8c0ae23e14842cf089434c716733f26738def189fbbb44341b772c9993b9f73b269f4d7744d2ef90a285cd1b02d7f67e18f1146e91851fc4d8c118c49ef0dea2
 AUX mupdf-1.11-CVE-2017-6060.patch 675 BLAKE2B 525ddceb2c853df02418a2cfbd6ac27c5b79a405b18c8d847d5c4f7a75fcffe9dcb5600e4758a9f681d5b8cf7db25ef253f9586714be666093b804d16d47515a SHA512 1ff64fb7f8a527d643cb57b472bbc48b73769eb826acdb511a5f77877d748ee165bb0e072ad27b62af5e3b7fcb075595ff53812824c5b03e686f758d0d270bd3
 AUX mupdf-1.11-drop-libmupdfthird.patch 579 BLAKE2B a0a1ee93832135663c14a91bb181ddfdbb315b1f0a9864c834e4c69f52c0c16ed960705baa4c0067526a23d52dc0c681ed6308b1efb34d29242303d023109b48 SHA512 a51588eae9cd97f1d6abc6c41cf5daed7b3e43fe33a5aab756567effa1bbe24cea3b05cdb3a8d027820b13eb2f54e6121a1fafefbcbe1a7768b0ba1e83bf7aeb
+AUX mupdf-1.11-openssl-curl-x11-r1.patch 1087 BLAKE2B 919a3fd6e955f8aee13e0bbce1db634ad5a32ed5f3a37508be18f182e54bf0550725dc94903bf9d33545e6fd20fc4084cfc62968f9b425efca4c14b4d9c9a7f6 SHA512 d82cfa7adfe2f6853f9fb08ee4c952919b2eb829fd3da2e015cca6dfd7924d2c494f229f461a0e33db2e69ffea90385ab04394fef856668b7ccc338e3fb60f29
 AUX mupdf-1.11-openssl-curl-x11.patch 1087 BLAKE2B b56dde0f5f150d1697562b96e3bfdc1a004ba6fbb50ce2fd3561c3d1f1c5c9ec5b10ec789eaed7d0b73ed1c24a4025c7e99b3ed056513be0fc31607abd9a9f33 SHA512 f3441a4ef5548e11adda6984ed84c6fe6d337a9ac3b17456b8b1b620e51f134fd39f5cef969ffe43b1a3025b3b6026b7cfc6d7fcdccc464859e3bf931d253c82
 AUX mupdf-1.11-system-glfw.patch 288 BLAKE2B 809aaed6098f59f555b14b80cb7576bd77b6cc781f07b387f720d8a74446fc44d74f5fc87f252b12cfa07495e7cbbc872bb20250290896d798d7b792c1ed6e3f SHA512 8331c72323011be2905383af3e0d76653d2a8551da3b815730aa8287494d6f867cc82bc8e2ba9ca2f5bdbb301ca3aba775c946019567957246bab1a852cda75f
 AUX mupdf-1.12-CFLAGS.patch 276 BLAKE2B 20a2440cbd5a8b2cbd17204939d876c8e6df3329c54ad477257ce875a9a5483e859be58cc2b4c6b93f7491aa1cbf4ae1444e8c43af161076feefbd570412b09c SHA512 834481f055df4ca8edc2991acade0295e753d72d1f973e4250ce25f81d33ea08bc4c5fafcef203efe686abd313b78512a36b2ce7c4b5b835206136793ab0e9d7
@@ -11,5 +12,6 @@ DIST mupdf-1.11-source.tar.gz 40156070 BLAKE2B 2a9991a11355a449b91955bd897b5da17
 DIST mupdf-1.12.0-source.tar.gz 51508917 BLAKE2B c34df17f0df7a200897d678514ff4012e02b1cef71189fe48740948c88cb544c6ce80f52a5dc335d70002806a7b413e5f79a1edee88865e42daf76e49416d9bf SHA512 11ae620e55e9ebd5844abd7decacc0dafc90dd1f4907ba6ed12f5c725d3920187fc730a7fc33979bf3ff9451da7dbb51f34480a878083e2064f3455555f47d96
 EBUILD mupdf-1.11-r1.ebuild 4650 BLAKE2B f68c39d06fae959cc37de3a6eb03758f3b146eda42253a795b48ba56ddb887f76eb79d901745fe4b6ff16924436f3fd4699b4065ed7d1a33bf605dd8f4265173 SHA512 4c2b3d4c568b42335177ccd975b11e044a0887d6541c2b78f7b3d43b1bc9030dd35f1ff4d8c3c2d4278c3e06b78ee2acab975eeff2dc5c00516575dfad436b6e
 EBUILD mupdf-1.11-r2.ebuild 4773 BLAKE2B d30970c3d275a44ff46a971b707cba9f17d2d4da24e1699cac848be97fc82fb5433a8a09166239b67a3764d13843b91683f93ff0e604fffde27e18d9bb500e7e SHA512 af89cdf6f3a595b424c67225cfa57b9c6811b4cbd9d1cb032bcadf98468aacbce00a78d4479592477bcdc3f6ad6f14703b4ea3aeda3820be7d8893ce506e2214
+EBUILD mupdf-1.12.0-r2.ebuild 5154 BLAKE2B feeda98cabe81764b76269fca21cff56d88b2d9604415ef972adccfbf9809e39a7779a821134245db0b8d0b930eadfc2ec463adbe25f6f39889d6d5d5860764e SHA512 e8040bcca783d3fc0ab87892a4f8c96c8a403a63132af9a2539879c6fc0c447331b88cce72e07197dee5452eff276066c464ef65ffbf936b463befe861b127a4
 EBUILD mupdf-1.12.0.ebuild 5060 BLAKE2B d68da2df2e328e4f96560d28dc8a79b7cdcbc5be7761513cac5dce3f9cc01a09083c11dea7ced2b8ab4cf41a788eb4a80b890e683e2178b6caed48dd758273c3 SHA512 42bf1fec67bbee0aa84a20614d322640f4c92c54eb947f35957886111834031d4a45994aaf39ba4ea08c709823475bede42c9dc4b49099929414ce587e8eb020
 MISC metadata.xml 315 BLAKE2B b143559c33bb6e3b81fe4dd7df802d48470f9080987e6c888b96bfb3f17e51dd3beaeb5501941dbbc47e1a525900a4719dc42d3d457d391d725670ff201e0c5b SHA512 1f3d23236f716a9e02a4f320105a8cd36e0dc84e25e35764677b66f7ae42039e0ae6f82ef06635cb0fe53fbb2e27ab854e54d45280275b8235f186328daa2b4e
diff --git a/app-text/mupdf/files/mupdf-1.11-openssl-curl-x11-r1.patch b/app-text/mupdf/files/mupdf-1.11-openssl-curl-x11-r1.patch
new file mode 100644
index 000000000000..92845a0eef2f
--- /dev/null
+++ b/app-text/mupdf/files/mupdf-1.11-openssl-curl-x11-r1.patch
@@ -0,0 +1,37 @@
+--- mupdf-1.11-source/Makerules
++++ mupdf-1.11-source/Makerules
+@@ -116,12 +116,17 @@
+ SYS_PTHREAD_CFLAGS :=
+ SYS_PTHREAD_LIBS := -lpthread
+ 
++WANT_OPENSSL ?= yes
++ifeq "$(WANT_OPENSSL)" "yes"
+ ifeq "$(shell pkg-config --exists 'libcrypto <= 1.0.1t' && echo yes)" "yes"
+ HAVE_LIBCRYPTO := yes
+ SYS_LIBCRYPTO_CFLAGS := -DHAVE_LIBCRYPTO $(shell pkg-config --cflags libcrypto)
+ SYS_LIBCRYPTO_LIBS := $(shell pkg-config --libs libcrypto)
+ endif
++endif
+ 
++WANT_CURL ?= yes
++ifeq "$(WANT_CURL)" "yes"
+ ifeq "$(shell pkg-config --exists libcurl && echo yes)" "yes"
+ HAVE_CURL := yes
+ SYS_CURL_CFLAGS := $(shell pkg-config --cflags libcurl)
+@@ -133,12 +138,16 @@
+ endif
+ endif
+ SYS_CURL_DEPS += -lpthread -lrt
++endif
+ 
++WANT_X11 ?= yes
++ifeq "$(WANT_X11)" "yes"
+ ifeq "$(shell pkg-config --exists x11 xext && echo yes)" "yes"
+ HAVE_X11 := yes
+ SYS_X11_CFLAGS := $(shell pkg-config --cflags x11 xext)
+ SYS_X11_LIBS := $(shell pkg-config --libs x11 xext)
+ endif
++endif
+ 
+ ifeq "$(shell pkg-config --exists harfbuzz && echo yes)" "yes"
+ SYS_HARFBUZZ_CFLAGS := $(shell pkg-config --cflags harfbuzz)
diff --git a/app-text/mupdf/mupdf-1.12.0-r2.ebuild b/app-text/mupdf/mupdf-1.12.0-r2.ebuild
new file mode 100644
index 000000000000..24fbe8ee0af5
--- /dev/null
+++ b/app-text/mupdf/mupdf-1.12.0-r2.ebuild
@@ -0,0 +1,166 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic toolchain-funcs xdg
+
+DESCRIPTION="a lightweight PDF viewer and toolkit written in portable C"
+HOMEPAGE="https://mupdf.com/"
+SRC_URI="https://mupdf.com/downloads/${P}-source.tar.gz"
+
+LICENSE="AGPL-3"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="X +curl javascript lcms libressl opengl +openssl static static-libs vanilla"
+
+LIB_DEPEND="
+	!libressl? ( dev-libs/openssl:0=[static-libs?] )
+	libressl? ( dev-libs/libressl:0=[static-libs?] )
+	javascript? ( >=dev-lang/mujs-0_p20160504 )
+	media-libs/freetype:2=[static-libs?]
+	media-libs/harfbuzz:=[static-libs?]
+	media-libs/jbig2dec:=[static-libs?]
+	media-libs/libpng:0=[static-libs?]
+	>=media-libs/openjpeg-2.1:2=[static-libs?]
+	net-misc/curl[static-libs?]
+	virtual/jpeg[static-libs?]
+	X? ( x11-libs/libX11[static-libs?]
+		x11-libs/libXext[static-libs?] )
+	opengl? ( >=media-libs/freeglut-3.0.0:= )"
+RDEPEND="${LIB_DEPEND}"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	static-libs? ( ${LIB_DEPEND} )
+	static? ( ${LIB_DEPEND//?}
+		app-arch/bzip2[static-libs]
+		x11-libs/libXau[static-libs]
+		x11-libs/libXdmcp[static-libs]
+		x11-libs/libxcb[static-libs] )"
+
+REQUIRED_USE="opengl? ( !static !static-libs )"
+
+S=${WORKDIR}/${P}-source
+
+PATCHES=(
+		"${FILESDIR}"/${PN}-1.12-CFLAGS.patch
+		"${FILESDIR}"/${PN}-1.9a-debug-build.patch
+		"${FILESDIR}"/${PN}-1.10a-add-desktop-pc-xpm-files.patch
+		"${FILESDIR}"/${PN}-1.11-openssl-curl-x11-r1.patch
+		"${FILESDIR}"/${PN}-1.11-drop-libmupdfthird.patch
+)
+
+src_prepare() {
+	xdg_src_prepare
+	use hppa && append-cflags -ffunction-sections
+
+	# specialized lcms2, keep it if wanted inside lubmupdfthird
+	if ! use lcms ; then
+		rm -rf thirdparty/lcms2
+	fi
+
+	rm -rf thirdparty/{README,curl,freeglut,freetype,harfbuzz,jbig2dec,libjpeg,mujs,openjpeg,zlib} || die
+	for my_third in thirdparty/* ; do
+		ewarn "Bundled thirdparty lib: ${my_third}"
+	done
+
+	if has_version ">=media-libs/openjpeg-2.1:2" ; then
+		# Remove a switch, which prevents using shared libraries for openjpeg2.
+		# See http://www.linuxfromscratch.org/blfs/view/cvs/pst/mupdf.html
+		sed '/OPJ_STATIC$/d' -i source/fitz/load-jpx.c
+	fi
+
+	use javascript || \
+		sed -e '/* #define FZ_ENABLE_JS/ a\#define FZ_ENABLE_JS 0' \
+			-i include/mupdf/fitz/config.h
+
+	sed -e "/^libdir=/s:/lib:/$(get_libdir):" \
+		-e "/^prefix=/s:=.*:=${EROOT}/usr:" \
+		-i platform/debian/${PN}.pc || die
+
+	use vanilla || eapply \
+		"${FILESDIR}"/${PN}-1.3-zoom-2.patch
+
+	sed -e "1iOS = Linux" \
+		-e "1iCC = $(tc-getCC)" \
+		-e "1iLD = $(tc-getCC)" \
+		-e "1iAR = $(tc-getAR)" \
+		-e "1iverbose = yes" \
+		-e "1ibuild = debug" \
+		-e "1iprefix = ${ED}usr" \
+		-e "1ilibdir = ${ED}usr/$(get_libdir)" \
+		-e "1idocdir = ${ED}usr/share/doc/${PF}" \
+		-i Makerules || die
+
+	if use static-libs || use static ; then
+		cp -a "${S}" "${S}"-static || die
+		#add missing Libs.private for xcb and freetype
+		sed -e 's:\(pkg-config --libs\):\1 --static:' \
+			-e '/^SYS_X11_LIBS = /s:\(.*\):\1 -lpthread:' \
+			-e '/^SYS_FREETYPE_LIBS = /s:\(.*\):\1 -lbz2:' \
+			-i "${S}"-static/Makerules || die
+	fi
+
+	my_soname=libmupdf.so.${PV}
+	my_soname_js_none=libmupdf-js-none.so.${PV}
+	sed -e "\$a\$(MUPDF_LIB): \$(MUPDF_JS_NONE_LIB)" \
+		-e "\$a\\\t\$(QUIET_LINK) \$(CC) \$(LDFLAGS) --shared -Wl,-soname -Wl,${my_soname} -Wl,--no-undefined -o \$@ \$^ \$(MUPDF_JS_NONE_LIB) \$(LIBS)" \
+		-e "/^MUPDF_LIB =/s:=.*:= \$(OUT)/${my_soname}:" \
+		-e "\$a\$(MUPDF_JS_NONE_LIB):" \
+		-e "\$a\\\t\$(QUIET_LINK) \$(CC) \$(LDFLAGS) --shared -Wl,-soname -Wl,${my_soname_js_none} -Wl,--no-undefined -o \$@ \$^ \$(LIBS)" \
+		-e "/install/s: COPYING : :" \
+		-i Makefile || die
+}
+
+src_compile() {
+	use lcms && emake XCFLAGS="-fpic" third
+	emake XCFLAGS="-fpic" \
+		HAVE_GLUT=$(usex opengl yes no) \
+		HAVE_MUJS=$(usex javascript) \
+		MUJS_LIBS=$(usex javascript -lmujs '') \
+		WANT_CURL=$(usex curl) \
+		WANT_OPENSSL=$(usex openssl) \
+		WANT_X11=$(usex X)
+
+	use static-libs && \
+		emake -C "${S}"-static build/debug/lib${PN}{,-js-none}.a
+	use static && \
+		emake -C "${S}"-static XLIBS="-static"
+}
+
+src_install() {
+	if use X || use opengl ; then
+		domenu platform/debian/${PN}.desktop
+		doicon platform/debian/${PN}.xpm
+	else
+		rm docs/man/${PN}.1
+	fi
+
+	emake install \
+		HAVE_GLUT=$(usex opengl yes no) \
+		HAVE_MUJS=$(usex javascript) \
+		MUJS_LIBS=$(usex javascript -lmujs '') \
+		WANT_CURL=$(usex curl) \
+		WANT_OPENSSL=$(usex openssl) \
+		WANT_X11=$(usex X)
+
+	dosym ${my_soname} /usr/$(get_libdir)/lib${PN}.so
+
+	use static-libs && \
+		dolib.a "${S}"-static/build/debug/lib${PN}{,-js-none}.a
+	if use static ; then
+		dobin "${S}"-static/build/debug/mu{tool,draw}
+		use X && dobin "${S}"-static/build/debug/${PN}-x11
+	fi
+	if use opengl ; then
+		einfo "mupdf symlink points to mupdf-gl (bug 616654)"
+		dosym ${PN}-gl /usr/bin/${PN}
+	elif use X ; then
+		einfo "mupdf symlink points to mupdf-x11 (bug 616654)"
+		dosym ${PN}-x11 /usr/bin/${PN}
+	fi
+	insinto /usr/$(get_libdir)/pkgconfig
+	doins platform/debian/${PN}.pc
+
+	dodoc README CHANGES CONTRIBUTORS
+}
diff --git a/app-text/po4a/Manifest b/app-text/po4a/Manifest
index dcee3756cbc1..71bcafba18b2 100644
--- a/app-text/po4a/Manifest
+++ b/app-text/po4a/Manifest
@@ -1,6 +1,4 @@
 AUX po4a-0.45-614122-no-dot-inc.patch 473 BLAKE2B 1ff10a5637d25c57500b6cb953442bf8e9ddd57f778e8772ffbed27e9d5a98be6d55f77e7665b0ab7fd975d886bd2893a432c6c9c9713a090a37727cecf0f3f7 SHA512 0a651b9de200b3ca08b3c849f24eba6cfbac93dd5f35911c9bf2aade174cbec27ad2c5a061a628db1b308dc9c576e2dad3db71da9a507d6337bed9ce620ad042
-DIST po4a_0.45.orig.tar.gz 2208959 BLAKE2B f5fd533036eac41aa15413559bab7fb176556b47d63fe7bae4a98797a128f8314f6a22076fd1792d1ae19d8aad27599508064ec8323b6fe8ffd433989541151e SHA512 e67334b7a45d3c23b7226077e01e12b3c4f1202531596f02851b6a9e7249b2b8a0c37f37ebbaf591753f041a4c6ce42c062b4822e91ac75884dcd0994c27323f
 DIST po4a_0.47.orig.tar.gz 2389750 BLAKE2B 72cd81e10f638a660e201b0c733b08c316aa75dd29b054bbc4c645c265b9e7745ce762305a8296f8cc37d2f182755dfa1394861f6c471cff1c7c398d13ac28cc SHA512 9c459a9795977a39aacc09cfb6ddbdc7dd2174e22896fa7bde90510a43ea833054aef558f7ca798991addc052a2c7f91ee11e5d49658a5c80a9ecb9c135ff97a
-EBUILD po4a-0.45-r3.ebuild 1980 BLAKE2B 3840a33a5c574b1f853a6ac582a93cd0f51f90c36fce29dd74be8a8432d5a4a923046b173a59a5b9cb3040e91fc44624ddfdea9e125399d1349c35c835079b62 SHA512 28547b542eb7ddc4125f9d6c1d1cd9efa3f0db8498beffde5ffe0f8ff9bd2223ff2e43d7b8f0d71571f6a91487c3259941cc1b5c217bcb8b01a443093cdde26e
 EBUILD po4a-0.47-r1.ebuild 1662 BLAKE2B 17b708bc9d3273f52f83bd4fe9d8907b1acc057b538592e35a9c2a833b9b395518834790099b18fe4cf55925ae099a09fc35788824511a5d5fe988d87b680a9e SHA512 46f6631a4ee4a081fb6526516713e801366da5e0bdd5c957fac9d3eb862f00a8d780a4de90fecc9af40349ab5f27bbc3991800e782c5174e4beb3d0e4d01a2dd
-MISC metadata.xml 359 BLAKE2B 595b8f927db22fe76f8ad8d6346cea457f50a139a794480ccc41b43a3091b34f4799f1058b1e00a5a937d688681364d3d7c83ba1e2b4b62d555d54e0c600d887 SHA512 aea1ab25da9b3d9c4b0080912a0260d642f91a4c58c608e7b091fdaaf40aa8bd9c7c0237f2cb90227826c1bda9931ab3d307a42354b5fd3172e07ea676e2f566
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-text/po4a/metadata.xml b/app-text/po4a/metadata.xml
index 4153ed21dbec..6f49eba8f496 100644
--- a/app-text/po4a/metadata.xml
+++ b/app-text/po4a/metadata.xml
@@ -1,12 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-	<email>fatzer2@gmail.com</email>
-	<name>Alexander Golubev</name>
-</maintainer>
-<maintainer type="project">
-	<email>proxy-maint@gentoo.org</email>
-	<name>Proxy Maintainers</name>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/app-text/po4a/po4a-0.45-r3.ebuild b/app-text/po4a/po4a-0.45-r3.ebuild
deleted file mode 100644
index 3523e66bb77e..000000000000
--- a/app-text/po4a/po4a-0.45-r3.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PLOCALES="af ca cs da de eo es et eu fr hr id it ja kn ko nb nl pl pt_BR pt ru sl sv uk vi zh_CN zh_HK"
-PLOCALES_BACKUP="en"
-
-# Needed because this package also installs to vendor_perl
-GENTOO_DEPEND_ON_PERL_SUBSLOT="yes"
-inherit perl-app perl-module l10n
-
-DESCRIPTION="Tools for helping translation of documentation"
-HOMEPAGE="http://po4a.alioth.debian.org"
-SRC_URI="mirror://debian/pool/main/p/po4a/${PN}_${PV}.orig.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
-IUSE="test"
-
-RDEPEND="dev-perl/SGMLSpm
-	>=sys-devel/gettext-0.13
-	app-text/openjade
-	dev-libs/libxslt
-	dev-perl/Locale-gettext
-	dev-perl/TermReadKey
-	dev-perl/Text-WrapI18N"
-DEPEND="${RDEPEND}
-	>=dev-perl/Module-Build-0.380.0
-	app-text/docbook-xsl-stylesheets
-	app-text/docbook-xml-dtd:4.1.2
-	test? ( app-text/docbook-sgml-dtd
-		app-text/docbook-sgml-utils
-		virtual/tex-base )"
-
-SRC_TEST="do"
-
-src_prepare() {
-	# Check against locale files in ${S}/pod/bin for mismatches
-	# with languages listed in PLOCALES
-	local locales_path="$S/po/bin"
-	l10n_find_plocales_changes "$locales_path" "" ".po"
-
-	# Array containing locale files to remove
-	local locales_to_remove=( )
-
-	# Get rid of disabled locales
-	my_get_disabled_locales() {
-		locales_to_remove=( "${locales_to_remove[@]}" "po/bin/${1}.po" "po/pod/${1}.po" )
-	}
-
-	l10n_for_each_disabled_locale_do my_get_disabled_locales
-
-	einfo "Your LINGUAS lists the following languages: $LINGUAS"
-	einfo "Removing locale files not listed in it ..."
-
-	# Fix bad escaping of '.' in @INC modification
-	epatch "${FILESDIR}/${P}-614122-no-dot-inc.patch"
-
-	# perl_rm_files also updates the Manifest file
-	# and therefore silences Perl as to .po files we're about to clean
-	perl_rm_files "${locales_to_remove[@]}"
-}
diff --git a/app-text/yodl/Manifest b/app-text/yodl/Manifest
index 56c56998f731..e345fce93036 100644
--- a/app-text/yodl/Manifest
+++ b/app-text/yodl/Manifest
@@ -1,5 +1,5 @@
 DIST yodl-4.01.00.tar.gz 288932 BLAKE2B 71491eaedae9cf0b6bc65f1da3065bc2a90e9ff5f527cbac66a714c761e679600635f7f10b0f20b7e1a15413c1930ee6e64e5ec083226058b6c8822e4a445437 SHA512 f195dec8e03b83561b47f9bd00fbb0fe711bbc254c32413d748587d8bf3848e050b90a2140977bec5a335021b2ef49ec5a6b0ca89f1649def495d81c3e7b437f
 DIST yodl-4.02.00.tar.gz 308567 BLAKE2B bf64ff7248ddcdc17dec23fe4407c28edf604b76746f13e97dfbb470421c15ca6235747c9ef349925a0293f8503d319a637a11352a2987f161fb2bcab60ddf7e SHA512 ca3a2490bf54a0ce4e800a62a3de9a5cf37df96f0f553de89623ef6d36f07b65b7c09168e77d267d7fb79d900a8e8a6c6d3c17c4b733345001213f5450c02b13
 EBUILD yodl-4.01.00.ebuild 1136 BLAKE2B 2311cafeb275140c3caff1006836c89bb15a628ee72197103244a904bd56aa5bf9911e681edd073ccde6e1eb24b7e1473e5106fef5b74e8bb5581c0e9e7cfd6f SHA512 dbd05b7eab771c07e1d57d113d165f0bc54e47fd0762ae5dbcd908c8ced6b29000d3b5c241813126b1d0b33efbbfe2fb14cb98eb7ec5f2beff3afa5cd188b6c9
-EBUILD yodl-4.02.00.ebuild 1136 BLAKE2B 694047ca19bf5e71ad50558923df9dcb523218829970312d594cc522e24f451b70e5e3d34c0fd96322fd2f423b5c9551a34a3a5edc5562bf4eed3b0e1f0af2ec SHA512 2b07686c118212aec338b1e9f760a82afce29d8d48890c58c4ebd66aba15e2abfeaf582b9cb0359165c1d74fc9e87f5f1be1dce70c250ef203023e987fc92591
+EBUILD yodl-4.02.00.ebuild 1192 BLAKE2B 5e1a1b4b8f8c1dca81c70f15d6b2cef95be19e27708c0ec87081bf3292d062beebb98dfc2b6065a057d3b6b2e7bf0c89787046cad2d146d4cd71b9a51f5ca1fa SHA512 8978742891afabfcd2c18e76bd0cc98239fff3f305af890b033efa852f7b7853317cb7d1887d2ac5175a162a174a6080c307af200d189b11c7859a968a7880ca
 MISC metadata.xml 372 BLAKE2B 65ba0511a2e235b9d929f861708f75e472a4a79a489c1ec6b58ba0e48f867aa85e0419bde877b648dc6863134b27484f1bfd78f1d87414fd488037dd103e86c3 SHA512 12928d8f1683c8158ad34c23c10670585705055f8360861ea2cf09078811d07d74699515f2903a388e00920916e7b6100865fa39cbefb49a86a214b77d74dd04
diff --git a/app-text/yodl/yodl-4.02.00.ebuild b/app-text/yodl/yodl-4.02.00.ebuild
index 99795591e6d6..b49b2b6193d4 100644
--- a/app-text/yodl/yodl-4.02.00.ebuild
+++ b/app-text/yodl/yodl-4.02.00.ebuild
@@ -23,6 +23,7 @@ src_prepare() {
 		-e "/COMPILER =/s/gcc/$(tc-getCC)/" \
 		-e "/CXX =/s/g++/$(tc-getCXX)/" \
 		-i INSTALL.im || die
+	sed -i "s/g++/$(tc-getCXX)/" verbinsert/icmconf || die
 
 	sed -e "s/ar r /$(tc-getAR) r /" \
 		-e "s/ranlib/$(tc-getRANLIB)/" \
diff --git a/app-text/zathura-cb/Manifest b/app-text/zathura-cb/Manifest
index 2a55cac713c4..aa2d113f4fbe 100644
--- a/app-text/zathura-cb/Manifest
+++ b/app-text/zathura-cb/Manifest
@@ -1,6 +1,6 @@
 DIST zathura-cb-0.1.6.tar.gz 7205 BLAKE2B 57fa7c8d54cdfdd717d89b8341139c70c86921a65b328a59f1e382d4c8ea03c041184f065e092ec98fff577c029363430b32db95a3b034cbeb19eb51b07d3948 SHA512 986293957b6bc5e5fe7033bb7c91e857b1089fe1a041eb39e516b4e906c2619d22d7ebfa0bfaba982cc6145cba4c6a2af01be810c6da71f4c862fb42bc91f230
 DIST zathura-cb-0.1.7.tar.gz 6971 BLAKE2B 814b0ff8e3d33c85e06ceb3abb315aa16464efda8a5c60554eb7ac8ce3babcf33daea5122e1ca201c1fbffb616a1eea79ba40b74e0c325ec23a7c2dd249d2e6f SHA512 a48c70bf534a8798d94c1b15382dad229d37ea5f5cbef8382ce87a4366c3607609577f10a8eeb2056e2aa539014e6411e08c879f5359f80ff676cb55c6ae9af2
 EBUILD zathura-cb-0.1.6.ebuild 1167 BLAKE2B 7fd39375ad96f761bd5122bfafb12c1c4510f914759540b71bc6bbe5f8932b3204ad63ef44749982568bba07478fe47bad309e97b16e18e7cb902457366b34bb SHA512 d6066874e0b39ef1fbeed2b41a3c8e6c9954ccef71d5fa60c7ccb4c25cbfbdff3629b1dad4b406304d5f176ffb0fcd37a85eb1f5261ef89d5e6509076de980aa
-EBUILD zathura-cb-0.1.7.ebuild 1192 BLAKE2B 53243b7172662190ae962416538b62d70484e6c3bb27223b2b4261dc74d2d58473e15431f9d17cea0798ec5fe6c6f62d6507ba24fc448c3cb02e4d9be71008f8 SHA512 491b07c8560671e5fb9d291878e9300cab7512e921e82fc3fdd11b6ef4f11e62c8f28f65279e6bcd138d5a79ecf3e014c13b043aeabe7913d18b751074de3310
+EBUILD zathura-cb-0.1.7.ebuild 1191 BLAKE2B 664244593b5f2a69b4316fa8bbfc302f164121d41d1f67422a593d695136fb604437250f5f2c6a70a0c29bfcc1caef052ce2ae4bcbef3436c7880b9cb2d2ad57 SHA512 ed96d22acda27f5afbeca6a05a7fe215ee27fa7af092c1b5e5941bc2997d1b32d2347a96baf1833a1abf49df824c019a417109ae762da2e8a2f168911935eba9
 EBUILD zathura-cb-9999.ebuild 1192 BLAKE2B 53243b7172662190ae962416538b62d70484e6c3bb27223b2b4261dc74d2d58473e15431f9d17cea0798ec5fe6c6f62d6507ba24fc448c3cb02e4d9be71008f8 SHA512 491b07c8560671e5fb9d291878e9300cab7512e921e82fc3fdd11b6ef4f11e62c8f28f65279e6bcd138d5a79ecf3e014c13b043aeabe7913d18b751074de3310
 MISC metadata.xml 702 BLAKE2B 494044f73e5201e73328ba0f0ab58cd40ae7860127449aaed63e96ec0962a3e2c5cc2b617dd58c73c9226d5ca7e1237f94064eb8dab48fe1a88e8c50bfb40216 SHA512 0f416ccc5110783602c76a1b2670f22c15104a2868d23b635180faf4993d3879198c04fc29e7a8d23b13105bd6b2268d9d7877a0e36dbab1726919b3d5c0a37f
diff --git a/app-text/zathura-cb/zathura-cb-0.1.7.ebuild b/app-text/zathura-cb/zathura-cb-0.1.7.ebuild
index 4c3f58bbc0cf..b9024c4ed2df 100644
--- a/app-text/zathura-cb/zathura-cb-0.1.7.ebuild
+++ b/app-text/zathura-cb/zathura-cb-0.1.7.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura-cb.git"
 	EGIT_BRANCH="develop"
 else
-	KEYWORDS="~amd64 ~arm ~x86"
+	KEYWORDS="~amd64 ~arm x86"
 	SRC_URI="http://pwmt.org/projects/zathura/plugins/download/${P}.tar.gz"
 fi
 
diff --git a/app-text/zathura-djvu/Manifest b/app-text/zathura-djvu/Manifest
index 84810baa41bf..20da1045784b 100644
--- a/app-text/zathura-djvu/Manifest
+++ b/app-text/zathura-djvu/Manifest
@@ -1,6 +1,6 @@
 DIST zathura-djvu-0.2.6.tar.gz 11137 BLAKE2B 23efc23cd53068abb3e118d6dc9b1e875c3f292d2e7ab49abbf6c599d6241c37959e9f74ac2b0f06838cadca0a07e39e1dda2e188f6861b72d4cd7a4bb1fcc62 SHA512 8534faa0de896ffea8d8d6f2d0c22697f2fd6ae3f73e955f5077e0a0656c13fd8823580f1b89c4b5aebb5189c69642ef690fc9167be178ce9533e9bb5d483dac
 DIST zathura-djvu-0.2.7.tar.gz 10909 BLAKE2B 6a55927aa99ec5d29b8f24922c4871c050c25f6c166ee3435390488deefd13f1f81f4286a0c3cd348e4f550e1b4082b9a7c5c7cce40371f8fb62074c87a2d372 SHA512 f0a33f53caced4cb90354e431d180a3b357db300ba5a376051e45f5409e8476105640e92768c2a31bdbbb0b37dea05df24a6489799c556e30336013f807b28b6
 EBUILD zathura-djvu-0.2.6.ebuild 869 BLAKE2B e808ea94258c503b48549c6dd56c1f037454ef06721b3c703ee20665dd14560765d02e0f838a3d79cce7f642c0b2fedb9bb11b848ce346fb2af1f685b4dfb377 SHA512 dabaa16d72e7281c7ed9cf8deda8fb011401127f671738bcbc1f9c370bd16147acfe716c01a5e1011be19f4bda718eda25800cdc7728f52c6ea475febcde2ce0
-EBUILD zathura-djvu-0.2.7.ebuild 876 BLAKE2B c0332a2c39389801dc8bbcfe42ed6aab193f23eccb43a29fce315c025f787cb47d3ee7945e2798b5b4407f5a63355a4c810e317a2b5c9826d3403bf660cce38b SHA512 e317ca99924d3e1c8a59e2f95ff91cb348b6e4dc310399f646d90b720c97e633f504508b63193fad90a7f9ec1c475253174ca4b9966b2b14ff7d6c9bcc58bed5
+EBUILD zathura-djvu-0.2.7.ebuild 875 BLAKE2B 75c4a5fd3665d0befd66abba823aef857ebfba3427ff611efc7c2cf9af5f099332aca03b1bc8115efdcb9683f81d33b8c4a80f50e5c5384cc36c537670ada5fc SHA512 eb7a2e662e6f4b285e213938cc590c18af356e925ed6a3ba47c843a0ed2c316daccae8e57ee18995a6a461e37d7af83fdc0183993f6a8c4bc0ffbc46d4ba9b01
 EBUILD zathura-djvu-9999.ebuild 876 BLAKE2B c0332a2c39389801dc8bbcfe42ed6aab193f23eccb43a29fce315c025f787cb47d3ee7945e2798b5b4407f5a63355a4c810e317a2b5c9826d3403bf660cce38b SHA512 e317ca99924d3e1c8a59e2f95ff91cb348b6e4dc310399f646d90b720c97e633f504508b63193fad90a7f9ec1c475253174ca4b9966b2b14ff7d6c9bcc58bed5
 MISC metadata.xml 702 BLAKE2B 494044f73e5201e73328ba0f0ab58cd40ae7860127449aaed63e96ec0962a3e2c5cc2b617dd58c73c9226d5ca7e1237f94064eb8dab48fe1a88e8c50bfb40216 SHA512 0f416ccc5110783602c76a1b2670f22c15104a2868d23b635180faf4993d3879198c04fc29e7a8d23b13105bd6b2268d9d7877a0e36dbab1726919b3d5c0a37f
diff --git a/app-text/zathura-djvu/zathura-djvu-0.2.7.ebuild b/app-text/zathura-djvu/zathura-djvu-0.2.7.ebuild
index 06d973da811e..9d88eeddb79e 100644
--- a/app-text/zathura-djvu/zathura-djvu-0.2.7.ebuild
+++ b/app-text/zathura-djvu/zathura-djvu-0.2.7.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura-djvu.git"
 	EGIT_BRANCH="develop"
 else
-	KEYWORDS="~amd64 ~arm ~x86"
+	KEYWORDS="~amd64 ~arm x86"
 	SRC_URI="http://pwmt.org/projects/zathura/plugins/download/${P}.tar.gz"
 fi
 
diff --git a/app-text/zathura-pdf-mupdf/Manifest b/app-text/zathura-pdf-mupdf/Manifest
index e04cd6ef5e4f..cc6912248125 100644
--- a/app-text/zathura-pdf-mupdf/Manifest
+++ b/app-text/zathura-pdf-mupdf/Manifest
@@ -1,6 +1,6 @@
 DIST zathura-pdf-mupdf-0.3.1.tar.gz 9755 BLAKE2B bbacecd503bda14301e1111799bf8fd82aa1488d4db5a28db7c0805b1e1391c038be64a0f4c64be974c2173396f972115ec6300686f34ac9b8b3e7e091d7ae5c SHA512 87b5b8a750a6911be37a0195b0f4bc3304350f9d29173091b3eeece40350b10cb98b009b2722a69ae1e617b4242292f3eba17fea97d5276e485069180f2bd67d
 DIST zathura-pdf-mupdf-0.3.2.tar.gz 9687 BLAKE2B 53ec5997c69ee160f60b90ba83ab15bff55fcd14f22b34cd54bf226a57d71d1fc95e62c2daac97f0285eee6bf6cd71e9c49a5f97920d19860c58bcc9d568deae SHA512 f6273923d0c1d7f6fad5cc3369c35fff9f87dabcb726d5ab4f814775f5e8783c552cbac7ad1381f3c6d91753698d64a96c7e76e0b8b5a16d9c28147fbdeb3089
 EBUILD zathura-pdf-mupdf-0.3.1.ebuild 1093 BLAKE2B d394921870e0cd321d0b98648ae1676787393fd3967ad7885d7f8e21b46843b0f488a49c63343bbd4adcc38af46e99d6fcfe189754fdbefdd3dc7d6fdfc77fbb SHA512 7e4d97e84f2ed0feca1d0778199e731aa205606d3c573816841ed0f53fd14b8642280de00ab1830d5d066c16773b71e8484c9d92cb04412191fd0ef55ef3c634
-EBUILD zathura-pdf-mupdf-0.3.2.ebuild 1075 BLAKE2B 57f54296611fdab7fc827ba64a5529919d532e7e89fd6210b5547e02633c55ab6ba75edc2c6efd8d47c9684c37f020cbcccdd71cfe7b3ba2ecf318109880da06 SHA512 231cd7f38a3b2d6e86ee9e3749d85ea17d50dd1f31c9ff5247079ecd7b0ccb5fd2184794849f3edbb5e4fe5ae06fbbc4544345179f04f10f179f00007fe454b9
+EBUILD zathura-pdf-mupdf-0.3.2.ebuild 1074 BLAKE2B f138c6a355e429392c6c63ad1bd4b81564eb9f1bd0692e3d59d521c8bdf22d2e4a6803940342bcd9c4da8301855424f18aa20eba2f276042da196dbd93e903f5 SHA512 eac62abe4919cf6b43b6690adaad5fb2dc56c6730d5b2d2e2d31aef31ed0ea554fc03a0b16e07ead116ada32ed09dcb63d8ab9181f4d397f7a49f680cbebd952
 EBUILD zathura-pdf-mupdf-9999.ebuild 1075 BLAKE2B 57f54296611fdab7fc827ba64a5529919d532e7e89fd6210b5547e02633c55ab6ba75edc2c6efd8d47c9684c37f020cbcccdd71cfe7b3ba2ecf318109880da06 SHA512 231cd7f38a3b2d6e86ee9e3749d85ea17d50dd1f31c9ff5247079ecd7b0ccb5fd2184794849f3edbb5e4fe5ae06fbbc4544345179f04f10f179f00007fe454b9
 MISC metadata.xml 702 BLAKE2B 494044f73e5201e73328ba0f0ab58cd40ae7860127449aaed63e96ec0962a3e2c5cc2b617dd58c73c9226d5ca7e1237f94064eb8dab48fe1a88e8c50bfb40216 SHA512 0f416ccc5110783602c76a1b2670f22c15104a2868d23b635180faf4993d3879198c04fc29e7a8d23b13105bd6b2268d9d7877a0e36dbab1726919b3d5c0a37f
diff --git a/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.3.2.ebuild b/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.3.2.ebuild
index 6ff77ca5cd96..1b7fde23fa81 100644
--- a/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.3.2.ebuild
+++ b/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.3.2.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura-pdf-mupdf.git"
 	EGIT_BRANCH="develop"
 else
-	KEYWORDS="~amd64 ~arm ~x86"
+	KEYWORDS="~amd64 ~arm x86"
 	SRC_URI="http://pwmt.org/projects/zathura/plugins/download/${P}.tar.gz"
 fi
 
diff --git a/app-text/zathura-pdf-poppler/Manifest b/app-text/zathura-pdf-poppler/Manifest
index f1f1a56c019f..3f72a287e313 100644
--- a/app-text/zathura-pdf-poppler/Manifest
+++ b/app-text/zathura-pdf-poppler/Manifest
@@ -1,6 +1,6 @@
 DIST zathura-pdf-poppler-0.2.7.tar.gz 9610 BLAKE2B ed0921545cfa435f47e45db223a469e80485ae3716ff20bb1fd213cd689eb5754935644198289a4fbe44cf30e837093e5f5568f714e66d4a3de11d53adfda5fb SHA512 815ef775059652337ca91ef6a089fa51105bbd3ac649ecd167da7da2a6ac62f617d04e85dbeb311ab47d86929338d8656037bcabc1177435804035914c6dfbdb
 DIST zathura-pdf-poppler-0.2.8.tar.gz 9504 BLAKE2B fc7ac4b4789f23d03b084dd90489c2b6e6fa0a93814140cf563fb826ed5bc7bad2cdcbf100cc6c2e708ecabd85be177c88a4faf9a0fc910bbfcddc1a515a7373 SHA512 644a36e31f89ee87a4d9bd50d5f9e209f06b6755af00009756422c89ad2ab50a97dd2c03a037b4e22bcf04bd620bd5b5ea55db7c380da9d3cebe0d1c00e18b9b
 EBUILD zathura-pdf-poppler-0.2.7.ebuild 854 BLAKE2B 48cd2dbd815496570c0826fb6f265b5b983f203689a5351c3a0a948ed9cd61d3b515940c755a2c297dbe294b6fd8b9cc732970ed2e24d7181d43a3a235a39f41 SHA512 8f1064fd8da384e347980adaf2370ea1e60eab857e50038ca16718768ccab732cfb95d5aef1fe1fcc53758e5ac872c3d0d787eae14bbbd76670e9679223f6396
-EBUILD zathura-pdf-poppler-0.2.8.ebuild 861 BLAKE2B 5237bbfc9f3202dd7178a2a37abaaac0d67af71344823969175d7b677387ab1040d6a1fbd83d6927aee6faa95f9e2e36b4fb1bc5a348bf007ebbbbf0b363c8dc SHA512 e451c62dd3fae3610b36b0511bcdf760d70cb27b56fe2c75b57151fd9fab7c714e83ba511c3f2e622e0d8467d4c3c4d40593eb882cbfba69712af7e140104e0f
+EBUILD zathura-pdf-poppler-0.2.8.ebuild 860 BLAKE2B 60bb8cc8f9d78dd4391f17e18835e3e4017d95defa01c786d58a44357197eed5168cc31baaacc5f7cd62cec729c9737a9db446343c69469a3b8c3bf67161d746 SHA512 51d322220e71b566efb5937431b3a796433b7a13288bd05589c65cfe4f6ea5ab6d3b961e9828798d60ef207424c9eac9d52a58c2ba86fc6a61d8cc306eec7c53
 EBUILD zathura-pdf-poppler-9999.ebuild 861 BLAKE2B 5237bbfc9f3202dd7178a2a37abaaac0d67af71344823969175d7b677387ab1040d6a1fbd83d6927aee6faa95f9e2e36b4fb1bc5a348bf007ebbbbf0b363c8dc SHA512 e451c62dd3fae3610b36b0511bcdf760d70cb27b56fe2c75b57151fd9fab7c714e83ba511c3f2e622e0d8467d4c3c4d40593eb882cbfba69712af7e140104e0f
 MISC metadata.xml 702 BLAKE2B 494044f73e5201e73328ba0f0ab58cd40ae7860127449aaed63e96ec0962a3e2c5cc2b617dd58c73c9226d5ca7e1237f94064eb8dab48fe1a88e8c50bfb40216 SHA512 0f416ccc5110783602c76a1b2670f22c15104a2868d23b635180faf4993d3879198c04fc29e7a8d23b13105bd6b2268d9d7877a0e36dbab1726919b3d5c0a37f
diff --git a/app-text/zathura-pdf-poppler/zathura-pdf-poppler-0.2.8.ebuild b/app-text/zathura-pdf-poppler/zathura-pdf-poppler-0.2.8.ebuild
index ca0b8305c134..dc47bab8a3dd 100644
--- a/app-text/zathura-pdf-poppler/zathura-pdf-poppler-0.2.8.ebuild
+++ b/app-text/zathura-pdf-poppler/zathura-pdf-poppler-0.2.8.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura-pdf-poppler.git"
 	EGIT_BRANCH="develop"
 else
-	KEYWORDS="~amd64 ~arm ~x86"
+	KEYWORDS="~amd64 ~arm x86"
 	SRC_URI="http://pwmt.org/projects/zathura/plugins/download/${P}.tar.gz"
 fi
 
diff --git a/app-text/zathura-ps/Manifest b/app-text/zathura-ps/Manifest
index fa6831df94e1..7cc0e3619f99 100644
--- a/app-text/zathura-ps/Manifest
+++ b/app-text/zathura-ps/Manifest
@@ -1,6 +1,6 @@
 DIST zathura-ps-0.2.4.tar.gz 5980 BLAKE2B ee60ebeea519eb618081816d0f0109cd5c327f5a4676e9260ec5b0d6c309368fe611a3bcb8dbefd7bd9661207630529311eebb1f54f4814eebf18378b640825e SHA512 c63cbd4ff032cffa85305393a8e7f2864986e3a8204832cd7f9f12878e2c69fd0393ace91dd7b0fa8829f3a785abc2675d2ecb99dfa71794d699b567be954922
 DIST zathura-ps-0.2.5.tar.gz 5845 BLAKE2B b716381b66f54626298544fab6ef6f857066db50b027e1b729cfa59e33a23fda4cab09ba8dc33317725058b6942ef84fbc7c24aa30a4d7db2c73f7ac1b6ef137 SHA512 043898fdca56bee28a8e2af61d3216af25e222c0a137737e599881bb21e805dd8a609ff2901a50763bdbb34bf2e3fca2afaf1a59b715f3ba6aa067971c99c258
 EBUILD zathura-ps-0.2.4.ebuild 925 BLAKE2B 31353e93c1a751fbf93588c6ea2f21a9cc5e2fe6ecae2eb10e139f06995e46c2ea2db8158d920605feb66203ac60feb36a47a6c1be5f277edc26e34889913f88 SHA512 151440b644811a83dffde220fed9c9bff52d240b1a13b9ee4cada8557aee0f48c115522ee55be31d2e48634257aa162efe95126cb8f523754a20aa81829f2ab2
-EBUILD zathura-ps-0.2.5.ebuild 932 BLAKE2B 79704ad9cde6720ae7f452869d46411ff59b10658d45ed0521f386b2570726d3e9399878c02699c668bc1628ec7178c56fc8676f17c424561109f1fd110cd30c SHA512 28de9c176c9d8ee111c3ff1311782af1cbdf720a2ea9e502882f48a17b61852a61e80a0f6a8a56404db60c1b3f0e523c2008c43cbe06c41166e0cb4797267081
+EBUILD zathura-ps-0.2.5.ebuild 931 BLAKE2B a44570c91c47e4ef755c0e91685142b5b4f45201a03d62c3506683ec3f83c537dfb8b1672441fc8d21fca8bbcc3ada6762b822f6f70ec7857fb7a3f51dbb4fac SHA512 0d4b693cb8e9ee7616e09270fe817bafb9bef4a2d8944e164873388bd90507d432c647c72d611b9c067ea596b839ece20906400f8fb1faf543ad70495b8d99f3
 EBUILD zathura-ps-9999.ebuild 932 BLAKE2B 79704ad9cde6720ae7f452869d46411ff59b10658d45ed0521f386b2570726d3e9399878c02699c668bc1628ec7178c56fc8676f17c424561109f1fd110cd30c SHA512 28de9c176c9d8ee111c3ff1311782af1cbdf720a2ea9e502882f48a17b61852a61e80a0f6a8a56404db60c1b3f0e523c2008c43cbe06c41166e0cb4797267081
 MISC metadata.xml 702 BLAKE2B 494044f73e5201e73328ba0f0ab58cd40ae7860127449aaed63e96ec0962a3e2c5cc2b617dd58c73c9226d5ca7e1237f94064eb8dab48fe1a88e8c50bfb40216 SHA512 0f416ccc5110783602c76a1b2670f22c15104a2868d23b635180faf4993d3879198c04fc29e7a8d23b13105bd6b2268d9d7877a0e36dbab1726919b3d5c0a37f
diff --git a/app-text/zathura-ps/zathura-ps-0.2.5.ebuild b/app-text/zathura-ps/zathura-ps-0.2.5.ebuild
index 62562632f284..f2ad6c0c7ee2 100644
--- a/app-text/zathura-ps/zathura-ps-0.2.5.ebuild
+++ b/app-text/zathura-ps/zathura-ps-0.2.5.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura-ps.git"
 	EGIT_BRANCH="develop"
 else
-	KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~amd64 ~arm x86 ~amd64-linux ~x86-linux"
 	SRC_URI="http://pwmt.org/projects/zathura/plugins/download/${P}.tar.gz"
 fi
 
diff --git a/app-text/zathura/Manifest b/app-text/zathura/Manifest
index a7273273e03b..aeef4e60bd52 100644
--- a/app-text/zathura/Manifest
+++ b/app-text/zathura/Manifest
@@ -2,6 +2,6 @@ AUX zathura-0.3.7-tests.patch 702 BLAKE2B 86ff60915631ab060eec0dbcf389157a1b6b86
 DIST zathura-0.3.7.tar.gz 174095 BLAKE2B f0025b75b319dbfa397362e102318f1dc1b5dd41f8beb1380cd781fd7594d15234781d862bf20b59ad4bcb9d1aa67210aa10779c19273e81341bfb74962f3139 SHA512 830a1b88820507a40a20b046c504d8ab3022a35c2c4c0d93a67f77ab5e31d746362a6f28fb9786a647cd0bfd943306aca74cbb2092774aedfb52380e713df533
 DIST zathura-0.3.8.tar.gz 174962 BLAKE2B 44d91564ee42cea80357230c789160e37774d5ae29f8de8bac1fbf734a28e7b862d58d807fe3fa01d323d0baaf88a3960243f8022893c3ad40b67ba8d8a1ae6d SHA512 bad10eaf6642885f96850a01921dc1580357144d8b9b27e88e7765e6fc8e7d8f8c94c240904469e1e6b22114be5117a28a24c87183476d2c89d93f27a5083109
 EBUILD zathura-0.3.7.ebuild 1481 BLAKE2B fb038b60a8a130a760f486dfaaf9051929bed9e6bc5defa99e89db283df286bd1e85ea71e5d88a97350e687125921c6884c0b0e7bf8ba56c3df98fa75158df36 SHA512 0927fdbf3d1a26580505cbdc31d97ffd056d8eb16a14e116673564ccc33fe78604a1913e48e29f4df24f66df07195489a3dd6fbad38764e96a98347261769d73
-EBUILD zathura-0.3.8.ebuild 1417 BLAKE2B 68cd168faec13cd9c351b59707fa11e9cec39732257ff894bbeea4822a8a416d63b89a94c6acd33a674a0f8fa9a6693da63de1b75df924c5a30f8488f95bb5b7 SHA512 674c0e13fddc00a5f28164da60f75d23e42b713caaebaa37b09acbdb68f1868aac9882fa7b9b0d6e26b801a80e7e53f4ba63358f09394a1c28844d55921c6844
+EBUILD zathura-0.3.8.ebuild 1416 BLAKE2B 16f64a691ac1b936738f3e72471faace598d12dcf29ad34be1c1f7cefac3dd01542f397a932c2d124e521e5b2abec283662616eed50e7a2694b3e3517735ffee SHA512 026f48a970cb62caf2db2908cf7e42ea53e251146d568b8c944162876ada99ea600ac5a059157ce3c191a75ec26ca88bdef11f2817f0e624dc9a30c689cb04e2
 EBUILD zathura-9999.ebuild 1412 BLAKE2B 5f304234d4918670a7a4750a18e823998e464f1e853bd2a426d9bb683799b2d10a8c91aa1c72b8d6e0070573e45c639291f847cd0564f3977860ddf3e04f8e7c SHA512 f3d639e1dbf2cd2d4c998ae69ef6518c50ec1ba8d6944796cc4394d77e4974c2726529f9b019ce54816264921ec88a148ec0f23241fb729e5c0d58fb25bfd15e
 MISC metadata.xml 823 BLAKE2B 745fba701ca26b7b430c8b55393ef77dae3175068b0afebcd6e2b3a9ac90823e542734464e4c1852e1306963c06663d13a507b6dc4967b54cdcc12c117046f81 SHA512 4bf7d56010d989c286976ece526874abbeb90449d940d4ff550f5c084ded0e028998c7b021fc2e3015ebf202d43a5d35fa9b4e8083d6eeadfb9c2915cbbeaa87
diff --git a/app-text/zathura/zathura-0.3.8.ebuild b/app-text/zathura/zathura-0.3.8.ebuild
index 46c2f8727832..3f8b8b3761a3 100644
--- a/app-text/zathura/zathura-0.3.8.ebuild
+++ b/app-text/zathura/zathura-0.3.8.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura.git"
 	EGIT_BRANCH="develop"
 else
-	KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~amd64 ~arm x86 ~amd64-linux ~x86-linux"
 	SRC_URI="http://pwmt.org/projects/${PN}/download/${P}.tar.gz"
 fi