gentoo resync : 17.12.2017

25 files changed, 132 insertions, 20 deletions

diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 829e953bfa2f..65ac6551e06b 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/djview/Manifest b/app-text/djview/Manifest
index 377290317d1f..716aef9613c7 100644
--- a/app-text/djview/Manifest
+++ b/app-text/djview/Manifest
@@ -7,7 +7,7 @@ DIST djview-4.9.tar.gz 930676 BLAKE2B 384cf46d4258bb6b5fcf8e4c0b64787bdf7edd281f
 EBUILD djview-4.10.3.ebuild 1976 BLAKE2B 240fe2a3524c4a4e9d3446155df69cdf86f85ba39e7fcd047b66958179c5e5b804f91feedf880bc1ec8fc2601e0bc72c4dc93e70c1f4fc364f54bd186f33d4ec SHA512 008cb8e128ad02b85ab1c5bcc8e16eb5cb07f6bd7a932bbcd049ef641e77a94d3c62acb967f07c7959037ec68b317f9b67292c38ad61037f8de790ecfdf06c12
 EBUILD djview-4.10.5.ebuild 1976 BLAKE2B 240fe2a3524c4a4e9d3446155df69cdf86f85ba39e7fcd047b66958179c5e5b804f91feedf880bc1ec8fc2601e0bc72c4dc93e70c1f4fc364f54bd186f33d4ec SHA512 008cb8e128ad02b85ab1c5bcc8e16eb5cb07f6bd7a932bbcd049ef641e77a94d3c62acb967f07c7959037ec68b317f9b67292c38ad61037f8de790ecfdf06c12
 EBUILD djview-4.10.6-r1.ebuild 2034 BLAKE2B 57fcd0e83d380eeb73f49c33448a656e55b09d680daa76c1d74784cec6a8193fbdefa5101bff2a651d2cb4b0e2fdd227694b23e0f6e033647ddf0c75564b2b81 SHA512 7ed4c8953b1326face2088ee6e8140b8cf73a13a163e16cdad1b5062459e57039410341512b272e9ce0c80955a6141f127b9d4a9791ee86e62e457e4d4c430e7
-EBUILD djview-4.10.6.ebuild 1973 BLAKE2B 2adc6d1f7a476489fe782173a6dffd29ff6614153b435372a5ba7601236c08cee5b4599883f79fc26070c8c09e42dd5629b2385df2ebeadcc3a00842cc7bbc44 SHA512 386c0912d43e380daf2b2f6d99347e04f74538f5d287e85d13b324d3b63387e4d63f651f4f51886de20622bf70889f8f0879b7193641d4704dffec81beee500f
+EBUILD djview-4.10.6.ebuild 1972 BLAKE2B 6028e7f4d2106d420a2395d4578317881a2c3e131b254cbca45c1dab52d1cf70db5b7bcf258a37a500054332b0148ecc494e3a7ce8b37b0bf6ed38f11d9cea90 SHA512 6d578c18a0206759be8cad1f3f2088728324ab21313379efdf9cb2a9db50498644c9f7ba7e9cfb67ef2cf7aab35131227d4b09187e182a3adaa7c3c001ce2e76
 EBUILD djview-4.10.ebuild 2026 BLAKE2B 6de40b276a954aec044457292b6495de4f3737b955e65dad75b990b73edc4267ed0f296f51bafb734bec01aa88aee6ef27408ee12d359e67611901dc818acb2a SHA512 cc75b12554250cd19fd62d0f0e55222ffadd4734047920385f0848b13b8657f5d19ef78bfb9482438133bb9fdd57c9a58541cf24df2bf4ce67a03f9bfaaeae14
 EBUILD djview-4.9.ebuild 1945 BLAKE2B f566da0cdc06eb299452a5640a4b6c2d1a12fc4cd3eb4f3697724a219b6eaaadbd908d9d461ed6b91f92c29b2bcad6af459d299849415588b3d9a04ffca08fd6 SHA512 08264dcd607a17f4fc79994a0ac144edc94c325768e16530d185026ba459cb976ce43fe9d36728cabfade3b75b0d4c71847e0a8464f8e9cd7d121fd095e5c04e
 MISC metadata.xml 323 BLAKE2B c8498cdd0e1820eb610a9e2ede4e10287977c2eb71dd1b6b9862e3d11a34760cf8dcb5e9e59535ab0ceed04f3be2b00aa4942657a25fffc87b23966c2b2c1caf SHA512 53a7a7290a2286fd31248db31160697a3b2693275013a1ea453258f9ac52fa3ea7111718ca35a5eb1652050699e5be1111c7ebb73b2a3c699383d8305509a5c4
diff --git a/app-text/djview/djview-4.10.6.ebuild b/app-text/djview/djview-4.10.6.ebuild
index 1673340f0b0d..4c7b748345cc 100644
--- a/app-text/djview/djview-4.10.6.ebuild
+++ b/app-text/djview/djview-4.10.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/djvu/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ~ppc64 x86"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 x86"
 IUSE="debug nsplugin"
 
 RDEPEND="
diff --git a/app-text/djvu/Manifest b/app-text/djvu/Manifest
index 91e6625a556e..4102ed95ecd3 100644
--- a/app-text/djvu/Manifest
+++ b/app-text/djvu/Manifest
@@ -2,5 +2,5 @@ AUX djvu-3.5.24-gcc46.patch 859 BLAKE2B c11a240b930df4ddbf45272c2c2ba262b545d440
 DIST djvulibre-3.5.25.3.tar.gz 2543949 BLAKE2B 8ae6004e74a7db0fa666a3cf15f5a3b335690984838e8d674ccd7fa7dda0728771f6fab5f61747b505646e3bb206effd0bbaf9c6035fb27993d587693ad1fa43 SHA512 0e38f56d77915ee6707dd19a36a8ca9167608c39449a5c73de9cd784d712852c07c068b79a794e25f6d3ded0f927d083413dde197c9fc8f7b68c03cffe68035b
 DIST djvulibre-3.5.27.tar.gz 3648522 BLAKE2B e1907b4b64c48304ceb24360cfd451e4690d38803f22231d4e136dbe754715527fa0300c623bb709fa05bba206348257137b2a755651bb51ca26259680e142d0 SHA512 62abcaa2fe7edab536477929ba38b882453dab1a06e119a3f838b38d5c61f5d8c252e4769e6534582b826e49bcfb490513179580fab9c3afa84aa92053ccebee
 EBUILD djvu-3.5.25.3.ebuild 1769 BLAKE2B 115fa97ab60cf2ba0489193b7e5489b3ff786c0e37ffc8aa724028851e5bc57c81212fdf80423e1a011c1aef7669325080abf497d55792d4d5bdaea830117d85 SHA512 51e5ed5fb1c2f3deff3e989c5bbabeb43177ac7ba0174f5ecc6916bb1734d88fcc6f6a9585183a30688ee70dae214c27b047b9f762e9b9eaafc3b5f77af86d53
-EBUILD djvu-3.5.27.ebuild 1464 BLAKE2B 0249629bd1cd4a5754447cad007d9f1d782ec7df4686119602893a3df2f65415094a86799e95e88196e041485bb28853efc14070d21358d170a3cc68817d81d6 SHA512 edc6f42cd7eae5af6116c9a1f8ac199cba5117afd57279b1143e6f3db6be20de41f47cc5c1990afd67af7d87147f77567281cd247347cf03b20c436cc8de16ae
+EBUILD djvu-3.5.27.ebuild 1463 BLAKE2B 41a705b2261b48b2a29f0917a55daaf933efa4004066a66396fffc3485ef81370fbe77034430bd7abd8378eb00b5c7aa5ac987cfc05545088ba9521e2808f1d4 SHA512 56fc8babd57824a7f3848f0ab06f64ebb4da14304da248d170f264dc115a77b82a3ee7af9da11de2e07713a074925e3f064067ce0ac1be77265c64767024c52d
 MISC metadata.xml 948 BLAKE2B 1d15a217967f10397d747f2cc0844ea76d4f876ed0ee8cb56733b74a3b92f023e3eeff11bfcb4265766c14dad4b1e35a18f7d2fdd7442068bf82c4a8302690db SHA512 e5cfa3a2b2077a3f0dbfcc99165fb678e8c8759724790d520f1bed670fed5e753a47207bbbcd7d2ff2d55def5b34bf32201771918c9e7a16583d91553ac75e42
diff --git a/app-text/djvu/djvu-3.5.27.ebuild b/app-text/djvu/djvu-3.5.27.ebuild
index 10b2d3ad46ee..90d113e316b5 100644
--- a/app-text/djvu/djvu-3.5.27.ebuild
+++ b/app-text/djvu/djvu-3.5.27.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/djvu/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE="debug doc jpeg tiff xml"
 
 RDEPEND="jpeg? ( virtual/jpeg:0 )
diff --git a/app-text/doconce/Manifest b/app-text/doconce/Manifest
index 414591bc9e43..0156cf130754 100644
--- a/app-text/doconce/Manifest
+++ b/app-text/doconce/Manifest
@@ -1,3 +1,5 @@
 DIST doconce-1.3.tar.bz2 112034753 BLAKE2B 4ac826b09ca2dce93d8725868f6fa00a07b61835336a56b72f4d846cb81282cc6982ca25c7fc27d9e66aed5a22d3ef30badbc137748f7c6c3a2e078554b6715e SHA512 b59568e801f4cc5b7f01f3c3d344702ec80c65b5a065e2ece3b3ed8cb5f669739c9adf3caf96cd0b43c646ccae0f11325d5ca64ee1a325ac404ec6e5feb6148d
+DIST doconce-1.4.4.tar.bz2 112713371 BLAKE2B 65acba4d02095d616c5ca6a070bb4a80ae57b4f201d9810f7b88e212e1ea86bd211440213194c4d61a2eefd19dfa9de9f81376d3e535f032747a8102bfdc2160 SHA512 9b5caae789a395bcdbb4daeea57182f2ea21a2c3c4da0abae2c097351fece601da6901de8d89ab60a187c1bc0ba5f913bbee14a847c1f85020dc16e0cdffdf31
 EBUILD doconce-1.3.ebuild 513 BLAKE2B 4b7d59b3475b5a4baa094154219fa37d372b42da73faf2f9ee1e1a81420c31526912413f7036abe72edf476ee86fe2c327bb36831262a4a1d8dde2dbf53724f4 SHA512 6c301a4e339c2764794f98186ebfa3fa8ece1f925f096a275f2c6ae78523cf74e55a9960c349e701f732b32d0305f556f8114141f8b8f1725fadd2b104d3617d
-MISC metadata.xml 889 BLAKE2B b8ae34880ad5a91d18c1496384fa302bc0e8bb4e7810970c6c8946bc6c80c7a3c616381af340c68c0f4a4dd2f0bd87697fe34a36badc7438266184cb76191bcd SHA512 a07b96f67cf20d3a5bf72e3e8b0c518db54ec034eed091ef1a00d32383c06591a4bcdee4af94a0f89299ca8da0f5caf8aed7c0a783b0f58d96870e3fb4715d4a
+EBUILD doconce-1.4.4.ebuild 785 BLAKE2B 8de03268a8624fa1372928e7939498a4d1524d16e5b1a6288f738881e4506365579c8f5ec68777df2c4799a1e6a3cd52a017350e5e2c7bfae053cd8906ec11e7 SHA512 131d68044fd3b1a10004f74d6fea4abfa09a9183d12d423439cf6011737ceb92d51cd2340054c77ce59b0097ffdf3a4808b90fdabe109b6e59709803daa4ef6b
+MISC metadata.xml 886 BLAKE2B 0e17aef2ca8b68603b8d8b83d719d6224e3891594c07070acebfa25c22b7860e92dcc0cd856227626299c1d5f12d04f7e279afea75b7bb508854ea9ea15ecdf6 SHA512 51fd63b9e6ebef041891046676a22e11eb4addefa5730632f48843509fdfb7cb16d612b55941222d690a305ee50cf2d66557bdde64f6db35c71efe39019ca55b
diff --git a/app-text/doconce/doconce-1.4.4.ebuild b/app-text/doconce/doconce-1.4.4.ebuild
new file mode 100644
index 000000000000..5028993da166
--- /dev/null
+++ b/app-text/doconce/doconce-1.4.4.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
+inherit distutils-r1
+
+DESCRIPTION="A markdown-like langauge to generate docs in html, LaTeX, and many other formats"
+HOMEPAGE="https://github.com/hplgit/doconce/ https://pypi.python.org/pypi/Doconce/"
+SRC_URI="https://dev.gentoo.org/~grozin/${P}.tar.bz2"
+LICENSE="BSD"
+SLOT="0"
+IUSE="doc"
+KEYWORDS="~amd64 ~x86"
+RDEPEND="dev-python/future[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+src_install() {
+	default
+	if use doc; then
+		sed -e "s|http://hplgit.github.io/doconce/doc|file:///usr/share/doc/${PF}|g" -i doc/web/index.html
+		docompress -x /usr/share/doc
+		dodoc -r doc/web doc/pub
+	fi
+}
diff --git a/app-text/doconce/metadata.xml b/app-text/doconce/metadata.xml
index ce47b04dd0ff..b9c4307747b0 100644
--- a/app-text/doconce/metadata.xml
+++ b/app-text/doconce/metadata.xml
@@ -14,7 +14,7 @@
     for paper, tablets, and phones.
   </longdescription>
   <upstream>
-    <remote-id type="pypi">processing</remote-id>
+    <remote-id type="pypi">Doconce</remote-id>
     <remote-id type="github">hplgit/doconce</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/app-text/enchant/Manifest b/app-text/enchant/Manifest
index 950cbae4350a..6e09269e3f45 100644
--- a/app-text/enchant/Manifest
+++ b/app-text/enchant/Manifest
@@ -6,7 +6,7 @@ DIST enchant-1.6.1.tar.gz 642124 BLAKE2B d41aa9b313e7fe8b0887728b55f3c5218e270c7
 DIST enchant-2.1.0.tar.gz 962857 BLAKE2B f1ee729f20f06c14cbe81c27eeff5ff3bfe9e815bdf278c0c5e27ab48a78301e0731cfc2a55d065cfc702b5939623e352817a3fa6102636bca6779a8903ce537 SHA512 5dee7c5693ffc4ca0933e0881ca6e1f6bab1553af79cadf29733589790c6626db524cf33b0008b3de4c48e122ed93929478cce35608d9a52ab71edb51f598f27
 DIST enchant-2.1.1.tar.gz 961821 BLAKE2B 1aaedc16e2108a382390c9401233d6a77dcff8732fb0af1a35816993b8eb127f22f9e6f4359b997f6793f53dd37c50c1c69d2aa09cf53bb5c47baa47277e044e SHA512 5cb57198ea826da6d9ed9042edca87fcca9b811e8e75b382ed1568c5b1d8d4f8d6ba732a167c8d52261cfce540f23f84bd4d2889a4beafd2db1d8509c0b6bc15
 EBUILD enchant-1.6.0.ebuild 1560 BLAKE2B 0162350ad36f2da271759e69c9acc0bbd8f793ef00069406a35320673991a644ed4171a32b73e01e2c243054fe9c38768f008e8bd30c6c0fdaf5aecd5cf46420 SHA512 e800eb39c1df85310236f1a760a218539622dc6670856482009efd2d7609b748e79f2a0aeb4fa565a17420226ebc7c7c87a4860e6e749b2b6d677ae308fa695f
-EBUILD enchant-1.6.1.ebuild 1620 BLAKE2B fe08a683ae5561a3528a0078cffc8288ea1595d71c6ef9ba37dbc90e47c2445fef7b9c1670129e0502cb3988e27a48ea07db65c27681ee0850bbdf2f241acd3e SHA512 c59deeb8a885a5a001c6fee44e7de8b09b6304f1b4182033f42acbae7c77c38f25d169f6baf025abc05db719643f4558ef6496ff3e3e104dcb3d3c9e91fd4ed7
+EBUILD enchant-1.6.1.ebuild 1619 BLAKE2B 071e5250c7442277bf263e8167af10bc00ca64e056384cfb5aaf8cbd2dd97f841a98ae2731005b5aec04757a9539ad38ca84d42751b5d6022e4faa765662e840 SHA512 0f478cfe5296fbf75c709a11c210f669d6a1288260272e71b77a1ac03124a13cc154eb21909e71e4c8304e7a999dedd5ea154cc5b94022c7103b381eff41451c
 EBUILD enchant-2.1.0.ebuild 1432 BLAKE2B b8b7276367b64a99e7010f7f4fcde09a050b3dc9a153349621df459dc5aefda583ab6a91898c247b57a5f75602970f9fa802cacb6727a788adde2b89862b3722 SHA512 4131394259cc3280717fb1f6ebd7334289c0209d21af7659ce412f4124a537d7b920e2d4b6f72e1ec6303e5e53238209ad5dfd37e5c011ffe32c9557084ceaf1
 EBUILD enchant-2.1.1.ebuild 1291 BLAKE2B 5292cda24db259c234bd3f2f7b7d30b5c64a1f36bf0031aa4a4359d061f371669e860b8879036f40af48d2fb2198576cfcfe6e2f1682667e16315499a7030c24 SHA512 f5ceb6c6114864facef4a56da39a17324a86880c680fae23acc0617e97223ab9ac36996f2aae55bfbfb5f0861263c272969f93dae17f82bfe61601b232b26266
 MISC metadata.xml 551 BLAKE2B 591faf062fb6571587dea9187322c0786caad190c7c89d490f38f8ce953d86ce9332918dc1e882830e226dbc99d20edcda5a1b35deb4f394052342f25197003f SHA512 15358f20d39014be293f87d60871f16712f4314808bdd28bd25d6cced2278fc46eaa36f1e44c970c1379488bcf0fa359686abf3fa8ff10f4d66cb2f82057a528
diff --git a/app-text/enchant/enchant-1.6.1.ebuild b/app-text/enchant/enchant-1.6.1.ebuild
index 354c82d0cc3f..a903d00f8123 100644
--- a/app-text/enchant/enchant-1.6.1.ebuild
+++ b/app-text/enchant/enchant-1.6.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/AbiWord/enchant/releases/download/${PN}-${MY_PV}/${P
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha ~amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 
 IUSE="aspell +hunspell static-libs test zemberek"
 REQUIRED_USE="|| ( hunspell aspell zemberek )"
diff --git a/app-text/getxbook/Manifest b/app-text/getxbook/Manifest
index 1bfe7247a5fe..2fff325e4660 100644
--- a/app-text/getxbook/Manifest
+++ b/app-text/getxbook/Manifest
@@ -1,4 +1,7 @@
 AUX getxbook-1.0.patch 863 BLAKE2B 1ffbd7f11a195620ebda24e9da1aa4ea183efb0438797f0cbacce87dbbae2691f2fc0f8c61e965e86f4ed3066f2aa58c7dfef2d4828747839e773b6d8e51ecdd SHA512 3b953cafff23f01918eb910d06cc6bc81d8420fbbe18cfa3cab59458977c7a843ac62ef8789ce0883c225200593f657efce593afcd5bc9a8d87a8f30784ed0cc
+AUX getxbook-1.2.patch 853 BLAKE2B 03778bceed27f4582ffdf3fb2ac9de1fd2f6101d78e697126d86a829e5a13bf97f9ad2948feb274c10dd05ce611d7142bd9f624da19020ce891073402cbbf0d8 SHA512 04699a133cfba3d2a7d0f4eb9cb420abb93eec9b890f23130c23ea7b9e07b7a0da1b69f34aff0482acc79fe07c8abeb7de9de1163ae04d9c581d7a3f5af084a0
 DIST getxbook-1.0.tar.bz2 22314 BLAKE2B cc3b652d4c580c8a5f41a0fc58c2d7cfc9e783fe2c159fb871c0a89d8246f65f9601265e8a7b51c593ef27a726b07faa84a9d2333f2d448b1661d1dad2e48e0f SHA512 df912e67ddd823e4b1ce1539522ef0804f74758aa27baa0c568790859fac97d40dbc8f574be936fdf3ba8a1135bcc3d9af1bedf0205353d7a12f8993393fe941
+DIST getxbook-1.2.tar.xz 23776 BLAKE2B 327a35a73a5e29eefcf3f87cd8ba1237da5d045e3ef009d3ae708797fa78e6d844baa4cba2e8ff021d71951ca100e087d69a98dac3ddce953afa549b63e7e1f8 SHA512 fec397d4fd979421658f7ef9535f3c25369c8bd4ea2f9adcd719f760fd01265ed789f9eca34374b245c24acd485b951c91fa92a36d5b6401a0e0bf4db746788d
 EBUILD getxbook-1.0-r1.ebuild 935 BLAKE2B e9f6642fcda1362867dd44202c58eb0ee812bc9567d1fb97057bf8805d19e56c70e751150569b0c9cfeae0983671041c88eb9e76a137ca0d262155a947f77541 SHA512 bc0d6f4a98efbd087552ede80bef2c81645e559f2d18df1b606cf7de6379a6cf36acb7ff04ad708fdb4d01b54e65dbdf9198684289179f79a19ecbeb1c8d6bdb
+EBUILD getxbook-1.2.ebuild 936 BLAKE2B a4f057509fb8195718b53aa5491a57279eb5feeed587a3b896e7608b06db5c28ff2d15fc8f26841fd7675b211fb468741391545a8447c821a09cd04dcbd80e05 SHA512 33818a0e2e930c48d1a330691d60cabb3552b5a97d2ef692e0d1a39bf463a454e90703e0675ce7ca0e75ac59a171155425b07be3fe0b9a2cf867a62912fcb1d1
 MISC metadata.xml 635 BLAKE2B 73ed8df477413c663fd0821b3aa61301dcfeef8b3ccded5465d4903782572cde1ccef3da28f5804be740ae230a836139359f9c80cb97b70fca383a5bac8fe9a5 SHA512 297c1e817da165662e84bda74934d4493edf3cca336d48ac6e1cd7bf5bb599d9967e0fe38f0fffbafc526185b0bdbcd6244cf7c5b61fb303791e64dcfd80e504
diff --git a/app-text/getxbook/files/getxbook-1.2.patch b/app-text/getxbook/files/getxbook-1.2.patch
new file mode 100644
index 000000000000..da0ac83264e1
--- /dev/null
+++ b/app-text/getxbook/files/getxbook-1.2.patch
@@ -0,0 +1,35 @@
+diff -r -U2 getxbook-1.2.orig/Makefile getxbook-1.2/Makefile
+--- getxbook-1.2.orig/Makefile	2015-07-28 21:52:40.000000000 +0600
++++ getxbook-1.2/Makefile	2017-12-16 11:27:18.554822718 +0700
+@@ -1,4 +1,13 @@
+ # See COPYING file for copyright and license details.
+-include config.mk
++VERSION = 1.2
++RELDATE = 2015-07-28
++PREFIX = /usr
++MANPREFIX = $(PREFIX)/share/man
++CFLAGS += -std=c99 -pedantic -Wall -Wextra -Werror -g -D_POSIX_C_SOURCE=200112L \
++         -DVERSION=\"$(VERSION)\"
++CC ?= cc
++LD = $(CC)
++LIBS = -lssl -lcrypto
++LDFLAGS += $(LIBS)
+ 
+ NAME = getxbook
+@@ -21,13 +30,13 @@
+ .o:
+ 	@echo LD $@
+-	@$(LD) -o $@ $< util.a $(LDFLAGS)
++	$(LD) -o $@ $< util.a $(LDFLAGS)
+ 
+ .c.o:
+ 	@echo CC $<
+-	@$(CC) -c $(CFLAGS) $<
++	$(CC) -c $(CFLAGS) $<
+ 
+ util.a: $(LIB)
+ 	@echo AR $@
+-	@$(AR) -r -s -c $@ $(LIB)
++	$(AR) -r -s -c $@ $(LIB)
+ 
+ install: all
diff --git a/app-text/getxbook/getxbook-1.2.ebuild b/app-text/getxbook/getxbook-1.2.ebuild
new file mode 100644
index 000000000000..b1acfc5e944d
--- /dev/null
+++ b/app-text/getxbook/getxbook-1.2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Download books from google, amazon, barnes and noble"
+HOMEPAGE="http://njw.me.uk/software/getxbook/"
+SRC_URI="http://njw.me.uk/software/getxbook/${P}.tar.xz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="pdf djvu ocr tk"
+
+DEPEND=""
+RDEPEND="
+	djvu? ( app-text/djvu )
+	pdf? ( media-gfx/imagemagick )
+	ocr? (
+		app-text/tesseract
+		pdf? ( media-gfx/exact-image app-text/pdftk )
+		)
+	tk? ( dev-lang/tk:0= )"
+
+src_prepare() {
+	default
+	eapply "${FILESDIR}"/${P}.patch
+	tc-export CC AR
+}
+
+src_install() {
+	DOCS=( README LEGAL )
+	default
+
+	use pdf  && dobin extras/mkpdf.sh
+	use djvu && dobin extras/mkdjvu.sh
+
+	if use ocr; then
+		dobin extras/mkocrtxt.sh
+		use pdf  && dobin extras/mkocrpdf.sh
+		use djvu && dobin extras/mkocrdjvu.sh
+	fi
+	use tk && dobin getxbookgui.tcl
+}
diff --git a/app-text/gspell/Manifest b/app-text/gspell/Manifest
index 59a9c5f7d3f5..a399ba1d3518 100644
--- a/app-text/gspell/Manifest
+++ b/app-text/gspell/Manifest
@@ -3,5 +3,5 @@ DIST gspell-1.4.1.tar.xz 408996 BLAKE2B d1b751eea7f76c97ee65e385a769aea353df8211
 DIST gspell-1.4.2.tar.xz 407356 BLAKE2B f2ee6ae43be55e8ad7253e10893868a8d7857bbe41e14d71103b27a0faf40b0ed247e9fa38ed7bc75039fe0f1f600fe739f538d50f69fb063d0932df6c0b1c27 SHA512 00f53d3ca47a4ba1af1e8b4983a41dc6df8a9788898b45ffdd161a3fc8de28024cc985f49fbb872912c0a94addbca3b28ce2edda70eeb206a794e2bcf65e4a5e
 EBUILD gspell-1.2.3.ebuild 993 BLAKE2B 4d5ef2d84c4aaf52691e10f84677c3f18c64dce556a3d0a2af74e9697384d17087d5c0a6c043e99a0d8730de2095d073493abb8deb3a6fb58144460a9bc62146 SHA512 10dea47cbf272ecf8453a13e78b92d2d4555aec588277b1cd59ca060457f33ef96784bef944e3fc1c073c2f526ce07866fe8fc4d671d087b1ac3c08148f10e13
 EBUILD gspell-1.4.1.ebuild 962 BLAKE2B ecf92f4861052b082e352c8ae719d6d0fe90eeda1ca5ecc84e4f323a44ee585dd5a83fdfc2088ae1a1cb9a22fddebbd6e601a94c12833132204b7256775b5b05 SHA512 7e930978ff6535e377a5009804703afcca050560073ffb80492cd3be722a8620938cf10aae6a8a8904c6f7081f4046416b63c774aab0a20c662ce336d889a4da
-EBUILD gspell-1.4.2.ebuild 967 BLAKE2B 9f0943a4e3b7d32a0006f7fb0db68a5868ecdb4d2cb1367eb2452106cdc21a08f6f753e597e6ab36e338b7832b92d359e74122e5ba9eea53422d282c7ee91e70 SHA512 2b80bf4af6b51713e22d339793403b5e61b5f353ff0ee815e69a08bba2b4e2570e74c3ed208ad1cf9e93dcacf9e4eee49361ae8ed6ea761739b54bbfda0d7bb5
+EBUILD gspell-1.4.2.ebuild 966 BLAKE2B 2b0329c2f4231d94f788ff3deef06cefe75ef09bf841d26d9d0f971651fb3320a32a6616de36ff997f3e5f5a12b9227c8c01cd17e444c012da5ab8c09c2b3127 SHA512 f579e5b3e9668623161bef01350cbde8a3b8e094423966078827a27a459b72a30e4ddbc7835036cf34f549362c74d1363d7cdf329a47afb202d07b878bef0091
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/app-text/gspell/gspell-1.4.2.ebuild b/app-text/gspell/gspell-1.4.2.ebuild
index 3981f50f9f09..e8d2f43221d2 100644
--- a/app-text/gspell/gspell-1.4.2.ebuild
+++ b/app-text/gspell/gspell-1.4.2.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/gspell"
 
 LICENSE="LGPL-2.1+"
 SLOT="0/1" # subslot = libgspell-1 soname version
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ppc ~x86"
 
 IUSE="+introspection vala"
 REQUIRED_USE="vala? ( introspection )"
diff --git a/app-text/gtkspell/Manifest b/app-text/gtkspell/Manifest
index c81f03d19399..c0af0b928c24 100644
--- a/app-text/gtkspell/Manifest
+++ b/app-text/gtkspell/Manifest
@@ -3,5 +3,5 @@ DIST gtkspell3-3.0.7.tar.gz 447648 BLAKE2B 2c3b9ec1c30fc2236d2aea6756382b878a468
 DIST gtkspell3-3.0.9.tar.xz 298988 BLAKE2B 01a824ba91fff1739046134ef0025cf894ed3f524dcc96a11ba6b23def3b1d84ef66fc5dbf37c1a047d23b276b944b25e89ff6a84ebfe19a1189ccc59d230250 SHA512 de6cc24ca092067a101996142bf2b3cfb6a5af2170ea4b0185a997e5c88adead7ba53c5a297c3110b3a66dc87d37e429720f972895bb2931f9a033fc006e2eab
 EBUILD gtkspell-2.0.16.ebuild 942 BLAKE2B ef168b07393e46a98497b1fa3a7d0e999af3d0a943a72e7c1b07eea830745ea6f56c7b1d6f9da3c392ec76fb56fa9ceabcc01ea26d5880ead6d281a0b5088d63 SHA512 90460f1f223900b13fa54ffdf5e87ff2b810d540242691f3574079ed66dd061539cf0d0bd5668f3fde09b2a18297cea93afedffb2772ac3725cdb98a5270ef53
 EBUILD gtkspell-3.0.7.ebuild 1063 BLAKE2B e6dccc0bf2a9050a1b6898c9e11afe61caef02e8611c21f8db4a0d6abc52f035a5e4786ba90a705d173c3d3ddb6cd718b922fe6c52363b3b3fff026976d6611e SHA512 65358c2816dca16196719bffc48d9c0ddd46c40d9df32e16cca40622405935931d083b46b6493a3b7da50834ae785fe784886585f9c7b67185afed9204835ee1
-EBUILD gtkspell-3.0.9.ebuild 1078 BLAKE2B 49b9c8471109c94f379cc86222fd4ba23820156b07fecbc916976a46552c61f36f8a54f9201336a3007a4a2cd4975015e3f71b203c12f239e6c1074dd8ff232b SHA512 0a724055a3fae84824f06bc034f9cb7cf5dd1dc8c023c55ec81a6646a817222845a0afe8354d5400fe98e43fcc534b85cb35f031ed78d05a7304b822f325392c
+EBUILD gtkspell-3.0.9.ebuild 1077 BLAKE2B aa51eefa5d20ef7874de80fb431e7fad5e5d0a01169b024909ac38e721f537e407db72b9dbe76bfa5ef9795760386622bd301c17f1c2523a61e25bd7b9ef0089 SHA512 959c9b0c7939446564a6b539a1ec2895b36cec4ca7f55a1f75ad0b19ae050838fad86556215f50f40bcf88819ab27faf9661df13f1193885c723e4b4eddf153e
 MISC metadata.xml 331 BLAKE2B 09488ce0a015e7f7321a4a72cf8b046c63a5497694736ea7d9450455f447be0a328bb5d6f607d86032cf1fa77ce3d204373dea048a5b089f0eb7b38c4626ddc3 SHA512 51f55422f9e5a13f8cff5ae6ed6e00f2be248ccd4b472c0d8519c73fcda34d19129fc3183d4c570480198f14468fd8b208ddab0c70df05431ab8470399221514
diff --git a/app-text/gtkspell/gtkspell-3.0.9.ebuild b/app-text/gtkspell/gtkspell-3.0.9.ebuild
index 35176e9b6f53..64fb90a99f2b 100644
--- a/app-text/gtkspell/gtkspell-3.0.9.ebuild
+++ b/app-text/gtkspell/gtkspell-3.0.9.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/project/${PN}/${PV}/${MY_P}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="3/0"
-KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
 IUSE="+introspection vala"
 REQUIRED_USE="vala? ( introspection )"
 
diff --git a/app-text/iso-codes/Manifest b/app-text/iso-codes/Manifest
index d8b6f5c41dfb..61811dc87e0f 100644
--- a/app-text/iso-codes/Manifest
+++ b/app-text/iso-codes/Manifest
@@ -2,6 +2,6 @@ DIST iso-codes-3.74.tar.xz 3455148 BLAKE2B 2bab64ae23c6706df472e7e0150b4f5022781
 DIST iso-codes-3.75.tar.xz 3461424 BLAKE2B 5548307415b45d2a149fa3868521a464522c9a34e19607faea64aec3e2ff68d331872ff7de3c5807f7ae431a489fede42b6b59f068c5f22132aad4a0f1de8f87 SHA512 157899048cec091864ad8a7723314e28a0ccc4a0e1a5c2101bb630baf1a034bf117e38263e3c95e0135ba9d3a4d76635c8201c50a54e25f6af24c87253b8b40e
 DIST iso-codes-3.76.tar.xz 3474728 BLAKE2B b418b7b80d1926e765b65aad4edbd74ad8d37251fda14e3ab0e222095762d54e358de6f8d4a08fde8ae14460fd975a2a541ca6a5a4cf8ef1d777719462b0f991 SHA512 a0f6714a79a52b5dab82a268e85cb2d019ff5255744b88d088dcd7d5a15eb9710876a338a0a5d0f5659b4146bc6cc53d6d3474d621b3dcca7c47afabfc7e0dfa
 EBUILD iso-codes-3.74.ebuild 2414 BLAKE2B bb7a2128daf4b2c6c1ce1e93c323df45301604d51d9b135a1f4f932dc9c06eb9f74175c1f765a801ff83cd7450aa8981f8acc9b8c52471488ee6480a66425f6c SHA512 0080d32cb19f1b72d007f1738997c22eac368a8182c2e07f6cffedcc006cdfdd97c8c6ab80ff8a48d5355831ba5e0fefbbaffd328fc660ab583b31ba9dfebfca
-EBUILD iso-codes-3.75.ebuild 2417 BLAKE2B 97c1ca4fc2c902a7a4fa5e71e83879cb9e592efb470cf33ecca78cd5c1b077b6f9a8f7ac2c2a4be63505df055f75c2d1a37f9ab5b18304cd6888520131b9776e SHA512 3f271462161e1e2b6e3b231cb66389887e36a8bd77e025483d1b36bf9480628a0c244c1ffd450604a8792cd021680dc67c958ac033ba47699ab01788112ff200
+EBUILD iso-codes-3.75.ebuild 2416 BLAKE2B 51c8991eaf4b8955dd6f7614673ecdeacac1d88e431d81b64396c3e5d9bc671a8b213ce9f2504b2656eb0079fd5500b8151e7c51a46463da04cdd441cdf79623 SHA512 10a43ca59b91d4c2e5c4656d63d4e62affaf293e8243dbfd0e5698ad6ec10ba24b98a2789256e1394be1bc447d7d23eceacc66d4eb8331d83aa9ecb8f722ff66
 EBUILD iso-codes-3.76.ebuild 2423 BLAKE2B 6a115745a5a6a551971fb18a8f03f13dc7d14d3a38ff64ffee1cc8f0342f59644c6fe36e08d2bfb6f49cb33aa6fe2a5f45edbf275988a9024337fe6221b12e71 SHA512 f8dc62420ddbd98b03a8e03fe54dd13c364fefd48084a177e8f5c3982c5a74521da2993792421a94ede39d9a7f2727ed45bfcb54360d54a4c4bfc599e936a700
 MISC metadata.xml 480 BLAKE2B 3aefef945cb111095839e8fa8b84757e7f51a9aa8848806911d8c01763ab2d2f1d0c5b31c042f6ee307756e007893f6559c54d74a104caa612c9a6d39b2eea7e SHA512 5729ca31911ea7dad748e9f3afdd1f45f9034d783b56a75609101bfdb0a204bda8a078e7d251e89731091726062c4ac962e000ec7a898cb66ff787c8f2308d4c
diff --git a/app-text/iso-codes/iso-codes-3.75.ebuild b/app-text/iso-codes/iso-codes-3.75.ebuild
index f8487e07c155..78f6eb5e905c 100644
--- a/app-text/iso-codes/iso-codes-3.75.ebuild
+++ b/app-text/iso-codes/iso-codes-3.75.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://pkg-isocodes.alioth.debian.org/downloads/${P}.tar.xz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="alpha ~amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND=""
diff --git a/app-text/libepubgen/Manifest b/app-text/libepubgen/Manifest
index 7ff0d080ffc8..c009d17e2940 100644
--- a/app-text/libepubgen/Manifest
+++ b/app-text/libepubgen/Manifest
@@ -1,3 +1,3 @@
-DIST libepubgen-0.0.1.tar.xz 295780 BLAKE2B e0aee4a076d84ffa290b25a357c9cd67df133e6262db750e8e2491b779f1775dcc38013458294492a1f22ce66584becd3a9ced83b44ea47871f9de20cd61166c SHA512 9add9c873ea0ad1b04fcfdfb987c7974b20f7e0c6c6b5a65b6ce5105a85318307fb9871ab60e998da649da378038f6df3722001940d00a7bc88af6dc87bd8945
-EBUILD libepubgen-0.0.1.ebuild 670 BLAKE2B b5d5617f6c4cffe86af0d753cc76a83688c0517d93bbee4eb55574ea2af06c883896f28c0246a4cd13f4ddc66f72d6e157dee2681cfb15600193a08cc62d81b7 SHA512 c2f47d84b0901c002550df5e2cf8c2409c5e164898022b45be04bfceda549513e2bb72d6733ec0679406ee1c8593dc304b434ab88666cb922cbe0144a17afd49
+DIST libepubgen-0.1.0.tar.xz 319652 BLAKE2B e6573e0a680711380ac3d2ef742413e38030e76dc50639f9659544e7410f7d7f987cdf1aa20cf2f2afa924bbcbecaf7141225d387fc509d0db6387cd144cb16e SHA512 6be431d06321807991048567aebd7111359f8aa364fe33e651c991553f832c03ad3bb3520b9f7e8d72a861a9ebd84483587becb9062e226bcd1d8ade1819b4a9
+EBUILD libepubgen-0.1.0.ebuild 670 BLAKE2B b5d5617f6c4cffe86af0d753cc76a83688c0517d93bbee4eb55574ea2af06c883896f28c0246a4cd13f4ddc66f72d6e157dee2681cfb15600193a08cc62d81b7 SHA512 c2f47d84b0901c002550df5e2cf8c2409c5e164898022b45be04bfceda549513e2bb72d6733ec0679406ee1c8593dc304b434ab88666cb922cbe0144a17afd49
 MISC metadata.xml 255 BLAKE2B 9b8486730bea2158e8be5cbbe0552c5460d1b18e2236a68e3f11d85ce4eeb96eb0e746f44a10cb7cdcf1bf498190a512ef42f47852c6843b9a3c937ceabc338d SHA512 ac646e8ac676faf0aac283e4be31c5f2b29e98ccf07327073ed05e688ce696caf639bdfea63e4aed141a90e84c0a86892bc717a52b95cdf1739aaa15240013c3
diff --git a/app-text/libepubgen/libepubgen-0.0.1.ebuild b/app-text/libepubgen/libepubgen-0.1.0.ebuild
index 508558384209..508558384209 100644
--- a/app-text/libepubgen/libepubgen-0.0.1.ebuild
+++ b/app-text/libepubgen/libepubgen-0.1.0.ebuild
diff --git a/app-text/tesseract/Manifest b/app-text/tesseract/Manifest
index 3938eaf31d86..b3b2fed51b1b 100644
--- a/app-text/tesseract/Manifest
+++ b/app-text/tesseract/Manifest
@@ -152,7 +152,7 @@ DIST vie.traineddata-4.00 12209616 BLAKE2B cd1eb9de7a319240b5279f7a7190244fa0c4c
 EBUILD tesseract-3.04.01-r1.ebuild 5840 BLAKE2B 010536068f4a3cd0e4f31b79cfc41100da1ef5e8ec91ec8d09ff86ab43bd304da4a7e1a346ac86cdde953daba3cd35057ed037710de120190b9fc8033ad08b19 SHA512 3efdd691009be9654e4a08ae71bd06c66fc73464c75d0700ee9d7c1a7eb2e23c7c28959ada858f57a6cac4b86f8d175252bfa4cd78d8b9e550eb6c1a487a595e
 EBUILD tesseract-3.04.01.ebuild 6015 BLAKE2B 427ec6a9f4541013e68343396e964496e51ce6cb842a9ff49af18edacc99fbe0eff9b6860655eb44b65b2fe15bdb91be691dca7f7196da49b8a70645a6b6c98a SHA512 594137b725f56ed51edc35ebd82521e31c0e2e12c85fc52e9394be2005653c64dd66a1bf45437d7b26e4b1eab2c4320814541529f23c4800631c9c3f541d8e5a
 EBUILD tesseract-3.05.00.ebuild 5862 BLAKE2B 2705e77c051fad25b7e25550c7a56361251b2542e087a12e1c550684bd88f2970eb91c9b352f469ac8ab38ef0011763a155ccdf108829ae113d6bfafbbba9a69 SHA512 8b26500aa7384bf7d215dafbebc69088ee6108d646353a99ef821594cc357a8e4b845ebb7c4d12ac562516bd56befe3440e9d645997884da82e1d7fb4deb50b6
-EBUILD tesseract-3.05.01.ebuild 5841 BLAKE2B 7947bb4c161d9b85520cb8bc72cbe239984f1a102bb20b0d278e7223d7adf9a1587da1a7dde83c693562e447fa881e3e93dc2fd54caecc0764df978502bd230a SHA512 fee0de88ba603024b5cc32e37f0b673f854a16f3dd14f615d6b1bf63b80289c80b0757f738d9e2fc6f14dcc9fb942e00f84bea40ba2ce8960f1623f9d22438f5
+EBUILD tesseract-3.05.01.ebuild 5840 BLAKE2B eab20ddfd91d037695ed5cf57c87ec57edc7106eb09474a0245d3b15f5f72efa3abd721842b6029efa5b96a129ec38979bced050833487a97464e62f7a34ffe7 SHA512 0f2ae8f02bb74f7dfc2ced133e98738a74d868711b2f3bdf18350d1ad8014327036756a96bea447de393240e502ea738c825206a13750f9700f9ebc772465e79
 EBUILD tesseract-4.00.00_alpha.ebuild 4167 BLAKE2B e638b8eb2a49dede24bc822a28da5d5e0671859eb707f28e8fd8de02b9f7e6db4d370d94b9a651f0072632d9f5cf4da809c128eb2a58636a7cdb6cff3eb35172 SHA512 1fbd99257210baee6791dc8fc4b3faa39b86bcbf786ed9c1a4da521c7b5b4a0c48a9c74596d589fcbe07767cd104490ef1b5c72beaa7226bdcfac373f30eed03
 EBUILD tesseract-9999.ebuild 3975 BLAKE2B 7aec6a728d49f1c50a7f12c15c17c37280c7cf38495fe375b37f5203da998c7fd1967fff4b1326d9cbc3ca8edbcb03e5ec16d63aaa2ed1129eddbffd9dd13bba SHA512 f1c5f75693a6eaff06a193113266020cde1bdbba7ba291ae7e6aad94fd7a94401fa03ac3f8ea2fdcd27417438045fac83a242027fb34ae836d6bfb0e77ad1f13
 MISC metadata.xml 1271 BLAKE2B e2f8b18ee6fa20f2c059c5fc99e242743cc30153e783874e3b43ef7185b0f5827d611884dfa98242ec442edd8adf278fdc389731d61e9114d7549df934b6f7d9 SHA512 7ea459bc822290be824fc07b7abe26e13ad537e932b5cf71925e654f191fdee4d8681fabdd9a7fb246e87a9a365a8c0d6f933e34217aff24eb8bf3d741369656
diff --git a/app-text/tesseract/tesseract-3.05.01.ebuild b/app-text/tesseract/tesseract-3.05.01.ebuild
index f08d377a08c6..84d774ac1468 100644
--- a/app-text/tesseract/tesseract-3.05.01.ebuild
+++ b/app-text/tesseract/tesseract-3.05.01.ebuild
@@ -60,7 +60,7 @@ SRC_URI="https://github.com/${MY_PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="alpha ~amd64 ~arm ~arm64 ~mips ppc ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~mips ppc ppc64 ~sparc ~x86"
 
 IUSE="doc examples jpeg math opencl osd png scrollview static-libs tiff training webp l10n_ar l10n_bg l10n_ca l10n_chr l10n_cs l10n_de l10n_da l10n_el l10n_es l10n_fi l10n_fr l10n_he l10n_hi l10n_hu l10n_id l10n_it l10n_ja l10n_ko l10n_lt l10n_lv l10n_nl l10n_no l10n_pl l10n_pt l10n_ro l10n_ru l10n_sk l10n_sl l10n_sr l10n_sv l10n_th l10n_tl l10n_tr l10n_uk l10n_vi l10n_zh-CN l10n_zh-TW"
 
diff --git a/app-text/tidy-html5/Manifest b/app-text/tidy-html5/Manifest
index 6af6de92662b..4e2e2803d27c 100644
--- a/app-text/tidy-html5/Manifest
+++ b/app-text/tidy-html5/Manifest
@@ -1,3 +1,3 @@
 DIST tidy-html5-5.6.0.tar.gz 665438 BLAKE2B 3e362c8a22a5de827ec14110bad08985ff326c061043cd3cb0ffefd6b3af9a178197fca6a97bbb42b94760e530ec44646f13f6429736f7989effe52515580f21 SHA512 179088a6dbd29bb0e4f0219222f755b186145495f7414f6d0e178803ab67140391283d35352d946f9790c6b1b5b462ee6e24f1cc84f19391cb9b65e73979ffd1
-EBUILD tidy-html5-5.6.0.ebuild 531 BLAKE2B 787f1986416e6faddbd8424a5509b043019f5c10d0cff031a1be38b33ffb5bd880718e250f2833a6e14d218fa1491238fcaa9518b3341e14b99965da91bf5edd SHA512 995d31b5e1fe28a127042296c5a5f28c0e4d65352f10238789018210cad6c083eb809b16c33d3c2950568174db698932ea8074bb295cd797880b766188d6ec4e
+EBUILD tidy-html5-5.6.0.ebuild 530 BLAKE2B 6e45eb3752607704e5b8ea8821a56dabffeb92c87f41dc2265d6d1d2b73918d9f45754b9f613a9b4a40fa4451a8cdd529b9dc1024452c96b2300eb3846e69327 SHA512 c4569dd08335099326452f76e29b0cc79334298f890e9ea912920791eb4a7f20164868dcce41d0a815525faa0ca4b98334e2637fdd066901a834a4fac6c04fda
 MISC metadata.xml 333 BLAKE2B 92aabf92af24245465d0e5b1f99faabf41cdb71fffd31b7fb1e8268c5d91977b44d3998ede7789f280031c80d70deb726ed201b896007d63fd0710ffbf8b120e SHA512 aedfa31a9188be8d3ad9ea8b278acf1b3e90f9b0c91dd63b00c19a90c6a74d16ee57d80810f39392564fbc1b782b35b6231a9b453f91e765296e5ec45d5c087b
diff --git a/app-text/tidy-html5/tidy-html5-5.6.0.ebuild b/app-text/tidy-html5/tidy-html5-5.6.0.ebuild
index e692c618c60e..6444b8b13fd2 100644
--- a/app-text/tidy-html5/tidy-html5-5.6.0.ebuild
+++ b/app-text/tidy-html5/tidy-html5-5.6.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/htacg/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
 
 RDEPEND="!app-text/htmltidy"