gentoo resync : 10.11.2019

17 files changed, 16 insertions, 320 deletions

diff --git a/app-text/docbook-sgml-dtd/Manifest b/app-text/docbook-sgml-dtd/Manifest
index 5a5c34d37de8..9d14a47d31dd 100644
--- a/app-text/docbook-sgml-dtd/Manifest
+++ b/app-text/docbook-sgml-dtd/Manifest
@@ -14,20 +14,12 @@ 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 978 BLAKE2B f83ac7ee8771bea0ee40dbacc4ecd1c024e594d02eb9a22b75199f07deffc72c2dc1f99d92a00fabf97742b8fbdffd6683193a618b4d2980a2140ac4ad271c69 SHA512 091b15d441c6d58bf32fb120ca27f679126d1b62f57e33a876c259db6b8b4893573d74bccd89b5d80d8be6e55f735b3553eb860172e261137773e2eaf43e5de2
-EBUILD docbook-sgml-dtd-3.0-r4.ebuild 1245 BLAKE2B 813c4577a5a9a53c10962676a86e57a681080a22685b604ce6ef37e68aedc1167444f794abc2a87b68b7d76f916564ffefe4c095d09f11c586df820b35f1f27a SHA512 f0ea8aa41863ac7064441e2eba8d3bbb1ae2e279d9dd5ed66b366668f2dcd3373d3e4ddd1e4e7367655694e93f34c8ef44258caf39c7775a100a4b94d8e185d0
-EBUILD docbook-sgml-dtd-3.1-r3.ebuild 978 BLAKE2B e426fd076c89a1d2a42574f3e2cb69cbc977660853fac147ec8d86f2f861abf13eda82b2e49c0703f6dc2b5867ac9101d95c93dad31d4f1ee4793982b9d2e7c5 SHA512 892fe39a4fb234cb3429982f8f8c6dbe9815453b3ce9de8b993e96eb5c429a87407ab60255f7e0b71844b910c66533d56f116f3d1b85f3382b76c735c0439b4b
-EBUILD docbook-sgml-dtd-3.1-r4.ebuild 1245 BLAKE2B 813c4577a5a9a53c10962676a86e57a681080a22685b604ce6ef37e68aedc1167444f794abc2a87b68b7d76f916564ffefe4c095d09f11c586df820b35f1f27a SHA512 f0ea8aa41863ac7064441e2eba8d3bbb1ae2e279d9dd5ed66b366668f2dcd3373d3e4ddd1e4e7367655694e93f34c8ef44258caf39c7775a100a4b94d8e185d0
-EBUILD docbook-sgml-dtd-4.0-r3.ebuild 978 BLAKE2B 4ecff8ed147969f87de00150cf77a1e53162926833847e09ea0fddd0da59d366979f495b05d52cd029afc67fb4746f3f95f22615ee7bd351bab7af934d095cde SHA512 1dbed9ae40cbfe8856f075a6d358b7aa29ccc97833be63529f8bffb573c813e42304591514e2224e3f7aa9140f16e29ff756908e91e73dffde39155f4359c558
-EBUILD docbook-sgml-dtd-4.0-r4.ebuild 1245 BLAKE2B 813c4577a5a9a53c10962676a86e57a681080a22685b604ce6ef37e68aedc1167444f794abc2a87b68b7d76f916564ffefe4c095d09f11c586df820b35f1f27a SHA512 f0ea8aa41863ac7064441e2eba8d3bbb1ae2e279d9dd5ed66b366668f2dcd3373d3e4ddd1e4e7367655694e93f34c8ef44258caf39c7775a100a4b94d8e185d0
-EBUILD docbook-sgml-dtd-4.1-r3.ebuild 978 BLAKE2B 86c16063c95d657d5716c755edcd97ef30d526e3df241a30acc98fc96eb55f22efac6b34f32b6c4d08b830622eb9cddbf2efa721878a2a6499af2c5cd3763e04 SHA512 c102a80ffa3faa1a869ff959044181e1516698a03f211b119a5c1478167cf0601f7d2af2cb43595a217fdf7ac85e67b21a0343b7620c780775dd636212b76403
-EBUILD docbook-sgml-dtd-4.1-r4.ebuild 1245 BLAKE2B 813c4577a5a9a53c10962676a86e57a681080a22685b604ce6ef37e68aedc1167444f794abc2a87b68b7d76f916564ffefe4c095d09f11c586df820b35f1f27a SHA512 f0ea8aa41863ac7064441e2eba8d3bbb1ae2e279d9dd5ed66b366668f2dcd3373d3e4ddd1e4e7367655694e93f34c8ef44258caf39c7775a100a4b94d8e185d0
-EBUILD docbook-sgml-dtd-4.2-r2.ebuild 993 BLAKE2B a946b13102ff386653ae52ebcbc3b13b8757443582801bc20d197080fc7f236c10ae4d5e023472d04869b3705cae6c500ab7ee56f4ca51e55c896baf5a6865ef SHA512 97a9e5dda3e40b722038fcb66c5a5b952b5debc5915b3de530142f04f31178e89bd7844b866442fc7cfa14c2ddaf1b34d73cf674e171917d3e92fd052ce75ac6
-EBUILD docbook-sgml-dtd-4.2-r3.ebuild 1256 BLAKE2B 715af8907a10f9a0fcf1a77b14e59ec4622e3078de1f29cc7b0507cf915c45d9e7f4c3f3b14a52b85208bf2b10f21cd886de23543fcead1ef546bb002eeebf55 SHA512 70f1a8846503620dfb3609fcda5ca592e67316e633b8649bef1f58246c1f34fd1d91cf946ef14f55a1b3aba719c2061242a182f39ab6f608da197ec04b355bc1
-EBUILD docbook-sgml-dtd-4.3-r2.ebuild 984 BLAKE2B ceba8e72d4050fc5783081d64bc2ab5feb8a5d6f7624a9cbcb1f606bff3923e839e9fcdd01fc83435857c647004f55bd692c7b7be288f24030f84f72c1c9c558 SHA512 34e3f2aabebda0eb43314ab3b2851466821fda47652713b65768a2876e04c0d516dba2164e1a432e22576b713045ed08c3743ec704f7141290efb2712707c695
-EBUILD docbook-sgml-dtd-4.3-r3.ebuild 1241 BLAKE2B f1e47412c600755c463675ba6fa7193a456f156a9961ca15df2754e572f0a1013dd3234dff17fb6683276d2ff3f3520abb78f025564aaedbe6702608ec5a35ec SHA512 b071c2bdcf354a40f1ad37964c7a2ee96273eb5d2f68235565796263917022f6b0c4e195284c5c9f5435cf4afc23aea32fd46148ed8c1545f6479c437ba47dc8
-EBUILD docbook-sgml-dtd-4.4-r1.ebuild 1241 BLAKE2B 6ffac3fa9e4d57fddc0c1ff3417ea6c91907b11ecab7cca7a8079bc08deb774a04f234ce979b4804a0c9a9ea1f34341b81b4333e02772ab22b16de127923dad5 SHA512 f07a1abeb6d48ac01cdffce7277d4eda5f6d5006cba5fa4746c6492ef3fd46602a5af7f9e353b3a4f48168c35bbf9af80a4499a2a74fa730573fc6fe3ced34ee
-EBUILD docbook-sgml-dtd-4.4.ebuild 984 BLAKE2B 69c42245da0c03a7aa65da7de54fa2fb68c1805360c7b8bad0e94169e82f3e1c55c9a43a4e96bc99cc2d599051b570ed647e924ea35a7066c67a2bd58870eab0 SHA512 70dac72ddc99a35fe804db3f70f515f432c1318897be424451d7c4912c67c7003df00fd61bc8a69fe4d2aa6bee0bd6557d9f86f6699b6b49dc6e9db07389a77e
-EBUILD docbook-sgml-dtd-4.5-r1.ebuild 1237 BLAKE2B ab2334a97d0dbd41255fefaa87eeac31c7631ab02005c0aa5b39a1271782b8c933eacab3c2ac3f6209b0122e47160d9f4cf5f431e0c9ce4f0077a73290f3139c SHA512 3bf8078e4fc10e9b089da0e89ce1284f28253dbb898c4c944780f76b812c2daeb6f9aff1c9b1b5bf526dad730ad17367ccded29b8674b0b2c3d9f46eb51f6cdb
-EBUILD docbook-sgml-dtd-4.5.ebuild 977 BLAKE2B 9dd0c5251b840856e6b1949258fb6ee427dbc3fe0487a2fc21153bb58cde8877e3d1bd899941ca51f884b8f3b6e2ae2a87c5bcc9f8d00cb138cb36ec9d31e415 SHA512 89b7ee7d59bf1bec074fe6a3136e09c8c0967cf21119b7cbef6ff2271a6eab140672543ce4899f5b22c4113a71c3b74c928ed57f8b0a569ed75eaf218fb6dacb
+EBUILD docbook-sgml-dtd-3.0-r4.ebuild 1242 BLAKE2B 00b5b550b36c113d18a1b6f1daad7ad5036b8a9cdbe776a1f664d2026d9175af288dd838906cc7dcd48c185c48dc85d555b092ca7302c2a83958ae467b3df15f SHA512 727d35d3f4870b0e26023c1467c2e11e1770782e4dfef86148b76a947e175057e93af0c5784a2937dd3d305549c9ba0318b5a058d5c631973fbc17211b7f9adc
+EBUILD docbook-sgml-dtd-3.1-r4.ebuild 1242 BLAKE2B 00b5b550b36c113d18a1b6f1daad7ad5036b8a9cdbe776a1f664d2026d9175af288dd838906cc7dcd48c185c48dc85d555b092ca7302c2a83958ae467b3df15f SHA512 727d35d3f4870b0e26023c1467c2e11e1770782e4dfef86148b76a947e175057e93af0c5784a2937dd3d305549c9ba0318b5a058d5c631973fbc17211b7f9adc
+EBUILD docbook-sgml-dtd-4.0-r4.ebuild 1242 BLAKE2B 00b5b550b36c113d18a1b6f1daad7ad5036b8a9cdbe776a1f664d2026d9175af288dd838906cc7dcd48c185c48dc85d555b092ca7302c2a83958ae467b3df15f SHA512 727d35d3f4870b0e26023c1467c2e11e1770782e4dfef86148b76a947e175057e93af0c5784a2937dd3d305549c9ba0318b5a058d5c631973fbc17211b7f9adc
+EBUILD docbook-sgml-dtd-4.1-r4.ebuild 1242 BLAKE2B 00b5b550b36c113d18a1b6f1daad7ad5036b8a9cdbe776a1f664d2026d9175af288dd838906cc7dcd48c185c48dc85d555b092ca7302c2a83958ae467b3df15f SHA512 727d35d3f4870b0e26023c1467c2e11e1770782e4dfef86148b76a947e175057e93af0c5784a2937dd3d305549c9ba0318b5a058d5c631973fbc17211b7f9adc
+EBUILD docbook-sgml-dtd-4.2-r3.ebuild 1253 BLAKE2B 9e99e7d84a26391457c49c037450f222269e2384dd959469227c9523f44a42d0c1fd638d1dd311cc53f701cadad8827b7f2a7aef5ceee23c726339ad22550fd1 SHA512 6870f7d0edd338c08bfe3289fb23dad0e5714a609d056db9fea66fd1b2af3f2609d2a3480ef09393b1c2d5c1a72e7a6c92236f1bac64c28fc03427e29d7fabff
+EBUILD docbook-sgml-dtd-4.3-r3.ebuild 1238 BLAKE2B e2d9486b56e81a6316fcba317597b76eeff5a24d1a1ac3c2b23257a0e86c9642ff7624a8d6ad651acc4d7a8c23eabff587f88560ce99a09dc03eb6f4d801f981 SHA512 e0a85aa9cd953090bc9c6e22fe0a262a6e9643febed4430a02b13561a04918dafc9888aa57d960e665faa8cb44971172b75ffa07502ce5185f151a316ea2bf48
+EBUILD docbook-sgml-dtd-4.4-r1.ebuild 1238 BLAKE2B 5564aa069926cf2c706caeda1e6cab0701b18fa2aedf603eccb14e5ed38de7dba3a946b970f9538a73edbaeec1089f90fc9b868ed288541dd792b8cae5025f98 SHA512 2b02e87e9ca37218c689bff17406f8c490f3d090f55ee46a2c54b162f97003c2d61ee125d2d53d28e5ab57aae173c4afd9b4aea26709b986e6f7aec482d6113e
+EBUILD docbook-sgml-dtd-4.5-r1.ebuild 1234 BLAKE2B f95b6448582b3628334dc13224e662a4d9089578a9f4723a40b409fd5686b92420ca02ac28f1cb50ced176fa05a8410f84a296a6a681f990c79919e503921fc0 SHA512 87c1c6e7b2ab2e024eb8617f1edb007a3baa0d9fd51c10c4cb83718467774757c43d52d0461eea126ac8dca3a3056830138765fa5f245a982bdc742fd8828fc7
 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
deleted file mode 100644
index f211f5548831..000000000000
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.0-r3.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit sgml-catalog eutils
-
-MY_P="docbk30"
-DESCRIPTION="Docbook SGML DTD 3.0"
-HOMEPAGE="https://docbook.org/sgml/"
-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-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
-IUSE=""
-
-DEPEND=">=app-arch/unzip-5.41"
-RDEPEND="app-text/sgml-common"
-
-S="${WORKDIR}"
-
-sgml-catalog_cat_include "/etc/sgml/sgml-docbook-${PV}.cat" \
-	"/usr/share/sgml/docbook/sgml-dtd-${PV}/catalog"
-sgml-catalog_cat_include "/etc/sgml/sgml-docbook-${PV}.cat" \
-	"/etc/sgml/sgml-docbook.cat"
-
-src_prepare() {
-	default
-	epatch "${FILESDIR}"/${P}-catalog.diff
-}
-
-src_install() {
-	insinto /usr/share/sgml/docbook/sgml-dtd-${PV}
-	doins *.dcl *.dtd *.mod
-	newins docbook.cat catalog
-	dodoc *.txt
-}
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 b9215d7e2a0f..485227051b7c 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-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
deleted file mode 100644
index 58c55ff1b74a..000000000000
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.1-r3.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit sgml-catalog eutils
-
-MY_P="docbk31"
-DESCRIPTION="Docbook SGML DTD 3.1"
-HOMEPAGE="https://docbook.org/sgml/"
-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-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
-IUSE=""
-
-DEPEND=">=app-arch/unzip-5.41"
-RDEPEND="app-text/sgml-common"
-
-S="${WORKDIR}"
-
-sgml-catalog_cat_include "/etc/sgml/sgml-docbook-${PV}.cat" \
-	"/usr/share/sgml/docbook/sgml-dtd-${PV}/catalog"
-sgml-catalog_cat_include "/etc/sgml/sgml-docbook-${PV}.cat" \
-	"/etc/sgml/sgml-docbook.cat"
-
-src_prepare() {
-	default
-	epatch "${FILESDIR}"/${P}-catalog.diff
-}
-
-src_install() {
-	insinto /usr/share/sgml/docbook/sgml-dtd-${PV}
-	doins *.dcl *.dtd *.mod
-	newins docbook.cat catalog
-	dodoc *.txt
-}
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 b9215d7e2a0f..485227051b7c 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-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
deleted file mode 100644
index 36599e3c3693..000000000000
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.0-r3.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit sgml-catalog eutils
-
-MY_P="docbk40"
-DESCRIPTION="Docbook SGML DTD 4.0"
-HOMEPAGE="https://docbook.org/sgml/"
-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-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
-IUSE=""
-
-DEPEND=">=app-arch/unzip-5.41"
-RDEPEND="app-text/sgml-common"
-
-S="${WORKDIR}"
-
-sgml-catalog_cat_include "/etc/sgml/sgml-docbook-${PV}.cat" \
-	"/usr/share/sgml/docbook/sgml-dtd-${PV}/catalog"
-sgml-catalog_cat_include "/etc/sgml/sgml-docbook-${PV}.cat" \
-	"/etc/sgml/sgml-docbook.cat"
-
-src_prepare() {
-	default
-	epatch "${FILESDIR}"/${P}-catalog.diff
-}
-
-src_install() {
-	insinto /usr/share/sgml/docbook/sgml-dtd-${PV}
-	doins *.dcl *.dtd *.mod
-	newins docbook.cat catalog
-	dodoc *.txt
-}
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 b9215d7e2a0f..485227051b7c 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-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
deleted file mode 100644
index 0180a134092f..000000000000
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.1-r3.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit sgml-catalog eutils
-
-MY_P="docbk41"
-DESCRIPTION="Docbook SGML DTD 4.1"
-HOMEPAGE="https://docbook.org/sgml/"
-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-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
-IUSE=""
-
-DEPEND=">=app-arch/unzip-5.41"
-RDEPEND="app-text/sgml-common"
-
-S="${WORKDIR}"
-
-sgml-catalog_cat_include "/etc/sgml/sgml-docbook-${PV}.cat" \
-	"/usr/share/sgml/docbook/sgml-dtd-${PV}/catalog"
-sgml-catalog_cat_include "/etc/sgml/sgml-docbook-${PV}.cat" \
-	"/etc/sgml/sgml-docbook.cat"
-
-src_prepare() {
-	default
-	epatch "${FILESDIR}"/${P}-catalog.diff
-}
-
-src_install() {
-	insinto /usr/share/sgml/docbook/sgml-dtd-${PV}
-	doins *.dcl *.dtd *.mod
-	newins docbook.cat catalog
-	dodoc *.txt
-}
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 b9215d7e2a0f..485227051b7c 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-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
deleted file mode 100644
index f422cc2836ee..000000000000
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.2-r2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit sgml-catalog eutils
-
-MY_P="docbook-4.2"
-DESCRIPTION="Docbook SGML DTD 4.2"
-HOMEPAGE="https://docbook.org/sgml/"
-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-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
-IUSE=""
-
-DEPEND=">=app-arch/unzip-5.41"
-RDEPEND="app-text/sgml-common"
-
-S="${WORKDIR}"
-
-sgml-catalog_cat_include "/etc/sgml/sgml-docbook-${PV}.cat" \
-	"/usr/share/sgml/docbook/sgml-dtd-${PV}/catalog"
-sgml-catalog_cat_include "/etc/sgml/sgml-docbook-${PV}.cat" \
-	"/etc/sgml/sgml-docbook.cat"
-
-src_prepare() {
-	default
-	epatch "${FILESDIR}"/${P}-catalog.diff
-}
-
-src_install() {
-	insinto /usr/share/sgml/docbook/sgml-dtd-${PV}
-	doins *.dcl *.dtd *.mod
-	newins docbook.cat catalog
-	dodoc ChangeLog README
-}
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 a94c3f33001c..ed669365795e 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-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
deleted file mode 100644
index bd78edf23ce2..000000000000
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.3-r2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit sgml-catalog eutils
-
-MY_P="docbook-${PV}"
-DESCRIPTION="Docbook SGML DTD 4.3"
-HOMEPAGE="https://docbook.org/sgml/"
-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-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
-IUSE=""
-
-DEPEND=">=app-arch/unzip-5.41"
-RDEPEND="app-text/sgml-common"
-
-S="${WORKDIR}"
-
-sgml-catalog_cat_include "/etc/sgml/sgml-docbook-${PV}.cat" \
-	"/usr/share/sgml/docbook/sgml-dtd-${PV}/catalog"
-sgml-catalog_cat_include "/etc/sgml/sgml-docbook-${PV}.cat" \
-	"/etc/sgml/sgml-docbook.cat"
-
-src_prepare() {
-	default
-	epatch "${FILESDIR}"/${P}-catalog.diff
-}
-
-src_install() {
-	insinto /usr/share/sgml/docbook/sgml-dtd-${PV}
-	doins *.dcl *.dtd *.mod
-	newins docbook.cat catalog
-	dodoc ChangeLog README
-}
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 b2993927d029..a05f25398105 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-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 e0216934a547..5bb97d5cabad 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-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
deleted file mode 100644
index e8a323c5cbf5..000000000000
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.4.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit sgml-catalog eutils
-
-MY_P="docbook-${PV}"
-DESCRIPTION="Docbook SGML DTD 4.4"
-HOMEPAGE="https://docbook.org/sgml/"
-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-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
-IUSE=""
-
-DEPEND=">=app-arch/unzip-5.41"
-RDEPEND="app-text/sgml-common"
-
-S="${WORKDIR}"
-
-sgml-catalog_cat_include "/etc/sgml/sgml-docbook-${PV}.cat" \
-	"/usr/share/sgml/docbook/sgml-dtd-${PV}/catalog"
-sgml-catalog_cat_include "/etc/sgml/sgml-docbook-${PV}.cat" \
-	"/etc/sgml/sgml-docbook.cat"
-
-src_prepare() {
-	default
-	epatch "${FILESDIR}"/${P}-catalog.diff
-}
-
-src_install() {
-	insinto /usr/share/sgml/docbook/sgml-dtd-${PV}
-	doins *.dcl *.dtd *.mod
-	newins docbook.cat catalog
-	dodoc ChangeLog README
-}
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 7f4bf9b937ad..e1907f7a0832 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-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
deleted file mode 100644
index 9fb1467339c4..000000000000
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.5.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils sgml-catalog
-
-MY_P="docbook-${PV}"
-DESCRIPTION="Docbook SGML DTD 4.5"
-HOMEPAGE="https://docbook.org/sgml/"
-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-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
-IUSE=""
-
-DEPEND=">=app-arch/unzip-5.41"
-RDEPEND="app-text/sgml-common"
-
-S="${WORKDIR}"
-
-sgml-catalog_cat_include "/etc/sgml/sgml-docbook-${PV}.cat" \
-	"/usr/share/sgml/docbook/sgml-dtd-${PV}/catalog"
-sgml-catalog_cat_include "/etc/sgml/sgml-docbook-${PV}.cat" \
-	"/etc/sgml/sgml-docbook.cat"
-
-src_prepare() {
-	default
-	epatch "${FILESDIR}"/${P}-catalog.diff
-}
-
-src_install() {
-	insinto /usr/share/sgml/docbook/sgml-dtd-${PV}
-	doins *.dcl *.dtd *.mod *.xml
-	newins docbook.cat catalog
-	dodoc README
-}