gentoo resync : 30.05.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-05-30 11:44:06 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2020-05-30 11:44:06 +0100
commit: f516638b7fe9592837389826a6152a7e1b251c54 (patch)
tree: 8bfecb640b7b6403d7a3d662d923eed630033da7 /app-text
parent: 1a61119f9f7b057830e2ce0563f913ec86f282ad (diff)
81 files changed, 1281 insertions, 430 deletions
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 205bdfd99d9d..b68b75fd9f2e 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/asciidoc/Manifest b/app-text/asciidoc/Manifest
index 5323efbc7985..e545342fb9eb 100644
--- a/app-text/asciidoc/Manifest
+++ b/app-text/asciidoc/Manifest
@@ -1,7 +1,5 @@
 DIST asciidoc-8.6.10_p20181016.tar.gz 576694 BLAKE2B 4d255606675346d00ab03398bf48cb30d357f9f9366944e4faf66ae4c96dafce49acdd930fc848f3dbb2d704a004bb5815d17b53416a76c8368a92e4716328b2 SHA512 801f360b0c444e932f1c50897d446de0ec3f0fb2206080b5aa6dda396fede96065f7bb629a84c8a8e40c5d8897f305fdb1877512f04ae757f3b142fd3a7305d0
-DIST asciidoc-9.0.0_rc1.tar.gz 1143528 BLAKE2B 97e2ee77cf7554e2e0d53e792213377e6cb233853717487b0c0ac1c70d233a5d58a08f3aa69ae840c90f98185b595f9feb7396795b2de47ff0cfc0147920bc2a SHA512 965d65df18ff90596e5cd72bec8d0f7daf2f6ad585ec77af2a6ae9637569b613e2384cc7015c1823fcde99be8170107789505a543fe8b6d3273f2c75a6a92960
 DIST asciidoc-9.0.0_rc2.tar.gz 1145229 BLAKE2B e820a957a5e03f8b28e94fb0e9514b2beebe5b08a30357b7ab70db326894270972cfee1b44c30d51dc1c4794e91a09e36acbf9e464386d9e932ac7d32e2f8e93 SHA512 61ea1eb74a2e2da76f92e32ef279f8940fa4ea77a82078e15b54c7c6f134e9d177b0425c6eb8a239cfd2dc6a6f85ad5e93883a447a3e0e92850c0898747b5ea3
 EBUILD asciidoc-8.6.10_p20181016-r1.ebuild 2619 BLAKE2B f0ae58d358cd1399aedac9776787d2a0e28261521d31b0bf6ca9fc02777469cbf5ac8d992eb51eb82a968510a1abb33dba35a24a9e9faa196acc172d60434db3 SHA512 9756d4447b3d8e77a21a182dbb865ce8ce1af6c523258aabb4b5aa7daedd49e7d446cca88654f8197d61e8b7157d2db631a1c08fdfc7f36b920d4f5cea33a183
-EBUILD asciidoc-9.0.0_rc1.ebuild 2723 BLAKE2B 4c300f19755be00bad844c09c252f5ba06985c7efbad1acddd7683d6fa5b261479eb6ced3554df9163b841cb23c23e2f3744376bb0bd733f68d2363b5f908f9d SHA512 45e514127164f15dea2c3715309beadd08c8dd1f6d999a7399769d5511d4bda48b5972a63bc6d237830d5eb8fc14a4d01ef3e0de6f08f67b8f4c127f7dbc19e1
 EBUILD asciidoc-9.0.0_rc2.ebuild 2717 BLAKE2B af40448addb4dc1cab464a8770573a63d185024a64eec0cb3c3fede736e8918e27d81896e9511b63979a3eecb44bae416011e011fa1166555f711abcd77e60d0 SHA512 cc6e444bbc783d2f4ef336c41caeab9ee76895beafc9ed72088ab6cbaa4716865245acca901500d5552e470eb5de6aae0638247e31a0c0669d902aa5d8705eba
 MISC metadata.xml 514 BLAKE2B 89fefee3e8081fc45a8251255bf365f58eba6aa9eef92a23bd8f234703b7062b1dd2a415260fcda1b799cffa4b46d0da22b153ba8de6b77cb6076666ff43ccb7 SHA512 2587ac6d8c24ceca295eef2dc6e0735461dd09864d6a1f282d67fc3c58cd18aa565099a2c280edec143024295b74a251152918932c37d3be450aef68d367ca70
diff --git a/app-text/asciidoc/asciidoc-9.0.0_rc1.ebuild b/app-text/asciidoc/asciidoc-9.0.0_rc1.ebuild
deleted file mode 100644
index ea4593547f48..000000000000
--- a/app-text/asciidoc/asciidoc-9.0.0_rc1.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} pypy3 )
-
-inherit autotools eutils python-single-r1 readme.gentoo-r1
-
-DESCRIPTION="A plain text human readable/writable document format"
-HOMEPAGE="http://asciidoc.org/ https://github.com/asciidoc/asciidoc-py3/"
-SRC_URI="https://github.com/${PN}/${PN}-py3/archive/9.0.0rc1.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~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 test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	app-text/docbook-xml-dtd:4.5
-	>=app-text/docbook-xsl-stylesheets-1.75
-	dev-libs/libxslt
-	dev-libs/libxml2:2
-	"
-DEPEND="
-	test? (
-		${PYTHON_DEPS}
-		app-text/dvipng
-		app-text/dvisvgm
-		dev-texlive/texlive-latex
-		dev-util/source-highlight
-		media-gfx/graphviz
-		media-gfx/imagemagick
-		media-sound/lilypond
-	)"
-
-DOC_CONTENTS="
-If you are going to use a2x, please also look at a2x(1) under
-REQUISITES for a list of runtime dependencies.
-"
-
-DOCS=( BUGS.txt CHANGELOG.txt README.asciidoc
-	   docbook-xsl/asciidoc-docbook-xsl.txt dblatex/dblatex-readme.txt
-	   filters/code/code-filter-readme.txt )
-
-S="${WORKDIR}/${PN}-py3-9.0.0rc1"
-
-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 run || die
-}
-
-src_install() {
-	default
-	python_fix_shebang "${ED}"/usr/bin/*.py
-
-	readme.gentoo_create_doc
-
-	# 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
-
-	optfeature "\"music\" filter support" "media-sound/lilypond media-gfx/imagemagick"
-	optfeature "\"source\" filter support" dev-util/source-highlight dev-python/pygments app-text/highlight
-	optfeature "\"latex\" filter support" "dev-texlive/texlive-latex app-text/dvipng" "dev-texlive/texlive-latex app-text/dvisvgm"
-	optfeature "\"graphviz\" filter support" media-gfx/graphviz
-}
diff --git a/app-text/calibre/Manifest b/app-text/calibre/Manifest
index 7da46fa1e70e..0dce7e4021ae 100644
--- a/app-text/calibre/Manifest
+++ b/app-text/calibre/Manifest
@@ -6,9 +6,14 @@ AUX calibre-server-3.init 1796 BLAKE2B f87d785d6f6fc10fa648d40944ec8538027854bb8
 DIST calibre-4.11.2.tar.xz 37045372 BLAKE2B 7d76d45afd9228d6346daefaf4ee7cbf4d3281379c96d0ae63b3073b6b5ed055bd2eca0ae728f1471460e3aa8cf9b3afa3e489c4c2f02c6849b39b94e2c2023a SHA512 64f1779ea16e2aedbc91e815b015ffbcfcc2d50035dddc9b33588007ceeeaa5cf4cca84b40fbc9c5808e9b6dab3b04047f37505815120a1e66650447363672f2
 DIST calibre-4.12.0.tar.xz 36823140 BLAKE2B b8dd24152b79790c8d22d3c0aa9482f69250fe177499e01c6c0564bf31946d0266a2e3053549f037c7ea7626b18a27798097bfbe0caf93f97585d4869c475ab9 SHA512 628308273b507ee2557cd089e5c7b77f8304c1728b9aadfe5493b22042bdcf2da4c07652a6432121b5dd432807bcda21fabb81c37e59f87d24ace52539f3244c
 DIST calibre-4.15.0.tar.xz 37033864 BLAKE2B fbb8965f438b438e0274fd8fbd23b633fb39bf3d746b0d8d1947e54cb6a21e39346031be6723adc1ecb83b4145562ec8a1e36805b96bad00451c0afbccb8d570 SHA512 d06bebe672864b2270a76f097f353aa727a3918d1c87766c9dbad615a6225621bb12d4040c1001415d188b15f1b7c068e77fec7964f4bf26e83ad7f3609bcc04
+DIST calibre-4.16.0.tar.xz 36964244 BLAKE2B e2c94ea882addff3a7def2b7d0bc286fc3bc499190469e9bfea99d710b4cdbb6b59ca2848ef5551d4375d22c582462962634c0329f0adca05dd6dc137dbea0ba SHA512 96803578c7b609cf146571df38cd9ab75c3fcc6e8b429d7083b4383974161193d544a22c249ad3934c621823a3b1d1bd52e564c6ef70fd4012aae40a1056715b
+DIST calibre-4.17.0-qt-5.15-fontconfig-bug-725020.patch 1222 BLAKE2B 14038b4ea5f87d9a8f645b5af8342da90337202b0247b07dccd8995f55bb965b5c2bbdddc24b55b6e92e899f91d5dec19c10ddea8fcc42c8ed3d74ee90eb09d6 SHA512 b0652c3277b8390f47039366380fceacfd3cd9014fe42306a947f6749c6192657b77e3d832044828bea06c43f1f5e745e6b4ff8dd24efc73d9ad5261c4c73a5e
+DIST calibre-4.17.0.tar.xz 37027156 BLAKE2B e1e9fbbb93cc14af0790e400d79b433c774f17bb06d99161e27769217ab7eed5c2660ab8a3e09109bade91684a8f5a8b52795667833ddf454343e530109eea63 SHA512 95719c820839a8548c0734a7be105fa4124c3c070fdd79ceeef5fef7f9c81f89d5b2077a71df3cc6cd103c14b813cd0d42add1c75ec4883686a8596de36ef5d0
 DIST calibre-4.9.1.tar.xz 37529656 BLAKE2B 5d703ca0c398b43cc26a54e0628d0fe938c6a5027a4fd0c9cac83944e5143eb08439bf79b2098182be7727eaa042748f17866788b02c7744178dce131f6b1d1e SHA512 bf06aa3cbc8d255934f3f7f3ce20b4798edf107ed9f822943d2b4ae7d95473842928ed79f8ba7571f7e0ebdc267c441916d543d5b7630aae5cb151bcc3184b71
 EBUILD calibre-4.11.2.ebuild 8545 BLAKE2B d9d02091f3118ffe7d2fc7422e342c82a73ae13f7c761eb3d855b7f3837d8acace61d04ba36aa72a3e9ff7f543397f9911150cfb2feb32262eef8cf04ea080ed SHA512 77787afa92e929a8ecba0ef3a0c22780c4ec14a0ff70d8c8fa2cc9368b62f0ec0e97a91015f6222d0203ccb9fa10a25cd1d13a7429842ebf9c121d36af1bcff0
 EBUILD calibre-4.12.0.ebuild 8550 BLAKE2B b0f4c1162c29b2e23be790ae2798b13859cc0b22166c05afb699c043e82e13d5df9daaecd8be54ef05951816c0bcede1f2e257b4c3ff401a996e3d05fef366d3 SHA512 a3d9405e5f466465df447f75f5bedf893f17160a63ee44332b058be37eecc5fb61cd8954c04cf1a5377d90528f45520f10889dd5b8b1ae7e37cc6e87bfb4fbed
 EBUILD calibre-4.15.0.ebuild 8550 BLAKE2B b0f4c1162c29b2e23be790ae2798b13859cc0b22166c05afb699c043e82e13d5df9daaecd8be54ef05951816c0bcede1f2e257b4c3ff401a996e3d05fef366d3 SHA512 a3d9405e5f466465df447f75f5bedf893f17160a63ee44332b058be37eecc5fb61cd8954c04cf1a5377d90528f45520f10889dd5b8b1ae7e37cc6e87bfb4fbed
+EBUILD calibre-4.16.0.ebuild 8550 BLAKE2B b0f4c1162c29b2e23be790ae2798b13859cc0b22166c05afb699c043e82e13d5df9daaecd8be54ef05951816c0bcede1f2e257b4c3ff401a996e3d05fef366d3 SHA512 a3d9405e5f466465df447f75f5bedf893f17160a63ee44332b058be37eecc5fb61cd8954c04cf1a5377d90528f45520f10889dd5b8b1ae7e37cc6e87bfb4fbed
+EBUILD calibre-4.17.0-r1.ebuild 8765 BLAKE2B 5fdb90f47e390d3935639673f63c2fdd9a5e64ae5635f5a1e5732c176831f5b91decb2dead5ddc79eafd786b64ccd95aa6b0943038428f8aa6331ed45beda222 SHA512 3235f8bac83d558268c0e41b6a313204b87e545dd7606309aaed0d2b9ab8a867562f0dd5127e90bd8d8d56dc4371c46c2d0091bcefa9815cbc3b1da31f00b4ec
 EBUILD calibre-4.9.1-r2.ebuild 8584 BLAKE2B 9e4061e96e543b69260fa51e7408468ff6529a8276782e166830f4266a4b58e481e01ec761ba5e4a7b25ac5cdcb1e2cd7955926392368cb341da6a51353b3d23 SHA512 4a89fbc43197765fa47070537eed2663f6bceaf3f0ac9ec51b46aaba1b12b6a341d446dc8a094f6df08fddc968de191da8af57c5c767ae861adad4563d572047
 MISC metadata.xml 382 BLAKE2B 87fa7e63a6ed7a4ea55247b362288b43f7edd312cc3085bb8c1b947402ae4aa0df01fac4f6646d260653ff8af7fe28d3dabb8a213dbf3e206181b69835b33d5f SHA512 8503e0a4a48d93682c386eb1d6507b4b26585afc9d62b7cd52bc00b457a887bd17422a03669ff404570ff7f5ff6f0bba14ee935979f8b54722870d6620097de5
diff --git a/app-text/calibre/calibre-4.16.0.ebuild b/app-text/calibre/calibre-4.16.0.ebuild
new file mode 100644
index 000000000000..0191479d6be6
--- /dev/null
+++ b/app-text/calibre/calibre-4.16.0.ebuild
@@ -0,0 +1,274 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,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/hyphen:=
+	>=dev-libs/icu-57.1:=
+	dev-libs/libinput:=
+	>=dev-libs/dbus-glib-0.106
+	>=sys-apps/dbus-1.10.8
+	$(python_gen_cond_dep '
+		>=dev-python/apsw-3.25.2_p1[${PYTHON_MULTI_USEDEP}]
+		dev-python/beautifulsoup:4[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/chardet-3.0.3[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/cssselect-0.7.1[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/css-parser-1.0.4[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/dbus-python-1.2.4[${PYTHON_MULTI_USEDEP}]
+		dev-python/dnspython[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/feedparser-5.2.1[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/html2text-2019.8.11[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/html5-parser-0.4.9[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/lxml-3.8.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/markdown-3.0.1[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/mechanize-0.3.5[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/msgpack-0.5.6[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/netifaces-0.10.5[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/pillow-3.2.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/psutil-4.3.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/pygments-2.3.1[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/python-dateutil-2.5.3[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/PyQt5-5.12[gui,svg,widgets,network,printsupport,${PYTHON_MULTI_USEDEP}]
+		>=dev-python/PyQtWebEngine-5.12[${PYTHON_MULTI_USEDEP}]
+		dev-python/regex[${PYTHON_MULTI_USEDEP}]
+		dev-python/zeroconf[${PYTHON_MULTI_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 )"
+DEPEND="${COMMON_DEPEND}
+	$(python_gen_cond_dep '
+		>=dev-python/setuptools-23.1.0[${PYTHON_MULTI_USEDEP}]
+		dev-python/sip[${PYTHON_MULTI_USEDEP}]
+	')
+	>=virtual/podofo-build-0.9.6_pre20171027
+	virtual/pkgconfig"
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]] && tc-is-gcc && [[ $(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"
+}
+
+src_install() {
+	# calibre works with python 3, so remove the python 2 constraint
+	export CALIBRE_PY3_PORT=1
+
+	# 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.utf8 #709682
+
+	# Bug #295672 - Avoid sandbox violation in ~/.config by forcing
+	# variables to point to our fake temporary $HOME.
+	export HOME="${T}/fake_homedir"
+	export XDG_CONFIG_HOME="${HOME}/.config"
+	export XDG_DATA_HOME="${HOME}/.local/share"
+	export CALIBRE_CONFIG_DIRECTORY="${XDG_CONFIG_HOME}/calibre"
+	mkdir -p "${XDG_DATA_HOME}" "${CALIBRE_CONFIG_DIRECTORY}" || die
+
+	tc-export CC CXX
+	# Bug #334243 - respect LDFLAGS when building extensions
+	export OVERRIDE_CFLAGS="$CFLAGS" OVERRIDE_LDFLAGS="$LDFLAGS"
+	local libdir=$(get_libdir)
+	[[ -n $libdir ]] || die "get_libdir returned an empty string"
+
+	addpredict /dev/dri #665310
+
+	PATH=${T}:${PATH} PYTHONPATH=${S}/src${PYTHONPATH:+:}${PYTHONPATH} \
+	"${PYTHON}" setup.py install \
+		--root="${D}" \
+		--prefix="${EPREFIX}/usr" \
+		--libdir="${EPREFIX}/usr/${libdir}" \
+		--staging-root="${ED}/usr" \
+		--staging-libdir="${ED}/usr/${libdir}" || die
+
+	rm "${ED}/usr/share/applications/defaults.list" || die
+	find "${ED}"/usr/share -type d -empty -delete
+
+	cd "${ED}"/usr/share/calibre/fonts/liberation || die
+	local x
+	for x in * ; do
+		[[ -f ${EPREFIX}/usr/share/fonts/liberation-fonts/${x} ]] || continue
+		ln -sf "../../../fonts/liberation-fonts/${x}" "${x}" || die
+	done
+
+	einfo "Converting python shebangs"
+	python_fix_shebang --force "${ED}"
+
+	einfo "Compiling python modules"
+	python_optimize "${ED}"/usr/lib/calibre
+
+	newinitd "${FILESDIR}"/calibre-server-3.init calibre-server
+	newconfd "${FILESDIR}"/calibre-server-3.conf calibre-server
+
+	bashcomp_alias calibre \
+		lrfviewer \
+		calibre-debug \
+		ebook-meta \
+		calibre-server \
+		ebook-viewer \
+		ebook-polish \
+		fetch-ebook-metadata \
+		lrf2lrs \
+		ebook-convert \
+		ebook-edit \
+		calibre-smtp \
+		ebook-device
+
+}
+
+pkg_preinst() {
+	# Indentify stray directories from upstream's "Binary install"
+	# method (see bug 622728).
+	CALIBRE_LIB_DIR=/usr/$(get_libdir)/calibre
+	CALIBRE_LIB_CONTENT=$(for x in "${ED}${CALIBRE_LIB_DIR}"/*; do
+		printf -- "${x##*/} "; done) || die "Failed to list ${ED}${CALIBRE_LIB_DIR}"
+}
+
+pkg_postinst() {
+	[[ -n ${CALIBRE_LIB_DIR} ]] || die "CALIBRE_LIB_DIR is unset"
+	local x
+	for x in "${EROOT}${CALIBRE_LIB_DIR}"/*; do
+		if [[ " ${CALIBRE_LIB_CONTENT} " != *" ${x##*/} "* ]]; then
+			elog "Purging '${x}'"
+			rm -rf "${x}"
+		fi
+	done
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	xdg_icon_cache_update
+}
diff --git a/app-text/calibre/calibre-4.17.0-r1.ebuild b/app-text/calibre/calibre-4.17.0-r1.ebuild
new file mode 100644
index 000000000000..bd20fd840abc
--- /dev/null
+++ b/app-text/calibre/calibre-4.17.0-r1.ebuild
@@ -0,0 +1,276 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,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
+	https://github.com/kovidgoyal/calibre/commit/db7007a25faefb0cc90e64dda1c0793393b9512d.patch -> calibre-4.17.0-qt-5.15-fontconfig-bug-725020.patch"
+
+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/hyphen:=
+	>=dev-libs/icu-57.1:=
+	dev-libs/libinput:=
+	>=dev-libs/dbus-glib-0.106
+	>=sys-apps/dbus-1.10.8
+	$(python_gen_cond_dep '
+		>=dev-python/apsw-3.25.2_p1[${PYTHON_MULTI_USEDEP}]
+		dev-python/beautifulsoup:4[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/chardet-3.0.3[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/cssselect-0.7.1[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/css-parser-1.0.4[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/dbus-python-1.2.4[${PYTHON_MULTI_USEDEP}]
+		dev-python/dnspython[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/feedparser-5.2.1[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/html2text-2019.8.11[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/html5-parser-0.4.9[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/lxml-3.8.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/markdown-3.0.1[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/mechanize-0.3.5[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/msgpack-0.5.6[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/netifaces-0.10.5[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/pillow-3.2.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/psutil-4.3.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/pygments-2.3.1[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/python-dateutil-2.5.3[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/PyQt5-5.12[gui,svg,widgets,network,printsupport,${PYTHON_MULTI_USEDEP}]
+		>=dev-python/PyQtWebEngine-5.12[${PYTHON_MULTI_USEDEP}]
+		dev-python/regex[${PYTHON_MULTI_USEDEP}]
+		dev-python/zeroconf[${PYTHON_MULTI_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 )"
+DEPEND="${COMMON_DEPEND}
+	$(python_gen_cond_dep '
+		>=dev-python/setuptools-23.1.0[${PYTHON_MULTI_USEDEP}]
+		dev-python/sip[${PYTHON_MULTI_USEDEP}]
+	')
+	>=virtual/podofo-build-0.9.6_pre20171027
+	virtual/pkgconfig"
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]] && tc-is-gcc && [[ $(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" \
+		"${DISTDIR}/calibre-4.17.0-qt-5.15-fontconfig-bug-725020.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"
+}
+
+src_install() {
+	# calibre works with python 3, so remove the python 2 constraint
+	export CALIBRE_PY3_PORT=1
+
+	# 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.utf8 #709682
+
+	# 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/cherrytree/Manifest b/app-text/cherrytree/Manifest
index 1cac420f1280..7fb34c532e59 100644
--- a/app-text/cherrytree/Manifest
+++ b/app-text/cherrytree/Manifest
@@ -1,8 +1,9 @@
 AUX cherrytree-0.38.9_update_setup_py.patch 748 BLAKE2B de89314f017fed48e2433bfbffd47b117234e779e80c9c2a8eebe80371be95a2b8f8fa4941544c674695121396e34e8b65c558ff3e642f74eab83d693fc22a78 SHA512 26a2f7e92717cd2e0e2f60b6df2ed2a861ba77a94b957e1841cd57f3377044ee1b52e179d3566795c9501472a76530a25f4c752a9046ac341bb533ead86c7d41
 DIST cherrytree-0.37.0.tar.gz 8888703 BLAKE2B 737c0c247c581086e23e4c3e5fba0b18459788b385078ec8092af8b7352d77c8b273c939f702178d0ae59c8633bf996a7a7e5223e22da703ced3c8bf1d7cbde3 SHA512 a1aaf92657c58c70430a45adaa771050b43476bc2a33dc929b108842d5ef46aa83c4fa4cfe8c4f54a9a3656fc0d30046fae34cbac5aa9fe3f32aa539058636f5
 DIST cherrytree-0.38.9.tar.gz 9928805 BLAKE2B 4de4187ae7e650090d82de5e8b1b7f85c4af6dbb2c9b2bc67f10b074db4c08c4b4593c4769708bfaf584958eefe083a3626f7e9c4d7736bc53d143528c754e09 SHA512 40c1c26fa1a6868b447d31625c14b10cf712185289cf97b71881c253d2f72c58f51b974a1615fca5b532099c4741c56f8419df2d02e4ca821b2a1b909152e56b
-DIST cherrytree-0.39.2.tar.gz 10044337 BLAKE2B 352b6b709e62487015eccf817c4aec799586f64b9e07e38f1eab5e1491b36d8e2ae2f62f55f32248ca1f5cc0c0f610282493de2f3d4cf4e128ecb66acb895668 SHA512 46a02753f02f17e9696e21510ad93222843734a8be271e3a20d7a038856ad99ff2c8316d559e56567e877e419324fe3b254882bb1578a3c8d85c902169cb0e26
+DIST cherrytree-0.99.0_p20200523.tar.gz 10452221 BLAKE2B cbac9b5b1c4fc1454d229a56784a59f1622b134d640db720e496cc0f1b4f95ee097343572f33d8b0626903f58ae188e8b85065144fcad8c647732e7eddadd0b9 SHA512 4eb142368bd1d3838879669d5bf1742689b02f08f50edd51a6fa6f22fef83d0f1871147aca3c346e9fcd1193c3f494e112cdc9e10eda4b3124587f605f89cc54
 EBUILD cherrytree-0.37.0-r1.ebuild 1189 BLAKE2B 3f56b8ab0077d13fc2bdabccdb44a07cedf5de5308aee8f0a4a7122856f2341762fca3d7e8f354c19ded1387458f22f90a87dca8ef39cf22bbf5d37cc152c787 SHA512 928f4b904c7047936caa78239615895a1365a76ee3b1260e5db1cce3688ce1627438f7c5cc87f3825210b3be736a155f9be847c91c07fbc1879f7e6f1699ec80
 EBUILD cherrytree-0.38.9-r1.ebuild 1279 BLAKE2B 4eabfb8f4c185c614cd17e7310199fc6b18acae898b3c286f2e458e6a7c34c663526c059df1ea4a227ace16be5d2ce463f936cfd4671472c9e365e4b30148481 SHA512 97b0318bb9270fe1c18cf85b7330437633375f72933dae02f9918a5848bf388bd409fd8d8c639a874280341c4a739a1897cab253c8d38530db5f6482af9b688d
-EBUILD cherrytree-0.39.2.ebuild 1812 BLAKE2B 265a778104ce50f3d8996408cc372aeb73a34dc729bc61ad6c8b5043f8a403b98534fd1b1503a0a620571ea74b430652e7f265ba10a092734d780db51e9ce1f4 SHA512 e6e883a226cd98826af784565df0e94b615fe5b2a399da5baaeafbfb5cd3040c03c662af26ba4ba754ec61b103b1f56fc2678bb0aa1cef314cfb17b9078cd8b9
+EBUILD cherrytree-0.99.0_p20200523.ebuild 2084 BLAKE2B 1992fe81d385769e086f1a00b00074f156e7496b43c5bd785fe8e25cd4a9dbc0e987e417354e00af1aec7ff71b18da5bae6d9516984bcfaad16a18b8078c5f35 SHA512 1d774275218de66e367f5e1bb871691a9ada75a43376e71bfac7fc7a4f4c4b74ed460e55bd3615b695f40574fc7e7b44963e4f20b66c0bb8b5c2570dc7f1233a
+EBUILD cherrytree-9999.ebuild 2084 BLAKE2B 1992fe81d385769e086f1a00b00074f156e7496b43c5bd785fe8e25cd4a9dbc0e987e417354e00af1aec7ff71b18da5bae6d9516984bcfaad16a18b8078c5f35 SHA512 1d774275218de66e367f5e1bb871691a9ada75a43376e71bfac7fc7a4f4c4b74ed460e55bd3615b695f40574fc7e7b44963e4f20b66c0bb8b5c2570dc7f1233a
 MISC metadata.xml 444 BLAKE2B d40087a12c79b778c4af5cd9b7eea1299941df716a11351acb087ad6ff3bc64e271bc54014b4fd9402fc679cd15d63a91ab5c1b8a838a9203b463e0ed21e4b60 SHA512 f3a43e7c407bbc442b165e5fe5401a1a0090f925bfb34b1e1fb6e46a068c274c5202f32f5e733b8abcfbee33e59677cd0b85017fc544f5fc1cfb7a0ea5156448
diff --git a/app-text/cherrytree/cherrytree-0.39.2.ebuild b/app-text/cherrytree/cherrytree-0.39.2.ebuild
deleted file mode 100644
index 0c4f473d9b89..000000000000
--- a/app-text/cherrytree/cherrytree-0.39.2.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit autotools desktop python-any-r1 xdg-utils
-
-DESCRIPTION="A hierarchical note taking application"
-HOMEPAGE="https://www.giuspen.com/cherrytree"
-SRC_URI="https://github.com/giuspen/cherrytree/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="nls test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-cpp/gtkmm:3.0
-	dev-cpp/gtksourceviewmm:3.0
-	dev-cpp/libxmlpp:2.6
-	dev-cpp/pangomm
-	dev-db/sqlite:3
-	dev-libs/libxml2:2"
-DEPEND="${RDEPEND}"
-BDEPEND="${PYTHON_DEPS}
-	dev-util/intltool
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-	test? ( dev-util/cpputest )"
-
-S="${S}/future"
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	python_fix_shebang "${S}"
-
-	sed -i \
-		-e "s|\(CT_VERSION.*{\)\(.*\)\(};\)$|\1\"${PV}\"\3|" \
-		src/ct/ct_const.cc || die
-
-	if ! use test; then
-		sed -i \
-			-e '/^PKG_CHECK_MODULES/s|\(\[.*\)cpputest\(.*\]\)|\1\2|' \
-			configure.ac || die
-	fi
-
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_enable nls)
-}
-
-src_install() {
-	default
-	pushd ../ >/dev/null || die
-
-	insinto /usr/share/mime/packages
-	doins linux/cherrytree.xml
-
-	insinto /usr/share/mime-info
-	doins linux/cherrytree.{mime,keys}
-
-	insinto /usr/share/metainfo
-	doins linux/cherrytree.appdata.xml
-
-	insinto /usr/share/application-registry
-	doins linux/cherrytree.applications
-
-	doicon -s scalable future/icons/cherrytree.svg
-	domenu linux/cherrytree.desktop
-	doman linux/cherrytree.1
-
-	popd >/dev/null || die
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
diff --git a/app-text/cherrytree/cherrytree-0.99.0_p20200523.ebuild b/app-text/cherrytree/cherrytree-0.99.0_p20200523.ebuild
new file mode 100644
index 000000000000..9599c94f4964
--- /dev/null
+++ b/app-text/cherrytree/cherrytree-0.99.0_p20200523.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..8} )
+
+inherit cmake python-any-r1 xdg-utils
+
+DESCRIPTION="A hierarchical note taking application (C++ version)"
+HOMEPAGE="https://www.giuspen.com/cherrytree https://github.com/giuspen/cherrytree"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/giuspen/cherrytree"
+	S="${WORKDIR}/${P}/future"
+else
+	COMMIT="074a09ce3c1130ec60f5f5a3b8be958337b6d5ab" # 20200523
+	SRC_URI="https://github.com/giuspen/cherrytree/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/${PN}-${COMMIT}/future"
+fi
+
+# GPL-3 — future/src/ct (CherryTree)
+# LGPL-2.1 — future/src/7za (7zip)
+# MIT — future/src/fmt (libfmt)
+LICENSE="GPL-3 LGPL-2.1 MIT"
+SLOT="0"
+IUSE="nls test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	app-text/gspell:=
+	dev-libs/glib:2
+	>=dev-cpp/glibmm-2.64.2:2
+	dev-cpp/gtkmm:3.0
+	dev-cpp/gtksourceviewmm:3.0
+	dev-libs/libxml2:2
+	dev-cpp/libxmlpp:2.6
+	dev-cpp/pangomm
+	dev-db/sqlite:3"
+DEPEND="${RDEPEND}
+	$(python_gen_any_dep 'dev-python/lxml[${PYTHON_USEDEP}]')"
+BDEPEND="${PYTHON_DEPS}
+	virtual/pkgconfig
+	nls? (
+		dev-util/intltool
+		sys-devel/gettext
+	)
+	test? ( dev-util/cpputest )"
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+}
+
+python_check_deps() {
+	has_version "dev-python/lxml[${PYTHON_USEDEP}]"
+}
+
+src_prepare() {
+	# disable compress man pages
+	sed -i -e \
+		'/install(FILES/s|${MANFILE_FULL_GZ}|${CMAKE_SOURCE_DIR}/data/cherrytree.1|' \
+		CMakeLists.txt || die
+
+	if [[ ${PV} != *9999 ]]; then
+		sed -i \
+			-e "/^set(CT_VERSION/s|\"\(.*\)\"|\"${PV}\"|" \
+			CMakeLists.txt || die
+	fi
+
+	python_fix_shebang .
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DPYTHON_EXEC="${PYTHON}"
+		-DUSE_NLS=$(usex nls)
+		-DBUILD_TESTING=$(usex test)
+	)
+
+	cmake_src_configure
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
diff --git a/app-text/cherrytree/cherrytree-9999.ebuild b/app-text/cherrytree/cherrytree-9999.ebuild
new file mode 100644
index 000000000000..9599c94f4964
--- /dev/null
+++ b/app-text/cherrytree/cherrytree-9999.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..8} )
+
+inherit cmake python-any-r1 xdg-utils
+
+DESCRIPTION="A hierarchical note taking application (C++ version)"
+HOMEPAGE="https://www.giuspen.com/cherrytree https://github.com/giuspen/cherrytree"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/giuspen/cherrytree"
+	S="${WORKDIR}/${P}/future"
+else
+	COMMIT="074a09ce3c1130ec60f5f5a3b8be958337b6d5ab" # 20200523
+	SRC_URI="https://github.com/giuspen/cherrytree/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/${PN}-${COMMIT}/future"
+fi
+
+# GPL-3 — future/src/ct (CherryTree)
+# LGPL-2.1 — future/src/7za (7zip)
+# MIT — future/src/fmt (libfmt)
+LICENSE="GPL-3 LGPL-2.1 MIT"
+SLOT="0"
+IUSE="nls test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	app-text/gspell:=
+	dev-libs/glib:2
+	>=dev-cpp/glibmm-2.64.2:2
+	dev-cpp/gtkmm:3.0
+	dev-cpp/gtksourceviewmm:3.0
+	dev-libs/libxml2:2
+	dev-cpp/libxmlpp:2.6
+	dev-cpp/pangomm
+	dev-db/sqlite:3"
+DEPEND="${RDEPEND}
+	$(python_gen_any_dep 'dev-python/lxml[${PYTHON_USEDEP}]')"
+BDEPEND="${PYTHON_DEPS}
+	virtual/pkgconfig
+	nls? (
+		dev-util/intltool
+		sys-devel/gettext
+	)
+	test? ( dev-util/cpputest )"
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+}
+
+python_check_deps() {
+	has_version "dev-python/lxml[${PYTHON_USEDEP}]"
+}
+
+src_prepare() {
+	# disable compress man pages
+	sed -i -e \
+		'/install(FILES/s|${MANFILE_FULL_GZ}|${CMAKE_SOURCE_DIR}/data/cherrytree.1|' \
+		CMakeLists.txt || die
+
+	if [[ ${PV} != *9999 ]]; then
+		sed -i \
+			-e "/^set(CT_VERSION/s|\"\(.*\)\"|\"${PV}\"|" \
+			CMakeLists.txt || die
+	fi
+
+	python_fix_shebang .
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DPYTHON_EXEC="${PYTHON}"
+		-DUSE_NLS=$(usex nls)
+		-DBUILD_TESTING=$(usex test)
+	)
+
+	cmake_src_configure
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
diff --git a/app-text/dblatex/Manifest b/app-text/dblatex/Manifest
index b7d5a6490e64..3f265d2d3c44 100644
--- a/app-text/dblatex/Manifest
+++ b/app-text/dblatex/Manifest
@@ -1,11 +1,8 @@
-AUX dblatex-0.3.10-no-inkscape-dependency.patch 682 BLAKE2B b9dd747b3e0440f9e255f09e0a5b80e9218066a09cceb63fad5b2ea4507d4d11975f610726db3efb0f14a1701a4c2f2afd89dacceba2ba6299805b6d21eb334a SHA512 e469066dad4dfeaa92ee0fc12e0fb0de0eda83f503a22227b9714b282f7b8ad697726d2c69f623b5c77c9f31d3d182f4c144a660521b8865808e6260fcd5f4da
 AUX dblatex-0.3.11-no-inkscape-dependency.patch 753 BLAKE2B 2199d6068d86be9a0a63bb7cc034f54e8edf59434127e495d5878dfb761c990f9f106fbc0436513220ade66bb107030093f41c8e4777e6ccb279259aff912d06 SHA512 08f4e4473359a2633a785cd34fc3a89feaab8619843a93c5ffba0bf00e31aff2d1ce5a54aeea3eb51e63385b3480df1f196f54cdd568ff49558860460faa1c8f
 AUX dblatex-0.3.11-path-logging.patch 554 BLAKE2B 7b078b4f0bacaffb3449122b561c264de8c8970fe4cbf5459c5ec651aecd3e3ccb7dcc95bfcc8277686133bc3187a5952edd1bc88dae11c2ddac3aa4060333b4 SHA512 ae08b08a435393bf94039edd8b74457a1d4475d8473fa450b41a993ca4ded08f79566bf2dc78144df977fe1f975e1c60b9d02b2dc4579f8c7d65839946e3de05
 AUX dblatex-0.3.11-setup.patch 1751 BLAKE2B a83e41c4fa68eaee1b6e80404cd5486e64f117ca07314463ca0369cd3bc9d64dbdeb8f5fa2f44bee2704c37dda0e1564c461c7d39b1439aa76800032dd96acad SHA512 f77a82876fe28fdc6f9cc689c8b789fd09e703ca4625207fe81a35b1491bcd46a398eb78781fac60c33ac2efcd3d0957fb3604f8a54cd411b0fd4031016ef5fc
 AUX dblatex-path-logging.patch 537 BLAKE2B 1ed23e355e64946ac0bd8839edd26688fbbfbbd56e090470c07ffb8b2cc91ebe32500002468c1f4333adcf786722b5af8623581ae4a4ca5af53be4a5e80959c3 SHA512 04a1f26e59a7c45eed758f8e8fa1f5e1469e3ea71fa65c836d038397c0d8bbc0ca658c05697dcb32371dde33cf3d20be3f987d7b68f194f2d254071cf2836213
 AUX dblatex-setup.patch 773 BLAKE2B d32b842e52caddd1587fe2fe0a005b148bb1a231b0b4bf4cc6c62cdced6a47048639ed9b5f98bc42a72f19a8e4e9dfd1bc4bf1eff62fb032bdb52bfe396335da SHA512 c9ca96db18f81ffd999d3b2fd274d2fbf29f869d199d954fac562938a8475510278f0d3bb7cb948414f13c84c6f94dbec196c7bd04f3abe3400c3fdfe36941fb
-DIST dblatex-0.3.10.tar.bz2 1668202 BLAKE2B 2cc7e33ddc1b4732ae880d3443e65e40b16fc21fa31dfc52ef2250433f4c99bb5b590961095e044b2972b1ac9b4e38358e356b7bdcfb607d6f863720feea7cf4 SHA512 33a5ee3d23d3b9a1576be248a312ca741ea7cb629334a98fb6cb49e0f0f932334506ea934312de04ec645c86ec52699687bd2574b1802d3c23815b44c8514b7b
 DIST dblatex-0.3.11py3.tar.bz2 1671505 BLAKE2B 44e89f5f8d81105a3401074ad765479c04a495962c3efb3677cec81bf3b85c67a03585e7da8bdbd103cbea84e38d2bc633bd13704a5835c98d70fed644bfc6ba SHA512 48c1445c702e9c7c3ff83c57bb8a0caf5f4b027669a70887af0a23f75f5f99fb6840c4281b8bad9402910f3850af485d432e3109e5fd93184434cc87eb712695
-EBUILD dblatex-0.3.10-r1.ebuild 1317 BLAKE2B 6c32f1308c5c13ebcbf1729b97ac38f64d2f145753d9e2188219e61d3038834272f6bee6f13ad6afc20ee570a142b8da491eb8eba3f024261eb1c90905f21c8c SHA512 fe7458acf522c678e0be2f347f3324a2ecd65c7f1b30aaeef769cbd1d11ac6205a5d5375eb85fb7c6a3756278b4f71a4aca20896405363c95fb50333d94c1239
 EBUILD dblatex-0.3.11.ebuild 1622 BLAKE2B e22f30327fbec58cf69839f1aad790aab5c024bf70df5faa3b4f5eb75e6619b6c3b35a9e52e8df0dab0d942b71c1bce8836bd1a468d2e66992b8fa90fd1d3a46 SHA512 25818584313360bb615da8a8dd6c88f6fe8ea41066e564d8e59849aadd30e0b2f13ad1b2aad511deaf492179d8b3e9d64b71c105793de7ca07f395b02a8e961f
 MISC metadata.xml 866 BLAKE2B 3776cf07848836c14fd82031a49284f982b04b573fd28080c0fa9c7cbe6155fa63c89b897461dc996842a0d66be38fbde2326cdce8aeddebbfcfd777677e2011 SHA512 9806f0804fc5b14a222974a9e2c2cc8a13a7378b99deca9cd9ac5f7cbdb776b3c240b521a6077cb80d1685574ca47a372712526ec994c6bf228b2c784568cf93
diff --git a/app-text/dblatex/dblatex-0.3.10-r1.ebuild b/app-text/dblatex/dblatex-0.3.10-r1.ebuild
deleted file mode 100644
index a395a25c9b09..000000000000
--- a/app-text/dblatex/dblatex-0.3.10-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Transform DocBook using TeX macros"
-HOMEPAGE="http://dblatex.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm x86"
-IUSE="inkscape"
-
-RDEPEND="
-	app-text/docbook-xml-dtd:4.5
-	dev-libs/kpathsea
-	dev-libs/libxslt
-	dev-libs/libxslt
-	dev-texlive/texlive-fontutils
-	dev-texlive/texlive-latex
-	dev-texlive/texlive-latexextra
-	dev-texlive/texlive-latexrecommended
-	dev-texlive/texlive-mathscience
-	dev-texlive/texlive-pictures
-	dev-texlive/texlive-xetex
-	gnome-base/librsvg
-	media-gfx/imagemagick
-	media-gfx/transfig
-	inkscape? ( media-gfx/inkscape )
-"
-DEPEND="${RDEPEND}"
-
-python_prepare_all() {
-	use inkscape || eapply "${FILESDIR}/${P}-no-inkscape-dependency.patch"
-	eapply "${FILESDIR}/${PN}-path-logging.patch"
-	eapply "${FILESDIR}/${PN}-setup.patch"
-	distutils-r1_python_prepare_all
-}
-
-python_install() {
-	distutils-r1_python_install
-	python_doscript "${S}"/scripts/dblatex
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	# move package documentation to a folder name containing version number
-	mv "${D%/}"/usr/share/doc/${PN} "${D%/}"/usr/share/doc/${PF} || die
-}
diff --git a/app-text/dblatex/files/dblatex-0.3.10-no-inkscape-dependency.patch b/app-text/dblatex/files/dblatex-0.3.10-no-inkscape-dependency.patch
deleted file mode 100644
index c501cee63042..000000000000
--- a/app-text/dblatex/files/dblatex-0.3.10-no-inkscape-dependency.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur dblatex-0.3.10.orig/lib/dbtexmf/core/imagedata.py dblatex-0.3.10/lib/dbtexmf/core/imagedata.py
---- dblatex-0.3.10.orig/lib/dbtexmf/core/imagedata.py	2018-02-16 17:00:42.658484437 +0200
-+++ dblatex-0.3.10/lib/dbtexmf/core/imagedata.py	2018-02-16 16:52:56.339441569 +0200
-@@ -178,7 +178,7 @@
- class SvgConverter(ImageConverter):
-     def __init__(self, imgsrc, imgdst="", docformat="", backend=""):
-         ImageConverter.__init__(self, imgsrc="svg", imgdst=imgdst)
--        self.add_command(["inkscape", "-z", "-D", "--export-%(dst)s=%(output)s",
-+        self.add_command(["rsvg-convert", "-f", "%(dst)s", "-o","%(output)s",
-                           "%(input)s"])
- 
- 
diff --git a/app-text/diffpdf/Manifest b/app-text/diffpdf/Manifest
index 9785718f9f68..7afb6ae5d382 100644
--- a/app-text/diffpdf/Manifest
+++ b/app-text/diffpdf/Manifest
@@ -1,5 +1,5 @@
 AUX diffpdf-2.1.3-qt5.patch 6240 BLAKE2B c4f522b41e4b036222f832e194088d2377f5063d35e8eb73714745db7a993d9b38fd9e5111eee69d7f2d86710a45289a8e54d25b8a3217b1ddd2fe53bd59b468 SHA512 96ae465bb5b27ff0b26a7c4686e7656af025669b418b755878627b1baf4b91bf14833e951f80c6510d907419efdb8759dffca3f5b7fb517b5bf20ae1ee6b3406
 AUX diffpdf.desktop 152 BLAKE2B e85754380c3e607d6bfe0f4db875983596f8e562d48b8bb732e26a23f9cb6137d7ec700ac2d0596fa3a13d79b6c527de671f46825646e266cf5579f33a1a1511 SHA512 3568a49e3fdcb2fa47688fce4d818cb01545d854890806e4508f228b18b712cbb5641a6e173927990e81c9086bdb49f5b4ffd870e5f0345f26de1b4e799eb0d7
 DIST diffpdf-2.1.3.tar.gz 91856 BLAKE2B a94b710674508a5b77ca1e18b48e906568b49ecf10ce5f96d425fceb91746922fdf454ee20ec77913cf3d7467e559e59257e7415bf96c44b9c136e1708d4e73f SHA512 137e00f7c1d696b097f271c51fa5f19d471efb85fb3d5381c096c32f1ff824083b1122bbefa758fb9320ac8e0c9c16e6b88c8b6286bd98388d88c45c714a948d
-EBUILD diffpdf-2.1.3-r2.ebuild 845 BLAKE2B e77919703d45560e33eb1787fbc13c6826da712f6aa45152f00a99b33b33677622ad82fec23ec20b639af1e0b736d525e410fdc2c6096b12a4593b1a0d5f5db6 SHA512 1eac75a40802fea068caa2ffd40f9107e022fab1e16fa44bd09571c8d8bbc13f36a3507aa144bb1ada4ad1a48e9ee4d47572b0243bef5eaf60ee2fc7ebf28657
+EBUILD diffpdf-2.1.3-r2.ebuild 850 BLAKE2B ec4d1a2b8e8c9f0565d528c96f221c012a3d7855c2484fb96b1ca9274dd4aeea5e1c9f66f635242421fa6749035907927fca24a8f09df3e3b6616d8d0fe97e7b SHA512 cc56361bfa53763b7e9198f9c817c257a5ec5956c2b3e34132cc184c95f013360b6fdb324ad8123c044b9e11a1cf100cf2954a1e8a3fd8b1b6601a3dd421647f
 MISC metadata.xml 247 BLAKE2B 317f906045f70ecc77ab85491b683c74618c027d768a499226ea0c46d214b783ff308f6bcb79c1edfaf3c4a01821afd529786bf5ad2cf73e0570aac56177d36e SHA512 4ae39ceedf573357554a383ccfab1d716abb7265c3a1eb407d1dc4bf3b38fc91b5cdeec8ba0bad84efb2595aebb6d115ade1575e12812079e47797b7dcd3fa7a
diff --git a/app-text/diffpdf/diffpdf-2.1.3-r2.ebuild b/app-text/diffpdf/diffpdf-2.1.3-r2.ebuild
index 379468357300..4ac979ae0a43 100644
--- a/app-text/diffpdf/diffpdf-2.1.3-r2.ebuild
+++ b/app-text/diffpdf/diffpdf-2.1.3-r2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit desktop qmake-utils
 
@@ -14,6 +14,7 @@ KEYWORDS="~amd64 ~x86"
 SLOT="0"
 IUSE=""
 
+BDEPEND="dev-qt/linguist-tools:5"
 RDEPEND="
 	app-text/poppler[qt5]
 	dev-qt/qtcore:5
@@ -21,9 +22,7 @@ RDEPEND="
 	dev-qt/qtprintsupport:5
 	dev-qt/qtwidgets:5
 "
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5
-"
+DEPEND="${RDEPEND}"
 
 PATCHES=( "${FILESDIR}"/${P}-qt5.patch )
 
diff --git a/app-text/djview/Manifest b/app-text/djview/Manifest
index a5ac46a02235..89ebb78cbd85 100644
--- a/app-text/djview/Manifest
+++ b/app-text/djview/Manifest
@@ -1,4 +1,4 @@
 AUX djview-4.10.6-hidpi.patch 2313 BLAKE2B 4d3356baa36cf830a8e01314f6fbf081c0b8fe8b6a43b2e14e4966fab2d07932088c66e1f68802282537d490503586a528c2a4b86eea26615fc8eefbf6b7d058 SHA512 922b0c321edaeed3a76ee206fa4353366e3d744dd30612d034070c251ecfca6bc18a2ddaf110cfbc811ea47426f2d9e370d5a58cce41b396b793ba27223bb881
 DIST djview-4.10.6.tar.gz 1113072 BLAKE2B db965ad7dc3b8191855e9c5f23af3cd963901ca649a937e6f85bad8f9f924e0636b30a9a5350c114dcfecea570f013ba395508eb6cf1d45afda674892bcd196e SHA512 c06b9c4c7addd9dededdc9d441094bca685c4d23744e3d1208eab33d9d341a85f120176bf9f1b879ac6620f591eefe05ac774870b1ba3215c43baf1eaf9d14f8
-EBUILD djview-4.10.6-r1.ebuild 2030 BLAKE2B 79d80ba1e21ce05edcd2462e56f1d61e6279fbce72f24c21142c4b0b3bf74326343d505d06f06d7e595ca7a688dbbc4fe3c3b58f63fb091bb5f85ff4a592a6da SHA512 6cbf7319de31e604e9e09915b98fe206403fbda2fb524889fefac97cfafca3aa9db36a328f8f4deeb62bf6303bc08c5f15a369c13ed46f91636b02f9f65cfc88
+EBUILD djview-4.10.6-r1.ebuild 2087 BLAKE2B 742ec6af8b08b40bf5951e79bbfcb4ac5ecd6a6f1727d57f700166e9a47d00f0c40add3c29e7fe79290fe7b4179cbdf7dd5b526936ee5e5d67bc92512867553e SHA512 b3745bd57c512a6926b90266fce1281971209bb853c4ef2ccbb4a8286f9b21977b3482381a8e69782fdf04efd45f599c2867c6ff8c61031580679a8dc9077278
 MISC metadata.xml 323 BLAKE2B c8498cdd0e1820eb610a9e2ede4e10287977c2eb71dd1b6b9862e3d11a34760cf8dcb5e9e59535ab0ceed04f3be2b00aa4942657a25fffc87b23966c2b2c1caf SHA512 53a7a7290a2286fd31248db31160697a3b2693275013a1ea453258f9ac52fa3ea7111718ca35a5eb1652050699e5be1111c7ebb73b2a3c699383d8305509a5c4
diff --git a/app-text/djview/djview-4.10.6-r1.ebuild b/app-text/djview/djview-4.10.6-r1.ebuild
index fa5fe0ff6bd9..8bb483e12649 100644
--- a/app-text/djview/djview-4.10.6-r1.ebuild
+++ b/app-text/djview/djview-4.10.6-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit autotools gnome2-utils flag-o-matic nsplugins qmake-utils toolchain-funcs versionator xdg-utils
+inherit autotools flag-o-matic nsplugins qmake-utils toolchain-funcs xdg-utils
 
 DESCRIPTION="Portable DjVu viewer using Qt"
 HOMEPAGE="http://djvu.sourceforge.net/djview4.html"
@@ -23,6 +23,7 @@ RDEPEND="
 	dev-qt/qtprintsupport:5
 	dev-qt/qtwidgets:5"
 DEPEND="${RDEPEND}
+	dev-qt/linguist-tools:5
 	>=sys-devel/autoconf-2.67
 	virtual/pkgconfig
 	nsplugin? ( dev-libs/glib:2 )"
@@ -37,7 +38,7 @@ src_prepare() {
 	# Force XEmbed instead of Xt-based mainloop (disable Xt autodep)
 	sed -e 's:\(ac_xt=\)yes:\1no:' -i configure* || die
 	sed 's/AC_CXX_OPTIMIZE/OPTS=;AC_SUBST(OPTS)/' -i configure.ac || die #263688
-	rm aclocal.m4 config/{libtool.m4,install-sh,ltmain.sh,lt*.m4}
+	rm aclocal.m4 config/{libtool.m4,install-sh,ltmain.sh,lt*.m4} || die
 	AT_M4DIR="config" eautoreconf
 }
 
@@ -63,23 +64,23 @@ src_install() {
 
 	einstalldocs
 
-	cd desktopfiles
 	insinto /usr/share/icons/hicolor/32x32/apps
-	newins prebuilt-hi32-djview4.png djvulibre-djview4.png
+	newins desktopfiles/prebuilt-hi32-djview4.png djvulibre-djview4.png
 	insinto /usr/share/icons/hicolor/64x64/apps
-	newins prebuilt-hi64-djview4.png djvulibre-djview4.png
+	newins desktopfiles/prebuilt-hi64-djview4.png djvulibre-djview4.png
 	insinto /usr/share/icons/hicolor/scalable/apps
-	newins djview.svg djvulibre-djview4.svg
-	sed -i -e 's/Exec=djview4/Exec=djview/' djvulibre-djview4.desktop
-	domenu djvulibre-djview4.desktop
+	newins desktopfiles/djview.svg djvulibre-djview4.svg
+	sed -e 's/Exec=djview4/Exec=djview/' \
+		-i desktopfiles/djvulibre-djview4.desktop || die
+	domenu desktopfiles/djvulibre-djview4.desktop
 }
 
 pkg_postinst() {
 	xdg_desktop_database_update
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }
 
 pkg_postrm() {
 	xdg_desktop_database_update
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }
diff --git a/app-text/doconce/Manifest b/app-text/doconce/Manifest
deleted file mode 100644
index e6e347751a10..000000000000
--- a/app-text/doconce/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST doconce-1.4.4.tar.bz2 112713371 BLAKE2B 65acba4d02095d616c5ca6a070bb4a80ae57b4f201d9810f7b88e212e1ea86bd211440213194c4d61a2eefd19dfa9de9f81376d3e535f032747a8102bfdc2160 SHA512 9b5caae789a395bcdbb4daeea57182f2ea21a2c3c4da0abae2c097351fece601da6901de8d89ab60a187c1bc0ba5f913bbee14a847c1f85020dc16e0cdffdf31
-EBUILD doconce-1.4.4.ebuild 764 BLAKE2B 1ed038fd47721164bce9260b9a0ea1b0e7e7404ef1c779543875ee258057b1d4a6475804492cfae07488ba044177c98cf91d053be50c6a2948589cc639684909 SHA512 0a13380d62f41ebf420dcd3a097f2844319b8470f38c0614c1e5d6ea70d8bf8430eb172dc4e0712740922c676f3331fc0483cc62ab75e812d18c6be666904912
-MISC metadata.xml 802 BLAKE2B 1b8df627a632e8b2e6ee6f038aef692b611fad270ae96d7d3ae44ad74d9259006e9aa636ffd14aa92fa286bc76d48a6e4a9ec85268e54173c3dc02a066ae18c0 SHA512 8223b8bb4e3b4da93110afb748946ad976ab275a76de8e998933fb7fe258e0be6ea205c4097ceae32760e5f8e8e16566ecc2889ced920d09dad06d0b9386a8bf
diff --git a/app-text/doconce/doconce-1.4.4.ebuild b/app-text/doconce/doconce-1.4.4.ebuild
deleted file mode 100644
index 44c6bb34b507..000000000000
--- a/app-text/doconce/doconce-1.4.4.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-inherit distutils-r1
-
-DESCRIPTION="A markdown-like langauge to generate docs in html, LaTeX, and many other formats"
-HOMEPAGE="https://github.com/hplgit/doconce/ https://pypi.org/project/Doconce/"
-SRC_URI="https://dev.gentoo.org/~grozin/${P}.tar.bz2"
-LICENSE="BSD"
-SLOT="0"
-IUSE="doc"
-KEYWORDS="~amd64 ~x86"
-RDEPEND="dev-python/future[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-src_install() {
-	default
-	if use doc; then
-		sed -e "s|http://hplgit.github.io/doconce/doc|file:///usr/share/doc/${PF}|g" -i doc/web/index.html
-		docompress -x /usr/share/doc
-		dodoc -r doc/web doc/pub
-	fi
-}
diff --git a/app-text/doconce/metadata.xml b/app-text/doconce/metadata.xml
deleted file mode 100644
index 2e6a499d5337..000000000000
--- a/app-text/doconce/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <!-- maintainer-needed -->
-  <longdescription lang="en">
-    DocOnce is a modestly tagged (Markdown-like) markup language targeting scientific reports,
-    software documentation, books, blog posts, and slides involving much math and code in the text.
-    From DocOnce source you can generate LaTeX, Sphinx, HTML, IPython notebooks, Markdown,
-    MediaWiki, and other formats.
-    This means that you from a single source can get the most up-to-date publishing technologies
-    for paper, tablets, and phones.
-  </longdescription>
-  <upstream>
-    <remote-id type="pypi">Doconce</remote-id>
-    <remote-id type="github">hplgit/doconce</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/app-text/dvipsk/Manifest b/app-text/dvipsk/Manifest
index f06067f25dd5..240d356a9bf1 100644
--- a/app-text/dvipsk/Manifest
+++ b/app-text/dvipsk/Manifest
@@ -4,6 +4,6 @@ DIST texlive-module-dvips-2019.tar.xz 34492 BLAKE2B fcc7ae96fd1fc87a4e4164e61c61
 DIST texlive-module-dvips.doc-2019.tar.xz 514068 BLAKE2B 91e4717b49f7c3b3cc0b350d9b5d029dfb6dacfba7a0d0f95195e681bf55e86c18f666d9a0a72ea3a5ca6cf4ad85e91e3faf2febaac3878b3e6b2d8138097d54 SHA512 fcc91e88fd3536244d878458a90d31ad3b9ec9efbc08d09d8b23f13d3887ca575e17663b2e21451abf88de389f7fc3937ce3ab49bc9e6ea94ab77c66ba179a00
 DIST tl-dvips-2020.tar.xz 58076 BLAKE2B 329b4ffbb759a040143269d492b58037dd803e1e832f263da9db918d9cdbe66dce86a0bc23d2ac421a52da017e33a38b6986c89be9ae9ae0591c9261f4510b7a SHA512 835a289ac24755904d7d39e09846420b286c0aaf5c57a081ea8da78dfc29e2289bc326d735a0281f5559418dead10ad0d040e2fe6362947e15df672c82d7900e
 DIST tl-dvips.doc-2020.tar.xz 521496 BLAKE2B 1a19670ea2a6339f983564580bfc15374737014fe5dbccc4fb3f3f81455bab2c0ee9cec9ea0b9858ccd3d75cff6465d825a4a2fb095e7d4e70edb459e76634b5 SHA512 6f97f38327335ea711ec467133d1fa4e3124f3362d177e19af2cca06a50be1cf1de4d9e5b1aacbd1ba9779e0062a49a7572d47c5de918030fd5f78476e2bfac1
-EBUILD dvipsk-2020.1_p20200406.ebuild 1582 BLAKE2B 304b60697d6aafea8715c13713f53b2340e57e8b8cd72e2dae1028b6cc95bb3640f808f8fa5760cfbf71c7eb066b3c4d7bd56a46b4099d04d893cfedd87cb34c SHA512 f2733119a1c106d9ef2cd0e1a219b578aef0aca6d62d238eaf9b5b7634f7fecb4c517f35a1fbb2866ac7b0cb4a64c453db37aeacbafa04e009f2a92c7df1865d
+EBUILD dvipsk-2020.1_p20200406.ebuild 1581 BLAKE2B 9b5589c2bb9fb8f5732e622572c3f56681fb7634f123828f96dc120ba0a6d610a58680ebcd1cc15c765fc7fa52c18d84133beae6bdc1af5c9937ea20c008d2d7 SHA512 2864467791200246e8329fb83d2b47211cac09a02970cb4d871e4a7a707c178260dfc56d533ae3cef8072e8fec00d7329871519f23f15ebfe60520d33b95c9bc
 EBUILD dvipsk-5.999_p20190410.ebuild 1597 BLAKE2B a209e36c9d762ac4d5b435fd6accc65a58c52340928496df39e13d77caefb90cdd01002fc439cde4dab4733c04db4f0b7a06a5a405b7ed6e3b56cdeea263fb25 SHA512 f7bddfc5841be869f5cb4944f9af6cdfb2802a4427ac4d9dda10bf7b3a4874430f907bb032e77919e7626c65d828dc54ba5eaed3362c7961c89090c65edc67bb
 MISC metadata.xml 358 BLAKE2B b5a2e9424ef1e5bb23c34e089d9204443dd5ad528b56db71d2fc2b3c5d428c14367805ca94a307f8856d21356abe76092c54ba0f0df204b5bce3665f9f3fd657 SHA512 51f6411780af5d7775f8f80d246d5f4e297abb1960a0b0c21c6dc5c03a9a407dad8cbc4977a679590cffb4523f1b72a0f7b15ab100c938391a5abfd3e17e8818
diff --git a/app-text/dvipsk/dvipsk-2020.1_p20200406.ebuild b/app-text/dvipsk/dvipsk-2020.1_p20200406.ebuild
index 78f5b068fb5a..6c990b59a4db 100644
--- a/app-text/dvipsk/dvipsk-2020.1_p20200406.ebuild
+++ b/app-text/dvipsk/dvipsk-2020.1_p20200406.ebuild
@@ -25,7 +25,7 @@ SRC_URI="${SRC_URI} ) "
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc source"
 
 DEPEND=">=dev-libs/kpathsea-6.2.1"
diff --git a/app-text/groonga-normalizer-mysql/Manifest b/app-text/groonga-normalizer-mysql/Manifest
index f0725434c42d..8aea649df97a 100644
--- a/app-text/groonga-normalizer-mysql/Manifest
+++ b/app-text/groonga-normalizer-mysql/Manifest
@@ -2,8 +2,8 @@ DIST groonga-normalizer-mysql-1.0.6.tar.gz 430461 BLAKE2B f124608b13888f337fc35e
 DIST groonga-normalizer-mysql-1.0.9.tar.gz 527908 BLAKE2B 20112b60a2a9f5f5b1d805280cd5dc77e8d039a768410a3f2259aa60449c660eb6c3764d14edd3db819dd68a830ba38aebe5bc0d6014dcd04752a194b1da87dd SHA512 878d10dc6f7280c62e9563db19a61450a0181c19d47b2a5afe3bef4bfa157abfe3de726f0d61b6b7040b3b37abd78f63cd257f48fe779ff6a1ea0ed262b70a97
 DIST groonga-normalizer-mysql-1.1.0.tar.gz 529179 BLAKE2B 1092b6245eb60a2e54cadf6193a402ad085923224e05d35f80453505fb2f0a4e97822746907d1f9a8c0b95f82d0b1396b7ff81d133099def75b850e54a899725 SHA512 a607ea875a1500b408742f52c5a0e465db4fc45101cd6b433a5fede8631fdadd6d24571ec188f70e39906178d35ad46138848bd57aaac721da32c064f3506416
 DIST groonga-normalizer-mysql-1.1.1.tar.gz 548788 BLAKE2B c2f06ffa4aaf52266dabf1397d592b772a10a45fe8b9184ffb7fc5f30a8db3c81011c19a80d3d14a228ea47b4b6ba21b7ab7f81e283533beef4596065d0c4b6b SHA512 40686a50133149b614057907c58f5b37d596fcaf697b4a6f3e68b776ac8c728cdd4c8a6e7c5676fe92ff96a4358b623f2b3740f6b72d317f1650c006cfb34369
-EBUILD groonga-normalizer-mysql-1.0.6.ebuild 712 BLAKE2B ffa3e31c542b4399826c879ac879f8a23c96e1301e110c174a4f26175cf169947b7ad19db6d7520226903115035028045a71edee6984157b24c3916dc7d9f047 SHA512 3d52475e2844caaa1e1cc208962308d70eb0d4812f7bc3525b2e57de91a6b0e3257c8c3609d4449fd63d51f1e8d2c2dcc63a8072afaf1baa397feb4dd9cd4803
-EBUILD groonga-normalizer-mysql-1.0.9.ebuild 700 BLAKE2B 0b0f4a33a55d932244250f1294fb8e9794c3e078032263348a87039da4c7cf58596d7985472c905ee1b4ed614a9b10704f1379ca8d8f097ee5dad9a8ef0fe77e SHA512 022e5ba51320af015149061407f11f21b2be35ebf5ad799c7634b42199dbf5c8a873b98c7299ed29d3dc84defd17ea4a235431716d0b1828243fceee3ddf1824
-EBUILD groonga-normalizer-mysql-1.1.0.ebuild 700 BLAKE2B 0b0f4a33a55d932244250f1294fb8e9794c3e078032263348a87039da4c7cf58596d7985472c905ee1b4ed614a9b10704f1379ca8d8f097ee5dad9a8ef0fe77e SHA512 022e5ba51320af015149061407f11f21b2be35ebf5ad799c7634b42199dbf5c8a873b98c7299ed29d3dc84defd17ea4a235431716d0b1828243fceee3ddf1824
-EBUILD groonga-normalizer-mysql-1.1.1.ebuild 675 BLAKE2B f5615a7f0f2d92bc6e07e01a1dc8f01c5f56a6eb380608ee392e46c2d3e844f8719b0921dfb63b61db2e8fa6984e867874a72f45fe0916878e7c518e7c7d52a0 SHA512 199d4275ba2f39aa3eeef1b9231204a107a49483cef584ceb2adcbb7bb225dd2c918a74964909fed0aca000a78e294df3943152ffc0dfb25dc014e39eb3d9a95
+EBUILD groonga-normalizer-mysql-1.0.6.ebuild 714 BLAKE2B 9700d2835f3f1558fa659eaa88f6ca4cfdaa382d023b9558ea28dea2dc07782d1f0286e862456fb054c0ba421e12930da2c3307ae21470d1eed05188f09370ef SHA512 1c78bcd77d2438b85f51e591964cebe3d14e335b24899b89e1625a30db3a1e98c9175075e7deca1ae7c91b5ef24be5064c9a73c31b1fbd4df5810f1bf597fa38
+EBUILD groonga-normalizer-mysql-1.0.9.ebuild 702 BLAKE2B 21096c271665dcb14c2828519ba5d0338918d6bbf575195cfb4e0e577c2628e8b280a51e73346bfe014d6cf43e6bb4b6ea364bca76049320134a256372aa3abd SHA512 bbff6609a47a4ef115fb72e70c8443ad9bceddb7a56f5447438f71c5c90d2d33b0bedeaba918a6e2772416438b39636c370f58092da39f4db8b9cfdfd8365301
+EBUILD groonga-normalizer-mysql-1.1.0.ebuild 702 BLAKE2B 21096c271665dcb14c2828519ba5d0338918d6bbf575195cfb4e0e577c2628e8b280a51e73346bfe014d6cf43e6bb4b6ea364bca76049320134a256372aa3abd SHA512 bbff6609a47a4ef115fb72e70c8443ad9bceddb7a56f5447438f71c5c90d2d33b0bedeaba918a6e2772416438b39636c370f58092da39f4db8b9cfdfd8365301
+EBUILD groonga-normalizer-mysql-1.1.1.ebuild 677 BLAKE2B 43c428007fc189bc6fc1f1ff62251c99ade97f9bb2f0775f4fa4bad48cf15733a2886cb1700f773817ef38386d1585c234303b61c8756d89eb3deda2047e7a3b SHA512 6b387668dee0f7c4d68dc1b690ef028ff8e14da6f8a15a764d300497b1eca16329adfd1a2adfe98e3aecbb8c2267acd742b1f02c31904dc3c7264d2ee0e0edac
 MISC metadata.xml 215 BLAKE2B 4eba5c3c44bf788b64d8084a6276754dc99a606036638e96522f3680ce8e5c6f6e1075b2f975d31cf93faea7c5e9a1ad37b58ec4e29e3eacc6a064d035ad8d52 SHA512 b9dfac6d012a908a88f80298c5df82f8b093bcb8f6b523ac7d1897289d0e72d4a62baca343c1b784b1e3f37a94efe000d353b7ea74cbd9b4584698c890d5a7f0
diff --git a/app-text/groonga-normalizer-mysql/groonga-normalizer-mysql-1.0.6.ebuild b/app-text/groonga-normalizer-mysql/groonga-normalizer-mysql-1.0.6.ebuild
index f6202b702aac..a2e51d5c428e 100644
--- a/app-text/groonga-normalizer-mysql/groonga-normalizer-mysql-1.0.6.ebuild
+++ b/app-text/groonga-normalizer-mysql/groonga-normalizer-mysql-1.0.6.ebuild
@@ -5,8 +5,8 @@ EAPI=5
 inherit eutils autotools ltprune
 
 DESCRIPTION="Groonga plugin that provides MySQL compatible normalizers"
-HOMEPAGE="http://groonga.org/"
-SRC_URI="http://packages.groonga.org/source/${PN}/${P}.tar.gz"
+HOMEPAGE="https://groonga.org/"
+SRC_URI="https://packages.groonga.org/source/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
diff --git a/app-text/groonga-normalizer-mysql/groonga-normalizer-mysql-1.0.9.ebuild b/app-text/groonga-normalizer-mysql/groonga-normalizer-mysql-1.0.9.ebuild
index fe2ac8288eea..febf15c849db 100644
--- a/app-text/groonga-normalizer-mysql/groonga-normalizer-mysql-1.0.9.ebuild
+++ b/app-text/groonga-normalizer-mysql/groonga-normalizer-mysql-1.0.9.ebuild
@@ -5,8 +5,8 @@ EAPI=5
 inherit eutils autotools ltprune
 
 DESCRIPTION="Groonga plugin that provides MySQL compatible normalizers"
-HOMEPAGE="http://groonga.org/"
-SRC_URI="http://packages.groonga.org/source/${PN}/${P}.tar.gz"
+HOMEPAGE="https://groonga.org/"
+SRC_URI="https://packages.groonga.org/source/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
diff --git a/app-text/groonga-normalizer-mysql/groonga-normalizer-mysql-1.1.0.ebuild b/app-text/groonga-normalizer-mysql/groonga-normalizer-mysql-1.1.0.ebuild
index fe2ac8288eea..febf15c849db 100644
--- a/app-text/groonga-normalizer-mysql/groonga-normalizer-mysql-1.1.0.ebuild
+++ b/app-text/groonga-normalizer-mysql/groonga-normalizer-mysql-1.1.0.ebuild
@@ -5,8 +5,8 @@ EAPI=5
 inherit eutils autotools ltprune
 
 DESCRIPTION="Groonga plugin that provides MySQL compatible normalizers"
-HOMEPAGE="http://groonga.org/"
-SRC_URI="http://packages.groonga.org/source/${PN}/${P}.tar.gz"
+HOMEPAGE="https://groonga.org/"
+SRC_URI="https://packages.groonga.org/source/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
diff --git a/app-text/groonga-normalizer-mysql/groonga-normalizer-mysql-1.1.1.ebuild b/app-text/groonga-normalizer-mysql/groonga-normalizer-mysql-1.1.1.ebuild
index d61e4f8126b6..d9d9ecefbd64 100644
--- a/app-text/groonga-normalizer-mysql/groonga-normalizer-mysql-1.1.1.ebuild
+++ b/app-text/groonga-normalizer-mysql/groonga-normalizer-mysql-1.1.1.ebuild
@@ -5,8 +5,8 @@ EAPI=6
 inherit eutils autotools ltprune
 
 DESCRIPTION="Groonga plugin that provides MySQL compatible normalizers"
-HOMEPAGE="http://groonga.org/"
-SRC_URI="http://packages.groonga.org/source/${PN}/${P}.tar.gz"
+HOMEPAGE="https://groonga.org/"
+SRC_URI="https://packages.groonga.org/source/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
diff --git a/app-text/highlight/Manifest b/app-text/highlight/Manifest
index ab3aa88bf6cb..ad9c358bd492 100644
--- a/app-text/highlight/Manifest
+++ b/app-text/highlight/Manifest
@@ -1,4 +1,6 @@
 AUX highlight-3.42-qmake-fix.patch 1051 BLAKE2B ad9436c010cb1f9b8db5a21234ec6b80ae73bf49cd165f99638c93b251a53db4918bc1fd70260a5a9310f9d28b86b25190ec5b21cda09b7f4138c3f39dc6088d SHA512 5f74b45995b953c815c9e820fbb73693f3f28927b5785fbc86537f55d2f411f9a6b420e45a4834babda54fddf44c1640bc32cc2cd35d3ec22be07781f05108fc
 DIST highlight-3.42.tar.bz2 1294770 BLAKE2B 22c79258be6a665eda8ee17d1de6a97811f97dc4b4491c24b466dc5375d98d865e07ac4e462288d066613bef8bb5a469fa0bdb3065ecf098fc6c4f6090ecb63e SHA512 362150ee396d2b203f11ecc3d011e23b6f8c7d93ff9f8cb0e9e980be6da21e7b3b1ea1e347e3f09129ab0fb1a0aab19ff19f021e643b93a163a99d3882f9bf80
+DIST highlight-3.57.tar.bz2 1412857 BLAKE2B c0ee8189294feac3b5e8c6d356634d8074a8960f2010918de52f23515ad4a13626971e9106ecc6d2adbdb45e0ebb66ff60eb3cbe86d2449666e3424f1c0dc3a6 SHA512 a086f6b8c4a4fc0b6651d456b178350a6c59a32cd613451d81b53fe3294eb0f80d673cb64fb615ef91d6c4d4bbc8a57413aec2490d2a5ad67e695ec6e92b3d99
 EBUILD highlight-3.42-r1.ebuild 2202 BLAKE2B 0b5d44fa0a2a9075e5b55ccb8c09f80dfd6bf0f00b0df7e21ea61d620db70442cb06ae5f0890fd0ee834673975255b9131cb77fff5d316109bd876f81c40e55e SHA512 24666e1693f84bf9f3f285f2fd0130769890ebce3fd67dce262cd9411a3c5d35d5b1cd28115d38269f1811f14322d676bd07f1cc521a529206408681326bc0e4
+EBUILD highlight-3.57.ebuild 2188 BLAKE2B 849955be9504de05df9edaafc02f2af7b598c9934c257b1bf7ee9046e910e2f77e9377b2899942fd20f9fda04919d9d9a53dc5728f5e5383447156450191dfd7 SHA512 92e151a33d1eda74cfcd374af26cea251ba81793507995241ab06bbc3958ba33139d51cabda92a31291867c65d2801a5595b6cfa41f0efc34db5a9a960b5dfda
 MISC metadata.xml 249 BLAKE2B 1b34ce77c092c0664a18f32525d158d41bf36ab7ab7a4b9d01ed37e1e3dda3d58849d5b1375065c4e5591f6b09b2a93e88a624d399c495a0b1125edb30ec172f SHA512 895325641a176c848988fb5f36cdb567b584d22f6e778b3de674de480cbca30b7cf8f12ecbbe1173a63e3229889e1e0f5efd5afea4f0d4c429ac236598f80f1e
diff --git a/app-text/highlight/highlight-3.57.ebuild b/app-text/highlight/highlight-3.57.ebuild
new file mode 100644
index 000000000000..90bd4a859636
--- /dev/null
+++ b/app-text/highlight/highlight-3.57.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit qmake-utils toolchain-funcs
+
+DESCRIPTION="Converts source code to formatted text (HTML, LaTeX, etc.) with syntax highlight"
+HOMEPAGE="http://www.andre-simon.de/"
+SRC_URI="http://www.andre-simon.de/zip/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="examples qt5"
+
+RDEPEND="
+	dev-lang/lua:0=
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+	)
+"
+DEPEND="${RDEPEND}
+	dev-libs/boost
+"
+BDEPEND="
+	virtual/pkgconfig
+	qt5? ( dev-qt/linguist-tools:5 )
+"
+
+myhlopts=(
+	"CXX=$(tc-getCXX)"
+	"AR=$(tc-getAR)"
+	"LDFLAGS=${LDFLAGS}"
+	"CFLAGS=${CXXFLAGS} -DNDEBUG -std=c++11"
+	"DESTDIR=${D}"
+	"PREFIX=${EPREFIX}/usr"
+	"HL_CONFIG_DIR=${EPREFIX}/etc/highlight/"
+	"HL_DATA_DIR=${EPREFIX}/usr/share/highlight/"
+	"doc_dir=${EPREFIX}/usr/share/doc/${PF}/"
+	"conf_dir=${EPREFIX}/etc/highlight/"
+)
+
+src_prepare() {
+	default
+
+	# disable man page compression
+	sed -e "/GZIP/d" -i makefile || die
+
+	sed -e "/LSB_DOC_DIR/s:doc/${PN}:doc/${PF}:" \
+		-i src/core/datadir.cpp || die
+
+	if has_version "<dev-lang/lua-5.2"; then
+		sed -e "s/-DUSE_LUA52//" -i src/makefile || die
+	fi
+
+	# We set it via eqmake5, otherwise it forces clang...
+	sed -e "s/QMAKE_CC/#QMAKE_CC/g" \
+		-e "s/QMAKE_CXX /#QMAKE_CXX /g" \
+		-i src/gui-qt/highlight.pro || die
+}
+
+src_configure() {
+	if use qt5 ; then
+		pushd src/gui-qt > /dev/null || die
+		eqmake5 \
+			'DEFINES+=DATA_DIR=\\\"'"${EPREFIX}"'/usr/share/${PN}/\\\" CONFIG_DIR=\\\"'"${EPREFIX}"'/etc/${PN}/\\\" DOC_DIR=\\\"'"${EPREFIX}"'/usr/share/doc/${PF}/\\\"'
+		popd > /dev/null || die
+	fi
+}
+
+src_compile() {
+	emake -f makefile "${myhlopts[@]}"
+	if use qt5 ; then
+		pushd src/gui-qt > /dev/null || die
+		emake
+		popd > /dev/null || die
+	fi
+}
+
+src_install() {
+	emake -f makefile "${myhlopts[@]}" install
+	if use qt5; then
+		emake -f makefile "${myhlopts[@]}" install-gui
+		docompress -x /usr/share/doc/${PF}/{ChangeLog,COPYING,README,README_PLUGINS}
+	fi
+
+	if ! use examples ; then
+		rm -r "${ED}"/usr/share/doc/${PF}/extras || die
+	fi
+}
diff --git a/app-text/kbibtex/Manifest b/app-text/kbibtex/Manifest
index fbd25281c29d..b099e32c03b7 100644
--- a/app-text/kbibtex/Manifest
+++ b/app-text/kbibtex/Manifest
@@ -1,5 +1,5 @@
 DIST kbibtex-0.9.1.tar.xz 4185284 BLAKE2B 437fb2473095e89bc26446bf4dfcdd56ff0b402e604fe67f2f76073628e8e7f3fc8982c56aa24174303dde101c42d19abfac2b3c1e371bf930ff6bdb4307b7c0 SHA512 710ef3f0ddfe4869f079068723a2056866be9aab5907ea7eb00efb4b597270e4c1ec9464d6a15509e2a62749393d27bf0798022367536d3c879a0cbd10dc3129
 DIST kbibtex-0.9.2.tar.xz 4196896 BLAKE2B 198b9a44f1aa19aa0f33f5abe6bcd135e5367ccacbc1d947fcdca531259d8b0ff3f1a53dacd8ce660691ea0ca709e5873adfbd79d01fe318fdfa273234d97938 SHA512 b733339f21fac0be3125e375d59f9060514107532372504902240e4e744e2f62cdff73ef0ea267e96f1e58e15ce917d1d1fdd7a3811a89493e0caedc877ca63a
 EBUILD kbibtex-0.9.1.ebuild 2060 BLAKE2B f880aa792f236a7525c42b7dcee2caebe5770b9893c47be6f4fdebe6c77b99d37fa94a5bfdd4acb00006cf12200904414e670264286dcf94f1c57f8352e81a84 SHA512 62e204d3e7451301d0845c7a652e9ea16fe710f32f46ae7229ec50ee3fb800d7a9074df0a9ec35b327af3be7d2bada93f862d26d1471725bddb808ef263508df
-EBUILD kbibtex-0.9.2.ebuild 2071 BLAKE2B af78dd35a5480e63313da391bfa4408d5debeecfba9c06cd01b93b81bfbfcbeb36f309d07f4e501171a224ce5845904aa679206260d62a6c5e808499bf0a135c SHA512 c64f468dc562881e5b4cd62899d0971cbbfe2e2750ff66b8f3ce3bacc640e03cd1e61c9938e10b19577a22a8c6ecc77528a7d60f3958f9ba61d069f259e81c0e
+EBUILD kbibtex-0.9.2.ebuild 2070 BLAKE2B 826203eea2dc3856fd17b7e58fa1132127f8241280817e41251eb4307827bb61efa2eb3c919a5fd3adc9e7798390e4970bd76d365254c144457b7961628b4e95 SHA512 223a4f3eaede46fbf38df658400fbe77b058c8d3a1ba69634356ddd07cd2be61698b26cfbe62c1beb8d134f46a7c5d6ffd72d0df7278ca62b6ac59d243c076c5
 MISC metadata.xml 440 BLAKE2B e5121ee173f89412a1bf3339de23a9e13fcec40f52c82129ebd185732759e4ad586b922d31e6470f91e03ba2ce614ba6de75dcb340e0f20d5b799c3476bde23b SHA512 cb2f6751bff9d468dde56635a792813de84b6c383e488ab5764c9656e54a892f5a9b9fd4932d49ec603bae4716f9f0bdd3cbe90b0c796017fceeb6b61196f1ef
diff --git a/app-text/kbibtex/kbibtex-0.9.2.ebuild b/app-text/kbibtex/kbibtex-0.9.2.ebuild
index 0c96475da697..76ffc2685c2c 100644
--- a/app-text/kbibtex/kbibtex-0.9.2.ebuild
+++ b/app-text/kbibtex/kbibtex-0.9.2.ebuild
@@ -15,7 +15,7 @@ https://userbase.kde.org/KBibTeX"
 
 if [[ ${KDE_BUILD_TYPE} != live ]]; then
 	SRC_URI="mirror://kde/stable/KBibTeX/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 ~x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/app-text/libetonyek/Manifest b/app-text/libetonyek/Manifest
index f0b7813c9bac..4be1d8d26ee4 100644
--- a/app-text/libetonyek/Manifest
+++ b/app-text/libetonyek/Manifest
@@ -1,5 +1,6 @@
+AUX libetonyek-0.1.9-boost-1.73.patch 304 BLAKE2B c9b18c3dac65284f53be3d686316bf6ecdab62b3d7a82cb4af41d528519e19cc65a0d5a97ac69a032d7305b38361ef0f47c7c1d2a0cf9098fffe6e1b3d818c3a SHA512 be2c53cd0902c3f51b0ba39b5b07177f3fc0978321fe6094baccdd8937b91de1aacf3cb77b1afe14840709712eb24d618e7474f58bb9baccdabe218eff7e7a9f
 DIST libetonyek-0.1.9.tar.xz 1477064 BLAKE2B 088d27c83d4aff41cb208cf840def78e323f378a1b7d456448db3abf51d1e850c8159ace75c8836958b533c2b84e583d5a622e638081230d2f862f6d1d175e98 SHA512 3f439b369d450bb1a4bdb3fe92023bda234b323cf676570f1738318c56867a97910f536280b9b164c3fdaa423a3ee669c935df75a5c700bc1530ea5b9a00391e
-EBUILD libetonyek-0.1.9-r1.ebuild 1347 BLAKE2B 0c0dc3a26076eb3b3d98f54c50aacd261bd7f13152fea89e37a04e53a37c8c37537d14a7f074d4a2ce39def6d77ac5226e86d7731798959e70c6ccd0a761737d SHA512 46ce7f286673f1c201cfb882130eb3d83c6a1c47a9bd3a28f72aeb5f22e25a88c6aa377a7808f1a129fd7223d73899a1520a3e6d23ed167cf7f854bf65082499
+EBUILD libetonyek-0.1.9-r1.ebuild 1407 BLAKE2B 115b06b38f818bc77ec379644a73d9794b4f8eb5241b759d58e4274ae1d0132414d3158da2d6a822b6a3f6d6308a66aeffd8e5e5cd75ca60f5b9eaba3d32c91b SHA512 5f67e3921c9cbb3f077e725e81d75b2692faee90756f3cfd4fe88b2df2d80e03d787eeaa55429ba185990ea3c4e693a88143c04164a34c44b8a2981c7b7cf489
 EBUILD libetonyek-0.1.9.ebuild 1213 BLAKE2B dd541c95dc2422f4c0461627b79f27e053bc4616223cd924c545f26a9af8b2e5fba66f6aed8a30d61885adc7d00524511c55eae725463f091385a801e2959fc3 SHA512 f79eef907d1889f71a6c3377a3452c626758301e288addb84dd866df8d0b672214f3bd400598aa9f4037f8ae16bac54722008be056ee2611eaccc20e653b6ae9
 EBUILD libetonyek-9999.ebuild 1347 BLAKE2B 0c0dc3a26076eb3b3d98f54c50aacd261bd7f13152fea89e37a04e53a37c8c37537d14a7f074d4a2ce39def6d77ac5226e86d7731798959e70c6ccd0a761737d SHA512 46ce7f286673f1c201cfb882130eb3d83c6a1c47a9bd3a28f72aeb5f22e25a88c6aa377a7808f1a129fd7223d73899a1520a3e6d23ed167cf7f854bf65082499
 MISC metadata.xml 255 BLAKE2B 9b8486730bea2158e8be5cbbe0552c5460d1b18e2236a68e3f11d85ce4eeb96eb0e746f44a10cb7cdcf1bf498190a512ef42f47852c6843b9a3c937ceabc338d SHA512 ac646e8ac676faf0aac283e4be31c5f2b29e98ccf07327073ed05e688ce696caf639bdfea63e4aed141a90e84c0a86892bc717a52b95cdf1739aaa15240013c3
diff --git a/app-text/libetonyek/files/libetonyek-0.1.9-boost-1.73.patch b/app-text/libetonyek/files/libetonyek-0.1.9-boost-1.73.patch
new file mode 100644
index 000000000000..2992f9f1add3
--- /dev/null
+++ b/app-text/libetonyek/files/libetonyek-0.1.9-boost-1.73.patch
@@ -0,0 +1,12 @@
+diff --git a/src/lib/NUM3Parser.cpp b/src/lib/NUM3Parser.cpp
+index 6dc0e9a..6f8e79e 100644
+--- a/src/lib/NUM3Parser.cpp
++++ b/src/lib/NUM3Parser.cpp
+@@ -7,6 +7,7 @@
+  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+  */
+ 
++#include <algorithm>
+ #include <functional>
+ 
+ #include "NUM3Parser.h"
+\ No newline at end of file
diff --git a/app-text/libetonyek/libetonyek-0.1.9-r1.ebuild b/app-text/libetonyek/libetonyek-0.1.9-r1.ebuild
index 63aab3eb452b..dbe9b85d2ee0 100644
--- a/app-text/libetonyek/libetonyek-0.1.9-r1.ebuild
+++ b/app-text/libetonyek/libetonyek-0.1.9-r1.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == *9999 ]]; then
 	inherit autotools git-r3
 else
 	SRC_URI="https://dev-www.libreoffice.org/src/libetonyek/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~ppc64 ~x86"
 fi
 DESCRIPTION="Library parsing Apple Keynote presentations"
 HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libetonyek"
@@ -36,6 +36,8 @@ DEPEND="${RDEPEND}
 	test? ( dev-util/cppunit )
 "
 
+PATCHES=( "${FILESDIR}/${P}-boost-1.73.patch" ) # bug 722042
+
 src_prepare() {
 	default
 	[[ -d m4 ]] || mkdir "m4"
diff --git a/app-text/libmwaw/Manifest b/app-text/libmwaw/Manifest
index e63d37597699..a7657275c879 100644
--- a/app-text/libmwaw/Manifest
+++ b/app-text/libmwaw/Manifest
@@ -1,6 +1,6 @@
 DIST libmwaw-0.3.15.tar.xz 1289744 BLAKE2B 9aed923542e795904761e4969299785906aa65c735541788d91eb41e80420ac6c6df4df5e0cfa156c71d4e100c601e5e984de10c6a5f66eebe6ffb5f0374cc1d SHA512 0b2443fc6bc9da9247f7585743424df440f89317af989018d8b972864bf91e3c5cd78c39094a45d9de8114906b2b2a93f68ddb967af8565e4b499f643d86e682
 DIST libmwaw-0.3.16.tar.xz 1306872 BLAKE2B 29c39ddb2cfe63116cbe7152a4dc3b7f16d402745c0dffd67c07dc42fa1ddee71f391695ead2519b3e1da206e8f437fbd24fa78ce1decfaa55e38a13d5d144e8 SHA512 c043d77e4b0efd7da594c1e370f24ee2d85afcb8a5e28179b4c3d76c8b7925f41ca5361bee12b35af732ef39f34fac46aa3636cb27c179ef9bb2b6feeaa19b0a
 EBUILD libmwaw-0.3.15.ebuild 1024 BLAKE2B b83e05b736486bae6f4baf0f2f4f0fd5bbbb831f85b671e438d339739ef270cd8cd2d7237302e97d2eefad7016ed06439bfbde6e79a4cc5e50ed35f2e9c138e7 SHA512 35756c8f95801ee8a6f424ac812b182ff5dd12196e38bab7c162a2bfb0f2a43259bf00cc70df800f7b4699aa7f8be2ec64b1ebd1653c717fe0dc3ba407e032fe
-EBUILD libmwaw-0.3.16.ebuild 1035 BLAKE2B 63446225d716fbc31ad10ea9a53152afd169aab929e6e238a42ad9b038c243e11ed5d8cdfd8a133e81e63b02ffc313365fdfe9855947bb3e21ad0f94c4724e4d SHA512 c7cade36b3766e3281f51b7fe958a05f440a3856d6ace494deef6bf035b66f7603ceda5ae0d176a70e28d8130534f690c1562207eb610518c49a454cda2e9e4e
+EBUILD libmwaw-0.3.16.ebuild 1033 BLAKE2B 8adeacf35070020cd04507658693720e200d403c5ff184e32d52c0d72eec58cf832b41f9adeb624b866a03de8c03441d5fa16cb1d6b399a4dc614d4d2330aefd SHA512 f9ee2f8457bedc33b1b2e92f2ff7879af1da351e8988b5d06c7d655190b31e17c585949d7aa1a9728f80ecd3a71c67518ac378700391c1b0b719ca975d6ca66b
 EBUILD libmwaw-9999.ebuild 1027 BLAKE2B e51984196fe26cf9e7ba8ebe2e6de35c58443d3db82a65ee5d0358ac05f7905227670e05106e89d52ecb264f1e3833fe38917fce36a1fb6a2449228d90409d82 SHA512 9b530edcb03829b26715e09c5b99dc5f08bda876317813bf4589a7366a4bf20c5e2f0604792d103d6f50f2f7c4439a19dc60e362bef8627026508910eabf7837
 MISC metadata.xml 403 BLAKE2B cbddacc98e4f22e521d739150ee4044b93c297dbd6d220a445192a3d1a6316491d6ed72ada8bd138c287133fcaf1b3d5ce580e68dd3ec071d36abbc1b05b4b6d SHA512 12cebd7bdaff6a793598f40cb11f4ae6681dcb29b18ecb7db92681abf1f6d4ce0281ae292c84106a143c0ff5ff3395e37604b3576c6a479001fc351dba10c7ed
diff --git a/app-text/libmwaw/libmwaw-0.3.16.ebuild b/app-text/libmwaw/libmwaw-0.3.16.ebuild
index f4561cebf565..b142992c749a 100644
--- a/app-text/libmwaw/libmwaw-0.3.16.ebuild
+++ b/app-text/libmwaw/libmwaw-0.3.16.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} = 9999 ]]; then
 	inherit autotools git-r3
 else
 	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~ppc64 ~x86"
 fi
 
 DESCRIPTION="Library parsing many pre-OSX MAC text formats"
diff --git a/app-text/libnumbertext/Manifest b/app-text/libnumbertext/Manifest
index 71a8e04597c8..a655dac6826c 100644
--- a/app-text/libnumbertext/Manifest
+++ b/app-text/libnumbertext/Manifest
@@ -1,3 +1,3 @@
 DIST libnumbertext-1.0.5.tar.xz 281640 BLAKE2B 5480c72fed80a9d4825b37a876efa8588c8efb187ee5a65629ac800d98a2882312f443736f4c967ee0ae2fc32a0dbe758b1c275378d807df3d1da4cee6dff9bc SHA512 4d61464f26f631d272ef7285fbb931d3931b08240b58166b7e9a28c95ff5a537ca04af4c9673541b73997339d66061858c9cd18873b4c16f9ad2ccd1b68e81a3
-EBUILD libnumbertext-1.0.5.ebuild 515 BLAKE2B 7303210611a6367c55cb590d55cda240d7206d8f2e899e9ed3877a91d34b0011a37975f26a3f7303e083394d5b9ef9ebcf5cae8e271b6285232cb598ee52d2a6 SHA512 8ec3e9055ab6fbbada7a1dbe484cb5aa76dfff13d718599a91688240e4dec5f5ae36ca990ff40e70b7c257067c6149815ff26f6ca0aaf152af17db97ccbeb58c
+EBUILD libnumbertext-1.0.5-r1.ebuild 544 BLAKE2B 886724679f53691089fe45359180712ee3bf74c16c7a939fda4b84493283065fc6f9cf9ca4b6890adf6e0f2f390cac52fe4c20294232db7f96fb278e28da4b83 SHA512 d3737fb073898718813b7b0465a295a9e772f6fb119250b6d70522ca09802f79e2a3741788f63985a29c1d55d25f78f55e2f3271ae9b7327b013e486fe38b786
 MISC metadata.xml 255 BLAKE2B 9b8486730bea2158e8be5cbbe0552c5460d1b18e2236a68e3f11d85ce4eeb96eb0e746f44a10cb7cdcf1bf498190a512ef42f47852c6843b9a3c937ceabc338d SHA512 ac646e8ac676faf0aac283e4be31c5f2b29e98ccf07327073ed05e688ce696caf639bdfea63e4aed141a90e84c0a86892bc717a52b95cdf1739aaa15240013c3
diff --git a/app-text/libnumbertext/libnumbertext-1.0.5.ebuild b/app-text/libnumbertext/libnumbertext-1.0.5-r1.ebuild
index 7dfb49ac5382..a0453adf49fc 100644
--- a/app-text/libnumbertext/libnumbertext-1.0.5.ebuild
+++ b/app-text/libnumbertext/libnumbertext-1.0.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,10 +14,11 @@ IUSE=""
 
 src_configure() {
 	econf \
+		--disable-static \
 		--disable-werror
 }
 
 src_install() {
 	default
-	find "${D}" -name '*.la' -delete || die
+	find "${D}" -name '*.la' -type f -delete || die
 }
diff --git a/app-text/libqxp/Manifest b/app-text/libqxp/Manifest
index fbba0519db27..f62d2b84a85f 100644
--- a/app-text/libqxp/Manifest
+++ b/app-text/libqxp/Manifest
@@ -1,3 +1,3 @@
 DIST libqxp-0.0.2.tar.xz 341760 BLAKE2B e596b3ebd23c8fff2a1675b1076ba6b4403bb41358972b50eb946610108f5968ef3e553478aec8c6211f8b476030033e7d334cb4deccc7d6bdfba3914821abf5 SHA512 409d3df82ac522b39bdd0ef4f0a781b906e246a8e6f502009c095eea90d672c482a7fc5c7f998d89952bc598c6f51357346ed6df490c25cb48e1318e27c50dab
-EBUILD libqxp-0.0.2.ebuild 819 BLAKE2B c0c27726cb094628a761a8c451d974444e8215e5a3561109bf54420aaf3125ec722a9bfa2499a647cce298717ebc17431f34fa33ff5753449df5bad27a31b365 SHA512 d556fb15a1d0bb584d900ff795258fdb4681edc34fc80838f20567c940fa8eb8e601809eb5e819aca4c1cc7bd4c0ade389368e8e63bcf789266b3ae50904347c
+EBUILD libqxp-0.0.2.ebuild 855 BLAKE2B afc5386a7957c177247f5f61d1c308d1399d0f2c42bdfeb5b03c1c6d47655634ad5125afc55847a6cb84a39ebbc71a65af52a2fa8eac950ff0da428986b73d3e SHA512 f6cda0a3dc9f72bc22354aaa4fc42912a13dc2e44407887f89756dab3aa440d8b24d4a1087b48e179cc43d7217de42384367bb6dc268d628691bfbd3ab16a2ca
 MISC metadata.xml 326 BLAKE2B 2058d5aa3fb12800596e894b6415bbb01df4d3b72efd60cb7cfc26d75f60d1de9ac3190aa4e82145fcfffbd3a48a80f8f2d0f984662160b82c6201aac48e3261 SHA512 97b3e21efde5b88155863552b56e196d2349d761106177deb84e587d3bd0c08cf4e91ec779caf1db86970ddd3f6ce7ce76ded2e08a8a763e93428a9042605e6e
diff --git a/app-text/libqxp/libqxp-0.0.2.ebuild b/app-text/libqxp/libqxp-0.0.2.ebuild
index ed370e59bacc..b8a7b7ad69f9 100644
--- a/app-text/libqxp/libqxp-0.0.2.ebuild
+++ b/app-text/libqxp/libqxp-0.0.2.ebuild
@@ -14,11 +14,12 @@ IUSE="debug doc test tools"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
-	dev-libs/librevenge
 	dev-libs/icu:=
+	dev-libs/librevenge
 "
 DEPEND="${RDEPEND}
 	dev-libs/boost
+	test? ( dev-util/cppunit )
 "
 BDEPEND="
 	virtual/pkgconfig
@@ -38,5 +39,5 @@ src_configure() {
 
 src_install() {
 	default
-	find "${D}" -name '*.la' -delete || die
+	find "${D}" -name '*.la' -type f -delete || die
 }
diff --git a/app-text/libstaroffice/Manifest b/app-text/libstaroffice/Manifest
index 282d338908f8..15ddac066264 100644
--- a/app-text/libstaroffice/Manifest
+++ b/app-text/libstaroffice/Manifest
@@ -1,6 +1,6 @@
 DIST libstaroffice-0.0.6.tar.xz 706324 BLAKE2B 5ff692c85bb48a7cd4c1e05e0afcc3ab26d627254dcf0b4ba10314c6ec654d69e2910f031ec7b88c9d28c48fe6a7267cd2434d224dc980ad9e266273cbc65bfa SHA512 9b5313a069e29265875f2e744b6b39c261f578d72f67fdefe1454c092aaa28399e1b3dfcb3a2f881f9a60674e0115a29350fba3ee37fb442f0a837982077f324
 DIST libstaroffice-0.0.7.tar.xz 707920 BLAKE2B f06786f600414a086f9b08b413ef1e028b15070ce90b4be03b18dd69787f4812b4ecbc245381e0ed464fabe0c1147149a3c4df248181b236e5d8bb766b398985 SHA512 fae873457a8018c1613667aa92771981503585513ab01bdbd2dd6d506ed4f72a7a8fdcfcb8953a46dfcb8fd902d2c9ef8ccd1a5ff15c83990a89847fb98009f8
 EBUILD libstaroffice-0.0.6.ebuild 939 BLAKE2B 0c15a6739fd974981ea96eca622e2b5f4a9c92a5b26cb59c6f9f0003fc7746d004443887b93770a24a46c1b2af50e0aefa93895c10d9b0aaf10021329f0d059a SHA512 c5ac1dababb01bfd8c208ba686dff5d9745c57923550e780a0970b2c8cdc2bc2b4382085f0be2eec9ba5cdfa4adf8a182f810a4db3d8a586e2fe873bb696ee55
-EBUILD libstaroffice-0.0.7.ebuild 970 BLAKE2B 8a0c15fbed015a4fcf3486377a283d5de02b90dc9c6004a0cc6385cdc1ca1fc12ce40623b0c761a2f008355a912dbc5c389744c99cefdd4014aa624dcfda7b8c SHA512 beceac819018586c88d9c29869486b0307b9ad52d62539f2bf5fa1ae47cbf70d6b5a62c26085c33a19107139ae956eff80c8ec1f883ce304834c778117687537
+EBUILD libstaroffice-0.0.7.ebuild 968 BLAKE2B 1b28438c083dd717d8c4ecb2159bd5b1937ddc108093fed65e4031def61f24f72c4a6901d4ecfdafcecb6a1d9141e7b378c8f2f1efb5daa3fad2ea63d4bb6fe3 SHA512 e900f7f5311ed448b4eaf45dbe4745bf5c7ca53bb309d8651c48aad143926c45cb192d96e1e64f4b60bc612f2a3bacdc19e09291b54595144842abc6b91df382
 EBUILD libstaroffice-9999.ebuild 948 BLAKE2B e587d8cb4ce451cd83e8890e03b797087cf097b5d1a337ce47cc5b17a003bea0547a187d759545b2c825422549fc781931ac19099d1bac28d754735039b3b8cd SHA512 e75eead560e819a37f4a3f0df4fc9d048ae6c53d291fa79687f3175ffb14b2112e8e4017aff581a1c2a482342e52c5c61d559589acd29e5e258757de11b6670b
 MISC metadata.xml 469 BLAKE2B a9dad122953621001465506893edb9b72c1b1e7a213f0cfbf155a985595d7d319041d95030ea80411a6c21c97aea0a2aa891538f26f31f46cfc4ac6ceb75d183 SHA512 2f352e3b818123c53c188dd2d31b7ea3acc1bdbe9dc127d44697512eeb2a7cf2e138b306c69c619cf7fb24d8424305ff4b3d5637fd945c2832a2dfb9ef7743c8
diff --git a/app-text/libstaroffice/libstaroffice-0.0.7.ebuild b/app-text/libstaroffice/libstaroffice-0.0.7.ebuild
index e56e6857509e..570eede5ca5c 100644
--- a/app-text/libstaroffice/libstaroffice-0.0.7.ebuild
+++ b/app-text/libstaroffice/libstaroffice-0.0.7.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3 autotools
 else
 	SRC_URI="https://github.com/fosnola/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~ppc64 ~x86"
 fi
 
 DESCRIPTION="Import filter for old StarOffice documents"
diff --git a/app-text/libwps/Manifest b/app-text/libwps/Manifest
index b31915826328..cf5dec974040 100644
--- a/app-text/libwps/Manifest
+++ b/app-text/libwps/Manifest
@@ -1,5 +1,5 @@
 DIST libwps-0.4.10.tar.xz 695448 BLAKE2B ec26b6ccd918aa29d0df053b3e321b651e0c7142910009e0b50a89f88f4dba8f7e9e20f8962a7afb84497b533129d85eb5c7628aa7c64f2a57ce2976d5ff372f SHA512 e5a6155d9e59df226e72db5723ae7574d3f3fdc49bd64156e11f9d3715748fb919dd3d2ab83b6d5fb80c002e7d4ca12563f6ff80472a6485f374b037404acf83
 DIST libwps-0.4.11.tar.xz 706000 BLAKE2B e733b2fed9a05352b41126b2c0225807b3fe9a57f01f3b2a3bf35f99bd0adbd47bab8ef058f45de749332d407d589f6c33a03a3579fc76551548cb92c236e09f SHA512 6c81342b68fd93974c10ec0907dd46e9417cafa46d06205843941650828f4299a8793a7ace5c0ca755b8b9fb91fc1d6ef63304c641e7b5de36885e9995566e36
 EBUILD libwps-0.4.10.ebuild 739 BLAKE2B 424f86cd3bef154f0221e14b568603c0578b298032fab736d2ffda545a5c26f132d96fb4ba11516b0c839669d54f3103ddb5f13854b485109e8897e1573203a1 SHA512 dfe7e90260e69078903641bb058081e0cda277d9507a8eb5d885fddf82e5c571c4b956b99e26ebf20cd2656c981c18f7f9c6cc108aee73543a5fd8532a1ea88f
-EBUILD libwps-0.4.11.ebuild 785 BLAKE2B 0cb03b63c0d1777f3ea9325ae2b837268cb12be826bdc8d864b600328f6cba8bac2f8e31889a6c990036e26d8d24c75cc34ec5ef760cce9ad69053aa5719c365 SHA512 1b617c24b3a5046de8a94bcdecae5ac738b1fcf75776d4589bea88336dfd1b2b4a24df1bb3a2fe37894611f3a28d8f5635245ecc3ab76021f8f3e2a6bac765e5
+EBUILD libwps-0.4.11.ebuild 783 BLAKE2B 2eeb65ff3fe0006952271aa6729dcf6bf3f10174b88394894c34b21255f025a92d150ee22407a8a88022a03269c9e1bda56b0d4ef2f37698ca5a00a70b4d18ad SHA512 7cda0ade34e99a0e98370b3e3f2cc162300acd30233ea8d99e8695ef5b096498796e2bfe92498b6f2781977d67c1558dd9094b5f3c16a236727c934796377de2
 MISC metadata.xml 512 BLAKE2B e2125277139c062748282be37319771c209ba9b9c6f68e0ab9b8e9b5d10c4dfda9f6369aca792be2f21db8c1dcf3e840f78f159190162114458ed9279bf46270 SHA512 971b6f541825d73b66f09bc6b6ab677c2b1f1430a6cdd469dfe57162528d13b048681c8e00de061aa8ef5f98914b36b8bce7e13a35044937e65298469241bc1e
diff --git a/app-text/libwps/libwps-0.4.11.ebuild b/app-text/libwps/libwps-0.4.11.ebuild
index ea494a549900..8fd4c09f00c7 100644
--- a/app-text/libwps/libwps-0.4.11.ebuild
+++ b/app-text/libwps/libwps-0.4.11.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
 
 LICENSE="|| ( LGPL-2.1 MPL-2.0 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ppc64 ~x86"
 IUSE="debug doc static-libs tools"
 
 BDEPEND="
diff --git a/app-text/pandoc/Manifest b/app-text/pandoc/Manifest
index c56816f013bf..62c1c5d817b0 100644
--- a/app-text/pandoc/Manifest
+++ b/app-text/pandoc/Manifest
@@ -5,11 +5,11 @@ DIST pandoc-1.14.0.4.tar.gz 2052114 BLAKE2B 12de5d3ab457718708f3181e78879b511c90
 DIST pandoc-1.15.0.6.tar.gz 2049870 BLAKE2B d1495abd3451ec6e14fa13ca022051813bf736b9c15ff6106987c00bd53672fe027ad87d43d81faa15d50694fa1735a5ec31472738ff2b9a496e78d27c7656c9 SHA512 4c9bfea7440d6bdb72fb10a9a99b69c018db0ef0f1028d86b032e6c4df215c86566b93fd55c5cba7772d713d4ce3f764891de079dfa24de8ca21f818b7729211
 DIST pandoc-1.18.tar.gz 2711663 BLAKE2B 3c324917285eb0bff314ff04add75aa6dfa381d1bb8dcc99078284be8c93cb8f5f9bacd9e557be1f07b2e6a4137b74d10e769b42e08f27bdfa0c6bd71aca4b12 SHA512 52bc68e9586366433e522a867946adf2e03219dfa4ca63cd6ff318ebb251f77ab16aa18f0350605fa31f8e085bb6cac9055f9661a0ef3cb5693faba9e124d049
 DIST pandoc-1.19.2.1.tar.gz 2755101 BLAKE2B 1314ebe4084dd39521fed89c1d14b8365f2bfb40c6f8ff581ab6b2566bf5e5ef43c4014e383c2e17ac10bc66cbb159ae60a718d399873084b68c7fcd5fb90f2b SHA512 bb814c162b68efd00f249899ebb2cffa07c69bf0ac73838191de8da38dbc9a37b9edb0c24473c7ac8f816c0105d340ca7387c5f5c6f07a908e1537f4d35ef2f9
-EBUILD pandoc-1.12.4.2-r1.ebuild 4141 BLAKE2B c2913d9a93670059952e19374585ee4b5306e3258f0714e1291ed2c09b63b0055046534c03dc9f828e3b66af23adcd56b816f157fff3cb2f520f19ae8605c604 SHA512 b6e67a2b2fd5e5d63fd5f6859ce4bcf43d4d6f3f085eca0f6f8ab2e7d52ff49559e13996a81124b2b7f6a267074c1152531dbb432b9d51a7e1be72788c336114
-EBUILD pandoc-1.13.2.1.ebuild 5033 BLAKE2B 341c16f6f470cfa7600e27bf027bfbc8d548d8a6b529d42765644197c440f181efd6569d196f65bf9d8d7a16a8c441a76f14a26049c1789e2b7a2857335b22eb SHA512 a6c4cf77b3878d2d2c34de1e1199df57605ef850ce16a83ad0f7f99b11bbbc1750786f714dbe450cd2931f0635736bc1e8e7a1ef28ce5b12573a5fb5e2df1247
-EBUILD pandoc-1.14.0.4.ebuild 5332 BLAKE2B 007c7849ca2e15e7c2239e65f329700fff5feffbe04e5ad5ef6133bb73d92fd1dff1af97ba20bdd6b136a6c01a832aa2be29f1e19f2b6c9104b011c84b54c150 SHA512 b32d1c18652126abd58085816f17f46f25c813a1c9b73d4d66304e8770939b75258146ef6380fcab807d1609a1613f54d11ff3e354485efe05e4fa7f8feb0b8d
-EBUILD pandoc-1.15.0.6.ebuild 4919 BLAKE2B fc239923519f60e362877f478868411356e374c8c943f8e205f73371ec925975877842d39e5e27e1ffb74134b158589e60f5087ec4820e5f60ff8cfcde9929b1 SHA512 27595c2e374fcc804008fcdfcfdcc799b3339a99ea57a3a40488eb196dc836c0d54f084648ce7b9849d029f1de9744e3cadb623431af58a3ea4c92260fe9a25c
-EBUILD pandoc-1.18.ebuild 4829 BLAKE2B 355adfacaf0d462c2c586ae312475625e57f02bdcda3c832cc64113f9596452cc147705c895dd22046188d8fd026a5822fb7535de01d66b85a15de97c3f42448 SHA512 f16b4531c29c113bc5a98202b593bafc36bebd0ddb65bea12de370a63d12eda2fe626000fa1909bfe0cc8b3b21d35550bab6d99ff99686dcbb91d66a3a4fe861
-EBUILD pandoc-1.19.2.1-r1.ebuild 4907 BLAKE2B fd71cefdc8e67e49cd668d14c50e23a831536fa506f5d37e26ce12fa2ba909c9894f5e483813a3b3b7dea67dd026cd46e441dacf9a3b202b64154a1c95e5a14e SHA512 6ad987ae27afce8c7d6ce8603519f942986ad4a3bce6f5be9547f4148db25f59db8d51f1ca3cdefbb743a49f46b68a1e19f4195071f4773814af45130361f074
-EBUILD pandoc-1.19.2.1.ebuild 4779 BLAKE2B d0043b7bf6db21d67f80ac379a960bbc9418311489e5011de509e17e1878f87727dd0093ffeb00e5cfe35c290a41689a62b627948b35a136b9dd028181af0f09 SHA512 8e9fc5f6cf1929b87a0f816befd4327c75f469f462dd6bdbaf38299066f9cb9d0cb8b8dea816f1712fdee3e4fc5d1057683daf7da43202264c2d9cf146b96d3e
+EBUILD pandoc-1.12.4.2-r1.ebuild 4142 BLAKE2B aece6deed0d32ab7a30fce9a80bb1b1649054230fa171103c25744d857cfb89d3ce79e017c0cf36dbfc6be362f6727c9ec4b7d4e09ed3d219259899a737daf1b SHA512 33da73a4d5a4bebf453475f97da67927c80671178ba1d79b90f0198719c0feb57b64a1528eec8ef64a21064e412143dd41429a99b87ea9a5393392e547f69800
+EBUILD pandoc-1.13.2.1.ebuild 5034 BLAKE2B c68c245aec5243374c433fe7c6901146e73dbf02e8b13e4d27e01abe92386abe7403adbacd844f35711ae26525eaa7b404c2a3a19239b1f60eda8141170695d4 SHA512 26ca2918ce5c27dfc341dd05b03be05a1a9ed2e8cd1c512d810969041006436d2bc58001d3c2e3bafd9b9b3ac0b9095ab779442342022b5d8ac713ef83ee2062
+EBUILD pandoc-1.14.0.4.ebuild 5333 BLAKE2B 6d76d063b8212c5699f1423ec12487a5cdfded00659797005b4193c9fca1645cc7cbba60c1dfeb6b57062a86f33e9faeed7f559caa726b2bab8ea7c98a8f383e SHA512 98c21b76c045b8a4dad6f583fef63f6ed9a66a20534fdbea4fa14eeebcf305b56929cbb8a827ad7ab49327564c52f4671d05692ded71a80b6201061c009b5563
+EBUILD pandoc-1.15.0.6.ebuild 4920 BLAKE2B 7976bae8f35cbff0ee64cd466e1c3ae0c592a3f9b9426b4e8c156bda181d75c2f36d52f83d6c55379c160e650f664288d30ca4e238a8f0d74416ca4c37cff275 SHA512 d3caed0c908d3333dbfbde80a5be8f32af62d6410d479dee6dd0d82e5fe20ff733a511c2d0f5a57d3efe721189b7af2b674aeca9be0617125f3589a138218917
+EBUILD pandoc-1.18.ebuild 4830 BLAKE2B b0c0c5fbf0df87840f4442d5b4c5a1bfa2d23c3aac4f82588b4d3710aefaf8875651ae47d51e24f6f6ed67f94ed56fb9f42a56b1fb87da6007cb94076097fb2a SHA512 ac324508b6655d446a70d7fcbe28aaa4c1aa3aaf9c8382ed6fe6185c24b94d32eeaf5f365c74b569ffa1e2abae1541892fee32b6eae711295b02ae987a20a25a
+EBUILD pandoc-1.19.2.1-r1.ebuild 4908 BLAKE2B e55010ee0388eb10bbbd49e6b197a40c2d7e09690867a330dd19c3db38b59c858ad5d95db46d33404045b1691054520841b532aa202c645ae3f002d9d28191eb SHA512 e8fbd73e60351c2429fabafa7758b3a5940c3876317fa8f00312706ad04efbd86dfc8fbb73811fa581a0ba11eb10ba46f644a10c347627c89cad4bb724e1c7e9
+EBUILD pandoc-1.19.2.1.ebuild 4780 BLAKE2B 4a969419563723a4d86d4faecd2035dd48d5bc1309861b7a5bf47384d4942800748e26e5fbe116a4cd6510609df897b4b04b65d187adf05715e678c85e9f805c SHA512 8da769f19eb43f0b5fead89f4ef42fc7d8bfb90fae9f056eccfa86cdf1fb933230c8954a0895db101861ae965b450505c88ab4eb2a55730fa3fc10b185231a60
 MISC metadata.xml 1284 BLAKE2B 0ac01c07148aa682d4e6bd074b246d2578a816c76d6110ba3a9506e051b5ef2254f98e3faa8399c5f51200af26155dbabb6d08987bba32dd27f863f7c8183c15 SHA512 ba9a2c3897e5b645c0faa2a1a2f918cf5c30e3cace81343b01de73b25c26c343d95d7a09c50d56bf2aaa18a0a39318a506131e6bcdd7a48ab32197f3ef68be2a
diff --git a/app-text/pandoc/pandoc-1.12.4.2-r1.ebuild b/app-text/pandoc/pandoc-1.12.4.2-r1.ebuild
index b655d7c94cf3..87ca53e3060d 100644
--- a/app-text/pandoc/pandoc-1.12.4.2-r1.ebuild
+++ b/app-text/pandoc/pandoc-1.12.4.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -9,7 +9,7 @@ CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
 inherit haskell-cabal
 
 DESCRIPTION="Conversion between markup formats"
-HOMEPAGE="http://johnmacfarlane.net/pandoc"
+HOMEPAGE="https://johnmacfarlane.net/pandoc"
 SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/app-text/pandoc/pandoc-1.13.2.1.ebuild b/app-text/pandoc/pandoc-1.13.2.1.ebuild
index 745338a85dde..334780d77031 100644
--- a/app-text/pandoc/pandoc-1.13.2.1.ebuild
+++ b/app-text/pandoc/pandoc-1.13.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -9,7 +9,7 @@ CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
 inherit haskell-cabal
 
 DESCRIPTION="Conversion between markup formats"
-HOMEPAGE="http://johnmacfarlane.net/pandoc"
+HOMEPAGE="https://johnmacfarlane.net/pandoc"
 SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/app-text/pandoc/pandoc-1.14.0.4.ebuild b/app-text/pandoc/pandoc-1.14.0.4.ebuild
index d06d757b34c6..85ab78a926c1 100644
--- a/app-text/pandoc/pandoc-1.14.0.4.ebuild
+++ b/app-text/pandoc/pandoc-1.14.0.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -9,7 +9,7 @@ CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
 inherit haskell-cabal
 
 DESCRIPTION="Conversion between markup formats"
-HOMEPAGE="http://johnmacfarlane.net/pandoc"
+HOMEPAGE="https://johnmacfarlane.net/pandoc"
 SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/app-text/pandoc/pandoc-1.15.0.6.ebuild b/app-text/pandoc/pandoc-1.15.0.6.ebuild
index ab46a0b6e0c9..a483adcb7e23 100644
--- a/app-text/pandoc/pandoc-1.15.0.6.ebuild
+++ b/app-text/pandoc/pandoc-1.15.0.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -9,7 +9,7 @@ CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
 inherit eutils haskell-cabal
 
 DESCRIPTION="Conversion between markup formats"
-HOMEPAGE="http://pandoc.org"
+HOMEPAGE="https://pandoc.org"
 SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/app-text/pandoc/pandoc-1.18.ebuild b/app-text/pandoc/pandoc-1.18.ebuild
index 2c98454468a6..a617c37202e0 100644
--- a/app-text/pandoc/pandoc-1.18.ebuild
+++ b/app-text/pandoc/pandoc-1.18.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
 inherit haskell-cabal
 
 DESCRIPTION="Conversion between markup formats"
-HOMEPAGE="http://pandoc.org"
+HOMEPAGE="https://pandoc.org"
 SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/app-text/pandoc/pandoc-1.19.2.1-r1.ebuild b/app-text/pandoc/pandoc-1.19.2.1-r1.ebuild
index e34f74eeaafb..a3e82072acbb 100644
--- a/app-text/pandoc/pandoc-1.19.2.1-r1.ebuild
+++ b/app-text/pandoc/pandoc-1.19.2.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
 inherit haskell-cabal
 
 DESCRIPTION="Conversion between markup formats"
-HOMEPAGE="http://pandoc.org"
+HOMEPAGE="https://pandoc.org"
 SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/app-text/pandoc/pandoc-1.19.2.1.ebuild b/app-text/pandoc/pandoc-1.19.2.1.ebuild
index 1c6b7c770d57..2a4bbf6d04b9 100644
--- a/app-text/pandoc/pandoc-1.19.2.1.ebuild
+++ b/app-text/pandoc/pandoc-1.19.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
 inherit haskell-cabal
 
 DESCRIPTION="Conversion between markup formats"
-HOMEPAGE="http://pandoc.org"
+HOMEPAGE="https://pandoc.org"
 SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/app-text/pdfsandwich/Manifest b/app-text/pdfsandwich/Manifest
index d49131d2bca4..10e5841dc049 100644
--- a/app-text/pdfsandwich/Manifest
+++ b/app-text/pdfsandwich/Manifest
@@ -1,3 +1,6 @@
+AUX pdfsandwich-0.1.7-gentoo.patch 1211 BLAKE2B 47461d33a0ecea51de9db0cda447f13c74094b7bf630abfa0ca0b5a72357e20b9adfc86b2035b89af8addbec9ee9ebdac9751490afe7166005c2ebad2b9333bb SHA512 d9865439ea2ed6ffec6c30abe9da1042b5b12a28d266131d421e1d459ff8f0bd60f8d6c2e68017464341f26215a04b4a537cf3f445cebeec55723831a9dee454
 DIST pdfsandwich-0.1.4.tar.bz2 16401 BLAKE2B cb431f35b199e3e6290c60a3f6c7b2621dd3652a29346092869d8e5f86f5664079de1ef431f9b5e8b9f7cc044d64006295a8176d6a28b2ea5fb820db8c952000 SHA512 ee03aea13c72cc5a02136b5d16d2425f685f0b7a9d6fa6cff6c792bd24e6316720dff321b5e8237b949c98c713f39cb8b08b855b76e2a77350927b1ee7943171
+DIST pdfsandwich-0.1.7.tar.bz2 17461 BLAKE2B edeb08ab55df89ef2d1f3e43446e831c66e57273b36ecd56a4cc5f910ca5b59a03e2a66b13e7150f06f8f3eb26ed14cd1c80d02cd38d6bd6cfe923c30c801577 SHA512 ac315aeba2cc753fddc380e2522d0c41d65ea80372a23c2cd5371ebc239ac104ab5a5a1386378b9e026b2935a767128224f7617a5eb8f5ef9d6874cc18ef83ff
 EBUILD pdfsandwich-0.1.4-r1.ebuild 970 BLAKE2B 416b43bc2a95175aabde4379e23207fa524bb882e4b40c7c61c1fff87fb6b016721bff23720b2bf7712892b4eb7d5786edf7c5500dadb9a5ec1646eb7612c8b7 SHA512 3505739fec5f3d76a7d51c0c9f4f4cf992faa59e23779dfd0ebf677246da0a794ca18af304a5631e7fc0984bd698bfe69f6c3a012389cdc943a543ac0fe4b263
-MISC metadata.xml 937 BLAKE2B 7e13ea95d5add452b52f7223411d798148e6bac03aa636237ad3e5c0677d0bdedf4a5f5a2c63caf0e84ab92626e0f8de5b1dc3df0f5d8747163d626dbe632f00 SHA512 595e3fdd841667046ae3064ee12aa288586cb1db3f8cd902aaf5c7c1bfb1c1776c641c400593b273dad83bf4f3a4c98f1f031125b8d65af3e836d6c2abdbc531
+EBUILD pdfsandwich-0.1.7.ebuild 1044 BLAKE2B 93a792a16a1e7612283e25d56b92648614fd606a19b50065192a904cdf12b20e1ff297b8f6c925e92ef5320b5fed08aac94e152a3e8a1c44c9375a96bf2a6dcf SHA512 dd59831311042b08e22a818b2cd553e26b0e7a58c2e3ee558d16a13100b7a3636bbe36f8a791fe8ce15d134aa1d452e5e100a7f427e1859c763664d1d4cdceed
+MISC metadata.xml 939 BLAKE2B 88b45ad8aa691ea97c50e7b9ba9f97455eb8557e8d244f70eb3715b8838530ce8cad94c0e30f8d73755fb738c798d727dab80507260a34298266f2d8cdae608f SHA512 b2e12b2457c8e8cdc35b7c6a3bcce5c52850a554b378849201654ba892f223891fbdfe58f1b6b9bbf711b621c01a5507577241e3c41746fd29e3b14cc5c6bd19
diff --git a/app-text/pdfsandwich/files/pdfsandwich-0.1.7-gentoo.patch b/app-text/pdfsandwich/files/pdfsandwich-0.1.7-gentoo.patch
new file mode 100644
index 000000000000..f16b94379b6a
--- /dev/null
+++ b/app-text/pdfsandwich/files/pdfsandwich-0.1.7-gentoo.patch
@@ -0,0 +1,43 @@
+--- a/Makefile	2020-05-21 20:46:14.961927486 +0200
++++ b/Makefile	2020-05-21 20:49:16.203121793 +0200
+@@ -6,7 +6,7 @@
+ 
+ SOURCE = pdfsandwich.ml
+ TARGET = pdfsandwich
+-MANUAL =	$(TARGET).1.gz
++MANUAL =	$(TARGET).1
+ 
+ VERSION :=	$(shell cat pdfsandwich_version)
+ 
+@@ -24,7 +24,7 @@
+ 
+ $(MANUAL):	manual.txt
+ 	# you need gawk for this:
+-	./txt2man -t PDFSANDWICH manual.txt | gzip -9 > $(MANUAL)
++	./txt2man -t PDFSANDWICH manual.txt > $(MANUAL)
+ 
+ # Canceling pathological implicit rule:
+ %: %.o
+@@ -40,7 +40,7 @@
+ include makefile.installprefix
+ 
+ PREF = $(DESTDIR)$(PREFIX)
+-INSTALL = 	install -s
++INSTALL = 	install
+ CP = 		cp
+ INSTALLBINDIR =	$(PREF)/bin
+ INSTALLMANDIR = $(PREF)/share/man/man1
+@@ -47,12 +47,8 @@
+ INSTALLDOCDIR = $(PREF)/share/doc/$(TARGET)
+ 
+ install: $(DOCFILES) $(ADDITIONAL)
+-	(umask 0022; mkdir -p $(INSTALLBINDIR) $(INSTALLDOCDIR) $(INSTALLMANDIR))
++	(umask 0022; mkdir -p $(INSTALLBINDIR))
+ 	$(INSTALL) $(TARGET) $(INSTALLBINDIR)
+-	$(CP) $(DOCFILES) $(INSTALLDOCDIR)
+-	gzip -9 $(INSTALLDOCDIR)/changelog
+-	$(CP) $(MANUAL) $(INSTALLMANDIR)
+-	chmod 644 $(INSTALLDOCDIR)/* $(INSTALLMANDIR)/*
+ 
+ uninstall:
+ 	rm -rf $(INSTALLBINDIR)/$(TARGET) $(INSTALLDOCDIR) $(INSTALLMANDIR)/$(MANUAL)
diff --git a/app-text/pdfsandwich/metadata.xml b/app-text/pdfsandwich/metadata.xml
index 0fb15c19e847..fce36805a6fc 100644
--- a/app-text/pdfsandwich/metadata.xml
+++ b/app-text/pdfsandwich/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>tupone@gentoo.org</email>
+		<name>Tupone Alfredo</name>
+	</maintainer>
 	<longdescription>
 pdfsandwich generates "sandwich" OCR pdf files, i.e. pdf files which
 contain only images (no text) will be processed by optical character
@@ -13,8 +16,7 @@ OCR scanned books or journals. It is able to recognize the page layout
 even for multicolumn text.
 
 Essentially, pdfsandwich is a wrapper script which calls the following
-binaries: convert, cuneiform, gs, and hocr2pdf. It is known to run on
-Unix systems and has been tested on Linux and MacOS X. It supports
+binaries: unpaper, convert, gs, and tesseract. It supports
 parallel processing on multiprocessor systems.
 </longdescription>
 	<upstream>
diff --git a/app-text/pdfsandwich/pdfsandwich-0.1.7.ebuild b/app-text/pdfsandwich/pdfsandwich-0.1.7.ebuild
new file mode 100644
index 000000000000..c42e82306713
--- /dev/null
+++ b/app-text/pdfsandwich/pdfsandwich-0.1.7.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="generator of sandwich OCR pdf files"
+HOMEPAGE="http://www.tobias-elze.de/pdfsandwich"
+SRC_URI="mirror://sourceforge/pdfsandwich/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE="png"
+
+RDEPEND="app-text/tesseract
+	media-gfx/exact-image
+	app-text/unpaper
+	app-text/ghostscript-gpl
+	app-text/poppler
+	virtual/imagemagick-tools[png?]"
+DEPEND="sys-apps/gawk
+	>=dev-lang/ocaml-3.10[ocamlopt]"
+
+DOCS=( changelog )
+
+PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
+
+QA_FLAGS_IGNORED="/usr/bin/${PN}"
+
+src_prepare() {
+	sed -i \
+		-e "/^OCAMLOPTFLAGS/s/$/ -ccopt \"\$(CFLAGS) \$(LDFLAGS)\"/" \
+		Makefile || die
+	default
+}
+
+src_install() {
+	default
+	doman ${PN}.1
+}
+
+pkg_postinst() {
+	elog "pdfsandwich relies on the tesseract library for OCR."
+	elog "Consequently language support is determined by tesseract's"
+	elog "language support which in turn is controlled via the LINGUAS"
+	elog "variable in make.conf."
+}
diff --git a/app-text/po4a/Manifest b/app-text/po4a/Manifest
index 9319e0a91ee7..f6280d7a1299 100644
--- a/app-text/po4a/Manifest
+++ b/app-text/po4a/Manifest
@@ -1,9 +1,9 @@
 AUX po4a-0.45-614122-no-dot-inc.patch 473 BLAKE2B 1ff10a5637d25c57500b6cb953442bf8e9ddd57f778e8772ffbed27e9d5a98be6d55f77e7665b0ab7fd975d886bd2893a432c6c9c9713a090a37727cecf0f3f7 SHA512 0a651b9de200b3ca08b3c849f24eba6cfbac93dd5f35911c9bf2aade174cbec27ad2c5a061a628db1b308dc9c576e2dad3db71da9a507d6337bed9ce620ad042
 AUX po4a-man.patch 621 BLAKE2B abdbac744d7395ec5f008e2ac2bcfd9aecf0f24726acd1e32a2a243995d9f26b0099e2194848a9a4d3b01dc24d4657cdc4470977838a96a1979495871dac5b8b SHA512 0d797b92c551eb75fa144e9b39d1aacc8acb00104a6d9e0dbdf4d00219b4c0c074637c953764e8cf1d67bdb1f3941fa0727da242b7761a96a8dafe66af224397
-DIST po4a-0.56.tar.gz 2994792 BLAKE2B c95905c70d7e1e24367fb128d9096996d026f58dd4cd7fa77f19c6c9b8607cb4101a1a024773d2fd383e905a008e1ce4f0c019a73003168a90cb23328ac1d984 SHA512 4fc1ca5743471577d9e8bd0b80285b9dbd83b964f8e828472787a6deaf8b8388bb7f96e68afab4119c1f5488fe371d3b1fa94b101204a59228d1cc2f0878f3c1
 DIST po4a-0.57.tar.gz 3079550 BLAKE2B 54b1d3263aa0ebd90eec61d735c3422efb5f67b2d88f91a87a6893bcdb7f06131aedadeb3577d221cf75ba07f8001f6e23409375756afec8357e26e8f0f0a1c2 SHA512 7ac2e614c126b049feeb8edbafb71a875cee78fb85d8cd74f3bf5b555cc8b2d19d5e4606b732e714e937c34e178729d73edfe559de594c5ffe811b5162b27d81
+DIST po4a-v0.59.1.tar.gz 3624434 BLAKE2B 9837a7317eecd3db540bc7c23b3d26a9110f00d9c441b1bf1d61af80bae1fe0952f875425f14d66a939456f3a90e9ea74c189d94da7471c7c9a4d0b15f3875ce SHA512 904cb5817586fef19de55e76f3a33c264f9864b5c720b727a75e78a3b690e1ecd7b10603304a762d07b340320143b83b686c9918b9fe95499ceb55482950a4d4
 DIST po4a_0.47.orig.tar.gz 2389750 BLAKE2B 72cd81e10f638a660e201b0c733b08c316aa75dd29b054bbc4c645c265b9e7745ce762305a8296f8cc37d2f182755dfa1394861f6c471cff1c7c398d13ac28cc SHA512 9c459a9795977a39aacc09cfb6ddbdc7dd2174e22896fa7bde90510a43ea833054aef558f7ca798991addc052a2c7f91ee11e5d49658a5c80a9ecb9c135ff97a
 EBUILD po4a-0.47-r1.ebuild 1656 BLAKE2B d648029b8afc30b50ff4b216bc46b37731ff7bb471aeec21ada1244f37f9b431c392e0f32b1bf3f16cc15e7fc79946a23aef976548382b998057812d8366a593 SHA512 1ee6216f7c8f1aa4ba51cd96c6a2fd4b5361d8727fa056a333d96f1413aa76fe19480d5e77602a32b526d99a4b436a103fbe93a58856c2e4021c85c5cc20d53c
-EBUILD po4a-0.56.ebuild 1320 BLAKE2B b184be6310d41915992653b61c0ea3d98a6723e4429810bb2b81872c5c5aaa8c407f9364ffeb895b6f293248e85f9bafadc9a50186eae10424b48ce59d4273b5 SHA512 4e3735928df5e2401a09a8c5be51f8642baa5f0174d778ecef243fd3c878792a74276b2683f3dfa56ac25547d2136371da8a95b0728938a6a4dea9ae53098fda
-EBUILD po4a-0.57.ebuild 1323 BLAKE2B 8e81b5a9f7d5bfc3095026193b534877e514c9ee3246054bd93defa25b9ef0311140ec557d2b6ca7df5e43e37104ad034538eace247dee0d1a762e2ab5b85efe SHA512 13a9179d861d5af57bdaddd70375a5a516cfeee4865a2b725633d3baa435879a461a0e74cc0b4b758ec258fd27912390a3d6a03d8dba905b520923689df6f6e1
+EBUILD po4a-0.57.ebuild 1321 BLAKE2B 1b21b1f84467ff062d888f126133dd76d61200b3e0efcd10485f68bcb654d4015dd8d8c0e55b8ef6a9a9c4959ddc68477f6e8489f92e808734063924902c631e SHA512 deedbdc30a91b4e7b8e7a7cc9d54629d6affe9744f3c8b1a38eb882a6f5000594939a0eed60fceeaf064d858e40e7d543f764fd02092dedfdddbaa60a7e5ac43
+EBUILD po4a-0.59.1.ebuild 1365 BLAKE2B 1d2364833b47fd38ad32290cd4942da8bebe13a266dd27dcc21b6265361bea45689a86771c49aab3a4f2478f6a350188f80bbaa9cca9572ca70619405ed52d02 SHA512 291da03d42b6039bcb35505161b8da6d7198b7f995130293d9d2582e26d7c01adaeee344791c84b55693c45ebbfc974743387f604bcbea6efcbfec6acf1536ad
 MISC metadata.xml 326 BLAKE2B 6ec11e49a2b25069f1e2eeac2eaa7ce8adb48704986f873ba92de8a1328e7d2963cd79efac7d2672bdde1fc6c71cddbfa11fbb4bfd4cda28fa1f92e350ef5be6 SHA512 2fbc62c1bbc9a555103e9ba0eb3389004f9770eaff51e00fea853051ac6da43312366d3a50ba63ad28453219dfc8970f9a78c7af2bf7799f58911a33e0bfd3f9
diff --git a/app-text/po4a/po4a-0.57.ebuild b/app-text/po4a/po4a-0.57.ebuild
index 1292f24f256d..cdc50e83c814 100644
--- a/app-text/po4a/po4a-0.57.ebuild
+++ b/app-text/po4a/po4a-0.57.ebuild
@@ -4,15 +4,15 @@
 EAPI="7"
 PLOCALES="af ar ca cs da de eo es et eu fr hr hu id it ja kn ko nb nl pl pt pt_BR ru sl sv uk vi zh_CN zh_HK"
 
-inherit perl-module l10n
+inherit l10n perl-module
 
 DESCRIPTION="Tools to ease the translation of documentation"
 HOMEPAGE="https://po4a.org/"
 SRC_URI="https://github.com/mquinson/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-text/po4a/po4a-0.56.ebuild b/app-text/po4a/po4a-0.59.1.ebuild
index a3747855af42..6d9d46d247b7 100644
--- a/app-text/po4a/po4a-0.56.ebuild
+++ b/app-text/po4a/po4a-0.59.1.ebuild
@@ -1,16 +1,18 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
-PLOCALES="af ar ca cs da de eo es et eu fr hr id it ja kn ko nb nl pl pt pt_BR ru sl sv uk vi zh_CN zh_HK"
+EAPI="7"
+PLOCALES="af ar ca cs da de eo es et eu fr hr hu id it ja kn ko nb nl pl pt pt_BR ru sl sr_Cyrl sv uk vi zh_CN zh_HK"
 
-inherit perl-module l10n
+inherit l10n perl-module
+
+MY_P="${P/-/-v}"
 
 DESCRIPTION="Tools to ease the translation of documentation"
 HOMEPAGE="https://po4a.org/"
-SRC_URI="https://github.com/mquinson/${PN}/releases/download/v${PV}/${P}.tar.gz"
+SRC_URI="https://github.com/mquinson/${PN}/releases/download/v${PV}/${MY_P}.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
 IUSE="test"
@@ -31,14 +33,13 @@ DEPEND="${RDEPEND}
 	dev-perl/Module-Build
 	test? (
 		app-text/docbook-sgml-dtd:4.1
+		dev-perl/Test-Pod
 		virtual/latex-base
 	)"
+S="${WORKDIR}/${MY_P}"
 
 PATCHES=( "${FILESDIR}"/${PN}-man.patch )
 
-PERL_RM_FILES=(
-	t/09-html.t
-)
 DIST_TEST="do"
 
 src_prepare() {
diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index 85d74b593d4e..9963e6a93633 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.82.0-respect-cflags.patch 2324 BLAKE2B 435986b347ffa1ac657a4fa2ebac232bb0d0bfe1d55fa9085c6e2819e4a37e54680a95e69d2b3cf49bdb5cb3c18eeede8ca58bf1426e8c9bd47ea79eddcd0860 SHA512 37d3700ac4d4774fefabc88fdc3a9b0031e91d8a7aae6f8229e87acd61710652f9a64f8ac97006131ab7cea479e1e6268c7992818017cf7473b45743a3796440
+AUX poppler-0.88.0-pdfsig-crash.patch 918 BLAKE2B 1cafb94e03afb06729633e117951edf0a14c6d52786eee4d785786e249f22fb4579d909f946ec595c6a7a54fbd594b6b1e94006ea37f97cacc49a93336cb2d37 SHA512 8967348da204da57002fbbff55d318e8065ce422e99bc5fbe7d517aed70c5f962dac87996bd949053ff5844f44aac528de08bbb1b2f7131b7852b3f5ad11653e
 DIST poppler-0.85.0.tar.xz 1588616 BLAKE2B d30c16ff214d2b64fade28bb4099567150e99df6ab967702f48e18ed2191e444728f51d4c1ce1772567c31f9b87a8cf64993ebc383184e06f8b3707436c89143 SHA512 2311bde5ae52e065c12a6129f500469860f5ebefafc3f7be581393f08c2121f3eae57394ff54c1f83ee1b926f28c61530bcd8149d42de10a16b9ba7345f2604e
 DIST poppler-0.87.0.tar.xz 1595088 BLAKE2B 7bce4426b057ae8702399f0f3581ee844df89b01151dff9212e1d2c525847eba7614697ef02cc7278930b5e266e15f62d3b7c5d989951d44c62ee3f8fb9b2835 SHA512 4bdc432c75106b3f37643bfd57c66aba659864fdc3c4d9ffa5089ceaa33ad3bd10d2c4abfb09a4f7b9d7d137e31eb559b440d7df53f35f60d70eaef05f987630
 DIST poppler-0.88.0.tar.xz 1604348 BLAKE2B 3c78d15871398fb5f2125596f959d98a173de198c8460907be39ca5c5b91a05f0f4048a6ba01b59edb4643c4fdd2333462edf7ab0e0648cd607ffd2deb5a3b18 SHA512 2c4c1333d5bd7411eb6b05fa1c5967b8577798e439a22b2fd119cf7a8e7d519e04b253464c6892d31bae7483a8bda8492755089cef4131f760f95bc3f4e56880
+DIST poppler-0.89.0.tar.xz 1612156 BLAKE2B 071724f823214f3b3a775a1e6ee57992c18c65815cc139d88953ea3a7b348066981ce7933bd00ea27ddb60bf9f2f34a245bf09944d8cfda9732f0e33feecb017 SHA512 e2af2ab20cc1bba72080d42e229379bda0802aff355d2932dd970ee5924f454577529aef21f0f90fc57efba54caf15cd973c75446f309498f88199d5c2d93f11
 EBUILD poppler-0.85.0.ebuild 3354 BLAKE2B 4302a00fdf67d9e6c31a245d3e896cc0bac0663249682efb44c3d307f5a00bb2f7b0195195d70531a784b9bc13dd3b0853c7a4e7189d7f04b2d5f7b572740bdb SHA512 b6f25ae17135528bd64dff6fb068d39026913b332410ec1b512834b339286205a5664564e8f8348e98678c81a4e00042b3e10cef4a70ec3525d91bd4bab2743a
 EBUILD poppler-0.87.0.ebuild 3363 BLAKE2B e9600b268bffbd857c8e0ac79087c61703ec0667126793ae069bb763f2aa3974f3b4b9b0b62b1fc4d323ec7bb7009fd788a948568c83b52f5c1f36ceb54bda63 SHA512 b30393fd43ed0ba92332874794a6ba64d89b88a7f82894571665389aa7a4aa347da663e70818ec6f0a2c56a6195b5e8b5aa179001e9ff9e4e043cb5a7332e227
-EBUILD poppler-0.88.0.ebuild 3363 BLAKE2B c496f6da00a8fe2c38ad90f6d044edcaa12a253853e94e9a3bdeb17db2eb2c7e85a91df308dc175005380d32f8283995738f34d7e1831b73b273b5f0cc4daefb SHA512 60c21666e9e1eb80c6bb76766fa90f4554c7a4650dd87ae63cdb787f5f249c5b8603f89de8634493923ba9ed758274d42a0100cb84e62242d928a93760d2be82
-EBUILD poppler-9999.ebuild 3363 BLAKE2B c496f6da00a8fe2c38ad90f6d044edcaa12a253853e94e9a3bdeb17db2eb2c7e85a91df308dc175005380d32f8283995738f34d7e1831b73b273b5f0cc4daefb SHA512 60c21666e9e1eb80c6bb76766fa90f4554c7a4650dd87ae63cdb787f5f249c5b8603f89de8634493923ba9ed758274d42a0100cb84e62242d928a93760d2be82
+EBUILD poppler-0.88.0-r1.ebuild 3397 BLAKE2B 5e41fe2e4f5fef40d5e20c8ee2ea91be06e797523e193b908afaaa2d6971ad45858c57ea034e23af7e28481cfe4143fa9356316b53c1e525612b7e05f47a20a8 SHA512 0949a2aa4c989d0a6e067097c9efd11233b9eaffe576ed5eef22575aa6e251fecf5a0a5c7d2a3311eea0d6898d3fcf7e8ca27fe5d7285b1b73f9a79ff9e9e16b
+EBUILD poppler-0.89.0.ebuild 3364 BLAKE2B dda70a754a90e073ade7ea7212798448976bd3ef6789a40e5b487a813804bc80cc1f5ae521954dfaca22ea7ae07c3b59404c69310df8d4c2d4ff36e439acac1e SHA512 9b24944e3f04ee159fd1493c04fb5d1a0fe277b04c85630faad6772a868609f16c6f07ec70aff4f700f24422d361b7eaeb62e46234c23045a28183c23379c532
+EBUILD poppler-9999.ebuild 3364 BLAKE2B dda70a754a90e073ade7ea7212798448976bd3ef6789a40e5b487a813804bc80cc1f5ae521954dfaca22ea7ae07c3b59404c69310df8d4c2d4ff36e439acac1e SHA512 9b24944e3f04ee159fd1493c04fb5d1a0fe277b04c85630faad6772a868609f16c6f07ec70aff4f700f24422d361b7eaeb62e46234c23045a28183c23379c532
 MISC metadata.xml 995 BLAKE2B 0d99fda69e6b020fd1b6fa879a0c3af278b92111be31d97cabe88703f06b4af56ce64ce9e0fc556d2b056c6770e547ae3b88dcc82da9cc26e15e2d1d0b5f685b SHA512 ae813761c5ab4dab475b737085f14f5874655b31f247f26495c43d8fcc47805dfceb2a8cd23ead39a3f8ee75ac820edc7c2554e573c338c09e5ec8b9d383417c
diff --git a/app-text/poppler/files/poppler-0.88.0-pdfsig-crash.patch b/app-text/poppler/files/poppler-0.88.0-pdfsig-crash.patch
new file mode 100644
index 000000000000..4f29727b6fcf
--- /dev/null
+++ b/app-text/poppler/files/poppler-0.88.0-pdfsig-crash.patch
@@ -0,0 +1,30 @@
+From 5cdb78fde50e3dc16006070b0884dfb6b23d964c Mon Sep 17 00:00:00 2001
+From: Albert Astals Cid <aacid@kde.org>
+Date: Thu, 14 May 2020 00:22:33 +0200
+Subject: [PATCH] Fix crash in PDFDoc::getSignatureFields when there's no Forms
+ at all
+
+---
+ poppler/PDFDoc.cc | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/poppler/PDFDoc.cc b/poppler/PDFDoc.cc
+index 572c77be..4b5621fc 100644
+--- a/poppler/PDFDoc.cc
++++ b/poppler/PDFDoc.cc
+@@ -613,10 +613,12 @@ static void addSignatureFieldsToVector(FormField *ff, std::vector<FormFieldSigna
+ 
+ std::vector<FormFieldSignature*> PDFDoc::getSignatureFields()
+ {
+-//   const int num_pages = getNumPages();
+   std::vector<FormFieldSignature*> res;
+ 
+   const Form *f = catalog->getForm();
++  if (!f)
++      return res;
++
+   const int nRootFields = f->getNumFields();
+   for (int i = 0; i < nRootFields; ++i) {
+     FormField *ff = f->getRootField(i);
+-- 
+2.26.2
diff --git a/app-text/poppler/poppler-0.88.0-r1.ebuild b/app-text/poppler/poppler-0.88.0-r1.ebuild
new file mode 100644
index 000000000000..9f5630087fb4
--- /dev/null
+++ b/app-text/poppler/poppler-0.88.0-r1.ebuild
@@ -0,0 +1,124 @@
+# Copyright 2005-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake 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 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	SLOT="0/99"   # 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"
+	"${FILESDIR}/${P}-pdfsig-crash.patch"
+)
+
+src_prepare() {
+	cmake_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
+		-DRUN_GPERF_IF_PRESENT=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_use_find_package qt5 Qt5Core)
+		-DWITH_TIFF=$(usex tiff)
+		-DENABLE_UTILS=$(usex utils)
+	)
+	use cairo && mycmakeargs+=( -DWITH_GObjectIntrospection=$(usex introspection) )
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_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-0.88.0.ebuild b/app-text/poppler/poppler-0.89.0.ebuild
index 0cd5e76d8ec8..ce0b37279855 100644
--- a/app-text/poppler/poppler-0.88.0.ebuild
+++ b/app-text/poppler/poppler-0.89.0.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 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-	SLOT="0/99"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
+	SLOT="0/100"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
 fi
 
 DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
diff --git a/app-text/poppler/poppler-9999.ebuild b/app-text/poppler/poppler-9999.ebuild
index 0cd5e76d8ec8..ce0b37279855 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 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-	SLOT="0/99"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
+	SLOT="0/100"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
 fi
 
 DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
diff --git a/app-text/ps2pkm/Manifest b/app-text/ps2pkm/Manifest
index 96fdfe41ff1b..cd3d46d1bf16 100644
--- a/app-text/ps2pkm/Manifest
+++ b/app-text/ps2pkm/Manifest
@@ -1,5 +1,5 @@
 DIST texlive-20190410-source.tar.xz 53783408 BLAKE2B 8e34c7c2b74eab1c4d16ddbf7eddd8566593e6d68c42a2634760f11d86e68970698d8b9deddcf3297966968ede11ecf30e0b04ec19b708dc3e6d0a2abcc3799d SHA512 7759d8e668e53c0c73e48907096da9d8fb6384dd9c3342ddfb05e17d077054c5351d35256cf4e63a6da502de2f09f521979bede7209cdd5bd8ae80eba0efed2e
 DIST texlive-20200406-source.tar.xz 55383320 BLAKE2B 3bc024166ebfc269389531c7cf818b062856cd2dcc27cf0a2e790f07cd941d9905c9c6a54566ea627ea1ca334d2b6da8d3e5bd1c686dc9d6f8ac15aac388c1e3 SHA512 65be52cb5e1b52f12feb62c6cf23e56c581b9dccb8d3b9ccc85c12c62b0cb67dd71de8d22d967d2cbf8403502c66bccb238523d13a0d081be104fc9f9c68b477
 EBUILD ps2pkm-1.8_p20190410.ebuild 796 BLAKE2B 86ac25a8da4e244dacf6ddd45ed7afd4c55f7f522ffdb7f435bec6c5e62fa2b0583c2c47a5c4229553bab05afdecff0c503ed984f08e1386b22518626d03161a SHA512 06317e329c658aea63a708ca556167d75ff01543710dd99ed9bfbec5aed2fe48c272da91a291b6ea4e4cc0092fe4b1ada24b970ef2cfcf08ef343b924430dfbc
-EBUILD ps2pkm-1.8_p20200406.ebuild 805 BLAKE2B ae15980f9111cccd61a6d5d7d91d9c224491b5f022de63044ec5d6fe1f8cf357a8e40930358d64de7045059fb417f7b09f6a516183fba4893aabcc8b48ea4861 SHA512 c12c1620483445e7f59d2757df3b5114edc187c96c05cfbfd65841c571320616207c2a3beb5f4e4ecd209f88a7af27be7ff468b3da35a4542e2617ec9a0617b0
+EBUILD ps2pkm-1.8_p20200406.ebuild 800 BLAKE2B 03e345a3b505e57774fa830d9fffd07c65d1b741fb537bfb35718babf3074c34952c84bf710054b576760d23c96188f09b9909d2fa1e9224cb65c75bc3c4fa65 SHA512 f7ada34aaf1d263d536c0d46c0ad8fce7cbf64c64f38bb12db650596cb11f00a3cc63c16c715856e6f8f7701c7d6c6a8a7486c0aebefed1823dc9d859c32d5a7
 MISC metadata.xml 358 BLAKE2B b5a2e9424ef1e5bb23c34e089d9204443dd5ad528b56db71d2fc2b3c5d428c14367805ca94a307f8856d21356abe76092c54ba0f0df204b5bce3665f9f3fd657 SHA512 51f6411780af5d7775f8f80d246d5f4e297abb1960a0b0c21c6dc5c03a9a407dad8cbc4977a679590cffb4523f1b72a0f7b15ab100c938391a5abfd3e17e8818
diff --git a/app-text/ps2pkm/ps2pkm-1.8_p20200406.ebuild b/app-text/ps2pkm/ps2pkm-1.8_p20200406.ebuild
index 2d17f6238c54..e6d5a682e314 100644
--- a/app-text/ps2pkm/ps2pkm-1.8_p20200406.ebuild
+++ b/app-text/ps2pkm/ps2pkm-1.8_p20200406.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://dev.gentoo.org/~zlogene/distfiles/texlive/texlive-${PV#*_p}-sou
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~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 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=dev-libs/kpathsea-6.2.1"
diff --git a/app-text/qpdfview/Manifest b/app-text/qpdfview/Manifest
index f7927218620b..91d8333ed8dc 100644
--- a/app-text/qpdfview/Manifest
+++ b/app-text/qpdfview/Manifest
@@ -1,3 +1,4 @@
+AUX qpdfview-0.4.18-qt-5.15.patch 342 BLAKE2B 34ecd868ba9f38f43433f425c173b5cf07c0c9a2c7097e62d0af1b85bf49a3ef2f68064be88a12f300356633471ea8f04b69b66f9874cb5a8dbae3962021402b SHA512 ac6a742b957eb192117aece45cef8f2a9d76fe45d4cc87246dba8e52a15ac11c6892175fd73c8af3bd22a34ff36645828a5f12d66c240b6305d9621387fc3261
 DIST qpdfview-0.4.18.tar.gz 786577 BLAKE2B 07ef444ba39435578481e549fcbbd2d97362c6bda3092a17f1daa8b8437febf50cd2f145cd5e80cc1be565c5a658e85a428314a1bcd2a5a38efce0830f1cffba SHA512 38741520b20e3ed7100e52982930abac26e994a69df68c54dfa7180be8b2a4f377b91ba03993bab67b0a505ad79d62164f0f168a6715f4306b635ceba6840d66
-EBUILD qpdfview-0.4.18.ebuild 2200 BLAKE2B eac7bff184c91a78fc82713e067111c52d7c27c1b8d49d746996ab47b567b6ed3a816ecc734ceac93b0cbbe97e975fdd7a2b1974d7a508bf2b3990169a5f2ff7 SHA512 8f0595c5ce798ad0f8168854c67bb02b6cd81b12e3d91b36b6b827106a0431d6396aa49c34fde51e35decba981309f86cb7c89658e3579e4647739a4db201871
+EBUILD qpdfview-0.4.18.ebuild 2259 BLAKE2B f36c70e222fe667853016cd5a4b35c086b2224ea1b65ee23c5d84e6e4baaef395f5cb865b3b8b16a6f217a50f955426e84eef5a33395e2a1ada12c889c74fba9 SHA512 ef3481e73d7bd71965712604cdddfb3d3257f9440aa5eedb1bb348ad95072054b2474a322befdc37c7802846732ff308bd3d882fbf4c36d51e24af4d44ce04b5
 MISC metadata.xml 534 BLAKE2B db66db041dd0875c8d4e36e3223d7f82263555f2d6a1dcc5270279b3fc8bc77499712253d43b56e278187f163af0495ca9e7e6aa0ba0dc8e9a5fe9cf7f2daf99 SHA512 e086f5e92c5ad9058f13c23c814a5cdc988a09cdbebecb1018b59d32a756dc2766b13ee1c3e09966cc7e221cc1c4ee26f9bf11c50610f94b28c20a34c316f133
diff --git a/app-text/qpdfview/files/qpdfview-0.4.18-qt-5.15.patch b/app-text/qpdfview/files/qpdfview-0.4.18-qt-5.15.patch
new file mode 100644
index 000000000000..b19f247a7c38
--- /dev/null
+++ b/app-text/qpdfview/files/qpdfview-0.4.18-qt-5.15.patch
@@ -0,0 +1,11 @@
+diff -ur qpdfview-0.4.18.orig/sources/model.h qpdfview-0.4.18/sources/model.h
+--- a/sources/model.h	2019-07-24 21:18:33.000000000 +0200
++++ b/sources/model.h	2020-05-29 11:44:33.012891583 +0200
+@@ -27,6 +27,7 @@
+ #include <QtPlugin>
+ #include <QWidget>
+ #include <QVector>
++#include <QPainterPath>
+ 
+ class QAbstractItemModel;
+ class QColor;
diff --git a/app-text/qpdfview/qpdfview-0.4.18.ebuild b/app-text/qpdfview/qpdfview-0.4.18.ebuild
index 5e1fefad37b7..de52c7c7b922 100644
--- a/app-text/qpdfview/qpdfview-0.4.18.ebuild
+++ b/app-text/qpdfview/qpdfview-0.4.18.ebuild
@@ -42,6 +42,8 @@ DEPEND="${RDEPEND}"
 
 DOCS=( CHANGES CONTRIBUTORS README TODO )
 
+PATCHES=( "${FILESDIR}/${P}-qt-5.15.patch" ) # bug 726064
+
 src_prepare() {
 	default
 
diff --git a/app-text/recode/Manifest b/app-text/recode/Manifest
index 49017175faf9..84185121d2b6 100644
--- a/app-text/recode/Manifest
+++ b/app-text/recode/Manifest
@@ -1,8 +1,8 @@
 AUX recode-3.6-as-if.patch 472 BLAKE2B b42518eea02219eae014faea4eea71e475b778de61c8645e21d86fd97bcae8f86accd5063370fdec40054263ede74842491841db48688c85d1796c93c311eff1 SHA512 5209779be9d03b770f679c2be736bc68a710e1c064b1f4a2fbb9963a8ca59a258a22b5d34ed6ac19e7a40ca83c64995f37aa9f466e49841ba2662b89d0789763
 AUX recode-3.6-gettextfix.diff 514 BLAKE2B cbe2dc00927ce9215d1719f78eb78bdea0cc8c5b6b72bc46f43ed14d658396c977053aad83df25a666739e8a431a512ffe4f7d6da9a36b0a5eb90d1c634c8380 SHA512 71408313ed269aeb8b015c171a6d16663e2bc7a3fe5ad4e0dc16ae0ec0e1f769605d92d7e32aec908a42a5ee148cd1f00ad2c069e947c0c4f64fb3b9f7dfb1b3
 DIST recode-3.6.tar.gz 1751886 BLAKE2B 94436343969da0ee6d16ed69a211d4f36b7a9cb59ce931ef71cfc1e0f11e5709e67ee1e0bb24f5320e6c7d6d01920a6c4d9edce87ff2c6aaaa8c80e30f3b536d SHA512 68de277ac8cd5f6023bb077b959ab5778a78edac1299d507bab906824080b6f86e9bfcd89169aa474197c2faa9af2ceb1ed272c8dd4d50caef373afa05daed1b
-DIST recode-3.7_pre20140303.tar.gz 1580388 BLAKE2B 8fb280368e6998c8cb4554f856dd779e70fd53958bf6da5839735e14e741f45b110ac106494703d97ac3390f41736b2d94539dfde4554b3ca70911788ce8c005 SHA512 a1821909e7ba68a315bbd5e0dcaf0a574f09ac6ef1ccf8858aeda1a0affc09cb70353b4bda005a14cff37ef41646a6f5246c5b5a0f6e89db2065eac7ace9b030
+DIST recode-3.7.6.tar.gz 2210564 BLAKE2B 8c99b6d2eb93482785fe7e36063514e4c153516cc8059a9b98fc9f1b08704314b7933390a5fd7921525648ef58e9f995242182b8de23b7db33cbf94383e28f29 SHA512 ababefc445fcc47b6bf9ed640b767aed374bb8ce93cdccb641dd1ba5d298360583dd79070a0bb458f1190a8d6f1ddeb3b04eec34a61305b69def0963cec5843f
 DIST recode_3.6-20.debian.tar.gz 341117 BLAKE2B 748ee36b68f1d1501edde23e8afcbd58df70a86745e7c366a27a33496e539dcae11b746fb46767e95ae99b68a18684e3e85c1ea961692ac57ad1a01a895734a7 SHA512 bc586534e77b49da7d387187a8ddb042a12871f87f4f32c818ce7218b7254ac5ba6eccb14aaaf0312579f27958883f2da620016a7049c3af24c8bfba81acc3ef
 EBUILD recode-3.6_p20-r1.ebuild 1639 BLAKE2B df12bfe979aa5b6cedaec6ca58148d972e8ab71905088cbccecaf8ebb516c6fffe53ac96d7a266c5e32756ac2207892219c9634ad540d9a6c88554d13d717f78 SHA512 b0afd29e6b220be63f88ffe9cccc00bed68582ea01b7486490a9ae90f8dc094b3427b15cdb7cb6b0505489782231bc002a7e8a77d41af73cbdaa4e3193cda3d2
-EBUILD recode-3.7_pre20140303.ebuild 1091 BLAKE2B 739577d9a5e38412363314897b1609e8b51b1aac977b4a337d6efecfeaa5ac9b87d60ba9b46e25f00de6ff209d5f5eabdb98f1d9f497e3ffb89ab91ded7d2df5 SHA512 f1952309d21129644556b4cf56d9ca9e0f75329cfab2e72205ea3a9055ec0d336100b92f069162753528aeb1ced995753d170cc96d8f2510ba87b58ab16ad9a4
-MISC metadata.xml 271 BLAKE2B 46146f4bf13e9f4d33435225ec1012dd9bb89b20812963dc50368cab2a60a3c542052cb72f8963cc72074b2c13a5b054c77152de1d108027752601a349bc4ef8 SHA512 3e98f5382cf789992bdfc0f32e6e36eba31944be654c03f2ed9bd00baf56c8b768c256c4f8778d5775d6df38da4afcf8e32b6e6495a1ecfc8e7982c7c8943b1b
+EBUILD recode-3.7.6-r1.ebuild 1024 BLAKE2B ecc79b0cc686ea88b765bb1fa035d7c41fd908496daf094dd2c11573a94843faeef067d91ecac570f0058ed81d645c0ab58e4d5fbe6809288e7bb25eaec4dee9 SHA512 a9ed1b358366995d2905796458379ad713bea5ef1e7a807b708b4a22869841b27a14f46adc4af300635dec1333c7bba786259be3546c96602f3977bf42e7da3e
+MISC metadata.xml 346 BLAKE2B 0a6af84d8b6ea322f62bf1f741e332892a60eee2704265685615240a178ddd965f524586179882867e609cef66ef021cfc56950581d1c0915f04a2a669dea9ba SHA512 6c5caba02d69998dc08954f52c9e126db6546eaa0d0f4abc166e96896fdfa8e73371f1206318fa00ebd0f266600c79105d43d5e300c07e7f7b0c3645f9537b2e
diff --git a/app-text/recode/metadata.xml b/app-text/recode/metadata.xml
index 3e927f8d7480..9a994f3a85a3 100644
--- a/app-text/recode/metadata.xml
+++ b/app-text/recode/metadata.xml
@@ -5,4 +5,7 @@
     <email>shell-tools@gentoo.org</email>
     <name>Gentoo Shell Tools Project</name>
   </maintainer>
+  <slots>
+    <subslots>SONAME version for librecode</subslots>
+  </slots>
 </pkgmetadata>
diff --git a/app-text/recode/recode-3.7_pre20140303.ebuild b/app-text/recode/recode-3.7.6-r1.ebuild
index 3de99c002b05..88f530ff3af2 100644
--- a/app-text/recode/recode-3.7_pre20140303.ebuild
+++ b/app-text/recode/recode-3.7.6-r1.ebuild
@@ -1,28 +1,24 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit flag-o-matic libtool toolchain-funcs
 
 DESCRIPTION="Convert files between various character sets"
 HOMEPAGE="https://github.com/rrthomas/recode"
-REV="2d7092a9999194fc0e9449717a8048c8d8e26c18"
-SRC_URI="https://github.com/pinard/Recode/archive/${REV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/rrthomas/recode/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
-SLOT="0"
+# librecode soname version
+SLOT="0/3"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="nls static-libs"
 
-DEPEND="
-	sys-devel/flex
-	nls? ( sys-devel/gettext )"
-
-S="${WORKDIR}/Recode-${REV}"
-
-# tests fail.
-RESTRICT="test"
+DEPEND="sys-devel/flex"
+BDEPEND="
+	nls? ( sys-devel/gettext )
+"
 
 src_configure() {
 	tc-export CC LD
diff --git a/app-text/tabler/Manifest b/app-text/tabler/Manifest
index dd5de87930c3..7792f055fc15 100644
--- a/app-text/tabler/Manifest
+++ b/app-text/tabler/Manifest
@@ -1,3 +1,4 @@
+AUX tabler-2-fno-common.patch 495 BLAKE2B 57c63a1b5d4dedd83d9b7034de4fc41696e4acbd6af681b6dd0214013b0ba0a6465f8734cb372164407f20f826244057884763e6bca34dca0b97f19a2e2f3309 SHA512 cfe00a5cad87fee0764b39d1e3c4f07144026763eebbc886c7460f63645a7e94df6c2858c79e294c32970cc0839cb491d586350244c46d251fd98d20e58c2113
 DIST tabler-2.tar.gz 87706 BLAKE2B 32b259cd84a9cb8c1475ef6da6815f96e5eb947d392fdd5150570ce639a7fcbc251baa9204e1c25bf471be025ae920b203fc0f89cdef46360b0af4d9f52122af SHA512 6f01796b4cadae22f9ae0029ee8a7bb224d04faae1793b13c9d8473e6a902543a5bd6da86e806f9c50c8b39ad7f5d44525c2a701920cd6c62c27995409d0b1d8
-EBUILD tabler-2-r1.ebuild 428 BLAKE2B 8a8584a6e0bb6923b2c32a4131befdaced5935643ace6971f7953113f37b2d297678226b8e37f2172bb6273d5bc24942042edb1588f77687bb836a0e6060a316 SHA512 9b234538b56fce6332a580243f27387e21d34d35f9790cdf6de8d12a5debdc2a0bf6a93213e9a7c7df5f2131577d4aa88c87f70f3b3d01e0ec2255a4306dd5fe
+EBUILD tabler-2-r1.ebuild 420 BLAKE2B a8f41c31ade7b3a58962151111c075d49b3c91380049a41a4763471ff43f033edc18b9d2b725ecbac7278f1f40524e619f0a03eb30158f1006b4268ac042abcf SHA512 30eeeab2dc3a9c53eb659cc546fa16f13cf00bf53f5d5ff79f81ccb9ffedf23ba7e1508f4d64c1448da4c440c42f9aaaa04e2a9cb58834870d62cd952249a2dd
 MISC metadata.xml 243 BLAKE2B d1a92b4f94bf011a4e2e185cc73d1ba11312a451e3d03437ca809bdd8df91be0f8280839eea56fb9dfb2cf711c1d2021f11ddec24833df077e2da061353df255 SHA512 c0d977a25c38fe6c32745c0b18520aa510c617922f267a468b2b788480104214bb5db37564d6ae52c45298e98da2764595734c827ab01abcce1270ed241e3bf7
diff --git a/app-text/tabler/files/tabler-2-fno-common.patch b/app-text/tabler/files/tabler-2-fno-common.patch
new file mode 100644
index 000000000000..b334880e5ec8
--- /dev/null
+++ b/app-text/tabler/files/tabler-2-fno-common.patch
@@ -0,0 +1,22 @@
+--- a/util.h
++++ b/util.h
+@@ -35,7 +35,7 @@
+ int digits(int n, int base);
+ char *replace_backslashed(char *string);
+ 
+-char *_strregtok_previous_end;
++extern char *_strregtok_previous_end;
+ char *strregtok(char *string, const regex_t *seperator);
+ 
+ #endif /* UTIL_H */
+--- a/util.c
++++ b/util.c
+@@ -32,6 +32,8 @@
+ #include "conf.h"
+ #include "util.h"
+ 
++char *_strregtok_previous_end;
++
+ /* replace_backslashed
+  *
+  * Replaces, within the given string, certain backslashed characters with the
diff --git a/app-text/tabler/tabler-2-r1.ebuild b/app-text/tabler/tabler-2-r1.ebuild
index f727d216278f..e39e7e2835a9 100644
--- a/app-text/tabler/tabler-2-r1.ebuild
+++ b/app-text/tabler/tabler-2-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 DESCRIPTION="A utility to create text art tables from delimited input"
 HOMEPAGE="https://sourceforge.net/projects/tabler/"
@@ -10,9 +10,9 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS ChangeLog README
-}
+PATCHES=(
+	"${FILESDIR}"/${P}-fno-common.patch
+)
+DOCS=(
+	AUTHORS ChangeLog README
+)
diff --git a/app-text/texlive-core/Manifest b/app-text/texlive-core/Manifest
index f5ef22e39fe6..a66e3bbb3aff 100644
--- a/app-text/texlive-core/Manifest
+++ b/app-text/texlive-core/Manifest
@@ -343,5 +343,5 @@ DIST tl-xindy.doc-2020.tar.xz 406620 BLAKE2B 143e9810da19aa0bd9080801ceb42923bd5
 DIST tl-xpdfopen-2020.tar.xz 580 BLAKE2B dd5bba56ad86e209daf6030f5aabf59c41a0474142e81a840b647ae2abf744d0a53ff76ba1581bf2f7de0db4432bcd607553fc3a2e5bb739e483357f02ed454b SHA512 4bc35a5699e39b12f6f38b48ed7e136e9c5c54cbcad71119d7ffcb0688df9739187b4e0042782a2678233b289902b24c6537ba10303ff26846bfe73b98c9f54e
 DIST tl-xpdfopen.doc-2020.tar.xz 28176 BLAKE2B ba0a9f1621999a8d98dd96f72fb93cd7a380e1f6285d2d59dac812e68ac91c08e815756553e10ff8cf1042dcbfa71bb994abab000910cdb1e6ddf113eefc481a SHA512 8dae12489e11fdc9e5e2aec22a4c70e8f8d15708b907404dde849b915515fe1f3d0771762f3a18112c8e2760e30bd1605d208b4315753ab37f738646e90c6f32
 EBUILD texlive-core-2019-r11.ebuild 11999 BLAKE2B 108149d92d2afab1d4476a46a7de98dab713da7f63c27d310d4af3e30e31cc0f9b578e783e71c793683526c48e5f7ce343ce048a955360e2364672b9fb421b42 SHA512 9dcd7bf77ad1a552d262c045484a35dadd4ca7d613605635ce11e9e685dc03fdfb463ac83b67dd3df0c5666c4f484769617ffbdad80c09b07a98f59925797294
-EBUILD texlive-core-2020-r4.ebuild 11953 BLAKE2B ab10e9731fb86b66d6205dbaa6ac3619f65cc7c6bbc57ecd1624ac1914b49a6d93d32a4adf9a3140874b960ddc0828cdfc2be7af7f8262e3a470dc99f6f2aa18 SHA512 8486ff97ebb87555a2d62533be41251a7a19df310fd942fedda4dd5fe7be49c276eda5fc6dead13db2769903edae4d8d0cde5eec61d55746c56bbd3363e9da27
+EBUILD texlive-core-2020-r4.ebuild 12042 BLAKE2B 4fa88e90b2f33d3b705c53dd12b26afa77728502bec54b3c25008f807ecd94700c88c40100615b4913dba27a863cbfd49fe8d7994b69b44618e818d52ab9ffbe SHA512 e9c2395b2c8dde31b16b6cc0f979c08d601da6a5ed2b210853c035a85d42154ef69e4000b9e432f87fae0f5e0bafa1189fdd9a65205f65cd0f3a2dacb3a5bb9b
 MISC metadata.xml 661 BLAKE2B 23fd3817c5a9861b9adec9a78b6dcae0a23743cf685560a86a991896ed8f102fe66aa15a416939829c0c085cdfee24668f7a07631b3f4aeee469002f35b481e6 SHA512 c00ae9537fced06990a4ffff5fbe5101670ce1d84c879c0e9eeaf5c979107dd6a1f92f8f8271731b6c4818abead15b759fc9958ece317e554effbd3cb23fd2b9
diff --git a/app-text/texlive-core/texlive-core-2020-r4.ebuild b/app-text/texlive-core/texlive-core-2020-r4.ebuild
index 31a1143af5e1..d791d0185e69 100644
--- a/app-text/texlive-core/texlive-core-2020-r4.ebuild
+++ b/app-text/texlive-core/texlive-core-2020-r4.ebuild
@@ -75,7 +75,7 @@ for i in ${TL_CORE_EXTRA_SRC_MODULES}; do
 done
 SRC_URI="${SRC_URI} )"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="cjk X doc source tk +luajittex xetex"
 
 TEXMF_PATH=/usr/share/texmf-dist
@@ -121,6 +121,10 @@ RDEPEND="${COMMON_DEPEND}
 	>=app-text/dvipsk-5.997
 	>=dev-tex/bibtexu-3.71_p20170524
 	virtual/perl-Getopt-Long
+	dev-perl/File-HomeDir
+	dev-perl/Log-Dispatch
+	dev-perl/Unicode-LineBreak
+	dev-perl/YAML-Tiny
 	tk? ( dev-perl/Tk )"
 
 S="${WORKDIR}/${P}_build"
diff --git a/app-text/texlive/Manifest b/app-text/texlive/Manifest
index 6af388d46e03..1b0a49a55245 100644
--- a/app-text/texlive/Manifest
+++ b/app-text/texlive/Manifest
@@ -1,3 +1,3 @@
 EBUILD texlive-2019-r1.ebuild 7238 BLAKE2B a654f916927ba6df7ef87fa6649b0c5883ec1ee3d4378de502fe8e1d1933969a4316175f4aa13633fda4486e31aabb6432f57c0ae9ded485a3ea653060acaea5 SHA512 1208cfd68d37eeddbe4b72fce098d4fdebce58d0c933ff04776b9fb1b0eb2de4d8144f6eb4f4b8ea179195cc75fbcf206ea7a885100ba98f1d2e18ffd75b9127
-EBUILD texlive-2020.ebuild 7201 BLAKE2B abdc4fe34248006d8785a5a225824b34d2d29a0481b3fe06d1fa0db30580b20ff38daa87fd6272337f21e2a93b342447b1c443f2c5a929d3173f9e3ac688300f SHA512 3c40dad8efdf382fbed462efcbaf46f694f4af9135731b78deea928646b7918a489201133306509e461f9b86b0f80afd07965596d33c562ba1170614d7ee8df2
+EBUILD texlive-2020.ebuild 7197 BLAKE2B e4664b86aea97b849e9c03a4a4e89e7992342eca16ebb387b70e779c085410b7d6083cf1475a9594562d7bf7b5569da6a08f15080f04b6528607eb817499b81d SHA512 4aebad9ab3ad38d4bce00ba70efddd326eaf6f110a11991c55d49f5890e15855e1f7f8662234d6080aa6321b32bca0ffc7d2bf1ed3f4c489312d114d0e35f0f1
 MISC metadata.xml 2419 BLAKE2B 2627379a58f80fd304b4c77ac3f3466520d8237458e4236d88ffc2b33a062d50e33a0f2cb07c6120abbbd27d0dd7d4aa79eaa44790280f719eb10fcfc230664d SHA512 e20c3f1c67f6250209b381aa21d827ee27006d6ba5558e913ce01ac704ba0d04f16b1c5b4666ed8833e6c744b7045276d98e777f3e3e1289dc33e861bc745941
diff --git a/app-text/texlive/texlive-2020.ebuild b/app-text/texlive/texlive-2020.ebuild
index 8818d9501a7e..37aa77dcfccc 100644
--- a/app-text/texlive/texlive-2020.ebuild
+++ b/app-text/texlive/texlive-2020.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="http://tug.org/texlive/"
 
 LICENSE="metapackage"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="cjk context detex dvi2tty extra epspdf games graphics
 humanities jadetex luatex metapost music pdfannotextractor png pstricks publishers
 science tex4ht texi2html truetype xetex xml X"
diff --git a/app-text/ttf2pk2/Manifest b/app-text/ttf2pk2/Manifest
index 4c6c9bff4383..1dbc8e6f6e61 100644
--- a/app-text/ttf2pk2/Manifest
+++ b/app-text/ttf2pk2/Manifest
@@ -2,5 +2,5 @@ AUX ttf2pk2-2.0_p20190410-fno-common-gcc10.patch 266 BLAKE2B 98f39f54a57008124d4
 DIST texlive-20190410-source.tar.xz 53783408 BLAKE2B 8e34c7c2b74eab1c4d16ddbf7eddd8566593e6d68c42a2634760f11d86e68970698d8b9deddcf3297966968ede11ecf30e0b04ec19b708dc3e6d0a2abcc3799d SHA512 7759d8e668e53c0c73e48907096da9d8fb6384dd9c3342ddfb05e17d077054c5351d35256cf4e63a6da502de2f09f521979bede7209cdd5bd8ae80eba0efed2e
 DIST texlive-20200406-source.tar.xz 55383320 BLAKE2B 3bc024166ebfc269389531c7cf818b062856cd2dcc27cf0a2e790f07cd941d9905c9c6a54566ea627ea1ca334d2b6da8d3e5bd1c686dc9d6f8ac15aac388c1e3 SHA512 65be52cb5e1b52f12feb62c6cf23e56c581b9dccb8d3b9ccc85c12c62b0cb67dd71de8d22d967d2cbf8403502c66bccb238523d13a0d081be104fc9f9c68b477
 EBUILD ttf2pk2-2.0_p20190410.ebuild 1190 BLAKE2B 866f211a200a21daf39c21c19885ecd5cf40c0256d07ab152030913affc3ff08db88f1c2ac505b79ed1cedb00ddeffc875315bd7f55e377cd1f8eab447c413c1 SHA512 286903e0bb70b8cb5b2b813d9ecf978dd3f653167846f77b6af22971faa64665fea1cf4889226a8e0eff785ed03dacb986220998c79533216d9950aac29d1a5f
-EBUILD ttf2pk2-2.0_p20200406.ebuild 1119 BLAKE2B a451ec9199c0931c3de90967c0c71a610a357d5541d5ad4e07731d6c63721d7e29fde1ac6d40097fcacb35e8a1835e5674e9a4c91b180b48458666a2c3099c4e SHA512 d21aea527735a0aff283f342d1f90b1c624077f6f5141604e7e0b12c8a5a538ac6d1656c8f52924f221fdb911dddbea968191157ef8aef9e2f0936cfafaff790
+EBUILD ttf2pk2-2.0_p20200406.ebuild 1114 BLAKE2B 476d3d14b02d255a7a49a39f4b5ee58eab5747947d35e48f95dc234aa185e5202856949e54b7884cc77a57ab719cb4a5d3e106f091ce172e51f6b8d2057305d9 SHA512 31cbca2042af79760fc0d5ffb8bcdfaa6310d524cad69902db4858f5a3b249a9096a1efa968294eda589024e3eeaa324b105da7e79d90ce6e8fd30589a2d34f4
 MISC metadata.xml 245 BLAKE2B ee3a163cfe0a4bc59c0dfb46f9ddb580e2d259b4d0e33cb4e684eb9e6d4b901bf97c6edd891f3b75a613a782f1b89318d0ee3ec9bee4e34c4441d9e8f4267678 SHA512 1653777623e2c15e1ce13229e396723b2cc9c214983e0f8592de98c01a31badc6c38c6735ed44f937d145883b43fb6f049af3eddb9ff96b18c96ccf8f67dd690
diff --git a/app-text/ttf2pk2/ttf2pk2-2.0_p20200406.ebuild b/app-text/ttf2pk2/ttf2pk2-2.0_p20200406.ebuild
index a5bb1053c225..b826102ea6cf 100644
--- a/app-text/ttf2pk2/ttf2pk2-2.0_p20200406.ebuild
+++ b/app-text/ttf2pk2/ttf2pk2-2.0_p20200406.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~zlogene/texlive/texlive-${PV#*_p}-source.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 # Note about blockers: it is a freetype2 based replacement for ttf2pk and
author	V3n3RiX <venerix@redcorelinux.org>	2020-05-30 11:44:06 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2020-05-30 11:44:06 +0100
commit	f516638b7fe9592837389826a6152a7e1b251c54 (patch)
tree	8bfecb640b7b6403d7a3d662d923eed630033da7 /app-text
parent	1a61119f9f7b057830e2ce0563f913ec86f282ad (diff)