gentoo resync : 10.11.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-11-10 13:21:36 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2019-11-10 13:21:36 +0000
commit: 77398e424e45d9e98c1cef3c43bdadb9d56e81ef (patch)
tree: 5aeffd3fc7b92fc615bd2c222fa8831aeda1925b /app-text
parent: bd4aeefe33e63f613512604e47bfca7b2187697d (diff)
90 files changed, 481 insertions, 1552 deletions
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 1191695c0525..26341d1cf7bd 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/binfind/Manifest b/app-text/binfind/Manifest
index 53b895eee61c..a90622c19bec 100644
--- a/app-text/binfind/Manifest
+++ b/app-text/binfind/Manifest
@@ -1,3 +1,3 @@
 DIST binfind-0.0.3.tar.gz 91222 BLAKE2B 87ab9faa611064b87771d5ddd799b792e27af457e5a768b4ee7c0f3976c41ed8692673a753b95450124ad0c3c8e5e473081961482b856dfb8e722323915d04d7 SHA512 b3a8b72669f701ce54fb3d1c2331262cfc7f396239d14741d3a106c999ef58739a7f33de87da427983ffb641baa7fae4857aa6aab2e1c0748a61d8b913dca3f1
-EBUILD binfind-0.0.3.ebuild 450 BLAKE2B b593671a6a0cf914595083e1cd75a162bea9ecb1fd7a7eb7b09ab8647b8f2826b1fcaf8adc24bda8d586a42f39df14bcae5d3bd08d6f7e94e914a538c343bc24 SHA512 be300ac9e50d23ee645faba00aca9c1b09e00edf2280b9018c1add1bf82570f12ba173ec42412c1779da26c9b4a637af2d13d230b4c88895a58e47733a87300a
+EBUILD binfind-0.0.3.ebuild 336 BLAKE2B 68ff0199c4cda256c6d4a9e3630e17e942ca457cd5d9032d0eb240343e81ed8f1f63c3518eb422ac9a8faf51a5417c69692f6077de60b809d54b1e87be2180e2 SHA512 7eca1309f13bdb84fb71448a47a38610141f1d221016db1178046ec78a6f0eec5c1bd3bd732ad1f2dc7614bc8be773edcd9ff4ee4397901234ef9872ef8f8cfe
 MISC metadata.xml 216 BLAKE2B 20531789dc11e43feee7ec315a0c1c7249fdf73764e29cb7d6db439826e9ff72f24a5cdb8eb7f1ab99bbb41fb6e4226874a1d1fa4185de52598602bb3b0479a3 SHA512 e881b59fe49746eb25ad66c258b41aba501e4eb563129093a3898ea970a20506e7898f7c355cfcf99605234962bf2c77c1309c258b9a2b84ee4302ccb71c9dbd
diff --git a/app-text/binfind/binfind-0.0.3.ebuild b/app-text/binfind/binfind-0.0.3.ebuild
index d5da3dc5dad5..8e402c5ed0e1 100644
--- a/app-text/binfind/binfind-0.0.3.ebuild
+++ b/app-text/binfind/binfind-0.0.3.ebuild
@@ -1,19 +1,13 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=7
 
-DESCRIPTION="binfind searches files for a byte sequence specified on the command line"
-HOMEPAGE="http://www.lith.at/binfind"
+DESCRIPTION="Search files for a byte sequence specified on the command line"
+HOMEPAGE="http://www.lith.at/binfind/"
 SRC_URI="http://www.lith.at/binfind/${P}.tar.gz"
-LICENSE="GPL-2"
+
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
-DEPEND=""
-RDEPEND=""
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS NEWS README ChangeLog
-}
diff --git a/app-text/calibre/Manifest b/app-text/calibre/Manifest
index e6731afb298b..2fff495b20a6 100644
--- a/app-text/calibre/Manifest
+++ b/app-text/calibre/Manifest
@@ -6,8 +6,10 @@ DIST calibre-3.47.1.tar.xz 38710008 BLAKE2B 60915345dd756d085386af61128e92569304
 DIST calibre-3.48.0.tar.xz 38777408 BLAKE2B 9a7fae20487ae93120cfdc06a312a42d54d68935fdd2bc18dc41be5f8d359c79eae24e0409ba8e7f4df85e2f073f80ce6bab56cba0638cead6693600fa93cb41 SHA512 6cee28fb560e2e00b8ac2f32756f094146c6fe744cfc343d68f1fb54b3f8b0ca16129a5b35018af54a103790faa2eb03ac186c01003f21c874d2ed5218441220
 DIST calibre-4.1.0.tar.xz 36231016 BLAKE2B 85987b8b8b37deb40f9ebb7d918e15e9a763cca00cf26eab841d0035309bd066f675d50d1ca94cb65e512d1964bac4241b3006aa38cac14ec0cb5e2d6416d2a8 SHA512 9a4766ccec830e553b5165f9a3b1111a6b4d0dbadee8b6a6547fef1dc3ca51adc886d9c3d751af23f4ff3a30a0fe03606c70ab57245ea38bfb486c111fd0e82e
 DIST calibre-4.2.0.tar.xz 36319240 BLAKE2B a37baae9c77ae2535782c5ee2095a33874c394b7f6415f4aac2752330c6cac3972723e75b90d38955a67a5df90de4318b740ca357b7149f610245f1895482437 SHA512 653dec2ba7a7ca122425619dc148765aea5cd60ede7fab23c1b10b0a7ba70f055bc6167732d4e21f161f37b313a7f2f9dde81240e1226a11a24b1195c9e38866
+DIST calibre-4.3.0.tar.xz 36472072 BLAKE2B fd187d1b68ac60c26c11094b0d19123f24ac93cde1e9939b71ecd4756c7a40ab55e4e36128763ed7f312df18a5152da418828ce84f4514a8747df8ccc3de2365 SHA512 7b95459df5a65f3c6ea743ef8e45b2f859c5bd4991813c583380c173c8f0dbba07128e8dbe09f2c6133706367c76add9b3387c8fbc6e2587d0723b7ebfa41351
 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
 EBUILD calibre-4.2.0.ebuild 8451 BLAKE2B e464f58bea125fa5651adc2226d853a702c0ca6af0b32382bd33899874023f8a94fbe4f799f121900312ed4f57c4322e8252bedb90559eaaeae29396ee7e6be0 SHA512 5f17a88f540a62249f180024216d4fb36a7d3e0d832fa45a62cda72ea2b5cf7e9433fa19244a7134f42ab1abc8e1e0e52e63ee9ead526a8ba0cd2f95aa9cb4de
+EBUILD calibre-4.3.0.ebuild 8451 BLAKE2B e464f58bea125fa5651adc2226d853a702c0ca6af0b32382bd33899874023f8a94fbe4f799f121900312ed4f57c4322e8252bedb90559eaaeae29396ee7e6be0 SHA512 5f17a88f540a62249f180024216d4fb36a7d3e0d832fa45a62cda72ea2b5cf7e9433fa19244a7134f42ab1abc8e1e0e52e63ee9ead526a8ba0cd2f95aa9cb4de
 MISC metadata.xml 382 BLAKE2B 87fa7e63a6ed7a4ea55247b362288b43f7edd312cc3085bb8c1b947402ae4aa0df01fac4f6646d260653ff8af7fe28d3dabb8a213dbf3e206181b69835b33d5f SHA512 8503e0a4a48d93682c386eb1d6507b4b26585afc9d62b7cd52bc00b457a887bd17422a03669ff404570ff7f5ff6f0bba14ee935979f8b54722870d6620097de5
diff --git a/app-text/calibre/calibre-4.3.0.ebuild b/app-text/calibre/calibre-4.3.0.ebuild
new file mode 100644
index 000000000000..a435558ef333
--- /dev/null
+++ b/app-text/calibre/calibre-4.3.0.ebuild
@@ -0,0 +1,271 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite,ssl"
+
+inherit bash-completion-r1 desktop toolchain-funcs python-single-r1 xdg-utils
+
+DESCRIPTION="Ebook management application"
+HOMEPAGE="https://calibre-ebook.com/"
+SRC_URI="https://download.calibre-ebook.com/${PV}/${P}.tar.xz"
+
+LICENSE="
+	GPL-3+
+	GPL-3
+	GPL-2+
+	GPL-2
+	GPL-1+
+	LGPL-3+
+	LGPL-2.1+
+	LGPL-2.1
+	BSD
+	MIT
+	Old-MIT
+	Apache-2.0
+	public-domain
+	|| ( Artistic GPL-1+ )
+	CC-BY-3.0
+	OFL-1.1
+	PSF-2
+"
+KEYWORDS="~amd64 ~arm ~x86"
+SLOT="0"
+IUSE="ios +udisks"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+	>=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.25.2_p1[${PYTHON_USEDEP}]
+	>=dev-python/beautifulsoup-3.0.5:python-2[${PYTHON_USEDEP}]
+	>=dev-python/chardet-3.0.3[${PYTHON_USEDEP}]
+	>=dev-python/cssselect-0.7.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/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.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
+	media-fonts/liberation-fonts
+	media-libs/fontconfig:=
+	>=media-libs/freetype-2:=
+	>=media-libs/libmtp-1.1.11:=
+	>=media-libs/libwmf-0.2.8
+	>=media-gfx/optipng-0.7.6
+	>=sys-libs/zlib-1.2.11:=
+	virtual/libusb:1=
+	x11-libs/libxkbcommon:=
+	x11-libs/libX11:=
+	x11-libs/libXext:=
+	x11-libs/libXrender:=
+	x11-misc/shared-mime-info
+	>=x11-misc/xdg-utils-1.0.2-r2
+	ios? (
+		>=app-pda/usbmuxd-1.0.8
+		>=app-pda/libimobiledevice-1.2.0
+	)
+	udisks? ( virtual/libudev )"
+RDEPEND="${COMMON_DEPEND}
+	udisks? ( || ( sys-fs/udisks:2 sys-fs/udisks:0 ) )"
+DEPEND="${COMMON_DEPEND}
+	>=dev-python/setuptools-23.1.0[${PYTHON_USEDEP}]
+	dev-python/sip[${PYTHON_USEDEP}]
+	>=virtual/podofo-build-0.9.6_pre20171027
+	virtual/pkgconfig"
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary && $(gcc-major-version) -lt 6 ]]; then
+		eerror "Calibre cannot be built with this version of gcc."
+		eerror "You need at least gcc-6.0"
+		die "Your C compiler is too old for this package."
+	fi
+}
+
+src_prepare() {
+	# no_updates: do not annoy user with "new version is availible all the time
+	# disable_plugins: walking sec-hole, wait for upstream to use GHNS interface
+	eapply \
+		"${FILESDIR}/${PN}-2.9.0-no_updates_dialog.patch" \
+		"${FILESDIR}/${PN}-disable_plugins.patch"
+
+	eapply_user
+
+	# Fix outdated version constant.
+	#sed -e "s#\\(^numeric_version =\\).*#\\1 (${PV//./, })#" \
+	#	-i src/calibre/constants.py || \
+	#	die "sed failed to patch constants.py"
+
+	# Avoid sandbox violation in /usr/share/gnome/apps when linux.py
+	# calls xdg-* (bug #258938).
+	sed -e "s|'xdg-desktop-menu', 'install'|\\0, '--mode', 'user'|" \
+		-e "s|check_call(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \
+		-e "s|\\(CurrentDir(tdir)\\), \\\\\$|\\1:|" \
+		-e "s|, PreserveMIMEDefaults():|:|" \
+		-e "s|'xdg-icon-resource', 'install'|\\0, '--mode', 'user'|" \
+		-e "s|cmd\[2\]|cmd[4]|" \
+		-e "s|cc(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \
+		-e "s|'xdg-mime', 'install'|\\0, '--mode', 'user'|" \
+		-i src/calibre/linux.py || die "sed failed to patch linux.py"
+
+	# Disable unnecessary privilege dropping for bug #287067.
+	sed -e "s:if os.geteuid() == 0:if False and os.geteuid() == 0:" \
+		-i setup/install.py || die "sed failed to patch install.py"
+
+	sed -e "/^                self.check_call(\\[QMAKE\\] + qmc + \\[proname\\])$/a\
+\\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ self.check_call(['sed', \
+'-e', 's|^CFLAGS .*|\\\\\\\\0 ${CFLAGS}|', \
+'-e', 's|^CXXFLAGS .*|\\\\\\\\0 ${CXXFLAGS}|', \
+'-e', 's|^LFLAGS .*|\\\\\\\\0 ${LDFLAGS}|', \
+'-i', 'Makefile'])" \
+		-i setup/build.py || die "sed failed to patch build.py"
+
+	# use system beautifulsoup, instead of bundled
+	rm -f "${S}"/src/calibre/ebooks/BeautifulSoup.py \
+		|| die "could not remove bundled beautifulsoup"
+	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"
+}
+
+src_install() {
+	# Bypass kbuildsycoca and update-mime-database in order to
+	# avoid sandbox violations if xdg-mime tries to call them.
+	cat - > "${T}/kbuildsycoca" <<-EOF
+	#!${BASH}
+	echo $0 : $@
+	exit 0
+	EOF
+
+	cp "${T}"/{kbuildsycoca,update-mime-database} || die
+	chmod +x "${T}"/{kbuildsycoca,update-mime-database} || die
+
+	export QMAKE="${EPREFIX}/usr/$(get_libdir)/qt5/bin/qmake"
+
+	# Unset DISPLAY in order to prevent xdg-mime from triggering a sandbox
+	# violation with kbuildsycoca as in bug #287067, comment #13.
+	export -n DISPLAY
+
+	# Bug #352625 - Some LANGUAGE values can trigger the following ValueError:
+	#   File "/usr/lib/python2.6/locale.py", line 486, in getdefaultlocale
+	#    return _parse_localename(localename)
+	#  File "/usr/lib/python2.6/locale.py", line 418, in _parse_localename
+	#    raise ValueError, 'unknown locale: %s' % localename
+	#ValueError: unknown locale: 46
+	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.
+	export HOME="${T}/fake_homedir"
+	export XDG_CONFIG_HOME="${HOME}/.config"
+	export XDG_DATA_HOME="${HOME}/.local/share"
+	export CALIBRE_CONFIG_DIRECTORY="${XDG_CONFIG_HOME}/calibre"
+	mkdir -p "${XDG_DATA_HOME}" "${CALIBRE_CONFIG_DIRECTORY}" || die
+
+	tc-export CC CXX
+	# Bug #334243 - respect LDFLAGS when building extensions
+	export OVERRIDE_CFLAGS="$CFLAGS" OVERRIDE_LDFLAGS="$LDFLAGS"
+	local libdir=$(get_libdir)
+	[[ -n $libdir ]] || die "get_libdir returned an empty string"
+
+	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
+
+	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
+	for x in * ; do
+		[[ -f ${EPREFIX}usr/share/fonts/liberation-fonts/${x} ]] || continue
+		ln -sf "../../../fonts/liberation-fonts/${x}" "${x}" || die
+	done
+
+	einfo "Converting python shebangs"
+	python_fix_shebang --force "${ED}"
+
+	einfo "Compiling python modules"
+	python_optimize "${ED}"/usr/lib/calibre
+
+	newinitd "${FILESDIR}"/calibre-server-3.init calibre-server
+	newconfd "${FILESDIR}"/calibre-server-3.conf calibre-server
+
+	bashcomp_alias calibre \
+		lrfviewer \
+		calibre-debug \
+		ebook-meta \
+		calibre-server \
+		ebook-viewer \
+		ebook-polish \
+		fetch-ebook-metadata \
+		lrf2lrs \
+		ebook-convert \
+		ebook-edit \
+		calibre-smtp \
+		ebook-device
+
+}
+
+pkg_preinst() {
+	# 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}"
+}
+
+pkg_postinst() {
+	[[ -n ${CALIBRE_LIB_DIR} ]] || die "CALIBRE_LIB_DIR is unset"
+	local x
+	for x in "${EROOT}${CALIBRE_LIB_DIR}"/*; do
+		if [[ " ${CALIBRE_LIB_CONTENT} " != *" ${x##*/} "* ]]; then
+			elog "Purging '${x}'"
+			rm -rf "${x}"
+		fi
+	done
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	xdg_icon_cache_update
+}
diff --git a/app-text/cwtext/Manifest b/app-text/cwtext/Manifest
index a004718493cb..b3ccf8b0c0cd 100644
--- a/app-text/cwtext/Manifest
+++ b/app-text/cwtext/Manifest
@@ -1,4 +1,5 @@
 AUX cwtext-0.94-asneeded.patch 525 BLAKE2B 0e099345b40bd853420bd35289108bfd43ff02ccc253202786201a74607692015808ae6a3620212ea3879e93b53a10abd4daab81ecf77159982a8aebf5dab604 SHA512 e80d4705d71badb3a0c75a21b99cb2b8033272c609a9cfea769ec48825544f3972cdc505ad32842c34da4918e7dcfcff07900f3611a5a1ca0fdd4c48784d7067
 DIST cwtext-0.96.tar.gz 16596 BLAKE2B 0165b787fcb0e5c0ef803370d06eabbde4c014ac11dcd16a516579cf3d817e90c79db6ec15702643be710c9849765671bf676f41a0679443a87a6f4e555963d9 SHA512 6765c79b6feea2947974bf4654ed1edc83f6c9ddaae1bf37d5ed95dedc4ce9b45d5e41dff7ec50d6586f34901d8f93a3230f1a7e1cf4d52b8a84c851cfbdbd33
+EBUILD cwtext-0.96-r1.ebuild 710 BLAKE2B cfe77b1e29906befd31f0071371b152f3f75c147740fc80c70b79dd6c9eb432359ebfcf8bb00f556efd6503ff457bb25fe152fbb85c46e459ddf083f5bf84df4 SHA512 f868048955573d9beee82d60ab989a75cc1e82c22bb4058b18aed22fb14610de9314737b8bcc4c3857263cc8bda15be8d158fe8e295b27581f0c31fdba721b8c
 EBUILD cwtext-0.96.ebuild 705 BLAKE2B 14f5b38878b22ac327898934337e0ea62b7ee94c8aa1ad9196111d8a9dc4b20aa3c76c229c68b2c5d88c6a68e8954f590e36af93005d158c47b130c622dc8be6 SHA512 3e937d89e7f7642839ec0a2acbe17006b1316c0dc31b3d284c31c2b8777905f6f1f47f804a77398e75782fbd24e0bd840611955957f5b61d197c4dff99dc8152
 MISC metadata.xml 325 BLAKE2B ff358d0bef47c35ccd68eb73a608e1e3f61cf6735aafcf4045c9b5a49f2e533b4ef2c305a0fa3fa1e23fb6920f4d589cd2274fbdd0073d0d0a8432ff5b911910 SHA512 e61b6497de3ea7dfbc4244c904bd2e3966bdfc3fb228836ffd21e7955da87da325af62b0f8cde180b75d0632dcacf77b46e2b56249b14b2dfa827cc082bd217f
diff --git a/app-text/cwtext/cwtext-0.96-r1.ebuild b/app-text/cwtext/cwtext-0.96-r1.ebuild
new file mode 100644
index 000000000000..8ee194501b87
--- /dev/null
+++ b/app-text/cwtext/cwtext-0.96-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit toolchain-funcs
+
+DESCRIPTION="Text to Morse Code converter"
+HOMEPAGE="http://cwtext.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE=""
+
+PATCHES=( "${FILESDIR}"/${PN}-0.94-asneeded.patch )
+DOCS=( Changes README TODO )
+
+src_prepare() {
+	eapply -p0 "${PATCHES}"
+	# change install directory to ${S}
+	sed -i -e "/^PREFIX/ s:=.*:=\"${S}\":" makefile || \
+		die "sed makefile failed"
+
+	eapply_user
+	tc-export CC
+}
+
+src_install() {
+	einstalldocs
+	dobin cwtext cwpcm cwmm
+}
diff --git a/app-text/docbook-dsssl-stylesheets/Manifest b/app-text/docbook-dsssl-stylesheets/Manifest
index f7a2adda4e70..d574852c7670 100644
--- a/app-text/docbook-dsssl-stylesheets/Manifest
+++ b/app-text/docbook-dsssl-stylesheets/Manifest
@@ -1,4 +1,3 @@
 DIST docbook-dsssl-1.79.tar.bz2 277650 BLAKE2B 6a12f46965ee705096f679b672610395b24f151e3bf3cb05f7d920c052b7a3fdafb4f5ee4526dbf765bbab6b7d4ca9f021277c6f35926f47edc61d0f835afdbb SHA512 fad71e67227b54b0a7c31a351b4d5c0695517b3687714807d7b144d239dc6f7e0d556520e705eb75581c82e0deea4b32ccfde1eccad2718337b757eddd64843e
-EBUILD docbook-dsssl-stylesheets-1.79-r3.ebuild 1529 BLAKE2B 78aba5226ec752b9a983f9cd4846619c788c6e6205738a11425e363b847c15c30a3ae21fd10f929cb36b554f806044b1d5381214a729890c61d22864e8dee131 SHA512 81b5606c5b3de8b54e50f66d2120de05169731afc50f34a057e35cf89c15437ce0e96d3a1a2e9bc8c6fbfba5cbc1373bc38f64f164d1937165791063c264518b
-EBUILD docbook-dsssl-stylesheets-1.79-r4.ebuild 2467 BLAKE2B f56e8016f8b40ed4ab545dfd1d0a90b3d2f2f063fce464c1f217a96dd8d5cbe6048ae2b1cf28d2779c38ff4ec4f4b85a7e553d5851801f8cb23002dffd3cc8f2 SHA512 4c08d861c3fcfa663e92f61f04b91a8c4568b44d4c9b75c3a98e338c4e8f30d031f8f4de13ebddd83d6cadb5a9916babc57e5b006d39e9ab03aa7438cba86d29
+EBUILD docbook-dsssl-stylesheets-1.79-r4.ebuild 2465 BLAKE2B b5ce46f7632e1b40b890bbf19708dd0be7b79b96eeefd5179ada2452adf9119e009fce572f422bd652ad3bc93aa878ebbaf8e279aedde6aeb53605cb58ead14a SHA512 20b3a75d27f5dba7015295e8e7b4aecd9b2787431df8d4c65d91137cb0b34f21c03e6345db006fad0ba75bb2255e12d4428f08c09eee09b6142fbcb1e7583870
 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
deleted file mode 100644
index 7ae3bc4c26cc..000000000000
--- a/app-text/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-1.79-r3.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# EAPI=6 is blocked by Gentoo bug 497052.
-EAPI=5
-
-MY_P=${P/-stylesheets/}
-
-inherit sgml-catalog
-
-DESCRIPTION="DSSSL Stylesheets for DocBook"
-HOMEPAGE="https://github.com/docbook/wiki/wiki"
-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-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
-IUSE=""
-
-RDEPEND="
-	app-text/sgml-common
-	app-text/docbook-sgml-dtd:3.0
-"
-
-DOCS=( BUGS ChangeLog README RELEASE-NOTES.txt WhatsNew )
-
-S="${WORKDIR}/${MY_P}"
-
-src_install() {
-	local dsssldir CATALOG_DIR=usr/share/sgml/docbook/dsssl-stylesheets-${PV}
-
-	dobin bin/collateindex.pl
-
-	insinto ${CATALOG_DIR}
-	doins catalog VERSION
-
-	insinto ${CATALOG_DIR}/common
-	doins common/*.{dsl,ent}
-
-	insinto ${CATALOG_DIR}/images
-	doins images/*.gif
-
-	for dsssldir in html lib olink print; do
-		insinto ${CATALOG_DIR}/${dsssldir}
-		doins ${dsssldir}/*.dsl
-	done
-
-	for dsssldir in dbdsssl html imagelib olink; do
-		insinto ${CATALOG_DIR}/dtds/${dsssldir}
-		doins dtds/${dsssldir}/*.dtd
-	done
-
-	insinto ${CATALOG_DIR}/dtds/html
-	doins dtds/html/*.{dcl,gml}
-
-	dodoc "${DOCS[@]}"
-}
-
-sgml-catalog_cat_include \
-	"/etc/sgml/dsssl-docbook-stylesheets.cat" \
-	"/usr/share/sgml/docbook/dsssl-stylesheets-${PV}/catalog"
-
-sgml-catalog_cat_include \
-	"/etc/sgml/sgml-docbook.cat" \
-	"/etc/sgml/dsssl-docbook-stylesheets.cat"
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 fddb608b835e..89a82cdb0d2c 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-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 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
-}
diff --git a/app-text/docbook-sgml-utils/Manifest b/app-text/docbook-sgml-utils/Manifest
index fc91a3e1abbe..37be8286d717 100644
--- a/app-text/docbook-sgml-utils/Manifest
+++ b/app-text/docbook-sgml-utils/Manifest
@@ -2,6 +2,5 @@ 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 1887 BLAKE2B f15df4383f323db128a975a0fdacc643fa162058484962d55e15526e601ad2b18f1e251f83e9ee516732794a0e51bb2c51b1feb968d5f4e03db4fae79543443c SHA512 f23328537fa94f67fa4eca2401ffd513fa164cf5bf4f7f7efae2428e31ff00e0a8114d77800cb1253c371cfe367d2cdcd5517d3404e8be8b9cf138a7963e7f01
-EBUILD docbook-sgml-utils-0.6.14-r3.ebuild 1833 BLAKE2B a15bec5c3f6a00be5f0dd3955a97b7cb06467abd6ca96ff13834f6ee23281530f5c24b17caf92b3de62390dad7840a07fce8cd2c568805b30bc43b06e025b9e8 SHA512 03ba40d09d6e1585839e4fcc1e89607176ee63e668650bdb8f43436bc43216f97da23cce4ae468b101720c061e4a9d96d7ef0b4acb496e5c1a2420356281d094
+EBUILD docbook-sgml-utils-0.6.14-r3.ebuild 1830 BLAKE2B 872bc4571ab58886490d921c6571ce6d9b7c8d22ed5cef7a2e4b9140c673c169615216db44dcb12226183f3e45db602b387a6e3fec69a4cab96d05b49bcf7275 SHA512 6d3b6c9fcfab53ffd269cf6a45c2cc4e6cf73c79e2f7aefb0a44fb23e2af2beef4342ea61ae7438f88d95bf3c77302a564212cd7bc1d90f82a95ac0ab2f714a8
 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
deleted file mode 100644
index b9da594bedd8..000000000000
--- a/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14-r2.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils autotools prefix
-
-MY_PN=${PN/-sgml/}
-MY_P=${MY_PN}-${PV}
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="Shell scripts to manage DocBook documents"
-HOMEPAGE="https://sourceware.org/docbook-tools/"
-SRC_URI="ftp://sourceware.org/pub/docbook-tools/new-trials/SOURCES/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-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
-	app-text/docbook-dsssl-stylesheets
-	app-text/openjade
-	dev-perl/SGMLSpm
-	~app-text/docbook-xml-simple-dtd-4.1.2.4
-	~app-text/docbook-xml-simple-dtd-1.0
-	app-text/docbook-xml-dtd
-	~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-dtd-4.2
-	~app-text/docbook-sgml-dtd-4.4
-	jadetex? ( app-text/jadetex )
-	userland_GNU? ( sys-apps/which )
-	|| (
-		www-client/lynx
-		www-client/links
-		www-client/elinks
-		virtual/w3m )"
-RDEPEND="${DEPEND}"
-
-# including both xml-simple-dtd 4.1.2.4 and 1.0, to ease
-# transition to simple-dtd 1.0, <obz@gentoo.org>
-
-src_prepare() {
-	epatch "${FILESDIR}"/${MY_P}-elinks.patch
-	epatch "${FILESDIR}"/${P}-grep-2.7.patch
-	if use prefix; then
-		epatch "${FILESDIR}"/${MY_P}-prefix.patch
-		eprefixify doc/{man,HTML}/Makefile.am bin/jw.in backends/txt configure.in
-		eautoreconf
-	fi
-}
-
-src_install() {
-	make DESTDIR="${D}" \
-		htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
-		install || die "Installation failed"
-
-	if ! use jadetex ; then
-		for i in dvi pdf ps ; do
-			rm "${ED}"/usr/bin/docbook2$i || die
-			rm "${ED}"/usr/share/sgml/docbook/utils-${PV}/backends/$i || die
-			rm "${ED}"/usr/share/man/man1/docbook2$i.1 || die
-		done
-	fi
-	dodoc AUTHORS ChangeLog NEWS README TODO
-}
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 c6ea3b0e3927..38a3221cf16f 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-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-xml-dtd/Manifest b/app-text/docbook-xml-dtd/Manifest
index 24d04c30525f..91f9a2832abe 100644
--- a/app-text/docbook-xml-dtd/Manifest
+++ b/app-text/docbook-xml-dtd/Manifest
@@ -3,14 +3,9 @@ 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 1348 BLAKE2B dd0e099bb825bfc3091c51b24b47fa50a9a5d79be6deff305f81203235d953d4e68562d8fe1fba9420ec5613b68c6b4588e86042108b7b53d0598551d1122577 SHA512 d01a0b5f92e8a2d77da20d65fdca469b6fc8ab6a8981e5288749f5dc8a826ab175f247614a9b595dc6de0c07efb29e4ae9ce3fa0d2d077dd8568241abc9efd24
-EBUILD docbook-xml-dtd-4.1.2-r7.ebuild 1628 BLAKE2B d7c76ccfe2a6d4c4d50b50e03f00c02153f309783143634311c4e308946c84eb08b4f4b4e412c39708c525dc69cbfd3a6be3bfcd156ed538b635a0140d38b462 SHA512 3bb98386c3fd2e9829ff22057921336a4c688bf6bd2e791d939e5323acd43aff5f4638e7c0110a02eafb2c494273fb11aad8c026ab100d0ac41d7d39844315eb
-EBUILD docbook-xml-dtd-4.2-r2.ebuild 1310 BLAKE2B 801f8c553e1e976b04207b9cc5619c08bda5dbe73b3e1d50063ccb0610a664f50808049abcaaf3d2534aebd70df031d517eb286b3621f574333f32e8814abbbf SHA512 1bd2e8373410819a9b1281e5e55b02d9ec8c5dc73c88528636fe31df9e2b4b2c5e61e74f092c87189a0f9a259b1bdca16a5272bfbfd392a2c462acf8153d0e84
-EBUILD docbook-xml-dtd-4.2-r3.ebuild 1622 BLAKE2B 112ba73bd5d5ee54798d1aeba1fa95d58a7ecb52490a32063178124223818ad8a70db2521ec8dda44cad410bcd0c3bfe37ae13983237ccb3e4c7f8cb674e81db SHA512 af7d5429c874a9a297c2bde5b3a50fb5e0a5f6202a3714010083a39040b57828242e7e28435059267da4635e9cc552c98f3afe9c491341612b58a5edd7146f4a
-EBUILD docbook-xml-dtd-4.3-r1.ebuild 1327 BLAKE2B 4f93b50fbdab95fedfada0400d33e1e49ed0b1430cda5e4a6fd1860cff434cdd779c12e1ed70000780882342ebed236d0359059925539d3369ff3aa734d8986d SHA512 1cd700b6c8992d5a5ad0998b28b74fcbd4a19a2e22316a80ca2463cefd3b75f404bc88e68e03c2c8273640c56d5813c8a1235b78cad2235f4571c413fce911ac
-EBUILD docbook-xml-dtd-4.3-r2.ebuild 1622 BLAKE2B 112ba73bd5d5ee54798d1aeba1fa95d58a7ecb52490a32063178124223818ad8a70db2521ec8dda44cad410bcd0c3bfe37ae13983237ccb3e4c7f8cb674e81db SHA512 af7d5429c874a9a297c2bde5b3a50fb5e0a5f6202a3714010083a39040b57828242e7e28435059267da4635e9cc552c98f3afe9c491341612b58a5edd7146f4a
-EBUILD docbook-xml-dtd-4.4-r2.ebuild 1509 BLAKE2B f4d113feca710d9946cd9df5a8f3c1a5a635be3a1a869a25ea03f843623d2d53752a40304e848cec83c337bc9a5d7ad52b424993ae07b1d6eaa60789ec4692cf SHA512 e657fa64429a248e02fde6214dfeb0ae9e8de59fc1d4888335b300bdbba36b58c4528f6420bd6219720bce737ed2109d6a52244eab3f4628e06f20945cadd7c8
-EBUILD docbook-xml-dtd-4.4-r3.ebuild 1655 BLAKE2B a769ddc4838a4a4d7c728fc996f191a05562e0259d0d4cc8dbc4724ef2b21875c36e9564d1014bd4850844ad37e0267ffa2fae0999786d598f4efe84f7011d48 SHA512 7e7ce7ac845e66c97bfc14e9ab367e9ce302c72f5de5bf02917f3c5f7db79d95ea2e6c0108f09c2d97e86876780b999d0c864257e83f6df6350142e16447d07c
-EBUILD docbook-xml-dtd-4.5-r1.ebuild 1561 BLAKE2B 63d28ed0626a3d2fdbef2e6f62d0469590b8078b49423149b90198e4d4f88939a1991da8a88236d0341df6a112d9540fe9fd58cd7f5eed0e1fc519e9b870279d SHA512 b61f411c8f2f87dbca620293afd2507437f893e926356c60d463b67c9b09b4767b5c6f1c87d810c48626e4aa67c7b35e3a39ee771a0327b18066c2c4cc638193
-EBUILD docbook-xml-dtd-4.5-r2.ebuild 1655 BLAKE2B a769ddc4838a4a4d7c728fc996f191a05562e0259d0d4cc8dbc4724ef2b21875c36e9564d1014bd4850844ad37e0267ffa2fae0999786d598f4efe84f7011d48 SHA512 7e7ce7ac845e66c97bfc14e9ab367e9ce302c72f5de5bf02917f3c5f7db79d95ea2e6c0108f09c2d97e86876780b999d0c864257e83f6df6350142e16447d07c
+EBUILD docbook-xml-dtd-4.1.2-r7.ebuild 1625 BLAKE2B 18c8bbef8edf41a3cad98a5c297cd6e3a0cbe2253c17236d841109920dd4610cd681c4fb7ebd99d28a7b9473d717695746e56d18e88cca8fb13e9b63713437e0 SHA512 7854d1cf94866f4a5387ec2dca09831ac1836d57c4c77d5f3bbe3b6f7a172fb912f6e8d8cf2f25ef71c528b539c247c430948e1a2afc1e850c777a40d690323d
+EBUILD docbook-xml-dtd-4.2-r3.ebuild 1619 BLAKE2B 985eadc7d7ff4a6bcb0a4de151ff74412e9a9cd3f21562a508746360a7badc50ff0cafc9a04d8af8137659acb134601277f89e3e5979c73e64563895a4bf558e SHA512 ae03227d0428c66b0992d2b8d94798df1de8aa387bd04fbe810a1883657f8a17f94c0c2f9cd91fbd42f1f798dba4fb02315e00629f11bf1d5aaad18b1c0bb8bb
+EBUILD docbook-xml-dtd-4.3-r2.ebuild 1619 BLAKE2B 985eadc7d7ff4a6bcb0a4de151ff74412e9a9cd3f21562a508746360a7badc50ff0cafc9a04d8af8137659acb134601277f89e3e5979c73e64563895a4bf558e SHA512 ae03227d0428c66b0992d2b8d94798df1de8aa387bd04fbe810a1883657f8a17f94c0c2f9cd91fbd42f1f798dba4fb02315e00629f11bf1d5aaad18b1c0bb8bb
+EBUILD docbook-xml-dtd-4.4-r3.ebuild 1652 BLAKE2B 48d73f566dc6923dc61f986e4543f3e14501f8426dca6b559171dc631a285b07b8659e673725da2f530654d38a47c460238986337ca832411f3eb28e94e4b097 SHA512 5ff39f24453a39cb7e10d62c11c00b4edb79fd6b4b6ec1e4e6240ed1f58238257989ab54d75500f421508e96a45efeed58704a9e0f7f49da60ebb9d716ec68e1
+EBUILD docbook-xml-dtd-4.5-r2.ebuild 1652 BLAKE2B 48d73f566dc6923dc61f986e4543f3e14501f8426dca6b559171dc631a285b07b8659e673725da2f530654d38a47c460238986337ca832411f3eb28e94e4b097 SHA512 5ff39f24453a39cb7e10d62c11c00b4edb79fd6b4b6ec1e4e6240ed1f58238257989ab54d75500f421508e96a45efeed58704a9e0f7f49da60ebb9d716ec68e1
 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
deleted file mode 100644
index 5fa31e2b8341..000000000000
--- a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.1.2-r6.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit sgml-catalog
-
-MY_P="docbkx412"
-DESCRIPTION="Docbook DTD for XML"
-HOMEPAGE="http://www.docbook.org/"
-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-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
-	>=app-text/build-docbook-catalog-1.2"
-DEPEND=">=app-arch/unzip-5.41"
-
-sgml-catalog_cat_include "/etc/sgml/xml-docbook-${PV}.cat" \
-	"/etc/sgml/sgml-docbook.cat"
-sgml-catalog_cat_include "/etc/sgml/xml-docbook-${PV}.cat" \
-	"/usr/share/sgml/docbook/xml-dtd-${PV}/docbook.cat"
-
-S=${WORKDIR}
-
-src_unpack() {
-	unpack ${A}
-
-	# Prepend OVERRIDE directive
-	sed -i -e '1i\\OVERRIDE YES' docbook.cat
-}
-
-src_install() {
-	keepdir /etc/xml
-
-	insinto /usr/share/sgml/docbook/xml-dtd-${PV}
-	doins *.cat *.dtd *.mod || die
-	insinto /usr/share/sgml/docbook/xml-dtd-${PV}/ent
-	doins ent/*.ent || die
-
-	dodoc ChangeLog *.txt
-}
-
-pkg_postinst() {
-	build-docbook-catalog
-	sgml-catalog_pkg_postinst
-}
-
-pkg_postrm() {
-	build-docbook-catalog
-	sgml-catalog_pkg_postrm
-}
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 0ed4c7b276a8..c66dcb07d7c7 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-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
deleted file mode 100644
index 033b2a7286bc..000000000000
--- a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.2-r2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit sgml-catalog
-
-MY_P=${P/-dtd/}
-DESCRIPTION="Docbook DTD for XML"
-HOMEPAGE="http://www.docbook.org/"
-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-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
-	>=app-text/build-docbook-catalog-1.2"
-DEPEND=">=app-arch/unzip-5.41"
-
-sgml-catalog_cat_include "/etc/sgml/xml-docbook-${PV}.cat" \
-	"/etc/sgml/sgml-docbook.cat"
-sgml-catalog_cat_include "/etc/sgml/xml-docbook-${PV}.cat" \
-	"/usr/share/sgml/docbook/xml-dtd-${PV}/docbook.cat"
-
-S=${WORKDIR}
-
-src_unpack() {
-	unpack ${A}
-
-	# Prepend OVERRIDE directive
-	sed -i -e '1i\\OVERRIDE YES' docbook.cat
-}
-
-src_install() {
-	keepdir /etc/xml
-
-	insinto /usr/share/sgml/docbook/xml-dtd-${PV}
-	doins *.cat *.dtd *.mod || die
-	insinto /usr/share/sgml/docbook/xml-dtd-${PV}/ent
-	doins ent/*.ent || die
-
-	dodoc ChangeLog README
-}
-
-pkg_postinst() {
-	build-docbook-catalog
-	sgml-catalog_pkg_postinst
-}
-
-pkg_postrm() {
-	build-docbook-catalog
-	sgml-catalog_pkg_postrm
-}
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 6e13510bf932..33be69e94534 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-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
deleted file mode 100644
index 558de1bc5d35..000000000000
--- a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.3-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit sgml-catalog
-
-MY_P=${P/-dtd/}
-DESCRIPTION="Docbook DTD for XML"
-HOMEPAGE="http://www.docbook.org/"
-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-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
-	>=app-text/build-docbook-catalog-1.2"
-DEPEND=">=app-arch/unzip-5.41"
-
-sgml-catalog_cat_include "/etc/sgml/xml-docbook-${PV}.cat" \
-	"/etc/sgml/sgml-docbook.cat"
-sgml-catalog_cat_include "/etc/sgml/xml-docbook-${PV}.cat" \
-	"/usr/share/sgml/docbook/xml-dtd-${PV}/docbook.cat"
-
-S=${WORKDIR}
-
-src_unpack() {
-	unpack ${A}
-
-	# Prepend OVERRIDE directive
-	sed -i -e '1i\\OVERRIDE YES' docbook.cat
-}
-
-src_install() {
-	keepdir /etc/xml
-
-	insinto /usr/share/sgml/docbook/xml-dtd-${PV}
-	doins *.cat *.dtd *.mod || die
-	insinto /usr/share/sgml/docbook/xml-dtd-${PV}/ent
-	doins ent/*.ent || die
-
-	dodoc ChangeLog README
-}
-
-pkg_postinst() {
-	build-docbook-catalog
-	sgml-catalog_pkg_postinst
-}
-
-pkg_postrm() {
-	build-docbook-catalog
-	sgml-catalog_pkg_postrm
-}
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 6e13510bf932..33be69e94534 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-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
deleted file mode 100644
index beaca290a76b..000000000000
--- a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.4-r2.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
-
-inherit sgml-catalog
-
-MY_P=${P/-dtd/}
-DESCRIPTION="Docbook DTD for XML"
-HOMEPAGE="http://www.docbook.org/"
-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-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
-	>=app-text/build-docbook-catalog-1.2"
-DEPEND=">=app-arch/unzip-5.41"
-
-sgml-catalog_cat_include "/etc/sgml/xml-docbook-${PV}.cat" \
-	"/etc/sgml/sgml-docbook.cat"
-sgml-catalog_cat_include "/etc/sgml/xml-docbook-${PV}.cat" \
-	"/usr/share/sgml/docbook/xml-dtd-${PV}/docbook.cat"
-
-S=${WORKDIR}
-
-src_unpack() {
-	unpack ${A}
-
-	# Prepend OVERRIDE directive
-	sed -i -e '1i\\OVERRIDE YES' docbook.cat
-}
-
-src_install() {
-	keepdir /etc/xml
-
-	insinto /usr/share/sgml/docbook/xml-dtd-${PV}
-	doins *.cat *.dtd *.mod *.xml || die
-	insinto /usr/share/sgml/docbook/xml-dtd-${PV}/ent
-	doins ent/*.ent || die
-
-	# work around unicode parser issues #238785
-	dosym ../../../xml-iso-entities-8879.1986/ISOgrk4.ent \
-		/usr/share/sgml/docbook/xml-dtd-${PV}/ent/isogrk4.ent || die
-
-	cp ent/README README.ent
-	dodoc ChangeLog README*
-}
-
-pkg_postinst() {
-	build-docbook-catalog
-	sgml-catalog_pkg_postinst
-}
-
-pkg_postrm() {
-	build-docbook-catalog
-	sgml-catalog_pkg_postrm
-}
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 50c88d83dfcb..127fcd260207 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-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
deleted file mode 100644
index 0c2ede2a5c31..000000000000
--- a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.5-r1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit sgml-catalog
-
-MY_P=${P/-dtd/}
-DESCRIPTION="Docbook DTD for XML"
-HOMEPAGE="http://www.docbook.org/"
-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-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND=""
-DEPEND=">=app-arch/unzip-5.41
-	>=dev-libs/libxml2-2.4
-	>=app-text/docbook-xsl-stylesheets-1.65
-	>=app-text/build-docbook-catalog-1.2"
-
-sgml-catalog_cat_include "/etc/sgml/xml-docbook-${PV}.cat" \
-	"/etc/sgml/sgml-docbook.cat"
-sgml-catalog_cat_include "/etc/sgml/xml-docbook-${PV}.cat" \
-	"/usr/share/sgml/docbook/xml-dtd-${PV}/docbook.cat"
-
-S=${WORKDIR}
-
-src_unpack() {
-	unpack ${A}
-
-	# Prepend OVERRIDE directive
-	sed -i -e '1i\\OVERRIDE YES' docbook.cat
-}
-
-src_install() {
-	keepdir /etc/xml
-
-	insinto /usr/share/sgml/docbook/xml-dtd-${PV}
-	doins *.cat *.dtd *.mod *.xml || die
-	insinto /usr/share/sgml/docbook/xml-dtd-${PV}/ent
-	doins ent/*.ent || die
-
-	# work around unicode parser issues #238785
-	dosym ../../../xml-iso-entities-8879.1986/ISOgrk4.ent \
-		/usr/share/sgml/docbook/xml-dtd-${PV}/ent/isogrk4.ent || die
-
-	cp ent/README README.ent
-	dodoc ChangeLog README*
-}
-
-pkg_postinst() {
-	build-docbook-catalog
-	sgml-catalog_pkg_postinst
-}
-
-pkg_postrm() {
-	build-docbook-catalog
-	sgml-catalog_pkg_postrm
-}
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 50c88d83dfcb..127fcd260207 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-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 9f9be36debab..7a1ea5347639 100644
--- a/app-text/docbook-xml-simple-dtd/Manifest
+++ b/app-text/docbook-xml-simple-dtd/Manifest
@@ -4,10 +4,7 @@ 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 991 BLAKE2B ec8220e283eda21a08bde22fd990526a5dd7f756b874a554c44b236bd5169902753d0e286bf0a2dea1e2c476d3fab6f9f951b39a389e890ab822857f7e005efc SHA512 7e3da43114a8554d887921b5e5f0888446524c4c105de57cebaca1c6ae27e6589730330e796e0a41384bef85c3d16f22e7ad6ed5d68508b38acb50f8fe88a2d8
-EBUILD docbook-xml-simple-dtd-1.0-r3.ebuild 1326 BLAKE2B b3e9a38a1bb74b1fc6f53865511aa8664372cc8eeff4956c1ad7f6704d6484b0566191058a4b8547c2b53166ae2aef7354178e5bbca2ef98846b23a59b2711ec SHA512 430a3fc636209eef191bb68182ba3790076dcaab3fefaaf5a09c4dc5b3a84ffd12465b9e6c8e291ea06455045d5721959991558200efab03237488bd9773c9fc
-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 1356 BLAKE2B 1e3924e51bdce18b7dbb77f1e95759ef1554a064d6db92a3989b0d6b5e72e083ef790ad99b3a05f4706cf6522d6771961b73d417fabfc5682471469b22683aee SHA512 afead15a67e7f33974fa86ec2f922ddd6a2593bc37decaf55513a3838363819cf66d1996f5656fcaf65cf83f0395e3d46743a74b5e4984b0ea013c2dc91f3496
-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 1343 BLAKE2B 8bdc8b34e5253b346475bc6784538609aea908217f466739017df1389f0859b7ee772cdf1c0060b7df5b2ebdbecca799ed848e72bce962aea3d99adae1408b0e SHA512 82313d3aa2e17c88466c32464318c26bef9bb88b58ca147906a188d34b017a36c3e04b703f5ad851c175f9665ba54de1a4cdc0f24683eb6dbd710ab3021b428b
+EBUILD docbook-xml-simple-dtd-1.0-r3.ebuild 1323 BLAKE2B 3008cab742172dc1e3baff033502f9bf6ed3ee391b3a845d823ca7c282c1ae4e7f2cdeeae018d0d99d136f64c435a038a2f2f1231da9a8a24add0557dee1cde4 SHA512 432c865a5fe5ae45cc745efbcee0cb9c29a0d9908b7b7b8a1d593b5ad50db5ffe32e0a83ae8448f70806276fb6033fa874a963c0f5bd3b64b3043bde3f6d2dfe
+EBUILD docbook-xml-simple-dtd-4.1.2.4-r4.ebuild 1353 BLAKE2B 9a338c67e9814e0e123dcf38e8dd311ac5607c56e17156e014bcc0700adce84c9d07dd3afe86a893d040221cf610f85ba49785db0aae35f52094ae4aea1873d3 SHA512 ade069cf5e2701d1242bc6f1b49b0feb27c263de41a3e5741ed4ec4122353751cb746cb4ed1aee320ec07e7af281bb51ff906f55320385fd0d19ca52ceb0e38f
+EBUILD docbook-xml-simple-dtd-4.1.2.5-r3.ebuild 1341 BLAKE2B feae5cbe3f3c1a2811d6b33f73816d06c1540e6978f8f7736643e8f52a7dfa9b1f090e7db07aed82e2f51be076b394a7da2b45b6ec1ea27f41e79e5989024e37 SHA512 fe978e28186aab7b8ec18262cd6b1815866c12d6a8748e14d44bc5751f54931c86c59b0f618d342c65f49865841291f39188eac92fe8de38c0d540c07c00f12e
 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
deleted file mode 100644
index ec43ec743d07..000000000000
--- a/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-1.0-r2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit sgml-catalog
-
-MY_PN="docbook-simple"
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Simplified Docbook DTD for XML"
-HOMEPAGE="http://www.oasis-open.org/docbook/"
-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-linux ~x86-linux ~x86-macos ~sparc-solaris"
-IUSE=""
-
-RDEPEND=">=app-text/build-docbook-catalog-1.6"
-DEPEND=">=app-arch/unzip-5.41"
-
-S=${WORKDIR}
-
-sgml-catalog_cat_include "/etc/sgml/xml-simple-docbook-${PV}.cat" \
-	"/usr/share/sgml/docbook/${P#docbook-}/catalog"
-
-src_install() {
-	insinto /usr/share/sgml/docbook/${P#docbook-}
-	doins *.dtd *.mod *.css
-
-	newins "${FILESDIR}"/${P}.cat catalog
-}
-
-pkg_postinst() {
-	build-docbook-catalog
-	sgml-catalog_pkg_postinst
-}
-
-pkg_postrm() {
-	build-docbook-catalog
-	sgml-catalog_pkg_postrm
-}
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 e51cdbd75e99..404b48682f1a 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-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
deleted file mode 100644
index dd68fe5fec25..000000000000
--- a/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.4-r3.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit sgml-catalog
-
-MY_P="sdb4124"
-DESCRIPTION="Docbook DTD for XML"
-HOMEPAGE="http://www.oasis-open.org/docbook/"
-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-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
-IUSE=""
-
-RDEPEND=">=app-text/build-docbook-catalog-1.6"
-DEPEND=">=app-arch/unzip-5.41"
-
-sgml-catalog_cat_include "/etc/sgml/xml-simple-docbook-${PV}.cat" \
-	"/usr/share/sgml/docbook/${P#docbook-}/catalog"
-
-S=${WORKDIR}
-
-src_install() {
-	insinto /usr/share/sgml/docbook/${P#docbook-}
-	doins *.dtd *.mod *.css
-
-	newins "${FILESDIR}"/${P}.catalog catalog
-
-	insinto /usr/share/sgml/docbook/${P#docbook-}/ent
-	doins ent/*.ent
-
-	dodoc README ChangeLog LostLog COPYRIGHT
-}
-
-pkg_postinst() {
-	build-docbook-catalog
-	sgml-catalog_pkg_postinst
-}
-
-pkg_postrm() {
-	build-docbook-catalog
-	sgml-catalog_pkg_postrm
-}
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 16021b838e23..4e87683f310f 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-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
deleted file mode 100644
index 608fba36798f..000000000000
--- a/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.5-r2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit sgml-catalog
-
-DESCRIPTION="Simplified Docbook DTD for XML"
-HOMEPAGE="http://www.oasis-open.org/docbook/xml/simple/4.1.2.5/"
-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-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
-IUSE=""
-
-RDEPEND=">=app-text/build-docbook-catalog-1.6"
-DEPEND=">=app-arch/unzip-5.41"
-
-S=${WORKDIR}
-
-sgml-catalog_cat_include "/etc/sgml/xml-simple-docbook-${PV}.cat" \
-	"/usr/share/sgml/docbook/${P#docbook-}/catalog"
-
-src_install() {
-	insinto /usr/share/sgml/docbook/${P#docbook-}
-	doins *.dtd *.mod *.css
-
-	newins "${FILESDIR}"/${P}.catalog catalog
-}
-
-pkg_postinst() {
-	build-docbook-catalog
-	sgml-catalog_pkg_postinst
-}
-
-pkg_postrm() {
-	build-docbook-catalog
-	sgml-catalog_pkg_postrm
-}
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 8206fbebb25e..dbb2560ee386 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
@@ -6,12 +6,12 @@ inherit sgml-catalog-r1
 
 MY_P=simple${PV//./}
 DESCRIPTION="Simplified Docbook DTD for XML"
-HOMEPAGE="http://www.oasis-open.org/docbook/xml/simple/4.1.2.5/"
+HOMEPAGE="https://www.oasis-open.org/docbook/xml/simple/4.1.2.5/"
 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-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/dos2unix/Manifest b/app-text/dos2unix/Manifest
index bc6c5d0b30d7..9e9c8797c422 100644
--- a/app-text/dos2unix/Manifest
+++ b/app-text/dos2unix/Manifest
@@ -1,7 +1,7 @@
 DIST dos2unix-7.3.5.tar.gz 662133 BLAKE2B e24f77d92fe0c5931f9ca762b79a1713b14cc39b7566f78d55c4fd58bb7d3c0de1f2a8add8ffd6c3fa26a6bae73c412572fc71701e26b7b52f15b51b0de0d294 SHA512 beafefa715d894ec51bd808b18485bcf413f93b888203486e659f7e30b922b32b2f1da2305ef9ae85e54085ba3819bd512957bb872b529fe4728000cec7d3e58
-DIST dos2unix-7.4.0.tar.gz 710339 BLAKE2B 629c4a410f0cbb0b5b0fdb89c03fbec1965759a747309ad8a4459820bf2151d1861f4040d67ce6934ca27cfc3b6d0495eccd0966045803f065b10520808d9686 SHA512 41be6b0c747f4a8e316eccecd468c8250aa6791962485569eb9496def60818ae434d619b5cfb5f80f15f8d17800314f5aefe229dc5d37faaa34e1270575175e9
 DIST dos2unix-7.4.1.tar.gz 711570 BLAKE2B 3dbe33007aa3e2ef47ec3dc0c3165987986955fffd7ae1435725014d52ba716626e7891911afe11674beec11fa62a12983c8dfc28cff682ca0c3e798449a9b0f SHA512 81e7cff82d95b298fb218b073f54d17fa851a7507fbd54b3cd9af7c1efa6a7bd3cf59f7a84ffbaf395403bf458650763e1755944451b24f708878a9c62316dc4
-EBUILD dos2unix-7.3.5.ebuild 2037 BLAKE2B edfc091f5ae520b92c58aa58b5273a1748c07741a64ad37fa9b06458c257b2e394fd43c56ae46c562f40a8331c9360e486f7d1e27957bff1f6e0c783b4f5a0f8 SHA512 be9ba30896b2e246b978ec3184c593c85e06e3b223fcdce599874645477f35c4161a6a1261379dbed08db2556eb9c472f6a89959a636887cfdd51ff924377dbe
-EBUILD dos2unix-7.4.0.ebuild 2046 BLAKE2B b76c15a3753bcfe22324fd3caafd4e4a1286d6d96bc379a3e23854dcc9bb7bb1344e7661cbdcc846caa1e740bee2a428f88408dea8ea6298735d15e2d8ffbfc5 SHA512 27fc2bd3e3e43512d4ab571ca5ddfb4f6ba8e0940eb8bd65c9d90f0c602822334f5789f3a2101311006fb614708ca32396ae8c3d24b8b313aa9248c8cd76d350
-EBUILD dos2unix-7.4.1.ebuild 2055 BLAKE2B fa9aabf70d771a0e39709efd6c20b394dd3699b2a601a8c4a3ee16c7e950490edee1909ad00c350053b3ec7dc095dbe27fa7d27a2254215350d3061578d0139f SHA512 6a0cddfcf4da36a0194a99dc9e87c3bd654e1a5838bf7e936d720535301735764a1d08381b367ebe687c0292839d590898fa481d3d8ead4e135b266ca6759d3a
+DIST dos2unix-7.4.2-beta1.tar.gz 712261 BLAKE2B 020b51a53b3b8ac601efd0f3fa424fbe5a42ca5b06e1f7282c2aca021e22b38aac21e4aa7b42ed428c95053d57bb5c35483881b06dc580b533eac2fe716142a2 SHA512 323c0dd90616bca1891f8228d43bca1c6415b5765f5fba4ccf5ce692da9b545c8f10f908ba5ebd65c3409fb4d9fdaaa2fb36d589faa8b5940d27ecf8f72bc422
+EBUILD dos2unix-7.3.5.ebuild 2062 BLAKE2B 68e7934f4731f0dc975085d6200c6c9e455ef065c0535edbb81abf0d4a1623d955948acdaaa1fd53807a206646d1c5d95b2bece673cac19a1d067f6ede876641 SHA512 55391478b1cc59f22e99adff149c4305eb3104fa97fc842d8d989a2b1836aca79af103561cec88c11f7e75438b267ee36741a935a34cc8e15daa1858bedb1573
+EBUILD dos2unix-7.4.1.ebuild 2084 BLAKE2B 34ea0687dd9b62819ea07dc4d217950f395e69ab6f152971e69115e6fb0524448fd7aa20a83a09a80b24b2de58850a684d26e30cfebb97c7c13cee4d34f76713 SHA512 fe58262dd2b1a27d3327f7a2fe40c8f9d8b59e84677a494f632f67bdffc68c9a4ddacb237c4f0144f8b1774aa53d4ba04e61d8138c43ed74829ea9db6a5036f0
+EBUILD dos2unix-7.4.2_beta1.ebuild 2147 BLAKE2B cb95b8e2e6ff0138adb3d296d7b78af682ed71e5f80d1c985322144c2af0b63cbe3f2ce3dbfce76332c1d220250d3c853031db5a3343de9699b11303b5df6b61 SHA512 b8bca370d4b1127382a4b80ca87ed8aaafded29da6cbebcbd77db16855cba7fa3809010e7f7687b51bdac1d6f6722481e844496b71fab191f8b3f68ccffd8a37
 MISC metadata.xml 343 BLAKE2B c4023a36777a79352885528afd87e7709255ccf7f02d9ba28e29eb11f6c67c2775eeeec4f2db95b427b94859e70e7cd276984bca828eb872116e7ec33751c31c SHA512 12f79ed9fdd8df3c05110ea2a31123ca92a855cdf9287910802cb4e68c384764cc84c29929376426b23bfe9699574dbbdc2105d82c6e2701aa9fe67079d867f3
diff --git a/app-text/dos2unix/dos2unix-7.3.5.ebuild b/app-text/dos2unix/dos2unix-7.3.5.ebuild
index d871ca54b250..1df77cff6201 100644
--- a/app-text/dos2unix/dos2unix-7.3.5.ebuild
+++ b/app-text/dos2unix/dos2unix-7.3.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -28,6 +28,8 @@ DEPEND="
 	test? ( virtual/perl-Test-Simple )
 	dev-lang/perl"
 
+RESTRICT="!test? ( test )"
+
 handle_locales() {
 	# Make sure locale list is kept up-to-date.
 	local detected sorted
diff --git a/app-text/dos2unix/dos2unix-7.4.1.ebuild b/app-text/dos2unix/dos2unix-7.4.1.ebuild
index 09270293006f..d57d4c02b286 100644
--- a/app-text/dos2unix/dos2unix-7.4.1.ebuild
+++ b/app-text/dos2unix/dos2unix-7.4.1.ebuild
@@ -30,6 +30,9 @@ BDEPEND="
 	dev-lang/perl
 	nls? ( sys-devel/gettext )
 "
+
+RESTRICT="!test? ( test )"
+
 handle_locales() {
 	# Make sure locale list is kept up-to-date.
 	local detected sorted
diff --git a/app-text/dos2unix/dos2unix-7.4.0.ebuild b/app-text/dos2unix/dos2unix-7.4.2_beta1.ebuild
index 7e09f7d15bea..6338a7ec3811 100644
--- a/app-text/dos2unix/dos2unix-7.4.0.ebuild
+++ b/app-text/dos2unix/dos2unix-7.4.2_beta1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 PLOCALES="da de eo es fr hu ja nb nl pl pt_BR ru sr sv uk vi zh_CN zh_TW"
 
@@ -10,11 +10,12 @@ inherit l10n toolchain-funcs
 DESCRIPTION="Convert DOS or MAC text files to UNIX format or vice versa"
 HOMEPAGE="http://www.xs4all.nl/~waterlan/dos2unix.html https://sourceforge.net/projects/dos2unix/"
 SRC_URI="
-	http://www.xs4all.nl/~waterlan/${PN}/${P}.tar.gz
-	mirror://sourceforge/${PN}/${P}.tar.gz"
+	http://www.xs4all.nl/~waterlan/${PN}/${P/_/-}.tar.gz
+	mirror://sourceforge/${PN}/${P/_/-}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
+[[ "${PV}" == *_beta* ]] || \
 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 ~sparc64-solaris"
 IUSE="debug nls test"
 
@@ -24,9 +25,16 @@ RDEPEND="
 
 DEPEND="
 	${RDEPEND}
-	nls? ( sys-devel/gettext )
 	test? ( virtual/perl-Test-Simple )
-	dev-lang/perl"
+"
+BDEPEND="
+	dev-lang/perl
+	nls? ( sys-devel/gettext )
+"
+
+RESTRICT="!test? ( test )"
+
+S="${WORKDIR}/${P/_/-}"
 
 handle_locales() {
 	# Make sure locale list is kept up-to-date.
diff --git a/app-text/ghostscript-gpl/Manifest b/app-text/ghostscript-gpl/Manifest
index 58d47545a003..43a28095e0b0 100644
--- a/app-text/ghostscript-gpl/Manifest
+++ b/app-text/ghostscript-gpl/Manifest
@@ -3,5 +3,5 @@ DIST ghostscript-9.50.tar.xz 34613344 BLAKE2B 999af7525ec84448256bac233a81ea3b8d
 DIST ghostscript-gpl-9.26-patchset-1.tar.xz 3716 BLAKE2B 0a4c32b3d0c0152b0dc7c62bf2b0bc8e30a369c2aed7c7be4a231948123c2242ce96ae5b1fd485bdae84d7cde1be9f3b3a16831fe77dfbc7ac6cd28bb5e14442 SHA512 7ad9558b00cc11d0872b32d2f1430d2e47730a2360c79d88299c87f8d6d4c15adb5c679ebdcaf50c58d9051c6a1d6f6873e4d81aadfbf3ce202ad94b6dc8981f
 DIST ghostscript-gpl-9.50-patchset-1.tar.xz 3840 BLAKE2B 12bda8633b5657b1b480b69d5a039be724c1af9a1a67e3509112fb607565e087500d2a6efaacd5e774e0f24b01fa6e8887a56fa0207cfc6fcdc3768b0156f86f SHA512 dc638ffb48425980202e7064ee40f65b0f78041c82601f87035100a50d5e18455aa1b852c8c1d852fa582b8be52276d078d80463e3b25ab73863a8544d0e08c1
 EBUILD ghostscript-gpl-9.26.ebuild 5128 BLAKE2B 30304f954fbef282379ad86802d4aa3ce2c8c5964ea9e63c3bf57c8d0b4896e59b3b02f2238aabc5ff4d90a96e0da3b01b16e42420e89670cf84f1181b0edfab SHA512 0d626ed577c443f1628b5f8f99672d27799c32ac83a73c6f2b3f3f3c1f92888bf24279ba7bca161552e5cc8f51de2d3ebc450beb6b724ad65329d4495bad273d
-EBUILD ghostscript-gpl-9.50.ebuild 5387 BLAKE2B b1bd13a12c43bc94c49223aad5e912456c3cc81d837e6b0f5218fb5e3ecead41c420f654f5fd098f6f73589d12e8d36cce3c18c4c3e505faef36eb3cd29e66d7 SHA512 24d4eb24f7d97393527d624fbc2425092215c0594b2541ad3cc0dc196f59f1e086727dd58aa16d6389bd67f72663a58d084eb782bdb62e7858f7b6955c1ed8b7
+EBUILD ghostscript-gpl-9.50.ebuild 5385 BLAKE2B 4063af697cc6e20c9ee77aa28dc0259e9aa5801dda4a70c35788a3364926755d5664bdc113f49a2bf2325298ad74f656ae86449000f52b4ce34c4efd28b484be SHA512 6850f8e2006ee84041b33a316dd0260fdef8db4d73000cfc1a0c573de03ef7133e45ec8dd571766adf030010a6fc3076495c78524bc15986ccf85f5857f154d0
 MISC metadata.xml 583 BLAKE2B cc9bd976a53f467582f4657d0f08862454c53783d1eeedf90dfe9fab7e074a8903a48632b03847e4aeba4d9f6cf821ebda120c1de1e64740641e4849278646a8 SHA512 3de9e76a9a3b6fff971d0760b3590a60448014268f45faa742327a90b1cd8c40eae1426026cda590dd9f91c96580eabbba85125c88ed250479b8df675f45bb15
diff --git a/app-text/ghostscript-gpl/ghostscript-gpl-9.50.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-9.50.ebuild
index 0c47bd6c911a..f1defa3f6bf7 100644
--- a/app-text/ghostscript-gpl/ghostscript-gpl-9.50.ebuild
+++ b/app-text/ghostscript-gpl/ghostscript-gpl-9.50.ebuild
@@ -22,7 +22,7 @@ fi
 
 LICENSE="AGPL-3 CPL-1.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
+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/html401/Manifest b/app-text/html401/Manifest
index f7317e40a8e2..a69fb43d67a1 100644
--- a/app-text/html401/Manifest
+++ b/app-text/html401/Manifest
@@ -1,5 +1,4 @@
 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 1014 BLAKE2B f790eb16c25ce67611295a20b6fdc63760fab22aa7c48a0fb331cd4a7079e563937115d0d5f96e931cab17f33fee5da90038c5e4b319a3e63fa1059e031abc74 SHA512 8539faf00e908a5354a6a8a6e5cf38a133c53a3acb720b0adce89c094e183ee72e2279023f2bc3f9e7a1e00f0af47255e6a90c9aaba373f5ae4653b5f9541b15
+EBUILD html401-19991224-r4.ebuild 1034 BLAKE2B f6b45a48b4e7e3654c4a719163fa8ad0c79966e091e082006766f7c032691427685e1031f93311906a3c56c0512cc254baf48a8c82a6f0c5243f56fb1b9198c8 SHA512 f35596fef49c99fd6f7d2257a06a540192ec053e3fe1828f6ad2cd008b34de5aebcd243ac62d64e7d1790f9e9f64222c8771718f45e6a2727fdf7dfd228c2747
 MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/app-text/html401/html401-19991224-r3.ebuild b/app-text/html401/html401-19991224-r3.ebuild
deleted file mode 100644
index 777837fcc2f2..000000000000
--- a/app-text/html401/html401-19991224-r3.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit sgml-catalog eutils
-
-DESCRIPTION="DTDs for the HyperText Markup Language 4.01"
-HOMEPAGE="http://www.w3.org/TR/html401/"
-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"
-IUSE=""
-DEPEND="app-text/sgml-common"
-RDEPEND=""
-
-S=${WORKDIR}
-
-src_prepare() {
-	sgml-catalog_cat_include "/etc/sgml/${PN}.cat" \
-		"/usr/share/sgml/${PN}/HTML4.cat"
-	epatch "${FILESDIR}"/${PN}-decl.diff
-}
-
-src_install() {
-	insinto /usr/share/sgml/${PN}
-	doins HTML4.cat HTML4.decl *.dtd *.ent
-	insinto /usr/share/doc/${PF}/html
-	doins -r *.html $(ls -p | fgrep "/" | sed "s#/##")
-}
diff --git a/app-text/html401/html401-19991224-r4.ebuild b/app-text/html401/html401-19991224-r4.ebuild
index c51da3def031..8b2044b87896 100644
--- a/app-text/html401/html401-19991224-r4.ebuild
+++ b/app-text/html401/html401-19991224-r4.ebuild
@@ -5,8 +5,8 @@ EAPI=7
 inherit sgml-catalog-r1
 
 DESCRIPTION="DTDs for the HyperText Markup Language 4.01"
-HOMEPAGE="http://www.w3.org/TR/html401/"
-SRC_URI="http://www.w3.org/TR/html401/html40.tgz"
+HOMEPAGE="https://www.w3.org/TR/html401/"
+SRC_URI="https://www.w3.org/TR/1999/REC-html401-19991224/html40.tgz"
 
 LICENSE="W3C"
 SLOT="0"
diff --git a/app-text/hunspell/Manifest b/app-text/hunspell/Manifest
index d3a05b3da2f4..2ac0557809e1 100644
--- a/app-text/hunspell/Manifest
+++ b/app-text/hunspell/Manifest
@@ -4,6 +4,5 @@ AUX hunspell-1.7.0-tinfo.patch 1721 BLAKE2B 1278f50da7577556710a8e481f46ca03ea40
 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 2361 BLAKE2B b75f02e0862a9a8be86d7fb29b663a93f483410bf5d0301bdab8487516c00f132e6268ed0bdf133f2ef746528b93c6b0d7cc71a38eb3f49b33202b125e19e04e SHA512 fa6f2089e74c17adcfeebdce2ffa7f2a56ef86e53f1b05b2a2d7fc61e4a29dc9a5f010aa305e07cf22c63208bb73fe1c795efc47e951b666aad33feccd0aeaad
-EBUILD hunspell-1.7.0-r1.ebuild 2326 BLAKE2B b077cc87d4bb5699232bc95ea519aa8fe2e9afaf15b9f0875a37408c728f0e3d14d4c1dd7423d303c6ea6fb967e4a98c7acd7269b072da186806f17e0c1d30a1 SHA512 f28f18c53fb148324dd8629aab4ca753e0caccd5870fa90833ec6a6c70c323c427a6b4832ed08c2f618f9671b466140214fca7bf7ecb49b1589e0c04418f4f7f
-EBUILD hunspell-1.7.0.ebuild 2270 BLAKE2B edd683d1308d7b2efabcb376c97c782d018ffb05947e957a2cb6417135b4c9fb56fbf9258f48d73a74f9574d9cc1386acbc49bc9ffdcc69ce922722d77a46c00 SHA512 aa610975bbfda9fc30f1590bdfd7f5ddace0a561f30755246a1e99c87851e2433b71c84c58cef0e8d1d1964c29a71dcc93b52adfb0228c4352d2a39ce207398c
+EBUILD hunspell-1.7.0-r1.ebuild 2325 BLAKE2B 3d4ef15259429bd278afdab0472b228049a497705b0758c7583b1abfce7b82b4eb8a65b2fb9ca772bb840b830765870fc941d03777e2db1a3e36638ba4b098ba SHA512 a4e84a740c35109a2032117e97a7d2afb705c4b2dd75f6218c14867dc65172da75d0facc981f407579d51053dd34d31c776ad69bef34f37b6b88495753e4076a
 MISC metadata.xml 300 BLAKE2B 03418bffa5dab48a3d9f5f7de46a79b8b5de44296b7c39d8d75d021f3c5693eea63148fbed02c8a77b1a0846e1d39d8e11caeb003297839fda0c5dc679aaca08 SHA512 b541c90d84ee8c1541d588948286428f065ebf0bb393108e7521ba8d45ab3fb235eaba61ca61eebc61f371e399e7d98ccf3c2994d8df97d1b6a7972e92cffa71
diff --git a/app-text/hunspell/hunspell-1.7.0-r1.ebuild b/app-text/hunspell/hunspell-1.7.0-r1.ebuild
index 14d592432628..e68c903e4c0a 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-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
deleted file mode 100644
index 1fbd02a709e9..000000000000
--- a/app-text/hunspell/hunspell-1.7.0.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools flag-o-matic
-
-MY_P="${PN}-${PV/_beta/b}"
-
-DESCRIPTION="Hunspell spell checker - an improved replacement for myspell in OOo"
-SRC_URI="https://github.com/hunspell/hunspell/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-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-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="
-	ncurses? ( sys-libs/ncurses:0= )
-	readline? ( sys-libs/readline:= )
-"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-"
-
-LANGS="af bg ca cs cy da de de-1901 el en eo es et fo fr ga gl he hr hu ia id
-is it kk km ku lt lv mi mk ms nb nl nn pl pt pt-BR ro ru sk sl sq sv sw tn uk
-zu"
-
-PDEPEND=""
-for lang in ${LANGS}; do
-	IUSE+=" l10n_${lang}"
-	case ${lang} in
-		de-1901) dict="de_1901" ;;
-		pt-BR)   dict="pt-br"   ;;
-		*)       dict="${lang}" ;;
-	esac
-	PDEPEND+=" l10n_${lang}? ( app-dicts/myspell-${dict} )"
-done
-unset dict lang LANGS
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=(
-	AUTHORS ChangeLog NEWS THANKS license.hunspell
-	license.myspell README.md
-)
-
-PATCHES=(
-	# Upstream package creates some executables which names are too generic
-	# to be placed in /usr/bin - this patch prefixes them with 'hunspell-'.
-	# It modifies a Makefile.am file, hence eautoreconf.
-	"${FILESDIR}/${PN}-1.7.0-renameexes.patch"
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	# missing somehow, and I am too lazy to fix it properly
-	[[ ${CHOST} == *-darwin* ]] && append-libs -liconv
-
-	# I wanted to put the include files in /usr/include/hunspell.
-	# You can do that, libreoffice can find them anywhere, just
-	# ping me when you do so ; -- scarabeus
-	local myeconfargs=(
-		$(use_enable nls)
-		$(use_with ncurses ui)
-		$(use_with readline readline)
-		$(use_enable static-libs static)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	einstalldocs
-	find "${D}" -name '*.la' -delete || die
-
-	#342449
-	pushd "${ED}"/usr/$(get_libdir)/ >/dev/null
-	ln -s lib${PN}{-$(ver_cut 1).$(ver_cut 2).so.0.0.1,.so}
-	popd >/dev/null
-}
diff --git a/app-text/info2html/Manifest b/app-text/info2html/Manifest
index bc2b233e21ea..88296708eaf5 100644
--- a/app-text/info2html/Manifest
+++ b/app-text/info2html/Manifest
@@ -1,4 +1,5 @@
 AUX info2html-2.0-xss.patch 2206 BLAKE2B 12daf13818b6c6a32932185f543bdfdfbb318d91f80ede4fe2495f9fe5d0dfc3183ad10b8e66d529530ea853834be2f029d94a81e7eebde5e8cfa67c06508797 SHA512 9ffdd82d6cd0f53473fa8eedd5372c09b3a0a2f2b59bea229320fb77bf07d9f9a9f6892585250cd9fa5034213b2b08a346e739ae931c6a42bbdc73487348b947
 DIST info2html-2.0.tar 51200 BLAKE2B 0209e7792689f68c8f596dcb0771395014963240f2071aa970f50611f752e9b9cf524ba2083a72a9b0f4346f8e14e23aedfde4497b05c02dae90b223ebcf6311 SHA512 1b9ebc8bdd4101d24116fe22df9e5d3124300b2ac11585d8c7fff9652f7984983480442af9d9f86300f9684335d85b96f276a775c56c95e7fac85ebc46235e06
+EBUILD info2html-2.0-r1.ebuild 1914 BLAKE2B 861c434b51a57e9a7641e2150e87c10a760ed0c13303ef1f2e7044e021923d23a9c870c1f4d2b7ec947b859736462ec775130eca325d9c07cec4b019f263549e SHA512 d6895e403e119a66884628d495fdc3345c6d0f9696468fccaabc8f339fa57a739baae1f3474efe58dc572a7a5dab881e33f7e3d45c77e682bd774bb6f0efd7db
 EBUILD info2html-2.0.ebuild 1936 BLAKE2B 35ad17ff213a187eb6a9b91e85c4e6e4c4cc9428cabf004d071aa0af4a9f6517dcaa06b76860523552250a0cb682982d587764b00238d47de080f63d14fb92e3 SHA512 e6064454cea807c4bd187f00796231ca53dbf1290aa7bca05eb56a048e0cce9c86b9ca857d5e18ad4e1ab036029acddbd74ba7aaf0592d8b5da58d1cf5f8b700
 MISC metadata.xml 329 BLAKE2B 9d0be1049ee8b84a11cf0b216e1e05263409f28ec1169978454df89f9726bdcdf1b63ba824f534606bdcd2163dd7b8e1aa9bf9497dfcb6410c0eb3b63958311a SHA512 18e0083cb85393d3d92abda8016dcdebe9f84fcd176557cb433b858ed9b6087ce7e5b53022d689e3861526d10440a9fe7fd6a1d86782a76d8f0756c3046bae23
diff --git a/app-text/info2html/info2html-2.0-r1.ebuild b/app-text/info2html/info2html-2.0-r1.ebuild
new file mode 100644
index 000000000000..3bacec7b49a4
--- /dev/null
+++ b/app-text/info2html/info2html-2.0-r1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit eutils webapp
+
+DESCRIPTION="Converts GNU .info files to HTML"
+HOMEPAGE="http://info2html.sourceforge.net/"
+SRC_URI="mirror://sourceforge/info2html/${P}.tar"
+
+LICENSE="freedist"
+# webapp.eclass deals with SLOTting
+#SLOT="0"
+IUSE=""
+KEYWORDS="~alpha ~amd64 ~hppa ~sparc ~x86"
+
+RDEPEND="dev-lang/perl"
+PATCHES=(
+	# filter user-provided data to prevent cross-frame/site scripting attacks
+	# bug #91354 (fix from Werner Fink)
+	"${FILESDIR}"/info2html-2.0-xss.patch
+)
+
+src_prepare() {
+	default
+
+	# Fixup INFODIR for paths in /etc/profile.env INFOPATH
+	infos=$(grep "^export INFOPATH=" /etc/profile.env | tail -n 1 |\
+				sed -e "s:^export INFOPATH=:INFOPATH=:;s:'::g")
+	# Default path to /usr/share/info and /usr/local/share/info
+	[[ -z ${infos} ]] && export infos="/usr/share/info"
+	infos=( ${INFOPATH//:/ } )
+	mv "${S}"/info2html.conf "${S}"/info2html.conf.orig
+	touch "${S}"/info2html.conf
+	state="copy"
+	inserted="no"
+	while read line; do
+		[[ ${line} == "@INFODIR = (" ]] && state="insert"
+		[[ ${line} == ");" ]] && state="copy"
+		case ${state} in
+			"copy")
+				echo ${line} >> ${S}/info2html.conf
+				;;
+			"insert")
+				echo ${line} >> ${S}/info2html.conf
+				for info in "${infos[@]}"; do
+					echo "	'${info}'," >> ${S}/info2html.conf
+				done
+				echo "	'/usr/local/share/info'" >> ${S}/info2html.conf
+				state="skip"
+				inserted="yes"
+				;;
+			"skip")
+				;;
+		esac
+	done < "${S}"/info2html.conf.orig
+	[[ ${state} == "copy" && ${inserted} == "yes" ]] ||
+		die "Setting up info2html.conf failed"
+}
+
+src_install() {
+	webapp_src_preinst
+
+	exeinto ${MY_CGIBINDIR}
+	cp info2html infocat info2html.css info2html.conf "${D}"/${MY_CGIBINDIR}
+	# README zapped by info2html-gentoo.patch; it only listed
+	# the homepage so it doesn't add anything useful.
+	# dodoc README
+
+	webapp_src_install
+}
diff --git a/app-text/libabw/Manifest b/app-text/libabw/Manifest
index 3b6f6fae83e4..c7d7a8d796e4 100644
--- a/app-text/libabw/Manifest
+++ b/app-text/libabw/Manifest
@@ -1,5 +1,3 @@
-DIST libabw-0.1.2.tar.xz 318400 BLAKE2B ba25542da0d6568530241892dbdba72d2b0dcf667b50e0c1a4e656e0facf82bf77ca8eff8db4d6e57ab699f12d8dad511d32aee291541ffe6460b2ee98590b68 SHA512 a365c1aa047a97a86eee6bce8463646bdf248a51013139ee288402a832fd545586e072d7c7fc11a56f42e3637de9e922197be20d0587e53c51fd80ced409a6cd
 DIST libabw-0.1.3.tar.xz 318808 BLAKE2B 234ff797bf3798bc7f14f2b3f0d0cc2d80eda2a6ba2d656288c26e58d53b9798003d7f45ad7c9a0f504da36c8c8ba367f8fe5b565a85fbc6a1f1627d89e7e353 SHA512 0d2646e1bad1e11b3da43714ac5931fc67ffdbc4e7a25a44ef5b6e6a41de1e0ae14596b4a87cceb07bf56dbbe9344622b3d60afcb054ee0ab8577ca8e9b5c289
-EBUILD libabw-0.1.2.ebuild 854 BLAKE2B 605b465b931a138beac45a6084d9cc2b0000e57f7cee102681cd56fe3f56c963309d0556ad5bf1f146b5de33246a5337ad024ef3f028b3530281f4a99aed6b5c SHA512 448e45210f18856a9713b959256dc4b861ae7004efa546a0295ea261fbc13a1aea5244e1ddeb93ec075dd6579c301b1a60526b84c0272221e1226b6af292ac33
-EBUILD libabw-0.1.3.ebuild 835 BLAKE2B 96622f8f5c9757c830c800bcf239894e64b09d8e5b1e728f3bd758cec41e96b6e32d3f82102339a905234f4af978a20ec997fefcad3ff04e2af12c2cb02aa280 SHA512 d4e0bd7fbcea6540b8f21ff5fa6f96e5b47a8c8d573a76adf002b19ebc6f97997fe2d3a44d8ee403ce562d56ee7a474e575f8d0cc8c3959173710829aa554ab2
+EBUILD libabw-0.1.3.ebuild 834 BLAKE2B ccd33ad9c142658d555b1ee31788f6d2e7477dd2a996c84a31e4d2905323c815f0547d4ae63b9b0cb3863beb1cb1d57e6054b1c0673f856b7442dbbca6b103c3 SHA512 323ec2ddca6e4deea8938f1bba01f77b68a75ad784b6e1a04c2e183592eb56e43e7605ccd00e9acff6135529a4b5d8a52bbd8ae254aa4584854c56208f540819
 MISC metadata.xml 255 BLAKE2B 9b8486730bea2158e8be5cbbe0552c5460d1b18e2236a68e3f11d85ce4eeb96eb0e746f44a10cb7cdcf1bf498190a512ef42f47852c6843b9a3c937ceabc338d SHA512 ac646e8ac676faf0aac283e4be31c5f2b29e98ccf07327073ed05e688ce696caf639bdfea63e4aed141a90e84c0a86892bc717a52b95cdf1739aaa15240013c3
diff --git a/app-text/libabw/libabw-0.1.2.ebuild b/app-text/libabw/libabw-0.1.2.ebuild
deleted file mode 100644
index 55a551b2fc4f..000000000000
--- a/app-text/libabw/libabw-0.1.2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools flag-o-matic
-
-DESCRIPTION="Library parsing abiword documents"
-HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libabw"
-SRC_URI="https://dev-www.libreoffice.org/src/${PN}/${P}.tar.xz"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="doc static-libs"
-
-RDEPEND="
-	dev-libs/librevenge
-	dev-libs/libxml2
-	sys-libs/zlib
-"
-DEPEND="${RDEPEND}
-	>=dev-libs/boost-1.46
-	sys-devel/libtool
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	# bug 619470
-	append-cxxflags -std=c++14
-
-	econf \
-		--disable-werror \
-		$(use_with doc docs) \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/app-text/libabw/libabw-0.1.3.ebuild b/app-text/libabw/libabw-0.1.3.ebuild
index 8f82370198df..71115f275264 100644
--- a/app-text/libabw/libabw-0.1.3.ebuild
+++ b/app-text/libabw/libabw-0.1.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev-www.libreoffice.org/src/${PN}/${P}.tar.xz"
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="doc static-libs"
 
 BDEPEND="
diff --git a/app-text/mht-rip/Manifest b/app-text/mht-rip/Manifest
deleted file mode 100644
index 89109fc79ecf..000000000000
--- a/app-text/mht-rip/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST mht-rip-0.8.c 9105 BLAKE2B f8b7566b5c875b10992f4b8bd4746f0be6b75cddc2d07f17db9113254ea2354f65d77ddc13f6e930051e8f0bbe564c4f37baf4355be999c2a524f05597d5cf30 SHA512 377643c75e621dfa88f426db8e0f8e0959aaa841d1950ab1cc4d514de1a4120cbd20e9f18aa58607b6012a9417095489de968002bd8d91fd89f71dcc0b90357e
-EBUILD mht-rip-0.8.ebuild 473 BLAKE2B adccc048fd29ccd8f680581f910647467b01ec9a4ef2c3b66cfd56228e8818eb3302ea59d387d9f27a3a8a41907474a7aca99fa919ac717f890aec490b21cd05 SHA512 7543b8eb5e6adf03f9efe7f184e57a3244af528ada3eefc7f3424605b99c8ca26b715670fbf21892feb9b791aff2840a4987f8c148e9e99d4fcc2b2f9f308fd4
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-text/mht-rip/metadata.xml b/app-text/mht-rip/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/app-text/mht-rip/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/mht-rip/mht-rip-0.8.ebuild b/app-text/mht-rip/mht-rip-0.8.ebuild
deleted file mode 100644
index f911329069fb..000000000000
--- a/app-text/mht-rip/mht-rip-0.8.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-DESCRIPTION="convert mht/mhtml files to something usable"
-HOMEPAGE="http://www.loganowen.com/mht-rip/"
-SRC_URI="http://www.loganowen.com/mht-rip/${P}.c"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-S=${WORKDIR}
-
-src_unpack() {
-	cp "${DISTDIR}"/${A} ${PN}.c || die
-}
-
-src_compile() {
-	emake ${PN} || die
-}
-
-src_install() {
-	dobin ${PN} || die
-}
diff --git a/app-text/openjade/Manifest b/app-text/openjade/Manifest
index abb399fa9a45..ff7002dd7e34 100644
--- a/app-text/openjade/Manifest
+++ b/app-text/openjade/Manifest
@@ -10,6 +10,5 @@ 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 3685 BLAKE2B 8fa38e1343de5dffe1477aba279158cf1a46d20b6b9f2bbb33806b32f9ee2e80a7aea2b9f90068bd4c671d892f974f15decb8a178aead7d3da66d68a798266cf SHA512 04eb2d1e1080015346d2ddd136c71fb6328973e6b94814fc2a90d9f9f7743055d117825017cc165f37f333a8a6f6c683fc4bdd4103c920d6313bc71c0cea14fc
-EBUILD openjade-1.3.2-r9.ebuild 4324 BLAKE2B 02fee4ca8f94031901f5cf53a70b9b6b30443717cc0a02513e3887058fa9b33c5256e629f05d37b74765ee52f678f4f67475ed5d6e0889493fe08a42df49057e SHA512 30ae5346e8c936e936165f04e6178b53eed5323a1c8ad8ed413d6f035c5bb447fbf5ac77fb0e9b9578631dacdabf1aa4277b88e6800d327ceaf237e681221756
+EBUILD openjade-1.3.2-r9.ebuild 4321 BLAKE2B e8a4a8eb03b705731391c64bc70b58d01a50c0bbe31dae8c4c80e1d0dd3f748eaac547017c757e61cad42a723cb5b8f728f6d90f56ef402ff6a78a77ad45af1d SHA512 3b5d249e45a4d4228f5f766e5bdd0209d7f37d835aced6de77f14303d687b293c48d3277fb09204f7fffe51c2efc6e011b486f54dac323ff0c127c29020ce042
 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
deleted file mode 100644
index 7388015dfa8c..000000000000
--- a/app-text/openjade/openjade-1.3.2-r8.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools sgml-catalog flag-o-matic toolchain-funcs
-
-DESCRIPTION="Jade is an implementation of DSSSL for formatting SGML and XML documents"
-HOMEPAGE="http://openjade.sourceforge.net"
-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-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="static-libs"
-
-RDEPEND="
-	app-text/sgml-common
-	>=app-text/opensp-1.5.1
-"
-DEPEND="${RDEPEND}
-	dev-lang/perl
-"
-
-src_prepare() {
-	default
-
-	eapply "${FILESDIR}"/${P}-deplibs.patch
-	eapply "${FILESDIR}"/${P}-ldflags.patch
-	eapply "${FILESDIR}"/${P}-msggen.pl.patch
-	eapply "${FILESDIR}"/${P}-respect-ldflags.patch
-	eapply "${FILESDIR}"/${P}-libosp-la.patch
-	eapply "${FILESDIR}"/${P}-gcc46.patch
-	eapply "${FILESDIR}"/${P}-no-undefined.patch
-	eapply "${FILESDIR}"/${P}-wchar_t-uint.patch
-	eapply "${FILESDIR}"/${P}-chmod.patch #487218
-
-	# Please note!  Opts are disabled.  If you know what you're doing
-	# feel free to remove this line.  It may cause problems with
-	# docbook-sgml-utils among other things.
-	#ALLOWED_FLAGS="-O -O1 -O2 -pipe -g -march"
-	strip-flags
-
-	# Default CFLAGS and CXXFLAGS is -O2 but this make openjade segfault
-	# on hppa. Using -O1 works fine. So I force it here.
-	use hppa && replace-flags -O2 -O1
-
-	ln -s config/configure.in configure.ac || die
-	cp "${FILESDIR}"/${P}-acinclude.m4 acinclude.m4 || die
-	rm config/missing || die
-
-	AT_NOEAUTOMAKE=yes
-	eautoreconf
-
-	SGML_PREFIX="${EPREFIX}"/usr/share/sgml
-}
-
-src_configure() {
-	# avoids dead-store elimination optimization
-	# leading to segfaults on GCC 6
-	# bug #592590 #596506
-	tc-is-clang || append-cxxflags $(test-flags-CXX -fno-lifetime-dse)
-
-	# We need Prefix env, bug #287358
-	export CONFIG_SHELL="${CONFIG_SHELL:-${BASH}}"
-	econf \
-		--enable-http \
-		--enable-default-catalog="${EPREFIX}"/etc/sgml/catalog \
-		--enable-default-search-path="${EPREFIX}"/usr/share/sgml \
-		--enable-splibdir="${EPREFIX}"/usr/$(get_libdir) \
-		--libdir="${EPREFIX}"/usr/$(get_libdir) \
-		--datadir="${EPREFIX}"/usr/share/sgml/${P} \
-		$(use_enable static-libs static)
-}
-
-src_compile() {
-	unset INCLUDE #412725
-	emake -j1 SHELL="${BASH}"
-}
-
-src_install() {
-	insinto /usr/$(get_libdir)
-
-	make DESTDIR="${D}" \
-		SHELL="${BASH}" \
-		libdir="${EPREFIX}"/usr/$(get_libdir) \
-		install install-man
-
-	use static-libs || find "${D}" -name '*.la' -delete || die
-
-	dosym openjade  /usr/bin/jade
-	dosym onsgmls   /usr/bin/nsgmls
-	dosym osgmlnorm /usr/bin/sgmlnorm
-	dosym ospam     /usr/bin/spam
-	dosym ospent    /usr/bin/spent
-	dosym osx       /usr/bin/sgml2xml
-
-	insinto /usr/share/sgml/${P}/
-	doins dsssl/builtins.dsl
-
-	echo 'SYSTEM "builtins.dsl" "builtins.dsl"' > ${ED}/usr/share/sgml/${P}/catalog
-	insinto /usr/share/sgml/${P}/dsssl
-	doins dsssl/{dsssl.dtd,style-sheet.dtd,fot.dtd}
-	newins "${FILESDIR}"/${P}.dsssl-catalog catalog
-
-	# Breaks sgml2xml among other things
-	#insinto /usr/share/sgml/${P}/unicode
-	#doins unicode/{catalog,unicode.sd,unicode.syn,gensyntax.pl}
-	insinto /usr/share/sgml/${P}/pubtext
-	doins pubtext/*
-
-	HTML_DOCS="doc/*.htm" einstalldocs
-
-	insinto /usr/share/doc/${PF}/jadedoc
-	doins jadedoc/*.htm
-	insinto /usr/share/doc/${PF}/jadedoc/images
-	doins jadedoc/images/*
-}
-
-sgml-catalog_cat_include "/etc/sgml/${P}.cat" \
-	"/usr/share/sgml/openjade-${PV}/catalog"
-sgml-catalog_cat_include "/etc/sgml/${P}.cat" \
-	"/usr/share/sgml/openjade-${PV}/dsssl/catalog"
-sgml-catalog_cat_include "/etc/sgml/sgml-docbook.cat" \
-	"/etc/sgml/${P}.cat"
diff --git a/app-text/openjade/openjade-1.3.2-r9.ebuild b/app-text/openjade/openjade-1.3.2-r9.ebuild
index df072b4fe9df..04d8536f09b2 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-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/passivetex/Manifest b/app-text/passivetex/Manifest
index cccacd03f67a..2ca2e84677a6 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 785 BLAKE2B a7f6b38fc7c5752e12558a44c50d852ee756291edaafbfb2618df29c2fef2113a7ecd9e833ed35e0108fcd85a23b5d31303a41bfb616c56c0fc85a31598b151f SHA512 62e5c96310690d4b06fd495faf5ca5fdfff1d1c83c600607a345c17b7948abc19ecf55877f74db2d445fc5d531557ccdfb820ff9de85dbce27f00760ac7d1e42
+EBUILD passivetex-1.25-r1.ebuild 768 BLAKE2B b08ef1eaaf77e31655a55d280c4d050824947d56eecf76e07aceffb64c4e7029dde98ec2f5ffbdd102d9635b57813290d01721a995ef4cd64842c47ac627993a SHA512 140ff69ad1e80d9a4d6044d8da11b375f71a6933b5a8ea2291eeb997106d906fb791beebca053379de4c1a2ee993c6f5d45c2bff9914b2c5f8d878f3be3301e3
 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-r1.ebuild
index 6c374b61eb8c..d0aa4bc6536e 100644
--- a/app-text/passivetex/passivetex-1.25.ebuild
+++ b/app-text/passivetex/passivetex-1.25-r1.ebuild
@@ -1,34 +1,31 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=7
 
 inherit latex-package
 
-S=${WORKDIR}/${PN}
 DESCRIPTION="A namespace-aware XML parser written in Tex"
+HOMEPAGE="http://www.tei-c.org.uk/Software/passivetex/"
 # Taken from: http://www.tei-c.org.uk/Software/passivetex/${PN}.zip
 SRC_URI="mirror://gentoo/${P}.zip"
-HOMEPAGE="http://www.tei-c.org.uk/Software/passivetex/"
-LICENSE="MIT"
+S=${WORKDIR}/${PN}
 
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
+LICENSE="MIT"
 SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND="virtual/latex-base
 	>=dev-tex/xmltex-1.9"
-
 DEPEND="${RDEPEND}
 	app-arch/unzip"
 
 TEXMF=/usr/share/texmf-site
 
 src_install() {
-
 	insinto ${TEXMF}/tex/xmltex/passivetex
 	doins *.sty *.xmt
 
-	dodoc README.passivetex index.xml
-	dohtml index.html
+	dodoc README.passivetex index.{html,xml}
 }
diff --git a/app-text/pdfjam/Manifest b/app-text/pdfjam/Manifest
index 66882a0d291a..b0807aaabbcb 100644
--- a/app-text/pdfjam/Manifest
+++ b/app-text/pdfjam/Manifest
@@ -1,4 +1,4 @@
 DIST pdfjam_208.tgz 180725 BLAKE2B 903ce4f0874c9fc9ad23f3db37b882596589d6470dfe9289f65a72fb66ff843bbd49b52086d7b2d2cbbfb1b6406cbbda64d46b933a853d5d681ef88d4033372c SHA512 728c8d304c6d2af773980d20ef4a4be6e0a5dad286ad8cd00be9b1687f5024e00032a750c10c74dcd24431f081368d02b76f03cc5bb1c8725a060cd70be0fd8c
-EBUILD pdfjam-2.08-r1.ebuild 594 BLAKE2B aa12d5c35e9ef4e9cbc45415d42b70920dd148eb12fbc2a212e36287981da3c7f800be1312a8c94ccd4b6ba12acda72f3c7e5f8a6148eff641566cda9e83bb63 SHA512 4f54c326c7df41f75aa4326a1d4d96823ddb2a702ba02980f3565d44ba7db174686b936fb6d2b8fe5d1efbb2426878625df64c9d867711bbf7dd8c47de650320
+EBUILD pdfjam-2.08-r1.ebuild 593 BLAKE2B a938cd485dbc84d644514b2c68e898b68a2dd0f2e4b20c99ae27fccb76002da702f15de579bafcdaa900075d6670746752770c6f46efae7a48b2b1f4514e1698 SHA512 8045d61912ebb9a30954a39d9ea659d9ab19325f8c3a5f0ef14f9e276bc352d3ce9f63c4f1a67a68d4904a93b2a0230ad730e3207d1bd670036647ecdffc48fe
 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-r1.ebuild b/app-text/pdfjam/pdfjam-2.08-r1.ebuild
index 119a213fce22..b3349889c32b 100644
--- a/app-text/pdfjam/pdfjam-2.08-r1.ebuild
+++ b/app-text/pdfjam/pdfjam-2.08-r1.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-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/qpdf/Manifest b/app-text/qpdf/Manifest
index 4c5a56080bd7..09c8a516f95c 100644
--- a/app-text/qpdf/Manifest
+++ b/app-text/qpdf/Manifest
@@ -7,5 +7,5 @@ EBUILD qpdf-8.2.1.ebuild 1246 BLAKE2B a5a9de3de8d4c2bbd9f36c6977626d1943eb1332f3
 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.1.ebuild 1256 BLAKE2B 99fce30ce8d693780d1753027420f7264bedc78a7163f9f37f1a72b1753a18065032508281f72ef052ea3d563b7b2fcc00d80bea959d69d070e8f7d0b30d8c11 SHA512 0bba46803264bbf4e3e2e46c9c0abd5239130b5b58bfb0cd42496d0105a43ebf4638765814f331807cf983169fa54dd3160a55f2e17d42ca2556164742321b71
-EBUILD qpdf-9.0.2.ebuild 1249 BLAKE2B 422ccd8dfb9eb35c3f27ee2d915f3cd5ff4c1c510d8c50dae6b9167372b0598e53085b3380b46fe432cc5f919a73f59dd3d90a88ddffb2afa557e9ec896f21b3 SHA512 8bcc08655c9b27d8e8d96f6b42a50d103c369b4919991872f7df3eef8bf7e841f2e810adda6498fa9d338b0b8c1db5aa7714ae9fe2e029c6831a506c1e2815eb
+EBUILD qpdf-9.0.2.ebuild 1247 BLAKE2B 1d2d5ea01230b8fa7bcb6745e8a4cca67b20fb9724c01b336e562029c470038dbfdd5591edc2bd55a64e008c496ac6a558a8d165562a7b1c5df3fee72fee17d2 SHA512 8c478d7c31448706a2ef065951712630d47c3297756099cca8ede27a16f7683afd223b1cea4c9f1122c569b82cf3e2742dead6e46d26bb2f7f2654462ffa914e
 MISC metadata.xml 499 BLAKE2B 9f6462a9606763352f0c823f877d1a39ffa207a8354e800d64bdb4d7686de8391309e08296adf23ca6b6e5d6fc2150d72ca9b0fed36cd4574e51ae6d04e48341 SHA512 77915adba55eb2b0fa68af06fa30b84c50af0a4a26a3ee6fafa71f9c7a7a307451ab76291dfc87f90479f6a208cb29c8a6c8c7fd0d574455faa15c87f8ea8de7
diff --git a/app-text/qpdf/qpdf-9.0.2.ebuild b/app-text/qpdf/qpdf-9.0.2.ebuild
index 98f584a8c41a..f4cf3354667a 100644
--- a/app-text/qpdf/qpdf-9.0.2.ebuild
+++ b/app-text/qpdf/qpdf-9.0.2.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-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/sgml-common/Manifest b/app-text/sgml-common/Manifest
index 51eecb33f659..4e923b61a649 100644
--- a/app-text/sgml-common/Manifest
+++ b/app-text/sgml-common/Manifest
@@ -1,6 +1,5 @@
 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 2452 BLAKE2B 01b04b177a926d64e0963d67d513c6632b5271f45bb9518defd100d59f3d333300e8c37b4d3d849200fe2ba105bed108c09ebf0037fa08d7df310f151cd8b20a SHA512 bb4a34272e4937dd6c84077f4aae03d28a4bf9868651b0cfb373519673b2dc419834a734559d98878776e022a25ddda202083344c80b6fb5c7b707b39e5b7858
-EBUILD sgml-common-0.6.3-r7.ebuild 2561 BLAKE2B 5ca0dd7d30217967f29aa720436e9369c1f3e97b1fb0d754dd7720e23866129662b33a533f7923e447c2f429005dc9f919a08ec3a963f02099325c2cac0aae42 SHA512 09421758dfc6cd3a7307bc67ef13f5a2b48133c35e0acaeae4597da894a883c81100e32f7b1d0b807f9c726765db4edf8ed5c86c391d805ef38d32e8ad77074a
+EBUILD sgml-common-0.6.3-r7.ebuild 2558 BLAKE2B 4a818e14a8cb42127e235a79ce922b0b7643049d7d2bb2f7760713ea3b13bc8d2285b918aa0808c26f82dfb7c44c95fe1dfa51c7440cec3db175f11a2215227a SHA512 a21f3dadf7bc7404614c48d75fa03abb54c84ee1c380345002a7c10594aef4bcea6c6fd3d98b756421fd2a326d3388b775ea341b006cd3a09d69024fe6d4fdf8
 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
deleted file mode 100644
index 21ad9f0b746c..000000000000
--- a/app-text/sgml-common/sgml-common-0.6.3-r6.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit prefix
-
-DESCRIPTION="Base ISO character entities and utilities for SGML"
-HOMEPAGE="https://www.iso.org/standard/16387.html"
-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-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-PATCHES=( "${FILESDIR}"/${P}-prefix.patch )
-
-src_prepare() {
-	# We use a hacked version of install-catalog that supports the ROOT
-	# variable, puts quotes around the CATALOG files, and can be prefixed.
-	cp "${FILESDIR}/${P}-install-catalog.in" "${S}/bin/install-catalog.in" \
-		|| die "Copy of install-catalog.in failed"
-
-	default
-	eprefixify bin/install-catalog.in bin/sgmlwhich config/sgml.conf
-}
-
-pkg_postinst() {
-	local installer="${EROOT%/}/usr/bin/install-catalog"
-	if [[ ! -x ${installer} ]]; then
-		eerror "install-catalog not found! Something went wrong!"
-		die "install-catalog not found! Something went wrong!"
-	fi
-
-	einfo "Installing Catalogs..."
-	"$installer" --add \
-		"${EROOT%/}"/etc/sgml/sgml-ent.cat \
-		"${EROOT%/}"/usr/share/sgml/sgml-iso-entities-8879.1986/catalog
-	"$installer" --add \
-		"${EROOT%/}"/etc/sgml/sgml-docbook.cat \
-		"${EROOT%/}"/etc/sgml/sgml-ent.cat
-
-	local file
-	while IFS="" read -d $'\0' -r file; do
-		einfo "Fixing ${file}"
-		awk '/"$/ { print $1 " " $2 }
-			! /"$/ { print $1 " \"" $2 "\"" }' ${file} > ${file}.new || die "awk failed"
-		mv ${file}.new ${file} || die "mv failed"
-	done < <(find "${EROOT%/}/etc/sgml/" -name "*.cat" -o -name "catalog" -print0)
-}
-
-pkg_prerm() {
-	cp "${EROOT%/}/usr/bin/install-catalog" "${T}" || die "cp failed"
-}
-
-pkg_postrm() {
-	if [[ ! -x ${T}/install-catalog ]]; then
-		return
-	fi
-
-	einfo "Removing Catalogs..."
-	if [[ -e ${EROOT%/}/etc/sgml/sgml-ent.cat ]]; then
-		"${T}"/install-catalog --remove \
-			"${EROOT%/}"/etc/sgml/sgml-ent.cat \
-			"${EROOT%/}"/usr/share/sgml/sgml-iso-entities-8879.1986/catalog \
-		|| die "install-catalog failed"
-	fi
-
-	if [[ -e ${EROOT%/}/etc/sgml/sgml-docbook.cat ]]; then
-		"${T}"/install-catalog --remove \
-			"${EROOT%/}"/etc/sgml/sgml-docbook.cat \
-			"${EROOT%/}"/etc/sgml/sgml-ent.cat \
-		|| die "install-catalog failed"
-	fi
-}
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 1093399f343c..e1b921979e4c 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-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 4b11208ac7a9..37d99a7db37f 100644
--- a/app-text/sgmltools-lite/Manifest
+++ b/app-text/sgmltools-lite/Manifest
@@ -1,5 +1,4 @@
 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 2544 BLAKE2B 445b9ca88bc29d7c1959b09aad3eacf27d2009e0c7aeb77d18fa279bba834991034494f7fc0e381b1499f2fa2595bb5031a837d55388e36e31f4c9ea6b466fd6 SHA512 9ca223aaefdecd6e0b28bdcfaae6895c96c408931063c661fb04627a51abb5130e9be7b12aa18c761f95ddff0404b867d6e4ff25d1707acfd957e236b71d9337
+EBUILD sgmltools-lite-3.0.3-r15.ebuild 2542 BLAKE2B 725ed4b559ba330370df718863bb53cbe838aa01e312dc39eca570bd94e0fb0d1cd49d4bcf3e2c00c6bb3fdd662f672da25d00027f60fe30ee3e08eadccbaa47 SHA512 6211911fc50daad41be3df2b537ead8cb442e546cae27cd7bf95979a399dc4d2533a03ec4a02de926d3e83efe32a0bf7621026eed146065f2ff609b626af4016
 MISC metadata.xml 493 BLAKE2B 36e972b80b557e131d5decb41945968ce24de810197ea457e50081017e50e3926baa419082222cbdfb494a55e9bae125bf304a431234efb4c4a67a8c3536852a SHA512 9f2e53faa5f07d791f7c4cfa7972ed42a26d1abfa5c11faf3e36dce18c2c30d086462e9c0a2c7664153333cb10c3923d47b4bb9e873b7e48dd144e667719a14e
diff --git a/app-text/sgmltools-lite/sgmltools-lite-3.0.3-r14.ebuild b/app-text/sgmltools-lite/sgmltools-lite-3.0.3-r14.ebuild
deleted file mode 100644
index 533ea51065bf..000000000000
--- a/app-text/sgmltools-lite/sgmltools-lite-3.0.3-r14.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-single-r1 sgml-catalog
-
-DESCRIPTION="Python interface to SGML software in a DocBook/OpenJade env"
-HOMEPAGE="http://sgmltools-lite.sourceforge.net/"
-SRC_URI="
-	mirror://sourceforge/sgmltools-lite/${P}.tar.gz
-	mirror://sourceforge/sgmltools-lite/nw-eps-icons-0.0.1.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
-IUSE="jadetex"
-
-RDEPEND="${PYTHON_DEPS}
-	app-text/sgml-common
-	app-text/docbook-sgml-dtd:3.1
-	app-text/docbook-dsssl-stylesheets
-	app-text/openjade
-	jadetex? ( app-text/jadetex )
-	|| (
-		www-client/w3m
-		www-client/lynx
-		)"
-DEPEND=${RDEPEND}
-
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-sgml-catalog_cat_include "/etc/sgml/sgml-lite.cat" \
-	"/usr/share/sgml/stylesheets/sgmltools/sgmltools.cat"
-
-src_prepare() {
-	ecvs_clean
-}
-
-src_compile() {
-	default
-}
-
-src_install() {
-	einstall etcdir="${D}"/etc/sgml
-
-	dodoc ChangeLog POSTINSTALL README*
-	dohtml -r .
-
-	insinto /usr/share/sgml/docbook/dsssl-stylesheets/
-	doins -r "${WORKDIR}"/nw-eps-icons-0.0.1/images
-
-	rm "${ED}"/etc/sgml/catalog.{suse,rh62} || die
-
-	# Remove file provided by sgml-common
-	rm "${ED}"/usr/bin/sgmlwhich || die
-
-	# List of backends to alias with sgml2*
-	# Do not provide sgml2{txt,rtf,html} anymore, they are part of
-	# linuxdoc-tools
-	local BACKENDS=""
-	if use jadetex; then
-		BACKENDS="ps dvi pdf"
-	else
-		# Remove the backends that require jadetex
-		rm "${D}"/usr/share/sgml/misc/sgmltools/python/backends/{Dvi,Ps,Pdf,JadeTeX}.py || die
-	fi
-
-	# Create simple alias scripts that people are used to
-	# And make the manpages for those link to the sgmltools-lite manpage
-	mandir="${D}"/usr/share/man/man1
-	ScripTEXT="#!/bin/sh\n/usr/bin/sgmltools --backend="
-	for back in ${BACKENDS}; do
-		echo -e ${ScripTEXT}${back} '$*' > sgml2${back}
-		dobin sgml2${back}
-
-		ln -sf sgmltools-lite.1 "${mandir}/sgml2${back}.1" || die
-	done
-
-	python_fix_shebang "${D}"
-	python_optimize "${ED%/}/usr/share/sgml/misc/sgmltools/python"
-}
-
-pkg_postinst() {
-	sgml-catalog_pkg_postinst
-}
-
-pkg_postrm() {
-	sgml-catalog_pkg_postrm
-}
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 064b535c9045..b1e78772f065 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/texlive/Manifest b/app-text/texlive/Manifest
index 596a45ce49df..f5da1f6eb9f8 100644
--- a/app-text/texlive/Manifest
+++ b/app-text/texlive/Manifest
@@ -1,2 +1,2 @@
-EBUILD texlive-2019.ebuild 7262 BLAKE2B 17dd50ca97edbca18fcd43822afecf60f9738a646cfb647cd9808c99103793fbab016bc6df11f7bdc8fb4fde44eedc7208bd69cd2138d5e031e77a9731b13f60 SHA512 4879d053bd20a2e2b67316ce321cfb60a5f4727afb8f984d6193610cb7a179ab6f19f61cf102056c55f38a1c5cc8d03347710640506bcfffdd4a144976cc8ec3
+EBUILD texlive-2019-r1.ebuild 7239 BLAKE2B 04b5a93d8994aa23f946e943855be77fd5d357311db5fad2108beb765a1dcc995b0b56d52832bad87a0569e74c3a8aece11f697768677811f1caed4c93847414 SHA512 336815e0ca228b8738944ecbd7ecc8e0320286b14fa5eaeeffa8f0133ca8aff51119c9e9d439fb727db44e847beaa888769ec6019ee7cc67363c6067e8debd6b
 MISC metadata.xml 2419 BLAKE2B 2627379a58f80fd304b4c77ac3f3466520d8237458e4236d88ffc2b33a062d50e33a0f2cb07c6120abbbd27d0dd7d4aa79eaa44790280f719eb10fcfc230664d SHA512 e20c3f1c67f6250209b381aa21d827ee27006d6ba5558e913ce01ac704ba0d04f16b1c5b4666ed8833e6c744b7045276d98e777f3e3e1289dc33e861bc745941
diff --git a/app-text/texlive/texlive-2019.ebuild b/app-text/texlive/texlive-2019-r1.ebuild
index 0fa8ecad4f1a..f506a836ea8d 100644
--- a/app-text/texlive/texlive-2019.ebuild
+++ b/app-text/texlive/texlive-2019-r1.ebuild
@@ -44,7 +44,6 @@ RDEPEND="${DEPEND}
 	>=${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}
diff --git a/app-text/vlna/Manifest b/app-text/vlna/Manifest
index efc06572c149..c4e4ae241eb2 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 646 BLAKE2B 7c86f7af50983b088b8e5516dd7ba31f6a4ee6bad20ddd8ed38bac6d668d85f3ee07c0484d4cf34a8940ccb91bf9e38603efe344d97a892a614594bbc5bba5d7 SHA512 5070730db6054c74e360de08c5dd03392c98da4e1e523d23818cd801297c3a400e6eb60f7b63469568a2aff1a9305b3a59568835ae078f67ee18ad6c02fff61e
+EBUILD vlna-1.5.ebuild 492 BLAKE2B d90cb90f36e89173985edbacb0ff98b6c617406cb7e187f45f86a59243301a7330e76848e4c92048f7e47c4a17d68693b3b76f059fca688502caeb603b8ca54e SHA512 a2419dd9f45b0461569a94d94e9a392ac2aed4eb7a87776a3a54e4057337d6d8c179a8587e156b0b051c841f59ca5349749e7771c3bd4f35cb3fb90c2c2e7fa2
 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 09778519fb07..303d7c68119e 100644
--- a/app-text/vlna/vlna-1.5.ebuild
+++ b/app-text/vlna/vlna-1.5.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=7
 
 DESCRIPTION="Add nonbreakable spaces after some prepositions in Czech texts"
 HOMEPAGE="http://math.feld.cvut.cz/olsak/cstex/"
@@ -12,13 +12,7 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
-DEPEND=""
-RDEPEND=""
-
 src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-
-	dodoc README README.en ChangeLog vlna.txt || die
-	insinto /usr/share/doc/${PF}
-	doins vlna.dvi || die
+	default
+	dodoc vlna.txt vlna.dvi
 }
diff --git a/app-text/xhtml1/Manifest b/app-text/xhtml1/Manifest
index 9bbae74489b9..0f9016ab3c61 100644
--- a/app-text/xhtml1/Manifest
+++ b/app-text/xhtml1/Manifest
@@ -1,5 +1,4 @@
 AUX xhtml1-catalog.patch 834 BLAKE2B 47236e18d55237bbfb6299b634253545299dd9649a58d42af6fc8e56afbb8547564dc17bbefb808b96aea739d7ba673403ab2f3c96b5eddceb7f886353320b51 SHA512 0b4fdb64e73405be53930984e5f628a1b5b48e6d43bebef9f9c502fca31d13b760385c0481030f8a09556447891a542dc4c7bb23f0618fd937e2934936b26780
 DIST xhtml1-20020801.tgz 232192 BLAKE2B 4e2da9b73da93a8196ade80549a2e255b1954178472fddaf2e3d979befda8689f3540a65d41723e40bd0450d626608ffcdcd1fa9183da5e3b13d90a5649fdc23 SHA512 184758381c5e2d36b80fa1e4470e864777383ff7539b48291036f8a3f1dba0b354a32142bfcc9071147fb20bcd4c0d4d541e09e865047938ab4cf9ae5a806412
-EBUILD xhtml1-20020801-r5.ebuild 2160 BLAKE2B ca6392bf2c05f249f7d2ce3a8f4ddbc184c80e6d5d4f292db63f33415c9a108fcc655a633665a7784fce61949bece01a8f29c72ced9994456dee3e3a1e0587a5 SHA512 b1f7470392e2d8acc75c0604f396621c624153baf7a27afac83632a3464c4001d94069b660adcc8432b038f2697ee0c3ab8a8b50dae3224f0d90670c81a791a6
-EBUILD xhtml1-20020801-r6.ebuild 2360 BLAKE2B 2d16c6349e56d2960aa32b0fec23898af872fffbb2a2d44253f8aa60ff93129c75938868401106e04e5fb93d3f014fc51bac45fd6c6e77eaaa5690e0275f2dd6 SHA512 e3c6a8f6453a00595c6f3fd478907b8d79a04867de73fc7ceacccf9d672e11615aeca8127de813fd7c127c955060402c331b4e2af458e2992e29dc8d7cd4cf61
+EBUILD xhtml1-20020801-r6.ebuild 2361 BLAKE2B 73fe63abb3bd77b8ac2875040969a302c75e63d02524df43fe610b3b9543a867a92c240ab4b8bfc468507aeb83de63ffad70408176ccc5059a48e7ab33a2d821 SHA512 b256d6c0300b7a712785376e870f7e70636bfccd4f4fb6f7b2700c2dca242d6b6bee9e1cdfc81b2b0d8f04c986e21e363b998692abe92804a2aa3faed34a2981
 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
deleted file mode 100644
index d46b7a400430..000000000000
--- a/app-text/xhtml1/xhtml1-20020801-r5.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-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/${P}.tgz"
-LICENSE="W3C"
-
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
-
-DEPEND="app-text/sgml-common
-	dev-libs/libxml2"
-RDEPEND=""
-
-xml_catalog_setup() {
-	CATALOG="${EROOT}etc/xml/catalog"
-	XMLTOOL="${EROOT}usr/bin/xmlcatalog"
-	DTDDIR="${EROOT}usr/share/sgml/${PN}"
-
-	[ -x "${XMLTOOL}" ] || return 1
-
-	return 0
-}
-
-src_prepare() {
-	sgml-catalog_cat_include "/etc/sgml/${PN}.cat" \
-		"/usr/share/sgml/${PN}/xhtml.soc"
-
-	epatch "${FILESDIR}"/${PN}-catalog.patch
-}
-
-src_install() {
-	insinto /usr/share/sgml/${PN}
-	doins DTD/xhtml.soc DTD/*.dcl DTD/*.dtd DTD/*.ent
-	insinto /etc/sgml
-	dodoc *.pdf *.ps
-	dohtml *.html *.png *.css
-}
-
-pkg_postinst() {
-	sgml-catalog_pkg_postinst
-	xml_catalog_setup || return
-
-	einfo "Installing xhtml1 in the global XML catalog"
-
-	$XMLTOOL --noout --add 'public' '-//W3C//DTD XHTML 1.0 Strict//EN' \
-		${DTDDIR}/xhtml1-strict.dtd $CATALOG
-	$XMLTOOL --noout --add 'public' '-//W3C//DTD XHTML 1.0 Transitional//EN' \
-		${DTDDIR}/xhtml1-transitional.dtd $CATALOG
-	$XMLTOOL --noout --add 'public' '-//W3C//DTD XHTML 1.0 Frameset//EN' \
-		${DTDDIR}/xhtml1-frameset.dtd $CATALOG
-	$XMLTOOL --noout --add 'rewriteSystem' 'http://www.w3.org/TR/xhtml1/DTD' \
-		${DTDDIR} $CATALOG
-	$XMLTOOL --noout --add 'rewriteURI' 'http://www.w3.org/TR/xhtml1/DTD' \
-		${DTDDIR} $CATALOG
-}
-
-pkg_postrm() {
-	sgml-catalog_pkg_postrm
-	xml_catalog_setup || return
-
-	if [ -d "$DTDDIR" ]; then
-		einfo "The xhtml1 data directory still exists."
-		einfo "No entries will be removed from the XML catalog."
-		return
-	fi
-
-	einfo "Removing xhtml1 from the global XML catalog"
-
-	$XMLTOOL --noout --del '-//W3C//DTD XHTML 1.0 Strict//EN' $CATALOG
-	$XMLTOOL --noout --del '-//W3C//DTD XHTML 1.0 Transitional//EN' $CATALOG
-	$XMLTOOL --noout --del '-//W3C//DTD XHTML 1.0 Frameset//EN' $CATALOG
-	$XMLTOOL --noout --del 'http://www.w3.org/TR/xhtml1/DTD' $CATALOG
-}
diff --git a/app-text/xhtml1/xhtml1-20020801-r6.ebuild b/app-text/xhtml1/xhtml1-20020801-r6.ebuild
index e4ee29db7afc..41ac3da774b6 100644
--- a/app-text/xhtml1/xhtml1-20020801-r6.ebuild
+++ b/app-text/xhtml1/xhtml1-20020801-r6.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 inherit sgml-catalog-r1
 
 DESCRIPTION="DTDs for the eXtensible HyperText Markup Language 1.0"
-HOMEPAGE="http://www.w3.org/TR/xhtml1/"
+HOMEPAGE="https://www.w3.org/TR/xhtml1/"
 SRC_URI="mirror://gentoo/${P}.tgz"
 
 LICENSE="W3C"
author	V3n3RiX <venerix@redcorelinux.org>	2019-11-10 13:21:36 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2019-11-10 13:21:36 +0000
commit	77398e424e45d9e98c1cef3c43bdadb9d56e81ef (patch)
tree	5aeffd3fc7b92fc615bd2c222fa8831aeda1925b /app-text
parent	bd4aeefe33e63f613512604e47bfca7b2187697d (diff)