gentoo resync : 13.09.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-09-13 17:45:37 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2019-09-13 17:45:37 +0100
commit: a1392efe64137262023d92492396ca9156d22396 (patch)
tree: de438b2711c7697c4597fb04f07e988586f34233 /app-text
parent: e3cf2c86fca1750343c1885311f857f185ee4f2d (diff)
92 files changed, 1806 insertions, 959 deletions
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index c9fef5ceb5ce..824081c24761 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/aspell/Manifest b/app-text/aspell/Manifest
index df82a9b6629a..9415ec6c4f4e 100644
--- a/app-text/aspell/Manifest
+++ b/app-text/aspell/Manifest
@@ -4,9 +4,7 @@ AUX aspell-0.60.6-darwin-bundles.patch 967 BLAKE2B 2b159dbac972ad9a246723fd7fbbd
 AUX aspell-0.60.6.1-clang.patch 1288 BLAKE2B fa2da2471f3ec3c6d5c9a98c0afd000bd86cd116b8380ea7ef2acdd1ffb1bf4f241fa60222b2228c60cfd643bb5f310c5671a649e71850ec830ec6d5fcc44cf8 SHA512 453e46b6057dc9fba5e80aa9a3c569f5aa2bc04deeebc4951539e6f251babfba0f6ea2e4f51c59d6e870bf69b1ef7d03b76816d7557a6b673ed0d276f0b3244f
 AUX aspell-0.60.6.1-unicode.patch 8273 BLAKE2B ceadde03ffb1904e58c76074444013d2517a20dafeb5847963b6d8e3dbd4ab7fb00fe0d13fd26d3381edeb4e68b2feefb2c8b44186336bdfe197d483920dd509 SHA512 8601183d2e84801c193f5a4412e021ff79ccd27e031c0e8ec85a879619868d13389cb60fb0f4fa971114da64645dd4fc5cbe480f49e88d575826cf429a533b98
 DIST aspell-0.60.7-rc1.tar.gz 2034916 BLAKE2B 7518660b0bb7f75aa3b659519a97132675b39dac7e8806d5450d43f40d62683e4c4a41a8c18cd08b6ab9ca53911caeb87e0898eb04ad9d2f98185e2bb6033d5c SHA512 e13240d78b8afd74d8a8cfd5fc7fe2081de85b33621e86543cdf942ed601d36c4e0cbf38a54be083e951127fa9435677cec2997387cb0e7b51a5597386e7e8d1
-DIST aspell-0.60.7-rc2.tar.gz 2064871 BLAKE2B 74760cc10804d964bd7d7ee0097198ab26026e0bca2987223b7b58e67491e2d0914c7e24d63cb5540764017dc15358c023e1a3cf6240d5feec8d1dd25ddf6450 SHA512 f9f81efaaeaac4d2bc5b3018fe2cef9ed2406f2c648298465d983a012cf8ba3e25a46593c9833ac5d8b4c8cfca2ac3b76b476a4893ba880e4753770d134bead3
 DIST aspell-0.60.7.tar.gz 2071890 BLAKE2B d0c8780179cca304361b9d58be667f3dd99d9319cbcffd92a0cc69c65c3a40410b10f6953471ddd9d6df355b557761ffff71ccb5bc6995a57de69a9adb07db66 SHA512 6f5fcd1c29164ee18f205594b66f382b51d19b17686293a931ca92c1442d3f7228627ca7d604d860551d0d367ac34dfb2ae34170a844f51e84e390fb1edc4535
 EBUILD aspell-0.60.7.ebuild 2782 BLAKE2B 0be6cd8d70288dd38578afc22aacd6bfc433d5d2e13f6d8f1de94229c528aa08acef3acc53c61ea5a42b3b36cf265f837192a787d3d1d3436ead0d8c8acbe974 SHA512 d77f9b0a7f8479121c68c1ea6d0b9971125245aa06a96ffd70489ceed9de548f857d7ba47aff14275d1750d662af179ee9881314a65f5d598b61917da9fb8c5a
 EBUILD aspell-0.60.7_rc1.ebuild 2715 BLAKE2B 06d035fba952118b6248e50644780a4645eb8706b65c64e55247272a9dfc8005589fe6dea4c42e3b52145f3ffa055a4d18032645b257e2cdcb9a23554b10962c SHA512 23ba2fb29445c969461a4cf00a1e4e21dc2d26cc4351f6a6f6f3784dd4f652bfcd91ecb1159fedec6dedd5ffd18b35e1c225cd7da92c6786bd3ad9fba38cda32
-EBUILD aspell-0.60.7_rc2.ebuild 2782 BLAKE2B 0be6cd8d70288dd38578afc22aacd6bfc433d5d2e13f6d8f1de94229c528aa08acef3acc53c61ea5a42b3b36cf265f837192a787d3d1d3436ead0d8c8acbe974 SHA512 d77f9b0a7f8479121c68c1ea6d0b9971125245aa06a96ffd70489ceed9de548f857d7ba47aff14275d1750d662af179ee9881314a65f5d598b61917da9fb8c5a
 MISC metadata.xml 166 BLAKE2B df899de61ee57cf9c2d5822a8ca4cb62c697c6da7142003688afbdd1261a8623d48058189ebe005c053ffddcb9f7275f19a0e48fc47ce1890341e276400f1d8f SHA512 12bfcd38af9dc9fe67b866a4ae090e26873d363409efc5949cca4b4a59ba0d770b09ebec8a108482b29b94c922bcdb8ce3f5ccbb578137b44e35bd783b4c9472
diff --git a/app-text/aspell/aspell-0.60.7_rc2.ebuild b/app-text/aspell/aspell-0.60.7_rc2.ebuild
deleted file mode 100644
index 676475350502..000000000000
--- a/app-text/aspell/aspell-0.60.7_rc2.ebuild
+++ /dev/null
@@ -1,103 +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 libtool toolchain-funcs
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="A spell checker replacement for ispell"
-HOMEPAGE="http://aspell.net/"
-if [[ "${PV}" = *_rc* ]] ; then
-	SRC_URI="mirror://gnu-alpha/aspell/${MY_P}.tar.gz"
-else
-	SRC_URI="mirror://gnu/aspell/${MY_P}.tar.gz"
-fi
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="nls unicode"
-
-PDEPEND="app-dicts/aspell-en"
-LANGS="af be bg br ca cs cy da de de-1901 el en eo es et fi fo fr ga gl he hr
-hu hy is it la lt nl no pl pt pt-BR ro ru sk sl sr sv uk vi"
-for lang in ${LANGS}; do
-	IUSE+=" l10n_${lang}"
-	case ${lang} in
-		de-1901) dict="de-alt"  ;;
-		pt-BR)   dict="pt-br"   ;;
-		*)       dict="${lang}" ;;
-	esac
-	PDEPEND+=" l10n_${lang}? ( app-dicts/aspell-${dict} )"
-done
-unset dict lang LANGS
-
-# English dictionary 0.5 is incompatible with aspell-0.6
-RDEPEND="
-	sys-libs/ncurses:0=[unicode?]
-	nls? ( virtual/libintl )
-	!=app-dicts/aspell-en-0.5*
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-HTML_DOCS=( manual/aspell{,-dev}.html )
-PATCHES=(
-	"${FILESDIR}/${PN}-0.60.5-nls.patch"
-	"${FILESDIR}/${PN}-0.60.5-solaris.patch"
-	"${FILESDIR}/${PN}-0.60.6-darwin-bundles.patch"
-	"${FILESDIR}/${PN}-0.60.6.1-clang.patch"
-	# includes fix for bug #467602
-	"${FILESDIR}/${PN}-0.60.6.1-unicode.patch"
-)
-
-src_prepare() {
-	default
-
-	rm m4/lt* m4/libtool.m4 || die
-	eautoreconf
-	elibtoolize --reverse-deps
-
-	# Parallel install of libtool libraries doesn't always work.
-	# https://lists.gnu.org/archive/html/libtool/2011-03/msg00003.html
-	# This has to be after automake has run so that we don't clobber
-	# the default target that automake creates for us.
-	echo 'install-filterLTLIBRARIES: install-libLTLIBRARIES' >> Makefile.in || die
-
-	# unicode patch breaks on Darwin, NCURSES_WIDECHAR won't get set
-	# any more.  Fix this.
-	[[ ${CHOST} == *-darwin* ]] || [[ ${CHOST} == *-musl* ]] && use unicode && \
-		append-cppflags -DNCURSES_WIDECHAR=1
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable nls)
-		$(use_enable unicode)
-		--disable-static
-		--sysconfdir="${EPREFIX}"/etc/aspell
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	docinto examples
-	dodoc "${S}"/examples/*.c
-
-	# install ispell/aspell compatibility scripts
-	newbin scripts/ispell ispell-aspell
-	newbin scripts/spell spell-aspell
-
-	# we explicitly pass '--disable-static' to econf,
-	# hence we can delete .la files unconditionally
-	find "${ED}" -type f -name '*.la' -delete || die
-}
diff --git a/app-text/blogc/Manifest b/app-text/blogc/Manifest
index 09616e986535..ca3a74ddceab 100644
--- a/app-text/blogc/Manifest
+++ b/app-text/blogc/Manifest
@@ -1,4 +1,4 @@
-DIST blogc-0.17.0.tar.xz 338212 BLAKE2B 19c5119b5d877a70ccfd6b4c8fca0c31141efd4c47c1d457d53d3bfefc1573553c69288e628dbcfffb23420461b8f0f08955b40f949d5b7390c5160faae94db1 SHA512 10522ecb218a7f09fd57e4d67e1c6ac2a17dfaf04f322c56ef77c939fcff22f6ae619e6a7e659ef14d069955d87b790701758e48ebc373d2175883b8908ef857
-EBUILD blogc-0.17.0.ebuild 1117 BLAKE2B 3a7d101207b6828738eb3c7e9896af1c8820bc3db4352b45dacd01d19ba8d0bd6d6b316617e92e5e6cdf1b35577406877c978796cbd60f344bafd250be0b19ea SHA512 4e439eb3dfaac7ce6eb5bc8c6d832f829e4049b95ce9fd35f442876f91e27732a24ee5b53be5ef8a993bfe38272e205739810ad0df2e444eb8121a48fb66d689
+DIST blogc-0.18.0.tar.xz 339920 BLAKE2B 03dce446c60c5337e85dedda8516a8417b770f294e019794ba6e3216b93f79896c851d690a37c3e24f218c8f9080f8271256647909b7dfaceaafb8a7d62d52d8 SHA512 db015d00b96af19b9f8cdb3023d073bdce45d41f731beafc0eba7219abb6bf31e435a08644145e56e2d783939542245dfcb6c20bbd27f27348de84ba4ca9e41a
+EBUILD blogc-0.18.0.ebuild 1117 BLAKE2B 3a7d101207b6828738eb3c7e9896af1c8820bc3db4352b45dacd01d19ba8d0bd6d6b316617e92e5e6cdf1b35577406877c978796cbd60f344bafd250be0b19ea SHA512 4e439eb3dfaac7ce6eb5bc8c6d832f829e4049b95ce9fd35f442876f91e27732a24ee5b53be5ef8a993bfe38272e205739810ad0df2e444eb8121a48fb66d689
 EBUILD blogc-9999.ebuild 1120 BLAKE2B 234392dc7c1e42c3bcd2c3ac4b1a648ee9e4fa6fc486cfcc60ef0af1c0cfb97ea68bc2b2ce3da820bdd88f05ef5993b7dc6589e52137d8d1e7cbce19d9c0a064 SHA512 ed4c808f2cfa1435972a53ae17f76a9e3423943713759cb7ad7378e6417a3912dbb16e0964d963dac8a476be37c90a42d8f875128101ee806f12a8ab11a519d9
 MISC metadata.xml 785 BLAKE2B 90817e117dbf1f0e60d655206ad0cc3f3cecf2b97a16ba43fdf84ae0f621ee6296af2ab6a17bb205d82b1d107be3f62b75d9c740aeab0267b02947a4bcc50aea SHA512 31230bdb8113bb73662328e0e657e710cd33e65f126d638f0cefdacbe97525643604f48ce3da27f80b8163d129092c7df7eee265cd6d6194cd0181b138230206
diff --git a/app-text/blogc/blogc-0.17.0.ebuild b/app-text/blogc/blogc-0.18.0.ebuild
index d5c7c49e8ea5..d5c7c49e8ea5 100644
--- a/app-text/blogc/blogc-0.17.0.ebuild
+++ b/app-text/blogc/blogc-0.18.0.ebuild
diff --git a/app-text/calibre/Manifest b/app-text/calibre/Manifest
index b7c7080727d7..fe5fd525d41c 100644
--- a/app-text/calibre/Manifest
+++ b/app-text/calibre/Manifest
@@ -3,13 +3,9 @@ AUX calibre-disable_plugins.patch 1042 BLAKE2B 92a56016c2c54f1b156bc910314205944
 AUX calibre-server-3.conf 541 BLAKE2B 06593633721e6adf2cf2077dffa83953eea46ccdcdc857ad468a9b74788326e9424f6ab9058be344dbbac8e49d343f5a1e53ddb486f2018b77319a7f8f713cf4 SHA512 12ef793a5b6ffd4413f780a13cad63927a95f15d17d85d4229eb5005ead68e51779abb822f9898ab5ae8c2094affeec1f9e85c34f109499739e6726b7641542a
 AUX calibre-server-3.init 1796 BLAKE2B f87d785d6f6fc10fa648d40944ec8538027854bb872d9a3be6b5b35b0abf3cda1e4e93874a9422914da5eb4287f193459733956e3f1e25e61bec0c214c552c99 SHA512 88110ded1b9c6cf8d3bfc3d5889654f77578f9d299e88daea9023767b930082e00fbddbb92a6e43c46d900248f3684232d93396ec1d0e784c7ec14b44783f98a
 DIST calibre-3.26.1.tar.xz 39109660 BLAKE2B 0e98c273b8a5dfafea7a7027de3f83ad25ab835edadedf78b7e9bc356bcac8937d915944f2ab6503b414c49b4e792e090e7bd2433a4e86373bf115720ed78b0a SHA512 893e36b101defaca29281b4bd072aafc1c4cb20a9cd3ee06a0b68fbe6b39cab34952799939ac4f54c77148c87861c5ab4ddff84f5ec8c2274ae7fa6424259ff5
-DIST calibre-3.44.0.tar.xz 38643008 BLAKE2B 7eb1412aa5de6ba2f48ea13e922dffff7ace0f4f475832ebe122db967c71df05b6bbb45092bdd53ddfe35d7a0c2af566ed83dde9aac64200d41ea2adc4cb1886 SHA512 a97f45f5f788357f62b4088c4d8190cd3e3b790685871d5a024342d5d21ca978d46fa4e47f85eef4b9fbc0774923732938a812dd188cd4a315445cf25b187d28
-DIST calibre-3.46.0.tar.xz 38750284 BLAKE2B 5590ba422d0323ea7c0cea67d88d448f00f5a470e7a8fdf9851b488c0856c88175bd107715a856706e95b2e1a45604713d061f4a7a3603ecaa01dfc018c1ed58 SHA512 d8eb014ba4d943e1c2ed05104d9b0c13f45a8b0085fa240248210cd43ab3739036936324183ae8a63dc636f7f8603484e3ddf50a260308ce1127745a8d3c6763
-DIST calibre-3.47.0.tar.xz 38720656 BLAKE2B 4626eac9f0940c1cd6ebab69c16b69eba3c01f62594bc7c60fb9bd097e513f0767a8b5706d07429f7529ed29ed5a7c47621ec6e62a9db82dc99accaaed028524 SHA512 b34d69f31e37ff528b22b6fab43836d53cabfaa4d4c03af42a8c2b73301bd737927f03eb256da765262f73dbb0631484ed164d46230f730e4b742b837c2dfce6
 DIST calibre-3.47.1.tar.xz 38710008 BLAKE2B 60915345dd756d085386af61128e92569304be64aadbc21b69973e93adf3fb5cc88f7250153c238ecf423546f408bfc094b5bce329a54e7f080f831c4a8c23c1 SHA512 010796b3ac3fc6adcdf26dbc7966946be0f48b2684e1317da11d77fa55151d1f6ad2b86adf3c8eced5559823567e6672bfdfd953c17e6cc978894544131fb6bd
+DIST calibre-3.48.0.tar.xz 38777408 BLAKE2B 9a7fae20487ae93120cfdc06a312a42d54d68935fdd2bc18dc41be5f8d359c79eae24e0409ba8e7f4df85e2f073f80ce6bab56cba0638cead6693600fa93cb41 SHA512 6cee28fb560e2e00b8ac2f32756f094146c6fe744cfc343d68f1fb54b3f8b0ca16129a5b35018af54a103790faa2eb03ac186c01003f21c874d2ed5218441220
 EBUILD calibre-3.26.1-r1.ebuild 9203 BLAKE2B 9e3bc1630f915a8548e1480f0b00d6acb4001dee3be5a5119dd9b2eb8b984c4eecaa0a0742e550a36eca359e8806d2444d21f8bf344321c11ffeca59e7e10877 SHA512 98407a3605b58125ca783dadbe7dfed5f3bb526f816d79a167fb0358202cc56870601d16b7eae46d2464a0f64761168d9f0a00d69a5a184e17d705eb540afb97
-EBUILD calibre-3.44.0.ebuild 8352 BLAKE2B 92a2d894b2ad0966588854cdece96930aa85e240699eb185cc32a4b7ec0b3e98c34e7cac2490c44b1909bc1e4fc92f7d5094ed8f6159e08ae22ef98d7156f06c SHA512 df60b94324ccfe704195af5a6188ea6a793767e342e058b1f5039f52ae7fab6b16e95266a0876f6ea8118b5e4a014d7d1e3636b58280d611ae94918e359763d4
-EBUILD calibre-3.46.0-r1.ebuild 8352 BLAKE2B 92a2d894b2ad0966588854cdece96930aa85e240699eb185cc32a4b7ec0b3e98c34e7cac2490c44b1909bc1e4fc92f7d5094ed8f6159e08ae22ef98d7156f06c SHA512 df60b94324ccfe704195af5a6188ea6a793767e342e058b1f5039f52ae7fab6b16e95266a0876f6ea8118b5e4a014d7d1e3636b58280d611ae94918e359763d4
-EBUILD calibre-3.47.0.ebuild 8352 BLAKE2B 92a2d894b2ad0966588854cdece96930aa85e240699eb185cc32a4b7ec0b3e98c34e7cac2490c44b1909bc1e4fc92f7d5094ed8f6159e08ae22ef98d7156f06c SHA512 df60b94324ccfe704195af5a6188ea6a793767e342e058b1f5039f52ae7fab6b16e95266a0876f6ea8118b5e4a014d7d1e3636b58280d611ae94918e359763d4
 EBUILD calibre-3.47.1.ebuild 8352 BLAKE2B 92a2d894b2ad0966588854cdece96930aa85e240699eb185cc32a4b7ec0b3e98c34e7cac2490c44b1909bc1e4fc92f7d5094ed8f6159e08ae22ef98d7156f06c SHA512 df60b94324ccfe704195af5a6188ea6a793767e342e058b1f5039f52ae7fab6b16e95266a0876f6ea8118b5e4a014d7d1e3636b58280d611ae94918e359763d4
+EBUILD calibre-3.48.0.ebuild 8352 BLAKE2B 92a2d894b2ad0966588854cdece96930aa85e240699eb185cc32a4b7ec0b3e98c34e7cac2490c44b1909bc1e4fc92f7d5094ed8f6159e08ae22ef98d7156f06c SHA512 df60b94324ccfe704195af5a6188ea6a793767e342e058b1f5039f52ae7fab6b16e95266a0876f6ea8118b5e4a014d7d1e3636b58280d611ae94918e359763d4
 MISC metadata.xml 382 BLAKE2B 87fa7e63a6ed7a4ea55247b362288b43f7edd312cc3085bb8c1b947402ae4aa0df01fac4f6646d260653ff8af7fe28d3dabb8a213dbf3e206181b69835b33d5f SHA512 8503e0a4a48d93682c386eb1d6507b4b26585afc9d62b7cd52bc00b457a887bd17422a03669ff404570ff7f5ff6f0bba14ee935979f8b54722870d6620097de5
diff --git a/app-text/calibre/calibre-3.46.0-r1.ebuild b/app-text/calibre/calibre-3.46.0-r1.ebuild
deleted file mode 100644
index 9b8c29fcc23b..000000000000
--- a/app-text/calibre/calibre-3.46.0-r1.ebuild
+++ /dev/null
@@ -1,268 +0,0 @@
-# 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/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.8[gui,svg,webkit,widgets,network,printsupport,${PYTHON_USEDEP}]
-	dev-python/regex[${PYTHON_USEDEP}]
-	dev-qt/qtcore:5=
-	dev-qt/qtdbus:5=
-	dev-qt/qtgui:5=
-	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/calibre/calibre-3.47.0.ebuild b/app-text/calibre/calibre-3.47.0.ebuild
deleted file mode 100644
index 9b8c29fcc23b..000000000000
--- a/app-text/calibre/calibre-3.47.0.ebuild
+++ /dev/null
@@ -1,268 +0,0 @@
-# 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/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.8[gui,svg,webkit,widgets,network,printsupport,${PYTHON_USEDEP}]
-	dev-python/regex[${PYTHON_USEDEP}]
-	dev-qt/qtcore:5=
-	dev-qt/qtdbus:5=
-	dev-qt/qtgui:5=
-	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/calibre/calibre-3.44.0.ebuild b/app-text/calibre/calibre-3.48.0.ebuild
index 9b8c29fcc23b..9b8c29fcc23b 100644
--- a/app-text/calibre/calibre-3.44.0.ebuild
+++ b/app-text/calibre/calibre-3.48.0.ebuild
diff --git a/app-text/diff-pdf/Manifest b/app-text/diff-pdf/Manifest
index defaec75ae75..ec746abfef6b 100644
--- a/app-text/diff-pdf/Manifest
+++ b/app-text/diff-pdf/Manifest
@@ -1,3 +1,3 @@
 DIST diff-pdf-0.3.tar.gz 132862 BLAKE2B bb3fa163337482785778fa7cbeab3e9f883d8537e4a905592eb20f4bb876597f500beaa2d9f13706887e1d340dd378c68c231b91a4dd478fb206b32f2cbd768c SHA512 b85585162b498c5abf14020ad04616ebdb5efce25b20604dab81c6068a036a818d7e10ddbbdb69d278d4b5a46ab9b9aa782a52e37f278f3e9db7b4d2259aaa08
-EBUILD diff-pdf-0.3.ebuild 1284 BLAKE2B 3fac12175666e53660c24b8273ba498103cbbfca53b81b3fd5cfb83586a49d98d06ff015e5c497594f45dc9befe788784315850591a52b9ef479bbf8c5a4d6e0 SHA512 e2e620af68029e94af9905cc3545a0c864f24744a8fa31a6ffba938a87d91f078ec744dd3a8dd6620a9ae270beb19c89bea96c622345e9090f3d27d2a4599814
+EBUILD diff-pdf-0.3.ebuild 1283 BLAKE2B 66f12a1fe1ca1c927b153ddae62d646106aab6fe54cfbbb5fda35bda57da46b1b63b4a5b9fd751943f031cee79018a97f8ac04f445b0945492de03c3bd84a2bf SHA512 b32216c901892d7b3c754cf9fb033969d909e7c55f7b1af4bad1f76bcd021986cb3823c68b878c0c31d149b44a1e40408772a03eb6a681dee2205e454b4b9d8d
 MISC metadata.xml 252 BLAKE2B fa9e1dbdc0de3313b50ecd9de7ac59006074b8b75ecb97a8fc4de5fb14609cb00dc1b24ba95a2e7fb11cbc6f8c8f0c068bd0311713cc2aa7e6016992dbd6e8bd SHA512 92f660063c96ac5b3e24e58733006d4a72a7e2f41605988efb575546a2539a92b1ceb3a37e018fcb5c08264a42af26950d6520ea80ba60130ad25ce6092ce742
diff --git a/app-text/diff-pdf/diff-pdf-0.3.ebuild b/app-text/diff-pdf/diff-pdf-0.3.ebuild
index 1f289d32bcb5..5127655c04ef 100644
--- a/app-text/diff-pdf/diff-pdf-0.3.ebuild
+++ b/app-text/diff-pdf/diff-pdf-0.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/vslavik/${PN}/releases/download/v${PV}/${P}.tar.gz"
 # version 2.16.5 of GTK+, which is licensed LGPL-2+.
 LICENSE="GPL-2+ LGPL-2+"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE=""
 
 # The build system checks for "poppler-glib", which is provided only
diff --git a/app-text/docbook-dsssl-stylesheets/Manifest b/app-text/docbook-dsssl-stylesheets/Manifest
index ca966e4da5d3..0d4f1bd8fdbc 100644
--- a/app-text/docbook-dsssl-stylesheets/Manifest
+++ b/app-text/docbook-dsssl-stylesheets/Manifest
@@ -1,3 +1,4 @@
 DIST docbook-dsssl-1.79.tar.bz2 277650 BLAKE2B 6a12f46965ee705096f679b672610395b24f151e3bf3cb05f7d920c052b7a3fdafb4f5ee4526dbf765bbab6b7d4ca9f021277c6f35926f47edc61d0f835afdbb SHA512 fad71e67227b54b0a7c31a351b4d5c0695517b3687714807d7b144d239dc6f7e0d556520e705eb75581c82e0deea4b32ccfde1eccad2718337b757eddd64843e
 EBUILD docbook-dsssl-stylesheets-1.79-r3.ebuild 1551 BLAKE2B d1f490d4cbee15aab1a5902bf143b791c7cff874a1b5726ade3bb84c3431491a15b84e165f547cf456c3fba1104009fd0c4f32dfcfe555d023d2241a8bb3bdee SHA512 222a78a676a75071ad75d58c7c78904ff8fe0345e6a2f0c0088482926b60089fba5ab4a5937fbf22d658b8bdcdc91a7a1b790e2a08dc0f33bad661495fe42837
-MISC metadata.xml 297 BLAKE2B 33f8b636a483011e6561d078c58c16a477925ea41543b150c11ea7ecb3465151a5404689d8cf263a6e9f6ede4d2d5a55fc8fd02fa89814c7b7b0e93e7c6077aa SHA512 e5cc7a9b4aea0e6cd29246bb44f1bd2713495d58b243bc78bceb760c827c415ec30459f5b9acf2ddab615e39d9ab5c4a9d4eb41e7bd53684032a08f7a4fbce3e
+EBUILD docbook-dsssl-stylesheets-1.79-r4.ebuild 2454 BLAKE2B b808b29e1b654329853dfbfdf293e5ae3fd4ec116a650ba98ce2399289d54d4ba6eec92a314a4e4359369b30f237111665c66f85ccc3ab40e589f4c4e6b82822 SHA512 c773f6f1ed2f86a85f519111f6cb192238a1ea228381f3dd31c9ec7b05d351e394d0785c21550b62afd821b588606ca896f03de157248014654c61669a60c751
+MISC metadata.xml 377 BLAKE2B 035eb23363be52cbeb11b0ca2fbcedbb608dad9d4b26dbd2155a538db51cafe7296614f5005c0460ec4ce02a35378d98f2c7834fe2f098d7b05ef835bdbf520b SHA512 c965e64e4582a7452d8cf7eb46b794788cc8ccd9d93a48ab14e7ef606979cee706f682545bfebc2c5e380e9e18db0b671ce0f9ad935a0812472fc1586c989c28
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
new file mode 100644
index 000000000000..8603dfc7f360
--- /dev/null
+++ b/app-text/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-1.79-r4.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit sgml-catalog-r1
+
+MY_P=${P/-stylesheets/}
+DESCRIPTION="DSSSL Stylesheets for DocBook"
+HOMEPAGE="https://github.com/docbook/wiki/wiki"
+SRC_URI="https://downloads.sourceforge.net/project/docbook/docbook-dsssl/${PV}/${MY_P}.tar.bz2"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+IUSE=""
+
+RDEPEND="
+	app-text/docbook-sgml-dtd:3.0
+"
+
+DOCS=( BUGS ChangeLog README RELEASE-NOTES.txt WhatsNew )
+
+S="${WORKDIR}/${MY_P}"
+
+src_install() {
+	local d catdir=/usr/share/sgml/docbook/dsssl-stylesheets-${PV}
+
+	dobin bin/collateindex.pl
+
+	insinto "${catdir}"
+	doins catalog VERSION
+
+	insinto "${catdir}"/common
+	doins common/*.{dsl,ent}
+
+	insinto "${catdir}"/images
+	doins images/*.gif
+
+	for d in html lib olink print; do
+		insinto "${catdir}/${d}"
+		doins "${d}"/*.dsl
+	done
+
+	for d in dbdsssl html imagelib olink; do
+		insinto "${catdir}/dtds/${d}"
+		doins "dtds/${d}"/*.dtd
+	done
+
+	insinto "${catdir}/dtds/html"
+	doins dtds/html/*.{dcl,gml}
+
+	insinto /etc/sgml
+	newins - dsssl-docbook-stylesheets.cat <<-EOF
+		CATALOG "${EPREFIX}/usr/share/sgml/docbook/dsssl-stylesheets-${PV}/catalog"
+	EOF
+
+	dodoc "${DOCS[@]}"
+}
+
+pkg_preinst() {
+	# work-around old revision removing it
+	cp "${ED}"/etc/sgml/dsssl-docbook-stylesheets.cat "${T}" || die
+}
+
+pkg_postinst() {
+	if [[ ! -f ${EROOT}/etc/sgml/dsssl-docbook-stylesheets.cat ]]; then
+		cp "${T}"/dsssl-docbook-stylesheets.cat "${EROOT}"/etc/sgml/ || die
+	fi
+	# this one's shared with openjade, so we need to do it in postinst
+	if ! grep -q -s dsssl-docbook-stylesheets.cat \
+			"${EROOT}"/etc/sgml/sgml-docbook.cat; then
+		ebegin "Adding dsssl-docbook-stylesheets.cat to /etc/sgml/sgml-docbook.cat"
+		cat >> "${EROOT}"/etc/sgml/sgml-docbook.cat <<-EOF
+			CATALOG "${EPREFIX}/etc/sgml/dsssl-docbook-stylesheets.cat"
+		EOF
+		eend
+	fi
+	sgml-catalog-r1_pkg_postinst
+}
+
+pkg_postrm() {
+	if [[ -z ${REPLACED_BY_VERSION} ]]; then
+		ebegin "Removing dsssl-docbook-stylesheets.cat from /etc/sgml/sgml-docbook.cat"
+		sed -i -e '/dsssl-docbook-stylesheets/d' \
+			"${EROOT}"/etc/sgml/sgml-docbook.cat
+		eend
+		if [[ ! -s ${EROOT}/etc/sgml/sgml-docbook.cat ]]; then
+			rm -f "${EROOT}"/etc/sgml/sgml-docbook.cat
+		fi
+	fi
+	sgml-catalog-r1_pkg_postrm
+}
diff --git a/app-text/docbook-dsssl-stylesheets/metadata.xml b/app-text/docbook-dsssl-stylesheets/metadata.xml
index df1f6e962108..9842e9a0785d 100644
--- a/app-text/docbook-dsssl-stylesheets/metadata.xml
+++ b/app-text/docbook-dsssl-stylesheets/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>mgorny@gentoo.org</email>
+		<name>Michał Górny</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">docbook/dsssl</remote-id>
 		<remote-id type="sourceforge">docbook</remote-id>
diff --git a/app-text/docbook-sgml-dtd/Manifest b/app-text/docbook-sgml-dtd/Manifest
index b7251ec56671..6989b4a4e690 100644
--- a/app-text/docbook-sgml-dtd/Manifest
+++ b/app-text/docbook-sgml-dtd/Manifest
@@ -1,11 +1,11 @@
-AUX docbook-sgml-dtd-3.0-catalog.diff 2144 BLAKE2B 8d68e85da15d660058135348b901a30aee7b32dc832493ba5a12e5ce0d6a59ef30fe1186ef8f6658eef1532607e88e32d56f12720ccc09a2621996cc422a0fa1 SHA512 e0ae3b49da83fcbd95fd12ae268d414d12e72c16f5d4342f3d2268f378b9c57ccd1c4daf1ed739a3ffc4b36c2b2842bd2f18ff2d1081c65ccca2aae694613654
-AUX docbook-sgml-dtd-3.1-catalog.diff 2125 BLAKE2B c6eb346817455012b289e8b511ecd0eb1fb3394438d7a10760ebb5d73779b992344dd4cbfd9202354827ac7a4259e1ec638c396075f8bb30ce2a77f44a341888 SHA512 cf4162f0b318bfb0e2a95384eb7520a1cc07971637a07f97841515c7ab3c6eba3ab4e45a39c406f24a10a79069b506e5066c436c59e569347a798827db3b8ff4
-AUX docbook-sgml-dtd-4.0-catalog.diff 2096 BLAKE2B c94662c30aea2a20aace83712e47ad4f831fcdfeb5e7e15cad463c7850a00ab97a457e67763f0aafb68c3a81c30e4dba46964fdfa979ce99eca0b00cf7ddf5aa SHA512 933f0f6ed79f749b82bc265fee41b01e0c1272f5b45bc298b77636cc9e527e722061300dc9acb5e39ed9af92177c0df03746f761702dd42091c423d5147cf3ba
-AUX docbook-sgml-dtd-4.1-catalog.diff 2096 BLAKE2B 7f0a1fd57f1a6c846665d5648c6e884c9755f9cf9f8ec38441d323b11bcf6b32688051d5eb5c0f9ae57b5f27d888fc4033965f1b3fbbc6a4ee87005b7c19500a SHA512 fcbf05b86f4d2290160929049f3599b34a7c88f3fe92f36b539d8cce0ce9d3dea74acfff164a8176f5e28b50416abfc9057623013edd59e18ec6fa8e254fba6a
-AUX docbook-sgml-dtd-4.2-catalog.diff 2528 BLAKE2B edee561d2ee6cf8ddc0c7101b32462daf2ec4250708ba4c585c325515daf9d230eca1cb64a6acd9ebe8ab099f683a12577d38cb78aa3e037134cc7457928b026 SHA512 23a61f2cee28e997e16a33177212578dc6a99c84868fae338f3fb5d2ac7a01322d22824785009711fe70462169118c88d57a928849da8c94af847d423b6449d0
-AUX docbook-sgml-dtd-4.3-catalog.diff 2471 BLAKE2B 378ced1d5aa8a3124e1a790953bb81bc4b1085508f47514e0d6adeccd4348d29a110d74c6b02b7fedaaaf7a3ff4496605c0af7d4a961e3877601b3b79dbe11fb SHA512 8143551df2b88963e1acb29ca281ea30629e6fbc41d1966c9d967dd00e1411bb55b0847069c25403f15fd814bddbb7552589e9682ba30c74656c291dc4906f49
-AUX docbook-sgml-dtd-4.4-catalog.diff 2471 BLAKE2B 94ad3fe3d68c7c7670c76fe7ed1eb067f674eef81666acc91c768d0d9a1ccf26edcfe5aac6417a9562df6cf6ad87efa3cb852d06d65c224c2fdee3725ba2c8c8 SHA512 86f1db81e539e4e76d2f3f799b1c5e3297ede2fc2f448f6a2b69d1fbae3d2d4a2a444f66186b5b9525c171e32082f9e213ea31715456cc17d998e15c68fe14da
-AUX docbook-sgml-dtd-4.5-catalog.diff 2583 BLAKE2B b08550bdc040423adcfe5f7e3f34d5c66c9d8ca863a5d6cadc9fd7379e6b83e71994ffa850571162c3f87d525fb18c7f3cbcd014672e148f5e16f95a616a2c61 SHA512 a2c35b12043db3b0676d29b9525e669a13c7e892a7f4a2a47392fbe16febb7727508d75a45deaacca0af386930236c4889e86e4a17c727c98a9c600b28fd392f
+AUX docbook-sgml-dtd-3.0-catalog.diff 2152 BLAKE2B 7f8e80f81aaa7800d5e1b578be6251fda06731078e98d81af9ae27d82f9e96b99baf27fb50dad8e56b63956dfe8ece8840f6fca4c25786978fa3550f058f4e49 SHA512 3e1a374118b514a98f9797ece5c9c43a89b3dc4bfe6515250689add9f55b50ec181433cd3d3885750eee2668f053c64515c803ae4274db65e5781c43564b7e77
+AUX docbook-sgml-dtd-3.1-catalog.diff 2133 BLAKE2B 5fecc78f39f7f47f67b21f5d1bf5fcb419086a72031d7ff904eb1e923a7ae04a1f557b7d438309a04eff47d28cdb405df988439c023e15cf57d3237e8a10832e SHA512 69da9f12eef8d4948e317abe03dabe8aba097caa66f1a46416bb99f065953f61f548b4f14f43b581522a930333803c477d1ef4bd2c4b6206e368437ad8b90d95
+AUX docbook-sgml-dtd-4.0-catalog.diff 2104 BLAKE2B 3cc8a2f3de4363416b1a4ed174a778aa71bbe1592077a2d678e75a731010d8c6aa8a8bd880a54970a0425c9fac5fb6ca81e8525b3c4b7d7c87fdc169ef3ae4c5 SHA512 6b24f09ee22db380c62833236ce1832d938377b5e806fe1006c290e5948bebe8ed37e93c6c9806964b32843dbe197b3511428ae39c1979c7737cfe639ec7125b
+AUX docbook-sgml-dtd-4.1-catalog.diff 2104 BLAKE2B f2c5ed707e4eb51b40f2468051f39bafe31e396e40edb1b0bbaba732252a6e007937e581e149d4411f8f1511f9d167b97cd5589471233f0b47000cf9baf73479 SHA512 83e4f2ffff68083b31c947facc46a83de373464852b0b6af28e67df4129fe5c5f4929e7a5d8d8f258ce1d673c3e61bcd16251601d85f09b573e32e164448e870
+AUX docbook-sgml-dtd-4.2-catalog.diff 2517 BLAKE2B 71cf7aa745e56190526b8973f1b5b9895974ec0a8a3598b66e9549e822a3e031fc1e3098136e813be82a32d0c97f740745036bde70f6cef65cf30a803a97bd92 SHA512 c2e70f701b3d8d4afcab963dccc61949c5b33b12f787d528e1b45d2d9b413b9ce5b137fb8cfc078680a9df1c5c9f10de9d0dfb3aae87053da66c8d80398986be
+AUX docbook-sgml-dtd-4.3-catalog.diff 2468 BLAKE2B 1f56f4869f35633ec19a978050455dd6d3d6624dddb254edab8396db985aeebc23b03591cb6940cf635b0a79e0da14a1a7316812beb8e84cc2f19418dc4116a3 SHA512 8378a6aa3636499e3f66b88d6f0caa449203fb47ccb10441420a6366d7dc6167d720e0876ab2539059c90d50b0cfcbeb3149ea81b87435f7f75751f5acadf538
+AUX docbook-sgml-dtd-4.4-catalog.diff 2468 BLAKE2B 1cca3e22c8d2879639d7464c46c355ca59e84e2d7dcddfc57b6b834c3b1b274b2761a3e7b84fe37923dad7244971d8d9e3c9f0eb6f5c0ccb846c756dffd58c38 SHA512 3f044b85621f4c03c956a33ca771f8cc6851a47e2aadb2b7b09c7c554a287de019f63e94a44cff5c03a87f493f6e59121e04cfc15d6bbff08d25a27fa847e5a4
+AUX docbook-sgml-dtd-4.5-catalog.diff 2547 BLAKE2B b947f076b008da5ddbf649cd8666c1084996d2734352019ca0bbc40c6ba53b3a3094829b37567cdebe700786c4d782b82f5e51c81e537a79d98318331a366502 SHA512 470aa232c6d1061e0eae2ccd837fe1fa5017157341a2c45ab8dada0b507f24f377e42dc9df1946a3e9ce34aca96a0743960473853fe46627a998379204fe6db7
 DIST docbk30.zip 43441 BLAKE2B e6711bc48f22fd9426f6c05b42270f03c2f5a2f0457df81bf7f4c930a432f55c288a07b834aeeaa21f91e0c258130f8f36fbbac55ce7af402c124793bd17acc8 SHA512 4e186c7b38bf70a3225bd9fca4edf99d3e7f316308b561aad9a0548f8e0ba941b54f20f6e653819de8a26db5eb54fc7442c3e2d740c2ba60311b3038a4bb9198
 DIST docbk31.zip 55952 BLAKE2B 6856fc7c15f3ae2b97251757df485deea8ffcd9f496284575ce290d4c336e1c45d7c5568acd1c93dcb6b0fcb91ca8011fc2bc90d2e78be76b75b3fc0c97cd875 SHA512 397c9df011007b71ddc9c052d28db7ab38ac2c05e7f575aaad41a6b4995b910cd147f9a822d162271bc073cbfca0788d7f323be381c900c3a32c352e658d37fe
 DIST docbk40.zip 55742 BLAKE2B e504c61b7c1402b5afa9036b9aec8fac89a39a0d2a24ec08044a84928c101a5abef17882e73704fd59fcdc7df0667e3ec1d9b97978a26b29489e2c027c61d1d4 SHA512 ae1078190bd34c2b7f0eab667a2502822eb80e17243c447849736ea8d7eeb65c71b571cc39106763c6c9f75c83f3b684a40a18e1dd6da5d235c63a107c931276
@@ -15,11 +15,19 @@ DIST docbook-4.3.zip 66117 BLAKE2B d92d69b6f94c85bc2e8ead87dfb31db331206ea3d014e
 DIST docbook-4.4.zip 66879 BLAKE2B 7a21c99e934851bc7c6be77da2b65079b3b6b32365672b40b70b1819e7aa6987cb65f8725ed2b9cc804d8cd0fc7c17f02601466dcd48f5314439df626db6aa89 SHA512 561d6f68e293fb98d13010dc287c6ea59d9e6a033af3518ab4d735a374a7a603150ecf555a1126577dd00baa692a6c5d09afc4d3fed70f2fe8b5b86d6bb5ecd8
 DIST docbook-4.5.zip 71252 BLAKE2B 0bdb424ff47be140d4d18eeb5f3dce509d47577737b485d5bc34af1a02596d577eb7b48c3884acd04965014819e4a23a444c198134fec14f2c2e7c2d5bcac58d SHA512 cde483678562a18f67fa5fbe631fbdfcbef907b6b6fb63749125fdc883af2448d4a95aefb8fba8bcdd0417fb078063984fe8eb3c7050978f4f4b03d527c329df
 EBUILD docbook-sgml-dtd-3.0-r3.ebuild 1000 BLAKE2B ab544f870b642843cac5852c3bd1a13144bac23f757b35d4eeb9294fa20bf33b457dd262a2c9a99493f916ca52c9003fd1997fd612b94a6f0fa53046c6f5031d SHA512 4800ab46cd04af41a618a979b8890e235c83aeb6079f6644539bcaf703c776774e69a231137fda037257882e2de2eb7ca673ffeb0083c4f8dc364f4dd98cf57b
+EBUILD docbook-sgml-dtd-3.0-r4.ebuild 1232 BLAKE2B 100b3dfb97a48aaaed20a5a7f0358ec30563f193da7576f21c457f88ad4ff7828d8a7e9a218e3ab9cd8cb98f781c1ea4aaa5699c47e12acbf2080c13a359c459 SHA512 80f2a1eabb0a800531bba61404e335be72e42d9ca4c394b84789d19196e511f68b833e201c413044584f43936a4699f5b3ce4ac51eb56abba4a73a03c6b7983e
 EBUILD docbook-sgml-dtd-3.1-r3.ebuild 1000 BLAKE2B d8130fc975e1acf1d569960b3b74b6dcc3c4fb68624d9ea56834bd9f3c94ca3876ca8359ee090fca5049f4eb502a22c3632746a6441e35b1946944b416563cbf SHA512 6af8de74f63b01e446fd43a1be7c37494a773a6b4a62a23b020732071c06870e0631206964f911d6a15a4031a9158848b57362eae1a1d44937a6c11e70c02b28
+EBUILD docbook-sgml-dtd-3.1-r4.ebuild 1232 BLAKE2B 100b3dfb97a48aaaed20a5a7f0358ec30563f193da7576f21c457f88ad4ff7828d8a7e9a218e3ab9cd8cb98f781c1ea4aaa5699c47e12acbf2080c13a359c459 SHA512 80f2a1eabb0a800531bba61404e335be72e42d9ca4c394b84789d19196e511f68b833e201c413044584f43936a4699f5b3ce4ac51eb56abba4a73a03c6b7983e
 EBUILD docbook-sgml-dtd-4.0-r3.ebuild 1000 BLAKE2B bae479fa462beef6bc0ad59b46ee470ed71677356ff1e25f87777daa5d4fd1c2e98dde26b65e32ad5333d0be81c281f16cf94e335759ddf137ff36476f3d7f23 SHA512 f4b8f6b23055c21d3f36f059666413c8d488f314756b23fd411e0d5471409c458d7bc1012aac29b02b3c82eadee8f9c2c12c758a1c498e40cb09ff0fe519e5f2
+EBUILD docbook-sgml-dtd-4.0-r4.ebuild 1232 BLAKE2B 100b3dfb97a48aaaed20a5a7f0358ec30563f193da7576f21c457f88ad4ff7828d8a7e9a218e3ab9cd8cb98f781c1ea4aaa5699c47e12acbf2080c13a359c459 SHA512 80f2a1eabb0a800531bba61404e335be72e42d9ca4c394b84789d19196e511f68b833e201c413044584f43936a4699f5b3ce4ac51eb56abba4a73a03c6b7983e
 EBUILD docbook-sgml-dtd-4.1-r3.ebuild 1000 BLAKE2B dbb46cff1a33f8f0770588c18cf087fa75074a3ed26e7e56a2f569635cbda0b37ce2be28fbcfb4e989030b153862d05470d8c0b408e56389d0cc7c92b0bcff31 SHA512 4aafa37378a6315835af91a37aac7842b1d04745ef8f4f6c8543e21d1c4aae51593b391b71a624a5014deadac058eb619e1eca6c5f9179ae0fafe249b6402c8a
+EBUILD docbook-sgml-dtd-4.1-r4.ebuild 1232 BLAKE2B 100b3dfb97a48aaaed20a5a7f0358ec30563f193da7576f21c457f88ad4ff7828d8a7e9a218e3ab9cd8cb98f781c1ea4aaa5699c47e12acbf2080c13a359c459 SHA512 80f2a1eabb0a800531bba61404e335be72e42d9ca4c394b84789d19196e511f68b833e201c413044584f43936a4699f5b3ce4ac51eb56abba4a73a03c6b7983e
 EBUILD docbook-sgml-dtd-4.2-r2.ebuild 1015 BLAKE2B 1dd036ea95d19b8bdbc825c4bf60b30dbd26ddcb97c4cecd020ccbdbb57294d5841882ef39dca414bab1e33533d390dd8ba0aee4f663c0bf35e0c5e7b9048c32 SHA512 8ddd813944172d0f8a858029292d7b22318e6795b1338f07057472e7042912c0c642d18876caabdf0d83aceb60c1852256bd36249741616510fbbb9abe69eaec
+EBUILD docbook-sgml-dtd-4.2-r3.ebuild 1243 BLAKE2B 8073ee23378197bbda7469828fb67eadbce9c0daf295da8a16f413d5f06923c96568f12f2b5e3e8b737ad95c9b795cce30ff7ae19188f33694a57e35e9422dec SHA512 ca4494a09284bace59bbb0aed2b551ace8e818bdab081f872443ef57da704b7d8a3fcab42b312918a8b80c2b7b55f33ea66504ebad5ea40d1b838a42bf0ac016
 EBUILD docbook-sgml-dtd-4.3-r2.ebuild 996 BLAKE2B 0368e87e3debadf66d48791a0e5044dbf6b047aa7461ac2ef190e7df56e619ecaddf16942d34570fff853b358ad030d67ba195793e79c061016e2834bab2185c SHA512 a1b777d1620c54fc30fa1d8ba1bfbded15eeebdc6a5289b8c15b7bf91577e4809db10bedc5929d1ea134a94d398929d9241b989e146012ad12b8564d84b10217
+EBUILD docbook-sgml-dtd-4.3-r3.ebuild 1228 BLAKE2B 138a635b5cdccd1d7867994755b5ac095c6e5ddab8281ba7eadb82df6c345eb593e7717a4d0c6be65bc7d959d5bf99880099884333cd5f0b4f6dc36692607da9 SHA512 8a6d7ea4d78b65d21c73dcf72ab773d16251fd60e41295af1b5f018241ba63ebb5215607c51803152aa3d941f805b307cdb30e8abd07d6f7062e57313596dbc5
+EBUILD docbook-sgml-dtd-4.4-r1.ebuild 1228 BLAKE2B 3ba0c8ad0c452fa03d84d9dee9058a70437987902c5177f39bdfb7e6fce4d9b2e8bd644a8613611953b014cb383316a61be99e02c7af4b27bf4b944d614e4022 SHA512 a900c02795aa9b36a7cb3bf8f5a08cede197e354c974c94fc6e6e7d09939f9cc3269b0d9f120500a02d85d6e17a1d485f2ec87e55e33adfae9c71a1e305e6533
 EBUILD docbook-sgml-dtd-4.4.ebuild 1006 BLAKE2B 895942f94fb5e43c0cec90080720378b675751ea55657c759a372642f960c9e58d8427d4d8270aa8624b25847cd7556320bf0f754b81b6e3501d6ee6746607b9 SHA512 bb0b2a4b95c8b9ef77bdafb2e9129415de1be53fcbff278811049964eb9e5ab6674fd7083edd1dd502ffac560b27ee4a4d0238cfac8901c04e3f0b34a5c8894f
+EBUILD docbook-sgml-dtd-4.5-r1.ebuild 1224 BLAKE2B eb7b397c296a5f43be9c44bd29995421bcb0fa951968d989d03659830e3b8755aeba89bf2158b41073dec03cb6fcfc3ffa91d8d02c8c2b3cd340486ae3938c04 SHA512 e994152a8a89df35fae119816cf2d0db57456ac6966c7b2b37f32a7982483af6af841d4294c773a7222b3a0bcf3440ff8da888f9c94e67fa0d12b5413751f26a
 EBUILD docbook-sgml-dtd-4.5.ebuild 999 BLAKE2B 47395c84eb27c599d8dc014d052b96e113c6040a83b5c2f1ba0e5d73f37d848b53b3ac6969af8d0e9e12b063918b203fd60f65f6367332e7e48628aac5a86a99 SHA512 a36d36f45f89866f6f66e5a3b97467459b7e22bcc322c63aaf738e1b95f6b6259d1078f7945ae76e5f493f0721e5b7f2981ab54ca63cc902e42b8ab84d29a7e6
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
+MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
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
new file mode 100644
index 000000000000..d72a82568092
--- /dev/null
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.0-r4.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit sgml-catalog-r1
+
+MY_P="docbk${PV/./}"
+DESCRIPTION="Docbook SGML DTD ${PV}"
+HOMEPAGE="https://docbook.org/sgml/"
+SRC_URI="https://www.oasis-open.org/docbook/sgml/${PV}/${MY_P}.zip"
+
+LICENSE="docbook"
+SLOT="${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+IUSE=""
+
+DEPEND=">=app-arch/unzip-5.41"
+
+S="${WORKDIR}"
+PATCHES=( "${FILESDIR}"/${P}-catalog.diff )
+
+src_install() {
+	insinto /usr/share/sgml/docbook/sgml-dtd-${PV}
+	doins *.dcl *.dtd *.mod
+	newins docbook.cat catalog
+	insinto /etc/sgml
+	newins - sgml-docbook-${PV}.cat <<-EOF
+		CATALOG "${EPREFIX}/usr/share/sgml/docbook/sgml-dtd-${PV}/catalog"
+		CATALOG "${EPREFIX}/etc/sgml/sgml-docbook.cat"
+	EOF
+	dodoc *.txt
+}
+
+pkg_preinst() {
+	# work-around -r3 postrm removing it
+	cp "${ED}"/etc/sgml/sgml-docbook-${PV}.cat "${T}" || die
+}
+
+pkg_postinst() {
+	if [[ ! -f ${EROOT}/etc/sgml/sgml-docbook-${PV}.cat ]]; then
+		cp "${T}"/sgml-docbook-${PV}.cat "${EROOT}"/etc/sgml/ || die
+	fi
+	sgml-catalog-r1_pkg_postinst
+}
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
new file mode 100644
index 000000000000..d72a82568092
--- /dev/null
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.1-r4.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit sgml-catalog-r1
+
+MY_P="docbk${PV/./}"
+DESCRIPTION="Docbook SGML DTD ${PV}"
+HOMEPAGE="https://docbook.org/sgml/"
+SRC_URI="https://www.oasis-open.org/docbook/sgml/${PV}/${MY_P}.zip"
+
+LICENSE="docbook"
+SLOT="${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+IUSE=""
+
+DEPEND=">=app-arch/unzip-5.41"
+
+S="${WORKDIR}"
+PATCHES=( "${FILESDIR}"/${P}-catalog.diff )
+
+src_install() {
+	insinto /usr/share/sgml/docbook/sgml-dtd-${PV}
+	doins *.dcl *.dtd *.mod
+	newins docbook.cat catalog
+	insinto /etc/sgml
+	newins - sgml-docbook-${PV}.cat <<-EOF
+		CATALOG "${EPREFIX}/usr/share/sgml/docbook/sgml-dtd-${PV}/catalog"
+		CATALOG "${EPREFIX}/etc/sgml/sgml-docbook.cat"
+	EOF
+	dodoc *.txt
+}
+
+pkg_preinst() {
+	# work-around -r3 postrm removing it
+	cp "${ED}"/etc/sgml/sgml-docbook-${PV}.cat "${T}" || die
+}
+
+pkg_postinst() {
+	if [[ ! -f ${EROOT}/etc/sgml/sgml-docbook-${PV}.cat ]]; then
+		cp "${T}"/sgml-docbook-${PV}.cat "${EROOT}"/etc/sgml/ || die
+	fi
+	sgml-catalog-r1_pkg_postinst
+}
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
new file mode 100644
index 000000000000..d72a82568092
--- /dev/null
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.0-r4.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit sgml-catalog-r1
+
+MY_P="docbk${PV/./}"
+DESCRIPTION="Docbook SGML DTD ${PV}"
+HOMEPAGE="https://docbook.org/sgml/"
+SRC_URI="https://www.oasis-open.org/docbook/sgml/${PV}/${MY_P}.zip"
+
+LICENSE="docbook"
+SLOT="${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+IUSE=""
+
+DEPEND=">=app-arch/unzip-5.41"
+
+S="${WORKDIR}"
+PATCHES=( "${FILESDIR}"/${P}-catalog.diff )
+
+src_install() {
+	insinto /usr/share/sgml/docbook/sgml-dtd-${PV}
+	doins *.dcl *.dtd *.mod
+	newins docbook.cat catalog
+	insinto /etc/sgml
+	newins - sgml-docbook-${PV}.cat <<-EOF
+		CATALOG "${EPREFIX}/usr/share/sgml/docbook/sgml-dtd-${PV}/catalog"
+		CATALOG "${EPREFIX}/etc/sgml/sgml-docbook.cat"
+	EOF
+	dodoc *.txt
+}
+
+pkg_preinst() {
+	# work-around -r3 postrm removing it
+	cp "${ED}"/etc/sgml/sgml-docbook-${PV}.cat "${T}" || die
+}
+
+pkg_postinst() {
+	if [[ ! -f ${EROOT}/etc/sgml/sgml-docbook-${PV}.cat ]]; then
+		cp "${T}"/sgml-docbook-${PV}.cat "${EROOT}"/etc/sgml/ || die
+	fi
+	sgml-catalog-r1_pkg_postinst
+}
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
new file mode 100644
index 000000000000..d72a82568092
--- /dev/null
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.1-r4.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit sgml-catalog-r1
+
+MY_P="docbk${PV/./}"
+DESCRIPTION="Docbook SGML DTD ${PV}"
+HOMEPAGE="https://docbook.org/sgml/"
+SRC_URI="https://www.oasis-open.org/docbook/sgml/${PV}/${MY_P}.zip"
+
+LICENSE="docbook"
+SLOT="${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+IUSE=""
+
+DEPEND=">=app-arch/unzip-5.41"
+
+S="${WORKDIR}"
+PATCHES=( "${FILESDIR}"/${P}-catalog.diff )
+
+src_install() {
+	insinto /usr/share/sgml/docbook/sgml-dtd-${PV}
+	doins *.dcl *.dtd *.mod
+	newins docbook.cat catalog
+	insinto /etc/sgml
+	newins - sgml-docbook-${PV}.cat <<-EOF
+		CATALOG "${EPREFIX}/usr/share/sgml/docbook/sgml-dtd-${PV}/catalog"
+		CATALOG "${EPREFIX}/etc/sgml/sgml-docbook.cat"
+	EOF
+	dodoc *.txt
+}
+
+pkg_preinst() {
+	# work-around -r3 postrm removing it
+	cp "${ED}"/etc/sgml/sgml-docbook-${PV}.cat "${T}" || die
+}
+
+pkg_postinst() {
+	if [[ ! -f ${EROOT}/etc/sgml/sgml-docbook-${PV}.cat ]]; then
+		cp "${T}"/sgml-docbook-${PV}.cat "${EROOT}"/etc/sgml/ || die
+	fi
+	sgml-catalog-r1_pkg_postinst
+}
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
new file mode 100644
index 000000000000..868d3429aece
--- /dev/null
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.2-r3.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit sgml-catalog-r1
+
+MY_P="docbook-${PV}"
+DESCRIPTION="Docbook SGML DTD ${PV}"
+HOMEPAGE="https://docbook.org/sgml/"
+SRC_URI="https://www.oasis-open.org/docbook/sgml/${PV}/${MY_P}.zip"
+
+LICENSE="docbook"
+SLOT="${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+IUSE=""
+
+DEPEND=">=app-arch/unzip-5.41"
+
+S="${WORKDIR}"
+PATCHES=( "${FILESDIR}"/${P}-catalog.diff )
+
+src_install() {
+	insinto /usr/share/sgml/docbook/sgml-dtd-${PV}
+	doins *.dcl *.dtd *.mod
+	newins docbook.cat catalog
+	insinto /etc/sgml
+	newins - sgml-docbook-${PV}.cat <<-EOF
+		CATALOG "${EPREFIX}/usr/share/sgml/docbook/sgml-dtd-${PV}/catalog"
+		CATALOG "${EPREFIX}/etc/sgml/sgml-docbook.cat"
+	EOF
+	dodoc ChangeLog README
+}
+
+pkg_preinst() {
+	# work-around -r2 postrm removing it
+	cp "${ED}"/etc/sgml/sgml-docbook-${PV}.cat "${T}" || die
+}
+
+pkg_postinst() {
+	if [[ ! -f ${EROOT}/etc/sgml/sgml-docbook-${PV}.cat ]]; then
+		cp "${T}"/sgml-docbook-${PV}.cat "${EROOT}"/etc/sgml/ || die
+	fi
+	sgml-catalog-r1_pkg_postinst
+}
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
new file mode 100644
index 000000000000..65e94280b8f3
--- /dev/null
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.3-r3.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit sgml-catalog-r1
+
+MY_P="docbook-${PV}"
+DESCRIPTION="Docbook SGML DTD ${PV}"
+HOMEPAGE="https://docbook.org/sgml/"
+SRC_URI="https://docbook.org/sgml/${PV}/${MY_P}.zip"
+
+LICENSE="docbook"
+SLOT="${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+IUSE=""
+
+DEPEND=">=app-arch/unzip-5.41"
+
+S="${WORKDIR}"
+PATCHES=( "${FILESDIR}"/${P}-catalog.diff )
+
+src_install() {
+	insinto /usr/share/sgml/docbook/sgml-dtd-${PV}
+	doins *.dcl *.dtd *.mod
+	newins docbook.cat catalog
+	insinto /etc/sgml
+	newins - sgml-docbook-${PV}.cat <<-EOF
+		CATALOG "${EPREFIX}/usr/share/sgml/docbook/sgml-dtd-${PV}/catalog"
+		CATALOG "${EPREFIX}/etc/sgml/sgml-docbook.cat"
+	EOF
+	dodoc ChangeLog README
+}
+
+pkg_preinst() {
+	# work-around -r2 postrm removing it
+	cp "${ED}"/etc/sgml/sgml-docbook-${PV}.cat "${T}" || die
+}
+
+pkg_postinst() {
+	if [[ ! -f ${EROOT}/etc/sgml/sgml-docbook-${PV}.cat ]]; then
+		cp "${T}"/sgml-docbook-${PV}.cat "${EROOT}"/etc/sgml/ || die
+	fi
+	sgml-catalog-r1_pkg_postinst
+}
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
new file mode 100644
index 000000000000..8e65feba19dc
--- /dev/null
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.4-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit sgml-catalog-r1
+
+MY_P="docbook-${PV}"
+DESCRIPTION="Docbook SGML DTD ${PV}"
+HOMEPAGE="https://docbook.org/sgml/"
+SRC_URI="https://docbook.org/sgml/${PV}/${MY_P}.zip"
+
+LICENSE="docbook"
+SLOT="${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+IUSE=""
+
+DEPEND=">=app-arch/unzip-5.41"
+
+S="${WORKDIR}"
+PATCHES=( "${FILESDIR}"/${P}-catalog.diff )
+
+src_install() {
+	insinto /usr/share/sgml/docbook/sgml-dtd-${PV}
+	doins *.dcl *.dtd *.mod
+	newins docbook.cat catalog
+	insinto /etc/sgml
+	newins - sgml-docbook-${PV}.cat <<-EOF
+		CATALOG "${EPREFIX}/usr/share/sgml/docbook/sgml-dtd-${PV}/catalog"
+		CATALOG "${EPREFIX}/etc/sgml/sgml-docbook.cat"
+	EOF
+	dodoc ChangeLog README
+}
+
+pkg_preinst() {
+	# work-around -r0 postrm removing it
+	cp "${ED}"/etc/sgml/sgml-docbook-${PV}.cat "${T}" || die
+}
+
+pkg_postinst() {
+	if [[ ! -f ${EROOT}/etc/sgml/sgml-docbook-${PV}.cat ]]; then
+		cp "${T}"/sgml-docbook-${PV}.cat "${EROOT}"/etc/sgml/ || die
+	fi
+	sgml-catalog-r1_pkg_postinst
+}
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
new file mode 100644
index 000000000000..f72a63fe7579
--- /dev/null
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.5-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit sgml-catalog-r1
+
+MY_P="docbook-${PV}"
+DESCRIPTION="Docbook SGML DTD ${PV}"
+HOMEPAGE="https://docbook.org/sgml/"
+SRC_URI="https://docbook.org/sgml/${PV}/${MY_P}.zip"
+
+LICENSE="docbook"
+SLOT="${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+IUSE=""
+
+DEPEND=">=app-arch/unzip-5.41"
+
+S="${WORKDIR}"
+PATCHES=( "${FILESDIR}"/${P}-catalog.diff )
+
+src_install() {
+	insinto /usr/share/sgml/docbook/sgml-dtd-${PV}
+	doins *.dcl *.dtd *.mod *.xml
+	newins docbook.cat catalog
+	insinto /etc/sgml
+	newins - sgml-docbook-${PV}.cat <<-EOF
+		CATALOG "${EPREFIX}/usr/share/sgml/docbook/sgml-dtd-${PV}/catalog"
+		CATALOG "${EPREFIX}/etc/sgml/sgml-docbook.cat"
+	EOF
+	dodoc README
+}
+
+pkg_preinst() {
+	# work-around -r0 postrm removing it
+	cp "${ED}"/etc/sgml/sgml-docbook-${PV}.cat "${T}" || die
+}
+
+pkg_postinst() {
+	if [[ ! -f ${EROOT}/etc/sgml/sgml-docbook-${PV}.cat ]]; then
+		cp "${T}"/sgml-docbook-${PV}.cat "${EROOT}"/etc/sgml/ || die
+	fi
+	sgml-catalog-r1_pkg_postinst
+}
diff --git a/app-text/docbook-sgml-dtd/files/docbook-sgml-dtd-3.0-catalog.diff b/app-text/docbook-sgml-dtd/files/docbook-sgml-dtd-3.0-catalog.diff
index 224f98ca59c9..b08003c09ca6 100644
--- a/app-text/docbook-sgml-dtd/files/docbook-sgml-dtd-3.0-catalog.diff
+++ b/app-text/docbook-sgml-dtd/files/docbook-sgml-dtd-3.0-catalog.diff
@@ -1,5 +1,5 @@
---- docbook.cat	Tue Dec 10 16:35:22 1996
-+++ catalog	Mon Jun  5 11:08:34 2000
+--- a/docbook.cat	Tue Dec 10 16:35:22 1996
++++ b/docbook.cat	Mon Jun  5 11:08:34 2000
 @@ -41,29 +41,6 @@
  PUBLIC "-//Davenport//ELEMENTS DocBook Information Pool V3.0//EN" "dbpool.mod"
  PUBLIC "-//Davenport//ELEMENTS DocBook Document Hierarchy V3.0//EN" "dbhier.mod"
diff --git a/app-text/docbook-sgml-dtd/files/docbook-sgml-dtd-3.1-catalog.diff b/app-text/docbook-sgml-dtd/files/docbook-sgml-dtd-3.1-catalog.diff
index 51afa752ad2c..df1507975ac9 100644
--- a/app-text/docbook-sgml-dtd/files/docbook-sgml-dtd-3.1-catalog.diff
+++ b/app-text/docbook-sgml-dtd/files/docbook-sgml-dtd-3.1-catalog.diff
@@ -1,5 +1,5 @@
---- docbook.cat	Tue Feb  2 06:53:32 1999
-+++ catalog	Thu May 25 11:45:01 2000
+--- a/docbook.cat	Tue Feb  2 06:53:32 1999
++++ b/docbook.cat	Thu May 25 11:45:01 2000
 @@ -35,29 +35,6 @@
  PUBLIC "-//OASIS//ENTITIES DocBook Additional General Entities V3.1//EN" "dbgenent.mod"
  PUBLIC "-//OASIS//ENTITIES DocBook Notations V3.1//EN" "dbnotn.mod"
diff --git a/app-text/docbook-sgml-dtd/files/docbook-sgml-dtd-4.0-catalog.diff b/app-text/docbook-sgml-dtd/files/docbook-sgml-dtd-4.0-catalog.diff
index dd83fdf12b52..82944d0b871a 100644
--- a/app-text/docbook-sgml-dtd/files/docbook-sgml-dtd-4.0-catalog.diff
+++ b/app-text/docbook-sgml-dtd/files/docbook-sgml-dtd-4.0-catalog.diff
@@ -1,5 +1,5 @@
---- docbook.cat	Mon May 22 22:38:05 2000
-+++ catalog	Mon May 22 22:12:36 2000
+--- a/docbook.cat	Mon May 22 22:38:05 2000
++++ b/docbook.cat	Mon May 22 22:12:36 2000
 @@ -35,29 +35,6 @@
  PUBLIC "-//OASIS//ENTITIES DocBook Additional General Entities V4.0//EN" "dbgenent.mod"
  PUBLIC "-//OASIS//ENTITIES DocBook Notations V4.0//EN" "dbnotn.mod"
diff --git a/app-text/docbook-sgml-dtd/files/docbook-sgml-dtd-4.1-catalog.diff b/app-text/docbook-sgml-dtd/files/docbook-sgml-dtd-4.1-catalog.diff
index 656ee333f45f..a68644aa1735 100644
--- a/app-text/docbook-sgml-dtd/files/docbook-sgml-dtd-4.1-catalog.diff
+++ b/app-text/docbook-sgml-dtd/files/docbook-sgml-dtd-4.1-catalog.diff
@@ -1,5 +1,5 @@
---- docbook.cat	Mon May 22 22:38:05 2000
-+++ catalog	Mon May 22 22:12:36 2000
+--- a/docbook.cat	Mon May 22 22:38:05 2000
++++ b/docbook.cat	Mon May 22 22:12:36 2000
 @@ -35,29 +35,6 @@
  PUBLIC "-//OASIS//ENTITIES DocBook Additional General Entities V4.1//EN" "dbgenent.mod"
  PUBLIC "-//OASIS//ENTITIES DocBook Notations V4.1//EN" "dbnotn.mod"
diff --git a/app-text/docbook-sgml-dtd/files/docbook-sgml-dtd-4.2-catalog.diff b/app-text/docbook-sgml-dtd/files/docbook-sgml-dtd-4.2-catalog.diff
index d9b232fd8115..d328fdbb3228 100644
--- a/app-text/docbook-sgml-dtd/files/docbook-sgml-dtd-4.2-catalog.diff
+++ b/app-text/docbook-sgml-dtd/files/docbook-sgml-dtd-4.2-catalog.diff
@@ -1,6 +1,6 @@
 diff -uNr 4.2/docbook.cat 4.2-gentoo/docbook.cat
---- 4.2/docbook.cat	2002-07-18 00:14:28.000000000 +0800
-+++ 4.2-gentoo/docbook.cat	2003-01-18 22:25:05.000000000 +0800
+--- a/docbook.cat	2002-07-18 00:14:28.000000000 +0800
++++ b/docbook.cat	2003-01-18 22:25:05.000000000 +0800
 @@ -19,6 +19,8 @@
    -- ...................................................................... --
    -- DocBook driver file .................................................. --
diff --git a/app-text/docbook-sgml-dtd/files/docbook-sgml-dtd-4.3-catalog.diff b/app-text/docbook-sgml-dtd/files/docbook-sgml-dtd-4.3-catalog.diff
index ce532355e4a7..207460ba6f96 100644
--- a/app-text/docbook-sgml-dtd/files/docbook-sgml-dtd-4.3-catalog.diff
+++ b/app-text/docbook-sgml-dtd/files/docbook-sgml-dtd-4.3-catalog.diff
@@ -1,5 +1,5 @@
---- docbook.cat	2004-03-31 20:44:16.000000000 +0900
-+++ docbook.cat-gentoo	2004-10-17 20:37:51.000000000 +0900
+--- a/docbook.cat	2004-03-31 20:44:16.000000000 +0900
++++ b/docbook.cat	2004-10-17 20:37:51.000000000 +0900
 @@ -19,6 +19,8 @@
    -- ...................................................................... --
    -- DocBook driver file .................................................. --
diff --git a/app-text/docbook-sgml-dtd/files/docbook-sgml-dtd-4.4-catalog.diff b/app-text/docbook-sgml-dtd/files/docbook-sgml-dtd-4.4-catalog.diff
index 5c16801a0902..c473d70db4f4 100644
--- a/app-text/docbook-sgml-dtd/files/docbook-sgml-dtd-4.4-catalog.diff
+++ b/app-text/docbook-sgml-dtd/files/docbook-sgml-dtd-4.4-catalog.diff
@@ -1,5 +1,5 @@
---- docbook.cat	2005-01-27 08:59:49.000000000 -0500
-+++ docbook.cat-gentoo	2005-07-11 21:12:28.000000000 -0500
+--- a/docbook.cat	2005-01-27 08:59:49.000000000 -0500
++++ b/docbook.cat	2005-07-11 21:12:28.000000000 -0500
 @@ -19,6 +19,8 @@
    -- ...................................................................... --
    -- DocBook driver file .................................................. --
diff --git a/app-text/docbook-sgml-dtd/files/docbook-sgml-dtd-4.5-catalog.diff b/app-text/docbook-sgml-dtd/files/docbook-sgml-dtd-4.5-catalog.diff
index b7405283f88a..cde8f541e988 100644
--- a/app-text/docbook-sgml-dtd/files/docbook-sgml-dtd-4.5-catalog.diff
+++ b/app-text/docbook-sgml-dtd/files/docbook-sgml-dtd-4.5-catalog.diff
@@ -1,6 +1,6 @@
 diff -NurdB docbook-sgml-dtd/docbook.cat docbook-sgml-dtd_patch/docbook.cat
---- docbook-sgml-dtd/docbook.cat	2006-10-03 15:27:50.000000000 +0200
-+++ docbook-sgml-dtd_patch/docbook.cat	2007-08-14 00:43:31.485987458 +0200
+--- a/docbook.cat	2006-10-03 15:27:50.000000000 +0200
++++ b/docbook.cat	2007-08-14 00:43:31.485987458 +0200
 @@ -19,6 +19,8 @@
    -- ...................................................................... --
    -- DocBook driver file .................................................. --
diff --git a/app-text/docbook-sgml-dtd/metadata.xml b/app-text/docbook-sgml-dtd/metadata.xml
index 6f49eba8f496..0319eec4c8be 100644
--- a/app-text/docbook-sgml-dtd/metadata.xml
+++ b/app-text/docbook-sgml-dtd/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>mgorny@gentoo.org</email>
+		<name>Michał Górny</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-text/docbook-sgml-utils/Manifest b/app-text/docbook-sgml-utils/Manifest
index 8b6ac28da3d5..51112c0c75a8 100644
--- a/app-text/docbook-sgml-utils/Manifest
+++ b/app-text/docbook-sgml-utils/Manifest
@@ -3,4 +3,5 @@ AUX docbook-utils-0.6.14-elinks.patch 445 BLAKE2B e4e64e0cdc22dec01bc96ce5ae0b73
 AUX docbook-utils-0.6.14-prefix.patch 3055 BLAKE2B f8b7f5ffa47d0a1d18fcf9ef66dae9db74b30086bed3a6d3900e73f83dda660c6abedf697f71e51f9b5145751bae2d461ace626a7336f95e95b284468ed50857 SHA512 c4f95b8507070dda4ed102c45e6b8fe40172a2a5d8b041259903f46c3bedb351d85924810cb9bae3073b674ec8b39bd86d5f570c8c28c8100134f62abb59c1a8
 DIST docbook-utils-0.6.14.tar.gz 124998 BLAKE2B c0ae31adbbbf78732362638bdc73638cd67205b4ce2b2ac4e740334fd230c8cb031e5ba3ee9e34110c48ea42115f2f5f4dab4b4b6dd45d963976d2b48d7836a2 SHA512 8052316a643b5eaa6c0373a9ed7f2406e7c3cb3da9d3c955a271c89813a8f3196fcd9e6c8385c7b6b7ecb916515e3ec7897aece4473989f0e4dc52a2bc8bbfdf
 EBUILD docbook-sgml-utils-0.6.14-r2.ebuild 1909 BLAKE2B 75a5d7f4e6c773bd3c2cda8c6879f176df05d9818a3f0e3b3745a4531d42096148b705d80b0c375a67919c5cc0c72badf6f9fae901cc9d8d19a3a5d0a7f914a7 SHA512 3c7960d9d6a12ab50b0e735531b2ff4bdbc15a7a8548fb8b4c6a1e6a2f70a7533a4b65e6e83cb6a15196ef5490d6e763c562ecd7afd84ed599febf4025fdd6a7
-MISC metadata.xml 328 BLAKE2B 03a0d4494de5507fcbddbcaf14fd0da4002abe3ae6c00ec8afd922f0f8034eeb1c3918fa7662da1d3c2016b1ce22980dde08c59d74cbbf3489e6eba3ff434867 SHA512 258243842db06c12a0751afd612ada57c02433da50c419be86dea6ed655b11120e30b8299228bbb81b6efda1574915d69933c4cda8bc9b0ad79c506a6172bb06
+EBUILD docbook-sgml-utils-0.6.14-r3.ebuild 1865 BLAKE2B 4f137c567b36e19551ac741be3ca0a165fb07b70dcc633a674a617c539b6eb37a57c81c752533ec93597099da802fa6032fabf9ffcf7bdfce330374852f1a9fd SHA512 7550d98f3e04b6c3690cfcf4fc42869dde344c5d153001bfd4ff2b465eeb2b9dde8ae9fa5c3394f4bdd16fbe1925ab26ba66f63ebf4152c525fe9306e0adf8b9
+MISC metadata.xml 409 BLAKE2B 326a67b502158f75dcbbd01ef2772bbab0099a4d4a1fc1e7463655abbcd807fbec8761edfd1d312b4d3c845d72506fbf53245779e657cc0baf7d2fa44b3e147b SHA512 abc9fadc1fe1a7a863308a566932f958df7b13800336db521acdb6cc93773fa6c8310a34d702bb996baff5718c2329ef790bedacc5f1d849810c174fd8b281ea
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
new file mode 100644
index 000000000000..16dc32cb7b0c
--- /dev/null
+++ b/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14-r3.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools prefix
+
+MY_P=${PN/-sgml/}-${PV}
+DESCRIPTION="Shell scripts to manage DocBook documents"
+HOMEPAGE="https://sourceware.org/docbook-tools/"
+SRC_URI="https://sourceware.org/pub/docbook-tools/new-trials/SOURCES/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+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() {
+	default
+	eapply "${FILESDIR}"/${MY_P}-elinks.patch
+	eapply "${FILESDIR}"/${P}-grep-2.7.patch
+	if use prefix; then
+		eapply "${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
+
+	if ! use jadetex; then
+		local i
+		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
+	einstalldocs
+}
diff --git a/app-text/docbook-sgml-utils/metadata.xml b/app-text/docbook-sgml-utils/metadata.xml
index b44d8c52bbfb..c09afbf4330d 100644
--- a/app-text/docbook-sgml-utils/metadata.xml
+++ b/app-text/docbook-sgml-utils/metadata.xml
@@ -1,10 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
-<use>
-    <flag name="jadetex">Add support for <pkg>app-text/jadetex</pkg>
-    (for processing tex files produced by the TeX backend of
-    Jade)</flag>
-  </use>
+	<maintainer type="person">
+		<email>mgorny@gentoo.org</email>
+		<name>Michał Górny</name>
+	</maintainer>
+	<use>
+		<flag name="jadetex">
+			Add support for <pkg>app-text/jadetex</pkg> (for processing tex
+			files produced by the TeX backend of Jade)
+		</flag>
+	</use>
 </pkgmetadata>
diff --git a/app-text/docbook-sgml/Manifest b/app-text/docbook-sgml/Manifest
index 227d8adbf6a1..e4b7f0d74610 100644
--- a/app-text/docbook-sgml/Manifest
+++ b/app-text/docbook-sgml/Manifest
@@ -1,2 +1,2 @@
-EBUILD docbook-sgml-1.0-r1.ebuild 557 BLAKE2B 03a73fce2b117fcdc0edee1fa7444b05df6ed6dcbf97f8e3d7c18d3f211ea4795324358ecc7f94d6d5fdf402c698650c13014318cae84708643a5f300d9f82a4 SHA512 98b7ebeec8ab5a8ac8ff8a424c8e7184d54cb84df030b0be3c1539d5d18b363f34fd55c500f8dd3667da4a0c4f849e1718b0a238608d1f9c7cfe95275072d3a6
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
+EBUILD docbook-sgml-1.0-r1.ebuild 566 BLAKE2B ef606f79e6fb3477a86853d06782a8280f6ef13cfdb85b3fcda4ceed25d4d447afc5a87c0ad090a48f91dfa6212e1be2bd512b1e87e53907a8b7311825dce557 SHA512 5434b64587487ba1066a4203c7e0865a23beaa425953f386538dff59aeef3926d36261faec63d41f971c7e349d8cc967d53a3c6efc45325427bd78214a80c6f8
+MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/app-text/docbook-sgml/docbook-sgml-1.0-r1.ebuild b/app-text/docbook-sgml/docbook-sgml-1.0-r1.ebuild
index aadcacdb95fe..33fc3d59f4c1 100644
--- a/app-text/docbook-sgml/docbook-sgml-1.0-r1.ebuild
+++ b/app-text/docbook-sgml/docbook-sgml-1.0-r1.ebuild
@@ -4,16 +4,18 @@
 EAPI=7
 
 DESCRIPTION="A helper package for sgml docbook"
+HOMEPAGE="https://www.docbook.org/sgml/"
 
-LICENSE="GPL-2"
+LICENSE="metapackage"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
-HOMEPAGE="https://www.docbook.org/sgml/"
 
-RDEPEND="app-text/sgml-common app-text/openjade
+RDEPEND="
 	>=app-text/docbook-dsssl-stylesheets-1.64
-	>=app-text/docbook-sgml-utils-0.6.6
 	~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.1
+	>=app-text/docbook-sgml-utils-0.6.6
+	app-text/openjade
+	app-text/sgml-common"
diff --git a/app-text/docbook-sgml/metadata.xml b/app-text/docbook-sgml/metadata.xml
index 6f49eba8f496..0319eec4c8be 100644
--- a/app-text/docbook-sgml/metadata.xml
+++ b/app-text/docbook-sgml/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>mgorny@gentoo.org</email>
+		<name>Michał Górny</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-text/docbook-xml-dtd/Manifest b/app-text/docbook-xml-dtd/Manifest
index 9625c564b8de..f90be347cca4 100644
--- a/app-text/docbook-xml-dtd/Manifest
+++ b/app-text/docbook-xml-dtd/Manifest
@@ -4,8 +4,13 @@ DIST docbook-xml-4.3.zip 83865 BLAKE2B d231a6e6ba3d8023d83358080d136880a5d65b4b3
 DIST docbook-xml-4.4.zip 96107 BLAKE2B 3616c20758de6c14e08f2a9b32682da33be741153d4586c8062d6ff895f0158decc188c5e1db4f0caafbea14afb139e39bd6805842f7bedc18f0770d22e0d2d3 SHA512 7df5af4df24e4618b09814e4e20c147c722962531f03a40c28cd60f1db16b4c330420adf96adb7d66ed6eda84046ee91b467fd6f6fbfac2201537e2080735d76
 DIST docbook-xml-4.5.zip 98497 BLAKE2B 3487f4488a9e3dbc3e366d63b61940727287a97f4e0ee2d2dda031cbba96cd4d85e5b729b7ee4d32e8a6842748fc688f85c94e1a0ab2f7ebc062dd8c7b800e20 SHA512 1ee282fe86c9282610ee72c0e1d1acfc03f1afb9dc67166f438f2703109046479edb6329313ecb2949db27993077e077d111501c10b8769ebb20719eb6213d27
 EBUILD docbook-xml-dtd-4.1.2-r6.ebuild 1370 BLAKE2B 2e10950d21be0d91a19be85f59c83ffb8409ca15c69e84d8110e13af7c9857cce2a21fedd50ac4445ca5f9a70eb6a40bf0de38494ba33d27f2ad6efc9db554f5 SHA512 e3d82053cb65cc80fd05ce3a811211dc5c3522752da9a8884cc23bc245859f8401036d6c9bddd385c5eb433d9154913e18d430b87bed876d9375477b9a3f678a
+EBUILD docbook-xml-dtd-4.1.2-r7.ebuild 1615 BLAKE2B 2870ffb3edd954243fb2885775515eab545cc8e7f4c42f18ac8344fe1fc4c27b61f8eaecf86e12cdbcb0d1862f9fb0c515475c90faf48e3992629f97cea50366 SHA512 0d68f033c54fe73e720a632d3fd124033d41dc3b74a6e7a95093e2fde6d25d878dfc4819a2020020e7020ea4db27df8ddf97625d948066f7346ed1d069ffa2d0
 EBUILD docbook-xml-dtd-4.2-r2.ebuild 1332 BLAKE2B 95ba0206c2ed1233e5a8a0e964c8c16cd626aa50f2eb7b59335017cc54eeecf19cc613e4747f319a50a824fe92cd66a36c3ffda73d1566d852935b59351fbc8f SHA512 98842a6ca697911b794d296e1600b7d1b8c05ab1f2521161c52bfe02eec7fc831eb5b3d97f5ce8dc000d455098b93b8ae9258c33cec4cd51c7f3197879f57d23
+EBUILD docbook-xml-dtd-4.2-r3.ebuild 1609 BLAKE2B b307a081697d13b3527c035b78d75b4eb4a8ae6f68f99ff794b930836b958c860503aa67b33b1da13caf0dc9c29185481af4ca573236cba5687317485fc6e94a SHA512 ba63e4bd7c73980f3a6ef29874d7240dc653542d361c0853936f6c11e98508fd23fa80107e1f9012253ad9dc130f010304dc3d44d95b996a85749ce8e9779517
 EBUILD docbook-xml-dtd-4.3-r1.ebuild 1349 BLAKE2B 278696d5de52ec6085421c3f705b8282fbb4917ba9c54a4ecea9bd9d95bf4ca23b938cc4594b30aa9234d30e5d332eb09b955f97e38414269cef047a742bee2b SHA512 663725a89c4be4ea58e50082445923bfe277674d450a320444f916577065302abb373b5c51fbe080a4fcb063fb08407dc2a57ee8703e1fe92277159a5d5150b7
+EBUILD docbook-xml-dtd-4.3-r2.ebuild 1609 BLAKE2B b307a081697d13b3527c035b78d75b4eb4a8ae6f68f99ff794b930836b958c860503aa67b33b1da13caf0dc9c29185481af4ca573236cba5687317485fc6e94a SHA512 ba63e4bd7c73980f3a6ef29874d7240dc653542d361c0853936f6c11e98508fd23fa80107e1f9012253ad9dc130f010304dc3d44d95b996a85749ce8e9779517
 EBUILD docbook-xml-dtd-4.4-r2.ebuild 1531 BLAKE2B 273c0acb1c86c9c757d514e6823d0130b566a54569b18d4320acc8ca1d02a1d4a3555c6b2f6df3966bfa9e458e040398ebc09b6f9be667321895a3ed4beec7e5 SHA512 de6f19e5f6e49f2498dcf0202760a7f5209e55f88bb39c55efdf572d7eaa859bdc5993ed6de4c8aadcc42008d23bbeed58841c73b5cd2bbf06bb06a082db1062
+EBUILD docbook-xml-dtd-4.4-r3.ebuild 1642 BLAKE2B cc09d208af49e55fb9aadff814b029a7b631a71b1fbc0b3fb26da3bc473a83625f7ee64ed0ad3b3d85b7341330b04c989c440ba087335ee63574fbf545eee7c9 SHA512 f8059823de61be1c224fa8c7295e6010870b6e37c8acb33ccff8dbb37d9f1e758d26760f17e20b0631024e39dd7bf47c562798864843f091b30754930c8ca1ca
 EBUILD docbook-xml-dtd-4.5-r1.ebuild 1583 BLAKE2B 831aaba6b2b304312726fb03ec666489ca4f1cc7abd01e66dd654dfef1fadeabf36ea3f9e739c24b77e35f9443a234fb83f4e7f0b2a08bf0bb9381591d1dd56f SHA512 6f0a101f815f12a8a48231f5b685e46ef24c2bd93a78907b44ff187abe9a680375d324d0d82cb69d67426a2a7f9556495f8567a0f565fe56473c6d9a46e628ed
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
+EBUILD docbook-xml-dtd-4.5-r2.ebuild 1642 BLAKE2B cc09d208af49e55fb9aadff814b029a7b631a71b1fbc0b3fb26da3bc473a83625f7ee64ed0ad3b3d85b7341330b04c989c440ba087335ee63574fbf545eee7c9 SHA512 f8059823de61be1c224fa8c7295e6010870b6e37c8acb33ccff8dbb37d9f1e758d26760f17e20b0631024e39dd7bf47c562798864843f091b30754930c8ca1ca
+MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
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
new file mode 100644
index 000000000000..fdf2ac2ad673
--- /dev/null
+++ b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.1.2-r7.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit sgml-catalog-r1
+
+MY_P="docbkx${PV//./}"
+DESCRIPTION="Docbook DTD for XML"
+HOMEPAGE="https://docbook.org/"
+SRC_URI="https://docbook.org/xml/${PV}/${MY_P}.zip"
+
+LICENSE="docbook"
+SLOT="${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND=">=app-text/docbook-xsl-stylesheets-1.65
+	>=app-text/build-docbook-catalog-1.2"
+DEPEND=">=app-arch/unzip-5.41"
+
+S=${WORKDIR}
+
+src_prepare() {
+	# Prepend OVERRIDE directive
+	sed -i -e '1i\\OVERRIDE YES' docbook.cat || die
+	default
+}
+
+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
+
+	insinto /etc/sgml
+	newins - "xml-docbook-${PV}.cat" <<-EOF
+		CATALOG "${EPREFIX}/etc/sgml/sgml-docbook.cat"
+		CATALOG "${EPREFIX}/usr/share/sgml/docbook/xml-dtd-${PV}/docbook.cat"
+	EOF
+
+	dodoc ChangeLog *.txt
+}
+
+pkg_preinst() {
+	# work-around old revision removing it
+	cp "${ED}"/etc/sgml/xml-docbook-${PV}.cat "${T}" || die
+}
+
+pkg_postinst() {
+	if [[ ! -f ${EROOT}/etc/sgml/xml-docbook-${PV}.cat ]]; then
+		cp "${T}"/xml-docbook-${PV}.cat "${EROOT}"/etc/sgml/ || die
+	fi
+	build-docbook-catalog
+	sgml-catalog-r1_pkg_postinst
+}
+
+pkg_postrm() {
+	build-docbook-catalog
+	sgml-catalog-r1_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
new file mode 100644
index 000000000000..db788fca68f3
--- /dev/null
+++ b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.2-r3.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit sgml-catalog-r1
+
+MY_P=${P/-dtd/}
+DESCRIPTION="Docbook DTD for XML"
+HOMEPAGE="https://docbook.org/"
+SRC_URI="https://docbook.org/xml/${PV}/${MY_P}.zip"
+
+LICENSE="docbook"
+SLOT="${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND=">=app-text/docbook-xsl-stylesheets-1.65
+	>=app-text/build-docbook-catalog-1.2"
+DEPEND=">=app-arch/unzip-5.41"
+
+S=${WORKDIR}
+
+src_prepare() {
+	# Prepend OVERRIDE directive
+	sed -i -e '1i\\OVERRIDE YES' docbook.cat || die
+	default
+}
+
+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
+
+	insinto /etc/sgml
+	newins - "xml-docbook-${PV}.cat" <<-EOF
+		CATALOG "${EPREFIX}/etc/sgml/sgml-docbook.cat"
+		CATALOG "${EPREFIX}/usr/share/sgml/docbook/xml-dtd-${PV}/docbook.cat"
+	EOF
+
+	dodoc ChangeLog README
+}
+
+pkg_preinst() {
+	# work-around old revision removing it
+	cp "${ED}"/etc/sgml/xml-docbook-${PV}.cat "${T}" || die
+}
+
+pkg_postinst() {
+	if [[ ! -f ${EROOT}/etc/sgml/xml-docbook-${PV}.cat ]]; then
+		cp "${T}"/xml-docbook-${PV}.cat "${EROOT}"/etc/sgml/ || die
+	fi
+	build-docbook-catalog
+	sgml-catalog-r1_pkg_postinst
+}
+
+pkg_postrm() {
+	build-docbook-catalog
+	sgml-catalog-r1_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
new file mode 100644
index 000000000000..db788fca68f3
--- /dev/null
+++ b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.3-r2.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit sgml-catalog-r1
+
+MY_P=${P/-dtd/}
+DESCRIPTION="Docbook DTD for XML"
+HOMEPAGE="https://docbook.org/"
+SRC_URI="https://docbook.org/xml/${PV}/${MY_P}.zip"
+
+LICENSE="docbook"
+SLOT="${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND=">=app-text/docbook-xsl-stylesheets-1.65
+	>=app-text/build-docbook-catalog-1.2"
+DEPEND=">=app-arch/unzip-5.41"
+
+S=${WORKDIR}
+
+src_prepare() {
+	# Prepend OVERRIDE directive
+	sed -i -e '1i\\OVERRIDE YES' docbook.cat || die
+	default
+}
+
+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
+
+	insinto /etc/sgml
+	newins - "xml-docbook-${PV}.cat" <<-EOF
+		CATALOG "${EPREFIX}/etc/sgml/sgml-docbook.cat"
+		CATALOG "${EPREFIX}/usr/share/sgml/docbook/xml-dtd-${PV}/docbook.cat"
+	EOF
+
+	dodoc ChangeLog README
+}
+
+pkg_preinst() {
+	# work-around old revision removing it
+	cp "${ED}"/etc/sgml/xml-docbook-${PV}.cat "${T}" || die
+}
+
+pkg_postinst() {
+	if [[ ! -f ${EROOT}/etc/sgml/xml-docbook-${PV}.cat ]]; then
+		cp "${T}"/xml-docbook-${PV}.cat "${EROOT}"/etc/sgml/ || die
+	fi
+	build-docbook-catalog
+	sgml-catalog-r1_pkg_postinst
+}
+
+pkg_postrm() {
+	build-docbook-catalog
+	sgml-catalog-r1_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
new file mode 100644
index 000000000000..d0987c01141c
--- /dev/null
+++ b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.4-r3.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit sgml-catalog-r1
+
+MY_P=${P/-dtd/}
+DESCRIPTION="Docbook DTD for XML"
+HOMEPAGE="https://docbook.org/"
+SRC_URI="https://docbook.org/xml/${PV}/${MY_P}.zip"
+
+LICENSE="docbook"
+SLOT="${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND=">=app-text/docbook-xsl-stylesheets-1.65
+	>=app-text/build-docbook-catalog-1.2"
+DEPEND=">=app-arch/unzip-5.41"
+
+S=${WORKDIR}
+
+src_prepare() {
+	# Prepend OVERRIDE directive
+	sed -i -e '1i\\OVERRIDE YES' docbook.cat || die
+	default
+}
+
+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
+
+	insinto /etc/sgml
+	newins - "xml-docbook-${PV}.cat" <<-EOF
+		CATALOG "${EPREFIX}/etc/sgml/sgml-docbook.cat"
+		CATALOG "${EPREFIX}/usr/share/sgml/docbook/xml-dtd-${PV}/docbook.cat"
+	EOF
+
+	cp ent/README README.ent
+	dodoc ChangeLog README*
+}
+
+pkg_preinst() {
+	# work-around old revision removing it
+	cp "${ED}"/etc/sgml/xml-docbook-${PV}.cat "${T}" || die
+}
+
+pkg_postinst() {
+	if [[ ! -f ${EROOT}/etc/sgml/xml-docbook-${PV}.cat ]]; then
+		cp "${T}"/xml-docbook-${PV}.cat "${EROOT}"/etc/sgml/ || die
+	fi
+	build-docbook-catalog
+	sgml-catalog-r1_pkg_postinst
+}
+
+pkg_postrm() {
+	build-docbook-catalog
+	sgml-catalog-r1_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
new file mode 100644
index 000000000000..d0987c01141c
--- /dev/null
+++ b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.5-r2.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit sgml-catalog-r1
+
+MY_P=${P/-dtd/}
+DESCRIPTION="Docbook DTD for XML"
+HOMEPAGE="https://docbook.org/"
+SRC_URI="https://docbook.org/xml/${PV}/${MY_P}.zip"
+
+LICENSE="docbook"
+SLOT="${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND=">=app-text/docbook-xsl-stylesheets-1.65
+	>=app-text/build-docbook-catalog-1.2"
+DEPEND=">=app-arch/unzip-5.41"
+
+S=${WORKDIR}
+
+src_prepare() {
+	# Prepend OVERRIDE directive
+	sed -i -e '1i\\OVERRIDE YES' docbook.cat || die
+	default
+}
+
+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
+
+	insinto /etc/sgml
+	newins - "xml-docbook-${PV}.cat" <<-EOF
+		CATALOG "${EPREFIX}/etc/sgml/sgml-docbook.cat"
+		CATALOG "${EPREFIX}/usr/share/sgml/docbook/xml-dtd-${PV}/docbook.cat"
+	EOF
+
+	cp ent/README README.ent
+	dodoc ChangeLog README*
+}
+
+pkg_preinst() {
+	# work-around old revision removing it
+	cp "${ED}"/etc/sgml/xml-docbook-${PV}.cat "${T}" || die
+}
+
+pkg_postinst() {
+	if [[ ! -f ${EROOT}/etc/sgml/xml-docbook-${PV}.cat ]]; then
+		cp "${T}"/xml-docbook-${PV}.cat "${EROOT}"/etc/sgml/ || die
+	fi
+	build-docbook-catalog
+	sgml-catalog-r1_pkg_postinst
+}
+
+pkg_postrm() {
+	build-docbook-catalog
+	sgml-catalog-r1_pkg_postrm
+}
diff --git a/app-text/docbook-xml-dtd/metadata.xml b/app-text/docbook-xml-dtd/metadata.xml
index 6f49eba8f496..0319eec4c8be 100644
--- a/app-text/docbook-xml-dtd/metadata.xml
+++ b/app-text/docbook-xml-dtd/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>mgorny@gentoo.org</email>
+		<name>Michał Górny</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-text/docbook-xml-simple-dtd/Manifest b/app-text/docbook-xml-simple-dtd/Manifest
index db3a2bd9837a..3a31d57e6b84 100644
--- a/app-text/docbook-xml-simple-dtd/Manifest
+++ b/app-text/docbook-xml-simple-dtd/Manifest
@@ -5,6 +5,9 @@ DIST docbook-simple-1.0.zip 31173 BLAKE2B b19054783553be68eaa2a689cb673bb4a270f5
 DIST sdb4124.zip 35199 BLAKE2B bee2de887a662978b6f0bf8b9ae663d37c4da1859f07a09e869cff91943bd65946dfd493b9bbe9244ffb8794f3cc5c828c647ab00b183326b63e179540765664 SHA512 b5c158cfcaaa4150d5ee719d11f3fc2b5a207cace241a147b39ab4a9f721cae2a894a88cd3dd944ecd24feae850b387faa03c669747b02de839f5d6a3ff0821f
 DIST simple4125.zip 29839 BLAKE2B 83f2b65e5192334bf6a9b5b5388a77d8b566a924837d041329d16f0ab864d5e69b7ea0a60b70fec4affcf0161fb724c5ed99fe16dd230dc0984100e40642709c SHA512 21c8d411f5b37c82442283dadbde99352778efe90fcf7eab7cc6a74fe9b702f14ffa5bd39e058d8f29fada7dbcdb197d5c880c29b207e3509ba856c5d19cfef1
 EBUILD docbook-xml-simple-dtd-1.0-r2.ebuild 1013 BLAKE2B 9454e1ad486ffcf7190af51cd750eb3aaac42aa4a5f07f485887cbd650fda46543c53cd721f5985f1faef89049373c7059f8a3f1a51753b714b903b6f5da321c SHA512 ce84d4cf08eb0c64b174a33ecd7a0064c09e72c2dcb5b65a2e009f227b561f3fe4306bafe7e3695dcadb404315a0fa6892122eb35f337c72d521d5c70763cdb1
-EBUILD docbook-xml-simple-dtd-4.1.2.4-r3.ebuild 1063 BLAKE2B 863f55c0428c2457ebf5e88435f86969fb20c1d4279f2e7d2fdd16227b42e93b3095f6d2d4574203b8d8b3f5bc38aa7043ae75b2eb46376f200992f77876e9db SHA512 023e19c364bc970672a790c96b9b6ada643af26c15659928560dc7964ff6adfc5da0cda464d1330b9d6dca0c060169ed8737953993ae4b1537d6f547014a6c4e
+EBUILD docbook-xml-simple-dtd-1.0-r3.ebuild 1313 BLAKE2B 93097fab66aab39c48bd03a88a599e01a84aeeebec870b93c54d5f9cfb2af9b2203ff337e2d63717e29016335cf21a5cf8528312aeef68a58426433fcc4b644d SHA512 cd0f3838e79112a35bb40122fb3e0d351f47e433fdbde20df81def60f603f02ecf9cdffb41d97809e7946a23d36c28ebedb3d433134413ed394865a81eec7fbe
+EBUILD docbook-xml-simple-dtd-4.1.2.4-r3.ebuild 1069 BLAKE2B 45c664a32fc1988d5ec95e608dfc9204f774e5208dd9ac4d93867e760b983db58f609c01ec7ee2c83cc625e4bbcdd06aa10d95b7021e18cb7e48816e73b44c99 SHA512 ee24ec7b14126ae353d0e1c11cb819f1f34e31a60603b407769149189ac38a998322960281f81d9549be00b60bb69e80a2571453251bb9ec225c648f6861de42
+EBUILD docbook-xml-simple-dtd-4.1.2.4-r4.ebuild 1343 BLAKE2B 49aa0a94ac4a8458dc7607614a3e4828db08289401a5c2fe2e3d646b345ff086f8151adec378b66a1fc0ee25f020fbfe47eed5ddceb579515bf0a2b601bbfbee SHA512 c0bd4de6cc0286af03c0438bae24ac6d607a6bb711007e09fa87a0925745bc584d44cc7ce98a57b530b02fc7a61c983ad885a82bed89d87f45d8199de607de79
 EBUILD docbook-xml-simple-dtd-4.1.2.5-r2.ebuild 1005 BLAKE2B e0e590a732cff3961f31c47422fbb8474905270996b886395e21decd03bb792ccd1b74834598905b69ff70e36218291bb2de49ce222b8f9879b6b113af5adf5d SHA512 b48010392f3787199881e89e0db87289cf7764abd2cdab4025d9a011e96f14b58eb5c33646a48c4558d90dc94e5789624fde873e210834873dbe4b2c1e0fbdc6
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
+EBUILD docbook-xml-simple-dtd-4.1.2.5-r3.ebuild 1330 BLAKE2B cefa748827ac7484b92d430cf6f8b6d0f798caf8d4109e408ca7b95b22f3ce9379a9b402d0bbb43630c249453640cd98342f7734cf83fd2799477dd5df3dfdd8 SHA512 a74fc344fd2c0cdc7600c8484180ab472c878a1e807bbaf679abe9c2062b0189215e4fa6b264d0d79871cc9f691984661539f88a8adbe6847b2b43d262cfed84
+MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
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
new file mode 100644
index 000000000000..ca6929bbed33
--- /dev/null
+++ b/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-1.0-r3.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit sgml-catalog-r1
+
+MY_P=docbook-simple-${PV}
+DESCRIPTION="Simplified Docbook DTD for XML"
+HOMEPAGE="https://www.oasis-open.org/docbook/"
+SRC_URI="https://www.oasis-open.org/docbook/xml/simple/${PV}/${MY_P}.zip"
+
+LICENSE="docbook"
+SLOT="${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris"
+IUSE=""
+
+RDEPEND=">=app-text/build-docbook-catalog-1.6"
+DEPEND=">=app-arch/unzip-5.41"
+
+S=${WORKDIR}
+
+src_install() {
+	insinto /usr/share/sgml/docbook/${P#docbook-}
+	doins *.dtd *.mod *.css
+	newins "${FILESDIR}"/${P}.cat catalog
+
+	insinto /etc/sgml
+	newins - "xml-simple-docbook-${PV}.cat" <<-EOF
+		CATALOG "${EPREFIX}/usr/share/sgml/docbook/xml-simple-dtd-${PV}/catalog"
+	EOF
+}
+
+pkg_preinst() {
+	# work-around old revision removing it
+	cp "${ED}"/etc/sgml/xml-simple-docbook-${PV}.cat "${T}" || die
+}
+
+pkg_postinst() {
+	if [[ ! -f ${EROOT}/etc/sgml/xml-simple-docbook-${PV}.cat ]]; then
+		cp "${T}"/xml-simple-docbook-${PV}.cat "${EROOT}"/etc/sgml/ || die
+	fi
+	build-docbook-catalog
+	sgml-catalog-r1_pkg_postinst
+}
+
+pkg_postrm() {
+	build-docbook-catalog
+	sgml-catalog-r1_pkg_postrm
+}
diff --git a/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.4-r3.ebuild b/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.4-r3.ebuild
index d8f17a55a964..df073bcf5490 100644
--- a/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.4-r3.ebuild
+++ b/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.4-r3.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.oasis-open.org/docbook/"
 SRC_URI="mirror://gentoo/${MY_P}.zip"
 
 LICENSE="docbook"
-SLOT="0"
+SLOT="4.1.2.4"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
 IUSE=""
 
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
new file mode 100644
index 000000000000..d4e1735315d0
--- /dev/null
+++ b/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.4-r4.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit sgml-catalog-r1
+
+MY_P="sdb${PV//.}"
+DESCRIPTION="Simplified Docbook DTD for XML"
+HOMEPAGE="https://www.oasis-open.org/docbook/"
+SRC_URI="mirror://gentoo/${MY_P}.zip"
+
+LICENSE="docbook"
+SLOT="${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris"
+IUSE=""
+
+RDEPEND=">=app-text/build-docbook-catalog-1.6"
+DEPEND=">=app-arch/unzip-5.41"
+
+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
+
+	insinto /etc/sgml
+	newins - "xml-simple-docbook-${PV}.cat" <<-EOF
+		CATALOG "${EPREFIX}/usr/share/sgml/docbook/xml-simple-dtd-${PV}/catalog"
+	EOF
+}
+
+pkg_preinst() {
+	# work-around old revision removing it
+	cp "${ED}"/etc/sgml/xml-simple-docbook-${PV}.cat "${T}" || die
+}
+
+pkg_postinst() {
+	if [[ ! -f ${EROOT}/etc/sgml/xml-simple-docbook-${PV}.cat ]]; then
+		cp "${T}"/xml-simple-docbook-${PV}.cat "${EROOT}"/etc/sgml/ || die
+	fi
+	build-docbook-catalog
+	sgml-catalog-r1_pkg_postinst
+}
+
+pkg_postrm() {
+	build-docbook-catalog
+	sgml-catalog-r1_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
new file mode 100644
index 000000000000..b818a587508e
--- /dev/null
+++ b/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.5-r3.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+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/"
+SRC_URI="https://www.oasis-open.org/docbook/xml/simple/${PV}/${MY_P}.zip"
+
+LICENSE="docbook"
+SLOT="${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris"
+IUSE=""
+
+RDEPEND=">=app-text/build-docbook-catalog-1.6"
+DEPEND=">=app-arch/unzip-5.41"
+
+S=${WORKDIR}
+
+src_install() {
+	insinto /usr/share/sgml/docbook/${P#docbook-}
+	doins *.dtd *.mod *.css
+	newins "${FILESDIR}"/${P}.catalog catalog
+
+	insinto /etc/sgml
+	newins - "xml-simple-docbook-${PV}.cat" <<-EOF
+		CATALOG "${EPREFIX}/usr/share/sgml/docbook/xml-simple-dtd-${PV}/catalog"
+	EOF
+}
+
+pkg_preinst() {
+	# work-around old revision removing it
+	cp "${ED}"/etc/sgml/xml-simple-docbook-${PV}.cat "${T}" || die
+}
+
+pkg_postinst() {
+	if [[ ! -f ${EROOT}/etc/sgml/xml-simple-docbook-${PV}.cat ]]; then
+		cp "${T}"/xml-simple-docbook-${PV}.cat "${EROOT}"/etc/sgml/ || die
+	fi
+	build-docbook-catalog
+	sgml-catalog-r1_pkg_postinst
+}
+
+pkg_postrm() {
+	build-docbook-catalog
+	sgml-catalog-r1_pkg_postrm
+}
diff --git a/app-text/docbook-xml-simple-dtd/metadata.xml b/app-text/docbook-xml-simple-dtd/metadata.xml
index 6f49eba8f496..0319eec4c8be 100644
--- a/app-text/docbook-xml-simple-dtd/metadata.xml
+++ b/app-text/docbook-xml-simple-dtd/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>mgorny@gentoo.org</email>
+		<name>Michał Górny</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-text/ghostscript-gpl/Manifest b/app-text/ghostscript-gpl/Manifest
index 6eb79eea0942..ee9481afd722 100644
--- a/app-text/ghostscript-gpl/Manifest
+++ b/app-text/ghostscript-gpl/Manifest
@@ -1,4 +1,4 @@
 DIST ghostscript-9.26.tar.xz 33059724 BLAKE2B 7ccb9730db8ae056e67bf8d7fa097a4cb529605e12214ab81253d2d354d26c24e393c8bec2ecdb51a1fefe8443b8af47758705c2fb6b1dab59932140c5de07ca SHA512 3ddb83029edf32282357bf606f4045a9ac73df6543cd423cfad09158ec12ada083a0dbb5aac3b73ae24cbc6c1e9d7574257a5c1fae63ba8776fbb00150ef2a3e
 DIST ghostscript-gpl-9.26-patchset-1.tar.xz 3716 BLAKE2B 0a4c32b3d0c0152b0dc7c62bf2b0bc8e30a369c2aed7c7be4a231948123c2242ce96ae5b1fd485bdae84d7cde1be9f3b3a16831fe77dfbc7ac6cd28bb5e14442 SHA512 7ad9558b00cc11d0872b32d2f1430d2e47730a2360c79d88299c87f8d6d4c15adb5c679ebdcaf50c58d9051c6a1d6f6873e4d81aadfbf3ce202ad94b6dc8981f
 EBUILD ghostscript-gpl-9.26.ebuild 5150 BLAKE2B 24cd87418056e9ebc8505d87ad0046d158126f3c0eb66a1895ac89ad88075fdf8820d2f9f09d6ae06f2635610131f74647c250bac9dd0de608888ea761d96376 SHA512 6bc420cff6e84d3db7fd7fc860d34c00ae1366586f458fc636539595b8d18961ce79cfce0e66198faa44590b4ca770b0ad05ea10fde497279b4ad9bd78b53c92
-MISC metadata.xml 516 BLAKE2B 6afad0e1422537a40a445465a9ae3b974d40e45b177cced532a8b1cee0163cc8af68e1d0f8c79212876e8439a0c3826892d6d639fdcfdf4fcf7d4e22116e837b SHA512 2f20a51f4716d8581748520da0c353f3b9846182ab77ac459abe178f6fd68942c9fc15614ac5a01ae183ff94f3db318037038f48fae54620d6aa7a25de9834d6
+MISC metadata.xml 583 BLAKE2B cc9bd976a53f467582f4657d0f08862454c53783d1eeedf90dfe9fab7e074a8903a48632b03847e4aeba4d9f6cf821ebda120c1de1e64740641e4849278646a8 SHA512 3de9e76a9a3b6fff971d0760b3590a60448014268f45faa742327a90b1cd8c40eae1426026cda590dd9f91c96580eabbba85125c88ed250479b8df675f45bb15
diff --git a/app-text/ghostscript-gpl/metadata.xml b/app-text/ghostscript-gpl/metadata.xml
index 9f69512715cb..61a1c44676ca 100644
--- a/app-text/ghostscript-gpl/metadata.xml
+++ b/app-text/ghostscript-gpl/metadata.xml
@@ -6,6 +6,7 @@
 		<name>Gentoo Printing Project</name>
 	</maintainer>
 	<upstream>
+		<remote-id type="cpe">cpe:/a:artifex:gpl_ghostscript</remote-id>
 		<remote-id type="sourceforge">djvu</remote-id>
 		<remote-id type="github">ArtifexSoftware/ghostpdl-downloads</remote-id>
 	</upstream>
diff --git a/app-text/html401/Manifest b/app-text/html401/Manifest
index ab5253bddb28..ba15a9745202 100644
--- a/app-text/html401/Manifest
+++ b/app-text/html401/Manifest
@@ -1,4 +1,5 @@
-AUX html401-decl.diff 469 BLAKE2B 7b7e98352b9650b06fa7c9e792e1538873827ffd8d7c043d45a3035c1c1099be9c2aed632717f959a92b2b5f0dc646104c81f13fe612cbcabb3531afcf3d4b9a SHA512 066d1c3672e2b8fd86a696c511c4eab92c8772f147503a986f6c89d1c33720325d15c22157c81d7f121ee441328b89f73a194d5e7e40af4408b0f9b8e0cc65d2
+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
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
+EBUILD html401-19991224-r4.ebuild 972 BLAKE2B 92c5a0227d0a61c64859976635630607721c4afdb1f5afb29e5286d3c0dfcfdf0a430bedbb3cac0af58a09457bf867b65d215c5fbed2c38f5a02d69a27374515 SHA512 9f40fde225a46bc749347c21994c6c0f53b7fe4f1f4b01d0dc29bbccb42d27f74d7fdf935b76821202d1b41d924e0cc9de403e5289d65df9c17803a5fe3331e3
+MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/app-text/html401/files/html401-decl.diff b/app-text/html401/files/html401-decl.diff
index 27819a8afd17..e5c5bd4b22d9 100644
--- a/app-text/html401/files/html401-decl.diff
+++ b/app-text/html401/files/html401-decl.diff
@@ -1,5 +1,5 @@
---- HTML4.cat.orig	2004-11-06 20:25:39.000000000 +0900
-+++ HTML4.cat	2004-11-06 21:16:08.543377286 +0900
+--- a/HTML4.cat	2004-11-06 20:25:39.000000000 +0900
++++ b/HTML4.cat	2004-11-06 21:16:08.543377286 +0900
 @@ -1,5 +1,9 @@
  OVERRIDE YES
  
diff --git a/app-text/html401/html401-19991224-r4.ebuild b/app-text/html401/html401-19991224-r4.ebuild
new file mode 100644
index 000000000000..8f75a577ac4d
--- /dev/null
+++ b/app-text/html401/html401-19991224-r4.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+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"
+
+LICENSE="W3C"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~s390 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE=""
+
+S=${WORKDIR}
+PATCHES=( "${FILESDIR}"/${PN}-decl.diff )
+
+src_install() {
+	insinto /usr/share/sgml/${PN}
+	doins HTML4.cat HTML4.decl *.dtd *.ent
+
+	insinto /etc/sgml
+	newins - html401.cat <<-EOF
+		CATALOG "${EPREFIX}/usr/share/sgml/html401/HTML4.cat"
+	EOF
+
+	docinto html
+	local dirs=( */ )
+	dodoc -r *.html "${dirs[@]%/}"
+}
+
+pkg_preinst() {
+	# work-around old revision removing it
+	cp "${ED}"/etc/sgml/html401.cat "${T}" || die
+}
+
+pkg_postinst() {
+	if [[ ! -f ${EROOT}/etc/sgml/html401.cat ]]; then
+		cp "${T}"/html401.cat "${EROOT}"/etc/sgml/ || die
+	fi
+	sgml-catalog-r1_pkg_postinst
+}
diff --git a/app-text/html401/metadata.xml b/app-text/html401/metadata.xml
index 6f49eba8f496..0319eec4c8be 100644
--- a/app-text/html401/metadata.xml
+++ b/app-text/html401/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>mgorny@gentoo.org</email>
+		<name>Michał Górny</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-text/htmltidy/Manifest b/app-text/htmltidy/Manifest
index 0b2f4463931c..fa5a2ae5b3d0 100644
--- a/app-text/htmltidy/Manifest
+++ b/app-text/htmltidy/Manifest
@@ -4,4 +4,4 @@ AUX htmltidy-5.10.26-strip-O2-flag.patch 370 BLAKE2B 7c2a58a6a8c00460871278f5967
 DIST tidy-20090325-doc.tar.bz2 13319 BLAKE2B c55c5e10cdfbf0eb62685955cad24f628c21e612bd12c41018c139b3b93db95cc201888f6766d7f68f2d1c4d4cfb2cab25b668eff0d2d241462f4cf9b65e79e1 SHA512 0224d1f839f3829a9c879eba8a98ceee3b0c9f8bfe1721076859714428d534f492acd11e49992fccc2e45afd64d79067793c90f7af06d623ef89e7c16dfee35b
 DIST tidy-20090325.tar.bz2 382016 BLAKE2B 3373e94d54cfef866e701e2e258be821b8749dbbbc37b10e4e4e4ba6d7f5995676161ac11bc6a2497f5e02c3907f680fabe9ac6dec2f2365aeb39c03b9697e0a SHA512 daeab2c3dd7f1248a5dbc1585267a8fdb0be09a940b79c3e53c97051f692cf85ea9f0a267f37e1c877054b77efb836d422a1e7ff61b22b383a2d2ac08939b970
 EBUILD htmltidy-20090325-r2.ebuild 2003 BLAKE2B 43116843d4c9eaacdb91822247b6a96868654c87ee92f180fb7112e87644ab66a09d4e105c1e4f983e700708b46aafe3bec67168698e890a42a90042ca68ed80 SHA512 c16aa9a70389e21ba8260fc2118bc36889350d95fc53ea7350279f8fb70252182156cb21efdcd8c2b31181ef18e0e53a499859064cc73149cb6d60ed328ef09a
-MISC metadata.xml 241 BLAKE2B bd724ebe3c99c206e2e78f9bdab811083ca54eafaf1e283f4913af473e6e9710f380021fcb71cc863bfc3cc0984475adff5d5f5e938b55c533ebc7460c597ee1 SHA512 3f74e1d47cf7af59d7255fbb4e6f04fc372447cc101a524779ac59bdc4acba08d53756350575e377f2ccf0ebf309f499ec81fda9d7cd93d234e53dd06cf504ba
+MISC metadata.xml 299 BLAKE2B 45af58b9f27f8329d072008a1089edae34741b855b1626cc56eb97efef684b316ce5573308ef1e73d4aa7e1cde74b0c10d5d7becee71707f5b3439f451a433ea SHA512 cd21089fbc56a2608734a5821826da373a5112e1676bf3c3481320236f5583ff1240e118e0021130625826c76cb426ca681e0dec3c6e4d2df22f8967da15321d
diff --git a/app-text/htmltidy/metadata.xml b/app-text/htmltidy/metadata.xml
index 3fbef354e7d1..295e70001214 100644
--- a/app-text/htmltidy/metadata.xml
+++ b/app-text/htmltidy/metadata.xml
@@ -3,6 +3,7 @@
 <pkgmetadata>
 	<!-- maintainer-needed -->
 	<upstream>
+		<remote-id type="cpe">cpe:/a:html-tidy:tidy</remote-id>
 		<remote-id type="sourceforge">tidy</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/app-text/libabw/Manifest b/app-text/libabw/Manifest
index c7bd5c2bc615..e75bb93be3d3 100644
--- a/app-text/libabw/Manifest
+++ b/app-text/libabw/Manifest
@@ -1,3 +1,5 @@
 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 837 BLAKE2B 2516f00319717c8b58eea0efd67dab51311ae1502cad970109b408389f22bf97a729651c383233ee5b9c37e8141651a57b2e5737c10efc90a8631d8bc671b6ad SHA512 f062383db73798464d34a5f207f4d471e68f6050e32bd1d66783ad30a464986a135af58ffa2144292e4db8f7559a299a6fa10a995a72e3236ac01872fc74667d
 MISC metadata.xml 255 BLAKE2B 9b8486730bea2158e8be5cbbe0552c5460d1b18e2236a68e3f11d85ce4eeb96eb0e746f44a10cb7cdcf1bf498190a512ef42f47852c6843b9a3c937ceabc338d SHA512 ac646e8ac676faf0aac283e4be31c5f2b29e98ccf07327073ed05e688ce696caf639bdfea63e4aed141a90e84c0a86892bc717a52b95cdf1739aaa15240013c3
diff --git a/app-text/libabw/libabw-0.1.3.ebuild b/app-text/libabw/libabw-0.1.3.ebuild
new file mode 100644
index 000000000000..bae7f1dcebdb
--- /dev/null
+++ b/app-text/libabw/libabw-0.1.3.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit 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"
+
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
+RDEPEND="
+	dev-libs/librevenge
+	dev-libs/libxml2
+	sys-libs/zlib
+"
+DEPEND="${RDEPEND}
+	>=dev-libs/boost-1.46
+	sys-devel/libtool
+"
+
+src_configure() {
+	# bug 619470
+	append-cxxflags -std=c++14
+
+	local myeconfargs=(
+		$(use_with doc docs)
+		$(use_enable static-libs static)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/app-text/libetonyek/Manifest b/app-text/libetonyek/Manifest
index 2200ebf1bf12..9bacf02e4bae 100644
--- a/app-text/libetonyek/Manifest
+++ b/app-text/libetonyek/Manifest
@@ -1,4 +1,4 @@
 DIST libetonyek-0.1.9.tar.xz 1477064 BLAKE2B 088d27c83d4aff41cb208cf840def78e323f378a1b7d456448db3abf51d1e850c8159ace75c8836958b533c2b84e583d5a622e638081230d2f862f6d1d175e98 SHA512 3f439b369d450bb1a4bdb3fe92023bda234b323cf676570f1738318c56867a97910f536280b9b164c3fdaa423a3ee669c935df75a5c700bc1530ea5b9a00391e
-EBUILD libetonyek-0.1.9.ebuild 1294 BLAKE2B 2d883f5908e5fd97babe59e62909de01e9b751ba0d6bf4322dd7106ec46cf0fdcdde759ba206ad674c14c79fa4c40c69e1afe66d5998f637c5fe8f9adc500d04 SHA512 0af622bef1e7896021bc7f614b6503a22545e5715c58c1676303d12ce0346fa1bf319b27a61d7eeebda53f1209644ce8f486ef608217a235fa6eb99d92814495
-EBUILD libetonyek-9999.ebuild 1297 BLAKE2B ef85c5b3f63b108d7a9ba562b83e1650210da5cac71f2868d2f0fed2c5a47d796459af36d2c1442db39e2b2cb48c4f3616c48c82b6620a8cebb961e49b3bfb10 SHA512 667aace5bf321077a711dfe37ad01ef56a1b206b6c25c27ce68eb8b1546721c1961b71b75fb85a49612df1c9a9ac92740852b39332778277d0cc1e980a5bd449
+EBUILD libetonyek-0.1.9.ebuild 1186 BLAKE2B d15463f4377588211f8d33f4dfabfc9e4fd1bf62fc4ee3d5828e9953edc7106f8f3e9f71827339beb21facf55b9737be53e6dfd45fd27098a9129fd8d84dd157 SHA512 70639675fc3b07a94a107fed5b40f72d8df2e2885db176ad5275f1a0e1fde0f7b2e945d5a42d438a34a83f311a2629638436eb7f613f782e7153883cf35fcee6
+EBUILD libetonyek-9999.ebuild 1297 BLAKE2B af489ee7a31f718a3670b3fe2ff212855cf9f43ff72112963f20a5b418996a8ac3b27828a2902947b91e769ad173c78eca148e6ad7cd2c301aee9a11db52e445 SHA512 fb33aaca7764969b2aed14955d5cd547e7b2718d33b27196642f1bacb18062e99b7e5ae7a2ed2468007273171cb4392148761709ceb3d96c85d6358eb26f62cb
 MISC metadata.xml 255 BLAKE2B 9b8486730bea2158e8be5cbbe0552c5460d1b18e2236a68e3f11d85ce4eeb96eb0e746f44a10cb7cdcf1bf498190a512ef42f47852c6843b9a3c937ceabc338d SHA512 ac646e8ac676faf0aac283e4be31c5f2b29e98ccf07327073ed05e688ce696caf639bdfea63e4aed141a90e84c0a86892bc717a52b95cdf1739aaa15240013c3
diff --git a/app-text/libetonyek/libetonyek-0.1.9.ebuild b/app-text/libetonyek/libetonyek-0.1.9.ebuild
index bd8b3c336f21..e690d1468504 100644
--- a/app-text/libetonyek/libetonyek-0.1.9.ebuild
+++ b/app-text/libetonyek/libetonyek-0.1.9.ebuild
@@ -21,7 +21,7 @@ RDEPEND="
 	app-text/liblangtag
 	dev-libs/librevenge
 	dev-libs/libxml2
-	>=dev-util/mdds-1.3.1:1=
+	=dev-util/mdds-1.4*:1=
 	sys-libs/zlib
 "
 DEPEND="${RDEPEND}
@@ -42,15 +42,11 @@ src_prepare() {
 src_configure() {
 	local myeconfargs=(
 		--disable-werror
+		--with-mdds=1.4
 		$(use_with doc docs)
 		$(use_enable static-libs static)
 		$(use_enable test tests)
 	)
-	if has_version ">=dev-util/mdds-1.4"; then
-		myeconfargs+=( --with-mdds=1.4 )
-	else
-		myeconfargs+=( --with-mdds=1.2 )
-	fi
 
 	econf "${myeconfargs[@]}"
 }
diff --git a/app-text/libetonyek/libetonyek-9999.ebuild b/app-text/libetonyek/libetonyek-9999.ebuild
index a59ca6e00967..5a2e3527e53a 100644
--- a/app-text/libetonyek/libetonyek-9999.ebuild
+++ b/app-text/libetonyek/libetonyek-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -21,7 +21,7 @@ RDEPEND="
 	app-text/liblangtag
 	dev-libs/librevenge
 	dev-libs/libxml2
-	>=dev-util/mdds-1.3.1:1=
+	>=dev-util/mdds-1.4.3:1=
 	sys-libs/zlib
 "
 DEPEND="${RDEPEND}
@@ -46,10 +46,10 @@ src_configure() {
 		$(use_enable static-libs static)
 		$(use_enable test tests)
 	)
-	if has_version ">=dev-util/mdds-1.4"; then
-		myeconfargs+=( --with-mdds=1.4 )
+	if has_version ">=dev-util/mdds-1.5"; then
+		myeconfargs+=( --with-mdds=1.5 )
 	else
-		myeconfargs+=( --with-mdds=1.2 )
+		myeconfargs+=( --with-mdds=1.4 )
 	fi
 
 	econf "${myeconfargs[@]}"
diff --git a/app-text/linuxdoc-tools/Manifest b/app-text/linuxdoc-tools/Manifest
index 23265a98edf8..266d4901fcc0 100644
--- a/app-text/linuxdoc-tools/Manifest
+++ b/app-text/linuxdoc-tools/Manifest
@@ -1,5 +1,6 @@
 DIST linuxdoc-tools-0.9.72.tar.gz 614429 BLAKE2B 404b311c0560780bd81f021760d32e47cd6ebe8abc9aa64a181b8ce727dd0edbbd88d286cdfdcc97a51981bd0bd299563d7b1b2945e06f83ff32c7d3e56abb19 SHA512 2d522a99212dab2535786b64e0b404a9bb023d1612d8e57a628de21b5e77b104285713a98591c61a2fb2196e687b34180198ab0dfeda2b44fbbce051e9919408
 DIST linuxdoc-tools-0.9.73.tar.gz 613971 BLAKE2B e2e04aaa44d5e2cea5af266e38b476381f87a02b9704e03ae5943f7714634d5d214350abd5b193f2efe656a264403c679495af5f954870b30d32b8b799ad7206 SHA512 b26896316e259cf4ef170814d410b1e39e58f61db49b03b4b9c1f767f8459d84214e92d9dcc09ad739508fd9c3c5fe4a2264cbb3c693a11362e59fd221655252
 EBUILD linuxdoc-tools-0.9.72.ebuild 1777 BLAKE2B b61585eaf79a55b9acc1f4711cbaec19d421db998f091a4fb5827292bb30c5720de9ba5a300ad0cf248b509a8ec4d1a0415a4ee498edb18f49279cf673ff35cb SHA512 40632a82dc9252a4bac966174c4e87f6f1adf075fb2ef125ea07ccc5796b98e74d8823d1afff11f98e042ded4eb5b7da82a8b8c5ab052e4f7d53357b84cbf649
+EBUILD linuxdoc-tools-0.9.73-r1.ebuild 1915 BLAKE2B a693c89988854a7efdabb270efd5d9ed3fd9888d6732b8cfe875cb9f34ca31a3f6718e090957f51ebc55a1a753cdadfac86eabb8e95a276f0a706b05f8b2366d SHA512 a8dc786ba14a8a89a5c05fe45bfa2e2deff57530a9235877791a6d9240a4e6ffc4871bbf6946ee497097fff6053c1af5f397e4362930ff4e4772147c96f0bb55
 EBUILD linuxdoc-tools-0.9.73.ebuild 1667 BLAKE2B 7610425455383b2de6e6d2192b1efe2ff91f177cb7d57db0244c7a5318bff2676e52b383c973345797b4322ef6d67166ef6376d7d3d2eac14a17137b59d0ef41 SHA512 1cc1811a713b4b255daf959fb45294ce2aff9c97a6c8b8fefbe0ef4d229da09c98ea4be56087b0a185ad6fde30788ee6b578c72e3f2c82673918233581c0b726
 MISC metadata.xml 911 BLAKE2B a78b50af9faf588a872f75b94f1278ce1ef5e16edb8c6f6c953dcc29b466be53f70a63275e5df54bd46f58d726e80f07b8cd8ae051d93f7c6ee11f0c8e63b8fe SHA512 6afd802552b700006b38a5eee516e5e1f59d0af0dff294bc2807804f8a85823ca2c5a928c0cfe2d5ef74d8c34521ecdd2a54d4ff5a1d322f17d42a6e5e6ad0f4
diff --git a/app-text/linuxdoc-tools/linuxdoc-tools-0.9.73-r1.ebuild b/app-text/linuxdoc-tools/linuxdoc-tools-0.9.73-r1.ebuild
new file mode 100644
index 000000000000..4f2129a2644a
--- /dev/null
+++ b/app-text/linuxdoc-tools/linuxdoc-tools-0.9.73-r1.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools latex-package perl-functions sgml-catalog-r1 toolchain-funcs
+
+DESCRIPTION="A toolset for processing LinuxDoc DTD SGML files"
+HOMEPAGE="https://gitlab.com/agmartin/linuxdoc-tools"
+SRC_URI="https://gitlab.com/agmartin/linuxdoc-tools/-/archive/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-3+ MIT SGMLUG"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~sparc ~x86 ~x86-fbsd"
+IUSE="doc"
+
+RDEPEND="
+	|| ( app-text/openjade app-text/opensp )
+	app-text/sgml-common
+	dev-lang/perl:=
+	sys-apps/groff
+"
+DEPEND="${RDEPEND}
+	sys-devel/flex
+	virtual/awk
+	doc? (
+		dev-texlive/texlive-fontsrecommended
+		virtual/latex-base
+	)
+"
+
+src_prepare() {
+	default_src_prepare
+	# Pregenerated configure scripts fail.
+	eautoreconf
+}
+
+src_configure() {
+	perl_set_version
+	tc-export CC
+	local myeconfargs=(
+		--disable-docs
+		--with-texdir="${TEXMF}/tex/latex/${PN}"
+		--with-perllibdir="${VENDOR_ARCH}"
+		--with-installed-iso-entities
+	)
+	use doc && myeconfargs+=(--enable-docs="txt pdf html")
+
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	# Prevent access violations from bitmap font files generation.
+	use doc && export VARTEXFONTS="${T}/fonts"
+	default_src_compile
+}
+
+src_install() {
+	# Makefile ignores docdir configuration option.
+	emake DESTDIR="${D}" docdir="${EPREFIX}/usr/share/doc/${PF}" install
+	dodoc ChangeLog README
+
+	insinto /etc/sgml
+	newins - linuxdoc.cat <<-EOF
+		CATALOG "${EPREFIX}/usr/share/linuxdoc-tools/linuxdoc-tools.catalog"
+	EOF
+}
+
+pkg_preinst() {
+	# work around sgml-catalog.eclass removing it
+	cp "${ED}"/etc/sgml/linuxdoc.cat "${T}" || die
+}
+
+pkg_postinst() {
+	if [[ ! -f ${EROOT}/etc/sgml/linuxdoc.cat ]]; then
+		cp "${T}"/linuxdoc.cat "${EROOT}"/etc/sgml/ || die
+	fi
+
+	latex-package_pkg_postinst
+	sgml-catalog-r1_pkg_postinst
+}
+
+pkg_postrm() {
+	latex-package_pkg_postrm
+	sgml-catalog-r1_pkg_postrm
+}
diff --git a/app-text/mupdf/Manifest b/app-text/mupdf/Manifest
index 285daeb9b226..a6d1d3e0ac63 100644
--- a/app-text/mupdf/Manifest
+++ b/app-text/mupdf/Manifest
@@ -3,7 +3,6 @@ AUX mupdf-1.14-CFLAGS.patch 395 BLAKE2B cc841dc186ac09892789664395bf632a33af3fd1
 AUX mupdf-1.14-Makefile.patch 1294 BLAKE2B 228ab49a5814e24b0fb1995c5137ce513a303f495973699a370a13a2af17e436ad67ecb47bab739740f7593b71087e167461ff188ef0fe8edf3980450d54984a SHA512 33be7134f8f469a4c72daf59d705de2ed2952ba4ff518ab54f5dc44279d4af8c5d05919bd19d4c6b84085f47f3713a752d678e708aa736e703d2f47d94391b84
 AUX mupdf-1.14-fix-big-endian.patch 4086 BLAKE2B c5104e808a83f122f1c1e80fd57b5aabadc017458e1d2383b09eef457ff6bd8809a42efac01d1f5fdfcbc55789696a2ab62dfd7f6f83150a1016e4c07c4fdfea SHA512 2519b33703976465f1411cad10daebe7646c2830ac385df642b326e82ca608bb4662f824ff98a1cc434994191f222ee02f56b296cac526abaa9e69d5786d50be
 AUX mupdf-1.14-libressl.patch 1362 BLAKE2B b52ccec0a03d97b357d5329317143595e0cf3029179b91f3d6134f6b59e313ed71063aee97d1192630fb64bd237997b1a56a6a55461b5e434297756e234990ef SHA512 3094d427a7beedc756e47a367423ffe7c8221f9078bd7bef5e8dddba615e918824778cc8118cd656b2dd1d8c235c770631241eb84a46551c96c32906a7986281
-AUX mupdf-1.14-openssl-curl-x11.patch 1799 BLAKE2B 62ae64baad844a13379f8dd1e1a1fed7cc0675fafe79e92a1029a968f59aa0aa3557734f2aa8e56d84f9bbeffbd148ae12255538d2f7b27a07fad5030621d33e SHA512 b6892c58c8a0d7561af16cc3e45e666b8bd1a6824f803d7500dd2db09b4bb477c45ab71b955bf76eedea8352d62d062ee656157c55d635514e464afdef1c2583
 AUX mupdf-1.14-r3-openssl-curl-x11.patch 1256 BLAKE2B 49bfda1f434fbfcf85c7b38b714b3c471d8d4ce02d625a6716582e0a9b3d1d0f623d401a0e9f4fc8ce4a1a6109925199c9c2b188be8739f274804217fb829efb SHA512 387f282fdd2e450585743de7fa297c24685d12c199c801f930da37795c6406aa9ee0bee335c54ca6ccef46726ebf6b49b389753f061542cf7e5381c979e0786d
 AUX mupdf-1.15-CFLAGS.patch 376 BLAKE2B ace255a4110df9200d627ac68f5950218eeaa993bbd37fa7fe2d676572cad02d50a632750e6a9bdf6269cd97501f709d075a79d7db8b9832909b59b33251b594 SHA512 c00cd5cb30d33a9cbc55557cab3c4e2be1ae86121c5b1b28b6e35f97f93751aa2e96e106f13b7f365a56ebcce8e1c5e4163a440e8c85a48130803f5a7aec63ed
 AUX mupdf-1.15-Makefile.patch 1189 BLAKE2B 21447e2fd8ca7c396b9b2bd5e1e70ac6ebff5dc8dcbde273e0b23e17281cf2fe16f7a53587f9b0a3b2af1837f3ed5fc4a19666a4cdfa5d491e8b9be71519e1a8 SHA512 6c696b5a522116d075ee1a4759cdf3cae2e8836315f2898a51c15e227d4d57b44095a9927e7d66ab7d522ba6e0c65eed10a379d9e80b791ee8b6022933f615ab
@@ -11,7 +10,6 @@ AUX mupdf-1.15-openssl-x11.patch 735 BLAKE2B 03e53970a145db913bad9c03de899ffeb7e
 AUX mupdf-1.3-zoom-2.patch 214 BLAKE2B b9d15ecf6978c4f5c865be0b913448a25852b4a768f8be99b8feb68b1511b203cd22cb7020ccb6447d31082d02a9f3ee80e3ac0153408f3b36db2bdfb68c9f6b SHA512 95bb2d68246dc22eb0fb6e8a312c0f02476f356ee219c417dfa06473b5944d9e63ae6778cd967c70e60fb933eee1aac337efd2476b0bc791df1c69f7b7b822b3
 DIST mupdf-1.14.0-source.tar.xz 41602372 BLAKE2B bb680038344af16c7231a18a009c0d04c5f50b3fcbaf061c9f5907f35d79eea93eeced7c2a43a06a963b93b39c74d0246c5fdad35655953d1aa5efb79737265a SHA512 bd41125dac1a81b7dbbfbb5f5e06e70bb601854731e0945983688da5d8d7c0bca9771fff2e4b6d9c36dbead6146f0a866ed7427d58e13d02ed6dfd94dcfe54bf
 DIST mupdf-1.15.0-source.tar.xz 39828864 BLAKE2B 15d0e4244062a91c7055b98fa61f2b02e0e3effbcf5374fe589f5a0d2ba2a2d4a59318ae3c0f28d866c6b07554e4b1e65ee9264c26a5f4524ef34e998d6c3320 SHA512 ef19362e8b6c2843e214fd2fcdcc9ba91017884383f7e1cfe08ef1f528a233820475ddfdd8aef481e6e37ae69e8b64324eb4b30699baa8055e99e47c2fab31dd
-EBUILD mupdf-1.14.0-r2.ebuild 3116 BLAKE2B 1700ed8f0eacc1c986393b597df20d4b45a2158ddedbe472281e900d8dc79ce4a76aafc5be0e3f35977afd6cecb643b7a382c6a7e0a422987d23b20bf2697343 SHA512 442a258938c868062ddd3de127da51c475c89908f466aa12d8baf44b4c29fa961c99f3e1eb3649672e1855cc447eb1b30f2aa31ed80ff1c2c751716b743ee6d8
 EBUILD mupdf-1.14.0-r3.ebuild 3229 BLAKE2B cea1f272cbf41f3fd1bf7b576124cb279e0f6cd9aa52c3ced218c09d77f6f1968bce066288afba74666d6bbe20cdf61958f5b721ed347b1667811900fb852069 SHA512 292695fe366b7f1688b90841d7d1cf5cf11a4d56ad0b6ea8fb3b87bde92c6a21183d42a1ae0baf4ef017d748be6d3a31d3616daa22ca17f797ac86ffa994fbb1
 EBUILD mupdf-1.15.0.ebuild 3505 BLAKE2B be357aae0944fda68a0e95cf12e2936ec94428d5baa645399add9f87ca5127de85898f22fb56762d7fb88d6ed3e61874723f7668fb9c4a2ac942585e3ddbde6f SHA512 41209dd40db318acaa224a031672fb9281dd674a6803b789da1cd673ab18af08c4fcdd2f5d82ccc5076026fec056986d2b67f1adc4b4cf3a7a0aca56787d7b75
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/app-text/mupdf/files/mupdf-1.14-openssl-curl-x11.patch b/app-text/mupdf/files/mupdf-1.14-openssl-curl-x11.patch
deleted file mode 100644
index a1284a63d670..000000000000
--- a/app-text/mupdf/files/mupdf-1.14-openssl-curl-x11.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-diff --git a/Makerules b/Makerules
-index fc9bf998..5c0fffa4 100644
---- a/Makerules
-+++ b/Makerules
-@@ -113,10 +113,14 @@ else ifeq ($(OS),Linux)
- 	SYS_ZLIB_LIBS := $(shell pkg-config --libs zlib)
-   endif
- 
-+  WANT_CURL ?= yes
-+  ifeq "$(WANT_CURL)" "yes"
-   HAVE_CURL := $(shell pkg-config --exists libcurl && echo yes)
-   ifeq ($(HAVE_CURL),yes)
- 	SYS_CURL_CFLAGS := $(shell pkg-config --cflags libcurl)
--	SYS_CURL_LIBS := $(shell pkg-config --libs libcurl)
-+    # We have to forcibly add -lpthread to avoid linking errors.
-+	SYS_CURL_LIBS := $(shell pkg-config --libs libcurl) -lpthread
-+  endif
-   endif
- 
-   HAVE_GLUT := yes
-@@ -125,17 +129,29 @@ else ifeq ($(OS),Linux)
- 	SYS_GLUT_LIBS := -lglut -lGL
-   endif
- 
-+  WANT_X11 ?= yes
-+  ifeq "$(WANT_X11)" "yes"
-   HAVE_X11 := $(shell pkg-config --exists x11 xext && echo yes)
-   ifeq ($(HAVE_X11),yes)
- 	X11_CFLAGS := $(shell pkg-config --cflags x11 xext)
- 	X11_LIBS := $(shell pkg-config --libs x11 xext)
-   endif
-+  endif
- 
--  HAVE_LIBCRYPTO := $(shell pkg-config --exists 'libcrypto >= 1.1.0' && echo yes)
--  ifeq ($(HAVE_LIBCRYPTO),yes)
-+  WANT_OPENSSL ?= yes
-+  ifeq "$(WANT_OPENSSL)" "yes"
-+  ifeq "$(shell pkg-config --exists 'libcrypto >= 2.0.0' && echo libre)" "libre"
-+  ifeq "$(shell pkg-config --exists 'libcrypto >= 2.7.0' && echo yes)" "yes"
-+    HAVE_LIBCRYPTO := yes
-+	LIBCRYPTO_CFLAGS := $(shell pkg-config --cflags libcrypto) -DHAVE_LIBCRYPTO
-+	LIBCRYPTO_LIBS := $(shell pkg-config --libs libcrypto)
-+  endif
-+  else ifeq "$(shell pkg-config --exists 'libcrypto >= 1.1.0' && echo yes)" "yes"
-+    HAVE_LIBCRYPTO := yes
- 	LIBCRYPTO_CFLAGS := $(shell pkg-config --cflags libcrypto) -DHAVE_LIBCRYPTO
- 	LIBCRYPTO_LIBS := $(shell pkg-config --libs libcrypto)
-   endif
-+  endif
- 
-   HAVE_PTHREAD := yes
-   ifeq ($(HAVE_PTHREAD),yes)
diff --git a/app-text/mupdf/mupdf-1.14.0-r2.ebuild b/app-text/mupdf/mupdf-1.14.0-r2.ebuild
deleted file mode 100644
index 8e081a7e46aa..000000000000
--- a/app-text/mupdf/mupdf-1.14.0-r2.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic toolchain-funcs xdg
-
-DESCRIPTION="a lightweight PDF viewer and toolkit written in portable C"
-HOMEPAGE="https://mupdf.com/"
-SRC_URI="https://mupdf.com/downloads/archive/${P}-source.tar.xz"
-
-LICENSE="AGPL-3"
-SLOT="0/${PV}"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 s390 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="X curl +javascript libressl opengl +ssl static-libs +vanilla"
-
-RDEPEND="
-	>=dev-lang/mujs-1.0.4
-	media-libs/freetype:2=[static-libs?]
-	media-libs/harfbuzz:=[static-libs?]
-	media-libs/jbig2dec:=[static-libs?]
-	media-libs/libpng:0=[static-libs?]
-	>=media-libs/openjpeg-2.1:2=[static-libs?]
-	virtual/jpeg[static-libs?]
-	curl? ( net-misc/curl[static-libs?] )
-	opengl? ( >=media-libs/freeglut-3.0.0:= )
-	ssl? (
-		libressl? ( dev-libs/libressl:0=[static-libs?] )
-		!libressl? ( dev-libs/openssl:0=[static-libs?] )
-	)
-	X? (
-		x11-libs/libX11[static-libs?]
-		x11-libs/libXext[static-libs?]
-	)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-REQUIRED_USE="
-	opengl? ( !static-libs )
-	curl? ( X )"
-
-S=${WORKDIR}/${P}-source
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.14-CFLAGS.patch
-	"${FILESDIR}"/${PN}-1.14-Makefile.patch
-	"${FILESDIR}"/${PN}-1.10a-add-desktop-pc-xpm-files.patch
-	# See bug #662352
-	"${FILESDIR}"/${PN}-1.14-openssl-curl-x11.patch
-	# bug #672998
-	"${FILESDIR}"/${PN}-1.14-fix-big-endian.patch
-)
-
-src_prepare() {
-	xdg_src_prepare
-	use hppa && append-cflags -ffunction-sections
-
-	use javascript || \
-		sed -e '/* #define FZ_ENABLE_JS/ a\#define FZ_ENABLE_JS 0' \
-			-i include/mupdf/fitz/config.h
-
-	use vanilla || eapply \
-		"${FILESDIR}"/${PN}-1.3-zoom-2.patch
-
-	sed -e "1iOS = Linux" \
-		-e "1iCC = $(tc-getCC)" \
-		-e "1iLD = $(tc-getLD)" \
-		-e "1iAR = $(tc-getAR)" \
-		-e "1iverbose = yes" \
-		-e "1ibuild = debug" \
-		-e "1iprefix = ${ED}usr" \
-		-e "1ilibdir = ${ED}usr/$(get_libdir)" \
-		-e "1idocdir = ${ED}usr/share/doc/${PF}" \
-		-i Makerules || die
-}
-
-_emake() {
-	# When HAVE_OBJCOPY is yes, we end up with a lot of QA warnings.
-	emake \
-		GENTOO_PV=${PV} \
-		HAVE_GLUT=$(usex opengl yes no) \
-		WANT_CURL=$(usex curl) \
-		WANT_OPENSSL=$(usex ssl) \
-		WANT_X11=$(usex X) \
-		USE_SYSTEM_LIBS=yes \
-		USE_SYSTEM_MUJS=yes \
-		HAVE_OBJCOPY=no \
-		"$@"
-}
-
-src_compile() {
-	_emake XCFLAGS="-fpic"
-
-	use curl && _emake extra-apps
-
-	use static-libs && \
-		_emake build/debug/lib${PN}.a
-}
-
-src_install() {
-	if use X || use opengl ; then
-		domenu platform/debian/${PN}.desktop
-		doicon platform/debian/${PN}.xpm
-	else
-		rm docs/man/${PN}.1
-	fi
-
-	_emake install
-
-	dosym libmupdf.so.${PV} /usr/$(get_libdir)/lib${PN}.so
-
-	use static-libs && \
-		dolib.a build/debug/lib${PN}.a
-	if use opengl ; then
-		einfo "mupdf symlink points to mupdf-gl (bug 616654)"
-		dosym ${PN}-gl /usr/bin/${PN}
-	elif use X ; then
-		einfo "mupdf symlink points to mupdf-x11 (bug 616654)"
-		dosym ${PN}-x11 /usr/bin/${PN}
-	fi
-	use curl && dobin build/debug/${PN}-x11-curl
-	insinto /usr/$(get_libdir)/pkgconfig
-	doins platform/debian/${PN}.pc
-
-	dodoc README CHANGES CONTRIBUTORS
-}
diff --git a/app-text/openjade/Manifest b/app-text/openjade/Manifest
index b0f57964f33a..cbb6143ff199 100644
--- a/app-text/openjade/Manifest
+++ b/app-text/openjade/Manifest
@@ -11,4 +11,5 @@ AUX openjade-1.3.2-wchar_t-uint.patch 496 BLAKE2B 0576cdd89a5d9c187eba41f740662d
 AUX openjade-1.3.2.dsssl-catalog 269 BLAKE2B 1faaba3f7b351d312c3499005d9b3d71186b8e1cdd8f2144c8b91f384cf8e2e70763bbc929beba64be019b430ef8166d726688f4d1ddeaf5f9aa05b301fae60f SHA512 fba4332fb995c05ae9f9a83cea5422c11ae37ec99b4e37f40edf11acd5be011cff9c7d3b0fcfd0bf2f9569bbe991374678811301ca07a7ef033556309012e340
 DIST openjade-1.3.2.tar.gz 894834 BLAKE2B 972251c63d27f86fa3e1a0760e05213dbac440e7222c81c67dfa6a5c216922ef575705bb7a6093306d6aab771b8a9e1335fb0aaca4b893de5a4d792dc0b55da9 SHA512 c39f70ec8020bd7a2b3e125cbd146b49ddb57910a042bd212da02722617ed5681f32dab60acc26ab89ac658997c6f604911d7be3be391d6278267481f3bcf2f1
 EBUILD openjade-1.3.2-r8.ebuild 3707 BLAKE2B 2330414eb9f418cec64dd1bcc2775fc63ebac0ff2404f611d08563bfebc615bb4002bd3740f86aba08aa5da62fb12a4cc24c2d50904ad1516f67fec11382a4fc SHA512 0e532bdabd29029898127229238b1404a57a0e3fc6b747c424c8bfbfe0bbf2e1c53633a839ade8452b8c705873b6fa261ed3b3c9093e42839c81dbb8c7147d3f
-MISC metadata.xml 245 BLAKE2B f01e184cc74cf4d5924bc0d9eaf955adf9797f656ddc41a13443a9c2dbf158ee403dc6f0f39970aa736d87111017b593c93750542a2f2ad539d1a644c96f664e SHA512 5d2a537b74c248094a700b0eeed29425d8d62c36ae30fca3ea8381daf41f74284333344775a108ff374b94b9f334516aa41892a983c825efa855b35a0f110c40
+EBUILD openjade-1.3.2-r9.ebuild 4311 BLAKE2B dd023c69bd4d5c5650e30c3073563618f10f810ec093b727d71c63f167ddd616740fa6ca6187b15f1a6b33de9790598b72354770d45e43c77823024c6490981d SHA512 0a9ad74203fe2d184f7d4d32cc6823298528947ef5c5294839b0729b3a471787c4224337eea2c91da68e317b5d40020751fec642a1908a35b47a2999c27dcf61
+MISC metadata.xml 325 BLAKE2B 3cecdaaecd44faf19571367fbe80cb75e687e6231c26c696cc9e7412aae427b95a4967cad7415b9df5e499bdb74c6b6fed54edc52470ff207cbba43e423ae223 SHA512 4e1e28e8c1722c9bcbbc2a8487ad373eff6679f51a5213850e11ce2d7d569afbaa093d215965e4fc010a9fa3e80121949a3db9fb98bfaf8ab70eafead9e14657
diff --git a/app-text/openjade/metadata.xml b/app-text/openjade/metadata.xml
index a4a5fdce9de1..1a3a16228acc 100644
--- a/app-text/openjade/metadata.xml
+++ b/app-text/openjade/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>mgorny@gentoo.org</email>
+		<name>Michał Górny</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">openjade</remote-id>
 	</upstream>
diff --git a/app-text/openjade/openjade-1.3.2-r9.ebuild b/app-text/openjade/openjade-1.3.2-r9.ebuild
new file mode 100644
index 000000000000..2d63798c3d74
--- /dev/null
+++ b/app-text/openjade/openjade-1.3.2-r9.ebuild
@@ -0,0 +1,153 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools flag-o-matic sgml-catalog-r1 toolchain-funcs
+
+DESCRIPTION="Jade is an implementation of DSSSL for formatting SGML and XML documents"
+HOMEPAGE="http://openjade.sourceforge.net"
+SRC_URI="https://downloads.sourceforge.net/project/${PN}/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+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
+}
+
+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
+	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} \
+		--disable-static
+}
+
+src_compile() {
+	unset INCLUDE #412725
+	emake -j1 SHELL="${BASH}"
+}
+
+src_install() {
+	#dodir /usr/$(get_libdir)
+
+	make DESTDIR="${D}" \
+		SHELL="${BASH}" \
+		libdir="${EPREFIX}"/usr/$(get_libdir) \
+		install install-man
+
+	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
+
+	newins - catalog <<-EOF
+		SYSTEM "builtins.dsl" "builtins.dsl"
+	EOF
+	doins -r pubtext
+	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 /etc/sgml
+	newins - "${P}.cat" <<-EOF
+		CATALOG "${EPREFIX}/usr/share/sgml/openjade-${PV}/catalog"
+		CATALOG "${EPREFIX}/usr/share/sgml/openjade-${PV}/dsssl/catalog"
+	EOF
+
+	local HTML_DOCS=( doc/*.htm )
+	einstalldocs
+	dodoc -r jadedoc
+}
+
+pkg_preinst() {
+	# work-around old revision removing it
+	cp "${ED}"/etc/sgml/${P}.cat "${T}" || die
+}
+
+pkg_postinst() {
+	if [[ ! -f ${EROOT}/etc/sgml/${P}.cat ]]; then
+		cp "${T}"/${P}.cat "${EROOT}"/etc/sgml/ || die
+	fi
+	# this one's shared with docbook-dsssl, so we need to do it in postinst
+	if ! grep -q -s ${P}.cat \
+			"${EROOT}"/etc/sgml/sgml-docbook.cat; then
+		ebegin "Adding ${P}.cat to /etc/sgml/sgml-docbook.cat"
+		cat >> "${EROOT}"/etc/sgml/sgml-docbook.cat <<-EOF
+			CATALOG "${EPREFIX}/etc/sgml/${P}.cat"
+		EOF
+		eend
+	fi
+	sgml-catalog-r1_pkg_postinst
+}
+
+pkg_postrm() {
+	if [[ -z ${REPLACED_BY_VERSION} ]]; then
+		ebegin "Removing ${P}.cat from /etc/sgml/sgml-docbook.cat"
+		sed -i -e '/${P}/d' \
+			"${EROOT}"/etc/sgml/sgml-docbook.cat
+		eend
+		if [[ ! -s ${EROOT}/etc/sgml/sgml-docbook.cat ]]; then
+			rm -f "${EROOT}"/etc/sgml/sgml-docbook.cat
+		fi
+	fi
+	sgml-catalog-r1_pkg_postrm
+}
diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index 754f98b73367..d67c0c1a9d49 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -8,4 +8,4 @@ DIST poppler-0.80.0.tar.xz 1548908 BLAKE2B 09a3b10b1ee6a9de900f7a6ca105e98ec2669
 EBUILD poppler-0.79.0-r1.ebuild 3518 BLAKE2B b1788df48fbc4300fc64ba2ab94bec0f1fd6fcce577ed5180fe2508043834c1894fef44096bb5d30697df5215999ec871798df1d7e936a82f604bbfe46fedece SHA512 9e04527cbacec01d734b737f9ebaa729300c987198a53c69079c198d9ace244f81eb1b6e516ad81e8afaca1ff6d44d8de3df92afc22a684fc6f389de37e5f0de
 EBUILD poppler-0.80.0.ebuild 3506 BLAKE2B ba82b892b343c3acf9029f0cdfe8f6fafa5b25f896a802b214373082295282e577f19ed3eea5a0e55d9fb23cb1a36b09e91b84d9b4e3cb65008858a34c9bec9b SHA512 bdc23a2cd987ae8f0fee3d80931b7f7e9c0a705acb58ea5eadc16c7ebf1276b9b0880130743b4c6e29b8b0acf7c442183a41a45fd626ff8830d9af7c5df5bd48
 EBUILD poppler-9999.ebuild 3506 BLAKE2B ba82b892b343c3acf9029f0cdfe8f6fafa5b25f896a802b214373082295282e577f19ed3eea5a0e55d9fb23cb1a36b09e91b84d9b4e3cb65008858a34c9bec9b SHA512 bdc23a2cd987ae8f0fee3d80931b7f7e9c0a705acb58ea5eadc16c7ebf1276b9b0880130743b4c6e29b8b0acf7c442183a41a45fd626ff8830d9af7c5df5bd48
-MISC metadata.xml 910 BLAKE2B 163a59e6d3a7b5cb610928d57a4a0db99a5ce9277bbdcb74e7589cb0f6276d0d8d9cec0c9ca53f1e1c1f6ea2eb539c05c6cec8a701c710d08d5105c73a526f16 SHA512 a6c4a161d32c008cc5a439e48d18dcf7a6d0501106652bbc33ae1735e986c91dad759660bc8408f047ed0f13b15a66d2068a5dcaa30f4620ede01973c1048bfa
+MISC metadata.xml 995 BLAKE2B 41ffeea7d766a1d5c86020673522c94ebb243b75e21b761f8c202bea7789464d2e3097a74f6ff6ee42f41ce34221ed378b6fcd6912f472249aa9e5ff01721346 SHA512 9d9134ae26b37d2d3a1859cc4d8c67a02257f7cfa33c5863260f8ec8afcde28f7430fcec557e6a5cb1c9d03cb0b5c116c074ba4034f94fa0ece4e957f718d319
diff --git a/app-text/poppler/metadata.xml b/app-text/poppler/metadata.xml
index 3f8d6be9f980..e88e31fc283b 100644
--- a/app-text/poppler/metadata.xml
+++ b/app-text/poppler/metadata.xml
@@ -17,6 +17,9 @@
 	<email>office@gentoo.org</email>
 	<description>Please CC on stabilisation bugs</description>
 </maintainer>
+<upstream>
+	<remote-id type="cpe">cpe:/a:freedesktop:poppler</remote-id>
+</upstream>
 <use>
 	<flag name="nss">Enable signatures handling with <pkg>dev-libs/nss</pkg></flag>
 	<flag name="utils">Install command-line PDF converters and various utilities.</flag>
diff --git a/app-text/qpdf/Manifest b/app-text/qpdf/Manifest
index b9948d7a1561..20c22236c53f 100644
--- a/app-text/qpdf/Manifest
+++ b/app-text/qpdf/Manifest
@@ -10,4 +10,4 @@ EBUILD qpdf-8.2.1.ebuild 1268 BLAKE2B c62c4bdf99ebd71593689e7918d57cba7031d2c0d4
 EBUILD qpdf-8.4.1.ebuild 1277 BLAKE2B a7a4b94e2fe88c4a4a10e82bcb85673b1425b56c76347e21101a0f0e94f92c4e7304d110ab003b731a8315b618dd35c071e102f486b726f30899d6081807bab6 SHA512 771c029e75a25d1d7c2ea14f9bbc364051a9419f513e070f7ba548b675d1e11dd4198d6dbd853de88b603d3183af8c65ced0c33498dd2df11c43be1229feb529
 EBUILD qpdf-8.4.2.ebuild 1278 BLAKE2B e32c28130f8b8e90cb022fcf78fbbd4f07b94455557f41b74c6645113d89ac2f33ff7c277d89e5dc16bd3b5e0b2502aa35f99c5e74804a3422a5e9c8848aa8f9 SHA512 c589c5ca6d96c9e5b48c62e5f1bac9ca26025c6a97925443805c64d51f0267a8b05497531fe55f2c352eae14f0349bffbe275fc79cd7ee672b5e54db7776ef5a
 EBUILD qpdf-9.0.0.ebuild 1278 BLAKE2B 8ea12d44646d8c4835b4576c118708b15ba31e3d8296aa94ba6c3421a0e7e4c063dd597d1758f242a5e6ed9677b02089eacfac454d728d75f2ad8c2f97cb9b2e SHA512 377db56c3e509884111642b0f379a4c3d965caa50db1b242173c63970d716376931440145c6e992da3f6277ee98bf6032aa1efadfd402f47a32502f9663b1b3b
-MISC metadata.xml 438 BLAKE2B ccb3c4e7dace8650c11418fecc8c5fdd7062692f83c99f60d3b73fd698f1fea19dd429a92014267388d04ea57e00652499768c88aaffd7e0e3f66e53c84f6449 SHA512 4c1aa514207b18e7b4de0585545d1c7b5def7f42be9d43726801f9a9ae7b129b91802dedf4e3eb9f2595a26e3863918c029b927ab42b6aab7ab0130c000ff843
+MISC metadata.xml 499 BLAKE2B 9f6462a9606763352f0c823f877d1a39ffa207a8354e800d64bdb4d7686de8391309e08296adf23ca6b6e5d6fc2150d72ca9b0fed36cd4574e51ae6d04e48341 SHA512 77915adba55eb2b0fa68af06fa30b84c50af0a4a26a3ee6fafa71f9c7a7a307451ab76291dfc87f90479f6a208cb29c8a6c8c7fd0d574455faa15c87f8ea8de7
diff --git a/app-text/qpdf/metadata.xml b/app-text/qpdf/metadata.xml
index ce823e597ac8..fda6f880d912 100644
--- a/app-text/qpdf/metadata.xml
+++ b/app-text/qpdf/metadata.xml
@@ -9,6 +9,7 @@
 		<flag name="perl">Install fix-qdf tool (for reverting PDF edits) written in perl</flag>
 	</use>
 	<upstream>
+		<remote-id type="cpe">cpe:/a:qpdf_project:qpdf</remote-id>
 		<remote-id type="sourceforge">qpdf</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/app-text/sgml-common/Manifest b/app-text/sgml-common/Manifest
index 4c9f48bd3af3..d9010c9638a3 100644
--- a/app-text/sgml-common/Manifest
+++ b/app-text/sgml-common/Manifest
@@ -2,4 +2,5 @@ AUX sgml-common-0.6.3-install-catalog.in 5064 BLAKE2B 2400dd32a80a64c89ded54d898
 AUX sgml-common-0.6.3-prefix.patch 664 BLAKE2B 5b82b66824547c0cbae10f12c94eaccaa0789c1ff68a20c3ace00cc1620dc0e2d7c81cf906db8fac82104b9d1c5ea29af42746b200f1c1a5a9e9728052f5859c SHA512 62758c7ccb4e86e91292757546e6a1f932cf8282abfc2d9ccfe2e68008bbcc995d0a4eeac3f0c8584c4dfae552a42000b438defe38dc911b770a9e8e72b310ef
 DIST sgml-common-0.6.3-gentoo.tar.gz 128903 BLAKE2B 3b374179fe85cf6f098649d2014f9d34349ddccd17ae0ac4c5502414507601c545eaf27f7c76fafd63c36041068205d3b82309a204989f3b106c04c7adf14875 SHA512 c8de573d707ccf524407c9be9a6e7740341eb88ecb6bee69d6d11a2658ef74e6acfb7495afa33c9983ab015c3c925aac98278a4e01ee217892a9fb99e60798ce
 EBUILD sgml-common-0.6.3-r6.ebuild 2474 BLAKE2B 0150bb9a950459ddccf7b4959a9e96aa570a32c0aff6badec54fce4f8a4aa2a3bfbf8ae667d39830dc9fc17bcbfb41366eb0a76e6eb7e231922d7667e1d2569b SHA512 2fb7a94b16c1c7b582f968c2f3916f1d1193811c5bce9541ed110daa87c3bf9228db5da7531da4d473ba9d28e4253a92fb44c98a58bb84be4c42e8660b4e1ead
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
+EBUILD sgml-common-0.6.3-r7.ebuild 2581 BLAKE2B 91a3c0829b37d952c3dce415234e5b7e8efdbdcb268559e33d058024671ef54020a1873dad6a912cf5f1d55b6199ce65c15c95d2bf51368e8bea2ca83990929d SHA512 ee74b80fc9aee9925da1a56ae3c315f4c0b5fe438a1233a049272bbe1cbff4767e8a3febf7a8ea3a9008c5d1e038ca96bf544ae7f7c8cdbc7611cb34d30ea9d5
+MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/app-text/sgml-common/metadata.xml b/app-text/sgml-common/metadata.xml
index 6f49eba8f496..0319eec4c8be 100644
--- a/app-text/sgml-common/metadata.xml
+++ b/app-text/sgml-common/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>mgorny@gentoo.org</email>
+		<name>Michał Górny</name>
+	</maintainer>
 </pkgmetadata>
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
new file mode 100644
index 000000000000..a9d675c8206a
--- /dev/null
+++ b/app-text/sgml-common/sgml-common-0.6.3-r7.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit prefix sgml-catalog-r1
+
+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"
+
+# install-catalog is GPL
+LICENSE="FDL-1.1+ GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+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
+}
+
+src_install() {
+	default
+
+	# own /etc/sgml/catalog
+	insinto /etc/sgml
+	newins - catalog <<<''
+	newins - sgml-ent.cat <<-EOF
+		CATALOG "${EPREFIX}/usr/share/sgml/sgml-iso-entities-8879.1986/catalog"
+	EOF
+	newins - sgml-docbook.cat <<-EOF
+		CATALOG "${EPREFIX}/etc/sgml/sgml-ent.cat"
+	EOF
+}
+
+pkg_preinst() {
+	# preserve old files
+	local f
+	for f in /etc/sgml/{catalog,sgml-docbook.cat}; do
+		if [[ -s ${EROOT}${f} ]]; then
+			cp "${EROOT}${f}" "${ED}${f}" || die
+		fi
+	done
+
+	# and back them up in case postrm killed them
+	for f in sgml-ent.cat sgml-docbook.cat; do
+		cp "${ED}/etc/sgml/${f}" "${T}" || die
+	done
+}
+
+pkg_postinst() {
+	# restore backed up files if necessary
+	for f in sgml-ent.cat sgml-docbook.cat; do
+		if [[ ! -s ${EROOT}/etc/sgml/${f} ]]; then
+			cp "${T}/${f}" "${EROOT}"/etc/sgml/ || die
+		fi
+	done
+
+	# re-append sgml-ent.cat if necessary
+	if ! grep -q -s sgml-ent.cat "${EROOT}/etc/sgml/sgml-docbook.cat"; then
+		ebegin "Adding sgml-ent.cat to /etc/sgml/sgml-docbook.cat"
+		cat >> "${EROOT}/etc/sgml/sgml-docbook.cat" <<-EOF
+			CATALOG "${EPREFIX}/etc/sgml/sgml-ent.cat"
+		EOF
+		eend
+	fi
+
+	sgml-catalog-r1_pkg_postinst
+}
+
+pkg_postrm() {
+	if [[ -z ${REPLACED_BY_VERSION} ]]; then
+		ebegin "Removing sgml-ent.cat from /etc/sgml/sgml-docbook.cat"
+		sed -i -e '/sgml-ent\.cat/d' \
+			"${EROOT}"/etc/sgml/sgml-docbook.cat
+		eend
+		if [[ ! -s ${EROOT}/etc/sgml/sgml-docbook.cat ]]; then
+			rm -f "${EROOT}"/etc/sgml/sgml-docbook.cat
+		fi
+	fi
+
+	sgml-catalog-r1_pkg_postrm
+}
diff --git a/app-text/sgmltools-lite/Manifest b/app-text/sgmltools-lite/Manifest
index f82107d6af3d..4bade9984277 100644
--- a/app-text/sgmltools-lite/Manifest
+++ b/app-text/sgmltools-lite/Manifest
@@ -1,4 +1,5 @@
 DIST nw-eps-icons-0.0.1.tar.gz 8733 BLAKE2B 467fa3f341c1d6ea20af059cfa88529a0b3bc729cefac72d5b3c264d3a224e8bfb05a89b5f491a22aaf4c194b72cd27ac103a381adb671d9867ef8fceb41f030 SHA512 597062e9882bb9bb73144bbdb056c3ccc2a6d99efc7da836f483ccd6f3799705bcbb897099cb1a580c8e22d936d281d95c3a875694f8e15b6989faf437f6cc7a
 DIST sgmltools-lite-3.0.3.tar.gz 61342 BLAKE2B 8fcac5b48fcdbb8fbbfdbf8ad055ab00cb3fb6a8447a27bf5b14faef968845554a86f04b4984c1ccc1e26d9c64dc5654d5831896bbc44bd3dee0ef3fc28109e5 SHA512 36709ba726859b734a7402c533ba7d2abc0546007bc97dba76ac824bc42f6f8ac7ef263b3740d0be51749cbc0982d010ba938646fca2006fa2c5094a296b3c81
 EBUILD sgmltools-lite-3.0.3-r14.ebuild 2205 BLAKE2B 030bdf9b6258b0768b3098c17d4cc820110cfff79ce9a2d6becf6d1c28c18977d2cbceb083cec512cb64380bd5cf8ef012a773357d328a08f4cef607229fd237 SHA512 f1cf3035547d1626ace249218a75399e7ad9374f60de3203003393418324628dce27f28cd608f4a4c310306d36043a6856db273307c8ec5a9a3642307e1cb351
-MISC metadata.xml 413 BLAKE2B b4a1d8afb18583b1b8a16bcfb3f29f547a233ba6742ec4998a101f0e97344554f7e404f51673a646f9200bbda586df213dc33fd21fa3120f4fc4394c9174bcb2 SHA512 e5b3ccaf5308d1509e4921035d83396d3357e4845798689ff03fbe4898d7b02da344e5ab21847d84c99f40371ab4c9ac04b57d7d060fc62c59a800e22e71611a
+EBUILD sgmltools-lite-3.0.3-r15.ebuild 2506 BLAKE2B 79ed87b6b2f2cb3c9e0ed72289d174916521969e5b35dc95b9cc75a1567ec440d759e87dc155fe773c07e322192f974dfeb9e6b984adce86fdadd8c75d56d245 SHA512 403ea71788c32b9865a9b0b77dfe52181c968f80eb5c0946eb1810e65577caccfb0df5958beda9add0ebe30976dcfa33f1b8d30ba44338d2bfd5560473e2e3e3
+MISC metadata.xml 493 BLAKE2B 36e972b80b557e131d5decb41945968ce24de810197ea457e50081017e50e3926baa419082222cbdfb494a55e9bae125bf304a431234efb4c4a67a8c3536852a SHA512 9f2e53faa5f07d791f7c4cfa7972ed42a26d1abfa5c11faf3e36dce18c2c30d086462e9c0a2c7664153333cb10c3923d47b4bb9e873b7e48dd144e667719a14e
diff --git a/app-text/sgmltools-lite/metadata.xml b/app-text/sgmltools-lite/metadata.xml
index 465570abcce8..dae13712da5b 100644
--- a/app-text/sgmltools-lite/metadata.xml
+++ b/app-text/sgmltools-lite/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>mgorny@gentoo.org</email>
+		<name>Michał Górny</name>
+	</maintainer>
 	<use>
 		<flag name="jadetex">
 			Add support for <pkg>app-text/jadetex</pkg> (for processing
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
new file mode 100644
index 000000000000..b8d8da45abc7
--- /dev/null
+++ b/app-text/sgmltools-lite/sgmltools-lite-3.0.3-r15.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-single-r1 sgml-catalog-r1
+
+DESCRIPTION="Python interface to SGML software in a DocBook/OpenJade env"
+HOMEPAGE="http://sgmltools-lite.sourceforge.net/"
+SRC_URI="
+	https://downloads.sourceforge.net/project/${PN}/${PN}/${PV}/${P}.tar.gz
+	https://downloads.sourceforge.net/project/${PN}/support%20files/0.0.1-1/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}
+
+src_configure() {
+	econf \
+		--datadir='${prefix}/share' \
+		--mandir='${prefix}/share/man'
+}
+
+src_install() {
+	# yes, it does not respect DESTDIR
+	emake install \
+		prefix="${ED}/usr" \
+		etcdir="${ED}/etc/sgml"
+
+	dodoc ChangeLog POSTINSTALL README*
+
+	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 "${ED}"/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
+	local b
+	for b in "${backends[@]}"; do
+		newbin - "sgml2${b}" <<-EOF
+			#!/bin/sh
+			exec sgmltools --backend=${b} "\${@}"
+		EOF
+
+		dosym sgmltools-lite.1 "/usr/share/man/man1/sgml2${b}.1"
+	done
+
+	insinto /etc/sgml
+	newins - sgml-lite.cat <<-EOF
+		CATALOG "${EPREFIX}/usr/share/sgml/stylesheets/sgmltools/sgmltools.cat"
+	EOF
+
+	python_fix_shebang "${D}"
+	python_optimize "${ED}/usr/share/sgml/misc/sgmltools/python"
+}
+
+pkg_preinst() {
+	# work-around old revision removing it
+	cp "${ED}"/etc/sgml/sgml-lite.cat "${T}" || die
+}
+
+pkg_postinst() {
+	if [[ ! -f ${EROOT}/etc/sgml/sgml-lite.cat ]]; then
+		cp "${T}"/sgml-lite.cat "${EROOT}"/etc/sgml/ || die
+	fi
+	sgml-catalog-r1_pkg_postinst
+}
diff --git a/app-text/xhtml1/Manifest b/app-text/xhtml1/Manifest
index a5adf084a9e3..1d5484ccd22f 100644
--- a/app-text/xhtml1/Manifest
+++ b/app-text/xhtml1/Manifest
@@ -1,4 +1,5 @@
 AUX xhtml1-catalog.patch 834 BLAKE2B 47236e18d55237bbfb6299b634253545299dd9649a58d42af6fc8e56afbb8547564dc17bbefb808b96aea739d7ba673403ab2f3c96b5eddceb7f886353320b51 SHA512 0b4fdb64e73405be53930984e5f628a1b5b48e6d43bebef9f9c502fca31d13b760385c0481030f8a09556447891a542dc4c7bb23f0618fd937e2934936b26780
 DIST xhtml1-20020801.tgz 232192 BLAKE2B 4e2da9b73da93a8196ade80549a2e255b1954178472fddaf2e3d979befda8689f3540a65d41723e40bd0450d626608ffcdcd1fa9183da5e3b13d90a5649fdc23 SHA512 184758381c5e2d36b80fa1e4470e864777383ff7539b48291036f8a3f1dba0b354a32142bfcc9071147fb20bcd4c0d4d541e09e865047938ab4cf9ae5a806412
 EBUILD xhtml1-20020801-r5.ebuild 2174 BLAKE2B 2029974397a6deb6848f5310a0c3078e70219c204406d1ef115241cf22f870f10ce8c18a965b035cdead98db36e4f0833053a67c765d1e538cdad172abada25b SHA512 57294051e859fd17a6942d180026f3d8e74c84e5ddfcf012e1f04f1870a867d908c4b7343b1a99c5a1d52844e86bc4a5754e6488e8ce45973d25e578b0d4a478
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
+EBUILD xhtml1-20020801-r6.ebuild 2332 BLAKE2B 702b13ee18e2549625e0651139b59bd5be8c8b73a980847fba8ce1523b9bdb65993e0bafc4a410048386b652ac65704aa9dfc042427b429c03fa2de13dee19fc SHA512 6ca481cc0f985c80a872fd031c2e982e776ee8b1ef96d3a5fe2fbfa1ee37d236102a6244be85b8b786e407e9b5a8a065405a1638027fffc131b1aac01dc8dd19
+MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/app-text/xhtml1/metadata.xml b/app-text/xhtml1/metadata.xml
index 6f49eba8f496..0319eec4c8be 100644
--- a/app-text/xhtml1/metadata.xml
+++ b/app-text/xhtml1/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>mgorny@gentoo.org</email>
+		<name>Michał Górny</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-text/xhtml1/xhtml1-20020801-r6.ebuild b/app-text/xhtml1/xhtml1-20020801-r6.ebuild
new file mode 100644
index 000000000000..306fefc150cb
--- /dev/null
+++ b/app-text/xhtml1/xhtml1-20020801-r6.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit sgml-catalog-r1
+
+DESCRIPTION="DTDs for the eXtensible HyperText Markup Language 1.0"
+HOMEPAGE="http://www.w3.org/TR/xhtml1/"
+SRC_URI="mirror://gentoo/xhtml1.tgz -> ${P}.tgz"
+
+LICENSE="W3C"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE=""
+
+DEPEND="app-text/sgml-common
+	dev-libs/libxml2"
+
+PATCHES=( "${FILESDIR}"/${PN}-catalog.patch )
+
+xml_catalog_setup() {
+	CATALOG="${EROOT}/etc/xml/catalog"
+	XMLTOOL="${BROOT}/usr/bin/xmlcatalog"
+	DTDDIR="${EROOT}/usr/share/sgml/${PN}"
+
+	[[ -x ${XMLTOOL} ]]
+}
+
+src_install() {
+	insinto /usr/share/sgml/${PN}
+	doins DTD/xhtml.soc DTD/*.dcl DTD/*.dtd DTD/*.ent
+
+	insinto /etc/sgml
+	newins - xhtml1.cat <<-EOF
+		CATALOG "${EPREFIX}/usr/share/sgml/xhtml1/xhtml.soc"
+	EOF
+
+	dodoc *.pdf *.ps
+	docinto html
+	dodoc *.html *.png *.css
+}
+
+pkg_preinst() {
+	# work-around old revision removing it
+	cp "${ED}"/etc/sgml/xhtml1.cat "${T}" || die
+}
+
+pkg_postinst() {
+	if [[ ! -f ${EROOT}/etc/sgml/xhtml1.cat ]]; then
+		cp "${T}"/xhtml1.cat "${EROOT}"/etc/sgml/ || die
+	fi
+	sgml-catalog-r1_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-r1_pkg_postrm
+
+	[[ -n ${REPLACED_BY_VERSION} ]] && return
+	xml_catalog_setup || return
+	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/xmldiff/Manifest b/app-text/xmldiff/Manifest
index 02b1b947a6a5..aaba4e0d88f6 100644
--- a/app-text/xmldiff/Manifest
+++ b/app-text/xmldiff/Manifest
@@ -1,5 +1,3 @@
-DIST xmldiff-0.6.10.tar.gz 45827 BLAKE2B f4b97d4fa7063f1edb66ab1bd465dc81cd66f35233dcd3d8ae2cc1f13e9e841645ddf8848dcd3bafc45d44da218c8260b36f5210883f3963572b375173e6d687 SHA512 b183a6e94258c4d693fa97e759868dae2dca6088e3cf12cf08b40e82d18a375f02b12d62d0cfc03fb74a5138f32f6614f555b95a3062ba768d1cdaf3391cc95b
 DIST xmldiff-1.1.1.tar.gz 36429 BLAKE2B 2d84a1552851b0964ac837a30c61a99a3360292020251aa06ed71723e89b6a8f89a79107c69a317b16d810ee74241d38837d382b0dcb134b43f72f58ee2b6ea2 SHA512 cf65bdd827b76781b693089b8742f6358931456c4fdfd0f4b2a9e13b30101b48379ea9c2bf3dcb32d6d22198769262f2603172ffa877bec2ddfa5fabfdf74326
-EBUILD xmldiff-0.6.10-r2.ebuild 522 BLAKE2B 6d012cfec8f200441be4e5e27e9cbd4ca927843b46a5b8d24108440663d619c36b1f4bf11f256bd7c8478e88a9b01805d12c112cbba2a82fb96887aec40d9265 SHA512 b16ceed0a37b133b1f61b9e47529bd61469bc933ad99218f5d3a345baa6bfb2d4908754bcce5691be68085ace23f3049bc1ae12b855073f33bddce20620fc879
 EBUILD xmldiff-1.1.1.ebuild 631 BLAKE2B 9462cbfb0eb42b9b9afff994bc9b87ed32f7e23c054ae5ae554db138e2df9bdb1064d68857fa2c3908e696cf16eb14bae6aaa777ff2c2df093046af787c5180b SHA512 38f6c5ff6aaad0c787af614ba2a2f5c1171aed47b38f32c4e998c85c90aaca3d9250bd404c088bb16a08696e7337e147aff32d87f36b5234e591e3a6c12dd789
 MISC metadata.xml 578 BLAKE2B ae500988e52962a46d0c79c948a163f7d3414c230d14ae344d33b09979085cf400ec38e911fe54f71da6035f40a795cdb9b70ed2c3299b9e37d0e6e3a77fcb7d SHA512 09529a22484d9b660b11b70137cf7e113ee07af4de0c58247d9f6dd7c9e85e222111b209b71dcdb342e734897fa0243b5f9a83688fdbd649584fa226a36acefb
diff --git a/app-text/xmldiff/xmldiff-0.6.10-r2.ebuild b/app-text/xmldiff/xmldiff-0.6.10-r2.ebuild
deleted file mode 100644
index 7f33b19bd77d..000000000000
--- a/app-text/xmldiff/xmldiff-0.6.10-r2.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="A tool that figures out the differences between two similar XML files"
-HOMEPAGE="https://github.com/Shoobx/xmldiff https://www.logilab.org/project/xmldiff"
-SRC_URI="ftp://ftp.logilab.fr/pub/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc sparc x86 ~x86-linux"
-IUSE=""
-
-DOCS=( ChangeLog README README.xmlrev TODO )
diff --git a/app-text/zathura-pdf-mupdf/Manifest b/app-text/zathura-pdf-mupdf/Manifest
index 24f6df0ac2c1..dbb22b4f132f 100644
--- a/app-text/zathura-pdf-mupdf/Manifest
+++ b/app-text/zathura-pdf-mupdf/Manifest
@@ -2,5 +2,5 @@ DIST zathura-pdf-mupdf-0.3.4.tar.xz 8092 BLAKE2B 5e47a9db7fede440c10f8270e02430d
 DIST zathura-pdf-mupdf-0.3.5.tar.gz 8901 BLAKE2B 63595d6a4b305d8cd09eced1cfa3840a5ab3d37a61c42738603691621f1f1dbdfc31d5963b14c7af32f8c504f2470bf1cadb708fefbfd49fb25b2848b2564153 SHA512 1f7a748fee74296a008cef42c8f2e443409c77e16caa8441f74136260aaac7dee4d3c03e8a88532c45a0f9972e1b4965d4cffd488a00123d4d8cee9bcec2cf30
 EBUILD zathura-pdf-mupdf-0.3.4.ebuild 793 BLAKE2B 480774b820e6390885f0a6901fde83b5c7ee777d4921bd4e6a105e325743222c4c8793879249734e33ab2ddb6170056105454e52ed6d358870c7a1f24778d166 SHA512 f0e9fe25289a90e838062f37522255ee6256b04a0deaadc9357f996eb7b8d735903bbec10421c4e985461d4454e697004806a83c756568adca76c54a7ccbdfb4
 EBUILD zathura-pdf-mupdf-0.3.5.ebuild 809 BLAKE2B 848d3a8bd80d7b253fa42f2fa352946cc4f6d6a3da0568f230ee504c6c46c58470fb228e75142313769ddf86cbeadd674a978d70e56b713aadc9f4aa7873c9dd SHA512 b928e7582cd71e4135bc0967f3eea887e9657b41baf83c5b0995580fbac13ef4bc12583029e346b99a15b9a6de99733232f67954033cc6326c1562af9ca92766
-EBUILD zathura-pdf-mupdf-9999.ebuild 796 BLAKE2B 623e1c0f435e95826791a71c3ce66c4448ff8c47f9e13dae411d86e8c78b4e6cc630333263eb9b2fc94bb41f6d86fcb871da340fc78509e894fa13613785d934 SHA512 54e52e1405959ee3fdf0ac819dcc1941a370369291c9b480256fc2b404a16f2c839d1f29110cc2e7728de148423bf372c33c2aae413fb3d658a74777bb577fe2
+EBUILD zathura-pdf-mupdf-9999.ebuild 809 BLAKE2B 848d3a8bd80d7b253fa42f2fa352946cc4f6d6a3da0568f230ee504c6c46c58470fb228e75142313769ddf86cbeadd674a978d70e56b713aadc9f4aa7873c9dd SHA512 b928e7582cd71e4135bc0967f3eea887e9657b41baf83c5b0995580fbac13ef4bc12583029e346b99a15b9a6de99733232f67954033cc6326c1562af9ca92766
 MISC metadata.xml 672 BLAKE2B 539ab88c5ef3fe3ad7ca25d9856bcf6a7755e09c479631c1cbdd835aeb398d2f6052af0980afc35771312397b6858fca2271f5aa8ee64fa8a57130f05b7594ee SHA512 288bfcdc265543b1d5d364af4fe0c6dbdeec0f30019b683ef0bf32619d87ada509cce47c141aac08cf0942f7ad74d1a453e6b5303175ea591e2f661ba044882a
diff --git a/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-9999.ebuild b/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-9999.ebuild
index 07030bc38d87..a8c73f86302b 100644
--- a/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-9999.ebuild
+++ b/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_BRANCH="develop"
 else
 	KEYWORDS="~amd64 ~arm ~x86"
-	SRC_URI="https://pwmt.org/projects/zathura-pdf-mupdf/download/${P}.tar.xz"
+	SRC_URI="https://github.com/pwmt/zathura-pdf-mupdf/archive/${PV}.tar.gz -> ${P}.tar.gz"
 fi
 
 DESCRIPTION="PDF plug-in for zathura"
diff --git a/app-text/zathura/Manifest b/app-text/zathura/Manifest
index 77c815011db6..214c0f474333 100644
--- a/app-text/zathura/Manifest
+++ b/app-text/zathura/Manifest
@@ -1,4 +1,6 @@
 DIST zathura-0.4.3.tar.xz 145796 BLAKE2B fe360d6ea2a11138324784beec8e8ebe0eaa83e4e682785a50265bbd0a77be0dcab4cd523923462398faaf918a4d304de148d64972dc9b6cb96578476e0ae6eb SHA512 427948025c20b2badb00921d03ec83e26806fd90d0d50cdcf0f3bcf645cd7206695faa3b5a7698d3d70b9bd60e8e68c920cf1e7f29855dd11a1a8ce6a7f8160b
+DIST zathura-0.4.4.tar.gz 194105 BLAKE2B dc99005c6e967a46af0db0001193d1b1551e9adb78acc88343096407ed4a61b889be600acaf83b45bd603e3b7c4b93402f619e06e7146089d4990309d3301d5f SHA512 8d1e5969cc2f9502d7d966d3341c8f7437422f2dcf952bc2567a5061e611c6fe90c2bc6670963d81b608aa621d70f77ec513d6ab9f03304894bd9ac648aaa6e7
 EBUILD zathura-0.4.3.ebuild 1333 BLAKE2B ad5146cdea9826b8d22bf95d47dc0dcfc02989ae7acd5c085cdbccb61a3b69fe2eb3aa7a44866efe71387da6d63490f37f4d19f01a4a0cdffdd680a52cd60e02 SHA512 cca06811020ead3fbc6d56aa54f1d6e5b73ab03874c5a59c885db015aeb8a9841f6f3d43562bcd0dc3a305d1faec8b7f4473f16ff7107740fc02b330869390fd
-EBUILD zathura-9999.ebuild 1374 BLAKE2B b1935313606001d9dac20406d05fde7fe1720afd0380885577fbf4ae88e78e989226f01651f59279fe863c67b552f0e4b9e6b8dcc00dbbee2b06e80622e8acc7 SHA512 a904dacf3ac21794e27aa8ebc84c2faf7cfbecde519a52936a91ec7d0d317552fd64ef95d0481ef2eb43ca19183e14075b6dc442ca2732ca6958e17cb2fde2c6
+EBUILD zathura-0.4.4.ebuild 1349 BLAKE2B 1e27a0335f223fcab2330c4650a736f6c7c595c711ba1be8f04eec3375ead89f735c347eb2231d3ea2ba29153d713e63b354d4623012cf4ad94bcca338154ea6 SHA512 bc8c191d8c2bd6e507080cc845f71ea4533791499af345b23742d6a5710d2d5322884e8c6a2ebb3e8087eeda25fc09bc839dc72d1e03ec6a1f30daf28627a322
+EBUILD zathura-9999.ebuild 1349 BLAKE2B 1e27a0335f223fcab2330c4650a736f6c7c595c711ba1be8f04eec3375ead89f735c347eb2231d3ea2ba29153d713e63b354d4623012cf4ad94bcca338154ea6 SHA512 bc8c191d8c2bd6e507080cc845f71ea4533791499af345b23742d6a5710d2d5322884e8c6a2ebb3e8087eeda25fc09bc839dc72d1e03ec6a1f30daf28627a322
 MISC metadata.xml 763 BLAKE2B 1a98b02634dd4017052820cb2103b81d7bc8308c8832edb28f65127f43e9a673926b76091e2062a66c701b25e9d5866051e2268fa3fb4f53a681257132618789 SHA512 5afbabe1726a25ba2b0ae5c66533bbc247deaf1c745534487895bfafa2671ba87d9fc4333ac824176f78db64a940cc53a87d018fa4d7e5d201cfc6f41cfb50d6
diff --git a/app-text/zathura/zathura-0.4.4.ebuild b/app-text/zathura/zathura-0.4.4.ebuild
new file mode 100644
index 000000000000..83ead1f313eb
--- /dev/null
+++ b/app-text/zathura/zathura-0.4.4.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson virtualx
+
+DESCRIPTION="A highly customizable and functional document viewer"
+HOMEPAGE="http://pwmt.org/projects/zathura/"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.pwmt.org/pwmt/${PN}.git"
+	EGIT_BRANCH="develop"
+else
+	SRC_URI="https://github.com/pwmt/zathura/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+fi
+
+LICENSE="ZLIB"
+SLOT="0"
+IUSE="doc +magic seccomp sqlite synctex test"
+
+RESTRICT="!test? ( test )"
+
+DEPEND=">=dev-libs/girara-0.3.3
+	>=dev-libs/glib-2.50:2
+	>=sys-devel/gettext-0.19.8
+	x11-libs/cairo[X]
+	>=x11-libs/gtk+-3.22:3
+	magic? ( sys-apps/file )
+	seccomp? ( sys-libs/libseccomp )
+	sqlite? ( >=dev-db/sqlite-3.5.9:3 )
+	synctex? ( app-text/texlive-core )"
+
+RDEPEND="${DEPEND}"
+
+BDEPEND="doc? ( dev-python/sphinx )
+	test? ( dev-libs/appstream-glib
+		dev-libs/check )
+	virtual/pkgconfig"
+
+src_configure() {
+	local emesonargs=(
+		-Dconvert-icon=disabled
+		-Dmagic=$(usex magic enabled disabled)
+		-Dmanpages=$(usex doc enabled disabled)
+		-Dseccomp=$(usex seccomp enabled disabled)
+		-Dsqlite=$(usex sqlite enabled disabled)
+		-Dsynctex=$(usex synctex enabled disabled)
+		)
+	meson_src_configure
+}
+
+src_test() {
+	virtx meson_src_test
+}
diff --git a/app-text/zathura/zathura-9999.ebuild b/app-text/zathura/zathura-9999.ebuild
index fcb0645c0898..83ead1f313eb 100644
--- a/app-text/zathura/zathura-9999.ebuild
+++ b/app-text/zathura/zathura-9999.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit gnome2-utils meson virtualx xdg-utils
+inherit meson virtualx
 
 DESCRIPTION="A highly customizable and functional document viewer"
 HOMEPAGE="http://pwmt.org/projects/zathura/"
@@ -13,36 +13,41 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://git.pwmt.org/pwmt/${PN}.git"
 	EGIT_BRANCH="develop"
 else
-	SRC_URI="https://pwmt.org/projects/zathura/download/${P}.tar.xz"
+	SRC_URI="https://github.com/pwmt/zathura/archive/${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="ZLIB"
 SLOT="0"
-IUSE="+magic seccomp sqlite synctex test"
+IUSE="doc +magic seccomp sqlite synctex test"
 
-RDEPEND=">=dev-libs/girara-0.3.1
+RESTRICT="!test? ( test )"
+
+DEPEND=">=dev-libs/girara-0.3.3
 	>=dev-libs/glib-2.50:2
-	dev-python/sphinx
 	>=sys-devel/gettext-0.19.8
-	x11-libs/cairo
+	x11-libs/cairo[X]
 	>=x11-libs/gtk+-3.22:3
 	magic? ( sys-apps/file )
 	seccomp? ( sys-libs/libseccomp )
 	sqlite? ( >=dev-db/sqlite-3.5.9:3 )
 	synctex? ( app-text/texlive-core )"
 
-DEPEND="${RDEPEND}
-	test? ( dev-libs/check )"
+RDEPEND="${DEPEND}"
 
-BDEPEND="virtual/pkgconfig"
+BDEPEND="doc? ( dev-python/sphinx )
+	test? ( dev-libs/appstream-glib
+		dev-libs/check )
+	virtual/pkgconfig"
 
 src_configure() {
 	local emesonargs=(
-		-Denable-magic=$(usex magic true false)
-		-Denable-seccomp=$(usex seccomp true false)
-		-Denable-sqlite=$(usex sqlite true false)
-		-Denable-synctex=$(usex synctex true false)
+		-Dconvert-icon=disabled
+		-Dmagic=$(usex magic enabled disabled)
+		-Dmanpages=$(usex doc enabled disabled)
+		-Dseccomp=$(usex seccomp enabled disabled)
+		-Dsqlite=$(usex sqlite enabled disabled)
+		-Dsynctex=$(usex synctex enabled disabled)
 		)
 	meson_src_configure
 }
@@ -50,13 +55,3 @@ src_configure() {
 src_test() {
 	virtx meson_src_test
 }
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
author	V3n3RiX <venerix@redcorelinux.org>	2019-09-13 17:45:37 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2019-09-13 17:45:37 +0100
commit	a1392efe64137262023d92492396ca9156d22396 (patch)
tree	de438b2711c7697c4597fb04f07e988586f34233 /app-text
parent	e3cf2c86fca1750343c1885311f857f185ee4f2d (diff)