gentoo resync : 03.11.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-11-03 16:06:58 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2019-11-03 16:06:58 +0000
commit: bd4aeefe33e63f613512604e47bfca7b2187697d (patch)
tree: adb35b5a9a00ee7ea591ab0c987f70167c23b597 /app-text
parent: 48ece6662cbd443015f5a57ae6d8cbdbd69ef37c (diff)
93 files changed, 965 insertions, 471 deletions
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index e0f606331c81..1191695c0525 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/asciidoc/Manifest b/app-text/asciidoc/Manifest
index db5cc63a3957..0b38452e508b 100644
--- a/app-text/asciidoc/Manifest
+++ b/app-text/asciidoc/Manifest
@@ -1,8 +1,3 @@
-DIST asciidoc-8.6.10.tar.gz 577208 BLAKE2B 320724c3e2306e14212a4e32f09fb735861f9b0126ce86695c6b5840b69f94d0e5befbbfc355006a10d13d34e8ed3582f0bfb678744654a7d2040555016b1681 SHA512 6ecc86977baaf1c756691e3f661e43ef2bb24e606898f6075bfa6f174d1fdc5e77d00853ffe014847e295364349d6ad34f3b8209cb97870e0233012fc38a281a
 DIST asciidoc-8.6.10_p20181016.tar.gz 576694 BLAKE2B 4d255606675346d00ab03398bf48cb30d357f9f9366944e4faf66ae4c96dafce49acdd930fc848f3dbb2d704a004bb5815d17b53416a76c8368a92e4716328b2 SHA512 801f360b0c444e932f1c50897d446de0ec3f0fb2206080b5aa6dda396fede96065f7bb629a84c8a8e40c5d8897f305fdb1877512f04ae757f3b142fd3a7305d0
-DIST asciidoc-8.6.9.tar.gz 907253 BLAKE2B 45db42abd9ec73f6d3b20fc755bdd501eab1503bd8d5d6bb6b7d66c442cf8bcd47ee4325dbb572bdcfd01168ef1bccc3430ee7c545e7b3a6715b8ebf09516ad9 SHA512 1984482010dbd35c3a1def67f4915ce83ecfc29a7463f84aa312107d7a9ff647978f57615462c65e885bea424eed89a212df728cc3acd3c63df1c763dfa5e955
-EBUILD asciidoc-8.6.10.ebuild 2389 BLAKE2B 9c7971a5b005e43ace62b818be8e5514e78f502f7aa47919d679576eaf4804502edc012456019f17bd339d53f119f3f0062e8faeda1b606d1c52d646bb4fc87f SHA512 fba805690f97e38c5f154ff4421d260ac73022ed8358840db60e0da91191ce01410a0b0b1b24ea634d0ae1d124d29883b5a0782ec3d5a627e874fbb4a0b10cb6
 EBUILD asciidoc-8.6.10_p20181016.ebuild 2554 BLAKE2B 368368ee6e9043a38d1f6fcd32cd9cc1ea07b1b387b839d439693b388c77b2d969cfcfab43b9ab0fdd153d0571bde3f61140d7b361137470b5c05d42d413ddea SHA512 12b321f595458d9b73b72cd921460ae00cb75a0e0367f332ef8db9de583641f634302632c65d4d57b29a3fe2d6180005187b05d029d23cc758fb2669a0094de2
-EBUILD asciidoc-8.6.9-r2.ebuild 2149 BLAKE2B 634aa49b629496eca149f5ad98c946ed4366a97ccdd588eb99cd5d68360af85054da33e0c2b13911539f98bcb1d3a8ab812332c756b7043a1f0ecd46d2b9f840 SHA512 e61050b06d020478fe5ef2dd29bb77c2760224420e0b87ce30dbbbe2e905d7f550056d1469fc6698b5de8b93cab4360c237dc3c2f975e9d0a10bc07cdd0d1a78
-EBUILD asciidoc-8.6.9-r6.ebuild 2348 BLAKE2B a45d6533355b1dba02ddcdff3856b751283346904874f03d7a9d78963cce22d665d4341fad5e94bcbfa6338580757f9818eed258c92660bb156678c1b67fa782 SHA512 fb7edb6b0337799d2984e6d221b84940eafd0d6f7b05e80e17d1a5f28ebececffb22b4910969b444b9852e59fb25675fb5c7b239fd7645e810f10f588475913b
 MISC metadata.xml 514 BLAKE2B 89fefee3e8081fc45a8251255bf365f58eba6aa9eef92a23bd8f234703b7062b1dd2a415260fcda1b799cffa4b46d0da22b153ba8de6b77cb6076666ff43ccb7 SHA512 2587ac6d8c24ceca295eef2dc6e0735461dd09864d6a1f282d67fc3c58cd18aa565099a2c280edec143024295b74a251152918932c37d3be450aef68d367ca70
diff --git a/app-text/asciidoc/asciidoc-8.6.10.ebuild b/app-text/asciidoc/asciidoc-8.6.10.ebuild
deleted file mode 100644
index 197355e1e29d..000000000000
--- a/app-text/asciidoc/asciidoc-8.6.10.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 pypy )
-
-inherit autotools python-single-r1 readme.gentoo-r1
-
-DESCRIPTION="A plain text human readable/writable document format"
-HOMEPAGE="http://asciidoc.org/"
-SRC_URI="https://github.com/asciidoc/asciidoc/archive/${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="examples graphviz highlight test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	app-text/docbook-xml-dtd:4.5
-	>=app-text/docbook-xsl-stylesheets-1.75
-	dev-libs/libxslt
-	${PYTHON_DEPS}
-	graphviz? ( media-gfx/graphviz )
-	highlight? (
-		|| (
-			dev-util/source-highlight
-			dev-python/pygments[${PYTHON_USEDEP}]
-			app-text/highlight
-		)
-	)"
-DEPEND="
-	test? (
-		app-text/dvipng
-		dev-texlive/texlive-latex
-		dev-util/source-highlight
-		media-gfx/graphviz
-		media-gfx/imagemagick
-		media-sound/lilypond
-		${PYTHON_DEPS}
-	)"
-
-DOC_CONTENTS="
-If you are going to use a2x, please also look at a2x(1) under
-REQUISITES for a list of runtime dependencies.
-"
-
-src_prepare() {
-	default
-	# Only needed for prefix - harmless (does nothing) otherwise
-	sed -i -e "s:^CONF_DIR=.*:CONF_DIR='${EPREFIX}/etc/asciidoc':" \
-		"${S}/asciidoc.py" || die
-
-	eautoreconf
-}
-
-src_configure() {
-	econf --sysconfdir="${EPREFIX}"/usr/share
-}
-
-src_test() {
-	local -x ASCIIDOC_PY=asciidoc.py
-	"${EPYTHON}" tests/test${PN}.py update || die
-	"${EPYTHON}" tests/test${PN}.py run || die
-}
-
-src_install() {
-	default
-	python_fix_shebang "${ED%/}"/usr/bin/*.py
-
-	readme.gentoo_create_doc
-	dodoc BUGS.txt CHANGELOG.txt README.asciidoc docbook-xsl/asciidoc-docbook-xsl.txt \
-		dblatex/dblatex-readme.txt filters/code/code-filter-readme.txt
-
-	# Below results in some files being installed twice in different locations, but they are
-	# in the right place, uncompressed, and there won't be any broken links. See bug #483336
-	if use examples; then
-		# examples/website is full of relative symlinks,
-		# deref them for copying, which dodoc doesn't do
-		cp -rL examples/website "${ED%/}"/usr/share/doc/${PF}/examples || die
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/app-text/asciidoc/asciidoc-8.6.9-r2.ebuild b/app-text/asciidoc/asciidoc-8.6.9-r2.ebuild
deleted file mode 100644
index 47c8ad5d9af9..000000000000
--- a/app-text/asciidoc/asciidoc-8.6.9-r2.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 pypy )
-
-inherit readme.gentoo python-single-r1
-
-DESCRIPTION="A plain text human readable/writable document format"
-HOMEPAGE="http://asciidoc.org/"
-SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV}/${P}.tar.gz"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="examples graphviz highlight test"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND=">=app-text/docbook-xsl-stylesheets-1.75
-		dev-libs/libxslt
-		graphviz? ( media-gfx/graphviz )
-		app-text/docbook-xml-dtd:4.5
-		highlight? ( || ( dev-util/source-highlight \
-			dev-python/pygments[${PYTHON_USEDEP}] \
-			app-text/highlight )
-		)
-		${PYTHON_DEPS}
-"
-DEPEND="test? ( dev-util/source-highlight
-			media-sound/lilypond
-			media-gfx/imagemagick
-			dev-texlive/texlive-latex
-			app-text/dvipng
-			media-gfx/graphviz
-			${PYTHON_DEPS} )
-"
-
-DOC_CONTENTS="
-If you are going to use a2x, please also look at a2x(1) under
-REQUISITES for a list of runtime dependencies.
-"
-
-src_prepare() {
-	# Only needed for prefix - harmless (does nothing) otherwise
-	sed -i -e "s:^CONF_DIR=.*:CONF_DIR='${EPREFIX}/etc/asciidoc':" \
-		"${S}/asciidoc.py" || die
-}
-
-src_configure() {
-	econf --sysconfdir="${EPREFIX}"/usr/share
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	python_fix_shebang "${ED}"/usr/bin/*.py
-
-	readme.gentoo_create_doc
-	dodoc BUGS CHANGELOG README docbook-xsl/asciidoc-docbook-xsl.txt \
-			dblatex/dblatex-readme.txt filters/code/code-filter-readme.txt
-
-	# Below results in some files being installed twice in different locations, but they are in the right place,
-	# uncompressed, and there won't be any broken links. See bug #483336.
-	if use examples; then
-		cp -rL examples/website "${D}"/usr/share/doc/${PF}/examples || die
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
-
-src_test() {
-	cd tests || die
-	local -x ASCIIDOC_PY=../asciidoc.py
-	"${PYTHON}" test${PN}.py update || die
-	"${PYTHON}" test${PN}.py run || die
-}
diff --git a/app-text/asciidoc/asciidoc-8.6.9-r6.ebuild b/app-text/asciidoc/asciidoc-8.6.9-r6.ebuild
deleted file mode 100644
index 19546e757826..000000000000
--- a/app-text/asciidoc/asciidoc-8.6.9-r6.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 pypy )
-
-inherit python-single-r1 readme.gentoo-r1
-
-DESCRIPTION="A plain text human readable/writable document format"
-HOMEPAGE="http://asciidoc.org/"
-SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV}/${P}.tar.gz"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="examples graphviz highlight test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	app-text/docbook-xml-dtd:4.5
-	>=app-text/docbook-xsl-stylesheets-1.75
-	dev-libs/libxslt
-	${PYTHON_DEPS}
-	graphviz? ( media-gfx/graphviz )
-	highlight? (
-		|| (
-			dev-util/source-highlight
-			dev-python/pygments[${PYTHON_USEDEP}]
-			app-text/highlight
-		)
-	)"
-DEPEND="
-	test? (
-		app-text/dvipng
-		dev-texlive/texlive-latex
-		dev-util/source-highlight
-		media-gfx/graphviz
-		media-gfx/imagemagick
-		media-sound/lilypond
-		${PYTHON_DEPS}
-	)"
-
-DOC_CONTENTS="
-If you are going to use a2x, please also look at a2x(1) under
-REQUISITES for a list of runtime dependencies.
-"
-
-src_prepare() {
-	default
-	# Only needed for prefix - harmless (does nothing) otherwise
-	sed -i -e "s:^CONF_DIR=.*:CONF_DIR='${EPREFIX}/etc/asciidoc':" \
-		"${S}/asciidoc.py" || die
-}
-
-src_configure() {
-	econf --sysconfdir="${EPREFIX}"/usr/share
-}
-
-src_test() {
-	local -x ASCIIDOC_PY=asciidoc.py
-	"${EPYTHON}" tests/test${PN}.py update || die
-	"${EPYTHON}" tests/test${PN}.py run || die
-}
-
-src_install() {
-	default
-	python_fix_shebang "${ED%/}"/usr/bin/*.py
-
-	readme.gentoo_create_doc
-	dodoc BUGS CHANGELOG README docbook-xsl/asciidoc-docbook-xsl.txt \
-		dblatex/dblatex-readme.txt filters/code/code-filter-readme.txt
-
-	# Below results in some files being installed twice in different locations, but they are
-	# in the right place, uncompressed, and there won't be any broken links. See bug #483336
-	if use examples; then
-		# examples/website is full of relative symlinks,
-		# deref them for copying, which dodoc doesn't do
-		cp -rL examples/website "${ED%/}"/usr/share/doc/${PF}/examples || die
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/app-text/calibre/Manifest b/app-text/calibre/Manifest
index c87c361fb6ae..e6731afb298b 100644
--- a/app-text/calibre/Manifest
+++ b/app-text/calibre/Manifest
@@ -5,7 +5,9 @@ AUX calibre-server-3.init 1796 BLAKE2B f87d785d6f6fc10fa648d40944ec8538027854bb8
 DIST calibre-3.47.1.tar.xz 38710008 BLAKE2B 60915345dd756d085386af61128e92569304be64aadbc21b69973e93adf3fb5cc88f7250153c238ecf423546f408bfc094b5bce329a54e7f080f831c4a8c23c1 SHA512 010796b3ac3fc6adcdf26dbc7966946be0f48b2684e1317da11d77fa55151d1f6ad2b86adf3c8eced5559823567e6672bfdfd953c17e6cc978894544131fb6bd
 DIST calibre-3.48.0.tar.xz 38777408 BLAKE2B 9a7fae20487ae93120cfdc06a312a42d54d68935fdd2bc18dc41be5f8d359c79eae24e0409ba8e7f4df85e2f073f80ce6bab56cba0638cead6693600fa93cb41 SHA512 6cee28fb560e2e00b8ac2f32756f094146c6fe744cfc343d68f1fb54b3f8b0ca16129a5b35018af54a103790faa2eb03ac186c01003f21c874d2ed5218441220
 DIST calibre-4.1.0.tar.xz 36231016 BLAKE2B 85987b8b8b37deb40f9ebb7d918e15e9a763cca00cf26eab841d0035309bd066f675d50d1ca94cb65e512d1964bac4241b3006aa38cac14ec0cb5e2d6416d2a8 SHA512 9a4766ccec830e553b5165f9a3b1111a6b4d0dbadee8b6a6547fef1dc3ca51adc886d9c3d751af23f4ff3a30a0fe03606c70ab57245ea38bfb486c111fd0e82e
+DIST calibre-4.2.0.tar.xz 36319240 BLAKE2B a37baae9c77ae2535782c5ee2095a33874c394b7f6415f4aac2752330c6cac3972723e75b90d38955a67a5df90de4318b740ca357b7149f610245f1895482437 SHA512 653dec2ba7a7ca122425619dc148765aea5cd60ede7fab23c1b10b0a7ba70f055bc6167732d4e21f161f37b313a7f2f9dde81240e1226a11a24b1195c9e38866
 EBUILD calibre-3.47.1.ebuild 8350 BLAKE2B d59300c7f0fc9a85c5a2862b0ce844c76e83a30cec434351e1df98d3741cd0a21dff80a52548903d25da29421121e220d8ee02a3f629f56bb11f7b3f9f5873c8 SHA512 53f70f860b5e8b9e33ac49a598c03b6e3a075b03377461008ca77a0ae2518d0e899c1af19fca611850e3e16c6efb5cfce1241afa2cdce0cba82c704fcec05d9f
 EBUILD calibre-3.48.0.ebuild 8352 BLAKE2B 92a2d894b2ad0966588854cdece96930aa85e240699eb185cc32a4b7ec0b3e98c34e7cac2490c44b1909bc1e4fc92f7d5094ed8f6159e08ae22ef98d7156f06c SHA512 df60b94324ccfe704195af5a6188ea6a793767e342e058b1f5039f52ae7fab6b16e95266a0876f6ea8118b5e4a014d7d1e3636b58280d611ae94918e359763d4
 EBUILD calibre-4.1.0-r1.ebuild 8451 BLAKE2B e464f58bea125fa5651adc2226d853a702c0ca6af0b32382bd33899874023f8a94fbe4f799f121900312ed4f57c4322e8252bedb90559eaaeae29396ee7e6be0 SHA512 5f17a88f540a62249f180024216d4fb36a7d3e0d832fa45a62cda72ea2b5cf7e9433fa19244a7134f42ab1abc8e1e0e52e63ee9ead526a8ba0cd2f95aa9cb4de
+EBUILD calibre-4.2.0.ebuild 8451 BLAKE2B e464f58bea125fa5651adc2226d853a702c0ca6af0b32382bd33899874023f8a94fbe4f799f121900312ed4f57c4322e8252bedb90559eaaeae29396ee7e6be0 SHA512 5f17a88f540a62249f180024216d4fb36a7d3e0d832fa45a62cda72ea2b5cf7e9433fa19244a7134f42ab1abc8e1e0e52e63ee9ead526a8ba0cd2f95aa9cb4de
 MISC metadata.xml 382 BLAKE2B 87fa7e63a6ed7a4ea55247b362288b43f7edd312cc3085bb8c1b947402ae4aa0df01fac4f6646d260653ff8af7fe28d3dabb8a213dbf3e206181b69835b33d5f SHA512 8503e0a4a48d93682c386eb1d6507b4b26585afc9d62b7cd52bc00b457a887bd17422a03669ff404570ff7f5ff6f0bba14ee935979f8b54722870d6620097de5
diff --git a/app-text/calibre/calibre-4.2.0.ebuild b/app-text/calibre/calibre-4.2.0.ebuild
new file mode 100644
index 000000000000..a435558ef333
--- /dev/null
+++ b/app-text/calibre/calibre-4.2.0.ebuild
@@ -0,0 +1,271 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite,ssl"
+
+inherit bash-completion-r1 desktop toolchain-funcs python-single-r1 xdg-utils
+
+DESCRIPTION="Ebook management application"
+HOMEPAGE="https://calibre-ebook.com/"
+SRC_URI="https://download.calibre-ebook.com/${PV}/${P}.tar.xz"
+
+LICENSE="
+	GPL-3+
+	GPL-3
+	GPL-2+
+	GPL-2
+	GPL-1+
+	LGPL-3+
+	LGPL-2.1+
+	LGPL-2.1
+	BSD
+	MIT
+	Old-MIT
+	Apache-2.0
+	public-domain
+	|| ( Artistic GPL-1+ )
+	CC-BY-3.0
+	OFL-1.1
+	PSF-2
+"
+KEYWORDS="~amd64 ~arm ~x86"
+SLOT="0"
+IUSE="ios +udisks"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+	>=app-text/hunspell-1.7:=
+	>=app-text/podofo-0.9.6_pre20171027:=
+	>=app-text/poppler-0.26.5[qt5]
+	>=dev-libs/chmlib-0.40:=
+	dev-libs/glib:2=
+	>=dev-libs/icu-57.1:=
+	dev-libs/libinput:=
+	>=dev-python/apsw-3.25.2_p1[${PYTHON_USEDEP}]
+	>=dev-python/beautifulsoup-3.0.5:python-2[${PYTHON_USEDEP}]
+	>=dev-python/chardet-3.0.3[${PYTHON_USEDEP}]
+	>=dev-python/cssselect-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/css-parser-1.0.4[${PYTHON_USEDEP}]
+	>=dev-python/dbus-python-1.2.4[${PYTHON_USEDEP}]
+	>=dev-libs/dbus-glib-0.106
+	>=sys-apps/dbus-1.10.8
+	dev-python/dnspython[${PYTHON_USEDEP}]
+	>=dev-python/feedparser-5.2.1[${PYTHON_USEDEP}]
+	>=dev-python/html5-parser-0.4.3[${PYTHON_USEDEP}]
+	>=dev-python/lxml-3.8.0[${PYTHON_USEDEP}]
+	>=dev-python/markdown-3.0.1[${PYTHON_USEDEP}]
+	>=dev-python/mechanize-0.3.5[${PYTHON_USEDEP}]
+	>=dev-python/msgpack-0.5.6[${PYTHON_USEDEP}]
+	>=dev-python/netifaces-0.10.5[${PYTHON_USEDEP}]
+	>=dev-python/pillow-3.2.0[${PYTHON_USEDEP}]
+	>=dev-python/psutil-4.3.0[${PYTHON_USEDEP}]
+	>=dev-python/pygments-2.3.1[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.5.3[${PYTHON_USEDEP}]
+	>=dev-python/PyQt5-5.12[gui,svg,widgets,network,printsupport,${PYTHON_USEDEP}]
+	>=dev-python/PyQtWebEngine-5.12[${PYTHON_USEDEP}]
+	dev-python/regex[${PYTHON_USEDEP}]
+	dev-qt/qtcore:5=
+	dev-qt/qtdbus:5=
+	dev-qt/qtgui:5=
+	>=dev-qt/qtwebengine-5.12
+	dev-qt/qtwidgets:5=
+	dev-util/desktop-file-utils
+	dev-util/gtk-update-icon-cache
+	media-fonts/liberation-fonts
+	media-libs/fontconfig:=
+	>=media-libs/freetype-2:=
+	>=media-libs/libmtp-1.1.11:=
+	>=media-libs/libwmf-0.2.8
+	>=media-gfx/optipng-0.7.6
+	>=sys-libs/zlib-1.2.11:=
+	virtual/libusb:1=
+	x11-libs/libxkbcommon:=
+	x11-libs/libX11:=
+	x11-libs/libXext:=
+	x11-libs/libXrender:=
+	x11-misc/shared-mime-info
+	>=x11-misc/xdg-utils-1.0.2-r2
+	ios? (
+		>=app-pda/usbmuxd-1.0.8
+		>=app-pda/libimobiledevice-1.2.0
+	)
+	udisks? ( virtual/libudev )"
+RDEPEND="${COMMON_DEPEND}
+	udisks? ( || ( sys-fs/udisks:2 sys-fs/udisks:0 ) )"
+DEPEND="${COMMON_DEPEND}
+	>=dev-python/setuptools-23.1.0[${PYTHON_USEDEP}]
+	dev-python/sip[${PYTHON_USEDEP}]
+	>=virtual/podofo-build-0.9.6_pre20171027
+	virtual/pkgconfig"
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary && $(gcc-major-version) -lt 6 ]]; then
+		eerror "Calibre cannot be built with this version of gcc."
+		eerror "You need at least gcc-6.0"
+		die "Your C compiler is too old for this package."
+	fi
+}
+
+src_prepare() {
+	# no_updates: do not annoy user with "new version is availible all the time
+	# disable_plugins: walking sec-hole, wait for upstream to use GHNS interface
+	eapply \
+		"${FILESDIR}/${PN}-2.9.0-no_updates_dialog.patch" \
+		"${FILESDIR}/${PN}-disable_plugins.patch"
+
+	eapply_user
+
+	# Fix outdated version constant.
+	#sed -e "s#\\(^numeric_version =\\).*#\\1 (${PV//./, })#" \
+	#	-i src/calibre/constants.py || \
+	#	die "sed failed to patch constants.py"
+
+	# Avoid sandbox violation in /usr/share/gnome/apps when linux.py
+	# calls xdg-* (bug #258938).
+	sed -e "s|'xdg-desktop-menu', 'install'|\\0, '--mode', 'user'|" \
+		-e "s|check_call(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \
+		-e "s|\\(CurrentDir(tdir)\\), \\\\\$|\\1:|" \
+		-e "s|, PreserveMIMEDefaults():|:|" \
+		-e "s|'xdg-icon-resource', 'install'|\\0, '--mode', 'user'|" \
+		-e "s|cmd\[2\]|cmd[4]|" \
+		-e "s|cc(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \
+		-e "s|'xdg-mime', 'install'|\\0, '--mode', 'user'|" \
+		-i src/calibre/linux.py || die "sed failed to patch linux.py"
+
+	# Disable unnecessary privilege dropping for bug #287067.
+	sed -e "s:if os.geteuid() == 0:if False and os.geteuid() == 0:" \
+		-i setup/install.py || die "sed failed to patch install.py"
+
+	sed -e "/^                self.check_call(\\[QMAKE\\] + qmc + \\[proname\\])$/a\
+\\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ self.check_call(['sed', \
+'-e', 's|^CFLAGS .*|\\\\\\\\0 ${CFLAGS}|', \
+'-e', 's|^CXXFLAGS .*|\\\\\\\\0 ${CXXFLAGS}|', \
+'-e', 's|^LFLAGS .*|\\\\\\\\0 ${LDFLAGS}|', \
+'-i', 'Makefile'])" \
+		-i setup/build.py || die "sed failed to patch build.py"
+
+	# use system beautifulsoup, instead of bundled
+	rm -f "${S}"/src/calibre/ebooks/BeautifulSoup.py \
+		|| die "could not remove bundled beautifulsoup"
+	find "${S}" -type f -name \*.py -exec \
+		sed -e 's/calibre.ebooks.BeautifulSoup/BeautifulSoup/' -i {} + \
+		|| die "could not sed bundled beautifulsoup out of the source tree"
+}
+
+src_install() {
+	# Bypass kbuildsycoca and update-mime-database in order to
+	# avoid sandbox violations if xdg-mime tries to call them.
+	cat - > "${T}/kbuildsycoca" <<-EOF
+	#!${BASH}
+	echo $0 : $@
+	exit 0
+	EOF
+
+	cp "${T}"/{kbuildsycoca,update-mime-database} || die
+	chmod +x "${T}"/{kbuildsycoca,update-mime-database} || die
+
+	export QMAKE="${EPREFIX}/usr/$(get_libdir)/qt5/bin/qmake"
+
+	# Unset DISPLAY in order to prevent xdg-mime from triggering a sandbox
+	# violation with kbuildsycoca as in bug #287067, comment #13.
+	export -n DISPLAY
+
+	# Bug #352625 - Some LANGUAGE values can trigger the following ValueError:
+	#   File "/usr/lib/python2.6/locale.py", line 486, in getdefaultlocale
+	#    return _parse_localename(localename)
+	#  File "/usr/lib/python2.6/locale.py", line 418, in _parse_localename
+	#    raise ValueError, 'unknown locale: %s' % localename
+	#ValueError: unknown locale: 46
+	export -n LANG LANGUAGE ${!LC_*}
+	export LC_ALL=C #684484
+
+	# Bug #295672 - Avoid sandbox violation in ~/.config by forcing
+	# variables to point to our fake temporary $HOME.
+	export HOME="${T}/fake_homedir"
+	export XDG_CONFIG_HOME="${HOME}/.config"
+	export XDG_DATA_HOME="${HOME}/.local/share"
+	export CALIBRE_CONFIG_DIRECTORY="${XDG_CONFIG_HOME}/calibre"
+	mkdir -p "${XDG_DATA_HOME}" "${CALIBRE_CONFIG_DIRECTORY}" || die
+
+	tc-export CC CXX
+	# Bug #334243 - respect LDFLAGS when building extensions
+	export OVERRIDE_CFLAGS="$CFLAGS" OVERRIDE_LDFLAGS="$LDFLAGS"
+	local libdir=$(get_libdir)
+	[[ -n $libdir ]] || die "get_libdir returned an empty string"
+
+	addpredict /dev/dri #665310
+
+	PATH=${T}:${PATH} PYTHONPATH=${S}/src${PYTHONPATH:+:}${PYTHONPATH} \
+	"${PYTHON}" setup.py install \
+		--root="${D}" \
+		--prefix="${EPREFIX}/usr" \
+		--libdir="${EPREFIX}/usr/${libdir}" \
+		--staging-root="${ED}/usr" \
+		--staging-libdir="${ED}/usr/${libdir}" || die
+
+	rm "${ED}/usr/share/applications/defaults.list" || die
+	find "${ED}"/usr/share -type d -empty -delete
+
+	cd "${ED}"/usr/share/calibre/fonts/liberation || die
+	local x
+	for x in * ; do
+		[[ -f ${EPREFIX}usr/share/fonts/liberation-fonts/${x} ]] || continue
+		ln -sf "../../../fonts/liberation-fonts/${x}" "${x}" || die
+	done
+
+	einfo "Converting python shebangs"
+	python_fix_shebang --force "${ED}"
+
+	einfo "Compiling python modules"
+	python_optimize "${ED}"/usr/lib/calibre
+
+	newinitd "${FILESDIR}"/calibre-server-3.init calibre-server
+	newconfd "${FILESDIR}"/calibre-server-3.conf calibre-server
+
+	bashcomp_alias calibre \
+		lrfviewer \
+		calibre-debug \
+		ebook-meta \
+		calibre-server \
+		ebook-viewer \
+		ebook-polish \
+		fetch-ebook-metadata \
+		lrf2lrs \
+		ebook-convert \
+		ebook-edit \
+		calibre-smtp \
+		ebook-device
+
+}
+
+pkg_preinst() {
+	# Indentify stray directories from upstream's "Binary install"
+	# method (see bug 622728).
+	CALIBRE_LIB_DIR=/usr/$(get_libdir)/calibre
+	CALIBRE_LIB_CONTENT=$(for x in "${ED}${CALIBRE_LIB_DIR}"/*; do
+		printf -- "${x##*/} "; done) || die "Failed to list ${ED}${CALIBRE_LIB_DIR}"
+}
+
+pkg_postinst() {
+	[[ -n ${CALIBRE_LIB_DIR} ]] || die "CALIBRE_LIB_DIR is unset"
+	local x
+	for x in "${EROOT}${CALIBRE_LIB_DIR}"/*; do
+		if [[ " ${CALIBRE_LIB_CONTENT} " != *" ${x##*/} "* ]]; then
+			elog "Purging '${x}'"
+			rm -rf "${x}"
+		fi
+	done
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	xdg_icon_cache_update
+}
diff --git a/app-text/docbook-dsssl-stylesheets/Manifest b/app-text/docbook-dsssl-stylesheets/Manifest
index 99b2c3ae11d7..f7a2adda4e70 100644
--- a/app-text/docbook-dsssl-stylesheets/Manifest
+++ b/app-text/docbook-dsssl-stylesheets/Manifest
@@ -1,4 +1,4 @@
 DIST docbook-dsssl-1.79.tar.bz2 277650 BLAKE2B 6a12f46965ee705096f679b672610395b24f151e3bf3cb05f7d920c052b7a3fdafb4f5ee4526dbf765bbab6b7d4ca9f021277c6f35926f47edc61d0f835afdbb SHA512 fad71e67227b54b0a7c31a351b4d5c0695517b3687714807d7b144d239dc6f7e0d556520e705eb75581c82e0deea4b32ccfde1eccad2718337b757eddd64843e
 EBUILD docbook-dsssl-stylesheets-1.79-r3.ebuild 1529 BLAKE2B 78aba5226ec752b9a983f9cd4846619c788c6e6205738a11425e363b847c15c30a3ae21fd10f929cb36b554f806044b1d5381214a729890c61d22864e8dee131 SHA512 81b5606c5b3de8b54e50f66d2120de05169731afc50f34a057e35cf89c15437ce0e96d3a1a2e9bc8c6fbfba5cbc1373bc38f64f164d1937165791063c264518b
-EBUILD docbook-dsssl-stylesheets-1.79-r4.ebuild 2473 BLAKE2B afb4a4521674b170456995a9cc578f21c736d4c48d1e70a20820affd34c87ac76ddc215fead0f538167cca07b3c1c256d0a1f4f8c8fc44798b6bb2dc63d7a4db SHA512 cc68a03d636cf0b2a086702b9120e51a8afd7a82b14fcd6696de527ce3de191c378ac299bb1f202a9a91d06ab2e313a3ab719c4d8ad6318be328ea6fc9dd5fa6
+EBUILD docbook-dsssl-stylesheets-1.79-r4.ebuild 2467 BLAKE2B f56e8016f8b40ed4ab545dfd1d0a90b3d2f2f063fce464c1f217a96dd8d5cbe6048ae2b1cf28d2779c38ff4ec4f4b85a7e553d5851801f8cb23002dffd3cc8f2 SHA512 4c08d861c3fcfa663e92f61f04b91a8c4568b44d4c9b75c3a98e338c4e8f30d031f8f4de13ebddd83d6cadb5a9916babc57e5b006d39e9ab03aa7438cba86d29
 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
index dddde1f8ca90..fddb608b835e 100644
--- a/app-text/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-1.79-r4.ebuild
+++ b/app-text/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-1.79-r4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://downloads.sourceforge.net/project/docbook/docbook-dsssl/${PV}/$
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 s390 sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/app-text/docbook-sgml-dtd/Manifest b/app-text/docbook-sgml-dtd/Manifest
index 282638a73603..5a5c34d37de8 100644
--- a/app-text/docbook-sgml-dtd/Manifest
+++ b/app-text/docbook-sgml-dtd/Manifest
@@ -15,19 +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 978 BLAKE2B f83ac7ee8771bea0ee40dbacc4ecd1c024e594d02eb9a22b75199f07deffc72c2dc1f99d92a00fabf97742b8fbdffd6683193a618b4d2980a2140ac4ad271c69 SHA512 091b15d441c6d58bf32fb120ca27f679126d1b62f57e33a876c259db6b8b4893573d74bccd89b5d80d8be6e55f735b3553eb860172e261137773e2eaf43e5de2
-EBUILD docbook-sgml-dtd-3.0-r4.ebuild 1251 BLAKE2B c3cd366ca13a335184615ca0c025a68c9e75f2208f8b79e414fa46565df4d63b0c70f5d83c1e5eb03fbd2c3f800ad11ab09d884086a6f9753a5c04dd2cad3410 SHA512 dcd94c5b38d05e3ee9dcf149a8902106b0c5cff2a91d61df6db049b751ab5289174f842697cf63045a1a35885b82e12d97d158d2eaf85ed037194a94504eed0d
+EBUILD docbook-sgml-dtd-3.0-r4.ebuild 1245 BLAKE2B 813c4577a5a9a53c10962676a86e57a681080a22685b604ce6ef37e68aedc1167444f794abc2a87b68b7d76f916564ffefe4c095d09f11c586df820b35f1f27a SHA512 f0ea8aa41863ac7064441e2eba8d3bbb1ae2e279d9dd5ed66b366668f2dcd3373d3e4ddd1e4e7367655694e93f34c8ef44258caf39c7775a100a4b94d8e185d0
 EBUILD docbook-sgml-dtd-3.1-r3.ebuild 978 BLAKE2B e426fd076c89a1d2a42574f3e2cb69cbc977660853fac147ec8d86f2f861abf13eda82b2e49c0703f6dc2b5867ac9101d95c93dad31d4f1ee4793982b9d2e7c5 SHA512 892fe39a4fb234cb3429982f8f8c6dbe9815453b3ce9de8b993e96eb5c429a87407ab60255f7e0b71844b910c66533d56f116f3d1b85f3382b76c735c0439b4b
-EBUILD docbook-sgml-dtd-3.1-r4.ebuild 1251 BLAKE2B c3cd366ca13a335184615ca0c025a68c9e75f2208f8b79e414fa46565df4d63b0c70f5d83c1e5eb03fbd2c3f800ad11ab09d884086a6f9753a5c04dd2cad3410 SHA512 dcd94c5b38d05e3ee9dcf149a8902106b0c5cff2a91d61df6db049b751ab5289174f842697cf63045a1a35885b82e12d97d158d2eaf85ed037194a94504eed0d
+EBUILD docbook-sgml-dtd-3.1-r4.ebuild 1245 BLAKE2B 813c4577a5a9a53c10962676a86e57a681080a22685b604ce6ef37e68aedc1167444f794abc2a87b68b7d76f916564ffefe4c095d09f11c586df820b35f1f27a SHA512 f0ea8aa41863ac7064441e2eba8d3bbb1ae2e279d9dd5ed66b366668f2dcd3373d3e4ddd1e4e7367655694e93f34c8ef44258caf39c7775a100a4b94d8e185d0
 EBUILD docbook-sgml-dtd-4.0-r3.ebuild 978 BLAKE2B 4ecff8ed147969f87de00150cf77a1e53162926833847e09ea0fddd0da59d366979f495b05d52cd029afc67fb4746f3f95f22615ee7bd351bab7af934d095cde SHA512 1dbed9ae40cbfe8856f075a6d358b7aa29ccc97833be63529f8bffb573c813e42304591514e2224e3f7aa9140f16e29ff756908e91e73dffde39155f4359c558
-EBUILD docbook-sgml-dtd-4.0-r4.ebuild 1251 BLAKE2B c3cd366ca13a335184615ca0c025a68c9e75f2208f8b79e414fa46565df4d63b0c70f5d83c1e5eb03fbd2c3f800ad11ab09d884086a6f9753a5c04dd2cad3410 SHA512 dcd94c5b38d05e3ee9dcf149a8902106b0c5cff2a91d61df6db049b751ab5289174f842697cf63045a1a35885b82e12d97d158d2eaf85ed037194a94504eed0d
+EBUILD docbook-sgml-dtd-4.0-r4.ebuild 1245 BLAKE2B 813c4577a5a9a53c10962676a86e57a681080a22685b604ce6ef37e68aedc1167444f794abc2a87b68b7d76f916564ffefe4c095d09f11c586df820b35f1f27a SHA512 f0ea8aa41863ac7064441e2eba8d3bbb1ae2e279d9dd5ed66b366668f2dcd3373d3e4ddd1e4e7367655694e93f34c8ef44258caf39c7775a100a4b94d8e185d0
 EBUILD docbook-sgml-dtd-4.1-r3.ebuild 978 BLAKE2B 86c16063c95d657d5716c755edcd97ef30d526e3df241a30acc98fc96eb55f22efac6b34f32b6c4d08b830622eb9cddbf2efa721878a2a6499af2c5cd3763e04 SHA512 c102a80ffa3faa1a869ff959044181e1516698a03f211b119a5c1478167cf0601f7d2af2cb43595a217fdf7ac85e67b21a0343b7620c780775dd636212b76403
-EBUILD docbook-sgml-dtd-4.1-r4.ebuild 1251 BLAKE2B c3cd366ca13a335184615ca0c025a68c9e75f2208f8b79e414fa46565df4d63b0c70f5d83c1e5eb03fbd2c3f800ad11ab09d884086a6f9753a5c04dd2cad3410 SHA512 dcd94c5b38d05e3ee9dcf149a8902106b0c5cff2a91d61df6db049b751ab5289174f842697cf63045a1a35885b82e12d97d158d2eaf85ed037194a94504eed0d
+EBUILD docbook-sgml-dtd-4.1-r4.ebuild 1245 BLAKE2B 813c4577a5a9a53c10962676a86e57a681080a22685b604ce6ef37e68aedc1167444f794abc2a87b68b7d76f916564ffefe4c095d09f11c586df820b35f1f27a SHA512 f0ea8aa41863ac7064441e2eba8d3bbb1ae2e279d9dd5ed66b366668f2dcd3373d3e4ddd1e4e7367655694e93f34c8ef44258caf39c7775a100a4b94d8e185d0
 EBUILD docbook-sgml-dtd-4.2-r2.ebuild 993 BLAKE2B a946b13102ff386653ae52ebcbc3b13b8757443582801bc20d197080fc7f236c10ae4d5e023472d04869b3705cae6c500ab7ee56f4ca51e55c896baf5a6865ef SHA512 97a9e5dda3e40b722038fcb66c5a5b952b5debc5915b3de530142f04f31178e89bd7844b866442fc7cfa14c2ddaf1b34d73cf674e171917d3e92fd052ce75ac6
-EBUILD docbook-sgml-dtd-4.2-r3.ebuild 1262 BLAKE2B 7afdde882b2d39eba65d7c61ce040213b02a98d0a7162cd87b2252812068a125c0c86932dd630811d61c99601869356e27fd571f7ede0316a373d43b19971900 SHA512 15420c2762700427cc512fafae165485b046ed028aefbebbb4a13a87522c7b1495988f66539429e87828f4abfc156720fcfdf172785e6b647eef84c6c69c58eb
+EBUILD docbook-sgml-dtd-4.2-r3.ebuild 1256 BLAKE2B 715af8907a10f9a0fcf1a77b14e59ec4622e3078de1f29cc7b0507cf915c45d9e7f4c3f3b14a52b85208bf2b10f21cd886de23543fcead1ef546bb002eeebf55 SHA512 70f1a8846503620dfb3609fcda5ca592e67316e633b8649bef1f58246c1f34fd1d91cf946ef14f55a1b3aba719c2061242a182f39ab6f608da197ec04b355bc1
 EBUILD docbook-sgml-dtd-4.3-r2.ebuild 984 BLAKE2B ceba8e72d4050fc5783081d64bc2ab5feb8a5d6f7624a9cbcb1f606bff3923e839e9fcdd01fc83435857c647004f55bd692c7b7be288f24030f84f72c1c9c558 SHA512 34e3f2aabebda0eb43314ab3b2851466821fda47652713b65768a2876e04c0d516dba2164e1a432e22576b713045ed08c3743ec704f7141290efb2712707c695
-EBUILD docbook-sgml-dtd-4.3-r3.ebuild 1247 BLAKE2B b2382a8185752d78c37ae39b6178a53c8aa256d834ba4861ec4c1a2c8a21fd982be7600bd00d44eb489ddff20d3ffe3c04afd26069bac5fae41652ac267d0a02 SHA512 a5721998eb93cd091cc3b4ffabc356ec283d5656b803ac73c5e8b1fdefaef07386192bebb8caac9233905ec9c7a3e41795c3e159e5c974c245630a1172e9aea6
-EBUILD docbook-sgml-dtd-4.4-r1.ebuild 1247 BLAKE2B 35a10e3494c3511607d99eef4b4c88536f246fb22b5ecd19092affcb494835e1577ddf8356f77acf79ddc687ea8fc3ff7c85467ba7f3a9a0baedb68c3fc02f5a SHA512 fbc33b0da8394b20a768a7663a813dec7bd369b93c9a47b0c6c37c56a59d8be00e312988eb61f0ce729dda9743d70e42af49a54bf0f08f8d320812ed2ab467d1
+EBUILD docbook-sgml-dtd-4.3-r3.ebuild 1241 BLAKE2B f1e47412c600755c463675ba6fa7193a456f156a9961ca15df2754e572f0a1013dd3234dff17fb6683276d2ff3f3520abb78f025564aaedbe6702608ec5a35ec SHA512 b071c2bdcf354a40f1ad37964c7a2ee96273eb5d2f68235565796263917022f6b0c4e195284c5c9f5435cf4afc23aea32fd46148ed8c1545f6479c437ba47dc8
+EBUILD docbook-sgml-dtd-4.4-r1.ebuild 1241 BLAKE2B 6ffac3fa9e4d57fddc0c1ff3417ea6c91907b11ecab7cca7a8079bc08deb774a04f234ce979b4804a0c9a9ea1f34341b81b4333e02772ab22b16de127923dad5 SHA512 f07a1abeb6d48ac01cdffce7277d4eda5f6d5006cba5fa4746c6492ef3fd46602a5af7f9e353b3a4f48168c35bbf9af80a4499a2a74fa730573fc6fe3ced34ee
 EBUILD docbook-sgml-dtd-4.4.ebuild 984 BLAKE2B 69c42245da0c03a7aa65da7de54fa2fb68c1805360c7b8bad0e94169e82f3e1c55c9a43a4e96bc99cc2d599051b570ed647e924ea35a7066c67a2bd58870eab0 SHA512 70dac72ddc99a35fe804db3f70f515f432c1318897be424451d7c4912c67c7003df00fd61bc8a69fe4d2aa6bee0bd6557d9f86f6699b6b49dc6e9db07389a77e
-EBUILD docbook-sgml-dtd-4.5-r1.ebuild 1243 BLAKE2B 797bff8ac4f1cd0778fe391a3d1788bdbfc7f74f08b68a04cd878e2d957029ecbd03d14cf0cc214fcfbad3cada3050eb06d9963190003a7cfb0e0f80dcce6f93 SHA512 d5f0d057930f8d9b0aaac960572e17d2cd66d4dc22a792d9a253170d670a1eb3358236f9d8846f165b370a37767cc6cb0dd8f18e37fa8c6498a7ad54a61f7f77
+EBUILD docbook-sgml-dtd-4.5-r1.ebuild 1237 BLAKE2B ab2334a97d0dbd41255fefaa87eeac31c7631ab02005c0aa5b39a1271782b8c933eacab3c2ac3f6209b0122e47160d9f4cf5f431e0c9ce4f0077a73290f3139c SHA512 3bf8078e4fc10e9b089da0e89ce1284f28253dbb898c4c944780f76b812c2daeb6f9aff1c9b1b5bf526dad730ad17367ccded29b8674b0b2c3d9f46eb51f6cdb
 EBUILD docbook-sgml-dtd-4.5.ebuild 977 BLAKE2B 9dd0c5251b840856e6b1949258fb6ee427dbc3fe0487a2fc21153bb58cde8877e3d1bd899941ca51f884b8f3b6e2ae2a87c5bcc9f8d00cb138cb36ec9d31e415 SHA512 89b7ee7d59bf1bec074fe6a3136e09c8c0967cf21119b7cbef6ff2271a6eab140672543ce4899f5b22c4113a71c3b74c928ed57f8b0a569ed75eaf218fb6dacb
 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
index 443369599379..b9215d7e2a0f 100644
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.0-r4.ebuild
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.0-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.oasis-open.org/docbook/sgml/${PV}/${MY_P}.zip"
 
 LICENSE="docbook"
 SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 s390 sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE=""
 
 DEPEND=">=app-arch/unzip-5.41"
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.1-r4.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.1-r4.ebuild
index 443369599379..b9215d7e2a0f 100644
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.1-r4.ebuild
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.1-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.oasis-open.org/docbook/sgml/${PV}/${MY_P}.zip"
 
 LICENSE="docbook"
 SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 s390 sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE=""
 
 DEPEND=">=app-arch/unzip-5.41"
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.0-r4.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.0-r4.ebuild
index 443369599379..b9215d7e2a0f 100644
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.0-r4.ebuild
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.0-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.oasis-open.org/docbook/sgml/${PV}/${MY_P}.zip"
 
 LICENSE="docbook"
 SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 s390 sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE=""
 
 DEPEND=">=app-arch/unzip-5.41"
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.1-r4.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.1-r4.ebuild
index 443369599379..b9215d7e2a0f 100644
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.1-r4.ebuild
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.1-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.oasis-open.org/docbook/sgml/${PV}/${MY_P}.zip"
 
 LICENSE="docbook"
 SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 s390 sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE=""
 
 DEPEND=">=app-arch/unzip-5.41"
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.2-r3.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.2-r3.ebuild
index 0e594e5d27fc..a94c3f33001c 100644
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.2-r3.ebuild
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.2-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.oasis-open.org/docbook/sgml/${PV}/${MY_P}.zip"
 
 LICENSE="docbook"
 SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 s390 sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE=""
 
 DEPEND=">=app-arch/unzip-5.41"
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.3-r3.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.3-r3.ebuild
index 56ef5b2c612e..b2993927d029 100644
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.3-r3.ebuild
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.3-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://docbook.org/sgml/${PV}/${MY_P}.zip"
 
 LICENSE="docbook"
 SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 s390 sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE=""
 
 DEPEND=">=app-arch/unzip-5.41"
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.4-r1.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.4-r1.ebuild
index a5921cc3c0c8..e0216934a547 100644
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.4-r1.ebuild
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.4-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://docbook.org/sgml/${PV}/${MY_P}.zip"
 
 LICENSE="docbook"
 SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 s390 sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE=""
 
 DEPEND=">=app-arch/unzip-5.41"
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.5-r1.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.5-r1.ebuild
index 65252a88f389..7f4bf9b937ad 100644
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.5-r1.ebuild
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.5-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://docbook.org/sgml/${PV}/${MY_P}.zip"
 
 LICENSE="docbook"
 SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 s390 sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE=""
 
 DEPEND=">=app-arch/unzip-5.41"
diff --git a/app-text/docbook-sgml-utils/Manifest b/app-text/docbook-sgml-utils/Manifest
index 16d4c1b1d62d..fc91a3e1abbe 100644
--- a/app-text/docbook-sgml-utils/Manifest
+++ b/app-text/docbook-sgml-utils/Manifest
@@ -3,5 +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 1887 BLAKE2B f15df4383f323db128a975a0fdacc643fa162058484962d55e15526e601ad2b18f1e251f83e9ee516732794a0e51bb2c51b1feb968d5f4e03db4fae79543443c SHA512 f23328537fa94f67fa4eca2401ffd513fa164cf5bf4f7f7efae2428e31ff00e0a8114d77800cb1253c371cfe367d2cdcd5517d3404e8be8b9cf138a7963e7f01
-EBUILD docbook-sgml-utils-0.6.14-r3.ebuild 1839 BLAKE2B 8c989b640ed8f60d1c87d1b25063cbc49a83fb63fcf202ee004efee4e164d5e289db4c9e290b5bef067645ff492afa49a512161f07fdb3efb41323daac08d17a SHA512 2ca82c447256d93e9b0a757e3b0216d22ce8ac83a87329b81bb5e5194890ae7cf9de371a4c0669eb3ec95737857c24cb69de03e872cb057bab7904b136d0eff2
+EBUILD docbook-sgml-utils-0.6.14-r3.ebuild 1833 BLAKE2B a15bec5c3f6a00be5f0dd3955a97b7cb06467abd6ca96ff13834f6ee23281530f5c24b17caf92b3de62390dad7840a07fce8cd2c568805b30bc43b06e025b9e8 SHA512 03ba40d09d6e1585839e4fcc1e89607176ee63e668650bdb8f43436bc43216f97da23cce4ae468b101720c061e4a9d96d7ef0b4acb496e5c1a2420356281d094
 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
index 3ee204ce8d54..c6ea3b0e3927 100644
--- a/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14-r3.ebuild
+++ b/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14-r3.ebuild
@@ -13,7 +13,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 s390 sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="jadetex"
 
 DEPEND=">=dev-lang/perl-5
diff --git a/app-text/docbook-xml-dtd/Manifest b/app-text/docbook-xml-dtd/Manifest
index c34fe0b50bfd..24d04c30525f 100644
--- a/app-text/docbook-xml-dtd/Manifest
+++ b/app-text/docbook-xml-dtd/Manifest
@@ -4,13 +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 1348 BLAKE2B dd0e099bb825bfc3091c51b24b47fa50a9a5d79be6deff305f81203235d953d4e68562d8fe1fba9420ec5613b68c6b4588e86042108b7b53d0598551d1122577 SHA512 d01a0b5f92e8a2d77da20d65fdca469b6fc8ab6a8981e5288749f5dc8a826ab175f247614a9b595dc6de0c07efb29e4ae9ce3fa0d2d077dd8568241abc9efd24
-EBUILD docbook-xml-dtd-4.1.2-r7.ebuild 1634 BLAKE2B eeca42174923aad0c54b1f264cfcb5282f3da9714f36da82151c4daeeada9237b4d54f3f92dfc79ca2bcc30dfbf5a3e9c870dfd573f8c7a8f2bdac1a4d02a41d SHA512 768dca54964438120c90096505b2247c21e331e12535b45fcc5c5531a0d6905798ba2639ab7b950f6463ace30af10950c103f1f688f175908085f4a3393f7f36
+EBUILD docbook-xml-dtd-4.1.2-r7.ebuild 1628 BLAKE2B d7c76ccfe2a6d4c4d50b50e03f00c02153f309783143634311c4e308946c84eb08b4f4b4e412c39708c525dc69cbfd3a6be3bfcd156ed538b635a0140d38b462 SHA512 3bb98386c3fd2e9829ff22057921336a4c688bf6bd2e791d939e5323acd43aff5f4638e7c0110a02eafb2c494273fb11aad8c026ab100d0ac41d7d39844315eb
 EBUILD docbook-xml-dtd-4.2-r2.ebuild 1310 BLAKE2B 801f8c553e1e976b04207b9cc5619c08bda5dbe73b3e1d50063ccb0610a664f50808049abcaaf3d2534aebd70df031d517eb286b3621f574333f32e8814abbbf SHA512 1bd2e8373410819a9b1281e5e55b02d9ec8c5dc73c88528636fe31df9e2b4b2c5e61e74f092c87189a0f9a259b1bdca16a5272bfbfd392a2c462acf8153d0e84
-EBUILD docbook-xml-dtd-4.2-r3.ebuild 1628 BLAKE2B 2215cbfd087b9e11adc7d0aba0fe26519dfb8e0723a7fa0e98ca173c159ffd998e9be62c8963adc4283b8d244a54316cdd0065c77daa3148f5aac40e92001f5d SHA512 95c9244690f5272e60b17b407e4cc6aaaa90d471cf9664af05ebed683978da84e2c3af05f9268dba12e2efefa952f5f5888d392d2874e6c7ea65f671bb2f6b4f
+EBUILD docbook-xml-dtd-4.2-r3.ebuild 1622 BLAKE2B 112ba73bd5d5ee54798d1aeba1fa95d58a7ecb52490a32063178124223818ad8a70db2521ec8dda44cad410bcd0c3bfe37ae13983237ccb3e4c7f8cb674e81db SHA512 af7d5429c874a9a297c2bde5b3a50fb5e0a5f6202a3714010083a39040b57828242e7e28435059267da4635e9cc552c98f3afe9c491341612b58a5edd7146f4a
 EBUILD docbook-xml-dtd-4.3-r1.ebuild 1327 BLAKE2B 4f93b50fbdab95fedfada0400d33e1e49ed0b1430cda5e4a6fd1860cff434cdd779c12e1ed70000780882342ebed236d0359059925539d3369ff3aa734d8986d SHA512 1cd700b6c8992d5a5ad0998b28b74fcbd4a19a2e22316a80ca2463cefd3b75f404bc88e68e03c2c8273640c56d5813c8a1235b78cad2235f4571c413fce911ac
-EBUILD docbook-xml-dtd-4.3-r2.ebuild 1628 BLAKE2B 2215cbfd087b9e11adc7d0aba0fe26519dfb8e0723a7fa0e98ca173c159ffd998e9be62c8963adc4283b8d244a54316cdd0065c77daa3148f5aac40e92001f5d SHA512 95c9244690f5272e60b17b407e4cc6aaaa90d471cf9664af05ebed683978da84e2c3af05f9268dba12e2efefa952f5f5888d392d2874e6c7ea65f671bb2f6b4f
+EBUILD docbook-xml-dtd-4.3-r2.ebuild 1622 BLAKE2B 112ba73bd5d5ee54798d1aeba1fa95d58a7ecb52490a32063178124223818ad8a70db2521ec8dda44cad410bcd0c3bfe37ae13983237ccb3e4c7f8cb674e81db SHA512 af7d5429c874a9a297c2bde5b3a50fb5e0a5f6202a3714010083a39040b57828242e7e28435059267da4635e9cc552c98f3afe9c491341612b58a5edd7146f4a
 EBUILD docbook-xml-dtd-4.4-r2.ebuild 1509 BLAKE2B f4d113feca710d9946cd9df5a8f3c1a5a635be3a1a869a25ea03f843623d2d53752a40304e848cec83c337bc9a5d7ad52b424993ae07b1d6eaa60789ec4692cf SHA512 e657fa64429a248e02fde6214dfeb0ae9e8de59fc1d4888335b300bdbba36b58c4528f6420bd6219720bce737ed2109d6a52244eab3f4628e06f20945cadd7c8
-EBUILD docbook-xml-dtd-4.4-r3.ebuild 1661 BLAKE2B 5271aa3a6bc23f340e6002a2684b50a44fb6182843aeb89b4afcc501192e52bd6914e4056f59a1be64d260db51c97ea251de22b8c3194de3108e720a6fa047ab SHA512 4a10daa399e721900f62328c738e14210f741bed807562e005b1490e42a303557d2ba471c0687879a826f8037df859672db0040d9b0a1fe17994b5ca9bf31f54
+EBUILD docbook-xml-dtd-4.4-r3.ebuild 1655 BLAKE2B a769ddc4838a4a4d7c728fc996f191a05562e0259d0d4cc8dbc4724ef2b21875c36e9564d1014bd4850844ad37e0267ffa2fae0999786d598f4efe84f7011d48 SHA512 7e7ce7ac845e66c97bfc14e9ab367e9ce302c72f5de5bf02917f3c5f7db79d95ea2e6c0108f09c2d97e86876780b999d0c864257e83f6df6350142e16447d07c
 EBUILD docbook-xml-dtd-4.5-r1.ebuild 1561 BLAKE2B 63d28ed0626a3d2fdbef2e6f62d0469590b8078b49423149b90198e4d4f88939a1991da8a88236d0341df6a112d9540fe9fd58cd7f5eed0e1fc519e9b870279d SHA512 b61f411c8f2f87dbca620293afd2507437f893e926356c60d463b67c9b09b4767b5c6f1c87d810c48626e4aa67c7b35e3a39ee771a0327b18066c2c4cc638193
-EBUILD docbook-xml-dtd-4.5-r2.ebuild 1661 BLAKE2B 5271aa3a6bc23f340e6002a2684b50a44fb6182843aeb89b4afcc501192e52bd6914e4056f59a1be64d260db51c97ea251de22b8c3194de3108e720a6fa047ab SHA512 4a10daa399e721900f62328c738e14210f741bed807562e005b1490e42a303557d2ba471c0687879a826f8037df859672db0040d9b0a1fe17994b5ca9bf31f54
+EBUILD docbook-xml-dtd-4.5-r2.ebuild 1655 BLAKE2B a769ddc4838a4a4d7c728fc996f191a05562e0259d0d4cc8dbc4724ef2b21875c36e9564d1014bd4850844ad37e0267ffa2fae0999786d598f4efe84f7011d48 SHA512 7e7ce7ac845e66c97bfc14e9ab367e9ce302c72f5de5bf02917f3c5f7db79d95ea2e6c0108f09c2d97e86876780b999d0c864257e83f6df6350142e16447d07c
 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
index bd143e6edef9..0ed4c7b276a8 100644
--- a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.1.2-r7.ebuild
+++ b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.1.2-r7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://docbook.org/xml/${PV}/${MY_P}.zip"
 
 LICENSE="docbook"
 SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv s390 sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=app-text/docbook-xsl-stylesheets-1.65
diff --git a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.2-r3.ebuild b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.2-r3.ebuild
index 9fe015b70522..6e13510bf932 100644
--- a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.2-r3.ebuild
+++ b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.2-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://docbook.org/xml/${PV}/${MY_P}.zip"
 
 LICENSE="docbook"
 SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv s390 sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=app-text/docbook-xsl-stylesheets-1.65
diff --git a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.3-r2.ebuild b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.3-r2.ebuild
index 9fe015b70522..6e13510bf932 100644
--- a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.3-r2.ebuild
+++ b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.3-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://docbook.org/xml/${PV}/${MY_P}.zip"
 
 LICENSE="docbook"
 SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv s390 sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=app-text/docbook-xsl-stylesheets-1.65
diff --git a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.4-r3.ebuild b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.4-r3.ebuild
index 268166710aa4..50c88d83dfcb 100644
--- a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.4-r3.ebuild
+++ b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.4-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://docbook.org/xml/${PV}/${MY_P}.zip"
 
 LICENSE="docbook"
 SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv s390 sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=app-text/docbook-xsl-stylesheets-1.65
diff --git a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.5-r2.ebuild b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.5-r2.ebuild
index 268166710aa4..50c88d83dfcb 100644
--- a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.5-r2.ebuild
+++ b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.5-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://docbook.org/xml/${PV}/${MY_P}.zip"
 
 LICENSE="docbook"
 SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv s390 sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=app-text/docbook-xsl-stylesheets-1.65
diff --git a/app-text/docbook-xml-simple-dtd/Manifest b/app-text/docbook-xml-simple-dtd/Manifest
index 27843532a56b..9f9be36debab 100644
--- a/app-text/docbook-xml-simple-dtd/Manifest
+++ b/app-text/docbook-xml-simple-dtd/Manifest
@@ -5,9 +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 991 BLAKE2B ec8220e283eda21a08bde22fd990526a5dd7f756b874a554c44b236bd5169902753d0e286bf0a2dea1e2c476d3fab6f9f951b39a389e890ab822857f7e005efc SHA512 7e3da43114a8554d887921b5e5f0888446524c4c105de57cebaca1c6ae27e6589730330e796e0a41384bef85c3d16f22e7ad6ed5d68508b38acb50f8fe88a2d8
-EBUILD docbook-xml-simple-dtd-1.0-r3.ebuild 1332 BLAKE2B e537b36db3a30eba9b83c7b320dce86aa2b885689bf9ca95d6a469b7d271e9b3a6d9b1f20d5da5a29667d35a7d5b0de090ed5aefddbfdcbbe042344a86bf3e5b SHA512 a6dcd9dfc7ef95c52113d4b0038288d4bc70a5baeb7a379d763abb5cae07a427fd2c08b5a07b7d82f8e966ecab56549983273b7b92425be63e1632e868c6f677
+EBUILD docbook-xml-simple-dtd-1.0-r3.ebuild 1326 BLAKE2B b3e9a38a1bb74b1fc6f53865511aa8664372cc8eeff4956c1ad7f6704d6484b0566191058a4b8547c2b53166ae2aef7354178e5bbca2ef98846b23a59b2711ec SHA512 430a3fc636209eef191bb68182ba3790076dcaab3fefaaf5a09c4dc5b3a84ffd12465b9e6c8e291ea06455045d5721959991558200efab03237488bd9773c9fc
 EBUILD docbook-xml-simple-dtd-4.1.2.4-r3.ebuild 1047 BLAKE2B 222732b5fdf3bd8909b55521da64d945b0dbce6ff2e7f0adce99c0fd1b0ab276a5f654387104474307ef9275738c1aee48f696da0cce2cf3b386d847e0e1bd1b SHA512 d903e1e18c25c7754b28a534a9c5b251ea9db22b16eb813d63e9eff740b49d34f0ae490a7f142f0a395cd1a40b39ed5f7af69ee8575196e75af99df3660a39c6
-EBUILD docbook-xml-simple-dtd-4.1.2.4-r4.ebuild 1362 BLAKE2B c92c7969af79fa07af5bacc8641abfa129d26c641b4dae90291d1e559deff570d5e7b43916cdebab5ba329cf1bbb48c3e8d652b8edb3e2e1d0be4d1f563f61e5 SHA512 5ab71017b850eee718eac8f154a7785451f0701a52f449549f4cb7f94b7985a204b30fbb1678a87922cf67c3918cb34bf3772a83583b9167b07570750ca3ba34
+EBUILD docbook-xml-simple-dtd-4.1.2.4-r4.ebuild 1356 BLAKE2B 1e3924e51bdce18b7dbb77f1e95759ef1554a064d6db92a3989b0d6b5e72e083ef790ad99b3a05f4706cf6522d6771961b73d417fabfc5682471469b22683aee SHA512 afead15a67e7f33974fa86ec2f922ddd6a2593bc37decaf55513a3838363819cf66d1996f5656fcaf65cf83f0395e3d46743a74b5e4984b0ea013c2dc91f3496
 EBUILD docbook-xml-simple-dtd-4.1.2.5-r2.ebuild 983 BLAKE2B 39691ba0d295337040f90fdfdd4b25b71e8704ab5e0535214e177c6bbd7194f197a181ee29d97967d2fcf9854a6ef7411ec509870fa596952200cd6006684a98 SHA512 f03d3b47009356acac7631342c480a2789066cdd42653f60845d34882038c96797e427106d3f3ca467e5af95643f5c4972da36291ea1dafca7e061b85a2fd429
-EBUILD docbook-xml-simple-dtd-4.1.2.5-r3.ebuild 1349 BLAKE2B 03599aab924418066f38c277a4690d56d9d6df3dbee467faa52f1842d11cc1d7147bffaad6135a257db9619c7d0652995e8cb52bf9e365d87ea760674a3c0c4a SHA512 4141edd7a177b6d63e4aaf0c7898b088bb519ef30965d67775587ebc43638b7073a6b70f5819eabc4e3d1e25c8636e93bcb7606a45fad5f06f7fe5ac8be96cdf
+EBUILD docbook-xml-simple-dtd-4.1.2.5-r3.ebuild 1343 BLAKE2B 8bdc8b34e5253b346475bc6784538609aea908217f466739017df1389f0859b7ee772cdf1c0060b7df5b2ebdbecca799ed848e72bce962aea3d99adae1408b0e SHA512 82313d3aa2e17c88466c32464318c26bef9bb88b58ca147906a188d34b017a36c3e04b703f5ad851c175f9665ba54de1a4cdc0f24683eb6dbd710ab3021b428b
 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
index d0992b013d32..e51cdbd75e99 100644
--- a/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-1.0-r3.ebuild
+++ b/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-1.0-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.oasis-open.org/docbook/xml/simple/${PV}/${MY_P}.zip"
 
 LICENSE="docbook"
 SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 s390 sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris"
 IUSE=""
 
 RDEPEND=">=app-text/build-docbook-catalog-1.6"
diff --git a/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.4-r4.ebuild b/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.4-r4.ebuild
index 4e98dca17d18..16021b838e23 100644
--- a/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.4-r4.ebuild
+++ b/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.4-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo/${MY_P}.zip"
 
 LICENSE="docbook"
 SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 s390 sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris"
 IUSE=""
 
 RDEPEND=">=app-text/build-docbook-catalog-1.6"
diff --git a/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.5-r3.ebuild b/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.5-r3.ebuild
index 22cf9063c97c..8206fbebb25e 100644
--- a/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.5-r3.ebuild
+++ b/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.5-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.oasis-open.org/docbook/xml/simple/${PV}/${MY_P}.zip"
 
 LICENSE="docbook"
 SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 s390 sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris"
 IUSE=""
 
 RDEPEND=">=app-text/build-docbook-catalog-1.6"
diff --git a/app-text/enchant/Manifest b/app-text/enchant/Manifest
index e980da8e3c56..a1ff469550b7 100644
--- a/app-text/enchant/Manifest
+++ b/app-text/enchant/Manifest
@@ -5,10 +5,12 @@ DIST enchant-2.1.0.tar.gz 962857 BLAKE2B f1ee729f20f06c14cbe81c27eeff5ff3bfe9e81
 DIST enchant-2.1.1.tar.gz 961821 BLAKE2B 1aaedc16e2108a382390c9401233d6a77dcff8732fb0af1a35816993b8eb127f22f9e6f4359b997f6793f53dd37c50c1c69d2aa09cf53bb5c47baa47277e044e SHA512 5cb57198ea826da6d9ed9042edca87fcca9b811e8e75b382ed1568c5b1d8d4f8d6ba732a167c8d52261cfce540f23f84bd4d2889a4beafd2db1d8509c0b6bc15
 DIST enchant-2.1.2.tar.gz 963236 BLAKE2B 3adaf9d96c7e2d7c5e31fe31ac426230f2e88b1cd6f68157e11f13c30fc5c161723d5a5b40bbe158307ce7352e098cd22272f4a75786854f7d82a0c5694b0f2b SHA512 6cb2eeccc617c005998b16ebc33a84a05cec116b26fd679fc1416110821a85a16605c8564672e1168ac6c865cfcca6680005d1219aa615ca1c2393bd523ae0c4
 DIST enchant-2.2.3.tar.gz 957451 BLAKE2B 294c4eb7afbe97a2c8076b1b26640cb15d13dde64de7879557992e3c8ec96d68ff4fbc2c911d3c6d8811d4d5ca5a104040941ab59f8a18e324134e7ac38a2dfa SHA512 abde9d6fec25edff694570455fd4c6e8e2e2c41a6b133bbb31a344761137a354cc1c655e53374cf712bf311c3732dc721e9ffd2dc933d78ec8ccf224350635d6
+DIST enchant-2.2.4.tar.gz 953026 BLAKE2B c1745c365c4084d92988105e072b4776e7f565a53748fdda67ab792777ce78276de5f843ae095d7c025f4f08cfa5daa5e3f9c26acf4e98b0978d589c9e9e076b SHA512 3860f04e276e1afa8969041b3f57411136d6b96ecf90996cdb122739e87be432f12219d2635c29d2e7ef3f2eeb366013026b6f8327a9749ffbc3a1dfafb4b870
 EBUILD enchant-1.6.1-r1.ebuild 1604 BLAKE2B 1316d5ef21c9d0604f33a7e61a11f3e554d072f92346bdcb99e18a3d32544e73591790439d777a42a91edb6a62f552787e047c849895d3344d7024c666a09005 SHA512 730628d378611c32d2f9ee9457620f330a4f3d5d5181cbd8ca6dbf772a95c40f5f10762bd753fafd2c2718c0560e26357d7a08472b98670bab6f5c1e76eb0f42
 EBUILD enchant-1.6.1.ebuild 1475 BLAKE2B 7e0c58a66445f07c64d127e6be81f60dfdeca4f0740d46339bd4651faccdd3a2ee3c0cf5fe2cc47b6c28c9368191ffab54235c3a9de103ba32bcb21901eb4942 SHA512 5cd684fe0979a29dd91e7c590d0fcb5927e0c3bab5e65d2ba3800a3c545b2bb64426bdfa06d04199514f650a566f12af11aed59fb4a053f2cefd3b3e59a404cb
 EBUILD enchant-2.1.0.ebuild 1293 BLAKE2B 28adab1e239028e4c1a1bb58380dd03f6104a4b5ee5ed8323703ce828989bc9f435d4ab10c0e53f2a475dc109f175f5f5a5c894bff326b6a2b251b800d6b85d9 SHA512 1537657246a50e76a4c65082b79ee75c8ed324d448063d840c94f886c043013fbb7ed33ff75c13aa35cfb2b528a5fec294f234948bff9479bcd8f21dffbe30cf
 EBUILD enchant-2.1.1.ebuild 1152 BLAKE2B 3f06209033ef964fce26cb8d7e8555b502316bb6609fcad2d49b9a21f33b2eb804169716879b7b5a16a201fa07f14e6a4dcb324863f0877d26cf6eaa539f08cc SHA512 af7796aa6c0d4688327dc1cdf4abbf2fa84a579178ef26e15a3b61054b781f6987c0ec0fe6b2be182a987c1899180e61288c88065e1a40bca5d0f3eb54131c33
 EBUILD enchant-2.1.2.ebuild 1152 BLAKE2B 3f06209033ef964fce26cb8d7e8555b502316bb6609fcad2d49b9a21f33b2eb804169716879b7b5a16a201fa07f14e6a4dcb324863f0877d26cf6eaa539f08cc SHA512 af7796aa6c0d4688327dc1cdf4abbf2fa84a579178ef26e15a3b61054b781f6987c0ec0fe6b2be182a987c1899180e61288c88065e1a40bca5d0f3eb54131c33
 EBUILD enchant-2.2.3.ebuild 1149 BLAKE2B ae0cde32ccb00ea5a7b10d31763cbb79f0ca49b9e0b90b392fa10812fecd7be8fd8148b35a1dcaeee0eb2dbcd78f0520d3c649bd77f7f8b273c28865ecb5a8db SHA512 ddcf9e3963f4e31392cd4f55b6e15b0c413c560b2446275e30843e85d10c56692b8f4efa5077eb4af92c240fe206484bc9bda4053fe8d95a8c126f649a50d807
+EBUILD enchant-2.2.4.ebuild 1149 BLAKE2B ae0cde32ccb00ea5a7b10d31763cbb79f0ca49b9e0b90b392fa10812fecd7be8fd8148b35a1dcaeee0eb2dbcd78f0520d3c649bd77f7f8b273c28865ecb5a8db SHA512 ddcf9e3963f4e31392cd4f55b6e15b0c413c560b2446275e30843e85d10c56692b8f4efa5077eb4af92c240fe206484bc9bda4053fe8d95a8c126f649a50d807
 MISC metadata.xml 446 BLAKE2B 46f91a78cb6d8ae11b77da0f640e07fd3842e4ed162d0037b9620132f8ae9ac81e4b6353371d2350abd634bc693e8d64c8d94a5496cb28931863ce7a246ab209 SHA512 9e1bdbc66c53f055c8730a6ff7a833e2597f648067087e268495a3337e51fb3d806fbed698a69ac59599100eba90401679f6141c71dd9298030f4771230429ea
diff --git a/app-text/enchant/enchant-2.2.4.ebuild b/app-text/enchant/enchant-2.2.4.ebuild
new file mode 100644
index 000000000000..f4146b3a703c
--- /dev/null
+++ b/app-text/enchant/enchant-2.2.4.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Spellchecker wrapping library"
+HOMEPAGE="https://abiword.github.io/enchant/"
+SRC_URI="https://github.com/AbiWord/enchant/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0/2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+
+IUSE="aspell +hunspell static-libs test"
+REQUIRED_USE="|| ( hunspell aspell )"
+
+# FIXME: depends on unittest++ but through pkgconfig which is a Debian hack, bug #629742
+COMMON_DEPENDS="
+	>=dev-libs/glib-2.6:2
+	aspell? ( app-text/aspell )
+	hunspell? ( >=app-text/hunspell-1.2.1:0= )"
+
+RDEPEND="${COMMON_DEPENDS}"
+
+DEPEND="${COMMON_DEPENDS}
+	virtual/pkgconfig
+"
+#	test? ( dev-libs/unittest++ )
+
+RESTRICT="test"
+
+src_configure() {
+	econf \
+		$(use_with aspell) \
+		$(use_with hunspell) \
+		$(use_enable static-libs static) \
+		--without-hspell \
+		--without-voikko \
+		--with-hunspell-dir="${EPREFIX}"/usr/share/hunspell/
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/app-text/epspdf/Manifest b/app-text/epspdf/Manifest
index d8b95107413b..820d2640cd89 100644
--- a/app-text/epspdf/Manifest
+++ b/app-text/epspdf/Manifest
@@ -1,5 +1,5 @@
 DIST epspdf.0.6.0.tgz 352989 BLAKE2B 633e2ed29d8ec28f679b00095d335cea4bd1996cf6fdf3950b97084a73044eca9371ac6964ad48e98ea8ddba38d91acad2137ee8d3122ea03df3ce25f08196ce SHA512 44a7015fa0b7298429567e998068864419fd396f6b0781bf7877c6599d3bb2f254b7a0f976500655851a95d727880d106d9e1df9086306eef74db0b109a63506
 DIST epspdf.0.6.3.tgz 335975 BLAKE2B aacd6e222bfe74636dba796fd6e878fa9970f469d096eb77acf4a336a0ab5620629de7ba1c763afa62b181887724db55be57d1929a041a945c7d74ea3028d6de SHA512 ddb0d8c17b6b0bbb934312e6253a2b689d2545c892af989efac9782022c501109f2ff57bb2ea7c26d63d7747e2a510c18bd22a6076bb7137fe0252c38b2125ea
-EBUILD epspdf-0.6.0.ebuild 1272 BLAKE2B b140340408b9758f34d135222ba4f8f7a7392793b9bc0b1c126f28a8c56594a1a9261140a0ab1ccb4d11efbba119a1c3f9060c459d7156726b470987ce8df066 SHA512 33bc948faa3974610155dbc2ab7227f9328f9832aa943ac01ee6c6d22473d5bfe8faf2c401d12b9b4d86fcc76642eb1f221f4ed5c0cd0fe280096539b6fd7823
-EBUILD epspdf-0.6.3.ebuild 1368 BLAKE2B 2a1039df5f67ce0dfad67c37ae097fee993ad7dab67496ccea9a0933260cbca4c928c60a375300ab1d51bae22483c54649f078499b08535a0d04287304a3e8b9 SHA512 b40e1a9f7e1608ad78131f3cb74804d5865ab9aeba5c25e17fb299f9d8481c58bbd39a735b4646fe5d3e5a5de507083274211cd412f3b09da832581c51a71b8f
+EBUILD epspdf-0.6.0-r1.ebuild 1259 BLAKE2B c0984abbe4657d40b05e0cc4e0aa968fcacdb0bb9e170a164a72e499d4370ab9cccd011ef32b0c841ff700c537709591f9147dfb8e960ea4d97d87e236455d8f SHA512 47f4e15c3009574ac1cd97490d62a6fd3a1a5e357ccfbf89e7157d77f4e9b4967b39c4c14afd46c81f6f58a4eb16daf0793cc0d1869ca1301fbef4b7aab183ae
+EBUILD epspdf-0.6.3-r1.ebuild 1365 BLAKE2B 52676e8d006dd0ac4d7a723fdf2d7dfb153faacef0b11623e9d926a854be83dcda37eec6e5e1cffefdeb91dc3f246c155ef88a1c8b0058eb9303b3a178dee10f SHA512 9f90d537edec78139a28b2defeb3ffb253428c1539bb61dd5a394b3399dc3a892b94beb215790a1d0467b627b51797bda278d73f60ab68e432c79460b7098693
 MISC metadata.xml 245 BLAKE2B ee3a163cfe0a4bc59c0dfb46f9ddb580e2d259b4d0e33cb4e684eb9e6d4b901bf97c6edd891f3b75a613a782f1b89318d0ee3ec9bee4e34c4441d9e8f4267678 SHA512 1653777623e2c15e1ce13229e396723b2cc9c214983e0f8592de98c01a31badc6c38c6735ed44f937d145883b43fb6f049af3eddb9ff96b18c96ccf8f67dd690
diff --git a/app-text/epspdf/epspdf-0.6.0.ebuild b/app-text/epspdf/epspdf-0.6.0-r1.ebuild
index 91e89b55123a..71f98598f49d 100644
--- a/app-text/epspdf/epspdf-0.6.0.ebuild
+++ b/app-text/epspdf/epspdf-0.6.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
-inherit texlive-common eutils
+inherit desktop texlive-common
 
 DESCRIPTION="GUI and command-line converter for [e]ps and pdf"
 HOMEPAGE="http://tex.aanhet.net/epspdf/"
@@ -14,7 +14,6 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc tk"
 
-DEPEND=""
 RDEPEND="!<dev-texlive/texlive-pictures-2011-r1
 	>=dev-texlive/texlive-basic-2011
 	app-text/ghostscript-gpl
@@ -38,7 +37,7 @@ src_install() {
 	dodoc doc/Changelog
 	if use doc ; then
 		dodoc doc/epspdf.pdf
-		dohtml -r doc
+		dodoc -r doc
 	fi
 
 	# give it a .desktop
diff --git a/app-text/epspdf/epspdf-0.6.3.ebuild b/app-text/epspdf/epspdf-0.6.3-r1.ebuild
index 38aa8ce944d6..a4c25c3c9add 100644
--- a/app-text/epspdf/epspdf-0.6.3.ebuild
+++ b/app-text/epspdf/epspdf-0.6.3-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
-inherit texlive-common eutils
+inherit desktop texlive-common
 
 DESCRIPTION="GUI and command-line converter for [e]ps and pdf"
 HOMEPAGE="http://tex.aanhet.net/epspdf/"
@@ -43,7 +43,7 @@ src_install() {
 	dodoc doc/Changelog
 	if use doc ; then
 		dodoc doc/epspdf.pdf
-		dohtml -r doc
+		dodoc -r doc
 	fi
 
 	# give it a .desktop
diff --git a/app-text/evince/Manifest b/app-text/evince/Manifest
index e93b68b0f83f..68477b191c28 100644
--- a/app-text/evince/Manifest
+++ b/app-text/evince/Manifest
@@ -1,6 +1,8 @@
 AUX 3.30.2-internal-synctex.patch 964 BLAKE2B cce1d02b40b18a23773985e2d9f39b1782e56ee9e032d625e51796723a2ad43e3cb9083055bcbc10438cb70b15e7c7c6737db3d7276db1e02b19127c5d75e527 SHA512 f1a98d09a0fee6add7a5a44d756ceaa003cbb3840e74a513c1f01ad6826ee4136cc5b862b675401371951468f1cdb2e5137158c44801a0c9ebe79c60951b8fbd
 DIST evince-3.30.2.tar.xz 2288868 BLAKE2B dd0423b7ec51daf897bfbc45afb298f9ee23b28ada3dfe5d5d2808b4515bdc7077a7e0ae46541876bb2fbfd8aa9ec44abc7aabcb3cb10b6e52912f0ac1358eeb SHA512 dfffcf15547d0720bd2379054d7b9bee02f8bea7113562162cbab62d77cf84c04f70dcc87a3e6b1ba62db38783df8f481d801854d8f0767f60e9cfabd9efc646
 DIST evince-3.32.0.tar.xz 2564236 BLAKE2B 203bc6ff6b8b2a3d30ebd30f7f9be6269ded5044521da7d2732cb759db8e8ebd2d565c2ad04908e11ec1f726ec70dd2931c58c9b31951a7b3d3165c61042c87f SHA512 565298a200d9ae2f6b4cb53c3cba0d0d0e4cfbef60e4145bfb9c82a5682947ceb2371e52c27179cd69a238cd387bcfd744d3c55df814b6347f07781aec3ea658
+DIST evince-3.32.1.tar.xz 2567868 BLAKE2B 8fec9ce1981fb2c5fc60c4b653f462f07f0341ebe64a5615f1e1a123533f8053c6f76a02d05da9245b4263c24df1cdd2e28aa89486b8c802a2aa14cf04faf13b SHA512 29028fedde9aff85e53a5059f63df007e1bac7d662a91fe01e1bb8c48349d5674afe3ce37f9c495e4b208fd476b22f4ecaf749c6d7c3362a03b05703400ece05
 EBUILD evince-3.30.2.ebuild 3114 BLAKE2B 839716b0960b7a8ed6e7ad682de262f432711dca58d51a313d40c15f7737d4b174d514066301974e9b0e8356b98c561b687de6de6ded6875f6929c5efb8188c2 SHA512 e46cddcc1296237685d865c2a1e5c5400add7c1d329c9887e79bcda2b4d73e26be5e3114edee9406828ba6e25e56eb9e46061d5e4f702faf7d1c3ed831a7e41f
 EBUILD evince-3.32.0.ebuild 3117 BLAKE2B a151578067d49c84001bf878991f425273c8634ba2dd35b0fe2444c469db250dbadf0e30f6ed05d7ef7b7853cee2d9f484693e122b201d6d07aa7294f6cf8a4c SHA512 2911fd3bbe41c67fc96492f9643940c5ff690634301dfad93c3b2120fd60dd1af629cdde5f1cc94567a133441e122ece244c5903dae683a7feb60fcb5ac6f719
+EBUILD evince-3.32.1.ebuild 3154 BLAKE2B 47404bc3ef9ae27dfb92dd454014bdbcb7bd63653bdf7c0e546b3c62506b4df0523ca536c2f6c9c03b3f8109c46ce1a6841d00608400f17ce29a378556a7d40e SHA512 0b4f8727604ff1d8592e8588b03615246884d1358671b1bf141ee0ea49ba0db5d997cfbadd61cf102325efe201ddd5c19f09d1a2681ef92f7d38cbe9abf9839d
 MISC metadata.xml 881 BLAKE2B 180e93316fad8f1bf7b80028a86c18964e695c93292b724e864ed50f3fbd951f810fd490b91944f30e42f632ce090dbe34aadf9679b2e62c118aa75b7b0ea834 SHA512 ece377a284a548444c185a7c1fa4c36546709ec00754d066eb4186fba0f079de60b02dcb75f3fd101d50c8ea8f4d4d654d7efd0d8ff8db7b2b85c097c18b43c5
diff --git a/app-text/evince/evince-3.32.1.ebuild b/app-text/evince/evince-3.32.1.ebuild
new file mode 100644
index 000000000000..c236ab722168
--- /dev/null
+++ b/app-text/evince/evince-3.32.1.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+GNOME2_EAUTORECONF="yes"
+
+inherit gnome2 systemd
+
+DESCRIPTION="Simple document viewer for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Evince"
+
+LICENSE="GPL-2+ CC-BY-SA-3.0"
+# subslot = evd3.(suffix of libevdocument3)-evv3.(suffix of libevview3)
+SLOT="0/evd3.4-evv3.3"
+IUSE="djvu dvi gstreamer gnome gnome-keyring +introspection nautilus nsplugin postscript spell t1lib tiff xps"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
+
+# atk used in libview
+# bundles unarr
+COMMON_DEPEND="
+	dev-libs/atk
+	>=dev-libs/glib-2.36:2[dbus]
+	>=dev-libs/libxml2-2.5:2
+	sys-libs/zlib:=
+	>=x11-libs/gdk-pixbuf-2.36.5:2
+	>=x11-libs/gtk+-3.22.0:3[introspection?]
+	gnome-base/gsettings-desktop-schemas
+	>=x11-libs/cairo-1.10:=
+	>=app-text/poppler-0.33[cairo]
+	>=app-arch/libarchive-3.2.0
+	djvu? ( >=app-text/djvu-3.5.22:= )
+	dvi? (
+		virtual/tex-base
+		dev-libs/kpathsea:=
+		t1lib? ( >=media-libs/t1lib-5:= ) )
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+		media-libs/gst-plugins-good:1.0 )
+	gnome? ( gnome-base/gnome-desktop:3= )
+	gnome-keyring? ( >=app-crypt/libsecret-0.5 )
+	introspection? ( >=dev-libs/gobject-introspection-1:= )
+	nautilus? ( >=gnome-base/nautilus-2.91.4 )
+	postscript? ( >=app-text/libspectre-0.2:= )
+	spell? ( >=app-text/gspell-1.6.0:= )
+	tiff? ( >=media-libs/tiff-3.6:0= )
+	xps? ( >=app-text/libgxps-0.2.1:= )
+"
+RDEPEND="${COMMON_DEPEND}
+	gnome-base/gvfs
+	gnome-base/librsvg
+	|| (
+		>=x11-themes/adwaita-icon-theme-2.17.1
+		>=x11-themes/hicolor-icon-theme-0.10 )
+"
+DEPEND="${COMMON_DEPEND}
+	app-text/docbook-xml-dtd:4.3
+	dev-libs/appstream-glib
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	>=dev-util/gtk-doc-am-1.13
+	>=dev-util/intltool-0.35
+	dev-util/itstool
+	sys-devel/gettext
+	virtual/pkgconfig
+	app-text/yelp-tools
+"
+# eautoreconf needs:
+#  app-text/yelp-tools
+
+PATCHES=(
+	"${FILESDIR}"/3.30.2-internal-synctex.patch # don't automagically link to synctex from texlive-core - always use internal copy of this small parser for now; requires eautoreconf
+)
+
+src_prepare() {
+	gnome2_src_prepare
+
+	# Do not depend on adwaita-icon-theme, bug #326855, #391859
+	# https://gitlab.freedesktop.org/xdg/default-icon-theme/issues/7
+	sed -e 's/adwaita-icon-theme >= $ADWAITA_ICON_THEME_REQUIRED//g' \
+		-i configure || die "sed failed"
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-static \
+		--enable-pdf \
+		--enable-comics \
+		--enable-thumbnailer \
+		--with-platform=gnome \
+		--enable-dbus \
+		$(use_enable djvu) \
+		$(use_enable dvi) \
+		$(use_enable gstreamer multimedia) \
+		$(use_enable gnome libgnome-desktop) \
+		$(use_with gnome-keyring keyring) \
+		$(use_enable introspection) \
+		$(use_enable nautilus) \
+		$(use_enable nsplugin browser-plugin) \
+		$(use_enable postscript ps) \
+		$(use_with spell gspell) \
+		$(use_enable t1lib) \
+		$(use_enable tiff) \
+		$(use_enable xps) \
+		BROWSER_PLUGIN_DIR="${EPREFIX}"/usr/$(get_libdir)/nsbrowser/plugins \
+		--with-systemduserunitdir="$(systemd_get_userunitdir)"
+}
diff --git a/app-text/ghostscript-gpl/Manifest b/app-text/ghostscript-gpl/Manifest
index 661374940e72..58d47545a003 100644
--- a/app-text/ghostscript-gpl/Manifest
+++ b/app-text/ghostscript-gpl/Manifest
@@ -1,7 +1,7 @@
 DIST ghostscript-9.26.tar.xz 33059724 BLAKE2B 7ccb9730db8ae056e67bf8d7fa097a4cb529605e12214ab81253d2d354d26c24e393c8bec2ecdb51a1fefe8443b8af47758705c2fb6b1dab59932140c5de07ca SHA512 3ddb83029edf32282357bf606f4045a9ac73df6543cd423cfad09158ec12ada083a0dbb5aac3b73ae24cbc6c1e9d7574257a5c1fae63ba8776fbb00150ef2a3e
-DIST ghostscript-9.28rc4.tar.xz 34608244 BLAKE2B f659b73d88b14f07e2c5b0ece7bc8dff5f9daf831a6da3f37e9613b00799929fb505c5ce7b98f181f617f2a2744b7abcf8be770b2ca0bb8389c439934541432b SHA512 a73dda81de96d93c1cdcc712356b1e06349d0e35af3db726b3581e5e1289cb656db52426f2aefa699c8fb137d0058e7a1238f54f0d2165f0c7ca86c96eb42fbc
+DIST ghostscript-9.50.tar.xz 34613344 BLAKE2B 999af7525ec84448256bac233a81ea3b8d4dcb8cd22fd67dc26dd542840259cef0c1438b85274f1d9c192784ecc5d36cb47a3d4482ebbe19ea8843404f9d0ad2 SHA512 3c1e5db519a427f4b6bfb8d93f3c3dfb67d5ec9ccd19c7afa7670deb768515f3fc617c5588e54934bbfbedfdf8609ce2ffa36dd7da3cb618937fe034f64f43ee
 DIST ghostscript-gpl-9.26-patchset-1.tar.xz 3716 BLAKE2B 0a4c32b3d0c0152b0dc7c62bf2b0bc8e30a369c2aed7c7be4a231948123c2242ce96ae5b1fd485bdae84d7cde1be9f3b3a16831fe77dfbc7ac6cd28bb5e14442 SHA512 7ad9558b00cc11d0872b32d2f1430d2e47730a2360c79d88299c87f8d6d4c15adb5c679ebdcaf50c58d9051c6a1d6f6873e4d81aadfbf3ce202ad94b6dc8981f
-DIST ghostscript-gpl-9.28-patchset-2.tar.xz 2560 BLAKE2B 137b6a817c9773f723e3533635866cdb0aef53fe957d432cc86ad314b0e972cba8aab4eec27fcb2e16972158f9b5692288d7e783398b5a5900a9f835a1d62eba SHA512 52c14d15a3cdda9c19102e25a10c5c5f57352414124bb4fb2b803e89b34bddf9ab6fc83e343619e4ff98f707f0b4acea6806419882ebe1d18e3486a8ff975526
+DIST ghostscript-gpl-9.50-patchset-1.tar.xz 3840 BLAKE2B 12bda8633b5657b1b480b69d5a039be724c1af9a1a67e3509112fb607565e087500d2a6efaacd5e774e0f24b01fa6e8887a56fa0207cfc6fcdc3768b0156f86f SHA512 dc638ffb48425980202e7064ee40f65b0f78041c82601f87035100a50d5e18455aa1b852c8c1d852fa582b8be52276d078d80463e3b25ab73863a8544d0e08c1
 EBUILD ghostscript-gpl-9.26.ebuild 5128 BLAKE2B 30304f954fbef282379ad86802d4aa3ce2c8c5964ea9e63c3bf57c8d0b4896e59b3b02f2238aabc5ff4d90a96e0da3b01b16e42420e89670cf84f1181b0edfab SHA512 0d626ed577c443f1628b5f8f99672d27799c32ac83a73c6f2b3f3f3c1f92888bf24279ba7bca161552e5cc8f51de2d3ebc450beb6b724ad65329d4495bad273d
-EBUILD ghostscript-gpl-9.28_rc4-r1.ebuild 5292 BLAKE2B 4cdccc4d4bdea5d9c00b6e05cfb2987a0e5f45b2c424f053b9ce197f2c74eb2f7ba1e8aa9b928f49377cc3e4ad471d84a0e27ad24d92c365c2ce3a824b362f74 SHA512 4e6b797b050e2ed9eeaf98f3e7a5c18b86ebc14113ebe1fae3c55335b69b0ee8e7c6503cc94e412d6157ff356ce28cb00e1839ece36c0f11c1fa73edb3d6c003
+EBUILD ghostscript-gpl-9.50.ebuild 5387 BLAKE2B b1bd13a12c43bc94c49223aad5e912456c3cc81d837e6b0f5218fb5e3ecead41c420f654f5fd098f6f73589d12e8d36cce3c18c4c3e505faef36eb3cd29e66d7 SHA512 24d4eb24f7d97393527d624fbc2425092215c0594b2541ad3cc0dc196f59f1e086727dd58aa16d6389bd67f72663a58d084eb782bdb62e7858f7b6955c1ed8b7
 MISC metadata.xml 583 BLAKE2B cc9bd976a53f467582f4657d0f08862454c53783d1eeedf90dfe9fab7e074a8903a48632b03847e4aeba4d9f6cf821ebda120c1de1e64740641e4849278646a8 SHA512 3de9e76a9a3b6fff971d0760b3590a60448014268f45faa742327a90b1cd8c40eae1426026cda590dd9f91c96580eabbba85125c88ed250479b8df675f45bb15
diff --git a/app-text/ghostscript-gpl/ghostscript-gpl-9.28_rc4-r1.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-9.50.ebuild
index 07b9d80dcbfa..0c47bd6c911a 100644
--- a/app-text/ghostscript-gpl/ghostscript-gpl-9.28_rc4-r1.ebuild
+++ b/app-text/ghostscript-gpl/ghostscript-gpl-9.50.ebuild
@@ -13,7 +13,7 @@ MY_P="${MY_PN}-${PV/_}"
 PVM=$(ver_cut 1-2)
 PVM_S=$(ver_rs 1-2 "")
 
-MY_PATCHSET="ghostscript-gpl-9.28-patchset-2.tar.xz"
+MY_PATCHSET="ghostscript-gpl-9.50-patchset-1.tar.xz"
 
 SRC_URI="https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs${PVM_S}/${MY_P}.tar.xz"
 if [[ -n "${MY_PATCHSET}" ]] ; then
@@ -22,7 +22,7 @@ fi
 
 LICENSE="AGPL-3 CPL-1.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
 IUSE="cups dbus gtk l10n_de static-libs tiff unicode X"
 
 LANGS="ja ko zh-CN zh-TW"
@@ -34,7 +34,7 @@ DEPEND="
 	app-text/libpaper
 	media-libs/fontconfig
 	>=media-libs/freetype-2.4.9:2=
-	>=media-libs/jbig2dec-0.16
+	>=media-libs/jbig2dec-0.16:=
 	>=media-libs/lcms-2.6:2
 	>=media-libs/libpng-1.6.2:0=
 	>=media-libs/openjpeg-2.1.0:2=
@@ -62,7 +62,9 @@ S="${WORKDIR}/${MY_P}"
 src_prepare() {
 	if [[ -n "${MY_PATCHSET}" ]] ; then
 		# apply various patches, many borrowed from Fedora
-		# http://pkgs.fedoraproject.org/cgit/ghostscript.git
+		# https://src.fedoraproject.org/rpms/ghostscript
+		# and Debian
+		# https://salsa.debian.org/printing-team/ghostscript/tree/debian/master/debian/patches
 		eapply "${WORKDIR}/patches/"*.patch
 	fi
 
diff --git a/app-text/gnopaster/Manifest b/app-text/gnopaster/Manifest
deleted file mode 100644
index d173388bed74..000000000000
--- a/app-text/gnopaster/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST gnopaster-0.0.9.pl.gz 2791 BLAKE2B e83b1163bfe520a33b7cf8e76eccd35051bab4bc816bba0ec24e2655e7f47fec2ddb8dbc6f0aaeb804feadf1ef4e41b4e8148d7b3f03a6e0c586c34bfea47791 SHA512 db7f6ffa7e0d4d9c4fcfaf830ee0b9aa40736ef8e67b12b8de4a4a0ad9e02964fa4c5b8521fed6299c336fb7ecd7cbfe8a9f7b2b0d5ed823545b5e67ff6c48cc
-EBUILD gnopaster-0.0.9.ebuild 488 BLAKE2B 69911181cef228c8a9b3d534a7750f257bcf872a28a8d4eda00fec6eedb3da79feee475a2712d87201d9980c760c06058457cf04a57936a01098862b8939139e SHA512 30ec23beeaa5b59f5b9ac3f5c2c8bc220bc26d5bab5dd66208065598e55c061d3859816be215346caf8fc1a37d8e904004d7f534bbbdd05d40c7ec3e25fe3317
-MISC metadata.xml 245 BLAKE2B 6f67aa02d51bd19681070c5991e15578c370a6a5e629814c6fe22f112dc18e571b47f4e38cef704f3d1c560fca9c3ea48c865880d5d4521f2e2415e7fa13db4e SHA512 09853ccf6aa61683ae8b490342245ae8d790a246a91c1ee165aa3f9905a7a002b974d8dff65381432a859682900ff02875b819afff856194d9c92ef0d99d70cf
diff --git a/app-text/gnopaster/gnopaster-0.0.9.ebuild b/app-text/gnopaster/gnopaster-0.0.9.ebuild
deleted file mode 100644
index d4ff316741bf..000000000000
--- a/app-text/gnopaster/gnopaster-0.0.9.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-DESCRIPTION="A submitter for gnopaste, a nopaste service like http://nopaste.info"
-HOMEPAGE="http://gnopaste.sf.net"
-SRC_URI="mirror://sourceforge/gnopaste/${P}.pl.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-DEPEND="dev-lang/perl
-	dev-perl/libwww-perl
-	dev-perl/Config-Simple"
-
-src_install() {
-	dobin ${WORKDIR}/${P}.pl
-	dosym ${P}.pl /usr/bin/${PN}
-}
diff --git a/app-text/gnopaster/metadata.xml b/app-text/gnopaster/metadata.xml
deleted file mode 100644
index bf00a5257491..000000000000
--- a/app-text/gnopaster/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="sourceforge">gnopaste</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-text/gspell/Manifest b/app-text/gspell/Manifest
index 5fe6a4e11b46..1e50b37c540a 100644
--- a/app-text/gspell/Manifest
+++ b/app-text/gspell/Manifest
@@ -1,5 +1,7 @@
 DIST gspell-1.6.1.tar.xz 416704 BLAKE2B 2a180bc52d3f09813d8de362e5bf900f831663c09530c8a9b993baf55f852a3939447a71c9c9dc0caafba7e8b74a2a5aad4443cf248eb87da4e15e0481e74262 SHA512 f1ffbd0d23d9743bcf924c25b3a3d7bf93c6a5e4ea5e362fb7300f657d8c1d0117e847f3dec29de377947f850e003b24a3231e88e99b313c955dd94ce358c23e
 DIST gspell-1.8.1.tar.xz 419268 BLAKE2B f32c9c518c23f8f560d65eb6fb122703561cc09e385eefa99d0761e8aa5b5bf3a8cec3cab7071043134314262979de56d08ee2929973b7968016b123e53d8f16 SHA512 ae94f46c7bdcdeefa0279cd4ac3c50e53b63092016e298ef6b502c40c2574a2135c503ab322f5a3a7b8b4422fdec291a6ed0c937683a8c0f32d7ad474cc1569b
+DIST gspell-1.8.2.tar.xz 421936 BLAKE2B 5fdff772e716c1f062002d7371064dbbaf6eb43e77cef03b8fca7ea71a91eac82ca54a5463c0f785153a15ceb65ad06aeecc069196765cb78e5dfaff5d81fec6 SHA512 220bdec2b8229e848960e5e31bda1209dedac232637d3e6d4931ca2552054fbdf3f576d52f3d5a7ac734e6e626f2fcc7cefd0bff906b29ba9930cef791906c32
 EBUILD gspell-1.6.1.ebuild 1027 BLAKE2B 4981651ab7e910ffef4d963cffc37f527325cf7d98d6ce5d60b40526fcdd97da22587670f7b99385d13c0b6b6a6045d5288ee299cb02cacab09f46f38288e0d3 SHA512 760314be43139d7de2f670677681953372ad77e990f9102a42ae788966482fcd5dbcb64b68fa83f01b74eaeaabfe5d8d021f01e73c37cecb96ba4e6c57ff51c0
 EBUILD gspell-1.8.1.ebuild 1019 BLAKE2B d134214c4050a378e9ee58931edb6ee4b582e581875e4b1d27e0c0498abcd0774a56eb5631cf6131c3f8e9bb773e8aac6cf83cbb78b8516fa628a3acd37cc522 SHA512 d5a09cbd8e08f4d47839bee3b35c842d915aa0278ada9aad3782456bc9478446b4f4ba1fa2421a942a8933d0fc3a221ab24eed8be201f3322b097bcf975b2bce
+EBUILD gspell-1.8.2.ebuild 1019 BLAKE2B 72f68958561b2fbb450d38bb5463a475577876a59c3def7604f93ce2c7313b06670843e3e3bc563ebf5ebcbfaf86fe3782a0136b91ac4326c00d9eb655e4fe00 SHA512 95b4ead4d83f585535f5dca90b6b7d2f8b47eab567adfddd2940c06044ef7b3888dddaa6a1377451f0e1402a52b09b465e70aaf8b4d6007b1f114c36a9eb6e25
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/app-text/gspell/gspell-1.8.2.ebuild b/app-text/gspell/gspell-1.8.2.ebuild
new file mode 100644
index 000000000000..52ccc9e64039
--- /dev/null
+++ b/app-text/gspell/gspell-1.8.2.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+VALA_USE_DEPEND="vapigen"
+
+inherit gnome2 vala virtualx
+
+DESCRIPTION="Spell check library for GTK+ applications"
+HOMEPAGE="https://wiki.gnome.org/Projects/gspell"
+
+LICENSE="LGPL-2.1+"
+SLOT="0/1" # subslot = libgspell-1 soname version
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+
+IUSE="+introspection vala"
+REQUIRED_USE="vala? ( introspection )"
+
+RDEPEND="
+	app-text/iso-codes
+	>=app-text/enchant-2.1.3
+	>=dev-libs/glib-2.44:2
+	>=x11-libs/gtk+-3.20:3[introspection?]
+	introspection? ( >=dev-libs/gobject-introspection-1.42.0:= )
+	vala? ( $(vala_depend) )
+"
+DEPEND="${RDEPEND}
+	dev-libs/libxml2:2
+	dev-util/glib-utils
+	>=dev-util/gtk-doc-am-1.25
+	>=sys-devel/gettext-0.19.6
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	use vala && vala_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		$(use_enable introspection) \
+		$(use_enable vala)
+}
+
+src_test() {
+	virtx emake check
+}
diff --git a/app-text/html401/Manifest b/app-text/html401/Manifest
index af6cc0ca8e3b..f7317e40a8e2 100644
--- a/app-text/html401/Manifest
+++ b/app-text/html401/Manifest
@@ -1,5 +1,5 @@
 AUX html401-decl.diff 468 BLAKE2B 4854afffaf01650a2c7997976a17d0e72e0fe71271047c362fa2956fa533035b5f2df4363c46c86fe39f3373357716d5913f5727644ecb91cbf65411bc697f42 SHA512 3f79a67c39f8c7a07b1bf0ec451620dd2ba1a8ee935751714262488bb50a5191c4f92362cd26f0438e0251d138d923ff2ebf6e216fbbbf8312c4010b7e3ce7e0
 DIST html40.tgz 369830 BLAKE2B c6fc0f65a9c65df34f534ce1db3cc53ba6ded4481df78f168c1b05b7e3b81fad7ddf3ee519ff1a901f0256af89285eefb39400ebc5b4089c1a16dfe935c6cf21 SHA512 f7423b55f8a5ad2806555700f450e1f46ba4370d1e47f1332e18b01ecd5a41217fc4426ad29c852b6e17100dc4c0a7add9961df35e87660df0e087ad03e4918e
 EBUILD html401-19991224-r3.ebuild 767 BLAKE2B fb6c509178154e010191683b1b3a26449b3136e6e662b9033134314b7587ba69c2583046366e1d7b0cead226dd2e6e3f24e1ba97eb4270a15080d4fa3086164f SHA512 f1669367c90b57b5d53e296736e511fc84561532d61f58caf6b7d76064ec178dcda9b0b02f6f27467c2e0f50059e0cfa37ba78edd6fd0841dbd4eb5d4d296e4b
-EBUILD html401-19991224-r4.ebuild 1016 BLAKE2B 03cb9724820f19bb17c6c05d33dc17f779a50a3b34a3e0d54b51176d8827a8db6807ecc8aba76ef5e3141dd26ccf3bc88ffae15094fba7dc2c33eab4f007c287 SHA512 31831d84796d041e71d4f0da9546675f9ab384b3a67710633e980c0fb389c682ed874e0b188f00e38746d9d433cfa246484e25cf4c35c4d0ecafe2ba2cc3bb92
+EBUILD html401-19991224-r4.ebuild 1014 BLAKE2B f790eb16c25ce67611295a20b6fdc63760fab22aa7c48a0fb331cd4a7079e563937115d0d5f96e931cab17f33fee5da90038c5e4b319a3e63fa1059e031abc74 SHA512 8539faf00e908a5354a6a8a6e5cf38a133c53a3acb720b0adce89c094e183ee72e2279023f2bc3f9e7a1e00f0af47255e6a90c9aaba373f5ae4653b5f9541b15
 MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/app-text/html401/html401-19991224-r4.ebuild b/app-text/html401/html401-19991224-r4.ebuild
index ff2fce81fca2..c51da3def031 100644
--- a/app-text/html401/html401-19991224-r4.ebuild
+++ b/app-text/html401/html401-19991224-r4.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.w3.org/TR/html401/html40.tgz"
 
 LICENSE="W3C"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~s390 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ppc ~s390 x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""
 
 S=${WORKDIR}
diff --git a/app-text/hunspell/Manifest b/app-text/hunspell/Manifest
index 8d5f392b0a45..d3a05b3da2f4 100644
--- a/app-text/hunspell/Manifest
+++ b/app-text/hunspell/Manifest
@@ -4,6 +4,6 @@ AUX hunspell-1.7.0-tinfo.patch 1721 BLAKE2B 1278f50da7577556710a8e481f46ca03ea40
 DIST hunspell-1.6.2.tar.gz 721165 BLAKE2B f377596d2031e89ad902a0f5da85e77948bd5d582bb4c558cc7c379d803a00787237d2feed9d26e037cebb77958709f41fb01d5f8bfed6ae21047a2da83c8f51 SHA512 a23127f1271da95ac06a1fb2f57b659485e959567b61da05b2bb350684003a0fb7e882b5e524c465fd890f79f513ed03174f38611989a1c09081147c47d6da11
 DIST hunspell-1.7.0.tar.gz 482156 BLAKE2B daf689ab44872c78d27bd035d996c61da9b01b7bbe5ced120034b2d64bbead573ad3807dfe5a06ecdbd96c610f42e4ea015be4b2046ebafad13347c08e60913a SHA512 8149b2e8b703a0610c9ca5160c2dfad3cf3b85b16b3f0f5cfcb7ebb802473b2d499e8e2d0a637a97a37a24d62424e82d3880809210d3f043fa17a4970d47c903
 EBUILD hunspell-1.6.2-r1.ebuild 2361 BLAKE2B b75f02e0862a9a8be86d7fb29b663a93f483410bf5d0301bdab8487516c00f132e6268ed0bdf133f2ef746528b93c6b0d7cc71a38eb3f49b33202b125e19e04e SHA512 fa6f2089e74c17adcfeebdce2ffa7f2a56ef86e53f1b05b2a2d7fc61e4a29dc9a5f010aa305e07cf22c63208bb73fe1c795efc47e951b666aad33feccd0aeaad
-EBUILD hunspell-1.7.0-r1.ebuild 2328 BLAKE2B 6612c22c9f3cc5b6549583454b688d1a284d921d5b893e313092b23333a564393f2b2a7b6307148b980df34fd85573efa6d25f628da948d6fb35707f00f61c3c SHA512 a694ccee52fbabf4599d12a3fa4efef687a0d000329f290fd1f4f5b27565e68575f4a367626b9f529949fb6fe3a533d36fbcc9ca4c34443ec8cec0ccc1a3a2ab
+EBUILD hunspell-1.7.0-r1.ebuild 2326 BLAKE2B b077cc87d4bb5699232bc95ea519aa8fe2e9afaf15b9f0875a37408c728f0e3d14d4c1dd7423d303c6ea6fb967e4a98c7acd7269b072da186806f17e0c1d30a1 SHA512 f28f18c53fb148324dd8629aab4ca753e0caccd5870fa90833ec6a6c70c323c427a6b4832ed08c2f618f9671b466140214fca7bf7ecb49b1589e0c04418f4f7f
 EBUILD hunspell-1.7.0.ebuild 2270 BLAKE2B edd683d1308d7b2efabcb376c97c782d018ffb05947e957a2cb6417135b4c9fb56fbf9258f48d73a74f9574d9cc1386acbc49bc9ffdcc69ce922722d77a46c00 SHA512 aa610975bbfda9fc30f1590bdfd7f5ddace0a561f30755246a1e99c87851e2433b71c84c58cef0e8d1d1964c29a71dcc93b52adfb0228c4352d2a39ce207398c
 MISC metadata.xml 300 BLAKE2B 03418bffa5dab48a3d9f5f7de46a79b8b5de44296b7c39d8d75d021f3c5693eea63148fbed02c8a77b1a0846e1d39d8e11caeb003297839fda0c5dc679aaca08 SHA512 b541c90d84ee8c1541d588948286428f065ebf0bb393108e7521ba8d45ab3fb235eaba61ca61eebc61f371e399e7d98ccf3c2994d8df97d1b6a7972e92cffa71
diff --git a/app-text/hunspell/hunspell-1.7.0-r1.ebuild b/app-text/hunspell/hunspell-1.7.0-r1.ebuild
index 197e5954bde1..14d592432628 100644
--- a/app-text/hunspell/hunspell-1.7.0-r1.ebuild
+++ b/app-text/hunspell/hunspell-1.7.0-r1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://github.com/hunspell"
 SLOT="0/$(ver_cut 1-2)"
 LICENSE="MPL-1.1 GPL-2 LGPL-2.1"
 IUSE="ncurses nls readline static-libs"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	ncurses? ( sys-libs/ncurses:0= )
diff --git a/app-text/hyperestraier/Manifest b/app-text/hyperestraier/Manifest
index 3e48c0c2d53c..64503c8b3440 100644
--- a/app-text/hyperestraier/Manifest
+++ b/app-text/hyperestraier/Manifest
@@ -2,5 +2,5 @@ AUX hyperestraier-configure.patch 11535 BLAKE2B 970d53c28c1dcc1bbd2f2354542e80e2
 AUX hyperestraier-perl.patch 844 BLAKE2B fd221a027e47ed7582e697a8104d1ef82d66b87919f20c82f185b9167ad03ae6b9f0b6996b47a99e58fb42443f1c1b1c9f53a6badab935361b26f8693b680694 SHA512 73c7bd659d80464baf1d28a0eed69c9fdb3052a62aa46dc0b56f2ba6f75d458531dc6023684bd92b22b7fc4b79869ccd82e835827096b163faee0f94b0615465
 AUX hyperestraier-ruby19.patch 5143 BLAKE2B c9ea3c9e045583dee3ca119ebea07946522c50b00aba4d94fc40f7172925b9aedb8cbdc88e087a87590422566b12269641511c2c1c0a484390b1c2fa8bd1fecc SHA512 fcae611f594eeb35b6aca6eb1139304538793afc6b794e8dee1a59243d5da216f364165c90e7cf7691ed9a7f38a610ba27f37c2eef2baa4042c4a993cbfefb2a
 DIST hyperestraier-1.4.13.tar.gz 1014600 BLAKE2B 02be7cd374c47094dedd239e967dbbe5045a77302125861541dbf4d5fc60d488968718fd6b9ca57b88aac96cf2cfe73397af6bbc3d53ff6e983063ed98748e70 SHA512 ec97f487bb0e085f74222106fc5fab227c8c02ee8d736c0b4adef57ec0e4310f829ac59fff5a1c92321786e89bbc2a059a0acff6ab0e5844b83627567bb265fc
-EBUILD hyperestraier-1.4.13.ebuild 3523 BLAKE2B 9d86f2c43d369278c00417235d6abe4bbfa2635e6a3fd0fcd43e4fbc2be4e5ea3aab5ab0087f0660d8b1ea4f89ff1bc2d9688a48642a808cd3500f7ab5fa07c9 SHA512 6734ded0b597f1c652ad67ef56169a8a9d982426ec5315466296a5019e860dcc5b2aad3cc965ad31ee1c64af54bf46959190af3c581456e55ef6e895d5b77e29
+EBUILD hyperestraier-1.4.13.ebuild 3506 BLAKE2B 2493b9a78e690264c0344c08ac9d0400047fb87a17d6176c472f649e8a5004d643067ac689ea152c356a2e9eeb536ea61bf56c85d6f85623038ad88ac2b838fb SHA512 5a4fdde48475de2417da854c3822bc51edbb880b1dcc683308ef93e3b0f23f870d3fc18d35ceeb6e1929b6176c5187f662f0daac91826e1b0ec2a17b7a81ec9a
 MISC metadata.xml 423 BLAKE2B 188de835ec6f287d3a72451770f6b7f8c93758c6579b31182bd918127b9dd3c91c13813451d611d4cf24e4dd29eee21f9b214b8545250ac23e26cc696ffee719 SHA512 60323531c2e899eed9db9635ecc0cf11d1482738006e86bbcdfb74e931b1e0ce1cc7741619d3b473d504c35d4a73f4542e2e6904e75208a4beb818fcf7d06723
diff --git a/app-text/hyperestraier/hyperestraier-1.4.13.ebuild b/app-text/hyperestraier/hyperestraier-1.4.13.ebuild
index 533097cd25a9..283cffc03030 100644
--- a/app-text/hyperestraier/hyperestraier-1.4.13.ebuild
+++ b/app-text/hyperestraier/hyperestraier-1.4.13.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
+USE_RUBY="ruby24 ruby25"
 RUBY_OPTIONAL="yes"
 
 inherit autotools java-pkg-opt-2 perl-functions ruby-ng
diff --git a/app-text/jadetex/Manifest b/app-text/jadetex/Manifest
index c6b0cc1a7c70..6ac4b2fbc3b9 100644
--- a/app-text/jadetex/Manifest
+++ b/app-text/jadetex/Manifest
@@ -1,5 +1,5 @@
 AUX 80jadetex.cnf 995 BLAKE2B 1316aa328e42553d13ba377512bb1c7301a62ee60b8351a9209dbdf7ebd306f092e9b3e35c6b605c9847a1fd931cda3ccfb042a30ec3415b59f1c88537ebe55d SHA512 b1e940b79bbb76b3ad02c82e25120651ab64259be104849fc39aee94fcedaea091220b6896217faa84f93a45cbafca5b1855396b47210952723148b69d9727f9
 AUX format.jadetex.cnf 170 BLAKE2B f6f923eb38263e054ef470f0e9bb8f4beae75a9ea5f5df380077e1661e22fed024e1f77f56f8419127bfb831b7409f486cd53bfbf2aa81bb80a2c47ec674cf2a SHA512 8d5d6ed30c45e1d79f108268e045acb763fa6815ca90a8f246daff51350ab2c19c7d38237aff3ced94f10bb9de06e3021c11138d3f038f4beaff25c5cade391b
 DIST jadetex-3.13.tar.gz 103137 BLAKE2B f1b94f62a6a9c0a33acba4e8c757bcfaf26660a2d0b4ac338cf5afe8d03476a8744652244218d056678a59507ce3c8de7066314f5559469a60be5287a8c0ab37 SHA512 188fb83b50fbe82856a32ef95088d5c801750114810e3cdf7e1758f78b6a94b331b7ae7d81feb1c08b7bb31ac52f8435503911933350baa3068ad373e11dbba1
-EBUILD jadetex-3.13-r7.ebuild 1654 BLAKE2B 35de068430343878c99b06930759fe009cbbfd4904585ff6e680cd9637a58aecbc83ee0121f4a5aa0fb18760f791fd4de389c605629edb194e5cfca228859510 SHA512 8f9d4a1d5ba2dbcd94ef72ac2c353404e1a5d89324e6102c455c87e8894047ee6a761e35dd3fb922bc50fac558cdd46b54c957957f7b08bad380191b28687f5d
+EBUILD jadetex-3.13-r8.ebuild 1643 BLAKE2B f9c193757e3f2bdd61ec14da411cb034a643fe55dc48068b9b9525f0f2d5a5abfed396e994cdf9c118d810c2557b54fe137202656decaf72a138af9beb06b4c9 SHA512 e2fff2f88b3f01cb2c8717bda7bfe468382e86ce55fd2ec64b8748ba8d30703baebebeb5bc4b03441a105696faf75b43ccd3de2c28d840c0a4e8d32cdc4d9e8d
 MISC metadata.xml 326 BLAKE2B 43480e556a9ce9c52fc46d18765664881cbb16ea08954b18d357df0a956d335815e9a0c3093504bd68a5b2249bee307ca05030fbe7fb4324beb8fdd7ff8b2e53 SHA512 eb50eeb89f113a376963fe314c979d5e399f43b0ab85fcecc923618c717e30c90f8f70fe22ba7a02b39b14c57861efebfdb785f607a2e7830578aee20c2bd915
diff --git a/app-text/jadetex/jadetex-3.13-r7.ebuild b/app-text/jadetex/jadetex-3.13-r8.ebuild
index 3150df40a384..b071fec8afd4 100644
--- a/app-text/jadetex/jadetex-3.13-r7.ebuild
+++ b/app-text/jadetex/jadetex-3.13-r8.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 inherit latex-package texlive-common
 
@@ -12,7 +12,6 @@ SRC_URI="mirror://sourceforge/jadetex/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE=""
 RESTRICT="test"
 
 DEPEND=">=app-text/openjade-1.3.1
@@ -34,14 +33,14 @@ src_install() {
 	doins dsssl.def jadetex.ltx jadetex.cfg {pdf,}jadetex.ini *.sty
 
 	insinto /var/lib/texmf
-	doins -r texmf-var/*
+	doins -r texmf-var
 
 	etexlinks "${FILESDIR}/format.jadetex.cnf"
 
 	# Doc/manpages
 	dodoc ChangeLog*
 	doman *.1
-	dohtml -r .
+	dodoc -r .
 
 	# Support for our latex setup
 	insinto /etc/texmf/texmf.d
diff --git a/app-text/libabw/Manifest b/app-text/libabw/Manifest
index e75bb93be3d3..3b6f6fae83e4 100644
--- a/app-text/libabw/Manifest
+++ b/app-text/libabw/Manifest
@@ -1,5 +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
+EBUILD libabw-0.1.3.ebuild 835 BLAKE2B 96622f8f5c9757c830c800bcf239894e64b09d8e5b1e728f3bd758cec41e96b6e32d3f82102339a905234f4af978a20ec997fefcad3ff04e2af12c2cb02aa280 SHA512 d4e0bd7fbcea6540b8f21ff5fa6f96e5b47a8c8d573a76adf002b19ebc6f97997fe2d3a44d8ee403ce562d56ee7a474e575f8d0cc8c3959173710829aa554ab2
 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
index bae7f1dcebdb..8f82370198df 100644
--- a/app-text/libabw/libabw-0.1.3.ebuild
+++ b/app-text/libabw/libabw-0.1.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev-www.libreoffice.org/src/${PN}/${P}.tar.xz"
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 IUSE="doc static-libs"
 
 BDEPEND="
diff --git a/app-text/llpp/Manifest b/app-text/llpp/Manifest
index 5961330d19ee..c9af8976261f 100644
--- a/app-text/llpp/Manifest
+++ b/app-text/llpp/Manifest
@@ -2,5 +2,5 @@ AUX Makefile 2810 BLAKE2B 9c8ad849e95dc4037813bc575b5627b54bdf1eae3085235489e1a1
 AUX llpp-30-keysym.patch 1669 BLAKE2B 4df35a04c4b5de7e8fa4eaf7efe6a63f203292f12c03d1c232a0c54fa7f9f47b92f1618042e998a006f9c9822f335620b6c0c40fe0d547ea6871cfff51e75676 SHA512 003d085650ee88ee3f7f12657aa81c8a46653f3fe4a13527aa18cd52f669b7135de7686169dfed706400a557c6654fdb8041a3cf2348014425f2063be67d494f
 AUX llpp.desktop 566 BLAKE2B 2b7497616434d7ae4abfa7a78d753f194ff13c460138a1d8f13cbee674b641a476d73753c8f95ef2d02e29568fcebc47df8820329ee224b611269724d812e108 SHA512 7bbfdb97ca6f3b58f95bde326cf20bed2a5b2797ff033b1fa497e1d1fbd4522c7691b3d06f57d36707623d335e0d6a7b2e82ec6e94bfd16689241bf58289313e
 DIST llpp-30.tar.gz 165821 BLAKE2B 755648f9f7e0e0740dd9647559c085ab1626edfceb91d8df4aa783610f32499d744f24a2e0ac0d6f13e747695e8829112e59bcf0fc78c7ef5f4b2427c759353d SHA512 1dfcf273bdabfb3c7b38366bac60659555b943f459cb3fd6e656df1a33c0f84e6745d62522c5498df0bd6182bda13973144724054588c07145018bb3e758d893
-EBUILD llpp-30.ebuild 1714 BLAKE2B 18e9e138cacfd1a3a66ee20530432cc2a8536771718ed9a675b26ce7298a9b2590f115d31fc7d56b80771b8a4bf80d29a1910fb8637c4166a013156e82dffa7d SHA512 53637de2dbd6bae2e885027ee39b3e2fe47b050852ae880b003c363ba2a42ca0ca176a22fa726fba874937d2cc41b70da5dda940d1c57975c96b137e647aea46
+EBUILD llpp-30.ebuild 1716 BLAKE2B c7c87a02e1ce23d4cd01645cd33469eff8be4cb109d5fa388b54fff60230a5eaca7adc6e432ce2385ef6e286ec23f06800ffdf4e194bd7bc31560e8ad3134575 SHA512 5afd881e7944eb01a77fbd1766ecbe131e1043f90d5809db99b5da24da4353d151a4b1a11e1e55e49d1046a5fb332178ed6a9bedb1d08929c9781f13ca460bef
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-text/llpp/llpp-30.ebuild b/app-text/llpp/llpp-30.ebuild
index 9fc50c6f10e2..782d76c46a45 100644
--- a/app-text/llpp/llpp-30.ebuild
+++ b/app-text/llpp/llpp-30.ebuild
@@ -18,7 +18,7 @@ LIB_DEPEND=">=app-text/mupdf-1.12.0:0=[static-libs]
 	media-libs/openjpeg:2[static-libs]
 	media-libs/fontconfig:1.0[static-libs]
 	media-libs/freetype:2[static-libs]
-	media-libs/jbig2dec[static-libs]
+	media-libs/jbig2dec:=[static-libs]
 	sys-libs/zlib[static-libs]
 	virtual/jpeg:0[static-libs]
 	x11-libs/libX11[static-libs]"
diff --git a/app-text/openjade/Manifest b/app-text/openjade/Manifest
index 1ebbb7d81765..abb399fa9a45 100644
--- a/app-text/openjade/Manifest
+++ b/app-text/openjade/Manifest
@@ -11,5 +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 3685 BLAKE2B 8fa38e1343de5dffe1477aba279158cf1a46d20b6b9f2bbb33806b32f9ee2e80a7aea2b9f90068bd4c671d892f974f15decb8a178aead7d3da66d68a798266cf SHA512 04eb2d1e1080015346d2ddd136c71fb6328973e6b94814fc2a90d9f9f7743055d117825017cc165f37f333a8a6f6c683fc4bdd4103c920d6313bc71c0cea14fc
-EBUILD openjade-1.3.2-r9.ebuild 4330 BLAKE2B 2363c44ad5070a05bc0201928ebfc53a8c3a28ce6282a8f99f3a2475e9721f87a1b772c710c271dcfbf536b1a12fce991c4b6463b19ad4126e5684d7814d68b2 SHA512 3aa9d06d5cd7fd2d90ed1c7ce6ad21c946bb1e02c182b53598b4a838ceee7a846f6a1277ce8b3a8c7be8b911905693c1039128f3dbab00ddc505bff9766be9b8
+EBUILD openjade-1.3.2-r9.ebuild 4324 BLAKE2B 02fee4ca8f94031901f5cf53a70b9b6b30443717cc0a02513e3887058fa9b33c5256e629f05d37b74765ee52f678f4f67475ed5d6e0889493fe08a42df49057e SHA512 30ae5346e8c936e936165f04e6178b53eed5323a1c8ad8ed413d6f035c5bb447fbf5ac77fb0e9b9578631dacdabf1aa4277b88e6800d327ceaf237e681221756
 MISC metadata.xml 325 BLAKE2B 3cecdaaecd44faf19571367fbe80cb75e687e6231c26c696cc9e7412aae427b95a4967cad7415b9df5e499bdb74c6b6fed54edc52470ff207cbba43e423ae223 SHA512 4e1e28e8c1722c9bcbbc2a8487ad373eff6679f51a5213850e11ce2d7d569afbaa093d215965e4fc010a9fa3e80121949a3db9fb98bfaf8ab70eafead9e14657
diff --git a/app-text/openjade/openjade-1.3.2-r9.ebuild b/app-text/openjade/openjade-1.3.2-r9.ebuild
index b86fbec7c52e..df072b4fe9df 100644
--- a/app-text/openjade/openjade-1.3.2-r9.ebuild
+++ b/app-text/openjade/openjade-1.3.2-r9.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://downloads.sourceforge.net/project/${PN}/${PN}/${PV}/${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv s390 sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/app-text/openlp/Manifest b/app-text/openlp/Manifest
index a4034ecd6b9c..c00bf8bf60b6 100644
--- a/app-text/openlp/Manifest
+++ b/app-text/openlp/Manifest
@@ -1,4 +1,4 @@
 AUX OpenLP-2.4.2-disable-tests.patch 795 BLAKE2B 0741116f289c1ec368e401d66a798f87124971c069921813f71518155e78f04b6fa097686899c809f8cab84084ab1fde2141d30ba74e4f940c2bd2647069c939 SHA512 ac67c675a4793be0194ccdc522737de0fd2b7b008707c19cfb5dd4fd1c17e88a59c0d38cdfebb02272774da81dbf06ca8b897504abe3d37b5eeaf40b8d0c63f9
 DIST OpenLP-2.4.6.tar.gz 7303683 BLAKE2B 4e5b1a60c8eb8772cdecf453e8277a69cfb1cdd51ab6478425332b58c52319713dd411027a108113485ee7fdc4c770cb6f94a626b23c6cca82231311a62df08a SHA512 071ca83c6969c5281213dea5efe6dfc60a3d22b56534b93e2fd1f8e43760ba5cab851b6f4dca485a31254d2090e26ce640359cb9f9797d84b9509426061dfb7a
 EBUILD openlp-2.4.6.ebuild 1189 BLAKE2B c41779cce8f02f881eb73353e7a4f98807a96afbc0ca584be7487215b922fb811ea6020a65878c775b15062e560246cb0b40c081dd7c360cccaa071f07853a6a SHA512 7893daf5777bbb06809597d456e2fb7bee142072380d0460df3134e923a895a61eec8fc9c3f8f95574ada1e5ddcaadc041bde9f960b56e93ccd82457b7e21e5b
-MISC metadata.xml 294 BLAKE2B f31b24e7a16fb99a7d3952c69a2d4f4a75afc12fb5e91954b20b07d9e1a43acf08bba842e5e08c73272be9db317bc2e52c5bc5c5e4e8e2d4c95acc787ef3387c SHA512 c8a3971d0143dec3196e52b3bf877b4b3e29041ec6c3c78cc20415cc9fb9640bd0762a651c3f7fd8c12b27b60d0fcf99eb8f0761c10337a9cbcf84e7e78c37e6
+MISC metadata.xml 243 BLAKE2B d538a563cab2fafd5f221d51aca0be85d290aa5e64dd6a2a1411eedb557a4014acd040859a18e9021cb33c978ad2028f4bad6f127714f3f410513b8e5ea5a600 SHA512 c2e42eb6d3044abae1cccd4fc2bfdc28d15223e2f1c4c5f365be504eac8a2db9862465d92a2ae5acd2d121a5dada77fa4724e3c24cd981a40e462435dd61eed2
diff --git a/app-text/openlp/metadata.xml b/app-text/openlp/metadata.xml
index c14282681213..b6f70e4456a8 100644
--- a/app-text/openlp/metadata.xml
+++ b/app-text/openlp/metadata.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>anarchy@gentoo.org</email>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="sourceforge">openlp</remote-id>
 	</upstream>
diff --git a/app-text/pdfjam/Manifest b/app-text/pdfjam/Manifest
index c3774a1d0d06..66882a0d291a 100644
--- a/app-text/pdfjam/Manifest
+++ b/app-text/pdfjam/Manifest
@@ -1,3 +1,4 @@
 DIST pdfjam_208.tgz 180725 BLAKE2B 903ce4f0874c9fc9ad23f3db37b882596589d6470dfe9289f65a72fb66ff843bbd49b52086d7b2d2cbbfb1b6406cbbda64d46b933a853d5d681ef88d4033372c SHA512 728c8d304c6d2af773980d20ef4a4be6e0a5dad286ad8cd00be9b1687f5024e00032a750c10c74dcd24431f081368d02b76f03cc5bb1c8725a060cd70be0fd8c
+EBUILD pdfjam-2.08-r1.ebuild 594 BLAKE2B aa12d5c35e9ef4e9cbc45415d42b70920dd148eb12fbc2a212e36287981da3c7f800be1312a8c94ccd4b6ba12acda72f3c7e5f8a6148eff641566cda9e83bb63 SHA512 4f54c326c7df41f75aa4326a1d4d96823ddb2a702ba02980f3565d44ba7db174686b936fb6d2b8fe5d1efbb2426878625df64c9d867711bbf7dd8c47de650320
 EBUILD pdfjam-2.08.ebuild 605 BLAKE2B a15b40f8f8bb6c1d696528706d38ea5471cc23170068e886b4361de4cd2a49a2e4ce5f888fb4037716efa816e82be3b7206c6e7a5d7002e89865bfd7f4ccb58c SHA512 f3b3cc6d4a5e64dbddfdf8029c9c18a8c3ff156735047f43ce4bc20d12f3e0e184636928ce78aaa7614429c36db16a6143c9e42c3691ef7f45997300ccb1f8a9
 MISC metadata.xml 249 BLAKE2B 1b34ce77c092c0664a18f32525d158d41bf36ab7ab7a4b9d01ed37e1e3dda3d58849d5b1375065c4e5591f6b09b2a93e88a624d399c495a0b1125edb30ec172f SHA512 895325641a176c848988fb5f36cdb567b584d22f6e778b3de674de480cbca30b7cf8f12ecbbe1173a63e3229889e1e0f5efd5afea4f0d4c429ac236598f80f1e
diff --git a/app-text/pdfjam/pdfjam-2.08-r1.ebuild b/app-text/pdfjam/pdfjam-2.08-r1.ebuild
new file mode 100644
index 000000000000..119a213fce22
--- /dev/null
+++ b/app-text/pdfjam/pdfjam-2.08-r1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PV=${PV/./}
+DESCRIPTION="pdfnup, pdfjoin and pdf90"
+HOMEPAGE="http://www.warwick.ac.uk/go/pdfjam"
+SRC_URI="http://www.warwick.ac.uk/go/pdfjam/${PN}_${MY_PV}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE=""
+S="${WORKDIR}"/${PN}
+
+DEPEND="virtual/latex-base"
+RDEPEND="${DEPEND}"
+
+src_install() {
+	dobin bin/*
+	dodoc PDFjam-README.html
+	doman man1/*
+}
diff --git a/app-text/pdfminer/Manifest b/app-text/pdfminer/Manifest
index 50d9497a4db1..35dcee7bd9ad 100644
--- a/app-text/pdfminer/Manifest
+++ b/app-text/pdfminer/Manifest
@@ -1,4 +1,6 @@
 DIST pdfminer-20140328.tar.gz 4081233 BLAKE2B 60e8c8409269c158feda0f02b1dbf46d4bcd58e2f0a2ef0102e3c3c691d599eda9164b8e5dde4278522d9cfcca4e6962b31919b08f66053fb986ad3ded7da498 SHA512 8abb2328f7824ee980df0ce42d758c15534e97379ea9213b4aa1d29864d24d73c9e2d6020964e9ab734c0c6f7d1ae70bccbd6605168eaadf83923718a1f4849a
+DIST pdfminer-20191020.tar.gz 4168016 BLAKE2B 53658853f1c6948a3249b56769c4d9e28cfe8e977b8702c3802f2c3d64f5c9f1d228024a3cbc9a5f288f60c991b2738a7aa131021bdb47c1492c83f9682abb15 SHA512 6ba663440f0ac370742f3a300a55d5f810202d960253931dfdb109a30ce3f71cf3e3dd30af9d0f6257365972452813b4ebc2dbee8031e988b7efb9dac15075d4
 EBUILD pdfminer-20140328-r1.ebuild 691 BLAKE2B 3b663daca3079290a88be838dd6381dcd029f3209eefad30881b89e10f0c37169ccc84372b464333accd467885e2e8dec4dc164647648a9d6a1e8e98dca19441 SHA512 8d4a9ba66c8ea67faa802709c799971262c08cfafe72c12d8e2549aa4c5da81f56dc9b7510c354f3c77b33eb6c225ce5122c2f1aaa8c376c7e53fcf9626d4963
 EBUILD pdfminer-20140328.ebuild 653 BLAKE2B 1d63ce17c37449a24b22705b0cf347f1b4306bd41b9c6a1d73060d55d75fdf577f9306fb043160a41dee1e7a65c9a561a56b0675d9ab0c492313b9093925ee30 SHA512 b5add0e6d898864ec0ee5ddbe8e73675bb044db37528bbaff1bd37d095b424280f76127f340f9462cf7e708b40cc70dbfada2c91660a51f327179494481ddfe0
+EBUILD pdfminer-20191020.ebuild 771 BLAKE2B 0936d0116558e1f7ca2f56d95b6eb6d7ae3397c294fed6c603050c615fbd1f26b805a075a1cd527f6c3af25518acb47262b51ab9fe1c232bd0711152059dff17 SHA512 ec6dada298ef55686daf5e6e9d1c56ca4e36eea8f010cabaa7de6babf49fcce4c1986cdf04e961b85e59252038675d2125b913d272bf17d9492eaf0b89bed1f5
 MISC metadata.xml 238 BLAKE2B 436e60128ac8083524cc8290bfe2eb3eff4af4bafe7a13320972438a85d29da40ada392d2295001add6aed88c9407529e0975a7ae7eefc976655216def9bb36f SHA512 899f64c55b53cf0a2d38498f0b0070d4707a6eb0289d8138c6757f703909dc2b6a009fee9fe640e5c16adca6f2f953cf445ba6e6b8f5f43d9185ef836a611297
diff --git a/app-text/pdfminer/pdfminer-20191020.ebuild b/app-text/pdfminer/pdfminer-20191020.ebuild
new file mode 100644
index 000000000000..77050f5937cf
--- /dev/null
+++ b/app-text/pdfminer/pdfminer-20191020.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Python tool for extracting information from PDF documents"
+HOMEPAGE="https://euske.github.io/pdfminer/ https://pypi.org/project/pdfminer/"
+SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples test"
+
+BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="dev-python/pycryptodome[${PYTHON_USEDEP}]"
+
+python_compile_all() {
+	use examples && emake -C samples all
+}
+
+python_test() {
+	emake test
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/. )
+	use examples && dodoc -r samples
+	distutils-r1_python_install_all
+}
diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index b0a655e4ddd6..5bf7f40d187e 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -3,11 +3,14 @@ AUX poppler-0.57.0-disable-internal-jpx.patch 892 BLAKE2B 811ce3bbeb3b3c0720902a
 AUX poppler-0.60.1-qt5-dependencies.patch 934 BLAKE2B 5af7f7adfb802905737abc22003d00dda6f25bc992d73c01570a560938e5aef166905c519ea7e4968f8e637b2dc47c61bb1c49cd5ab14fb2076e2a1e38545499 SHA512 fc2e3297da9dbbb6ba9377958c08626db44790ec6ba3acdbc1c348d3e909bd7b061fa64995d584d89a42d1bc9cb278827590b303bd1ff57c0557f2bae450b81c
 AUX poppler-0.61.0-respect-cflags.patch 3012 BLAKE2B 24ac0b8067f1f8aea6e1b328b27ff9a5be0fa457354a251bb5066e6a63ffbf953c2d761e53e5d78e1b8593dbd5740420cffaa7f4a01f1366b712b12fbfad2cf9 SHA512 b680ac77711d845a93586084d1a4523860af33c2d494cbf16ea42f799612548b96fbdaadf53100dc74e933e0d09ba98ce3aa49b7ba6655907aad01e09561fa6d
 AUX poppler-0.78.0-respect-cflags.patch 1140 BLAKE2B 59e87b6957a5aff35cf6ebc8092c0552b8ece31e2fc73765789ac73dc5ac01ba69928f9308de9660ba3cf6b38b921ca341dcf6c5bce1d360b1bcf1a4005e4115 SHA512 713f7a3e3e2ae950fd6406ed076d4e6d2079619e40f00de7ec7d7df587df520373b923d343494902da454423adf29174f1ced11cb874a12851febfc1860988f4
+AUX poppler-0.82.0-respect-cflags.patch 2324 BLAKE2B 435986b347ffa1ac657a4fa2ebac232bb0d0bfe1d55fa9085c6e2819e4a37e54680a95e69d2b3cf49bdb5cb3c18eeede8ca58bf1426e8c9bd47ea79eddcd0860 SHA512 37d3700ac4d4774fefabc88fdc3a9b0031e91d8a7aae6f8229e87acd61710652f9a64f8ac97006131ab7cea479e1e6268c7992818017cf7473b45743a3796440
 DIST poppler-0.79.0.tar.xz 1544140 BLAKE2B b5ecf204c5246f640d9f5ca5ffce9648a1a2c957efdb1e31ace9c1ccdff1be85337b67f7c4019b52eefce17e6f5869aa1911a60e54e421b80ddd3b6eec97a0ec SHA512 f0024fb86887e147ec1cbe9481498d348076dbd6b960716da65defab3365c67ab39626f946758dddbe438634a7116773d8ded8684b65e18abbfc299f56563ec9
 DIST poppler-0.80.0.tar.xz 1548908 BLAKE2B 09a3b10b1ee6a9de900f7a6ca105e98ec266995c3f6a3d56fbefb7b57851462caa4a16a55081efd8b70d02107d8b7a13a74e316d448290bb3b02286c1778ad86 SHA512 0a0d68168ba4d560941de31cb9e32c6cd7b44025e93cd84ace863ffab5b9ff0356524626cb16fb99c29a897738f2ac5862480fc54d42f8aecd2e3457f11c642f
 DIST poppler-0.81.0.tar.xz 1548944 BLAKE2B 23b460d50b22d8b42690c28156398fa3cf299ac24ea883dc8c79044c44aebc126388cab2f31e69c76c50750ef86bd5203958efbb1c353c582c0337e6e0486a85 SHA512 774d650c63afe2a0d6669daad4b286c2412a0c02581d7ea2cc37d71936f77dff92dc22217367561b7e4285c9c27dcfdca4c76c187d9c3c482db2f3549919b25b
+DIST poppler-0.82.0.tar.xz 1553336 BLAKE2B a83d476ce1174cb7789f857a52a8a9ed29dfe8863d082ef662508ad9957667349aa62b038fa1a52e9e7ae3ddf4701eb5fbd58545b041b6aebd69cb8b91376d8d SHA512 1631be30e398dd18a4e8c2cc893cf0d9469a98d93f02f2ffe3bc14857518b76674a10cafe89ee92b9886c3c6b03d50e214a6838c102f673a62789c9832cfa4a2
 EBUILD poppler-0.79.0-r1.ebuild 3496 BLAKE2B 71c664164c00a554aa7e524b8e56e32d5d6e05ff68ec88bb4ca45e474cde45b20b653d101c8cafa5467875c1a31ca8184ec956efa278f07e762c2b74a3569449 SHA512 91aad9e8ef1648b5207cf9e20ef6a6475305a39b375109196fcbaed1078ca6fac67f5c70e0ca89668a8d46d9e7d234a39b48d6e5c83b6a4900804393e68ec9fa
 EBUILD poppler-0.80.0.ebuild 3484 BLAKE2B 607e91146b25a87bb690b869d1310c2b7a536912ecb70159bb0087fa6c31c4aa65ee773b3e5254d051e606fc9ca946a32eb48d34869bb5382a598083eade11e4 SHA512 1415779bc776554445fa049ec35a0ba68e9b7ed878da9b0170a3acd1ef575d2b72f62eca14e2ada250b5ceeac5ce7a6491120249c2080034c2afcd6ecedba49b
 EBUILD poppler-0.81.0.ebuild 3367 BLAKE2B 88eefb38717a40ea3adde8c8ddf5189e80a04f48500886470ebe7a7702eb24afb567a041490186765f27cb6978ef866285b64704e7bbe61560bc7578a1383382 SHA512 780f3b1116d35a3a51d5de2d43690580e554814ad1d9f07f2ab54006561fabebe053be42591d07e608fee0de1b3b453fb865ecb056708beb59e013a2ed059e17
-EBUILD poppler-9999.ebuild 3367 BLAKE2B 88eefb38717a40ea3adde8c8ddf5189e80a04f48500886470ebe7a7702eb24afb567a041490186765f27cb6978ef866285b64704e7bbe61560bc7578a1383382 SHA512 780f3b1116d35a3a51d5de2d43690580e554814ad1d9f07f2ab54006561fabebe053be42591d07e608fee0de1b3b453fb865ecb056708beb59e013a2ed059e17
+EBUILD poppler-0.82.0.ebuild 3367 BLAKE2B da58dbc5f9cb52c60dadc3f9c9a004338bfdcb4595a2b649952bf04a4b3aa0c13a11a4631d90da2d2f74a9548dc4d0b5bfff8f788be89b0c797a790c32a34147 SHA512 88b21996d1ae6152fec6033574d5d3bb1bee8058d13e4cb2f3f7af282a1f0f99065d7b5fd64b98b19590b5c598ce85bbe03c0db50b057fd4f0c700f9f1ea0e6c
+EBUILD poppler-9999.ebuild 3367 BLAKE2B da58dbc5f9cb52c60dadc3f9c9a004338bfdcb4595a2b649952bf04a4b3aa0c13a11a4631d90da2d2f74a9548dc4d0b5bfff8f788be89b0c797a790c32a34147 SHA512 88b21996d1ae6152fec6033574d5d3bb1bee8058d13e4cb2f3f7af282a1f0f99065d7b5fd64b98b19590b5c598ce85bbe03c0db50b057fd4f0c700f9f1ea0e6c
 MISC metadata.xml 995 BLAKE2B 0d99fda69e6b020fd1b6fa879a0c3af278b92111be31d97cabe88703f06b4af56ce64ce9e0fc556d2b056c6770e547ae3b88dcc82da9cc26e15e2d1d0b5f685b SHA512 ae813761c5ab4dab475b737085f14f5874655b31f247f26495c43d8fcc47805dfceb2a8cd23ead39a3f8ee75ac820edc7c2554e573c338c09e5ec8b9d383417c
diff --git a/app-text/poppler/files/poppler-0.82.0-respect-cflags.patch b/app-text/poppler/files/poppler-0.82.0-respect-cflags.patch
new file mode 100644
index 000000000000..6f7b2a7c175b
--- /dev/null
+++ b/app-text/poppler/files/poppler-0.82.0-respect-cflags.patch
@@ -0,0 +1,49 @@
+--- poppler-0.82.0/cmake/modules/PopplerMacros.cmake
++++ poppler-0.82.0/cmake/modules/PopplerMacros.cmake
+@@ -145,46 +145,6 @@
+   endif(GCC_HAS_AS_NEEDED)
+ endif (CMAKE_COMPILER_IS_GNUCXX)
+ 
+-if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
+-# set the default compile warnings
+-  set(_warn "-Wall -Wextra -Wpedantic")
+-  set(_warn "${_warn} -Wno-unused-parameter")
+-  set(_warn "${_warn} -Wcast-align")
+-  set(_warn "${_warn} -Wformat-security")
+-  set(_warn "${_warn} -Wframe-larger-than=65536")
+-  set(_warn "${_warn} -Wmissing-format-attribute")
+-  set(_warn "${_warn} -Wnon-virtual-dtor")
+-  set(_warn "${_warn} -Woverloaded-virtual")
+-  set(_warn "${_warn} -Wmissing-declarations")
+-  set(_warn "${_warn} -Wundef")
+-  set(_warn "${_warn} -Wzero-as-null-pointer-constant")
+-  set(_warn "${_warn} -Wshadow")
+-
+-  # set extra warnings
+-  set(_warnx "${_warnx} -Wconversion")
+-
+-  set(DEFAULT_COMPILE_WARNINGS "${_warn}")
+-  set(DEFAULT_COMPILE_WARNINGS_EXTRA "${_warn} ${_warnx}")
+-
+-  set(_save_cxxflags "${CMAKE_CXX_FLAGS}")
+-  set(CMAKE_CXX_FLAGS                "-fno-exceptions -fno-check-new -fno-common -D_DEFAULT_SOURCE")
+-  set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g ${_save_cxxflags}")
+-  set(CMAKE_CXX_FLAGS_RELEASE        "-O2 -DNDEBUG ${_save_cxxflags}")
+-  # clang does not support -fno-reorder-blocks -fno-schedule-insns, so do not use -O2
+-  set(CMAKE_CXX_FLAGS_DEBUG          "-g ${_save_cxxflags}")
+-  set(CMAKE_CXX_FLAGS_DEBUGFULL      "-g3 -fno-inline ${_save_cxxflags}")
+-  set(CMAKE_CXX_FLAGS_PROFILE        "-g3 -fno-inline -ftest-coverage -fprofile-arcs ${_save_cxxflags}")
+-  set(_save_cflags "${CMAKE_C_FLAGS}")
+-  set(CMAKE_C_FLAGS                  "-std=c99 -D_DEFAULT_SOURCE")
+-  set(CMAKE_C_FLAGS_RELWITHDEBINFO   "-O2 -g ${_save_cflags}")
+-  set(CMAKE_C_FLAGS_RELEASE          "-O2 -DNDEBUG ${_save_cflags}")
+-  # clang does not support -fno-reorder-blocks -fno-schedule-insns, so do not use -O2
+-  set(CMAKE_C_FLAGS_DEBUG            "-g ${_save_cflags}")
+-  set(CMAKE_C_FLAGS_DEBUGFULL        "-g3 -fno-inline ${_save_cflags}")
+-  set(CMAKE_C_FLAGS_PROFILE          "-g3 -fno-inline -ftest-coverage -fprofile-arcs ${_save_cflags}")
+-
+-endif()
+-
+ if(CMAKE_C_COMPILER MATCHES "icc")
+   set(_save_cxxflags "${CMAKE_CXX_FLAGS}")
+   set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g ${_save_cxxflags}")
diff --git a/app-text/poppler/poppler-0.82.0.ebuild b/app-text/poppler/poppler-0.82.0.ebuild
new file mode 100644
index 000000000000..a5c4e4a699c8
--- /dev/null
+++ b/app-text/poppler/poppler-0.82.0.ebuild
@@ -0,0 +1,122 @@
+# Copyright 2005-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils toolchain-funcs xdg-utils
+
+if [[ ${PV} == *9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://anongit.freedesktop.org/git/poppler/poppler.git"
+	SLOT="0/9999"
+else
+	SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	SLOT="0/92"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
+fi
+
+DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
+HOMEPAGE="https://poppler.freedesktop.org/"
+
+LICENSE="GPL-2"
+IUSE="cairo cjk curl cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt5 tiff +utils"
+
+# No test data provided
+RESTRICT="test"
+
+BDEPEND="
+	dev-util/glib-utils
+	virtual/pkgconfig
+"
+DEPEND="
+	media-libs/fontconfig
+	media-libs/freetype
+	sys-libs/zlib
+	cairo? (
+		dev-libs/glib:2
+		x11-libs/cairo
+		introspection? ( dev-libs/gobject-introspection:= )
+	)
+	curl? ( net-misc/curl )
+	jpeg? ( virtual/jpeg:0 )
+	jpeg2k? ( >=media-libs/openjpeg-2.3.0-r1:2= )
+	lcms? ( media-libs/lcms:2 )
+	nss? ( >=dev-libs/nss-3.19:0 )
+	png? ( media-libs/libpng:0= )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtxml:5
+	)
+	tiff? ( media-libs/tiff:0 )
+"
+RDEPEND="${DEPEND}
+	cjk? ( app-text/poppler-data )
+"
+
+DOCS=( AUTHORS NEWS README.md README-XPDF )
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.60.1-qt5-dependencies.patch"
+	"${FILESDIR}/${PN}-0.28.1-fix-multilib-configuration.patch"
+	"${FILESDIR}/${PN}-0.82.0-respect-cflags.patch"
+	"${FILESDIR}/${PN}-0.61.0-respect-cflags.patch"
+	"${FILESDIR}/${PN}-0.57.0-disable-internal-jpx.patch"
+)
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	# Clang doesn't grok this flag, the configure nicely tests that, but
+	# cmake just uses it, so remove it if we use clang
+	if [[ ${CC} == clang ]] ; then
+		sed -e 's/-fno-check-new//' -i cmake/modules/PopplerMacros.cmake || die
+	fi
+
+	if ! grep -Fq 'cmake_policy(SET CMP0002 OLD)' CMakeLists.txt ; then
+		sed -e '/^cmake_minimum_required/acmake_policy(SET CMP0002 OLD)' \
+			-i CMakeLists.txt || die
+	else
+		einfo "policy(SET CMP0002 OLD) - workaround can be removed"
+	fi
+}
+
+src_configure() {
+	xdg_environment_reset
+	local mycmakeargs=(
+		-DBUILD_GTK_TESTS=OFF
+		-DBUILD_QT5_TESTS=OFF
+		-DBUILD_CPP_TESTS=OFF
+		-DENABLE_SPLASH=ON
+		-DENABLE_ZLIB=ON
+		-DENABLE_ZLIB_UNCOMPRESS=OFF
+		-DENABLE_UNSTABLE_API_ABI_HEADERS=ON
+		-DUSE_FLOAT=OFF
+		-DWITH_Cairo=$(usex cairo)
+		-DENABLE_LIBCURL=$(usex curl)
+		-DENABLE_CPP=$(usex cxx)
+		-DWITH_JPEG=$(usex jpeg)
+		-DENABLE_DCTDECODER=$(usex jpeg libjpeg none)
+		-DENABLE_LIBOPENJPEG=$(usex jpeg2k openjpeg2 none)
+		-DENABLE_CMS=$(usex lcms lcms2 none)
+		-DWITH_NSS3=$(usex nss)
+		-DWITH_PNG=$(usex png)
+		$(cmake-utils_use_find_package qt5 Qt5Core)
+		-DWITH_TIFF=$(usex tiff)
+		-DENABLE_UTILS=$(usex utils)
+	)
+	use cairo && mycmakeargs+=( -DWITH_GObjectIntrospection=$(usex introspection) )
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# live version doesn't provide html documentation
+	if use cairo && use doc && [[ ${PV} != *9999* ]]; then
+		# For now install gtk-doc there
+		insinto /usr/share/gtk-doc/html/poppler
+		doins -r "${S}"/glib/reference/html/*
+	fi
+}
diff --git a/app-text/poppler/poppler-9999.ebuild b/app-text/poppler/poppler-9999.ebuild
index 86a7cd33bcc2..a5c4e4a699c8 100644
--- a/app-text/poppler/poppler-9999.ebuild
+++ b/app-text/poppler/poppler-9999.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999* ]] ; then
 else
 	SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-	SLOT="0/91"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
+	SLOT="0/92"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
 fi
 
 DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
@@ -59,7 +59,7 @@ DOCS=( AUTHORS NEWS README.md README-XPDF )
 PATCHES=(
 	"${FILESDIR}/${PN}-0.60.1-qt5-dependencies.patch"
 	"${FILESDIR}/${PN}-0.28.1-fix-multilib-configuration.patch"
-	"${FILESDIR}/${PN}-0.78.0-respect-cflags.patch"
+	"${FILESDIR}/${PN}-0.82.0-respect-cflags.patch"
 	"${FILESDIR}/${PN}-0.61.0-respect-cflags.patch"
 	"${FILESDIR}/${PN}-0.57.0-disable-internal-jpx.patch"
 )
diff --git a/app-text/ps2eps/Manifest b/app-text/ps2eps/Manifest
index 5f67746b2d64..77ba358d887f 100644
--- a/app-text/ps2eps/Manifest
+++ b/app-text/ps2eps/Manifest
@@ -1,3 +1,3 @@
 DIST ps2eps-1.68.tar.gz 97304 BLAKE2B 594b894b2d81f64c8c6a7461d1df96d7b6e3ce3ef8f7eaf58161eb6a05ebca7b2d304a531be954898f1a9ad53cccd84536b64127b080afbc3902265d2e4e1108 SHA512 7fc84da5da00d5b1169d6e337b1db232adf80d9d957e48bfdd9272946151adca3e44f712587387ef557488cd15f44210b3fbd8c545488ec0071641d9d25a9c2b
-EBUILD ps2eps-1.68.ebuild 990 BLAKE2B 39e4e002373815574b5924193f1ed17387a51e1c281449f04b8007421d6d283be448a2012aff4d26c555b7fc52c388040010aeb49ac5fc94e1de984d9c03a242 SHA512 e4dd3f1568f07dc95beec0819dfd3e10f317eae23760832f8e875e27ccc8ac61926671378746b64af72f6289e95a826baff5a17be4aceaabc6a4c091504aab02
+EBUILD ps2eps-1.68.ebuild 913 BLAKE2B 4c9ea75c7c0b50bef946e376b94a11ae2bb57ff1bc47f71a978effa6de2e7c42f86b642f889f36c2370003649bfa87a25b1895543b207b988046cd3b8420bc9a SHA512 822e934e632ddf6551ca91d23e89cb1aeb061a043d09f672203735e79a2e4fe84ec16fa7d61283c81a958d495e00fda51db3f7d4ddd15af6d3f6034b33839e71
 MISC metadata.xml 525 BLAKE2B d27db1f0104b7ac6fb9e61c95da58ce62a7dddb28eb7c160507efc87b9b6930df11f889e8a8f5ec1e606209d942254294933313581a2e5dcb0f56c578e4d4080 SHA512 0d250fa2b43ab06f9d214116054bd21dc43f130c5518b430c2bdaaf4a4038fee52d61c6a82b1fe0736b966634e24d7fd99c6a88e171a05e7b5d9cb83a45ca24a
diff --git a/app-text/ps2eps/ps2eps-1.68.ebuild b/app-text/ps2eps/ps2eps-1.68.ebuild
index 9950ac235e7b..67beb71c430d 100644
--- a/app-text/ps2eps/ps2eps-1.68.ebuild
+++ b/app-text/ps2eps/ps2eps-1.68.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=7
 
 inherit toolchain-funcs
 
@@ -12,29 +12,30 @@ SRC_URI="http://www.tm.uka.de/~bless/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
 
-DEPEND=""
-RDEPEND="app-text/ghostscript-gpl
+RDEPEND="
+	app-text/ghostscript-gpl
 	!<app-text/texlive-core-2007-r7"
 
 S="${WORKDIR}/${PN}"
 
-src_compile() {
+src_configure() {
 	tc-export CC
-	cd "${S}/src/C"
-	echo "all: bbox" > Makefile
-	emake || die "making bbox failed"
+}
+
+src_compile() {
+	cd src/C || die
+	emake bbox
 }
 
 src_install() {
-	dobin "${S}/src/C/bbox"
-	dobin "${S}/bin/ps2eps"
-	doman "${S}/doc/man/man1/bbox.1"
-	doman "${S}/doc/man/man1/ps2eps.1"
-
-	dodoc Changes.txt README.txt
-	dohtml "${S}/doc/html/"*
-	docinto pdf
-	dodoc "${S}/doc/pdf/"*
+	dobin src/C/bbox
+	dobin bin/ps2eps
+
+	doman doc/man/man1/bbox.1
+	doman doc/man/man1/ps2eps.1
+
+	local DOCS=( Changes.txt README.txt doc/pdf )
+	local HTML_DOCS=( doc/html/. )
+	einstalldocs
 }
diff --git a/app-text/qpdf/Manifest b/app-text/qpdf/Manifest
index 6320879b6b13..4c5a56080bd7 100644
--- a/app-text/qpdf/Manifest
+++ b/app-text/qpdf/Manifest
@@ -1,13 +1,11 @@
-DIST qpdf-7.0.0.tar.gz 7053781 BLAKE2B 1abd54a3cdc24c3e56ac81cabaa56be8d2217961abfc026cbd0c0141aea3efb6c75b9daf2fe9f6fc0f09efd224d241fa859bd37bcd972df4e4837318497d774e SHA512 7b52d67b4d2c428a7b0c1cd03b03a23f05d38d7e3c81041079a137919019ea5158f12bf95fdcfcff6b43ffdefe93a85127ced2a363a6b4b380cbaa02a3840256
-DIST qpdf-7.1.1.tar.gz 7099282 BLAKE2B 9658dd1cc6f8d0e3dd13137db147e0f954f747b5bb6b1577f70a236b1f67c5513713889dca77181a9b25f1a2054a8ec5cbfda60866e97b2d43e60b494752c9fd SHA512 a75f988c7dd7ac174bdc981cd3696ca8b539ac6c581e3afecf601dc67277014cb4fe3f0e5cb75a67412cafa4eb645b2fc2d8a0ec203834464baf0c7e80baa0b4
 DIST qpdf-8.2.1.tar.gz 8256216 BLAKE2B 67e9b897ed938b9dd2e8508efaddd4dd6f63568aa23332ef72918a0888cc1e1b8fe844f0c1424b8ab568ee5ce42f8efd04293cd525e9d8de0c5fe7b352f49367 SHA512 ef3aeb4a7ca3ec48ab62341533eedcb2a6d0985767317ab72c22f0c0ecfef6849bfdc34b1bcec6427c7bde166143adb409c895ff40d8be6628e6323e27697a8c
 DIST qpdf-8.4.1.tar.gz 16990752 BLAKE2B 6e7ccd212cf8d01aea3dc615f5924c0575392f19cdd20b35327a71bd1f97d7e515fe1a73cd2e3901964f621cafa19ab07a1314af19f40ded28d3e9f683c02ab0 SHA512 d5ac3376345650f05278f8b4d99182cd58b927537085a4a6415d3df0b80b7ddd80a7c33778ec8c3b85d9788ea081ea3266bd4a9315eda9820988e9e54a22f80d
 DIST qpdf-8.4.2.tar.gz 16988263 BLAKE2B 358836310575fd0f454d4504a70796b72d2e3120c5820e2c33e84ea79c5c115d1c84f8d58392d870b5357407d0fbed05028bd854d164be0b32b348c587845300 SHA512 9cde046fb5e42dc331933294155583fb20408704a0cab3075cc3e97bd4643e3178e4162b8de7434aa2304097e7734f985fdc8e7b05cc028c37193dce91797f7a
-DIST qpdf-9.0.0.tar.gz 18172400 BLAKE2B 90b59d54dd87378ccc766f19bc142950f435e4314594fd78923f1c9099393a1b141bf7772f507df7553d9f4afbbe49414c75c0276296481c65017a48d3a5ff01 SHA512 bb20eaf4a12f33ad2ca6933a21123cdfd7d6031da472a881f8c60979881c19bc363db585c2be0635081c7380f0f0819921af7c3a4847de57505013c6e3959ea0
-EBUILD qpdf-7.0.0.ebuild 1212 BLAKE2B 0141c83c2b3ba8abed3d974b3a2d827c864f698eedacbfb0d01ceb447db4f30f8061da08ad0507e0f8d81158b19c2ef29e62a8102452d1af2fabe95096e99f68 SHA512 d7c68ba266f88000c5a98360c3ba568ae9f4a4093874b06a4c5ad9faca72abf32c8f4d6a6d1a94dced96063e88e90fa8aa6faa2bff3efdb2a73cc7ae5fb60490
-EBUILD qpdf-7.1.1.ebuild 1221 BLAKE2B b069833afe4b5ee03372ec40fe1831e171048422915228742fd9b3a9242be3157730bea25523f4c7a99295ad1e5b8d0d1de8c6e88be55c718975a9acf4f8e6f4 SHA512 ffbbd94355bc287e545ef723da53c8e1b89e23f49479c08a42209d677ba2d8c0c06af13b4a6c62f78352c7cb602df15d6b90aba23d458ef758edab506eae7aa4
+DIST qpdf-9.0.1.tar.gz 18172693 BLAKE2B ddb389b773b4664c1c3da270f1804f015c8f0a04ed57df7a4a1de9ff80cd47c6fd07c29836573bd6459cde42e8fd3986855a68632495df5363d220d6062669c7 SHA512 1bca5cf39f0019443f744c01ddc93773febca6883063fcec7f3541dd68359d8da44f34cf111cacb3bd9564f10bf1b09ea58173efd3ae06116e5c3832e61e82cc
+DIST qpdf-9.0.2.tar.gz 18168977 BLAKE2B 46b397f0e6a97804c5e8dcbfc9fd2278960d5afd459430c1790bb8f9080062cf661cf186ab386721ed7560dbd4abbea43e4d31914c0636502c5c11096c250fe2 SHA512 275ca81603d53601e4389cb34eaebea1c5d52b310ef28f3375fbeee255a28edf9375f03f31649f580dbc3df73b851a2c8498feb3dd7b30067955571b05c9e69c
 EBUILD qpdf-8.2.1.ebuild 1246 BLAKE2B a5a9de3de8d4c2bbd9f36c6977626d1943eb1332f3b592d2fa0ee19107651c6601d51d5ef7987774c3a1a7d3dc1d89aeffa96bb8f70820a40ede9cb6f1bc5659 SHA512 d54a88037debb98c3e85d354a223a4f682fa1ff7d744244c7a9e9cca089141fe92aadcc6f2ef6006ae54911bccb0e107fe5d8739875483f5e26fa7c150db539f
 EBUILD qpdf-8.4.1.ebuild 1255 BLAKE2B 1b3e6004cc12bbc5e1b89d27b7100d963e9bfba4cc50c823cb356a021884196b11f5f43219e71fc74c31f946ea5da701b5fd7512ee852edab13f4268af55203f SHA512 c135d6a5af42997864e7f348f6464f6249d6a018eae0fb9352e7fa8b8c107702077f1e00daa48ff4e49af08c4d612b430ceac2063b3d8c49edd67ac618ca0e40
 EBUILD qpdf-8.4.2.ebuild 1256 BLAKE2B 8733a9c756fd75c166d6de06420795de427b19c60a5e7411dd271f7493c3a5ec493ac4813555587dd8acb429afc611937089c6f29ed3dd5699a4bc83c864f96f SHA512 8e2e971373eb77502adfa95962e5dddacb9ec781080ff5e5b72d2b43e2a9cc158885168f5dbbc191ba688b8dc20ededeaa3057682ab57d50afb80c8f2730f74e
-EBUILD qpdf-9.0.0.ebuild 1256 BLAKE2B 99fce30ce8d693780d1753027420f7264bedc78a7163f9f37f1a72b1753a18065032508281f72ef052ea3d563b7b2fcc00d80bea959d69d070e8f7d0b30d8c11 SHA512 0bba46803264bbf4e3e2e46c9c0abd5239130b5b58bfb0cd42496d0105a43ebf4638765814f331807cf983169fa54dd3160a55f2e17d42ca2556164742321b71
+EBUILD qpdf-9.0.1.ebuild 1256 BLAKE2B 99fce30ce8d693780d1753027420f7264bedc78a7163f9f37f1a72b1753a18065032508281f72ef052ea3d563b7b2fcc00d80bea959d69d070e8f7d0b30d8c11 SHA512 0bba46803264bbf4e3e2e46c9c0abd5239130b5b58bfb0cd42496d0105a43ebf4638765814f331807cf983169fa54dd3160a55f2e17d42ca2556164742321b71
+EBUILD qpdf-9.0.2.ebuild 1249 BLAKE2B 422ccd8dfb9eb35c3f27ee2d915f3cd5ff4c1c510d8c50dae6b9167372b0598e53085b3380b46fe432cc5f919a73f59dd3d90a88ddffb2afa557e9ec896f21b3 SHA512 8bcc08655c9b27d8e8d96f6b42a50d103c369b4919991872f7df3eef8bf7e841f2e810adda6498fa9d338b0b8c1db5aa7714ae9fe2e029c6831a506c1e2815eb
 MISC metadata.xml 499 BLAKE2B 9f6462a9606763352f0c823f877d1a39ffa207a8354e800d64bdb4d7686de8391309e08296adf23ca6b6e5d6fc2150d72ca9b0fed36cd4574e51ae6d04e48341 SHA512 77915adba55eb2b0fa68af06fa30b84c50af0a4a26a3ee6fafa71f9c7a7a307451ab76291dfc87f90479f6a208cb29c8a6c8c7fd0d574455faa15c87f8ea8de7
diff --git a/app-text/qpdf/qpdf-7.1.1.ebuild b/app-text/qpdf/qpdf-7.1.1.ebuild
deleted file mode 100644
index 7b0bf28566cf..000000000000
--- a/app-text/qpdf/qpdf-7.1.1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Command-line tool for structural, content-preserving transformation of PDF files"
-HOMEPAGE="http://qpdf.sourceforge.net/"
-SRC_URI="mirror://sourceforge/qpdf/${P}.tar.gz"
-
-LICENSE="|| ( Apache-2.0 Artistic-2 )"
-
-# subslot = libqpdf soname version
-SLOT="0/18"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~m68k-mint ~sparc-solaris"
-IUSE="doc examples perl static-libs test"
-
-CDEPEND="
-	sys-libs/zlib
-	virtual/jpeg:0=
-"
-DEPEND="${CDEPEND}
-	test? (
-		sys-apps/diffutils
-		media-libs/tiff
-		app-text/ghostscript-gpl[tiff]
-	)
-"
-# Only need perl for the installed tools.
-RDEPEND="${CDEPEND}
-	perl? ( >=dev-lang/perl-5.8 )
-"
-
-DOCS=( ChangeLog README.md TODO )
-
-src_configure() {
-	CONFIG_SHELL=/bin/bash econf \
-		$(use_enable static-libs static) \
-		$(use_enable test test-compare-images)
-}
-
-src_install() {
-	default
-
-	if ! use perl ; then
-		rm "${ED}"/usr/bin/fix-qdf || die
-		rm "${ED}"/usr/share/man/man1/fix-qdf.1 || die
-	fi
-
-	if use examples ; then
-		dobin examples/build/.libs/*
-	fi
-
-	find "${ED}" -name '*.la' -exec rm -f {} +
-}
diff --git a/app-text/qpdf/qpdf-9.0.0.ebuild b/app-text/qpdf/qpdf-9.0.1.ebuild
index 32bef49367a9..32bef49367a9 100644
--- a/app-text/qpdf/qpdf-9.0.0.ebuild
+++ b/app-text/qpdf/qpdf-9.0.1.ebuild
diff --git a/app-text/qpdf/qpdf-7.0.0.ebuild b/app-text/qpdf/qpdf-9.0.2.ebuild
index d1bf435cf3c6..98f584a8c41a 100644
--- a/app-text/qpdf/qpdf-7.0.0.ebuild
+++ b/app-text/qpdf/qpdf-9.0.2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 DESCRIPTION="Command-line tool for structural, content-preserving transformation of PDF files"
 HOMEPAGE="http://qpdf.sourceforge.net/"
@@ -10,9 +10,9 @@ SRC_URI="mirror://sourceforge/qpdf/${P}.tar.gz"
 LICENSE="|| ( Apache-2.0 Artistic-2 )"
 
 # subslot = libqpdf soname version
-SLOT="0/18"
+SLOT="0/26"
 
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~m68k-mint ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~m68k-mint ~sparc-solaris"
 IUSE="doc examples perl static-libs test"
 
 CDEPEND="
@@ -34,9 +34,11 @@ RDEPEND="${CDEPEND}
 DOCS=( ChangeLog README.md TODO )
 
 src_configure() {
-	CONFIG_SHELL=/bin/bash econf \
-		$(use_enable static-libs static) \
+	local myeconfargs=(
+		$(use_enable static-libs static)
 		$(use_enable test test-compare-images)
+	)
+	CONFIG_SHELL=/bin/bash econf "${myeconfargs[@]}"
 }
 
 src_install() {
@@ -51,5 +53,5 @@ src_install() {
 		dobin examples/build/.libs/*
 	fi
 
-	find "${ED}" -name '*.la' -exec rm -f {} +
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/app-text/qpdfview/Manifest b/app-text/qpdfview/Manifest
index da92d3aca5fe..23abe82da778 100644
--- a/app-text/qpdfview/Manifest
+++ b/app-text/qpdfview/Manifest
@@ -3,5 +3,5 @@ DIST qpdfview-0.4.18_pre3.tar.gz 747794 BLAKE2B 08420a350ae6f8bba65efe2a930a8941
 DIST qpdfview-0.4.18_pre4.tar.gz 782305 BLAKE2B 0e79a30e9774a1afb7f38bd932e8e1b2a7930acca217b7ac485f4857211449f5a8f902706b4638023667002d2f98fc116a180b2ec0219a360fe8c3025023cc39 SHA512 24431a27c279c290ce95a7db52f87e6cade0683dab53a3c494823020a7df9150919af31f20f63ff4c7337f5548b3e7252df0d8a6043a8c50ebb18e41f387838d
 EBUILD qpdfview-0.4.16.ebuild 2137 BLAKE2B d0ce86840680b56afd8b925b820d0641a0754776d4054b469c691f5da10db072febd5b04b34b80394bc08f47d6b5b7b58390332c30d445116528cbc238fe2144 SHA512 2d89740ee569287794935eb369c8a035a3ceeceb3e428e740f0b0adbe808f532a336dae9739c789bd4ee71b1a7f87af222ce91c19028bb179275184607489549
 EBUILD qpdfview-0.4.18_pre3-r1.ebuild 2392 BLAKE2B 9b8d9bf46515c2e77b85fb0dbf6bbcc183c9bf8e2c0b0c837bb1442634885770806285c35094e91439da58482176a77deea8a0addbd9842804509b1aea3fd9bb SHA512 930ef2979ac45d7beb67b8da2074d476c393a00e0054e0a045ea14b62825688d53b19047faa57ac12ed155b46bfc6833fbdc93eddba5ecd9bcf7ac63dce707fe
-EBUILD qpdfview-0.4.18_pre4.ebuild 2392 BLAKE2B 6ba3bdc539586daac4c0db3bae00096e2653eafe745658d755ae7eafed3c40547e0fa7a5bae76bd4f4679e69da150b63ab0eb11e8704260b0fb454a993953141 SHA512 5aa02f71a7125be0c2ae69d664a4a5e9f5ebb8b3dcf9aab5c1ea07f43814a6a02bdd429910778c96f7fbbac641d742edb51078095cd3fb889969aef84af38f75
+EBUILD qpdfview-0.4.18_pre4.ebuild 2399 BLAKE2B cd8c12940af69772fcf9ac6271f18488968ea10165ed1a09fe4427357115d0054e79b629f98d3823ebf111991429b6726e3662808b151c3aaa47ef4f36bea3bb SHA512 c1f17e9694ec8acd3002451cdbe248bbb8ec696c66ded602ce66a784eb37aa8437743dcfefe8099877c2a3bafdda64557ec2ac186163faee87ec4fdf7efb21a7
 MISC metadata.xml 534 BLAKE2B db66db041dd0875c8d4e36e3223d7f82263555f2d6a1dcc5270279b3fc8bc77499712253d43b56e278187f163af0495ca9e7e6aa0ba0dc8e9a5fe9cf7f2daf99 SHA512 e086f5e92c5ad9058f13c23c814a5cdc988a09cdbebecb1018b59d32a756dc2766b13ee1c3e09966cc7e221cc1c4ee26f9bf11c50610f94b28c20a34c316f133
diff --git a/app-text/qpdfview/qpdfview-0.4.18_pre4.ebuild b/app-text/qpdfview/qpdfview-0.4.18_pre4.ebuild
index 47d005b062d9..cf650275d2a4 100644
--- a/app-text/qpdfview/qpdfview-0.4.18_pre4.ebuild
+++ b/app-text/qpdfview/qpdfview-0.4.18_pre4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://dev.gentoo.org/~grozin/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="cups +dbus djvu fitz +pdf postscript +sqlite +svg synctex"
 
 REQUIRED_USE="?? ( fitz pdf )"
diff --git a/app-text/sgml-common/Manifest b/app-text/sgml-common/Manifest
index 19c33ba4b055..51eecb33f659 100644
--- a/app-text/sgml-common/Manifest
+++ b/app-text/sgml-common/Manifest
@@ -2,5 +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 2452 BLAKE2B 01b04b177a926d64e0963d67d513c6632b5271f45bb9518defd100d59f3d333300e8c37b4d3d849200fe2ba105bed108c09ebf0037fa08d7df310f151cd8b20a SHA512 bb4a34272e4937dd6c84077f4aae03d28a4bf9868651b0cfb373519673b2dc419834a734559d98878776e022a25ddda202083344c80b6fb5c7b707b39e5b7858
-EBUILD sgml-common-0.6.3-r7.ebuild 2567 BLAKE2B 800f5101e1f755c084861548a7e9ab0b5cff19cac9ff132763293702591b8d4540ef84caed5cc49cc4ac45774eb3479d7e191126fec68d3714aa3107b53b6e2f SHA512 456d3381d04aa895801cf07b37ae6fbd46fd05f9e13407cb10789e7e55d0825a82b19e8318564bb1e451c0a707a94dec8401837fa9978086a6fcff0c7fe50c20
+EBUILD sgml-common-0.6.3-r7.ebuild 2561 BLAKE2B 5ca0dd7d30217967f29aa720436e9369c1f3e97b1fb0d754dd7720e23866129662b33a533f7923e447c2f429005dc9f919a08ec3a963f02099325c2cac0aae42 SHA512 09421758dfc6cd3a7307bc67ef13f5a2b48133c35e0acaeae4597da894a883c81100e32f7b1d0b807f9c726765db4edf8ed5c86c391d805ef38d32e8ad77074a
 MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/app-text/sgml-common/sgml-common-0.6.3-r7.ebuild b/app-text/sgml-common/sgml-common-0.6.3-r7.ebuild
index 2e02f5cb5078..1093399f343c 100644
--- a/app-text/sgml-common/sgml-common-0.6.3-r7.ebuild
+++ b/app-text/sgml-common/sgml-common-0.6.3-r7.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://dev.gentoo.org/~floppym/dist/${PN}/${P}-gentoo.tar.gz"
 # install-catalog is GPL
 LICENSE="FDL-1.1+ GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv s390 sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=""
diff --git a/app-text/sgmltools-lite/Manifest b/app-text/sgmltools-lite/Manifest
index c62de35f83c9..4b11208ac7a9 100644
--- a/app-text/sgmltools-lite/Manifest
+++ b/app-text/sgmltools-lite/Manifest
@@ -1,5 +1,5 @@
 DIST nw-eps-icons-0.0.1.tar.gz 8733 BLAKE2B 467fa3f341c1d6ea20af059cfa88529a0b3bc729cefac72d5b3c264d3a224e8bfb05a89b5f491a22aaf4c194b72cd27ac103a381adb671d9867ef8fceb41f030 SHA512 597062e9882bb9bb73144bbdb056c3ccc2a6d99efc7da836f483ccd6f3799705bcbb897099cb1a580c8e22d936d281d95c3a875694f8e15b6989faf437f6cc7a
 DIST sgmltools-lite-3.0.3.tar.gz 61342 BLAKE2B 8fcac5b48fcdbb8fbbfdbf8ad055ab00cb3fb6a8447a27bf5b14faef968845554a86f04b4984c1ccc1e26d9c64dc5654d5831896bbc44bd3dee0ef3fc28109e5 SHA512 36709ba726859b734a7402c533ba7d2abc0546007bc97dba76ac824bc42f6f8ac7ef263b3740d0be51749cbc0982d010ba938646fca2006fa2c5094a296b3c81
 EBUILD sgmltools-lite-3.0.3-r14.ebuild 2205 BLAKE2B 030bdf9b6258b0768b3098c17d4cc820110cfff79ce9a2d6becf6d1c28c18977d2cbceb083cec512cb64380bd5cf8ef012a773357d328a08f4cef607229fd237 SHA512 f1cf3035547d1626ace249218a75399e7ad9374f60de3203003393418324628dce27f28cd608f4a4c310306d36043a6856db273307c8ec5a9a3642307e1cb351
-EBUILD sgmltools-lite-3.0.3-r15.ebuild 2549 BLAKE2B 2fd99f4cd7a56638734df4e1dc5953e135b92419d52cba630daa43e644ccfa8ec8f2e204b5ec905473ebe7cf36efc5531b0f9437f8fcb67ec4730c175d08a070 SHA512 08294ee125a1dc755625023a8ec89d07f60ab9e9f0c0c897a4f7090e6bb6d88ed791a01c241aec2bc9f6e176241aa90eb2aa8750eba8ac0ea30b628d27ed5684
+EBUILD sgmltools-lite-3.0.3-r15.ebuild 2544 BLAKE2B 445b9ca88bc29d7c1959b09aad3eacf27d2009e0c7aeb77d18fa279bba834991034494f7fc0e381b1499f2fa2595bb5031a837d55388e36e31f4c9ea6b466fd6 SHA512 9ca223aaefdecd6e0b28bdcfaae6895c96c408931063c661fb04627a51abb5130e9be7b12aa18c761f95ddff0404b867d6e4ff25d1707acfd957e236b71d9337
 MISC metadata.xml 493 BLAKE2B 36e972b80b557e131d5decb41945968ce24de810197ea457e50081017e50e3926baa419082222cbdfb494a55e9bae125bf304a431234efb4c4a67a8c3536852a SHA512 9f2e53faa5f07d791f7c4cfa7972ed42a26d1abfa5c11faf3e36dce18c2c30d086462e9c0a2c7664153333cb10c3923d47b4bb9e873b7e48dd144e667719a14e
diff --git a/app-text/sgmltools-lite/sgmltools-lite-3.0.3-r15.ebuild b/app-text/sgmltools-lite/sgmltools-lite-3.0.3-r15.ebuild
index 44cfa3625f33..064b535c9045 100644
--- a/app-text/sgmltools-lite/sgmltools-lite-3.0.3-r15.ebuild
+++ b/app-text/sgmltools-lite/sgmltools-lite-3.0.3-r15.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
 IUSE="jadetex"
 
 RDEPEND="${PYTHON_DEPS}
diff --git a/app-text/webgen/Manifest b/app-text/webgen/Manifest
index 02d93d188f13..023774ecd4b6 100644
--- a/app-text/webgen/Manifest
+++ b/app-text/webgen/Manifest
@@ -1,3 +1,5 @@
 DIST webgen-1.5.2.gem 200704 BLAKE2B 55749d515223b46c7063596d1424de107f43af022fc54ba431e83ffa4dbe3ab5651e6c61e48f66710a1e958c2f6d09a64ea05c9186dd0c73add5351fbc419806 SHA512 83557bc7a3cafb5e885bd4c50f7083a7576a5c930458075d91ffd58b4fa3c4e406f342dd23988788afb22e9a03ffbff0dfb02d23ebfdef7d2275638c102839b4
+DIST webgen-1.7.0.gem 201728 BLAKE2B ed44657420817d98ffbd72093ff56db22ae3a8da43c77661a663d938f3958c4055df4b7b34252eee162846af27a35320f680fdb6b9b1818f96aa1e51eceffd9f SHA512 1e791f720108996a4f52b151d160d9b6f613c036aae2350c634f5539257c4ae946737ba2df94bc424199413463e3016432a6d1e67e30b419b2770bc83b3b14db
 EBUILD webgen-1.5.2.ebuild 1163 BLAKE2B a44f3a9abccb766d9f4905b912029e82dac08438771ffb73faadd400f7cf474b1a70a4398b45e1ee4b6e8cb1a15673ea1c5e839c291f840bd96dfb593d5e06a5 SHA512 32b64116287d64be074c47f6c74213ada9185d5a3cbca85ce98114180144669531b742bcacf7c1ac2b953260bfc272a8b3838358a41679d1de9420ca3e5530d4
+EBUILD webgen-1.7.0.ebuild 1490 BLAKE2B a7d030cbef9fd77dfeab3cc54d8e7fba04d7a2ee9cc9549c6a45956735ae9c64f7fd2f3ca1bc47f6db8dab0915bb97936582abd7bc2fe0473bbe89de46fbc4dc SHA512 ce7d14ac48592bdf117ab556250c021242994f641920a96e075fdbd889b6a9406756e2c72621598517bd7399c4de1d9c3addae1a7914cbba6ea631f62565dfd1
 MISC metadata.xml 477 BLAKE2B c8293490729904a1a67e6c0861f6fc01b00190322213b566de36e6a56d474118c32a81a9573bb8e43f433d5eba8d5f111878cda00866a5f1b5fb36e052b779d1 SHA512 d872a0fb051b79b34541fafe549c2283a4a92edd7bad4a97adb1c3124e82820a67c286d04a004cdd2fe132a44ea4f0ec8cc3b335f3a1d91aa8877533a1c278bb
diff --git a/app-text/webgen/webgen-1.7.0.ebuild b/app-text/webgen/webgen-1.7.0.ebuild
new file mode 100644
index 000000000000..3e7ecc338654
--- /dev/null
+++ b/app-text/webgen/webgen-1.7.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_RECIPE_DOC="task"
+RUBY_FAKEGEM_DOCDIR="htmldoc/rdoc"
+RUBY_FAKEGEM_EXTRADOC="AUTHORS THANKS"
+RUBY_FAKEGEM_EXTRAINSTALL="data"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A template-based static website generator"
+HOMEPAGE="https://webgen.gettalong.org"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="builder doc highlight markdown"
+
+ruby_add_bdepend "doc? ( dev-ruby/rdoc )
+	test? (
+		dev-ruby/kramdown
+		dev-ruby/minitest:5
+		dev-ruby/rdiscount
+		>=dev-ruby/sass-3.2:* )"
+
+ruby_add_rdepend ">=dev-ruby/cmdparse-3.0.1:3
+	>=dev-ruby/systemu-2.5 =dev-ruby/systemu-2*
+	>=dev-ruby/kramdown-1.3 =dev-ruby/kramdown-1*
+	builder? ( >=dev-ruby/builder-2.1.0:* )
+	highlight? ( >=dev-ruby/coderay-1.0 )
+	markdown? ( dev-ruby/maruku )"
+
+all_ruby_prepare() {
+	# Avoid a test fragile for sass version differences
+	sed -i -e '/test_static_call/,/^  end/ s:^:#:' test/webgen/content_processor/test_sass.rb || die
+	# Avoid a test with fragile whitespace tests
+	rm -f test/webgen/content_processor/test_haml.rb || die
+
+	# Avoid tests for rdoc since that requires an obsolete version
+	sed -i -e '/def test_create_nodes/askip' test/webgen/path_handler/test_api.rb || die
+
+	# Avoid tests for unpackaged dependencies
+	rm -f test/webgen/content_processor/test_{css_minify,tikz}.rb || die
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	doman man/man1/webgen.1
+}
diff --git a/app-text/xapian-omega/Manifest b/app-text/xapian-omega/Manifest
index 2158cfaf26c4..15f17a879940 100644
--- a/app-text/xapian-omega/Manifest
+++ b/app-text/xapian-omega/Manifest
@@ -2,6 +2,7 @@ DIST xapian-omega-1.2.25.tar.xz 440224 BLAKE2B 1e67cff0ed1796349df5da7d33c07febb
 DIST xapian-omega-1.4.10.tar.xz 532952 BLAKE2B dec0ebc7b4de24d6f11ea91f090925c0a2dd088ec6468e47e1ea6e60f31acd99d8480f47275df597a508b51c3d2046ce89cd1c8f10e19ff4ad4ce5e593e25852 SHA512 53dde1705eea39fa26afd4db6a0ab39e050ecd1ffc71d2e4c2a2287930d926993c48c36d0c2ad6268188a29876bac1f0e3c29fc54afd2fb6f831899929ebb302
 DIST xapian-omega-1.4.11.tar.xz 533596 BLAKE2B 5002f809a310cfff8b7316c6d1f7fa17f93fd88381aa5ca5de14a443f2b3bfd7f00738bae7b2e3a739a170bd8f454e82f696212fc43282d342946a774b7bfaa0 SHA512 135077e26dc0b0707d1d14c64eeb25db67374b1b7909e9f3e925b10e03b1557263339d2f84c5a82046a159e58a5301834e76e99843d66342666d5694f91ed4f3
 DIST xapian-omega-1.4.12.tar.xz 539324 BLAKE2B 01a9f54dc622699fc4362c3d36a9b529f31c87b6c424f5d55d5dc7e676e8dff895df7e31fa187680afd5eb9e90d65b06d39fc06912b9ae5db8a9e13b694d980d SHA512 2d2c48646f4f06fc4b2666e0901e4f73b2c5da93c4a8e8a5ea6d32e9076a2f18c15c14c7dd2ae2d421a501119ea19b52fe324ad98f9f0bfd6b80f4286721aa2e
+DIST xapian-omega-1.4.13.tar.xz 540216 BLAKE2B a6133e4ac8423f5bbbb67013a8f7a9d936574d8b16dd0adfe42307044e0d0de7773624cd7a7c127bf6cb4bb887ec70a101621ab8077b8918c5b3c83b84b36f66 SHA512 438b015aa554d9a315b1e2a5a2d7a77e0fbf80455f81fc2abc47e7f70d3cb64e4b7811566df2f790cc39b75293de42e2e685dc9df0ac6744763b11216f265785
 DIST xapian-omega-1.4.5.tar.xz 502820 BLAKE2B 3077a9a4fd177daa7f8470bea0b8dde25402235fee280118a90930888543b2da7821ad7d30143d04d35dccfb0de6c375231f2db4a4f4dcbaeeaf5d4e54045cfc SHA512 895da1e1a3ddf2e5e8576fd41853cc5cb7c6e4f0223a0d25f6303fd01ca26f64c8e41616d6d66b2309a4ca5763b2b20b208dbf6054f0498411f2678422c07893
 DIST xapian-omega-1.4.7.tar.xz 510644 BLAKE2B e2106b07a0ccf765dad25c3e83a745936156b002e638fbd9cbd1fd194f507ad663c305fc4981d72f92a74f645601aa83b1bc3133d10d8d4c308f28657a90a356 SHA512 e7e2c7dfa3e76ccdde103b34aa1b0732033e9f218346a81f1b0b865c6e2d17c356b96a4522a3a2273fb55eb2fbd2dd57e835368771f46c9fb458c0c11329893b
 DIST xapian-omega-1.4.8.tar.xz 521352 BLAKE2B 01d914c0dcd7e8a8cf7ec4b997af49c01883d83a5c9bd1c59da058d3329dab5f517bb4d3aa243a3e47ad36311acafd64505fda1ecf86d3605a38ef70760d8711 SHA512 5d27c03891ff941b23c899b1a293ed9be0129de08ff46156380638408360ea6e4aa2dfb4fe0ffb13726807849802fe8d19f6dc817a52ec5bf50c2bf94ed94c2f
@@ -10,6 +11,7 @@ EBUILD xapian-omega-1.2.25.ebuild 1265 BLAKE2B 28e33f851cccd463daf6ff3e92c980d4c
 EBUILD xapian-omega-1.4.10.ebuild 1156 BLAKE2B 7678c709dfa63c30ff24b194adcbee10b9eacdb9fc8ab10820f761453e89e385767220852a586c3455858fc552ec58411f28b6e5ef3b9bd24bff86f1401f7f1d SHA512 f3da59ad5c6291ffcf3f84e56b98687dde6c8873af3f697a82bc69343c3b1691cb6afc57de69afcbf020305688dfb9a25d721a9ade0b10e244a3f7fbc6dce992
 EBUILD xapian-omega-1.4.11.ebuild 1156 BLAKE2B 7678c709dfa63c30ff24b194adcbee10b9eacdb9fc8ab10820f761453e89e385767220852a586c3455858fc552ec58411f28b6e5ef3b9bd24bff86f1401f7f1d SHA512 f3da59ad5c6291ffcf3f84e56b98687dde6c8873af3f697a82bc69343c3b1691cb6afc57de69afcbf020305688dfb9a25d721a9ade0b10e244a3f7fbc6dce992
 EBUILD xapian-omega-1.4.12.ebuild 1156 BLAKE2B 7678c709dfa63c30ff24b194adcbee10b9eacdb9fc8ab10820f761453e89e385767220852a586c3455858fc552ec58411f28b6e5ef3b9bd24bff86f1401f7f1d SHA512 f3da59ad5c6291ffcf3f84e56b98687dde6c8873af3f697a82bc69343c3b1691cb6afc57de69afcbf020305688dfb9a25d721a9ade0b10e244a3f7fbc6dce992
+EBUILD xapian-omega-1.4.13.ebuild 1156 BLAKE2B 7678c709dfa63c30ff24b194adcbee10b9eacdb9fc8ab10820f761453e89e385767220852a586c3455858fc552ec58411f28b6e5ef3b9bd24bff86f1401f7f1d SHA512 f3da59ad5c6291ffcf3f84e56b98687dde6c8873af3f697a82bc69343c3b1691cb6afc57de69afcbf020305688dfb9a25d721a9ade0b10e244a3f7fbc6dce992
 EBUILD xapian-omega-1.4.5.ebuild 1152 BLAKE2B 1cdca6a87ec353a468a65a7dc5df903e452128c8df66930d3b7eb651963d211305962cf5b415dca9a56475ff782c4693aa34cd2a91e4d2a444e6a1d2f00b5144 SHA512 540c43a135aaab12509e155b188e17f768d0b9c50a4170f39a29d815532aea4c66c24c65af270c7b906321527f4795a06d325d87b0b67f51600a0da488408944
 EBUILD xapian-omega-1.4.7.ebuild 1151 BLAKE2B 60e49c563df5f5df9b3b29a4ad0aec64c56b045b3bb0f6ac4691d34d46342ae8504a2da8910562cd6dfdd5068b097a9e0d0217c517968f1db9fee114275297c3 SHA512 bd6cc0b52a785d6d205d4faebe6f8dd620623a9c4305da606238bef4026279d6e5c3490c3f398ce51e4fedbf91cb2fd65a1efca8943f8e3ad4ebba829c6e1bf6
 EBUILD xapian-omega-1.4.8.ebuild 1156 BLAKE2B 098b20d7e4f03036303c6a5e63692b0e90b8f64cd9c6c29699e91a4d3d0e795624911546375cb330e8db9aff0cf8962d7392990c1fee6b30c387897c7bd93caa SHA512 4132801108201759b6a7a32eeda1a0ed566c4d9e772df586e174036b9042679ea42fab1f5c80d0d7c8dff6dde4af768f54ca17908e352cba7950a3ee01551108
diff --git a/app-text/xapian-omega/xapian-omega-1.4.13.ebuild b/app-text/xapian-omega/xapian-omega-1.4.13.ebuild
new file mode 100644
index 000000000000..4a7e3ffd806d
--- /dev/null
+++ b/app-text/xapian-omega/xapian-omega-1.4.13.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+DESCRIPTION="An application built on Xapian, consisting of indexers and a CGI search frontend"
+SRC_URI="http://www.oligarchy.co.uk/xapian/${PV}/xapian-omega-${PV}.tar.xz"
+HOMEPAGE="https://xapian.org/"
+S="${WORKDIR}/xapian-omega-${PV}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+DEPEND="dev-libs/xapian:0/30
+	dev-lang/perl
+	dev-libs/libpcre
+	sys-libs/zlib"
+RDEPEND="${DEPEND}"
+
+src_install () {
+	emake DESTDIR="${D}" install
+
+	# Protect /etc/omega.conf
+	echo "CONFIG_PROTECT=\"/etc/omega.conf\"" > "${T}"/20xapian-omega
+	doenvd "${T}"/20xapian-omega
+	dodoc AUTHORS ChangeLog INSTALL NEWS README TODO
+
+	# Directory containing Xapian databases:
+	keepdir /var/lib/omega/data
+
+	# Directory containing OmegaScript templates:
+	keepdir /var/lib/omega/templates
+	mv "${S}"/templates/* "${D}"/var/lib/omega/templates || die
+
+	# Directory to write Omega logs to:
+	keepdir /var/log/omega
+
+	# Directory containing any cdb files for the $lookup OmegaScript command:
+	keepdir /var/lib/omega/cdb
+}
diff --git a/app-text/xhtml1/Manifest b/app-text/xhtml1/Manifest
index 5f8d29cc6cbe..9bbae74489b9 100644
--- a/app-text/xhtml1/Manifest
+++ b/app-text/xhtml1/Manifest
@@ -1,5 +1,5 @@
 AUX xhtml1-catalog.patch 834 BLAKE2B 47236e18d55237bbfb6299b634253545299dd9649a58d42af6fc8e56afbb8547564dc17bbefb808b96aea739d7ba673403ab2f3c96b5eddceb7f886353320b51 SHA512 0b4fdb64e73405be53930984e5f628a1b5b48e6d43bebef9f9c502fca31d13b760385c0481030f8a09556447891a542dc4c7bb23f0618fd937e2934936b26780
 DIST xhtml1-20020801.tgz 232192 BLAKE2B 4e2da9b73da93a8196ade80549a2e255b1954178472fddaf2e3d979befda8689f3540a65d41723e40bd0450d626608ffcdcd1fa9183da5e3b13d90a5649fdc23 SHA512 184758381c5e2d36b80fa1e4470e864777383ff7539b48291036f8a3f1dba0b354a32142bfcc9071147fb20bcd4c0d4d541e09e865047938ab4cf9ae5a806412
 EBUILD xhtml1-20020801-r5.ebuild 2160 BLAKE2B ca6392bf2c05f249f7d2ce3a8f4ddbc184c80e6d5d4f292db63f33415c9a108fcc655a633665a7784fce61949bece01a8f29c72ced9994456dee3e3a1e0587a5 SHA512 b1f7470392e2d8acc75c0604f396621c624153baf7a27afac83632a3464c4001d94069b660adcc8432b038f2697ee0c3ab8a8b50dae3224f0d90670c81a791a6
-EBUILD xhtml1-20020801-r6.ebuild 2362 BLAKE2B ba7d9d04ed58a3ac609ae2c684eb7085c1903f1d7caec3994df43050d45d5efc3a61c71d9ea22a068c3d2819f41b9db78e5aef962925469ee6d65e266a335dbd SHA512 4aaa7be3ee9f6255a485fc1193c8c22f15be5f80c53b2dcc16eca4dc0570bfbc3387c8af105b45b0e249734ce646a257446e377fbb5512765ec72bf84c6c829c
+EBUILD xhtml1-20020801-r6.ebuild 2360 BLAKE2B 2d16c6349e56d2960aa32b0fec23898af872fffbb2a2d44253f8aa60ff93129c75938868401106e04e5fb93d3f014fc51bac45fd6c6e77eaaa5690e0275f2dd6 SHA512 e3c6a8f6453a00595c6f3fd478907b8d79a04867de73fc7ceacccf9d672e11615aeca8127de813fd7c127c955060402c331b4e2af458e2992e29dc8d7cd4cf61
 MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/app-text/xhtml1/xhtml1-20020801-r6.ebuild b/app-text/xhtml1/xhtml1-20020801-r6.ebuild
index 8c5588a7bab4..e4ee29db7afc 100644
--- a/app-text/xhtml1/xhtml1-20020801-r6.ebuild
+++ b/app-text/xhtml1/xhtml1-20020801-r6.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://gentoo/${P}.tgz"
 
 LICENSE="W3C"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ~arm64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""
 
 DEPEND="app-text/sgml-common
diff --git a/app-text/xpdf/Manifest b/app-text/xpdf/Manifest
index 43f6ce855e8e..58df5d70609f 100644
--- a/app-text/xpdf/Manifest
+++ b/app-text/xpdf/Manifest
@@ -1,7 +1,7 @@
 AUX xpdf-automagic.patch 924 BLAKE2B df4d7a245d8f710568d455660b29a81fd4d4dcfb21fccf60d5f2db959a7a2e2e64eb36cc7cbc0aea7e1cd21bdc6a11cb0ae7ae43e9293164ba5ef88685aa1653 SHA512 8bdeafe1553fea67b6d30afd1eb6e6abbd57f470a79b982b2b545fc91f12bc00c34a1639a05e8ef589ce1518886cc8de45c54303c4528c7e3d721ff624a0d27e
 AUX xpdf-shared-libs.patch 2286 BLAKE2B 63d668f5ab910ede26c85ec8fb379baa39112c0056ab61d3d8192447d76a5d455a3d3eb43ac1f0f3e275ed38d8cfaa56ed45432cf2f0d22a5eeaa63fa8e794e6 SHA512 560bf773fea8aed81678710aebb5733c8134ea7c088a761e20726c8758a98219c977a32437bd6f425271ed7c76a2742705074e11db108cb4bf71c0530b10276c
 AUX xpdf-visibility.patch 414 BLAKE2B 835bdfdbb39297859d1886a5ebd76bec23a8b8df744f627a475d8c00ae3cdcfe219ec039f00b7b6a7305e6c451399c422fafdea0599bf22d2ef34bd4912eae4c SHA512 a1f87523aeb657484181005b3e40a90eaaee2d00452bfc50bc23913d6e1e5a9117600959b3800e789be50f6d12d726f875caf02b73ec41dc9d98e1215b2e964e
-DIST xpdf-4.01.01.tar.gz 891962 BLAKE2B 500cec4091f1ea4fda2008febcfbbe758663d26a1a2a9842abd8630c41a29f6f9fa9839a4b286a2d42e8d686d33084335ad7aa5775c1142cc196b38ef70914d6 SHA512 e0b42195ba4858ecf2ec3c3c06a42eae742eb8567dca695a45a01185b606b399b5e45d220b24ed39782d1f9b1ee16f674129db3346d25b709bbb3f90ef078c22
+DIST xpdf-4.02.tar.gz 912885 BLAKE2B 70dec3d213566c1a7c13edd05e4f6145b45ad4c4805843393e0f86a07820511a5187cd61a04adf3c3fc671840acdb3b1bbb19dda7dc101df75e564971f51b76f SHA512 72c9413fc7241dde5288137ca8a68c837d2a68e95e909dbe2afe8f374b5a7c92af4edf82918963d1c6388c947057fcf5f0ae1e6fbb2b31c3d5eb9a07d3c74ddc
 DIST xpdf-arabic.tar.gz 1057 BLAKE2B 5889fa5704a805b152886043ee32082d5e60044fb96f91d429661f823d1ea9c929dcae22460421a7c26a7aae43d5926263fa2a1ea4c07e0e130e67f2fb0b6fab SHA512 1ddaee045c0c3576bda0ebf065021e66e1ac6673d6872aff8e8afb3bae33dd927d920d89761553bade040d20e4b60eb286131bdb2f2d75ec1e833b9a9ce58d3e
 DIST xpdf-chinese-simplified.tar.gz 918277 BLAKE2B ad41cc6ceae8d5295e49e6cb6356885a77dd314fd55cae95f4adf7ca597c7d86c0029b2767b1ecae86883d31cf9acc5d67997e1ab7871f10d2b6550734bb3b34 SHA512 1f016ff06301cf445546b380fe4cf0c1c9ef08b5e37bd392ca975b4a54fa43afbe251c31e14f216c68fb38dcf04f40ab5baf828586734efb7881a755f92cc49e
 DIST xpdf-chinese-traditional.tar.gz 906297 BLAKE2B 63f4e482b0ba127331ae9adaa69a64ac868e5973d631cec57867ccab83566b61c37771be28c42d02994f574e7bf0fe16813d2d18d6ef5869dc1200f702d7c6dc SHA512 6fec238af3c76f149087bb4445786cb1de31fbcb17982b8da779e71a91e76c780dde7970515eaa6131db2e654d04d13aebe8d840203293b9072850c5d1e6ba0b
@@ -13,5 +13,5 @@ DIST xpdf-korean.tar.gz 526847 BLAKE2B e1640f6df0bc1e126b2e0f010403fc3ff068a8171
 DIST xpdf-latin2.tar.gz 1431 BLAKE2B db8c823c4e90643b9d08c9a4106f479470236a00115d2dc6f3a71da4bc9b5e33561da5ac5dce81cbf5fc943a65572f3595601f6e9f31a3fba9bc0d35f28e0016 SHA512 5fe0b60bfac7f0f4a26e3e7216de5043f6b94446f464c984b7c25431ec01a5912952c0dc66bb2c7159c9f63e4805689c6cfc761086aad9e59f1f21d0cddb5d15
 DIST xpdf-thai.tar.gz 1878 BLAKE2B dbcc2aa2652c40c2220688767a58cadcfbe39310d6c2664b98392a03b00de6d558fa3f333a085e7c6ff3476b6ffcd98fcc228eeb8dd59e905f870c8a39143ac9 SHA512 5584b590e34da29285c379e3b7a7243c28241ec6fddb3e4a8e2e7bf88b8f7aaae3483061d12c332a1ff042ec5e2b31869a67d60512ac48f7903c5e2fc871aa87
 DIST xpdf-turkish.tar.gz 1137 BLAKE2B f735e9842361a5a73fabe40aa4e9cb552475d3751df3e885c5a1a68e0de8ca7b5a031e6332495f70abdc1e943fa615f09185e9ba22922f37f02e42f59ddfc57c SHA512 a73e90bce8f2a12154b06ef29333a45d96258c0d653d5cb15afd2e5ad9e79a9b617e5f8ebeb20bde545684d50f3bc1349800c99f70c863bdd502c24c266b4fb1
-EBUILD xpdf-4.01.01.ebuild 2985 BLAKE2B a7f1d05f66c6734cc67a0bfb7a6a6e8eccc49605d7cf730d28dbbd24d05e09513a5256d78de86f14e4d7b2f408d8108b9307be5e03d3e255eed65097c5aaffde SHA512 abaa47c209e377702777d8ea6ca13c4ad73651e80883f334672ce77e98792a33aa96f5a80bb522f3bef7c4f5209acb7dcc3e8acffe8c2756126d97e7ab281996
+EBUILD xpdf-4.02.ebuild 2983 BLAKE2B 7005023c4f179f8306d0af2e6bbe1841eacd72a9075c070b945d2bea1a25c09586a61d05625f85d418a3172c92345d811390c2febcf6ad1df931b0a98c831919 SHA512 bd7ebba70d9bba16b88caa9b5feac37dc12f0ec82048e7ca94ae63066a45f7fce3bb83b773624d0c1bcfe95ef00fb9977edf22cf89c7ec97dadc5e9b33815f19
 MISC metadata.xml 899 BLAKE2B ec3658537d667032b6f725c70c6ad41dbaea8bf8a15e999bdc4d7ca2f2000542b1d6bf4f247c4d050b0c9ccf11c8a7abd385c496091facd2038b7e55be3783d4 SHA512 7be89c30dfb1644aebf07794f2fb0f26abbf921d6185ce6fed9c0f5c802704e5fc6cff9d9a1f8e59a0e6bdf27548f34eef3b8b130296c93b492d0110aa16e359
diff --git a/app-text/xpdf/xpdf-4.01.01.ebuild b/app-text/xpdf/xpdf-4.02.ebuild
index 272214724007..4263e9c9ad4e 100644
--- a/app-text/xpdf/xpdf-4.01.01.ebuild
+++ b/app-text/xpdf/xpdf-4.02.ebuild
@@ -24,7 +24,7 @@ SRC_URI="https://xpdfreader-dl.s3.amazonaws.com/${P}.tar.gz
 
 LICENSE="GPL-2 GPL-3 i18n? ( BSD )"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="cmyk cups i18n +libpaper metric opi png +textselect utils"
 
 DEPEND="
diff --git a/app-text/zathura-pdf-mupdf/Manifest b/app-text/zathura-pdf-mupdf/Manifest
index dbb22b4f132f..68a043e5d728 100644
--- a/app-text/zathura-pdf-mupdf/Manifest
+++ b/app-text/zathura-pdf-mupdf/Manifest
@@ -1,6 +1,7 @@
+AUX 0.3.5-compile-fix.patch 518 BLAKE2B e1e52be08b27459d2125fb44b1767c1f381ce13dfecae02b83afb6bc09db00c145f2b557db0c1515a383ea223eb51c68fdfa32d3effea334c5cddb9af5209ed5 SHA512 7af34317726849aa0eb49b7d7449c23cea1208a72ec1f872bf218b3be9c9b84bb8668523ef8ca0bee9fcdcffa44ba9599ba43f79c88bc3e8811597a91868a1c6
 DIST zathura-pdf-mupdf-0.3.4.tar.xz 8092 BLAKE2B 5e47a9db7fede440c10f8270e02430d2603a93a3fc05bbbcf036f825a534f9083fda3ea536de7b47091aca63409b54a15bec057b7fb3da687507e55efa779075 SHA512 8a885f1faa471d413f09bd6a78b86d419fe433139b2f811dcae9a9ea180beaf693ee8c11c7fe98ed7d5303520f6d9b3efd0d8e7edf978aa5099ef580db79166a
 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-0.3.5.ebuild 1017 BLAKE2B c4b9040fd79d9528b07b327ba2120c890956ea7c4ea26145529b85ff7d47592502cf159ea69de5462a1970a6a661f6188bb1ab876cb83000bbe639de00ef6082 SHA512 b11ca0f4f44bc668021f0149f576d8d800942e901dac13e491e26dbe5d8b0cc651a43aa3ef49b20749f3315f82175fc8374f647421cbd5eb84a71277d6b79020
 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/files/0.3.5-compile-fix.patch b/app-text/zathura-pdf-mupdf/files/0.3.5-compile-fix.patch
new file mode 100644
index 000000000000..e031db3c9188
--- /dev/null
+++ b/app-text/zathura-pdf-mupdf/files/0.3.5-compile-fix.patch
@@ -0,0 +1,11 @@
+--- a/zathura-pdf-mupdf/search.c	2019-09-12 11:29:21.527194069 +0200
++++ b/zathura-pdf-mupdf/search.c	2019-09-12 11:30:11.648675352 +0200
+@@ -39,7 +39,7 @@
+     mupdf_page_extract_text(mupdf_document, mupdf_page);
+   }
+ 
+-  fz_quad* hit_bbox = fz_malloc_array(mupdf_page->ctx, N_SEARCH_RESULTS, fz_quad);
++  fz_quad* hit_bbox = fz_malloc_array(mupdf_page->ctx, N_SEARCH_RESULTS, sizeof(fz_quad));
+   int num_results = fz_search_stext_page(mupdf_page->ctx, mupdf_page->text,
+       text, hit_bbox, N_SEARCH_RESULTS);
+ 
diff --git a/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.3.5.ebuild b/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.3.5.ebuild
index a8c73f86302b..fa515bf718e6 100644
--- a/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.3.5.ebuild
+++ b/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.3.5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit meson
+inherit meson xdg-utils
 
 if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
@@ -20,7 +20,7 @@ HOMEPAGE="https://pwmt.org/projects/zathura-pdf-mupdf/"
 LICENSE="ZLIB"
 SLOT="0"
 
-DEPEND="app-text/mupdf
+DEPEND="app-text/mupdf:=
 	>=app-text/zathura-0.3.9
 	dev-libs/girara
 	dev-libs/glib:2
@@ -35,5 +35,18 @@ BDEPEND="virtual/pkgconfig"
 
 src_prepare() {
 	sed -i -e '/mupdfthird/d' meson.build || die "sed failed"
+
+	if has_version '<app-text/mupdf-1.16.1'; then
+		eapply "${FILESDIR}"/${PV}-compile-fix.patch
+	fi
+
 	default
 }
+
+pkg_postinst() {
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/app-text/zathura/Manifest b/app-text/zathura/Manifest
index 214c0f474333..3f2a3928f0a1 100644
--- a/app-text/zathura/Manifest
+++ b/app-text/zathura/Manifest
@@ -1,6 +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-0.4.4.ebuild 1349 BLAKE2B 1e27a0335f223fcab2330c4650a736f6c7c595c711ba1be8f04eec3375ead89f735c347eb2231d3ea2ba29153d713e63b354d4623012cf4ad94bcca338154ea6 SHA512 bc8c191d8c2bd6e507080cc845f71ea4533791499af345b23742d6a5710d2d5322884e8c6a2ebb3e8087eeda25fc09bc839dc72d1e03ec6a1f30daf28627a322
+EBUILD zathura-0.4.4.ebuild 1346 BLAKE2B bc8eae75f9e3c766eafbfd96e692cf5733d82c502159b0d56007f8dcb0238b13aed2543e23e3737419fc54b5dfe1ed4ac83b1c27bdeffc05ae18940517a7377f SHA512 d241a6f6daa64522e99f188c17b87dd0d89473800d487dcb50fda99942f05c58d66f2a551bb314e82bb2f691ea88e4efa27c715fc3d3163dd7e5818c20012337
 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
index 83ead1f313eb..1167454be534 100644
--- a/app-text/zathura/zathura-0.4.4.ebuild
+++ b/app-text/zathura/zathura-0.4.4.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999 ]]; then
 	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"
+	KEYWORDS="amd64 arm x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="ZLIB"
author	V3n3RiX <venerix@redcorelinux.org>	2019-11-03 16:06:58 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2019-11-03 16:06:58 +0000
commit	bd4aeefe33e63f613512604e47bfca7b2187697d (patch)
tree	adb35b5a9a00ee7ea591ab0c987f70167c23b597 /app-text
parent	48ece6662cbd443015f5a57ae6d8cbdbd69ef37c (diff)