gentoo resync : 13.10.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-10-13 22:19:36 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2019-10-13 22:19:36 +0100
commit: bb72e65b6d6ce95abb5d486dad35d37dc105e89b (patch)
tree: b31a9263d386dcae4cb06764136672508dc5efdf /app-text
parent: 9b1e6d491f32eb4caf0c8e197bdec075713c97ca (diff)
306 files changed, 1066 insertions, 1873 deletions
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 9f4ee225b0e4..e0f606331c81 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/a2ps/Manifest b/app-text/a2ps/Manifest
index c10ffc2ef323..f49fc77806fe 100644
--- a/app-text/a2ps/Manifest
+++ b/app-text/a2ps/Manifest
@@ -15,5 +15,5 @@ AUX a2ps-4.14-ptrdiff_t.patch 367 BLAKE2B 1a69ba36b72a08f3c853905d9d2a0f787259f4
 AUX a2ps-4.14-texinfo-5.x.patch 5996 BLAKE2B 720a408c88c848fbe9b6ece319a8eb05a109df97dd2c25a26ed8a4ad8f49d545d111900cedc4d5eda05b4aa120b9f1f4aecd6434c6f20f1944d863b13d4952aa SHA512 1e93a21cda8547a49d09e429c8ffed23b68e7f7555fa356f615bc76eef059a0065cc71e62bb4f1a1239aaf140796195c7d264c5c884e1a89516facbdbcb955d9
 DIST a2ps-4.14-ja_nls.patch.gz 27576 BLAKE2B 7300971fb76f6c8d2b0e5ffa519cf6064519a33f24430b9894e43778dff5b78f7cf7e2b9fe1e98fb475f452b39ccc29f88f579bbe1922ac3ef70775a05591b32 SHA512 f02f553dd9d9dbd9dfe41ebfe103493000aa4e9de5634c94e7453f73b66d88fea6b0010095913a4a99c7285990a1df1ebcc39da451b2b34f96b0c191112b125f
 DIST a2ps-4.14.tar.gz 2552507 BLAKE2B cd15a2b85f54f8bfb92adf9f4cf2c3c29091e528ae8072d0e905c58cc94caf55b76ac3e37891f8a0bc0909a177c5ee434fe5aaab3625a2c14127dabad8b506ed SHA512 fd6ac8ab47d789114c283e8ca508f7f56feabd1a189f4ac772cad9e6be7e3791e210892cfffd04ad1d39efe4b15386b2e61bf4cd56b70ed581c0554f36bfe06f
-EBUILD a2ps-4.14-r6.ebuild 3586 BLAKE2B 0aeab0e2234264c064222ea83b2390bad9a950854c0f63ffe150efc5a66b238e4ae69354df63ef73e13d31c7ef1636d709585f334ebee74ba5ac37c2b5e94c91 SHA512 72ae818e2a7d5cb613a8aa3465b1a493be404d7159f5280aa2fefce224fc3a64e90f2b0c60b6cb5f8fc9b12561363a5ea5f88c4459a3aa22510b6445adc207a8
+EBUILD a2ps-4.14-r6.ebuild 3576 BLAKE2B 66e1a0aabfd2032310af35ce798a5b5e21b2089a93ff5a5396246fdc2bb1c8f83d1ebf820cda8a9e512d219f6d99e9bc7268c3a7479fa58f25fc123bdb07bf98 SHA512 755386abe294f22aa129fb098b53fdf1e69c44d594268c41a6dc44f48cc9a7d9b9fd7ee80fdf1089efc2135212cf13f1e3480f58a6ef93ac5cd77741674921fa
 MISC metadata.xml 346 BLAKE2B 5f3d7c0d868dfb3ce0ec6e47c33087f9d41b6b2e11d569c48b1a6a635f1a46e7cbb51e793f7df235c4b9dc20eb2eb24a5c8764ca2b6eee34a900d1f4641c4de7 SHA512 0973b9c922d40a291ad52b590c40ef122167070e2f3c2c30980a83188bf8ed8742d825542ca1ea88139fd7ceb0e251f91dff13822ffbec4c9a6af2ea2b7a0010
diff --git a/app-text/a2ps/a2ps-4.14-r6.ebuild b/app-text/a2ps/a2ps-4.14-r6.ebuild
index 8d73b88d0665..272fed2bb5cb 100644
--- a/app-text/a2ps/a2ps-4.14-r6.ebuild
+++ b/app-text/a2ps/a2ps-4.14-r6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="cjk emacs latex nls static-libs userland_BSD userland_GNU vanilla"
 
 RESTRICT=test
diff --git a/app-text/aiksaurus/Manifest b/app-text/aiksaurus/Manifest
index a3068083921a..c4b87e8fd4b9 100644
--- a/app-text/aiksaurus/Manifest
+++ b/app-text/aiksaurus/Manifest
@@ -1,6 +1,6 @@
 AUX aiksaurus-1.2.1-format-security.patch 822 BLAKE2B f8891b9772367ce4aef4b68e3af122826d7250d9cec4df9ef48a3564cb522911d56710394eaa183b6180e08eae939b9f00a73fe061f21be4142520689687ad4c SHA512 72ebdc63cbb2c56bd8274f92501cbbae8c66e7d81b11b8fdeda38149da4bf44ab88699d248093eedc9813f6cd60e2a1f360fb39d778b4b7827777b1d003ab1dc
 AUX aiksaurus-1.2.1-gcc43.patch 734 BLAKE2B 9c8b5c401bc116d9daa52ee100bd42127639330449b44d0012494fd8536d46dd99079ee606df794b515ae002d5834f379706af7ecb41785593be150842baaa53 SHA512 6f821ac66f0dd4601f84a6fe8f71b14712854e293f4ebc755a80d34032725cee61b919da1547b514e3d8b6a07edd29016ae53283a28f1792119ae99850016241
 DIST aiksaurus-1.2.1.tar.gz 928893 BLAKE2B 12bcc77eccd921e4e2dd3f148be76905bb162a38483b0aee620be2fe069685a4289df4ec12f91286eb88d9c2f1f4d58556b0b6ac38857fe4f11bb5d31adff496 SHA512 48591850f28f1a8f4b4986df14090ef7bd57cbfbad739cb0013db021f6f5bcb3c592b38e36774735499e27b9e99330504f8d9c6022158e25469cbc81d13f7463
-EBUILD aiksaurus-1.2.1-r1.ebuild 921 BLAKE2B 51857e2551a12d4b508305888552bb6d58f4a8a2b4ea2e3d72fc086402be3698e39a156b3387fbfa3cf53940cc7c8bf16ede10d06bb5fbd62f632f92220d1144 SHA512 bc42edc981b8bc886e1024d5f0e8ae1a423a2a06e29d39faca6b3c334bfaeda249ba0d9e36252e929530b5e8bc3ee443e8ae8a0a167bc7037d890ecd3d1dbde4
-EBUILD aiksaurus-1.2.1.ebuild 803 BLAKE2B 4ea59eb9cd6bb4513091a92c72d346ec18cda4690b0bc5d3903e84fe57063f9ac6b3bbfee731dc48d51d906b8b26b012f84af146d9f11011e6f30d8bf10d7a52 SHA512 f442673ae7806af431baa5d49c7eef26aabce69935b22e26255547e25737b03501e6096b82f80db49c07b78e43e45fcc65ecc6bb3eaa4daef52388d3a55cd9b4
+EBUILD aiksaurus-1.2.1-r1.ebuild 911 BLAKE2B 123b26f66856a3447fd19c282cb6b33dc2fd82d0cb98fa36b8a09fa798a410f6e6f202da88a03ae6c87b6a640b6b4b97c10cb9b7034d71ec8480e1f191646711 SHA512 81e07f8b5aa16025e0a6a980eb0d5a42d2d45001a660f72ac5aa9148693dd101975c5eee1ca0c87355313194651cf378757ea6af4b5d7e23aa721a644bf5e5e1
+EBUILD aiksaurus-1.2.1.ebuild 793 BLAKE2B a95cc8ac39de6255d16bbc9b14f25c80a3403660ab7086f3cb75d21cba5e72b6764e48c7c0fe75653e3b70cdecada769efc76f9da8992bff9572b49635893856 SHA512 dea3afd48ed71d0b2e7c0c265d12af342c309ebb4f40261f32b8f80cf8bb2a1a6f7928b4640bdaea6b8a2eb4008260ef1e5e67b1ffa71b0bd32860646efce088
 MISC metadata.xml 245 BLAKE2B 163eaf1f9854d0f7906920339f1ddf8321c4658b23e14d44bdc7e07ea3eba22d7cedb1cc63285aff307a1287555463807160d380836d63032637eacd5ce97f1d SHA512 34945e0950bf668d24db2565287fdd8484cccb8968df2efbcc665905ee583f45222fe0ff848c267cf9a25f58d3aae9e870656d88b1f813b7812a185782564e08
diff --git a/app-text/aiksaurus/aiksaurus-1.2.1-r1.ebuild b/app-text/aiksaurus/aiksaurus-1.2.1-r1.ebuild
index b78d34eacee5..dd4ebeeef7d7 100644
--- a/app-text/aiksaurus/aiksaurus-1.2.1-r1.ebuild
+++ b/app-text/aiksaurus/aiksaurus-1.2.1-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="gtk"
 
 RDEPEND="gtk? ( x11-libs/gtk+:2 )"
diff --git a/app-text/aiksaurus/aiksaurus-1.2.1.ebuild b/app-text/aiksaurus/aiksaurus-1.2.1.ebuild
index e86e0fca8539..cea5c259a4d3 100644
--- a/app-text/aiksaurus/aiksaurus-1.2.1.ebuild
+++ b/app-text/aiksaurus/aiksaurus-1.2.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="gtk"
 
 RDEPEND="gtk? ( x11-libs/gtk+:2 )"
diff --git a/app-text/asciidoc/Manifest b/app-text/asciidoc/Manifest
index c2909fd8ca89..db5cc63a3957 100644
--- a/app-text/asciidoc/Manifest
+++ b/app-text/asciidoc/Manifest
@@ -1,8 +1,8 @@
 DIST asciidoc-8.6.10.tar.gz 577208 BLAKE2B 320724c3e2306e14212a4e32f09fb735861f9b0126ce86695c6b5840b69f94d0e5befbbfc355006a10d13d34e8ed3582f0bfb678744654a7d2040555016b1681 SHA512 6ecc86977baaf1c756691e3f661e43ef2bb24e606898f6075bfa6f174d1fdc5e77d00853ffe014847e295364349d6ad34f3b8209cb97870e0233012fc38a281a
 DIST asciidoc-8.6.10_p20181016.tar.gz 576694 BLAKE2B 4d255606675346d00ab03398bf48cb30d357f9f9366944e4faf66ae4c96dafce49acdd930fc848f3dbb2d704a004bb5815d17b53416a76c8368a92e4716328b2 SHA512 801f360b0c444e932f1c50897d446de0ec3f0fb2206080b5aa6dda396fede96065f7bb629a84c8a8e40c5d8897f305fdb1877512f04ae757f3b142fd3a7305d0
 DIST asciidoc-8.6.9.tar.gz 907253 BLAKE2B 45db42abd9ec73f6d3b20fc755bdd501eab1503bd8d5d6bb6b7d66c442cf8bcd47ee4325dbb572bdcfd01168ef1bccc3430ee7c545e7b3a6715b8ebf09516ad9 SHA512 1984482010dbd35c3a1def67f4915ce83ecfc29a7463f84aa312107d7a9ff647978f57615462c65e885bea424eed89a212df728cc3acd3c63df1c763dfa5e955
-EBUILD asciidoc-8.6.10.ebuild 2411 BLAKE2B 18435c6f4749a661ae93d613991599fffde505210c132cfe1807035efb1323eb3bfe563a5fe53a14f4b7c7a6885c27889428db70b3c4e605f4dde37fa61d0620 SHA512 c202341942125b482e8e4cb6ef6ddf11e6806826667cd53f94e032971819b70cbdf4c2a16dc4a14b1b31df096d5bed673f1e76362af13e8761f15a6271b1d5b6
-EBUILD asciidoc-8.6.10_p20181016.ebuild 2576 BLAKE2B 16cd4a41ff09070752296ba3d3aaa573b4d13c29388035db99c945e6085f2b1816eb76c3310d325a0e499f1eefb5c09f4e920d5ad5347cee6d3c5e7932534c3d SHA512 6a940592d66cf3dd654391e718c4827a590dd0f814f4694d4337f0f4d3f450135991d9359f3c83477969ac7613ac1a973989b5cd2753d97b0a492677c79390cd
-EBUILD asciidoc-8.6.9-r2.ebuild 2171 BLAKE2B 76606035ddef0bd31709a24a1b9896dda55ee1c299a043b46724da1a3d21565eddbd484ec0fd80db320c6db7aaaba1b340d6e1aac4bed7416724b9cd421791a8 SHA512 5a5bb301dab871ca93c282892c0e7a9421dad343dd529670385231397cfb96bdc01a483ce23fe86348c4af7ff2f00185006cb498e65b0eb5718e34c2fa7a3883
-EBUILD asciidoc-8.6.9-r6.ebuild 2370 BLAKE2B ffa3b9a29ff82b63eeb56d4af3c527ec62d19034086a40569116c8949fbb8bde289273f006f6f707cfed75d3f5302a8da7d09b01e998b58268aa83925eb39d31 SHA512 f953144beb29005d3a0027a644f3a1d68fbe54dafeeb2f22d176ef2a28fe92e7dc6b315c47d49e7d6132cefdef8f623e2b1c90f30337324fa90a418e6e29e39d
+EBUILD asciidoc-8.6.10.ebuild 2389 BLAKE2B 9c7971a5b005e43ace62b818be8e5514e78f502f7aa47919d679576eaf4804502edc012456019f17bd339d53f119f3f0062e8faeda1b606d1c52d646bb4fc87f SHA512 fba805690f97e38c5f154ff4421d260ac73022ed8358840db60e0da91191ce01410a0b0b1b24ea634d0ae1d124d29883b5a0782ec3d5a627e874fbb4a0b10cb6
+EBUILD asciidoc-8.6.10_p20181016.ebuild 2554 BLAKE2B 368368ee6e9043a38d1f6fcd32cd9cc1ea07b1b387b839d439693b388c77b2d969cfcfab43b9ab0fdd153d0571bde3f61140d7b361137470b5c05d42d413ddea SHA512 12b321f595458d9b73b72cd921460ae00cb75a0e0367f332ef8db9de583641f634302632c65d4d57b29a3fe2d6180005187b05d029d23cc758fb2669a0094de2
+EBUILD asciidoc-8.6.9-r2.ebuild 2149 BLAKE2B 634aa49b629496eca149f5ad98c946ed4366a97ccdd588eb99cd5d68360af85054da33e0c2b13911539f98bcb1d3a8ab812332c756b7043a1f0ecd46d2b9f840 SHA512 e61050b06d020478fe5ef2dd29bb77c2760224420e0b87ce30dbbbe2e905d7f550056d1469fc6698b5de8b93cab4360c237dc3c2f975e9d0a10bc07cdd0d1a78
+EBUILD asciidoc-8.6.9-r6.ebuild 2348 BLAKE2B a45d6533355b1dba02ddcdff3856b751283346904874f03d7a9d78963cce22d665d4341fad5e94bcbfa6338580757f9818eed258c92660bb156678c1b67fa782 SHA512 fb7edb6b0337799d2984e6d221b84940eafd0d6f7b05e80e17d1a5f28ebececffb22b4910969b444b9852e59fb25675fb5c7b239fd7645e810f10f588475913b
 MISC metadata.xml 514 BLAKE2B 89fefee3e8081fc45a8251255bf365f58eba6aa9eef92a23bd8f234703b7062b1dd2a415260fcda1b799cffa4b46d0da22b153ba8de6b77cb6076666ff43ccb7 SHA512 2587ac6d8c24ceca295eef2dc6e0735461dd09864d6a1f282d67fc3c58cd18aa565099a2c280edec143024295b74a251152918932c37d3be450aef68d367ca70
diff --git a/app-text/asciidoc/asciidoc-8.6.10.ebuild b/app-text/asciidoc/asciidoc-8.6.10.ebuild
index dfcb6964d773..197355e1e29d 100644
--- a/app-text/asciidoc/asciidoc-8.6.10.ebuild
+++ b/app-text/asciidoc/asciidoc-8.6.10.ebuild
@@ -10,7 +10,7 @@ inherit autotools python-single-r1 readme.gentoo-r1
 DESCRIPTION="A plain text human readable/writable document format"
 HOMEPAGE="http://asciidoc.org/"
 SRC_URI="https://github.com/asciidoc/asciidoc/archive/${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/app-text/asciidoc/asciidoc-8.6.10_p20181016.ebuild b/app-text/asciidoc/asciidoc-8.6.10_p20181016.ebuild
index a395cd9f17ea..78348887c8c9 100644
--- a/app-text/asciidoc/asciidoc-8.6.10_p20181016.ebuild
+++ b/app-text/asciidoc/asciidoc-8.6.10_p20181016.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="A plain text human readable/writable document format"
 HOMEPAGE="http://asciidoc.org/ https://github.com/asciidoc/asciidoc-py3/"
 MY_COMMIT="618f6e6f6b558ed1e5f2588cd60a5a6b4f881ca0"
 SRC_URI="https://github.com/${PN}/${PN}-py3/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/app-text/asciidoc/asciidoc-8.6.9-r2.ebuild b/app-text/asciidoc/asciidoc-8.6.9-r2.ebuild
index 1a8c91dd30a4..47c8ad5d9af9 100644
--- a/app-text/asciidoc/asciidoc-8.6.9-r2.ebuild
+++ b/app-text/asciidoc/asciidoc-8.6.9-r2.ebuild
@@ -10,7 +10,7 @@ inherit readme.gentoo python-single-r1
 DESCRIPTION="A plain text human readable/writable document format"
 HOMEPAGE="http://asciidoc.org/"
 SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV}/${P}.tar.gz"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/app-text/asciidoc/asciidoc-8.6.9-r6.ebuild b/app-text/asciidoc/asciidoc-8.6.9-r6.ebuild
index 06458cb42e0e..19546e757826 100644
--- a/app-text/asciidoc/asciidoc-8.6.9-r6.ebuild
+++ b/app-text/asciidoc/asciidoc-8.6.9-r6.ebuild
@@ -10,7 +10,7 @@ inherit python-single-r1 readme.gentoo-r1
 DESCRIPTION="A plain text human readable/writable document format"
 HOMEPAGE="http://asciidoc.org/"
 SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV}/${P}.tar.gz"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/app-text/aspell/Manifest b/app-text/aspell/Manifest
index 9e1b24849150..8c07f77c295d 100644
--- a/app-text/aspell/Manifest
+++ b/app-text/aspell/Manifest
@@ -5,6 +5,8 @@ AUX aspell-0.60.6.1-clang.patch 1288 BLAKE2B fa2da2471f3ec3c6d5c9a98c0afd000bd86
 AUX aspell-0.60.6.1-unicode.patch 8273 BLAKE2B ceadde03ffb1904e58c76074444013d2517a20dafeb5847963b6d8e3dbd4ab7fb00fe0d13fd26d3381edeb4e68b2feefb2c8b44186336bdfe197d483920dd509 SHA512 8601183d2e84801c193f5a4412e021ff79ccd27e031c0e8ec85a879619868d13389cb60fb0f4fa971114da64645dd4fc5cbe480f49e88d575826cf429a533b98
 DIST aspell-0.60.7-rc1.tar.gz 2034916 BLAKE2B 7518660b0bb7f75aa3b659519a97132675b39dac7e8806d5450d43f40d62683e4c4a41a8c18cd08b6ab9ca53911caeb87e0898eb04ad9d2f98185e2bb6033d5c SHA512 e13240d78b8afd74d8a8cfd5fc7fe2081de85b33621e86543cdf942ed601d36c4e0cbf38a54be083e951127fa9435677cec2997387cb0e7b51a5597386e7e8d1
 DIST aspell-0.60.7.tar.gz 2071890 BLAKE2B d0c8780179cca304361b9d58be667f3dd99d9319cbcffd92a0cc69c65c3a40410b10f6953471ddd9d6df355b557761ffff71ccb5bc6995a57de69a9adb07db66 SHA512 6f5fcd1c29164ee18f205594b66f382b51d19b17686293a931ca92c1442d3f7228627ca7d604d860551d0d367ac34dfb2ae34170a844f51e84e390fb1edc4535
-EBUILD aspell-0.60.7.ebuild 2782 BLAKE2B 0be6cd8d70288dd38578afc22aacd6bfc433d5d2e13f6d8f1de94229c528aa08acef3acc53c61ea5a42b3b36cf265f837192a787d3d1d3436ead0d8c8acbe974 SHA512 d77f9b0a7f8479121c68c1ea6d0b9971125245aa06a96ffd70489ceed9de548f857d7ba47aff14275d1750d662af179ee9881314a65f5d598b61917da9fb8c5a
-EBUILD aspell-0.60.7_rc1.ebuild 2715 BLAKE2B 06d035fba952118b6248e50644780a4645eb8706b65c64e55247272a9dfc8005589fe6dea4c42e3b52145f3ffa055a4d18032645b257e2cdcb9a23554b10962c SHA512 23ba2fb29445c969461a4cf00a1e4e21dc2d26cc4351f6a6f6f3784dd4f652bfcd91ecb1159fedec6dedd5ffd18b35e1c225cd7da92c6786bd3ad9fba38cda32
+DIST aspell-0.60.8.tar.gz 3486448 BLAKE2B a72e70af65749059a576740377f93b20ab283f73fa7919894f6af189b5aa73581fa0410800851c9396e7d13f4cbc2f7edc23c53d46874d0389ffdb2432ff08c2 SHA512 8ef4952c553b6234dfe777240d2d97beb13ef9201e18d56bee3b5068d13525db3625b7130d9f5122f7c529da0ccb0c70eb852a81472a7d15fb7c4ee5ba21cd29
+EBUILD aspell-0.60.7.ebuild 2760 BLAKE2B 60bdbc0c7b9bae9d1581b56739f787757e4f997df5555ea281d911a6a499c6f8e2f868585ff56d91f0fd623fb02dd621dba4cb5443737451404ca58cf587e4aa SHA512 e1b48dfcba09975fd4648483b5923ce598eca3f61a0caf9256b2ac6986c12f56ac3911a74e70312b2d84e0c7d4494ffc190b57ec17683f60846fdbaf538c88ad
+EBUILD aspell-0.60.7_rc1.ebuild 2693 BLAKE2B d8e53782f55571c0c53d2dce4069e3c3f2113a4977c78ed113294d4e7d342dbb2b295c3606f1a760212cbd0958cb3aad57a3a161c4ef6eeb3b4c558ddfd89a98 SHA512 54bc31bd148687657ab4700bf757bdd9d632689a50a28f606b29c5e550341acd9f4fde53bca338406127764ee9c467aa801b9a234b18f44d422112fc3e5d88ca
+EBUILD aspell-0.60.8.ebuild 2760 BLAKE2B 60bdbc0c7b9bae9d1581b56739f787757e4f997df5555ea281d911a6a499c6f8e2f868585ff56d91f0fd623fb02dd621dba4cb5443737451404ca58cf587e4aa SHA512 e1b48dfcba09975fd4648483b5923ce598eca3f61a0caf9256b2ac6986c12f56ac3911a74e70312b2d84e0c7d4494ffc190b57ec17683f60846fdbaf538c88ad
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/app-text/aspell/aspell-0.60.7.ebuild b/app-text/aspell/aspell-0.60.7.ebuild
index 676475350502..54907d973247 100644
--- a/app-text/aspell/aspell-0.60.7.ebuild
+++ b/app-text/aspell/aspell-0.60.7.ebuild
@@ -17,7 +17,7 @@ fi
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="nls unicode"
 
 PDEPEND="app-dicts/aspell-en"
diff --git a/app-text/aspell/aspell-0.60.7_rc1.ebuild b/app-text/aspell/aspell-0.60.7_rc1.ebuild
index 5f2773604f59..da438fc07845 100644
--- a/app-text/aspell/aspell-0.60.7_rc1.ebuild
+++ b/app-text/aspell/aspell-0.60.7_rc1.ebuild
@@ -17,7 +17,7 @@ fi
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="nls unicode"
 
 PDEPEND="app-dicts/aspell-en"
diff --git a/app-text/aspell/aspell-0.60.8.ebuild b/app-text/aspell/aspell-0.60.8.ebuild
new file mode 100644
index 000000000000..54907d973247
--- /dev/null
+++ b/app-text/aspell/aspell-0.60.8.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic libtool toolchain-funcs
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="A spell checker replacement for ispell"
+HOMEPAGE="http://aspell.net/"
+if [[ "${PV}" = *_rc* ]] ; then
+	SRC_URI="mirror://gnu-alpha/aspell/${MY_P}.tar.gz"
+else
+	SRC_URI="mirror://gnu/aspell/${MY_P}.tar.gz"
+fi
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="nls unicode"
+
+PDEPEND="app-dicts/aspell-en"
+LANGS="af be bg br ca cs cy da de de-1901 el en eo es et fi fo fr ga gl he hr
+hu hy is it la lt nl no pl pt pt-BR ro ru sk sl sr sv uk vi"
+for lang in ${LANGS}; do
+	IUSE+=" l10n_${lang}"
+	case ${lang} in
+		de-1901) dict="de-alt"  ;;
+		pt-BR)   dict="pt-br"   ;;
+		*)       dict="${lang}" ;;
+	esac
+	PDEPEND+=" l10n_${lang}? ( app-dicts/aspell-${dict} )"
+done
+unset dict lang LANGS
+
+# English dictionary 0.5 is incompatible with aspell-0.6
+RDEPEND="
+	sys-libs/ncurses:0=[unicode?]
+	nls? ( virtual/libintl )
+	!=app-dicts/aspell-en-0.5*
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+HTML_DOCS=( manual/aspell{,-dev}.html )
+PATCHES=(
+	"${FILESDIR}/${PN}-0.60.5-nls.patch"
+	"${FILESDIR}/${PN}-0.60.5-solaris.patch"
+	"${FILESDIR}/${PN}-0.60.6-darwin-bundles.patch"
+	"${FILESDIR}/${PN}-0.60.6.1-clang.patch"
+	# includes fix for bug #467602
+	"${FILESDIR}/${PN}-0.60.6.1-unicode.patch"
+)
+
+src_prepare() {
+	default
+
+	rm m4/lt* m4/libtool.m4 || die
+	eautoreconf
+	elibtoolize --reverse-deps
+
+	# Parallel install of libtool libraries doesn't always work.
+	# https://lists.gnu.org/archive/html/libtool/2011-03/msg00003.html
+	# This has to be after automake has run so that we don't clobber
+	# the default target that automake creates for us.
+	echo 'install-filterLTLIBRARIES: install-libLTLIBRARIES' >> Makefile.in || die
+
+	# unicode patch breaks on Darwin, NCURSES_WIDECHAR won't get set
+	# any more.  Fix this.
+	[[ ${CHOST} == *-darwin* ]] || [[ ${CHOST} == *-musl* ]] && use unicode && \
+		append-cppflags -DNCURSES_WIDECHAR=1
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable nls)
+		$(use_enable unicode)
+		--disable-static
+		--sysconfdir="${EPREFIX}"/etc/aspell
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	docinto examples
+	dodoc "${S}"/examples/*.c
+
+	# install ispell/aspell compatibility scripts
+	newbin scripts/ispell ispell-aspell
+	newbin scripts/spell spell-aspell
+
+	# we explicitly pass '--disable-static' to econf,
+	# hence we can delete .la files unconditionally
+	find "${ED}" -type f -name '*.la' -delete || die
+}
diff --git a/app-text/bdf2psf/Manifest b/app-text/bdf2psf/Manifest
index 49502d3157e3..df0dd89806c6 100644
--- a/app-text/bdf2psf/Manifest
+++ b/app-text/bdf2psf/Manifest
@@ -1,5 +1,5 @@
 DIST console-setup_1.104.tar.gz 3272857 BLAKE2B ae7a5929a059ddd2258884e5207198ae517da1284e264527878ad25bf883e48b399e53f2a987265623a5cffa3eefce8cce5fe8ad632576c46bba40689c17c586 SHA512 72b07a0ed955069777c1691b16753534630bcbdb5cd94f05ae95e8c27436c233598f01418fbf52a29b6ecf7d8217e6af841778d8e5d329569f2f585b538ba03e
 DIST console-setup_1.155.tar.xz 1641952 BLAKE2B fbe1e58915c2aac1148a1de31eca5bc9b7fc078c9840b5d51d8b1211e178315360e294d81040c464e2404774594606b3fecab6f7924b1fd4bec4c24b219e9197 SHA512 e00b0b48d91c9587c0659714f74de259bf3efd1caa553c4a06d9bc545335463808db2da16797ffca1dc59cae4f524619d3cf9a68db2ff5ad7b47cdd8aced37ac
-EBUILD bdf2psf-1.104.ebuild 693 BLAKE2B 961f6e8ebac9a32f2086acf1428982ecbdede10cea9fc9fdbe8a6971b3892139f36bce1c6ffa98074855e3b131fc1e710ab8a71f34600a75bcda687623d6cb2b SHA512 a4c868d5e4d02b5de553fda422e02b662a73b95dad846a758527dd66ada333cac9406c46d596f37d915a23d2ebd482f0e4752351d337969035afdc6130a1ad5e
-EBUILD bdf2psf-1.155.ebuild 701 BLAKE2B 5b64a1d92b3856aee6429421bd65f931751f61200e3b9a6df2aa2a1974a95a0ceafd47e57855223eae50d77e5ee5381b00326a5db744dea7410e90c0a0871db1 SHA512 d47ddc0b4e9a2f2c6839c4ede3043cebbd8100e1621486b006f3412841f51c434c28d893e4f6fd2f34d9ac485771351aa66c99bc097ceed0e06fd96d998c85aa
+EBUILD bdf2psf-1.104.ebuild 683 BLAKE2B 537e2bf5e0be96a56796def32a886b0cdb164957e02efd909240a5d831429550d1d1fd5648ec1ccf281b683d004ac694839063ca890fd285572c136d8c452581 SHA512 a2fae1806d040303b1304a00e4234b206991ac08cac9291e61302fbf042e259ad73517d3d7ebecaf055370273f3056ed6aa93567308e2e25b42173c082ae217f
+EBUILD bdf2psf-1.155.ebuild 691 BLAKE2B 68b89128f921c18f77376a4972da9a258e11b53f2ce973a83584e3c8b52750592f6ed2b97e49b90934f395b81e2024a4b1b68406eefa1451e863808f58cf0631 SHA512 39cbd5722bad1f5e8e25e2edf14a52d767eaa8fab75c56a043d7aeb7b50f28ec412e479989189f512f1b60207463084e504f75437031ca4d0fbfd96411ca0487
 MISC metadata.xml 246 BLAKE2B f94a229d0ffd7220f14c23ca2b0b6b84128338b5af27cd18ddb0c9e2f95f51c943fdfbc368c03b4a87d7bb381c668158fdc169fd067cc0cd8cd35852acc29d62 SHA512 b6df287a6e1f18bf267a05d8eb6dea788ae7ec74de31d9cea76fea038e4090c6a83d62221505d280d55e9b314d059c409e442951d78eb3a58928307ff118147b
diff --git a/app-text/bdf2psf/bdf2psf-1.104.ebuild b/app-text/bdf2psf/bdf2psf-1.104.ebuild
index c9f47dc27058..84e96bab4fc9 100644
--- a/app-text/bdf2psf/bdf2psf-1.104.ebuild
+++ b/app-text/bdf2psf/bdf2psf-1.104.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://debian/pool/main/c/console-setup/console-setup_${PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ia64 ppc ppc64 ~s390 ~sh sparc x86"
 IUSE=""
 
 DEPEND=""
diff --git a/app-text/bdf2psf/bdf2psf-1.155.ebuild b/app-text/bdf2psf/bdf2psf-1.155.ebuild
index 29eca139506f..f0e61fad5df4 100644
--- a/app-text/bdf2psf/bdf2psf-1.155.ebuild
+++ b/app-text/bdf2psf/bdf2psf-1.155.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://debian/pool/main/c/console-setup/console-setup_${PV}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE=""
 
 DEPEND=""
diff --git a/app-text/build-docbook-catalog/Manifest b/app-text/build-docbook-catalog/Manifest
index d10b0322d048..2e97477168dd 100644
--- a/app-text/build-docbook-catalog/Manifest
+++ b/app-text/build-docbook-catalog/Manifest
@@ -1,3 +1,3 @@
 DIST build-docbook-catalog-1.21.tar.xz 4620 BLAKE2B ed4aa645a5bb8e168c291c05891a2359114c9148a81588d93542528a0c74828a1824dc98a14468e8ba65525edf5aae8c936f29190d54063064cd54e2af8dbc3c SHA512 0becc1bae100101b072c62bee844157151336aebc39a046030c8b7b501e13f1b3552097b244ac51339abd2e724304f4fe728861b7d5f070c26973998936861bc
-EBUILD build-docbook-catalog-1.21.ebuild 1093 BLAKE2B ba2f6ef03b4934dfdedef819b2c0e3f9f39b4a5b014ade9edf6bf3bfcf78868c0ebdea85ab22ab32a5709267ebfed8402bccf2d5e7d893e4209e59d31251b93e SHA512 bd404c50a2f6e0d7c2340ff592d3fe47524b1345e5e930edf4092163500549caa08cdcd37372637de6eac744b5174f69d6de59c99784566cc339e09445e7ca3f
+EBUILD build-docbook-catalog-1.21.ebuild 1071 BLAKE2B ea2ab9074f9bd1b16a6bcd40c97b336651f68f4a5356e85eb077e4e208f3d79b1f2823966870afd6cc275ca35022d5852578cde5d180acfbb9e511a48998403f SHA512 83762f55316254a2bf755cbc3b58843fc6a13be063f1f251db3ccf62aff2480c42c708addb0d4d3383733af07acd5ec5484446cd95da8489c3ae002d56be2433
 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 3d841463a2a6..78f6ee18a6b3 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 ~riscv 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 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~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/calibre/Manifest b/app-text/calibre/Manifest
index fe5fd525d41c..c87c361fb6ae 100644
--- a/app-text/calibre/Manifest
+++ b/app-text/calibre/Manifest
@@ -2,10 +2,10 @@ AUX calibre-2.9.0-no_updates_dialog.patch 1661 BLAKE2B c75fc49a621e8dbd16ee1bad7
 AUX calibre-disable_plugins.patch 1042 BLAKE2B 92a56016c2c54f1b156bc91031420594445545b98b701f7cce99cf4bb86847eebad1ccebdc20a0d1b67f9fa88a9250fc4926d7c04cb36405323388b3171cf502 SHA512 c152ddd92728a89db10c75a4d00a968bf119bef68da8b9116c76827e3cdc8f8a7e5c45fbb973f6ca8db1f79e461518351ce2d47e5e059c282f36d2df499d1629
 AUX calibre-server-3.conf 541 BLAKE2B 06593633721e6adf2cf2077dffa83953eea46ccdcdc857ad468a9b74788326e9424f6ab9058be344dbbac8e49d343f5a1e53ddb486f2018b77319a7f8f713cf4 SHA512 12ef793a5b6ffd4413f780a13cad63927a95f15d17d85d4229eb5005ead68e51779abb822f9898ab5ae8c2094affeec1f9e85c34f109499739e6726b7641542a
 AUX calibre-server-3.init 1796 BLAKE2B f87d785d6f6fc10fa648d40944ec8538027854bb872d9a3be6b5b35b0abf3cda1e4e93874a9422914da5eb4287f193459733956e3f1e25e61bec0c214c552c99 SHA512 88110ded1b9c6cf8d3bfc3d5889654f77578f9d299e88daea9023767b930082e00fbddbb92a6e43c46d900248f3684232d93396ec1d0e784c7ec14b44783f98a
-DIST calibre-3.26.1.tar.xz 39109660 BLAKE2B 0e98c273b8a5dfafea7a7027de3f83ad25ab835edadedf78b7e9bc356bcac8937d915944f2ab6503b414c49b4e792e090e7bd2433a4e86373bf115720ed78b0a SHA512 893e36b101defaca29281b4bd072aafc1c4cb20a9cd3ee06a0b68fbe6b39cab34952799939ac4f54c77148c87861c5ab4ddff84f5ec8c2274ae7fa6424259ff5
 DIST calibre-3.47.1.tar.xz 38710008 BLAKE2B 60915345dd756d085386af61128e92569304be64aadbc21b69973e93adf3fb5cc88f7250153c238ecf423546f408bfc094b5bce329a54e7f080f831c4a8c23c1 SHA512 010796b3ac3fc6adcdf26dbc7966946be0f48b2684e1317da11d77fa55151d1f6ad2b86adf3c8eced5559823567e6672bfdfd953c17e6cc978894544131fb6bd
 DIST calibre-3.48.0.tar.xz 38777408 BLAKE2B 9a7fae20487ae93120cfdc06a312a42d54d68935fdd2bc18dc41be5f8d359c79eae24e0409ba8e7f4df85e2f073f80ce6bab56cba0638cead6693600fa93cb41 SHA512 6cee28fb560e2e00b8ac2f32756f094146c6fe744cfc343d68f1fb54b3f8b0ca16129a5b35018af54a103790faa2eb03ac186c01003f21c874d2ed5218441220
-EBUILD calibre-3.26.1-r1.ebuild 9203 BLAKE2B 9e3bc1630f915a8548e1480f0b00d6acb4001dee3be5a5119dd9b2eb8b984c4eecaa0a0742e550a36eca359e8806d2444d21f8bf344321c11ffeca59e7e10877 SHA512 98407a3605b58125ca783dadbe7dfed5f3bb526f816d79a167fb0358202cc56870601d16b7eae46d2464a0f64761168d9f0a00d69a5a184e17d705eb540afb97
-EBUILD calibre-3.47.1.ebuild 8352 BLAKE2B 92a2d894b2ad0966588854cdece96930aa85e240699eb185cc32a4b7ec0b3e98c34e7cac2490c44b1909bc1e4fc92f7d5094ed8f6159e08ae22ef98d7156f06c SHA512 df60b94324ccfe704195af5a6188ea6a793767e342e058b1f5039f52ae7fab6b16e95266a0876f6ea8118b5e4a014d7d1e3636b58280d611ae94918e359763d4
+DIST calibre-4.1.0.tar.xz 36231016 BLAKE2B 85987b8b8b37deb40f9ebb7d918e15e9a763cca00cf26eab841d0035309bd066f675d50d1ca94cb65e512d1964bac4241b3006aa38cac14ec0cb5e2d6416d2a8 SHA512 9a4766ccec830e553b5165f9a3b1111a6b4d0dbadee8b6a6547fef1dc3ca51adc886d9c3d751af23f4ff3a30a0fe03606c70ab57245ea38bfb486c111fd0e82e
+EBUILD calibre-3.47.1.ebuild 8350 BLAKE2B d59300c7f0fc9a85c5a2862b0ce844c76e83a30cec434351e1df98d3741cd0a21dff80a52548903d25da29421121e220d8ee02a3f629f56bb11f7b3f9f5873c8 SHA512 53f70f860b5e8b9e33ac49a598c03b6e3a075b03377461008ca77a0ae2518d0e899c1af19fca611850e3e16c6efb5cfce1241afa2cdce0cba82c704fcec05d9f
 EBUILD calibre-3.48.0.ebuild 8352 BLAKE2B 92a2d894b2ad0966588854cdece96930aa85e240699eb185cc32a4b7ec0b3e98c34e7cac2490c44b1909bc1e4fc92f7d5094ed8f6159e08ae22ef98d7156f06c SHA512 df60b94324ccfe704195af5a6188ea6a793767e342e058b1f5039f52ae7fab6b16e95266a0876f6ea8118b5e4a014d7d1e3636b58280d611ae94918e359763d4
+EBUILD calibre-4.1.0-r1.ebuild 8451 BLAKE2B e464f58bea125fa5651adc2226d853a702c0ca6af0b32382bd33899874023f8a94fbe4f799f121900312ed4f57c4322e8252bedb90559eaaeae29396ee7e6be0 SHA512 5f17a88f540a62249f180024216d4fb36a7d3e0d832fa45a62cda72ea2b5cf7e9433fa19244a7134f42ab1abc8e1e0e52e63ee9ead526a8ba0cd2f95aa9cb4de
 MISC metadata.xml 382 BLAKE2B 87fa7e63a6ed7a4ea55247b362288b43f7edd312cc3085bb8c1b947402ae4aa0df01fac4f6646d260653ff8af7fe28d3dabb8a213dbf3e206181b69835b33d5f SHA512 8503e0a4a48d93682c386eb1d6507b4b26585afc9d62b7cd52bc00b457a887bd17422a03669ff404570ff7f5ff6f0bba14ee935979f8b54722870d6620097de5
diff --git a/app-text/calibre/calibre-3.47.1.ebuild b/app-text/calibre/calibre-3.47.1.ebuild
index 9b8c29fcc23b..c798de6c6e21 100644
--- a/app-text/calibre/calibre-3.47.1.ebuild
+++ b/app-text/calibre/calibre-3.47.1.ebuild
@@ -31,7 +31,7 @@ LICENSE="
 	OFL-1.1
 	PSF-2
 "
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 SLOT="0"
 IUSE="ios +udisks"
 
diff --git a/app-text/calibre/calibre-3.26.1-r1.ebuild b/app-text/calibre/calibre-4.1.0-r1.ebuild
index c92715c1e5f5..a435558ef333 100644
--- a/app-text/calibre/calibre-3.26.1-r1.ebuild
+++ b/app-text/calibre/calibre-4.1.0-r1.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE="sqlite,ssl"
 
-inherit eutils bash-completion-r1 gnome2-utils multilib toolchain-funcs python-single-r1 xdg-utils
+inherit bash-completion-r1 desktop toolchain-funcs python-single-r1 xdg-utils
 
 DESCRIPTION="Ebook management application"
 HOMEPAGE="https://calibre-ebook.com/"
@@ -31,42 +31,47 @@ LICENSE="
 	OFL-1.1
 	PSF-2
 "
-KEYWORDS="amd64 ~arm x86"
+KEYWORDS="~amd64 ~arm ~x86"
 SLOT="0"
 IUSE="ios +udisks"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 COMMON_DEPEND="${PYTHON_DEPS}
-	>=app-text/podofo-0.8.2:=
+	>=app-text/hunspell-1.7:=
+	>=app-text/podofo-0.9.6_pre20171027:=
 	>=app-text/poppler-0.26.5[qt5]
 	>=dev-libs/chmlib-0.40:=
 	dev-libs/glib:2=
 	>=dev-libs/icu-57.1:=
 	dev-libs/libinput:=
-	>=dev-python/apsw-3.13.0[${PYTHON_USEDEP}]
+	>=dev-python/apsw-3.25.2_p1[${PYTHON_USEDEP}]
 	>=dev-python/beautifulsoup-3.0.5:python-2[${PYTHON_USEDEP}]
-	dev-python/chardet[${PYTHON_USEDEP}]
+	>=dev-python/chardet-3.0.3[${PYTHON_USEDEP}]
 	>=dev-python/cssselect-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/cssutils-1.0.1[${PYTHON_USEDEP}]
+	>=dev-python/css-parser-1.0.4[${PYTHON_USEDEP}]
 	>=dev-python/dbus-python-1.2.4[${PYTHON_USEDEP}]
 	>=dev-libs/dbus-glib-0.106
 	>=sys-apps/dbus-1.10.8
 	dev-python/dnspython[${PYTHON_USEDEP}]
-	dev-python/html5-parser[${PYTHON_USEDEP}]
-	>=dev-python/lxml-3.2.1[${PYTHON_USEDEP}]
-	>=dev-python/mechanize-0.2.5[${PYTHON_USEDEP}]
-	dev-python/msgpack[${PYTHON_USEDEP}]
-	dev-python/netifaces[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/psutil[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.1.3[${PYTHON_USEDEP}]
+	>=dev-python/feedparser-5.2.1[${PYTHON_USEDEP}]
+	>=dev-python/html5-parser-0.4.3[${PYTHON_USEDEP}]
+	>=dev-python/lxml-3.8.0[${PYTHON_USEDEP}]
+	>=dev-python/markdown-3.0.1[${PYTHON_USEDEP}]
+	>=dev-python/mechanize-0.3.5[${PYTHON_USEDEP}]
+	>=dev-python/msgpack-0.5.6[${PYTHON_USEDEP}]
+	>=dev-python/netifaces-0.10.5[${PYTHON_USEDEP}]
+	>=dev-python/pillow-3.2.0[${PYTHON_USEDEP}]
+	>=dev-python/psutil-4.3.0[${PYTHON_USEDEP}]
+	>=dev-python/pygments-2.3.1[${PYTHON_USEDEP}]
 	>=dev-python/python-dateutil-2.5.3[${PYTHON_USEDEP}]
-	>=dev-python/PyQt5-5.8[gui,svg,webkit,widgets,network,printsupport,${PYTHON_USEDEP}]
+	>=dev-python/PyQt5-5.12[gui,svg,widgets,network,printsupport,${PYTHON_USEDEP}]
+	>=dev-python/PyQtWebEngine-5.12[${PYTHON_USEDEP}]
 	dev-python/regex[${PYTHON_USEDEP}]
 	dev-qt/qtcore:5=
 	dev-qt/qtdbus:5=
 	dev-qt/qtgui:5=
+	>=dev-qt/qtwebengine-5.12
 	dev-qt/qtwidgets:5=
 	dev-util/desktop-file-utils
 	dev-util/gtk-update-icon-cache
@@ -76,7 +81,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	>=media-libs/libmtp-1.1.11:=
 	>=media-libs/libwmf-0.2.8
 	>=media-gfx/optipng-0.7.6
-	sys-libs/zlib:=
+	>=sys-libs/zlib-1.2.11:=
 	virtual/libusb:1=
 	x11-libs/libxkbcommon:=
 	x11-libs/libX11:=
@@ -94,7 +99,7 @@ RDEPEND="${COMMON_DEPEND}
 DEPEND="${COMMON_DEPEND}
 	>=dev-python/setuptools-23.1.0[${PYTHON_USEDEP}]
 	dev-python/sip[${PYTHON_USEDEP}]
-	>=virtual/podofo-build-0.9.4
+	>=virtual/podofo-build-0.9.6_pre20171027
 	virtual/pkgconfig"
 
 pkg_pretend() {
@@ -149,15 +154,6 @@ src_prepare() {
 	find "${S}" -type f -name \*.py -exec \
 		sed -e 's/calibre.ebooks.BeautifulSoup/BeautifulSoup/' -i {} + \
 		|| die "could not sed bundled beautifulsoup out of the source tree"
-
-	# avoid failure of xdg tools to recognize vendor prefix
-	sed -e "s|xdg-icon-resource install|xdg-icon-resource install --novendor|" \
-		-e "s|'xdg-mime', 'install'|'xdg-mime', 'install', '--novendor'|" \
-		-e "s|'xdg-desktop-menu', 'install'|'xdg-desktop-menu', 'install', '--novendor'|" \
-		-i "${S}"/src/calibre/linux.py || die 'sed failed'
-
-	# don't create/install uninstaller
-	sed '/self\.create_uninstaller()/d' -i src/calibre/linux.py || die
 }
 
 src_install() {
@@ -184,7 +180,8 @@ src_install() {
 	#  File "/usr/lib/python2.6/locale.py", line 418, in _parse_localename
 	#    raise ValueError, 'unknown locale: %s' % localename
 	#ValueError: unknown locale: 46
-	export -n LANGUAGE
+	export -n LANG LANGUAGE ${!LC_*}
+	export LC_ALL=C #684484
 
 	# Bug #295672 - Avoid sandbox violation in ~/.config by forcing
 	# variables to point to our fake temporary $HOME.
@@ -200,34 +197,18 @@ src_install() {
 	local libdir=$(get_libdir)
 	[[ -n $libdir ]] || die "get_libdir returned an empty string"
 
-	# Bug #472690 - Avoid sandbox violation for /dev/dri/card0.
-	local x
-	for x in /dev/dri/card[0-9] ; do
-		[[ -e ${x} ]] && addpredict ${x}
-	done
+	addpredict /dev/dri #665310
 
 	PATH=${T}:${PATH} PYTHONPATH=${S}/src${PYTHONPATH:+:}${PYTHONPATH} \
 	"${PYTHON}" setup.py install \
 		--root="${D}" \
 		--prefix="${EPREFIX}/usr" \
 		--libdir="${EPREFIX}/usr/${libdir}" \
-		--staging-root="${ED}usr" \
-		--staging-libdir="${ED}usr/${libdir}" || die
-
-	# The menu entries end up here due to '--mode user' being added to
-	# xdg-* options in src_prepare.
-	dodir /usr/share/mime/packages
-	chmod -fR a+rX,u+w,g-w,o-w "${HOME}"/.local
-	mv "${HOME}"/.local/share/mime/packages/* "${ED}"usr/share/mime/packages/ ||
-		die "failed to register mime types"
-	dodir /usr/share/icons
-	mv "${HOME}"/.local/share/icons/* "${ED}"usr/share/icons/ ||
-		die "failed to install icon files"
-
-	domenu "${HOME}"/.local/share/applications/*.desktop ||
-		die "failed to install .desktop menu files"
+		--staging-root="${ED}/usr" \
+		--staging-libdir="${ED}/usr/${libdir}" || die
 
-	find "${ED}"usr/share -type d -empty -delete
+	rm "${ED}/usr/share/applications/defaults.list" || die
+	find "${ED}"/usr/share -type d -empty -delete
 
 	cd "${ED}"/usr/share/calibre/fonts/liberation || die
 	local x
@@ -237,10 +218,10 @@ src_install() {
 	done
 
 	einfo "Converting python shebangs"
-	python_fix_shebang "${ED}"
+	python_fix_shebang --force "${ED}"
 
 	einfo "Compiling python modules"
-	python_optimize "${ED}"usr/lib/calibre
+	python_optimize "${ED}"/usr/lib/calibre
 
 	newinitd "${FILESDIR}"/calibre-server-3.init calibre-server
 	newconfd "${FILESDIR}"/calibre-server-3.conf calibre-server
@@ -262,18 +243,17 @@ src_install() {
 }
 
 pkg_preinst() {
-	gnome2_icon_savelist
 	# Indentify stray directories from upstream's "Binary install"
 	# method (see bug 622728).
 	CALIBRE_LIB_DIR=/usr/$(get_libdir)/calibre
-	CALIBRE_LIB_CONTENT=$(for x in "${ED%/}${CALIBRE_LIB_DIR}"/*; do
-		printf -- "${x##*/} "; done) || die "Failed to list ${ED%/}${CALIBRE_LIB_DIR}"
+	CALIBRE_LIB_CONTENT=$(for x in "${ED}${CALIBRE_LIB_DIR}"/*; do
+		printf -- "${x##*/} "; done) || die "Failed to list ${ED}${CALIBRE_LIB_DIR}"
 }
 
 pkg_postinst() {
 	[[ -n ${CALIBRE_LIB_DIR} ]] || die "CALIBRE_LIB_DIR is unset"
 	local x
-	for x in "${EROOT%/}${CALIBRE_LIB_DIR}"/*; do
+	for x in "${EROOT}${CALIBRE_LIB_DIR}"/*; do
 		if [[ " ${CALIBRE_LIB_CONTENT} " != *" ${x##*/} "* ]]; then
 			elog "Purging '${x}'"
 			rm -rf "${x}"
@@ -281,11 +261,11 @@ pkg_postinst() {
 	done
 	xdg_desktop_database_update
 	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }
 
 pkg_postrm() {
 	xdg_desktop_database_update
 	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }
diff --git a/app-text/convertlit/Manifest b/app-text/convertlit/Manifest
index 4bfe86590820..79854f5d972a 100644
--- a/app-text/convertlit/Manifest
+++ b/app-text/convertlit/Manifest
@@ -2,5 +2,5 @@ AUX convertlit-1.8-respectflags-r1.patch 838 BLAKE2B 4ba437ea3a7eb23e08c262b6e6b
 AUX fix-Wformat-security-warnings.patch 936 BLAKE2B 636599eb3840f5ea084dd60fd96f462f6757a4ec04e41360469eacb03badb3b8271a595692f055d10162e591600994be7e4676800e0f8a8feadbbabccbaeb21a SHA512 6f8798a8b54951c15da4f28d4c8103811c4d77ba96eb12a4e19bc35876c148c1247d19ea5b3d60028b156d50d5dbd67ec5254e47a556d195ca8c084bbc571e4d
 AUX support-ar-variable.patch 408 BLAKE2B d3649dcc362cb54a67eba34b9b6bfc6a52a22cd0ed33de95aad3cd5dad75729c35c45b8817e9c64040b3ea4baee876b456121a7e55094f0ceb01aabf4d6a2a8b SHA512 8d807507cccc58979092becb1725d4871f62746f06b3d4ac8740a0704019d3900cd60098497a0d770fcb9bab68e9bf34dc50219afda0995209ea88a71b084ce6
 DIST clit18src.zip 135120 BLAKE2B b2c47c03df2cee8779f50eee1a19f46907fa966165629d17fb25c66e5bf7b68b6ada6efa1790d36deb6a10f69c17ec7ef2cc66551796cbba04a3f2f7e5e3294d SHA512 0d4b7d525f5164a73a47a00e1c4e93ff50e738a4e6c541ded283c4779e6a67138f601c23a41344517ca5d7f8c9141b25cc6edc7f3967fbf9042e99f647354f36
-EBUILD convertlit-1.8-r3.ebuild 947 BLAKE2B c4d3a14480b5f7720b2787ba66a7bf0020c20fb85212ab15e6d7933f4824aad15eb3acbae93d3abee4e3a7e0a9d956900003cf63d948644aa049785c29341785 SHA512 c9814b98eca144c4e12c2d9cff21f06a783a6f6a02351d92b37b52fbd300fcc5c2e69c9e4143a47926ce1d0f32480c5e2529d36a03619000d35a7b5865210091
+EBUILD convertlit-1.8-r3.ebuild 935 BLAKE2B 9349947a2093758f4f85bdab5feee4c036b9bfbc0aa06a49deffadfedf20c7e2ceff9eeeae17129fd3f4427e3044846c490ac2d00baca5ecf98e5987cdb8456c SHA512 952506a21114e4e9ce60cde34da33c19488ab55bd4e82c7da1dcce2ae9616411d1b518d370232df6aaf432a0be03c92bd83b4434e288181fb59c3ff02d2a3656
 MISC metadata.xml 562 BLAKE2B 65f7b124b050f42c8c6f800e2e05d2e9404869c42a1217e0d280895d52d8f2588f37bbb4a696cffb58129f080580aee9cbca83740e888ccf9d272a8162a053ef SHA512 1264f1669bece35fbd465ebf7911c7d416d85d092aa6e1601b240728fc2a0cb521d913e3bae08962fc5e70c2b70ee17989191e0bc21f04c9c1ed30592ff4820e
diff --git a/app-text/convertlit/convertlit-1.8-r3.ebuild b/app-text/convertlit/convertlit-1.8-r3.ebuild
index d56b60c9caf7..807569a1b130 100644
--- a/app-text/convertlit/convertlit-1.8-r3.ebuild
+++ b/app-text/convertlit/convertlit-1.8-r3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://www.convertlit.com/${MY_P}src.zip"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ppc ppc64 x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""
 
 RDEPEND=">=dev-libs/libtommath-0.36-r1"
diff --git a/app-text/crf++/Manifest b/app-text/crf++/Manifest
index 8b3150097504..8245488c42bc 100644
--- a/app-text/crf++/Manifest
+++ b/app-text/crf++/Manifest
@@ -1,4 +1,4 @@
 AUX crf++-automake-1.13.patch 216 BLAKE2B 129027abc820acf499b9fd49ea152f0d404c458af0584c0f7acc3dde6a02c46f1f14f96321b0ea7e2d00e9345276e8bdefb2206cc475772e5c23890143c78d0d SHA512 5bd02a0d3f67e37d544255984341beda8c958e5f76ce51521fd2157eb7dc70dfb1d43d30913e4d02e7dfe21526f04520f6539e28a58beed6e577a31b5d4a16ca
 DIST CRF++-0.58.tar.gz 790570 BLAKE2B 8fdd3fea3e30f4196560e2e265519c961739aabbad75e9805040a8f7da0f501620d6bb2c4f589c6d0c8bb79af5c8f46bbe27b610a4ec6a0db632fef219ea5b46 SHA512 676b3e9ed89b5fb2f246175b58c384f10cab09fff8329c07311fed3832f55dbad26a25d2946c9efaa75cd8026517cb9e1742bb70ca26187367747852073e4eb9
-EBUILD crf++-0.58.ebuild 1142 BLAKE2B f3b9572d8fcedf2245d7e1ad51e5c43d9b13559c1894b47d9ca784fbdd447507e808f9df5c2f708f29dec06758740e0180770319ead3ddc56e77516c9330e707 SHA512 ecf7045059470e8a318fc8c46ae38af0eac567382755d29f5594d6f87f30baf35fb9c86a0a79d87f2b300c3675684924791a0656463a4191d94327c099bbbc30
+EBUILD crf++-0.58.ebuild 1132 BLAKE2B 492069839647de056b2e97944b65124a404eb85ff8bba2c6031c3442b31d3ad6f706205f885cf475084780d1324dc76b89113fbe7be40ca79a5c27a04e878200 SHA512 e73081e26b8da54d90c4d8f587c85ec618f640ac7b2bcbb425f55fc9316968d1d62b8a30ca832950ce49799d9e3f5d840011087a7eb62e31ad195720dfd18ee3
 MISC metadata.xml 669 BLAKE2B 12280d15998c56ac4c2e3bd3e80fd2a22eb150b979836d8600df3d5a36008807f0cc7fd91b84cd3717c379c9ca603ce110a88c3f86b48e29be983f99faa1b6a0 SHA512 d479bf4332884e2dfdd57b6c496b585f7e55adad2200dd22684a9fe6f1cc1c69049fec20d3ee0683543119c4f4935c83cda7d6a501b44e51e612249283fda7f3
diff --git a/app-text/crf++/crf++-0.58.ebuild b/app-text/crf++/crf++-0.58.ebuild
index c358043e7e8e..6cd0e8e99953 100644
--- a/app-text/crf++/crf++-0.58.ebuild
+++ b/app-text/crf++/crf++-0.58.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gentoo/${MY_P}.tar.gz"
 
 LICENSE="|| ( BSD LGPL-2.1 )"
 SLOT="0"
-KEYWORDS="amd64 x86 ~x86-fbsd"
+KEYWORDS="amd64 x86"
 IUSE="examples static-libs"
 
 S="${WORKDIR}/${MY_P}"
diff --git a/app-text/crm114/Manifest b/app-text/crm114/Manifest
index 8381364c7342..53b338d12c69 100644
--- a/app-text/crm114/Manifest
+++ b/app-text/crm114/Manifest
@@ -1,4 +1,4 @@
 AUX crm114-20100106-fix-makefile.patch 1796 BLAKE2B 370bc77608f77960be4c4ecb88e3729eb62fb9e46e15fcca673ae8f4e4efcaf4425f30cd6beada25d8eb9fdf741dfa449c4e2a5c3ca9d06eab9ea25524e38136 SHA512 3011a85116510fce131bd3c13b5ec1e4faeefdb1eebf114782d417fb9ce8050ce15cae05f8b651728335233641be1e870fe48702fa620b542a8f1c963853b81c
 DIST crm114-20100106-BlameMichelson.src.tar.gz 724672 BLAKE2B ce5c3078030f2c4e78833edfb107d78e134a02c339d28411f2f60d4a67c333904d2ed0cf32a087997a72d961cbc5dabef46fb6c692d99fb509abd4161bd0094b SHA512 bb95fa50d6feef1a127e39e4005c4964b0096c3c7059f63bbf2293042351cf5ceeb7590fd1bedc64291ba556dfba96856dba8554f2f52a6cbaa3ad65012809c6
-EBUILD crm114-20100106-r1.ebuild 1962 BLAKE2B 09f24d7ed7fea796905f0c2bfe554864788c65a05685f9c6a7e690dad98669b3d49df6d55c00a2254f927cf3c99803e0315a4dc827bc387aaee57abda04c8570 SHA512 29a09f44a2f9ca1011e15d36060a57603e1fffe9c22fc7a61bf82f3b77ff4e747a96133724f5f8168bfb341626a1d7f5556ac562e94666f8e544c09cfc9a535c
+EBUILD crm114-20100106-r1.ebuild 1952 BLAKE2B 50da2788d3be437460b30b92140dce34c09dc244231f22d1ece22a195fcb1c9d7e723109cfd84b650d493d840038929d7a9bd57bc060a22883e1ae3b6005219c SHA512 01140268efd7fabd47c8b759d4d978e189588d0aa0c097c6b1b1beea604959430fa1bff87bcbf059b778681c9f9dd498cab25b47762c602e5daccfc5cde52ce6
 MISC metadata.xml 707 BLAKE2B f66efbf9497eb73a927c0cbbd87fa3da5617adae4102940135f983ebbf6ce18d3e2f2a3aa8721aa4395d54977fd0d3ff44387610906bcadcde869e46869ba932 SHA512 9009a38eaab5b49e3ec537785dc2e45601afd2ef0bd1c2f7a0ab7f8f24c80feb7bd99c2e47e6835d8bc4fffeeb8d6628df02c260ff5198905b209c6606c2352e
diff --git a/app-text/crm114/crm114-20100106-r1.ebuild b/app-text/crm114/crm114-20100106-r1.ebuild
index 6c22e69d7c12..9e28d628eaec 100644
--- a/app-text/crm114/crm114-20100106-r1.ebuild
+++ b/app-text/crm114/crm114-20100106-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://crm114.sourceforge.net/tarballs/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="examples mew mimencode nls normalizemime static test"
 
 RDEPEND="
diff --git a/app-text/dbacl/Manifest b/app-text/dbacl/Manifest
index a5517fb9953e..3d136cd4d6d1 100644
--- a/app-text/dbacl/Manifest
+++ b/app-text/dbacl/Manifest
@@ -1,5 +1,5 @@
 DIST dbacl-1.14.1.tar.gz 923956 BLAKE2B a98b7e01a0cafaee8178120069beaa6fbfe716eaa02eeb9505aa498f11b1c54ef599ea3a40bbc6ddfe235d571f550381a9c8026e80208c56a4a44a80750f00e1 SHA512 910fe5d8e56a92a643f16eab73fc3376489f303e22c470b3d78428d65340b01073f336ac8febb7d911eae0995f08ba265cac09628efd55a64955814a810b7372
 DIST dbacl-1.14.tar.gz 922969 BLAKE2B 9d16c1736b9bc062135daa2fd810b527324abe1fa4cdab650bee45949c21f44fef4197a09d9059e89bdc36dc038f073e7d67b295f6a460fad5dd22d688bd464d SHA512 1cf0877c8bea9c47e055f9291efbb934b65cfd7d26d4ef375ee9fb154b557c691e760543254c5128eb1a04b0724462078f47477a91c4e396e7096ef88d2d77c9
-EBUILD dbacl-1.14.1.ebuild 713 BLAKE2B 45e2c404723a45115a286055d1ed262821436530d6eb678b1f3f323ac4f6feea82d5fc89d7cc2bcffef9aa828cde72f99156bdc3bacfca604a7f6dc2386becee SHA512 9c2575cb4e62da77a97724a503bced99ebd57b367903ca9f369a038e9f7aae577d36c7872eee754e70444e270dce62b2bd7ec5814839f45ca777c84791727108
-EBUILD dbacl-1.14.ebuild 704 BLAKE2B f8d17c5d13a347f9518d8ad6a2cbef0288ca4bdbffd8a70ce4dc1ce935dea057f932e77f3619ac0af41e2225c1a5c70553620dc8c97563834526161c8fbb5f23 SHA512 6c1e721db59b9f330ea0fab1491f0ab39cf801c628525b963a616da664c84175fe71633f492cf0e1650d37d955fac41695cc50970b9a6fe7ad5968538cc8727a
+EBUILD dbacl-1.14.1.ebuild 703 BLAKE2B 529e455038ca4240ce6d18b6b1e8e8cd09fe3462e2262cb1711c719dda7758597326b5eeb31e53fc6338a92d882c61ba0bdfc9291e381e819a694407bec839ab SHA512 1cebd8459c13ed191bd3b764a122e97391a5671a5d5f0bcc246bb68357f8e8fc8761d8cf46f7d6f89c9da8307c1964ac770b2f2b9f19b32cd437c15957aa787b
+EBUILD dbacl-1.14.ebuild 694 BLAKE2B 6830add723a5c24766782410ad044cb9dca45103e6c3d66bee56e0a40b6bb00e687c77b4359769dc73c66ab4ef062baa4bd41c4ea3b1c71fbb85a18e2a1e6782 SHA512 972e3f250a90661ca951c9dd866d8447af1d4aeebb4b8bf9a0bd60b43773205d2f6f1b1fab93ed561e5328233be12505178f73484275e86dad72e7cb18d2475c
 MISC metadata.xml 610 BLAKE2B 1466caaf4d713d5f8352b846e2a1616c28a1f45ffedad98a3f7e35e602cf41b77a3b0bc74012b49c793609a8f88c3976d5573c79f9448816cd00991cc3cef97f SHA512 3151e9a89b575615aa7bc26fae4edbf84a53a24893c1c07f6d8f46fd1058f2270bf7a30697217e1326b733204ee38edd56a7ab8f9949ae2a5450b87828ae290b
diff --git a/app-text/dbacl/dbacl-1.14.1.ebuild b/app-text/dbacl/dbacl-1.14.1.ebuild
index 07965efdea80..ee861dd57ff3 100644
--- a/app-text/dbacl/dbacl-1.14.1.ebuild
+++ b/app-text/dbacl/dbacl-1.14.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~s390 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~amd64 ~s390 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="interactive"
 
 RDEPEND="interactive? (
diff --git a/app-text/dbacl/dbacl-1.14.ebuild b/app-text/dbacl/dbacl-1.14.ebuild
index 1d92922bbae4..68d1cda31eb4 100644
--- a/app-text/dbacl/dbacl-1.14.ebuild
+++ b/app-text/dbacl/dbacl-1.14.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://www.lbreyer.com/gpl/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 s390 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 s390 x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="interactive"
 
 RDEPEND="interactive? (
diff --git a/app-text/ddir/Manifest b/app-text/ddir/Manifest
deleted file mode 100644
index 63e9795510e1..000000000000
--- a/app-text/ddir/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST ddir-0_p20100323.tar.bz2 15875 BLAKE2B 5e4a013d8e0c224c540514968b82c4818f5c737a74b13bcf257e19c7f8726a94d234bd138ad8efe777b45edfe7a471896855b37eec0d8adb4045912687cb25c5 SHA512 e2f367eef02c14a1d937db71fcd798990975581f6352ffad01894b40aea218f48a22d2aa96660cb1f8876b0720a8e76eacf9a5c87f0ecd2f58cafd5434acccad
-EBUILD ddir-0_p20100323.ebuild 500 BLAKE2B 0012595c8066e26100d52db3809f190036840ff4da180f7c1055a351f0c00c8e78f30546f80e8ecfa3cb01cda81ea8e183a46cf38780eb5ba1c8afee19c5ac91 SHA512 29810950bf04b3e156bb68631159e4b2001d43f380151ec847aa0362b1f54d41b7ee9e1ace6829870bb5c7bffd9d967d34bf23d655896e303a1bf933c3017c31
-MISC metadata.xml 239 BLAKE2B cae8f9ef0098f8c78fe8a8e585278e7dd949c753e52125db395f9914e0d93ccf6f16761c30bfe522d90c7b04a5fd1561f87cefc3fc20240f2700ef3772a90439 SHA512 146e1784395f9829562092d49772899fd84d99fa48d2f52c2f9359a8443973a4284d798d54453041fae44f64df806830d31a94f5b883c35579d5f574f7a8e798
diff --git a/app-text/ddir/ddir-0_p20100323.ebuild b/app-text/ddir/ddir-0_p20100323.ebuild
deleted file mode 100644
index dd207b08e59c..000000000000
--- a/app-text/ddir/ddir-0_p20100323.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-DESCRIPTION="A perl implementation of the tree(1) program"
-HOMEPAGE="http://freshmeat.net/projects/ddir"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-lang/perl"
-
-src_compile() { :; }
-
-src_install() {
-	newbin bin/ddir.pl ddir || die
-	doman bin/ddir.1
-	dodoc ChangeLog doc/manual/*.txt README
-	dohtml doc/manual/*.html
-}
diff --git a/app-text/ddir/metadata.xml b/app-text/ddir/metadata.xml
deleted file mode 100644
index eca282c06938..000000000000
--- a/app-text/ddir/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-needed -->
-	<upstream>
-		<remote-id type="freshmeat">ddir</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-text/djvu/Manifest b/app-text/djvu/Manifest
index c3dad1871688..3242cc7be020 100644
--- a/app-text/djvu/Manifest
+++ b/app-text/djvu/Manifest
@@ -1,6 +1,6 @@
 AUX djvu-3.5.24-gcc46.patch 859 BLAKE2B c11a240b930df4ddbf45272c2c2ba262b545d440cb6553107bac51894853b1ae28ca97620bef74bdde6ac674eee237cf14c63fa9313f9acf2afb70c8e6045f6e SHA512 8e27341bb994dca8ea27cf6da1141f06b5c96f1b853e7d4215214893c32a17fe3adc821c98ff8793d23cde458420f944b7f4d51e794fda9a061fea6f1eac08ca
 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 1768 BLAKE2B 9e2806c9af331c5ec9f86a6908ba985d64cee22d64848bff5f80a0cf8163fad0ee2f5736d28260c15c672970b05f20fb1b5ed5f82feb193550186059d548adff SHA512 08d9199c719032df599b8e18022411adbc0ee6f9f5e09e0a8e73b62b13e5e3dc4be6b8baad13dfb4bed973423042c9c464ac714a614af2e771dae7955bf5f453
-EBUILD djvu-3.5.27.ebuild 1461 BLAKE2B 2d8e41aa8552fef138db4660b83ec949892c3254dc902d47d3555592becfbeeaa76cd8d7a5b48ac183a66f9c4a2c351edfe3dd2b2d30a8893bde24936a5a9c7c SHA512 532db3244d98404e095a0521e6ee09724bfe887f374a0b132efd0bae94ad063177562c3c81c0206979f38736a77a392e82ea96e9d0eb2abb62445807eec259cd
+EBUILD djvu-3.5.25.3.ebuild 1746 BLAKE2B 7061503856361dc69ac981e870962e262db8a95e9a9bad3328c81ec36e1b8bf1c582c25159b681dee8c3b05d50f1a041b0927bbedc1e5abe11b0e805fba488ce SHA512 ecaf46883bfc303c945356850c539f12491183864456564936d0cd2926d178273555072ee33221188c0e1e32b2f3ccfeb245abe995e55e8044334cb566b1335c
+EBUILD djvu-3.5.27.ebuild 1439 BLAKE2B c9af82a7de257769690fca1e1e855020ab98a33f35b1b7646d6deeb8792f892818db11b37c10e10bc428229fd4fe53404b93f0fb73ddbf009ca9bf91d2150ba2 SHA512 7828e17d01157054e7f7d54bc312786b5dff6ca110231ad9670db692d22c9fa71657bc8df0a720d8ae7317bad0f246de26c44432b2b4389ffa2bd49723b4157d
 MISC metadata.xml 948 BLAKE2B 1d15a217967f10397d747f2cc0844ea76d4f876ed0ee8cb56733b74a3b92f023e3eeff11bfcb4265766c14dad4b1e35a18f7d2fdd7442068bf82c4a8302690db SHA512 e5cfa3a2b2077a3f0dbfcc99165fb678e8c8759724790d520f1bed670fed5e753a47207bbbcd7d2ff2d55def5b34bf32201771918c9e7a16583d91553ac75e42
diff --git a/app-text/djvu/djvu-3.5.25.3.ebuild b/app-text/djvu/djvu-3.5.25.3.ebuild
index 455ebfa772e0..ce39ce5ee796 100644
--- a/app-text/djvu/djvu-3.5.25.3.ebuild
+++ b/app-text/djvu/djvu-3.5.25.3.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-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/djvu/djvu-3.5.27.ebuild b/app-text/djvu/djvu-3.5.27.ebuild
index 7e1a7c1c755e..63ee44269e42 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-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/docbook-dsssl-stylesheets/Manifest b/app-text/docbook-dsssl-stylesheets/Manifest
index bfd182e1b3af..99b2c3ae11d7 100644
--- a/app-text/docbook-dsssl-stylesheets/Manifest
+++ b/app-text/docbook-dsssl-stylesheets/Manifest
@@ -1,4 +1,4 @@
 DIST docbook-dsssl-1.79.tar.bz2 277650 BLAKE2B 6a12f46965ee705096f679b672610395b24f151e3bf3cb05f7d920c052b7a3fdafb4f5ee4526dbf765bbab6b7d4ca9f021277c6f35926f47edc61d0f835afdbb SHA512 fad71e67227b54b0a7c31a351b4d5c0695517b3687714807d7b144d239dc6f7e0d556520e705eb75581c82e0deea4b32ccfde1eccad2718337b757eddd64843e
-EBUILD docbook-dsssl-stylesheets-1.79-r3.ebuild 1551 BLAKE2B d1f490d4cbee15aab1a5902bf143b791c7cff874a1b5726ade3bb84c3431491a15b84e165f547cf456c3fba1104009fd0c4f32dfcfe555d023d2241a8bb3bdee SHA512 222a78a676a75071ad75d58c7c78904ff8fe0345e6a2f0c0088482926b60089fba5ab4a5937fbf22d658b8bdcdc91a7a1b790e2a08dc0f33bad661495fe42837
-EBUILD docbook-dsssl-stylesheets-1.79-r4.ebuild 2499 BLAKE2B 7a6634616f2be22040019ab4088f4cda0746d451819b448efa85ab98878f04cf5849cd69d53eeb4b8283f65c1d5d0058c6c8fce0c49a39c744d7759934d452a0 SHA512 475de9c00edb2ba54b9ce1f9a9f83abd7959f780b5d7869c7a16cdd03479b2c8f0bc68c4b1581f157cb4e2746f2e0dd744897508b15a09027c779b3c59db7917
+EBUILD docbook-dsssl-stylesheets-1.79-r3.ebuild 1529 BLAKE2B 78aba5226ec752b9a983f9cd4846619c788c6e6205738a11425e363b847c15c30a3ae21fd10f929cb36b554f806044b1d5381214a729890c61d22864e8dee131 SHA512 81b5606c5b3de8b54e50f66d2120de05169731afc50f34a057e35cf89c15437ce0e96d3a1a2e9bc8c6fbfba5cbc1373bc38f64f164d1937165791063c264518b
+EBUILD docbook-dsssl-stylesheets-1.79-r4.ebuild 2473 BLAKE2B afb4a4521674b170456995a9cc578f21c736d4c48d1e70a20820affd34c87ac76ddc215fead0f538167cca07b3c1c256d0a1f4f8c8fc44798b6bb2dc63d7a4db SHA512 cc68a03d636cf0b2a086702b9120e51a8afd7a82b14fcd6696de527ce3de191c378ac299bb1f202a9a91d06ab2e313a3ab719c4d8ad6318be328ea6fc9dd5fa6
 MISC metadata.xml 377 BLAKE2B 035eb23363be52cbeb11b0ca2fbcedbb608dad9d4b26dbd2155a538db51cafe7296614f5005c0460ec4ce02a35378d98f2c7834fe2f098d7b05ef835bdbf520b SHA512 c965e64e4582a7452d8cf7eb46b794788cc8ccd9d93a48ab14e7ef606979cee706f682545bfebc2c5e380e9e18db0b671ce0f9ad935a0812472fc1586c989c28
diff --git a/app-text/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-1.79-r3.ebuild b/app-text/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-1.79-r3.ebuild
index df8d6e0a7df2..7ae3bc4c26cc 100644
--- a/app-text/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-1.79-r3.ebuild
+++ b/app-text/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-1.79-r3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/docbook/${MY_P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/app-text/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-1.79-r4.ebuild b/app-text/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-1.79-r4.ebuild
index 7137b03bc61c..dddde1f8ca90 100644
--- a/app-text/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-1.79-r4.ebuild
+++ b/app-text/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-1.79-r4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://downloads.sourceforge.net/project/docbook/docbook-dsssl/${PV}/$
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 s390 sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/app-text/docbook-sgml-dtd/Manifest b/app-text/docbook-sgml-dtd/Manifest
index 59db6cc74e55..282638a73603 100644
--- a/app-text/docbook-sgml-dtd/Manifest
+++ b/app-text/docbook-sgml-dtd/Manifest
@@ -14,20 +14,20 @@ DIST docbook-4.2.zip 61830 BLAKE2B f9a26e9aefe2da7c785f065374bb082f15e3f39dded7b
 DIST docbook-4.3.zip 66117 BLAKE2B d92d69b6f94c85bc2e8ead87dfb31db331206ea3d014e7dc240b47d8b07f43f8c1053003f50c398c4723726980e553dee7b34db629f1eee19ef6ae95f06c6ae8 SHA512 18ead2e683a9e9bc39e1487ee06fb72542557fa0c76f0e899b566cb52207e3bbfcb415ed59163c6d59e8d58f92289e115416d56bc6ed8f182910f7a18565b227
 DIST docbook-4.4.zip 66879 BLAKE2B 7a21c99e934851bc7c6be77da2b65079b3b6b32365672b40b70b1819e7aa6987cb65f8725ed2b9cc804d8cd0fc7c17f02601466dcd48f5314439df626db6aa89 SHA512 561d6f68e293fb98d13010dc287c6ea59d9e6a033af3518ab4d735a374a7a603150ecf555a1126577dd00baa692a6c5d09afc4d3fed70f2fe8b5b86d6bb5ecd8
 DIST docbook-4.5.zip 71252 BLAKE2B 0bdb424ff47be140d4d18eeb5f3dce509d47577737b485d5bc34af1a02596d577eb7b48c3884acd04965014819e4a23a444c198134fec14f2c2e7c2d5bcac58d SHA512 cde483678562a18f67fa5fbe631fbdfcbef907b6b6fb63749125fdc883af2448d4a95aefb8fba8bcdd0417fb078063984fe8eb3c7050978f4f4b03d527c329df
-EBUILD docbook-sgml-dtd-3.0-r3.ebuild 1000 BLAKE2B ab544f870b642843cac5852c3bd1a13144bac23f757b35d4eeb9294fa20bf33b457dd262a2c9a99493f916ca52c9003fd1997fd612b94a6f0fa53046c6f5031d SHA512 4800ab46cd04af41a618a979b8890e235c83aeb6079f6644539bcaf703c776774e69a231137fda037257882e2de2eb7ca673ffeb0083c4f8dc364f4dd98cf57b
-EBUILD docbook-sgml-dtd-3.0-r4.ebuild 1277 BLAKE2B 6b75110588e644edfe22502b60267558c42e2dc972bbdc02a7f23246913d861f82c36263be501d08a25a785c05be89a2756df4260602f730448f11b5b23a1bdd SHA512 e70b20043e7b51215963df66de3d7f099ecb5dcf25ada99dd4da611108e1197c09a80769928aaa13e9784fec84eaad9679b559ea06659d7c5e89ec9ce73b3121
-EBUILD docbook-sgml-dtd-3.1-r3.ebuild 1000 BLAKE2B d8130fc975e1acf1d569960b3b74b6dcc3c4fb68624d9ea56834bd9f3c94ca3876ca8359ee090fca5049f4eb502a22c3632746a6441e35b1946944b416563cbf SHA512 6af8de74f63b01e446fd43a1be7c37494a773a6b4a62a23b020732071c06870e0631206964f911d6a15a4031a9158848b57362eae1a1d44937a6c11e70c02b28
-EBUILD docbook-sgml-dtd-3.1-r4.ebuild 1277 BLAKE2B 6b75110588e644edfe22502b60267558c42e2dc972bbdc02a7f23246913d861f82c36263be501d08a25a785c05be89a2756df4260602f730448f11b5b23a1bdd SHA512 e70b20043e7b51215963df66de3d7f099ecb5dcf25ada99dd4da611108e1197c09a80769928aaa13e9784fec84eaad9679b559ea06659d7c5e89ec9ce73b3121
-EBUILD docbook-sgml-dtd-4.0-r3.ebuild 1000 BLAKE2B bae479fa462beef6bc0ad59b46ee470ed71677356ff1e25f87777daa5d4fd1c2e98dde26b65e32ad5333d0be81c281f16cf94e335759ddf137ff36476f3d7f23 SHA512 f4b8f6b23055c21d3f36f059666413c8d488f314756b23fd411e0d5471409c458d7bc1012aac29b02b3c82eadee8f9c2c12c758a1c498e40cb09ff0fe519e5f2
-EBUILD docbook-sgml-dtd-4.0-r4.ebuild 1277 BLAKE2B 6b75110588e644edfe22502b60267558c42e2dc972bbdc02a7f23246913d861f82c36263be501d08a25a785c05be89a2756df4260602f730448f11b5b23a1bdd SHA512 e70b20043e7b51215963df66de3d7f099ecb5dcf25ada99dd4da611108e1197c09a80769928aaa13e9784fec84eaad9679b559ea06659d7c5e89ec9ce73b3121
-EBUILD docbook-sgml-dtd-4.1-r3.ebuild 1000 BLAKE2B dbb46cff1a33f8f0770588c18cf087fa75074a3ed26e7e56a2f569635cbda0b37ce2be28fbcfb4e989030b153862d05470d8c0b408e56389d0cc7c92b0bcff31 SHA512 4aafa37378a6315835af91a37aac7842b1d04745ef8f4f6c8543e21d1c4aae51593b391b71a624a5014deadac058eb619e1eca6c5f9179ae0fafe249b6402c8a
-EBUILD docbook-sgml-dtd-4.1-r4.ebuild 1277 BLAKE2B 6b75110588e644edfe22502b60267558c42e2dc972bbdc02a7f23246913d861f82c36263be501d08a25a785c05be89a2756df4260602f730448f11b5b23a1bdd SHA512 e70b20043e7b51215963df66de3d7f099ecb5dcf25ada99dd4da611108e1197c09a80769928aaa13e9784fec84eaad9679b559ea06659d7c5e89ec9ce73b3121
-EBUILD docbook-sgml-dtd-4.2-r2.ebuild 1015 BLAKE2B 1dd036ea95d19b8bdbc825c4bf60b30dbd26ddcb97c4cecd020ccbdbb57294d5841882ef39dca414bab1e33533d390dd8ba0aee4f663c0bf35e0c5e7b9048c32 SHA512 8ddd813944172d0f8a858029292d7b22318e6795b1338f07057472e7042912c0c642d18876caabdf0d83aceb60c1852256bd36249741616510fbbb9abe69eaec
-EBUILD docbook-sgml-dtd-4.2-r3.ebuild 1288 BLAKE2B b85798472aebcb87c22622e517d54d1ed38086849e70ef6665b7f7313a11d569cae3c81fc116f8c1faefe2c3aedc18ed9a0e2528ec6ee0bed42f712e3da7a8a3 SHA512 d2beb77a6cd594ad5f0dd1359c37c0b2fcba22882f89e4a13424704329080cab5512472e95bb8fd0ae666fcc58835b70f8a537f5d1c0f8995c5236c4694411f4
-EBUILD docbook-sgml-dtd-4.3-r2.ebuild 996 BLAKE2B 0368e87e3debadf66d48791a0e5044dbf6b047aa7461ac2ef190e7df56e619ecaddf16942d34570fff853b358ad030d67ba195793e79c061016e2834bab2185c SHA512 a1b777d1620c54fc30fa1d8ba1bfbded15eeebdc6a5289b8c15b7bf91577e4809db10bedc5929d1ea134a94d398929d9241b989e146012ad12b8564d84b10217
-EBUILD docbook-sgml-dtd-4.3-r3.ebuild 1273 BLAKE2B 4c43958cf5844b639fa2ba96025ad4b2e1a0adaf2bf289bec9e4e092d4b6443558b007149ad7736bb7427c9ceb821c46a0200744d00271ca1653bc17d0daac8e SHA512 a4d251d260482325241db0fc1183bbb276d4d9ec850b7fba0d63898f788d8b72d100bb9cfbe55b7087d9b740b0e6c8cfae8a31b288270111c8cb00fffb03ebe8
-EBUILD docbook-sgml-dtd-4.4-r1.ebuild 1273 BLAKE2B c4b271334c3abe9bea3f081b1d26a66195b64a6c6926762b9aa772b81c8ac755505ea07d079f26e7d31b916148a897b1e42a532c2b8467d6c052c7aec6a15b74 SHA512 af35d1219f033982523d9cb62116d5e62b30e4face8ed69edcb375583df0069c1526fc44bd4bc4cff2cbd67da0c97b9976047d8c09046535b1709040d6043c1c
-EBUILD docbook-sgml-dtd-4.4.ebuild 1006 BLAKE2B 895942f94fb5e43c0cec90080720378b675751ea55657c759a372642f960c9e58d8427d4d8270aa8624b25847cd7556320bf0f754b81b6e3501d6ee6746607b9 SHA512 bb0b2a4b95c8b9ef77bdafb2e9129415de1be53fcbff278811049964eb9e5ab6674fd7083edd1dd502ffac560b27ee4a4d0238cfac8901c04e3f0b34a5c8894f
-EBUILD docbook-sgml-dtd-4.5-r1.ebuild 1269 BLAKE2B 74784711b3a1d76ecb7473fbe17c4efceb661909fe41776940b59de47660467d1105858a63380008ed449510b769831fa645b3d8fc7568e0adaa30631b6b4427 SHA512 5121fa21b029d85436af1d40eb02a57562af4334eb2a6c269d17802a0c3fd6c887b10544cd8734619fba4deaf9bafa87aa792c7e8c425530fb732a8413cbd161
-EBUILD docbook-sgml-dtd-4.5.ebuild 999 BLAKE2B 47395c84eb27c599d8dc014d052b96e113c6040a83b5c2f1ba0e5d73f37d848b53b3ac6969af8d0e9e12b063918b203fd60f65f6367332e7e48628aac5a86a99 SHA512 a36d36f45f89866f6f66e5a3b97467459b7e22bcc322c63aaf738e1b95f6b6259d1078f7945ae76e5f493f0721e5b7f2981ab54ca63cc902e42b8ab84d29a7e6
+EBUILD docbook-sgml-dtd-3.0-r3.ebuild 978 BLAKE2B f83ac7ee8771bea0ee40dbacc4ecd1c024e594d02eb9a22b75199f07deffc72c2dc1f99d92a00fabf97742b8fbdffd6683193a618b4d2980a2140ac4ad271c69 SHA512 091b15d441c6d58bf32fb120ca27f679126d1b62f57e33a876c259db6b8b4893573d74bccd89b5d80d8be6e55f735b3553eb860172e261137773e2eaf43e5de2
+EBUILD docbook-sgml-dtd-3.0-r4.ebuild 1251 BLAKE2B c3cd366ca13a335184615ca0c025a68c9e75f2208f8b79e414fa46565df4d63b0c70f5d83c1e5eb03fbd2c3f800ad11ab09d884086a6f9753a5c04dd2cad3410 SHA512 dcd94c5b38d05e3ee9dcf149a8902106b0c5cff2a91d61df6db049b751ab5289174f842697cf63045a1a35885b82e12d97d158d2eaf85ed037194a94504eed0d
+EBUILD docbook-sgml-dtd-3.1-r3.ebuild 978 BLAKE2B e426fd076c89a1d2a42574f3e2cb69cbc977660853fac147ec8d86f2f861abf13eda82b2e49c0703f6dc2b5867ac9101d95c93dad31d4f1ee4793982b9d2e7c5 SHA512 892fe39a4fb234cb3429982f8f8c6dbe9815453b3ce9de8b993e96eb5c429a87407ab60255f7e0b71844b910c66533d56f116f3d1b85f3382b76c735c0439b4b
+EBUILD docbook-sgml-dtd-3.1-r4.ebuild 1251 BLAKE2B c3cd366ca13a335184615ca0c025a68c9e75f2208f8b79e414fa46565df4d63b0c70f5d83c1e5eb03fbd2c3f800ad11ab09d884086a6f9753a5c04dd2cad3410 SHA512 dcd94c5b38d05e3ee9dcf149a8902106b0c5cff2a91d61df6db049b751ab5289174f842697cf63045a1a35885b82e12d97d158d2eaf85ed037194a94504eed0d
+EBUILD docbook-sgml-dtd-4.0-r3.ebuild 978 BLAKE2B 4ecff8ed147969f87de00150cf77a1e53162926833847e09ea0fddd0da59d366979f495b05d52cd029afc67fb4746f3f95f22615ee7bd351bab7af934d095cde SHA512 1dbed9ae40cbfe8856f075a6d358b7aa29ccc97833be63529f8bffb573c813e42304591514e2224e3f7aa9140f16e29ff756908e91e73dffde39155f4359c558
+EBUILD docbook-sgml-dtd-4.0-r4.ebuild 1251 BLAKE2B c3cd366ca13a335184615ca0c025a68c9e75f2208f8b79e414fa46565df4d63b0c70f5d83c1e5eb03fbd2c3f800ad11ab09d884086a6f9753a5c04dd2cad3410 SHA512 dcd94c5b38d05e3ee9dcf149a8902106b0c5cff2a91d61df6db049b751ab5289174f842697cf63045a1a35885b82e12d97d158d2eaf85ed037194a94504eed0d
+EBUILD docbook-sgml-dtd-4.1-r3.ebuild 978 BLAKE2B 86c16063c95d657d5716c755edcd97ef30d526e3df241a30acc98fc96eb55f22efac6b34f32b6c4d08b830622eb9cddbf2efa721878a2a6499af2c5cd3763e04 SHA512 c102a80ffa3faa1a869ff959044181e1516698a03f211b119a5c1478167cf0601f7d2af2cb43595a217fdf7ac85e67b21a0343b7620c780775dd636212b76403
+EBUILD docbook-sgml-dtd-4.1-r4.ebuild 1251 BLAKE2B c3cd366ca13a335184615ca0c025a68c9e75f2208f8b79e414fa46565df4d63b0c70f5d83c1e5eb03fbd2c3f800ad11ab09d884086a6f9753a5c04dd2cad3410 SHA512 dcd94c5b38d05e3ee9dcf149a8902106b0c5cff2a91d61df6db049b751ab5289174f842697cf63045a1a35885b82e12d97d158d2eaf85ed037194a94504eed0d
+EBUILD docbook-sgml-dtd-4.2-r2.ebuild 993 BLAKE2B a946b13102ff386653ae52ebcbc3b13b8757443582801bc20d197080fc7f236c10ae4d5e023472d04869b3705cae6c500ab7ee56f4ca51e55c896baf5a6865ef SHA512 97a9e5dda3e40b722038fcb66c5a5b952b5debc5915b3de530142f04f31178e89bd7844b866442fc7cfa14c2ddaf1b34d73cf674e171917d3e92fd052ce75ac6
+EBUILD docbook-sgml-dtd-4.2-r3.ebuild 1262 BLAKE2B 7afdde882b2d39eba65d7c61ce040213b02a98d0a7162cd87b2252812068a125c0c86932dd630811d61c99601869356e27fd571f7ede0316a373d43b19971900 SHA512 15420c2762700427cc512fafae165485b046ed028aefbebbb4a13a87522c7b1495988f66539429e87828f4abfc156720fcfdf172785e6b647eef84c6c69c58eb
+EBUILD docbook-sgml-dtd-4.3-r2.ebuild 984 BLAKE2B ceba8e72d4050fc5783081d64bc2ab5feb8a5d6f7624a9cbcb1f606bff3923e839e9fcdd01fc83435857c647004f55bd692c7b7be288f24030f84f72c1c9c558 SHA512 34e3f2aabebda0eb43314ab3b2851466821fda47652713b65768a2876e04c0d516dba2164e1a432e22576b713045ed08c3743ec704f7141290efb2712707c695
+EBUILD docbook-sgml-dtd-4.3-r3.ebuild 1247 BLAKE2B b2382a8185752d78c37ae39b6178a53c8aa256d834ba4861ec4c1a2c8a21fd982be7600bd00d44eb489ddff20d3ffe3c04afd26069bac5fae41652ac267d0a02 SHA512 a5721998eb93cd091cc3b4ffabc356ec283d5656b803ac73c5e8b1fdefaef07386192bebb8caac9233905ec9c7a3e41795c3e159e5c974c245630a1172e9aea6
+EBUILD docbook-sgml-dtd-4.4-r1.ebuild 1247 BLAKE2B 35a10e3494c3511607d99eef4b4c88536f246fb22b5ecd19092affcb494835e1577ddf8356f77acf79ddc687ea8fc3ff7c85467ba7f3a9a0baedb68c3fc02f5a SHA512 fbc33b0da8394b20a768a7663a813dec7bd369b93c9a47b0c6c37c56a59d8be00e312988eb61f0ce729dda9743d70e42af49a54bf0f08f8d320812ed2ab467d1
+EBUILD docbook-sgml-dtd-4.4.ebuild 984 BLAKE2B 69c42245da0c03a7aa65da7de54fa2fb68c1805360c7b8bad0e94169e82f3e1c55c9a43a4e96bc99cc2d599051b570ed647e924ea35a7066c67a2bd58870eab0 SHA512 70dac72ddc99a35fe804db3f70f515f432c1318897be424451d7c4912c67c7003df00fd61bc8a69fe4d2aa6bee0bd6557d9f86f6699b6b49dc6e9db07389a77e
+EBUILD docbook-sgml-dtd-4.5-r1.ebuild 1243 BLAKE2B 797bff8ac4f1cd0778fe391a3d1788bdbfc7f74f08b68a04cd878e2d957029ecbd03d14cf0cc214fcfbad3cada3050eb06d9963190003a7cfb0e0f80dcce6f93 SHA512 d5f0d057930f8d9b0aaac960572e17d2cd66d4dc22a792d9a253170d670a1eb3358236f9d8846f165b370a37767cc6cb0dd8f18e37fa8c6498a7ad54a61f7f77
+EBUILD docbook-sgml-dtd-4.5.ebuild 977 BLAKE2B 9dd0c5251b840856e6b1949258fb6ee427dbc3fe0487a2fc21153bb58cde8877e3d1bd899941ca51f884b8f3b6e2ae2a87c5bcc9f8d00cb138cb36ec9d31e415 SHA512 89b7ee7d59bf1bec074fe6a3136e09c8c0967cf21119b7cbef6ff2271a6eab140672543ce4899f5b22c4113a71c3b74c928ed57f8b0a569ed75eaf218fb6dacb
 MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.0-r3.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.0-r3.ebuild
index ba9da057ae5a..f211f5548831 100644
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.0-r3.ebuild
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.0-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.oasis-open.org/docbook/sgml/${PV}/${MY_P}.zip"
 
 LICENSE="docbook"
 SLOT="3.0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE=""
 
 DEPEND=">=app-arch/unzip-5.41"
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.0-r4.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.0-r4.ebuild
index 1787a5d05c8a..443369599379 100644
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.0-r4.ebuild
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.0-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.oasis-open.org/docbook/sgml/${PV}/${MY_P}.zip"
 
 LICENSE="docbook"
 SLOT="${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 s390 sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE=""
 
 DEPEND=">=app-arch/unzip-5.41"
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.1-r3.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.1-r3.ebuild
index 88708e01acf1..58c55ff1b74a 100644
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.1-r3.ebuild
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.1-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.oasis-open.org/docbook/sgml/${PV}/${MY_P}.zip"
 
 LICENSE="docbook"
 SLOT="3.1"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE=""
 
 DEPEND=">=app-arch/unzip-5.41"
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.1-r4.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.1-r4.ebuild
index 1787a5d05c8a..443369599379 100644
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.1-r4.ebuild
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.1-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.oasis-open.org/docbook/sgml/${PV}/${MY_P}.zip"
 
 LICENSE="docbook"
 SLOT="${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 s390 sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE=""
 
 DEPEND=">=app-arch/unzip-5.41"
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.0-r3.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.0-r3.ebuild
index feda5792a75b..36599e3c3693 100644
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.0-r3.ebuild
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.0-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.oasis-open.org/docbook/sgml/${PV}/${MY_P}.zip"
 
 LICENSE="docbook"
 SLOT="4.0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE=""
 
 DEPEND=">=app-arch/unzip-5.41"
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.0-r4.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.0-r4.ebuild
index 1787a5d05c8a..443369599379 100644
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.0-r4.ebuild
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.0-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.oasis-open.org/docbook/sgml/${PV}/${MY_P}.zip"
 
 LICENSE="docbook"
 SLOT="${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 s390 sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE=""
 
 DEPEND=">=app-arch/unzip-5.41"
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.1-r3.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.1-r3.ebuild
index f0777f778ab8..0180a134092f 100644
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.1-r3.ebuild
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.1-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.oasis-open.org/docbook/sgml/${PV}/${MY_P}.zip"
 
 LICENSE="docbook"
 SLOT="4.1"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE=""
 
 DEPEND=">=app-arch/unzip-5.41"
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.1-r4.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.1-r4.ebuild
index 1787a5d05c8a..443369599379 100644
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.1-r4.ebuild
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.1-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.oasis-open.org/docbook/sgml/${PV}/${MY_P}.zip"
 
 LICENSE="docbook"
 SLOT="${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 s390 sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE=""
 
 DEPEND=">=app-arch/unzip-5.41"
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.2-r2.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.2-r2.ebuild
index b4cacf0c675c..f422cc2836ee 100644
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.2-r2.ebuild
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.2-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.oasis-open.org/docbook/sgml/${PV}/${MY_P}.zip"
 
 LICENSE="docbook"
 SLOT="4.2"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE=""
 
 DEPEND=">=app-arch/unzip-5.41"
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.2-r3.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.2-r3.ebuild
index 118ee2068463..0e594e5d27fc 100644
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.2-r3.ebuild
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.2-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.oasis-open.org/docbook/sgml/${PV}/${MY_P}.zip"
 
 LICENSE="docbook"
 SLOT="${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 s390 sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE=""
 
 DEPEND=">=app-arch/unzip-5.41"
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.3-r2.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.3-r2.ebuild
index 75e8deae2c4c..bd78edf23ce2 100644
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.3-r2.ebuild
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.3-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.docbook.org/sgml/${PV}/${MY_P}.zip"
 
 LICENSE="docbook"
 SLOT="4.3"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE=""
 
 DEPEND=">=app-arch/unzip-5.41"
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.3-r3.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.3-r3.ebuild
index bef0181183d9..56ef5b2c612e 100644
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.3-r3.ebuild
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.3-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://docbook.org/sgml/${PV}/${MY_P}.zip"
 
 LICENSE="docbook"
 SLOT="${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 s390 sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE=""
 
 DEPEND=">=app-arch/unzip-5.41"
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.4-r1.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.4-r1.ebuild
index fd2c41e6679f..a5921cc3c0c8 100644
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.4-r1.ebuild
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.4-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://docbook.org/sgml/${PV}/${MY_P}.zip"
 
 LICENSE="docbook"
 SLOT="${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 s390 sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE=""
 
 DEPEND=">=app-arch/unzip-5.41"
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.4.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.4.ebuild
index d207163ef213..e8a323c5cbf5 100644
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.4.ebuild
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.docbook.org/sgml/${PV}/${MY_P}.zip"
 
 LICENSE="docbook"
 SLOT="4.4"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE=""
 
 DEPEND=">=app-arch/unzip-5.41"
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.5-r1.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.5-r1.ebuild
index 9e8d322d952d..65252a88f389 100644
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.5-r1.ebuild
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.5-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://docbook.org/sgml/${PV}/${MY_P}.zip"
 
 LICENSE="docbook"
 SLOT="${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 s390 sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE=""
 
 DEPEND=">=app-arch/unzip-5.41"
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.5.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.5.ebuild
index da54710ad845..9fb1467339c4 100644
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.5.ebuild
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.docbook.org/sgml/${PV}/${MY_P}.zip"
 
 LICENSE="docbook"
 SLOT="4.5"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE=""
 
 DEPEND=">=app-arch/unzip-5.41"
diff --git a/app-text/docbook-sgml-utils/Manifest b/app-text/docbook-sgml-utils/Manifest
index 51112c0c75a8..16d4c1b1d62d 100644
--- a/app-text/docbook-sgml-utils/Manifest
+++ b/app-text/docbook-sgml-utils/Manifest
@@ -2,6 +2,6 @@ AUX docbook-sgml-utils-0.6.14-grep-2.7.patch 603 BLAKE2B 9b7832675ae7776e25c2a76
 AUX docbook-utils-0.6.14-elinks.patch 445 BLAKE2B e4e64e0cdc22dec01bc96ce5ae0b73c8e080f2d64bdd0cdecb86618bd6e46e2b00fc076570b26bb16490a47ed9d83ba28e630ecf95c00166ce12ab31b4b40f0b SHA512 67985be1ef2cea086a1029ebce17edbb9508e9b8498cdb304cde71ca3a58a48c461c9a1ff5ec83758864c67cdbc4fa7e414270a7783a41b8cfe95f0526e00f42
 AUX docbook-utils-0.6.14-prefix.patch 3055 BLAKE2B f8b7f5ffa47d0a1d18fcf9ef66dae9db74b30086bed3a6d3900e73f83dda660c6abedf697f71e51f9b5145751bae2d461ace626a7336f95e95b284468ed50857 SHA512 c4f95b8507070dda4ed102c45e6b8fe40172a2a5d8b041259903f46c3bedb351d85924810cb9bae3073b674ec8b39bd86d5f570c8c28c8100134f62abb59c1a8
 DIST docbook-utils-0.6.14.tar.gz 124998 BLAKE2B c0ae31adbbbf78732362638bdc73638cd67205b4ce2b2ac4e740334fd230c8cb031e5ba3ee9e34110c48ea42115f2f5f4dab4b4b6dd45d963976d2b48d7836a2 SHA512 8052316a643b5eaa6c0373a9ed7f2406e7c3cb3da9d3c955a271c89813a8f3196fcd9e6c8385c7b6b7ecb916515e3ec7897aece4473989f0e4dc52a2bc8bbfdf
-EBUILD docbook-sgml-utils-0.6.14-r2.ebuild 1909 BLAKE2B 75a5d7f4e6c773bd3c2cda8c6879f176df05d9818a3f0e3b3745a4531d42096148b705d80b0c375a67919c5cc0c72badf6f9fae901cc9d8d19a3a5d0a7f914a7 SHA512 3c7960d9d6a12ab50b0e735531b2ff4bdbc15a7a8548fb8b4c6a1e6a2f70a7533a4b65e6e83cb6a15196ef5490d6e763c562ecd7afd84ed599febf4025fdd6a7
-EBUILD docbook-sgml-utils-0.6.14-r3.ebuild 1865 BLAKE2B 4f137c567b36e19551ac741be3ca0a165fb07b70dcc633a674a617c539b6eb37a57c81c752533ec93597099da802fa6032fabf9ffcf7bdfce330374852f1a9fd SHA512 7550d98f3e04b6c3690cfcf4fc42869dde344c5d153001bfd4ff2b465eeb2b9dde8ae9fa5c3394f4bdd16fbe1925ab26ba66f63ebf4152c525fe9306e0adf8b9
+EBUILD docbook-sgml-utils-0.6.14-r2.ebuild 1887 BLAKE2B f15df4383f323db128a975a0fdacc643fa162058484962d55e15526e601ad2b18f1e251f83e9ee516732794a0e51bb2c51b1feb968d5f4e03db4fae79543443c SHA512 f23328537fa94f67fa4eca2401ffd513fa164cf5bf4f7f7efae2428e31ff00e0a8114d77800cb1253c371cfe367d2cdcd5517d3404e8be8b9cf138a7963e7f01
+EBUILD docbook-sgml-utils-0.6.14-r3.ebuild 1839 BLAKE2B 8c989b640ed8f60d1c87d1b25063cbc49a83fb63fcf202ee004efee4e164d5e289db4c9e290b5bef067645ff492afa49a512161f07fdb3efb41323daac08d17a SHA512 2ca82c447256d93e9b0a757e3b0216d22ce8ac83a87329b81bb5e5194890ae7cf9de371a4c0669eb3ec95737857c24cb69de03e872cb057bab7904b136d0eff2
 MISC metadata.xml 409 BLAKE2B 326a67b502158f75dcbbd01ef2772bbab0099a4d4a1fc1e7463655abbcd807fbec8761edfd1d312b4d3c845d72506fbf53245779e657cc0baf7d2fa44b3e147b SHA512 abc9fadc1fe1a7a863308a566932f958df7b13800336db521acdb6cc93773fa6c8310a34d702bb996baff5718c2329ef790bedacc5f1d849810c174fd8b281ea
diff --git a/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14-r2.ebuild b/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14-r2.ebuild
index 71a101d90125..b9da594bedd8 100644
--- a/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14-r2.ebuild
+++ b/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14-r2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="ftp://sourceware.org/pub/docbook-tools/new-trials/SOURCES/${MY_P}.tar.g
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="jadetex"
 
 DEPEND=">=dev-lang/perl-5
diff --git a/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14-r3.ebuild b/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14-r3.ebuild
index 16dc32cb7b0c..3ee204ce8d54 100644
--- a/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14-r3.ebuild
+++ b/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14-r3.ebuild
@@ -13,7 +13,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 s390 sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="jadetex"
 
 DEPEND=">=dev-lang/perl-5
diff --git a/app-text/docbook-sgml/Manifest b/app-text/docbook-sgml/Manifest
deleted file mode 100644
index e4b7f0d74610..000000000000
--- a/app-text/docbook-sgml/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-EBUILD docbook-sgml-1.0-r1.ebuild 566 BLAKE2B ef606f79e6fb3477a86853d06782a8280f6ef13cfdb85b3fcda4ceed25d4d447afc5a87c0ad090a48f91dfa6212e1be2bd512b1e87e53907a8b7311825dce557 SHA512 5434b64587487ba1066a4203c7e0865a23beaa425953f386538dff59aeef3926d36261faec63d41f971c7e349d8cc967d53a3c6efc45325427bd78214a80c6f8
-MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/app-text/docbook-sgml/docbook-sgml-1.0-r1.ebuild b/app-text/docbook-sgml/docbook-sgml-1.0-r1.ebuild
deleted file mode 100644
index 33fc3d59f4c1..000000000000
--- a/app-text/docbook-sgml/docbook-sgml-1.0-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="A helper package for sgml docbook"
-HOMEPAGE="https://www.docbook.org/sgml/"
-
-LICENSE="metapackage"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
-
-RDEPEND="
-	>=app-text/docbook-dsssl-stylesheets-1.64
-	~app-text/docbook-sgml-dtd-3.0
-	~app-text/docbook-sgml-dtd-3.1
-	~app-text/docbook-sgml-dtd-4.0
-	~app-text/docbook-sgml-dtd-4.1
-	>=app-text/docbook-sgml-utils-0.6.6
-	app-text/openjade
-	app-text/sgml-common"
diff --git a/app-text/docbook-sgml/metadata.xml b/app-text/docbook-sgml/metadata.xml
deleted file mode 100644
index 0319eec4c8be..000000000000
--- a/app-text/docbook-sgml/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="person">
-		<email>mgorny@gentoo.org</email>
-		<name>Michał Górny</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/app-text/docbook-xml-dtd/Manifest b/app-text/docbook-xml-dtd/Manifest
index b09612f7b18e..c34fe0b50bfd 100644
--- a/app-text/docbook-xml-dtd/Manifest
+++ b/app-text/docbook-xml-dtd/Manifest
@@ -3,14 +3,14 @@ DIST docbook-xml-4.2.zip 78428 BLAKE2B 542a2b658a10e0eee4928666a2edbdbff12e96dbc
 DIST docbook-xml-4.3.zip 83865 BLAKE2B d231a6e6ba3d8023d83358080d136880a5d65b4b3b135b2f60e3a784d2f2231d12e1e9d1b5284a7d3fa1b9281466591e0438adbf6160d33732e3611f5c58f21b SHA512 f5090fb74884bae3d4fac8a3c5060bffff5d6a74272de183c181a7642e4b91f4ed32ad028537d198010782c3d98575ce679672f76a9749ed124432195886a7cb
 DIST docbook-xml-4.4.zip 96107 BLAKE2B 3616c20758de6c14e08f2a9b32682da33be741153d4586c8062d6ff895f0158decc188c5e1db4f0caafbea14afb139e39bd6805842f7bedc18f0770d22e0d2d3 SHA512 7df5af4df24e4618b09814e4e20c147c722962531f03a40c28cd60f1db16b4c330420adf96adb7d66ed6eda84046ee91b467fd6f6fbfac2201537e2080735d76
 DIST docbook-xml-4.5.zip 98497 BLAKE2B 3487f4488a9e3dbc3e366d63b61940727287a97f4e0ee2d2dda031cbba96cd4d85e5b729b7ee4d32e8a6842748fc688f85c94e1a0ab2f7ebc062dd8c7b800e20 SHA512 1ee282fe86c9282610ee72c0e1d1acfc03f1afb9dc67166f438f2703109046479edb6329313ecb2949db27993077e077d111501c10b8769ebb20719eb6213d27
-EBUILD docbook-xml-dtd-4.1.2-r6.ebuild 1370 BLAKE2B 2e10950d21be0d91a19be85f59c83ffb8409ca15c69e84d8110e13af7c9857cce2a21fedd50ac4445ca5f9a70eb6a40bf0de38494ba33d27f2ad6efc9db554f5 SHA512 e3d82053cb65cc80fd05ce3a811211dc5c3522752da9a8884cc23bc245859f8401036d6c9bddd385c5eb433d9154913e18d430b87bed876d9375477b9a3f678a
-EBUILD docbook-xml-dtd-4.1.2-r7.ebuild 1660 BLAKE2B 92c41f7069dbe84d96563d1b3f6fa75764f54c29613f65dd041b94445aa69d97f099fb5934c816e20a4fe1da504a75f13c074e4aa8dd10a30ba4bbeb7ebe15ed SHA512 41e1afb160f8095affb510a65693e82cf8b4d9f6b22d4c20eb0da26dbc4537dcbe6c5d85e332220f03a2d9cbe1cffce2c44da2c43a2807e22a0da21c88f97b7b
-EBUILD docbook-xml-dtd-4.2-r2.ebuild 1332 BLAKE2B 95ba0206c2ed1233e5a8a0e964c8c16cd626aa50f2eb7b59335017cc54eeecf19cc613e4747f319a50a824fe92cd66a36c3ffda73d1566d852935b59351fbc8f SHA512 98842a6ca697911b794d296e1600b7d1b8c05ab1f2521161c52bfe02eec7fc831eb5b3d97f5ce8dc000d455098b93b8ae9258c33cec4cd51c7f3197879f57d23
-EBUILD docbook-xml-dtd-4.2-r3.ebuild 1654 BLAKE2B cfe2d7bf91327474736c5fdef40b905265e73275b0f183489441454718c2b8c65a87cc1af8d2206e8b5f1b2b31ba7e7c20a34ca7c446b6afc48b16cdc144b680 SHA512 8f8c4e5715bf0909a57c54508f6aa9a1fcf820c248f3043684fa98432682cf6a83547b61849e9e66fd64aacdf0498456b36d584e17dadac35611579e2d477382
-EBUILD docbook-xml-dtd-4.3-r1.ebuild 1349 BLAKE2B 278696d5de52ec6085421c3f705b8282fbb4917ba9c54a4ecea9bd9d95bf4ca23b938cc4594b30aa9234d30e5d332eb09b955f97e38414269cef047a742bee2b SHA512 663725a89c4be4ea58e50082445923bfe277674d450a320444f916577065302abb373b5c51fbe080a4fcb063fb08407dc2a57ee8703e1fe92277159a5d5150b7
-EBUILD docbook-xml-dtd-4.3-r2.ebuild 1654 BLAKE2B cfe2d7bf91327474736c5fdef40b905265e73275b0f183489441454718c2b8c65a87cc1af8d2206e8b5f1b2b31ba7e7c20a34ca7c446b6afc48b16cdc144b680 SHA512 8f8c4e5715bf0909a57c54508f6aa9a1fcf820c248f3043684fa98432682cf6a83547b61849e9e66fd64aacdf0498456b36d584e17dadac35611579e2d477382
-EBUILD docbook-xml-dtd-4.4-r2.ebuild 1531 BLAKE2B 273c0acb1c86c9c757d514e6823d0130b566a54569b18d4320acc8ca1d02a1d4a3555c6b2f6df3966bfa9e458e040398ebc09b6f9be667321895a3ed4beec7e5 SHA512 de6f19e5f6e49f2498dcf0202760a7f5209e55f88bb39c55efdf572d7eaa859bdc5993ed6de4c8aadcc42008d23bbeed58841c73b5cd2bbf06bb06a082db1062
-EBUILD docbook-xml-dtd-4.4-r3.ebuild 1687 BLAKE2B 461e436efdc26857945980f6ef699700a3108bd2f4abf85c3768dc7f572a132f9df4f86a733cf8a3a63d49e9b04de3c08766bd6b20ade977d9f654a4811a3488 SHA512 6be8595beee96b96e80c04eb9d41f5fd54132810828f76008edf152b0d20d86ac03ef239eb30c39eaa984ec856b745becebc941897ffdc35d6623f9736344524
-EBUILD docbook-xml-dtd-4.5-r1.ebuild 1583 BLAKE2B 831aaba6b2b304312726fb03ec666489ca4f1cc7abd01e66dd654dfef1fadeabf36ea3f9e739c24b77e35f9443a234fb83f4e7f0b2a08bf0bb9381591d1dd56f SHA512 6f0a101f815f12a8a48231f5b685e46ef24c2bd93a78907b44ff187abe9a680375d324d0d82cb69d67426a2a7f9556495f8567a0f565fe56473c6d9a46e628ed
-EBUILD docbook-xml-dtd-4.5-r2.ebuild 1687 BLAKE2B 461e436efdc26857945980f6ef699700a3108bd2f4abf85c3768dc7f572a132f9df4f86a733cf8a3a63d49e9b04de3c08766bd6b20ade977d9f654a4811a3488 SHA512 6be8595beee96b96e80c04eb9d41f5fd54132810828f76008edf152b0d20d86ac03ef239eb30c39eaa984ec856b745becebc941897ffdc35d6623f9736344524
+EBUILD docbook-xml-dtd-4.1.2-r6.ebuild 1348 BLAKE2B dd0e099bb825bfc3091c51b24b47fa50a9a5d79be6deff305f81203235d953d4e68562d8fe1fba9420ec5613b68c6b4588e86042108b7b53d0598551d1122577 SHA512 d01a0b5f92e8a2d77da20d65fdca469b6fc8ab6a8981e5288749f5dc8a826ab175f247614a9b595dc6de0c07efb29e4ae9ce3fa0d2d077dd8568241abc9efd24
+EBUILD docbook-xml-dtd-4.1.2-r7.ebuild 1634 BLAKE2B eeca42174923aad0c54b1f264cfcb5282f3da9714f36da82151c4daeeada9237b4d54f3f92dfc79ca2bcc30dfbf5a3e9c870dfd573f8c7a8f2bdac1a4d02a41d SHA512 768dca54964438120c90096505b2247c21e331e12535b45fcc5c5531a0d6905798ba2639ab7b950f6463ace30af10950c103f1f688f175908085f4a3393f7f36
+EBUILD docbook-xml-dtd-4.2-r2.ebuild 1310 BLAKE2B 801f8c553e1e976b04207b9cc5619c08bda5dbe73b3e1d50063ccb0610a664f50808049abcaaf3d2534aebd70df031d517eb286b3621f574333f32e8814abbbf SHA512 1bd2e8373410819a9b1281e5e55b02d9ec8c5dc73c88528636fe31df9e2b4b2c5e61e74f092c87189a0f9a259b1bdca16a5272bfbfd392a2c462acf8153d0e84
+EBUILD docbook-xml-dtd-4.2-r3.ebuild 1628 BLAKE2B 2215cbfd087b9e11adc7d0aba0fe26519dfb8e0723a7fa0e98ca173c159ffd998e9be62c8963adc4283b8d244a54316cdd0065c77daa3148f5aac40e92001f5d SHA512 95c9244690f5272e60b17b407e4cc6aaaa90d471cf9664af05ebed683978da84e2c3af05f9268dba12e2efefa952f5f5888d392d2874e6c7ea65f671bb2f6b4f
+EBUILD docbook-xml-dtd-4.3-r1.ebuild 1327 BLAKE2B 4f93b50fbdab95fedfada0400d33e1e49ed0b1430cda5e4a6fd1860cff434cdd779c12e1ed70000780882342ebed236d0359059925539d3369ff3aa734d8986d SHA512 1cd700b6c8992d5a5ad0998b28b74fcbd4a19a2e22316a80ca2463cefd3b75f404bc88e68e03c2c8273640c56d5813c8a1235b78cad2235f4571c413fce911ac
+EBUILD docbook-xml-dtd-4.3-r2.ebuild 1628 BLAKE2B 2215cbfd087b9e11adc7d0aba0fe26519dfb8e0723a7fa0e98ca173c159ffd998e9be62c8963adc4283b8d244a54316cdd0065c77daa3148f5aac40e92001f5d SHA512 95c9244690f5272e60b17b407e4cc6aaaa90d471cf9664af05ebed683978da84e2c3af05f9268dba12e2efefa952f5f5888d392d2874e6c7ea65f671bb2f6b4f
+EBUILD docbook-xml-dtd-4.4-r2.ebuild 1509 BLAKE2B f4d113feca710d9946cd9df5a8f3c1a5a635be3a1a869a25ea03f843623d2d53752a40304e848cec83c337bc9a5d7ad52b424993ae07b1d6eaa60789ec4692cf SHA512 e657fa64429a248e02fde6214dfeb0ae9e8de59fc1d4888335b300bdbba36b58c4528f6420bd6219720bce737ed2109d6a52244eab3f4628e06f20945cadd7c8
+EBUILD docbook-xml-dtd-4.4-r3.ebuild 1661 BLAKE2B 5271aa3a6bc23f340e6002a2684b50a44fb6182843aeb89b4afcc501192e52bd6914e4056f59a1be64d260db51c97ea251de22b8c3194de3108e720a6fa047ab SHA512 4a10daa399e721900f62328c738e14210f741bed807562e005b1490e42a303557d2ba471c0687879a826f8037df859672db0040d9b0a1fe17994b5ca9bf31f54
+EBUILD docbook-xml-dtd-4.5-r1.ebuild 1561 BLAKE2B 63d28ed0626a3d2fdbef2e6f62d0469590b8078b49423149b90198e4d4f88939a1991da8a88236d0341df6a112d9540fe9fd58cd7f5eed0e1fc519e9b870279d SHA512 b61f411c8f2f87dbca620293afd2507437f893e926356c60d463b67c9b09b4767b5c6f1c87d810c48626e4aa67c7b35e3a39ee771a0327b18066c2c4cc638193
+EBUILD docbook-xml-dtd-4.5-r2.ebuild 1661 BLAKE2B 5271aa3a6bc23f340e6002a2684b50a44fb6182843aeb89b4afcc501192e52bd6914e4056f59a1be64d260db51c97ea251de22b8c3194de3108e720a6fa047ab SHA512 4a10daa399e721900f62328c738e14210f741bed807562e005b1490e42a303557d2ba471c0687879a826f8037df859672db0040d9b0a1fe17994b5ca9bf31f54
 MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.1.2-r6.ebuild b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.1.2-r6.ebuild
index eed5959a1a9f..5fa31e2b8341 100644
--- a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.1.2-r6.ebuild
+++ b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.1.2-r6.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://www.docbook.org/xml/${PV}/${MY_P}.zip"
 
 LICENSE="docbook"
 SLOT="${PV}"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=app-text/docbook-xsl-stylesheets-1.65
diff --git a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.1.2-r7.ebuild b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.1.2-r7.ebuild
index 9d06ca5a5154..bd143e6edef9 100644
--- a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.1.2-r7.ebuild
+++ b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.1.2-r7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://docbook.org/xml/${PV}/${MY_P}.zip"
 
 LICENSE="docbook"
 SLOT="${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~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 ~riscv s390 sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=app-text/docbook-xsl-stylesheets-1.65
diff --git a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.2-r2.ebuild b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.2-r2.ebuild
index 2283cbf65498..033b2a7286bc 100644
--- a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.2-r2.ebuild
+++ b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.2-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://www.docbook.org/xml/${PV}/${MY_P}.zip"
 
 LICENSE="docbook"
 SLOT="${PV}"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=app-text/docbook-xsl-stylesheets-1.65
diff --git a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.2-r3.ebuild b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.2-r3.ebuild
index 2864178f068a..9fe015b70522 100644
--- a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.2-r3.ebuild
+++ b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.2-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://docbook.org/xml/${PV}/${MY_P}.zip"
 
 LICENSE="docbook"
 SLOT="${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~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 ~riscv s390 sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=app-text/docbook-xsl-stylesheets-1.65
diff --git a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.3-r1.ebuild b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.3-r1.ebuild
index b5fa2f3e3ceb..558de1bc5d35 100644
--- a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.3-r1.ebuild
+++ b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.3-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://www.docbook.org/xml/${PV}/${MY_P}.zip"
 
 LICENSE="docbook"
 SLOT="${PV}"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~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 ~riscv s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=app-text/docbook-xsl-stylesheets-1.65
diff --git a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.3-r2.ebuild b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.3-r2.ebuild
index 2864178f068a..9fe015b70522 100644
--- a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.3-r2.ebuild
+++ b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.3-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://docbook.org/xml/${PV}/${MY_P}.zip"
 
 LICENSE="docbook"
 SLOT="${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~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 ~riscv s390 sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=app-text/docbook-xsl-stylesheets-1.65
diff --git a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.4-r2.ebuild b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.4-r2.ebuild
index 5073cae4a3c4..beaca290a76b 100644
--- a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.4-r2.ebuild
+++ b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.4-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://www.docbook.org/xml/${PV}/${MY_P}.zip"
 
 LICENSE="docbook"
 SLOT="${PV}"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=app-text/docbook-xsl-stylesheets-1.65
diff --git a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.4-r3.ebuild b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.4-r3.ebuild
index fb841c4266b0..268166710aa4 100644
--- a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.4-r3.ebuild
+++ b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.4-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://docbook.org/xml/${PV}/${MY_P}.zip"
 
 LICENSE="docbook"
 SLOT="${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~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 ~riscv s390 sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=app-text/docbook-xsl-stylesheets-1.65
diff --git a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.5-r1.ebuild b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.5-r1.ebuild
index 28e745219079..0c2ede2a5c31 100644
--- a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.5-r1.ebuild
+++ b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.5-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://www.docbook.org/xml/${PV}/${MY_P}.zip"
 
 LICENSE="docbook"
 SLOT="${PV}"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~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 ~riscv s390 sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=""
diff --git a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.5-r2.ebuild b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.5-r2.ebuild
index fb841c4266b0..268166710aa4 100644
--- a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.5-r2.ebuild
+++ b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.5-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://docbook.org/xml/${PV}/${MY_P}.zip"
 
 LICENSE="docbook"
 SLOT="${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~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 ~riscv s390 sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=app-text/docbook-xsl-stylesheets-1.65
diff --git a/app-text/docbook-xml-simple-dtd/Manifest b/app-text/docbook-xml-simple-dtd/Manifest
index e0e7598909e5..27843532a56b 100644
--- a/app-text/docbook-xml-simple-dtd/Manifest
+++ b/app-text/docbook-xml-simple-dtd/Manifest
@@ -4,10 +4,10 @@ AUX docbook-xml-simple-dtd-4.1.2.5.catalog 1728 BLAKE2B a5ba21fb9f622b7427adf142
 DIST docbook-simple-1.0.zip 31173 BLAKE2B b19054783553be68eaa2a689cb673bb4a270f546e7c45416b3176cf413bd3be46b1b7321ff9360018c93d7f2eb2db904c9d194dcb3b4de6eff4ea33dcbd228f1 SHA512 5be8a2fb48b95912412eb250d2dad6126c78f81155b7eb115d175d32831430ede285d5f4bbebd0d8a50a1a3159fe1b7d133adf84ff8447111ca88a441b415643
 DIST sdb4124.zip 35199 BLAKE2B bee2de887a662978b6f0bf8b9ae663d37c4da1859f07a09e869cff91943bd65946dfd493b9bbe9244ffb8794f3cc5c828c647ab00b183326b63e179540765664 SHA512 b5c158cfcaaa4150d5ee719d11f3fc2b5a207cace241a147b39ab4a9f721cae2a894a88cd3dd944ecd24feae850b387faa03c669747b02de839f5d6a3ff0821f
 DIST simple4125.zip 29839 BLAKE2B 83f2b65e5192334bf6a9b5b5388a77d8b566a924837d041329d16f0ab864d5e69b7ea0a60b70fec4affcf0161fb724c5ed99fe16dd230dc0984100e40642709c SHA512 21c8d411f5b37c82442283dadbde99352778efe90fcf7eab7cc6a74fe9b702f14ffa5bd39e058d8f29fada7dbcdb197d5c880c29b207e3509ba856c5d19cfef1
-EBUILD docbook-xml-simple-dtd-1.0-r2.ebuild 1013 BLAKE2B 9454e1ad486ffcf7190af51cd750eb3aaac42aa4a5f07f485887cbd650fda46543c53cd721f5985f1faef89049373c7059f8a3f1a51753b714b903b6f5da321c SHA512 ce84d4cf08eb0c64b174a33ecd7a0064c09e72c2dcb5b65a2e009f227b561f3fe4306bafe7e3695dcadb404315a0fa6892122eb35f337c72d521d5c70763cdb1
-EBUILD docbook-xml-simple-dtd-1.0-r3.ebuild 1358 BLAKE2B 58eb920a8cc1a4a9a63c309354054b3c682f5c5b83bdc350eba801398c52894334e2f38a9deab17c3edd87697dbd2487ae0150c5035c3c581e578a00719dfb5f SHA512 c0e7fba290b5d8a2c146ef35f9d90235a5cf79867c2b579f8afd3f0f06ad2e33854f0ccf26c8d65b5688c03c0eadf9830ebab4a6a9f4c68047d4392391fd2db0
-EBUILD docbook-xml-simple-dtd-4.1.2.4-r3.ebuild 1069 BLAKE2B 45c664a32fc1988d5ec95e608dfc9204f774e5208dd9ac4d93867e760b983db58f609c01ec7ee2c83cc625e4bbcdd06aa10d95b7021e18cb7e48816e73b44c99 SHA512 ee24ec7b14126ae353d0e1c11cb819f1f34e31a60603b407769149189ac38a998322960281f81d9549be00b60bb69e80a2571453251bb9ec225c648f6861de42
-EBUILD docbook-xml-simple-dtd-4.1.2.4-r4.ebuild 1388 BLAKE2B 92b6593107ebb465fb5d68ada1b0218441241e971a8f3421c86c8914cf79bd840b39bd4e7afdf1ee2852a6f7979f7a006515c950e6bd97b1c2d095e24d730555 SHA512 22aeac8e4d252556a91adc25f81a1319dc8c056f240769dd423c0d69033973ec48b3853d67740b3cb64d14fc6e83ccfbd16d8c4c51f5acdf9ae1c8a8c01e54ac
-EBUILD docbook-xml-simple-dtd-4.1.2.5-r2.ebuild 1005 BLAKE2B e0e590a732cff3961f31c47422fbb8474905270996b886395e21decd03bb792ccd1b74834598905b69ff70e36218291bb2de49ce222b8f9879b6b113af5adf5d SHA512 b48010392f3787199881e89e0db87289cf7764abd2cdab4025d9a011e96f14b58eb5c33646a48c4558d90dc94e5789624fde873e210834873dbe4b2c1e0fbdc6
-EBUILD docbook-xml-simple-dtd-4.1.2.5-r3.ebuild 1375 BLAKE2B 08d0e8b0d4586bcfafa90a719012913792aa433ee5da26c88695433168b0e43f5201c3ec1a0bab2e5f6d8f432eb0a2244670731157bb7a7d15cebc34133d0c8e SHA512 bef05d2b8d50c1ac70de345f68dd9fb01d4c790da21a028c89f3dc8b1690029aa368f6b9eb78ccc822445df4c8c1c24e72ea0b7bb22211c6d3034935d3f89418
+EBUILD docbook-xml-simple-dtd-1.0-r2.ebuild 991 BLAKE2B ec8220e283eda21a08bde22fd990526a5dd7f756b874a554c44b236bd5169902753d0e286bf0a2dea1e2c476d3fab6f9f951b39a389e890ab822857f7e005efc SHA512 7e3da43114a8554d887921b5e5f0888446524c4c105de57cebaca1c6ae27e6589730330e796e0a41384bef85c3d16f22e7ad6ed5d68508b38acb50f8fe88a2d8
+EBUILD docbook-xml-simple-dtd-1.0-r3.ebuild 1332 BLAKE2B e537b36db3a30eba9b83c7b320dce86aa2b885689bf9ca95d6a469b7d271e9b3a6d9b1f20d5da5a29667d35a7d5b0de090ed5aefddbfdcbbe042344a86bf3e5b SHA512 a6dcd9dfc7ef95c52113d4b0038288d4bc70a5baeb7a379d763abb5cae07a427fd2c08b5a07b7d82f8e966ecab56549983273b7b92425be63e1632e868c6f677
+EBUILD docbook-xml-simple-dtd-4.1.2.4-r3.ebuild 1047 BLAKE2B 222732b5fdf3bd8909b55521da64d945b0dbce6ff2e7f0adce99c0fd1b0ab276a5f654387104474307ef9275738c1aee48f696da0cce2cf3b386d847e0e1bd1b SHA512 d903e1e18c25c7754b28a534a9c5b251ea9db22b16eb813d63e9eff740b49d34f0ae490a7f142f0a395cd1a40b39ed5f7af69ee8575196e75af99df3660a39c6
+EBUILD docbook-xml-simple-dtd-4.1.2.4-r4.ebuild 1362 BLAKE2B c92c7969af79fa07af5bacc8641abfa129d26c641b4dae90291d1e559deff570d5e7b43916cdebab5ba329cf1bbb48c3e8d652b8edb3e2e1d0be4d1f563f61e5 SHA512 5ab71017b850eee718eac8f154a7785451f0701a52f449549f4cb7f94b7985a204b30fbb1678a87922cf67c3918cb34bf3772a83583b9167b07570750ca3ba34
+EBUILD docbook-xml-simple-dtd-4.1.2.5-r2.ebuild 983 BLAKE2B 39691ba0d295337040f90fdfdd4b25b71e8704ab5e0535214e177c6bbd7194f197a181ee29d97967d2fcf9854a6ef7411ec509870fa596952200cd6006684a98 SHA512 f03d3b47009356acac7631342c480a2789066cdd42653f60845d34882038c96797e427106d3f3ca467e5af95643f5c4972da36291ea1dafca7e061b85a2fd429
+EBUILD docbook-xml-simple-dtd-4.1.2.5-r3.ebuild 1349 BLAKE2B 03599aab924418066f38c277a4690d56d9d6df3dbee467faa52f1842d11cc1d7147bffaad6135a257db9619c7d0652995e8cb52bf9e365d87ea760674a3c0c4a SHA512 4141edd7a177b6d63e4aaf0c7898b088bb519ef30965d67775587ebc43638b7073a6b70f5819eabc4e3d1e25c8636e93bcb7606a45fad5f06f7fe5ac8be96cdf
 MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-1.0-r2.ebuild b/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-1.0-r2.ebuild
index 4769cfbe91b4..ec43ec743d07 100644
--- a/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-1.0-r2.ebuild
+++ b/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-1.0-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://www.oasis-open.org/docbook/xml/simple/${PV}/${MY_P}.zip"
 
 LICENSE="docbook"
 SLOT="1.0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris"
 IUSE=""
 
 RDEPEND=">=app-text/build-docbook-catalog-1.6"
diff --git a/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-1.0-r3.ebuild b/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-1.0-r3.ebuild
index 19a3541028bd..d0992b013d32 100644
--- a/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-1.0-r3.ebuild
+++ b/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-1.0-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.oasis-open.org/docbook/xml/simple/${PV}/${MY_P}.zip"
 
 LICENSE="docbook"
 SLOT="${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 s390 sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris"
 IUSE=""
 
 RDEPEND=">=app-text/build-docbook-catalog-1.6"
diff --git a/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.4-r3.ebuild b/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.4-r3.ebuild
index df073bcf5490..dd68fe5fec25 100644
--- a/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.4-r3.ebuild
+++ b/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.4-r3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gentoo/${MY_P}.zip"
 
 LICENSE="docbook"
 SLOT="4.1.2.4"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
 IUSE=""
 
 RDEPEND=">=app-text/build-docbook-catalog-1.6"
diff --git a/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.4-r4.ebuild b/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.4-r4.ebuild
index bd0a32a10e5e..4e98dca17d18 100644
--- a/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.4-r4.ebuild
+++ b/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.4-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo/${MY_P}.zip"
 
 LICENSE="docbook"
 SLOT="${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 s390 sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris"
 IUSE=""
 
 RDEPEND=">=app-text/build-docbook-catalog-1.6"
diff --git a/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.5-r2.ebuild b/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.5-r2.ebuild
index 6e2679e689de..608fba36798f 100644
--- a/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.5-r2.ebuild
+++ b/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.5-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.nwalsh.com/docbook/simple/${PV}/simple4125.zip"
 
 LICENSE="docbook"
 SLOT="4.1.2.5"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
 IUSE=""
 
 RDEPEND=">=app-text/build-docbook-catalog-1.6"
diff --git a/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.5-r3.ebuild b/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.5-r3.ebuild
index e68783e3d120..22cf9063c97c 100644
--- a/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.5-r3.ebuild
+++ b/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.5-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.oasis-open.org/docbook/xml/simple/${PV}/${MY_P}.zip"
 
 LICENSE="docbook"
 SLOT="${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 s390 sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris"
 IUSE=""
 
 RDEPEND=">=app-text/build-docbook-catalog-1.6"
diff --git a/app-text/docbook-xsl-ns-stylesheets/Manifest b/app-text/docbook-xsl-ns-stylesheets/Manifest
index 960d584161a9..1bdc6a3601c1 100644
--- a/app-text/docbook-xsl-ns-stylesheets/Manifest
+++ b/app-text/docbook-xsl-ns-stylesheets/Manifest
@@ -1,3 +1,3 @@
 DIST docbook-xsl-ns-1.78.0.tar.bz2 4992293 BLAKE2B 3bc93ca1dc45756121a4a3838093539957bba4ddffbbd7d27c5df6c63422a8694ea7d805cc9585ab1ce2d9092e35b91cd3bde97ee2fabb91c8c870eefa8ded1d SHA512 f3b9b52a4ba5670c17086cdf64674080ef82a9226f085887c23c53d2d102611d690895c71d14186cd84a25c7735b05d6c55207f4b2b9084d65889aaac7993cf3
-EBUILD docbook-xsl-ns-stylesheets-1.78.0.ebuild 1648 BLAKE2B caed04c4c7d135bb4e50c29c357bb7d5e87fb471ca050652cd0a8f58f807bc820e991835f6cc8dadcaa66a8598558e75265ee7a25e7d4105b1e8339a2d077921 SHA512 8ad0e0d62480762974c747edd80212a152c53a839309e6e6ec5fbd02487c8c9d1a823e8e3a59ddb37b74b14c745aa73a602c3bbc0820fd5e0bcc3e614bea6972
+EBUILD docbook-xsl-ns-stylesheets-1.78.0.ebuild 1638 BLAKE2B f2be0d70be3c203b9c4e0d3478f50620b063dac00bf7f24a9d3a1bd03e725b7776de218aefe421193b7ea19a6d72d1e6f656f65e048451bf9cef90baf2daeef1 SHA512 3c2f496c12961c6fb2fc4cb413922d158311e9f04add9334d84050470cfbbfdfff276c47ebe6377a33ad6a1374837777883b03e3a35a8d52ec8fb61adfbc8b45
 MISC metadata.xml 411 BLAKE2B d10acaa19dc1518378813204f8afa18a97c88647b8cb6cdfa0e214935b999ee17aca34e6c3ecabfbaefabfa6ea229eaaa4c2a6ebf877888e32e6ef1351f5fad8 SHA512 55962cd28fad52f6dc931791e3e2288e22e183e3d49183e0f9ff890d23a38d6ad928eed4ce0b4e41b4f381234536ff67c219e4c8a75efd32cc0a14eefee6e299
diff --git a/app-text/docbook-xsl-ns-stylesheets/docbook-xsl-ns-stylesheets-1.78.0.ebuild b/app-text/docbook-xsl-ns-stylesheets/docbook-xsl-ns-stylesheets-1.78.0.ebuild
index a50b149c8f9c..9377221f6af9 100644
--- a/app-text/docbook-xsl-ns-stylesheets/docbook-xsl-ns-stylesheets-1.78.0.ebuild
+++ b/app-text/docbook-xsl-ns-stylesheets/docbook-xsl-ns-stylesheets-1.78.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/docbook/${MY_P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86"
 IUSE="ruby"
 
 RDEPEND=">=app-text/build-docbook-catalog-1.4
diff --git a/app-text/docbook-xsl-stylesheets/Manifest b/app-text/docbook-xsl-stylesheets/Manifest
index 7deaafbe37f3..3ead5ab59d3c 100644
--- a/app-text/docbook-xsl-stylesheets/Manifest
+++ b/app-text/docbook-xsl-stylesheets/Manifest
@@ -1,4 +1,4 @@
 AUX nonrecursive-string-subst.patch 1205 BLAKE2B 0c7bb8e3ba646a137bc0b50722448c65437881672a4bbb3f3dc7a181e5074f667fca0fbcb4475b83f04ac63bdddbf3dae800b7a7094b5d9aea270faeb81d9e50 SHA512 6a26838078a3ce28273dddfa1af6a378cffc28b6d1ba48a4cfc839addd7bf58ce217d6584b735f9c75381954744ab2386c75fa3c593858b6e27882be55c00d04
 DIST docbook-xsl-1.79.1.tar.bz2 21967928 BLAKE2B 42b7e989616d16fa100c2dad713830ecedf6c7e26f56f99a9bf9330385c753f282cea1033e689196352bd41f9dca59a06ff09fc4638051cb478a630df9bfeb0b SHA512 83325cbaf1545da6b9b8b77f5f0e6fdece26e3c455164b300a1aa3d19e3bd29ae71fd563553a714a5394968d1a65684c6c7987c77524469358d18b8c227025c7
-EBUILD docbook-xsl-stylesheets-1.79.1-r2.ebuild 2177 BLAKE2B 0ef29a8eb43ec83d6fe5350e1242d382cff72a85cc5aa18006f2bc093a5b3982d3e170d62f5bbf5b3030417b5b28edb88c554d54812deae64cf6a38d6b9242d1 SHA512 9bc48d3147212e02f197491dd07c819fecbcdb827ac94d9b771ed8018a42c4fcd975fb474ef39f674b3ba1d668e7bcc965eae7b6bf4224ca7e2a1bb26e7e06db
+EBUILD docbook-xsl-stylesheets-1.79.1-r2.ebuild 2155 BLAKE2B 4dc4b8fef2c877112e64e1f4215aec25e16a3407aa65effe8254d311a37c2351b9151ba7d8a3cc4b7e6758cb3863575f21a1abda3da85eb2cb3c74a2984038fc SHA512 84eabdaaea52fafd33bcb3b84c44b88fdbf7a38c5d59fb38ca576874cd419287844035d6c3280c8f83c1d1f0de2a31e1f42427c37b4360c13be05317f0b74448
 MISC metadata.xml 413 BLAKE2B c4ba1418a2d7499d953111afac5907a4dd53c183f8a2613218aa0f0f510f1b75d04c6839c5407f20703ebab963d505dc09e081cfb053970147b07001caea6920 SHA512 7c32b5261d0bfe9f552efd08854233b47958d04cab7b932ddb67cfe163319f8f8ea82d1b169203b9e2158d3a436862d7050dcc762d3b525ba806690640ad3892
diff --git a/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.79.1-r2.ebuild b/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.79.1-r2.ebuild
index b877ae3d1bf5..c4e53b624f92 100644
--- a/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.79.1-r2.ebuild
+++ b/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.79.1-r2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/docbook/${MY_P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="ruby"
 
 RDEPEND="
diff --git a/app-text/docbook2X/Manifest b/app-text/docbook2X/Manifest
index 86c048957210..c8227470b6da 100644
--- a/app-text/docbook2X/Manifest
+++ b/app-text/docbook2X/Manifest
@@ -3,5 +3,5 @@ AUX docbook2X-0.8.8-error_on_missing_refentry.patch 1247 BLAKE2B 1afaf90f76030c6
 AUX docbook2X-0.8.8-filename_whitespace_handling.patch 2080 BLAKE2B ca60c0da237260893d9c4d75b95dafde605ac5ef0d01d311f52ca3a77817ce389a3f0bc7edde06f83593bc24ddc0170507898da4cfd57a7aa081884d3be7f503 SHA512 3a72979c03a1b5135662ad5cedefd0d508001994e727a0820d628ff5ad2476c09befeb921b9562230fdec3db547e5eec4b301aa08430dd6c2ce2632624a1c375
 AUX docbook2X-0.8.8-preprocessor_declaration_syntax.patch 3358 BLAKE2B e5c8c38c4504e03d7bb003929c3723cc0d15448258b8d0770571f94279e66d565f5c7cf2926cafc0a71f66e2976039401acd6b3486a9a177115b56b44437827c SHA512 af88626ca61847a25ef8c4cf8a09ea27cd1dce6510952e9629b704d3637097b10d85b9727e502dd7eecea1d2152a71cd26bf6abf4a8370eb8647258faa30be45
 DIST docbook2X-0.8.8.tar.gz 723909 BLAKE2B 17593d104a8b50a3ab56e5de464785d86d41c8a3fd04f76037c5482de867efa6dfa1ed4047e11814ed18275cd3b856440deafb637dcec17267a946d5cb1bd085 SHA512 cc336017ad734fc62d96d289105e8ea154c418a03a37f3e21b0b3520063f8b466b4aae5a5aec2e0b83f6324c6c79b5557247a93338d0a9882a94a44112f6b65c
-EBUILD docbook2X-0.8.8-r4.ebuild 1568 BLAKE2B 9d2e48978c5e70d446749eba19d1f1b8316eec9abfe62b7b87a7c11a044ab97a53a2c0c2f5ab0a79f77fa1965458de2cb334759898cc70783706c647ed3e2160 SHA512 03fba3f83bfb7f572e944f80c422e907db2aba5ae56439599ada658e9bb43a73eda03b97cf1ebf70cc26444404ef575f1761452f799435bb8e97f538e7a979bd
+EBUILD docbook2X-0.8.8-r4.ebuild 1546 BLAKE2B 51508868838fdba3ff0c4f1a06ad95cd8c045df21ea384e4e58e89f35cbeecb224ca3051ac172c44c75c4e3313fd7873a156a1b58667fb4cc7c5be39605c7a91 SHA512 076184b0c75e9160e743944c044f4d3d39f598f388e0970c9d68bc6a2489fd1df1b6469b8ec7450d6cf9bae3f9202b1b6e007110cb83d32817aed3b03b894062
 MISC metadata.xml 246 BLAKE2B aa5c9c8df66314e0c3f156b1f79b96a87103809e228bff9935544e5b0d9e61165dc0bd0080ecb78595e6e93d0e06c1b8c979b47b8a29f6bdae22fc3abe7a3f95 SHA512 751233aacee2a81a9b2e02bf872dc788d2fe39fa6d6b3781146dbd19e4eebf5854620b2ae9d62e0d4dada2a64903ecf789e94b3eefecedd131808bc575617759
diff --git a/app-text/docbook2X/docbook2X-0.8.8-r4.ebuild b/app-text/docbook2X/docbook2X-0.8.8-r4.ebuild
index 6693cd2fa72d..3a2c9554073b 100644
--- a/app-text/docbook2X/docbook2X-0.8.8-r4.ebuild
+++ b/app-text/docbook2X/docbook2X-0.8.8-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/docbook2x/${P}.tar.gz"
 HOMEPAGE="http://docbook2x.sourceforge.net/"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-linux ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~riscv s390 sh sparc x86 ~x86-linux ~x86-solaris"
 IUSE="test"
 LICENSE="MIT"
 
diff --git a/app-text/dvipng/Manifest b/app-text/dvipng/Manifest
index bf117ef8babc..ed178b170ee9 100644
--- a/app-text/dvipng/Manifest
+++ b/app-text/dvipng/Manifest
@@ -1,4 +1,4 @@
 AUX dvipng-1.15-freetype-config.patch 405 BLAKE2B cb60958773b1091026f4bd59cab2dbb51404a3696f61606a4394563b70e2d4a506664d91435b9485417fa8ef61a07051240b8d05861f4bf1e0196a93de69966e SHA512 65fb9900e0b929902713a0c61e5bd2cafd56828a0f294171852bd7d6a5ee44356a26e3f5a3bc57f5e0c532cc6e31a8111ca1daf52945909eecd7b7f1c74c3546
 DIST dvipng-1.15.tar.gz 171529 BLAKE2B 0653e1b6cace30cd510c0a4f7a5ac4c88d3e17a6283693b93202529b1453dcc1617ed5906112206bfb872af093d871163cc6a117be13575211712901ac541070 SHA512 54647526a9d3a26d2ba9c7ef17f285a426d9df06ffb1d5336a1da95cbf24cd17505ba7f6b1ffd14a0beb7f91ab3e519612ce3d3ea3f30c278733127dfbf07c5c
-EBUILD dvipng-1.15-r1.ebuild 1320 BLAKE2B cb0d2336005e0dbf709ed2cecdb98bc80999553bbdb8c6aaaec3c4b8a74c33be148dbb70892bce8451df56f8ef15892d3836dfa27674385c1f585f598b08e174 SHA512 16fef8e9b8164876519ebbdfed8061d53cefe63e80cba48e72ca1b70abbef8d872909d065f6e6d8146eac4ec40e7075627537e89a096dc20ce885e16fa721df8
+EBUILD dvipng-1.15-r1.ebuild 1298 BLAKE2B 2d51c57723e886ae40a804e42628239cbdacebdb133837e8c2841714d46b87fcab345d50daf9b205e52b17d7afb09e0497ba328219fb9d7a191f046536478cad SHA512 77937854e35b8d1e4e8dae1e4c1c697828d3c81ca4904b5f1d456c076bf6a95dee75c3f23128d40f523f684ca8c022c0441ba9fc930b2afe3504b85ec72f39a9
 MISC metadata.xml 1122 BLAKE2B fcfe5bf7616dd40ccaa74751ba1c653012de0f263ae8c4764363c4a5b1ce9546a335b7e2c0917a9d2a0a30cde98bcc5b8e3184619b83f1d6267d7172584144d2 SHA512 c2f663c6ae8113fc462e16ce50ef44172c8d5cffaf34e9095701df7e3ae568126bb782c8a02e3d735239ea7263e6cd9778bf21f4d7166c24799a9090ecd8bc26
diff --git a/app-text/dvipng/dvipng-1.15-r1.ebuild b/app-text/dvipng/dvipng-1.15-r1.ebuild
index a7c56c1005f1..654ee932d78d 100644
--- a/app-text/dvipng/dvipng-1.15-r1.ebuild
+++ b/app-text/dvipng/dvipng-1.15-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-3+ Texinfo-manual"
 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-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="truetype test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-text/dvipsk/Manifest b/app-text/dvipsk/Manifest
index 2a91329cba9d..2ef8f5c4fb3f 100644
--- a/app-text/dvipsk/Manifest
+++ b/app-text/dvipsk/Manifest
@@ -1,17 +1,5 @@
-DIST texlive-20150521-source.tar.xz 45459552 BLAKE2B 639eaee7c9dd173e5ede9f157ccd9a9655ee55cabf232985915f10afa36dce618b8b78848e5d9853bf0f96f818d03d68fa17d8abcdc4d1a1349fe13dfe3a1ddc SHA512 9d06bb88c489715787ce619c4c6b5e2d4251e1db8d48ae7fe2d1a253634c76bc6d7282ef9c93c77847845cae01eafb58dfb37ba3fb83a6d223f0d7fe8f5d3855
-DIST texlive-20160523-source.tar.xz 45941100 BLAKE2B 8752212d41d6bbabc725d9b1dcc187dd4dbb34df4271c768e83c13a2dd4e7170aa162d01a15d87fa02bc1b5abee648a2d35e3aa1380569851cc21d6f33f2f109 SHA512 915fa2f5e2099dd385ef81033db7aafdf09558c0c200fed0748a8a42fd61f69d3eaac9decea334e30981af739dd81061a9b1d6853c7f6d00285fe0be40e26c3e
-DIST texlive-20170524-source.tar.xz 63483372 BLAKE2B 44669d1228f5be27e9d93672a4f4ead40f7f4c6cf386f2db6fef54d64f8b8a743a485fe1170904d8117b9745f71ec77db8434caa6cdd79359b1f3f387130a3b4 SHA512 18c18940992ab94ce22e22ccd4ad798253ea14ac2ab296a10ea5e9a8da9f33989f2e2641b42b564d1d5fb53bd371da3e68726b676d706b469016ad146cd19daa
 DIST texlive-20190410-source.tar.xz 53783408 BLAKE2B 8e34c7c2b74eab1c4d16ddbf7eddd8566593e6d68c42a2634760f11d86e68970698d8b9deddcf3297966968ede11ecf30e0b04ec19b708dc3e6d0a2abcc3799d SHA512 7759d8e668e53c0c73e48907096da9d8fb6384dd9c3342ddfb05e17d077054c5351d35256cf4e63a6da502de2f09f521979bede7209cdd5bd8ae80eba0efed2e
-DIST texlive-module-dvips-2015.tar.xz 159316 BLAKE2B 1a47ae6e5f8ccbcbe98d318d3206eba62b421b0f1d8271c10a85a1e7a1f2d7a7ee3d8fc10c07f5d28a0a9b3da34c921cdebf4cd0818e189909ac95ff0e3d00a4 SHA512 1dc167b54b4e8e5d45867247347e62a6d3613fcb20db6ae145e259e591ad96693f29f2b5ef0eecc2cb625f418c54c082646e3c36a61fdb25ea9d6715f87e6ef4
-DIST texlive-module-dvips-2016.tar.xz 34372 BLAKE2B 445cf1c46b0adeb811ff0ded3ac940de6482d2061478f302e9ae2f1af06aab36ab0a05fae04d67ef9ba7af7cd08ee4b186e43eb8b570d59652a4e4a7e3496781 SHA512 e5fb9e65f0070d52b13b94d11c72247fac71bfe45d43daf8b6bebc3f8b06d63927832bd1fbf5f66464ff1d9ae001773c650ffdd9e9b30f26dee2087b3d3118a7
-DIST texlive-module-dvips-2017.tar.xz 34372 BLAKE2B 445cf1c46b0adeb811ff0ded3ac940de6482d2061478f302e9ae2f1af06aab36ab0a05fae04d67ef9ba7af7cd08ee4b186e43eb8b570d59652a4e4a7e3496781 SHA512 e5fb9e65f0070d52b13b94d11c72247fac71bfe45d43daf8b6bebc3f8b06d63927832bd1fbf5f66464ff1d9ae001773c650ffdd9e9b30f26dee2087b3d3118a7
 DIST texlive-module-dvips-2019.tar.xz 34492 BLAKE2B fcc7ae96fd1fc87a4e4164e61c611587ddebf628c156d798df819fc9e2fda2c23e70bf2e7eddd779275fbf9b223ed0e7092d5e0c82144d8dedc70c8a7b7a1136 SHA512 ee10b8c1b67997d1c781fe2c3e5ce7826c111a2b6f4078330b566bf5525ad2a1cb2b89c4efa8d877ae1557fb319941ed09db30b229a62b6d3ff6f6a784e48df5
-DIST texlive-module-dvips.doc-2015.tar.xz 481208 BLAKE2B 973d64db8edf7dd4720d13ef81033d59bab3d771a23c533c1a95770837028cc506b5c05cfcff68b0d15912f1a8245ddb4edc244606ed556ae65a3a706fd5566a SHA512 bbe2ff14b1f2f3cc3b5b2d7866cef64f33b7a8e1a5a71a9e6efd210748ab8fa5b6be94d0efe46d3b757b1c7db7713d9dfe56164c63488142eb790990a1d99f2c
-DIST texlive-module-dvips.doc-2016.tar.xz 513008 BLAKE2B b7a7675d213298aeafe9fabef465011c8c6412c265880fb2042f8652ae0d00299f587d3da65f031a4128cee1cacf2ee911c3975ac165c1c7127900aa695b623f SHA512 ada60c607ca2034663277a15b11c37c2d1b0350193e26934ee3a96adaf15ccd4ae76a35113c44d30d471732062dfe971a4a024f64e7e028518bd7bbc05b914de
-DIST texlive-module-dvips.doc-2017.tar.xz 481464 BLAKE2B 43a82ac2a058cfd10e8cc60459e42d312159fc62ac7d5aeb69ff6aff2494391894dbc0890e4b6781de9e4d6b26eb0b910980704323e353d436fb1ffba1fdfdb6 SHA512 87c2577ee4c0a82430b165fd7864ec266d00b9a621b8964f39f2adecc427dedf63d7354c0849bc1bc9c0f220b35f47b499de5255500208881abb5ea5e2012f18
 DIST texlive-module-dvips.doc-2019.tar.xz 514068 BLAKE2B 91e4717b49f7c3b3cc0b350d9b5d029dfb6dacfba7a0d0f95195e681bf55e86c18f666d9a0a72ea3a5ca6cf4ad85e91e3faf2febaac3878b3e6b2d8138097d54 SHA512 fcc91e88fd3536244d878458a90d31ad3b9ec9efbc08d09d8b23f13d3887ca575e17663b2e21451abf88de389f7fc3937ce3ab49bc9e6ea94ab77c66ba179a00
-EBUILD dvipsk-5.995_p20150521.ebuild 1944 BLAKE2B f3f3c1655be30372750d06afb40367d22169ee2cada945995fa4f92dad409abab12d7a54b5d03814d79599680c897d061686db76451fa04e304267f226ea0ce0 SHA512 a4d3295a5d8fc8d11b0023d37e3f1df30c836fbcede3c2b131f550704f959678238720705dad182f325fd181bce032615afe242f1bbafd9d68cfa1a29984d680
-EBUILD dvipsk-5.996_p20160523.ebuild 1956 BLAKE2B be85abf0a4d4ff7ade60990a777b51e7d2f7b772f10088d1b434e5a5ac10a3bc4eeb46f8d84cf945e78ac6eae4613b3900525e2182c8526af797f26f3b33e8b2 SHA512 b4d84566fb3655cf8a38c28fae357485ed3ae936d569aedd7114200cd65c19e0ba651e2c7a6f0b1410f78c1d2d3132b92b0610953763914446f0d215849f5668
-EBUILD dvipsk-5.997_p20170524.ebuild 1968 BLAKE2B e93d33ad3b952a161a82d73f306e8f8892f0cc7b999424ac22bc7387b412af9556af361d9a44c3237326b951368ba2c8900b7d00be21c32fc75bd7291fc50d23 SHA512 95f56cc680033b0581e5bf0b13157d173f06712b517e33e9d0ee0ab83225d80a4aeca40d277ec53301694514a984b08a798350402d682a58d95eb2168494c359
-EBUILD dvipsk-5.999_p20190410.ebuild 1526 BLAKE2B 468df06e96107ca6caefd5eb2d7c3cd1b38446b1e94eb50d94b183564530118a2a6d249266512983bb054c58c9c43b95f5cf688207e5637a74b023dcb6324e6b SHA512 0585aa3c9d434a1282796cbcb20fc34472f418d9b7f3a2b5cee680b6e09cfee01f42a4ec756f880fa8e81c054fa129e396eff6988f6278716dbe7af43375ede4
+EBUILD dvipsk-5.999_p20190410.ebuild 1497 BLAKE2B 04d1bb675d3467819bb8115338379928e1d449a35619671b7b5643b419a645e116fab7ff1d31454a38a255f1020eb5552025779f7bf6b11cd963a16a4ffff2c5 SHA512 173e54aba08f1dc0f2a2b864ad216b467ec5a2f8e431fe67f3f17452c43db3b3571b46577d069e0e4e846c989929a76ff3346996216d18f875c332bea84d849e
 MISC metadata.xml 358 BLAKE2B b5a2e9424ef1e5bb23c34e089d9204443dd5ad528b56db71d2fc2b3c5d428c14367805ca94a307f8856d21356abe76092c54ba0f0df204b5bce3665f9f3fd657 SHA512 51f6411780af5d7775f8f80d246d5f4e297abb1960a0b0c21c6dc5c03a9a407dad8cbc4977a679590cffb4523f1b72a0f7b15ab100c938391a5abfd3e17e8818
diff --git a/app-text/dvipsk/dvipsk-5.995_p20150521.ebuild b/app-text/dvipsk/dvipsk-5.995_p20150521.ebuild
deleted file mode 100644
index 881a00844932..000000000000
--- a/app-text/dvipsk/dvipsk-5.995_p20150521.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-#TL_UPSTREAM_PATCHLEVEL="1"
-
-inherit texlive-common eutils
-
-DESCRIPTION="DVI-to-PostScript translator"
-HOMEPAGE="http://tug.org/texlive/"
-SRC_URI="mirror://gentoo/texlive-${PV#*_p}-source.tar.xz"
-#SRC_URI="${SRC_URI} mirror://gentoo/texlive-core-upstream-patches-${TL_UPSTREAM_PATCHLEVEL}.tar.xz"
-
-TL_VERSION=2015
-EXTRA_TL_MODULES="dvips"
-EXTRA_TL_DOC_MODULES="dvips.doc"
-
-for i in ${EXTRA_TL_MODULES} ; do
-	SRC_URI="${SRC_URI} mirror://gentoo/texlive-module-${i}-${TL_VERSION}.tar.xz"
-done
-
-SRC_URI="${SRC_URI} doc? ( "
-for i in ${EXTRA_TL_DOC_MODULES} ; do
-	SRC_URI="${SRC_URI} mirror://gentoo/texlive-module-${i}-${TL_VERSION}.tar.xz"
-done
-SRC_URI="${SRC_URI} ) "
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ~mips ppc ppc64 ~s390 ~sh x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc source"
-
-DEPEND=">=dev-libs/kpathsea-6.2.1"
-RDEPEND="
-	!<app-text/texlive-core-2010
-	!<dev-texlive/texlive-basic-2009
-	!app-text/ptex
-	${DEPEND}"
-DEPEND="${DEPEND} virtual/pkgconfig"
-
-S=${WORKDIR}/texlive-${PV#*_p}-source/texk/${PN}
-
-#src_prepare() {
-#	cd "${WORKDIR}/texlive-${PV#*_p}-source/"
-#	EPATCH_MULTI_MSG="Applying patches from upstream bugfix branch..." EPATCH_SUFFIX="patch" epatch "${WORKDIR}/gentoo_branch2011_patches"
-#}
-
-src_configure() {
-	econf --with-system-kpathsea
-}
-
-src_install() {
-	emake DESTDIR="${D}" prologdir="${EPREFIX}/usr/share/texmf-dist/dvips/base" install
-
-	dodir /usr/share # just in case
-	cp -pR "${WORKDIR}"/texmf-dist "${ED}/usr/share/" || die "failed to install texmf trees"
-	if use source ; then
-		cp -pR "${WORKDIR}"/tlpkg "${ED}/usr/share/" || die "failed to install tlpkg files"
-	fi
-
-	dodoc AUTHORS ChangeLog NEWS README TODO
-}
-
-pkg_postinst() {
-	etexmf-update
-}
-
-pkg_postrm() {
-	etexmf-update
-}
diff --git a/app-text/dvipsk/dvipsk-5.996_p20160523.ebuild b/app-text/dvipsk/dvipsk-5.996_p20160523.ebuild
deleted file mode 100644
index ca8383296e89..000000000000
--- a/app-text/dvipsk/dvipsk-5.996_p20160523.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-#TL_UPSTREAM_PATCHLEVEL="1"
-
-inherit texlive-common eutils
-
-DESCRIPTION="DVI-to-PostScript translator"
-HOMEPAGE="http://tug.org/texlive/"
-SRC_URI="mirror://gentoo/texlive-${PV#*_p}-source.tar.xz"
-#SRC_URI="${SRC_URI} mirror://gentoo/texlive-core-upstream-patches-${TL_UPSTREAM_PATCHLEVEL}.tar.xz"
-
-TL_VERSION=2016
-EXTRA_TL_MODULES="dvips"
-EXTRA_TL_DOC_MODULES="dvips.doc"
-
-for i in ${EXTRA_TL_MODULES} ; do
-	SRC_URI="${SRC_URI} mirror://gentoo/texlive-module-${i}-${TL_VERSION}.tar.xz"
-done
-
-SRC_URI="${SRC_URI} doc? ( "
-for i in ${EXTRA_TL_DOC_MODULES} ; do
-	SRC_URI="${SRC_URI} mirror://gentoo/texlive-module-${i}-${TL_VERSION}.tar.xz"
-done
-SRC_URI="${SRC_URI} ) "
-
-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-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc source"
-
-DEPEND=">=dev-libs/kpathsea-6.2.1"
-RDEPEND="
-	!<app-text/texlive-core-2010
-	!<dev-texlive/texlive-basic-2009
-	!app-text/ptex
-	${DEPEND}"
-DEPEND="${DEPEND} virtual/pkgconfig"
-
-S=${WORKDIR}/texlive-${PV#*_p}-source/texk/${PN}
-
-#src_prepare() {
-#	cd "${WORKDIR}/texlive-${PV#*_p}-source/"
-#	EPATCH_MULTI_MSG="Applying patches from upstream bugfix branch..." EPATCH_SUFFIX="patch" epatch "${WORKDIR}/gentoo_branch2011_patches"
-#}
-
-src_configure() {
-	econf --with-system-kpathsea
-}
-
-src_install() {
-	emake DESTDIR="${D}" prologdir="${EPREFIX}/usr/share/texmf-dist/dvips/base" install
-
-	dodir /usr/share # just in case
-	cp -pR "${WORKDIR}"/texmf-dist "${ED}/usr/share/" || die "failed to install texmf trees"
-	if use source ; then
-		cp -pR "${WORKDIR}"/tlpkg "${ED}/usr/share/" || die "failed to install tlpkg files"
-	fi
-
-	dodoc AUTHORS ChangeLog NEWS README TODO
-}
-
-pkg_postinst() {
-	etexmf-update
-}
-
-pkg_postrm() {
-	etexmf-update
-}
diff --git a/app-text/dvipsk/dvipsk-5.997_p20170524.ebuild b/app-text/dvipsk/dvipsk-5.997_p20170524.ebuild
deleted file mode 100644
index 0e897197cd42..000000000000
--- a/app-text/dvipsk/dvipsk-5.997_p20170524.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-#TL_UPSTREAM_PATCHLEVEL="1"
-
-inherit texlive-common eutils
-
-DESCRIPTION="DVI-to-PostScript translator"
-HOMEPAGE="http://tug.org/texlive/"
-SRC_URI="mirror://gentoo/texlive-${PV#*_p}-source.tar.xz"
-#SRC_URI="${SRC_URI} mirror://gentoo/texlive-core-upstream-patches-${TL_UPSTREAM_PATCHLEVEL}.tar.xz"
-
-TL_VERSION=2017
-EXTRA_TL_MODULES="dvips"
-EXTRA_TL_DOC_MODULES="dvips.doc"
-
-for i in ${EXTRA_TL_MODULES} ; do
-	SRC_URI="${SRC_URI} mirror://gentoo/texlive-module-${i}-${TL_VERSION}.tar.xz"
-done
-
-SRC_URI="${SRC_URI} doc? ( "
-for i in ${EXTRA_TL_DOC_MODULES} ; do
-	SRC_URI="${SRC_URI} mirror://gentoo/texlive-module-${i}-${TL_VERSION}.tar.xz"
-done
-SRC_URI="${SRC_URI} ) "
-
-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-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc source"
-
-DEPEND=">=dev-libs/kpathsea-6.2.1"
-RDEPEND="
-	!<app-text/texlive-core-2010
-	!<dev-texlive/texlive-basic-2009
-	!app-text/ptex
-	${DEPEND}"
-DEPEND="${DEPEND} virtual/pkgconfig"
-
-S=${WORKDIR}/texlive-${PV#*_p}-source/texk/${PN}
-
-#src_prepare() {
-#	cd "${WORKDIR}/texlive-${PV#*_p}-source/"
-#	EPATCH_MULTI_MSG="Applying patches from upstream bugfix branch..." EPATCH_SUFFIX="patch" epatch "${WORKDIR}/gentoo_branch2011_patches"
-#}
-
-src_configure() {
-	econf --with-system-kpathsea
-}
-
-src_install() {
-	emake DESTDIR="${D}" prologdir="${EPREFIX}/usr/share/texmf-dist/dvips/base" install
-
-	dodir /usr/share # just in case
-	cp -pR "${WORKDIR}"/texmf-dist "${ED}/usr/share/" || die "failed to install texmf trees"
-	if use source ; then
-		cp -pR "${WORKDIR}"/tlpkg "${ED}/usr/share/" || die "failed to install tlpkg files"
-	fi
-
-	dodoc AUTHORS ChangeLog NEWS README TODO
-}
-
-pkg_postinst() {
-	etexmf-update
-}
-
-pkg_postrm() {
-	etexmf-update
-}
diff --git a/app-text/dvipsk/dvipsk-5.999_p20190410.ebuild b/app-text/dvipsk/dvipsk-5.999_p20190410.ebuild
index 0b79c5a4ae0e..a08c98aad8f3 100644
--- a/app-text/dvipsk/dvipsk-5.999_p20190410.ebuild
+++ b/app-text/dvipsk/dvipsk-5.999_p20190410.ebuild
@@ -25,7 +25,7 @@ SRC_URI="${SRC_URI} ) "
 
 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-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc source"
 
 DEPEND=">=dev-libs/kpathsea-6.2.1"
diff --git a/app-text/dvisvgm/Manifest b/app-text/dvisvgm/Manifest
index d458a8286277..1be3cd146bc0 100644
--- a/app-text/dvisvgm/Manifest
+++ b/app-text/dvisvgm/Manifest
@@ -1,7 +1,7 @@
 DIST dvisvgm-2.1.3.tar.gz 2802278 BLAKE2B 36e523d4b82a71f26ebc50428c56863a3729d1cf79c63660a5a3cecdd7c55c27e7ad811121e8a2ccdaa37f1ec2fb345d1d5d4f7b59011be7877500df5dba1f48 SHA512 dfd6e94b28dcdf2d1be236f3f29eaf4e3e5b7bb34544cdd55ae09de612b02561dd782b693a9a94eea07420c795d31ef210eba34cb663d7de98f438c089369ff2
 DIST dvisvgm-2.6.1.tar.gz 2911596 BLAKE2B 8dfe85140db4b462c1721a8bad322d52535a0fced4bb8c374c342bd4ca8fe5cf6dfa5751a8a8070b9ce622ab7bb7df14985802c596fdc387f90febc80151fbd6 SHA512 791183f92ec4733574614fd5b8b4247a7b766b62b1aa7b1444d508d0358178b1447b24fb51d09948d99552c2cb7ed3a0f9bce0416b66de8a4835f85476bbdb25
 DIST dvisvgm-2.7.tar.gz 3037242 BLAKE2B f93bcc4220adf4b2c0d7e06deb11416f22c623f07c96ca9aa9093054e18ec72f8da1d93aa4ee467f82f9478bb0c1b8acebbb56de020f47563056dd0dbea5936e SHA512 b706085015d1ab4c9b88997cf6c1c93f6c0ee60c9d1429d3fba7bed7b5acb3392958f64b4207ae27e6eb52abb19ff9640e2b7459e4b19ae21986b82d4b65b182
-EBUILD dvisvgm-2.1.3.ebuild 1133 BLAKE2B 539dbf877da7971b3a3b3f7134ceb4e0a8a901789df432d62c445c1fed973daaa7e3fe72e133b384f7676d697b68a5d9909a9e0e3c4af476ef6263082643e38f SHA512 964c71feda01cf0ba7ee6f72773a1b735cc0e96440b455966f5e0fbb29abb6b93c318e1252ebea8cabaed98976b93c0eefd05ce2a25476b685b5208f69235652
-EBUILD dvisvgm-2.6.1.ebuild 1224 BLAKE2B 79a4356389afa033c41625b3c78146d86d04cd89ddd86411fdfa2309a40fc9f38f78d31b8a497d76dda045d756927158eaa56faeaf3b1ea0385b610531fff340 SHA512 361f3a1ec530a0f5866c10d94dc54daba96773f93c1a7a591786181d315ee3f72422e55c40a1681e00d572e628b1ac60d356b681f71d045e9d275fddcb518bae
-EBUILD dvisvgm-2.7.ebuild 1224 BLAKE2B d3a3b5e0f5960fd7d86c5c04a771c939f61845109bcaff875ef7995b713dee085213b0e2ef32fd3eb029e341ee26cd12db6978d76279b012ca350aefb3921f05 SHA512 e0d0aa37a413f60cde5c03052f8fb192246e1dfc3823bfa788e3b4d41755c491fb0d804fa6d95234229f6477cdcdac19dc24d805bf8ce0543c052ec71e2d4887
+EBUILD dvisvgm-2.1.3.ebuild 1111 BLAKE2B b350c975dffcb39fbd837840dd37e1f078edfb17ee1b1c3bddfb6ec4d041b24a12c9d9bb8a988cf4b4cc403605d416c6228da6f858d788fbb7e0b9fc13d6170d SHA512 5597fdadb7cfaebde1c5a47cbc366416f1c14a910112717fb1f7ac27b1c6fea2fc9f017d8e7ef20f0d6691eeaab6a5580156481e1d2c483bc35305cff7dd344f
+EBUILD dvisvgm-2.6.1.ebuild 1202 BLAKE2B 9571be4ce3544239c0206b459204066b595465b33ae0b5c1fb8c7dcf9f3d805232952d705b2197b4429fb511f55227d73b366fbd69688e5c05284440a93f09b5 SHA512 cf6e91c827a2f15634563da4d6f6536771eb26190b8e11bb93833468822fc0b348d420bba4655755e29076527fed66ac746fb119aedd42429fcdd3f60c60d061
+EBUILD dvisvgm-2.7.ebuild 1202 BLAKE2B 1c287a4cea343470f1df3ad65eefd20a3d722dcc092eda19087965ae54a59541984fcf640ca9d3af7e4b8ce9538883a3ec6258f43d28ee305931ce7c1726ab12 SHA512 206dade91b836bdeedf36e0d6e4923842060f05c4cc693d176593bbd6318f2ac514cc762cf64fdcd23d63135ddba873b70a6367e98e2d0cecb21eea90be6d476
 MISC metadata.xml 382 BLAKE2B ccc1e78101b4a4bcd72e8898d75270b38231df2e3563f9d0ad2beb826fdfcad0da3e0ef9ed39c4f0adcb79eef87b17bc639a2414eca0d9a5dbf88795b968bb82 SHA512 0d9a02bb1979574379451b38d790a58479fa438cbb5ee657058a7259b7e5cfa441854ce8bde11ed8cfedb06adb1e6361164d6bbb258466586cb5fa9cdff852c0
diff --git a/app-text/dvisvgm/dvisvgm-2.1.3.ebuild b/app-text/dvisvgm/dvisvgm-2.1.3.ebuild
index 3e4152d3cf92..a1e242e123ca 100644
--- a/app-text/dvisvgm/dvisvgm-2.1.3.ebuild
+++ b/app-text/dvisvgm/dvisvgm-2.1.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/mgieseki/dvisvgm/releases/download/${PV}/${P}.tar.gz
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="test"
 # Tests don't work from $WORKDIR: kpathsea tries to search in relative
 # directories from where the binary is executed.
diff --git a/app-text/dvisvgm/dvisvgm-2.6.1.ebuild b/app-text/dvisvgm/dvisvgm-2.6.1.ebuild
index 59fb93309c6f..72b86f9d9eb3 100644
--- a/app-text/dvisvgm/dvisvgm-2.6.1.ebuild
+++ b/app-text/dvisvgm/dvisvgm-2.6.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/mgieseki/dvisvgm/releases/download/${PV}/${P}.tar.gz
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="test"
 # Tests don't work from $WORKDIR: kpathsea tries to search in relative
 # directories from where the binary is executed.
diff --git a/app-text/dvisvgm/dvisvgm-2.7.ebuild b/app-text/dvisvgm/dvisvgm-2.7.ebuild
index ace7733c8139..f127b1931346 100644
--- a/app-text/dvisvgm/dvisvgm-2.7.ebuild
+++ b/app-text/dvisvgm/dvisvgm-2.7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/mgieseki/dvisvgm/releases/download/${PV}/${P}.tar.gz
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="test"
 # Tests don't work from $WORKDIR: kpathsea tries to search in relative
 # directories from where the binary is executed.
diff --git a/app-text/ebook-tools/Manifest b/app-text/ebook-tools/Manifest
index 6b00828d0797..c8fa3e876cca 100644
--- a/app-text/ebook-tools/Manifest
+++ b/app-text/ebook-tools/Manifest
@@ -1,3 +1,3 @@
 DIST ebook-tools-0.2.2.tar.gz 46889 BLAKE2B 20b6ff048e9e31d2e00db3a02b67e21f3031d74aedfc663331b08f626b1816adecad5039e124462f97ff2ff7dc43f002eb39dd625f031ae42fe2b46338e94fcf SHA512 b4518249835ed7cc672392bf2f8b1c62bc218e41c53663bb26ab34c9e43a99b6b7ae794babdb4bd775e467bb17918703a66ee57c8cf94cb7afc4ba2a7f74816a
-EBUILD ebook-tools-0.2.2-r1.ebuild 661 BLAKE2B fc16b12917144bdb98c38a84a29c3a1223a667e85dc5c59a9c6650338c2db1b156cba70bf55ef9e5715523952ba2226b18dda3b58b423398b19a45ca38c3ef67 SHA512 db52a5fab32760cc5a886ef3343e5d093d8dd39c870e22a920bb24f1e3c7afb63eb8c0bb397b9d13db779de37e65f1858352183ac077f6ca8c17e269806fc56f
+EBUILD ebook-tools-0.2.2-r1.ebuild 649 BLAKE2B d39c7352b72d1b8143468be21df3e4f2c094ea6c0b9380ae69d1ec0b6a20f62d820caa4a618861a61c2f00f0402ca2cb1c2c05b5c31346f0da3e929ef487364d SHA512 4cd37a92486ff8fe5a6f62db6016ddc888dcbe27d7d88579721e3ef2fdf3183131108ecb3defce86189401ef5979a236ecba6368202d7c67facf2e94de626fa1
 MISC metadata.xml 400 BLAKE2B c225e8514134fea3843975618d6bb5b6085785eb71a9b0413bf986d752eff783f973c10fb7e6af504a3efa1c0e05475b421ff4c1f4c24bf51d4a948d485ed103 SHA512 2ab30e14742c63fc54cc75068b57d1c9fa178d6f57fb03b8b15c5649d4bdf35c5068a132c6ee50fe855a2037af67b5c2fd2229cc97b4f3e89f4eecde6d21885b
diff --git a/app-text/ebook-tools/ebook-tools-0.2.2-r1.ebuild b/app-text/ebook-tools/ebook-tools-0.2.2-r1.ebuild
index 511f12be65dd..3b018f5a2d63 100644
--- a/app-text/ebook-tools/ebook-tools-0.2.2-r1.ebuild
+++ b/app-text/ebook-tools/ebook-tools-0.2.2-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 x86 ~amd64-fbsd"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 x86"
 IUSE="+lit2epub"
 
 DEPEND="
diff --git a/app-text/enchant/Manifest b/app-text/enchant/Manifest
index 09355d581efa..e980da8e3c56 100644
--- a/app-text/enchant/Manifest
+++ b/app-text/enchant/Manifest
@@ -5,10 +5,10 @@ DIST enchant-2.1.0.tar.gz 962857 BLAKE2B f1ee729f20f06c14cbe81c27eeff5ff3bfe9e81
 DIST enchant-2.1.1.tar.gz 961821 BLAKE2B 1aaedc16e2108a382390c9401233d6a77dcff8732fb0af1a35816993b8eb127f22f9e6f4359b997f6793f53dd37c50c1c69d2aa09cf53bb5c47baa47277e044e SHA512 5cb57198ea826da6d9ed9042edca87fcca9b811e8e75b382ed1568c5b1d8d4f8d6ba732a167c8d52261cfce540f23f84bd4d2889a4beafd2db1d8509c0b6bc15
 DIST enchant-2.1.2.tar.gz 963236 BLAKE2B 3adaf9d96c7e2d7c5e31fe31ac426230f2e88b1cd6f68157e11f13c30fc5c161723d5a5b40bbe158307ce7352e098cd22272f4a75786854f7d82a0c5694b0f2b SHA512 6cb2eeccc617c005998b16ebc33a84a05cec116b26fd679fc1416110821a85a16605c8564672e1168ac6c865cfcca6680005d1219aa615ca1c2393bd523ae0c4
 DIST enchant-2.2.3.tar.gz 957451 BLAKE2B 294c4eb7afbe97a2c8076b1b26640cb15d13dde64de7879557992e3c8ec96d68ff4fbc2c911d3c6d8811d4d5ca5a104040941ab59f8a18e324134e7ac38a2dfa SHA512 abde9d6fec25edff694570455fd4c6e8e2e2c41a6b133bbb31a344761137a354cc1c655e53374cf712bf311c3732dc721e9ffd2dc933d78ec8ccf224350635d6
-EBUILD enchant-1.6.1-r1.ebuild 1626 BLAKE2B 10419db64a4a632c79ca63066f7021eaf5122c4448e461c23c1ab9275e7345f3990335d86bb529bee33710dfb371d0e71b622218d7cbb888491ef193dcfc33ca SHA512 53e554a64a50b2f0ddbb10158a44adb1b3bfe1aa50699ea52d7b13a4a23d811b5a3dca365b812f071084f423faaa248bc90db1a63077f31cb056c7baf1e2ecdf
-EBUILD enchant-1.6.1.ebuild 1497 BLAKE2B 0a9aefe2919ec376d33ac79e271014c065a26cfa4dd70e760efbbd3b76e6723127fb588f4365aec905215236ed407eccb25a9943067bd198ce67f6b7b41adc3c SHA512 ca846dd37eb5e9fabcb512dfb2c77dcecacf22018a3ba5e61528180c2c879f0a849236ad7799121f9f0839bd250078480c2c80f792756d301518e06bd3c7b01a
-EBUILD enchant-2.1.0.ebuild 1315 BLAKE2B 099906e37a942d542e7bf55a4f86e2def554890f131ebb2a717a270a1b7e1582200468f403eaeeb669d8e253ec437beaa8117f5ac8c05d757983caaa7158ba61 SHA512 6c6261e70abe20d1a4ad83b3b3d0cf68fa29543d3f676301ad16fbbd4d8477b3add24accdf94b9c14bcd970a27385c88bf1c8b516a4cdfa720e81bf9c6204515
-EBUILD enchant-2.1.1.ebuild 1174 BLAKE2B 0a132dc9992834a78b6553b0e0a377b393b3a8c2e4692962cb0931fe86c0b9b6a7a455657500e22e20c1dc15de7fb38866b0f8ba2c7a4db3869533a1ebf3de64 SHA512 889cc5ef82a0ab3393f3971655864ddc0a70093ac1c5cc67a9ce2605e2206e5534628f1383c24893b1d77db0367f0f9c66897942f4b7c6b844d0f44349f7b6e0
-EBUILD enchant-2.1.2.ebuild 1174 BLAKE2B 0a132dc9992834a78b6553b0e0a377b393b3a8c2e4692962cb0931fe86c0b9b6a7a455657500e22e20c1dc15de7fb38866b0f8ba2c7a4db3869533a1ebf3de64 SHA512 889cc5ef82a0ab3393f3971655864ddc0a70093ac1c5cc67a9ce2605e2206e5534628f1383c24893b1d77db0367f0f9c66897942f4b7c6b844d0f44349f7b6e0
-EBUILD enchant-2.2.3.ebuild 1171 BLAKE2B 73259403ac20a282d251d9941bd2aff8dde977aab3a71766b896e7e57d2e52c8e95eeb8c4688630b8a9960fc7ab4d03a433878a92ccdd93a67129052218e1ce7 SHA512 b270abe29c3c3f0c705a7c7d4f0115047386e89620212db4451b50284ec30a6a994f4e7c40035ba44e1471823b2842c49631744075eb52cd9d4ab93c6e76206c
+EBUILD enchant-1.6.1-r1.ebuild 1604 BLAKE2B 1316d5ef21c9d0604f33a7e61a11f3e554d072f92346bdcb99e18a3d32544e73591790439d777a42a91edb6a62f552787e047c849895d3344d7024c666a09005 SHA512 730628d378611c32d2f9ee9457620f330a4f3d5d5181cbd8ca6dbf772a95c40f5f10762bd753fafd2c2718c0560e26357d7a08472b98670bab6f5c1e76eb0f42
+EBUILD enchant-1.6.1.ebuild 1475 BLAKE2B 7e0c58a66445f07c64d127e6be81f60dfdeca4f0740d46339bd4651faccdd3a2ee3c0cf5fe2cc47b6c28c9368191ffab54235c3a9de103ba32bcb21901eb4942 SHA512 5cd684fe0979a29dd91e7c590d0fcb5927e0c3bab5e65d2ba3800a3c545b2bb64426bdfa06d04199514f650a566f12af11aed59fb4a053f2cefd3b3e59a404cb
+EBUILD enchant-2.1.0.ebuild 1293 BLAKE2B 28adab1e239028e4c1a1bb58380dd03f6104a4b5ee5ed8323703ce828989bc9f435d4ab10c0e53f2a475dc109f175f5f5a5c894bff326b6a2b251b800d6b85d9 SHA512 1537657246a50e76a4c65082b79ee75c8ed324d448063d840c94f886c043013fbb7ed33ff75c13aa35cfb2b528a5fec294f234948bff9479bcd8f21dffbe30cf
+EBUILD enchant-2.1.1.ebuild 1152 BLAKE2B 3f06209033ef964fce26cb8d7e8555b502316bb6609fcad2d49b9a21f33b2eb804169716879b7b5a16a201fa07f14e6a4dcb324863f0877d26cf6eaa539f08cc SHA512 af7796aa6c0d4688327dc1cdf4abbf2fa84a579178ef26e15a3b61054b781f6987c0ec0fe6b2be182a987c1899180e61288c88065e1a40bca5d0f3eb54131c33
+EBUILD enchant-2.1.2.ebuild 1152 BLAKE2B 3f06209033ef964fce26cb8d7e8555b502316bb6609fcad2d49b9a21f33b2eb804169716879b7b5a16a201fa07f14e6a4dcb324863f0877d26cf6eaa539f08cc SHA512 af7796aa6c0d4688327dc1cdf4abbf2fa84a579178ef26e15a3b61054b781f6987c0ec0fe6b2be182a987c1899180e61288c88065e1a40bca5d0f3eb54131c33
+EBUILD enchant-2.2.3.ebuild 1149 BLAKE2B ae0cde32ccb00ea5a7b10d31763cbb79f0ca49b9e0b90b392fa10812fecd7be8fd8148b35a1dcaeee0eb2dbcd78f0520d3c649bd77f7f8b273c28865ecb5a8db SHA512 ddcf9e3963f4e31392cd4f55b6e15b0c413c560b2446275e30843e85d10c56692b8f4efa5077eb4af92c240fe206484bc9bda4053fe8d95a8c126f649a50d807
 MISC metadata.xml 446 BLAKE2B 46f91a78cb6d8ae11b77da0f640e07fd3842e4ed162d0037b9620132f8ae9ac81e4b6353371d2350abd634bc693e8d64c8d94a5496cb28931863ce7a246ab209 SHA512 9e1bdbc66c53f055c8730a6ff7a833e2597f648067087e268495a3337e51fb3d806fbed698a69ac59599100eba90401679f6141c71dd9298030f4771230429ea
diff --git a/app-text/enchant/enchant-1.6.1-r1.ebuild b/app-text/enchant/enchant-1.6.1-r1.ebuild
index 79f317dc4b94..1c1f2b790703 100644
--- a/app-text/enchant/enchant-1.6.1-r1.ebuild
+++ b/app-text/enchant/enchant-1.6.1-r1.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-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 
 IUSE="aspell +hunspell static-libs test"
 REQUIRED_USE="|| ( hunspell aspell )"
diff --git a/app-text/enchant/enchant-1.6.1.ebuild b/app-text/enchant/enchant-1.6.1.ebuild
index 8a0c7ad3ef3f..30cc4c9998e1 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-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 
 IUSE="aspell +hunspell static-libs test"
 REQUIRED_USE="|| ( hunspell aspell )"
diff --git a/app-text/enchant/enchant-2.1.0.ebuild b/app-text/enchant/enchant-2.1.0.ebuild
index 03527fb94952..7edc38a439ef 100644
--- a/app-text/enchant/enchant-2.1.0.ebuild
+++ b/app-text/enchant/enchant-2.1.0.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/AbiWord/enchant/releases/download/v${PV}/${P}.tar.gz
 
 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-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 
 IUSE="aspell +hunspell static-libs test"
 REQUIRED_USE="|| ( hunspell aspell )"
diff --git a/app-text/enchant/enchant-2.1.1.ebuild b/app-text/enchant/enchant-2.1.1.ebuild
index 0780c2cc403d..e6c8d4bc6a37 100644
--- a/app-text/enchant/enchant-2.1.1.ebuild
+++ b/app-text/enchant/enchant-2.1.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/AbiWord/enchant/releases/download/v${PV}/${P}.tar.gz
 
 LICENSE="LGPL-2.1"
 SLOT="0/2"
-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-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 
 IUSE="aspell +hunspell static-libs test"
 REQUIRED_USE="|| ( hunspell aspell )"
diff --git a/app-text/enchant/enchant-2.1.2.ebuild b/app-text/enchant/enchant-2.1.2.ebuild
index 0780c2cc403d..e6c8d4bc6a37 100644
--- a/app-text/enchant/enchant-2.1.2.ebuild
+++ b/app-text/enchant/enchant-2.1.2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/AbiWord/enchant/releases/download/v${PV}/${P}.tar.gz
 
 LICENSE="LGPL-2.1"
 SLOT="0/2"
-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-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 
 IUSE="aspell +hunspell static-libs test"
 REQUIRED_USE="|| ( hunspell aspell )"
diff --git a/app-text/enchant/enchant-2.2.3.ebuild b/app-text/enchant/enchant-2.2.3.ebuild
index b9445634e884..f4146b3a703c 100644
--- a/app-text/enchant/enchant-2.2.3.ebuild
+++ b/app-text/enchant/enchant-2.2.3.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/AbiWord/enchant/releases/download/v${PV}/${P}.tar.gz
 
 LICENSE="LGPL-2.1"
 SLOT="0/2"
-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-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 
 IUSE="aspell +hunspell static-libs test"
 REQUIRED_USE="|| ( hunspell aspell )"
diff --git a/app-text/enscript/Manifest b/app-text/enscript/Manifest
index 09148ab871fc..adb234f2bba8 100644
--- a/app-text/enscript/Manifest
+++ b/app-text/enscript/Manifest
@@ -4,5 +4,5 @@ AUX enscript-1.6.4-ebuild.st.patch 332 BLAKE2B 88feff57f5dabfb09dce2c11c65e64005
 AUX enscript-1.6.5.2-php.st.patch 410 BLAKE2B 84e35ea8441b60bc5da3085b969f1b20334ed4f9632681b12cd50fbd95d144e40fcd1874aed99a08986432885efdeb70653b0ffed7e5a5b83d5bf1edbff60cbd SHA512 71bf65c91d6d362bbb700ef26b72137e524a969da0971b7f0c30ac409a7f002103769cc25c02222d0ccb1bf69919a419481af9ea479828e3df18ec7a2e1d29b0
 AUX ruby.st 3904 BLAKE2B 854c86166a43715e85e91802f2d82eae71773d9caabf604bd5edc0e53046ed0fa9944ec61c5ff7516e22740cc90ac73dc1d8edbdc0e9722ec876be3a129d2183 SHA512 43af0998ebe95530129aec126b9f91878bbbf7dd52530cb162b25f5779f9eb5b870f41727665e66dd5cf42a6d5e790899bf03c38c1a914adf2b0eecac83154e2
 DIST enscript-1.6.6.tar.gz 1330493 BLAKE2B 02e333271ac6716e049402d5904b0ad6926b31d4533c813a9e5bcf76045d4100def2476426b97c52585e8f5c0a741159fb3e78de79c817e75de81ebd464c0d61 SHA512 bf1c2b9ea7723518a1ef312145ddcd6ffdef0c6e8b5795ea84cb55d76fccc02f441d0c2dc6897e970368186e6a829ab74a090716624e0f7a8f575653fa495ebc
-EBUILD enscript-1.6.6.ebuild 1139 BLAKE2B 8d1245dd62f2654ab7e7d7ba0e040652322792d5e5c8f6e0cc980d5065338b2525ca634c702ba45afd8afcf205afb2fa752521470fa1ce33472d825bddf3a9bc SHA512 748b16650373e043a94de3422a547b599ccd24d915cf461c46b5d8e4ac81a35b3f690d15734d54377395bef9b4dcf1e8880ec420fda47eb62d8885fa0867d0c0
+EBUILD enscript-1.6.6.ebuild 1117 BLAKE2B 260ddca7530e760939e4e7a23b46c219ffa82ae7c95d944607f3f542710475ab56c2208d3709bf25cdc78fb81901991ac314ecad83bd7ba8437a33f1418c90d2 SHA512 070e1a5fbdb517806cdda9a2d53a9f163fd089b413c2407d318e9729169793a3e437a10318fdb02929b672c6f9cf11c01bf4fb0adce063726fe34abfb14d9b7a
 MISC metadata.xml 255 BLAKE2B 06f078acf8e4416705c8bad8b4802a44592eb962c08c050e11332bfa97564fafdf08754ab056eb813f6baeaa6cdfaf5d71672455d77e74045f86098c221d5136 SHA512 c6c5f966cfbe396fde1b15334442de9e0004b44c4b48775588b0b25a058ad1751252761370c9c254280e97561fa6306f5aa0cc7959c675d4ee11f7f95d777a36
diff --git a/app-text/enscript/enscript-1.6.6.ebuild b/app-text/enscript/enscript-1.6.6.ebuild
index 185ba15dbf84..a287552dc78e 100644
--- a/app-text/enscript/enscript-1.6.6.ebuild
+++ b/app-text/enscript/enscript-1.6.6.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Powerful text-to-postscript converter"
 SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 HOMEPAGE="https://www.gnu.org/software/enscript/enscript.html"
 
-KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86"
 SLOT="0"
 LICENSE="GPL-3"
 IUSE="nls ruby"
diff --git a/app-text/epspdf/Manifest b/app-text/epspdf/Manifest
index 472414c1ba1e..d8b95107413b 100644
--- a/app-text/epspdf/Manifest
+++ b/app-text/epspdf/Manifest
@@ -1,5 +1,5 @@
 DIST epspdf.0.6.0.tgz 352989 BLAKE2B 633e2ed29d8ec28f679b00095d335cea4bd1996cf6fdf3950b97084a73044eca9371ac6964ad48e98ea8ddba38d91acad2137ee8d3122ea03df3ce25f08196ce SHA512 44a7015fa0b7298429567e998068864419fd396f6b0781bf7877c6599d3bb2f254b7a0f976500655851a95d727880d106d9e1df9086306eef74db0b109a63506
 DIST epspdf.0.6.3.tgz 335975 BLAKE2B aacd6e222bfe74636dba796fd6e878fa9970f469d096eb77acf4a336a0ab5620629de7ba1c763afa62b181887724db55be57d1929a041a945c7d74ea3028d6de SHA512 ddb0d8c17b6b0bbb934312e6253a2b689d2545c892af989efac9782022c501109f2ff57bb2ea7c26d63d7747e2a510c18bd22a6076bb7137fe0252c38b2125ea
-EBUILD epspdf-0.6.0.ebuild 1294 BLAKE2B 04f03e10c525815194609721427dc383a94b29b4e56da2f3a843e5396bdd9595e2f02399935e90e5184f6777ccbddaead2f3b4640dcd6acd438320c7edb44010 SHA512 ac737cd99a6951e27dc297fab0dd8e5029a1e5140b31dfb3737781f58aaaf66560f4401933a282dc410d8f9e4437374d8d057b78557602e223301d2bfe8c086d
-EBUILD epspdf-0.6.3.ebuild 1390 BLAKE2B 4abe3db638678b963b668b28b97f71bc2b7a229c7143e40ad0f5aef488ca310fc6d9ca61f4a3f32de74acfff47c50dfdc939ca6d955d6e98dc94effd02ca59ae SHA512 cf7fe0118112f27651e500fd672d00308b17acb0852619bd94063011abb8b461f71fc8bebef91d2a4045b5e314c1e7f62114fbf5485e67b1e34674ae181b97b9
+EBUILD epspdf-0.6.0.ebuild 1272 BLAKE2B b140340408b9758f34d135222ba4f8f7a7392793b9bc0b1c126f28a8c56594a1a9261140a0ab1ccb4d11efbba119a1c3f9060c459d7156726b470987ce8df066 SHA512 33bc948faa3974610155dbc2ab7227f9328f9832aa943ac01ee6c6d22473d5bfe8faf2c401d12b9b4d86fcc76642eb1f221f4ed5c0cd0fe280096539b6fd7823
+EBUILD epspdf-0.6.3.ebuild 1368 BLAKE2B 2a1039df5f67ce0dfad67c37ae097fee993ad7dab67496ccea9a0933260cbca4c928c60a375300ab1d51bae22483c54649f078499b08535a0d04287304a3e8b9 SHA512 b40e1a9f7e1608ad78131f3cb74804d5865ab9aeba5c25e17fb299f9d8481c58bbd39a735b4646fe5d3e5a5de507083274211cd412f3b09da832581c51a71b8f
 MISC metadata.xml 245 BLAKE2B ee3a163cfe0a4bc59c0dfb46f9ddb580e2d259b4d0e33cb4e684eb9e6d4b901bf97c6edd891f3b75a613a782f1b89318d0ee3ec9bee4e34c4441d9e8f4267678 SHA512 1653777623e2c15e1ce13229e396723b2cc9c214983e0f8592de98c01a31badc6c38c6735ed44f937d145883b43fb6f049af3eddb9ff96b18c96ccf8f67dd690
diff --git a/app-text/epspdf/epspdf-0.6.0.ebuild b/app-text/epspdf/epspdf-0.6.0.ebuild
index 25b3f41e6c1c..91e89b55123a 100644
--- a/app-text/epspdf/epspdf-0.6.0.ebuild
+++ b/app-text/epspdf/epspdf-0.6.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://tex.aanhet.net/epspdf/${PN}.${PV}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc tk"
 
 DEPEND=""
diff --git a/app-text/epspdf/epspdf-0.6.3.ebuild b/app-text/epspdf/epspdf-0.6.3.ebuild
index fd24f3b41c02..38aa8ce944d6 100644
--- a/app-text/epspdf/epspdf-0.6.3.ebuild
+++ b/app-text/epspdf/epspdf-0.6.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://tex.aanhet.net/epspdf/${PN}.${PV}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc tk"
 
 DEPEND="sys-apps/texinfo"
diff --git a/app-text/evince/Manifest b/app-text/evince/Manifest
index e5c3548e6bac..e93b68b0f83f 100644
--- a/app-text/evince/Manifest
+++ b/app-text/evince/Manifest
@@ -1,6 +1,6 @@
 AUX 3.30.2-internal-synctex.patch 964 BLAKE2B cce1d02b40b18a23773985e2d9f39b1782e56ee9e032d625e51796723a2ad43e3cb9083055bcbc10438cb70b15e7c7c6737db3d7276db1e02b19127c5d75e527 SHA512 f1a98d09a0fee6add7a5a44d756ceaa003cbb3840e74a513c1f01ad6826ee4136cc5b862b675401371951468f1cdb2e5137158c44801a0c9ebe79c60951b8fbd
 DIST evince-3.30.2.tar.xz 2288868 BLAKE2B dd0423b7ec51daf897bfbc45afb298f9ee23b28ada3dfe5d5d2808b4515bdc7077a7e0ae46541876bb2fbfd8aa9ec44abc7aabcb3cb10b6e52912f0ac1358eeb SHA512 dfffcf15547d0720bd2379054d7b9bee02f8bea7113562162cbab62d77cf84c04f70dcc87a3e6b1ba62db38783df8f481d801854d8f0767f60e9cfabd9efc646
 DIST evince-3.32.0.tar.xz 2564236 BLAKE2B 203bc6ff6b8b2a3d30ebd30f7f9be6269ded5044521da7d2732cb759db8e8ebd2d565c2ad04908e11ec1f726ec70dd2931c58c9b31951a7b3d3165c61042c87f SHA512 565298a200d9ae2f6b4cb53c3cba0d0d0e4cfbef60e4145bfb9c82a5682947ceb2371e52c27179cd69a238cd387bcfd744d3c55df814b6347f07781aec3ea658
-EBUILD evince-3.30.2.ebuild 3124 BLAKE2B 18a459e407b968406bfa1220d4ee151cc2668277775ec5a6c91df53019069508e15c7213eeadf73a38c2d975be5a76eefe81e7c76da888d805c6a4b25cde736a SHA512 2eceb17e9f9251517c0b3cb5394e364bd7b2f95ead765a555730094e6686c54c256efba28adb95316a730572cc539a144dcc07607b05af7830e2e9c41c475d6e
-EBUILD evince-3.32.0.ebuild 3127 BLAKE2B 32b9d29b0e68b7a8421730f546dad584d3962ff9e5219ae68f2e5afaf943c6d52c290b3cb82fc0b9d13fdd553e19187b8f611a07218e82be6f1a86deef7b65f2 SHA512 14aab1578a9025b8bbd9d6adc1e8d00f2f54a166f373349167ad993ac524a020e5818622b9b17fd9b0be23ca1db5159077a101d6215c6cb68395849e2941e12d
+EBUILD evince-3.30.2.ebuild 3114 BLAKE2B 839716b0960b7a8ed6e7ad682de262f432711dca58d51a313d40c15f7737d4b174d514066301974e9b0e8356b98c561b687de6de6ded6875f6929c5efb8188c2 SHA512 e46cddcc1296237685d865c2a1e5c5400add7c1d329c9887e79bcda2b4d73e26be5e3114edee9406828ba6e25e56eb9e46061d5e4f702faf7d1c3ed831a7e41f
+EBUILD evince-3.32.0.ebuild 3117 BLAKE2B a151578067d49c84001bf878991f425273c8634ba2dd35b0fe2444c469db250dbadf0e30f6ed05d7ef7b7853cee2d9f484693e122b201d6d07aa7294f6cf8a4c SHA512 2911fd3bbe41c67fc96492f9643940c5ff690634301dfad93c3b2120fd60dd1af629cdde5f1cc94567a133441e122ece244c5903dae683a7feb60fcb5ac6f719
 MISC metadata.xml 881 BLAKE2B 180e93316fad8f1bf7b80028a86c18964e695c93292b724e864ed50f3fbd951f810fd490b91944f30e42f632ce090dbe34aadf9679b2e62c118aa75b7b0ea834 SHA512 ece377a284a548444c185a7c1fa4c36546709ec00754d066eb4186fba0f079de60b02dcb75f3fd101d50c8ea8f4d4d654d7efd0d8ff8db7b2b85c097c18b43c5
diff --git a/app-text/evince/evince-3.30.2.ebuild b/app-text/evince/evince-3.30.2.ebuild
index 0d61b2bf1503..85804e8eea8e 100644
--- a/app-text/evince/evince-3.30.2.ebuild
+++ b/app-text/evince/evince-3.30.2.ebuild
@@ -14,7 +14,7 @@ LICENSE="GPL-2+ CC-BY-SA-3.0"
 # subslot = evd3.(suffix of libevdocument3)-evv3.(suffix of libevview3)
 SLOT="0/evd3.4-evv3.3"
 IUSE="djvu dvi gstreamer gnome gnome-keyring +introspection nautilus nsplugin postscript spell t1lib tiff xps"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
 
 # atk used in libview
 # bundles unarr
diff --git a/app-text/evince/evince-3.32.0.ebuild b/app-text/evince/evince-3.32.0.ebuild
index b1965cc88ea6..0211917c6847 100644
--- a/app-text/evince/evince-3.32.0.ebuild
+++ b/app-text/evince/evince-3.32.0.ebuild
@@ -14,7 +14,7 @@ LICENSE="GPL-2+ CC-BY-SA-3.0"
 # subslot = evd3.(suffix of libevdocument3)-evv3.(suffix of libevview3)
 SLOT="0/evd3.4-evv3.3"
 IUSE="djvu dvi gstreamer gnome gnome-keyring +introspection nautilus nsplugin postscript spell t1lib tiff xps"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
 
 # atk used in libview
 # bundles unarr
diff --git a/app-text/fdftk/Manifest b/app-text/fdftk/Manifest
deleted file mode 100644
index 94240fd8df84..000000000000
--- a/app-text/fdftk/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST FDFToolkitForUnix.tar.gz 5725906 BLAKE2B 800ff670744bcbb9673db6edbb1d35e0c530fed5374da26520152b257c83abda3588886d6bac787701e767c5ae0651341804468b2a744bb466b525338a7ae899 SHA512 835438c5031464c169543d42a512ad691824dcea6d7f38e746bbe778adc9511eaa15c49ac2d4b3a92e4f831275e16a409e9e1e275983fb70309559ecdf686a66
-EBUILD fdftk-6.0-r1.ebuild 1454 BLAKE2B 65dd7cfba64b9fc947a3d29a31d3c71bc095ea20c8fd9f8f3bcf548192b17ae8cdc3f8f606801548fe369759fdc1e9fc5defe4d850d1667a065ea3c3ae79ca49 SHA512 72fa953ea7035e6cb4e34c1547d85704db57cdb21d86cd7514156f13d3da0d469f7c14d59269a4568b312c773e3b45120befef0165b1d6e983cf4ffad0f5ff8b
-MISC metadata.xml 324 BLAKE2B d19168d873a621db4923cb020f10b8c7c52a0f4c336155a834921391dc7209b25ac89abdb16e49f1494deb8bc46d27c71922cd592b2d9aa924d0b4aeeb016c12 SHA512 73461851a2949c275eeb920052d972a17c5f687eeabc7453614289cc1fa05b4c2ae9a40a2bcf5b767b564c8ce93e24b7a619e71ab706424a9e0990a30ad28959
diff --git a/app-text/fdftk/fdftk-6.0-r1.ebuild b/app-text/fdftk/fdftk-6.0-r1.ebuild
deleted file mode 100644
index d4f4935a36bf..000000000000
--- a/app-text/fdftk/fdftk-6.0-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-MY_P="FDFToolkitForUnix"
-At="${MY_P}.tar.gz"
-
-DESCRIPTION="Acrobat FDF Toolkit"
-HOMEPAGE="http://www.adobe.com/devnet/acrobat/fdftoolkit.html"
-SRC_URI="${At}"
-
-SLOT="0"
-LICENSE="Adobe"
-KEYWORDS="-* x86" # binaries for i386 type hardware ONLY
-RESTRICT="fetch strip mirror"
-
-#DEPEND="
-#		perl? ( dev-lang/perl )"
-IUSE=""
-
-S=${WORKDIR}/${MY_P}
-
-pkg_nofetch() {
-	einfo "1. Visit ${HOMEPAGE}"
-	einfo "2. Review EULA"
-	einfo "3. Download ${At}"
-	einfo "4. Move ${At} to your DISTDIR directory"
-}
-
-src_unpack() {
-	if [ ! -r ${DISTDIR}/${At} ]; then
-		eerror "cannot read ${At}. Please check the permission and try again."
-		die
-	fi
-	unpack ${At} || die
-}
-
-src_install () {
-	into /opt/${P}
-	dolib.so "Headers and Libraries/LINUX/libFdfTk.so" || die
-	insinto /opt/${P}/include
-	doins "Headers and Libraries/Headers/FdfTk.h" || die
-	# It doesn't support Perl 5.8.*
-	#if use perl; then
-	#	eval `perl '-V:package'`
-	#	eval `perl '-V:version'`
-	#	eval `perl '-V:archname'`
-	#	insinto /usr/lib/${package}/vendor_perl/${version}/Acrobat
-	#	exeinto /usr/lib/${package}/vendor_perl/${version}/${archname}/auto/Acrobat/FDF
-	#	doexe "Headers and Libraries/LINUX/FDF.so" || die
-	#	doins "Headers and Libraries/Headers/FDF.pm" || die
-	#fi
-
-	into /usr
-	dodoc ReadMe.txt Documentation/*.pdf
-
-	dodir /etc/env.d
-	echo "LDPATH=/opt/${P}/lib" >${D}/etc/env.d/55${P}
-}
diff --git a/app-text/fdftk/metadata.xml b/app-text/fdftk/metadata.xml
deleted file mode 100644
index f93818d4dfc6..000000000000
--- a/app-text/fdftk/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="person">
-  <email>robbat2@gentoo.org</email>
-</maintainer>
-<maintainer type="project">
-  <email>tex@gentoo.org</email>
-  <name>Gentoo TeX Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-text/freepwing/Manifest b/app-text/freepwing/Manifest
deleted file mode 100644
index 04962f61d613..000000000000
--- a/app-text/freepwing/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST freepwing-1.4.3.tar.gz 129499 BLAKE2B d21e6a6e84fff368a6b483dfe68d46f0955ba234e924a7b7c1b50d4124404c3a274d9a6dbe439cc476e9eb146d1c9039ede7b47488b7a7e514a0ca0915f288a9 SHA512 e363d2751410d6e39e786920faf63c4efee74e5004594f95157f700eb3a68a92a9e98635978f21f5da60f7bd9e1a3b4049f90c7b9da0b4bb0374081ab6738734
-EBUILD freepwing-1.4.3.ebuild 574 BLAKE2B ee43c2269cdae54c4129b8df7e9d0d162a699273b79374c3b6988476891d6a4fc7469f4cfe246a70eae6ced27e8051b48927585b6ef3aa9abceb71abb4512370 SHA512 1fff03f46f665315ab53cc7b9657673c9481b54eed63adefc5f3a86e085561411b563c29ab10489ff99a51808ac492c7b326b6a992d1f8bac7098794f936e05c
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-text/freepwing/freepwing-1.4.3.ebuild b/app-text/freepwing/freepwing-1.4.3.ebuild
deleted file mode 100644
index 4e5d4445ce6a..000000000000
--- a/app-text/freepwing/freepwing-1.4.3.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-IUSE=""
-
-DESCRIPTION="FreePWING is a free JIS X 4081 (subset of EPWING V1) formatter"
-HOMEPAGE="http://www.sra.co.jp/people/m-kasahr/freepwing/"
-SRC_URI="ftp://ftp.sra.co.jp/pub/misc/freepwing/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86"
-
-DEPEND="dev-lang/perl"
-
-src_install() {
-	emake install DESTDIR="${D}" \
-		perllibdir=`perl -V:vendorlib | cut -d\' -f2` \
-		pkgdocdir=/usr/share/doc/${PF} || die
-
-	dodoc AUTHORS ChangeLog INSTALL NEWS README
-}
diff --git a/app-text/freepwing/metadata.xml b/app-text/freepwing/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/app-text/freepwing/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/app-text/ghostscript-gpl/Manifest b/app-text/ghostscript-gpl/Manifest
index ee9481afd722..661374940e72 100644
--- a/app-text/ghostscript-gpl/Manifest
+++ b/app-text/ghostscript-gpl/Manifest
@@ -1,4 +1,7 @@
 DIST ghostscript-9.26.tar.xz 33059724 BLAKE2B 7ccb9730db8ae056e67bf8d7fa097a4cb529605e12214ab81253d2d354d26c24e393c8bec2ecdb51a1fefe8443b8af47758705c2fb6b1dab59932140c5de07ca SHA512 3ddb83029edf32282357bf606f4045a9ac73df6543cd423cfad09158ec12ada083a0dbb5aac3b73ae24cbc6c1e9d7574257a5c1fae63ba8776fbb00150ef2a3e
+DIST ghostscript-9.28rc4.tar.xz 34608244 BLAKE2B f659b73d88b14f07e2c5b0ece7bc8dff5f9daf831a6da3f37e9613b00799929fb505c5ce7b98f181f617f2a2744b7abcf8be770b2ca0bb8389c439934541432b SHA512 a73dda81de96d93c1cdcc712356b1e06349d0e35af3db726b3581e5e1289cb656db52426f2aefa699c8fb137d0058e7a1238f54f0d2165f0c7ca86c96eb42fbc
 DIST ghostscript-gpl-9.26-patchset-1.tar.xz 3716 BLAKE2B 0a4c32b3d0c0152b0dc7c62bf2b0bc8e30a369c2aed7c7be4a231948123c2242ce96ae5b1fd485bdae84d7cde1be9f3b3a16831fe77dfbc7ac6cd28bb5e14442 SHA512 7ad9558b00cc11d0872b32d2f1430d2e47730a2360c79d88299c87f8d6d4c15adb5c679ebdcaf50c58d9051c6a1d6f6873e4d81aadfbf3ce202ad94b6dc8981f
-EBUILD ghostscript-gpl-9.26.ebuild 5150 BLAKE2B 24cd87418056e9ebc8505d87ad0046d158126f3c0eb66a1895ac89ad88075fdf8820d2f9f09d6ae06f2635610131f74647c250bac9dd0de608888ea761d96376 SHA512 6bc420cff6e84d3db7fd7fc860d34c00ae1366586f458fc636539595b8d18961ce79cfce0e66198faa44590b4ca770b0ad05ea10fde497279b4ad9bd78b53c92
+DIST ghostscript-gpl-9.28-patchset-2.tar.xz 2560 BLAKE2B 137b6a817c9773f723e3533635866cdb0aef53fe957d432cc86ad314b0e972cba8aab4eec27fcb2e16972158f9b5692288d7e783398b5a5900a9f835a1d62eba SHA512 52c14d15a3cdda9c19102e25a10c5c5f57352414124bb4fb2b803e89b34bddf9ab6fc83e343619e4ff98f707f0b4acea6806419882ebe1d18e3486a8ff975526
+EBUILD ghostscript-gpl-9.26.ebuild 5128 BLAKE2B 30304f954fbef282379ad86802d4aa3ce2c8c5964ea9e63c3bf57c8d0b4896e59b3b02f2238aabc5ff4d90a96e0da3b01b16e42420e89670cf84f1181b0edfab SHA512 0d626ed577c443f1628b5f8f99672d27799c32ac83a73c6f2b3f3f3c1f92888bf24279ba7bca161552e5cc8f51de2d3ebc450beb6b724ad65329d4495bad273d
+EBUILD ghostscript-gpl-9.28_rc4-r1.ebuild 5292 BLAKE2B 4cdccc4d4bdea5d9c00b6e05cfb2987a0e5f45b2c424f053b9ce197f2c74eb2f7ba1e8aa9b928f49377cc3e4ad471d84a0e27ad24d92c365c2ce3a824b362f74 SHA512 4e6b797b050e2ed9eeaf98f3e7a5c18b86ebc14113ebe1fae3c55335b69b0ee8e7c6503cc94e412d6157ff356ce28cb00e1839ece36c0f11c1fa73edb3d6c003
 MISC metadata.xml 583 BLAKE2B cc9bd976a53f467582f4657d0f08862454c53783d1eeedf90dfe9fab7e074a8903a48632b03847e4aeba4d9f6cf821ebda120c1de1e64740641e4849278646a8 SHA512 3de9e76a9a3b6fff971d0760b3590a60448014268f45faa742327a90b1cd8c40eae1426026cda590dd9f91c96580eabbba85125c88ed250479b8df675f45bb15
diff --git a/app-text/ghostscript-gpl/ghostscript-gpl-9.26.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-9.26.ebuild
index 51a818491724..26e38ef9fc25 100644
--- a/app-text/ghostscript-gpl/ghostscript-gpl-9.26.ebuild
+++ b/app-text/ghostscript-gpl/ghostscript-gpl-9.26.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="AGPL-3 CPL-1.0"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86"
 IUSE="cups dbus gtk l10n_de static-libs tiff unicode X"
 
 LANGS="ja ko zh-CN zh-TW"
diff --git a/app-text/ghostscript-gpl/ghostscript-gpl-9.28_rc4-r1.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-9.28_rc4-r1.ebuild
new file mode 100644
index 000000000000..07b9d80dcbfa
--- /dev/null
+++ b/app-text/ghostscript-gpl/ghostscript-gpl-9.28_rc4-r1.ebuild
@@ -0,0 +1,200 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic toolchain-funcs
+
+DESCRIPTION="Interpreter for the PostScript language and PDF"
+HOMEPAGE="https://ghostscript.com/"
+
+MY_PN=${PN/-gpl}
+MY_P="${MY_PN}-${PV/_}"
+PVM=$(ver_cut 1-2)
+PVM_S=$(ver_rs 1-2 "")
+
+MY_PATCHSET="ghostscript-gpl-9.28-patchset-2.tar.xz"
+
+SRC_URI="https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs${PVM_S}/${MY_P}.tar.xz"
+if [[ -n "${MY_PATCHSET}" ]] ; then
+	SRC_URI+=" https://dev.gentoo.org/~whissi/dist/ghostscript-gpl/${MY_PATCHSET}"
+fi
+
+LICENSE="AGPL-3 CPL-1.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="cups dbus gtk l10n_de static-libs tiff unicode X"
+
+LANGS="ja ko zh-CN zh-TW"
+for X in ${LANGS} ; do
+	IUSE="${IUSE} l10n_${X}"
+done
+
+DEPEND="
+	app-text/libpaper
+	media-libs/fontconfig
+	>=media-libs/freetype-2.4.9:2=
+	>=media-libs/jbig2dec-0.16
+	>=media-libs/lcms-2.6:2
+	>=media-libs/libpng-1.6.2:0=
+	>=media-libs/openjpeg-2.1.0:2=
+	>=sys-libs/zlib-1.2.7
+	virtual/jpeg:0
+	cups? ( >=net-print/cups-1.3.8 )
+	dbus? ( sys-apps/dbus )
+	gtk? ( || ( x11-libs/gtk+:3 x11-libs/gtk+:2 ) )
+	unicode? ( net-dns/libidn:0= )
+	tiff? ( >=media-libs/tiff-4.0.1:0= )
+	X? ( x11-libs/libXt x11-libs/libXext )
+"
+BDEPEND="virtual/pkgconfig"
+RDEPEND="${DEPEND}
+	app-text/poppler-data
+	>=media-fonts/urw-fonts-2.4.9
+	l10n_ja? ( media-fonts/kochi-substitute )
+	l10n_ko? ( media-fonts/baekmuk-fonts )
+	l10n_zh-CN? ( media-fonts/arphicfonts )
+	l10n_zh-TW? ( media-fonts/arphicfonts )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	if [[ -n "${MY_PATCHSET}" ]] ; then
+		# apply various patches, many borrowed from Fedora
+		# http://pkgs.fedoraproject.org/cgit/ghostscript.git
+		eapply "${WORKDIR}/patches/"*.patch
+	fi
+
+	default
+
+	# remove internal copies of various libraries
+	rm -r cups/libs || die
+	rm -r freetype || die
+	rm -r jbig2dec || die
+	rm -r jpeg || die
+	rm -r lcms2mt || die
+	rm -r libpng || die
+	rm -r tiff || die
+	rm -r zlib || die
+	rm -r openjpeg || die
+	# remove internal CMaps (CMaps from poppler-data are used instead)
+	rm -r Resource/CMap || die
+
+	if ! use gtk ; then
+		sed -e "s:\$(GSSOX)::" \
+			-e "s:.*\$(GSSOX_XENAME)$::" \
+			-i base/unix-dll.mak || die "sed failed"
+	fi
+
+	# Force the include dirs to a neutral location.
+	sed -e "/^ZLIBDIR=/s:=.*:=${T}:" \
+		-i configure.ac || die
+	# Some files depend on zlib.h directly.  Redirect them. #573248
+	# Also make sure to not define OPJ_STATIC to avoid linker errors due to
+	# hidden symbols (https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=203327#c1)
+	sed -e '/^zlib_h/s:=.*:=:' \
+		-e 's|-DOPJ_STATIC ||' \
+		-i base/lib.mak || die
+
+	# search path fix
+	# put LDFLAGS after BINDIR, bug #383447
+	sed -e "s:\$\(gsdatadir\)/lib:@datarootdir@/ghostscript/${PVM}/$(get_libdir):" \
+		-e "s:exdir=.*:exdir=@datarootdir@/doc/${PF}/examples:" \
+		-e "s:docdir=.*:docdir=@datarootdir@/doc/${PF}/html:" \
+		-e "s:GS_DOCDIR=.*:GS_DOCDIR=@datarootdir@/doc/${PF}/html:" \
+		-e 's:-L$(BINDIR):& $(LDFLAGS):g' \
+		-i Makefile.in base/*.mak || die "sed failed"
+
+	# remove incorrect symlink, bug 590384
+	rm ijs/ltmain.sh || die
+	eautoreconf
+
+	cd ijs || die
+	eautoreconf
+}
+
+src_configure() {
+	local FONTPATH
+	for path in \
+		"${EPREFIX}"/usr/share/fonts/urw-fonts \
+		"${EPREFIX}"/usr/share/fonts/Type1 \
+		"${EPREFIX}"/usr/share/fonts \
+		"${EPREFIX}"/usr/share/poppler/cMap/Adobe-CNS1 \
+		"${EPREFIX}"/usr/share/poppler/cMap/Adobe-GB1 \
+		"${EPREFIX}"/usr/share/poppler/cMap/Adobe-Japan1 \
+		"${EPREFIX}"/usr/share/poppler/cMap/Adobe-Japan2 \
+		"${EPREFIX}"/usr/share/poppler/cMap/Adobe-Korea1
+	do
+		FONTPATH="$FONTPATH${FONTPATH:+:}${EPREFIX}$path"
+	done
+
+	PKGCONFIG=$(type -P $(tc-getPKG_CONFIG)) \
+	econf \
+		--enable-dynamic \
+		--enable-freetype \
+		--enable-fontconfig \
+		--enable-openjpeg \
+		--disable-compile-inits \
+		--with-drivers=ALL \
+		--with-fontpath="$FONTPATH" \
+		--with-ijs \
+		--with-jbig2dec \
+		--with-libpaper \
+		--without-luratech \
+		$(use_enable cups) \
+		$(use_enable dbus) \
+		$(use_enable gtk) \
+		$(use_with cups pdftoraster) \
+		$(use_with unicode libidn) \
+		$(use_with tiff system-libtiff) \
+		$(use_with X x)
+
+	cd "${S}/ijs" || die
+	econf \
+		--enable-shared \
+		$(use_enable static-libs static)
+}
+
+src_compile() {
+	emake so all
+
+	cd ijs || die
+	emake
+}
+
+src_install() {
+	emake DESTDIR="${D}" install-so install
+
+	# move gsc to gs, bug #343447
+	# gsc collides with gambit, bug #253064
+	mv -f "${ED}"/usr/bin/{gsc,gs} || die
+
+	cd "${S}/ijs" || die
+	emake DESTDIR="${D}" install
+
+	# rename the original cidfmap to cidfmap.GS
+	mv "${ED}/usr/share/ghostscript/${PVM}/Resource/Init/cidfmap"{,.GS} || die
+
+	# install our own cidfmap to handle CJK fonts
+	insinto /usr/share/ghostscript/${PVM}/Resource/Init
+	doins \
+		"${WORKDIR}/fontmaps/CIDFnmap" \
+		"${WORKDIR}/fontmaps/cidfmap"
+	for X in ${LANGS} ; do
+		if use l10n_${X} ; then
+			doins "${WORKDIR}/fontmaps/cidfmap.${X/-/_}"
+		fi
+	done
+
+	# install the CMaps from poppler-data properly, bug #409361
+	dosym ../../../poppler/cMaps "/usr/share/ghostscript/${PVM}/Resource/CMap"
+
+	if ! use static-libs; then
+		find "${ED}" -name '*.la' -delete || die
+	fi
+
+	if ! use l10n_de; then
+		rm -r "${ED}"/usr/share/man/de || die
+	fi
+}
diff --git a/app-text/gnome-doc-utils/Manifest b/app-text/gnome-doc-utils/Manifest
index 7dcb92ada6d6..991689e54f0d 100644
--- a/app-text/gnome-doc-utils/Manifest
+++ b/app-text/gnome-doc-utils/Manifest
@@ -1,4 +1,4 @@
 AUX gnome-doc-utils-0.20.10-fix-out-of-tree-build.patch 2101 BLAKE2B f1970ffe2cf1d369ffc3f3a5a6abea2f04fb32cfdc54dde9052ef468c2a274db2318495c80ec1ef0048fb65df8209bacb86392d9ff594fdc60ea92ebb85584ab SHA512 25cff56b05bf4ec0ca55a6fcab1700bd6bec9f60a923e14607fd894bd9b63cd669a4e3e9b7bacc0480e040e393370be05f237ea21074cb439a3cf176be0dd78c
 DIST gnome-doc-utils-0.20.10.tar.xz 526700 BLAKE2B 6019aa9b1d2c8153ddc1e6af589f79628ceafb6c14b0de5dc8f9ef518b5e626bbafdc2a4d93bfb70c6823ba0605a5abe899989e9f893c976d7a5fcd9c99a90dc SHA512 1cb5e3b9ca9e45e6c551801e9c9c4aac725c2ce85238c230a4c70b36c90419886b921d8dd464df0643fc3bbb877df075abaa83a36d1609c5664960c31e11d151
-EBUILD gnome-doc-utils-0.20.10-r1.ebuild 1767 BLAKE2B 235efe543fd6d785221578094b73f9a7aa2773e3833825141d6a68455bfb164c7005963563db4445833b3ee6b5ee9e3f0272e5411926b1cf5bd95f2f9453bb00 SHA512 0b968123c33ebdbf84d4b9966a12714ee8c2ce5a1b8b2da3b8135ba068505f24f52fea1e9f67a36fa6a730d94103d437e9a7c5fb8b86f6d459bb507d049b9824
+EBUILD gnome-doc-utils-0.20.10-r1.ebuild 1745 BLAKE2B e07cdad251d540fde141223a257f9b8afd30054119cb5fc76292b45f50a7903f4d396e701c958dd90c198806d82310c9b02d2fde2375392cf07dd5e371a04f9d SHA512 11920ebfad4a4512e03e5d7da7906e4211220a39a2219ba896c87378ba2d1d4dd24d5f628857379b24e995770069f552cd8f9e92afad333091c594da9d1e7bb4
 MISC metadata.xml 259 BLAKE2B 32f8c5208a55a1dda504b7df969127393a2c70e672aba383fcdc870de8fe778366d3dde3c3313bd043068d2e7831d1e18bad6fb428e82266fc2a630104e0a193 SHA512 fbef629394690b3a5608abc6344816f6acf1e8e2663f29949fd14a662c628f16fee77a1ec1641066806d143fb94c1571bc5b46b829dc53620af6956377fe15cc
diff --git a/app-text/gnome-doc-utils/gnome-doc-utils-0.20.10-r1.ebuild b/app-text/gnome-doc-utils/gnome-doc-utils-0.20.10-r1.ebuild
index 132d14159a00..95f1de3c4603 100644
--- a/app-text/gnome-doc-utils/gnome-doc-utils-0.20.10-r1.ebuild
+++ b/app-text/gnome-doc-utils/gnome-doc-utils-0.20.10-r1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GnomeDocUtils"
 
 LICENSE="GPL-2 LGPL-2.1"
 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 ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/app-text/grutatxt/Manifest b/app-text/grutatxt/Manifest
index 34174bf9e891..0bd3812bb67e 100644
--- a/app-text/grutatxt/Manifest
+++ b/app-text/grutatxt/Manifest
@@ -1,3 +1,3 @@
 DIST Grutatxt-2.0.16.tar.gz 29929 BLAKE2B 11ed6a87884ed79e6f8705f6ed8ee94c2fa79e6867296eaf6255ed7f9473a99d5fce0dec0d29de16df2a15959b6593dcba7937b3f8cda88ee88072abefb0f01c SHA512 bf5203308d0fb4baea9b161ac3374116f7cd60de3d43e8699f90626aa3f67354d2ff304ab8d45ae6368add31777b4e56a7a4d944137aa5d3687dd457c71a8512
-EBUILD grutatxt-2.0.16-r1.ebuild 640 BLAKE2B 13f90c05ffa575e6e2264dfcdf3b01e6895f9d6256221e0b10b5d220adddbbdf3b91b16025a756b2c03d4b04fbc42937c09718af72164719643ce226e6db65f5 SHA512 4b97945428ebb6f093f437464a90471b49800c8c8048e4dd8401ba91c88ce80decc694dc647477d175ba80ebf00109acf2c5b2ed9d058331e78e96ec3c98a6aa
+EBUILD grutatxt-2.0.16-r1.ebuild 606 BLAKE2B c8edc7d139c9eb15339f933050762c5085cf3c60ece86734873976abdaef039e6a1f929621b2ca942fb03809c7be2c221bd04d799289c6bd4f874bdf764bbbbb SHA512 7e8e0ef1a2ab24a13bf08b744d3bde1138c8da073be28ecacf00d47d7fc7e60187ed15f7e8a3b73365a75e76993cac043e82574bda9975543b61939abbedfe2c
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-text/grutatxt/grutatxt-2.0.16-r1.ebuild b/app-text/grutatxt/grutatxt-2.0.16-r1.ebuild
index 665c38e090d3..1509ebcd6dcb 100644
--- a/app-text/grutatxt/grutatxt-2.0.16-r1.ebuild
+++ b/app-text/grutatxt/grutatxt-2.0.16-r1.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-GENTOO_DEPEND_ON_PERL_SUBSLOT=yes
-inherit perl-app
+inherit perl-module
 
 MY_PN="Grutatxt"
 MY_P=${MY_PN}-${PV}
diff --git a/app-text/gspell/Manifest b/app-text/gspell/Manifest
index 0642fa4a936f..5fe6a4e11b46 100644
--- a/app-text/gspell/Manifest
+++ b/app-text/gspell/Manifest
@@ -1,5 +1,5 @@
 DIST gspell-1.6.1.tar.xz 416704 BLAKE2B 2a180bc52d3f09813d8de362e5bf900f831663c09530c8a9b993baf55f852a3939447a71c9c9dc0caafba7e8b74a2a5aad4443cf248eb87da4e15e0481e74262 SHA512 f1ffbd0d23d9743bcf924c25b3a3d7bf93c6a5e4ea5e362fb7300f657d8c1d0117e847f3dec29de377947f850e003b24a3231e88e99b313c955dd94ce358c23e
 DIST gspell-1.8.1.tar.xz 419268 BLAKE2B f32c9c518c23f8f560d65eb6fb122703561cc09e385eefa99d0761e8aa5b5bf3a8cec3cab7071043134314262979de56d08ee2929973b7968016b123e53d8f16 SHA512 ae94f46c7bdcdeefa0279cd4ac3c50e53b63092016e298ef6b502c40c2574a2135c503ab322f5a3a7b8b4422fdec291a6ed0c937683a8c0f32d7ad474cc1569b
-EBUILD gspell-1.6.1.ebuild 1039 BLAKE2B d79904f97cf3f8d312c6a776267e189515e194b87f253357c82004f4ac4cfa12359faec8c5fd020e172f74159f1e7da356f11e4a4cac7cd76ce6c7fa688b7ad7 SHA512 6785c2c1d0fedd3c9fcdadc4d322f2272ba590ec609c4a9ee84c896489b271d9d355c7c1336e84cd052bbfc4d7d409b54c4293b5832c0b849f410ec2c80e82b8
-EBUILD gspell-1.8.1.ebuild 1031 BLAKE2B 992514f9524848dc3e3c78715b7b030487152ee6b6d65c2ac8924bd9dfa8e0c2a4b5cdb104a723e35b16919307281cc7e234a1c27f11f0df9a9fa2e294559622 SHA512 4e9055dc20476b1291a108a2a779a4c94cea377be2ff7519853cae22950b6e88f468ce7ad377dee7abefd9ac021caa22a9648d83c996535f9e82c252091f800b
+EBUILD gspell-1.6.1.ebuild 1027 BLAKE2B 4981651ab7e910ffef4d963cffc37f527325cf7d98d6ce5d60b40526fcdd97da22587670f7b99385d13c0b6b6a6045d5288ee299cb02cacab09f46f38288e0d3 SHA512 760314be43139d7de2f670677681953372ad77e990f9102a42ae788966482fcd5dbcb64b68fa83f01b74eaeaabfe5d8d021f01e73c37cecb96ba4e6c57ff51c0
+EBUILD gspell-1.8.1.ebuild 1019 BLAKE2B d134214c4050a378e9ee58931edb6ee4b582e581875e4b1d27e0c0498abcd0774a56eb5631cf6131c3f8e9bb773e8aac6cf83cbb78b8516fa628a3acd37cc522 SHA512 d5a09cbd8e08f4d47839bee3b35c842d915aa0278ada9aad3782456bc9478446b4f4ba1fa2421a942a8933d0fc3a221ab24eed8be201f3322b097bcf975b2bce
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/app-text/gspell/gspell-1.6.1.ebuild b/app-text/gspell/gspell-1.6.1.ebuild
index 93c3d40003f4..2258eb9a0e38 100644
--- a/app-text/gspell/gspell-1.6.1.ebuild
+++ b/app-text/gspell/gspell-1.6.1.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 arm64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ppc ~ppc64 ~sparc x86"
 
 IUSE="+introspection vala"
 REQUIRED_USE="vala? ( introspection )"
diff --git a/app-text/gspell/gspell-1.8.1.ebuild b/app-text/gspell/gspell-1.8.1.ebuild
index 18dcf94ede51..29b5aa6fd9fe 100644
--- a/app-text/gspell/gspell-1.8.1.ebuild
+++ b/app-text/gspell/gspell-1.8.1.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 ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
 
 IUSE="+introspection vala"
 REQUIRED_USE="vala? ( introspection )"
diff --git a/app-text/gtkspell/Manifest b/app-text/gtkspell/Manifest
index 66ea24af34bd..e5fe7b71a9b2 100644
--- a/app-text/gtkspell/Manifest
+++ b/app-text/gtkspell/Manifest
@@ -1,7 +1,7 @@
 DIST gtkspell-2.0.16.tar.gz 351277 BLAKE2B ccb49b99c4f9059ed4461bb5ffda4dbeb691c5a062184ba7b51d8464d2461c5be0d648e4f69dbc36fe345be2addbc271af9701a0a387975265585dd3a7926e99 SHA512 7d3afb327c2e15608194e6ee6110107a0ce082e483788d831d636b2e579472304137373c09a966d8e5c0cd2f830bf2e0ee477c9b5fca7da6ee27fd1498915b9d
 DIST gtkspell3-3.0.10.tar.xz 300968 BLAKE2B aa167e9e5068e9c6c5fcf6933a28246de0be8386be43ab3af80a45dfbc092e1381503822d09742d20dde2e0b8dae77210001c955e37a8dab263b832ee52675a1 SHA512 3b1ceaa9ffa06bd3f6dae39c95db951588e5cf2edf4f551cac6972822ba230af3415c5045fa24f7a4dfe05c2e386ab3f67cb80cb779576b4e54293b7b9fbc28e
 DIST gtkspell3-3.0.9.tar.xz 298988 BLAKE2B 01a824ba91fff1739046134ef0025cf894ed3f524dcc96a11ba6b23def3b1d84ef66fc5dbf37c1a047d23b276b944b25e89ff6a84ebfe19a1189ccc59d230250 SHA512 de6cc24ca092067a101996142bf2b3cfb6a5af2170ea4b0185a997e5c88adead7ba53c5a297c3110b3a66dc87d37e429720f972895bb2931f9a033fc006e2eab
-EBUILD gtkspell-2.0.16.ebuild 938 BLAKE2B f2a2175ecad0ca990af6df61d200572067ce05b5d0b537516a71f8618baccceddacb60bef6a5b0e059127b778da0a4225015323244a7b42257385ed3e884732e SHA512 ebc9c788eedd9370a8610dbf02eb253d3cdfd0f481489d17af79c9240a3ad5060b7082e30a55cfc08612dfef7f8730ce5481e233ffcecd17bd3ecc73a08d01fb
-EBUILD gtkspell-3.0.10.ebuild 1083 BLAKE2B d3c1703d91a7266167ea274f0ed611e0d4944e334dfa7458de9caaa642e61b23cb87bfce7e335441a9343f70afb56d8a83e57eed21a6530977d8d4856047ebf2 SHA512 495cea201fc44dbffae9978dc1b1f1acc1645af542627d5e7f6ed8881961af3e4266938c996ab7de7b41ba357a119c1f41c737fa1739262fec6dc4c987570c8f
-EBUILD gtkspell-3.0.9.ebuild 1076 BLAKE2B ccd5af100eb027832135ec7eb65c91989496caa8f8d561e62cbc1ebde31c75a841a0288f12de7af876351c52a55d9de3590946ea34f45283590d5a277b1fff3f SHA512 e3313e828ff7d76e039113c6dee9dbcc220ae6c4751f39340f685451ccfeb96c0c20adeb75265125db6265b9b1c79ec3ec4d960b9c0522223489da9edda4bd22
+EBUILD gtkspell-2.0.16.ebuild 928 BLAKE2B 33f64b64cc8dba2cae0e1482b2b727bc93652dab216fa835724c7d90c879626813ba666f6c5844b56920e4dd69936147d68c49f4ae6413e556e99145376c3309 SHA512 88a52df77ce6d7cde85ff6ff3eccada19979c288c3abaa67994a7aadd9f7d575c1aef356bfb4e4da4ee0748827b9b23a6e6c1397ef7e7a332f26b6781152ee6c
+EBUILD gtkspell-3.0.10.ebuild 1073 BLAKE2B 006313a3737900c99f1610b0eb5ef028e0e1be435de32e66fbe9127078694032e7b57ce24948b92136c0365fa5877b012f879d45b7dfcc3bdd5de4b879754770 SHA512 423b40803bae51080d22c9739a873ed448eb0396bc3876ee7a42a361b392b57a1c0311755879bb9e536562dd26f8f2726d7179bcf28667f578d555c3240a1f6f
+EBUILD gtkspell-3.0.9.ebuild 1066 BLAKE2B b839594d19911e619c8fe1e9d506e702f59191e90e91fe678d77c878938b7d1c6882211cd13618897d08bab43637c093db6d604e3da5030437638819fe378422 SHA512 3f508d14a63ede632cc91ca2894ed18732ab5a939e03c0cf6fe000f9ff07bad5019e07f525cee45d2692f67c065517c14fd974db61749ca6dbee2f7db95c2c35
 MISC metadata.xml 331 BLAKE2B 09488ce0a015e7f7321a4a72cf8b046c63a5497694736ea7d9450455f447be0a328bb5d6f607d86032cf1fa77ce3d204373dea048a5b089f0eb7b38c4626ddc3 SHA512 51f55422f9e5a13f8cff5ae6ed6e00f2be248ccd4b472c0d8519c73fcda34d19129fc3183d4c570480198f14468fd8b208ddab0c70df05431ab8470399221514
diff --git a/app-text/gtkspell/gtkspell-2.0.16.ebuild b/app-text/gtkspell/gtkspell-2.0.16.ebuild
index e3cea83f8f0b..4db14eabbaec 100644
--- a/app-text/gtkspell/gtkspell-2.0.16.ebuild
+++ b/app-text/gtkspell/gtkspell-2.0.16.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://${PN}.sourceforge.net/download/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="2"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND="x11-libs/gtk+:2
diff --git a/app-text/gtkspell/gtkspell-3.0.10.ebuild b/app-text/gtkspell/gtkspell-3.0.10.ebuild
index a8b3ddf550a8..1b3a6cedbaec 100644
--- a/app-text/gtkspell/gtkspell-3.0.10.ebuild
+++ b/app-text/gtkspell/gtkspell-3.0.10.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 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
 IUSE="+introspection vala"
 REQUIRED_USE="vala? ( introspection )"
 
diff --git a/app-text/gtkspell/gtkspell-3.0.9.ebuild b/app-text/gtkspell/gtkspell-3.0.9.ebuild
index 0c11422fc626..b3ba00b85791 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 arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
 IUSE="+introspection vala"
 REQUIRED_USE="vala? ( introspection )"
 
diff --git a/app-text/highlight/Manifest b/app-text/highlight/Manifest
index 57eb63d27cbd..841c70377c36 100644
--- a/app-text/highlight/Manifest
+++ b/app-text/highlight/Manifest
@@ -1,4 +1,4 @@
 AUX highlight-3.42-qmake-fix.patch 1051 BLAKE2B ad9436c010cb1f9b8db5a21234ec6b80ae73bf49cd165f99638c93b251a53db4918bc1fd70260a5a9310f9d28b86b25190ec5b21cda09b7f4138c3f39dc6088d SHA512 5f74b45995b953c815c9e820fbb73693f3f28927b5785fbc86537f55d2f411f9a6b420e45a4834babda54fddf44c1640bc32cc2cd35d3ec22be07781f05108fc
 DIST highlight-3.42.tar.bz2 1294770 BLAKE2B 22c79258be6a665eda8ee17d1de6a97811f97dc4b4491c24b466dc5375d98d865e07ac4e462288d066613bef8bb5a469fa0bdb3065ecf098fc6c4f6090ecb63e SHA512 362150ee396d2b203f11ecc3d011e23b6f8c7d93ff9f8cb0e9e980be6da21e7b3b1ea1e347e3f09129ab0fb1a0aab19ff19f021e643b93a163a99d3882f9bf80
-EBUILD highlight-3.42-r1.ebuild 2229 BLAKE2B 5dfc0539fe776aa6d365d66f620942162dbd971c744b5dd24f453c0262166fe321c4832fb3affe66d4a3dcbead78eb28ddd6906f23b693410f55b48ed64eca5b SHA512 41e82019318923740c0e955bca11ec1e82882f16288da280726030edd2cf7c0236baca0f082e3727fd8d94f073f5a52a2ce7e5e49eed4a5e39a703a48d92a944
+EBUILD highlight-3.42-r1.ebuild 2207 BLAKE2B 3956e9a1d15dbd8e6149196a92ddab36da675a2dd35a471fa525e645fb9a0e4fa854c7a87b467f9a652372d83baa745afcd207e4c9bb357295bcd76f331da665 SHA512 7bf01a705b0df549e856a61c50d0723d0f116ae0cddd5db16b8c935ae51634b51983d1f32c9b8616b7ea7b2537a75d35d32d66621ee0eae19cfc0b18fec262cf
 MISC metadata.xml 249 BLAKE2B 1b34ce77c092c0664a18f32525d158d41bf36ab7ab7a4b9d01ed37e1e3dda3d58849d5b1375065c4e5591f6b09b2a93e88a624d399c495a0b1125edb30ec172f SHA512 895325641a176c848988fb5f36cdb567b584d22f6e778b3de674de480cbca30b7cf8f12ecbbe1173a63e3229889e1e0f5efd5afea4f0d4c429ac236598f80f1e
diff --git a/app-text/highlight/highlight-3.42-r1.ebuild b/app-text/highlight/highlight-3.42-r1.ebuild
index 0309f3970645..1ba2fae9d484 100644
--- a/app-text/highlight/highlight-3.42-r1.ebuild
+++ b/app-text/highlight/highlight-3.42-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.andre-simon.de/zip/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="examples qt5"
 
 RDEPEND="
diff --git a/app-text/html401/Manifest b/app-text/html401/Manifest
index 66b01df5c11c..af6cc0ca8e3b 100644
--- a/app-text/html401/Manifest
+++ b/app-text/html401/Manifest
@@ -1,5 +1,5 @@
 AUX html401-decl.diff 468 BLAKE2B 4854afffaf01650a2c7997976a17d0e72e0fe71271047c362fa2956fa533035b5f2df4363c46c86fe39f3373357716d5913f5727644ecb91cbf65411bc697f42 SHA512 3f79a67c39f8c7a07b1bf0ec451620dd2ba1a8ee935751714262488bb50a5191c4f92362cd26f0438e0251d138d923ff2ebf6e216fbbbf8312c4010b7e3ce7e0
 DIST html40.tgz 369830 BLAKE2B c6fc0f65a9c65df34f534ce1db3cc53ba6ded4481df78f168c1b05b7e3b81fad7ddf3ee519ff1a901f0256af89285eefb39400ebc5b4089c1a16dfe935c6cf21 SHA512 f7423b55f8a5ad2806555700f450e1f46ba4370d1e47f1332e18b01ecd5a41217fc4426ad29c852b6e17100dc4c0a7add9961df35e87660df0e087ad03e4918e
 EBUILD html401-19991224-r3.ebuild 767 BLAKE2B fb6c509178154e010191683b1b3a26449b3136e6e662b9033134314b7587ba69c2583046366e1d7b0cead226dd2e6e3f24e1ba97eb4270a15080d4fa3086164f SHA512 f1669367c90b57b5d53e296736e511fc84561532d61f58caf6b7d76064ec178dcda9b0b02f6f27467c2e0f50059e0cfa37ba78edd6fd0841dbd4eb5d4d296e4b
-EBUILD html401-19991224-r4.ebuild 1017 BLAKE2B cbb31ff474de0924c3510f3b06d523e1267e55304ec5730638e37bdf385afa2e39d76a3824dc977c7f8f000b9e494a78fe6511c3602e46c5bdb010f1fb2428a1 SHA512 93b025ee50c796f3ca39ca956da27d98b02437537480e74eb01009e823dc7ad394a39299a7492a6dbfc703adfde1070241235da8e0a01ebfe3b322fde8022d09
+EBUILD html401-19991224-r4.ebuild 1016 BLAKE2B 03cb9724820f19bb17c6c05d33dc17f779a50a3b34a3e0d54b51176d8827a8db6807ecc8aba76ef5e3141dd26ccf3bc88ffae15094fba7dc2c33eab4f007c287 SHA512 31831d84796d041e71d4f0da9546675f9ab384b3a67710633e980c0fb389c682ed874e0b188f00e38746d9d433cfa246484e25cf4c35c4d0ecafe2ba2cc3bb92
 MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/app-text/html401/html401-19991224-r4.ebuild b/app-text/html401/html401-19991224-r4.ebuild
index 2456ff58ee72..ff2fce81fca2 100644
--- a/app-text/html401/html401-19991224-r4.ebuild
+++ b/app-text/html401/html401-19991224-r4.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.w3.org/TR/html401/html40.tgz"
 
 LICENSE="W3C"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~s390 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ~ppc ~s390 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""
 
 S=${WORKDIR}
diff --git a/app-text/htmlinc/Manifest b/app-text/htmlinc/Manifest
index 8b5fc2c7c37d..93db7482d33a 100644
--- a/app-text/htmlinc/Manifest
+++ b/app-text/htmlinc/Manifest
@@ -1,5 +1,5 @@
 AUX htmlinc-1.0_beta1-fix-build-system.patch 768 BLAKE2B a9da434128aeb20a2151d38353b8b7ce5eaab8fa4e4b44b9f9c79a87a55ba63cb6a344f6328b9b2c439a530aaba1b5377844946b24def2b1b0ca62c7fb52a145 SHA512 78c386be5ca30e15c786ab882800a065fa785f4ea5d3683d4a703948d642945077e00cf59f724cf7dc4a533827102883dfdcbc799752130d41bc846da83ebcfb
 AUX htmlinc-gcc3-gentoo.patch 3601 BLAKE2B d268406b773c21cd2885d3f9b5e66ad0121493152a454811b5af1bb20e8ee857777374f2424d68ae9634c74d30d6e24a8d09779059c8fe4440db390259108e23 SHA512 f29d5c823fae27ef027002a8e075e105f028c8a4892d142c64d69af7bca52a63de4ca19aa0cf86acc67f772349472d2b04003c71257cf1b7464c9dee56d95afd
 DIST htmlinc-1.0_beta1.tar.gz 17042 BLAKE2B 07c9333599876c17846dec8d40c0eba31f1f9321cfa463e4c5dd2698a120c878c6b2d0e6593eb78d22a15fa5333e0fb26ed064a9cccf6b95641cd9a7e3a13a53 SHA512 2bdb7a5df4a8152d9a23f7b740995bd565e92998ef199cfb7d08b1f5e8ae4390c5179f78da71dfa4b7ce18a2a0bfe6002d465b0fa8d860a25afdec5eb4f3ee4c
-EBUILD htmlinc-1.0_beta1-r2.ebuild 603 BLAKE2B 39e1397f1c4c0a5cb03ef142e25574d264cc061b920f98e705b732ed29f9d72a6bf2c461df34bc361bbf20da6087f40227a626a49dc2a3a933db449dde558c14 SHA512 72fad342057ae06c1e1fa2025a04a96e37dcce8736120a37896bdf05db154f1a828041ed410bcc38bfcce1a4661d260c1a1b3d9434c5976fbd14e2cd46725218
+EBUILD htmlinc-1.0_beta1-r2.ebuild 587 BLAKE2B 9dd12c0b2cbaec3fdfb21ffe63de9487acbcedee0c06b31fb6b41f24b8965699581c813dd892a018f0dc8933644162d18e039733b431f9214d755f021ac5a995 SHA512 e643b5b2324d70fe8a2b9c485c3d41b8967229aea2aa80f5573b9b8a7399d708ea094f76e90806ca6056ab739f5fa04b762704e601e8c27b19630aec315e640f
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-text/htmlinc/htmlinc-1.0_beta1-r2.ebuild b/app-text/htmlinc/htmlinc-1.0_beta1-r2.ebuild
index a2d1afc50502..180d093a6ff0 100644
--- a/app-text/htmlinc/htmlinc-1.0_beta1-r2.ebuild
+++ b/app-text/htmlinc/htmlinc-1.0_beta1-r2.ebuild
@@ -7,7 +7,7 @@ inherit flag-o-matic toolchain-funcs
 
 DESCRIPTION="HTML Include System by Ulli Meybohm"
 HOMEPAGE="http://www.meybohm.de/"
-SRC_URI="mirror://gentoo/${PN}.tar.gz -> ${P}.tar.gz"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/app-text/htmltidy/Manifest b/app-text/htmltidy/Manifest
index fa5a2ae5b3d0..8d3da8fd142f 100644
--- a/app-text/htmltidy/Manifest
+++ b/app-text/htmltidy/Manifest
@@ -3,5 +3,5 @@ AUX htmltidy-20090325-tidyrc.patch 923 BLAKE2B 1ce5800a8991d37edb48d652c03525ce6
 AUX htmltidy-5.10.26-strip-O2-flag.patch 370 BLAKE2B 7c2a58a6a8c00460871278f59676d3b8b8077a7cf2fc1f65dc9ae2987e06d760c73177baa37a197eb0f45f3a5c09bc2030f556948cfd2470fabe2bd734527e3d SHA512 671a0ef17388fb39d5623e0dd2b8aa6c55c22d9f3ba8eea093ddea1234a2786ef983cbe9dd7002fe04b2986ae888458f4f44120c47aa34dc145d34d9db2f81d7
 DIST tidy-20090325-doc.tar.bz2 13319 BLAKE2B c55c5e10cdfbf0eb62685955cad24f628c21e612bd12c41018c139b3b93db95cc201888f6766d7f68f2d1c4d4cfb2cab25b668eff0d2d241462f4cf9b65e79e1 SHA512 0224d1f839f3829a9c879eba8a98ceee3b0c9f8bfe1721076859714428d534f492acd11e49992fccc2e45afd64d79067793c90f7af06d623ef89e7c16dfee35b
 DIST tidy-20090325.tar.bz2 382016 BLAKE2B 3373e94d54cfef866e701e2e258be821b8749dbbbc37b10e4e4e4ba6d7f5995676161ac11bc6a2497f5e02c3907f680fabe9ac6dec2f2365aeb39c03b9697e0a SHA512 daeab2c3dd7f1248a5dbc1585267a8fdb0be09a940b79c3e53c97051f692cf85ea9f0a267f37e1c877054b77efb836d422a1e7ff61b22b383a2d2ac08939b970
-EBUILD htmltidy-20090325-r2.ebuild 2003 BLAKE2B 43116843d4c9eaacdb91822247b6a96868654c87ee92f180fb7112e87644ab66a09d4e105c1e4f983e700708b46aafe3bec67168698e890a42a90042ca68ed80 SHA512 c16aa9a70389e21ba8260fc2118bc36889350d95fc53ea7350279f8fb70252182156cb21efdcd8c2b31181ef18e0e53a499859064cc73149cb6d60ed328ef09a
+EBUILD htmltidy-20090325-r2.ebuild 1981 BLAKE2B 7c067dc7b28f6996e567bfcaf53697213a8b3eb65342e8a3f1bf5c7fc261b48ca8be41769b823dbc39cd2e76edf3c7dcdc84166b3e126b3710eb4c28a9ea7fd7 SHA512 0503e5972fd2ce2d9ccc26619174061d423613db8027379524d2cf014b46d2d48faa11a4d5969f5eaa17676317164c2dc17c31359ac9e680f2f5aef8c23b95a5
 MISC metadata.xml 299 BLAKE2B 45af58b9f27f8329d072008a1089edae34741b855b1626cc56eb97efef684b316ce5573308ef1e73d4aa7e1cde74b0c10d5d7becee71707f5b3439f451a433ea SHA512 cd21089fbc56a2608734a5821826da373a5112e1676bf3c3481320236f5583ff1240e118e0021130625826c76cb426ca681e0dec3c6e4d2df22f8967da15321d
diff --git a/app-text/htmltidy/htmltidy-20090325-r2.ebuild b/app-text/htmltidy/htmltidy-20090325-r2.ebuild
index d3a18bca8cce..a47e38e16716 100644
--- a/app-text/htmltidy/htmltidy-20090325-r2.ebuild
+++ b/app-text/htmltidy/htmltidy-20090325-r2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://gentoo/${MY_P}.tar.bz2
 
 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-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="debug doc static-libs"
 
 DEPEND="doc? ( app-doc/doxygen )"
diff --git a/app-text/hunspell/Manifest b/app-text/hunspell/Manifest
index 789a8410a371..8d5f392b0a45 100644
--- a/app-text/hunspell/Manifest
+++ b/app-text/hunspell/Manifest
@@ -3,7 +3,7 @@ AUX hunspell-1.7.0-renameexes.patch 6399 BLAKE2B d852305da0dc0330e293a028a1e178d
 AUX hunspell-1.7.0-tinfo.patch 1721 BLAKE2B 1278f50da7577556710a8e481f46ca03ea40147149d2419343aadd2e08afcc3e1865efb9fc13beca9d4d2d7b1e027f72931415120524458843f85c86528e82da SHA512 3161ccc03a7c1af9b3a421515385d95866d306bf7639a24e4e4fc0d762a30e7195a517315ce489472fb18edc3594cd0f621ef5c42e17847d0b76563315426864
 DIST hunspell-1.6.2.tar.gz 721165 BLAKE2B f377596d2031e89ad902a0f5da85e77948bd5d582bb4c558cc7c379d803a00787237d2feed9d26e037cebb77958709f41fb01d5f8bfed6ae21047a2da83c8f51 SHA512 a23127f1271da95ac06a1fb2f57b659485e959567b61da05b2bb350684003a0fb7e882b5e524c465fd890f79f513ed03174f38611989a1c09081147c47d6da11
 DIST hunspell-1.7.0.tar.gz 482156 BLAKE2B daf689ab44872c78d27bd035d996c61da9b01b7bbe5ced120034b2d64bbead573ad3807dfe5a06ecdbd96c610f42e4ea015be4b2046ebafad13347c08e60913a SHA512 8149b2e8b703a0610c9ca5160c2dfad3cf3b85b16b3f0f5cfcb7ebb802473b2d499e8e2d0a637a97a37a24d62424e82d3880809210d3f043fa17a4970d47c903
-EBUILD hunspell-1.6.2-r1.ebuild 2383 BLAKE2B 7ef52fd2c661ce65496350ebf7f33e550b9e2645183cea6a3801e7bea81045da4b9846dbedc6b933cb30a3876df87d434785ee4a39292aa2fb3093310b565b59 SHA512 41e296e4a093edc5ef757cec31fd93fcd9a6b08ea18e5b5086477f4f4b351a93fa9ff03a7cb6884da17236985c0d3e5ece154da8aba8557f56cff37c73efc3b7
-EBUILD hunspell-1.7.0-r1.ebuild 2350 BLAKE2B 549d5faa02b30a9c05f0ce88d0d25aa432ea80a0a94643c819676afbf241d4e376f483cceb97073d93396e11bbaa3d944204abb91c430b23933710b6bb5252c9 SHA512 6828c0da75f5e652df23d1d14985fd0e73e00a4bf0acd407650f5973f2fd19d1ec0d98fb3ba246d3ea7ed74f5fdf1a1eed602c260c01d0a44257feceaa68581a
-EBUILD hunspell-1.7.0.ebuild 2292 BLAKE2B ffcdf02a09d0bac21a950177962e6ee769802c3c8656d847c3c59faf21925a153bf51d7d933a06a3ec14ee88bb9178398e56b8ab1efde0992e562ab1e0540628 SHA512 aa8b250d91da765cd2e86ae0233947a5722e135f38a5f5c7ae54f1a50723b66d3aa618fda42931ea65e36d5e306de00e9983c305716d613e3d4ecf7e50a7e5b1
+EBUILD hunspell-1.6.2-r1.ebuild 2361 BLAKE2B b75f02e0862a9a8be86d7fb29b663a93f483410bf5d0301bdab8487516c00f132e6268ed0bdf133f2ef746528b93c6b0d7cc71a38eb3f49b33202b125e19e04e SHA512 fa6f2089e74c17adcfeebdce2ffa7f2a56ef86e53f1b05b2a2d7fc61e4a29dc9a5f010aa305e07cf22c63208bb73fe1c795efc47e951b666aad33feccd0aeaad
+EBUILD hunspell-1.7.0-r1.ebuild 2328 BLAKE2B 6612c22c9f3cc5b6549583454b688d1a284d921d5b893e313092b23333a564393f2b2a7b6307148b980df34fd85573efa6d25f628da948d6fb35707f00f61c3c SHA512 a694ccee52fbabf4599d12a3fa4efef687a0d000329f290fd1f4f5b27565e68575f4a367626b9f529949fb6fe3a533d36fbcc9ca4c34443ec8cec0ccc1a3a2ab
+EBUILD hunspell-1.7.0.ebuild 2270 BLAKE2B edd683d1308d7b2efabcb376c97c782d018ffb05947e957a2cb6417135b4c9fb56fbf9258f48d73a74f9574d9cc1386acbc49bc9ffdcc69ce922722d77a46c00 SHA512 aa610975bbfda9fc30f1590bdfd7f5ddace0a561f30755246a1e99c87851e2433b71c84c58cef0e8d1d1964c29a71dcc93b52adfb0228c4352d2a39ce207398c
 MISC metadata.xml 300 BLAKE2B 03418bffa5dab48a3d9f5f7de46a79b8b5de44296b7c39d8d75d021f3c5693eea63148fbed02c8a77b1a0846e1d39d8e11caeb003297839fda0c5dc679aaca08 SHA512 b541c90d84ee8c1541d588948286428f065ebf0bb393108e7521ba8d45ab3fb235eaba61ca61eebc61f371e399e7d98ccf3c2994d8df97d1b6a7972e92cffa71
diff --git a/app-text/hunspell/hunspell-1.6.2-r1.ebuild b/app-text/hunspell/hunspell-1.6.2-r1.ebuild
index d4a295cdf9af..b7e862c9381a 100644
--- a/app-text/hunspell/hunspell-1.6.2-r1.ebuild
+++ b/app-text/hunspell/hunspell-1.6.2-r1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://github.com/hunspell"
 SLOT="0/$(get_version_component_range 1-2)"
 LICENSE="MPL-1.1 GPL-2 LGPL-2.1"
 IUSE="ncurses nls readline static-libs"
-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 ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	ncurses? ( sys-libs/ncurses:0= )
diff --git a/app-text/hunspell/hunspell-1.7.0-r1.ebuild b/app-text/hunspell/hunspell-1.7.0-r1.ebuild
index 343a7fbce81c..197e5954bde1 100644
--- a/app-text/hunspell/hunspell-1.7.0-r1.ebuild
+++ b/app-text/hunspell/hunspell-1.7.0-r1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://github.com/hunspell"
 SLOT="0/$(ver_cut 1-2)"
 LICENSE="MPL-1.1 GPL-2 LGPL-2.1"
 IUSE="ncurses nls readline static-libs"
-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 ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	ncurses? ( sys-libs/ncurses:0= )
diff --git a/app-text/hunspell/hunspell-1.7.0.ebuild b/app-text/hunspell/hunspell-1.7.0.ebuild
index 9d0357167faa..1fbd02a709e9 100644
--- a/app-text/hunspell/hunspell-1.7.0.ebuild
+++ b/app-text/hunspell/hunspell-1.7.0.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://github.com/hunspell"
 SLOT="0/$(ver_cut 1-2)"
 LICENSE="MPL-1.1 GPL-2 LGPL-2.1"
 IUSE="ncurses nls readline static-libs"
-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 ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	ncurses? ( sys-libs/ncurses:0= )
diff --git a/app-text/hyperestraier/Manifest b/app-text/hyperestraier/Manifest
index 9b846c4bc9f1..3e48c0c2d53c 100644
--- a/app-text/hyperestraier/Manifest
+++ b/app-text/hyperestraier/Manifest
@@ -2,5 +2,5 @@ AUX hyperestraier-configure.patch 11535 BLAKE2B 970d53c28c1dcc1bbd2f2354542e80e2
 AUX hyperestraier-perl.patch 844 BLAKE2B fd221a027e47ed7582e697a8104d1ef82d66b87919f20c82f185b9167ad03ae6b9f0b6996b47a99e58fb42443f1c1b1c9f53a6badab935361b26f8693b680694 SHA512 73c7bd659d80464baf1d28a0eed69c9fdb3052a62aa46dc0b56f2ba6f75d458531dc6023684bd92b22b7fc4b79869ccd82e835827096b163faee0f94b0615465
 AUX hyperestraier-ruby19.patch 5143 BLAKE2B c9ea3c9e045583dee3ca119ebea07946522c50b00aba4d94fc40f7172925b9aedb8cbdc88e087a87590422566b12269641511c2c1c0a484390b1c2fa8bd1fecc SHA512 fcae611f594eeb35b6aca6eb1139304538793afc6b794e8dee1a59243d5da216f364165c90e7cf7691ed9a7f38a610ba27f37c2eef2baa4042c4a993cbfefb2a
 DIST hyperestraier-1.4.13.tar.gz 1014600 BLAKE2B 02be7cd374c47094dedd239e967dbbe5045a77302125861541dbf4d5fc60d488968718fd6b9ca57b88aac96cf2cfe73397af6bbc3d53ff6e983063ed98748e70 SHA512 ec97f487bb0e085f74222106fc5fab227c8c02ee8d736c0b4adef57ec0e4310f829ac59fff5a1c92321786e89bbc2a059a0acff6ab0e5844b83627567bb265fc
-EBUILD hyperestraier-1.4.13.ebuild 3545 BLAKE2B 537419fa747d6fe5d668c127c3a90ea3dbd065491bf3d2947451ea9cfa18b346cac6c36b62e9ac41e7a1df84bd4b785a20e5c007526b382b19126f134378237f SHA512 b6d977c697ff32183fe9eaec5df12d35f6f4f72198e8787d564de3700a03c79fb48d412c96c3b99ad733619e3c1d94a20fe90bbaede32ec0bf6cef50e4dbac93
+EBUILD hyperestraier-1.4.13.ebuild 3523 BLAKE2B 9d86f2c43d369278c00417235d6abe4bbfa2635e6a3fd0fcd43e4fbc2be4e5ea3aab5ab0087f0660d8b1ea4f89ff1bc2d9688a48642a808cd3500f7ab5fa07c9 SHA512 6734ded0b597f1c652ad67ef56169a8a9d982426ec5315466296a5019e860dcc5b2aad3cc965ad31ee1c64af54bf46959190af3c581456e55ef6e895d5b77e29
 MISC metadata.xml 423 BLAKE2B 188de835ec6f287d3a72451770f6b7f8c93758c6579b31182bd918127b9dd3c91c13813451d611d4cf24e4dd29eee21f9b214b8545250ac23e26cc696ffee719 SHA512 60323531c2e899eed9db9635ecc0cf11d1482738006e86bbcdfb74e931b1e0ce1cc7741619d3b473d504c35d4a73f4542e2e6904e75208a4beb818fcf7d06723
diff --git a/app-text/hyperestraier/hyperestraier-1.4.13.ebuild b/app-text/hyperestraier/hyperestraier-1.4.13.ebuild
index a31998f22220..533097cd25a9 100644
--- a/app-text/hyperestraier/hyperestraier-1.4.13.ebuild
+++ b/app-text/hyperestraier/hyperestraier-1.4.13.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="http://fallabs.com/hyperestraier/"
 SRC_URI="http://fallabs.com/hyperestraier/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86"
 SLOT="0"
 
 RDEPEND="dev-db/qdbm
diff --git a/app-text/iso-codes/Manifest b/app-text/iso-codes/Manifest
index 2290706e5559..80d0c50cba7b 100644
--- a/app-text/iso-codes/Manifest
+++ b/app-text/iso-codes/Manifest
@@ -1,3 +1,3 @@
 DIST iso-codes-3.76.tar.xz 3474728 BLAKE2B b418b7b80d1926e765b65aad4edbd74ad8d37251fda14e3ab0e222095762d54e358de6f8d4a08fde8ae14460fd975a2a541ca6a5a4cf8ef1d777719462b0f991 SHA512 a0f6714a79a52b5dab82a268e85cb2d019ff5255744b88d088dcd7d5a15eb9710876a338a0a5d0f5659b4146bc6cc53d6d3474d621b3dcca7c47afabfc7e0dfa
-EBUILD iso-codes-3.76.ebuild 2422 BLAKE2B 6ef279103301db42206b5b03488dc74205c5edd74378ddd71ca082bdf477f694e38cb241d8d4b3e7e0c62050427306659a840e596078ca8534135251f30a052f SHA512 99b946cca3dfbbdb8d5cc35b7c3742ba1ee7f96b18789d936bfdabc2c62ff9942e4e1c5288459f94115d910afc6a7cefe929e52f68ba94e9c8d777a77a41b9d1
+EBUILD iso-codes-3.76.ebuild 2400 BLAKE2B c1d67f20bb3593200867078852ce8ad078a0fc9443344c195ff08b8ced3f44a1945e7253b4bc928372efe700c8af806fc0679f715d8675d5d1c4d7db6429afbb SHA512 decda8e09e6c76e2259fc9163a351de44c3094468fce60b61095fa51bb65a536f73953b0a68fdee910a60d36c8f88bdee7eecdf8b6d410ad95619ce42bc3b1ac
 MISC metadata.xml 480 BLAKE2B 3aefef945cb111095839e8fa8b84757e7f51a9aa8848806911d8c01763ab2d2f1d0c5b31c042f6ee307756e007893f6559c54d74a104caa612c9a6d39b2eea7e SHA512 5729ca31911ea7dad748e9f3afdd1f45f9034d783b56a75609101bfdb0a204bda8a078e7d251e89731091726062c4ac962e000ec7a898cb66ff787c8f2308d4c
diff --git a/app-text/iso-codes/iso-codes-3.76.ebuild b/app-text/iso-codes/iso-codes-3.76.ebuild
index 0b54092aefcb..ed9a22a2e123 100644
--- a/app-text/iso-codes/iso-codes-3.76.ebuild
+++ b/app-text/iso-codes/iso-codes-3.76.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-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND=""
diff --git a/app-text/jadetex/Manifest b/app-text/jadetex/Manifest
index 1f77413d2419..c6b0cc1a7c70 100644
--- a/app-text/jadetex/Manifest
+++ b/app-text/jadetex/Manifest
@@ -1,5 +1,5 @@
 AUX 80jadetex.cnf 995 BLAKE2B 1316aa328e42553d13ba377512bb1c7301a62ee60b8351a9209dbdf7ebd306f092e9b3e35c6b605c9847a1fd931cda3ccfb042a30ec3415b59f1c88537ebe55d SHA512 b1e940b79bbb76b3ad02c82e25120651ab64259be104849fc39aee94fcedaea091220b6896217faa84f93a45cbafca5b1855396b47210952723148b69d9727f9
 AUX format.jadetex.cnf 170 BLAKE2B f6f923eb38263e054ef470f0e9bb8f4beae75a9ea5f5df380077e1661e22fed024e1f77f56f8419127bfb831b7409f486cd53bfbf2aa81bb80a2c47ec674cf2a SHA512 8d5d6ed30c45e1d79f108268e045acb763fa6815ca90a8f246daff51350ab2c19c7d38237aff3ced94f10bb9de06e3021c11138d3f038f4beaff25c5cade391b
 DIST jadetex-3.13.tar.gz 103137 BLAKE2B f1b94f62a6a9c0a33acba4e8c757bcfaf26660a2d0b4ac338cf5afe8d03476a8744652244218d056678a59507ce3c8de7066314f5559469a60be5287a8c0ab37 SHA512 188fb83b50fbe82856a32ef95088d5c801750114810e3cdf7e1758f78b6a94b331b7ae7d81feb1c08b7bb31ac52f8435503911933350baa3068ad373e11dbba1
-EBUILD jadetex-3.13-r7.ebuild 1676 BLAKE2B 1ca11aaa3b536ea806ca2cbcf66f70081b40a9fa3a590695d59d73a15015d9c340d7404662d396cef3f783c82a2fcf4a07d90185feacae2fb59e76d720b5bfb4 SHA512 95b2411a4b2741a1f752f0ed148d5f022ecd79e2ed666151cff8eb10ebbd127eca13e1be133a21a46fecda79e645d020621362041d51793c97ccf276f6973896
+EBUILD jadetex-3.13-r7.ebuild 1654 BLAKE2B 35de068430343878c99b06930759fe009cbbfd4904585ff6e680cd9637a58aecbc83ee0121f4a5aa0fb18760f791fd4de389c605629edb194e5cfca228859510 SHA512 8f9d4a1d5ba2dbcd94ef72ac2c353404e1a5d89324e6102c455c87e8894047ee6a761e35dd3fb922bc50fac558cdd46b54c957957f7b08bad380191b28687f5d
 MISC metadata.xml 326 BLAKE2B 43480e556a9ce9c52fc46d18765664881cbb16ea08954b18d357df0a956d335815e9a0c3093504bd68a5b2249bee307ca05030fbe7fb4324beb8fdd7ff8b2e53 SHA512 eb50eeb89f113a376963fe314c979d5e399f43b0ab85fcecc923618c717e30c90f8f70fe22ba7a02b39b14c57861efebfdb785f607a2e7830578aee20c2bd915
diff --git a/app-text/jadetex/jadetex-3.13-r7.ebuild b/app-text/jadetex/jadetex-3.13-r7.ebuild
index d1f1a0cc071a..3150df40a384 100644
--- a/app-text/jadetex/jadetex-3.13-r7.ebuild
+++ b/app-text/jadetex/jadetex-3.13-r7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/jadetex/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE=""
 RESTRICT="test"
 
diff --git a/app-text/lcdf-typetools/Manifest b/app-text/lcdf-typetools/Manifest
index 51e8468a761e..90227200589f 100644
--- a/app-text/lcdf-typetools/Manifest
+++ b/app-text/lcdf-typetools/Manifest
@@ -1,5 +1,7 @@
 DIST lcdf-typetools-2.106.tar.gz 643503 BLAKE2B cb016da74dfbad92808292842de653badec4dd3b703fee5e177016856a795e1383ceeed68de668846cce167b7b9c74bd7e0b17ea3a60b2f9b9caa0b73444e02d SHA512 039215132585214e6518864161885f7a06f08f8b36b002a961b1d83182e388b31eb034eaa4466ba56a2af52e1cfb202e88f004be17c22df1343f94481e3114cf
 DIST lcdf-typetools-2.107.tar.gz 652445 BLAKE2B bbbc428673c8e036f8d3be8ec80dbcf8892f60976fee7f11d622af8442c4d3eda0e118d47b364f55fe0dc8b53062ece0926be1d67e6627500a787bce810c074c SHA512 be54d4346d567c640b260dc513854085901af96b82701fccb8f0feae4b373ac69962c568a648515eb9ebfcabc828359ab2d742947ccdf9422643b0d889961ff3
-EBUILD lcdf-typetools-2.106.ebuild 890 BLAKE2B 9094d210f3bd6576fbd2810906252a3353b40b52ededad56b6e8ba49e0c48790e6b9dd4749137c681349f6125b7e6b4b94407daed968b7eeaeec4e8998c3a3bb SHA512 7775bda480cbbcb9a19575a10fd5b5e9081ccb3aa0e4a9419782662caf4926e2c4ff3498671232c6fd476c2d5a1f4cbdacd33b8626358700e9316b951d2fbe23
-EBUILD lcdf-typetools-2.107.ebuild 899 BLAKE2B 4d6c782a7fa16fd91b831d2b20aa691d05cb220af20dc66969bbb2f25b93fe5f20ec96c53de0d9b98590d5f14ff4ee3ec128427af31d26cb18d523ff4962c258 SHA512 f98c7da549aefa9cf75b4dd9b6d7129fbafb954756995af8e2628558a120205071d2bbff8de92cdb3e274b8501c11ae73f4ba7fed5cce2bb0fb0b3d30869977e
+DIST lcdf-typetools-2.108.tar.gz 651350 BLAKE2B c60986672a31bcf47b876fa75d04a976be761442b04b1541f7f9082521d716708542b8708fd3da558f9df6b459cca1043a7e1ee2eb006f94054611dd4ef348d5 SHA512 2c7afe1c6838f432ddd5bbd5fa86a58743242d5a2203220d3cd0153c0c69f23ca734e8d4352ed3c8a6bffc1c61bb93c19d00c6483545a09d6f8363f870bf2fd0
+EBUILD lcdf-typetools-2.106.ebuild 868 BLAKE2B 411295ec92edf7c577345f40479a166671601ab5cb26389da9027d05a41d4817e9a5e77c3675e7f4a2f451508e681db57ed7bb058eb11cf0146870fe5ac9d6c9 SHA512 e88e2ebfd759b88f1c76bfca05db6a1d46951c8f234dd80e9f391e7c9b0f4833898256c74a1f4ddd078d2768f83b332a591f5b7aba1006697ebb7b85bb9c9599
+EBUILD lcdf-typetools-2.107.ebuild 877 BLAKE2B 7995727fe87f1c6c1ec126fd514195dfb94c73bb721bf6fce98d83a64b16d523d89e712e40bd0483c6cb876506740f84baba1f2f513443be97ad86297501313c SHA512 15aaf39828f08a6415a8e1930332fc64805d309144d9e1f06998d422129c1e82c4090f50fb161acd0b7816242e086f38d865bb655a4054339bc11f7d36de3aed
+EBUILD lcdf-typetools-2.108.ebuild 874 BLAKE2B 5118bdd86da617e6e8d88f13ed4cfc33364b7a6ce729fcb04e435dfda8193ff508fbac19bf690f3c7edbcb373cf54f072b6ba00526164422f3d512101f49f84b SHA512 6afd443bab6bcae29e392a9eae8ab33b6c5dc95dc1b59888e56cc90264c8430592b1746f235d0b824845bf9849ad8e9c3575f8dee3628c4a675d02afd0901477
 MISC metadata.xml 794 BLAKE2B c611036ee3c2daf88b72b026f0d8bec0e05595db2f73df051fb37793eda6304e1a32137e7759028ef4eb75bc56426d6ee2649d5384bbcc41c2da56d32a647b8e SHA512 9ae4e29814e34012d731aacc0a8b4a38649c95a988049f3fc10c7f260cb6ebcc57caa0a93d21eb8e66e64207673842ab7ab2fb71792ed3d537b7eca891609cba
diff --git a/app-text/lcdf-typetools/lcdf-typetools-2.106.ebuild b/app-text/lcdf-typetools/lcdf-typetools-2.106.ebuild
index 7b13fdda8e33..52337d788483 100644
--- a/app-text/lcdf-typetools/lcdf-typetools-2.106.ebuild
+++ b/app-text/lcdf-typetools/lcdf-typetools-2.106.ebuild
@@ -8,7 +8,7 @@ inherit toolchain-funcs flag-o-matic
 DESCRIPTION="Font utilities for eg manipulating OTF"
 SRC_URI="http://www.lcdf.org/type/${P}.tar.gz"
 HOMEPAGE="http://www.lcdf.org/type/#typetools"
-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-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 LICENSE="GPL-2"
 IUSE="+kpathsea"
diff --git a/app-text/lcdf-typetools/lcdf-typetools-2.107.ebuild b/app-text/lcdf-typetools/lcdf-typetools-2.107.ebuild
index d538c2e96354..8e7a134d43bb 100644
--- a/app-text/lcdf-typetools/lcdf-typetools-2.107.ebuild
+++ b/app-text/lcdf-typetools/lcdf-typetools-2.107.ebuild
@@ -8,7 +8,7 @@ inherit toolchain-funcs flag-o-matic
 DESCRIPTION="Font utilities for eg manipulating OTF"
 SRC_URI="http://www.lcdf.org/type/${P}.tar.gz"
 HOMEPAGE="http://www.lcdf.org/type/#typetools"
-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-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 LICENSE="GPL-2"
 IUSE="+kpathsea"
diff --git a/app-text/lcdf-typetools/lcdf-typetools-2.108.ebuild b/app-text/lcdf-typetools/lcdf-typetools-2.108.ebuild
new file mode 100644
index 000000000000..c3cb17fb388e
--- /dev/null
+++ b/app-text/lcdf-typetools/lcdf-typetools-2.108.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit toolchain-funcs flag-o-matic
+
+DESCRIPTION="Font utilities for eg manipulating OTF"
+SRC_URI="http://www.lcdf.org/type/${P}.tar.gz"
+HOMEPAGE="http://www.lcdf.org/type/#typetools"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+SLOT="0"
+LICENSE="GPL-2"
+IUSE="+kpathsea"
+
+RDEPEND="kpathsea? ( virtual/tex-base dev-libs/kpathsea )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_configure() {
+	use kpathsea && has_version '>=dev-libs/kpathsea-6.2.1' && append-cppflags "$($(tc-getPKG_CONFIG) --cflags kpathsea)"
+	econf $(use_with kpathsea)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc NEWS.md README.md ONEWS
+}
diff --git a/app-text/lesspipe/Manifest b/app-text/lesspipe/Manifest
index dbc92853cad4..79c98f4955e9 100644
--- a/app-text/lesspipe/Manifest
+++ b/app-text/lesspipe/Manifest
@@ -1,6 +1,6 @@
 DIST lesspipe-1.83.tar.gz 115129 BLAKE2B 24d9e4a226537a44c01c316528e085c6d2d7889b2ae5166d70b85e12c5f0b34e825e039a70071d7e75947e1c63d527decb21973631e910de42c75ec3ee17436c SHA512 c6418ac2bfc2dee9d32d56b0ea4a94954b1431db54fef8b67a9cf7d961cf4a23d87b2f41b2a4560d2333029c6d4ed5c6f399cb635f857bd43f1603993b5cb55d
 DIST lesspipe-1.84.tar.gz 119657 BLAKE2B 671b504022bdba82eea03d7a83960d5ed148d851d0420f179967f46d38a88ab90c9928a462e01744134aedfe710dba741430e78743451b1b65e603e5d89ae139 SHA512 f11ef23610f722d62ddf7e084b03967ed59d21af6ac207d4456f625c93c3c58c87ec5907cf6bca00ae5550dcddfc9b7f0be5de51f9ff81044fcff1f1cde81267
-EBUILD lesspipe-1.83-r1.ebuild 1123 BLAKE2B e0e9a8373bda948281b5a584b174bb9bd1b75b503f004fdbaec54629673cbb7a850a685445dbd7de9b3bc1237f052fdb10e8ee771d3600c5fee4f2cfcacfc5b7 SHA512 334fae62576add56f38a0ba9c0ff46bdba7a5bf03a5f5236e028b30ee3cadc123913aae4d78ef38942d7b816e2f243cdb6828c7a366313ff83f48cc82e92fddd
-EBUILD lesspipe-1.83.ebuild 1136 BLAKE2B 4e7dd1ab4b3a24c1233539d1132b791b5576eb81c32fc866bfaabe3904c9de104e02db88a516f122f5892a08c9da231100c1417a55536973b241751bd55fdbd9 SHA512 aa8ed4b60d7396c65204d149057ac8f56480201ac1fccca2d9f5661a76100cdca8daf2c322dfe9d3e754281c49d5ec6b07201b938e72e96e72f2a1f4212f205d
-EBUILD lesspipe-1.84.ebuild 1129 BLAKE2B c0e0e5bc2bf7412601c6c79a98fa044e7754b16fdea7620749c0468d1b8004e7ff8864ca1116e2cc26cdc575b1286415d6808964a246f981057b44e184926028 SHA512 1c827e596d3915ec72de0d72397005c6daf0ed80e691d26593c2e536a1e1de1f66dd73c7ed903402fbebb8607e57a3e652a1e3cd4dcce6b43992e0e2a3fc142d
+EBUILD lesspipe-1.83-r1.ebuild 1101 BLAKE2B 083f4a7254d2eafb8df257d8f9a63ed78de23b48917afdc45e6dff3e1a10c9a36383fb675b4f450b36d6529a839249dca79dcf149b6f18f71767c313508b6eac SHA512 325fa0a6ff63285ae2254c54c96883c7bb71660272933b4eb76ec54d41cf9415e9879da78c7b566fc8ebc25dc2930987146d0f8fa977d369f50bd9f55efcb880
+EBUILD lesspipe-1.83.ebuild 1114 BLAKE2B 0371b148f99d97a04c4cca30ab71b001ee71ae191615718fc76bedba2a0caeb131ea7a964bf4d2e1af2eb3a1c13d56b914567d3c4924a8e6659005180275edcf SHA512 03c59a5dca37304c89f1bac9c78b170fec806c268d0c338d479ab81e7f4f45c0970c699f1999b9eba90c67ae5cda79e31677cac43ed465a95a3a9892030edc30
+EBUILD lesspipe-1.84.ebuild 1107 BLAKE2B 16351d23108a2bffaeb40d003555e6ce6f6198f572df64745a6b366e6f3e88fc3402bab6c897cd9a09a1abe766fe4278935269f7ff85fa20564ca4f5f7ab6bd8 SHA512 bc603a619b3046c24b4c6c37cd81a7012626ce8077cf0d13fc6201de01539480019581231085e251a67c7b3a7b8f02e8caa00a6732e8e5fcbad57696d7233a0c
 MISC metadata.xml 303 BLAKE2B 57a0ab69188055eec0a29d4f2e331dd027d87b12623099013f889cd4954574772f3279c7fdce85c0fe627083db59a89a6d3daed8266c867b17bbdf84d1fef4a5 SHA512 efdd1963073db285de7f83ff804fdc98876846cb011fa0c8aa65f9b3c1dd6b7cdb039ca6a7a03018edfdff930f817208bb29601bb0c5571fc16d637615e0c7b7
diff --git a/app-text/lesspipe/lesspipe-1.83-r1.ebuild b/app-text/lesspipe/lesspipe-1.83-r1.ebuild
index 0eefc64e5ed0..9664f1de12e8 100644
--- a/app-text/lesspipe/lesspipe-1.83-r1.ebuild
+++ b/app-text/lesspipe/lesspipe-1.83-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://www-zeuthen.desy.de/~friebel/unix/less/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="dev-lang/perl"
diff --git a/app-text/lesspipe/lesspipe-1.83.ebuild b/app-text/lesspipe/lesspipe-1.83.ebuild
index e879930b2086..7ef07ab95e0e 100644
--- a/app-text/lesspipe/lesspipe-1.83.ebuild
+++ b/app-text/lesspipe/lesspipe-1.83.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://www-zeuthen.desy.de/~friebel/unix/less/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="dev-lang/perl"
diff --git a/app-text/lesspipe/lesspipe-1.84.ebuild b/app-text/lesspipe/lesspipe-1.84.ebuild
index 4ecd47310905..30ad4194969a 100644
--- a/app-text/lesspipe/lesspipe-1.84.ebuild
+++ b/app-text/lesspipe/lesspipe-1.84.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/wofr06/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="dev-lang/perl"
diff --git a/app-text/libetonyek/Manifest b/app-text/libetonyek/Manifest
index 9bacf02e4bae..f7e750504276 100644
--- a/app-text/libetonyek/Manifest
+++ b/app-text/libetonyek/Manifest
@@ -1,4 +1,4 @@
 DIST libetonyek-0.1.9.tar.xz 1477064 BLAKE2B 088d27c83d4aff41cb208cf840def78e323f378a1b7d456448db3abf51d1e850c8159ace75c8836958b533c2b84e583d5a622e638081230d2f862f6d1d175e98 SHA512 3f439b369d450bb1a4bdb3fe92023bda234b323cf676570f1738318c56867a97910f536280b9b164c3fdaa423a3ee669c935df75a5c700bc1530ea5b9a00391e
 EBUILD libetonyek-0.1.9.ebuild 1186 BLAKE2B d15463f4377588211f8d33f4dfabfc9e4fd1bf62fc4ee3d5828e9953edc7106f8f3e9f71827339beb21facf55b9737be53e6dfd45fd27098a9129fd8d84dd157 SHA512 70639675fc3b07a94a107fed5b40f72d8df2e2885db176ad5275f1a0e1fde0f7b2e945d5a42d438a34a83f311a2629638436eb7f613f782e7153883cf35fcee6
-EBUILD libetonyek-9999.ebuild 1297 BLAKE2B af489ee7a31f718a3670b3fe2ff212855cf9f43ff72112963f20a5b418996a8ac3b27828a2902947b91e769ad173c78eca148e6ad7cd2c301aee9a11db52e445 SHA512 fb33aaca7764969b2aed14955d5cd547e7b2718d33b27196642f1bacb18062e99b7e5ae7a2ed2468007273171cb4392148761709ceb3d96c85d6358eb26f62cb
+EBUILD libetonyek-9999.ebuild 1319 BLAKE2B 68e896b8f92d533592df53574f366c4b633d1b9fbffaba9c7fd0c92c686446dff254b1b165682b0b66ab109c6245adadf7bc677a16906fbd125f7ad3d13d9cd7 SHA512 35a31c69a9bfadca69b4250e4495dfffd28b437197c8dedea2b65daf0d195d570d4fad8d62c70863ea32c61c711559d40024bd854821c367a13e4435a419a1eb
 MISC metadata.xml 255 BLAKE2B 9b8486730bea2158e8be5cbbe0552c5460d1b18e2236a68e3f11d85ce4eeb96eb0e746f44a10cb7cdcf1bf498190a512ef42f47852c6843b9a3c937ceabc338d SHA512 ac646e8ac676faf0aac283e4be31c5f2b29e98ccf07327073ed05e688ce696caf639bdfea63e4aed141a90e84c0a86892bc717a52b95cdf1739aaa15240013c3
diff --git a/app-text/libetonyek/libetonyek-9999.ebuild b/app-text/libetonyek/libetonyek-9999.ebuild
index 5a2e3527e53a..9bea9ad25cf0 100644
--- a/app-text/libetonyek/libetonyek-9999.ebuild
+++ b/app-text/libetonyek/libetonyek-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-if [[ ${PV} = 9999 ]]; then
+if [[ ${PV} = *9999 ]]; then
 	EGIT_REPO_URI="https://anongit.freedesktop.org/git/libreoffice/libetonyek.git"
 	inherit autotools git-r3
 else
@@ -17,6 +17,10 @@ LICENSE="|| ( GPL-2+ LGPL-2.1 MPL-1.1 )"
 SLOT="0"
 IUSE="doc static-libs test"
 
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
 RDEPEND="
 	app-text/liblangtag
 	dev-libs/librevenge
@@ -28,15 +32,13 @@ DEPEND="${RDEPEND}
 	dev-libs/boost
 	media-libs/glm
 	sys-devel/libtool
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
 	test? ( dev-util/cppunit )
 "
 
 src_prepare() {
 	default
 	[[ -d m4 ]] || mkdir "m4"
-	[[ ${PV} == 9999 ]] && eautoreconf
+	[[ ${PV} == *9999 ]] && eautoreconf
 }
 
 src_configure() {
@@ -57,5 +59,5 @@ src_configure() {
 
 src_install() {
 	default
-	find "${D}" -name '*.la' -delete || die
+	find "${D}" -name '*.la' -type f -delete || die
 }
diff --git a/app-text/libmspub/Manifest b/app-text/libmspub/Manifest
index 9032d8500ebe..bfd2526649ee 100644
--- a/app-text/libmspub/Manifest
+++ b/app-text/libmspub/Manifest
@@ -1,4 +1,4 @@
 DIST libmspub-0.1.4.tar.xz 377472 BLAKE2B 89bd994a5aa2b3a22681dfe78fcea19561ea6057210e61630fa904ded12cca4694d715dd8f2fe8f687a91951bfa2f7aec1ff11d0b978a517476545bb07f654dd SHA512 7275f890645961b3fd56df4584788962e8c064fe3f99f5834c6ba6177ce76d00d544fbe9a25b7ab2f4180d2f3a90c609fe0bb68d61ea24e95b086190390fff31
 EBUILD libmspub-0.1.4.ebuild 1170 BLAKE2B b0a27deadfd4163569fa328bfeaf1c7d19d56bdaf63cfc71a80bf3760b49d5b2746560ad0107e958f48605cfc03b53036522f64d09db2f0d75c8c602ba24ef53 SHA512 7b403212e73bcaf9128714d09172637bdf4a785183669f8574438961623e3a7212b0c95f1985561461526cc317e711d5503bfe67faf45c3788cbef30af3912e4
-EBUILD libmspub-9999.ebuild 1171 BLAKE2B b9df1f08071dfb36cd24e62e3e6e120b47c7f3a252a5921533357706a5eda7139e3f6e8720d6401c3259bd941ba326ac044de2772cb8a5bd86c86453d1f110ee SHA512 c6b9f035c794632f6e4ba273ea8ec31d23dc3067ba531bb4365ec6b945039b7ea59ab1f3e89934f3d2600b2b9147d6cc4889a858561e350accab32219e9afad3
+EBUILD libmspub-9999.ebuild 1126 BLAKE2B c552dd2106be6bbf6a8433ac4470fe60168b8a3ecd4ec728d216fc181e6e89043547cfbc0860c49a5377b9e6b94959ad29ec70167aeae14e846da53595b0f761 SHA512 77f8370a5cbd3b32a518399c0e2a7a744bb4224a24f42587e5d8fc7183f33d43612d3158da02e6811f501491fe989d1bc1a5d7631929d46f10b51a5529975c5d
 MISC metadata.xml 255 BLAKE2B 9b8486730bea2158e8be5cbbe0552c5460d1b18e2236a68e3f11d85ce4eeb96eb0e746f44a10cb7cdcf1bf498190a512ef42f47852c6843b9a3c937ceabc338d SHA512 ac646e8ac676faf0aac283e4be31c5f2b29e98ccf07327073ed05e688ce696caf639bdfea63e4aed141a90e84c0a86892bc717a52b95cdf1739aaa15240013c3
diff --git a/app-text/libmspub/libmspub-9999.ebuild b/app-text/libmspub/libmspub-9999.ebuild
index c627cd0bee6f..2035408ee17b 100644
--- a/app-text/libmspub/libmspub-9999.ebuild
+++ b/app-text/libmspub/libmspub-9999.ebuild
@@ -1,26 +1,28 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit flag-o-matic
 
-EGIT_REPO_URI="https://anongit.freedesktop.org/git/libreoffice/libmspub.git"
-[[ ${PV} == 9999 ]] && inherit autotools git-r3
-
+if [[ ${PV} = *9999 ]]; then
+	EGIT_REPO_URI="https://anongit.freedesktop.org/git/libreoffice/libmspub.git"
+	inherit autotools git-r3
+else
+	SRC_URI="https://dev-www.libreoffice.org/src/libmspub/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+fi
 DESCRIPTION="Library parsing Microsoft Publisher documents"
 HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libmspub"
-[[ ${PV} == 9999 ]] || SRC_URI="https://dev-www.libreoffice.org/src/libmspub/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-
-# Don't move KEYWORDS on the previous line or ekeyword won't work # 399061
-[[ ${PV} == 9999 ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
-
 IUSE="doc static-libs"
 
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
 RDEPEND="
 	dev-libs/icu:=
 	dev-libs/librevenge
@@ -29,27 +31,27 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	dev-libs/boost
 	sys-devel/libtool
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
 "
 
 src_prepare() {
 	default
 	[[ -d m4 ]] || mkdir "m4"
-	[[ ${PV} == 9999 ]] && eautoreconf
+	[[ ${PV} == *9999 ]] && eautoreconf
 }
 
 src_configure() {
 	# bug 619044
 	append-cxxflags -std=c++14
 
-	econf \
-		--disable-werror \
-		$(use_with doc docs) \
+	local myeconfargs=(
+		--disable-werror
+		$(use_with doc docs)
 		$(use_enable static-libs static)
+	)
+	econf "${myeconfargs[@]}"
 }
 
 src_install() {
 	default
-	find "${D}" -name '*.la' -delete || die
+	find "${D}" -name '*.la' -type f -delete || die
 }
diff --git a/app-text/libpaper/Manifest b/app-text/libpaper/Manifest
index 35ad53d4f4e1..18b27fdd5f35 100644
--- a/app-text/libpaper/Manifest
+++ b/app-text/libpaper/Manifest
@@ -1,5 +1,5 @@
 DIST libpaper_1.1.24+nmu5.tar.gz 49032 BLAKE2B 27a684dc02d5d25c84a92161e7178d1f369444d50c316e7303579a2f8ede8590d4a19637b7066fcc8909f7942fa965d8421d468b28e99b8e963f4b2b170f2ab3 SHA512 4d20d454dd7d09dd7e84b9ccc3b0ff8d65d95e0ae3874ec41462f812882e7ead032310396801a47a32bfff112c4a9adaf2d8d3e6235a1fa6fbb853196a363c56
 DIST libpaper_1.1.24.tar.gz 355272 BLAKE2B 28617744c7361a5d51bad3eda876b3a2c03e5aad0b381aeae037a7280c88dde7cf3c3a457e7aed2dbd86b116ae6ce2469f65edc0eedbb0c2df68451813a5a579 SHA512 f90816723dafa9ce0aef652e027b13174d2430208003d3715d6f96226130bc66cfc36465f1a5a3f855697708c389f219b964a5534a64a8c98ac53662040df67b
-EBUILD libpaper-1.1.24-r2.ebuild 1171 BLAKE2B fdac1481068b67658044f6cfc463e83159f0019092c1894edd48bee69dac07456f48fe7a3fa80205222b8199b0f962210f71130d9b8767f181faa6604f81a2d0 SHA512 994e5f082733408c99452d5fa19073be84eef45d51ff651adea2fd1963f6c8af78f4266d88a1326497f807c35437c09fbcac17fb761c90c3c9ab21967b3add51
-EBUILD libpaper-1.1.24_p5.ebuild 1243 BLAKE2B 817506357bb867e1625642da4ccf80e266e65b46e497ed1af9f1527d5716f333cb38b03e859fd19ec20679ad3e88ef487c8de3d4a6ef7f87a08dd0f277b49b20 SHA512 781ba7a7c3b4bebaac50bc86125e262ef18fa46e3ccf414116c14672f95e1412beab657b1d0d1f1ffb641e992535211297f281686c6c08cbd4c81803220ae697
+EBUILD libpaper-1.1.24-r2.ebuild 1149 BLAKE2B 4e68022462064aaa9cd6b3d375614069543e7dc338d6b991ca3eaf28ccba5cb5167884cd8dd94e97e83eba69a145133241e6fd710956a1fb069e16f276ee93a4 SHA512 216a070587a25c945039afebbc19687a09b429ff9b86a25f567b93898efa340de68f6fd2a3046e3fe2bc61315bdd4b2ec14858fb5d336fa32fe780391f8fec8e
+EBUILD libpaper-1.1.24_p5.ebuild 1221 BLAKE2B efcc5b15395b9f83576aa261570ca67e9c420dbb96c3a7819e27b8c28a37b1c522f0277f673257671335dd31d89da5093178c8fd3fea86d1ad6aa8ad5af42ea8 SHA512 9f78a9bc1ed0ea55f9dbd5579cc87e6d940a4abebc13515c21d50d08b363ff0082230b80ac2e60827ea6b6df43e243bf442c068fbfd3fa81b996b35a66a49396
 MISC metadata.xml 255 BLAKE2B 06f078acf8e4416705c8bad8b4802a44592eb962c08c050e11332bfa97564fafdf08754ab056eb813f6baeaa6cdfaf5d71672455d77e74045f86098c221d5136 SHA512 c6c5f966cfbe396fde1b15334442de9e0004b44c4b48775588b0b25a058ad1751252761370c9c254280e97561fa6306f5aa0cc7959c675d4ee11f7f95d777a36
diff --git a/app-text/libpaper/libpaper-1.1.24-r2.ebuild b/app-text/libpaper/libpaper-1.1.24-r2.ebuild
index 0dbca3f2a9e2..7ae08536efde 100644
--- a/app-text/libpaper/libpaper-1.1.24-r2.ebuild
+++ b/app-text/libpaper/libpaper-1.1.24-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://debian/pool/main/libp/libpaper/${PN}_${MY_PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 S="${WORKDIR}/${PN}-${MY_PV}"
diff --git a/app-text/libpaper/libpaper-1.1.24_p5.ebuild b/app-text/libpaper/libpaper-1.1.24_p5.ebuild
index 7016e7ddeabd..eae4131557e2 100644
--- a/app-text/libpaper/libpaper-1.1.24_p5.ebuild
+++ b/app-text/libpaper/libpaper-1.1.24_p5.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://debian/pool/main/libp/libpaper/${PN}_${MY_PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 S="${WORKDIR}/${PN}-${MY_PV}"
diff --git a/app-text/libspectre/Manifest b/app-text/libspectre/Manifest
index 64f4787f3a2a..c1afb7ba7e9c 100644
--- a/app-text/libspectre/Manifest
+++ b/app-text/libspectre/Manifest
@@ -2,6 +2,6 @@ AUX libspectre-0.2.0-interix.patch 728 BLAKE2B 5954fa18e92c33f086e3cd45b1d837aa1
 AUX libspectre-0.2.7-gs918.patch 1272 BLAKE2B 37f9b02992e622754c271d6c2d4921a3ee55d657f66d810b27498cc908c332ed735a177a1594fa625c135c13a9cc0809b1fbbba9e66ea7bcaa3e69df0aa5fdfd SHA512 50c307ffd6fbd1de92239670afa61a68a32b788e3664a1d4d5b86a074102596e678492c91f6ff9fb8ca58bbe00b5a5fc01034a0d04e5cee3149932ce0337b401
 DIST libspectre-0.2.7.tar.gz 387947 BLAKE2B 1d8c5ce045e90cb10a159615d3b011dafd24fa07c8bbd79349663880d077b53944495cba7f5a77e8e32735123762d0f6fcd2feb382258b8d35107284f72243b8 SHA512 2e60905f7eeed9ac6ec3b5f8b47a7dad85178c8c35a63ba097ef6088dd334f7fde5797ecb05cf67532b759d07a65006427914d2cd6b09107ecc90620c9541794
 DIST libspectre-0.2.8.tar.gz 421791 BLAKE2B bbefa06cf80ecb91f0f780493e1829eadc34061b6f2b3004f9ae01e06fc4609edd440df290be9ff1c9f43e580b53791aae033feb4115743a0f03f703bc18e0c7 SHA512 ebbe7f6adcbc7f7d6af61f24e23b114116c878755dbe90f1163546c1284a005b4d539be01986c1f940611e84141ca19768b8effc2abf1013606da7c93547da86
-EBUILD libspectre-0.2.7.ebuild 1232 BLAKE2B d77eb5e11d74f44972efd3a04252e44a8b0d37734957ad7ecad6f847be51a78f37cf0617f49a62c77211ea1d3b03216ef1a725832c698c06e9fe5bacd0f6a4dd SHA512 b3e700400305328d680e5e1a62aa696990cdff6ac55e3fe5079549ffb3c53e30559ff69b5d05090c6929d4511d2c13a28b82ba50ab0adcc412546da52b7b4992
-EBUILD libspectre-0.2.8.ebuild 1101 BLAKE2B 69cfe11e985852fc9ec6a75be6fd02a66fe3ffc5791a65f6fe94fb105e11e55097cfee12e2714e69843e99ae6c2a434f875e82716ebb3b0b4d705bc4be187e41 SHA512 733d34fe5d8f0c20ebc4903093ec3a77c8bd7247bac11ec503e2562eebd5d636a8723a018028fb76e74332fae1a1a2716fab6dc23e3943b0cecc34751b43747a
+EBUILD libspectre-0.2.7.ebuild 1210 BLAKE2B 655fc68798e1637c3013b407cd8bcc88c91a23f1c85747f33c1c5ee12b3c074ed57a13d25684645bf8f02e3d04e1af4a9bc2e4485ebe487201f83981f5e1ec50 SHA512 b65c05db5a76bd4618dc0bb43faa1b917c1a572d32a8e822af913e6a9633671d106823ea9563d55e60881c1b52098a8b2c0ebde110d46080096479fdf61a58e5
+EBUILD libspectre-0.2.8.ebuild 1079 BLAKE2B 78361980640afce657b85057ff9ee82f6abb15cc900daa88053be433ff0c8abf3dd762f27af1d68f85fb79e49e90766b5fd80571bf84de86b9292543798d3eec SHA512 7245c26fe1989b8b66d377505425bd0ede4093a37a1d11a3c88ec93c73862b8cb3b143089951cfee0563a258967afc38a8858d611ed7c0fe8acc8ee20677f7cc
 MISC metadata.xml 232 BLAKE2B b8ca675b002ba96d45a3afe7b6dd9f0e74d21db87eb002f72bae4e23fd49602115a18b372084596fdc09c3dccef80ae95ab540dad93fdf5dab0c9fb34f5d28db SHA512 21ba416ac701f1c9deb55d07f8afbf9da930fb04d274d84c5cf0df5e549554059959228ee6a4b8523d985fe0762af1a7c36aaefcb0e5b3c7baa5866e2841cfb4
diff --git a/app-text/libspectre/libspectre-0.2.7.ebuild b/app-text/libspectre/libspectre-0.2.7.ebuild
index 7fbb9e521c29..d250899af08d 100644
--- a/app-text/libspectre/libspectre-0.2.7.ebuild
+++ b/app-text/libspectre/libspectre-0.2.7.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://libspectre.freedesktop.org/releases/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
 IUSE="debug doc static-libs"
 
 RDEPEND=">=app-text/ghostscript-gpl-8.62"
diff --git a/app-text/libspectre/libspectre-0.2.8.ebuild b/app-text/libspectre/libspectre-0.2.8.ebuild
index aa8bb8ab1bea..1685947fcfea 100644
--- a/app-text/libspectre/libspectre-0.2.8.ebuild
+++ b/app-text/libspectre/libspectre-0.2.8.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://libspectre.freedesktop.org/releases/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
 IUSE="debug doc static-libs"
 
 RDEPEND=">=app-text/ghostscript-gpl-8.62"
diff --git a/app-text/libwpd/Manifest b/app-text/libwpd/Manifest
index 5ff95346c13e..031875ddd963 100644
--- a/app-text/libwpd/Manifest
+++ b/app-text/libwpd/Manifest
@@ -1,4 +1,4 @@
 AUX libwpd-0.10.3-gcc-4.8.patch 470 BLAKE2B a77e5a6fdc4dbadc716ed3c4bdb5ce04e2e173a9ad6dd57def6e622ab68db2e5d386a21d653a515b069c4982df83ee99ceabd80ce36ef6ab0605351beaafec5c SHA512 9bcad3f4ae15213c26d9730e5a496dffbb1c01b1ec85fe4eda8edc5bda3ddbc0df5b6d6a9eaa3d9c944f3f5900c189197cc0925df5adfc6523eed3e4ea327564
 DIST libwpd-0.10.3.tar.xz 534712 BLAKE2B a7b39713c0df908912d0f6f94c6c0f7056a685dee7542ea88c441f055ad7cc62c1159985c459a4ff67d5b5fe4c412c31c9a9a2924702386ed5b8250147f071ff SHA512 df14f11e885a583218afdb0aafe8a15d01890289af8b316cd1d225e4a83996c82907fbfdde83257dc71d99bfbc5b21b2c96536f5a783748388659155dbdb8949
-EBUILD libwpd-0.10.3.ebuild 794 BLAKE2B 0fb4a68db20356acb7ad4f03584ac91774fb4ef65c667dd288ced4723c77ad42724feea0acd45d4846aa05a431b229153aa7df85ffd2b19d97dce4a5f1b95610 SHA512 c35fa2c99e18a8340298c8a2b0a25475a10da80f8243bb2542b080f17df2f091452c5c27a99229bfdbd9598d7de70aa510fd0e21e4b4bf51ffdb9fa99503aa17
+EBUILD libwpd-0.10.3.ebuild 784 BLAKE2B 2abbee6df35a3034e18b2ed89e14ca67ce433c31a4905d522983e68b883a7dc66fa08c45c57237ed2e4d4029714cc3ba007ba07d0093bc69e7abd50d629c8aa0 SHA512 c349c45c997b1a639c1f222edf7e5bd39c9ddf015da03739d4247de0c1fdf01752af665879c1f7642e255d558bda66c304c0b85b0748e74b69cd319651cae7b7
 MISC metadata.xml 402 BLAKE2B 449d3fa4ee2b0be84bca5eca7708b2e318060e7d85c84369ab16923edfa4bd3a19eed80b11d3cbd7c4d9a12e2d3d07df6b0aad95f011d1ce100fd9a6fd22206c SHA512 af33c7d44f5766cadb1955928210dc6f28171eef00cfbdd96a0257226bb7eee560fb05cf58673dfbbef932600ec3e8fafa666db3f9c3ddd2bcfa5a2a90cd77f2
diff --git a/app-text/libwpd/libwpd-0.10.3.ebuild b/app-text/libwpd/libwpd-0.10.3.ebuild
index c05f26f93137..edac8b995a8b 100644
--- a/app-text/libwpd/libwpd-0.10.3.ebuild
+++ b/app-text/libwpd/libwpd-0.10.3.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
 
 LICENSE="|| ( LGPL-2.1 MPL-2.0 )"
 SLOT="0.10"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc64 x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc64 x86"
 IUSE="doc +tools"
 
 RDEPEND="dev-libs/librevenge"
diff --git a/app-text/linuxdoc-tools/Manifest b/app-text/linuxdoc-tools/Manifest
index 996d504bf683..c34f0fff0b14 100644
--- a/app-text/linuxdoc-tools/Manifest
+++ b/app-text/linuxdoc-tools/Manifest
@@ -1,6 +1,6 @@
 DIST linuxdoc-tools-0.9.72.tar.gz 614429 BLAKE2B 404b311c0560780bd81f021760d32e47cd6ebe8abc9aa64a181b8ce727dd0edbbd88d286cdfdcc97a51981bd0bd299563d7b1b2945e06f83ff32c7d3e56abb19 SHA512 2d522a99212dab2535786b64e0b404a9bb023d1612d8e57a628de21b5e77b104285713a98591c61a2fb2196e687b34180198ab0dfeda2b44fbbce051e9919408
 DIST linuxdoc-tools-0.9.73.tar.gz 613971 BLAKE2B e2e04aaa44d5e2cea5af266e38b476381f87a02b9704e03ae5943f7714634d5d214350abd5b193f2efe656a264403c679495af5f954870b30d32b8b799ad7206 SHA512 b26896316e259cf4ef170814d410b1e39e58f61db49b03b4b9c1f767f8459d84214e92d9dcc09ad739508fd9c3c5fe4a2264cbb3c693a11362e59fd221655252
-EBUILD linuxdoc-tools-0.9.72.ebuild 1777 BLAKE2B b61585eaf79a55b9acc1f4711cbaec19d421db998f091a4fb5827292bb30c5720de9ba5a300ad0cf248b509a8ec4d1a0415a4ee498edb18f49279cf673ff35cb SHA512 40632a82dc9252a4bac966174c4e87f6f1adf075fb2ef125ea07ccc5796b98e74d8823d1afff11f98e042ded4eb5b7da82a8b8c5ab052e4f7d53357b84cbf649
-EBUILD linuxdoc-tools-0.9.73-r1.ebuild 1960 BLAKE2B 377cd4d25f3ecb59e6ba973e01b282afb55df90e6f34ad878585d4d58c9fa5a973c91cc2138a561950fc8d564f8c8d2418bb086228f28adb0ebac1c429e58c54 SHA512 08fe3518ca9628e5ee200ed7bfb74e6b62d1b58c1d545a126a64803cb56233ba57c187eaa252f800661fdb71bc984fbb145e0ee0a75e91a1178240bccfa197c9
-EBUILD linuxdoc-tools-0.9.73.ebuild 1667 BLAKE2B 7610425455383b2de6e6d2192b1efe2ff91f177cb7d57db0244c7a5318bff2676e52b383c973345797b4322ef6d67166ef6376d7d3d2eac14a17137b59d0ef41 SHA512 1cc1811a713b4b255daf959fb45294ce2aff9c97a6c8b8fefbe0ef4d229da09c98ea4be56087b0a185ad6fde30788ee6b578c72e3f2c82673918233581c0b726
+EBUILD linuxdoc-tools-0.9.72.ebuild 1767 BLAKE2B 46572536ad7d41da82be7618217966627236fedefbf2897c84f2b7f04453d123678b4d336447cf869e3fbbf963e1aa136c0468bd73e7977f74b18a285c6987f9 SHA512 04c2ca40dbf232b9d49453f6df9272605947755d3840edba6e10d3ec10b02dc7541552bb9908c050569e7315e2a5afd97bac2db3a4ae5850a212e9a43aff738c
+EBUILD linuxdoc-tools-0.9.73-r1.ebuild 1950 BLAKE2B 0b428db96cde36c532c276747445e939d719c08170f449df3533a4b1de899c194a585c0b18981db7d1f492697d3b103c8f315eec65ec2df0c07c474c3de8f21b SHA512 619c87b55840d9841a8ecb1373d66bb202d127ba8f9ea6ce2384073c3b5f33d2f1c6b058b645feb8b651f4fbf2b815c54a15c8384273a107a25d7c0ef8249a87
+EBUILD linuxdoc-tools-0.9.73.ebuild 1657 BLAKE2B 09063fffc91df4fbe7556cdbcfb83250233c966ef6151342a5a22293408304fcd615f44d7870a9cfd945bf10f692b6daced1e456b8534b6c6315a98ecadef3e3 SHA512 c4ad1f83a530da79f841af017b3b92b8af115c2de204c3862004637e166d7a3ae3c3d8ddd2071bf097fb65f1ec78ffa0e1270b4df964b130573d4ffd12d08336
 MISC metadata.xml 712 BLAKE2B b2f8030cb2de1321cf9bf1be3431ad04d9d87165d206846c48f1cf50042abdad7b33b935c0b4acde37898cdb1e71487be2db720c97dc39c211cae27ca75d53ce SHA512 99b997c23ae04221a18ccf4b033ed7718180fd597cbded2e615aba1ff113d0737974ffd52beb1253f4096156068b001a786fbe643b4827a2f85786957a89eca0
diff --git a/app-text/linuxdoc-tools/linuxdoc-tools-0.9.72.ebuild b/app-text/linuxdoc-tools/linuxdoc-tools-0.9.72.ebuild
index 808897c2186f..2bd2a8f42353 100644
--- a/app-text/linuxdoc-tools/linuxdoc-tools-0.9.72.ebuild
+++ b/app-text/linuxdoc-tools/linuxdoc-tools-0.9.72.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://gitlab.com/agmartin/${PN}/repository/archive.tar.gz?ref=v${PV}
 
 LICENSE="GPL-3+ MIT SGMLUG"
 SLOT="0"
-KEYWORDS="amd64 ~ia64 ppc x86 ~x86-fbsd"
+KEYWORDS="amd64 ~ia64 ppc x86"
 IUSE="doc"
 
 RDEPEND="
diff --git a/app-text/linuxdoc-tools/linuxdoc-tools-0.9.73-r1.ebuild b/app-text/linuxdoc-tools/linuxdoc-tools-0.9.73-r1.ebuild
index 0639b6ae8b3d..8e02b1acefcd 100644
--- a/app-text/linuxdoc-tools/linuxdoc-tools-0.9.73-r1.ebuild
+++ b/app-text/linuxdoc-tools/linuxdoc-tools-0.9.73-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://gitlab.com/agmartin/linuxdoc-tools/-/archive/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-3+ MIT SGMLUG"
 SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ia64 ~ppc ~sparc ~x86"
 IUSE="doc"
 
 RDEPEND="
diff --git a/app-text/linuxdoc-tools/linuxdoc-tools-0.9.73.ebuild b/app-text/linuxdoc-tools/linuxdoc-tools-0.9.73.ebuild
index 1c687efe9403..68f6240d0417 100644
--- a/app-text/linuxdoc-tools/linuxdoc-tools-0.9.73.ebuild
+++ b/app-text/linuxdoc-tools/linuxdoc-tools-0.9.73.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://gitlab.com/agmartin/linuxdoc-tools/-/archive/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-3+ MIT SGMLUG"
 SLOT="0"
-KEYWORDS="amd64 ~ia64 ppc ~sparc x86 ~x86-fbsd"
+KEYWORDS="amd64 ~ia64 ppc ~sparc x86"
 IUSE="doc"
 
 RDEPEND="
diff --git a/app-text/lv/Manifest b/app-text/lv/Manifest
index 75f57caecbf3..61312f74952d 100644
--- a/app-text/lv/Manifest
+++ b/app-text/lv/Manifest
@@ -3,5 +3,5 @@ AUX lv-headers.patch 725 BLAKE2B 64a570d256aae0e5d3c13c2c6a51c2311da1dff3057219f
 AUX lv-tinfo.patch 629 BLAKE2B 1923de4cb256d6752561f2489d1633a01987e4ad073bd28fcafcd2ab81c68a2ea8a4a278a0c4a8c1c09df581f0391fb2c469c65144ddf5d7975ba1b8b9ae5555 SHA512 3a33edf5ad11d77cd23bd27fbe071aacf83ec5367b100103954159a0dc4ba2856f3978d3b8c7f41c52006dc99097bdd9d127419f700d75cbb88b745ffe4694e0
 AUX lv-xz.patch 1415 BLAKE2B e4a9cbd5bb2ca71eb3c6eea8e132caf2f1bbfda84e8055654eac86948b7f0e57397af96beca2eeacf259f9258aafa5d03303a202ab5562236ba05f0adf22cfa7 SHA512 eb791a2e392070a01e372bbc6d0d4bc113fbb57394e50fb7a55e46ee4b0896177fdb1698db750b43e78b6aa120d0fef34ad4859fee5d4a1749c062a7afb6ec84
 DIST lv451.tar.gz 605082 BLAKE2B cbfdf1c4c90dc746de631e55e3d1e88335f22342991ca7d5bd4b3661803af4efc0c6dcd821ea58be6024fa7ce773ffaa0aa3844350b6f67dd61be09e2475cb70 SHA512 88c05cb06ddc56e7f16f30b38218ec3bf9c8ef6c3c2b08d5a3f950b6870b82417368ada3f14f183b0feb6ed32d144d71901ad8134e5f88ddec11fc7b9520e810
-EBUILD lv-4.51-r4.ebuild 1006 BLAKE2B 3b1d148cedb017ddce84cdd91b2652c9e583d64904d38fc2496e038ccb29e9d0e8f964513d893e211b48cc4a0a88abf9246fb5beff7daa2a6ac490c38faa1807 SHA512 538d091fe0d8077cf2135ebb467f65461d56806a301dec64e552683aa37cf3abd234192c626f7cc0b2e2b26eb7df5be2faaaa62d257e224405da08d01185a9fb
+EBUILD lv-4.51-r4.ebuild 984 BLAKE2B b5247729f6a722012c2e7264ce80f8f789a725da9fe2541dab5a55848e4747ad6081daa95c580573cd82b862605bdbd66639256eaaf7a7d45877ee494916a0b5 SHA512 6725013dd50cb01b2a1fee8ed6ea0564ad664296dbbfb76ad43193b1ac68f2edcdb5e0f37bd55627d0b3fe1c0d48d7dcbb6bb0a56ab940266f2eecf2b1ae5799
 MISC metadata.xml 358 BLAKE2B 56858cc481cec55add44dce0a02d0955fa787248b0a6861914fc450957d9b18ae256a698613d94479aca810cae4c264e0a91bf3ff89b52183c4945ce32a5dec5 SHA512 7b250d5ddc092d7ecd4e6f48175e1f57f1671af4f8529368f368071b777fd773e363e83bcd3cfee3c9352ee93c9c0bc205f940c4cb6601dac3164ad34766e6a1
diff --git a/app-text/lv/lv-4.51-r4.ebuild b/app-text/lv/lv-4.51-r4.ebuild
index eef46afd6200..5ee1d812cc66 100644
--- a/app-text/lv/lv-4.51-r4.ebuild
+++ b/app-text/lv/lv-4.51-r4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://gentoo/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ia64 ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="alpha amd64 ~arm ia64 ppc ppc64 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""
 
 RDEPEND="!app-editors/levee
diff --git a/app-text/manpager/Manifest b/app-text/manpager/Manifest
index 99b365feac3a..58eceea14335 100644
--- a/app-text/manpager/Manifest
+++ b/app-text/manpager/Manifest
@@ -1,3 +1,3 @@
 AUX manpager.c 1809 BLAKE2B 3f17501b90ca4af07e2bdebdc02b0dfd9aafe4dafe878852deeba30219593b1dc4310bd4a152ebf8bc4a58df61cf40fd3fe341cf0fd69e9cccfa43568a7ec67e SHA512 4f827429dc46993010d0096cb352920dfdcaf2cc97bf10e2155dfea3fda601c011467be65ca3f2e3f5c44cb26de0fd9eb58f7d875f75fd5f1db4b2c6cdabdca2
-EBUILD manpager-1.ebuild 651 BLAKE2B 6c04df97becf9bd83955cb9a3bba488e3e984b72f0c0eafe1f8508ed20b8265fbd9b1776dc3d8a0f14394a4c90cf655202c8a4647c396c38a63b009bb092c201 SHA512 229fce8e29190d848b1eb688800e7f73b7434a39298fb72fc4e14f7d6d9e0d0514e959131ba39d6238ca7e5cbec65c2480e7d83c1a287bb77d95c989e3b586e7
+EBUILD manpager-1.ebuild 639 BLAKE2B f12ae2709bae1bf2acd7cb53cba87b8175aeaf32ffdf7429fbdcfdaa9084564e76eae40e3d76cebff84ea87447e8b5fab6f8155adb7e7b23df4b55528c9452c4 SHA512 40852546c3fa16af4d8b3fe8a9cd0259dfae724c3605e8eaef042e6087a9f5b564b94437e4b26addac3ea85692f73380aee2dfb0606cdba0bdf1065522cda8c8
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/app-text/manpager/manpager-1.ebuild b/app-text/manpager/manpager-1.ebuild
index 5bf1e81a9d7f..b7961451e493 100644
--- a/app-text/manpager/manpager-1.ebuild
+++ b/app-text/manpager/manpager-1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.gentoo.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 S=${WORKDIR}
diff --git a/app-text/mecab/Manifest b/app-text/mecab/Manifest
index 1f8699551862..75b734de1441 100644
--- a/app-text/mecab/Manifest
+++ b/app-text/mecab/Manifest
@@ -1,4 +1,4 @@
 AUX mecab-0.98-iconv.patch 302 BLAKE2B 3644a66b1bdf9099ff0258a057c930c1b2e065836b0e6332211e4d04efbbf39da1de2788d90143826a1c9d887fcb63042e533864e746b7c385baea485cb93490 SHA512 c0dcaa8637f1c16a33bd4dd4007225a4f1ed3f0eebcda28dc7d92ec0a66ea16b5bdd956fb3a904af8070ce0ac2d6c9090b602b4705e73fac1100a845b3a756ce
 DIST mecab-0.996.tar.gz 1398663 BLAKE2B 97ea18a00c6f2284c994681631b84a572d244b741c8e30b5fdf5404b2bf80fdd4c724c803999955e36ee252e59e6644716dbdca55a6ffb2e4de52193d7f777bd SHA512 aca6d16f411b9ba9b6687242246aeb28ede6d6c6a9122d4a32da9d8e76e79b5f4af2c8e3b13ad9462b34e9d2994cbd9bbbedebac45609684db9b703da999577f
-EBUILD mecab-0.996-r1.ebuild 1184 BLAKE2B df8f8d801186c3346f5f231c51de9d6e13779dbb78b31f209c9da653484e771abd77e0e10858e60a1b7fae15a223fc12b026469c326a38a0b7aae8a0ee40e1e7 SHA512 932596d0bc8cac787b1ab3512b704234a0354daafcf1558cfbd8a54a66a52578a21d7ef183baf77667572d15e841da959a5b53f7f8b7144faf011eabcbc9e838
+EBUILD mecab-0.996-r1.ebuild 1162 BLAKE2B 80faeb4af9ffd68c6182c10fda7bf3fc9b9c3a03fbd80811f821d692a79542e48997890328e567630aa4f69ce49b2e98007178629b8039d6ac464b8d5742b886 SHA512 d6b139c0793ae459cbd3855f1b6c645b260a9dc9d0b79a5325a47e46b745e2749ef5249afba3bd57e3098a1f95ce5d5f995b42278574c94af75876f39092d332
 MISC metadata.xml 412 BLAKE2B ca6440887d39a7ded3f9d000ec965344164f69dfdf0e98bd070cdc531804d7c94d74fe9a6a3ead7876fd9bf39eacbe5649b3e5357b1083f30d78ac51fd0a7afa SHA512 78feb6a8557ee197f02071540a3c6836cebec69cffc3d32a22f8563008614da66a6b26fafa0dae24b0c21cb7492e203c096f67c5482d1ffe617098b0db0670e0
diff --git a/app-text/mecab/mecab-0.996-r1.ebuild b/app-text/mecab/mecab-0.996-r1.ebuild
index f4e881708c9e..cacc5fa860c4 100644
--- a/app-text/mecab/mecab-0.996-r1.ebuild
+++ b/app-text/mecab/mecab-0.996-r1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://taku910.github.io/mecab/"
 SRC_URI="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/${PN}/${P}.tar.gz"
 
 LICENSE="|| ( BSD LGPL-2.1 GPL-2 )"
-KEYWORDS="amd64 arm arm64 hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="amd64 arm arm64 hppa ia64 ppc ppc64 s390 sparc x86"
 SLOT="0"
 IUSE="static-libs unicode"
 
diff --git a/app-text/mftrace/Manifest b/app-text/mftrace/Manifest
index 8bb762a95b19..3ae265bafd4c 100644
--- a/app-text/mftrace/Manifest
+++ b/app-text/mftrace/Manifest
@@ -1,5 +1,5 @@
 DIST mftrace-1.2.18.tar.gz 79112 BLAKE2B 8c3be27985766690782338dec33955cbac80e7d8f4334ed7b62d3c52d7ea5784c14b12c87afd13099cdae226033ca3324b9e7c6e876badb75a8fb634f68a75f6 SHA512 db26a643a92cfcbb150c5f80af65b1ce6030a266023b4433ea760c3601092c42602617f52a49ce467cd3a4804aa6779e72ee38dc557dc03e1e1c86a36dbd54db
 DIST mftrace-1.2.19.tar.gz 78907 BLAKE2B 894ec3c428020cad8f2e408e141b58d7f1e0969c59e65ccb5379e346d735845f8922be4e046ca8fbd18cfd7c3b8e2179ed7af4756ddb4416b6ad42bdbff27f09 SHA512 410739ced17c5e5bb82c286b6b935c9d8d46299f9c04f0ba4c97df9ada5d7e9c778c720fb8a2377eb6df3c629a6e7264836fe7675733cf60197a817477dc49ee
-EBUILD mftrace-1.2.18-r3.ebuild 880 BLAKE2B 8acb91b62b98111984b27ee23b7a55840ac5b931a885bceed004851bcdc770f4c7a7a843bf503d4e19b7b0d9bd0c78cfca9490e5febe9799fcb387bc01b60b03 SHA512 f98ca43a58e9a15945772880dddb0c82df88469b02913c1b95f5e8b748619a189b8a7b98fa5e90ca6049f3a7213056bc1e97cb4cf9575b209a9e3c40e6dba651
-EBUILD mftrace-1.2.19-r1.ebuild 883 BLAKE2B 68fe01bcfcac4e4e38c6cb40546c55316323990d50f6baf4ab0440d105659ef57c4fdb9aed4773bd9a2554e82c96293b3f74dae35cfb8c512e3073ce948ea4e4 SHA512 7641184886ca69f49686a4bff64445660d73109ba0dd1a88bf869b398413d54ef795254cb06e06c73a87346734d8b7c704e0b843d10e74fe2678dfafc4430689
+EBUILD mftrace-1.2.18-r3.ebuild 870 BLAKE2B da64abe4b474e3fda7b0995559e2a849f1d015d82700693fcf18a70f1b21743b4af79b92935caf3a4afc8daa8c582925e7ff917042687f82c56215414ad71221 SHA512 c993edfe9573492bfba2baa103cc2694a6c9abe96cdefa76cdd09bbe3aa85c515a313a365bd14be1eeb897a046990fd3e3fb70bcf72ef65b28044b6252105fe5
+EBUILD mftrace-1.2.19-r1.ebuild 873 BLAKE2B 7e5b6546db7cbca2644319a336ec817b853ae017d26c61ce110d827a33bf2b3b9e15edb9c64755f50bf9b4119af46788491566a8a49909ffb9c8dc6a7cef4ca8 SHA512 6de1ec0ac3e7d4cd60f47a735dd7e3a5f15e744b7c26b016915cd1019f4526c8f537ecd3aea0b4c2dabe35a4d635a1ce1c62d90812f021034b7358ff2207d479
 MISC metadata.xml 340 BLAKE2B c05678e707d8559ee9e192a80e8911ed8caf3279f8b240e2554bf2e60a6f10c0c1597d12ee3d236fdcf4e9b10aea677972c1a443eabf507d37f6adf9cc7fbcff SHA512 f8317a47d8515f79517a74e966aa31a05c9900a5a4aa52d9aac86b92d15553d03e6d82051312eb689d62381be05ab0f2fe9234bd520e86faf8226aba0cc9ba21
diff --git a/app-text/mftrace/mftrace-1.2.18-r3.ebuild b/app-text/mftrace/mftrace-1.2.18-r3.ebuild
index 059796f95a34..3487a1885759 100644
--- a/app-text/mftrace/mftrace-1.2.18-r3.ebuild
+++ b/app-text/mftrace/mftrace-1.2.18-r3.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://lilypond.org/mftrace/"
 SRC_URI="http://lilypond.org/downloads/sources/mftrace/${P}.tar.gz"
 
 LICENSE="GPL-2"
-KEYWORDS="amd64 ~hppa ppc x86 ~x86-fbsd"
+KEYWORDS="amd64 ~hppa ppc x86"
 # SLOT 1 was used in pktrace ebuild
 SLOT="1"
 IUSE="test truetype"
diff --git a/app-text/mftrace/mftrace-1.2.19-r1.ebuild b/app-text/mftrace/mftrace-1.2.19-r1.ebuild
index fedb8709080c..8f79db97ec5a 100644
--- a/app-text/mftrace/mftrace-1.2.19-r1.ebuild
+++ b/app-text/mftrace/mftrace-1.2.19-r1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://lilypond.org/mftrace/"
 SRC_URI="http://lilypond.org/downloads/sources/mftrace/${P}.tar.gz"
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~hppa ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~hppa ~ppc ~x86"
 # SLOT 1 was used in pktrace ebuild
 SLOT="1"
 IUSE="test truetype"
diff --git a/app-text/mupdf/Manifest b/app-text/mupdf/Manifest
index a6d1d3e0ac63..aaa68ad1778b 100644
--- a/app-text/mupdf/Manifest
+++ b/app-text/mupdf/Manifest
@@ -10,6 +10,8 @@ AUX mupdf-1.15-openssl-x11.patch 735 BLAKE2B 03e53970a145db913bad9c03de899ffeb7e
 AUX mupdf-1.3-zoom-2.patch 214 BLAKE2B b9d15ecf6978c4f5c865be0b913448a25852b4a768f8be99b8feb68b1511b203cd22cb7020ccb6447d31082d02a9f3ee80e3ac0153408f3b36db2bdfb68c9f6b SHA512 95bb2d68246dc22eb0fb6e8a312c0f02476f356ee219c417dfa06473b5944d9e63ae6778cd967c70e60fb933eee1aac337efd2476b0bc791df1c69f7b7b822b3
 DIST mupdf-1.14.0-source.tar.xz 41602372 BLAKE2B bb680038344af16c7231a18a009c0d04c5f50b3fcbaf061c9f5907f35d79eea93eeced7c2a43a06a963b93b39c74d0246c5fdad35655953d1aa5efb79737265a SHA512 bd41125dac1a81b7dbbfbb5f5e06e70bb601854731e0945983688da5d8d7c0bca9771fff2e4b6d9c36dbead6146f0a866ed7427d58e13d02ed6dfd94dcfe54bf
 DIST mupdf-1.15.0-source.tar.xz 39828864 BLAKE2B 15d0e4244062a91c7055b98fa61f2b02e0e3effbcf5374fe589f5a0d2ba2a2d4a59318ae3c0f28d866c6b07554e4b1e65ee9264c26a5f4524ef34e998d6c3320 SHA512 ef19362e8b6c2843e214fd2fcdcc9ba91017884383f7e1cfe08ef1f528a233820475ddfdd8aef481e6e37ae69e8b64324eb4b30699baa8055e99e47c2fab31dd
+DIST mupdf-1.16.1-source.tar.xz 45800404 BLAKE2B bc4158a457056c55db52a518efc13c289cca537c29a6b563046297dc225f3ce0add781adb8520c4d0829d653ed0539042597e341cb21c4fb4c462ed422bf735b SHA512 fa657e6b9251aff91c25e91b335ea829b797dd91a759505bfd7259f8236613f590a044bc741e9b0587da55817a1ab8c1499c067d65d683d099259d06d91a8f50
 EBUILD mupdf-1.14.0-r3.ebuild 3229 BLAKE2B cea1f272cbf41f3fd1bf7b576124cb279e0f6cd9aa52c3ced218c09d77f6f1968bce066288afba74666d6bbe20cdf61958f5b721ed347b1667811900fb852069 SHA512 292695fe366b7f1688b90841d7d1cf5cf11a4d56ad0b6ea8fb3b87bde92c6a21183d42a1ae0baf4ef017d748be6d3a31d3616daa22ca17f797ac86ffa994fbb1
 EBUILD mupdf-1.15.0.ebuild 3505 BLAKE2B be357aae0944fda68a0e95cf12e2936ec94428d5baa645399add9f87ca5127de85898f22fb56762d7fb88d6ed3e61874723f7668fb9c4a2ac942585e3ddbde6f SHA512 41209dd40db318acaa224a031672fb9281dd674a6803b789da1cd673ab18af08c4fcdd2f5d82ccc5076026fec056986d2b67f1adc4b4cf3a7a0aca56787d7b75
+EBUILD mupdf-1.16.1.ebuild 3432 BLAKE2B cffcdaad02dc54a982486ca990e4b34526565556e036303e5ecb9e77251975557734a2367fbb0081b806b8c57e47f16515bb6f1751ba4ae656b26ec4219c4062 SHA512 910df1f9d5f8d431b5d3a54ef954e9c54ad2f7aabbb08c892a26ebdae3fc226272f9dc131cfa7859a58b830612bdee9e7d648b05fb65a7b3efdd203577bc5e6b
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/app-text/mupdf/mupdf-1.16.1.ebuild b/app-text/mupdf/mupdf-1.16.1.ebuild
new file mode 100644
index 000000000000..58fd2c474994
--- /dev/null
+++ b/app-text/mupdf/mupdf-1.16.1.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic toolchain-funcs xdg desktop
+
+DESCRIPTION="a lightweight PDF viewer and toolkit written in portable C"
+HOMEPAGE="https://mupdf.com/"
+SRC_URI="https://mupdf.com/downloads/archive/${P}-source.tar.xz"
+
+LICENSE="AGPL-3"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="X +javascript libressl opengl ssl static-libs"
+
+# Although we use the bundled, patched version of freeglut in mupdf (because of
+# bug #653298), the best way to ensure that its dependencies are present is to
+# install system's freeglut.
+RDEPEND="
+	media-libs/freetype:2=[static-libs?]
+	media-libs/harfbuzz:=[static-libs?,truetype]
+	media-libs/jbig2dec:=[static-libs?]
+	media-libs/libpng:0=[static-libs?]
+	>=media-libs/openjpeg-2.1:2=[static-libs?]
+	virtual/jpeg[static-libs?]
+	opengl? ( >=media-libs/freeglut-3.0.0:= )
+	ssl? (
+		libressl? ( >=dev-libs/libressl-2.8:0=[static-libs?] )
+		!libressl? ( >=dev-libs/openssl-1.1:0=[static-libs?] )
+	)
+	X? (
+		x11-libs/libX11[static-libs?]
+		x11-libs/libXext[static-libs?]
+	)"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+REQUIRED_USE="opengl? ( !static-libs )"
+
+S=${WORKDIR}/${P}-source
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.15-CFLAGS.patch
+	"${FILESDIR}"/${PN}-1.15-Makefile.patch
+	"${FILESDIR}"/${PN}-1.10a-add-desktop-pc-xpm-files.patch
+	# See bugs #662352
+	"${FILESDIR}"/${PN}-1.15-openssl-x11.patch
+)
+
+src_prepare() {
+	xdg_src_prepare
+	use hppa && append-cflags -ffunction-sections
+
+	use javascript || \
+		sed -e '/* #define FZ_ENABLE_JS/ a\#define FZ_ENABLE_JS 0' \
+			-i include/mupdf/fitz/config.h
+
+	# See bug #670832
+	use ssl && use libressl && eapply "${FILESDIR}"/${PN}-1.14-libressl.patch
+
+	sed -e "1iOS = Linux" \
+		-e "1iCC = $(tc-getCC)" \
+		-e "1iLD = $(tc-getLD)" \
+		-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
+}
+
+_emake() {
+	# When HAVE_OBJCOPY is yes, we end up with a lot of QA warnings.
+
+	# We don't use system's freeglut because upstream has a special modified
+	# version of it that gives mupdf clipboard support. See bug #653298
+
+	# As of v1.15.0, mupdf started using symbols in mujs that were not part
+	# of any release. We thus go back to using the bundled version of it.
+	# Bug #685244
+	emake \
+		GENTOO_PV=${PV} \
+		HAVE_GLUT=$(usex opengl) \
+		HAVE_LIBCRYPTO=$(usex ssl) \
+		HAVE_X11=$(usex X) \
+		USE_SYSTEM_LIBS=yes \
+		USE_SYSTEM_MUJS=no \
+		USE_SYSTEM_GLUT=no \
+		HAVE_OBJCOPY=no \
+		"$@"
+}
+
+src_compile() {
+	_emake XCFLAGS="-fpic"
+
+	use static-libs && \
+		_emake build/debug/lib${PN}.a
+}
+
+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
+
+	dosym libmupdf.so.${PV} /usr/$(get_libdir)/lib${PN}.so
+
+	use static-libs && \
+		dolib.a build/debug/lib${PN}.a
+	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/openjade/Manifest b/app-text/openjade/Manifest
index 66a16b7340a5..1ebbb7d81765 100644
--- a/app-text/openjade/Manifest
+++ b/app-text/openjade/Manifest
@@ -10,6 +10,6 @@ AUX openjade-1.3.2-respect-ldflags.patch 500 BLAKE2B 65c8a9a71b7141e6fa8d47220e4
 AUX openjade-1.3.2-wchar_t-uint.patch 496 BLAKE2B 0576cdd89a5d9c187eba41f740662d2d5e9ba5414ab931583f1e791ceae948e381e558f8337399e6b853573388041288d0f42d7c45e1f34befb8d65bfa8b03b7 SHA512 e483c08b6ea63e78dfc6351670f7bb6a55927f458c6e922c542981b25389168f32eb79e16554a41c102b19b7fa12489c0303beb35b839dfc9767b5ab9e5e1027
 AUX openjade-1.3.2.dsssl-catalog 269 BLAKE2B 1faaba3f7b351d312c3499005d9b3d71186b8e1cdd8f2144c8b91f384cf8e2e70763bbc929beba64be019b430ef8166d726688f4d1ddeaf5f9aa05b301fae60f SHA512 fba4332fb995c05ae9f9a83cea5422c11ae37ec99b4e37f40edf11acd5be011cff9c7d3b0fcfd0bf2f9569bbe991374678811301ca07a7ef033556309012e340
 DIST openjade-1.3.2.tar.gz 894834 BLAKE2B 972251c63d27f86fa3e1a0760e05213dbac440e7222c81c67dfa6a5c216922ef575705bb7a6093306d6aab771b8a9e1335fb0aaca4b893de5a4d792dc0b55da9 SHA512 c39f70ec8020bd7a2b3e125cbd146b49ddb57910a042bd212da02722617ed5681f32dab60acc26ab89ac658997c6f604911d7be3be391d6278267481f3bcf2f1
-EBUILD openjade-1.3.2-r8.ebuild 3707 BLAKE2B 2330414eb9f418cec64dd1bcc2775fc63ebac0ff2404f611d08563bfebc615bb4002bd3740f86aba08aa5da62fb12a4cc24c2d50904ad1516f67fec11382a4fc SHA512 0e532bdabd29029898127229238b1404a57a0e3fc6b747c424c8bfbfe0bbf2e1c53633a839ade8452b8c705873b6fa261ed3b3c9093e42839c81dbb8c7147d3f
-EBUILD openjade-1.3.2-r9.ebuild 4356 BLAKE2B 76619334e3f27845a87cb795e0f171bf182692d9e86dd09b8e8b39709f901e4632ae648cf6e54355d20a208995a95eef13e430cff565b8a70fdf819ae0c5ea41 SHA512 a422c1417fcde1dfa5bd885aa0d06731b4de86a3ab93f02672b6e21e3f4305316600909e9dd1ac63ff686a5ba295d5f48dab43c069dedf4d996fd9055c0d6705
+EBUILD openjade-1.3.2-r8.ebuild 3685 BLAKE2B 8fa38e1343de5dffe1477aba279158cf1a46d20b6b9f2bbb33806b32f9ee2e80a7aea2b9f90068bd4c671d892f974f15decb8a178aead7d3da66d68a798266cf SHA512 04eb2d1e1080015346d2ddd136c71fb6328973e6b94814fc2a90d9f9f7743055d117825017cc165f37f333a8a6f6c683fc4bdd4103c920d6313bc71c0cea14fc
+EBUILD openjade-1.3.2-r9.ebuild 4330 BLAKE2B 2363c44ad5070a05bc0201928ebfc53a8c3a28ce6282a8f99f3a2475e9721f87a1b772c710c271dcfbf536b1a12fce991c4b6463b19ad4126e5684d7814d68b2 SHA512 3aa9d06d5cd7fd2d90ed1c7ce6ad21c946bb1e02c182b53598b4a838ceee7a846f6a1277ce8b3a8c7be8b911905693c1039128f3dbab00ddc505bff9766be9b8
 MISC metadata.xml 325 BLAKE2B 3cecdaaecd44faf19571367fbe80cb75e687e6231c26c696cc9e7412aae427b95a4967cad7415b9df5e499bdb74c6b6fed54edc52470ff207cbba43e423ae223 SHA512 4e1e28e8c1722c9bcbbc2a8487ad373eff6679f51a5213850e11ce2d7d569afbaa093d215965e4fc010a9fa3e80121949a3db9fb98bfaf8ab70eafead9e14657
diff --git a/app-text/openjade/openjade-1.3.2-r8.ebuild b/app-text/openjade/openjade-1.3.2-r8.ebuild
index 90545f6ec1f4..7388015dfa8c 100644
--- a/app-text/openjade/openjade-1.3.2-r8.ebuild
+++ b/app-text/openjade/openjade-1.3.2-r8.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/openjade/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 RDEPEND="
diff --git a/app-text/openjade/openjade-1.3.2-r9.ebuild b/app-text/openjade/openjade-1.3.2-r9.ebuild
index 9aa17662d63f..b86fbec7c52e 100644
--- a/app-text/openjade/openjade-1.3.2-r9.ebuild
+++ b/app-text/openjade/openjade-1.3.2-r9.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://downloads.sourceforge.net/project/${PN}/${PN}/${PV}/${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv s390 sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/app-text/opensp/Manifest b/app-text/opensp/Manifest
index 83fd73ece2a7..90b0f9b0816d 100644
--- a/app-text/opensp/Manifest
+++ b/app-text/opensp/Manifest
@@ -3,5 +3,5 @@ AUX opensp-1.5.2-c11-using.patch 2626 BLAKE2B 16ff8ba1701831fa0c87e0788f8b420f1d
 AUX opensp-1.5.2-fix-segfault.patch 747 BLAKE2B 544dbb8a638d2fc8fed5c7426e828d1524f4756e6882ac837b4cf3deab4e039a0b66564431b1849d9067f6071955f82b8057cde5168094da70b1419844b000fe SHA512 e0c72df8e8b191c6cecabcac550cc52918bbff7c2fddf8099ff4403de0fe817c1f3f5deb44b4c33e9d135a97a4fd8978c4090f6740c99dbadc6f9b06e24c41cf
 DIST OpenSP-1.5.2.tar.gz 1521390 BLAKE2B 2c6f8dfc721c77ab223aa67e90c8dfb45855b74fdd382ac98303c6fb23af08019ca96b5430bcdb87b9e86fc333114bd8b2e5f243c87f2cf84ee04c880c8c309b SHA512 a7dcc246ba7f58969ecd6d107c7b82dede811e65f375b7aa3e683621f2c6ff3e7dccefdd79098fcadad6cca8bb94c2933c63f4701be2c002f9a56f1bbe6b047e
 EBUILD opensp-1.5.2-r3.ebuild 1975 BLAKE2B 2e33accb3db11106c812195cb854bba0f814e3da5422a0e18278d373c73f03b7d9eb3ee31d231189ebfbe374b62bfc1927c47e85ce16942f006063f5f4b871be SHA512 6234b977e1d16e2de5271663800b86dc2b018d365e805e510e704d5d6f8085da1ce5a0d141735bb45fadab1ee9b792f3e8a2e9c1b8c0fc959fd12457d29ee039
-EBUILD opensp-1.5.2-r6.ebuild 2074 BLAKE2B d4f4c75b87fa5b38317e15c87122fa4a1b007d5d29fdfed9ea4191ffc78bcb59fbe3ed9e1badf0a1a0e4aaa0adb58c623bb2a50e563b1cb9cdf9a122c1534958 SHA512 3c9ca72637a3aae7cd011ade657f20f7b975307de571aab1f404194f6de549a571db05593b22e9440da45cb5d4c2c6d6450cc347aeb61a1912f1fc7906a31f45
+EBUILD opensp-1.5.2-r6.ebuild 2052 BLAKE2B c87e9ea747c7cab52374219f3b65039f13a09d1cec034662d583db591a352ea580128cebb4e8e1c2762d6fadbb6f85a0a33de7836f9321e412e14c7adcc06a44 SHA512 136a42ac17642b1edf6541eb5d24295eda6c9d2766c32d76c309a39da916c363e1dd7b36a64a3187adc04ffd5ff59e8528ea292fdd8901797884de6701650844
 MISC metadata.xml 418 BLAKE2B 2650036a138376fceac69b4ca2ec3c7f2acdc958760902387592c5c5953fa37bbb41e643ed1133975aa8ec48306aa2cd654b7754272e06805f5f134b7dd2f63a SHA512 d69bb957dd6b4af7a13527a7c6fb15b7df9ae62cddafb561557654d4076c3e455b28ed16c081fe6c8843c0ed9ec26bef4d26035ac6389d6d95523953bd940008
diff --git a/app-text/opensp/opensp-1.5.2-r6.ebuild b/app-text/opensp/opensp-1.5.2-r6.ebuild
index 9059b26d2475..73415f181564 100644
--- a/app-text/opensp/opensp-1.5.2-r6.ebuild
+++ b/app-text/opensp/opensp-1.5.2-r6.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/openjade/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc elibc_glibc nls static-libs test"
 
 RDEPEND="
diff --git a/app-text/passivetex/Manifest b/app-text/passivetex/Manifest
index 7023e210d5f8..cccacd03f67a 100644
--- a/app-text/passivetex/Manifest
+++ b/app-text/passivetex/Manifest
@@ -1,3 +1,3 @@
 DIST passivetex-1.25.zip 1190258 BLAKE2B bc82a0414c5df9b5619b099899ac3970943672fc3b76fa60549ba36dd60861b591c62174f1f55b58b0f51458bc961ce47fee9b991795e2d321daf3ae4b328e9d SHA512 083ba4fab9fee327ed3fef5bdc48b415138951432dcb53b1478d1ba16a92bebc1cfc4b8590e2aa647a32c7658124f2aca8160230176c623bbf531e996c43622b
-EBUILD passivetex-1.25.ebuild 807 BLAKE2B e6ef022eb7890d2fdb21b6c74d529a913d2328023c9a2291cdf002dab8791664bc8cf647cfad966b3e45abefcec01a56369eef5475c598d75e0e457b98709a73 SHA512 2d28d89c1c635c2a858ca2da99b7394b1509bd417be4f66991e58d9fb6a782a3a1ebb2eae107c84d5a17fa3ab250f7b5251e9fe3b2af79fec5c1c4199521faea
+EBUILD passivetex-1.25.ebuild 785 BLAKE2B a7f6b38fc7c5752e12558a44c50d852ee756291edaafbfb2618df29c2fef2113a7ecd9e833ed35e0108fcd85a23b5d31303a41bfb616c56c0fc85a31598b151f SHA512 62e5c96310690d4b06fd495faf5ca5fdfff1d1c83c600607a345c17b7948abc19ecf55877f74db2d445fc5d531557ccdfb820ff9de85dbce27f00760ac7d1e42
 MISC metadata.xml 245 BLAKE2B ee3a163cfe0a4bc59c0dfb46f9ddb580e2d259b4d0e33cb4e684eb9e6d4b901bf97c6edd891f3b75a613a782f1b89318d0ee3ec9bee4e34c4441d9e8f4267678 SHA512 1653777623e2c15e1ce13229e396723b2cc9c214983e0f8592de98c01a31badc6c38c6735ed44f937d145883b43fb6f049af3eddb9ff96b18c96ccf8f67dd690
diff --git a/app-text/passivetex/passivetex-1.25.ebuild b/app-text/passivetex/passivetex-1.25.ebuild
index 618cb7a179a3..6c374b61eb8c 100644
--- a/app-text/passivetex/passivetex-1.25.ebuild
+++ b/app-text/passivetex/passivetex-1.25.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gentoo/${P}.zip"
 HOMEPAGE="http://www.tei-c.org.uk/Software/passivetex/"
 LICENSE="MIT"
 
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
 SLOT="0"
 IUSE=""
 
diff --git a/app-text/pdfjam/Manifest b/app-text/pdfjam/Manifest
index bf6426cee8f1..c3774a1d0d06 100644
--- a/app-text/pdfjam/Manifest
+++ b/app-text/pdfjam/Manifest
@@ -1,3 +1,3 @@
 DIST pdfjam_208.tgz 180725 BLAKE2B 903ce4f0874c9fc9ad23f3db37b882596589d6470dfe9289f65a72fb66ff843bbd49b52086d7b2d2cbbfb1b6406cbbda64d46b933a853d5d681ef88d4033372c SHA512 728c8d304c6d2af773980d20ef4a4be6e0a5dad286ad8cd00be9b1687f5024e00032a750c10c74dcd24431f081368d02b76f03cc5bb1c8725a060cd70be0fd8c
-EBUILD pdfjam-2.08.ebuild 627 BLAKE2B 6e60296a7fd5e950879b068461f3f686d245eb62ecff42e2a5184ac35ea4d228acbd008c91e4a12fbf8fa1183d332b51c8e51eec315c656595356b49a30b549a SHA512 4bca91908dad28c739f8c461c407c270803b018887a9a4942f0541303ec3bc487aa0a4e84b56bd949b8e15b63df2eb27fe686817b8b24075969c28f3e7c66e89
+EBUILD pdfjam-2.08.ebuild 605 BLAKE2B a15b40f8f8bb6c1d696528706d38ea5471cc23170068e886b4361de4cd2a49a2e4ce5f888fb4037716efa816e82be3b7206c6e7a5d7002e89865bfd7f4ccb58c SHA512 f3b3cc6d4a5e64dbddfdf8029c9c18a8c3ff156735047f43ce4bc20d12f3e0e184636928ce78aaa7614429c36db16a6143c9e42c3691ef7f45997300ccb1f8a9
 MISC metadata.xml 249 BLAKE2B 1b34ce77c092c0664a18f32525d158d41bf36ab7ab7a4b9d01ed37e1e3dda3d58849d5b1375065c4e5591f6b09b2a93e88a624d399c495a0b1125edb30ec172f SHA512 895325641a176c848988fb5f36cdb567b584d22f6e778b3de674de480cbca30b7cf8f12ecbbe1173a63e3229889e1e0f5efd5afea4f0d4c429ac236598f80f1e
diff --git a/app-text/pdfjam/pdfjam-2.08.ebuild b/app-text/pdfjam/pdfjam-2.08.ebuild
index 02f5c07608c9..2b3e33154105 100644
--- a/app-text/pdfjam/pdfjam-2.08.ebuild
+++ b/app-text/pdfjam/pdfjam-2.08.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.warwick.ac.uk/go/pdfjam/${PN}_${MY_PV}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE=""
 S=${WORKDIR}/${PN}
 
diff --git a/app-text/pelican/Manifest b/app-text/pelican/Manifest
index a7ddf4a8ed37..530f72ea953c 100644
--- a/app-text/pelican/Manifest
+++ b/app-text/pelican/Manifest
@@ -1,8 +1,10 @@
 DIST pelican-3.7.1.tar.gz 784605 BLAKE2B 42adef016f54a931e4fef225af9a4c5c880b66c96660c2a34137a425f879688822ddc8bbc19805444bf2b49369c3dccf8a5303748ff9e7cbde3910d6ba501652 SHA512 9e04e6a2009cc134f74410d8c8349831467192e7524287e23cad0b68232f2b5dd04f5d98505222d71eb3441e466bccec1cafc7f6e3c6bfcb4c5e57e4ab0fadda
 DIST pelican-4.0.0.tar.gz 1314626 BLAKE2B 18924209949b43063416f2e2c6e22a5524a36bab79a801f7cc6953c0822beb1bd5b05e715f5bcdb7c4877aba8d7a62cf4276e8abc43406f3c6fd7af8ef0c7c2f SHA512 5d98f5e13e6dde6b27cc299f9fb166edec79efb3fc53b29567218e0d0ba164989ce51830029ec8359697bc039661f6b0ced8d4155105e29098c038840c97d253
 DIST pelican-4.0.1.tar.gz 1314716 BLAKE2B 1fbe01f5df7f1c730d7a45429369311f77c7e8e278a05cc037e03d8193dc2ae9075ee1346fea072a08ee5d73baf9aaed8c1f8f210fd4331754accca9ebffa4da SHA512 26f91046124bb92de6fa31d17ab89f743cf9408c15b9b259875e2378342133313368418da083d1d4abc5de0537806a9dede327719c8fcf89d135805c47618a4a
+DIST pelican-4.1.2.tar.gz 1329126 BLAKE2B ec6067b9df2bf37877ca23602228b2eff035221ef16ed1f185e2806fd661c8b733603506f3f1d9516422bd8009a0712f726d40559a39b0d100224ee56c3e706c SHA512 9a20e3a16e2caa15b6a47281d4acd6ada344292f011d4fd30c6ac786aebbccffd9cd0b2fd80471d3a383d4cb0ba779c51653705572760e62f6c2d3d49a862a67
 EBUILD pelican-3.7.1.ebuild 1468 BLAKE2B 0fe9e784ad7514b9d92e35c2e6f07bd5d8b5a9fc68e83c7e1367968c809b0f90566f7109789b142cb56c7090e6d4060ea0b754bed7614894848ce18829ef6678 SHA512 f6e81e8e93d6de41516b6e0b018974e8bd8174f10b0bca7047859644a1fbac3b0a199da331cce29a0e205362a0f935000178f4212bc27692a34f592fc8a9cc8d
 EBUILD pelican-4.0.0.ebuild 1486 BLAKE2B f4359af3f68b0e9e05d7238d3b3cf4efe58bd494b059f13d8e0af92d65f55bbb924b9cb672fcc4651e7dca101051bca43073353895cd6a2501f3d91e3c80a20a SHA512 b87631cf9a40de695173e114cf3fc347a8d7ea876174476b997c7ae9e49d2c7d5906ad90e25c72af401d236e62ee3d653bf88029ca3ab333e743bd3ef82f7a0a
 EBUILD pelican-4.0.1.ebuild 1486 BLAKE2B b1f81ae6d9924380f7181c0af735e3436fc727a14f1a7604e61bf70e7698b73865801cc95bcab17500f91a52150b1416e1a019bc2742423a9144176fc0ae5f32 SHA512 676cb7c561ddd1770da789dffa866aea2725b3eb3c9c0436758aad7c909c8d1fe26b8c7d6a739e8cbcdf3400444d0c217c46ccf2973243ad48b54cebf14c0843
+EBUILD pelican-4.1.2.ebuild 1486 BLAKE2B b1f81ae6d9924380f7181c0af735e3436fc727a14f1a7604e61bf70e7698b73865801cc95bcab17500f91a52150b1416e1a019bc2742423a9144176fc0ae5f32 SHA512 676cb7c561ddd1770da789dffa866aea2725b3eb3c9c0436758aad7c909c8d1fe26b8c7d6a739e8cbcdf3400444d0c217c46ccf2973243ad48b54cebf14c0843
 EBUILD pelican-9999.ebuild 1545 BLAKE2B 7571deb70118ea2764b71544a3adcbf863be67713a68f5a71dd336397c69fcc9bb0c285dc7ea7a533f72547be398fc5dc43c7440348b1a386e55a583c4d55d6f SHA512 f7f9c00e6905be764bd93a2612460a9db99d5e57c2bbb8d3df5f4164085ce1455a41ff42541e24ad6cd5c1afcc3bb5d38761e3362ac7f4f9d4fdd3287ec3670e
 MISC metadata.xml 520 BLAKE2B bcf1bbb92ce3d045a3dde410f9566322f5605796b3fdc1947b1ae08967f2af21319922001d1942ccbb46dda2a911c3ea4efacf95ae67af32f8a3183c734ab2e1 SHA512 1a10d48a737dd95edb40e5190e45bddd30fdbe50db08394d21834d1ebd4f7e5b267477a52f90934b9ba92252b5a2b1d60e208399ab96559d169f550055c3e65c
diff --git a/app-text/pelican/pelican-4.1.2.ebuild b/app-text/pelican/pelican-4.1.2.ebuild
new file mode 100644
index 000000000000..c165da40c9a6
--- /dev/null
+++ b/app-text/pelican/pelican-4.1.2.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+
+inherit distutils-r1
+
+DESCRIPTION="A tool to generate a static blog, with restructured text or markdown input files"
+HOMEPAGE="https://blog.getpelican.com/ https://pypi.org/project/pelican/"
+SRC_URI="https://github.com/getpelican/pelican/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples markdown test"
+
+DEPEND=">=dev-python/feedgenerator-1.9[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.7[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	dev-python/unidecode[${PYTHON_USEDEP}]
+	dev-python/blinker[${PYTHON_USEDEP}]
+	>=dev-python/six-1.4[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	markdown? ( dev-python/markdown[${PYTHON_USEDEP}] )
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/markdown[${PYTHON_USEDEP}]
+	)"
+RDEPEND=""
+RESTRICT="test"
+
+DOCS=( README.rst )
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	if use examples; then
+		insinto "/usr/share/doc/${PF}"
+		docompress -x "/usr/share/doc/${PF}/samples"
+		doins -r samples
+	fi
+	distutils-r1_python_install_all
+}
+
+python_test() {
+	nosetests || die "Testing failed with ${EPYTHON}"
+}
diff --git a/app-text/pinfo/Manifest b/app-text/pinfo/Manifest
index 6fad7d692e88..7d61bd78ff30 100644
--- a/app-text/pinfo/Manifest
+++ b/app-text/pinfo/Manifest
@@ -12,8 +12,8 @@ AUX pinfo-0.6.9-as-needed.patch 457 BLAKE2B 5e104b202a66c377cad570d3427043fe8273
 AUX pinfo-0.6.9-lzma-xz.patch 614 BLAKE2B 0b84247de91a42f75d0664f4ccab23e3d57bc66f6af2444e8b9dee2c0e6edb5afad1d467725507c9618947463cdd2f221024c7feb387282ebafcb6bc62741c89 SHA512 8e3ec8a98347c061826cc913c09fd2177d0f8625947c319b527e85d5ae3dcbf7dafb34b5f4a5e2fc9639bcc4db45afdea7dda6db6a88001e1c6a3994b4847ae4
 DIST pinfo-0.6.10.tar.bz2 133059 BLAKE2B aaac23583510f42ac8a0c71a380f2bc76c4db6d78518bb4d5399c100bf0aec291c869576b18313e00f8572610cb967c3acb5f8d643c48f1295fd2efa8e16e3e6 SHA512 d3aeb93a668b939a2be7dd397ef5c918a8d108a1a7613ce39d4ef2faafbd549582a35d95c74c1dc74f4c86c9f2bf09b7bca7b5006c5a79302403dd906e8d376e
 DIST pinfo-0.6.13.tar.gz 157103 BLAKE2B 18af4a5ae1bbd2abccb174ce1a3a16e4d17207a10015042723c58f80695c2580ca0c1c60f4f6f4f08e67eb01316fe48cd848a887e65159a6cd4463eca14bdecd SHA512 739e24821a363a087fb9df5651694f051286d4a15c3e51f2421a2aa60b1efe1da558b959ba22a0094e22854534ea5875498156e8ea2e198e31001aecab1a18df
-EBUILD pinfo-0.6.10-r5.ebuild 1327 BLAKE2B fa65a2d59989d50982921aaf64b2f7e98fb3c4ea82e2c1537656d30159d44a29df0ffb0c8034dbabcfb4b82386bf15b7f4ccf86f5fcfb577eaa667cab7ee22b2 SHA512 f5132c2d41aba6c9cc41076571d70266db613f28ce63c1c3d3b3902c011d3860004cd910280527090b72c97a7735928ae2c3e8f85f96139134bf847d6ec624ba
-EBUILD pinfo-0.6.10-r7.ebuild 1440 BLAKE2B 1a52c7a2f04d51b7788233a0b0e4f4ff3367a798abdfe2c1c949655431652e1fffccc0b8c582143f596e44d4753a1e67d9b19a3b2f4ed5442260556015260990 SHA512 001351b50d182fea1772686449629ceb9946625f0d13d1f13219938ef0a3dfaaeb142d3fa7d8dd3dd1f28cb359da3a526d76654875cc6c62bf39451f1b6ca431
-EBUILD pinfo-0.6.13.ebuild 998 BLAKE2B ca950e33769cbcd5652c11cd4fe64f2aa0de98d0fe5dbec38e8fab04f4f5af0d6154188788d99f9dc4a05c1613c4c0e7ffca014043fd9a789c590f0c3490aa11 SHA512 70b4b076dbe03634a6b2745e117bf3969bfb12978ac30e54ae0c040aa74dadb3ac4cb30b910f50928ea5bf8f3787e967c4cec8ab4fa9ee1f9d3e0e24fea56f48
+EBUILD pinfo-0.6.10-r5.ebuild 1317 BLAKE2B ee1268a45c8f9e716776274cf8fb7c86fc28c844aeebe5f3b5a036a4834b40ac85ab3df2414ea5e97b07485e534f9e590a6a64e3c24ad8c054ef155505701c6d SHA512 9c675ed8b4bda0a363c5060656b1d918fc86181f5db8ef359ec55ca9316576e12b63ca108dba183ba47c97931afbf32a563850f3dd4ea2c5f65e63268bb0f851
+EBUILD pinfo-0.6.10-r7.ebuild 1430 BLAKE2B a369621e3778359219a0850f19fc950fc9699fcf6e53c3d63846b6b817442294fdb08b76f4441234a6a60d2e52c61972896a8f6f2781346ff1bf18b639e4fa96 SHA512 fb80e9c0bfed07d6dc37607cd05d2868102a554855f73dc3b4a7f780f50c3e525fbc096d3464ea35f524bb221b779982343afd3151e1e616e94c01356f800e01
+EBUILD pinfo-0.6.13.ebuild 988 BLAKE2B bd113e1cf335f64ad9cf2cca80fbffcfd9a9080b7b41ca903faccb82581cc9c1c4fb081eb530cf0e6777a685f88419a3bccc73df53c825cec81d80a7c4890282 SHA512 ae060920a54ff592be17e6016017e8b5161335fabf2107b9ae992a86870fcc2f2c5ed50ea5713b906e3c939a1e46d943fa2512bccbf51f24ae3069604a7b80c8
 EBUILD pinfo-99999.ebuild 916 BLAKE2B 665e86f2f287e61ef58076845d75955ae149a518fe40d3b39dd9795f13ea3f7295ab937d07e919843006603aed86ee8708d2f599a0ed8dcdb508ecbd4b7b7431 SHA512 93259861bcdaa1aee6c71ea59b2fce4913ec5dc61ecc6ed08e21e6d30994ef6a1dfffebb876cefeb583bcbb79123f0e89b6321f6e7aab8edb5e1b1878c7e19ca
 MISC metadata.xml 214 BLAKE2B 2714d2d15a382508ac07f9e3cf3c042bbba715d1a3f679a37d45fb68cbb7931bffe3479e8a9c3ef61c0f76d1b5822f9696d203ed0153a2e713865cce16ed2403 SHA512 6bd18312d33fe28edbaf93fa559dab76a4eb813f37bf3accccd113e111507617827f4423e81f6448edc51245f86c73a5b1d65c0a9310c3aa1d1b910597303fc1
diff --git a/app-text/pinfo/pinfo-0.6.10-r5.ebuild b/app-text/pinfo/pinfo-0.6.10-r5.ebuild
index ddab3ae23eab..39cdfcd39c90 100644
--- a/app-text/pinfo/pinfo-0.6.10-r5.ebuild
+++ b/app-text/pinfo/pinfo-0.6.10-r5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://alioth.debian.org/frs/download.php/3351/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86"
 IUSE="nls readline"
 
 RDEPEND="sys-libs/ncurses:0=
diff --git a/app-text/pinfo/pinfo-0.6.10-r7.ebuild b/app-text/pinfo/pinfo-0.6.10-r7.ebuild
index dc0428966984..43f398132432 100644
--- a/app-text/pinfo/pinfo-0.6.10-r7.ebuild
+++ b/app-text/pinfo/pinfo-0.6.10-r7.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://alioth.debian.org/frs/download.php/3351/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="nls readline"
 
 RDEPEND="
diff --git a/app-text/pinfo/pinfo-0.6.13.ebuild b/app-text/pinfo/pinfo-0.6.13.ebuild
index 07dccc853773..66c990a911d4 100644
--- a/app-text/pinfo/pinfo-0.6.13.ebuild
+++ b/app-text/pinfo/pinfo-0.6.13.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/baszoetekouw/pinfo/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
 IUSE="nls readline"
 
 RDEPEND="
diff --git a/app-text/poppler-data/Manifest b/app-text/poppler-data/Manifest
index 5bcc7ded9ddb..d1deb369303d 100644
--- a/app-text/poppler-data/Manifest
+++ b/app-text/poppler-data/Manifest
@@ -1,3 +1,3 @@
 DIST poppler-data-0.4.9.tar.gz 4196919 BLAKE2B a986dcff2c2295eeb952adbb4bfc59ccbc53c27668ecc44fcf862bbe3d65062ccdb9302ebdd9b530d9d0ed155666922086b368c81c0772bdab284e323e6ac436 SHA512 45afd378d0bb415c5e1bc9718025328058712c0bde6d529d2c7a4813b12f600be46ecd2ed2454b3f83fb9f8cad157b75d11d8c5d1ca849f347c310b58132ff7a
-EBUILD poppler-data-0.4.9.ebuild 784 BLAKE2B 16fcced2eed5171ab935902a5858875b9296d2b5ee1943bfa370ec03c34b90febe46875e853c1448b2ff24733276ae333207ce13150652b5bd458e4397680f13 SHA512 c90e6209acaf9f379ffd4ca2068ac251abb9f02282ee230728946a3fcd2a8687bc038a4a7fcd4ea702a0441b6a05e9c7cc657611b12ef199a8b15bbb1371d778
+EBUILD poppler-data-0.4.9.ebuild 762 BLAKE2B 1c926a648a2b5daaa9c11135b17a3a196c9a6f99128a0807f0108c5f04970cb8c15989e4c9b2c991836de296592870573faa6c2aed3b79f068d4fbbf8dd86de3 SHA512 5dc0e17254c5975dcbbf8f774e1ba7086b27614398e68667ac11e6e188a001d6ebfee2ed77b89de3f9d080963cee58890b7fe56432ebf911e311242ebb7cd028
 MISC metadata.xml 255 BLAKE2B 06f078acf8e4416705c8bad8b4802a44592eb962c08c050e11332bfa97564fafdf08754ab056eb813f6baeaa6cdfaf5d71672455d77e74045f86098c221d5136 SHA512 c6c5f966cfbe396fde1b15334442de9e0004b44c4b48775588b0b25a058ad1751252761370c9c254280e97561fa6306f5aa0cc7959c675d4ee11f7f95d777a36
diff --git a/app-text/poppler-data/poppler-data-0.4.9.ebuild b/app-text/poppler-data/poppler-data-0.4.9.ebuild
index fcd701289a51..d5a46c5c4bcf 100644
--- a/app-text/poppler-data/poppler-data-0.4.9.ebuild
+++ b/app-text/poppler-data/poppler-data-0.4.9.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://poppler.freedesktop.org/"
 SRC_URI="https://poppler.freedesktop.org/${P}.tar.gz"
 
 LICENSE="BSD GPL-2 MIT"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 IUSE=""
 
diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index d67c0c1a9d49..b0a655e4ddd6 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -5,7 +5,9 @@ AUX poppler-0.61.0-respect-cflags.patch 3012 BLAKE2B 24ac0b8067f1f8aea6e1b328b27
 AUX poppler-0.78.0-respect-cflags.patch 1140 BLAKE2B 59e87b6957a5aff35cf6ebc8092c0552b8ece31e2fc73765789ac73dc5ac01ba69928f9308de9660ba3cf6b38b921ca341dcf6c5bce1d360b1bcf1a4005e4115 SHA512 713f7a3e3e2ae950fd6406ed076d4e6d2079619e40f00de7ec7d7df587df520373b923d343494902da454423adf29174f1ced11cb874a12851febfc1860988f4
 DIST poppler-0.79.0.tar.xz 1544140 BLAKE2B b5ecf204c5246f640d9f5ca5ffce9648a1a2c957efdb1e31ace9c1ccdff1be85337b67f7c4019b52eefce17e6f5869aa1911a60e54e421b80ddd3b6eec97a0ec SHA512 f0024fb86887e147ec1cbe9481498d348076dbd6b960716da65defab3365c67ab39626f946758dddbe438634a7116773d8ded8684b65e18abbfc299f56563ec9
 DIST poppler-0.80.0.tar.xz 1548908 BLAKE2B 09a3b10b1ee6a9de900f7a6ca105e98ec266995c3f6a3d56fbefb7b57851462caa4a16a55081efd8b70d02107d8b7a13a74e316d448290bb3b02286c1778ad86 SHA512 0a0d68168ba4d560941de31cb9e32c6cd7b44025e93cd84ace863ffab5b9ff0356524626cb16fb99c29a897738f2ac5862480fc54d42f8aecd2e3457f11c642f
-EBUILD poppler-0.79.0-r1.ebuild 3518 BLAKE2B b1788df48fbc4300fc64ba2ab94bec0f1fd6fcce577ed5180fe2508043834c1894fef44096bb5d30697df5215999ec871798df1d7e936a82f604bbfe46fedece SHA512 9e04527cbacec01d734b737f9ebaa729300c987198a53c69079c198d9ace244f81eb1b6e516ad81e8afaca1ff6d44d8de3df92afc22a684fc6f389de37e5f0de
-EBUILD poppler-0.80.0.ebuild 3506 BLAKE2B ba82b892b343c3acf9029f0cdfe8f6fafa5b25f896a802b214373082295282e577f19ed3eea5a0e55d9fb23cb1a36b09e91b84d9b4e3cb65008858a34c9bec9b SHA512 bdc23a2cd987ae8f0fee3d80931b7f7e9c0a705acb58ea5eadc16c7ebf1276b9b0880130743b4c6e29b8b0acf7c442183a41a45fd626ff8830d9af7c5df5bd48
-EBUILD poppler-9999.ebuild 3506 BLAKE2B ba82b892b343c3acf9029f0cdfe8f6fafa5b25f896a802b214373082295282e577f19ed3eea5a0e55d9fb23cb1a36b09e91b84d9b4e3cb65008858a34c9bec9b SHA512 bdc23a2cd987ae8f0fee3d80931b7f7e9c0a705acb58ea5eadc16c7ebf1276b9b0880130743b4c6e29b8b0acf7c442183a41a45fd626ff8830d9af7c5df5bd48
-MISC metadata.xml 995 BLAKE2B 41ffeea7d766a1d5c86020673522c94ebb243b75e21b761f8c202bea7789464d2e3097a74f6ff6ee42f41ce34221ed378b6fcd6912f472249aa9e5ff01721346 SHA512 9d9134ae26b37d2d3a1859cc4d8c67a02257f7cfa33c5863260f8ec8afcde28f7430fcec557e6a5cb1c9d03cb0b5c116c074ba4034f94fa0ece4e957f718d319
+DIST poppler-0.81.0.tar.xz 1548944 BLAKE2B 23b460d50b22d8b42690c28156398fa3cf299ac24ea883dc8c79044c44aebc126388cab2f31e69c76c50750ef86bd5203958efbb1c353c582c0337e6e0486a85 SHA512 774d650c63afe2a0d6669daad4b286c2412a0c02581d7ea2cc37d71936f77dff92dc22217367561b7e4285c9c27dcfdca4c76c187d9c3c482db2f3549919b25b
+EBUILD poppler-0.79.0-r1.ebuild 3496 BLAKE2B 71c664164c00a554aa7e524b8e56e32d5d6e05ff68ec88bb4ca45e474cde45b20b653d101c8cafa5467875c1a31ca8184ec956efa278f07e762c2b74a3569449 SHA512 91aad9e8ef1648b5207cf9e20ef6a6475305a39b375109196fcbaed1078ca6fac67f5c70e0ca89668a8d46d9e7d234a39b48d6e5c83b6a4900804393e68ec9fa
+EBUILD poppler-0.80.0.ebuild 3484 BLAKE2B 607e91146b25a87bb690b869d1310c2b7a536912ecb70159bb0087fa6c31c4aa65ee773b3e5254d051e606fc9ca946a32eb48d34869bb5382a598083eade11e4 SHA512 1415779bc776554445fa049ec35a0ba68e9b7ed878da9b0170a3acd1ef575d2b72f62eca14e2ada250b5ceeac5ce7a6491120249c2080034c2afcd6ecedba49b
+EBUILD poppler-0.81.0.ebuild 3367 BLAKE2B 88eefb38717a40ea3adde8c8ddf5189e80a04f48500886470ebe7a7702eb24afb567a041490186765f27cb6978ef866285b64704e7bbe61560bc7578a1383382 SHA512 780f3b1116d35a3a51d5de2d43690580e554814ad1d9f07f2ab54006561fabebe053be42591d07e608fee0de1b3b453fb865ecb056708beb59e013a2ed059e17
+EBUILD poppler-9999.ebuild 3367 BLAKE2B 88eefb38717a40ea3adde8c8ddf5189e80a04f48500886470ebe7a7702eb24afb567a041490186765f27cb6978ef866285b64704e7bbe61560bc7578a1383382 SHA512 780f3b1116d35a3a51d5de2d43690580e554814ad1d9f07f2ab54006561fabebe053be42591d07e608fee0de1b3b453fb865ecb056708beb59e013a2ed059e17
+MISC metadata.xml 995 BLAKE2B 0d99fda69e6b020fd1b6fa879a0c3af278b92111be31d97cabe88703f06b4af56ce64ce9e0fc556d2b056c6770e547ae3b88dcc82da9cc26e15e2d1d0b5f685b SHA512 ae813761c5ab4dab475b737085f14f5874655b31f247f26495c43d8fcc47805dfceb2a8cd23ead39a3f8ee75ac820edc7c2554e573c338c09e5ec8b9d383417c
diff --git a/app-text/poppler/metadata.xml b/app-text/poppler/metadata.xml
index e88e31fc283b..6f044d376b2f 100644
--- a/app-text/poppler/metadata.xml
+++ b/app-text/poppler/metadata.xml
@@ -26,6 +26,6 @@
 </use>
 <slots>
 	<subslots>Reflects ABI compatibility of libpoppler.so only,
-		NOT libpoppler-{glib,qt4,cpp}.so!</subslots>
+		NOT libpoppler-{glib,qt5,cpp}.so!</subslots>
 </slots>
 </pkgmetadata>
diff --git a/app-text/poppler/poppler-0.79.0-r1.ebuild b/app-text/poppler/poppler-0.79.0-r1.ebuild
index caa27e2a577d..7043b939f9bb 100644
--- a/app-text/poppler/poppler-0.79.0-r1.ebuild
+++ b/app-text/poppler/poppler-0.79.0-r1.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999* ]] ; then
 	SLOT="0/9999"
 else
 	SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
-	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-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	SLOT="0/89"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
 fi
 
diff --git a/app-text/poppler/poppler-0.80.0.ebuild b/app-text/poppler/poppler-0.80.0.ebuild
index e11942716aad..c2f563333cc2 100644
--- a/app-text/poppler/poppler-0.80.0.ebuild
+++ b/app-text/poppler/poppler-0.80.0.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999* ]] ; then
 	SLOT="0/9999"
 else
 	SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
-	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-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	SLOT="0/90"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
 fi
 
diff --git a/app-text/poppler/poppler-0.81.0.ebuild b/app-text/poppler/poppler-0.81.0.ebuild
new file mode 100644
index 000000000000..86a7cd33bcc2
--- /dev/null
+++ b/app-text/poppler/poppler-0.81.0.ebuild
@@ -0,0 +1,122 @@
+# Copyright 2005-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils toolchain-funcs xdg-utils
+
+if [[ ${PV} == *9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://anongit.freedesktop.org/git/poppler/poppler.git"
+	SLOT="0/9999"
+else
+	SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	SLOT="0/91"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
+fi
+
+DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
+HOMEPAGE="https://poppler.freedesktop.org/"
+
+LICENSE="GPL-2"
+IUSE="cairo cjk curl cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt5 tiff +utils"
+
+# No test data provided
+RESTRICT="test"
+
+BDEPEND="
+	dev-util/glib-utils
+	virtual/pkgconfig
+"
+DEPEND="
+	media-libs/fontconfig
+	media-libs/freetype
+	sys-libs/zlib
+	cairo? (
+		dev-libs/glib:2
+		x11-libs/cairo
+		introspection? ( dev-libs/gobject-introspection:= )
+	)
+	curl? ( net-misc/curl )
+	jpeg? ( virtual/jpeg:0 )
+	jpeg2k? ( >=media-libs/openjpeg-2.3.0-r1:2= )
+	lcms? ( media-libs/lcms:2 )
+	nss? ( >=dev-libs/nss-3.19:0 )
+	png? ( media-libs/libpng:0= )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtxml:5
+	)
+	tiff? ( media-libs/tiff:0 )
+"
+RDEPEND="${DEPEND}
+	cjk? ( app-text/poppler-data )
+"
+
+DOCS=( AUTHORS NEWS README.md README-XPDF )
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.60.1-qt5-dependencies.patch"
+	"${FILESDIR}/${PN}-0.28.1-fix-multilib-configuration.patch"
+	"${FILESDIR}/${PN}-0.78.0-respect-cflags.patch"
+	"${FILESDIR}/${PN}-0.61.0-respect-cflags.patch"
+	"${FILESDIR}/${PN}-0.57.0-disable-internal-jpx.patch"
+)
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	# Clang doesn't grok this flag, the configure nicely tests that, but
+	# cmake just uses it, so remove it if we use clang
+	if [[ ${CC} == clang ]] ; then
+		sed -e 's/-fno-check-new//' -i cmake/modules/PopplerMacros.cmake || die
+	fi
+
+	if ! grep -Fq 'cmake_policy(SET CMP0002 OLD)' CMakeLists.txt ; then
+		sed -e '/^cmake_minimum_required/acmake_policy(SET CMP0002 OLD)' \
+			-i CMakeLists.txt || die
+	else
+		einfo "policy(SET CMP0002 OLD) - workaround can be removed"
+	fi
+}
+
+src_configure() {
+	xdg_environment_reset
+	local mycmakeargs=(
+		-DBUILD_GTK_TESTS=OFF
+		-DBUILD_QT5_TESTS=OFF
+		-DBUILD_CPP_TESTS=OFF
+		-DENABLE_SPLASH=ON
+		-DENABLE_ZLIB=ON
+		-DENABLE_ZLIB_UNCOMPRESS=OFF
+		-DENABLE_UNSTABLE_API_ABI_HEADERS=ON
+		-DUSE_FLOAT=OFF
+		-DWITH_Cairo=$(usex cairo)
+		-DENABLE_LIBCURL=$(usex curl)
+		-DENABLE_CPP=$(usex cxx)
+		-DWITH_JPEG=$(usex jpeg)
+		-DENABLE_DCTDECODER=$(usex jpeg libjpeg none)
+		-DENABLE_LIBOPENJPEG=$(usex jpeg2k openjpeg2 none)
+		-DENABLE_CMS=$(usex lcms lcms2 none)
+		-DWITH_NSS3=$(usex nss)
+		-DWITH_PNG=$(usex png)
+		$(cmake-utils_use_find_package qt5 Qt5Core)
+		-DWITH_TIFF=$(usex tiff)
+		-DENABLE_UTILS=$(usex utils)
+	)
+	use cairo && mycmakeargs+=( -DWITH_GObjectIntrospection=$(usex introspection) )
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# live version doesn't provide html documentation
+	if use cairo && use doc && [[ ${PV} != *9999* ]]; then
+		# For now install gtk-doc there
+		insinto /usr/share/gtk-doc/html/poppler
+		doins -r "${S}"/glib/reference/html/*
+	fi
+}
diff --git a/app-text/poppler/poppler-9999.ebuild b/app-text/poppler/poppler-9999.ebuild
index e11942716aad..86a7cd33bcc2 100644
--- a/app-text/poppler/poppler-9999.ebuild
+++ b/app-text/poppler/poppler-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 2005-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit cmake-utils flag-o-matic toolchain-funcs xdg-utils
+inherit cmake-utils toolchain-funcs xdg-utils
 
 if [[ ${PV} == *9999* ]] ; then
 	inherit git-r3
@@ -11,8 +11,8 @@ if [[ ${PV} == *9999* ]] ; then
 	SLOT="0/9999"
 else
 	SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
-	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-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-	SLOT="0/90"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	SLOT="0/91"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
 fi
 
 DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
@@ -79,9 +79,6 @@ src_prepare() {
 	else
 		einfo "policy(SET CMP0002 OLD) - workaround can be removed"
 	fi
-
-	# we need to up the C++ version, bug #622526, #643278
-	append-cxxflags -std=c++11
 }
 
 src_configure() {
@@ -94,7 +91,6 @@ src_configure() {
 		-DENABLE_ZLIB=ON
 		-DENABLE_ZLIB_UNCOMPRESS=OFF
 		-DENABLE_UNSTABLE_API_ABI_HEADERS=ON
-		-DSPLASH_CMYK=OFF
 		-DUSE_FLOAT=OFF
 		-DWITH_Cairo=$(usex cairo)
 		-DENABLE_LIBCURL=$(usex curl)
diff --git a/app-text/ps2eps/Manifest b/app-text/ps2eps/Manifest
index dec07e12b0e8..5f67746b2d64 100644
--- a/app-text/ps2eps/Manifest
+++ b/app-text/ps2eps/Manifest
@@ -1,3 +1,3 @@
 DIST ps2eps-1.68.tar.gz 97304 BLAKE2B 594b894b2d81f64c8c6a7461d1df96d7b6e3ce3ef8f7eaf58161eb6a05ebca7b2d304a531be954898f1a9ad53cccd84536b64127b080afbc3902265d2e4e1108 SHA512 7fc84da5da00d5b1169d6e337b1db232adf80d9d957e48bfdd9272946151adca3e44f712587387ef557488cd15f44210b3fbd8c545488ec0071641d9d25a9c2b
-EBUILD ps2eps-1.68.ebuild 1012 BLAKE2B bec16c67b3a3f7c4e78cac7e8e0315f8895a61114cef16f99bed067c6fd8ab44d0546d090c29e323304b84f9c0dba568f4f17b2240d8fcb96952e58478d833f2 SHA512 b34bfac3b3857a0ef6d6059806053ee37b109c35179e392d4198d44bd323976167f2415754f9990ab1b2162eabf47bbf77f4072ae03de993cedf03f3a0f07219
+EBUILD ps2eps-1.68.ebuild 990 BLAKE2B 39e4e002373815574b5924193f1ed17387a51e1c281449f04b8007421d6d283be448a2012aff4d26c555b7fc52c388040010aeb49ac5fc94e1de984d9c03a242 SHA512 e4dd3f1568f07dc95beec0819dfd3e10f317eae23760832f8e875e27ccc8ac61926671378746b64af72f6289e95a826baff5a17be4aceaabc6a4c091504aab02
 MISC metadata.xml 525 BLAKE2B d27db1f0104b7ac6fb9e61c95da58ce62a7dddb28eb7c160507efc87b9b6930df11f889e8a8f5ec1e606209d942254294933313581a2e5dcb0f56c578e4d4080 SHA512 0d250fa2b43ab06f9d214116054bd21dc43f130c5518b430c2bdaaf4a4038fee52d61c6a82b1fe0736b966634e24d7fd99c6a88e171a05e7b5d9cb83a45ca24a
diff --git a/app-text/ps2eps/ps2eps-1.68.ebuild b/app-text/ps2eps/ps2eps-1.68.ebuild
index 407dde790949..9950ac235e7b 100644
--- a/app-text/ps2eps/ps2eps-1.68.ebuild
+++ b/app-text/ps2eps/ps2eps-1.68.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.tm.uka.de/~bless/${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-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=""
diff --git a/app-text/ps2pkm/Manifest b/app-text/ps2pkm/Manifest
index 196f47a1c958..2a1f46cba035 100644
--- a/app-text/ps2pkm/Manifest
+++ b/app-text/ps2pkm/Manifest
@@ -1,9 +1,3 @@
-DIST texlive-20150521-source.tar.xz 45459552 BLAKE2B 639eaee7c9dd173e5ede9f157ccd9a9655ee55cabf232985915f10afa36dce618b8b78848e5d9853bf0f96f818d03d68fa17d8abcdc4d1a1349fe13dfe3a1ddc SHA512 9d06bb88c489715787ce619c4c6b5e2d4251e1db8d48ae7fe2d1a253634c76bc6d7282ef9c93c77847845cae01eafb58dfb37ba3fb83a6d223f0d7fe8f5d3855
-DIST texlive-20160523-source.tar.xz 45941100 BLAKE2B 8752212d41d6bbabc725d9b1dcc187dd4dbb34df4271c768e83c13a2dd4e7170aa162d01a15d87fa02bc1b5abee648a2d35e3aa1380569851cc21d6f33f2f109 SHA512 915fa2f5e2099dd385ef81033db7aafdf09558c0c200fed0748a8a42fd61f69d3eaac9decea334e30981af739dd81061a9b1d6853c7f6d00285fe0be40e26c3e
-DIST texlive-20170524-source.tar.xz 63483372 BLAKE2B 44669d1228f5be27e9d93672a4f4ead40f7f4c6cf386f2db6fef54d64f8b8a743a485fe1170904d8117b9745f71ec77db8434caa6cdd79359b1f3f387130a3b4 SHA512 18c18940992ab94ce22e22ccd4ad798253ea14ac2ab296a10ea5e9a8da9f33989f2e2641b42b564d1d5fb53bd371da3e68726b676d706b469016ad146cd19daa
 DIST texlive-20190410-source.tar.xz 53783408 BLAKE2B 8e34c7c2b74eab1c4d16ddbf7eddd8566593e6d68c42a2634760f11d86e68970698d8b9deddcf3297966968ede11ecf30e0b04ec19b708dc3e6d0a2abcc3799d SHA512 7759d8e668e53c0c73e48907096da9d8fb6384dd9c3342ddfb05e17d077054c5351d35256cf4e63a6da502de2f09f521979bede7209cdd5bd8ae80eba0efed2e
-EBUILD ps2pkm-1.7_p20150521.ebuild 836 BLAKE2B 10e2fa2b739ab555770328f5e5cc25d9bd092b2a8efc7a519256eda0e056fe84d76a4a9d5f642e04e230639c0161b5f5814b524ecdc990f01fd3863ac6dfbbac SHA512 5007f586c9941ae159cbfdc49ebbd0da23f11b81731f5954ff79dcdff700764d15c555173c17b9d4bcfe82727eada7a0d07c98e19a62ce3e2933707c8557cb24
-EBUILD ps2pkm-1.8_p20160523.ebuild 848 BLAKE2B 7b28623873b847d71ff2f5f2f5bca7d68ab82b5cfd62e39c2f040cfd38b7895f3c6729b0544f6872d882539598aaffb233306bbcefe6dccd78897200d36b89f5 SHA512 829b0fa2979bc26a1198bc265b8e5977ccbf6edc2b9834f60ef504318d54c288bc54621f646e5f01313d12fbeee9d4223e9d8d7aae75635e24e3069f422a7659
-EBUILD ps2pkm-1.8_p20170524.ebuild 846 BLAKE2B b4d755ceb012e39002be8da61a38d0479f4d5a6b3dc11467d766e894b274648cdd0ebb5e79d96aad97b167f0d2d23fda3d148712e6aae1d0cc2cfec77dc69c58 SHA512 d8d68f8b71aa47b384709a58f686c24c8b22767d9e596fb29f06fc759774558c2807ff55a52f609c915e8acd3f351ca6a9d73444874d6eda7dfdd30af3b991f2
-EBUILD ps2pkm-1.8_p20190410.ebuild 793 BLAKE2B 340696bc3b5002cbb9f7809ea094f461efaec2d96c627c3ea88962cc2b8f8625fbeaacd49605d2ef3821752544b995f54abc5c5c03b311290efe209a88dc46c8 SHA512 f7a97ce406d09f60fdbcb1b2c4ff2eabefea510b7d18049a7aeae155d95ed983586118f9710bac67941aa9e0168e159b8a91ba24372457d5418c82b0cfe41c9f
+EBUILD ps2pkm-1.8_p20190410.ebuild 764 BLAKE2B 8548c7d9bb5a6a1681c9db5de11294f7fce09500802b06f2c2b9f2993f7a68c88aae47e48e412adfcb5132bed04e47582fc7a7195c064e84727dcc3a0d4b50d6 SHA512 194bf00ea69c5f9d64b16dc8abd3fb8ba77bae4d8ee256964c0d7eb36d36ad65741ec130643c8bc4001fb70afb9c951a0180eae266293ccd7936fb514cf29b0e
 MISC metadata.xml 358 BLAKE2B b5a2e9424ef1e5bb23c34e089d9204443dd5ad528b56db71d2fc2b3c5d428c14367805ca94a307f8856d21356abe76092c54ba0f0df204b5bce3665f9f3fd657 SHA512 51f6411780af5d7775f8f80d246d5f4e297abb1960a0b0c21c6dc5c03a9a407dad8cbc4977a679590cffb4523f1b72a0f7b15ab100c938391a5abfd3e17e8818
diff --git a/app-text/ps2pkm/ps2pkm-1.7_p20150521.ebuild b/app-text/ps2pkm/ps2pkm-1.7_p20150521.ebuild
deleted file mode 100644
index 7843327c3e7a..000000000000
--- a/app-text/ps2pkm/ps2pkm-1.7_p20150521.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Tool that converts a PostScript type1 font into a corresponding TeX PK font"
-HOMEPAGE="http://tug.org/texlive/"
-SRC_URI="mirror://gentoo/texlive-${PV#*_p}-source.tar.xz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ~mips ppc ppc64 ~s390 ~sh x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND=">=dev-libs/kpathsea-6.2.1"
-RDEPEND="
-	!<app-text/texlive-core-2010
-	!app-text/ptex
-	${DEPEND}"
-DEPEND="${DEPEND}
-	virtual/pkgconfig"
-
-S=${WORKDIR}/texlive-${PV#*_p}-source/texk/ps2pk
-DOCS=( "ChangeLog" "CHANGES.type1" "README" "README.14m" "README.type1" )
-
-src_configure() {
-	econf --with-system-kpathsea
-}
diff --git a/app-text/ps2pkm/ps2pkm-1.8_p20160523.ebuild b/app-text/ps2pkm/ps2pkm-1.8_p20160523.ebuild
deleted file mode 100644
index b545997a4690..000000000000
--- a/app-text/ps2pkm/ps2pkm-1.8_p20160523.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Tool that converts a PostScript type1 font into a corresponding TeX PK font"
-HOMEPAGE="http://tug.org/texlive/"
-SRC_URI="mirror://gentoo/texlive-${PV#*_p}-source.tar.xz"
-
-LICENSE="MIT"
-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-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND=">=dev-libs/kpathsea-6.2.1"
-RDEPEND="
-	!<app-text/texlive-core-2010
-	!app-text/ptex
-	${DEPEND}"
-DEPEND="${DEPEND}
-	virtual/pkgconfig"
-
-S=${WORKDIR}/texlive-${PV#*_p}-source/texk/ps2pk
-DOCS=( "ChangeLog" "CHANGES.type1" "README" "README.14m" "README.type1" )
-
-src_configure() {
-	econf --with-system-kpathsea
-}
diff --git a/app-text/ps2pkm/ps2pkm-1.8_p20170524.ebuild b/app-text/ps2pkm/ps2pkm-1.8_p20170524.ebuild
deleted file mode 100644
index 59318b16b5ac..000000000000
--- a/app-text/ps2pkm/ps2pkm-1.8_p20170524.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Tool that converts a PostScript type1 font into a corresponding TeX PK font"
-HOMEPAGE="http://tug.org/texlive/"
-SRC_URI="mirror://gentoo/texlive-${PV#*_p}-source.tar.xz"
-
-LICENSE="MIT"
-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-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND=">=dev-libs/kpathsea-6.2.1"
-RDEPEND="
-	!<app-text/texlive-core-2010
-	!app-text/ptex
-	${DEPEND}"
-DEPEND="${DEPEND}
-	virtual/pkgconfig"
-
-S=${WORKDIR}/texlive-${PV#*_p}-source/texk/ps2pk
-DOCS=( "ChangeLog" "CHANGES.type1" "README" "README.14m" "README.type1" )
-
-src_configure() {
-	econf --with-system-kpathsea
-}
diff --git a/app-text/ps2pkm/ps2pkm-1.8_p20190410.ebuild b/app-text/ps2pkm/ps2pkm-1.8_p20190410.ebuild
index 0cdded57cfae..9aa30446d231 100644
--- a/app-text/ps2pkm/ps2pkm-1.8_p20190410.ebuild
+++ b/app-text/ps2pkm/ps2pkm-1.8_p20190410.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gentoo/texlive-${PV#*_p}-source.tar.xz"
 
 LICENSE="MIT"
 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-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=dev-libs/kpathsea-6.2.1"
diff --git a/app-text/psutils/Manifest b/app-text/psutils/Manifest
index b017afac520d..33086834e178 100644
--- a/app-text/psutils/Manifest
+++ b/app-text/psutils/Manifest
@@ -1,5 +1,5 @@
 AUX psutils-1.17-ldflags.patch 1417 BLAKE2B fa54e0f8cab31336dbe95db96313e345e9cd3a03f2c92855c5bc5fbc4054e89193ade6b346f52edf61f58f20330dacc8d7df32a5ec1769ed7ff62b4eacb36368 SHA512 179b1551516a8acc9f4f9859b4bbe06a6d6e2ba0ddfe20c147a143e6795d61d9cb4f55107866d7a891f0be0dbebaf11d836f4c129205da44ba561a133d69ab08
 AUX psutils-1.17-no-fixmacps.patch 1176 BLAKE2B fdf9653e881e05340445560ba5cb3303bc42e46a1605ee19d675023174aa7bf73d9b4cc37ba3bbafee9b3829974981ff58284acf7079f9b2a3fedbac9d28b2af SHA512 707ebb4594b341044e27cd3fb35402b4d3144eb52f9baffcc633dbde69b53717da148b6c03074411cb95dcf50b48ba87df4ad6c2ec3b24f37b0951c40012efdc
 DIST psutils_1.17.dfsg.orig.tar.gz 40296 BLAKE2B c74cde600e841e876892f3c0cfd20ab5d1ed87135e0bc952b19baf90315b95f89bf177b66deeeb91862fc2c620f688ba49972673bf9f4b4ff250590f0b2fc848 SHA512 a4ee49ecea9a948c0cfb8b51d10471409ec461a07bb94c1158c64e433f02ede4770fcb961d6ec79088bf247176db9757389d3e1cf5b64246b3b90b5584b59ff3
-EBUILD psutils-1.17-r3.ebuild 999 BLAKE2B 283c673f8eed7948d71baa0a16af860cbb93c97bebf63519a44f9c8aee340a14b8153718aa91f60d5d02f64c1d9971c61af718b93e2939f56b7154c11ee14d87 SHA512 78143446eabfdfb5400e80ad6576086918259a68987627f036d6f557208369746087020ce5d1ccd613f17060045fd57bf10e11626e34364dc6835380cb75dca9
+EBUILD psutils-1.17-r3.ebuild 977 BLAKE2B 780a37f96c33d8e04974d31942951dc93f3e0edc59eb60e176ff778ab4fcdeee91a99a5b43cbfada34c9659a892088cec5e8b11abb0186ecc3903d94efedeff9 SHA512 67b87ece7fec638b7f759fccd8973dbf8b00be0f8588fcb37d5b06e6227c5d366f1ef29785fdeade4593fd5861517e5fcd5c9fca10778082de521c96dc396f8d
 MISC metadata.xml 245 BLAKE2B ee3a163cfe0a4bc59c0dfb46f9ddb580e2d259b4d0e33cb4e684eb9e6d4b901bf97c6edd891f3b75a613a782f1b89318d0ee3ec9bee4e34c4441d9e8f4267678 SHA512 1653777623e2c15e1ce13229e396723b2cc9c214983e0f8592de98c01a31badc6c38c6735ed44f937d145883b43fb6f049af3eddb9ff96b18c96ccf8f67dd690
diff --git a/app-text/psutils/psutils-1.17-r3.ebuild b/app-text/psutils/psutils-1.17-r3.ebuild
index 551a8ecd7021..fd952fa6a288 100644
--- a/app-text/psutils/psutils-1.17-r3.ebuild
+++ b/app-text/psutils/psutils-1.17-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://debian/pool/main/p/${PN}/${PN}_${PV}.dfsg.orig.tar.gz"
 
 LICENSE="psutils"
 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-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=""
diff --git a/app-text/qpdf/Manifest b/app-text/qpdf/Manifest
index 20c22236c53f..6320879b6b13 100644
--- a/app-text/qpdf/Manifest
+++ b/app-text/qpdf/Manifest
@@ -4,10 +4,10 @@ DIST qpdf-8.2.1.tar.gz 8256216 BLAKE2B 67e9b897ed938b9dd2e8508efaddd4dd6f63568aa
 DIST qpdf-8.4.1.tar.gz 16990752 BLAKE2B 6e7ccd212cf8d01aea3dc615f5924c0575392f19cdd20b35327a71bd1f97d7e515fe1a73cd2e3901964f621cafa19ab07a1314af19f40ded28d3e9f683c02ab0 SHA512 d5ac3376345650f05278f8b4d99182cd58b927537085a4a6415d3df0b80b7ddd80a7c33778ec8c3b85d9788ea081ea3266bd4a9315eda9820988e9e54a22f80d
 DIST qpdf-8.4.2.tar.gz 16988263 BLAKE2B 358836310575fd0f454d4504a70796b72d2e3120c5820e2c33e84ea79c5c115d1c84f8d58392d870b5357407d0fbed05028bd854d164be0b32b348c587845300 SHA512 9cde046fb5e42dc331933294155583fb20408704a0cab3075cc3e97bd4643e3178e4162b8de7434aa2304097e7734f985fdc8e7b05cc028c37193dce91797f7a
 DIST qpdf-9.0.0.tar.gz 18172400 BLAKE2B 90b59d54dd87378ccc766f19bc142950f435e4314594fd78923f1c9099393a1b141bf7772f507df7553d9f4afbbe49414c75c0276296481c65017a48d3a5ff01 SHA512 bb20eaf4a12f33ad2ca6933a21123cdfd7d6031da472a881f8c60979881c19bc363db585c2be0635081c7380f0f0819921af7c3a4847de57505013c6e3959ea0
-EBUILD qpdf-7.0.0.ebuild 1234 BLAKE2B 303e3943f8429ab560cfef1d62b1c35f2dbec6c2e27fd6436fd8cba9eec5d8247bf4df27b2093f5a5936295452c171b81a7e07f3b888b98fff428ad7b566d109 SHA512 bc0f824517bf3d7837243162e11cd7a1b973fc27f984f2486cfea23047a7df185f5d4adcdbc82fa7c7b39a9aa6a31c80624e76fb5bda9d92aa2bff4dc457efb1
-EBUILD qpdf-7.1.1.ebuild 1243 BLAKE2B 99023977c552d4fb2b6d2177f60664d01867a5f5309a79c9e192ac4b8f6c6394649f2bc58717114bcbce15c91031ad00dac38364353c1121901722b7f4240b6a SHA512 5f9e78903502e37430b8b2dda10507fb5527b47dd76aaa1afd56dbf3453ed5a209720c0bed72e0f5c2a8aa055b27403c340b1eeb8c870274e450b9bb055e347c
-EBUILD qpdf-8.2.1.ebuild 1268 BLAKE2B c62c4bdf99ebd71593689e7918d57cba7031d2c0d4d17e5eda23bdd147c7cac7b955e1ad258f6542e3522c598bd893e1334f3878401aa71c94c5aff34659e4ff SHA512 3a4f44293fd6c5e9319d198007795aef5a254cbe06f28e887c4d5efa4aa1f0854d5751c94af3250d7057d2693892930c723e6b43405d4234eaac6e3f7f525efb
-EBUILD qpdf-8.4.1.ebuild 1277 BLAKE2B a7a4b94e2fe88c4a4a10e82bcb85673b1425b56c76347e21101a0f0e94f92c4e7304d110ab003b731a8315b618dd35c071e102f486b726f30899d6081807bab6 SHA512 771c029e75a25d1d7c2ea14f9bbc364051a9419f513e070f7ba548b675d1e11dd4198d6dbd853de88b603d3183af8c65ced0c33498dd2df11c43be1229feb529
-EBUILD qpdf-8.4.2.ebuild 1278 BLAKE2B e32c28130f8b8e90cb022fcf78fbbd4f07b94455557f41b74c6645113d89ac2f33ff7c277d89e5dc16bd3b5e0b2502aa35f99c5e74804a3422a5e9c8848aa8f9 SHA512 c589c5ca6d96c9e5b48c62e5f1bac9ca26025c6a97925443805c64d51f0267a8b05497531fe55f2c352eae14f0349bffbe275fc79cd7ee672b5e54db7776ef5a
-EBUILD qpdf-9.0.0.ebuild 1278 BLAKE2B 8ea12d44646d8c4835b4576c118708b15ba31e3d8296aa94ba6c3421a0e7e4c063dd597d1758f242a5e6ed9677b02089eacfac454d728d75f2ad8c2f97cb9b2e SHA512 377db56c3e509884111642b0f379a4c3d965caa50db1b242173c63970d716376931440145c6e992da3f6277ee98bf6032aa1efadfd402f47a32502f9663b1b3b
+EBUILD qpdf-7.0.0.ebuild 1212 BLAKE2B 0141c83c2b3ba8abed3d974b3a2d827c864f698eedacbfb0d01ceb447db4f30f8061da08ad0507e0f8d81158b19c2ef29e62a8102452d1af2fabe95096e99f68 SHA512 d7c68ba266f88000c5a98360c3ba568ae9f4a4093874b06a4c5ad9faca72abf32c8f4d6a6d1a94dced96063e88e90fa8aa6faa2bff3efdb2a73cc7ae5fb60490
+EBUILD qpdf-7.1.1.ebuild 1221 BLAKE2B b069833afe4b5ee03372ec40fe1831e171048422915228742fd9b3a9242be3157730bea25523f4c7a99295ad1e5b8d0d1de8c6e88be55c718975a9acf4f8e6f4 SHA512 ffbbd94355bc287e545ef723da53c8e1b89e23f49479c08a42209d677ba2d8c0c06af13b4a6c62f78352c7cb602df15d6b90aba23d458ef758edab506eae7aa4
+EBUILD qpdf-8.2.1.ebuild 1246 BLAKE2B a5a9de3de8d4c2bbd9f36c6977626d1943eb1332f3b592d2fa0ee19107651c6601d51d5ef7987774c3a1a7d3dc1d89aeffa96bb8f70820a40ede9cb6f1bc5659 SHA512 d54a88037debb98c3e85d354a223a4f682fa1ff7d744244c7a9e9cca089141fe92aadcc6f2ef6006ae54911bccb0e107fe5d8739875483f5e26fa7c150db539f
+EBUILD qpdf-8.4.1.ebuild 1255 BLAKE2B 1b3e6004cc12bbc5e1b89d27b7100d963e9bfba4cc50c823cb356a021884196b11f5f43219e71fc74c31f946ea5da701b5fd7512ee852edab13f4268af55203f SHA512 c135d6a5af42997864e7f348f6464f6249d6a018eae0fb9352e7fa8b8c107702077f1e00daa48ff4e49af08c4d612b430ceac2063b3d8c49edd67ac618ca0e40
+EBUILD qpdf-8.4.2.ebuild 1256 BLAKE2B 8733a9c756fd75c166d6de06420795de427b19c60a5e7411dd271f7493c3a5ec493ac4813555587dd8acb429afc611937089c6f29ed3dd5699a4bc83c864f96f SHA512 8e2e971373eb77502adfa95962e5dddacb9ec781080ff5e5b72d2b43e2a9cc158885168f5dbbc191ba688b8dc20ededeaa3057682ab57d50afb80c8f2730f74e
+EBUILD qpdf-9.0.0.ebuild 1256 BLAKE2B 99fce30ce8d693780d1753027420f7264bedc78a7163f9f37f1a72b1753a18065032508281f72ef052ea3d563b7b2fcc00d80bea959d69d070e8f7d0b30d8c11 SHA512 0bba46803264bbf4e3e2e46c9c0abd5239130b5b58bfb0cd42496d0105a43ebf4638765814f331807cf983169fa54dd3160a55f2e17d42ca2556164742321b71
 MISC metadata.xml 499 BLAKE2B 9f6462a9606763352f0c823f877d1a39ffa207a8354e800d64bdb4d7686de8391309e08296adf23ca6b6e5d6fc2150d72ca9b0fed36cd4574e51ae6d04e48341 SHA512 77915adba55eb2b0fa68af06fa30b84c50af0a4a26a3ee6fafa71f9c7a7a307451ab76291dfc87f90479f6a208cb29c8a6c8c7fd0d574455faa15c87f8ea8de7
diff --git a/app-text/qpdf/qpdf-7.0.0.ebuild b/app-text/qpdf/qpdf-7.0.0.ebuild
index 90ccfa2f8961..d1bf435cf3c6 100644
--- a/app-text/qpdf/qpdf-7.0.0.ebuild
+++ b/app-text/qpdf/qpdf-7.0.0.ebuild
@@ -12,7 +12,7 @@ LICENSE="|| ( Apache-2.0 Artistic-2 )"
 # subslot = libqpdf soname version
 SLOT="0/18"
 
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint ~sparc-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~m68k-mint ~sparc-solaris"
 IUSE="doc examples perl static-libs test"
 
 CDEPEND="
diff --git a/app-text/qpdf/qpdf-7.1.1.ebuild b/app-text/qpdf/qpdf-7.1.1.ebuild
index df045305bb67..7b0bf28566cf 100644
--- a/app-text/qpdf/qpdf-7.1.1.ebuild
+++ b/app-text/qpdf/qpdf-7.1.1.ebuild
@@ -12,7 +12,7 @@ LICENSE="|| ( Apache-2.0 Artistic-2 )"
 # subslot = libqpdf soname version
 SLOT="0/18"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint ~sparc-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~m68k-mint ~sparc-solaris"
 IUSE="doc examples perl static-libs test"
 
 CDEPEND="
diff --git a/app-text/qpdf/qpdf-8.2.1.ebuild b/app-text/qpdf/qpdf-8.2.1.ebuild
index 9745f21e963d..522fafc80cc9 100644
--- a/app-text/qpdf/qpdf-8.2.1.ebuild
+++ b/app-text/qpdf/qpdf-8.2.1.ebuild
@@ -12,7 +12,7 @@ LICENSE="|| ( Apache-2.0 Artistic-2 )"
 # subslot = libqpdf soname version
 SLOT="0/21"
 
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint ~sparc-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~m68k-mint ~sparc-solaris"
 IUSE="doc examples perl static-libs test"
 
 CDEPEND="
diff --git a/app-text/qpdf/qpdf-8.4.1.ebuild b/app-text/qpdf/qpdf-8.4.1.ebuild
index 4555441c255b..fc19a146e9d4 100644
--- a/app-text/qpdf/qpdf-8.4.1.ebuild
+++ b/app-text/qpdf/qpdf-8.4.1.ebuild
@@ -12,7 +12,7 @@ LICENSE="|| ( Apache-2.0 Artistic-2 )"
 # subslot = libqpdf soname version
 SLOT="0/21"
 
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint ~sparc-solaris"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~m68k-mint ~sparc-solaris"
 IUSE="doc examples perl static-libs test"
 
 CDEPEND="
diff --git a/app-text/qpdf/qpdf-8.4.2.ebuild b/app-text/qpdf/qpdf-8.4.2.ebuild
index 320e39eb2a68..a31c84968611 100644
--- a/app-text/qpdf/qpdf-8.4.2.ebuild
+++ b/app-text/qpdf/qpdf-8.4.2.ebuild
@@ -12,7 +12,7 @@ LICENSE="|| ( Apache-2.0 Artistic-2 )"
 # subslot = libqpdf soname version
 SLOT="0/21"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint ~sparc-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~m68k-mint ~sparc-solaris"
 IUSE="doc examples perl static-libs test"
 
 CDEPEND="
diff --git a/app-text/qpdf/qpdf-9.0.0.ebuild b/app-text/qpdf/qpdf-9.0.0.ebuild
index c4633b3c6952..32bef49367a9 100644
--- a/app-text/qpdf/qpdf-9.0.0.ebuild
+++ b/app-text/qpdf/qpdf-9.0.0.ebuild
@@ -12,7 +12,7 @@ LICENSE="|| ( Apache-2.0 Artistic-2 )"
 # subslot = libqpdf soname version
 SLOT="0/26"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint ~sparc-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~m68k-mint ~sparc-solaris"
 IUSE="doc examples perl static-libs test"
 
 CDEPEND="
diff --git a/app-text/rarian/Manifest b/app-text/rarian/Manifest
index c7894901a087..41e90135c2ce 100644
--- a/app-text/rarian/Manifest
+++ b/app-text/rarian/Manifest
@@ -1,4 +1,4 @@
 DIST rarian-0.8.1-r3-patches.tar.xz 33508 BLAKE2B 772f2e2ff45b707e45da16103da665c54655dae0b904db5240964a25591f5871fb28c37e42a99cb98c760a214e6b039af12015bffb9b51ccb50e6bb054d3effa SHA512 a6a258803ce165854047aacd1ffef32d8d5c271cad3e6b74fb3c694ca6a0de9a8f253c89f9ff53279e7228ae401fad06721f10a6374a03a51bad76b2ef969000
 DIST rarian-0.8.1.tar.gz 459461 BLAKE2B 7589633a3abc188a7e83adede964b4d293984ad9c896e5c8116775905dfc3acc3b0cfbbee574b26d1c3966501f8b42e61df9910c840c58bfcd0b41d065a30c26 SHA512 ddc640e1ac210e9dc3fcdde6bbff6e21dabe97b160b531cac68d47d1b831dec71b7c4aced9819cfafd8f89f290920c4e33550b8e29d9872a1c1a202d6fe8e3eb
-EBUILD rarian-0.8.1-r3.ebuild 1837 BLAKE2B 9469bc44dc063490380b3ca8ae45e5182890f83336ad1f75e4605d87b2f1c9bc048709a88597e5acdc99663894fc87746c7bcf0cad35f073fbb5c8fbe0f0975c SHA512 d07b0d20dcc2b17f8b24e60692f9fcb096287b1b086d22dbdf412de02883688de6054b2940cce4ba1a37bfb20b9259531b3dc7f50e524f081b5a2a058c773781
+EBUILD rarian-0.8.1-r3.ebuild 1815 BLAKE2B c6d699372a72c024ea32bca44c464519c2f1d4268ef373c54e2aeb202898874236e8e7687957a21aebb8510a09b5de798cb68836051a589f684779756a944819 SHA512 8c3e2a4b20695cf0b8a7ea357d6635bacc9c92ddaa884f6c8ccb7afc9a430fff0a871bdc7b825d966951a93b60cad9d4de5109ab5b1a9c743d03cec39985f08e
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/app-text/rarian/rarian-0.8.1-r3.ebuild b/app-text/rarian/rarian-0.8.1-r3.ebuild
index f620a54c2025..db896b4f7e50 100644
--- a/app-text/rarian/rarian-0.8.1-r3.ebuild
+++ b/app-text/rarian/rarian-0.8.1-r3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://${PN}.freedesktop.org/Releases/${P}.tar.gz
 
 LICENSE="LGPL-2.1"
 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 ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 RDEPEND="
diff --git a/app-text/recode/Manifest b/app-text/recode/Manifest
index 623752853e7d..37f6ecb82934 100644
--- a/app-text/recode/Manifest
+++ b/app-text/recode/Manifest
@@ -3,6 +3,6 @@ AUX recode-3.6-gettextfix.diff 514 BLAKE2B cbe2dc00927ce9215d1719f78eb78bdea0cc8
 DIST recode-3.6.tar.gz 1751886 BLAKE2B 94436343969da0ee6d16ed69a211d4f36b7a9cb59ce931ef71cfc1e0f11e5709e67ee1e0bb24f5320e6c7d6d01920a6c4d9edce87ff2c6aaaa8c80e30f3b536d SHA512 68de277ac8cd5f6023bb077b959ab5778a78edac1299d507bab906824080b6f86e9bfcd89169aa474197c2faa9af2ceb1ed272c8dd4d50caef373afa05daed1b
 DIST recode-3.7_pre20140303.tar.gz 1580388 BLAKE2B 8fb280368e6998c8cb4554f856dd779e70fd53958bf6da5839735e14e741f45b110ac106494703d97ac3390f41736b2d94539dfde4554b3ca70911788ce8c005 SHA512 a1821909e7ba68a315bbd5e0dcaf0a574f09ac6ef1ccf8858aeda1a0affc09cb70353b4bda005a14cff37ef41646a6f5246c5b5a0f6e89db2065eac7ace9b030
 DIST recode_3.6-20.debian.tar.gz 341117 BLAKE2B 748ee36b68f1d1501edde23e8afcbd58df70a86745e7c366a27a33496e539dcae11b746fb46767e95ae99b68a18684e3e85c1ea961692ac57ad1a01a895734a7 SHA512 bc586534e77b49da7d387187a8ddb042a12871f87f4f32c818ce7218b7254ac5ba6eccb14aaaf0312579f27958883f2da620016a7049c3af24c8bfba81acc3ef
-EBUILD recode-3.6_p20-r1.ebuild 1666 BLAKE2B 4d47ac76ad8a1a57bf31c313b345158d7a36995a5b7478cd6a698aed49ba43a0d9e9f29c9813aee1b602cea80f5a8e3a98789a2cea930a7687fbd3ccd096764b SHA512 e934997a54c90398769ea35803a4008bfeca5ba69cf7c20b9001cd49f4f342648f66185e6fa0df3a59598408d233860f5effbe08bcc6c077d372ca32f7e1d294
-EBUILD recode-3.7_pre20140303.ebuild 1117 BLAKE2B b745a5946e221ca9790e5521d86cc0f81096daa87e9a55dc88900bcedd058644cc2c85181b2f5cf532964edcfcc24acffa3e0b0d36f80868d7ea5d42b55041ea SHA512 c281d27e012193976989ae044744584ee5be47799542e9ee53c882550a2fec0f9bfbf8c5daef75cc212001e6e1d23be342a1b3ea4bbc4e16e55c95dfa9161ff6
+EBUILD recode-3.6_p20-r1.ebuild 1644 BLAKE2B 539f302c2e0bd2473fdb1bc4f9f2e6d5eff9b60fc880508d27e46a55142ca870e4fe2dcd86b6b7a7c434e20581da7442632540dbb74e517ca9049f4cc95ae9cf SHA512 ddedcf411f1180adfd15d68ac58d4a65d23607d6e9841a275978901fe019bef1a1e18761866cae0e19e78ec14eb21d5c3662978c134d2a3e115c615ac7300898
+EBUILD recode-3.7_pre20140303.ebuild 1095 BLAKE2B e2a89f0b13ced5f68263ce75434a616d8627fb735739fdfcb0adef816598acaca2357a029de71227231089dff8945e441d73e146778ded23a2ae9d7b866d1694 SHA512 4e29c10baae6065d26b3f31671a0bbb6a9c31df9513fa171629e813d5312c0c3d97c99ffdf69c651079e0b89f16ef8c28003730a6849dab412e9f8a1584b6c12
 MISC metadata.xml 271 BLAKE2B 46146f4bf13e9f4d33435225ec1012dd9bb89b20812963dc50368cab2a60a3c542052cb72f8963cc72074b2c13a5b054c77152de1d108027752601a349bc4ef8 SHA512 3e98f5382cf789992bdfc0f32e6e36eba31944be654c03f2ed9bd00baf56c8b768c256c4f8778d5775d6df38da4afcf8e32b6e6495a1ecfc8e7982c7c8943b1b
diff --git a/app-text/recode/recode-3.6_p20-r1.ebuild b/app-text/recode/recode-3.6_p20-r1.ebuild
index c54f1f42b139..5d227e252fbc 100644
--- a/app-text/recode/recode-3.6_p20-r1.ebuild
+++ b/app-text/recode/recode-3.6_p20-r1.ebuild
@@ -19,7 +19,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="nls static-libs"
 
 DEPEND="
diff --git a/app-text/recode/recode-3.7_pre20140303.ebuild b/app-text/recode/recode-3.7_pre20140303.ebuild
index 252872bba7df..1f34cb0889a2 100644
--- a/app-text/recode/recode-3.7_pre20140303.ebuild
+++ b/app-text/recode/recode-3.7_pre20140303.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/pinard/Recode/archive/${REV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="nls static-libs"
 
 DEPEND="
diff --git a/app-text/rman/Manifest b/app-text/rman/Manifest
index 308ba40e4260..098d10906111 100644
--- a/app-text/rman/Manifest
+++ b/app-text/rman/Manifest
@@ -2,5 +2,5 @@ AUX rman-3.2-format-security.patch 458 BLAKE2B 85807cbc0ffa292c56794f61f37133381
 AUX rman-3.2-gentoo.diff 560 BLAKE2B 7f63625d37971f537c44667a05ec5b65c7c2216c05b5cc447fc802be3a35df365def1c8a95aebd5ed2f462eeced80cd1c106fb2708c231568a7666d1fa7335d4 SHA512 528b2e7385882620ecaa0374a65579e0fe56803aa6991277ea1279d18d65a4331ebbfc2374a711bda2f5722a5fcc236681f9c4dfb3c0abed1e931ff986cbf74e
 AUX rman-3.2-ldflags.patch 451 BLAKE2B ee44bfca1a15b8a52a42c703ca749722257f8ded019fa3119687f0808ad85ae696096bc29d5a7b04c4527382ad1f3f9d8d2d3e3bfb72005a167be3e95693a4b3 SHA512 936c9fb92e3f018ec0006370ea61f010b61469171a22a9f52a6773f32ef3ab01764b726573aa30548b1c9ea6db3893302a45d20c06bc19f7e272b5e531bec433
 DIST rman-3.2.tar.gz 79397 BLAKE2B 2be1c60f77c3b2c4fa73a59c5a8965da1c8b1f3b569e7e4d5716a372228bacb81c5421f4bbf330781aa231835393c915ed14057c717cb1e8ed57101f7febb37d SHA512 a70aea0af1510088fd88a736e63a6dab9200040be5eb89912ede4f50e3de97d423574841bbb66e90fb12934f3834dac0acefe78ff1c73a78a79c95c3dd6fa5ae
-EBUILD rman-3.2-r1.ebuild 823 BLAKE2B 168b622d56892faa6e41642ce973a4b4c4cc633334a7d7828abb4ea9a974f3c7fdd09c5bc0e7d83203d99fb79a186f1dda854699f22874336ad148f3366ea6ad SHA512 0a5559eda13c5f2a971e99b35020359d1e1599b9af42e9574d788f21c49742e9cd5ce2039239adea2e7a947c1259c7f6b44bd81a712915cc1bd7e598cb5191a0
+EBUILD rman-3.2-r1.ebuild 801 BLAKE2B 8d5c18c144bbe7895473b6d3f5348a4a4abb00604957a053b53afd8827f56709f14c7b2ffb343af272625734ba8e3f5bfa3323a552377d10fea12e9123a1c1c4 SHA512 fc5b40f2a57e73dd5a48a5a763d5cf499f01ee23a13640e75ea5192f29d7af23f4ecfe9b2ec73f128c96524677355a5cd45c3a5b5d743947f7264d7da38a0efb
 MISC metadata.xml 334 BLAKE2B f3759592bab3b3f8426acb5a0fff5d5d7efb5618c951e2c0a26dcc119f609702f45327dcc47de6132befee7064536413006e77a09ab67415c041b0697129df6c SHA512 29d5b70060964469ce308fed8bc01e09bb74b3d2ac0605760d88f7dbd19a1cdd6517cdbab76f4269188454112837e0d27b32bbf3c5b9ecd5bb4d3ea4f862188c
diff --git a/app-text/rman/rman-3.2-r1.ebuild b/app-text/rman/rman-3.2-r1.ebuild
index d891857e3a63..740f1a45515c 100644
--- a/app-text/rman/rman-3.2-r1.ebuild
+++ b/app-text/rman/rman-3.2-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/polyglotman/${P}.tar.gz"
 
 LICENSE="Artistic"
 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-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RESTRICT="test"
diff --git a/app-text/ronn/Manifest b/app-text/ronn/Manifest
index c792fc3e0e81..d686147029cf 100644
--- a/app-text/ronn/Manifest
+++ b/app-text/ronn/Manifest
@@ -1,3 +1,3 @@
 DIST ronn-0.7.3.gem 61440 BLAKE2B 3ff0a1752d7a972b7d8319cac2b1287e7d21207e22b9eb288694172eb9b30b2198e4378eb02df8418585a44d3d2c89b4695675933dc5ef5d9ba63c78e71f4e7c SHA512 885418c88d5a1073f9457ea11e29d82d3bb40ad12506589ccfab83ad447445e41282c9688aba5646082ae5ecc6a047fa9439ffae14561152fc61a136474f611c
-EBUILD ronn-0.7.3-r3.ebuild 1183 BLAKE2B 7e0ee7a12f450753ddfeb4419c577fbfa59fff069450cfaa4b3cc479a2e6677c234e80e6088846b400cafcc3e50e2252342404c06605ac439e56649f39723558 SHA512 c47a743edf5a9ef171e44a2d6f7676211aa5dd0676c2360e01658d7b1b60e2d7eac733258e7720600ea2abcc9ba264ee8858643ad44145dd0c107aebce468713
+EBUILD ronn-0.7.3-r3.ebuild 1173 BLAKE2B 7d44862ed10f3a084b215c1cfdd8261d4160133cd11d9de87bcc509e3a92b6e2743a90b17b568bbdabd30961c74bfc7bf1c58108f70a81b8fb9a6176595227a3 SHA512 b82c03860d16952b331123301f6d703f0a00fc60b91df69730e34107c1d1dd9e9d9336360dcde247b3d1d64a48e2bf2c7e6553e0de516209674d2394d270cdfb
 MISC metadata.xml 339 BLAKE2B 2a1722a0531a1ccaba0d29a1ace114b95789ba4b0c692e8efcf38605f81de4dd1210671331fcdb5baa6536cf38fbf63f11b85fb13bd6a067be56f22a372fc5b6 SHA512 0be4072cf3514eba60569138ed409362b318616ad4514e319d9b4add120e74fd7655e2fc5c3ab8d7b5d813cfcf8e1054fb98395a1a89d9fb90e447a825ee9439
diff --git a/app-text/ronn/ronn-0.7.3-r3.ebuild b/app-text/ronn/ronn-0.7.3-r3.ebuild
index 9c72157f73c1..50774daf7f6e 100644
--- a/app-text/ronn/ronn-0.7.3-r3.ebuild
+++ b/app-text/ronn/ronn-0.7.3-r3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/rtomayko/ronn/"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 
 IUSE=""
 
diff --git a/app-text/sablotron/Manifest b/app-text/sablotron/Manifest
index 789082e576a1..f837938c4bfb 100644
--- a/app-text/sablotron/Manifest
+++ b/app-text/sablotron/Manifest
@@ -1,4 +1,4 @@
 AUX 1.0.3-libsablot-expat.patch 286 BLAKE2B 07728a2d174343133946519934a0b10aa0ea0d2c7e5ba73401b8c16ead71f059f78b24236bc96e17baf2467a5765ce0d82e67e97bb48225a9ba0fc5ac8a163d0 SHA512 29b7ae2798696439d3b181196677a7e7beacecac39abae631c73aff2d77e608bbf0088100953db78feb82cba37f89350da238cf8053e694c8ff0b3d8e8837040
 DIST Sablot-1.0.3.tar.gz 607597 BLAKE2B 429df09361d233b290e1179d5a3fbe7b421b834c23ff32d72466f007fd4ce19e810d68483b1b0314e943f2ff0f3713a3f28a357a71c69722883f5c85499cb582 SHA512 836c1a9d09317194333619461b0e5ea312277cadb6df5ae5ed327bdfee4090970bd3056ec0b3bd6aa8a3e3289af1bc5c1461c9fe15b53a944f1042190c485031
-EBUILD sablotron-1.0.3-r1.ebuild 1053 BLAKE2B e969fcfc506eaf71ca7534edb4e2bfdf7fec8c2813fb156511d61e99dcc860e0f5c3e0ae574dc50bb885cd8f03cc24530fa06f0179549815b0a6f98510d62225 SHA512 a3145154f2be9d371e1cbf33589f6da3723ef3106c38a6f278c3840043f58137bd7d072af0602c065665773ebf471a711fdc81dbadf400f8619aecd5e0aa21eb
+EBUILD sablotron-1.0.3-r1.ebuild 1043 BLAKE2B b54ac77c2a6c570fe07ad380604114d63ae5ecd54b1e5786c6e634c7fd046a5c4791210691350537d43b198eeb9800ef355fc9a1bf422ea253e1957c1922bf98 SHA512 184c92b8c6fc4992fbc09506e67eebae0ab10839fee12b4321334523fd8942245013aa00e011b6d61ecfe69986ba6a3798f18e0481fc6fd58877816b51537c44
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-text/sablotron/sablotron-1.0.3-r1.ebuild b/app-text/sablotron/sablotron-1.0.3-r1.ebuild
index 622e9320de00..aa2df2039233 100644
--- a/app-text/sablotron/sablotron-1.0.3-r1.ebuild
+++ b/app-text/sablotron/sablotron-1.0.3-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="http://download-1.gingerall.cz/download/sablot/${MY_P}.tar.gz"
 # Sablotron can optionally be built under GPL, using MPL for now
 LICENSE="MPL-1.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="perl"
 
 RDEPEND=">=dev-libs/expat-1.95.6-r1"
diff --git a/app-text/sary/Manifest b/app-text/sary/Manifest
index 5f71863507c9..0bcedeca78de 100644
--- a/app-text/sary/Manifest
+++ b/app-text/sary/Manifest
@@ -1,3 +1,3 @@
 DIST sary-1.2.0.tar.gz 393787 BLAKE2B bcfb393dbae4b5edd51b35a9bb542a1988a4293a321a72f9e3fbce48abbd034bcb96bac915fb330166c5d8adcb2f2b572e808b76508c0411521aef722422c074 SHA512 0eeae82a384970b4d96f7a0ca3929e74d17b8b3ebc61459ec9fc7172e61c3835ffe2de8aaab7ebd64f54be24d39f6734949ebc98758c28cec299b3bd25020632
-EBUILD sary-1.2.0-r1.ebuild 950 BLAKE2B d34edd5b708c68cc1494b7f41167446f6db9945ea239fcc0d87939e733d83b41b3632aeeea01b996b00a475a45006ad1e81045fee4ea8f2e49eedd3242f4f94d SHA512 74713f39515aec6da7df7664755243d28c339313c1de070824d2ef05a1deb50309ead443bdad9e490da891b92ed0daaa181f9cadb6337a38c9192c6772a7c83c
+EBUILD sary-1.2.0-r1.ebuild 940 BLAKE2B 6cc0f09cd9d14a40b6d4a1ada57f132b2a63e6e3522b06e9483b3b850afc74c2b5a8fd2ec6ed944d8dbb23c1049c471e06fa0295d90f76f01a5869aba392f41e SHA512 b8c1473b0150a40141c1b426bead96695f32d15bfb383d946ae4274cc2976a1124d93d06b9a3b9498ea2856cd43ea49b55e580a4193b49dabe5310c5160f867d
 MISC metadata.xml 614 BLAKE2B dbab63bef60f0c15430f90761b9660a90cc05561104ee73eb3848ba30fae5d8bd888e091afd6709d9796cc9fa087c350903e5c83077bd014fdfd9cb7d92dca3e SHA512 ef381dbe030d43e46f5b8aaf13c0783cb1a215bb2961793d75500712fd491983e2df30eb838eb504432d2cc844b7e064d0f96c0efd67d190295496b8cc082a15
diff --git a/app-text/sary/sary-1.2.0-r1.ebuild b/app-text/sary/sary-1.2.0-r1.ebuild
index 1155888702a7..0a46d5be73af 100644
--- a/app-text/sary/sary-1.2.0-r1.ebuild
+++ b/app-text/sary/sary-1.2.0-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://sary.sourceforge.net/${P}.tar.gz"
 IUSE="static-libs"
 
 LICENSE="LGPL-2.1"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 SLOT="0"
 RESTRICT="test"
 
diff --git a/app-text/scrollkeeper-dtd/Manifest b/app-text/scrollkeeper-dtd/Manifest
index 10e254a94150..dfcd30d9e88f 100644
--- a/app-text/scrollkeeper-dtd/Manifest
+++ b/app-text/scrollkeeper-dtd/Manifest
@@ -1,3 +1,3 @@
 DIST scrollkeeper-omf.dtd 11031 BLAKE2B 47a52f587447f30c1c93ebdb4d1339d714260c7bcf16711591edb0b0f8a41d6694a1f64f0306d0c296c032869176b884adb50762eaa445f50684820effcb9399 SHA512 edb38d85352d0ed4a4fd1eea108cd88696d2f0759bc4402d4b7f85aa56b5647ca5a518de14deb3a429344ede474d42a64b90100e5d3c772ae6e5e47a47d86ff0
-EBUILD scrollkeeper-dtd-1.0-r1.ebuild 1538 BLAKE2B 1b75e066575e75c8c565b8185b6c870afbd164d809707fe2dcace671f598bbea01af6f7e2d8ff16c4a9b4e2e162d2fed46a24caaa75ec06c38485a767ae1c037 SHA512 28b31ab7494ba0a733c8ece1cd030d57d7b7d8c75b1aae43d046d4ca0eb2a249f00e16201526567581333b917489cb51143c6dbf113b8225b60553080dee4846
+EBUILD scrollkeeper-dtd-1.0-r1.ebuild 1516 BLAKE2B f99bfdb8a99533aace38abd7cfb5d5cb703372c8056b9fc4d1ca88a5198efd7015d1d9bb03df2c555850a880d6525d47b6ee3365fc6df9ad6fd438d891e550a5 SHA512 2500277fbb4cb09a703b280b5119d479b884789e711e1388b9f4f4147421c601bdd7dcd8c9525e0b44aa8d05d2fa336a5fa60d18484210599c0bd50757e04619
 MISC metadata.xml 335 BLAKE2B 5557a7230bee25bc8e1340443746da2d41568635c68904549b2ac2f6227a70444cf2753e6656de56c290c1a96e18dbe882401bcba68e271259cafaa44402a1f1 SHA512 c0180e1504b25daba0b5f2a6556793cf721eca12a4c488a57e7960b9b096129e5f535a24e1da1ffa6b1d9e8b646325edcebd00e5f7e908ace3d81d818e49f8e3
diff --git a/app-text/scrollkeeper-dtd/scrollkeeper-dtd-1.0-r1.ebuild b/app-text/scrollkeeper-dtd/scrollkeeper-dtd-1.0-r1.ebuild
index 581c5f9bd798..8d1d95790d70 100644
--- a/app-text/scrollkeeper-dtd/scrollkeeper-dtd-1.0-r1.ebuild
+++ b/app-text/scrollkeeper-dtd/scrollkeeper-dtd-1.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/${DTD_FIL
 
 LICENSE="FDL-1.1"
 SLOT="1.0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=dev-libs/libxml2-2.4.19"
diff --git a/app-text/scrollkeeper/Manifest b/app-text/scrollkeeper/Manifest
index da0eb8752512..4f3e0061d3db 100644
--- a/app-text/scrollkeeper/Manifest
+++ b/app-text/scrollkeeper/Manifest
@@ -1,2 +1,2 @@
-EBUILD scrollkeeper-9999-r2.ebuild 508 BLAKE2B dac0791d87b250de0ca1d238e7723ec241e5794b9afac06ac52003299d1c95020b583c5391a1666eba4a0ca5756aab488b2edee9a4320fb6c4e1d2f0c295ea56 SHA512 4175a3ed7c2f6855af4a0f0a345a9a87ee6842d8ab7810063ee531595f6e924bc0955241c5a454aed994bb0e5fc28720cfe7d49c87065db75573d1eea788e46a
+EBUILD scrollkeeper-9999-r2.ebuild 486 BLAKE2B 8b2576d33ff59d44ea1ade106f476e8535f185d01dad7b19597e502160bc61256fa0761228922661e3ef1ad0efcea451a124faa34ba29bb4ea704d154c6eede6 SHA512 ce09195a489eacdba52610b621f54a8d3cc2a66600d31f490eb4dac69881dbe9c7d3c75b951e2f262dfc2ef93af2c1f01f39104faa1fb0dab9cfa75060169ca3
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/app-text/scrollkeeper/scrollkeeper-9999-r2.ebuild b/app-text/scrollkeeper/scrollkeeper-9999-r2.ebuild
index bb8c99747484..3367ac85b1d4 100644
--- a/app-text/scrollkeeper/scrollkeeper-9999-r2.ebuild
+++ b/app-text/scrollkeeper/scrollkeeper-9999-r2.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://gnome.gentoo.org"
 
 LICENSE="metapackage"
 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 ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="~app-text/scrollkeeper-dtd-1.0"
diff --git a/app-text/sgml-common/Manifest b/app-text/sgml-common/Manifest
index 2c1e3eeba84b..19c33ba4b055 100644
--- a/app-text/sgml-common/Manifest
+++ b/app-text/sgml-common/Manifest
@@ -1,6 +1,6 @@
 AUX sgml-common-0.6.3-install-catalog.in 5064 BLAKE2B 2400dd32a80a64c89ded54d898a2331b649a35269bd3389e6c71c9f161b5b02b857230a6c7f4807cb975ff4c7d6a99a5576d2bb79190e5914c9faf9488e1d11a SHA512 85fbcdd7aceb28256e08ca1a5b6472247d81499e604d6a45edabf662bc32b72a22326db907e2a408b1a6da02deccd89606749e3fc8e42594ad6402ab29d501b9
 AUX sgml-common-0.6.3-prefix.patch 664 BLAKE2B 5b82b66824547c0cbae10f12c94eaccaa0789c1ff68a20c3ace00cc1620dc0e2d7c81cf906db8fac82104b9d1c5ea29af42746b200f1c1a5a9e9728052f5859c SHA512 62758c7ccb4e86e91292757546e6a1f932cf8282abfc2d9ccfe2e68008bbcc995d0a4eeac3f0c8584c4dfae552a42000b438defe38dc911b770a9e8e72b310ef
 DIST sgml-common-0.6.3-gentoo.tar.gz 128903 BLAKE2B 3b374179fe85cf6f098649d2014f9d34349ddccd17ae0ac4c5502414507601c545eaf27f7c76fafd63c36041068205d3b82309a204989f3b106c04c7adf14875 SHA512 c8de573d707ccf524407c9be9a6e7740341eb88ecb6bee69d6d11a2658ef74e6acfb7495afa33c9983ab015c3c925aac98278a4e01ee217892a9fb99e60798ce
-EBUILD sgml-common-0.6.3-r6.ebuild 2474 BLAKE2B 0150bb9a950459ddccf7b4959a9e96aa570a32c0aff6badec54fce4f8a4aa2a3bfbf8ae667d39830dc9fc17bcbfb41366eb0a76e6eb7e231922d7667e1d2569b SHA512 2fb7a94b16c1c7b582f968c2f3916f1d1193811c5bce9541ed110daa87c3bf9228db5da7531da4d473ba9d28e4253a92fb44c98a58bb84be4c42e8660b4e1ead
-EBUILD sgml-common-0.6.3-r7.ebuild 2593 BLAKE2B a22d4e69b252cd123da3e78413ea58cb82b7ecc6ebf32bc533f6024f8bd4d7adc49eb6a76903deb65add93f6cc94d9708b2973875ffd420e0e85714fe0cc42d7 SHA512 f7a45346b9ebf325282bcf7f47d02faf4ec3ecf0e4d64e6b2ea6fb430adb5618c94e8a3164b1541ffaeae40c578f0e08aab2773b07f425c26cc02ea71677f6d1
+EBUILD sgml-common-0.6.3-r6.ebuild 2452 BLAKE2B 01b04b177a926d64e0963d67d513c6632b5271f45bb9518defd100d59f3d333300e8c37b4d3d849200fe2ba105bed108c09ebf0037fa08d7df310f151cd8b20a SHA512 bb4a34272e4937dd6c84077f4aae03d28a4bf9868651b0cfb373519673b2dc419834a734559d98878776e022a25ddda202083344c80b6fb5c7b707b39e5b7858
+EBUILD sgml-common-0.6.3-r7.ebuild 2567 BLAKE2B 800f5101e1f755c084861548a7e9ab0b5cff19cac9ff132763293702591b8d4540ef84caed5cc49cc4ac45774eb3479d7e191126fec68d3714aa3107b53b6e2f SHA512 456d3381d04aa895801cf07b37ae6fbd46fd05f9e13407cb10789e7e55d0825a82b19e8318564bb1e451c0a707a94dec8401837fa9978086a6fcff0c7fe50c20
 MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/app-text/sgml-common/sgml-common-0.6.3-r6.ebuild b/app-text/sgml-common/sgml-common-0.6.3-r6.ebuild
index 4ae7b574b727..21ad9f0b746c 100644
--- a/app-text/sgml-common/sgml-common-0.6.3-r6.ebuild
+++ b/app-text/sgml-common/sgml-common-0.6.3-r6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~floppym/dist/${PN}/${P}-gentoo.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=""
diff --git a/app-text/sgml-common/sgml-common-0.6.3-r7.ebuild b/app-text/sgml-common/sgml-common-0.6.3-r7.ebuild
index 18b9bdd5b860..2e02f5cb5078 100644
--- a/app-text/sgml-common/sgml-common-0.6.3-r7.ebuild
+++ b/app-text/sgml-common/sgml-common-0.6.3-r7.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://dev.gentoo.org/~floppym/dist/${PN}/${P}-gentoo.tar.gz"
 # install-catalog is GPL
 LICENSE="FDL-1.1+ GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~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 ~riscv s390 sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=""
diff --git a/app-text/sgmltools-lite/Manifest b/app-text/sgmltools-lite/Manifest
index 456f6c8d290e..c62de35f83c9 100644
--- a/app-text/sgmltools-lite/Manifest
+++ b/app-text/sgmltools-lite/Manifest
@@ -1,5 +1,5 @@
 DIST nw-eps-icons-0.0.1.tar.gz 8733 BLAKE2B 467fa3f341c1d6ea20af059cfa88529a0b3bc729cefac72d5b3c264d3a224e8bfb05a89b5f491a22aaf4c194b72cd27ac103a381adb671d9867ef8fceb41f030 SHA512 597062e9882bb9bb73144bbdb056c3ccc2a6d99efc7da836f483ccd6f3799705bcbb897099cb1a580c8e22d936d281d95c3a875694f8e15b6989faf437f6cc7a
 DIST sgmltools-lite-3.0.3.tar.gz 61342 BLAKE2B 8fcac5b48fcdbb8fbbfdbf8ad055ab00cb3fb6a8447a27bf5b14faef968845554a86f04b4984c1ccc1e26d9c64dc5654d5831896bbc44bd3dee0ef3fc28109e5 SHA512 36709ba726859b734a7402c533ba7d2abc0546007bc97dba76ac824bc42f6f8ac7ef263b3740d0be51749cbc0982d010ba938646fca2006fa2c5094a296b3c81
 EBUILD sgmltools-lite-3.0.3-r14.ebuild 2205 BLAKE2B 030bdf9b6258b0768b3098c17d4cc820110cfff79ce9a2d6becf6d1c28c18977d2cbceb083cec512cb64380bd5cf8ef012a773357d328a08f4cef607229fd237 SHA512 f1cf3035547d1626ace249218a75399e7ad9374f60de3203003393418324628dce27f28cd608f4a4c310306d36043a6856db273307c8ec5a9a3642307e1cb351
-EBUILD sgmltools-lite-3.0.3-r15.ebuild 2551 BLAKE2B 15d1d26a84402722cab1b584d7e8911de57f642d03d1378c5d9bc39a245369c0eeb97d2bb610e0f47387c919b164b9f3b5d9b5b9a87ec428487c3cb4720c0b8c SHA512 a5cebbe167e7bd562fbffa2da8dd7fadae91caa9f1a292bf4ff7683d582ba8c96be1c4cedb64b436780178ec051a3daf1376944f660430b2a61bc4649a9ae372
+EBUILD sgmltools-lite-3.0.3-r15.ebuild 2549 BLAKE2B 2fd99f4cd7a56638734df4e1dc5953e135b92419d52cba630daa43e644ccfa8ec8f2e204b5ec905473ebe7cf36efc5531b0f9437f8fcb67ec4730c175d08a070 SHA512 08294ee125a1dc755625023a8ec89d07f60ab9e9f0c0c897a4f7090e6bb6d88ed791a01c241aec2bc9f6e176241aa90eb2aa8750eba8ac0ea30b628d27ed5684
 MISC metadata.xml 493 BLAKE2B 36e972b80b557e131d5decb41945968ce24de810197ea457e50081017e50e3926baa419082222cbdfb494a55e9bae125bf304a431234efb4c4a67a8c3536852a SHA512 9f2e53faa5f07d791f7c4cfa7972ed42a26d1abfa5c11faf3e36dce18c2c30d086462e9c0a2c7664153333cb10c3923d47b4bb9e873b7e48dd144e667719a14e
diff --git a/app-text/sgmltools-lite/sgmltools-lite-3.0.3-r15.ebuild b/app-text/sgmltools-lite/sgmltools-lite-3.0.3-r15.ebuild
index b23d92b022ee..44cfa3625f33 100644
--- a/app-text/sgmltools-lite/sgmltools-lite-3.0.3-r15.ebuild
+++ b/app-text/sgmltools-lite/sgmltools-lite-3.0.3-r15.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 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"
 IUSE="jadetex"
 
 RDEPEND="${PYTHON_DEPS}
diff --git a/app-text/silvercity/Manifest b/app-text/silvercity/Manifest
index c7b6d616dc87..e6f4c4f799f9 100644
--- a/app-text/silvercity/Manifest
+++ b/app-text/silvercity/Manifest
@@ -1,3 +1,3 @@
 DIST SilverCity-0.9.7.tar.gz 278396 BLAKE2B 30419ee4d2cafe56cbfc1b73a3b188214c58e29a154810bed9b837d9fdc6709f7691c1662cc1da0a5eb1b326a430f958d66bb5629ae2f3a3afe2442f2e11957d SHA512 230c4ce61a0dfef36ba63dfa2d290c2368ae0a1055445b1e17cd12ff436ec80ec91e5a8ff47870c19a3f7a50f958ce59bbe5be06aa07dd0bf0a70038ca3150b0
-EBUILD silvercity-0.9.7-r1.ebuild 923 BLAKE2B e5891e786498ac428ed3970f4d40fdaf22ba8fe1ac9377a728ea321ca463157b371e6186cc4af1a4e90ebaa36dcb28a5e726dd070c46853e523b838a621b02d1 SHA512 6a224815f39ff8ef107fc62c23f0ca63fde672c792ec666816eca19ca1fd0aab2e6616c7b7873d18dfdd4d426b5cf88040ce292dd9ed6e07d6f5dde39b47ef62
+EBUILD silvercity-0.9.7-r1.ebuild 913 BLAKE2B 5ced5eab8dc1732efca681bbb2ad654a7ac5cde137fe25fb8e402b982ba0274b994485a6a26f4c55d898126e7af3db83549f62e6247fd0a975bdea68ccd90b79 SHA512 f5e69707bdbd9fb7a8acbc30c440c64a88f4f34c81920d4733cef02954edae1bfce17c1a08fa9c4471aad2c43bdbcf274828bea474513d355439cbfb6be726ce
 MISC metadata.xml 330 BLAKE2B dc1e089aa92ecf442d42c3a1dce93b9735a2c58a5fb6488c6825110125e2292c94e6bc0fa6471a56b58e72e6a130162dc77dff3f548f70e470ba628d21b6ff07 SHA512 6ae025cf1a3a56a19a6fbf436c293fe57365e87d11386797f94fd680bd0d044c8c13860670e070af9c1cad7c0a5f6bd4c29468ac5177456d20196844482676bd
diff --git a/app-text/silvercity/silvercity-0.9.7-r1.ebuild b/app-text/silvercity/silvercity-0.9.7-r1.ebuild
index 36a16f780317..29e26f3f30bf 100644
--- a/app-text/silvercity/silvercity-0.9.7-r1.ebuild
+++ b/app-text/silvercity/silvercity-0.9.7-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/silvercity/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~ia64 ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE=""
 
 DEPEND=""
diff --git a/app-text/sword-modules/Manifest b/app-text/sword-modules/Manifest
index 294a8f2ee4a1..d024137db633 100644
--- a/app-text/sword-modules/Manifest
+++ b/app-text/sword-modules/Manifest
@@ -1,2 +1,2 @@
-EBUILD sword-modules-1.ebuild 3971 BLAKE2B 54f8e9aedf19414c75ba00174a269b999033534f29db13956369fccbebe40c08a9986d8c133e5c2da7e3d35894190d3128c00605eb11a6415c2ba5b0c879dc81 SHA512 900b7506d16f487f397af1cd3d8188fbb73ea1637cb3686d0f78d21f3abacaa7fd1a95ea02b034d0739bb6b666e65b48e9c508e0a93569ab7d24fde6827a1504
+EBUILD sword-modules-1.ebuild 3961 BLAKE2B fe0193035732029ea55eb6bea090de9eec408612bd77158e30efa29342e09dd887cebb17d4c601ad30f15f83aeaea002eaf75e087ef5038518dd666420afbfff SHA512 539861d578b0509bd06e0aa32612401c13235c8c4b718aa3f64a8ff46d5a42bfded4597b19520771d7f32da7fa5c70bb8397a0c7022fde4416fec983e5ad9258
 MISC metadata.xml 378 BLAKE2B 94f101a56061c2386d02786a9f8f023bd97e33629ed7d660f5f62395c8b18a95c5ee6facbdc54b0f4dddc530fa7e07802dd470067087226859e9de9df0f83441 SHA512 066849ccc8fbb9e87e694a0c6e3de55b9d4d685eace107a70287d2aab827231dbb7d2eba8fb5e92dec30de93cb4d8749332a7cdc838d971e298b8c0818ad026d
diff --git a/app-text/sword-modules/sword-modules-1.ebuild b/app-text/sword-modules/sword-modules-1.ebuild
index 0c3387a34929..f8c88194ab51 100644
--- a/app-text/sword-modules/sword-modules-1.ebuild
+++ b/app-text/sword-modules/sword-modules-1.ebuild
@@ -7,7 +7,7 @@ HOMEPAGE="http://www.crosswire.org/sword/"
 
 LICENSE="metapackage"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
 DEPEND=""
diff --git a/app-text/sword/Manifest b/app-text/sword/Manifest
index 7b3378b5f203..5859a055f208 100644
--- a/app-text/sword/Manifest
+++ b/app-text/sword/Manifest
@@ -3,6 +3,6 @@ AUX sword-1.7.4-gcc6.patch 626 BLAKE2B 69b56ed6152d07962d5941868925ac35825256e4d
 AUX sword-1.8.1-icu61.diff 4838 BLAKE2B d0ea686e4fedd8a6cfe242d1048f85b047d414424fc3ca7618a098d6e3ee82c440eb95c3370eeb0dbe46a4abe7ccc0c62e7b725cfed0f8ec0951e11099627337 SHA512 7bd545014ea81fa5f6203d39fd1a4125ae163ac51fe76270511b1df65d4dbf44b912fbaf3fa6a6d6a20370efc3abfff9feabe5de7177981ce1b62f4d9c5ce49d
 DIST sword-1.7.4.tar.gz 2157882 BLAKE2B 7ed50430500ec428a125e24550a1f7d0437a0253cf4fabad4c8af452d2aa82c71c11e4a6c334ef1a95d82f14ce1cc092f3774210113e9668ba207875b3a11b20 SHA512 4c8b183e613367364439cc7a8a842012f75180fccc8eb775b9af2dc4c10f39c152261d35f0aadaaa91a11df36ab1a4057c2edc50ea4b0b3bb0ab0a847ff68f75
 DIST sword-1.8.1.tar.gz 2449503 BLAKE2B 4cc130ade49211dd4def6d9410ad6a0f01b35d11df246e26bb7fd0ee5c27ef02ee06ed3ec33c7becd140fa303b4fb4b3d4ba4d62de78b86be343949d5fcf7c6d SHA512 5c08c070ea0c86b7d929bbf94c89730eb5a487986deb9edf01c08d1710356aecd1ab3bde4437a778e5fc1ceb05b63287612ec6161381c0986a36344c27d2ab36
-EBUILD sword-1.7.4-r1.ebuild 1974 BLAKE2B cdccfbf2bc8cc2f6a22b1bf88a929faf3a6305f271956acf83f0e9d4383b02a6e74201bc0accb28becc05b5e979f4032dcd48d9addab74ca5563c0bcb4d008c4 SHA512 b9c272643badb68f6af83bdf7a50f070f3a0fa56ed21ecf9c1b1ae941e5bee671cc9674fc8fba3b6042bc111f19576fa3d731700b7a9c91fbc637558e74886f0
-EBUILD sword-1.8.1-r1.ebuild 1826 BLAKE2B 7f9e2ae2a44ff3ec5704ede93ec93d08c47e4f78514d31d82326f910fd3f99fe2fc6a66283e405609ac9bff4c1f92849a1aa251cc2e74b2f3eebe3b29e04b686 SHA512 68b8d8194239b84cbfae825c91dda775ce0808eb07a0bf1b1affc046c736454153cb25c740f7310265d362eab8d15d701af38c6150fc394ea78dc18689852b0f
+EBUILD sword-1.7.4-r1.ebuild 1964 BLAKE2B fd911784f0d72c29f0a1fbdaf5df45594ba95428d654e65f8b9f3d88752ac7c651ff7b00441b90db1917141f962b022e33e8ef92e6d9a6c2ba5f0068629926f7 SHA512 a0a1698b1160feac54e444f951b60c661823ee25652ad4f219074b71a6d01f8f90ca03f381988e734849a28d45400c8e7fbbfc0ee8442393ba2a3225a2c0450b
+EBUILD sword-1.8.1-r1.ebuild 1816 BLAKE2B fb8a0b982e10ef201181308adc42fd235dce26c4bfbfa87e4ae3870373bc50116feac875d30e688178d174a727886175ec6cbc26307da152eebb220cdc454cea SHA512 070f6efa7131ec2559826431c926be8630d862f584280c5aa09d5ae942bf6e189443bf144f759aa6e95adf5db046a772bb69386685ad3248c6aed5a467a5d199
 MISC metadata.xml 564 BLAKE2B b7ed0b7e3e245079c82d4ebcb446a1e864e0f72610ac9c60d98fbfc73c7d078f12ddb7d1650fbc3816ac292c8c6b122990a71b0e99056eb21bdb4f3a8dc8b3ec SHA512 74ff38bf540aa48eb0195c7999adcf1226ede7ca4a6848a45b73913011f95e2bb7d84e0ca0534d2ee2610efee78234a52ae69f507704bb0ec80e4876a5d4aadc
diff --git a/app-text/sword/sword-1.7.4-r1.ebuild b/app-text/sword/sword-1.7.4-r1.ebuild
index 72b16688cc81..99a6880de9ce 100644
--- a/app-text/sword/sword-1.7.4-r1.ebuild
+++ b/app-text/sword/sword-1.7.4-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.crosswire.org/ftpmirror/pub/${PN}/source/v${PV%.*}/${P}.tar.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~x86-fbsd ~ppc-macos"
+KEYWORDS="amd64 ~ppc x86 ~ppc-macos"
 IUSE="clucene curl debug doc icu static-libs"
 
 RDEPEND="sys-libs/zlib
diff --git a/app-text/sword/sword-1.8.1-r1.ebuild b/app-text/sword/sword-1.8.1-r1.ebuild
index 97ffa1634b52..acafbb4e5311 100644
--- a/app-text/sword/sword-1.8.1-r1.ebuild
+++ b/app-text/sword/sword-1.8.1-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.crosswire.org/ftpmirror/pub/${PN}/source/v${PV%.*}/${P}.tar.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~x86-fbsd ~ppc-macos"
+KEYWORDS="amd64 ~ppc x86 ~ppc-macos"
 IUSE="clucene curl debug doc icu static-libs"
 
 RDEPEND="sys-libs/zlib
diff --git a/app-text/t1utils/Manifest b/app-text/t1utils/Manifest
index feeea53efcb2..a8414ae42d92 100644
--- a/app-text/t1utils/Manifest
+++ b/app-text/t1utils/Manifest
@@ -1,7 +1,4 @@
 AUX t1utils-1.41-memmem.patch 703 BLAKE2B 3d7801d11e9120701c3229bb495d5cbef8b538a1486bcbe40039b2915af9ed11c444f20914d8e678af4a8beb9db999052c53d7bb04ea912f0c665871ec7848fb SHA512 ab7a8f5273aaf478c4e2fd9aa201d5b081adfa431e147ccd429ca5eaefca1858008e09dbe62d7847ae3fe307d5b1f72a16093d026f7d73f665531abde5f5c60b
-DIST t1utils-1.39.tar.gz 175047 BLAKE2B 346c6a400351e3662cb7ab88183c2f3b3934d4dd124742c06513c0d582d1359803fb32272ebb6744a227e1a862e7c55f195273087c8cc401a8bdf507227b967d SHA512 930fa0f264136fdc5d3d18e9a3b45c4818413d01ed12a32daa1b5ecfcc0ea4d6554faf428c6bab9247a2cfc16973787c0b6f0dfbb0273fa6a03a3e8d1d501301
 DIST t1utils-1.41.tar.gz 176552 BLAKE2B 69ccc07a3b98de18355b09532129f80e4188d64817a1ad4e8439b3a0e37917a63b9e187a25fedfc5aba486b2e60279586a425992e9f25a111ba9c77ed3863f6e SHA512 b532d3af38a73903a512eb1297ba7510747dcbe8362acc4a0f20f2a3c786d82d8f5b22997ed3867114f33153a34cdd71c4c8e6a093db3cecc3825b6e4725a00b
-EBUILD t1utils-1.39.ebuild 644 BLAKE2B 9c15a7a5374adb05e68cd58074357208f53aa1d8e77aefc156577442879097696f939aebf22f745917c3cda777859e35eed43f2d646dfe65d6f64ab5ba5ada9b SHA512 b3a01745789d41b50a4ae48bfc020cc8d85da4c4b72e43976b45ff8b6cd8a542cc461afedac3452d7b39f23417d59acecc886a4c87e3ee3515693f63c9230e2d
-EBUILD t1utils-1.41-r1.ebuild 582 BLAKE2B 42785ac05287fd06f1656f0f92e3b0ba85c4ef25302581b6b736b935db13a3f1bf2324a222e730c4fa5ecffd56a8302d2a335159dfe0478dc3adcd1b51f71f96 SHA512 ec09c0b28ff09f1add4d9436df2c3fe293980ade630d31e58a0831140cc2ec68268ce59e1d4c7cb81e288420e42a2620154516783b456b55f8b072365334be18
-EBUILD t1utils-1.41-r2.ebuild 674 BLAKE2B beb41c51330046c2552922724920b1c241cbdb6be66b7d46d9cf2aa522e70e3891a7a62f7538a36f67139303056ff95c788dcb96dc1c9735de3d0a85b13113a2 SHA512 910fb29b9b44b5926ad53c6d0d9f15368534aac7f0633dc144c2e388b3730082f7291a5198fbb24c37b2d80a62f560ea96621e057eb1e3918b20334e21e2a4c7
+EBUILD t1utils-1.41-r2.ebuild 652 BLAKE2B e502ea6e67f30128c4a40d9b9b4ff2e11db6b5f6a1d352296643810c61b0dd457bb2d27afcfdf6a7e83f85b63dc6b48c42f84446cdb540ac33fed3a812878010 SHA512 d4a2d2a41c778d7a27e75e2c8af9aeaf3b45a5ed575b206e89a6db503dbc5273fc26a62dd0ff0151d793cfc57ec91f18d83634f52381fd3bb22bc1e19ddfed0a
 MISC metadata.xml 347 BLAKE2B 2f19fa13fe0a6a3f521653e00c787e1e5b61a0d53ef30e06efb6ef104d560e90417512d9e72bed79f51a81bd465494ac469f23246705876cfb91da82fe31cddb SHA512 6a4884011de9218a6c0417b64690cc76c9c5be7a525f4439fb04e70c3ed287080fdb5707004d611107dee69230bb1f892078260bd18dfe7aa824d88e23dffc16
diff --git a/app-text/t1utils/t1utils-1.39.ebuild b/app-text/t1utils/t1utils-1.39.ebuild
deleted file mode 100644
index a7af218b8f28..000000000000
--- a/app-text/t1utils/t1utils-1.39.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-IUSE=""
-
-DESCRIPTION="Type 1 Font utilities"
-SRC_URI="http://www.lcdf.org/type/${P}.tar.gz"
-HOMEPAGE="http://www.lcdf.org/type/#t1utils"
-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-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-SLOT="0"
-LICENSE="BSD"
-
-DEPEND=""
-RDEPEND="${DEPEND}
-	!<media-libs/freetype-1.4_pre20080316"
-
-src_install () {
-	emake DESTDIR="${D}" install || die "make install failed"
-	dodoc NEWS README
-}
diff --git a/app-text/t1utils/t1utils-1.41-r1.ebuild b/app-text/t1utils/t1utils-1.41-r1.ebuild
deleted file mode 100644
index 810aff2d6510..000000000000
--- a/app-text/t1utils/t1utils-1.41-r1.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Type 1 Font utilities"
-SRC_URI="http://www.lcdf.org/type/${P}.tar.gz"
-HOMEPAGE="http://www.lcdf.org/type/#t1utils"
-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-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-SLOT="0"
-LICENSE="BSD"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}
-	!<media-libs/freetype-1.4_pre20080316"
-
-DOCS=( NEWS.md README.md )
diff --git a/app-text/t1utils/t1utils-1.41-r2.ebuild b/app-text/t1utils/t1utils-1.41-r2.ebuild
index dfc88459ba3a..7e9e91c61016 100644
--- a/app-text/t1utils/t1utils-1.41-r2.ebuild
+++ b/app-text/t1utils/t1utils-1.41-r2.ebuild
@@ -8,7 +8,7 @@ inherit autotools
 DESCRIPTION="Type 1 Font utilities"
 SRC_URI="http://www.lcdf.org/type/${P}.tar.gz"
 HOMEPAGE="http://www.lcdf.org/type/#t1utils"
-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-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 LICENSE="BSD"
 IUSE=""
diff --git a/app-text/talkfilters/Manifest b/app-text/talkfilters/Manifest
index 11a1aa49dddb..2202f00cb095 100644
--- a/app-text/talkfilters/Manifest
+++ b/app-text/talkfilters/Manifest
@@ -1,4 +1,4 @@
 AUX talkfilters-2.3.8-format-security.patch 862 BLAKE2B f8050b5527c9777a2a500611989ee0eaa90fc1360ddb76a659ef334ec97cb3904f5051605bcf6b10dcad8b1b571d0a0001613358f1aa9c1b617a75ee893e6af6 SHA512 b210777c038878cdd06365a13591c723151356864c08bee700005e509b2f0f6aec4819730ca631d401e4cbb9d3dbd3a4a6551f0920819fa6097585ae43f6c8f4
 DIST talkfilters-2.3.8.tar.gz 821338 BLAKE2B 1ed5904829380858e5599458d54d3e7a339c10f057a94ce17f38b330d89ad5aba972cf234c10aa2ed7ffbf67c8b4c01a9bba0ebe73b4ba2bf32230e9e36eda3d SHA512 3fb317c572e95756fea9dcbaeac01e9576b05f5b0710e64513ecd05ec219f8050dec3bc5bc5d0d5f00c642487925765843da03525cfcb23925cab3c321272b28
-EBUILD talkfilters-2.3.8-r1.ebuild 554 BLAKE2B 509e68e57a16fd01615767817a2a9cb029eff39b2da481ea3c8ca9789945aab5c4662f9d662da91c39ef97f00e6ad5cbbcc57135c55ff127824d9122cba63262 SHA512 5cf58ccc9abd312c0c70204331ee564a96e4c651ab9139b1816dc225a96aebec34a6021b2dae283351c76919cac640ded3c47c8d9ee5887c0b137f8a9ee28de1
+EBUILD talkfilters-2.3.8-r1.ebuild 544 BLAKE2B 3f659931c5f6ed6ea139247e737f578bd6236bfae8a9f2d89e3fd83d10e3fd137133b131548c7bf37a540623078f9d60b66aef515c52a766ff1375866f723f18 SHA512 bd4453b8020001e7af1285c370d566d36fedd791cfe79039ea84e7aafdd6ea3bf2cc5297f06159cb5b85a2a946c4e1fafbf8208995126c8d55635585287baaa1
 MISC metadata.xml 957 BLAKE2B 2f66b167131788d1df1195fd9f4d372cfe2ada94c10ad6ce6d0a1bcd28582f3249344ef5733e39838453dca5b54456066ae93e976437e239a4a556982b436426 SHA512 d1b664bff6db93a8289a01b6ef00df35a06207722360ca753853fde6cd667abd739acbbadc9eacb16d46536326c61d6b1673ab50940f778c7ed7c228a082b52e
diff --git a/app-text/talkfilters/talkfilters-2.3.8-r1.ebuild b/app-text/talkfilters/talkfilters-2.3.8-r1.ebuild
index 791828fabbc1..483918e1ca11 100644
--- a/app-text/talkfilters/talkfilters-2.3.8-r1.ebuild
+++ b/app-text/talkfilters/talkfilters-2.3.8-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.hyperrealm.com/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 hppa ~mips ppc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 hppa ~mips ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""
 
 PATCHES=(
diff --git a/app-text/teckit/Manifest b/app-text/teckit/Manifest
index 561648f3ef2e..ead2a3f3f891 100644
--- a/app-text/teckit/Manifest
+++ b/app-text/teckit/Manifest
@@ -1,4 +1,4 @@
 AUX teckit-2.5.1-mixcflagscxxflags.patch 534 BLAKE2B 98c7ec0325821d6fc8ed4952cce4ec38233302c25e0b6e4157c357693c16ee756c553347cf70aa1381315e0bb1c721e3e423ec6855a5c80fd2a5a298eaeb62d2 SHA512 7b76d3ebc6ecba24a7cd6469b47b35245e73d5c02a32c67a6205434f8c4b73ab6f1a77d0f8cf95081c4b441e876a2d62a1c276f69171d4f9f4679ccccbfd1c87
 DIST teckit-2.5.6.tar.gz 2500800 BLAKE2B a41c51e80b558d9735be782ed655fe36ec673180e559a3063c3b78ece14e470e194740f2039863a6e7a12e006c2314c3b73eff5de4d289c8eca1b6c9744f1e0d SHA512 d3462dbf22658de85fd718c43229259c460730d907226435195742f1ab65accc4ec83f7b6cb32a0e99fa12ddb7f2b7b5f2598c8853636aa5b31c8592ed9b4745
-EBUILD teckit-2.5.6.ebuild 1143 BLAKE2B d2baeade44a8f6d86f546f6936f6d31643e7309d1df69fe38a0b054b32a845b68eadab935afd0bf8b255296c474ce12880ea1a740bb493d5d426f325aca54caa SHA512 90f8c074eb690fce1a80a3ad51dd29c2a39bfde540958cb7be05521e139ba3dbb0e6a2f1dffb363a9c13b10747c063b21b363d3519c4f8f8e43778c3f7b14973
+EBUILD teckit-2.5.6.ebuild 1121 BLAKE2B 7c7766f9ff169a4a71cf29bc909cc377fcbf8ebb1bdf4e83db37bb2447cdff03e36f4a504402f8ec8f2d08b1997b1a49ba85c154d378bf209c3e44126e760cc9 SHA512 bbf93231daf7188eb385a0582547ec3b95b8734a727c1d69ab18acaeb63918d42069a13c779ad8d78775216025f4235612c9badd15e6783aeb618ccd262f5884
 MISC metadata.xml 328 BLAKE2B 55a9af22d43fe5270c143f0bdd0fdaa5bf58665a47c6386b83611071a25c8e41e0116bd48c3b6ff051b51e28f9f0bbbb1d09a97939f03df5e367a352c99b6f09 SHA512 f4ee21269605eb831d9a6cbe639da9f2bf63aa14ffb69bf41b7fa4304e4680f5e11ff9efaf30b63cbe0f3708468af19c5412353dab4af8d9a49e6f845a2b7f67
diff --git a/app-text/teckit/teckit-2.5.6.ebuild b/app-text/teckit/teckit-2.5.6.ebuild
index 045beae1707b..868e68907d9e 100644
--- a/app-text/teckit/teckit-2.5.6.ebuild
+++ b/app-text/teckit/teckit-2.5.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/silnrsi/teckit/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="|| ( CPL-0.5 LGPL-2.1 )"
 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-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 RDEPEND="sys-libs/zlib
diff --git a/app-text/texi2html/Manifest b/app-text/texi2html/Manifest
index 29b46cbc0957..7479adfc39d7 100644
--- a/app-text/texi2html/Manifest
+++ b/app-text/texi2html/Manifest
@@ -1,3 +1,3 @@
 DIST texi2html-5.0.tar.bz2 15397249 BLAKE2B 3e502d9424c2936a922488aab7a66140c0a8369253a5500beeebcea0942ffa7b97fb7021b23212264e110d4bdab4850f263269aacf61de23ac6e052dfcf10d67 SHA512 50afc2f1f8875d3e62a51cc0339bd4c4f058041f42a9fda9cd5b02960f0d5c72838e4f010702ba716dbd256946f64520ce1e5b86539b6f7b8b7ce24a43c98e9d
-EBUILD texi2html-5.0-r1.ebuild 1353 BLAKE2B 14b9bbb13aa0c18c9c0ade90a323c39dd5a0e4f6cbfafa067df6b80d32bbb212fa7df67863091eab6ad6c6dc0c393f22c329d3e5dc5bc7590fe15d8cea8b59fa SHA512 9f57defaec3e5a959885c0e8eef21e33c0b7f9207a7da95d19d79b3e2e83bba37552dc8d871ef69c1a5efc3ff6761b5c24897a3eda651ac572064660a2dad4a4
+EBUILD texi2html-5.0-r1.ebuild 1331 BLAKE2B c8a945376b9170577369ab7a5779df032aa30f5fecd4e9a52937a0b18589309fc6f2a489e2172359fd94da40c0890c2c1553ad9bf491bc644170c7c52b95e4f4 SHA512 3fef0018328252c5156c1126affc72d2a0a3ee3d457b4837353e2c7584131705c27410547a0e7c52770b33b57b9c5557529313f5f22126c21e5ade832959d9e2
 MISC metadata.xml 245 BLAKE2B ee3a163cfe0a4bc59c0dfb46f9ddb580e2d259b4d0e33cb4e684eb9e6d4b901bf97c6edd891f3b75a613a782f1b89318d0ee3ec9bee4e34c4441d9e8f4267678 SHA512 1653777623e2c15e1ce13229e396723b2cc9c214983e0f8592de98c01a31badc6c38c6735ed44f937d145883b43fb6f049af3eddb9ff96b18c96ccf8f67dd690
diff --git a/app-text/texi2html/texi2html-5.0-r1.ebuild b/app-text/texi2html/texi2html-5.0-r1.ebuild
index f0c768a3b544..81ea54fbe106 100644
--- a/app-text/texi2html/texi2html-5.0-r1.ebuild
+++ b/app-text/texi2html/texi2html-5.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://nongnu/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2+ || ( GPL-2 CC-BY-SA-1.0 ) Texinfo-manual LGPL-2+ MIT"
 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-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="unicode"
 
 RDEPEND=">=dev-lang/perl-5.10.1
diff --git a/app-text/texlive-core/Manifest b/app-text/texlive-core/Manifest
index 4791bb586da9..5451a14ba451 100644
--- a/app-text/texlive-core/Manifest
+++ b/app-text/texlive-core/Manifest
@@ -1,322 +1,160 @@
-DIST texlive-20170524-source-freetype.patch.xz 625056 BLAKE2B 70bcd15da1edfe5422f6dc0e736bc842f93787d45a81f823c8ddc5a420eff65f176ccce20cb17ac1dbc3b4eef3081de7dfbe34eb390f1baaa925e17f3d55c6c1 SHA512 daa0ff9306b39e6d5058c53572fdc741adad17cec9a874785005aacd0e57b75ce59f21d0d12260f4178d47b7b0e6509e49c44e2ab524613fe962ac1199a9120b
-DIST texlive-20170524-source.tar.xz 63483372 BLAKE2B 44669d1228f5be27e9d93672a4f4ead40f7f4c6cf386f2db6fef54d64f8b8a743a485fe1170904d8117b9745f71ec77db8434caa6cdd79359b1f3f387130a3b4 SHA512 18c18940992ab94ce22e22ccd4ad798253ea14ac2ab296a10ea5e9a8da9f33989f2e2641b42b564d1d5fb53bd371da3e68726b676d706b469016ad146cd19daa
 DIST texlive-20190410-source.tar.xz 53783408 BLAKE2B 8e34c7c2b74eab1c4d16ddbf7eddd8566593e6d68c42a2634760f11d86e68970698d8b9deddcf3297966968ede11ecf30e0b04ec19b708dc3e6d0a2abcc3799d SHA512 7759d8e668e53c0c73e48907096da9d8fb6384dd9c3342ddfb05e17d077054c5351d35256cf4e63a6da502de2f09f521979bede7209cdd5bd8ae80eba0efed2e
-DIST texlive-core-2017-poppler076.tar.xz 9232 BLAKE2B 945e4f8e6f3230b78dc43560c664fbe4989fb32759b41c0ef83d656b43b008030cebdbf668718c4f22831d01c3fe1466f686f7f6b76183d3d1bb5e760f17140d SHA512 63fb2b426921be5f6d310b31e7fea6fc0edc0900f4790445fcaface9c931ca6c3e8f98b81a3bccfd1c877750e854c9410a59ff9a124aa2826d7b4187d54ed8ab
 DIST texlive-core-patches-2019-4.tar.xz 11932 BLAKE2B 5e73e2bd3afeb904f2b8898081ffd770c9ab152368ae5a8699d5f63507e3c0584901d7d6f8fece7724b8e744d7816fe31db4b96962c0550491a57a6d51adb296 SHA512 fce31563f8c7e8f1f0bdcba9c5108d9f5d14529c22c110e33f32a6367560f7f255e51a1e86f1d5c8fb275085ff3ba6d0f5f474acd79ff61d67be795dfb330708
-DIST texlive-core-patches-70.tar.xz 13068 BLAKE2B 011cf51af10d28ac9df7c9b9d7aea2cac3e562d393dcf09d57b3c2832fe6816cf926458417577f7c9d9414639a291c09240444145bdbb3d132170f51a8a16980 SHA512 fd26b92a03cd0446007728d0c16a8c7301e254515b997e6a0bd9b325db162bf3f2a2e96be0cb185f042038205c4b4dacf1785a216c8326328682f1c42da9079e
-DIST texlive-module-a2ping-2017.tar.xz 31136 BLAKE2B cc0d99992cb780711a2a423fa26135845fa1f2cbbac76485d64a0b3184e338e7a60cdcfeaca129e6251f72110b0069c32164f9c4904d7f7c9c2edc6306f50411 SHA512 4711f184222fd95498a6d3ee94db19209c7836e6b775303926766d97921f2e8324b0aa2252a958fb619dbeca50729d2be4851a2add5503e7e8f4e713fc993e41
 DIST texlive-module-a2ping-2019.tar.xz 30616 BLAKE2B 545abfdd3aa23b8d2bed608d7b7aef0f9578d5c4d6039880d435144c687014edb8c841afcb2d9ca1fc48a365b2bcb57832d49d1c6bb35480a01a813e40e18ea6 SHA512 983084ca3d70eff729d81d5d52a74e1bf1f95e384916bc81d17be81290f70c1da5ac891c1665a2451975f36fd56ea0036e1d0dc46b2e98b61ddc660ac044c23c
-DIST texlive-module-a2ping.doc-2017.tar.xz 17524 BLAKE2B dea1db9fb3650c56161190823e4015d3e6399be3612f7e54702264a5187e72c7be987abb2cf8465d82711c9894d604fa03d79dc770bbf93b3404f18a633fbfa0 SHA512 8cfcc3b2a5dc462895a2bbd82f3a21537ae5d3fe81217b0b664b2008d6d18259f18de10e6eb3e3ac2655f96067b0f9bc6e30f69d068d9335598eb0b075eb4cea
 DIST texlive-module-a2ping.doc-2019.tar.xz 39740 BLAKE2B 1a9cf6e4cf4dd4dd7677efddafc9da191ab3c34eea3b7bd0f51937f6946e1696b858aa9d53e7599c220933b06bc0332869a0bd596ca66b9801b48adb5ab1aa2b SHA512 daeefb01a0197e3b7751614cb84e2926f670d36b7e8a389bfbbe39cbd941c4d10ef5112593bfb88e11fa15f7f7bb07f2538c7d0a68cefe1482bbdaf02d475512
-DIST texlive-module-adhocfilelist-2017.tar.xz 3568 BLAKE2B c472d7a318d1dc36d1bc4c9fff821c527b6f0dbfe6fd7ee945c209cc48e97c179bbc1ff244845f287df6dd5398640d2ba73415a7e228b5aeea7ef121950800e0 SHA512 637cd01a30bf9808b7cff6a0024230f20d0bd68911beddbd4ef64072855d28ac57d1df0f7cf4b78e376aba1f06f979f03c135bc65b58ef1beb9a0c8128b2c2c5
 DIST texlive-module-adhocfilelist-2019.tar.xz 3600 BLAKE2B cf6e37b1b3ce64ee7033f43677416c3de6abf2859bb2d985795608f8ccbfc09f842cd3d2664840ff64a7352f179abe4e5fec096b25326a47bd074cbd26bce78d SHA512 57436dae1489c0f614c4b002f83d34a711398a762ac532b44b1d91a51d068462aaedb5b034923629f7630f039988452eb833d1e98af389c788091517bbee8954
-DIST texlive-module-adhocfilelist.doc-2017.tar.xz 9876 BLAKE2B 91dd2728d567450d55a6e1503d9f10fa1bde452af9876cfcae164269c0ceeef3aeb834689d4aee2295327ea6244eb15fb96f5d4f5ce05986022fa1e193b8cd78 SHA512 db69dca80f163a9c8d1eb7d911b5c030341ee3d93a383e0dc4b4d60715c736c80192e61b665310bdc9c819b8fe702f6a28049cb5e08bf87d880fcf27069c9beb
 DIST texlive-module-adhocfilelist.doc-2019.tar.xz 9876 BLAKE2B 6f0a079b7aa05335f4cde30cc93bdc0781f6fa9fee39e7e7cb0cee7e66fb27dcd73b64afc51e02b66bd2ae6caed641eec402ee7350505daecec05b4a4dc684c5 SHA512 14bde143bf3ffa3f2b972f93544089e4c0314c7696e1d711719549b7e831278c66fee0676665fe6eaaac744689d613dce159e4eee2e3f9c24dbbe602794fc62e
-DIST texlive-module-adhocfilelist.source-2017.tar.xz 16408 BLAKE2B f3d72e2c9abbc6594b34eebf2f1ecc18b6adbca55f7c14fd5d87a9da5642665ccd55f61e4204b540f5ddb639e062283462ad4136718a1cf5e2c191b6ab9f431b SHA512 1e74ead0f3cc61b6985e530d884702867c2cb9af1e545b697adf7ef1fcaa49cf01ac768cd1c5161900feccfcb3accbe96b3da7b62219e9dac5cad89cb04a35f0
 DIST texlive-module-adhocfilelist.source-2019.tar.xz 16408 BLAKE2B cb3c8401e40f4b2d922be8ae6fb5381894df8b1a0634f8aaf21d2d4dcc861de0818904ff0342ce9684d1ac956afcc71b6d9e1c1bfcd0523b405444359e8de063 SHA512 15e7f652408c5975ba47131109e0d18bcb1d270e0ea630a9a3ff385e499cf3607a366e708a5ec9559d7ccc2a5e0b2d3d0f5f615142978a918b0bd1bd0218a30d
-DIST texlive-module-arara-2017.tar.xz 2333636 BLAKE2B 4422d6171af16f51c67bf6f48c5d981f85d3b45b7a3f051c6272db2525e6d0fadd6a0a276780339d15f9726019dab585eb41a0bbe4978d8dfcab52bc0586a4ec SHA512 3acfdc5872c866f8c883bb5e0ab97bc15e67c8afb799a633905493c82e20bb1183a50786d4d39b41a21e2b0fa51a8d373e645379774249ddfca5a851526bff21
 DIST texlive-module-arara-2019.tar.xz 4536520 BLAKE2B 8ce431b87dcaa166d6c527d1d9d192ad12770e502ebbb4144d3161811a1527c1832427d868f99d7108c0949576fd496cca1d023c57d06999762984a3f65b53a7 SHA512 9a999610563bbafd4dcf95591d90aac65a0ba2b0e4da7d5f58c694896dd01b1be5c06d2693d9fd69576e3b32e4becaf9bc046ecbd045394a5dc7e2db5c86a02e
-DIST texlive-module-arara.doc-2017.tar.xz 2748360 BLAKE2B cf0233cb8c5bbf3b871889f189092a7334c6a17ed6dfb6dee29997031eecfb2921b389c65dbfa5ad546f18941ef927f96be04de79bcbd200aa415df55bac8560 SHA512 5e917d8f326d1c9dc4568ed9a9c27c9aa31513c5188c66986056138ee4144b79b9fd8111a8638b0c42ae5c0fde62ba89bfa2f98cf9d2238a7ed929ae917625c9
 DIST texlive-module-arara.doc-2019.tar.xz 1677204 BLAKE2B 5a72ca0ee042b73d5fdef7189a0471afe622260fa94c2fe84609743bbe0396595be11a93c31fda2268a293ee66eb0f3bd5d1525717d465b3344adebf6d73e52d SHA512 b4654d62b725c493e175d9d70c459b05be8a365fb389d5f20c2bd920671f03130586305d225676a3524a5835b87066223deed62db6dbe0ff8fea76f2caac5ce3
-DIST texlive-module-arara.source-2017.tar.xz 22508 BLAKE2B 911b0cd932bfc99772de4742b476012cc285d08e8c601c3cfe7468c1e136f16b48e513867c2551ef33073c2aeec13dd4212f538d853fe139e8f7835bef43d0a7 SHA512 fff9a37c9a3c8ddf835552c9ee5b87234a2db96b699a5324cf880bdf68bbece8ed2329f57c4c646859ccdfc065e3fde7e413014727a607eb70bce8aaea48e536
 DIST texlive-module-arara.source-2019.tar.xz 63544 BLAKE2B 1a8ad9e8e7ae8a645a3efe50c5dd7be8bb907a9aa25741367d840aedab1b53cd0ac74df03e378fd68c3a0d96e8359866a09730f593273c516d3d8775288e45c4 SHA512 3ec571f4e1d8f13811aa17a4d95cb5e364e63fce1f5b320414b08abdd8907df28a18af42deac3bdce9964d7af8ddb7825702f88e4b58007d9a005369be8d4e53
-DIST texlive-module-asymptote-2017.tar.xz 277568 BLAKE2B dc7d046c5aaa1f7d51cbe930085a295b913123764064141c6fee171b80516a4ffc64236540248889558c5527e891e882abecb0f4b4cd12bb9396838e21672d3d SHA512 184cdd0ae495ce695309453458b8a6db2e29950e192a45c86f7b553823ce978eacc506e5e9454de1b1b4a2ed4c12450b0b59a006dff954d008311437aefeb3f9
 DIST texlive-module-asymptote-2019.tar.xz 312964 BLAKE2B 1c1ced6f3af846bd6c9512efabb784dea34d3a6fea7ecbdac89e893ca08b8a90c85112073a8afc75c43a5544fda59bdf5e1a53df96033dbc6457f3be477a015f SHA512 e314e473c14c2fd8980d3d0256c6cf6fc7c757a5b4b4dcf90c93cbd15fa70a5e7a0ce453c8382df3f9cfa4aba9c9047b3ee44084e398d9c767bb88ccf3bb47ad
-DIST texlive-module-asymptote.doc-2017.tar.xz 1791956 BLAKE2B de5bc12e4ca274bc7575a6b7184b2c1f602c128c37a389eae2c2aa2580018fcb1408d1543a5dae03fd9fca8a8f47fc9d96a6814afa3868aa5260a8320e282f82 SHA512 50a12a697b9b9c45a4137af23d88d7dbbe2cbfcb091655feed4511418a559863193236ff8a2c0c5730052d6984a03aef3ceddf1d96fc9ff838b57459fc288dca
 DIST texlive-module-asymptote.doc-2019.tar.xz 1810712 BLAKE2B 2aea38bcbb43767b512f8ba9fbc0f7b8027a17bb4766816d0cf57269cd2951fc70a77efaaeb8d10d1b4223d20bdb104b7bf6099c4e56d65e8a96724bfdf5da20 SHA512 7969d7001bf3662ed28f92b07defe67a9262aaf62d8dd2f137a4f36d90fb4ffac034052a6c037882c3bcfbc0fd2b9836fc8815c90c741a26dbc68b59a8879782
-DIST texlive-module-bundledoc-2017.tar.xz 12208 BLAKE2B 54be93937a61573bc64522651dbe23e6e72336dd8170e6c9b226e30f6641d32f47475c7b2f8ccb67f6d13bf45551d45a61e6f908413e8cad53fa3555ac094c84 SHA512 075193471d65e6b7eb61a1cd18b1380054467b346bd66f82a02b060f259e0fd1b49f510ae088579f555360effd40ae3a6e3a35dde0e956b8271845b445507ed1
 DIST texlive-module-bundledoc-2019.tar.xz 12276 BLAKE2B 228fd77fee1c600e7582fb4a30276b54544624b9f67e1b3d76b5e37e8025fd3e9688375577e5081958f709cc62ff7cb342370c1bf2baf7bd0fa3108386f40e45 SHA512 fd342f56a110ed29a4562057910c9bde89a3a70dc619381005dd38610736f9dd43a3c2c25dbdaf557b648e3d126d943418969dacfa26e6627fe8f9f767a9004d
-DIST texlive-module-bundledoc.doc-2017.tar.xz 37392 BLAKE2B 642564e479ee5312a9c38beb70967ae1915659ac5cfa7d00fb2478d90f754ee2fa26c2f8b55f3bfc68c2003ac724b5e0488d90dc713bc3d52c2b2f75a2841621 SHA512 f765ad03ec75b1a0f7d577ac8c3cd03e196e6dea569836eb3a02d6aa50a7cd0084d8a41eabdc4207423291eb8e7f4002340c32e6d04c07968a8533cef80a6b97
 DIST texlive-module-bundledoc.doc-2019.tar.xz 80972 BLAKE2B 0c0061a4808f9cbc97111dc6e59dd191e29c56d7f3449bbe0a677c59eec077a94d8b14d8a83984776cbbeeea8b04accc89abfb722cd03f14ed2c5ee2d5146087 SHA512 384a9519a3aaa328444dfb569e86d037ca283d2d24529057bcbd1dccb41a3ba7bda027c01bc986b0932da77198ca13e9d7c4f4859d898a284577796255baa9c9
-DIST texlive-module-checklistings-2017.tar.xz 6476 BLAKE2B 709a4935942eaacd2cbf694f2c06a7e6ccb9866577e2dc0df8bee3a47e471f0db71b5e47007f02f6c78f26d08f308b5afa3e4e4f06b7bd0d71deb75b5c2041cc SHA512 c58753601d1af48ec2bae629b5671fdf1de8f055058763a9328a1fea9829960a86df836358fef16985747b31f4e1a569d78d4acf167cdece2d34eb57ab738548
 DIST texlive-module-checklistings-2019.tar.xz 6496 BLAKE2B 7ea3bd63da0c718dcc1406507c1c800a62f09ab2c0dee1d043ea73573c0a4e645a01ffb2d2ca2008c230bd14c1ae858638d050d4a24b831b898a98bdd4bdda00 SHA512 599ed476321a825bea61fbdd468670cadcdb11249a4a9324fc88339a9445ceeced3680459dc2d27c2e6263cd207ffc0ce3b60b325d31072922bf4644478cf544
-DIST texlive-module-checklistings.doc-2017.tar.xz 364452 BLAKE2B d9e5855dae2195c2d085277abfd1c6253c2d46c49bdce4548d5720cc0e21104cfff618e8f30a1048d73c7e02d8922cb62280de21f2366f637ae8bbba1d5ae344 SHA512 771246b9ccc70cb337a3f55e0d04e406c338217298f091c9372533bb55c5c98f0947287b2f0340bda049f5f0acbd33d2ab9e706426c5b487e0a31460863d5e40
 DIST texlive-module-checklistings.doc-2019.tar.xz 364456 BLAKE2B f742b41e3b18c1248fb9a8f4cda9a1ff5fff26b4c6eeccd0dc658a95ee690f0dfef9d8384265f0bd6ee5d42d38e3a2d45f3e74536bbda364b4150b494515052e SHA512 3f8d6eb67f305fa5e03bb625a4034ffe616a6c0223774688463884df99c337c1e5bdd76bbfa3b9428ec4812ec72388979c4252ba7407ae8b79e3de7cfacbeb01
-DIST texlive-module-checklistings.source-2017.tar.xz 10948 BLAKE2B 6ddd87b790a5ecb35382218452f787a0fcc43bfb59455f3660b1b5a2176eed033b72aecd7da0d2f1ad0efd21085f4cb468c1487ae7609eba9f2321e2dc722f92 SHA512 8fd158560f0bbdc7ea996b510ca69cf30dce26decd6c963533ea80a6eba7d6543c72e12175fc568725fbd8e4c8226503cabc607b52d68d51901bc8f32146e818
 DIST texlive-module-checklistings.source-2019.tar.xz 10948 BLAKE2B 08881ceb308803c8e2a6476d72e4446e63ceb714db4893c6fdeb773c46f8ffa39b4cd4a2642e3d90e88c0adc145e421007d5e0614a862cd4ede6af224f0db4d4 SHA512 a7435841305ce368f1bedac9cb531d8f0fce3fac27484547821a2e82998e977968e578601382f4cddf6c089b42e8e175c56d2e466faa5c4c0e5b49edaf6baf1d
-DIST texlive-module-collection-binextra-2017.tar.xz 848 BLAKE2B 2a417424ea3cbd4333d7dd0bc42d8a50a56fa61ac40f276759576d71c2d94969a44806fb57a3d6d795cfd71846fe332f352fc64b47b62fef262ab7569c352fd2 SHA512 ab5459f4a6431f22b88255e3b2114ecc2cf34e58e5d450da7ef70904511a6596061250c27b23fcae74f955b8e040f1820e444f504a71ae3f41d0784c67aaecdb
 DIST texlive-module-collection-binextra-2019.tar.xz 900 BLAKE2B f54b161a33b5d3038bebf8976ffa3182bc53068be423e7aea76421ceb199894ec956b916a5ce10a2b961ab9c6ba13c27b2683af4bc09b5abbc0be4828528e504 SHA512 885f7b2009983d71ee4fa4dddc48045fe1fb92841bad8de3009b52cf4157c9bd79d1607b8fa6e55db298d1ce763423d8b1f1273d8faf41708e8bdc391bb76fdd
-DIST texlive-module-ctan_chk-2017.tar.xz 512 BLAKE2B 2757ec920c4c058246157553950036229bd4a685193c19faa9b9d548d09c93ed7348dab350549939b53ee65572c5c93448b59243e855099ab43aa8f3bc672106 SHA512 b1a15b0ad26055dff982bcb30d8798ac0dbc021f1265239118a97b0fe0fd53accb3d2c215365f998c317d25eab1bfc8b1b52f481b166e8fc88dcf37931abbc85
 DIST texlive-module-ctan_chk-2019.tar.xz 512 BLAKE2B 80525a48521023cf7ab0cf3ab19d9fc3fb72dbe3fb3c638803076a0775794f6f30935cef8ec77936574a61d8676e123f4ef7c84beeacc72812fcbb86a4dd0588 SHA512 6eabd7281d79ff0ad19080350dfcca8ee3a33ddfa6d17827a7851cc53f09f627729c8d715a1dfe50e0c079add44331a07d543cb8b6a57000efa6d73c30f2ffe0
-DIST texlive-module-ctan_chk.doc-2017.tar.xz 222000 BLAKE2B a5c92248896a0160e8a81e110bd8e93355769fa264453c7720e7312f94edea56557c1f8d1c23f4afb47e78b6f8d85b5a5f46cd612105aca9098c504c39e7df0d SHA512 cb3c694bb7b2f361b9e05e8dbd8d4594aac84886d1138e55b45dc2cb102620d2ec904f4e061e931d1ed57b410efb3d6b7fb699fc7f714d049337f285e531ab6a
 DIST texlive-module-ctan_chk.doc-2019.tar.xz 221996 BLAKE2B 43def8aec1f47ab26750a3678d68eb846f5a4383c681e1cee66529d877bb636b8867b5ce4a6b330a6b4239f5ad9db9125799c12b6ca5453f872fdfffdcb3fb75 SHA512 c61bc0d70cadcc4382dae55cdc1af076882801321a2de16f164223267732e476e41f949f566808c928f446d69aa22bd9965adb155c97905e32b93808810c76c0
-DIST texlive-module-ctanify-2017.tar.xz 8228 BLAKE2B 73d304f42f0f88cfb15ec6d60f375582276c96a846b061602e5b80fb9ff5b052244db74fb975638d6782ab25baab2cec45fb1a9e1d2b7109130945bf2ae3697d SHA512 335cfca62d46fd278f3c9b80dad62ca7a10310a5101c53fbd3060a4025b388eb962f9f41b4b7dd9bc896f4b7c32e127ac0b901ebd1f7a9e8a16a6ce749cbe92c
 DIST texlive-module-ctanify-2019.tar.xz 8236 BLAKE2B d8b56d748f70530caab43039a73b2263e3ad7178e3fc1e2fb0e8280ca2304e2bad34ce73b4ffdbc6ab4a96bccd36c51e3d30aa5a2bf37f6e16fc653944d19f59 SHA512 6774b151bb0fb052d41d8447c7e8d378d7f31b0a5aea5f2f00b93669b8c2f629f479ae21d40480fd62f468d866cbe0c6f0dedd8a0248f8d83cd1039131849439
-DIST texlive-module-ctanify.doc-2017.tar.xz 57964 BLAKE2B 973b48b1f35faea3ffea7ad260cfaacbb11e44047aa5eec4671e664da5578d3fd96873ef8524e0fc89b71783ebcac38310ee70c167b41d04650f59ec6f95bc52 SHA512 c845fe36bb7c388e07a254938796181dc19d36a5947cbd9d571ce983ef2148bcad275f6f593386ef18ac26490b743b6db3a337cead46e20cc952946a7f3fb89e
 DIST texlive-module-ctanify.doc-2019.tar.xz 57960 BLAKE2B 87879b04d622f78564ddc1edeb6dfbc8e7da4796f45fe6b441c0c27b5090c2e03226ee4436d7be07e59ed64be7c1a151a76a26b54549e18930049a6a65ee1f8d SHA512 f9b636cb41b126809d808c167410a37052b1c6c385fe4eb8df3b819c0cf2cac2c7c1c74d7ea15d2916c1cbc563e078845e451000e3a08cd9a8e0696a342b22ac
-DIST texlive-module-ctanupload-2017.tar.xz 5108 BLAKE2B 889704ff7e23c84c31785b0a14c310e35d94d45aae4671efed4495a4667c9ae16aec75869c9e164d4988adf56e38fc607503760290b8c8ee80772c47a17ce3f3 SHA512 814d68f2870afc8c22d411dc8a2c55fe00851258c315b0be0db28122c939d4b3dd5a446579a0da3c66b807c288eb38dfabc855af9cbcf4fad3905b5cb7ecc1fd
 DIST texlive-module-ctanupload-2019.tar.xz 5104 BLAKE2B 77ad6a6c1d493f9b3d7f7f39d016b391dc4d8d82fab32c1c91838e16ad86a268fde2ee750063315853c2a1825a4331a8e32de7c217df440f53e72c43882f19c4 SHA512 4464bdfbf72318b24abcd88e1c25dae5925a96e867c694f3f02a594ed7b8b24cffdcdb345f0054e200a6af63f88b591ff84058af0adfb4a1b3feff2a057d9d72
-DIST texlive-module-ctanupload.doc-2017.tar.xz 174944 BLAKE2B a8a104a280d4dfa84ac35a277501db71dfbed72f15fa9916f057aa896e461d456f491c427d17485fac3136b9677c9b2819ed3b9be75b969d1dcd44e7243c2bd9 SHA512 29f8c0649a249c02f05b153590de221eab0147e093c241e78521d0264045c5de3f9f26a5f008294ba10622f4fe7c7cb00217025282faef22cca2d4d6a87a347e
 DIST texlive-module-ctanupload.doc-2019.tar.xz 174964 BLAKE2B 804ae2c963ec668924d105454416faee356832baee3f452aafcd8489bda55627b6a60d307f58932e2487a4c2e6ab4a533f10369053a7245896da37df3cc5a40c SHA512 9e027f7ce08041be7668a7a404fad6b6c7cfc71e581ad1216956d0b53c379d204bd84d2d55d186c74f784df8911770b96f934775f44f7141a5f1b9b5e773cb7a
-DIST texlive-module-ctie-2017.tar.xz 408 BLAKE2B 73f6a6343b78fb7b1b6ff2d60e2a6cd39d7549853ceb2ecf33e632d1d4aba72452c97437be06d04ef32587f3e21c8cff74fb50c0c154f929c6e92d2f6636ae91 SHA512 b881e721bebd88dfe7de6163f76c424ef85d480cb09e52d9b2b02c6224578fc2a416e1afd3ef803e5cfb7428fea53879029f1ff5c52d7377149cb4fb9ffa0722
 DIST texlive-module-ctie-2019.tar.xz 408 BLAKE2B 752ee2564532f95c89533d7348235e238f62da84048351c0dc94ced6a1c362de08c1d1eccca7295c0b2481671472c08bfa9613783593b784390a6a256ecf784c SHA512 05fd794d4437c662b77b0662dd0c9169aef35a10140abad2519702577c087177d0a02ee5b6163873fe5b3c83c3f77c342c4774af168ebca2ed875717c7d0c5b0
-DIST texlive-module-ctie.doc-2017.tar.xz 16580 BLAKE2B 2ab872f2b201ad432e60dd81ee3e788d808a2948cc09155766de3a0d721ef27d3b64ff90d18e753a3d85e5a838e1c126aecada33dfa00502b8b569a8154f1a39 SHA512 311931484aedb2c217acb7760de9406bfd6e5922c3fc1a9590514ac27087b27268b22e4ec7d8be2b704aba9ee55803ee52ceb6431c6aeb27b23ab8a45c613afc
 DIST texlive-module-ctie.doc-2019.tar.xz 16456 BLAKE2B ef2aa98bbf2e3c270308f4ded3d18b55aac99b9059d4543abcfdc383b2a4f761a4d24a5f01beb94cd0e1bb1842c9dc6be641e964dd2117258193dfdf56421513 SHA512 83bb53248ce262bc8310faa8c0e057dac72c7c682e295fb9888acff237249a66a69d66b99d79033f5a1d8611ef582dd2121f8c28be9800ebcce775bf3adecf63
-DIST texlive-module-cweb-2017.tar.xz 12900 BLAKE2B 703d65399507ea73329a1f69605ac97c8abd102ed5b57cf1505c48417385d2befa0784fce6c255145f1915fc49adfd75f90c9a058ae4f7710353d5fa437a1514 SHA512 6e8bea28c9e8288d186f46afdd30b864ecd0abc20fd687f0a8a35aaa9b1ceab0d208af6d0bb5eb5fd0d47a57d0d3826610dcaaba5e95c1821590ade62207548a
 DIST texlive-module-cweb-2019.tar.xz 9364 BLAKE2B e43cb0e84e570223523b552fb96ac754888a418a10077f5beadcf29cb8d5b7eef0db17fa543a0c3d930ae1c3882aca0d011072151bb7c0d9c5f9ecd294cfa809 SHA512 274b81a9a12de63e62c72878971c517427fe3dbd9a5ab10d89676326ecf23caefaa961504cb0e9a609224c519a3a6983346212fa67e759dbbf18c2c74de4c61e
-DIST texlive-module-cweb.doc-2017.tar.xz 60908 BLAKE2B 426ae54d4e0d2d46c8e62b7283463d0ef126befcb2e7460cd15c44a5471e93ac8606110e050d2da594950c5b714bff42f3dff20003c3e75c690bfe0b99ec1bda SHA512 10db26820e6d3998fc0be20f73088fe7a2aa06cedde32aff51a539d71ad49e8e7f51a25950e1db578770dff78a8f5a486f28590ffc0a655a72cc04b4072d0221
 DIST texlive-module-cweb.doc-2019.tar.xz 388288 BLAKE2B 6b1a369c86b0f4b01e190e049382d615f9163f928074d9e371d39977d0fa1201ee47a6f0131ee3f235c2a7dbc97584cdd5d5d43dc0b11223c5fea7b9dcb4a13d SHA512 1acb8eb3dfa5d563369baccf3615c06c61f03ae70e18988fe4d4637bc97290f04288a9d15c548d48c65aba0dd3b0b23faa9c1a7f7aa093ed37035fab569c8d4f
-DIST texlive-module-de-macro-2017.tar.xz 7840 BLAKE2B 4d50cb8d5213d652c7eb493e32eaad381310b385a766ee43a27377c39e02c4d8b8338149cbf66883e779f5fd94f097c578e9690d7ad89af50e0977cd843cbc06 SHA512 759f9146b37d485bae92cd6ecfc4291ece42017ce6be601669d989e52229270e04d6e8e26a2a8db46cc9f6f1eed3c5babe57bcf7c080afe828e2320510a3aed3
 DIST texlive-module-de-macro-2019.tar.xz 7848 BLAKE2B fb911180e375163a6339c4d884942f3d20dea41a81a203845c6e87ef8c8712b8460da928995385ece0961bd8e773f589ee59be5384ddacb11f3a19a6cbd1901a SHA512 5ce9beff85d65654173557af668ff15af6989d9fa6d341fe9c26149d0715ed7cf57bf5b2a59b6cf99e8ec14e4ebb6816e9972268516a0b2a78ee13c6423b3599
-DIST texlive-module-de-macro.doc-2017.tar.xz 49764 BLAKE2B 935293c1dd2f509b49320f0f91e61cfee825e3025cdb63e7cbf4cefb7cc8b6f3c30b26f84bd08cb80ad6177e224e37973eaf7da9780365176fb9929211ba3e88 SHA512 00784c0670b5f11ed715f76745acc3ebc098b318ca2b00c294dae3ebf162af0f47b4192d993f7b1f5d443eadf0f7a2644cfc2bfb71956eb680cad2c593a29cee
 DIST texlive-module-de-macro.doc-2019.tar.xz 49764 BLAKE2B c3f60cba4b9a6df10de15e7ca3b5bfb7c16a6e0f82e230ea0b78fe59efeb27fd83e2717262fe36bd6983d62eb5724dc4b6b2bdc3a15d6448b986df4f8625a490 SHA512 05793930357ad58a57e221696d836895f02dec82cc93b9aa7ea302978bee24410d4b382ff72407faa67f4133c75a84fb2454957de446beca05606776c6581ade
-DIST texlive-module-dtl-2017.tar.xz 580 BLAKE2B a69a36d545938321e86fdd20083f0ea3d1fd691115a5a45e4e04c290c3694c27d483a90cae7b082acda1266e03dfc473af69bacdb6f356bce70aab5ac0769f85 SHA512 a10e239f20462a47c8ca0955dbfac1c8d3fd6a73ccaeacca07afe4dc5b7fcb70768cb9c61cbe245b306cae045e8179772c69cfcbd866f6b0f9388c6da54b483f
 DIST texlive-module-dtl-2019.tar.xz 580 BLAKE2B b005aa4657527bb58aef3b3f6c30592a7e81177147d9b046a777fc0476778975de675c5393b96223830e16dd85870e11801ea0583587316e231452dfd13c1712 SHA512 796f01b568969124edc40662db5d8699a815b72d9eafea640c9499b7cd907e4cd36ab42c87ade466c51fcb18a47de3363f5c6068f4c678243c7633343705f35d
-DIST texlive-module-dtl.doc-2017.tar.xz 19580 BLAKE2B b4bb591348ddddec9ea975f2ad10fbe5db5fe786c900b236d811490710c0eb92a5804f2347f7bc478780fce54fd3451b81b328269346c24513e197d7a5d764be SHA512 a340bf2a2af68edca51f4c6a7cede18faa8da5fbddb26a134bfc28e4d79dfb33631a8ee562fc1598596453e4030fa6ec343dae588223adadfae5dcc6953b3169
 DIST texlive-module-dtl.doc-2019.tar.xz 52488 BLAKE2B 1296b8fcbf60fbba28fcb161a4362b97c84e9743b9558287d2aca178a0e5ca36def4926d332ac918a992cd4f70dca3e84a734936cebfbaee72da60c7ddbebfcf SHA512 b0e1d2c3728b859bc010efc5d31c50b10c7f9a045530f99278228fd4a4bae5563d58852dc995e9f4430d64512f7b0ec0c868c6f86259127bdf524c6f66bbec86
-DIST texlive-module-dtxgen-2017.tar.xz 5700 BLAKE2B 5dffbe3fa2894984f1d1b6458c7260439497d6a7ea64a2967ddee9fe59c719c11fd2e32c1c0f27c7a37347bc9ea2332dd82f8dac1cdc64110969bc0194e6dd72 SHA512 faaf12b7897a2d9f2d647096770e0f65bc44fd36b84a6587672c9551cb79627c71bd6cbf251bfe3ebc407d7537f9e8d42f5b301df7760afca7269cf2e6699915
 DIST texlive-module-dtxgen-2019.tar.xz 5696 BLAKE2B 70293ebd3e2942cd602aa34e0916622f4c66458341b16cdc8230b8b5e40857ec9c243d93619d52c6788ea6b6ed5f20cc7b5f26eba881740789e187ae783a03a7 SHA512 e4d1bf82d1a64eafb67f3f0ff570b1b7eb8b45e869891482ba5e37ebb33312e2aabd22f433d1401e3f02e12b1ba9814c543899c52f7fbf8d191ac78d4856f2a3
-DIST texlive-module-dtxgen.doc-2017.tar.xz 46204 BLAKE2B 0ec76f5e6713dcbb748ba94b14f753c3e9695eb1f0668444bda605bb55ee72b13482b5e5f1ce2547a84fc37d60f592ed7970233c48dde9c794a64f45249f75ed SHA512 e53316cab21fd5c9902c566dff44d4f16da6d666040185df3962c8119726fa135acdfe1f08b5a011a3e2287d157b3ea98091db46a5dfdea68994edfedc04a90c
 DIST texlive-module-dtxgen.doc-2019.tar.xz 46204 BLAKE2B 249c303629eef5b5af847f8340ad8109e3ff12c8b635d6eb21fe2b5028cfc82464237daed7d3f85b3bc632dc7fa0c7e685fe59ea54afef5193fd8997db75f613 SHA512 a6f57e26b579a34aa61a76ac3e3539c53ee47427a02e39bb39ab4ead1e28135106c0b7a88a9de2211fefc6f5df84a0f1b5b797e3efdcf54d73426eef23cd0a3a
-DIST texlive-module-dvi2tty-2017.tar.xz 472 BLAKE2B 77de3968ff65aa8b98e86487a77e2bf06f886ec476619f8e92324112b6095775603e6f495d5fa3d096b1d59a2315d57c19e0521f20879c0d046611a74cf44ad4 SHA512 21a8e5e9f077ce1fb1e6b5b249d8eed4a75d007bbff65c58edb83fe07932440568d8d8ad19ac714e12e57d0aef56ca2d5e6276e51c249c172498ca404cba55fa
 DIST texlive-module-dvi2tty-2019.tar.xz 504 BLAKE2B bc28b5dba8887d5144f3006c07ad27854bb9c0d2e55c3ff78629c0f29c96aaf5e3c874d61c6d54b453fa83ef380b36fadf1d466958206059fc7569c5dd4832a9 SHA512 41399ea5ec5d9e32cd032caf70009181bef98b28e29ffee84414914ca436a49bb59caa7e5523ae3c76cb8ede89d89ab74af79dd6ecc89cdf9f0d65605668e9c2
-DIST texlive-module-dvi2tty.doc-2017.tar.xz 10964 BLAKE2B 799fff8a088c6614e9cd99bbb4c2590b0a4595490fd4797d9099f1b349fd0d84b6e995f2c2c1049cd3dbb08eb17fc667fbe415b9fdcea29a356718f9dcf3d92e SHA512 5384f60e4b72858c10503f458a50f0d554bcb081cbf3614bbef77aa351855bc70b69a59268b8a3dc1bcc2a26ecfbbe06d424a888806fa7a3d05df1b31c1b1532
 DIST texlive-module-dvi2tty.doc-2019.tar.xz 35892 BLAKE2B 1577b9aec7144caca92df4567a0258faf6012752690a041681e224182637bdac308ae05f2730d9b0c233c2161fa3406c275b4c195b4effe4cb6e678e8ad3c00a SHA512 31cd9e13e873269f27e7e40b681a56022e7c0d776179fedb3c9396bcd9743b9e2b5f3043d6d2858858593aac49e40c16bb27d676f77ded984f4b803dfd9b07eb
-DIST texlive-module-dviasm-2017.tar.xz 9516 BLAKE2B cdcaee4e5fd57e17e39a267190a48f02cf5f96ad5f62fb74d0c608629f3d36d10f992ab9a0941d189126725801753cb368a1cd375cf27125fb0b388a3c63a5eb SHA512 25bbe1b0a90886a025cd1b64e63669baa382e1ac4517211edb8d01dc7876cfacc3dd13358727c4a5f3cf171aa90f8af7c822c31c8dbe3bb55512eab97ec1e4c9
 DIST texlive-module-dviasm-2019.tar.xz 9776 BLAKE2B aa2494bb1f86725461a274df15a926cff19fe55a82fd908dd4bfbd4f32d6a479e56b842f6d8b48ff81edf7d7195eed9075f3199093d6c18c8e29d8d9d3e7d6e6 SHA512 f8f24627f416053ed4a53008eb6f4b83a6f7114793e361956c3a968efdfe06c11c233e24e14568ccffec612d1ef63daf8f6644333f68d202b816cafee1da98b2
-DIST texlive-module-dviasm.doc-2017.tar.xz 664 BLAKE2B 26782dff43ab32f90d1d74ca7cb5af8250fd6d7019e3e99762a50177d068f796976308749ff64602b11e86734a90d2e2bb11e976d1c6fb274161bd101987ffae SHA512 13b9b6fe891fe6c0e5c7819c74225b2b943811452562a684c1f71fae7628ba167acb48178187a5a6d56625744ab840aac90cff15010e64e36c3a4eeb1ed84ceb
 DIST texlive-module-dviasm.doc-2019.tar.xz 664 BLAKE2B 8cce538c9bf68d2a245ce53eb15fdc77c921358b060caa1be1fb2c45527c6498e528c542ac268800951eb0a511dd4f09fa464472927b70eb75d5b70497d36c70 SHA512 49d49f53bbba34659a96d587d899af7a1d4eb4841d3b5132ca8647efeb27bf6590f7bbac42bc5d5becca356f7bfcd4fb244f6ce9282539fc9aae4bc99a633ecc
-DIST texlive-module-dvicopy-2017.tar.xz 524 BLAKE2B 088d69167909c33a373c581d01b1dbd7b0312d7cb79438fd95c6657dd3f35af59aa68630ecf5be688f9a03ae899cec346a3d31a43a621d1c45e1fbd4d387454f SHA512 537444d1baa72d23c09c42a53c39bf111a363ad683fa94851baa186b856730e37c01ea5aa60076a3da5475503fb134c44f8b32bc8bceed3d63e809d1e4161c0a
 DIST texlive-module-dvicopy-2019.tar.xz 608 BLAKE2B f0e20ab50bc3a9f9eb90f94369b011538e10b813246fc7e4683f1088507facf86d061a48f1b6fd4513e9076060cb4f8cd2d3b144ef668cdb1906aa9a6e7d94d4 SHA512 34e16ff93daa924658b433affc70fdab01bd8d6c1d537cf1787389b8de34e7348aaa91a39ba3f3671d25d216420421a5ca73cff5de254fbf25a8433e20fda322
-DIST texlive-module-dvicopy.doc-2017.tar.xz 3592 BLAKE2B 1f610dd0d92f39b993cc393107aa55e921819fe04930fb8855215f36646e0f30e2d7af6571c7ec5ae72890881cbe5be164ec18bd3390e1a7ddc4457be64bc563 SHA512 c308ffafbdfdf152abd842918c73aa55689a514a1de6cdc53595ea988bc7aebacb022efc77bc5b7eb0469e619f1fb6916e2a3515ba5dfc6e4744a22b64dfaee8
 DIST texlive-module-dvicopy.doc-2019.tar.xz 18264 BLAKE2B bfdfef70d6c7dcd1ea68ccf1306b8bad580dc54638b0feff058cf72ab6f784d1c2e86a4320e4a86e3668190a0915da7a4626ec40b054e84d02917f82fef9a2e6 SHA512 a85e3cf8ee5e500264ffaffddf8ebe6642373f29fcca42c346654f304f34b9389f2e190014eacd215ca0d78debe44859e05696789b9f703fd6eaefc9bebd4ff7
-DIST texlive-module-dvidvi-2017.tar.xz 468 BLAKE2B 0e301f188aca041dac510018e4da638194cfac151b9229f4ab766ce021bbcbc153dfa39558cc2be696859eb153175044ba0a8aae3447ef49d47f0e512c419b02 SHA512 29ccf47b7a4d81999daa3a16b774783d582df2b9af1dd814ba09329b5fdcda4af8a9183af31e2f9c4c416cf26425c2443571c9249f992dde98058824a64bdb31
 DIST texlive-module-dvidvi-2019.tar.xz 464 BLAKE2B c82c37107c4679d87d240a68d7b394ff78af9e94456490d5977e97e952c4c9bf88dd2c56b5ad4934c2b81e9023703d21646633355d4fcb4ad8ba317dc063aea6 SHA512 0b21ec8ae0741fe0b9cbe53fd97c4ef20cd4330bae769424b2fbd2998293b05419008ebcc7ab74bc17f166a30a66cad980f5692ab32aa1621ad4a771d20d720a
-DIST texlive-module-dvidvi.doc-2017.tar.xz 7880 BLAKE2B 58d04f3df26776118c4684b8d3eab3badf304c7987f006e8c1e9330e949a4bf34f978747dc162147092ac1ee9f588d5055ea11217c55a92b61a102dc6be0ca30 SHA512 72685126bffcdb0adf0aff770d17eabb1da16e999b24a40c4f5a0925e8eee1e168f88abca69a6d803dc91a8871beac954feca4d22b08542e5887d8f4226f7cda
 DIST texlive-module-dvidvi.doc-2019.tar.xz 19336 BLAKE2B bbb9a82346ec68d3d179451dcc142ab32e1cb2d24559314f2ee23579c6e83dd84429dfdbe80240a9abc746c6cc4a868abbe043f5717f3a9e82613e8e0f4ca1fe SHA512 831daec5b770f866c15440a384d1352824ead05faaacb8ae991e2d9bc1b115d599e5260cc9d7db6f0752ca7a16f21b0c52b5fff58ed1b23f30ffbfae59387c13
-DIST texlive-module-dviljk-2017.tar.xz 532 BLAKE2B 692aa25033a35e776a79e829e1d202c8609b1bf6d74a3940568d41e289132c42c4e195b895efed633732896b7fbb8c235840ea4a492ba8244ec8f0e67127b199 SHA512 2fc2bd385e0952e1f1a348040de644aa98c63ddf436e7cdf30366f779203d55632b96e2a8e167413887a6eb1f5a86e37b3c49b067de582db553ffcec51c046d2
 DIST texlive-module-dviljk-2019.tar.xz 532 BLAKE2B c7bd650dbedb417e8a29b4c3ab7152d4b9ca591e9d5fe60f140c4daf284c074f8d374a91265055c852787d7e73a622f9ea41bc42ba45d5f9117204e178d20421 SHA512 9c94578a0e4a43663cf1d3e05447d51ee84b892bb78ac105321b471e21417dd636bf8746d04c0decce06293f8ae8d8f60e0127b52796310a9c9dfc512158ab4c
-DIST texlive-module-dviljk.doc-2017.tar.xz 42128 BLAKE2B 41d9409a8ea851316f9321a951f2fc84107f3cfefbacb68ab6680f80a3ab024ceeeb4c0afe4d027b453e1caaed59b4bfe371bcc5c04fd072c747f4fe75e25926 SHA512 4140bf5492da8d3e4566d7dcfbb3c45f722fc1b924b429d1b4b8a32acae424b4485d0810390182527c6400ace88c4b45b6da06bb4838141e12142ec5c87f05f0
 DIST texlive-module-dviljk.doc-2019.tar.xz 74944 BLAKE2B ffdde2707be4b30895d107f65cf6ce77b2f9af40fcc2c066664a2dfab355331939ed89a3f3e43bce3241fabc83f22abc16bfbe4ddb9e5b935d85941c6703dfc4 SHA512 fa77f151e69f8baccbd01f8beb29c0143283892d42f5b0213909c7d434688a4e4c5e121ef9b8b73d93ebb211ca03a454ce309efd447a7d351968cbe9066b5ae8
-DIST texlive-module-dvipos-2017.tar.xz 244 BLAKE2B b6ed5118a94f06e170d34150fbe43c96da3ec8d1c1e305092caa06cdda497b662c91b2752eea7049fc37187e031103e84c9ccf305f71cf4b98847a1d4af16ed9 SHA512 ea01dc9fa33eb847010fc4f13b023d8ef0e87a9da1e9cb7b8f15f51ac6c428952ea5d8406184c0807ba4eeec255933637122155ebe08fbcd8fc5d3df5fa1fbd4
 DIST texlive-module-dvipos-2019.tar.xz 296 BLAKE2B cd298e3137e6ef39c1963f70a9f9e592f424bf70871f551aead7669d176de2dc02f71e79bbb0f465806f8af9c6060cb9554298d0b860240efd01056637de2bd3 SHA512 ea771c689b519ab7167a0e363af501db771e7883c0b82fe0ded3661b57fcf31b932cb268b08b7e1f2f4ea3a7f85a7bc1efca83272f7eaf163354166a0b9a5a93
-DIST texlive-module-dvipos.doc-2017.tar.xz 11144 BLAKE2B ca5a8d9f604cee30f57e01b94733599a6c72feccbf20e7ae3d080138a02db87afb0169b7738717dd56cef3f95d8f8882ca6428b7731a6803b861671ab9bc4d2d SHA512 e1720314341e7063baf34dc5ce7086dddf282a82c5723df8b67547b9ac868e336657a88b0243b1dd20762c4371e2b5a8341314af558c55a7462534bb35c2a965
 DIST texlive-module-dvipos.doc-2019.tar.xz 28512 BLAKE2B 6295ba336dbf940fb4ef72e4dfdac982a0f50c47ab91860198cab77087937a7bb16b09c22b507fd8c533f2bf8f1ce27d18a9e6858d1154cc0b66b29c40d18ed0 SHA512 0e4548fc7abe4aa8f54a1b1a17d4582e1cb6e9f0aecd9812a1e2337ab1aa9995b4f3c4e2417f3eed248a9d40a5ba2c314aab273fda3ff5dafda3d9ca23307b77
-DIST texlive-module-findhyph-2017.tar.xz 3904 BLAKE2B 8ed8db21800eaea0afce6ee4c0ec4e61441537c43f79c82506de3ce9558f74e8b29a9067d8d4e453acb88a84a9633165150ba206181302f72999aaf5770042f0 SHA512 f6f117fd97f3c5cc7833da907b49783925704a43580b980d67a6bde4c501ab0d48b6d662bef3c11d1c802559a120ebaf3673c7a69f4d636133fd1e46629fee26
 DIST texlive-module-findhyph-2019.tar.xz 3904 BLAKE2B ed688ba5b589ecfda3c1de90f7977fb76952576534b4614ba01643335d25a7a7b2593d954515f96e65e6fffb5544aae6237b5ad1dd7b011691a0666cf516ba86 SHA512 aea6305dc0d9b31367638078a7958933468e761ef4cf47a1c44d9fd5ab2e25f7af22273c4631946a90edc9b51947c2e56b3d4b74c8c59f0a79250c2edf5bc137
-DIST texlive-module-findhyph.doc-2017.tar.xz 12024 BLAKE2B 1036486064c040454e1c4fdd8d1ab95ed28847ddc8811b279529346ad148d2039ea86f24f01fbbd9389358fcf6396624e66cc006f6b3ddb644e21be2682e80b2 SHA512 fe8f33cf13a69b43b80464e3799a090e0a0eb0bbc3420b5b9500ceb490582f79defa4b2ad29d406dccc4b2ddb5d5b83fbf644eaa99ea0565cb258706d1acc0f5
 DIST texlive-module-findhyph.doc-2019.tar.xz 35040 BLAKE2B c8c7bd2eec414c4289b441c047c36870726826d2e22cdfe852117117831f63f92457fc25ad27714ab7eb110832e3c052ff197f503ae969c941bafb6d5d48d24c SHA512 97f3fa22fe490d21bc9e5ce5ea0b23ff25ab9afd9c5dbf6e8d78b24fd306ddc132c5ba7ca7ea7e3d7aaeb48993c7968b0c02ae0b765416a939d84b53171f4179
-DIST texlive-module-fragmaster-2017.tar.xz 6872 BLAKE2B 574cf41226398f1f0ebe3a46c515449b95ce39c5639d00e21822753c560f3236cb37c1f410a33e1cd52ae59a5fe8ed72fd6c2ba3e7ccdfb1e77ac5148a82c330 SHA512 a7e6fccbd850e7b3ee942a3d5af379e79a946fa9b037ed47d8de50b250eff15d0e6250ce2ddfbf8f7535a1b7c1bf39d80d5a352e1b77fe9bbe0bfd25da434bdc
 DIST texlive-module-fragmaster-2019.tar.xz 6872 BLAKE2B 85cb9e3b240f22274f25bf1ff002b86ad20389d20840c197653242e8983795e4f61358b9546b302be786eeebe7359f51ae60a7b82fc06d2a5aec561d50fc7cfc SHA512 dc5d80aa4bab7a0a66258face6cf8222d03b12ea492f7cf568ef815a6d5950a8a2b36c7403ab466141f49cb8faedfbb33146820b88da17d8b8fa18a2b16235e4
-DIST texlive-module-fragmaster.doc-2017.tar.xz 80256 BLAKE2B fabb4875633e49d260fbb6dc263ba1412d022fca85a3811183933ad19605c69c8c11a7b2b4b1e32295afeaf43c566c91cd137ac15263176eafb5b34ad7c95f0d SHA512 cab8ac6247875ed48f86f16a67cf3ba8b320aeabd61cf95a6c43a6cabea9ae11ee0cd9e2bee0b577ebbb414216cd4015a36161c83627647371418ef61d28c8b2
 DIST texlive-module-fragmaster.doc-2019.tar.xz 80316 BLAKE2B 5fe2d1f1b5b38dbf579e0ab8819103a04e885c9b43ed7e76afc4836da78f230a0a56840a0c188a6f40e06d17084108f0f7cccb8e45f5a9c32c2856d8c681a55e SHA512 61f0bd7dab46bfb91b634006217f01648007cbce3c9187b0811a5cc1755ec19654da94b47866ad9873fd57629f1561d1cc46bf3a4d62db618502aa0e67500637
-DIST texlive-module-gsftopk-2017.tar.xz 3428 BLAKE2B 348791efea69f8ad6a37480770d1cde59c8e3a0791f16bafbfa94955fb200e8285b086d95ffab90d08d631010f053f5a03ac7509592f0a455a004c0e19dcccf0 SHA512 9f3cf2841b1f275c13991ca07483bb47e9e833bf5d2d137af2660d7e01127f878b26cf0bab98668504edbf0d87e4e17fdeb8c7c654de01048298298771d289ce
 DIST texlive-module-gsftopk-2019.tar.xz 3548 BLAKE2B b4d4c355587e6665ee542c9a58e0d67ed773e3258cba1e8d86a78042d614db5dcd70014cf4b24c96d0aff2fd76bb353ccc16e90ce2802a0f00337b3557bc46d4 SHA512 d05802963d499c4dc0979a58bfb56a1c04e006b25b7eac4cdeb7659ac6f31a0380e476e933586f4169846f88d727742ae5494cdbcb29995439a4cca5be4c7332
-DIST texlive-module-gsftopk.doc-2017.tar.xz 11764 BLAKE2B ef3ae2f15809430ce3db9090ebceb9395a1a66bf31045de689207cf52b9744a1435d29f32787b73dfb77ba951109633ab09972216d3a999960d0d94d97f149b6 SHA512 6114d30883da80d9ca222c7191f57c613d28871d737df506f977442484ece94934c2c72e0c78c8ed619622c4d0a2c4a174d917ea9408f976ee0e14f3db7cd55b
 DIST texlive-module-gsftopk.doc-2019.tar.xz 27536 BLAKE2B 4c84bd07e016fd4b23d7ba30c33f1cfc581c41e9f7354f0f9d3849c5e49264aed35372f22344753f8bb832e285dd8f5bcefecf11b353cc489e86aa1e883c5894 SHA512 7d9fc4dc5c3b4cbc05939332e7286be712a51f74b408df2e6cd9f1c52f81b01104e4f41074c55f74ecd003276f2b9fa2285e875a27c20e16936e78ffedc6a4f5
-DIST texlive-module-hook-pre-commit-pkg-2017.tar.xz 776 BLAKE2B 34892ff70e1b4ad25ab9356f26cae2ae183f403afdc729d9a1e107d161eaab0aa78f22ba2d0c27d7b90f0a30d1e83d29805e1000bb81c50a629888cefc96afa4 SHA512 8db15c4d2347289caf9cbe967e4bc7ee819868d11d6723afbc9ff045247fccf52694e0533f441ad8b69ffbcffcc98e52f17ad901b47a7a9fa2c19cfdcc693dc1
 DIST texlive-module-hook-pre-commit-pkg-2019.tar.xz 808 BLAKE2B 99741f4b4ae417b9e1975fbcaf412416702730bc4c0aea51be2e8324ad539abc2687b690c5541e89ce085d07584b63b24946c7d5beb538476855053ebfaaacfe SHA512 6fb3009d4bb4016f0d6e92571d52aaf7e3780d39a6b2ec73ffb37112b3f153ed71ecbcd985b81dd841f296a39da83e9004a2d6e6e85e9a49765e1682563cfde3
-DIST texlive-module-hook-pre-commit-pkg.doc-2017.tar.xz 2784 BLAKE2B 290480e643130dedf245b25741141ae910e094ddab5b3a169e9f9999c794afb6f8c1a999a0d2df5b0eafbf414a6c15bc11841a29552a5c9bc2b78aa93b5277d4 SHA512 727cce2647d203c3a8c8c918ade775af08da1edcea7bc57f55b566caaba5ca42310b6c0a90b089f3ca10718a5c1dbd16c95549930b0d4b33c68b0a3367dbb172
 DIST texlive-module-hook-pre-commit-pkg.doc-2019.tar.xz 2788 BLAKE2B e87de5b35b848539f0bb55e82e60e147ada03120a55f3098b1d0b1bdf7926c57882c5c4296dcaaf4da89f2ef46989593642908db22e75a37802aa2b71c905ac2 SHA512 3873c4714a8a6d221f860a5d0606113c64482b363727067e0017d27e99d73f31cfdac88a799fb1412225baffaecd7bb03dbdc66b607a075b1e4539ffc0df2a9d
-DIST texlive-module-hyphen-base-2017.tar.xz 22296 BLAKE2B 8de6b540c4df5a4a51136b96e33fbf9e5fed9a4e63517edeacd0c978a9890abd8721dacf011ee3f49b86252e3112e938b775f627eeb74f3bc868a4f4f7c5e72c SHA512 6a6ccb73d2e56233956460ab6ec1e1585f9ff4d88cf14e91186429f7fee78bdf58c78d96f25e0e8208d8824ab907b49f2d61119e4d7d17c1b79aed2fd2b3e834
 DIST texlive-module-hyphen-base-2019.tar.xz 22420 BLAKE2B 752153e786b90c402f327a2ebd87e80bb5ca2705d55cbdde91f01c11e428a41a50cd8adb1d96cc72d5b85112250b6a1a5af14c855b2bcab73b332942faf7d218 SHA512 e1980b81a98b82da2e590d08ae5873529041f3b048396d9bd1c3e644e6e8a48a8eb2040ce120462a9e844353f8f0c3fa93c38bd7492d35d390525fac69794503
-DIST texlive-module-hyphenex-2017.tar.xz 7512 BLAKE2B 77e2016ad16e11ece80b11cfa803fa74aacb41d1bf54ac98ec7a685e152cf6a98ff071b6134a493648ab333cf4a32235566c1bebdd543fec8ac17b33ddad8fd2 SHA512 d92236780a8e22c2430bc656fb4d4f630665d7be084a796a11508ed102592dd4de940f99e6a3501577c093cbb0cbd861eb8d41d92fba09a6cd0f5e5d2dab9f22
 DIST texlive-module-hyphenex-2019.tar.xz 7512 BLAKE2B 788a74fcad29a9f80fb23067baa1757a449d0d56e8e0788dd76d9eacde4e95548e96068216d63871107d44ff852648761ddbf11595fbe38d21f4a9117361fe42 SHA512 dfa1f625e736c2c4125209552f084fbd5d64109db5dd5b8f37b5add3fce90984bfa5db855b581396ffad20b1f5a3461cae01e031c086f7db5dc98203bb7bf8d9
-DIST texlive-module-hyphenex.source-2017.tar.xz 183840 BLAKE2B 9123337f2ca79b38b5dca08f9b2a53acea4502ce4a5d4aa702b82efdd1ac2918c80d1f0cb03186173cd60ea3ef25219a4e9e326d55fb1cbb357d86cecaacc9e5 SHA512 370235797f5754994efb735b8c1691d3be19dcce9e112969323e16502cc5cf695bd63ac5265ce90a7312415a6acc106999dd290a22e9865a03b0ce952ee62f56
 DIST texlive-module-hyphenex.source-2019.tar.xz 183836 BLAKE2B ef7bdeb8230caf5d1140bc0ea0eff144ca1e747eb8918cf9abcc58cfb20bc7a5783361c557e375fd47325a083133dd3fa227a46cb48b1d8cc45802286208c868 SHA512 cedcf83033a5aaebb44a8270b5e670b9db2fba2b8f65925cddee4684bf50fee5dcadb02921b04288d02c91ca3d003c8da143c7bb1974e7af26b1f392dfd4283f
-DIST texlive-module-installfont-2017.tar.xz 4796 BLAKE2B 05d37b0526c314d3416aa48ce80c843e2bb7b7e6b239931689ed2eb02e413d9ac2d1a3bcae98b865234449e5496e5f5363c75dc87fde7bca7d6d62c6fab54209 SHA512 f15bf4b91feaf5af8466db0492aee40c3570494a9ad503b62badf319b2aa20371eac883f714b60e015fa3ff15d8cddff65da373de653a6780fe2709de8fe8071
 DIST texlive-module-installfont-2019.tar.xz 4840 BLAKE2B f5fdcc51fde58473041db0aebb682b431ceb02476fda93fc7cc59016982d613f0ceebc2a662a6260d51ebd8a96e03ecffa717cd098fa2fcf2d614e3458777624 SHA512 cd5133b93c5daabaa0ea13649f3d34c28f9af9f92db54917e64cafca5f5e7fe5169d87e36783036850ccde0002d34860eceaea528ad06e21f08141106e6599ae
-DIST texlive-module-installfont.doc-2017.tar.xz 56028 BLAKE2B 91169625c57838433c30f8b4e9830d9a949d9adb13b0dc811f68f4de516e05f9ca119634d769ac5fd630728ffc5ca7ee53c1a363d8699e374ac9bbdac9007eca SHA512 cad711520909fabcb44a551c3d3b4ac12682ffa5ac5986d168fe0e0c0e5ca0cf8135d2a3964f7d4f15f8891ec5d44fc88d0f00a458308b82e31dd1bb52dcdcce
 DIST texlive-module-installfont.doc-2019.tar.xz 56040 BLAKE2B e1b66c235779773678580a4a2730734460c3efa433de30303bdf8731c4d303e3b0b41784bb5643f379d64e53b768941e9ccec124847dcadd8b928bda9a0975d7 SHA512 2b61c4b229e0c4ec89c591075e52bcf8c150f5f9584bff94f81ec1f229940dafef11d6b6f84dd086692cbd99e6616685533d4313ef5bc48c56a7494fef3583b7
-DIST texlive-module-lacheck-2017.tar.xz 464 BLAKE2B 8657aa4ce38ff1d433a1fd37347c362169f12a3af8e2127e462565f8f7444e53d103c0a44acf38c45aa3b222a40ad5699093c6e9556c2f3f254d5728a29cb293 SHA512 16a3bcff6278cbc0b8237590951b6e5c5cb4f13402d2991db8f69ed4ba7c95a4cc2caf6563a2e38a386caeb68af11452d26a3a18a8bab3576255ba88128a8eac
 DIST texlive-module-lacheck-2019.tar.xz 464 BLAKE2B 306cfae738b04113bebe25cb6e57598af61078f587f91503408bff5190362927bfc5d2456b4396fc524eab495ab70c48f70f20afe24b966acf753f4a86d1a435 SHA512 7b8c4c7d15618b7e0d860afce675124372d31bc11b5e89ba169c355401714929c2c192912e7d666a3ca98c805e2f4942bd6173763a5a9265d1f19467a29223d2
-DIST texlive-module-lacheck.doc-2017.tar.xz 7404 BLAKE2B 73eaeb32befa917817aeee5cd5c345654dfc565e82e8276ec19cec4684bea321ce66e63bbf92f80b88866dbec1a6b0e3e2016611bcb104fc459392b2b9d8bda1 SHA512 dccade3cb114fcaed052b8474e6d4e3884023cfffd34ba8e4895452dd84f114270f3cd20a731b52d5443953154d6d0c112b27bbad536ff1cdef463f66f1e9fa2
 DIST texlive-module-lacheck.doc-2019.tar.xz 21132 BLAKE2B c0a0dfce1f35ea67691faa65f8d2d6917eaed9ef5c9ecc7bfb846131139749d9ecac115bc557a2e5e71bd42546f8bf850508e6d814b76995dede37baa25d774c SHA512 59202286440ad95fc96576f6915843adfb2b3f0092509175c759c690069e36c0ce1ae66ef46c1dc1b9c33e42e7819b1f3490b45d3c3933233201d3e86eeb5746
-DIST texlive-module-latex-git-log-2017.tar.xz 4840 BLAKE2B da03a5d25ba505e0f545056c9558abf7a0482bdd783d9cfa7484b07345bbd1781c9c06ac9db8c1ffa9a6981432515857eec74ba3ee590e6b34a4c7bfdda1c626 SHA512 01a823d96ea3cb193617ad26405768231a1ba3f22165b008f0a4898e3db14da424cdcdd12fc353e0c89b42e6cd80e3b1531d772f663ea9487f8fb02c763a1c03
 DIST texlive-module-latex-git-log-2019.tar.xz 4856 BLAKE2B 9cd08c5a9dfffbd71c2e00f1bfa80fe831aecc5ff4b93570d873e98890ad50528532fc906ad6d108283cb8c7ebbd2c93db055f2c88464e2e0d4166bd098e6e43 SHA512 7277bd2160cfbab8daa88144b384cd03647192d516114d692af232906a39ea44ae5721ff0b935e7dd6425ec5514851220787827b819af71ae3f0c57b29d0d924
-DIST texlive-module-latex-git-log.doc-2017.tar.xz 91528 BLAKE2B 1fd46609e1e87d5d55bf61c61141ce7467da6a45d6fd36a350dd74924b9c67619843d7ca7bc11cca3eab62801f444fe0761ba1224db9f2085231cee4514ecc14 SHA512 0e08eb2ca6a0c933a82b66058d463c781b0313e5631ed4e35312d0f612dc2c627dfa5ad5d4b520a457975f31266c6ce132f2318fa2fd1a66f4860fc14dfd334d
 DIST texlive-module-latex-git-log.doc-2019.tar.xz 91528 BLAKE2B 7200b51158e2e6b2e028ad94c54e2de9beca10fb109187e42b6f1eed693394f9990b5c578dbf2cde46c7153420ec8c514c3388d5265c8d6845993ae6b1d94c70 SHA512 34c96eaa3950f9577ddf63fb42aac51080f8e92c55f02b217d2b680353f97b1fa6bcdd59158fa9e81d48dbe63d35859b52285912ceac4b523a8ae34ec894a1ac
-DIST texlive-module-latex-papersize-2017.tar.xz 4608 BLAKE2B 702216f90287e9a05883c7c50dc28c1c12be11dff0d0f97c9a6fd4ba7dbfa0e7b19151af47e25ef4d2c60316db2f634e8feaeaad54c016fce8a082e53ec406de SHA512 84f4af6e54673015a85ac1bc7e16a93b1fc9c57df4251ca56fd3af5a90bbb750a9d4aef4fc5ab769bd3ccf965ee1bc31704de90d0f2c88d23d696b866c8a2fa5
 DIST texlive-module-latex-papersize-2019.tar.xz 4612 BLAKE2B 8b41ce3b6d519e1167a7f198c7050f393f919c7a3a708aaa5576e2a88acd7ff343b072feeb037fa00feb90ef8f1e27ae75a1c8a38b33cb2c0574c6a57ddd5283 SHA512 cc3c6b563e16f70cab0ec113068d7f870a266c090ef518c06b4e3eced8e8fd9cb7aaa3544ef362ffd4af7f1d033a104daa48d47416061c3a73ba8329cc9a0fbb
-DIST texlive-module-latex-papersize.doc-2017.tar.xz 600 BLAKE2B 5dd6592c5680266f071539d861b4d5acaef86743b2643267b40c8a25dd21454f608a593dc804291ce241000af96b9206ca2bdff5322c88a351fd80459363bf01 SHA512 e3aa2050c9fab9c806f0df66bc2d34b97a8b67e6e1bb41b13e524054731419145003305117ecf515dc47c98ae365c78784a5f09f823145e01ea08aa54ebb024b
 DIST texlive-module-latex-papersize.doc-2019.tar.xz 596 BLAKE2B ddcaeef03ece18b323d153b84b3369f317b5ecceb10f320d98c93f3963d739673a5df9c0e2918caf7424f14197fac79ded05964893595f8efd2d802ff6ce8bea SHA512 662d7a890978bb772a79db7a1d406ce6958970f6cdec352f78347d9ad8df47734ddae444370fa9e93582d4030568cd516ca32125b2d1e0f60aac3ce1c9b930e9
-DIST texlive-module-latex2man-2017.tar.xz 13940 BLAKE2B 1289010000370b5b88ab4baa6d26b299c2f67d385efcee8c5387658b5fbd1b8033463cba4c664365dae9ae0eed84dbf0831559f81286ad46bb6ba08aa5df6a41 SHA512 e3579403dc9e984cb51f8854436968abf69a29ae6984cdbd0fb2fe0141b1ff2af65d2100011fb6355580b7f8a73a3c0bdcd3b225c8f7e13a828c6b2c5ee602af
 DIST texlive-module-latex2man-2019.tar.xz 14088 BLAKE2B e791e164f7d8faf12c30719817cb887eff7706b3b3db97cc0cce773b4c722e62564935a5061804e531a3dbc862a919b3606c9c57796679029b5208473bf7faea SHA512 9ce1870958d7de7625fe73dfb735488d2512b048c8c06fed3f87255db0914080675017d24c88a97ec71ddb9cfe6f5769ea378f099d8787e447837a1ff5167436
-DIST texlive-module-latex2man.doc-2017.tar.xz 344456 BLAKE2B 39e69f1301796e5b3561075496b3f46b7d464296dfe4db2f55e7230cb788efc23dfb399838e6245cf64602dbdb865ecf725ddec214824913974f1c88a6882ac5 SHA512 88f4b0fc6a12355b0defe1c1ee10aba1d06cd498556ddf043ab12d480ed5f1946cbceb58de7beef452afeb24e416261eed8aff8c21c330909f6cc6a8cce9d5c8
 DIST texlive-module-latex2man.doc-2019.tar.xz 369336 BLAKE2B 897023bf06fb5ed6f172251fc21cbb3bef908742ec86e3fe998a080a890b74e029d52332ce7b9c47334bae40648812ea5fc9888e18a9b28ee53f059ceb9be4c3 SHA512 214685e6982c7a9c694d74a73d37c58f3947d7304637d2ed44fc616cece6026e5d02763f26e280ab21212d18a962c31b4ac5315fa840f10bf1efcfb782f4dd2a
-DIST texlive-module-latex2nemeth-2017.tar.xz 7082664 BLAKE2B ece6a898180446590b092deeb1f1c8dcd96f3692d2dfaaf24ff8981a25fea8080b10d8fa74dfffb3f0bdc899ec63aab4033a39fa4f672b543ac5c4357828c588 SHA512 f65a25838d5feb6c90eefec17e13561241359db663dc1c109a1a0fc6a4d8dbf48919ef068db1284c8e117d22566230ecae405c69813fb7e95d26cc1e5da1f403
 DIST texlive-module-latex2nemeth-2019.tar.xz 7113440 BLAKE2B 3220792f23086f9c8dfaaf146f83f72c3329b0ce0d2e891ca9c461fe6540f837798b649887df890caae09afd5d90bc151afa9315e455df012817274c0accc02a SHA512 ee82b11dfd3ede3b926a034ce8a7f46ae2bdd065f648fc0375a62392a8be605e391c64726eea03efc439b7a01fcd3cecfd70106335c72927e45c70ef0c8aa48f
-DIST texlive-module-latex2nemeth.doc-2017.tar.xz 23852 BLAKE2B 6636c3c0fe7628d8ba8c600ae4ff84add3bc9f7702f596fcc3bf2d24f5a2b85e87e9ff8cf301adf5354504033ab0c3ef0d5bbc3ed5c52c6bb9dd36e39e445dd8 SHA512 c55505f0b00e4d600ef9a40461f6e3888f4c820ca1462a2c2edbd5c9f9ca75e08e543cb9fb25ce56313a6eb80747a710134ec5933f71a172e5a675ea9a0d76ee
 DIST texlive-module-latex2nemeth.doc-2019.tar.xz 26732 BLAKE2B 0310a18a972caa58589eafd322d4d767e023d3c3a42a3dc250b673eb24d09c1a5ae86789119f1b21ec9575654a186a47d159cf5da03ffce59ceea9bee239c7fd SHA512 a674eac6b80811890433c613f7ec9c6fc4667791c5b4692606e88d3e38ee59a3b68951e5f19b26d2b9f9de3b79002d17f4c539fdcfce37b82c3dfea5cb811086
-DIST texlive-module-latexfileversion-2017.tar.xz 1652 BLAKE2B 5552ae1828ec81909956d20d68bc35c1d6e09a10b7a7439c633ccc8612553340d4b7afcc7000a8db1e4793d618fe0f31116e993bde0bd907ce644d1e2b929e7e SHA512 7b2c2ef5ae64d2921da0fa553f7fb745dc7c8f9c5675f5c018e29a4745f2333c0f51d00eaeac6474a35a382d9286896b0c9a7a105424ec680f53f8a93faa5b2e
 DIST texlive-module-latexfileversion-2019.tar.xz 1652 BLAKE2B 57a97adc83f9e367c3681f6943bb38ca238e6057ecf9873611751da624013e891f5dc184a46daac80a2464fe32ee7002e53f63343e6d8bc3bf313e5b347c5e50 SHA512 3a017b8a367864358370f0063957c301014df2aa039566ef33ae78dcf428235ccc2a88e19c917c940e186371e2c0b747887cb04e7cb78b9a04ac1720dbd94cf9
-DIST texlive-module-latexfileversion.doc-2017.tar.xz 928 BLAKE2B c5654e989d5c5edb203cf77493edaf588cbd125f49eeda6513eb0f335ec1c98d11a53df98c0e5233503e985aa89fd9c6239a250d85e6eb15d26c23082ac6d305 SHA512 46a5495320ead028664b1c02c872147cf350f05f1f9a18291fd47a266a06a66449bbdc0d9d4818cad30f75f29a2ea3611fd6c88379aaf3a703e76e6df9f6b679
 DIST texlive-module-latexfileversion.doc-2019.tar.xz 928 BLAKE2B 3a72c41b0da50e9793ef2ca44653aec32780da76201a43a57e0ee77ffd4ef6225d789f1614b166e2c1b324b97a1515867f4af13d68a5225fafbd444c7ecaf11f SHA512 b1df01f8bc7daed937cd20d1ab7cce443a3d1fbb58e04cb18f0c0b30ef0795c988cf51bf49ace2f960c173f6a95fe982ee9d29d7650dcde21784c788165094c1
-DIST texlive-module-latexindent-2017.tar.xz 38844 BLAKE2B 3ee9541872df5fc37587c563ad6879f7c9d151b19838b71b79c8a17a252c233a581ed7333e0317e4c152b5789e6a67c01de9f3157851c48e14599cb9b55a13d7 SHA512 f8797cf236d783536bd208abfbd7bda3fe05f5101e3ff2cdf546179a526029ab47fc25eadce6f54cd8f0ab29ea155d412163726cc2119395ced80507d8597f69
 DIST texlive-module-latexindent-2019.tar.xz 53160 BLAKE2B 11455103e8e251ac61b7abcf01e638059b89c981e3002b909aec682392dfd5c4fa72837c09d8e773e02f5e5870886f225ce39a6bb248ba29241ac6c55e952760 SHA512 e8f6f5dd0cab6f203014a57d455996794acb84a18e690acad00f1740264b28da6e4a6f8aa0b1525c44fab01c9bd8bb9292a8bf9cacc5cd049a06c11bff57df78
-DIST texlive-module-latexindent.doc-2017.tar.xz 541996 BLAKE2B 7b239ebbbbcd0904a2ed31ba6f092918bf75703cfaa032001aafac18dfb1f10f312ff8edcc919ee389c2242ff6622bf5ac6b1ab859cd4a75f2ec163109bb079d SHA512 53d8e5566272f7dbfca899687a4981e142d9e801d6f9c6c9a33e5fa6adb0bf22828edc130f7320a3719b93001125066ec48a497743490ae5f7872747317b6f2d
 DIST texlive-module-latexindent.doc-2019.tar.xz 755148 BLAKE2B 577c31ff736c40977ab3fd317cf082d85bd195c6f05d2fe67484e48644baad138fbc66e8cbf9c4470a4590e4716d684b06ad9a02b8b7c381ea4e7076de4ca24c SHA512 89d85ccc7faf8890b09c9e4818a07f706c0be9b39b035bbcdaf278016a78222cfaae0292d92b13f27febaf8d4c0d1e5078295bbaf08f3d17219c495c05c1ac69
-DIST texlive-module-latexpand-2017.tar.xz 4664 BLAKE2B 3ab8f981d0b2c6fe62610c84c436738aeb16b05be8a38634ead040050272585593a5a8cb701af329e923e3b6ca1759f7b7dc3d7f37bcdfc88b6f417345ce1e00 SHA512 e74ed2886e781740d77c18303fd98eab17e431812f033b0e7734e4aec966ef3476605ffbdefb960f7be511ac5c2e4e01586f3ba3b3b1708e02b0656a02e4b6d1
 DIST texlive-module-latexpand-2019.tar.xz 5752 BLAKE2B 61a55fa12048faddaa58202e769d46b949a6367980b8d29ef8fe10e7b09693dc009b330944862fae5ec9677a32804f0599545cc6984b9a07c2439083434be63d SHA512 9248c63fa16b9f9ccfb0243bdc6d56bb80b9887e26d8f1cae53092ecef94f046f554d8c5b9ed6cacf7202dd5be212472f8bddf9eb740f4ce54e521c9baaf75dd
-DIST texlive-module-latexpand.doc-2017.tar.xz 3000 BLAKE2B b37e0a3af2f1c77fa3399034966d758374555b87381b614b92eea44ea031f0f3d535adb1f845fbad57b6e8f022e3fe650e656399f171b9ccf95081a52ba3c8e8 SHA512 ab847d512042ea1079621f9492001ee09c278b130a7c61412d883fb3687bb85d52dc53c3133d54acd444c38d21d42d5ad1b95f918ccf38bd9575f9fb19bd6ede
 DIST texlive-module-latexpand.doc-2019.tar.xz 3072 BLAKE2B da7fc2e838df1f2288b8f5d74241f25ac16dba6c9eb69ebfc149599e13fc12fae2a754f8395892b9ab97cff41a25ea9123fad616121a5d2dfaac0d1965a23853 SHA512 faf4b269446a008ba77d37d8f51ab123171a3cc56d59dc6fae9c5274833e97276c24392064f6f95e8e8eb5b88717d1c4433a915208cd81788364d382aae200c5
-DIST texlive-module-listings-ext-2017.tar.xz 4852 BLAKE2B 5cec8bb40972739e36b6f2e18b0d0b85ab0d719e8b752c1184fcd84da3c8bbb7687794b256e4581bc94718e97400ca1c1d2a0abbba171cc85531381dd608a6d4 SHA512 a40ef2786fe5624c233f846995903ebe19fe6fb9525899f23e73818eb8f87dcb296d6bf0c23366741f6a8eb8655c21ae7337a4b80d90949961b007ccdc67f461
 DIST texlive-module-listings-ext-2019.tar.xz 4856 BLAKE2B 0317ca2bd6c6cd1ebdebccb4b924c57bc9b9409d97e9e967a78a16282541655f454dd4c20e6e8cf1613a05755cdf5d88c1c7aee6f030a80d8364807aa8434a2e SHA512 c68752d0e7a1ffb7d08f153bf337849164d0287f20ff8f092635ad7083b2e5a6c487bcd9dff913dd029f4ea92750768d23583eed53a0c2d3bf012e4db059708c
-DIST texlive-module-listings-ext.doc-2017.tar.xz 103660 BLAKE2B 6160b391e62ab03455f226c7db98518a4735c630b7599bc88a868ac760d602bf07bd05e846d7586791b7ada2c666de73bf860c222e2d1d9b7d4616ea0dc063d3 SHA512 edd67257cb74020f36a11a95e6f53dca80b376d73ccf75a87d689ec606019ba35f5b836f012c1817764da8c3b2947ef47ae707f22c47c4096dd31c4bfa58a327
 DIST texlive-module-listings-ext.doc-2019.tar.xz 103704 BLAKE2B a7367a78ebd5d466b0b4adde5926264d4b5325a635f4db25483a491ddcafe3436d2f97e64d50d4825e5def63439c50543dc893e08504501fab56b3ef7d84e6d3 SHA512 82491f81dfc89950d085f7cc41dabdf7b895b23c8a69f80c1b4f4c420fe8f036ac181b56e3ab60496910d0f1165ce19b2f94c5e268dc1d59e352ab6747e3bee5
-DIST texlive-module-listings-ext.source-2017.tar.xz 22640 BLAKE2B ced7c27da8c445870a22c02575adcf3749f6f04fa0db23016e9712fa95087a75ffb8c4129d3eb4bad28c0d780502289ac7f5016a0bfe28db16eb81a1a31f2943 SHA512 4bde1dbcd6c5dcd258682314cbde29ce93c4c765158798b27fa17a23fe77c3e4ef73f86578716da6233039f864bb44a1450206bfa7c12b7500d650c16930784a
 DIST texlive-module-listings-ext.source-2019.tar.xz 22652 BLAKE2B 15f7ecd55bbdd3e34de77c72e710ad7aa5b7be6d31da0e550171f8477627e0cbcc9cac8bb852c2771b639d66992b846a9cd37952f8b6ffe16a7ea9a7fb3e43a1 SHA512 fab34f07d6384a5474f3ac30e2e00a75398418668134ac1041cabded6209c9521244e1637e4037e7346bc70b3247ebcd90526d5e34fc3c4e388fa978382bf228
-DIST texlive-module-ltxfileinfo-2017.tar.xz 5172 BLAKE2B 612f8b21a4ec4c2571cc0fdc9776ab5c5faa5bf865b7946a1b8e2d4354c70a2d7825565016da339c8f89e2899e49dce841460660913fb959fee70d14ff434ed5 SHA512 f441ef14def62f9ff9a6dd80574f0a526748810b17a5993f2880f464eeb30997578406112179103fd614afe91d2f6bf8ca19448e83ef455d630623980eee67f5
 DIST texlive-module-ltxfileinfo-2019.tar.xz 5168 BLAKE2B 65e798fa705b8420a03db389c5990784d9c1f208d23f9e07c615a47c2abe9a560ecd55d0eb589151ae39450738a98b8eb48c949d4a4fe285d6defcbbb81927ee SHA512 ca078af6b822747e9b337eb5694c1b019444e55f5f9f9dbdf59fa1a65c9445b19a62b0d610514c9231365017d3ea95ad9288a37b62b400c12df74c0c7f774a44
-DIST texlive-module-ltxfileinfo.doc-2017.tar.xz 37604 BLAKE2B d36e08a057af2bfb964901caa20b79ff84013f80fbc9ed19545027c104e007110dbda9ceb62f8d5091f50947624533d45393a9d7cc0bc1b470a768fcb390adb8 SHA512 44e7b6664fd865a78ef23379cfd39c720ddf9040d3ffe63c4ea922e2825a14f49926782e1e3ae4cba347c26b8bbbd15e630d94dfc36c68dbe813fcaaeb11da88
 DIST texlive-module-ltxfileinfo.doc-2019.tar.xz 37612 BLAKE2B b8021ed8cd1d977b18b92ca463046ebb67fae757794d881d8bf65b81dffb41ebdbc9aab960d06bfd7514d55d36c2d780fbe890a76e5fa3b415b53f174ff9e363 SHA512 0020ffc5874e0545c7ae4d1f6f9c0d5d598786444f4e98369e0c5fc872c5d63f235222594a9b0f5d2def5c3dcafc5ad660a4fd5a9e4551dd7717bc6ac06189d5
-DIST texlive-module-ltximg-2017.tar.xz 10352 BLAKE2B a16c2be4855eaf69e527bf91a152c1e677688340f56c3c31ed4453c4e3700e104df42d03b761bb18a8a65fd1ee9a26c27b202ffe460aa38c76ff129b13ef8e1c SHA512 ddae4ed4afc9c4e18b0cb7a49cf7a0f3aadcbe75bff0c0962b40aab505ebd5c2a8b60f523d9cfaa9235beeb75601126b5621b3a84437ce21c3fd4d651ead2783
 DIST texlive-module-ltximg-2019.tar.xz 15896 BLAKE2B ce3638279a98f98fa8b2c4d19f40a7e23a545fe563e863d2bc2557532c4696007d9032bb76900de50e2688d8581dcd25dfb5ac61a1b14a3513ee38ba2d845fef SHA512 388b4826e49a57071f5dc8718d02d9f62f1c4f85368ee9e2f3f435fecd80c698cd3acde79d0dc9edcdda46e1cb2386e6efefc12a25b79f6ed73c0b5e5ce1dca6
-DIST texlive-module-ltximg.doc-2017.tar.xz 350876 BLAKE2B d4e2fb1c140120aae6c89d347005a6c385c7c2fce1cc69ab6dd32d5456df90871b8ec3f251e035332e5b3359ba6804924b622257a1b510878412f2337059e8df SHA512 a761b23a9873912e677f042378b7598750480d527c7fd58b5c36be638265138033e4a6aec411e879a9ada801aed85694898b4da9459c52040e9d33408ae485a8
 DIST texlive-module-ltximg.doc-2019.tar.xz 189772 BLAKE2B 3a5909954eb83a4fdda6e4b4e6b3a4fa3c79c4f30b223449ce374f2ea40c71a255c69690a7189b323d64e4574bad9c22fcc3997ca353dbdcb2b39239eec14a43 SHA512 2c5af9f2b1a843f5e27f96759cdca8d92dec87013cdfadceeafacbf77eed00e2db9dc286ecc7316cc6838fb85f59c399457490529426fb2ef7daf02f393fb622
-DIST texlive-module-make4ht-2017.tar.xz 15268 BLAKE2B 8ce45523d313cd72676027b072c2bd19094b5017dcb92eeb35d82ac7973d5d7ec111d7cfccdeb5f254ca3abd82f4db2e696ccbe8b1284790c65a274234d7743a SHA512 06d90bcc80409a9f18024bf730f956d126bb5745f43e30cf159ca8a94487fb0dbc347b1b30b2d954e8e3d79160ee0c13c94f4ffbfefae332bf39f94823da599f
 DIST texlive-module-make4ht-2019.tar.xz 33224 BLAKE2B 5fe5decba37c652d4f6ab837af47ca9e9b72d6b254ad7bf8016ecb42ee633065f264b64051c1f6aa822ea94e16d0b9af1fad39664f769ac108354a4d39e44623 SHA512 ba85b1b4055d997677f5a158513eeca0390e9e07b872250970908151f33f7203a4d0938aaf4dc56c33e36f57b99f797b3a28f999add39d931bf4e78b907ceff3
-DIST texlive-module-make4ht.doc-2017.tar.xz 72112 BLAKE2B 24a227bf3025db627785580ddeb2a4dd894b4e3b41bc95d53e8f98ca0b319cdb1237b93cbf59a0d15398ff31f303800cfe1f68e1c2e9514fb36905b5bc993d25 SHA512 05dceee32a5488df1bc889e2ebd006cc2c901e8445a7f7e3ddde51afa24dab59fabca9b2df963febb7018b4e840f0107f7aded5653ac9046b7625d3a5852fbe9
 DIST texlive-module-make4ht.doc-2019.tar.xz 125828 BLAKE2B dc9daf6639b32dda301fb9070cfe4e6b2b54793bcdf6f4ec53bb6a2c110296b3d16067fda7b95de3ef3bb941294542d77e1672ab103170fbee8be37b55a84dcc SHA512 45637b363c64d0ad91e164d8c8a254506f98c8105d226ef9ce1912c2c4ee50057233f17035e8a5ab995c49875e638bbd14e1a13949867329a3e3cae65b844c55
-DIST texlive-module-match_parens-2017.tar.xz 3328 BLAKE2B 22441bf4709086eb73afc83e46525059825457a0e28ac4a345fa2a20de92563353c5dab5e794b884dda66a596f89ba79a485ade65e1d65f78211c918238093a0 SHA512 a604521dd72736f3f5ac703734218e534f4690d59fedfda06576f6ae402306e94a810da9ef8c7739dcbb7537df04f7d09bf5d08b2b58e0df90710a3394eab03e
 DIST texlive-module-match_parens-2019.tar.xz 3328 BLAKE2B 3fd79342cb4a1d3de5a60e7364730af1fef0e7de20e45c78c2e7c6aea1457259a7cd53daf6875f9a35f1f5425fb34a67426ceceeab7868a1f781a67a82ab3594 SHA512 1e03e279e977af436a8f5d5c3d30f046f46f1a31a0fd3de6d8ab458a64f0634b5f3ef8a338954971a898a1c68128f60c6eabd7ca231df9f3ca8ed12e55967dad
-DIST texlive-module-match_parens.doc-2017.tar.xz 57280 BLAKE2B 0fd6b2c6f7ac7eebe6b7d1bd975181dea960284dfbf98866557dfa45c29202129bffe587c3bdba50217790e0d97aeef98f5467ef7dcb0fd0b0d7084bdfc657da SHA512 d92fa529b9cd6cbdee2d8e6f178fa8395c08540d044d0522d1da2a68c78654666d0f7ec05960c9b9f8b2530b4c54bc695887da13a1ba383d6c3bfcc49ebd64b1
 DIST texlive-module-match_parens.doc-2019.tar.xz 57268 BLAKE2B 3540abdc804c0b062e5a06c570ff9be7aa87514004a780b96d159dc90bc9fdd98847fdb1a5559d944da15908bd6cb8b6a03bb56e8de4f40a13e13557c3e4d3e5 SHA512 60428bc16f65fe820e267852c9d85a5f862c6800ac9c2aae0915a48819da381b2a311fdd3d08096d4aab7311ef86c1c89fabff3d88caf419dacbef515f4dd39a
-DIST texlive-module-mflua-2017.tar.xz 27848 BLAKE2B c2f2be68f0072b49a94e535bd7fb948e24d6f6e4e711aa067efc7643ad599c26dd66f9635e3aa9ed4cf876f4bfededd1f8a24b06328db042f06fa11e45212e5a SHA512 83d84e3cb1291c2af4067df2fce91e14bc30d11843c5aae36aefce4e0e1fe5cf6896ecff8791c2888abb16d13933cdcaacec11421d534b71dc3b6cf8c1c02bd6
 DIST texlive-module-mflua-2019.tar.xz 31672 BLAKE2B 89204162fdab8140533133a48ff92a741746839a55c7e3fa9fe91cfd8fa3c842f100ca40e03be80dac08f676d5d84371ab0b3f6fff7be00d59c265c3317b6754 SHA512 a12e8a56228f0e3c49ef08a47c989135028ce6a99db714eee1304feaa31ae10ca5f030291ac56e9a344b54626247a521a909a18a35038333dbdce6553019e31f
-DIST texlive-module-mkjobtexmf-2017.tar.xz 7444 BLAKE2B 20a80de587212d1a89610b378c50ed8802cd8ebfa7c3b80529add90a8f737f7a6b87d3614e77e3a820292bb8145ef369b2c4f393efa41eabfef65336a5bcedce SHA512 b87432ef1fcface11e93e541595fdf74de1539d9f2ce0dbbe3e35c73064230812628745aec782b8026cc60f9797aeaca9057c534ac852b22bf44d24d5cf1b960
 DIST texlive-module-mkjobtexmf-2019.tar.xz 7444 BLAKE2B 624ff2a3059854ad4aec624e43e8bf03286b477c2210ba4d993affe076fa12bf932a9b6376862aa98d06b4f848ab8b49257215658a8c55196f8e59594d64d4aa SHA512 c0dffdb276141b78bd2c47e6d2bfddcd13c1800d3a0806a05ca1fba72a91621364b827801430bc757601e07f2a5130366ade49d7ac1df27901fbec29827739c3
-DIST texlive-module-mkjobtexmf.doc-2017.tar.xz 80276 BLAKE2B 206017cc2c54a2f1dce32d7b4ff2670a5fc0e3f3afc0c5c013b849aa1309af8ebeeaccc9aafd59ed2336d226b53afd6d07895177bbc5b62329b10754b81592c4 SHA512 4df1df676df7f1a1c1bf0d1c0a51df8e4839558b79fd410446b522ce218f499960420af351c195c61fb66f9eeaea869762f3ca8091f76c662aeec333fcfd0f80
 DIST texlive-module-mkjobtexmf.doc-2019.tar.xz 80276 BLAKE2B ee2373e795425a3c40e1a46af3d1fb7a800aec9db9d808b6a6b32e64de6f449f4421320e429f635eb8b04c03e7768a4ada3f37e8c044d89c903d13ae32ed0f87 SHA512 3ef5c333cedd5104b63c1457fff2eee40aea7d1f1b187d34ce4cfccd5b6bd38809b7686dc7b41a147fbee2ae0e951470f3ae574bd3c10a5f9b6fb76b686ce4f5
-DIST texlive-module-mkjobtexmf.source-2017.tar.xz 19820 BLAKE2B bb68f6151bd777e677ef75ffaef1338a9995e37308cbaf4307378b5d7291c52950be369c66539e322dbde11bb8951b3e0fd6b227e47de9238027081f359cba5f SHA512 2ff63f05ec1d4b09842a20b93a1ecab09245dfdb3cfbd3e37f1e1cd9d25760c161948433c10ef05373d84cc44b56714f86073afb48053a8f965c64490da0b3ed
 DIST texlive-module-mkjobtexmf.source-2019.tar.xz 19828 BLAKE2B 31b3a262ea9c1202d17c542a5a707ca36df035338844ba5973fddcdc6fb96805185bdcbe0de69dddb7f7f3b4a898de540caeb66088fa57abb0d3501c699f6677 SHA512 7f9de9bafb890d12ef2f07d3b8596dc31c4bb97079f826c9efd4f318383f64d8250099a937d8d692fecf703e626b42f942962f4d906e705cf4b0155e354bff0f
-DIST texlive-module-patgen-2017.tar.xz 532 BLAKE2B 21f5b2ba902932c026e6f8d395031510625424341b494063010384aabb4d5c1c4bedad0223e738dcf57a7656e0bf13996e9662ada35933ae328ebcd42ebb70a8 SHA512 129087787df6ff3f450ba9b4af53eec8c5349bef186825ade2d2831139c2c4d2de5b8d2a354052a06f86f1fca251047cddea3bae2d9dbdbcb469d0dd0877786e
 DIST texlive-module-patgen-2019.tar.xz 648 BLAKE2B 3bc7cd6eddb45607f2a6858b31dfcb65d2a8252115293ee8a2cac24747d00ba0024b4ff8c60c54b67ad46e50012749ccffcf1dafb5f885b1d5b920d2079cd949 SHA512 524ea5aa09feba7ef5efd47e35d8d94703be4e191bb081d0b13007e853e88729c6029451e58a7237ad5ddf524c4d0798421316c38d1d9374ed7cd05f2744f761
-DIST texlive-module-patgen.doc-2017.tar.xz 10960 BLAKE2B 08b89c5a01af4e9f14bffbb17561e2591753e853395b29476fd98ec3c5fe18120e223ca96fe6a4c7a2f5220bc8a0f07707e4ffe0b7a7fe914ff8246db9231226 SHA512 b1b69e00f32402f3bf2012f25840e63e3e1ebb00a5224efe7c7425d54a4c37945dfa097a1f41e89b360e4d0d769ae003774503fed41e4e1076004d296be27117
 DIST texlive-module-patgen.doc-2019.tar.xz 28652 BLAKE2B 9ec6e794bba001e7a94956d632cf0376a10fa0575fd287b4acf3c36de4ea19021ed117670f236346784e3c1640b2ec91c3c3fcf1f0bd91e1d2637d61a35c3b8e SHA512 136e6c23505593788da8343f4dffccee77ffcf9fa63382871507db47c3ff23d6c25d0cefc985f67e4ee137840aa3af8f1738a5b2dac5272e568e73b18b71a5e2
-DIST texlive-module-pdfbook2-2017.tar.xz 3492 BLAKE2B 8f20b8b924d72575b0685fc9b2f4478e78e99bf8a2cf820188db9f5dcf2c4b761794cbcebd3785a5cd084ba77e39528a422b8290a2c226718c25a97f29e15253 SHA512 62aa520c215830d8145bb0fd7af60915245be4b246bf42eb912124e61c9a388da67f3ca7efad560f98701c5b32be0b87ec9e78078b9900f44f0095c9c069ab1d
 DIST texlive-module-pdfbook2-2019.tar.xz 3500 BLAKE2B 851f722554a74d47696ece850f9381fd470acc75457ab24590cf42375f836fec1e0631c531ec1da3e5491004c33330d59d9a56e2840def598f80cc5178f81ed5 SHA512 ecee1f160c1898110bffda10fd1a329b66b8689d7fb967254eb9dabf8bf7d71ad94399fcf3ec6f01db08309c3b4803789ce768e347ca70bd9a81e2c49a6f1f78
-DIST texlive-module-pdfbook2.doc-2017.tar.xz 7552 BLAKE2B 086bf910bc66166a2a441465094d95d13fa8c39b4840c9ef19d9595ab2aaa14eb4251de5cd2b4ff2589768259ac3048e4057bf3bcd7bbef4b86d6c82b6bc3746 SHA512 7620a797dcae68e7bf093c119b06f377ea2665b228125bedae11ce129d8053df066e771df2053fb8d90473cd7d00a75ec5235a0ac5221b0171605d145a18321d
 DIST texlive-module-pdfbook2.doc-2019.tar.xz 7552 BLAKE2B eae92ede4b9beb7fac91f0baf6a1d2c9edf95b9e665d600c0f1d6c76ec7ab910108272f63b87bd3b2f06ed849b69a2b57f0f9f578a70228ef3ed9b4a6e5d7d11 SHA512 b6b58cce91ec59d43e5aa868d5f1a692e76ef84f57c2399dd0d25b7ad9a94c2e23b376cb49a9d1c33a084362095e018a177c95bb3b752c5ab4840d054b241b51
-DIST texlive-module-pdfcrop-2017.tar.xz 10720 BLAKE2B 0287ee170ff11967df2932d9dd7ba947abbff12045b059c906b9dc399a56596915b9aa06d4c924db84cd9d5b2d04e42637f5ec1291d4657730ad5225de002cc6 SHA512 11d2e8e911e8cfcabd5a4f6555715e08cd6ca51868c1a0dd7d9332fea5fe7fc4b571669058a99ca518f7dbafdf45a517231ea8a654ad39ad9169a789b3346a00
 DIST texlive-module-pdfcrop-2019.tar.xz 10732 BLAKE2B 29c12f811d7e0bd7a5475d35eab2b35549d404e90df4b0c70aa299ebf938b1abdb3eac9eb1ea868d98c297b5cd22e1fab629d2013a475c36157761f4a901b68e SHA512 eba7fd5c529e1b3a29d00ee679c24748050f1a6005391de4bdb6e6fd537cd447b01e6569e0eaa87251d49e14f548dfc80d5e33f037862a4e978905af37e9e186
-DIST texlive-module-pdfcrop.doc-2017.tar.xz 4300 BLAKE2B 7d5a70a0f8ef86b1bd9c60e534a20e95571d0808d6219e0cfb011def705427b843c1492b2021611d2b27b79324c764d249b852499e9dca5fa9e71aee1f7343e5 SHA512 fc9537872e8a7234d80e76709d69ea7c3e17e02321b26477a96186e9b190d6c093a62caef83bebc76d4aa4134273e28e74d456ddaeb9e53fd073f9838ecb6110
 DIST texlive-module-pdfcrop.doc-2019.tar.xz 4300 BLAKE2B 67bddc633e05ab07d56b78be20da628f44beb511b636cbdc8b9b74883e2778ed917a0a96d16bd17355124feee5544c9e5392057362b508273f08e7340c602f36 SHA512 5deb207030892f9e351d511bba20e65e957b5db17df6af60022c3f069cba127be6e9bdc1e94600b6f36af8f35697b041ac5aa529ef7997f57264b1dcbf76ce2e
-DIST texlive-module-pdflatexpicscale-2017.tar.xz 3120 BLAKE2B 9b4630ba97d27258bcdf58f9abbcfb2a3c14f846b575c365462c46775685728443290488108af99161f164b16714a7bca6717ccba0c9d5878cef8ff1baea6ff6 SHA512 2e6c4baababe8b656e12eecdbe73d8410c060c3d4aca5dcfc626728126481a5a86b8b7d031a35c85a26e2cb79ed1e7bba7e143b449b0118b5a11d9bd9bd135b3
 DIST texlive-module-pdflatexpicscale-2019.tar.xz 3124 BLAKE2B 491b0d733a769aa494ce026add50ae710a2257ddfa2737cddd83465d33c564f553edc735f61f3dd09b41c3e92cee095d38d777e52bfd57d77ce5f04e21868cb1 SHA512 d36dcc4d70156d52bcaf668d620c8eee5db8914473f943412ea5ad5c8bde673a6715fd5a69d13e502a5d4fe0b1e0e55099432c4e0e5e02bd5f6155ca5804c3f3
-DIST texlive-module-pdflatexpicscale.doc-2017.tar.xz 86448 BLAKE2B 45de64a373368a72acd8511a46ca37b6a0fe10a2b4c0d3f7c65a32799f1a25fc22b2fa9f22a9a0b0abaaf372a1b29ab26a1dbefc37cfc7a4569a8ca2f43b4ff1 SHA512 6a19f1366879369ccebfb53663ab565e3a635bdde413fa7c1d8d6a58faaab745cf213b35e183ca1bbca4c90dc3a8c60f1ff0e472817d703ce015852d0028122f
 DIST texlive-module-pdflatexpicscale.doc-2019.tar.xz 86376 BLAKE2B 53f8b82efd4f7c4f27edbba3a6ac5a790d40dd9fbb652bcc798973182604166ac8a748dfb4ac3147d206fef6072d178ef5c7ff7a334cc009f3bac0c06b48d7e8 SHA512 64440f794e88c08bfeeac75d6d4174eccb800125c8d57e3b0be3ac6883c04790d422cb05cbed6be7335ab2e4d2e6bb2c8c0137c04160db126674960ddb7603e1
-DIST texlive-module-pdftools-2017.tar.xz 1872 BLAKE2B 57670c928b435abae7bbd86d7a0f9160ca194e8e4dc07ee9a077fb6061b4895da02cb5c71db7011ac90d9c0ddc6f27177769b9f0e39d079dce7191a9a9683050 SHA512 9f6684fa61f3bf757fc970214065b76523e9f0bf324024fe90268034a2322646cbd10f3a005135cc176e7ea17c434fd9e727337d45929ef24f024b0ee7edfb10
 DIST texlive-module-pdftools-2019.tar.xz 1844 BLAKE2B 1e8533512e15a8fbf5bb62f2a4e05e61e2769c1cb68c9e50144696015703442902ff8016ddad1f9c0bd695a0d28fae932e2f8c9231c5f968276533e14497ce5a SHA512 ba9ae7b0bbe512465357405e87f3d523235c2398d4a94e8d0c8191e37db06bfabd6676f3fb9f603397e5682f9dd4f9b1b4cad03fce89448a9f0b254f8a7f2b46
-DIST texlive-module-pdftools.doc-2017.tar.xz 73680 BLAKE2B 039106802e0eb4b7c26c857194a3906f553c038723f42ca4c1f7f575e5e703506c49f731b03b4a8f302d1bc230a6c38140664f9f7be301e35584886be15f9682 SHA512 e89610bc333017173d5e3f81826a244daa5e7a9ea779f580e06ea54ee2e1a456b7d83ca8fae39a38270d14bfcda4a8c8d9520e0903ab9e91cafcb1aae0207bcc
 DIST texlive-module-pdftools.doc-2019.tar.xz 64040 BLAKE2B e8194e09bb210f1b09d3b08e0f68f15a3412db38a9300cad6036612551580a0ae82962fc9847b3ec50fa7419349ebfe207fdab8da7afe749879da5e3b4bf13f0 SHA512 3f95883d9405bcec282468f42f8718bf9c510d98c41510aa643ce0b70eb7557f67b75def0dc0e1f862f79d586f0f49959b4c826f8c468ca9460fdd69d3d4ceb5
-DIST texlive-module-pdfxup-2017.tar.xz 7260 BLAKE2B 30bdcb82091edf920b31a0ff9c3b4e4ff16e3c2cb1e91584766319f1ccb9f3211d9d064aca5636f4181b9eac47e3202aee0ab8474e198dabbe63ac63c6503368 SHA512 598107c336f9ace01c160c107da09e6a43d0d508b1e8b9f5304d6ab099b924ef97726d925031c5643b179e647d7d66638028cf006d9afc7898ccbb6830b87a68
 DIST texlive-module-pdfxup-2019.tar.xz 7264 BLAKE2B ae89dab0e28b42bd0c5c18ed813f00d7f61e1569bac172ba662933a12cd0ae8b64bb361805eff7d8e86b4c24de061cbef82f516e3bc30679f141516395553e91 SHA512 4086f58241799139e980c97c1aae786566bb7801932334d78e89dfc5f8e718b6b9fd3eada32ae006b9aeb74d8b2644071a1b1e60db7dda3b4b4942947d727fca
-DIST texlive-module-pdfxup.doc-2017.tar.xz 21260 BLAKE2B 5256bfb3c4439855976f940e5a220372349cbe355fd95cce1c90e60840f71634410fe9551cc476e457c19516627c7099c788ab092d72ad8f365440eeae6fa261 SHA512 934aef9a1ddfe0e1f6cab6078e4bb4c1e4c4d428ca3f249f32ebfa72f9148af342c080164cf291b4e1cedec5fed1d596026427e9c7253c4e151778ccaa399b2f
 DIST texlive-module-pdfxup.doc-2019.tar.xz 21260 BLAKE2B 59bd932a68ef363af4de08d8e444a9e796bfad0c250c549bf224e3105ef1825a9bc44bfccd288cdb4af5fb074358bdc9e772726d0dd685f89a619944c963ab83 SHA512 3888fce668affc7efa7e9d88c890f72c94b49dd88ea3c05af956943dc015e89ad930e2de3a67e023c7e1be2cd1c7911e5df29dbc273e3c2b219eb5377c165956
-DIST texlive-module-pfarrei-2017.tar.xz 4640 BLAKE2B 04bf192c53a5f9828f96f6ccced8fe77e562279c99e039a793a2da6a7a346cb7c9ae5439723ab8c50ba95155befccc90d2979543a9d836de23ffd323949a5b10 SHA512 3fd11229796b4958fe8b8a3e2c4a4f0556063328ecb83cd9f4273c9bfa7b0d81dac776fc5d79f5b96b7366e0dd259d27af1747752e1fe4bcf7396519020a6d95
 DIST texlive-module-pfarrei-2019.tar.xz 4632 BLAKE2B 658455eb955f1525dc9f5e00a748ef19d89bf2d65f8168121d1a0539b298fd32a9494d58724706857885364c86f6d46d42c8045e8124716b93726f8aea8aa3e8 SHA512 f6046dc96672b60ed272dd6fe23a4a51032f039d3aeaff3f8b5e2407c99fe1f43c568a03564a7c20212a97bbfa4ecbd0dcb7f5f44593e1485c8e5d9197467a6c
-DIST texlive-module-pfarrei.doc-2017.tar.xz 499400 BLAKE2B 4553271b95f9d295ec870681ebfe9431c84d7314fd69cffb96555b132095715738fb101184cf66002ffba91078b97b33b4e88326d73aee77163114f120afb4e2 SHA512 66ce3c9aa05bee674cc1966f52968edef3b0da97225457f5bc723e3f800c5f14200c75597fc67b82b167ad8aed92a28235d53b9030f08e5a29fcaaf2be3f5324
 DIST texlive-module-pfarrei.doc-2019.tar.xz 499400 BLAKE2B ea640be4e5f113f9c2cf07b7b2dfe6da8889f79eb5a9c6bdf8758b2b587b1f3e4fd5337051b374e330380a6efa941cf10be47d643f2555af99b8847a6904cd1c SHA512 d50ff4603d51eb72d1d12e7f5b1440fa3d7abb1ab74fdf441d7e4a474df91247a1ccad504a14438bc0c3c6354c8f8674f180b5d9d826ff09a8749db3cf0d08c4
-DIST texlive-module-pfarrei.source-2017.tar.xz 13448 BLAKE2B 3e01dbdeb61416eb45b83f077452b694b1243b132941f2aa8329c3b544e3c9527008b44d2755ea7e54a113382e00b344c6c393d8a1a5dceb19c232e80ba6fdbb SHA512 2a00bb71000bce7cdba9648d51cc5a7943e2b11ffe1a9bf68dea4d4a320a337f73aef4152b7d5ef10b8a406329b0979eac82e84c21bbeb89421bf0785cb085b0
 DIST texlive-module-pfarrei.source-2019.tar.xz 13448 BLAKE2B d30c95a4970d5674f7b44915d8129d13c7c8ccb43725a8a12129ebf64eb63aa9c17a9e39d6478d57584ffa818aa9542cebf865220de3ba286b18318386bc25da SHA512 1e4008782161066066fc4cb1b029a36f6a18eb0d5d52f11a2a70d04d4778de6ed1a80ea1fef5d8cc86c2e13b8cbcb1cf8ce43e58ff4431b16ca23c3fdafb9884
-DIST texlive-module-pkfix-2017.tar.xz 7572 BLAKE2B d4036a5922fb8ff9e4ec2e6644c29f5799dacdfa97195cb21d998f327e6aff8441aa4570e62464f1d36c04019f35f91546c2e26c8e02642eb75fd15bf4b0cc28 SHA512 5ec75f9a8760dc9d159a003738e700938aed4312b76c3b32feeae1e3736bfb7e0ec61bc6627753ba2c035c93a47f21176ed8588f73510e1deb76dd8d159b3691
 DIST texlive-module-pkfix-2019.tar.xz 7572 BLAKE2B 3b655dba7deda0576d7c9f84d8d6d136709b516df18cae7f15a010ef3ab3ec8997032c02b1b0ff027fa611d638648e1e713894c31defe16c0cc671fcd7ae060e SHA512 b4d374e5b771e131075ec59ef6713c6433cc3cefb6331a933e791c3774a9d54d6c8427d70a4aadb2c6326c3733abdb562ca103f0b6a9dbcafd87856d20b18a24
-DIST texlive-module-pkfix-helper-2017.tar.xz 16716 BLAKE2B 954f041f4cc1d2b3abb126952000497ed98f49abe4e84304244b828db0ce5d18ed379591ce8d2037d0165996cf055be6f0c82de711e2c76bb4b1cf7c54d5c45f SHA512 14de8aed71eee67bb1b5f7989c18e16dc35191aa762a4e30ffe916161b81c1397f284d6cd8a497ca9e639302b663c388d0ddf3bd7110bd512021232e63e84086
 DIST texlive-module-pkfix-helper-2019.tar.xz 16716 BLAKE2B 4c178cbeaab6845ac2e7bcd8d8f81d2dd541be4c265413403f8e749290f6efb80ebaf7cc0cd134c8dd0cf1bd29a348ba82416c62d0903a0e43549ec8da63899f SHA512 4828927668f21f465ab672b92e6e3934e81e60bd9b3bc1f28a65b2c4dd26d2ce244258ac1b7d8846c0bfbb653a2fe009875ddfcc0383b34249e775f675497478
-DIST texlive-module-pkfix-helper.doc-2017.tar.xz 640356 BLAKE2B 47f4671dbf99a20a2458073c39ce4aee1257db7c975095fd16132b8af23e3cd3aa25d68e4bd354edf3b9555f0c8619b794d80be377091de602060a53e6e59e6a SHA512 9bd23f5fbad0899936b27d91de75a248b304ace9314e28e9e4278d482545bb7cbc027b7f4933c2f868ce2c19ac3eb74527e176c4f648146613717de36488f7b5
 DIST texlive-module-pkfix-helper.doc-2019.tar.xz 640356 BLAKE2B b2514d1862eeebcc883f5799e46bb5d856f2b100adb6bf83e2f04dc0226c71107270c7a006a3c3f248127dc726e5d50a4e799c9ffd87c97838e6e1f1d60fdf01 SHA512 146bc49beeb779c4815737cffe1bad30c28e7e44409a3e7036ab82c58f6f1b7e0ea3498f1a19cfd312390bcbc31c72d9f61a92501d87690a61cdc7c66c2fd2ae
-DIST texlive-module-pkfix.doc-2017.tar.xz 4376 BLAKE2B a550f55ff869a06be90fed27ffd46dfbb6039736e9fcf87117774ce6706d1d7bd3d615f42e79dbb7bc5d7d0850f4e9d5758fea0bebcd0a9fd8ece64f330126b2 SHA512 209405747fd8faa6fa5b5c109bfadfb3dc8c764ecfbef044a4bef219f1a31d06efa6da205e1b45bdbc35e36f283430cdc0610f5a7fb9692ce1fbab0307e4e4e6
 DIST texlive-module-pkfix.doc-2019.tar.xz 4376 BLAKE2B 7cc25ca096dfcaacce04fb4241dade290ce51fc6bd2791ddf4961d059080d449ecf68ad972e7c6f4cc2564e3faa982e86e128e1227ca3beae02055c160075644 SHA512 c6819c63aa4cf7df5879a796e08299f2fa132e1244648d17a7fb0b3c28204b0641e56fe4661887c257ca4f5998786c31b1cae2aa64e3163340f08d02fda4c8d4
-DIST texlive-module-purifyeps-2017.tar.xz 6212 BLAKE2B cee315c9eb13aecb59eee53c58190aa0775f7e1b5297b02faabee2268b036d9006cdceb704df6e7cbee7da68547227a89b5ac43a9dae50f79f4e9adae0bbe700 SHA512 28561a89dbfb895180d0112fb39920c0da0f52830c6a1389afcc080d381c70ccdb217192b2b154f0f31611c67b16603f33c69eaed9d8e5d0571f3886e1481817
 DIST texlive-module-purifyeps-2019.tar.xz 6212 BLAKE2B 648b7a323d2a1f9e48e5eba4ec9c43e796a50c166af2ce880514679cc5ff04d429fc48e1381e8797bce848e3b4fd5f0428d6825dc3facb6369df3fe1a2d25712 SHA512 79d99ef7ebc462c7c65d03f23cc85b9f136df2b0c9d647fc0672584fa57bfb7447f6db0e6d6b11bfc738cfe8c8658f45fe0b4059ff00f355e4b21d44f0d4102a
-DIST texlive-module-purifyeps.doc-2017.tar.xz 15060 BLAKE2B 2d9872bd873b6d149d84a8c9075b1aa4119c1ea54fc17e5d519db5a7ec06493e095e12d308c2b315f18933f492b92fddb4604cf235fdbc91d4ffd305bc7305fc SHA512 666846fdd403a143a1756c271c02561576c1ba314fa02400156914baf694d90d461c621bd2d9eb1491e498bb92a4d68e1d69bc20e35d9aaa7440bdc4b76b9b07
 DIST texlive-module-purifyeps.doc-2019.tar.xz 15056 BLAKE2B 7d6e071fcceabecaef60b58f0f69119e8b0950820075b97adc07651de19f9db92e33a6cab8d860b23c6fe5ed89ffbdcb11cd792f3dd2198d81fcf61c77a91c3c SHA512 3f9fadfb35596835b250cab98b0d1e3c6d537cfac5878e0b9788aeb5cc7ef455ce3d44f7d0f03e9002796a162d374f6aa8f9bce5bd4c3f0e8937040de0b82a8d
-DIST texlive-module-pythontex.doc-2017.tar.xz 1525440 BLAKE2B 4dc91d1b2ae4199094af30fbb0718a966eb51be23d4f28986888761d200a4b8f6f83471299587523d58a44db6327a52f33fc52e29aebcd8a2ad6a2a93f0e7888 SHA512 8ddd52bb6fdd93510120343222234a3f8dff4497037a6529017437353c5d409572f122f5b1cf78088d554986f1694d8674cb7d8991d90683c197a4b08c5bb844
 DIST texlive-module-pythontex.doc-2019.tar.xz 1543832 BLAKE2B 71dfdb873479eb2f0e0ef1f48785e97294630fcb6838b4c3c3e241a83fa7714a5347d9ac92c2a717271683ef49cfabeda5a79b635eff6a950976b4c0a3d4d305 SHA512 4a79de9023f8b12a22ff6ab14295e580118ba749a465884fce3f43a2bdfa8c3f7a4e131223f191863f2f3b3049f2b6d83d7c52bfcd3e4b3d90698591c61a8e6c
-DIST texlive-module-pythontex.source-2017.tar.xz 81880 BLAKE2B 59576a4d07721caf2a13b2b25c26c9ebd537e7b5eb119a42ff9038c054cf05ea0b82f9f79c120cea3f1a68afebbc57040e301a76759bde1b7529df2838125e2b SHA512 4e05da64a7dc831a169d891aae6202cd1e9c72812838552a23dd3d43b961fc39f2db30080a61056b950df730c2144ea82526255aea213c8793a4e629c6b4c4fb
 DIST texlive-module-pythontex.source-2019.tar.xz 82424 BLAKE2B 3069ce8f0c51f7535c423765beb3db2a44ba55a506085d159b55d91b790148ff17c85f20c322ab9e6d5863110dbf422048de3c73750b3f029110bfa551fb28d4 SHA512 a1fe4099a2508da8e901de36a302c368ac1ad9990f896e0d36dd5fe911c7bc3de43d2c19ebca5f7ec078ffc03797fb4d600d34501f568fa68fa87d0019584660
-DIST texlive-module-seetexk-2017.tar.xz 644 BLAKE2B 9347aee58780cfd2ca45b4178cef3eb312686cba1239f83c34cbf515bc558b1610410d26569fe5f33483729c296fafa24feba60466637d544b9b7b7cf02255fc SHA512 f18b647cd991c862a1e27a0d172d294918cab89d91a00f6de33858b67f07a2d1279d3b343a711b20a2067b631fbe7908a60b613f22a475e95bcb90c0ef1604b5
 DIST texlive-module-seetexk-2019.tar.xz 644 BLAKE2B 8cf432fd5eaf36fd87e686ba69765421b74012514b4615357cb01d8999a9fa3869c039fbf044e01e8dfaad4b145ef01d661930fcd65d75336d49227fcc6c8262 SHA512 b3dea76f239ec78da4eb15d4bea4dd1171c3193e9d9e82a1ecc5d5ed747e421a7a3dc96e422839772d2f825e862b8a71befbacb7cd816405d707f654c7e5a32c
-DIST texlive-module-seetexk.doc-2017.tar.xz 16780 BLAKE2B 4724e3475aadbc2bc2d1fa70a52ad7a4e57acf1f906852e8e35fd9102811acb3ad10ea14215af6a52bb02a0d1ce7c5bf7ababc6be8450b3311853e610afd0eda SHA512 8d0f79f6d4528d234c264752ce27944f70291d299f6d7e1a254537b0acf1a296894d8f961efb8ddea6130a1faea0e400f99456bf15464e5b08a26a652ec9df94
 DIST texlive-module-seetexk.doc-2019.tar.xz 68816 BLAKE2B e764173c0bfab5979bba3af955da85d03c8f3244f0a84748f46bae4388de8e63cfba0d337f6c8c60451ae66fa45f49d7b286f4f6f248513e3a967e879b942c2b SHA512 39504cee7a077e16d10b2d4d1f393b1b90e7c21c7452f761dde1117f4b8668962b1baeac4b834b71b481fd170059e4e60f2d529e523e40503d26704ff15a7dcf
-DIST texlive-module-srcredact-2017.tar.xz 4236 BLAKE2B 67eb56cdfb84688a69fb5f1bca4e5e5ab67687174736501b72f4d7caed65286fb6f291a216d4192413aae98d6e57cf4a17cf15cbc58c1490579525ec733d9e80 SHA512 f192de24c480a97a17784b567ad29d592da33a0e2b1dd56800b17144dc2e23bc7f6ee51d0f36eaeea037eb30113e7c7df1f2ed430c06fadec6957a6c9f54470b
 DIST texlive-module-srcredact-2019.tar.xz 4240 BLAKE2B 553cde0085a142f679d327b1b3edd4a16a7a74a1d0b5871346964298ad796d9c3c3cfc5a01851f620e9748f47e0e23b7e18bbccfd9d5037d042618a4e0acc11a SHA512 9e11ed88fbbfc0130f43fdecd8fb0b3eecbdf50eb33bdca57bd34c860cdfe84dcd560371efba4cb261e65aaf4577306f478d1c43ed89152e7e21fd627eb7328d
-DIST texlive-module-srcredact.doc-2017.tar.xz 384372 BLAKE2B 74fcccb38f2a598f6ddd5139f3c903910b3cdbe555f062ee2d5a7043764bd3d56d917cc4ce0d6eb6dfbdc4fd707d30e69a8891f49f0c5b3af027be7c084cab40 SHA512 fbd5c700002f3d7c72bb127b24f13b4017a17b69eba9897e1a84d65fbb5123f36c56c06a8ab35fcdde7e4c13731cc5d92f2f3a92734bf9c4e77fb6af14622a16
 DIST texlive-module-srcredact.doc-2019.tar.xz 384380 BLAKE2B 8ddc8328384950b5feb4b59e29a4af4b69fed9d0072905dea0e2619a3a48490bd6c30e22cd38a16d7413f947339626a57aae11765e982b2ae9632b01ce93f602 SHA512 dba9916acf75e800af1e581b4276e82bfe4c421a500a400773354766b37849568c1f19752a75983374ca41f793903f9776423888215f00376db1e0f5f3b3dbbc
-DIST texlive-module-sty2dtx-2017.tar.xz 8672 BLAKE2B a0da05e670dc8b998bb1642a6fbe32940ac5cbc038aefd62db9ff37456691d5d329cf8aecd3f5fd2c0a17c9755d9c8090ea11725c7c0ba578daf19878f0c0f7c SHA512 28858f261898d682760a3eb6f381f4b4d56c604d7bd471ce1217a229131110a7e7c99b22808d48999b86d68c801354018e75e56c763d629e0aa8c574da2d164d
 DIST texlive-module-sty2dtx-2019.tar.xz 8676 BLAKE2B d3f185f31dfbcf3ac4019480546a7b67422a1650795f4b9beb619374cf69305bfd718dde52f4a55395932abb18f07bcfc3f3c98309e0b90b929d557ee64b2318 SHA512 05e17abf8322e70f275308e983a244e178883aa36571640d513962e813a2bfeb88264c0ae9ccab956f9bd016923d1727c14a7a26bb58b257c7d05600a540da1c
-DIST texlive-module-sty2dtx.doc-2017.tar.xz 151552 BLAKE2B 69e10ca9ba5aa92c5bbe575381e966d6c149b4ff391eedebb925be298535396991eb82943b5de681b9bea29b4830c8a9cf8d0719ad66ac3afb5813b9ba2c5eda SHA512 0323a7d039fdd1a3f623418c5294a5e1193da458b5a3d955c0a20551fe8928fa81461d76de1c9b0c1b5020156bc1e56a571439fcb83241e1f5ffeba741988b10
 DIST texlive-module-sty2dtx.doc-2019.tar.xz 151548 BLAKE2B 0e3b78110e1ba71fe8fc9828ffdf389ff9645e40e14555209b4f1e72a471275ef883d773b778865537e7dd2e50003f5be18abb17204bb9ffc7e69e5373837229 SHA512 1abba13831a0cd4b93f9665f242b96d32e764c39ccdb917f655922fe2a4b00385d6a78c77c151e212082eace3b9c9447705681416b5cb2eed9f794d7eb30c905
-DIST texlive-module-synctex-2017.tar.xz 244 BLAKE2B 86c14efc8163ad3f0240cc2680cb21fab85551f91d3f981e2dfafc1ac53c421172b16f9e2dc71af967e95e0317abee3b021165e6bc82f19d7311a95725eefa27 SHA512 f6c0b41e5691dbec92aabdfb1e84716766cfd0aecaa260d66014f3bd7e08da57800978b3bf6b892cdb88ac5c960f898fa836488883a7a533fd98d48dba58ade8
 DIST texlive-module-synctex-2019.tar.xz 464 BLAKE2B 991a1570f8dcc53e5b4a55eda741de55b846871e51fb588101aed6a5084e88f3fcacd2bc93111ed37f33fef411067765a03e59c65511e72f9e20e4c05639ce25 SHA512 9fb5f8c3729115a91a51efb3645f39809b07ef9eb842d2ded1d64cdfe558c0bfec6234827dd87b38c40bb167225a88c6ff09e3d7bd49b50db7561981105bd6a2
-DIST texlive-module-synctex.doc-2017.tar.xz 21220 BLAKE2B 59aaac4a0b21fe9407aa0b07de94f9ef64dc61aa19ed70b751485fe6c0a9e081cb1587faec7079836dd77feb2f562cc18a523b74d5d8d6fd65275ce073eee998 SHA512 1a2ae03662a4104f1b2923c9ddb5f63c3040f2f646128cf4987865ff72d367852580a15d01b179a14e9dce4efbab946ef78ee7766ca98d99021d0adc7cbc36be
 DIST texlive-module-synctex.doc-2019.tar.xz 41824 BLAKE2B 0d062f02aa107730caa701f42a25d0e628233765cd3a52523cdd8e2b596fae33a5e3703a9113113e001cc0fac6ce25418ea5ea3dcb0489edb0c3044ec8949a32 SHA512 3a61c57a78772d6f8441db824f489c7dbd5b547760b43dce500ba9ec07780a839d0c6db7f90921846985ce4400bccbec2435e6d4d8bc2952fe1dcbeb9a23c91f
-DIST texlive-module-tetex-2017.tar.xz 60072 BLAKE2B 0b46ea74e06218517620aa2a9b13485807f8e1032c30417e32ba712e3728505a2e4e1f1e0ff0e4d437082a1a7887cc96bdcc146b9dfc265a959704999497f3c3 SHA512 22eade74858326f76f6ea22f2eeedcabc313e2e59a36a1a079cfafe7c9351953fb8e381fe9097110336dbbbea9c123a437fbd5e4fb9d7efe395ebdfe0c7d453a
 DIST texlive-module-tetex-2019.tar.xz 71648 BLAKE2B c15666bdf9c178d6e99d9be29091aa7178c0ca094344b7f6fd1467b208715562c3c1dc482a89d24074afea62f0c7ef502d4476be238e0feda0d801a0492d630c SHA512 4c51b762a71c161923e98af99bc9c695bf9ba46bb6f8aef2da1da0aabb65db48836fadbc964f0bd5eb25fc51fbd1e48214eadf63b7b1175683b6bd03a389aae7
-DIST texlive-module-tetex.doc-2017.tar.xz 348764 BLAKE2B ce1f98e48be94453dfee368dd8a90f66bdb83b4595eb04155fd4bc965f1813aee62b5ad18151da7beb14a723761a76764c412e3ef8b9a9ed9cdaed2a996fadc2 SHA512 d0e83b87f9a844c9961bda9875f8812dd507e8edb9664fe0edb19a775f34cfdd3f096295f5d0c209ecd3c7ef4a11416601c61f0d4db4bef0297ee96d9ae430f2
 DIST texlive-module-tetex.doc-2019.tar.xz 525320 BLAKE2B 00ccb37eebaa3c3501292568c10d1144792e3dcd1391ec3b6456350b5f42d3ecc882a87d657fb115b234f761dd7664a75df807a1afd0e465f8d811f962f28283 SHA512 1b049d99c487f66cdf0b05a0371d7cfdeff99e6fef86fc33b20fc31af6c40fe2280a082ea7572a6463498e5bada30d6587134a3fc9026fe9f8a18dee45fbad65
-DIST texlive-module-tex4ebook-2017.tar.xz 13352 BLAKE2B 392661a4b57691baeddc5a1885222256712744d3346011aa33ffd3c948c744fe6895a6a396b76839f30f37a86007038bc57536c23bec33c1b52e757d5d4769fc SHA512 06f7b0af006fff3d3d583967066bf2b7320e7e8d1aeefb0776fb5cf30f5fa49c956a47f677f115b680f50db6b6486a11d1a00e7a687a49a6870761e7c90bea42
 DIST texlive-module-tex4ebook-2019.tar.xz 15776 BLAKE2B 066aa3f462dd91623a4cfb2cfb66e7202bd6602321dd947e822848df969bddf081273edcf694b1f10a49fd6e0f177ff400638453172c4a108606ac721a132fc7 SHA512 946317be3532db3e60b1fcf2c027f616c00526da55562ab3b682c01306277059edaf14138902d1e21eab53cfb9bf293c636598cffddb9f1980b287b2fba081d9
-DIST texlive-module-tex4ebook.doc-2017.tar.xz 72536 BLAKE2B 3109ec747de67cb46ddf6b522e00537ec1239a3c28fb3992827ca0028b33539a25c734d15d1d8df7469256d8f765c5e6df8b64b61bf4f1cd58b00c83893489ac SHA512 2da50214c0612614b539eb2db68e30cd73edd024b14073cf6ceceddbfffe29aa4eb8ba5c0c6f002856e097574a16045aebe7fcb2c7e04ddb218181c5ab64c3e8
 DIST texlive-module-tex4ebook.doc-2019.tar.xz 81192 BLAKE2B deab1e660b58e71e2dfc9902198baead1049a1b81087908aa6dac658448ac6a521977b0b4c84089232c137527c54711e330739eaf20742874b250c8019fce925 SHA512 586d3ce7642a0f06e358e0cb3d3dc577396a638d7e7c9f333a118716bf4dee8c18991d1736ac7169ba32c22b9aa10b887a8ae77ae5a4f40c800f2f1aca958abd
-DIST texlive-module-texconfig-2017.tar.xz 12492 BLAKE2B 432779d8f44ce00e5a3551ac9271c510f1575770d99ab8b32d98afa9e36a78c77878ac63075f08a553bcfd94f34f9eb64c56b316e86bebbad03e53a7ea3fcd02 SHA512 5473622487ae5b5f6bd430bc3b75ee7c1fdd646f74442fbcb9d4a943f27e013a21bb05a35a724efe4dd330bca3572dc6024be031072aa2d9ab8c9d4e75ea065c
-DIST texlive-module-texconfig.doc-2017.tar.xz 28132 BLAKE2B 737d716a4be9e86e3805af4d92a94d25b2e9ebcfdcac797dd0bb0f20e4529e6a209afe9820d91406f0a7df76d1723e2e65f8a4e1e15aeb85cae39ef5ab99f5d2 SHA512 3467b34fee7dc7bda25a85d759ab150d113effb27d64c632d69bea332114372299accf749e112709a39104afeb2c562a1f189c9bbbe41325b27827e515545b79
-DIST texlive-module-texcount-2017.tar.xz 33976 BLAKE2B e88e6c3b3173a00e0537642a3b3dbdf381455bbfd51958633502029f4d58e5605e530ebdf1c8772e3b755ba91c553b77addcd90edc8295662fb30ba07b4c1026 SHA512 1283f3554ad91423c5244c74670821a098ae8aa10c06b0a409b1852ca86c0c90b24ef3a1d76e894dda6636a95784fb8820aaba6442efdda566b8674a8faeffaf
 DIST texlive-module-texcount-2019.tar.xz 35908 BLAKE2B 7c84cc1f4f07d9d9cc3aba2cc2526274b42484ba4fbfd0b4f985bb5d7ddbe8d259cec8f5033f029db2bb30abe15c8941eb2f19fe9b37c5b4679839ef8c19508d SHA512 82f51346d9474270af6374cc1619ca005206b1bd729ce1559b8b66e361b184a192c7fbe085216a3a64e656197756593f7d76e52437ac562fd33bf09504b0f58f
-DIST texlive-module-texcount.doc-2017.tar.xz 554756 BLAKE2B fc8aeeedfdeb7a88dba8e23cde6ebfddac01f0ba379d90acd88ffabf6e069039aa88f6402c932eae63076f9d577e08fa0f32f8efe894bdce63f9ed743acb0e85 SHA512 f87c36f1d46552d258156d36764c6d96839576e30510257f72d24b4eddba1c624b12ff4405be3e39e1aa9d3f70c02e272a3affd513f2dc9ca3671568279ed6ca
 DIST texlive-module-texcount.doc-2019.tar.xz 559548 BLAKE2B 9c5acb7caaadd303532206e5ff2aec75be3dab53b6a1fdd1f726e7b2ae54819198b33033ee60d267d59b5a9b3f0efb66489cae55ff69c18ba7e1ddeb2597abfe SHA512 5141bdf4378cf87a19933945d6742427f4467dc73d92f4a470e34474232dbb2f60c4d8db065f812481520f1aa2f8a90d7e97dfc83f0f089d10386847f64f4d94
-DIST texlive-module-texdef-2017.tar.xz 9280 BLAKE2B 736d66b8bddf7315b6891d7b5e17473afe7390f9fc9bfaaea323fefca59e59af8a96f7724aa07e168c1a6fed077f7fcd2011c9fd5e8e9d170a78378a9765845c SHA512 79527a3b020f5fa3ce69f3436ef71f0f17d388b61b53e133dc8558ff26ab9a600d06233c41aeef6e4935d98c3b2d1c2b1ebb6f8265f0750bbfde847fcaddac6d
 DIST texlive-module-texdef-2019.tar.xz 9408 BLAKE2B 9383a0bebbd66a49babd66da47b4220d71c3afc799d00d523f2d40da287c82275ac3bb6fd53269791561f5c65186c92f228d0fb00b0e9ffc7e9a6dcc390933b2 SHA512 7c5defeb9cf9d5fbe92f8433265543e6d7024e9f7fdc768582ec51a5880745c54cf8576f1b7455e32d51429e2faf122c0775ead117be97510f4b2d8123b04d71
-DIST texlive-module-texdef.doc-2017.tar.xz 249876 BLAKE2B 5752e8cf7f2cc497748267a822c19972e5adc223b54e829e9431a1540ecf73c33e3e1f38d26b5e29ed0bd1c09c7af02e58c7c76f3689a5a270423fbff51e7a63 SHA512 9ad1743eb54c5d32dddda440294595f512b9eb64d45d4041ff2edb44a99cc689df17b5384bb5ef7150202a7d1f5c2cd08cfc81abcc2c1fea5e9098c7ef74877a
 DIST texlive-module-texdef.doc-2019.tar.xz 155444 BLAKE2B 00a24992c6a1bc2a607bb6f6b7348b0331d46b50594972d56f253a0a9f01ef1bf78d6b7bfa4cbda96a0498880ab2ea7c94bdc8e5a455889f91b73a2289639c6d SHA512 a4727d57bb5b56106a9baf4aabbabd16cc8a8ac08358c28263abe9c40b76a6d692d0e819c23c7b8e946e97fd3f7574a498a6f43207c04e7544a0383b3681f54e
-DIST texlive-module-texdef.source-2017.tar.xz 3888 BLAKE2B 1e724963bef41f950df0f86ff25015a5e43e80c84b2de6ea35df36505b075d8cbc90413dd634452edbe0cb0226c7b9507bb1fbc993d9a84f088e499d85c57486 SHA512 41c19aea1b9141542a6b5262decf3aea1d241c41d1aa0225eac028b564facead789c637e9d580b65ed68db7698dbe6d9fc7572b045259571b802860c7b455d68
 DIST texlive-module-texdef.source-2019.tar.xz 4764 BLAKE2B 01537ec90b734610e5e7bed83dd4ee6d07d53cd88bf68b23fac06738c4d919416e376a5361035e07d6027096c1c6efd5c301f4ac5714b467d63ea92ec5f116c2 SHA512 4b57478b06d4cd67ae6b8d2afb059eb52e03e31c4c4066108d471134865a64f3eb3dc99f8bc4330625eaa8e7c660f445365c6bbe510f36d5770b406df99d6c8c
-DIST texlive-module-texdiff-2017.tar.xz 7152 BLAKE2B f35399766adb4c0ec92d1642d3148a10c66d51e350f7e7b9c52117a78155b87dcf54d73d638d15c339839269360b13103ab06223684b08037a0600defe92b13c SHA512 8e300ab38c698a33ba6fce3416e6e1c57e53929dd5ccd7cf6c64b17e8c79f5eae0faaa9fd54f9bc909dcc1d3b961b3b799a98fce219503a7add53c0bc306a150
 DIST texlive-module-texdiff-2019.tar.xz 7172 BLAKE2B b68d85c65018983ca389a365efa425e1f30b015b376bc64449ad155b2a93ffbcadb1d005155c63f32404eb4b72de786896779a2deb922438f01a3692324b1c0c SHA512 26fa84b3090d641efb186947ce4d1d89c30a2c224cfc8fa759da3ba7ec9cc113c0ed4afc1c3d0fa5f9d0a88af4f9b3001d57651df6b5be6e0234fb78ec4f252a
-DIST texlive-module-texdiff.doc-2017.tar.xz 10300 BLAKE2B a6c11347315fb8035fd73720d0766a1c2843fe36487cb6837cc6adb9b939a50629bd72d596c105fe028a45ffc833ca43c499e581fdd6eee68241a5ff9b753f10 SHA512 d5c5c12dc2d6186f5e196bba31216986166b7efa9f6d44599d43446278d00576f94b858fe91ca5911811c5daa2d409411722e7d29543973641c78036aac15bd1
 DIST texlive-module-texdiff.doc-2019.tar.xz 10296 BLAKE2B e9bf5a7721ad75a86f406efe948df02c7db85a69317a0d12c601d491bf80c62a8fb5d944441d683a0e5125b7c74e7f48ff97298a7e1b5d34f484c19de39e4afe SHA512 d458fa8db6433b4c7fbd23a16f9be53c2c822e396e7f50844cfa6acdd2a08acf8efdd0bd946c8fdc09ca8aa28d1eb25708d3719184634abced92ea5c94d9a948
-DIST texlive-module-texdirflatten-2017.tar.xz 3084 BLAKE2B 4f9c3aafc996be5990596850fceacd4b825f6422a3f94d092d342ea27c65294045860ed7e70e1df871128a63bea9f482c605a2c40f250837d50e558b25df044d SHA512 73404f73d3c7ee569ef019ed4ce621512b6cb2d6f6c85bafc362759b1e1bbc4f56048d17e98b481099d7a0c4348594ec5a514752ff8888c153f4239f3e6d2322
 DIST texlive-module-texdirflatten-2019.tar.xz 4848 BLAKE2B 0e98680a98837b46ca20066382215ce6c9ab396b0fd234331c369e6010f64fffc7750bd4830945df32ec59c348f2cfd5327d3e085e33aa501f999858464798bd SHA512 e4f03e9a434e1ab8ea1b69ca0ed2dffe1f8cdb2c853a733e275bee74ed4b17b84b72cd8cc7d1820f595e1c2282a38b9bfc7f7b7a9e003fdace6488390a1b97ba
-DIST texlive-module-texdirflatten.doc-2017.tar.xz 5608 BLAKE2B 13f2c288e526c827c4759ed26938b8203f204415c4e6bd8f0852b4b09e82caf8c370e4db4752ddbb99673734095ff304f3c0a0009a7fa61a29ff00c642c9ab38 SHA512 a3e00dff899ca3bb7033eb8c8608d44cc3319f73afe6fa0d00c25e330ee13827df9556857f75b9000b4716ad1ab9d8b648f20509cc3ea4b10d2991bd6b3f9ea7
 DIST texlive-module-texdirflatten.doc-2019.tar.xz 11016 BLAKE2B a5525f16389a978b0aecfef7de04d5cb302fafb894b5d681c3f0fb3fd9676055c0befee94326dec2b819d7b34d75233f4750e6ea047e2fb13edc0a346c343158 SHA512 972fc69b705b2f6289358199cedc91ec386da9212048f7f7a84e43eeadc943f7f42ade8d7faa9f58d1685d2bb10408e274b2461032927042371feb86b4ef6b43
-DIST texlive-module-texdoc-2017.tar.xz 214216 BLAKE2B 7dc8381f2617b5e03587604fb5cd5c162a35f03b3a28c521349c529e20fe87b2aa33167116c2bde1f0e5fb4437da7dbf79783a75a45561e7b200d75dfd76b892 SHA512 f20124d5e65956d568b96efa1c58214d6ff664477e9525610f07b48898d2a09d55c39276571a7d2954c09bb6732abf5a0067c430d4f0f3ff9355f2d57fab22cd
 DIST texlive-module-texdoc-2019.tar.xz 25736 BLAKE2B 316d26e8f25d0f1dec8e0cbc8fb1949e14a6b47777c2191e113e2fb81ae7786c0b90b6df08907e463821c72e5f008231fa980893d7b937e736edb42dcc0328ff SHA512 2c12bf48d03d456e95d6bc31ad6d46f77c0dfebde73fd8a87e2128c7267327377b8d8d7d9b04ecf7295eaad16eccf1df5bab6f9050df7113c62bfbbffc0d00be
-DIST texlive-module-texdoc.doc-2017.tar.xz 157676 BLAKE2B 5c11d2a3d6a8fae9d6d2c277582366e46601a22a499a447e27291a97246c5a27c6191e2f664f805c5fec118a7a546a3aaa32fe3ac7a6783aa19c8bd91486982b SHA512 52ac9f9406c18856aa1f1570fa52e7ba4dd29b84b10a9c877dd88561248d48b8aa954ac4260d07018e2873dd5a43cf3c02bca02a87db2470d72c6becb115fbe6
 DIST texlive-module-texdoc.doc-2019.tar.xz 124736 BLAKE2B 22ec7dd263b1c525d6119e6cf24505e4844011f3ad0853a743d5e35b25a71da1c29872df4eedf42c1fa16cd582af1cf59ebcdcf543b5d187ff0c49b23573f591 SHA512 133abc048e8cbfa84bd2788fe0942bc48d4d2844bec525c010a3590afa62b22ca77518ebbfd26e78c825152ec0eea0a8e1513d15931332656b8fec702b0b7479
-DIST texlive-module-texfot-2017.tar.xz 6148 BLAKE2B 4631014160a90292d30c1c22af88aed44d3260a4600cf0186676ff0ed8ef27cf67a10bbe674db23c71a37fad248838919ae914c9ce24408414c18ee688e756a9 SHA512 40b6db87dc624e9fde0c134b982920fd59b29d771b9a8016870f9c161befbf1d0f3a6f122c20363285e7e71b2aa8464cd1fe4afff2c9ea96b850da4a0841e6dc
 DIST texlive-module-texfot-2019.tar.xz 6204 BLAKE2B edfdd65ebe4b757eba7d79993cd3c850b12bad9fa918055142a114557f42e671b8e252edbc66f859d66d7e9a3cf3dc9156bc144e7087b7e2fbc6ee5a9b73d09b SHA512 19b496131b7d68e77e7370a28cf05ab5edd2540027a927750237be0956c8e0fe9773017db5501f1ed31e213b1978aa217973d22ded0315b59cea453f59519bfe
-DIST texlive-module-texfot.doc-2017.tar.xz 31680 BLAKE2B c93ab467401c57826e4a16878112b5239724036dc96146e24101cd6912b29d8a3d5063cdf85a53c9aa4c500c058ea8ddbeae52745e51386d3a44a01e6f92a92b SHA512 ea12297d42d3ee6166aefc6a08507a9c1840c162ac837d1a3705c0e4cb7c4bed57c483ad6ae8ca01f487e492a88c2c0d9fdf7f07833553aabd07112a0aaeb786
 DIST texlive-module-texfot.doc-2019.tar.xz 19076 BLAKE2B 691590c51e6fea5f6c52cdf2d141d0678e2119e3e8389d6fcc1511eb3f648dce90e78b06f16a8d21b044f6d8442218fdc87421632d2b911aab2519ff5d945ddd SHA512 c0645e3061ec11cb0f27840391fd762eb18f407f173dc10da98190bcc33b2c64ecb7aac11fb7c79df7861273ce8710881bacfd976e635b3870f29a662a19caac
-DIST texlive-module-texlive.infra-2017.tar.xz 200472 BLAKE2B 4163baabb72bca39c34a77edf7a56ab6c93b1ed8a128ff71e4efb5309ea4465ae9fe427777e02b42ae685064fd32a7008864fe1a62656d25b5e6e9a12a358eea SHA512 13b73020baaf358a4812a10ac17fc22250fb9383ba1f1d535b7f25f2354e9f4fceb5cd6f479f38c8951d4894ff6315315fa058ef415ab11d4eea03601308ad53
 DIST texlive-module-texlive.infra-2019.tar.xz 220796 BLAKE2B 398d91a7e729c318fc4bb5a5f0100c9091bd878865f5423494170495702cd044a0e71b0fab84dfa467a572dbde00656e04990096edc8fdceabef8f965d6505e9 SHA512 4550aca83dffc9acd90a538671a13f82acfe3270b6f42ab3e3485ce67b45da539521ef075d3212f1dd8a637f2fef597388edb87a2cb1c57c763369b3acae6cba
-DIST texlive-module-texlive.infra.doc-2017.tar.xz 168904 BLAKE2B c78a14af1befd93c18055302d02f2cc51d36acb1e671319f37e5cf5d3bda7775af3dc1f6f3a7891c20d0d3458cb251c9bbd9f9dbe6b55f98111e0fac4ddb1abf SHA512 dd7c466ca4c94c81a0b7bd0d3ce5938c82f38c878a5b1e6ea68317f064ceecb43f02616c303265998f92bb486f3eddbbc3d6d16cea8c92a57e01f1591219c710
 DIST texlive-module-texlive.infra.doc-2019.tar.xz 180540 BLAKE2B 5945f5b3a1889109e42288684268dc98798b774f88103557bf0fc40bf0712796a8b7a13985eeef5a68e4cf6ff9917d6c0111e57ecb913501b4305c83891c269d SHA512 be27926d824c4ddc48c0b70d03b3e129e9392cc32ed10972aab1ab3e8c16695947f648e6dcea9b6b0aaba11e34ff5c2ef60d6c955d6b3cf28fa4e9e6f84848c6
-DIST texlive-module-texliveonfly-2017.tar.xz 6148 BLAKE2B b96e747db7175367f8d7b21e834b102b4ea83310b26cd502dfff0e75e81bf2bcd14a504f598b56a82529fd3328ad6f87edd76d9cf366d3937f865f8cbf17143a SHA512 dd18460601a387dc43587a81e6e2f1b3282c84340a1c1e89644eb22718f4d911f9fe651707645237cf74b07d9b05b8c5cb54741698141e0f3cffd6d184289612
 DIST texlive-module-texliveonfly-2019.tar.xz 6148 BLAKE2B 5e5bcf0ec5f61718852b2e0d29dd0d868f733051fe9db1fe3b970aa8ebb88eff61fdaeeed454c9508067f26baccc89c854220ff26b5e7daf46f59943d1c340b7 SHA512 e02a1214775f209c0698e62fb7f0ae91c9ad14024c076dd6a5ca73fad4c92ebbf9bbb0f281869cb0c073538c66edae2af23245f1bd0e1f939c80841269625af6
-DIST texlive-module-texliveonfly.doc-2017.tar.xz 700 BLAKE2B c21187393153d4122ae169e79d8c22ced1e8e076e049cdca68f2f637eb67a6fdeb4cb59be1217c90509ee0b16566ba2c04f517f50f3f1e282d7ab1923a5e3a72 SHA512 e84543231522b62de362760cec32e57321470382b6eedc944b5f02200d9454f10a743397d48acef3e5f926f378830607f9fea20208d5aaca0884cbc4bf6988ce
 DIST texlive-module-texliveonfly.doc-2019.tar.xz 700 BLAKE2B 7c2f1f682e9b1780176cfed3f141b621234f402eac6fcfd0926dc54db243ac334880684842674a6b3dd42ba38305def0fdfa815c75f2b051635a90ab146ff7d6 SHA512 f89f82a59f726b226101275b1aeaec00b99ea1302ee5ff8c021e4696b4abad39d1a95b544a4bc45483440591e1266cfba4d5c3c3bbc769f193671a46aa7458b2
-DIST texlive-module-texloganalyser-2017.tar.xz 3844 BLAKE2B 965f18c9f1e885df90853cdbb552b75d24673b54d2eb260c22738e3600bfa47982dab68f9cfbb2ba974d75baf3a134b075f557c0fd91fa1cc3a9b3071da8056f SHA512 4ad74a418469bca56eeac138830d4e4020b3a0c3db36b0fbd25b89bd14367219590ef5d948cab79f22f1acccedf4b0073a2ace78447075242a66b40a1b6faf93
 DIST texlive-module-texloganalyser-2019.tar.xz 3844 BLAKE2B 85c9ae09f242f54cee0d77910ff12a7e0005c2e1785eb923e978858307e5474de4853cdc330c328fc96ab46bdce3e05008146dc50a5e1e5ebd72e5dd7c584979 SHA512 cbc18031b9b9ecfb6088b82b99eb72ad70fce92e4b103230a06ffeda0a50871715405a0aad18a7495ba1b80f16913cbadc4b8d1a7d2ebaa77d5cbd00e1682c93
-DIST texlive-module-texloganalyser.doc-2017.tar.xz 512 BLAKE2B ba1e799f3e68af8b38a74bf1531704385ee23ead7fa83ac1d3514a19497265954a50e59dccafb99824e6a688f14ed5c4fb02e2a728df272e3a020c1db460e3aa SHA512 922b73d9948fb8a0c79d553d7ff96389172fc924ec03f400a9bdccaa288bb59163778b01cec5ac74df700bfafcaba3d961a22bfb9b025f47440ec4b718bd81e6
 DIST texlive-module-texloganalyser.doc-2019.tar.xz 512 BLAKE2B 5743ee9faafe9308ae7eb897cb8e4b94f0331ad14be4b3075728f77e2b22ceed0a9ff27928ffd8ef0af9b8ec16a7ccbcf16cc4ace4c0c6d13bc22d1bd633a846 SHA512 1cccf82314d9afc841044aabbb5f06933f6bbdfcdb46c22909ce18c2736d40c532944405232633f61893f0f56de24233d520edd64d4cc89baeca5c01ffd0f9ea
-DIST texlive-module-texosquery-2017.tar.xz 163988 BLAKE2B 2599645600750ef77ddb3811b7a2ac82ebedca438b9e488a17f281aa047f977ab0922e8a2b94590dc9cdf33cb4f298d15ab0300748efd2cdf479238f7fbd13b5 SHA512 3a34bbdf928908993cdbf0287680b0136ca3a43e4bf7ac245ac4c15cc2f55cfc9f0e80d4e8a443619d8ecea259d7541790ee1cfbcc8dc8094295b22c77dbb8b7
 DIST texlive-module-texosquery-2019.tar.xz 170196 BLAKE2B 6899cef3b0afffbb0d908a015ceff481b271a25e4497a7d767ce823a5eca49bad2616790c2301bd9b83f1371a8da0f9e703eb981ea4d0824db4f46ab6de03237 SHA512 bfe5cbc793a81a9ce3c98ddc94fd217c3b235614394d2f329db4f98ae29ded1757bba5d98997118a2c78cfdf6d774146a7ac6a716b2bce91c876b0387e1aeba2
-DIST texlive-module-texosquery.doc-2017.tar.xz 496380 BLAKE2B e3378dd5b925defd800530270c997154a927fb6ca07aef013c138d333eb88c83b4b9d06d2b0940afb7803d7b129059176fa5aef33b985ba9475fbd0611076a0f SHA512 b57a8c02deed662b5437cc1d739994f69542ed307ea5b37ea6d1f7dec45e441e6d05458e8cacd6837d76598f0a83f6c912152514e62791e82b403a27534cf7d3
 DIST texlive-module-texosquery.doc-2019.tar.xz 502508 BLAKE2B c2396bf194fb0cda0aa89171d0513e96e33839bbbef2004c54eb42c22f12a6d0895362437fd8b6c53d7192da0658a661a2a0b50c8982b7ccc73566dcd6118ff5 SHA512 2b7cf8dad61829b96a2f17f1063baabd21087ea2526c8d8a6408b4c2e63c8f44be3f318be6d1e198661efe683afbff7055c678e7229a13d3b01e200565caea9d
-DIST texlive-module-texosquery.source-2017.tar.xz 69084 BLAKE2B 653a547c1d0221c5744dbd205de5065b495ff6ebd172dd10092b8029bfbdde9d36486a26a3381d07800b8cfc0a1d6ef406f5c57a83aa4a59d166c3318a538f8d SHA512 d16795a95e298913d0bc5a3f41453a523278259b4c211890609635d7445d0a6eb0367d8c842a6e7df4a9ae9cf0b9ba2b9a804aa8b2ce5abd380c59958a60b27a
 DIST texlive-module-texosquery.source-2019.tar.xz 71160 BLAKE2B 827a60a866bb959468fb5699b764ec3cf5447da4110c4532024a8ff05c6ac04acc3300666bd75a6dd1c0d49fc58f6b44376bff950262cf2d3f538c0776806f18 SHA512 c834540e5448887bb0d80dac77770c7f89b8017743bbe4691e46aa5c95c3f59f2bdfde93e0dd72aa8dd94295b1dbcfdd374a8892d4c622c41df7c4a37a68a701
-DIST texlive-module-texware-2017.tar.xz 588 BLAKE2B d41d855b39779785b0ba8b9fa32ba271ac33e8c832077f6e40f773a289762d29557c2e7dbe5ce45c7a088d99132b245e654a28351147329b8e6774bbfd6c6e9b SHA512 b210ba9c3492631bb63fd230b5c719e604724a66064a4fdd1cafbaa6a66e3727aa7634d856bf3c10fd8d49155a62c447d261e0181a46ae7d067ef8ebf39f2a7c
 DIST texlive-module-texware-2019.tar.xz 668 BLAKE2B 6324a93d098bca2e6038f13cff1ff9dd302a6494a8ef0dd0b9594e249eab957a81336991df171cb804aee580c651a1d9257f4fda3f3b7d6a90f3baa8d49c9c63 SHA512 cc66e87d459fb04070b0c43c16f3412ea22e3cf8a2748efb8a87fb0417bf0b9caa32a38147a9dd068d7ad0d25e320dc78ac54d9004cf5adef337ed0a90e52923
-DIST texlive-module-texware.doc-2017.tar.xz 34412 BLAKE2B e0e92cfa8b2e6dfd50fe0a03f62271779c6f9528ec1666686aa2cd44627f83fbb86027f58d44a83055bf819ea9b20322eb9df7ec6f17b38d44d9cdba25b8ab44 SHA512 63decbabef250daf9ac5ac6ce97e447333dc7724a56850d63067dbb929b1840fa5467f8db6a310d3992e93d4dad93d6e41f1dabaeaeaf811ce2608b3bc5b7987
 DIST texlive-module-texware.doc-2019.tar.xz 34600 BLAKE2B b6949f864ff00cfdd8f620479ea38ef8eefd739dbaccb6e0e249cadd9bd6b2eb504947c29d78b0df0bc6f2e80829153db9d79cbdc69373b4ce6570b22ae30266 SHA512 a8ef6e6a062140ca6ab3311b7e57f452bbbb0eddebe36d02cd8122141320814508438d764a97d351febf9f65a5539b03774f611e9bfdcb5abdc5fa989fc5a848
-DIST texlive-module-tie-2017.tar.xz 504 BLAKE2B 7ff539b26566f25795a748e3bf76d0fec6611d2f37796c56ce4af587757be0f8ccad6d1ab797dfdeba42cd1894aab628d1052d57bdfe9a62f07b77856b0b1a2e SHA512 91d008e9f9734c4b0eefd7d016395cf095602e3efad281c01ee502790b40ce357673dac432bdc2869f917e7a71e007df871524e993cbcbb581390b85a8287b24
 DIST texlive-module-tie-2019.tar.xz 500 BLAKE2B 6d4c87a35b8bf59f2dbb9ac2437f91dbcf47c7396b4b150dad65229a9d08d86a04ea4c9ac6e8ffa45929040bfdfe7d31eb36c8e64d718a1571327ccf3944901e SHA512 970a855d2d025b3ac30a4e1631986568459bae84727b661ffc8e0982656bc66eb940b59e2b9c3ee6430e3abd5f7d8b0ce4ff828127bd2f9420e0139f1860527b
-DIST texlive-module-tie.doc-2017.tar.xz 14984 BLAKE2B a0b24055c843dd454900b82b821ed3a8114ff7e00d3e529105d0bf47b6d06d6f6c897445492b11bc5420b97cf8caf2f09254988c5ae98e238a901680b7571c50 SHA512 93d9eaaa217c1504852ad52ca04851616d5b7ea5c5d3521538ca29f16f03b28fa0ce22275f4d22026192826259ab6e80547f80dbfaa3117eb7e44517c22c01e8
 DIST texlive-module-tie.doc-2019.tar.xz 14936 BLAKE2B c300333466ab30ca31413cb23b473e4162f0aed966255522357c04864575f919856637d56abf4760a45b49bb7e56299a59ad8fd6016d88869ac694bbc6e0d4d2 SHA512 24f07d9954fe0385abec8487d4c488df551453e13e8f638e32899722d62dc91b23df9d4494f9bc13662d57fed6e8dfd4d71835ef79832b59f075f9023797e858
-DIST texlive-module-tpic2pdftex-2017.tar.xz 440 BLAKE2B dbe8d3012f351853db1c2019b650f5c1c2d24d4ed9f39e3b891062f8946ecd42315069e833c4500e06b8213c8f5c40a7b58f6edc5e86180f360bd226de74d55b SHA512 ff542fc31ae85d199a72d5f6913c482ee9441b31d95a109a6a9a3dcfeae41aef85e80911b9e755f11cc700765f9b40527406bc36991a2280c4b09ec63d0e9bc5
 DIST texlive-module-tpic2pdftex-2019.tar.xz 440 BLAKE2B a64a6f371b7331b4f963c039c9b42bc8e396bc5bf56931e76bf8b7b73a7a11a67c1defc7e9dcedf23556b65fe7d86b6c437ebb2a4fdace0ddcda6b2a2ced6f67 SHA512 3a0bfba17911731b52960646914da0050a6928b2b433c84140ccbe63835d816f018cea4b16a8513b447c7490fcfd610cbf7a48c8cb0d5dc67ee925c238361b14
-DIST texlive-module-tpic2pdftex.doc-2017.tar.xz 41848 BLAKE2B 2e0cb6a73fdadfbe2cf85c8f241e650905ca1e94520ade6482bbb8e0362c07fa41295e0557b92df4d8b529eccc326f930ee079a47683565ddd9cd6688773d053 SHA512 e08e33a9c04f32bf4dd5d1f3f9be95cd36cec5998c8dc1dba2799ee9ca9ac1e9326550ecc53500c98506c03cea4fb08a766eea88ba85482ed2bd6dc03b306708
 DIST texlive-module-tpic2pdftex.doc-2019.tar.xz 54396 BLAKE2B ea93ec21f96ab67ad58b3baef1f18f1133230805adbb3335d489dbd901ff5eec06ff61911c685764f05291e2a15a029c6e047e4c108306731956539c906e16ea SHA512 b2734d86215332e7898e611ee12880c559b095468881c9ec1f15696a182afaa2f056c46ebdcf4cd69427e9716ed70b1cf50f72384d9f698e644e8b2fe9d3a1a6
-DIST texlive-module-typeoutfileinfo-2017.tar.xz 1596 BLAKE2B 3c20d6daebac40630f491876917686e83572b57f043000825d0600f3f3329926243e88151ec087c7384e366c244960d96705939eb6afce60f3ff5a56c13d5158 SHA512 d287e4c728d33ba67e8c907c8c28f06d5b75660d0f5b996c917c127c903b0a6f5d292c9a97e5ed34a23d953ce62ff5b9bd357ef7674f87a60ffd71eda3d0d7fb
 DIST texlive-module-typeoutfileinfo-2019.tar.xz 1628 BLAKE2B f934ffec09993f9ccc2958330442c594f45710de2d1f7565f978ab5bed2069a67b06ed289840f190935e16fe25c49b849d4cb12261a429cb6747c175bef59970 SHA512 b30d2618c8cdbf69fcb8a5444922185a52b934448b5d28ba143948cf80ed17cb402d73d1162194df3d2992a52ca9e6faca79000644eef968c4eba892c415b6bd
-DIST texlive-module-typeoutfileinfo.doc-2017.tar.xz 760 BLAKE2B d6ae70e4c4baf44728d0fc474cd1a39036997366b9f4565f6a1648a27ec904fc24100ab0109d35825b171f9d094a165cf72f7fbcf53ce766c5cd6acd336f2ac0 SHA512 277b08d5cdf7d6ebef2d03644c635c0a3ead2d18e037264a3505dd1c6a7c9c7bea60a7e81fd99648efa486158d573ebd58b10b62014b5194c84386f4ab6788de
 DIST texlive-module-typeoutfileinfo.doc-2019.tar.xz 756 BLAKE2B 00d7c631ba6815997b46ec9adf1eed4f765a583de7fc5925349ebef150f633d34325ce7831e89fdffdf0c3f64147b0da5b883d9000c6555ea04e16880645abc3 SHA512 143c4ad9cb3890b6350069d5d045f74c0bb0cfbe50e7d051c50c82011b56e651d483c1422d7d553a8d1d1784ae726a1ca1aead023fc3ccb1da4f0d59d47f7920
-DIST texlive-module-web-2017.tar.xz 524 BLAKE2B 264e7fdff3293d66b4793974995f35225cc9bd041706b3b755f231def9959a092fc78746c48c6a1b954679fffbe3cc03f0a4ce8dbb49059ead58826045e08868 SHA512 8dcab0b976bf1976ca40c925182248ed9d5ff06843540eedb720fc5ff89f44594befbc084270adbb3fd3c6c96c437f248236e82252b2e4a7f48d761470c7d15e
 DIST texlive-module-web-2019.tar.xz 524 BLAKE2B ec134eb2d40143e1f45a076e05eafa25f991568c53cef0d812be7415f8979e4da38ed14ab9c6d97f3b2aaaf62720816822939d4e79fb7a18ef77f0025317035f SHA512 0d2d771e8452d67278adec061e1df8cfc06f3af729ea5ae7849acd5fe1b628167b18d86b1037484dbb6b20d5f703bba7ba9fb255788becc53ce22fd87f39ca7b
-DIST texlive-module-web.doc-2017.tar.xz 41924 BLAKE2B 020be249269dc535725cf30618b28fec3b107cc861319d25ff4854e4407361c1194821e493303be6603e1aabfa458ba213d7f5923fbc752d746d9d9024dd29d4 SHA512 1f47b9fe15e48f0c29e754ce51c563bd44bd31c5f8dc0810a0ea6c42b24e2a8b70e02ec38dcb14e6aa6603fa34d0ba72d6ae481088e105a8972c4d364df1af40
 DIST texlive-module-web.doc-2019.tar.xz 41588 BLAKE2B e0bb24840f72cf3b8a2b2d314fc82ca124d09700cdce32a4472b69963b0c6d6b1287b573018fa2b4698a3ce6594398031db7becb5b7c09db2fb0f9a7e893e038 SHA512 5647beef7b99a3a552b8f55d12ef669481e8ba3e01beefb014fb8e3cae6e8f419862131379b506ab8197e1717d563c34fa81d69db3c6db8107e6167447d87322
 DIST texlive-tlpdb-2019.tar.xz 2079308 BLAKE2B 5673fa842b129208a7ec027a0b0a097e7b29eb8baa019371e20444dc4386859144e0c88125e0f085a57812fabf41af1a146a8d66f6eb9e4aefe49518c95590f9 SHA512 024c8cbc65b3bf4d3cba7f527bcf5585c5304c88508d03ff8cb14ffd3a10a666dd58af6db2fa58fad2b1d30ec9a1f03f31fc2486526ecee338dcf46aea8906e0
-EBUILD texlive-core-2017-r4.ebuild 12142 BLAKE2B e985aa11a092e0ec2182790bdff1b97fd40d4d899bcdbd1d6afe630db8708552732d1b6ff797c1e4e82787ac1a009ffcbc44007071dc17960291218c26b5c218 SHA512 d2ece7dc59460ea810897b8fab11bda393a5ad4b249efd62e0d52687ecc2172d2f459e1ba2ad6c55ddd5ead8e6921935924fd6bf93f4aee6d465271354bd7bfd
-EBUILD texlive-core-2019-r4.ebuild 11273 BLAKE2B 748ea4308ba4325d589168a98f05d48a02f5356e34fe5234a19d1c30ad0c329638b1c86c13da216ab45af23ba4724b3c913917b8033431d400e73aa8c8ca51a6 SHA512 98186f70348f596d840ea9418eaee234b4676432760678b5fdb55b8b30fad0fab9e3ca6ed325dc2e787ada868fa1125ce756bc69db3556deaf8124e7c48fcce9
+EBUILD texlive-core-2019-r4.ebuild 11250 BLAKE2B 4961ac6eb055e45afd84c07f231884fb6a19cd2f9f84b5f53a508f6ec2a7fe364f7e7679e92c41d48f94622e387006a164be2fb13623785ea440ef86965c6962 SHA512 c871962fa65f795b2707438489d7054ecea3decb6930c6154126df9d7659c3f83c4c594e107ff7febed1698c3e3bc5a3acf2115b461f98eeefda0b65a9c4f37f
 MISC metadata.xml 661 BLAKE2B 23fd3817c5a9861b9adec9a78b6dcae0a23743cf685560a86a991896ed8f102fe66aa15a416939829c0c085cdfee24668f7a07631b3f4aeee469002f35b481e6 SHA512 c00ae9537fced06990a4ffff5fbe5101670ce1d84c879c0e9eeaf5c979107dd6a1f92f8f8271731b6c4818abead15b759fc9958ece317e554effbd3cb23fd2b9
diff --git a/app-text/texlive-core/texlive-core-2017-r4.ebuild b/app-text/texlive-core/texlive-core-2017-r4.ebuild
deleted file mode 100644
index 88f58b3afc2f..000000000000
--- a/app-text/texlive-core/texlive-core-2017-r4.ebuild
+++ /dev/null
@@ -1,372 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-#TL_UPSTREAM_PATCHLEVEL="1"
-PATCHLEVEL="70"
-TL_SOURCE_VERSION=20170524
-
-inherit eutils flag-o-matic toolchain-funcs libtool texlive-common
-
-MY_PV=${PN%-core}-${TL_SOURCE_VERSION}-source
-
-DESCRIPTION="A complete TeX distribution"
-HOMEPAGE="https://tug.org/texlive/"
-SLOT="0"
-LICENSE="GPL-2 LPPL-1.3c TeX"
-
-SRC_URI="mirror://gentoo/${MY_PV}.tar.xz"
-
-# Fetch patches
-POPPLERPATCHES="${P}-poppler076"
-SRC_URI="${SRC_URI} mirror://gentoo/${PN}-patches-${PATCHLEVEL}.tar.xz
-	https://dev.gentoo.org/~dilfridge/distfiles/${PN%-core}-${TL_SOURCE_VERSION}-source-freetype.patch.xz
-	https://dev.gentoo.org/~asturm/distfiles/${POPPLERPATCHES}.tar.xz
-"
-#	mirror://gentoo/texlive-core-upstream-patches-${TL_UPSTREAM_PATCHLEVEL}.tar.xz"
-
-TL_CORE_BINEXTRA_MODULES="
-	a2ping adhocfilelist arara asymptote bundledoc checklistings ctan_chk
-	ctanify ctanupload ctie cweb de-macro dtl dtxgen dvi2tty dviasm dvicopy
-	dvidvi dviljk dvipos findhyph fragmaster hook-pre-commit-pkg hyphenex
-	installfont lacheck latex-git-log latex-papersize latex2man latex2nemeth
-	latexfileversion latexpand latexindent ltxfileinfo ltximg listings-ext make4ht
-	match_parens mflua mkjobtexmf patgen pdfbook2 pdfcrop pdflatexpicscale pdftools
-	pdfxup pfarrei pkfix pkfix-helper purifyeps seetexk srcredact sty2dtx
-	synctex tex4ebook texcount texdef texdiff texdirflatten texdoc texfot
-	texliveonfly texloganalyser texosquery texware tie tpic2pdftex typeoutfileinfo
-	web collection-binextra
-	"
-TL_CORE_BINEXTRA_DOC_MODULES="
-	a2ping.doc adhocfilelist.doc arara.doc asymptote.doc bundledoc.doc
-	checklistings.doc ctan_chk.doc ctanify.doc ctanupload.doc ctie.doc
-	cweb.doc de-macro.doc dtl.doc dtxgen.doc dvi2tty.doc dviasm.doc dvicopy.doc
-	dvidvi.doc dviljk.doc dvipos.doc findhyph.doc fragmaster.doc
-	hook-pre-commit-pkg.doc installfont.doc lacheck.doc latex-git-log.doc
-	latex-papersize.doc latex2man.doc latex2nemeth.doc latexfileversion.doc
-	latexpand.doc latexindent.doc ltxfileinfo.doc ltximg.doc listings-ext.doc
-	make4ht.doc match_parens.doc mkjobtexmf.doc patgen.doc pdfbook2.doc pdfcrop.doc
-	pdflatexpicscale.doc pdftools.doc pdfxup.doc pfarrei.doc pkfix.doc
-	pkfix-helper.doc purifyeps.doc pythontex.doc seetexk.doc srcredact.doc
-	sty2dtx.doc synctex.doc tex4ebook.doc texcount.doc texdef.doc texdiff.doc
-	texdirflatten.doc texdoc.doc texfot.doc texliveonfly.doc texloganalyser.doc
-	texosquery.doc texware.doc tie.doc tpic2pdftex.doc typeoutfileinfo.doc web.doc
-"
-TL_CORE_BINEXTRA_SRC_MODULES="
-	adhocfilelist.source arara.source checklistings.source hyphenex.source
-	listings-ext.source mkjobtexmf.source pfarrei.source pythontex.source
-	texdef.source texosquery.source
-"
-
-TL_CORE_EXTRA_MODULES="tetex hyphen-base texconfig gsftopk texlive.infra ${TL_CORE_BINEXTRA_MODULES}"
-TL_CORE_EXTRA_DOC_MODULES="tetex.doc texconfig.doc gsftopk.doc texlive.infra.doc ${TL_CORE_BINEXTRA_DOC_MODULES}"
-TL_CORE_EXTRA_SRC_MODULES="${TL_CORE_BINEXTRA_SRC_MODULES}"
-
-for i in ${TL_CORE_EXTRA_MODULES}; do
-	SRC_URI="${SRC_URI} mirror://gentoo/texlive-module-${i}-${PV}.tar.xz"
-done
-
-SRC_URI="${SRC_URI} doc? ( "
-for i in ${TL_CORE_EXTRA_DOC_MODULES}; do
-	SRC_URI="${SRC_URI} mirror://gentoo/texlive-module-${i}-${PV}.tar.xz"
-done
-SRC_URI="${SRC_URI} )"
-SRC_URI="${SRC_URI} source? ( "
-for i in ${TL_CORE_EXTRA_SRC_MODULES}; do
-	SRC_URI="${SRC_URI} mirror://gentoo/texlive-module-${i}-${PV}.tar.xz"
-done
-SRC_URI="${SRC_URI} )"
-
-KEYWORDS="alpha amd64 arm arm64 ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="cjk X doc source tk +luajittex xetex"
-
-TEXMF_PATH=/usr/share/texmf-dist
-
-MODULAR_X_DEPEND="X? (
-				x11-libs/libX11
-				x11-libs/libXmu
-	)"
-
-COMMON_DEPEND="${MODULAR_X_DEPEND}
-	!app-text/ptex
-	!app-text/tetex
-	!<app-text/texlive-2007
-	!app-text/xetex
-	!<dev-texlive/texlive-basic-2014
-	!<dev-texlive/texlive-metapost-2011
-	!app-text/dvibook
-	!dev-tex/luatex
-	!app-text/dvipdfm
-	!app-text/dvipdfmx
-	!app-text/xdvipdfmx
-	sys-libs/zlib
-	>=media-libs/libpng-1.2.43-r2:0=
-	>=app-text/poppler-0.58.0:=
-	>=x11-libs/cairo-1.12
-	>=x11-libs/pixman-0.18
-	dev-libs/zziplib
-	app-text/libpaper
-	dev-libs/gmp:0
-	dev-libs/mpfr:0=
-	xetex? (
-		>=media-libs/harfbuzz-1.4.5[icu,graphite]
-		>=dev-libs/icu-50:=
-		>=app-text/teckit-2.5.3
-		media-libs/fontconfig
-		media-gfx/graphite2
-	)
-	media-libs/freetype:2
-	>=dev-libs/kpathsea-6.2.3
-	cjk? ( >=dev-libs/ptexenc-1.3.5 )"
-
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-	sys-apps/ed
-	sys-devel/flex
-	app-arch/xz-utils"
-
-RDEPEND="${COMMON_DEPEND}
-	>=app-text/ps2pkm-1.8_p20170524
-	>=app-text/dvipsk-5.997
-	>=dev-tex/bibtexu-3.71_p20170524
-	virtual/perl-Getopt-Long
-	tk? ( dev-perl/Tk )"
-
-S="${WORKDIR}/${P}_build"
-B="${WORKDIR}/${MY_PV}"
-
-src_unpack() {
-	unpack ${A}
-	mkdir -p "${S}" || die "failed to create build dir"
-}
-
-RELOC_TARGET=texmf-dist
-
-src_prepare() {
-	cd "${WORKDIR}"
-	# From texlive-module.eclass.
-	grep -H RELOC tlpkg/tlpobj/* | awk '{print $2}' | sed 's#^RELOC/##' > "${T}/reloclist"
-	{ for i in $(<"${T}/reloclist"); do  dirname $i; done; } | uniq > "${T}/dirlist"
-	for i in $(<"${T}/dirlist"); do
-		[ -d "${RELOC_TARGET}/${i}" ] || mkdir -p "${RELOC_TARGET}/${i}"
-	done
-	for i in $(<"${T}/reloclist"); do
-		mv "${i}" "${RELOC_TARGET}"/$(dirname "${i}") || die "failed to relocate ${i} to ${RELOC_TARGET}/$(dirname ${i})"
-	done
-
-	mv "${WORKDIR}"/texmf* "${B}" || die "failed to move texmf files"
-
-	cd "${B}"
-
-	# bug 655052
-	epatch "${WORKDIR}/${PN%-core}-${TL_SOURCE_VERSION}-source-freetype.patch"
-
-	#EPATCH_MULTI_MSG="Applying patches from upstream bugfix branch..." EPATCH_SUFFIX="patch" epatch "${WORKDIR}/gentoo_branch2011_patches"
-	EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
-
-	# bug ?
-	epatch "${WORKDIR}/${POPPLERPATCHES}/${P}-poppler064.patch"
-
-	if has_version ">=app-text/poppler-0.69.0"; then
-		epatch "${WORKDIR}"/${POPPLERPATCHES}/${P}-poppler0{69,71,72,73}.patch # bugs #672854, 675448
-	fi
-
-	if has_version ">=app-text/poppler-0.75.0"; then
-		epatch "${WORKDIR}"/${POPPLERPATCHES}/${P}-pdftexdir-poppler0{75,76}.patch # bugs #681338, 685284
-		epatch "${WORKDIR}"/${POPPLERPATCHES}/${P}-luatexdir-poppler0{75,76}.patch # bugs #681338, 685284
-	fi
-
-	sed -i \
-		-e "s,/usr/include /usr/local/include.*echo \$KPATHSEA_INCLUDES.*,${EPREFIX}/usr/include\"," \
-		texk/web2c/configure || die
-
-	elibtoolize
-}
-
-src_configure() {
-	# It fails on alpha without this
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# Required for newest icu, bug #618732
-	append-cxxflags '-std=c++11'
-
-	# Too many regexps use A-Z a-z constructs, what causes problems with locales
-	# that don't have the same alphabetical order than ascii. Bug #242430
-	# So we set LC_ALL to C in order to avoid problems.
-	export LC_ALL=C
-	tc-export CC CXX AR RANLIB
-	ECONF_SOURCE="${B}" \
-		econf -C \
-		--bindir="${EPREFIX}"/usr/bin \
-		--datadir="${S}" \
-		--with-system-freetype2 \
-		--with-system-zlib \
-		--with-system-libpng \
-		--with-system-xpdf \
-		--with-system-poppler \
-		--with-system-teckit \
-		--with-teckit-includes="${EPREFIX}"/usr/include/teckit \
-		--with-system-kpathsea \
-		--with-kpathsea-includes="${EPREFIX}"/usr/include \
-		--with-system-icu \
-		--with-system-ptexenc \
-		--with-system-harfbuzz \
-		--with-system-icu \
-		--with-system-graphite2 \
-		--with-system-cairo \
-		--with-system-pixman \
-		--with-system-zziplib \
-		--with-system-libpaper \
-		--with-system-gmp \
-		--with-system-mpfr \
-		--without-texinfo \
-		--disable-dialog \
-		--disable-multiplatform \
-		--enable-epsfwin \
-		--enable-mftalkwin \
-		--enable-regiswin \
-		--enable-tektronixwin \
-		--enable-unitermwin \
-		--with-ps=gs \
-		--disable-psutils \
-		--disable-t1utils \
-		--enable-ipc \
-		--disable-biber \
-		--disable-bibtex-x \
-		--disable-dvipng \
-		--disable-dvipsk \
-		--disable-chktex \
-		--disable-lcdf-typetools \
-		--disable-pdfopen \
-		--disable-ps2eps \
-		--disable-ps2pk \
-		--disable-detex \
-		--disable-ttf2pk2 \
-		--disable-tex4htk \
-		--disable-cjkutils \
-		--disable-xdvik \
-		--disable-xindy \
-		--enable-luatex \
-		--disable-dvi2tty \
-		--disable-dvisvgm \
-		--disable-vlna \
-		--enable-shared \
-		--disable-native-texlive-build \
-		--disable-largefile \
-		$(use_enable luajittex) \
-		$(use_enable luajittex mfluajit) \
-		$(use_enable xetex) \
-		$(use_enable cjk ptex) \
-		$(use_enable cjk eptex) \
-		$(use_enable cjk uptex) \
-		$(use_enable cjk euptex) \
-		$(use_enable cjk mendexk) \
-		$(use_enable cjk makejvf) \
-		$(use_enable cjk pmp) \
-		$(use_enable cjk upmp) \
-		$(use_enable tk texdoctk) \
-		$(use_with X x)
-}
-
-src_compile() {
-	tc-export CC CXX AR RANLIB
-	emake SHELL="${EPREFIX}"/bin/sh texmf="${EPREFIX}"${TEXMF_PATH:-/usr/share/texmf-dist}
-
-	cd "${B}" || die
-	# Mimic updmap --syncwithtrees to enable only fonts installed
-	# Code copied from updmap script
-	for i in `egrep '^(Mixed|Kanji)?Map' "texmf-dist/web2c/updmap.cfg" | sed 's@.* @@'`; do
-		texlive-common_is_file_present_in_texmf "$i" || echo "$i"
-	done > "${T}/updmap_update"
-	{
-		sed 's@/@\\/@g; s@^@/^MixedMap[     ]*@; s@$@$/s/^/#! /@' <"${T}/updmap_update"
-		sed 's@/@\\/@g; s@^@/^Map[  ]*@; s@$@$/s/^/#! /@' <"${T}/updmap_update"
-		sed 's@/@\\/@g; s@^@/^KanjiMap[     ]*@; s@$@$/s/^/#! /@' <"${T}/updmap_update"
-	} > "${T}/updmap_update2"
-	sed -f "${T}/updmap_update2" "texmf-dist/web2c/updmap.cfg" >	"${T}/updmap_update3"\
-		&& cat "${T}/updmap_update3" > "texmf-dist/web2c/updmap.cfg"
-}
-
-src_install() {
-	dodir ${TEXMF_PATH:-/usr/share/texmf-dist}/web2c
-	emake DESTDIR="${D}" texmf="${ED}${TEXMF_PATH:-/usr/share/texmf-dist}" run_texlinks="true" run_mktexlsr="true" install
-
-	cd "${B}" || die
-	dodir /usr/share # just in case
-	cp -pR texmf-dist "${ED}/usr/share/" || die "failed to install texmf trees"
-	cp -pR "${WORKDIR}"/tlpkg "${ED}/usr/share/" || die "failed to install tlpkg files"
-
-	# When X is disabled mf-nowin doesn't exist but some scripts expect it to
-	# exist. Instead, it is called mf, so we symlink it to please everything.
-	use X || dosym mf /usr/bin/mf-nowin
-
-	docinto texk
-	cd "${B}/texk"
-	dodoc ChangeLog README
-
-	docinto dviljk
-	cd "${B}/texk/dviljk"
-	dodoc ChangeLog README NEWS
-
-	docinto makeindexk
-	cd "${B}/texk/makeindexk"
-	dodoc ChangeLog NOTES README
-
-	docinto web2c
-	cd "${B}/texk/web2c"
-	dodoc ChangeLog NEWS PROJECTS README
-
-	use doc || rm -rf "${ED}/usr/share/texmf-dist/doc"
-
-	dodir /etc/env.d
-	echo 'CONFIG_PROTECT_MASK="/etc/texmf/web2c /etc/texmf/language.dat.d /etc/texmf/language.def.d /etc/texmf/updmap.d"' > "${ED}/etc/env.d/98texlive"
-	# populate /etc/texmf
-	keepdir /etc/texmf/web2c
-
-	# take care of updmap.cfg and language.d files
-	keepdir /etc/texmf/{updmap.d,language.dat.d,language.def.d,language.dat.lua.d}
-
-	mv "${ED}${TEXMF_PATH}/web2c/updmap.cfg" "${ED}/etc/texmf/updmap.d/00updmap.cfg" || die "moving updmap.cfg failed"
-
-	# Remove fmtutil.cnf, it will be regenerated from /etc/texmf/fmtutil.d files
-	# by texmf-update
-	rm -f "${ED}${TEXMF_PATH}/web2c/fmtutil.cnf"
-	# Remove bundled and invalid updmap.cfg
-	rm -f "${ED}/usr/share/texmf-dist/web2c/updmap.cfg"
-
-	texlive-common_handle_config_files
-
-	keepdir /usr/share/texmf-site
-
-	# the virtex symlink is not installed
-	# The links has to be relative, since the targets
-	# is not present at this stage and MacOS doesn't
-	# like non-existing targets
-	dosym tex /usr/bin/virtex
-	dosym pdftex /usr/bin/pdfvirtex
-
-	# Rename mpost to leave room for mplib
-	mv "${ED}/usr/bin/mpost" "${ED}/usr/bin/mpost-${P}"
-	dosym "mpost-${P}" /usr/bin/mpost
-
-	# Ditto for pdftex
-	mv "${ED}/usr/bin/pdftex" "${ED}/usr/bin/pdftex-${P}"
-	dosym "pdftex-${P}" /usr/bin/pdftex
-}
-
-pkg_postinst() {
-	etexmf-update
-
-	einfo "Regenerating TeX formats"
-	fmtutil-sys --all &> /dev/null
-
-	elog
-	elog "If you have configuration files in ${EPREFIX}/etc/texmf to merge,"
-	elog "please update them and run ${EPREFIX}/usr/sbin/texmf-update."
-	elog
-	ewarn "If you are migrating from an older TeX distribution"
-	ewarn "Please make sure you have read:"
-	ewarn "https://wiki.gentoo.org/wiki/Project:TeX/Tex_Live_Migration_Guide"
-	ewarn "in order to avoid possible problems"
-}
diff --git a/app-text/texlive-core/texlive-core-2019-r4.ebuild b/app-text/texlive-core/texlive-core-2019-r4.ebuild
index 9534cf675048..be0dc8606b4f 100644
--- a/app-text/texlive-core/texlive-core-2019-r4.ebuild
+++ b/app-text/texlive-core/texlive-core-2019-r4.ebuild
@@ -72,7 +72,7 @@ for i in ${TL_CORE_EXTRA_SRC_MODULES}; do
 done
 SRC_URI="${SRC_URI} )"
 
-KEYWORDS="~alpha amd64 ~arm ~arm64 ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="cjk X doc source tk +luajittex xetex"
 
 TEXMF_PATH=/usr/share/texmf-dist
diff --git a/app-text/texlive/Manifest b/app-text/texlive/Manifest
index 7bee6bb89612..596a45ce49df 100644
--- a/app-text/texlive/Manifest
+++ b/app-text/texlive/Manifest
@@ -1,3 +1,2 @@
-EBUILD texlive-2017.ebuild 7276 BLAKE2B 4bb6c9de41736664687aa1ba4318aef71d43e3823c64807755743ac1f30c8a0441b330bd98bcb265c118676953b406e2a138a376a1a14e17397aa6db838d8e66 SHA512 08a2ffabfb4b5732391a20afaab0615ac5c3a3ff5caba16c90430fff6eb144f00280969753b405a57167606cd40501287130cee059495287e8b7b8281d62ee07
-EBUILD texlive-2019.ebuild 7278 BLAKE2B 5240c3ecb111469ab16774375bed0ce4443a69342ad2943064cd88d8dbe22bd27135572ee9632eb9eaa0e634da4ffdcdc5870116c185b36b270f0e2edbda07fb SHA512 0d51c436b0df8fe31cf4161ecb6860fc699e53bcfe29a65dc7c18132d88c2a30206bad0f4afdcae699f405e2fc4d52af1049a54b2fa6af5bbbb10322fcc08175
+EBUILD texlive-2019.ebuild 7262 BLAKE2B 17dd50ca97edbca18fcd43822afecf60f9738a646cfb647cd9808c99103793fbab016bc6df11f7bdc8fb4fde44eedc7208bd69cd2138d5e031e77a9731b13f60 SHA512 4879d053bd20a2e2b67316ce321cfb60a5f4727afb8f984d6193610cb7a179ab6f19f61cf102056c55f38a1c5cc8d03347710640506bcfffdd4a144976cc8ec3
 MISC metadata.xml 2419 BLAKE2B 2627379a58f80fd304b4c77ac3f3466520d8237458e4236d88ffc2b33a062d50e33a0f2cb07c6120abbbd27d0dd7d4aa79eaa44790280f719eb10fcfc230664d SHA512 e20c3f1c67f6250209b381aa21d827ee27006d6ba5558e913ce01ac704ba0d04f16b1c5b4666ed8833e6c744b7045276d98e777f3e3e1289dc33e861bc745941
diff --git a/app-text/texlive/texlive-2017.ebuild b/app-text/texlive/texlive-2017.ebuild
deleted file mode 100644
index e05547b4564a..000000000000
--- a/app-text/texlive/texlive-2017.ebuild
+++ /dev/null
@@ -1,163 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-DESCRIPTION="A complete TeX distribution"
-HOMEPAGE="http://tug.org/texlive/"
-SRC_URI=""
-
-LICENSE="metapackage"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="cjk context detex dvi2tty extra epspdf games graphics
-humanities jadetex luatex metapost music pdfannotextractor png pstricks publishers
-science tex4ht texi2html truetype xetex xindy xml X"
-
-LANGS="af ar as bg bn br ca cs cy da de el en eo es et eu fa fi fr ga gl gu he
-	hi hr hsb hu hy ia id is it ja ko kn la lo lt lv ml mn mr nb nl nn no or pa
-	pl pt rm ro ru sa sco sk sl sq sr sv ta te th tk tr uk vi zh"
-
-for X in ${LANGS}; do
-	IUSE="${IUSE} l10n_${X}"
-done
-
-TEXLIVE_CAT="dev-texlive"
-
-DEPEND=">=app-text/texlive-core-${PV}"
-RDEPEND="${DEPEND}
-	app-text/psutils
-	>=${TEXLIVE_CAT}/texlive-fontutils-${PV}
-	media-gfx/sam2p
-	texi2html? ( app-text/texi2html )
-	sys-apps/texinfo
-	app-text/t1utils
-	>=app-text/lcdf-typetools-2.92[kpathsea]
-	truetype? ( >=app-text/ttf2pk2-2.0_p20150521 )
-	detex? ( dev-tex/detex )
-	app-text/ps2eps
-	dvi2tty? ( dev-tex/dvi2tty )
-	png? ( app-text/dvipng )
-	X? ( >=app-text/xdvik-22.87 )
-	>=${TEXLIVE_CAT}/texlive-basic-${PV}
-	>=${TEXLIVE_CAT}/texlive-fontsrecommended-${PV}
-	>=${TEXLIVE_CAT}/texlive-latex-${PV}
-	luatex? ( >=${TEXLIVE_CAT}/texlive-luatex-${PV} )
-	>=${TEXLIVE_CAT}/texlive-latexrecommended-${PV}
-	>=dev-tex/xcolor-2.11
-	>=dev-tex/latex-beamer-3.36
-	metapost? (
-		>=${TEXLIVE_CAT}/texlive-metapost-${PV}
-			dev-tex/feynmf
-	)
-	>=${TEXLIVE_CAT}/texlive-plaingeneric-${PV}
-	pdfannotextractor? ( dev-tex/pdfannotextractor )
-	extra? (
-		dev-tex/chktex
-		app-text/dvisvgm
-		dev-tex/latexdiff
-		>=dev-tex/latexmk-418
-		>=app-text/pdfjam-2.02
-		>=${TEXLIVE_CAT}/texlive-bibtexextra-${PV}
-		>=${TEXLIVE_CAT}/texlive-fontsextra-${PV}
-		>=${TEXLIVE_CAT}/texlive-formatsextra-${PV}
-		>=${TEXLIVE_CAT}/texlive-latexextra-${PV}
-			>=dev-tex/glossaries-2.07
-			>=dev-tex/leaflet-20041222
-			>=dev-tex/currvita-0.9i-r1
-			>=dev-tex/g-brief-4.0.2
-			>=dev-tex/envlab-1.2-r1
-			>=dev-tex/europecv-20060424-r1
-			>=dev-tex/svninfo-0.7.3-r1
-	)
-	xetex? ( >=${TEXLIVE_CAT}/texlive-xetex-${PV} )
-	graphics? ( >=${TEXLIVE_CAT}/texlive-pictures-${PV}
-		dev-tex/dot2texi )
-	epspdf? ( app-text/epspdf )
-	science? ( >=${TEXLIVE_CAT}/texlive-mathscience-${PV} )
-	publishers? ( >=${TEXLIVE_CAT}/texlive-publishers-${PV} )
-	music? ( >=${TEXLIVE_CAT}/texlive-music-${PV} )
-	pstricks? ( >=${TEXLIVE_CAT}/texlive-pstricks-${PV} )
-	context? ( >=${TEXLIVE_CAT}/texlive-context-${PV} )
-	games? ( >=${TEXLIVE_CAT}/texlive-games-${PV} )
-	humanities? ( >=${TEXLIVE_CAT}/texlive-humanities-${PV} )
-	tex4ht? ( >=dev-tex/tex4ht-20090611_p1038-r3 )
-	xml? (
-		>=dev-tex/xmltex-1.9-r2
-		app-text/passivetex
-	)
-	jadetex? ( >=app-text/jadetex-3.13-r2 )
-	l10n_af?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
-	l10n_ar?    ( >=${TEXLIVE_CAT}/texlive-langarabic-${PV} )
-	l10n_fa?    ( >=${TEXLIVE_CAT}/texlive-langarabic-${PV} )
-	l10n_hy?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
-	cjk? ( >=${TEXLIVE_CAT}/texlive-langcjk-${PV}
-		   >=dev-tex/cjk-latex-4.8.4 )
-	l10n_hr?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
-	l10n_bg?    ( >=${TEXLIVE_CAT}/texlive-langcyrillic-${PV} )
-	l10n_br?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
-	l10n_ru?    ( >=${TEXLIVE_CAT}/texlive-langcyrillic-${PV} )
-	l10n_uk?    ( >=${TEXLIVE_CAT}/texlive-langcyrillic-${PV} )
-	l10n_cs?    ( >=${TEXLIVE_CAT}/texlive-langczechslovak-${PV}
-	              >=app-text/vlna-1.3 )
-	l10n_sk?    ( >=${TEXLIVE_CAT}/texlive-langczechslovak-${PV} )
-	l10n_da?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
-	l10n_nl?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
-	l10n_en?    ( >=${TEXLIVE_CAT}/texlive-langenglish-${PV} )
-	l10n_fi?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
-	l10n_eu?    ( >=${TEXLIVE_CAT}/texlive-langfrench-${PV} )
-	l10n_fr?    ( >=${TEXLIVE_CAT}/texlive-langfrench-${PV} )
-	l10n_de?    ( >=${TEXLIVE_CAT}/texlive-langgerman-${PV} )
-	l10n_el?    ( >=${TEXLIVE_CAT}/texlive-langgreek-${PV} )
-	l10n_he?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
-	l10n_hu?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
-	l10n_as?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
-	l10n_bn?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
-	l10n_gu?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
-	l10n_hi?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
-	l10n_kn?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
-	l10n_ml?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
-	l10n_mr?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
-	l10n_or?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
-	l10n_pa?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
-	l10n_sa?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
-	l10n_ta?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
-	l10n_te?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
-	l10n_it?    ( >=${TEXLIVE_CAT}/texlive-langitalian-${PV} )
-	l10n_ja?    ( >=${TEXLIVE_CAT}/texlive-langjapanese-${PV} )
-	l10n_ko?    ( >=${TEXLIVE_CAT}/texlive-langkorean-${PV} )
-	l10n_la?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
-	l10n_lt?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
-	l10n_lv?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
-	l10n_mn?    ( >=${TEXLIVE_CAT}/texlive-langcyrillic-${PV} )
-	l10n_nb?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
-	l10n_nn?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
-	l10n_no?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
-	l10n_cy?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
-	l10n_eo?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
-	l10n_et?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
-	l10n_ga?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
-	l10n_rm?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
-	l10n_hsb?   ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
-	l10n_ia?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
-	l10n_id?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
-	l10n_is?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
-	l10n_lo?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
-	l10n_ro?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
-	l10n_sq?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
-	l10n_sr?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV}
-	              >=${TEXLIVE_CAT}/texlive-langcyrillic-${PV} )
-	l10n_sl?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
-	l10n_tr?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
-	l10n_pl?    ( >=${TEXLIVE_CAT}/texlive-langpolish-${PV} )
-	l10n_pt?    ( >=${TEXLIVE_CAT}/texlive-langportuguese-${PV} )
-	l10n_ca?    ( >=${TEXLIVE_CAT}/texlive-langspanish-${PV} )
-	l10n_gl?    ( >=${TEXLIVE_CAT}/texlive-langspanish-${PV} )
-	l10n_es?    ( >=${TEXLIVE_CAT}/texlive-langspanish-${PV} )
-	l10n_sco?   ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
-	l10n_sv?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
-	l10n_tk?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
-	l10n_vi?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
-	l10n_zh?    ( >=${TEXLIVE_CAT}/texlive-langchinese-${PV} )
-	xindy? ( app-text/xindy )
-"
diff --git a/app-text/texlive/texlive-2019.ebuild b/app-text/texlive/texlive-2019.ebuild
index c44916e25ef2..0fa8ecad4f1a 100644
--- a/app-text/texlive/texlive-2019.ebuild
+++ b/app-text/texlive/texlive-2019.ebuild
@@ -9,7 +9,7 @@ SRC_URI=""
 
 LICENSE="metapackage"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="cjk context detex dvi2tty extra epspdf games graphics
 humanities jadetex luatex metapost music pdfannotextractor png pstricks publishers
 science tex4ht texi2html truetype xetex xindy xml X"
diff --git a/app-text/ttf2pk2/Manifest b/app-text/ttf2pk2/Manifest
index 40a5073c8d7d..7fb373d11328 100644
--- a/app-text/ttf2pk2/Manifest
+++ b/app-text/ttf2pk2/Manifest
@@ -1,11 +1,3 @@
-AUX ttf2pk2-2.0_p20170524-freetype2-config.patch 1019 BLAKE2B a675a238fb147dcb67eda572b9a3b1e1b1ab630726464eb740240be0815b9a9da5e5f7a8a6d404648f060995c64efb02acbb67fc907dd6139c6817f0bdb5a946 SHA512 be5b7de6957c5bb2ad884e5b3a6a21f074b84b6be08f519b80a24dacd8630b2bc75dc64e225dba388d17a01bfed6784b2862db2e6bab4b73a1f6d4aebf23a9c6
-DIST texlive-20150521-source.tar.xz 45459552 BLAKE2B 639eaee7c9dd173e5ede9f157ccd9a9655ee55cabf232985915f10afa36dce618b8b78848e5d9853bf0f96f818d03d68fa17d8abcdc4d1a1349fe13dfe3a1ddc SHA512 9d06bb88c489715787ce619c4c6b5e2d4251e1db8d48ae7fe2d1a253634c76bc6d7282ef9c93c77847845cae01eafb58dfb37ba3fb83a6d223f0d7fe8f5d3855
-DIST texlive-20160523-source.tar.xz 45941100 BLAKE2B 8752212d41d6bbabc725d9b1dcc187dd4dbb34df4271c768e83c13a2dd4e7170aa162d01a15d87fa02bc1b5abee648a2d35e3aa1380569851cc21d6f33f2f109 SHA512 915fa2f5e2099dd385ef81033db7aafdf09558c0c200fed0748a8a42fd61f69d3eaac9decea334e30981af739dd81061a9b1d6853c7f6d00285fe0be40e26c3e
-DIST texlive-20170524-source.tar.xz 63483372 BLAKE2B 44669d1228f5be27e9d93672a4f4ead40f7f4c6cf386f2db6fef54d64f8b8a743a485fe1170904d8117b9745f71ec77db8434caa6cdd79359b1f3f387130a3b4 SHA512 18c18940992ab94ce22e22ccd4ad798253ea14ac2ab296a10ea5e9a8da9f33989f2e2641b42b564d1d5fb53bd371da3e68726b676d706b469016ad146cd19daa
 DIST texlive-20190410-source.tar.xz 53783408 BLAKE2B 8e34c7c2b74eab1c4d16ddbf7eddd8566593e6d68c42a2634760f11d86e68970698d8b9deddcf3297966968ede11ecf30e0b04ec19b708dc3e6d0a2abcc3799d SHA512 7759d8e668e53c0c73e48907096da9d8fb6384dd9c3342ddfb05e17d077054c5351d35256cf4e63a6da502de2f09f521979bede7209cdd5bd8ae80eba0efed2e
-EBUILD ttf2pk2-2.0_p20150521.ebuild 1380 BLAKE2B 8a332fc015d1e328b342328096e173d90b4652b3e29ee5f235661741e350404edc9eebd919dbc7fb8d2607da798e333eec8b4dd714967296f96dbd51b2896872 SHA512 86c034a1d85d74894efb55ad7b6aca38606f8291d58d993dbe17c124e44cd71bce7b8aed5e4264e45ce4d8b43ce8e8e6108f42820d86e23448f62f7576219065
-EBUILD ttf2pk2-2.0_p20160523.ebuild 1251 BLAKE2B eb840feed846e552a3202b42db5872d26c19949be4444ec538470e02ce1da85a2a3e2f3cd03e0d1e81f0282978cb86b3282310ca8865b576c6be4eadb393e0b9 SHA512 aa1cfe98ed451aaa6066e4815698113ea0e925b4361eb50ebb51935089f26ac438e511eb06d74dc7c7737981422718a4e4fe67b5aaa839594d617f0c488296d8
-EBUILD ttf2pk2-2.0_p20170524-r1.ebuild 1462 BLAKE2B 29fbec0d2ecfb06fb7c7303b9ffcc8d0aab170ae70c171a92f9c0517763f4a18e9860decf85cdff98a71b2a98cb760139fdc60d743abf2d512edebb41093f4dd SHA512 27fc9486fbadb5e73bb9f70ef3b695bebef7b8a580b13bf0d427aef54bcf6a86e400c2d14cc126302bff39676b28018e082dda2791a50b4afa389bc197395a30
-EBUILD ttf2pk2-2.0_p20170524.ebuild 1257 BLAKE2B 88872ff9775a86392454eca4ecd81c1b1e92fed99a6c46ac73082d5242d6a33a78b0d5f5cc2f056fa077366f6ade864063d5d59e286ea65dc611a67bef119051 SHA512 8ef2e82cd26116b828b4e287210d4823f4ff4d9b0b89efb3ad3ec37c00da8b9b23649ce245d7c05bae8f6fc0820138fd7fb073886a7aa5be048230da66c76a2c
-EBUILD ttf2pk2-2.0_p20190410.ebuild 1117 BLAKE2B cbc8c6529643fcc58875cb6e49035ba0e241b570100b000a2e1bec93e21094b4f2028835798db94fbc1e3c3475b8d526dbbffdb1f8655efb40b87c68cb752da3 SHA512 73c0c6721ec5712684bebf4865e39793687d1974dff494280e06a3d91b8edb0765998dcab7dbd4c2c538571588733722e8b4c13237e99968f220df5a70043777
+EBUILD ttf2pk2-2.0_p20190410.ebuild 1088 BLAKE2B 64d3bc3fe7fec8b8d6b947d28eff0fed017060aa4aff176671efdf2f600e433fb28129c033c71f2751f1feb5aa4c0e1d9643983806cea2e236d4ff03627685c8 SHA512 1ca94b1f380c8d8f908d6ede4c7d613d296273b949626aa041deaa651148f87f99958e0c865316e6dcc78029340499586e6942caef5da03dd125ec21396a817e
 MISC metadata.xml 245 BLAKE2B ee3a163cfe0a4bc59c0dfb46f9ddb580e2d259b4d0e33cb4e684eb9e6d4b901bf97c6edd891f3b75a613a782f1b89318d0ee3ec9bee4e34c4441d9e8f4267678 SHA512 1653777623e2c15e1ce13229e396723b2cc9c214983e0f8592de98c01a31badc6c38c6735ed44f937d145883b43fb6f049af3eddb9ff96b18c96ccf8f67dd690
diff --git a/app-text/ttf2pk2/files/ttf2pk2-2.0_p20170524-freetype2-config.patch b/app-text/ttf2pk2/files/ttf2pk2-2.0_p20170524-freetype2-config.patch
deleted file mode 100644
index 6387b28c8ba2..000000000000
--- a/app-text/ttf2pk2/files/ttf2pk2-2.0_p20170524-freetype2-config.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/m4/kpse-freetype2-flags.m4	2018-09-19 10:19:06.437789178 +0100
-+++ b/m4/kpse-freetype2-flags.m4	2018-09-19 10:23:48.556050046 +0100
-@@ -21,17 +21,10 @@
- 
- # KPSE_FREETYPE2_OPTIONS([WITH-SYSTEM])
- # -------------------------------------
--AC_DEFUN([KPSE_FREETYPE2_OPTIONS], [_KPSE_LIB_OPTIONS([freetype2], [$1], [freetype-config])])
-+AC_DEFUN([KPSE_FREETYPE2_OPTIONS], [_KPSE_LIB_OPTIONS([freetype2], [$1], [pkg-config])])
- 
- # KPSE_FREETYPE2_SYSTEM_FLAGS
- # ---------------------------
- AC_DEFUN([KPSE_FREETYPE2_SYSTEM_FLAGS], [dnl
--AC_REQUIRE([AC_CANONICAL_HOST])[]dnl
--AC_CHECK_TOOL([FT2_CONFIG], [freetype-config], [false])[]dnl
--if $FT2_CONFIG --ftversion >/dev/null 2>&1; then
--  FREETYPE2_INCLUDES=`$FT2_CONFIG --cflags`
--  FREETYPE2_LIBS=`$FT2_CONFIG --libs`
--elif test "x$need_freetype2:$with_system_freetype2" = xyes:yes; then
--  AC_MSG_ERROR([did not find freetype-config required for system freetype2 library])
--fi
--]) # KPSE_FREETYPE2_SYSTEM_FLAGS
-+_KPSE_PKG_CONFIG_FLAGS([freetype2], [freetype2])])
-+
diff --git a/app-text/ttf2pk2/ttf2pk2-2.0_p20150521.ebuild b/app-text/ttf2pk2/ttf2pk2-2.0_p20150521.ebuild
deleted file mode 100644
index c9c06857c63c..000000000000
--- a/app-text/ttf2pk2/ttf2pk2-2.0_p20150521.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="Freetype 2 based TrueType font to TeX's PK format converter"
-HOMEPAGE="http://tug.org/texlive/"
-SRC_URI="mirror://gentoo/texlive-${PV#*_p}-source.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ~mips ppc ppc64 ~s390 ~sh x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-# Note about blockers: it is a freetype2 based replacement for ttf2pk and
-# ttf2tfm from freetype1, so block freetype1.
-# It installs some data that collides with
-# dev-texlive/texlive-langcjk-2011[source]. Hope it'd be fixed with 2012,
-# meanwhile we can start dropping freetype1.
-RDEPEND=">=dev-libs/kpathsea-6.2.1
-		media-libs/freetype:2
-		sys-libs/zlib
-		!media-libs/freetype:1
-		!=dev-texlive/texlive-langcjk-2011*[source]"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	virtual/pkgconfig"
-
-S=${WORKDIR}/texlive-${PV#*_p}-source/texk/${PN}
-
-src_configure() {
-	has_version '>=dev-libs/kpathsea-6.2.1' && append-cppflags "$($(tc-getPKG_CONFIG) --cflags kpathsea)"
-	econf --with-system-kpathsea \
-		--with-system-freetype2 \
-		--with-system-zlib
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc BUGS README TODO ChangeLog
-}
diff --git a/app-text/ttf2pk2/ttf2pk2-2.0_p20160523.ebuild b/app-text/ttf2pk2/ttf2pk2-2.0_p20160523.ebuild
deleted file mode 100644
index 11ba85c82e21..000000000000
--- a/app-text/ttf2pk2/ttf2pk2-2.0_p20160523.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Freetype 2 based TrueType font to TeX's PK format converter"
-HOMEPAGE="http://tug.org/texlive/"
-SRC_URI="mirror://gentoo/texlive-${PV#*_p}-source.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-# Note about blockers: it is a freetype2 based replacement for ttf2pk and
-# ttf2tfm from freetype1, so block freetype1.
-# It installs some data that collides with
-# dev-texlive/texlive-langcjk-2011[source]. Hope it'd be fixed with 2012,
-# meanwhile we can start dropping freetype1.
-RDEPEND=">=dev-libs/kpathsea-6.2.1
-		media-libs/freetype:2
-		sys-libs/zlib
-		!media-libs/freetype:1
-		!=dev-texlive/texlive-langcjk-2011*[source]"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	virtual/pkgconfig"
-
-S=${WORKDIR}/texlive-${PV#*_p}-source/texk/${PN}
-
-src_configure() {
-	econf --with-system-kpathsea \
-		--with-system-freetype2 \
-		--with-system-zlib
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc BUGS README TODO ChangeLog
-}
diff --git a/app-text/ttf2pk2/ttf2pk2-2.0_p20170524-r1.ebuild b/app-text/ttf2pk2/ttf2pk2-2.0_p20170524-r1.ebuild
deleted file mode 100644
index 5a5ec2a0e649..000000000000
--- a/app-text/ttf2pk2/ttf2pk2-2.0_p20170524-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="Freetype 2 based TrueType font to TeX's PK format converter"
-HOMEPAGE="http://tug.org/texlive/"
-SRC_URI="mirror://gentoo/texlive-${PV#*_p}-source.tar.xz"
-
-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-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-# Note about blockers: it is a freetype2 based replacement for ttf2pk and
-# ttf2tfm from freetype1, so block freetype1.
-# It installs some data that collides with
-# dev-texlive/texlive-langcjk-2011[source]. Hope it'd be fixed with 2012,
-# meanwhile we can start dropping freetype1.
-RDEPEND=">=dev-libs/kpathsea-6.2.1
-		media-libs/freetype:2
-		sys-libs/zlib
-		!media-libs/freetype:1
-		!=dev-texlive/texlive-langcjk-2011*[source]"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	virtual/pkgconfig"
-
-S=${WORKDIR}/texlive-${PV#*_p}-source/texk/${PN}
-
-src_prepare () {
-	# Bug 654770
-	cd "${WORKDIR}/texlive-${PV#*_p}-source"
-	eapply "${FILESDIR}"/ttf2pk2-2.0_p20170524-freetype2-config.patch
-	cd "${S}"
-	eautoreconf
-	eapply_user
-}
-
-src_configure() {
-	econf --with-system-kpathsea \
-		--with-system-freetype2 \
-		--with-system-zlib
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc BUGS README TODO ChangeLog
-}
diff --git a/app-text/ttf2pk2/ttf2pk2-2.0_p20170524.ebuild b/app-text/ttf2pk2/ttf2pk2-2.0_p20170524.ebuild
deleted file mode 100644
index ddd5274a4986..000000000000
--- a/app-text/ttf2pk2/ttf2pk2-2.0_p20170524.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Freetype 2 based TrueType font to TeX's PK format converter"
-HOMEPAGE="http://tug.org/texlive/"
-SRC_URI="mirror://gentoo/texlive-${PV#*_p}-source.tar.xz"
-
-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-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-# Note about blockers: it is a freetype2 based replacement for ttf2pk and
-# ttf2tfm from freetype1, so block freetype1.
-# It installs some data that collides with
-# dev-texlive/texlive-langcjk-2011[source]. Hope it'd be fixed with 2012,
-# meanwhile we can start dropping freetype1.
-RDEPEND=">=dev-libs/kpathsea-6.2.1
-		media-libs/freetype:2
-		sys-libs/zlib
-		!media-libs/freetype:1
-		!=dev-texlive/texlive-langcjk-2011*[source]"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	virtual/pkgconfig"
-
-S=${WORKDIR}/texlive-${PV#*_p}-source/texk/${PN}
-
-src_configure() {
-	econf --with-system-kpathsea \
-		--with-system-freetype2 \
-		--with-system-zlib
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc BUGS README TODO ChangeLog
-}
diff --git a/app-text/ttf2pk2/ttf2pk2-2.0_p20190410.ebuild b/app-text/ttf2pk2/ttf2pk2-2.0_p20190410.ebuild
index 62cf2ceb43d4..16620e115f19 100644
--- a/app-text/ttf2pk2/ttf2pk2-2.0_p20190410.ebuild
+++ b/app-text/ttf2pk2/ttf2pk2-2.0_p20190410.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo/texlive-${PV#*_p}-source.tar.xz"
 
 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-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 # Note about blockers: it is a freetype2 based replacement for ttf2pk and
diff --git a/app-text/vlna/Manifest b/app-text/vlna/Manifest
index 8fc87e9f09d1..efc06572c149 100644
--- a/app-text/vlna/Manifest
+++ b/app-text/vlna/Manifest
@@ -1,3 +1,3 @@
 DIST vlna-1.5.tar.gz 146670 BLAKE2B a72cae3b276bb0673dca940d15df4ec0af8c292bb08b0a0ed55680d6893a3fbf80de9588bad4698c8c12f056a9a66650a63c100ea3021d7809f57cd2b9b09d19 SHA512 2416fd4183a5be495fa538d05bd8a7514265c4cb68d78aff6f2dfdd4b3c9abc34b6eb829e5adb6fecd20aa5d110ad77d9e0f56f260ac8ced3ea2218cb6cadee2
-EBUILD vlna-1.5.ebuild 668 BLAKE2B 5dfee4328418884380b678baec4e3e9f520ab77a3899d4e68088d87962cdcc13701056231a61d8d1e213515fbbaecb69c3faba479ba21073d09aad641722e0da SHA512 3bc9fb255d1bce5dd58e7663d89eda495bf4ac736b305ec3f481d8d52523618283657129d72cde0b3e14dc1d724a72cc7924838afdb8e2b5786911a111aa17e2
+EBUILD vlna-1.5.ebuild 646 BLAKE2B 7c86f7af50983b088b8e5516dd7ba31f6a4ee6bad20ddd8ed38bac6d668d85f3ee07c0484d4cf34a8940ccb91bf9e38603efe344d97a892a614594bbc5bba5d7 SHA512 5070730db6054c74e360de08c5dd03392c98da4e1e523d23818cd801297c3a400e6eb60f7b63469568a2aff1a9305b3a59568835ae078f67ee18ad6c02fff61e
 MISC metadata.xml 245 BLAKE2B ee3a163cfe0a4bc59c0dfb46f9ddb580e2d259b4d0e33cb4e684eb9e6d4b901bf97c6edd891f3b75a613a782f1b89318d0ee3ec9bee4e34c4441d9e8f4267678 SHA512 1653777623e2c15e1ce13229e396723b2cc9c214983e0f8592de98c01a31badc6c38c6735ed44f937d145883b43fb6f049af3eddb9ff96b18c96ccf8f67dd690
diff --git a/app-text/vlna/vlna-1.5.ebuild b/app-text/vlna/vlna-1.5.ebuild
index 1d3fe39b4857..09778519fb07 100644
--- a/app-text/vlna/vlna-1.5.ebuild
+++ b/app-text/vlna/vlna-1.5.ebuild
@@ -9,7 +9,7 @@ SRC_URI="ftp://math.feld.cvut.cz/pub/olsak/vlna/${P}.tar.gz"
 
 LICENSE="Artistic"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 DEPEND=""
diff --git a/app-text/wdiff/Manifest b/app-text/wdiff/Manifest
index 879695aee2c8..94e9aafafb7a 100644
--- a/app-text/wdiff/Manifest
+++ b/app-text/wdiff/Manifest
@@ -1,4 +1,4 @@
 DIST wdiff-1.2.2.tar.gz 1478567 BLAKE2B 80de7ecdd8fef1a4c9e6e0830e1af52d5087abc235dbe2bcf7542c0f017c1a21036243162fa6f70e714f3544d74e9a1add70dc22e69f306a17ce9bdd49c5bc15 SHA512 9272c225f4f61612197fe151cf8c913107169ac9fcd6c9f8472a0f56d9124d78a060944cea1b51489ca34311220f23638d043d43c733a3252cdbb7cceb1085ed
-EBUILD wdiff-1.2.2-r1.ebuild 873 BLAKE2B 153436ba42f195828fd94d44e8f2f466dee684c34faf6d0861d98e340eca8e2196b2b4827bff04bb3aa506aef1a4fa1328a2086abf07c1bb2a81cf9e45579a1f SHA512 ff0b0ff424b9efd252e30fcaa7c0e55b9c4ad9c4f4282cf12c997a4fca97649cc292fc554c3df9afb311fc26eb9c518a581c2f7f403d6c956e3eb429ac8acca4
-EBUILD wdiff-1.2.2.ebuild 839 BLAKE2B 05f9a12ffccb81d5f5aa8a99f604975255b76c95324068a7cf5fbce3411213689bac7becc3f9c6d110a53b81ee65f966272435b4e7559f8a51e14f5d7fb17c71 SHA512 bd6430c5c7ee706d37adc6489ba72d9021b5887e2864f45edfd23cc051340586fac6f79daef740bae11c16ad9b9ce6a54d980a0738bd6cf1965d85248fa91dae
+EBUILD wdiff-1.2.2-r1.ebuild 863 BLAKE2B 7c437cd06cc63f44f19293a1cc3f3f38abeb70488d82b71eb4cfb288bf64c580418d82e769886d04c10f8f5217b12460d8e80c83d47c49d329050813db06d524 SHA512 0bb87eadca4743acbba9e1db1b25e2c9610f528d6a97b4570d94dc5e58104a6bcd27318bda8c37a3e3f64a8ce6700210e22c09c06be7b4f18a1bd214d29c91ff
+EBUILD wdiff-1.2.2.ebuild 829 BLAKE2B c338db8bfbe6806db40bd6c146716e00df109795ab86529cfbaff6c7caec736846888fe15515e6e7169caee146fa8f7895d0f7513d5a172eeb2bdeaf794df9ae SHA512 c2dea5404dc1808081ee6354a5827e010aea9c448d537975966badee4cdc65b7eef4de991dacc46db1ec7ef16961fed54506a89e93235e3a69848261745faec0
 MISC metadata.xml 377 BLAKE2B ddada9afaa9d6031b4493ad27870959d71c7ad7852399b36468f41c0c11dbd591e0809101927d82a4f80520562b1fb8b65d577086218cc922a7b0e03b761005a SHA512 675191d217533506137aa85c390cbcf2c9683157b451c862701b5ab59d3ca437266243af0cb458f7ee5150fadb444a7eda648091eaa8b4f7e211e0bd98d92c7a
diff --git a/app-text/wdiff/wdiff-1.2.2-r1.ebuild b/app-text/wdiff/wdiff-1.2.2-r1.ebuild
index e5340d3ca4e0..1690a2a05365 100644
--- a/app-text/wdiff/wdiff-1.2.2-r1.ebuild
+++ b/app-text/wdiff/wdiff-1.2.2-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
 IUSE="experimental test"
 
 RDEPEND="
diff --git a/app-text/wdiff/wdiff-1.2.2.ebuild b/app-text/wdiff/wdiff-1.2.2.ebuild
index f423a37982c4..3dc14fe01f8d 100644
--- a/app-text/wdiff/wdiff-1.2.2.ebuild
+++ b/app-text/wdiff/wdiff-1.2.2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
 IUSE="experimental test"
 
 RDEPEND="
diff --git a/app-text/wgetpaste/Manifest b/app-text/wgetpaste/Manifest
index a60a1934a85e..d45d9fb8b05a 100644
--- a/app-text/wgetpaste/Manifest
+++ b/app-text/wgetpaste/Manifest
@@ -2,6 +2,6 @@ AUX wgetpaste-2.29-fix-bpaste.patch 1401 BLAKE2B c7a08ac708aace5fbafcd8de2452133
 AUX wgetpaste-remove-dead.patch 1069 BLAKE2B d11664112833cf72b3f0cfd338e6a3e7b41549b60dedb61915501f45f86d72e6003415fd30badb3820453c3b4c81829b34d5bbe501e33aba735b8668487f109d SHA512 edc121802218f7c32664d76e737195b50e167b8b86e62314bc5c818822ee8dca2807d0d38c81167c9771a9a2023ef507f509abed574bc5f1906fbf39ba72ee18
 DIST wgetpaste-2.28.tar.bz2 12448 BLAKE2B 231b6d00ecf9c355f45683d56537c0fe6a5d6561e42edee680b228f5a76e7e1b202669e429f7941b6daaf14682e5a8469521713930bb42387e168965acfccca2 SHA512 b3b9ee4bfbc52da6762b06c2640385eeedab7910ad1bc4e92ff9304371ec2442e2d30b69ebc0f1407a00a9c8afde398e00dc3d3c048452d730517227a68e6b97
 DIST wgetpaste-2.29.tar.bz2 12988 BLAKE2B 838b84632754f6e07c25fe3648e14bf939dff4e08ae8e8064e94008beb436f77738e4f54859115321fbf445a323641ebfecf5fd7d09bbbb46c72e913687deb07 SHA512 6596842733bb5d1d52cbb3cbcf61ba714f0cbfdc13acb4d6025ccfd27c214adaf886ac3a0a11baefaa4af3f33165619e5a3360b4e0807d29e8dc8ef5ff819bb6
-EBUILD wgetpaste-2.28-r2.ebuild 779 BLAKE2B ed1ba770ecf40257f2db99a7a84e4cbb264264244d407db4659ea82d11afd6f6a1b8960444d11165d413955ab88a3f7df45da734444940f322f0aac18101bbb5 SHA512 851fd5ea306c1f99645096671dcda51a84791863d171bd007b92c47de760db34c6eb15feca2b7d7cb21827f2d00dd74318c715e3f97e031c8e017cbaef54239d
-EBUILD wgetpaste-2.29-r1.ebuild 787 BLAKE2B bb4190d4de6240b39244ec2b1b1a87af2599d81494adbdfe0682bfcdf4edf8dd79f90ae79ffc04acb871a8bcad7d566ab5f6472b76e107516067c598b21b7905 SHA512 87a551c9576cf10096f80588babefcd8fcb285c4e57109c46683b1a523aee3d2b202d479337fda3c654155c5fb1f1c53a1f02cd1c090b84f86f723061dbc0d28
+EBUILD wgetpaste-2.28-r2.ebuild 757 BLAKE2B b594c0b1a36f75cf15efd675e4e493fe5e3f79a46cd739d3da834a795ac84de4285e2bfd868ee6ab09924aa48cad1c0d537cc8fc8b0ba8dd483748c397b79b7c SHA512 3032579ee27278a160eb94be3ba56ceac8e7536cdf035a9240ea4cc7489462a8fed4cf1042f99ddb32c76c3ff884dc6e1a495336522d32deac4e3708f4dfe9a9
+EBUILD wgetpaste-2.29-r1.ebuild 765 BLAKE2B d79f0a29fa9723e71eafb8196ffb596f601c54b4966b9c35867b4ddc9650ffe20f1b1fcc7df65f39253721ee7e5800fbc8e053190c33abeee47c0fcb4b0b6a88 SHA512 d4d65e84ce13e48d056d9e1035dd036643b8c604742774ad2c90be7fe8325c2de89a2e9151976de9007f55856d33b1a293580a814edd36efb6a6f28e9643ebaf
 MISC metadata.xml 498 BLAKE2B 9442c088cf776d11e625be4466d161c7a2103fd34da4aad288a9e7b04297db23c2cf04745d533376fec8649e1ea4936ab27db42963f0e57623018add15182b8c SHA512 e312aefde50dcbe35325de6215d85d82f16d51beb3a5ff1d3e07c5408aeef66dd7a4ee7485cc3f795462429193dd977cb864b4f1ee8a280bb2e2e7f45e521278
diff --git a/app-text/wgetpaste/wgetpaste-2.28-r2.ebuild b/app-text/wgetpaste/wgetpaste-2.28-r2.ebuild
index 8cad5c7d054b..f1ba13c66922 100644
--- a/app-text/wgetpaste/wgetpaste-2.28-r2.ebuild
+++ b/app-text/wgetpaste/wgetpaste-2.28-r2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://wgetpaste.zlin.dk/${P}.tar.bz2"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="+ssl"
 
 DEPEND=""
diff --git a/app-text/wgetpaste/wgetpaste-2.29-r1.ebuild b/app-text/wgetpaste/wgetpaste-2.29-r1.ebuild
index 175617a320c6..75d49b5d1b35 100644
--- a/app-text/wgetpaste/wgetpaste-2.29-r1.ebuild
+++ b/app-text/wgetpaste/wgetpaste-2.29-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://wgetpaste.zlin.dk/${P}.tar.bz2"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="+ssl"
 
 DEPEND=""
diff --git a/app-text/wklej/Manifest b/app-text/wklej/Manifest
index 5adba9955476..d852a0950332 100644
--- a/app-text/wklej/Manifest
+++ b/app-text/wklej/Manifest
@@ -1,3 +1,3 @@
 DIST wklej-0.2.1.tar.gz 4370 BLAKE2B 616126936c37f8f727167745eecca27b7f1ba844b7396bbd2c205c804c90c2632dddb1b74bd9d66cd040c7eaa9a8e179281372b96eeb6d3d8f09ae27250563c7 SHA512 3799a1570f0cc7f1005f69484ceb1c6c88c8a24933beb3e32c0acd758ce29a5a1b6599baeea2b6405ec2da1e4fcb25b2d218b8295c68fa811fa4d53ada96cf0c
-EBUILD wklej-0.2.1-r1.ebuild 771 BLAKE2B 4846a1ad6b8774567e8690c424ece84aec67a7ee8674a4ed655ce2fb7410cef8d103ed4e3648257573c760508d61515899e72ccc24ca3241c8fa9f58285c014e SHA512 940a93f0dcaf325f8dc44cae7e62654860d5dbb8db415c9ea3f15e5d4c2b1612d162b00740abdd908e6265a89c14c186b360d2afd9463ec7157b90b5a1025006
+EBUILD wklej-0.2.1-r1.ebuild 761 BLAKE2B 0b80121aaed2d97ac7e179c25005a685fc8c71db045e4bc1bdd12bb9b54d2013fddb26f46b9d068f217fbe4f9bd3ee9d44018ea6c6dd82345e186cf7e467181b SHA512 af54630f519243c7a45f0d93062761ad907b3eb525313e3fde0d0a93606c4a68428bf7529cacfa7a359473cb8496bac4d48060ed5175646aa307e62437a43e13
 MISC metadata.xml 349 BLAKE2B 9abac59717642921e8f8e3c38865b6fb76d96a1a98a60f5947602d6b66719785eda7629d01f3fe5aea22e8ad3a4af8829e53861c5cff3140acd94a055adfee10 SHA512 b65a626f1a38f94be7617bd3b46819425724097af5536d5378372574ace10d96fc33f96c9ac52b480b4d9e3a33ab63b9b127737d6d0d2e9e02013fd3d0d826b0
diff --git a/app-text/wklej/wklej-0.2.1-r1.ebuild b/app-text/wklej/wklej-0.2.1-r1.ebuild
index 01df0f62ca1d..1fbdd5b27cc5 100644
--- a/app-text/wklej/wklej-0.2.1-r1.ebuild
+++ b/app-text/wklej/wklej-0.2.1-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://wklej.org/m/apps/wklej-${PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86 ~x86-fbsd"
+KEYWORDS="amd64 x86"
 IUSE="+vim"
 # the vim script is python2-only...
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
diff --git a/app-text/wv/Manifest b/app-text/wv/Manifest
index 07ae28b83ef0..a3bd1709baa0 100644
--- a/app-text/wv/Manifest
+++ b/app-text/wv/Manifest
@@ -1,4 +1,4 @@
 AUX wv-1.2.9-format-security.patch 336 BLAKE2B 18641a15c75a32250012771bd8ca8b0739f503ef8d1d2eebe23f2d378996aa3f6e2f0cfa72f8077add3db33f8ece86c57e80cc5b868719472b45ba1bed10a7d0 SHA512 99fef3bec0f129ae2d138c50d1e3e9288d5309db87a72d9b1970d1d230e20be3469b423f0b74c5083a0a5cdca8fed0b2ca32ec1fefdca22f213e4a02a6bbd405
 DIST wv-1.2.9.tar.gz 616256 BLAKE2B 6a6aa6b5f87a934c703c8a74d85af3d7aa84dcd2bc613a3af7fb8d69a9339e71ba2618ae8f725b90c3fe0b0199f4b224bdb32a50c2b6b6614f84b6a14437633f SHA512 ae5c762012595ce8922bfda8749ad3e9cb055edab30152c3a5feaaf3ca6601f357d1e301b179e9a5860cd99452dd6e63e5f44f5bcc12f8db148bdd334e0200a5
-EBUILD wv-1.2.9-r2.ebuild 1454 BLAKE2B a83fc6db9afd3a98697eb1b5f74ac1e9823428b67d2483875e4387717c8b02a2a97093f511490c2006ddaf5813db070ef1514fdd4046e7b1add3b4b66870482a SHA512 db9304515079b91cb54de90d84fafe963dd81e2d37e6fb70a5598448e05958e7ddff037dbbcee8c3337e412f37d92cc26865c3760277ab03ea518ab6b394a610
+EBUILD wv-1.2.9-r2.ebuild 1444 BLAKE2B 24c7c7f1025ec40fa175bb8fae6a8c5af968b3fbfa1f8464c3ca092386c64919a165deb85ae41df2cd529c545c810b7dc1f4c96cbf3773d5522f43dc7e5cb23b SHA512 d00de83a1cdcaae62efaf66277457e2b38d00f78d9125b53bb1db7ef6467c60d927df9de84bc9264732fd0488eb2f16d3e417c1f183bc0f779b7b2245e78fa45
 MISC metadata.xml 448 BLAKE2B 2ad03c8351da9b74d3420841cbb63aa4a5f8723bdd698ded80bfbc91f0d7bda75b0f2d671a74882e32f7f7e1b1e3d6bc4f1ff491132af931e5914b853b3ff854 SHA512 f6ed1d52b212ac06af826dea4218cdc3017d2d7e417f943bd14f2f223221da1d8a4401852e4fd8375195a77f4f10465d93b8ce62e3981c41570220b5699e4a55
diff --git a/app-text/wv/wv-1.2.9-r2.ebuild b/app-text/wv/wv-1.2.9-r2.ebuild
index e80da09ffb16..da374a9fc56e 100644
--- a/app-text/wv/wv-1.2.9-r2.ebuild
+++ b/app-text/wv/wv-1.2.9-r2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://abiword.org/downloads/${PN}/${PV}/${P}.tar.gz"
 HOMEPAGE="http://wvware.sourceforge.net/"
 
 IUSE="tools wmf"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
 SLOT="0"
 LICENSE="GPL-2"
 
diff --git a/app-text/wv2/Manifest b/app-text/wv2/Manifest
index f2c8b210ce66..e581cab0c4d0 100644
--- a/app-text/wv2/Manifest
+++ b/app-text/wv2/Manifest
@@ -1,5 +1,5 @@
 AUX wv2-0.4.2-glib.patch 312 BLAKE2B 7c68aff28688cf4ad7ee99c73d4509197e958bf05fc6dc8a556e2c2376cd586942778dcb8cbb1aa1a80cf24b1ab94415224b5af122756eeae02a316464eb6323 SHA512 0dfa6f75d9c117869eff3c4c5aadaf6096af8b2239626fc249a3df3ddb5437c417c3265a0a5d956af2241c9d7b3cc137b6c79598c38506fedd2964e85bcf54ea
 AUX wv2-0.4.2-libgsf.patch 425 BLAKE2B 417d6b340c34dffee0301308ee5a04f4468a5627670638399535f7336cca7515927392e66dd723e8a13742e71ccb1bf850c7b91608b7f280b545a707d6425a2d SHA512 634b1a336506777f8976b81cd906f8a896e2b777a3f04c5791277ed5ca2856dacb71adab807efecdf29d07c02e4c95b5d6fe143b1660be77e37ed9d7bd177143
 DIST wv2-0.4.2.tar.bz2 452759 BLAKE2B 6134739459617189f9d4e11a660dac25114b5d329b43d02fffe773d25bf62f2eb9f4ccb2712016e670c72f089a6d48f764e99b0ce5d44554d3e9d69ea9e14762 SHA512 7b4fb1dc6aa05da52ea169bf13f3bb544a7a896cf9127b6d67a08e991d798e81e2bf65724cf9396a9b89902f7856007006d8b123fcaaccce77e2a4668a9c9d5b
-EBUILD wv2-0.4.2-r2.ebuild 831 BLAKE2B a8829c7340d953d9b6329837956f2639936a5bf33c6f88b4937fda6bc0f115c24bf8ad96de3046a41b40db3bea124a2ea436944f07e504d352afc605536f6dd1 SHA512 ee2dc6db1c3302a6938157bccb9bddf3d77ef571a5e10907a2832af93fb6452d8668489c648a7d9b26705b01936f63113b52a69629c44ae4d03159ca70f2ae21
+EBUILD wv2-0.4.2-r2.ebuild 821 BLAKE2B 90e207ba4f3ac433eb1b55665859230f473ad6294e2b3b9d338bfc8408285709ca8cf23b894e75625d503d9132993de74f5744bbff716c5468ab83e6c757ef8f SHA512 ae933724c832942bb00e3a4930c3502c87871ad4d341352dab4c6b5b79fb49f65712913bec126af609dda55e69f7355c3507f3b6f50a3195c3a3eeef1600a75b
 MISC metadata.xml 385 BLAKE2B 3528b2f800f83faedd0d61e9842dcd95c97a6fd805beec944ede5967c6f7da198d742521c1d8a5202366518407011ce8cb2b4a6072b9aba2aeb5a5b9642be09d SHA512 700605145c4883ed52e8f5a2dbc230aaabbe12038006c31f784d2bacfa71f8942100ae8342d393a27fa74d19dbc2a6d9cdd829659cf7509182761ecfd4782408
diff --git a/app-text/wv2/wv2-0.4.2-r2.ebuild b/app-text/wv2/wv2-0.4.2-r2.ebuild
index 5f5d76cee7ef..b28db4eef3a1 100644
--- a/app-text/wv2/wv2-0.4.2-r2.ebuild
+++ b/app-text/wv2/wv2-0.4.2-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/wvware/${P}.tar.bz2"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
 IUSE="zlib"
 
 RDEPEND="
diff --git a/app-text/xdvik/Manifest b/app-text/xdvik/Manifest
index 5ca545fed7b7..049f66bb78df 100644
--- a/app-text/xdvik/Manifest
+++ b/app-text/xdvik/Manifest
@@ -1,6 +1,6 @@
 AUX xdvik-22.87.03-freetype2-config.patch 1019 BLAKE2B a675a238fb147dcb67eda572b9a3b1e1b1ab630726464eb740240be0815b9a9da5e5f7a8a6d404648f060995c64efb02acbb67fc907dd6139c6817f0bdb5a946 SHA512 be5b7de6957c5bb2ad884e5b3a6a21f074b84b6be08f519b80a24dacd8630b2bc75dc64e225dba388d17a01bfed6784b2862db2e6bab4b73a1f6d4aebf23a9c6
 AUX xdvik.xpm 3125 BLAKE2B 97990fbd5b22e51319c3f55bfe16808b01f215a92185a170620c8c0ef1dc44906e38af48ad056d4fb40a1777f92a88afaa0f80c0b36e7dd770954f7009d261a3 SHA512 697c888c481d7cbe7b42980d2ae93a8d25d781f926970d9040f8fbc6a37545349fbdbe2e8c98fb686e5a5ebe9a7a5ff661793d3a264fd8641182b0397365517d
 DIST xdvik-22.87.03.tar.gz 4760306 BLAKE2B d242696fadf2980cd307d4a172d2af06d98d07b090279440117f869c9a623bcade8745d7a4d3c108c4eafbdeaadefb8d5ba1ea00bdf77d350cbf83c49c2ca0fb SHA512 d4d418d78658f16d4d278e387ed484b291afc8623b00acaf4110e9f123ed76568714ad50f80588373657f412e8fff36f3e76b3e43f69756d46f031c0f2269a88
-EBUILD xdvik-22.87.03-r1.ebuild 2782 BLAKE2B d20a9864521e5c6605393c63ecc76649194a4e305b4e9259c2002f963c53c55c29d61a03c5755ba3d5b91a2f8e4d28a03028e180223e0ef36fdf4987b0c4cea9 SHA512 eb072fce7b045f3a4318741935c0c23f40981e84ba5f9f9a8c936050c0537c8ba73b99455a4d0e80c349ae4e5a869d40aaae417175f985f7bbaa719b980f91f9
-EBUILD xdvik-22.87.03-r2.ebuild 2923 BLAKE2B 2e2721893d1e2378e80d81e62910ce5194460e0e4598e0f71a1b27c53899ccf4205d62a28751291117939ea098b762fd61b7f06a799be83a34063350595d158e SHA512 5d5ce903b6d8fd592c151cc06220b145d4db309eeb3a2e7b1d31ad65cb8f1e918068afcdbc2e9f38826d0947cf4d2b82eff0cc370448a59e07da23fc83d6379a
+EBUILD xdvik-22.87.03-r1.ebuild 2760 BLAKE2B 019a10d63e77b3ebabe7b21d322dd39442958238050547842b3b583780dfb0357abc2f190ce40e32332e7d7f383988652218a00468f6f27a2f1b2e1c781d05f3 SHA512 cd46dedaf47b11b3f3ffb2febec8321700c2d9620eb7db600175ed21c3d51cd6516a90f33c2d2fbb3bdd0bb1507c81f09e44b89a098e5045f0e63fab35036b00
+EBUILD xdvik-22.87.03-r2.ebuild 2901 BLAKE2B 63409ea7ab58a864ca922d099988a44cefd3a18d6e6d4e4c3c46b69fb5f65616014370caee4e427404acb281d0b10273f17c68ea7096e6837ea88c699207c247 SHA512 04773c14bad5fdb1cd0460d0e69550d1709fb4d3e5cc13afbb7d91469d8306301770229b152f02cf7fba7f7784f882ff68dde1dfe983da7bade9ef56fe9f4ee9
 MISC metadata.xml 594 BLAKE2B 338b1aedaaf7426ed8bc2b9ae08e03f9fd6170b0714f938fc97a0f4555e8daa385635200bcbea4d0959604fad44db3212bd7436ac70b2e49ba353dd48713e7c6 SHA512 b1563a6578aec4be3df4b47c9914de3ad80a8859e60bce3a9b3e48f1b8bff3c38dd266523c913ab97bafa2c0804ab5003b5a449858582ef934044d80065c5cdd
diff --git a/app-text/xdvik/xdvik-22.87.03-r1.ebuild b/app-text/xdvik/xdvik-22.87.03-r1.ebuild
index dc814d5d0db8..b52295a19d1e 100644
--- a/app-text/xdvik/xdvik-22.87.03-r1.ebuild
+++ b/app-text/xdvik/xdvik-22.87.03-r1.ebuild
@@ -8,7 +8,7 @@ DESCRIPTION="DVI previewer for X Window System"
 HOMEPAGE="http://xdvi.sourceforge.net/"
 SRC_URI="mirror://sourceforge/xdvi/${P}.tar.gz"
 
-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 ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 LICENSE="GPL-2"
 IUSE="motif neXt Xaw3d emacs"
diff --git a/app-text/xdvik/xdvik-22.87.03-r2.ebuild b/app-text/xdvik/xdvik-22.87.03-r2.ebuild
index 34a4d9669b4e..d31665bbb6c4 100644
--- a/app-text/xdvik/xdvik-22.87.03-r2.ebuild
+++ b/app-text/xdvik/xdvik-22.87.03-r2.ebuild
@@ -8,7 +8,7 @@ DESCRIPTION="DVI previewer for X Window System"
 HOMEPAGE="http://xdvi.sourceforge.net/"
 SRC_URI="mirror://sourceforge/xdvi/${P}.tar.gz"
 
-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 ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 LICENSE="GPL-2"
 IUSE="motif neXt Xaw3d emacs"
diff --git a/app-text/xhtml1/Manifest b/app-text/xhtml1/Manifest
index a3d63db8760c..5f8d29cc6cbe 100644
--- a/app-text/xhtml1/Manifest
+++ b/app-text/xhtml1/Manifest
@@ -1,5 +1,5 @@
 AUX xhtml1-catalog.patch 834 BLAKE2B 47236e18d55237bbfb6299b634253545299dd9649a58d42af6fc8e56afbb8547564dc17bbefb808b96aea739d7ba673403ab2f3c96b5eddceb7f886353320b51 SHA512 0b4fdb64e73405be53930984e5f628a1b5b48e6d43bebef9f9c502fca31d13b760385c0481030f8a09556447891a542dc4c7bb23f0618fd937e2934936b26780
 DIST xhtml1-20020801.tgz 232192 BLAKE2B 4e2da9b73da93a8196ade80549a2e255b1954178472fddaf2e3d979befda8689f3540a65d41723e40bd0450d626608ffcdcd1fa9183da5e3b13d90a5649fdc23 SHA512 184758381c5e2d36b80fa1e4470e864777383ff7539b48291036f8a3f1dba0b354a32142bfcc9071147fb20bcd4c0d4d541e09e865047938ab4cf9ae5a806412
-EBUILD xhtml1-20020801-r5.ebuild 2174 BLAKE2B 2029974397a6deb6848f5310a0c3078e70219c204406d1ef115241cf22f870f10ce8c18a965b035cdead98db36e4f0833053a67c765d1e538cdad172abada25b SHA512 57294051e859fd17a6942d180026f3d8e74c84e5ddfcf012e1f04f1870a867d908c4b7343b1a99c5a1d52844e86bc4a5754e6488e8ce45973d25e578b0d4a478
-EBUILD xhtml1-20020801-r6.ebuild 2377 BLAKE2B ed9a9c8051f3882925c2daf93b1bec307b7fcc8baec82d14a08ae978b08edc3a6d8ed786d03095413d4451876c35522342d915674eab1641c6da687c31a3b089 SHA512 b77ba0324ab7c73e2d10e95500d9be72c4b075290157f2baa2e322d81ee574897609f18b42fd23ad193273e1f43aece487e52790626a2a3c0f63b9c44ebee393
+EBUILD xhtml1-20020801-r5.ebuild 2160 BLAKE2B ca6392bf2c05f249f7d2ce3a8f4ddbc184c80e6d5d4f292db63f33415c9a108fcc655a633665a7784fce61949bece01a8f29c72ced9994456dee3e3a1e0587a5 SHA512 b1f7470392e2d8acc75c0604f396621c624153baf7a27afac83632a3464c4001d94069b660adcc8432b038f2697ee0c3ab8a8b50dae3224f0d90670c81a791a6
+EBUILD xhtml1-20020801-r6.ebuild 2362 BLAKE2B ba7d9d04ed58a3ac609ae2c684eb7085c1903f1d7caec3994df43050d45d5efc3a61c71d9ea22a068c3d2819f41b9db78e5aef962925469ee6d65e266a335dbd SHA512 4aaa7be3ee9f6255a485fc1193c8c22f15be5f80c53b2dcc16eca4dc0570bfbc3387c8af105b45b0e249734ce646a257446e377fbb5512765ec72bf84c6c829c
 MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/app-text/xhtml1/xhtml1-20020801-r5.ebuild b/app-text/xhtml1/xhtml1-20020801-r5.ebuild
index 8fb45b9a9a67..d46b7a400430 100644
--- a/app-text/xhtml1/xhtml1-20020801-r5.ebuild
+++ b/app-text/xhtml1/xhtml1-20020801-r5.ebuild
@@ -7,7 +7,7 @@ inherit sgml-catalog eutils
 
 DESCRIPTION="DTDs for the eXtensible HyperText Markup Language 1.0"
 HOMEPAGE="http://www.w3.org/TR/xhtml1/"
-SRC_URI="mirror://gentoo/xhtml1.tgz -> ${P}.tgz"
+SRC_URI="mirror://gentoo/${P}.tgz"
 LICENSE="W3C"
 
 SLOT="0"
diff --git a/app-text/xhtml1/xhtml1-20020801-r6.ebuild b/app-text/xhtml1/xhtml1-20020801-r6.ebuild
index f8356d929bb6..8c5588a7bab4 100644
--- a/app-text/xhtml1/xhtml1-20020801-r6.ebuild
+++ b/app-text/xhtml1/xhtml1-20020801-r6.ebuild
@@ -6,11 +6,11 @@ inherit sgml-catalog-r1
 
 DESCRIPTION="DTDs for the eXtensible HyperText Markup Language 1.0"
 HOMEPAGE="http://www.w3.org/TR/xhtml1/"
-SRC_URI="mirror://gentoo/xhtml1.tgz -> ${P}.tgz"
+SRC_URI="mirror://gentoo/${P}.tgz"
 
 LICENSE="W3C"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ~arm64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""
 
 DEPEND="app-text/sgml-common
diff --git a/app-text/xmlto/Manifest b/app-text/xmlto/Manifest
index 88a7b1eab2c8..fa2fb2315101 100644
--- a/app-text/xmlto/Manifest
+++ b/app-text/xmlto/Manifest
@@ -1,4 +1,4 @@
 AUX xmlto-0.0.22-format_fo_passivetex_check.patch 2286 BLAKE2B eb004b4fa394840b8e6fd792bfacfee75d180a1493d960348a33c7737a33a15a809fff28f4b6ade3deb045b629eb48a675b56037da56a7fabcd20718dfdaa6a4 SHA512 c8eeb3dc909431dd2fb9f5286b6ee98a40dce80a29606a9884bdab50c039ac90097720b9b968dfac76546492844de0b72f2f6c937da14b47142ad81b897023f4
 DIST xmlto-0.0.28.tar.bz2 127921 BLAKE2B 12ef3e2e1436c330e7b003d08f4a4d4032d70255777956949eb8b47b6f5466e7c158b0f85dc87069c1e379603cac0b01c88589f98ca1ef9e862f0aef31169f6d SHA512 6e0c4968d4f1b7a3b132904182aa72a73f6167553eabdeb65cfafa6295ef7b960541685769d04144207963cca77b0c44db4f9fbb2796348ffcb37b3b399f18f1
-EBUILD xmlto-0.0.28-r1.ebuild 1535 BLAKE2B 9f0cb2f5a8d01df0e0c0141e11ae643d0a16f5447af89558ee5b04980089af264a199e2cb01623002c39f45164d12c49b6c6e64dae1f1c11fb01762790211d76 SHA512 e75155e646074603c1c493c3d09eca089485a6d02753f422c544f23accfb7c9266bbd9ab48a2e4239510c00401a0b3320410390bf7aae02e2fdb6e2e9d471dd9
+EBUILD xmlto-0.0.28-r1.ebuild 1513 BLAKE2B 3c483fd0b679631399c05f9ab464f994585c6a67e8f6424fddef806c8923d49ef9fe3e0b24f704658fa9c9cef022a9ccd572f02e1e30c36fced8b6897b66d2a6 SHA512 1aa034fbf1930bbfd6d3ef2be1c5452185c7a0a87870b67e9a2107fb65c7a1ec47d0688f264ff7f2bb4c5cb68a91f6665b676a517a6a3a760a7da3c2d389a41b
 MISC metadata.xml 247 BLAKE2B 17c173af66eaa7e25c4a88ae4e5b8cba24cd1f324224ddeb95774690a862c678f2c6c51cfd175aaa3781efa83d0526c01883b7888cba6fb9ba8f62b9bef5942f SHA512 f2b92e9bda8e4466d98436c15ee46b2a382afa4bfcf868678bb245abda936298ed41d03f3dcf5a61000ae1b1031a5578635e15293d63c531773d6a42d356af47
diff --git a/app-text/xmlto/xmlto-0.0.28-r1.ebuild b/app-text/xmlto/xmlto-0.0.28-r1.ebuild
index 84a3540260aa..7db02ef37d17 100644
--- a/app-text/xmlto/xmlto-0.0.28-r1.ebuild
+++ b/app-text/xmlto/xmlto-0.0.28-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://releases.pagure.org/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="latex text"
 
 RDEPEND=">=app-text/docbook-xsl-stylesheets-1.62.0-r1
diff --git a/app-text/yelp-tools/Manifest b/app-text/yelp-tools/Manifest
index 5bc91a3d6397..8aa129e4f488 100644
--- a/app-text/yelp-tools/Manifest
+++ b/app-text/yelp-tools/Manifest
@@ -1,7 +1,7 @@
 DIST yelp-tools-3.18.0.tar.xz 210712 BLAKE2B 8b9af089bc2d337d5474525f369b5ff5773391dac4deba7610545625a8550cb2735f9295282cd490b176ba9648f3b91e3865fedba27c4c0b4155b2e99bf8db8e SHA512 75957b06bdade966a33a41ecc68dfa3eb3b3e3550dc8c6664ee694c4b043c8b45a2403dd23c9810347ed7234ceb5389a34133554de012a7e0afc5db891525fb8
 DIST yelp-tools-3.28.0.tar.xz 210496 BLAKE2B 2904b0ffe50f302d7f0938fecca74b37f6d070fe42fd681dd96b3a70b73244f65e204c34bb6f6ffb2b5bcd3400334b3d85a82807793b2bd30261c616382b8be6 SHA512 0b5adcb746ffb2b9c60303ef484dac01fbb59a06abf94bb8ec8a66bd573451939299688dec088a7421eab8f69ec2d7628475e81720640f0cb5b947a8d410ed62
 DIST yelp-tools-3.32.2.tar.xz 211668 BLAKE2B b45aef4d03f1954ac33bb05a9c788af40a74d76b54c2a0bcc466098e18435e02eb40004465dda399eb74e986caf404e51a393974d37ef1abeff6d76289840ecc SHA512 c9383426b854ae46ff4587bef07955541de3026f845025f9e99ba095cce11ff307e23d00d07a2da8763bcb6f9f061fc610351170e2abd99b5669912463729a85
-EBUILD yelp-tools-3.18.0.ebuild 665 BLAKE2B cca32e98a9cbcf49457795aa608955662f8a58ab7276b24aed66b5069f1f67de5c6ea5c244c4ec8dba26670b996e3d1554d210888fe339bc1f7b299b32aca978 SHA512 265e23a9f7286e866e85c431dbab8bed4f1c6477ac55029f1e55680cee77840be72260470d6bb81590174a16a0f5affc8c54fe8d072bd834ffb666f4d685f8c6
-EBUILD yelp-tools-3.28.0.ebuild 644 BLAKE2B 9571186c6a9ac3bc24e582165f8c115a485e24be2b8f2cbe9b71a7b7cce0e1a00b890b3ea6b330141ccea480581a87d2571c9d27695ff56054502152622b1db3 SHA512 96b9a6195150ed92076ecaa96b6697445d3bf63ed4a5c144bf14370fbe0f67ca23973b85623f041d84c77f08a4043ac3ee18e99fe001c6830aad4148c521c89f
-EBUILD yelp-tools-3.32.2.ebuild 654 BLAKE2B 59cb15841c8c003bc6cb65e25ee24a6b52b502b990f01801f759a3437a71555ee7ed3b8eaeff26c2933548c240c096eebac3469b77c7dce042d4abc8b0ead16a SHA512 50f9a685c573c554acdb025ec786210e53cc02aa72d45e53e2f64c97719c6ca557ef6f22f89548aa0ffbe040ea37586d43d4c81ce757c8f56db1d3be2335c47d
+EBUILD yelp-tools-3.18.0.ebuild 653 BLAKE2B eebca2c8369fe16431219fb8a66815fd6246a74d70bf85078bed0685f84f69cb15583209f60653e24eb5fb8c2a498f10407a54bb42ae8f9c374a3613dd2fff95 SHA512 4d5f2c149a3dffb3d10f5854061f2ad35b030a993aa4f02ef43b77a647de7fbe5fee3036b8eef8095cc1a3ed86107b5f62fa0d9a065fca60855b90db0432ef89
+EBUILD yelp-tools-3.28.0.ebuild 632 BLAKE2B 3a0a01ed48e27bb67336da5926e9e25705cdee023272b99bfc18777fd83e46a98bbdf84b253fd85b22625a66f3a2e0f185bccd625faa8eb9b21931dced578879 SHA512 9416cc50f6c4fa52770092f63477b0799d394f25ecfbd418ba715476e39b202325ac67abd03d97e90410316308839fa5b0485d06a9b54011ea26b599b12b0dbf
+EBUILD yelp-tools-3.32.2.ebuild 642 BLAKE2B f9ef83aaa31ba3ddb2f6a545fe1953cc962a5b87c22b07ba54673279daa050d580b8fdcfce6c8bf77b9b7ad1ea936bfd272ec140878edc0f1dfc68782f937665 SHA512 013b643dda6eddf471b0b931a785e92256c434ac379127679c08ed664ca9c673305b602a041ea962149df354e1f13bcbe3116d3518d10a8a96ee9a6e6e0c058a
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/app-text/yelp-tools/yelp-tools-3.18.0.ebuild b/app-text/yelp-tools/yelp-tools-3.18.0.ebuild
index fa0c5f05052e..860196bb74fa 100644
--- a/app-text/yelp-tools/yelp-tools-3.18.0.ebuild
+++ b/app-text/yelp-tools/yelp-tools-3.18.0.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Yelp/Tools"
 
 LICENSE="|| ( GPL-2+ freedist ) GPL-2+" # yelp.m4 is GPL2 || freely distributable
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="
diff --git a/app-text/yelp-tools/yelp-tools-3.28.0.ebuild b/app-text/yelp-tools/yelp-tools-3.28.0.ebuild
index ed2cb1c720de..5da64177c9d5 100644
--- a/app-text/yelp-tools/yelp-tools-3.28.0.ebuild
+++ b/app-text/yelp-tools/yelp-tools-3.28.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Yelp/Tools"
 
 LICENSE="|| ( GPL-2+ freedist ) GPL-2+" # yelp.m4 is GPL2 || freely distributable
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="
diff --git a/app-text/yelp-tools/yelp-tools-3.32.2.ebuild b/app-text/yelp-tools/yelp-tools-3.32.2.ebuild
index 2316f862c34a..d4510ed309d3 100644
--- a/app-text/yelp-tools/yelp-tools-3.32.2.ebuild
+++ b/app-text/yelp-tools/yelp-tools-3.32.2.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Yelp/Tools"
 
 LICENSE="|| ( GPL-2+ freedist ) GPL-2+" # yelp.m4 is GPL2 || freely distributable
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="
author	V3n3RiX <venerix@redcorelinux.org>	2019-10-13 22:19:36 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2019-10-13 22:19:36 +0100
commit	bb72e65b6d6ce95abb5d486dad35d37dc105e89b (patch)
tree	b31a9263d386dcae4cb06764136672508dc5efdf /app-text
parent	9b1e6d491f32eb4caf0c8e197bdec075713c97ca (diff)