gentoo resync : 21.06.2020

55 files changed, 694 insertions, 808 deletions

diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index c717541fa08a..e51c26e04faa 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/calibre/Manifest b/app-text/calibre/Manifest
index c36734de2efe..8d9ab17a42fb 100644
--- a/app-text/calibre/Manifest
+++ b/app-text/calibre/Manifest
@@ -6,8 +6,10 @@ AUX calibre-server-3.init 1796 BLAKE2B f87d785d6f6fc10fa648d40944ec8538027854bb8
 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.18.0.tar.xz 37135328 BLAKE2B 247fc226fade064306309933be008e7636bacfdcfb1c96ae900fce5cc4474e26853b3a9dd932fd758543e31af95374f089d2e7a15c3d9ca7655eabd077727e2c SHA512 cc75e8b78722eb286af57f1d6b1ed783647f69471d903a3d4dd458b3f6966804e8e4fda7bd1947e9107ce9a280486ea7de101f7b843f8365bfe6e874d9ebf3d3
+DIST calibre-4.19.0.tar.xz 37172532 BLAKE2B 1cf3a4727ac7a2e7fe4d926acad7e6324b0673728db862209d98280f4fe9457eb33d734e47ac4882accebad2a6ffd12aa0add6bdcfe64cc4baa8a39dc2b4b94f SHA512 47b767b3f23f01fa1931abd470eb69f5493f5b0e6cd5c0e566b5576d1d831137c28555de3f73ad2a2dd0dd03615171a4c62356278a590ad48b77a6ca1cac890b
 DIST calibre-4.9.1.tar.xz 37529656 BLAKE2B 5d703ca0c398b43cc26a54e0628d0fe938c6a5027a4fd0c9cac83944e5143eb08439bf79b2098182be7727eaa042748f17866788b02c7744178dce131f6b1d1e SHA512 bf06aa3cbc8d255934f3f7f3ce20b4798edf107ed9f822943d2b4ae7d95473842928ed79f8ba7571f7e0ebdc267c441916d543d5b7630aae5cb151bcc3184b71
 EBUILD calibre-4.17.0-r1.ebuild 8765 BLAKE2B 5fdb90f47e390d3935639673f63c2fdd9a5e64ae5635f5a1e5732c176831f5b91decb2dead5ddc79eafd786b64ccd95aa6b0943038428f8aa6331ed45beda222 SHA512 3235f8bac83d558268c0e41b6a313204b87e545dd7606309aaed0d2b9ab8a867562f0dd5127e90bd8d8d56dc4371c46c2d0091bcefa9815cbc3b1da31f00b4ec
-EBUILD calibre-4.18.0.ebuild 8697 BLAKE2B 0cf516ba2e15a614c2eff207fe03bfedc6e6d20f3bfa0948ff3d077dbd111580bdd807a360df27f5813282acaef9dff0dda504c69cd502d84b294cff5fa45da6 SHA512 884a603d9e249bec56e2631ce378d79d3c86e0a0c7740a0d81c1aeb60af0332a7353c8629756f25793669c231bd4fd950d35437fbc6a81f228dd09b2a86d0ecd
+EBUILD calibre-4.18.0.ebuild 8697 BLAKE2B 2375f915eb98ca26ac5ad31db9a0ffee9ec8cc6694b0a7daca9eda35604c1ca606f71b3e3b7277033ba9c35e35abbc9ffdf02fceb2f1d72cc286a6d6daf357aa SHA512 48ccd11e78545cd8f489ad0a7fa1e660ed52e68dadf54d1439baa1a378afa67d766e6f7b0c0c5bd53538695e274e2fa4c2a6bb0555d5898d854cac56660a9cda
+EBUILD calibre-4.19.0.ebuild 8550 BLAKE2B fcaf2c66cd59bbe0017ab5ead307bb532ac1ae8f5fcc9c0b4e015ec652646f8faed0d108ccbf29675384265f07fb6720634abe757faa6653a73146c685caa7f4 SHA512 01f6b7944e0ae5ffdf420b8046a104200217f958fcdeef057ba5e81a06bc04ffb9b1b2a8bcddcc3b50bd2d3dfd27b738df9084454d2bd7ae51ed28ab7b78d714
 EBUILD calibre-4.9.1-r2.ebuild 8799 BLAKE2B abbcecaeec5f818cf7ed218edef294ee45d53861b3a8a573ac8c119deeb3d6f25ee16c42433daefb41a1b05eb7ffef007759632d6823b731931c57b60272cd30 SHA512 8989bcbb4e122b2e7ad8fde2b671ed71173658a6b05932b2b56e270e600d84ac916d61af1e2eb63dd146b9ff8801670cd42a2ba8db5a6aca3f21e944f1ecbd43
 MISC metadata.xml 382 BLAKE2B 87fa7e63a6ed7a4ea55247b362288b43f7edd312cc3085bb8c1b947402ae4aa0df01fac4f6646d260653ff8af7fe28d3dabb8a213dbf3e206181b69835b33d5f SHA512 8503e0a4a48d93682c386eb1d6507b4b26585afc9d62b7cd52bc00b457a887bd17422a03669ff404570ff7f5ff6f0bba14ee935979f8b54722870d6620097de5
diff --git a/app-text/calibre/calibre-4.18.0.ebuild b/app-text/calibre/calibre-4.18.0.ebuild
index f37e5cccd2f6..a4f5f90a8186 100644
--- a/app-text/calibre/calibre-4.18.0.ebuild
+++ b/app-text/calibre/calibre-4.18.0.ebuild
@@ -63,7 +63,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 		>=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/msgpack-0.6.2[${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}]
diff --git a/app-text/calibre/calibre-4.19.0.ebuild b/app-text/calibre/calibre-4.19.0.ebuild
new file mode 100644
index 000000000000..ae82240de8bf
--- /dev/null
+++ b/app-text/calibre/calibre-4.19.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.6.2[${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/djvu/Manifest b/app-text/djvu/Manifest
index e167b680162a..fd9efc3b6c2e 100644
--- a/app-text/djvu/Manifest
+++ b/app-text/djvu/Manifest
@@ -1,4 +1,6 @@
 AUX fix-CVE-2019-18804.patch 1130 BLAKE2B d83e7f74fca659d58731cb051aface930f1f3d0ffc737056e59323d436bfbad9b43aba5fb2c353b368a4fdbe9c257ca34ba53769e8aa2f0a42ebbd0a8d48181f SHA512 587aa61a9f9f7f845f1f0a23f59503efa7247862074096c707368316ad91aee40025d48c76a7351dc09ec1687c3902198fdbd6aa8623c4f1d8654d0c549ec4e7
+DIST djvu-3.5.27.zip 3567522 BLAKE2B c074468a2fedf097b9b8fea4c449f26b61bffb31d10114081554e59256a23315ecffc203b5223468ca0c3338118b53aba65eee4cb5e7ad5c8d55470e90f43843 SHA512 dc1cd1bce2fb6245946f9409b3a3826ef2dc77a20be079c929b17508c3d967a0b5d8acd61bad00357e46a845f7f97717a043db9ffd1fe23e9a09441b7d21cbd6
 DIST djvulibre-3.5.27.tar.gz 3648522 BLAKE2B e1907b4b64c48304ceb24360cfd451e4690d38803f22231d4e136dbe754715527fa0300c623bb709fa05bba206348257137b2a755651bb51ca26259680e142d0 SHA512 62abcaa2fe7edab536477929ba38b882453dab1a06e119a3f838b38d5c61f5d8c252e4769e6534582b826e49bcfb490513179580fab9c3afa84aa92053ccebee
 EBUILD djvu-3.5.27-r1.ebuild 1574 BLAKE2B aa47ac7501b211d0f56a90cd4d82f33d287cb575216c78f27603d7d81a7b585637ee02ba81c5e9a918421dabac9d23f338a60bec5377821ed35f750140568481 SHA512 9bcc71de91a7cb092b635fb9b6456966faa03ef25154f145307da888fb219c419e6907517280c0dc85673de5b9d7914829d3ebf505f2333156e859ac9a0bbeb1
+EBUILD djvu-3.5.27-r2.ebuild 1698 BLAKE2B a774bee0b263b3f166f98dc5b22ebcdbd37746d67ec33fc23e5172d89003be0c9d18e69f4fdab137a3b2e3c2f77b03ffe51acc18840225dde58bbd2671120b6e SHA512 d627b593fa6cf288b4fb89eb16230cf09fe6b44fc8a4d2d83c43d5250d4e4c40a35af379b3045aedc8c8ea3bc44f1eaac4ef8d20f7ecf345b5cf55907725a395
 MISC metadata.xml 948 BLAKE2B 1d15a217967f10397d747f2cc0844ea76d4f876ed0ee8cb56733b74a3b92f023e3eeff11bfcb4265766c14dad4b1e35a18f7d2fdd7442068bf82c4a8302690db SHA512 e5cfa3a2b2077a3f0dbfcc99165fb678e8c8759724790d520f1bed670fed5e753a47207bbbcd7d2ff2d55def5b34bf32201771918c9e7a16583d91553ac75e42
diff --git a/app-text/djvu/djvu-3.5.27-r2.ebuild b/app-text/djvu/djvu-3.5.27-r2.ebuild
new file mode 100644
index 000000000000..ed3eea609053
--- /dev/null
+++ b/app-text/djvu/djvu-3.5.27-r2.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools desktop eutils flag-o-matic xdg-utils
+
+COMMIT="a00b7618c22fb35b030582147a4479c4cf41c349"
+MY_P="${PN}-${PN}libre-git-${COMMIT}"
+
+DESCRIPTION="DjVu viewers, encoders and utilities"
+HOMEPAGE="http://djvu.sourceforge.net/"
+SRC_URI="https://sourceforge.net/code-snapshots/git/d/dj/djvu/djvulibre-git.git/${MY_P}.zip -> ${P}.zip"
+
+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-solaris"
+IUSE="debug doc jpeg tiff xml"
+
+RDEPEND="jpeg? ( virtual/jpeg:0 )
+	tiff? ( media-libs/tiff:0= )"
+DEPEND="${RDEPEND}
+	|| ( gnome-base/librsvg media-gfx/inkscape )"
+BDEPEND="app-arch/unzip"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	use debug && append-cppflags "-DRUNTIME_DEBUG_ONLY"
+
+	# We install all desktop files by hand.
+	econf \
+		$(use_enable xml xmltools) \
+		$(use_with jpeg) \
+		$(use_with tiff) \
+		--disable-desktopfiles
+}
+
+DOCS=( NEWS README )
+
+src_install() {
+	default
+
+	find "${ED}" -name '*.la' -delete || die
+
+	use doc && dodoc -r doc
+
+	# Install desktop files.
+	cd desktopfiles
+	for i in {22,32,48,64}; do
+		insinto /usr/share/icons/hicolor/${i}x${i}/mimetypes
+		newins prebuilt-hi${i}-djvu.png image-vnd.djvu.png
+	done
+	insinto /usr/share/mime/packages
+	doins djvulibre-mime.xml
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+	has_version app-text/djview || \
+		optfeature "For djviewer or browser plugin" app-text/djview
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+}
diff --git a/app-text/docbook-xsl-ns-stylesheets/Manifest b/app-text/docbook-xsl-ns-stylesheets/Manifest
index 47e4250fc8d7..199629a6169c 100644
--- a/app-text/docbook-xsl-ns-stylesheets/Manifest
+++ b/app-text/docbook-xsl-ns-stylesheets/Manifest
@@ -1,3 +1,5 @@
 DIST docbook-xsl-ns-1.78.0.tar.bz2 4992293 BLAKE2B 3bc93ca1dc45756121a4a3838093539957bba4ddffbbd7d27c5df6c63422a8694ea7d805cc9585ab1ce2d9092e35b91cd3bde97ee2fabb91c8c870eefa8ded1d SHA512 f3b9b52a4ba5670c17086cdf64674080ef82a9226f085887c23c53d2d102611d690895c71d14186cd84a25c7735b05d6c55207f4b2b9084d65889aaac7993cf3
+DIST docbook-xsl-ns-1.79.1.tar.bz2 21962317 BLAKE2B a68cc31ea8cb98fc07e198fe55f242c6438284d6fa75d4920a9ca7b5038732f966cc6653e058d7fafb26c0ff49f2039025a48a0f8c0392ee892951723703bce3 SHA512 23fd06870bd5afe4efcd08c8ad679821c202a62442b50657c093cbe9cd71b585a3c56a5534a0d41119f58bf98b1f9014a53ff2e48ab59075ec1827e7363980e9
 EBUILD docbook-xsl-ns-stylesheets-1.78.0.ebuild 1641 BLAKE2B 5dcbfe996ef1279395046ffbc32d786ebe5e5f9384565db4f88c93955554584b8c85f31b95d6e087af5ba98e6a65afd4f31c51cfe0d43cdc8bc1fc751a952855 SHA512 a5826b3a7dec2370010693d1d45deef863770b4a5c9559506a584f5aaeea30ba12aa2301f9a900d8ba385651994093a16717d82a56ad6008cbb920ba1e81d971
+EBUILD docbook-xsl-ns-stylesheets-1.79.1.ebuild 1671 BLAKE2B c9a70e167f12858a3ae7331ba47ebf64ac6a7446909202e37cc5bf6420d885ecfa1d54286b270e191137db33a82d00a32c0b10adf88c06832c446b68690101db SHA512 e3dfa7ad205e9424b3af557f42017cd59ce35312cb6f731e2cfe4c46a8cf1e4765a60cc04c1d791f2b9bc4ce70f61e0044950e368b8c6fbd0b005cbf8705ba24
 MISC metadata.xml 411 BLAKE2B d10acaa19dc1518378813204f8afa18a97c88647b8cb6cdfa0e214935b999ee17aca34e6c3ecabfbaefabfa6ea229eaaa4c2a6ebf877888e32e6ef1351f5fad8 SHA512 55962cd28fad52f6dc931791e3e2288e22e183e3d49183e0f9ff890d23a38d6ad928eed4ce0b4e41b4f381234536ff67c219e4c8a75efd32cc0a14eefee6e299
diff --git a/app-text/docbook-xsl-ns-stylesheets/docbook-xsl-ns-stylesheets-1.79.1.ebuild b/app-text/docbook-xsl-ns-stylesheets/docbook-xsl-ns-stylesheets-1.79.1.ebuild
new file mode 100644
index 000000000000..3ad9535de821
--- /dev/null
+++ b/app-text/docbook-xsl-ns-stylesheets/docbook-xsl-ns-stylesheets-1.79.1.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DOCBOOKDIR="/usr/share/sgml/${PN/-//}"
+MY_PN="${PN%-stylesheets}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="XSL Stylesheets for Docbook"
+HOMEPAGE="https://github.com/docbook/wiki/wiki"
+SRC_URI="mirror://sourceforge/docbook/${MY_P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="ruby"
+
+RDEPEND=">=app-text/build-docbook-catalog-1.4
+	ruby? ( dev-lang/ruby )"
+DEPEND=""
+
+S="${WORKDIR}/${MY_P}"
+
+# Makefile is broken since 1.76.0
+RESTRICT=test
+
+# The makefile runs tests, not builds.
+src_compile() { :; }
+
+src_test() {
+	emake check
+}
+
+src_install() {
+	# The changelog is now zipped, and copied as the RELEASE-NOTES, so we
+	# don't need to install it
+	dodoc AUTHORS BUGS NEWS README RELEASE-NOTES.txt TODO
+
+	insinto ${DOCBOOKDIR}
+	doins VERSION VERSION.xsl
+
+	local i
+	for i in $(find . -maxdepth 1 -mindepth 1 -type d -exec basename {} \;); do
+		[[ "${i}" == "epub" ]] && ! use ruby && continue
+
+		cd "${S}"/${i}
+		for doc in ChangeLog README; do
+			if [[ -e "${doc}" ]] ; then
+				mv ${doc} ${doc}.${i} || die
+				dodoc ${doc}.${i}
+				rm ${doc}.${i} || die
+			fi
+		done
+
+		doins -r "${S}"/${i}
+	done
+
+	if use ruby; then
+		local cmd="dbtoepub${MY_PN#docbook-xsl}"
+
+		# we can't use a symlink or it'll look for the library in the
+		# wrong path.
+		dodir /usr/bin
+		cat - > "${ED}"/usr/bin/${cmd} <<EOF
+#!/usr/bin/env ruby
+
+load "${DOCBOOKDIR}/epub/bin/dbtoepub"
+EOF
+		fperms 0755 /usr/bin/${cmd}
+	fi
+}
+
+pkg_postinst() {
+	build-docbook-catalog
+}
+
+pkg_postrm() {
+	build-docbook-catalog
+}
diff --git a/app-text/foliate/Manifest b/app-text/foliate/Manifest
new file mode 100644
index 000000000000..73854e4f98e0
--- /dev/null
+++ b/app-text/foliate/Manifest
@@ -0,0 +1,3 @@
+DIST foliate-2.2.1.tar.gz 4310842 BLAKE2B 3e858379c84a790d1ce4d60af25c4911d2864d7b82f1896216ae8a01598ae7865d65b90056348b372b328e84184e75fcbacfbb2b6fdb8aa9a7e254e726957c4f SHA512 3c9c3d8f2df72fcb8699ccf23bf1850c129c6f387a9b12489d8fcc3dd1da4da5a7e0707f74f4607ab0e28d67e2f55f0bb2d053fbbc072bc9915c54c4857e4cff
+EBUILD foliate-2.2.1.ebuild 980 BLAKE2B 38bf7445278159e8d914dad322e8d3164a2e7edacc6a37f149f625897c0f98aab560679eb4d984fac9660084227ef696996b51ac7d50657c0fbcf8c9fe86ccaa SHA512 633d6da653eb3ffe94b3a7fc576e5cf20cf085d69798c76ef82efdfe64e86bfbe20ef8ead5cb2f386c01237ee0e0ec4fe9df63c6d62ddc2d6e4e2027aea3a568
+MISC metadata.xml 526 BLAKE2B 9663aeafbe2182662001d238253587b45512bf1d71308e7e1d0fbd197c88d2cf384ff38a464da61facabbc8eeb3e391abc382426291eb75a2853ede4152d490c SHA512 0132f71baba803835fe3789cbb41d6a7d98fcfe06ff14e6212f734d807ed0b3ce0e4379d5531f1f23a82b99672102d227ce3eeeb9a7e2f94ead65755f1c7cf24
diff --git a/app-text/foliate/foliate-2.2.1.ebuild b/app-text/foliate/foliate-2.2.1.ebuild
new file mode 100644
index 000000000000..a64449df461f
--- /dev/null
+++ b/app-text/foliate/foliate-2.2.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PLOCALES="cs_CS de_DE es fr_FR id_ID it nl pt_BR ru_RU sv zh_CN zh_TW"
+inherit meson l10n xdg-utils gnome2-utils
+SRC_URI="https://github.com/johnfactotum/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+DESCRIPTION="gtk ebook reader built with gjs"
+HOMEPAGE="https://github.com/johnfactotum/foliate/"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+BDEPEND="${MESON_DEPEND}
+	sys-devel/gettext"
+RDEPEND="dev-libs/gjs
+	net-libs/webkit-gtk"
+
+src_prepare() {
+	default
+
+	l10n_find_plocales_changes "${S}"/po '' '.po'
+
+	rm_po() {
+		rm po/${1}.po
+		sed -e "/^${1}/d" -i po/LINGUAS
+	}
+
+	l10n_for_each_disabled_locale_do rm_po
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	xdg_icon_cache_update
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	xdg_icon_cache_update
+	gnome2_schemas_update
+}
diff --git a/app-text/foliate/metadata.xml b/app-text/foliate/metadata.xml
new file mode 100644
index 000000000000..61acad2b9559
--- /dev/null
+++ b/app-text/foliate/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>grozin@gentoo.org</email>
+  </maintainer>
+  <longdescription lang="en">
+    A simple and modern GTK eBook viewer, built with GJS and Epub.js.
+    Supported formats:
+    epub, epub3, azw, azw3, mobi, fb2, fb2.zip, cbr, cbz, cbt, cb7, txt
+  </longdescription>
+  <upstream>
+    <remote-id type="github">johnfactotum/foliate</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-text/getxbook/Manifest b/app-text/getxbook/Manifest
deleted file mode 100644
index 9e0ae0091bf7..000000000000
--- a/app-text/getxbook/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX getxbook-1.2.patch 853 BLAKE2B 03778bceed27f4582ffdf3fb2ac9de1fd2f6101d78e697126d86a829e5a13bf97f9ad2948feb274c10dd05ce611d7142bd9f624da19020ce891073402cbbf0d8 SHA512 04699a133cfba3d2a7d0f4eb9cb420abb93eec9b890f23130c23ea7b9e07b7a0da1b69f34aff0482acc79fe07c8abeb7de9de1163ae04d9c581d7a3f5af084a0
-DIST getxbook-1.2.tar.xz 23776 BLAKE2B 327a35a73a5e29eefcf3f87cd8ba1237da5d045e3ef009d3ae708797fa78e6d844baa4cba2e8ff021d71951ca100e087d69a98dac3ddce953afa549b63e7e1f8 SHA512 fec397d4fd979421658f7ef9535f3c25369c8bd4ea2f9adcd719f760fd01265ed789f9eca34374b245c24acd485b951c91fa92a36d5b6401a0e0bf4db746788d
-EBUILD getxbook-1.2.ebuild 936 BLAKE2B a4f057509fb8195718b53aa5491a57279eb5feeed587a3b896e7608b06db5c28ff2d15fc8f26841fd7675b211fb468741391545a8447c821a09cd04dcbd80e05 SHA512 33818a0e2e930c48d1a330691d60cabb3552b5a97d2ef692e0d1a39bf463a454e90703e0675ce7ca0e75ac59a171155425b07be3fe0b9a2cf867a62912fcb1d1
-MISC metadata.xml 551 BLAKE2B dd6bac7ee3b0ec2bcd017b9d9ba62c859a2b31af629b4e5c5f021f3cea713c4b08927447dbdab46f069a8b50d1f4899c9cefc0d127b0df0a7e4080f398136fb4 SHA512 38858ab4ba3a4ca457e115e7638d01d720c735fe2c9112ec2f005bcf73a29848b74f4018e89f405ad260adc188a1bc4afbb0aaf0371643d24ca0461a21bec82a
diff --git a/app-text/getxbook/files/getxbook-1.2.patch b/app-text/getxbook/files/getxbook-1.2.patch
deleted file mode 100644
index da0ac83264e1..000000000000
--- a/app-text/getxbook/files/getxbook-1.2.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff -r -U2 getxbook-1.2.orig/Makefile getxbook-1.2/Makefile
---- getxbook-1.2.orig/Makefile	2015-07-28 21:52:40.000000000 +0600
-+++ getxbook-1.2/Makefile	2017-12-16 11:27:18.554822718 +0700
-@@ -1,4 +1,13 @@
- # See COPYING file for copyright and license details.
--include config.mk
-+VERSION = 1.2
-+RELDATE = 2015-07-28
-+PREFIX = /usr
-+MANPREFIX = $(PREFIX)/share/man
-+CFLAGS += -std=c99 -pedantic -Wall -Wextra -Werror -g -D_POSIX_C_SOURCE=200112L \
-+         -DVERSION=\"$(VERSION)\"
-+CC ?= cc
-+LD = $(CC)
-+LIBS = -lssl -lcrypto
-+LDFLAGS += $(LIBS)
- 
- NAME = getxbook
-@@ -21,13 +30,13 @@
- .o:
- 	@echo LD $@
--	@$(LD) -o $@ $< util.a $(LDFLAGS)
-+	$(LD) -o $@ $< util.a $(LDFLAGS)
- 
- .c.o:
- 	@echo CC $<
--	@$(CC) -c $(CFLAGS) $<
-+	$(CC) -c $(CFLAGS) $<
- 
- util.a: $(LIB)
- 	@echo AR $@
--	@$(AR) -r -s -c $@ $(LIB)
-+	$(AR) -r -s -c $@ $(LIB)
- 
- install: all
diff --git a/app-text/getxbook/getxbook-1.2.ebuild b/app-text/getxbook/getxbook-1.2.ebuild
deleted file mode 100644
index b1acfc5e944d..000000000000
--- a/app-text/getxbook/getxbook-1.2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Download books from google, amazon, barnes and noble"
-HOMEPAGE="http://njw.me.uk/software/getxbook/"
-SRC_URI="http://njw.me.uk/software/getxbook/${P}.tar.xz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="pdf djvu ocr tk"
-
-DEPEND=""
-RDEPEND="
-	djvu? ( app-text/djvu )
-	pdf? ( media-gfx/imagemagick )
-	ocr? (
-		app-text/tesseract
-		pdf? ( media-gfx/exact-image app-text/pdftk )
-		)
-	tk? ( dev-lang/tk:0= )"
-
-src_prepare() {
-	default
-	eapply "${FILESDIR}"/${P}.patch
-	tc-export CC AR
-}
-
-src_install() {
-	DOCS=( README LEGAL )
-	default
-
-	use pdf  && dobin extras/mkpdf.sh
-	use djvu && dobin extras/mkdjvu.sh
-
-	if use ocr; then
-		dobin extras/mkocrtxt.sh
-		use pdf  && dobin extras/mkocrpdf.sh
-		use djvu && dobin extras/mkocrdjvu.sh
-	fi
-	use tk && dobin getxbookgui.tcl
-}
diff --git a/app-text/getxbook/metadata.xml b/app-text/getxbook/metadata.xml
deleted file mode 100644
index b214e7e03b4e..000000000000
--- a/app-text/getxbook/metadata.xml
+++ /dev/null
@@ -1,15 +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">
-    A collection of tools to download books from
-    google books' "book preview",
-    amazon's "look inside the book",
-    barnes and noble's "book viewer",
-    optionally using tesseract to produce OCRed pdf or djvu.
-  </longdescription>
-  <use>
-    <flag name="ocr">Use <pkg>app-text/tesseract</pkg> for optical character recognition</flag>
-  </use>
-</pkgmetadata>
diff --git a/app-text/html-xml-utils/Manifest b/app-text/html-xml-utils/Manifest
index b80661c5aef0..5fbbfd9f763a 100644
--- a/app-text/html-xml-utils/Manifest
+++ b/app-text/html-xml-utils/Manifest
@@ -1,11 +1,5 @@
-DIST html-xml-utils-7.1.tar.gz 319559 BLAKE2B 4c07a13a6b59c9d336a5620f2c9b1109fc5289339348d287136ac91f5dd508780a97dc9e30ae361c1c8237ecfa16996a6cd79cb4eaf6d9b6ba9bd97806009fd2 SHA512 a17328500552ad28136a08d0c7dd992d53afbc853ffd8930b516b3218915f4f159234f27af66d135a51dc25eb6c35e6f14d6f0006bdfc2abf351ac8298334d48
-DIST html-xml-utils-7.4.tar.gz 343008 BLAKE2B 29c8e437afabd04fd511d3498c94cfe8ef027478b7bd4d0390635a5dd18be20971413217ba083e7fb7b82d9b10a9d943b8a90f761cd6ab192829ee64a11a0952 SHA512 88a527c29ef23b34ecb778085aafd399943764a18a3e4b39ff27b3e2cc3effa84b9ffe7c2a0df80fb27a38a7e4d4ceef6db91da46cbb2b4f9fd59903d4868a20
-DIST html-xml-utils-7.5.tar.gz 342037 BLAKE2B 0398c35593438fc3f46c459a6aba5f2c8814aed70087f27b3205a864fc349159691d282f6636073a8c8c0e8a711cd4efd070ba83f04348315f6b657b7495150c SHA512 32d9d36189a0f1a2f72578f7a449faa1ae85077de697e9021499981ee1a26e002d0a79a96ebe7f9e914b4a32320e098413a59a059c1541789599602e8be39d86
-DIST html-xml-utils-7.6.tar.gz 343469 BLAKE2B 8273aee01df43df43e9a3b6d384061d4ef6065c60829a225e088a8e24c9c7d5cf91bce2a7624a88a9821c5fdce327754d93dfa3ddd583e27de21b714cea9f91d SHA512 ea9faec48b9f8a8e4c2ce4b4f504bf1641d83f624366a162ffd8cba1b4a3cb5ae019f82c472986dc8cfb97454b8a469b2e8e11852b6ed93ed5bce84528a07baa
 DIST html-xml-utils-7.7.tar.gz 403664 BLAKE2B cdb97003bb6fb0138910f8f00b9612db3eb8ed4fa0ee81f27260e8907c088e14ac010f2862839355a4a6c0eca49508ad47c4e26f1c1c62e178c3b0e880ed124d SHA512 72b71982717de11b3b5f601a157a04bb6ecc235db6810a0dd830ad7682ed16cd6a928730013cfc918f722e1e5f03c357cd2545806288986797230f9d04175460
-EBUILD html-xml-utils-7.1.ebuild 720 BLAKE2B 713315b969084c59ce214f5a47ac4226f388ed9c3a46567d159efde9c6d16d330928fc28714c678d10eda8c36bd346ef2b50400c006247111550edf2f2b78ab1 SHA512 990a5c37f41781133dcc916e22ffd5fca9e1570411df9552552ea547cd8847683b6c4f9c3d80989e44643533777e861da96d7d33e4621e59ab12722216547b01
-EBUILD html-xml-utils-7.4.ebuild 724 BLAKE2B b848b468185c966cf1df0ae6bd23620687afeeaff4cc6daaa334015ed5a4cf9f5458193c96598004a1ea31d2e5f578ab749eff7b2f6547f9d9600c3c91f1139e SHA512 7ceedb6d8ce7288edf2582f37af8e6bf4d48421dcb740578c8666fadd0b4dd0dfbc1f3ab1e340c5bbb4825549fb87ecae7feb09672ab60f7acbd805e3242d15a
-EBUILD html-xml-utils-7.5.ebuild 724 BLAKE2B 9d8dfdf491584b8cdce68db8deacfb70c397b5a9139eb2aa39c4cbade121282b3ac74509a3e1777306b1f543be762588b9606cf18c880cdd258e99a3eb578b67 SHA512 5217f1139325cb12729b7ef4c6fdf28bbfa4fb9bc58b57e72c6196b6c84c28bfb58caff20c2381b221215fc3782851a87b7452c1bf17dd158c0f945f27e141c9
-EBUILD html-xml-utils-7.6.ebuild 724 BLAKE2B 9d8dfdf491584b8cdce68db8deacfb70c397b5a9139eb2aa39c4cbade121282b3ac74509a3e1777306b1f543be762588b9606cf18c880cdd258e99a3eb578b67 SHA512 5217f1139325cb12729b7ef4c6fdf28bbfa4fb9bc58b57e72c6196b6c84c28bfb58caff20c2381b221215fc3782851a87b7452c1bf17dd158c0f945f27e141c9
-EBUILD html-xml-utils-7.7.ebuild 724 BLAKE2B 9d8dfdf491584b8cdce68db8deacfb70c397b5a9139eb2aa39c4cbade121282b3ac74509a3e1777306b1f543be762588b9606cf18c880cdd258e99a3eb578b67 SHA512 5217f1139325cb12729b7ef4c6fdf28bbfa4fb9bc58b57e72c6196b6c84c28bfb58caff20c2381b221215fc3782851a87b7452c1bf17dd158c0f945f27e141c9
+DIST html-xml-utils-7.8.tar.gz 408201 BLAKE2B c2fed68e8fa0ae331ff6ce100afdd4c7c5b272b47d806c8e557855d32d2a140c2aa580d200644158350697e62c416d16a5e264c09897cef06d29cc5f0ab67091 SHA512 8d3a242203de099b36ca78a8d84571ecc5d8673855ee613f98edc48d388230367f40b87006f7b429e2927026300626bed7ff7f146df317d078e332091d290930
+EBUILD html-xml-utils-7.7.ebuild 717 BLAKE2B 210ddf6ba853c4eb205cd496f2e6992321929e7e1f5513fc3885213d7b89c3af09f5553b6122dbd9b934306d96c4ea81fac9b0de968246509a0e5007b369472d SHA512 573c185e238cefab05cc378c976cce51ad08379aee51335c7ea2bf75325f807dbb1e4ff695e4bfb7a49543e225e20c9a7a426515032c2d975d26b10c6d19dd6d
+EBUILD html-xml-utils-7.8.ebuild 721 BLAKE2B f305a5a3ead744dad71a9bd2dc015d7185f3faf283aecf83da2108eb95bf0fc00b0aa1ea63eb7907996f0a7624d30f8d03d62b6ad7e8cd183be7ef8824998b58 SHA512 113ff3debb917d330eb33f49879a3cf8a615101a2f9a72d1cc6ce47f7e318d355b46396d785c2a57b44e534725bde9c2968175687a6f2e5b2668047262169e88
 MISC metadata.xml 220 BLAKE2B eabf3517ba7e5b67320254eeb2b07adf1dbe0c3432b693973bc25a3e3dc8ed160b7313f9f8ae64d994ac272487b785f33202d9640bb5a7ace9f56ceb42978a19 SHA512 1db105eebacb6c7d44fd17746981e6e24badb2e81327410aa935a7603379cfcc8f3cf27dcf4e9d870cea2f73f6a15cf052e3e785205095ea9a93d72980ff71cc
diff --git a/app-text/html-xml-utils/html-xml-utils-7.1.ebuild b/app-text/html-xml-utils/html-xml-utils-7.1.ebuild
deleted file mode 100644
index a55cccd45c2e..000000000000
--- a/app-text/html-xml-utils/html-xml-utils-7.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit multilib-minimal
-
-DESCRIPTION="A number of simple utilities for manipulating HTML and XML files"
-SRC_URI="http://www.w3.org/Tools/HTML-XML-utils/${P}.tar.gz"
-HOMEPAGE="http://www.w3.org/Tools/HTML-XML-utils/"
-
-LICENSE="W3C"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-linux ~ppc-macos ~x86-macos"
-
-RESTRICT="test"
-
-RDEPEND="net-misc/curl"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	default
-	sed -e "/doc_DATA = COPYING/d" -i Makefile.in || die
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf
-}
-
-src_compile() {
-	multilib-minimal_src_compile
-}
-
-src_install() {
-	multilib-minimal_src_install
-}
diff --git a/app-text/html-xml-utils/html-xml-utils-7.5.ebuild b/app-text/html-xml-utils/html-xml-utils-7.5.ebuild
deleted file mode 100644
index 882068c2edf7..000000000000
--- a/app-text/html-xml-utils/html-xml-utils-7.5.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit multilib-minimal
-
-DESCRIPTION="A number of simple utilities for manipulating HTML and XML files"
-SRC_URI="http://www.w3.org/Tools/HTML-XML-utils/${P}.tar.gz"
-HOMEPAGE="http://www.w3.org/Tools/HTML-XML-utils/"
-
-LICENSE="W3C"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-linux ~ppc-macos ~x86-macos"
-
-RESTRICT="test"
-
-RDEPEND="net-misc/curl"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	default
-	sed -e "/doc_DATA = COPYING/d" -i Makefile.in || die
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf
-}
-
-src_compile() {
-	multilib-minimal_src_compile
-}
-
-src_install() {
-	multilib-minimal_src_install
-}
diff --git a/app-text/html-xml-utils/html-xml-utils-7.6.ebuild b/app-text/html-xml-utils/html-xml-utils-7.6.ebuild
deleted file mode 100644
index 882068c2edf7..000000000000
--- a/app-text/html-xml-utils/html-xml-utils-7.6.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit multilib-minimal
-
-DESCRIPTION="A number of simple utilities for manipulating HTML and XML files"
-SRC_URI="http://www.w3.org/Tools/HTML-XML-utils/${P}.tar.gz"
-HOMEPAGE="http://www.w3.org/Tools/HTML-XML-utils/"
-
-LICENSE="W3C"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-linux ~ppc-macos ~x86-macos"
-
-RESTRICT="test"
-
-RDEPEND="net-misc/curl"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	default
-	sed -e "/doc_DATA = COPYING/d" -i Makefile.in || die
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf
-}
-
-src_compile() {
-	multilib-minimal_src_compile
-}
-
-src_install() {
-	multilib-minimal_src_install
-}
diff --git a/app-text/html-xml-utils/html-xml-utils-7.7.ebuild b/app-text/html-xml-utils/html-xml-utils-7.7.ebuild
index 882068c2edf7..d684951d281f 100644
--- a/app-text/html-xml-utils/html-xml-utils-7.7.ebuild
+++ b/app-text/html-xml-utils/html-xml-utils-7.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.w3.org/Tools/HTML-XML-utils/"
 
 LICENSE="W3C"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 ppc ppc64 x86 ~x86-linux ~ppc-macos ~x86-macos"
 
 RESTRICT="test"
 
diff --git a/app-text/html-xml-utils/html-xml-utils-7.4.ebuild b/app-text/html-xml-utils/html-xml-utils-7.8.ebuild
index 080b0bdc12c5..29a3b176a17e 100644
--- a/app-text/html-xml-utils/html-xml-utils-7.4.ebuild
+++ b/app-text/html-xml-utils/html-xml-utils-7.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/app-text/html2text/Manifest b/app-text/html2text/Manifest
index f93fdd93ad6b..c52db3aab518 100644
--- a/app-text/html2text/Manifest
+++ b/app-text/html2text/Manifest
@@ -1,8 +1,10 @@
 AUX html2text-1.3.2a-compiler.patch 247 BLAKE2B 83c719d6dbbc18e347ca45e6e0df8958a615fb2c1d1f27119978d6efd15aeec6a32fa83e0d9524e4b5863dfec88787427e7c5f2757f8c5eafb0ee4d88fb96860 SHA512 f7c2192e65fe6976ac9d21d45fcb3eb9cd460314945fd9e8f62ada1189935c3799aea43b6ebb15a86b6f313fb95e4115d6aa67a148f11d1b8774d9ca115b538e
 AUX html2text-1.3.2a-urlistream-get.patch 186 BLAKE2B 600aac564090a318cd600858360b16e4cedc0005981d8c392ca450b7182fd0497cdbed6388d9429406756734ba2a204baaf314b73a2f69978574698e631289c2 SHA512 388c30725c72e3d7b372544b4a4fec871d3069fe050aec3212b047d8bdb0c31575e2703e46374b3b7d0422ca8cf2ce2f2d3960d56c32977d85a93d4d94b41659
 DIST html2text-1.3.2a.tar.gz 130088 BLAKE2B 97ca951ae7c501cefca78378683de7fb3c329905298de9e9675303485f3f4a83c5de39c90c8f9c0fe20b73d1e2b70897ee47cdabade9b3791a46f02625bbef05 SHA512 8ec2c17849615b8b78b6f7e9066e5bcfb419b293ffe98323ed0942e891993e205ef37ddfd2839eb12b6bad561989027aea0ba2d57eb7193d424715f93ded90e5
+DIST html2text-2.0.0.tar.gz 162901 BLAKE2B 878ff3bfb55523f2bd2721f2320b55729ac84e250fe651c2347b8cfb0f6d524c18c4e820e255b474d59b5179c255b8acbfc51f7213539979b5d3977c42383ebd SHA512 94f2cf3f5085307cc2cf5e264b35621029e57142d6e4d832eee2c447860338c947687be5e8c81367696b0b04432a44537a1545a820991c621b4036393ad6f4e8
 DIST patch-amd64-html2text-1.3.2a.diff 2230 BLAKE2B 332adeeceed512a2c5bfc01985efbaa4db5ea64b3e4ef8be8b880754524771de2e11b3a2efc55bce154bedc9e598231a1b5bcfe10e915b833d6dbcbcd9e46dc9 SHA512 2a421a20aec8a547bbdf54b81e30a6a1d4cf093e7ad67b27158f0c7248ca0abadd8d96ce0a27adcdd375012db6fd21f61f42a8343bfd910cd8a9720c0a043be1
 DIST patch-utf8-html2text-1.3.2a.diff 29499 BLAKE2B ffc0ea8d89d9e9c9dfa89c2369016685a6af1403a6e71787df2724b72c74c8f774d8d92278a1aaeb90f47d34c8de4c889a7bf4edc02a00e3c97955ea624cfa71 SHA512 be31251471b221a38d291420d5f23e01d5017c20d953064c33ca3dd148543ae877ab584c16fcb01df1341abdb02494b05d08fdcf94bf70bad6b510ee8fac3376
 EBUILD html2text-1.3.2a-r2.ebuild 968 BLAKE2B 00c6c5b53923a5954ea71126a4bd47cbe437a1482f0da36a44bc8862cf92f03fc6ba69a328e8e80e0dd61ec0a41eb35e66375ec940bf57fd98c1c68e5eb228c4 SHA512 fa461dcf03442c9b9d3d4e19ebdc6005f4dce9749120fba622d9aac7dfa2fe60fb3b33d4d701e67207869deedf98bb64089d8a03f2b77e4eaf8a8b620bb23964
-EBUILD html2text-9999.ebuild 759 BLAKE2B a4c2524bf3b2445986a9796725e8ce29a14fa5bb90d5908de154d2bb6ce2dcbdbd5815bc000accd4595d8cf6226fff3c7e1a1fbec870c8e0cc0b1d644fd37ac6 SHA512 4b33544b93d2943af6d8c2be96c578ccd833ef15931d4cf33a3a1e183fb750cd1dff5e8405c576ff43a8bb1f31dffef61c525e188c2f8e1202b8dbf62d4589c9
+EBUILD html2text-2.0.0.ebuild 897 BLAKE2B 76d33a641400dd2f26fd569530ecdf6835e9713b031f24e66c547b4a6abb98af435599de1f8a93e1e01dc4ca72a00074ee0f3aaba637214d5371749208d8d859 SHA512 b5b8222d66777f437be3e8ab747a920aa702ed3e8fac45723ab0dbcf162205efb53394722880a4e3dc1729d8e94085e2e612dc189fa90ab65f5ff4a1348d7633
+EBUILD html2text-9999.ebuild 897 BLAKE2B 76d33a641400dd2f26fd569530ecdf6835e9713b031f24e66c547b4a6abb98af435599de1f8a93e1e01dc4ca72a00074ee0f3aaba637214d5371749208d8d859 SHA512 b5b8222d66777f437be3e8ab747a920aa702ed3e8fac45723ab0dbcf162205efb53394722880a4e3dc1729d8e94085e2e612dc189fa90ab65f5ff4a1348d7633
 MISC metadata.xml 248 BLAKE2B 60e4295b22f6f36039547e98305ae072755044f6516df2e29e65768732900ffc93dac9cbcf1da9e6c731403a62cf272f2f378d0641bd466974f8a234235c862a SHA512 f6fee7363592cb9dcd666011806321b791fb84bf0719fb2454d1f3ceb738650184286c17a13684c077bacd1a93581a71accfe9cef74adcaf40dfda7d8a167d13
diff --git a/app-text/html2text/html2text-2.0.0.ebuild b/app-text/html2text/html2text-2.0.0.ebuild
new file mode 100644
index 000000000000..564b1370c781
--- /dev/null
+++ b/app-text/html2text/html2text-2.0.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+if [[ ${PV} == *9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/grobian/html2text.git"
+else
+	SRC_URI="https://github.com/grobian/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="HTML to text converter"
+HOMEPAGE="https://github.com/grobian/html2text"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+src_prepare() {
+	default
+	tc-export CXX
+}
+
+src_compile() {
+	emake LDFLAGS="${LDFLAGS}" CXXFLAGS="${CXXFLAGS}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" \
+		PREFIX="${EPREFIX}/usr" \
+		MANDIR="${EPREFIX}/usr/share/man" \
+		DOCDIR="${EPREFIX}/usr/share/doc/${P}" \
+		install
+}
diff --git a/app-text/html2text/html2text-9999.ebuild b/app-text/html2text/html2text-9999.ebuild
index 1e7099098c7f..564b1370c781 100644
--- a/app-text/html2text/html2text-9999.ebuild
+++ b/app-text/html2text/html2text-9999.ebuild
@@ -9,8 +9,8 @@ if [[ ${PV} == *9999* ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/grobian/html2text.git"
 else
-	SRC_URI=""
-	KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+	SRC_URI="https://github.com/grobian/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="HTML to text converter"
diff --git a/app-text/hyperestraier/Manifest b/app-text/hyperestraier/Manifest
index 5463072a5cd1..8c3ba5a95923 100644
--- a/app-text/hyperestraier/Manifest
+++ b/app-text/hyperestraier/Manifest
@@ -2,5 +2,5 @@ AUX hyperestraier-configure.patch 12359 BLAKE2B 52fb2210ee4945c07fcd4e9812be052a
 AUX hyperestraier-perl.patch 844 BLAKE2B fd221a027e47ed7582e697a8104d1ef82d66b87919f20c82f185b9167ad03ae6b9f0b6996b47a99e58fb42443f1c1b1c9f53a6badab935361b26f8693b680694 SHA512 73c7bd659d80464baf1d28a0eed69c9fdb3052a62aa46dc0b56f2ba6f75d458531dc6023684bd92b22b7fc4b79869ccd82e835827096b163faee0f94b0615465
 AUX hyperestraier-ruby19.patch 5143 BLAKE2B c9ea3c9e045583dee3ca119ebea07946522c50b00aba4d94fc40f7172925b9aedb8cbdc88e087a87590422566b12269641511c2c1c0a484390b1c2fa8bd1fecc SHA512 fcae611f594eeb35b6aca6eb1139304538793afc6b794e8dee1a59243d5da216f364165c90e7cf7691ed9a7f38a610ba27f37c2eef2baa4042c4a993cbfefb2a
 DIST hyperestraier-1.4.13.tar.gz 1014600 BLAKE2B 02be7cd374c47094dedd239e967dbbe5045a77302125861541dbf4d5fc60d488968718fd6b9ca57b88aac96cf2cfe73397af6bbc3d53ff6e983063ed98748e70 SHA512 ec97f487bb0e085f74222106fc5fab227c8c02ee8d736c0b4adef57ec0e4310f829ac59fff5a1c92321786e89bbc2a059a0acff6ab0e5844b83627567bb265fc
-EBUILD hyperestraier-1.4.13.ebuild 3518 BLAKE2B 7e6b24b191afaffb73d4da93aca67a812bbf1df135df3241c2d2a3d7327e31fcb5b1b7afc95645d32f6f3b14d49d92e7d74475207d9043c1e017e137ec624d51 SHA512 3a2ee91a27792f2c9f62cb1da0911be52ce35ebec8201ff52a40a7ec885288138ec567ff0880a5f43f372694175fb05719487d857f6ed5aca0def948efd197c1
-MISC metadata.xml 423 BLAKE2B 188de835ec6f287d3a72451770f6b7f8c93758c6579b31182bd918127b9dd3c91c13813451d611d4cf24e4dd29eee21f9b214b8545250ac23e26cc696ffee719 SHA512 60323531c2e899eed9db9635ecc0cf11d1482738006e86bbcdfb74e931b1e0ce1cc7741619d3b473d504c35d4a73f4542e2e6904e75208a4beb818fcf7d06723
+EBUILD hyperestraier-1.4.13.ebuild 3589 BLAKE2B 8fbd49741c321fcb758048adc62e32447aee6146ea91512ba7cefaddbbfc8489117e3f368970d98035575e6c984e27d4eb3e922ed95e73ed59fceae6505c82e4 SHA512 adf4bfceeb47beae2a7dafe52382b018d8e81d3314a61b491b3419b6add57b07e2312bc6b3aac4d21ddff46c20ec9679f3418b03963dfb82f9d632877efb531f
+MISC metadata.xml 440 BLAKE2B 5c3edd49e5590ef45d48db13de2f18aa00f332fe955b03b58439a05d3cf8d4ab623b1df6fb39aad7a6f74bef0f8072cf3a097c30be66793957b3cfcc5c35ae9d SHA512 421891e359bfbdafa6759bbaed59a430cbb6bef6bacf0109bb523fe17a19a5804fbdba26ff6cfd00ba19b5fff3d6aca60bd56fd5facbd0e3831f8a34368f142a
diff --git a/app-text/hyperestraier/hyperestraier-1.4.13.ebuild b/app-text/hyperestraier/hyperestraier-1.4.13.ebuild
index d2a6c0238428..9393122cd47e 100644
--- a/app-text/hyperestraier/hyperestraier-1.4.13.ebuild
+++ b/app-text/hyperestraier/hyperestraier-1.4.13.ebuild
@@ -7,8 +7,6 @@ RUBY_OPTIONAL="yes"
 
 inherit autotools java-pkg-opt-2 perl-functions ruby-ng
 
-IUSE="bzip2 debug java lzo mecab perl ruby +zlib"
-
 DESCRIPTION="a full-text search system for communities"
 HOMEPAGE="https://fallabs.com/hyperestraier/"
 SRC_URI="https://fallabs.com/${PN}/${P}.tar.gz"
@@ -16,6 +14,7 @@ SRC_URI="https://fallabs.com/${PN}/${P}.tar.gz"
 LICENSE="LGPL-2.1"
 KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ppc ppc64 sparc x86"
 SLOT="0"
+IUSE="bzip2 debug java lzo mecab perl ruby static-libs +zlib"
 
 RDEPEND="dev-db/qdbm
 	bzip2? ( app-arch/bzip2 )
@@ -186,6 +185,7 @@ src_install() {
 	emake DESTDIR="${D}" MYDOCS= install
 	einstalldocs
 	he_foreach_api
+	use static-libs || find "${ED}" -name '*.a' -delete || die
 
 	if use perl; then
 		perl_delete_module_manpages
diff --git a/app-text/hyperestraier/metadata.xml b/app-text/hyperestraier/metadata.xml
index 63e7b3c8bb44..e89da165177a 100644
--- a/app-text/hyperestraier/metadata.xml
+++ b/app-text/hyperestraier/metadata.xml
@@ -1,14 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>hattya@gentoo.org</email>
-  </maintainer>
-  <maintainer type="project">
-    <email>cjk@gentoo.org</email>
-    <name>Cjk</name>
-  </maintainer>
-  <use>
-    <flag name="mecab">Enable <pkg>app-text/mecab</pkg> support for Estraier</flag>
-  </use>
+	<maintainer type="person">
+		<email>hattya@gentoo.org</email>
+		<name>Akinori Hattori</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
+	<use>
+		<flag name="mecab">Enable <pkg>app-text/mecab</pkg> support for Estraier</flag>
+	</use>
 </pkgmetadata>
diff --git a/app-text/libspectre/Manifest b/app-text/libspectre/Manifest
index 2bc2c7c0d92f..273f631876f1 100644
--- a/app-text/libspectre/Manifest
+++ b/app-text/libspectre/Manifest
@@ -2,5 +2,5 @@ AUX libspectre-0.2.0-interix.patch 654 BLAKE2B 5be37013c202c2191c8169ebd5b769737
 DIST libspectre-0.2.8.tar.gz 421791 BLAKE2B bbefa06cf80ecb91f0f780493e1829eadc34061b6f2b3004f9ae01e06fc4609edd440df290be9ff1c9f43e580b53791aae033feb4115743a0f03f703bc18e0c7 SHA512 ebbe7f6adcbc7f7d6af61f24e23b114116c878755dbe90f1163546c1284a005b4d539be01986c1f940611e84141ca19768b8effc2abf1013606da7c93547da86
 DIST libspectre-0.2.9.tar.gz 433384 BLAKE2B ed75a7013763a86c0f0702e0e47dcfb8401db6c957ed4851ecc85e27db6a49c8d4dae6443b302bcce5b0ae0da18dce3294a010eee5531a253020a650c19388c5 SHA512 7c24b5c83c6d356c89417d09dc76566afbe886ec189fe80d030a239c23ad25b061db071768117fa06805aa3d86f749fb232b7491bd7d467f26a40e348e74d5d2
 EBUILD libspectre-0.2.8.ebuild 1089 BLAKE2B ee022b1c6cb7ca03c227c14a230e2275c07ef04c68fa58e140d250a2280d344949f8f2d1afed6ac78a12e9fa622ab34878dc017a647ef2bc89e8bdb8b97461f0 SHA512 c610aaca45b156d883188f1fc661cf0972d9fbba3bbac5c2535ed41c9692713d49a6691410d4d0e4ca44c6fe987a2d04d81d459ecf7b1d90e9e06f92acc4f9c1
-EBUILD libspectre-0.2.9.ebuild 1142 BLAKE2B 30f9dbe411a2981fbc30ae2182f829449f9a5a560142a30c5df54ed0ee0bae9c6fb08895e0dbfa30b2475947e132c441f83253cf1b8be6b3ba2a274f8bdde632 SHA512 289d0bcc10ccb6ef3a218dabacdae54e81cbdc80b5ecfcc46142990ecc722763daddd652c7118f77fb818d76d482beee2c03c8b3751b83ddbe73ff503692eb20
+EBUILD libspectre-0.2.9.ebuild 1136 BLAKE2B 193aecdd217e2b1d6c06216ece1f22a3f001a3c8873e4ab77499e8fba209a2aa3c029eeeea0a695acb4e046d8afc5faaf29baced0f4aad4897b4fc3fb469e978 SHA512 3c705f4bd1e41180ad02d51d4e84fe9f9270e163247a1a64ac228152e1f129b75e967ebec92eac8a930fcead7a31e7027016238945e891f20dc1a42d0567fc1e
 MISC metadata.xml 232 BLAKE2B b8ca675b002ba96d45a3afe7b6dd9f0e74d21db87eb002f72bae4e23fd49602115a18b372084596fdc09c3dccef80ae95ab540dad93fdf5dab0c9fb34f5d28db SHA512 21ba416ac701f1c9deb55d07f8afbf9da930fb04d274d84c5cf0df5e549554059959228ee6a4b8523d985fe0762af1a7c36aaefcb0e5b3c7baa5866e2841cfb4
diff --git a/app-text/libspectre/libspectre-0.2.9.ebuild b/app-text/libspectre/libspectre-0.2.9.ebuild
index 60f16522aa3a..0d295f6fe89e 100644
--- a/app-text/libspectre/libspectre-0.2.9.ebuild
+++ b/app-text/libspectre/libspectre-0.2.9.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://libspectre.freedesktop.org/releases/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
 IUSE="debug doc"
 
 BDEPEND="
diff --git a/app-text/nfoview/Manifest b/app-text/nfoview/Manifest
index f65920b37b5d..55fd952b377a 100644
--- a/app-text/nfoview/Manifest
+++ b/app-text/nfoview/Manifest
@@ -1,8 +1,6 @@
-DIST nfoview-1.26.tar.gz 117468 BLAKE2B 7fec761774ee66f1f5845d2d49cf99644d522c6fe402bdfd578e12371b58b3ac5a80b77959c92531ff54362c2234d043fa219b50730158c91310ba67b491f729 SHA512 2e697e3a49aa85fe0865ad9f281ea830e692335682658061f2aaaa1c5ed6ccb3dbd822dab244190ae0521ce237fbc3d91480da4c1229548f0fd5a74df712e336
 DIST nfoview-1.27.1.tar.gz 60211 BLAKE2B 777d9f42a08a17d3790996ff76819a0b74c6e1f01625019259524e6e5cee9afc72ae463085071e4a23cefeebaf5b14f1bbeae949446356ed1aaebebaaf53e230 SHA512 7066995954997a20aec27ff820c0f0a067835e219f9029f696b2885a85c4714b32fc8d474291433f64d9b28e81e5f4c24989a6447affc7b206cef453342a05d2
-DIST nfoview-1.27.tar.gz 60094 BLAKE2B 3186de6d04b50aa4388f606a49f8c2f13a0fe3494d49a1dbbd2ffc84cc039f03f47223e3aed469c32c3fbb01d277cba7f53290056dbcc7fec8e0eeec7ebcb596 SHA512 157257f9f289bdeac140054320ad43893c73995e11e6ccc91ebd2ca53878f00d45945c4e3ac3c11ec2f589a0349598f96dfecad3b0e3cfbe06e5a036bcedc3b5
-EBUILD nfoview-1.26.ebuild 817 BLAKE2B 47ada35bd06c2a1c43d78f598de8858e6a7bafcd9dc79987515155bbccdb4922288fb8374db2b3413c545bf7f2055f70a1eeda8b2f35009f6314424dec48b276 SHA512 56111d9d3a08543a698ef7319ca3ed2312955f0b611ce7069f24d6ce3957d30cc884b4ea9ec37f8749d31956b76c17786221c5829a9cce6e1dd0dbce640d1386
+DIST nfoview-1.28.tar.gz 61164 BLAKE2B 7fb1f150d343d5133e411486f3bff7315765187920dc5821de7d717f3381b6126263585a23fdb7847403ae992ee98b7503f7313a312adb0e6b2fb992e69da4a8 SHA512 652ed3a5dd3cad547c6c0f93a0c686c42e9fc58e2f90a682432cbcb865a1b6ab6cb55424ed68128718c0c867ad353d170ecf54619f7006445cb9761bced2bbd3
 EBUILD nfoview-1.27.1.ebuild 872 BLAKE2B 7b70a94c6144642e519476ccf2f44d1a07168493ff23b460237bbe9d62569f98fc0d812a46bc45674198ff0cbee091275fb63bf98369d42915c257f9b41f85dc SHA512 1b0b399f1ef009998b47d46f0d45f2130ef1cc6d62d50c993eb2be95f118e4d1afce962868763d4c177a74744a8b968312c2910c92a4723a29409f0741544f61
-EBUILD nfoview-1.27.ebuild 842 BLAKE2B 0b41463fa89d8dde1235c8609d728e9c696246fd1e6e252aad937ae238240127c832ab27e2592c93ba86a2c7150409501a70c918b584581dcfd51854a4abf717 SHA512 f14d92ccde72f6c5f72feb3b6b7f068f9fe26f3ddf86b0fff3a588fcb6ab829d1a042366fdf074b7876bf74f7786a3ed3e3cf487508d2dc3582f9c6d1d7d485a
+EBUILD nfoview-1.28.ebuild 872 BLAKE2B 0e0ea4b94556b7221137cbf1d4bde727854a8318b0d0e32f60951acf3df9f9945986ff1d31b2b41d6328d073bc1ea5aed073ed4a575711a7b694cc4003c67393 SHA512 3595e083ab06bcc9fdd85e6035e4ad380416e6484534e142b1e15b416ed98ce0627af3ab6093bff01bf467a8bf4c6267c2bdb47d649c664719fb6cf043586ae7
 EBUILD nfoview-9999.ebuild 817 BLAKE2B 47ada35bd06c2a1c43d78f598de8858e6a7bafcd9dc79987515155bbccdb4922288fb8374db2b3413c545bf7f2055f70a1eeda8b2f35009f6314424dec48b276 SHA512 56111d9d3a08543a698ef7319ca3ed2312955f0b611ce7069f24d6ce3957d30cc884b4ea9ec37f8749d31956b76c17786221c5829a9cce6e1dd0dbce640d1386
 MISC metadata.xml 457 BLAKE2B fc1b77e74af5461b5ff1e772f60ef2c222f95860b1afb21828aa39d26342c241658e731d80bb937e694ff1195b0a079fb4134e60207539fa799ffdb6cd601c52 SHA512 65cd8b6021811a13d3a319b930afd8a090c5d15fe232e10d403c3ca8258685f6e118a224bdda7e6cbcff17bf72a409f5213a919554d20525c75efca06b1fcfc1
diff --git a/app-text/nfoview/nfoview-1.26.ebuild b/app-text/nfoview/nfoview-1.26.ebuild
deleted file mode 100644
index a6e9e5a10d68..000000000000
--- a/app-text/nfoview/nfoview-1.26.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1 gnome2-utils xdg-utils
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/otsaloma/nfoview.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/otsaloma/nfoview/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Simple viewer for NFO files, which are ASCII art in the CP437 codepage"
-HOMEPAGE="https://otsaloma.io/nfoview/"
-
-LICENSE="GPL-3+"
-SLOT="0"
-IUSE=""
-
-DEPEND="dev-python/pygobject:3[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}
-	media-fonts/terminus-font"
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/app-text/nfoview/nfoview-1.27.ebuild b/app-text/nfoview/nfoview-1.28.ebuild
index 568e5c1e57bd..ac3f5a722095 100644
--- a/app-text/nfoview/nfoview-1.27.ebuild
+++ b/app-text/nfoview/nfoview-1.28.ebuild
@@ -3,7 +3,8 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit distutils-r1 xdg-utils
 
@@ -26,7 +27,7 @@ BDEPEND="${PYTHON_DEPS}
 	sys-devel/gettext"
 DEPEND="dev-python/pygobject:3[${PYTHON_USEDEP}]"
 RDEPEND="${DEPEND}
-	media-fonts/terminus-font"
+	media-fonts/cascadia-code"
 
 pkg_postinst() {
 	xdg_icon_cache_update
diff --git a/app-text/pdfarranger/Manifest b/app-text/pdfarranger/Manifest
index 8e4f04ff0060..9d38ebba4bc0 100644
--- a/app-text/pdfarranger/Manifest
+++ b/app-text/pdfarranger/Manifest
@@ -1,3 +1,5 @@
 DIST pdfarranger-1.3.1.tar.gz 120834 BLAKE2B 5f429d479d130ec06e795c6cedc2aefa75f89b971b556901fc0bfba02038e36c4fd7b4233b5ce6d0dfb6252862176dc7b07192ab43e458090970a25648bb946e SHA512 6ac13447410477e9125da26adbf7123f7f5ffa25814a4c254247a5ff2d07eba6af0557eafb60b4c68ac5987c8e9e7888da21296fb6a74d31a3d0d763b1077918
+DIST pdfarranger-1.5.3.tar.gz 221208 BLAKE2B 2669a3be00d771542ba2449696de74d633fe31c1ab84ff368ea95ffd6e6f6bdd4d5bbb2b0b2cf1c2ddcddcba9e774f1870ee3c85735f54c832894e2093392042 SHA512 17960786b2197e4035b2c224cbeb8e6d14ca7690920a4366d3dcad8b19f890b52d5e95277372fe3011f3476a5be0c4f253eb4d3ee3b6a8df74e20468be124d8b
 EBUILD pdfarranger-1.3.1.ebuild 732 BLAKE2B d2f04362a6461b10b875fdc00e86e1f71534eefc87c5cea5f9b6ae7e3ea877ec07dd4debb1aaf39c13dd00f553cf09782b35d2a8d07e2159ce0cbd2d8424b6a6 SHA512 97d65731e892b00f5c3e22756c9ca02548982a7a88e5434d7abf76018deba2671d2b378cf9b5c0e0d5179516f6e88c8f8c7e5aa7428ad8c648e13f97f8a10074
+EBUILD pdfarranger-1.5.3.ebuild 732 BLAKE2B d2f04362a6461b10b875fdc00e86e1f71534eefc87c5cea5f9b6ae7e3ea877ec07dd4debb1aaf39c13dd00f553cf09782b35d2a8d07e2159ce0cbd2d8424b6a6 SHA512 97d65731e892b00f5c3e22756c9ca02548982a7a88e5434d7abf76018deba2671d2b378cf9b5c0e0d5179516f6e88c8f8c7e5aa7428ad8c648e13f97f8a10074
 MISC metadata.xml 622 BLAKE2B 5a11cb38ad122bd2408a114cfdd40e3a0ebd3cc897ede128cc7c5fd55df8c566d0cd342573bac3352f501fa935c293b890b71736d0ecaf7e5e5c2e25fac74418 SHA512 15cfc342f5df485547c0691362e3dcb5e4820158db143452b5439969325fe798dbad02f5ec50379bedae732a42163086e26c5b7472aab804af2c99df25611912
diff --git a/app-text/pdfarranger/pdfarranger-1.5.3.ebuild b/app-text/pdfarranger/pdfarranger-1.5.3.ebuild
new file mode 100644
index 000000000000..d42ba6dcc63b
--- /dev/null
+++ b/app-text/pdfarranger/pdfarranger-1.5.3.ebuild
@@ -0,0 +1,22 @@
+# 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 distutils-r1
+
+DESCRIPTION="Merge or split pdfs; rearrange, rotate, crop pages."
+HOMEPAGE="https://github.com/jeromerobert/pdfarranger"
+SRC_URI="https://github.com/jeromerobert/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+RDEPEND="dev-python/pikepdf[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP},cairo]
+	dev-python/pycairo[${PYTHON_USEDEP}]
+	x11-libs/gtk+:3[introspection]
+	x11-libs/pango[introspection]
+	app-text/poppler[introspection,cairo]"
+DEPEND="${RDEPEND}
+	dev-python/python-distutils-extra[${PYTHON_USEDEP}]"
diff --git a/app-text/qpdf/Manifest b/app-text/qpdf/Manifest
index 86a79a6ab0d5..6aa67aded2a8 100644
--- a/app-text/qpdf/Manifest
+++ b/app-text/qpdf/Manifest
@@ -1,7 +1,7 @@
+DIST qpdf-10.0.1.tar.gz 18399985 BLAKE2B 5e113790e7c2b48987c18aa7f562ff18f0efb544c48be8c36ba201ba1420168a7f32ebfe2e5754e8af679557df29093e0fd550c991b5201e4246be827952b3d3 SHA512 b73c0839b08905052d90ed78645cc9fb4fda4a0fa803db7b46f3d77a2c2f7e8cec52173834b1e1f008f3a3475a7d913362d22e1ebece11187a90c9035b81de94
 DIST qpdf-9.0.2.tar.gz 18168977 BLAKE2B 46b397f0e6a97804c5e8dcbfc9fd2278960d5afd459430c1790bb8f9080062cf661cf186ab386721ed7560dbd4abbea43e4d31914c0636502c5c11096c250fe2 SHA512 275ca81603d53601e4389cb34eaebea1c5d52b310ef28f3375fbeee255a28edf9375f03f31649f580dbc3df73b851a2c8498feb3dd7b30067955571b05c9e69c
-DIST qpdf-9.1.0.tar.gz 18285597 BLAKE2B ef86cd4192805761e121bcd112e071dacb4bc108335da0ba237476d9f1698e4ba630010e3266fb63d9aa5b97e0e778f76fe226613e91d351b93a53b9fc9abee7 SHA512 7561ffc366dbce9df58cc85ff18480b28b0d46de04733ba463139188bee95690f92cf0960a328619f0c9f34ce865598db490fa1c6aaa76ee87d2c034a5f7f57e
 DIST qpdf-9.1.1.tar.gz 18312457 BLAKE2B 0bbfaa782e46a911b20440bcf122d2745dde62de16423307cb02f7f3cd9a4976c79c7f6371322f793abfd8eaf9d5cc4f49b6854e58039595b5a488a2fec98d88 SHA512 008a11fef663a57ca173631f2053988023babea6c333cfe01db0ef955c8cd36d387ed9f2039f55bd5f9ca94c7a8e400461a09a15c5f89e03bc0817fdd0d3d585
+EBUILD qpdf-10.0.1-r1.ebuild 1344 BLAKE2B 90fedf92ea6fea520b7eea282a05cd2d8c98c00331fc34af6a1720bc66c98f54f732d9ff607e7279c2b9e609d2bfbf1d460b1489f71b7e732c0e299cd3dd71c0 SHA512 8d5484d57c7f8f0987ac3044951a8a7387f082f3a24920820dfbf350320d12219b2870fbeb83eb916281e494ad14ad5d80a1d60c1999a9e39718a407d7638f76
 EBUILD qpdf-9.0.2.ebuild 1275 BLAKE2B 734241fc7d46a3340ea6b5561b5a5bdeaeedcbc27df2cdbe1a56314ac3da57b8cd450ff0dc5413bc9eb05349d52382838b77fcdc37c675da84eae0318bdc4359 SHA512 d17952de2eed88b93d3236e80328c4816a30add65ff0bf3f6588530ec25d0d1e2e84724ff400216cce537a1e1013a243c5c54deea7d1ec6332aad763d6d161a1
-EBUILD qpdf-9.1.0.ebuild 1421 BLAKE2B fcf852c0c05df1b7699d7dbabe2d01861d41eff1cf3b14bac03fb07fd67a28923cc063dfc8e7111cb1ba20a2485a48c863f86669cf9bfd25849f13b0b66d2663 SHA512 6bd4a49cbfc8972b0bd5781ddc7cd175191156064ae512466556a26eaae36cd7f7a830442744cfe1110810216ac5a98fb20e34f7b8c202c7ebc8880c65357a63
 EBUILD qpdf-9.1.1-r1.ebuild 1209 BLAKE2B a41341bc00ad325e8fc52b7bb72cc93d9fa615a82452c436518cc26310678f3fa1148a72f1ea26c50da5a2b366d69d53327c3138eff72370d06ab6be9ccfa673 SHA512 e94d36930a5c3ed832630ada53181acd18d487ed81e387dcbb0ea1fc9b46d99ec1e336dc9e352888f10e3661c9e0a01469e6d2fef2fc83b5896f8b276305d747
 MISC metadata.xml 499 BLAKE2B 9f6462a9606763352f0c823f877d1a39ffa207a8354e800d64bdb4d7686de8391309e08296adf23ca6b6e5d6fc2150d72ca9b0fed36cd4574e51ae6d04e48341 SHA512 77915adba55eb2b0fa68af06fa30b84c50af0a4a26a3ee6fafa71f9c7a7a307451ab76291dfc87f90479f6a208cb29c8a6c8c7fd0d574455faa15c87f8ea8de7
diff --git a/app-text/qpdf/qpdf-9.1.0.ebuild b/app-text/qpdf/qpdf-10.0.1-r1.ebuild
index 156b5c7a2d93..5f164234bfe4 100644
--- a/app-text/qpdf/qpdf-9.1.0.ebuild
+++ b/app-text/qpdf/qpdf-10.0.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=7
@@ -10,29 +10,29 @@ SRC_URI="mirror://sourceforge/qpdf/${P}.tar.gz"
 LICENSE="|| ( Apache-2.0 Artistic-2 )"
 
 # subslot = libqpdf soname version
-SLOT="0/26"
+SLOT="0/28"
 
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~m68k-mint ~sparc-solaris"
-IUSE="doc examples perl static-libs test"
+IUSE="doc examples libressl ssl static-libs test"
 
 RESTRICT="!test? ( test )"
 
-CDEPEND="
+RDEPEND="
 	net-libs/gnutls:0=
 	sys-libs/zlib
 	virtual/jpeg:0=
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
 "
-DEPEND="${CDEPEND}
+DEPEND="${RDEPEND}
 	test? (
 		sys-apps/diffutils
 		media-libs/tiff
 		app-text/ghostscript-gpl[tiff]
 	)
 "
-# Only need perl for the installed tools.
-RDEPEND="${CDEPEND}
-	perl? ( >=dev-lang/perl-5.8 )
-"
 
 DOCS=( ChangeLog README.md TODO )
 
@@ -42,20 +42,16 @@ src_configure() {
 		--enable-crypto-gnutls
 		--enable-crypto-native
 		--with-default-crypto=gnutls
+		$(use_enable ssl crypto-openssl)
 		$(use_enable static-libs static)
 		$(use_enable test test-compare-images)
 	)
-	CONFIG_SHELL=/bin/bash econf "${myeconfargs[@]}"
+	CONFIG_SHELL="/bin/bash" econf "${myeconfargs[@]}"
 }
 
 src_install() {
 	default
 
-	if ! use perl ; then
-		rm "${ED}"/usr/bin/fix-qdf || die
-		rm "${ED}"/usr/share/man/man1/fix-qdf.1 || die
-	fi
-
 	if use examples ; then
 		dobin examples/build/.libs/*
 	fi
diff --git a/app-text/rpl/Manifest b/app-text/rpl/Manifest
index 858965ef43a7..fb18fdcf2301 100644
--- a/app-text/rpl/Manifest
+++ b/app-text/rpl/Manifest
@@ -1,3 +1,3 @@
-DIST rpl-1.5.5.tar.gz 11397 BLAKE2B 29511d894a7b3e67cfdf4378902219acedb0a0b85c4a9c8aa879f9cede8ad57aeefd91b21ee79ac01b924a64b2f48248896f31ffb6934a4f79dda135114ebca9 SHA512 f43af366b8fc34b6c4578841f50046170810187119eb0730405a082f64d5c095fd9d28fabf1f0fda1dad85f24e98047df4d695b39b7ea5b99d32efc18634000f
-EBUILD rpl-1.5.5-r1.ebuild 654 BLAKE2B 8942acb6231835355b71561ed36b7a8dfc0104ac25276b152e72dded58d7cdfdd8a1683164ce3676e0783b43664086f87157ed559edf53414aa6fd8515ba12c0 SHA512 c9b61a885c1bcca000002df4dc9b114444c1a490072b080b7318880517227d5929a05df26b172cec3a95c83e5d3c8d49cadd41a3c7263e095ad62451b84c12a8
+DIST rpl-1.6.7.tar.gz 21867 BLAKE2B ac523aa836312d6ed6db9eabaf9b6499ce00047ce1a4d35bf398f769036d65aa5b52c410b2110cf5bb14c31d782bc1c424bcd1b2a26692de28ca70fd452b18f1 SHA512 f853eae0ce0a82d864e72ecf3fd3f20fba10553357b23d0012ed22ee0efd57bbefea71095775f7215323d829057f6579aadfc006b6a893972e05039784dc5add
+EBUILD rpl-1.6.7.ebuild 710 BLAKE2B ce1dfe853ef5e91d5d729751c44c641c8d003074335262db7b01a549fd08c5319a42b4a05a80f328963bb504da3b8b6246d165a7dde73552a87f41905ba4bc87 SHA512 8d3bd5ab28972bff224ffd29874bb14d16936bd1db1a7ea3aca8e33e9e66375b7042c85c4d82e9a31d31bc8cff5f860dbb2b5e231338c2406cfd80f0cefc65db
 MISC metadata.xml 338 BLAKE2B 64a9c58a45097871d3d71b78a46857234cb27a5db16cd80b1dc9e7d9f4dfe650f605d1e8f1ba8a645d50d67b4e2ba21b56308e06aaae3cd264920705e5c4a8c3 SHA512 e8231d1fb1b810948ec4ff31afceaaffa7b6d3f0ed565118f8555cb0721de20dad9a845e213162b3b1619e2b20610e4df0843293df049e17f8e4e1977957104a
diff --git a/app-text/rpl/rpl-1.5.5-r1.ebuild b/app-text/rpl/rpl-1.5.5-r1.ebuild
deleted file mode 100644
index 11c7d47074cb..000000000000
--- a/app-text/rpl/rpl-1.5.5-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Intelligent recursive search/replace utility"
-HOMEPAGE="http://rpl.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~mips ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE=""
-
-python_prepare_all() {
-	iconv -f latin1 -t utf8 -o setup.py.new setup.py || die
-	mv setup.py.new setup.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	doman ${PN}.1
-}
diff --git a/app-text/rpl/rpl-1.6.7.ebuild b/app-text/rpl/rpl-1.6.7.ebuild
new file mode 100644
index 000000000000..4524edb28594
--- /dev/null
+++ b/app-text/rpl/rpl-1.6.7.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_7,3_8} )
+
+inherit distutils-r1
+
+DESCRIPTION="Intelligent recursive search/replace utility"
+HOMEPAGE="http://rpl.sourceforge.net/"
+SRC_URI="http://deb.debian.org/debian/pool/main/r/${PN}/${PN}_${PV}.orig.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~mips ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+
+#python_prepare_all() {
+#	iconv -f latin1 -t utf8 -o setup.py.new setup.py || die
+#	mv setup.py.new setup.py || die
+#	distutils-r1_python_prepare_all
+#}
+#
+#python_install_all() {
+#	distutils-r1_python_install_all
+#	doman ${PN}.1
+#}
diff --git a/app-text/sigil/Manifest b/app-text/sigil/Manifest
index e6ef6c9db863..4ed274ce4eee 100644
--- a/app-text/sigil/Manifest
+++ b/app-text/sigil/Manifest
@@ -1,11 +1,6 @@
+AUX sigil-1.2.1-qt5.15-fix.patch 1228 BLAKE2B 61c4b8de1d7e6a65668f45b6aadebb7c93bad6c82ed415caad3900f009f88f253aa10ca678c76580ef5d3b344cead91390b001aa824e49ad963a45ff259971d3 SHA512 f4a42fa135b03a218c4fa1d2460563d727f90de1a20482ab35bba8ebe2af8484863424664930ad01f14c20772a60c0d60f6472e287ecb69302140df8af6b7b3d
 DIST sigil-0.9.16.tar.gz 21241424 BLAKE2B 1e784768cfe98e08ac01f5a9c11ec8254f9a0211f69ee1eb479643cc83677f6fea43745bcb158ea178ac64eec87c2e0062e783af2fe7477e2e5e8faf4db24c46 SHA512 45358912527484a7c580db34733d30927938443096fbf23e969d966e140a20607a4d98e086149a5eeb620f2462efc9abd531988c1b5cd93c373e747d5e5cd20a
-DIST sigil-0.9.18.tar.gz 21396185 BLAKE2B a20a1465032371f9d7e567fff03c859adf4bd2264e9d803efeb3bdeb3b097eca826daa36824370848aea50fffb2b2b74b28568f7dca926565dfd0948d7ade030 SHA512 a8f669ffb76554268aae8aa0f85c6861f80def71e429b44b20ac9b231f3f7584839a82e7b6991f57ca1f2d1f023e24d1f37897bd048379e30565e9bdd7ee188a
-DIST sigil-1.0.0.tar.gz 21623303 BLAKE2B 5772316d3ffc78387f7fb9db1e88397756bf82c25513246033fe71f288d619844e9316f43b7f08b914e4f59912e42eea061079cd4b468de77087bf7a8ea46be0 SHA512 7fc440131fcdd9af60b10f703dcdaf946ac6c667cabbfc842addd68c6c9af35fc8808630a6cfee6db465e7faeec6a6b4f2c6bbe185426a0f845e47c16b02d7d1
-DIST sigil-1.1.0.tar.gz 21370163 BLAKE2B f5e522e6cd6335ef0a897fecdc99f40da5f6be902c02fadc8bf5817bc0e88c4bacab1075995f5da1fd6bbacb8759ab9f20c6810acfeb3736d033241d1ca6f2ed SHA512 855e973b76eee5f06c3efd7f693474c9ea9a30791d0519569696adc4d7737c2ea6036ae932828c7101e78e6903cbdc846a164ba7464ef6c6821b704092cb796e
 DIST sigil-1.2.1.tar.gz 21462439 BLAKE2B b615304d80ae1bc8b202398e4e00e25e6f13130ba5f27239d78cb847813fac6d13ddd868ed8daa496b5a5f2f37914603b3014b2c0ecb9f8ae2f0e5f6f2bdf84b SHA512 763648e5c77df9c34568790700f76a1793445f0ba061e2c8c2032c1de72bc5d5c0e0f671d87140df1b4404d571f6c1c73aa99c57208f7383aa2b0d50ed3c15a1
 EBUILD sigil-0.9.16-r1.ebuild 2960 BLAKE2B f3198426ecfe3f9e01a04a4741049a3e42e54c574a5e8df1500deb5cf632f41c32925b8fee9681da4287b1aaf63eb5c18be4c2372592fb5a7d07796c0fb099a6 SHA512 ce4c4428a22ca2ee06bd38a4cb05c45475a0a2b6ad766128bbfa9d4361ea5bcb756d9167a582e358ba1a80da53e1c1110e51b662a21a708f11b15102d4da35f3
-EBUILD sigil-0.9.18.ebuild 2784 BLAKE2B 33c8b03b32e4a20954f34e26c6e9f41dcc5d9f6f20cde6fb781d1fb3143dea6b58a87d87975df6b618745d5f2ddc22c9b8bb37fe9ef3721292e56cdde380b3d0 SHA512 4f0aabf83ea7cac03a43dee977f763b9631163a6e11003f9facfcef9ba946743b8c8d966fe6c0b996bfea5bb04dcdf010ae4f2b86b5c174239d08c8f95adefb1
-EBUILD sigil-1.0.0.ebuild 2102 BLAKE2B 62b2e071fcd1a6c817f37117864e1cc22b1b29e042de7e3141cc74de32d3dd592629eebc84588a966dd18f600faabe925f058be72b8d1e4e202eae1b5fa7a1c1 SHA512 1f9ca94bf37afa8c5196c1124f18a46777225e923de7cef0a1c5672914e4ff0c9fd08f6054fc2f36fc748b92f5aba08291623e0d0983e5068959be3f1e06a85e
-EBUILD sigil-1.1.0.ebuild 2102 BLAKE2B 62b2e071fcd1a6c817f37117864e1cc22b1b29e042de7e3141cc74de32d3dd592629eebc84588a966dd18f600faabe925f058be72b8d1e4e202eae1b5fa7a1c1 SHA512 1f9ca94bf37afa8c5196c1124f18a46777225e923de7cef0a1c5672914e4ff0c9fd08f6054fc2f36fc748b92f5aba08291623e0d0983e5068959be3f1e06a85e
-EBUILD sigil-1.2.1.ebuild 2015 BLAKE2B 1a2e7be85c8794763553e32cecc958cb60b093b5cac503b6452bd1d5d7f9b749334da36d31929d7975a16808975b6050779b5c54d348f8ee5b04db04461d48a6 SHA512 976f03e5885f5a41a8852b1a49322c9d0792b6d042582da9bc96a8c49fcb2af9baefb3379d165d3979b0a793937b2a5e759dd12c0f8036d8cf8bcc03eace7f7c
+EBUILD sigil-1.2.1-r1.ebuild 2064 BLAKE2B dac3f83421c2481340fe8d15511de050ea8c0b35e68813f750da9f167b77c2745879a348176d11eb88fbf5998109dc24a96e7695de636945a99e54ed4abd714f SHA512 cf8ac54594d499bbbd68b970785111ceec4653a1613b3d4a7b81f24d33573840ead7332a00dd098a8822b575532bea192e7c3803d7137e96783d8a4d65edd326
 MISC metadata.xml 932 BLAKE2B c7bf8b421a098f818c9a394cfe656f49fdf6349d762ca2bea588f24dbb0492ca426673f255dffe57dab54fde53408b6fe74bd2cd3b6bfbf31b9814c331de21ca SHA512 0e5c7366b3e0defbc8675c6a33313f6680bb51bc3b67963e79ff03d2f02aa201e5237af43645d1c0e6eb550fad17ca8f9ada9c85a9c4105ddb7a45ef487f726c
diff --git a/app-text/sigil/files/sigil-1.2.1-qt5.15-fix.patch b/app-text/sigil/files/sigil-1.2.1-qt5.15-fix.patch
new file mode 100644
index 000000000000..f15cfd4e9639
--- /dev/null
+++ b/app-text/sigil/files/sigil-1.2.1-qt5.15-fix.patch
@@ -0,0 +1,22 @@
+From 50280fae48717e76d56685bf0fda19783c8904e1 Mon Sep 17 00:00:00 2001
+From: Doug Massay <douglaslmassay@gmail.com>
+Date: Fri, 5 Jun 2020 20:25:41 -0400
+Subject: [PATCH] Fix Qt5.15.x behavior-change breakage
+
+---
+ src/MainUI/MainWindow.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/MainUI/MainWindow.cpp b/src/MainUI/MainWindow.cpp
+index 64202e113..de7e7f97f 100644
+--- a/src/MainUI/MainWindow.cpp
++++ b/src/MainUI/MainWindow.cpp
+@@ -4289,7 +4289,7 @@ void MainWindow::ReadSettings()
+     web_settings->setAttribute(QWebEngineSettings::JavascriptCanOpenWindows, false);
+     web_settings->setAttribute(QWebEngineSettings::JavascriptCanAccessClipboard, false);
+     web_settings->setAttribute(QWebEngineSettings::LocalContentCanAccessRemoteUrls, (settings.remoteOn() == 1));
+-    web_settings->setAttribute(QWebEngineSettings::LocalContentCanAccessFileUrls, false);
++    web_settings->setAttribute(QWebEngineSettings::LocalContentCanAccessFileUrls, true);
+     web_settings->setAttribute(QWebEngineSettings::PluginsEnabled, false);
+     web_settings->setAttribute(QWebEngineSettings::AutoLoadIconsForPage, false);
+     web_settings->setAttribute(QWebEngineSettings::FocusOnNavigationEnabled, true);
diff --git a/app-text/sigil/sigil-0.9.18.ebuild b/app-text/sigil/sigil-0.9.18.ebuild
deleted file mode 100644
index 697fccf8b9f1..000000000000
--- a/app-text/sigil/sigil-0.9.18.ebuild
+++ /dev/null
@@ -1,100 +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} )
-PYTHON_REQ_USE="tk"
-
-inherit cmake python-single-r1 readme.gentoo-r1 xdg-utils
-
-DESCRIPTION="Multi-platform WYSIWYG ebook editor for ePub format"
-HOMEPAGE="https://sigil-ebook.com/ https://github.com/Sigil-Ebook/Sigil"
-SRC_URI="https://github.com/Sigil-Ebook/Sigil/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+ Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+plugins system-mathjax"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	app-text/hunspell:=
-	dev-libs/boost:=[threads]
-	dev-libs/libpcre:3=[pcre16]
-	dev-libs/xerces-c[icu]
-	$(python_gen_cond_dep \
-		'dev-python/css-parser[${PYTHON_MULTI_USEDEP}]
-		dev-python/lxml[${PYTHON_MULTI_USEDEP}]
-		dev-python/six[${PYTHON_MULTI_USEDEP}]')
-	>=dev-qt/qtconcurrent-5.12:5
-	>=dev-qt/qtcore-5.12:5
-	>=dev-qt/qtgui-5.12:5
-	>=dev-qt/qtprintsupport-5.12:5
-	>=dev-qt/qtwebengine-5.12:5[widgets]
-	>=dev-qt/qtwidgets-5.12:5
-	sys-libs/zlib[minizip]
-	plugins? ( $(python_gen_cond_dep \
-		'dev-python/chardet[${PYTHON_MULTI_USEDEP}]
-		dev-python/cssselect[${PYTHON_MULTI_USEDEP}]
-		dev-python/cssutils[${PYTHON_MULTI_USEDEP}]
-		dev-python/html5lib[${PYTHON_MULTI_USEDEP}]
-		dev-python/pillow[${PYTHON_MULTI_USEDEP}]
-		dev-python/regex[${PYTHON_MULTI_USEDEP}]') )
-	system-mathjax? ( dev-libs/mathjax )
-"
-DEPEND="${RDEPEND}"
-
-BDEPEND="
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig
-"
-
-S="${WORKDIR}/Sigil-${PV}"
-
-DOCS=( ChangeLog.txt README.md )
-
-DOC_CONTENTS="From Sigil's release notes:
-When you fire up Sigil for the very first time:
-navigate to the new General Preferences and select the default
-epub version you plan to work with (epub2 or epub3) so that new
-empty ebooks start with the correct code.
-if you plan to work with epub3 epubs, you should change your
-PreserveEntities setting to use ONLY NUMERIC entities.
-
-For example use & # 1 6 0 ; for non-breaking spaces and etc.
-
-We strongly recommend enabling Mend On Open in your settings
-for best performance with Sigil."
-
-src_configure() {
-	python_export PYTHON_LIBPATH PYTHON_INCLUDEDIR
-	local mycmakeargs=(
-		-DINSTALL_BUNDLED_DICTS=0
-		-DUSE_SYSTEM_LIBS=1
-		-DSYSTEM_LIBS_REQUIRED=1
-		-DPYTHON_EXECUTABLE="${PYTHON}"
-		-DPYTHON_LIBRARY="${PYTHON_LIBPATH}"
-		-DPYTHON_INCLUDE_DIR="${PYTHON_INCLUDEDIR}"
-	)
-	use system-mathjax && mycmakeargs+=( -DMATHJAX_DIR="${EPREFIX}"/usr/share/mathjax )
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	python_fix_shebang "${ED}"/usr/share/sigil/
-	python_optimize "${ED}"/usr/share/sigil/
-	DISABLE_AUTOFORMATTING=true readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/app-text/sigil/sigil-1.0.0.ebuild b/app-text/sigil/sigil-1.0.0.ebuild
deleted file mode 100644
index 0d5c548e6440..000000000000
--- a/app-text/sigil/sigil-1.0.0.ebuild
+++ /dev/null
@@ -1,83 +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} )
-PYTHON_REQ_USE="tk"
-
-inherit cmake python-single-r1 xdg-utils
-
-DESCRIPTION="Multi-platform WYSIWYG ebook editor for ePub format"
-HOMEPAGE="https://sigil-ebook.com/ https://github.com/Sigil-Ebook/Sigil"
-SRC_URI="https://github.com/Sigil-Ebook/Sigil/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+ Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+plugins system-mathjax"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	app-text/hunspell:=
-	dev-libs/libpcre:3=[pcre16]
-	$(python_gen_cond_dep \
-		'dev-python/css-parser[${PYTHON_MULTI_USEDEP}]
-		dev-python/lxml[${PYTHON_MULTI_USEDEP}]
-		dev-python/six[${PYTHON_MULTI_USEDEP}]')
-	>=dev-qt/qtconcurrent-5.12:5
-	>=dev-qt/qtcore-5.12:5
-	>=dev-qt/qtgui-5.12:5
-	>=dev-qt/qtprintsupport-5.12:5
-	>=dev-qt/qtwebengine-5.12:5[widgets]
-	>=dev-qt/qtwidgets-5.12:5
-	sys-libs/zlib[minizip]
-	plugins? ( $(python_gen_cond_dep \
-		'dev-python/chardet[${PYTHON_MULTI_USEDEP}]
-		dev-python/cssselect[${PYTHON_MULTI_USEDEP}]
-		dev-python/cssutils[${PYTHON_MULTI_USEDEP}]
-		dev-python/html5lib[${PYTHON_MULTI_USEDEP}]
-		dev-python/pillow[${PYTHON_MULTI_USEDEP}]
-		dev-python/regex[${PYTHON_MULTI_USEDEP}]') )
-	system-mathjax? ( dev-libs/mathjax )
-"
-DEPEND="${RDEPEND}"
-
-BDEPEND="
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig
-"
-
-S="${WORKDIR}/Sigil-${PV}"
-
-DOCS=( ChangeLog.txt README.md )
-
-src_configure() {
-	python_export PYTHON_LIBPATH PYTHON_INCLUDEDIR
-	local mycmakeargs=(
-		-DINSTALL_BUNDLED_DICTS=0
-		-DUSE_SYSTEM_LIBS=1
-		-DSYSTEM_LIBS_REQUIRED=1
-		-DPYTHON_EXECUTABLE="${PYTHON}"
-		-DPYTHON_LIBRARY="${PYTHON_LIBPATH}"
-		-DPYTHON_INCLUDE_DIR="${PYTHON_INCLUDEDIR}"
-	)
-	use system-mathjax && mycmakeargs+=( -DMATHJAX_DIR="${EPREFIX}"/usr/share/mathjax )
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	python_fix_shebang "${ED}"/usr/share/sigil/
-	python_optimize "${ED}"/usr/share/sigil/
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/app-text/sigil/sigil-1.1.0.ebuild b/app-text/sigil/sigil-1.1.0.ebuild
deleted file mode 100644
index 0d5c548e6440..000000000000
--- a/app-text/sigil/sigil-1.1.0.ebuild
+++ /dev/null
@@ -1,83 +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} )
-PYTHON_REQ_USE="tk"
-
-inherit cmake python-single-r1 xdg-utils
-
-DESCRIPTION="Multi-platform WYSIWYG ebook editor for ePub format"
-HOMEPAGE="https://sigil-ebook.com/ https://github.com/Sigil-Ebook/Sigil"
-SRC_URI="https://github.com/Sigil-Ebook/Sigil/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+ Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+plugins system-mathjax"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	app-text/hunspell:=
-	dev-libs/libpcre:3=[pcre16]
-	$(python_gen_cond_dep \
-		'dev-python/css-parser[${PYTHON_MULTI_USEDEP}]
-		dev-python/lxml[${PYTHON_MULTI_USEDEP}]
-		dev-python/six[${PYTHON_MULTI_USEDEP}]')
-	>=dev-qt/qtconcurrent-5.12:5
-	>=dev-qt/qtcore-5.12:5
-	>=dev-qt/qtgui-5.12:5
-	>=dev-qt/qtprintsupport-5.12:5
-	>=dev-qt/qtwebengine-5.12:5[widgets]
-	>=dev-qt/qtwidgets-5.12:5
-	sys-libs/zlib[minizip]
-	plugins? ( $(python_gen_cond_dep \
-		'dev-python/chardet[${PYTHON_MULTI_USEDEP}]
-		dev-python/cssselect[${PYTHON_MULTI_USEDEP}]
-		dev-python/cssutils[${PYTHON_MULTI_USEDEP}]
-		dev-python/html5lib[${PYTHON_MULTI_USEDEP}]
-		dev-python/pillow[${PYTHON_MULTI_USEDEP}]
-		dev-python/regex[${PYTHON_MULTI_USEDEP}]') )
-	system-mathjax? ( dev-libs/mathjax )
-"
-DEPEND="${RDEPEND}"
-
-BDEPEND="
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig
-"
-
-S="${WORKDIR}/Sigil-${PV}"
-
-DOCS=( ChangeLog.txt README.md )
-
-src_configure() {
-	python_export PYTHON_LIBPATH PYTHON_INCLUDEDIR
-	local mycmakeargs=(
-		-DINSTALL_BUNDLED_DICTS=0
-		-DUSE_SYSTEM_LIBS=1
-		-DSYSTEM_LIBS_REQUIRED=1
-		-DPYTHON_EXECUTABLE="${PYTHON}"
-		-DPYTHON_LIBRARY="${PYTHON_LIBPATH}"
-		-DPYTHON_INCLUDE_DIR="${PYTHON_INCLUDEDIR}"
-	)
-	use system-mathjax && mycmakeargs+=( -DMATHJAX_DIR="${EPREFIX}"/usr/share/mathjax )
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	python_fix_shebang "${ED}"/usr/share/sigil/
-	python_optimize "${ED}"/usr/share/sigil/
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/app-text/sigil/sigil-1.2.1.ebuild b/app-text/sigil/sigil-1.2.1-r1.ebuild
index 6b67b65a3825..e7b02c1eea76 100644
--- a/app-text/sigil/sigil-1.2.1.ebuild
+++ b/app-text/sigil/sigil-1.2.1-r1.ebuild
@@ -53,6 +53,8 @@ S="${WORKDIR}/Sigil-${PV}"
 
 DOCS=( ChangeLog.txt README.md )
 
+PATCHES=( "${FILESDIR}/${P}-qt5.15-fix.patch" )
+
 src_configure() {
 	local mycmakeargs=(
 		-DINSTALL_BUNDLED_DICTS=0
diff --git a/app-text/simple-fb2-reader/Manifest b/app-text/simple-fb2-reader/Manifest
index c98467e55b63..382d4796a7dc 100644
--- a/app-text/simple-fb2-reader/Manifest
+++ b/app-text/simple-fb2-reader/Manifest
@@ -1,5 +1,3 @@
-DIST simple-fb2-reader-1.1.2.tar.gz 95181 BLAKE2B 4bcfc361fe25e2fbbd6767d4517dac61e50f2e907c969402dc76be688228e612c489758ae2adef731a30e9a9aac19b2fb5786ad768e83354c8d082edfbf2b634 SHA512 0d0b95cedf8b0863fc415ba710da7bae140fda6a9cc947f20986fae0f348653ab73a85425ba34fc9beb747372ad3fcffdf8c3c173386678653cdf10318abe64c
 DIST simple-fb2-reader-1.1.3.tar.gz 94550 BLAKE2B 857f3b472d6dc2e7c4b1935b8123a1ae269df436457ad061cd8bb2d051b77fe2f318e37f1e2adc93add132870879a0fe53bf36eaaf9998bdfaf6993dd34d32c2 SHA512 6c683ca1cd29e09a2c3ceef2057f61cba8a7711d7c6508a3ebb40ccf3440e90ec87c34ff9832d11f2f9215f8bccd4d365cd725ec5d4004562763e1bdbae3cc7a
-EBUILD simple-fb2-reader-1.1.2.ebuild 719 BLAKE2B 0eb99cb61bebb33fed875ec4ea548663ddbd46e9aad7d2b3112113ca1e29a812ccbf039ae0c399f7883c6b2f4e6da6c39edb46d63f06635283214392d75d27ed SHA512 6f717e06aa6976382f37a4c193fb40effad3de7e8027801a15a07288a629d484d52552e106a6d6f41b1b4ace69e1f7a35cb1616ef85535295f72ae3be007de97
 EBUILD simple-fb2-reader-1.1.3.ebuild 571 BLAKE2B b4ae5ad5f708d6c04fe9019d2d16a25e5c41188650da73da3e7a65041f8ea60c91f2be63a11b2ed29bca0ee67bc0244c16f29facb6e1a546970b6a65fdeebd6f SHA512 8c92c67bb3767df08af35b0283493864a8ec8529d3db3ac7c4d5a1f3d1bd639b3d7aaf482a324cefd90bc4a05ab4c89b553a376ed0305d5ca9aa60e57e4e5e66
 MISC metadata.xml 317 BLAKE2B 42a730980929eff799e8de69cd94c2f15a2da6ba77cc3c98dabd4a323a6fcaae293a437b6509d0b9b32fe1bebc7c0d7e94f948f16c42a1eea552da45d40c7fc5 SHA512 09ce0420bdd7879b4f7578ea792cd27421abb6155d121c18bb0728c4e63b31577f7f6b8aa5dd1d647dd87e8f73c1a668148e0fc76efa7b3fcede097015fcb70a
diff --git a/app-text/simple-fb2-reader/simple-fb2-reader-1.1.2.ebuild b/app-text/simple-fb2-reader/simple-fb2-reader-1.1.2.ebuild
deleted file mode 100644
index c7d3c54be77d..000000000000
--- a/app-text/simple-fb2-reader/simple-fb2-reader-1.1.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit cmake-utils xdg-utils
-DESCRIPTION="A simple gtk3 reader for fb2 ebooks"
-HOMEPAGE="https://github.com/Cactus64k/simple-fb2-reader"
-SRC_URI="https://github.com/Cactus64k/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-RDEPEND="x11-libs/gtk+:3
-	dev-libs/libxml2
-	dev-libs/libzip
-	dev-db/sqlite"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	dev-util/pkgconfig"
-
-pkg_postinst() {
-	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/texlive-core/Manifest b/app-text/texlive-core/Manifest
index 95ba2afe8cd1..79edbaf50761 100644
--- a/app-text/texlive-core/Manifest
+++ b/app-text/texlive-core/Manifest
@@ -184,5 +184,5 @@ DIST tl-xindy-2020.tar.xz 141192 BLAKE2B 47a053cf02e7ead9a86801731e211663c5ead7f
 DIST tl-xindy.doc-2020.tar.xz 406620 BLAKE2B 143e9810da19aa0bd9080801ceb42923bd5c8ceb6a1055e6916489a306b40bfd6977a7b17b3434ee04c88ee975a5313c3beffb536b1e867ce6e7eeab1df3b1b5 SHA512 9e6c10388a7a707695e2965c3e3b851f939a68997cf880560a4a05ca3a167febeee9f1a7803cff1927bf7aecf0d6baac65bc4827c367f9c2d086d17d5947d64c
 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-2020-r5.ebuild 12053 BLAKE2B 3882eee52464b6487f546ad9f77a585900ca848884055386048c7a44bec9e004955a7ebb21aed83fa46fe7140405aa0ba4fd84615524e54f75a4d8f67cff7b28 SHA512 a2eff9396c837c1bcdb4d5b44d617550284c52a6e70abf97aa532f211eba980d4daf65758010f75b14210b64808a3ed41e9475f6bd5ef79e80dbc2b713865a14
+EBUILD texlive-core-2020-r5.ebuild 12079 BLAKE2B fd9a7b37e52bda9290eb88fc19a5af4551002aa505f52009dde37a822be657273e06e218eafa8ce08e0879bc19b7582f786456e18e95bac3cda5ab06ba4651dd SHA512 f8f08cf86bff653a375829bbc6ec5ffb4ce79b4938007e827b23bf405c63a5e60c1b3a98ed8c66f7e727a12e83bd506f3db5ad7c0bf001346add3927db984cbf
 MISC metadata.xml 747 BLAKE2B 86f6b1dbfe55c17e841ed5cf89a20e3da7bcf895b0481a7460ee2577dd1927548b6dc7f7c618c3bc08bac73a8a33ac20632391a9533cade342d78f2ef92caedf SHA512 96e9763e09319a9f49ba9b62f09497ed422ad5d1111c3c850351f5cd13537bdeedd2cb0539aeafe09fd3cbab6dc87db7366de3994189f2123fbfc2b8090ed98d
diff --git a/app-text/texlive-core/texlive-core-2020-r5.ebuild b/app-text/texlive-core/texlive-core-2020-r5.ebuild
index d508896e46c0..525e0874fe5a 100644
--- a/app-text/texlive-core/texlive-core-2020-r5.ebuild
+++ b/app-text/texlive-core/texlive-core-2020-r5.ebuild
@@ -242,6 +242,7 @@ src_configure() {
 		--disable-largefile \
 		--disable-build-in-source-tree \
 		--disable-xindy-docs \
+		--disable-xindy-rules \
 		--with-banner-add=" Gentoo Linux" \
 		$(use_enable luajittex) \
 		$(use_enable luajittex luajithbtex) \
diff --git a/app-text/texlive/Manifest b/app-text/texlive/Manifest
index 78710cb26ca0..8ceee5037055 100644
--- a/app-text/texlive/Manifest
+++ b/app-text/texlive/Manifest
@@ -1,3 +1,2 @@
-EBUILD texlive-2019-r1.ebuild 7238 BLAKE2B a654f916927ba6df7ef87fa6649b0c5883ec1ee3d4378de502fe8e1d1933969a4316175f4aa13633fda4486e31aabb6432f57c0ae9ded485a3ea653060acaea5 SHA512 1208cfd68d37eeddbe4b72fce098d4fdebce58d0c933ff04776b9fb1b0eb2de4d8144f6eb4f4b8ea179195cc75fbcf206ea7a885100ba98f1d2e18ffd75b9127
-EBUILD texlive-2020.ebuild 7194 BLAKE2B 55c6e031dea2d125dd183780046b2c8f9f34b9e253646fae16451a25206dcb0f9bc94e7c40a0daa5abe0ff0888ec96354abf6efdfd8df2f5f17b77895c234549 SHA512 2a84842f4e26f4638ed8e9fb560039eb9db9fd7826dea537e93831ceb5d145bb208b867808986a5f92afe64408b5a0d7395ae6e585d375dc599a3c516c980a6f
-MISC metadata.xml 2419 BLAKE2B 2627379a58f80fd304b4c77ac3f3466520d8237458e4236d88ffc2b33a062d50e33a0f2cb07c6120abbbd27d0dd7d4aa79eaa44790280f719eb10fcfc230664d SHA512 e20c3f1c67f6250209b381aa21d827ee27006d6ba5558e913ce01ac704ba0d04f16b1c5b4666ed8833e6c744b7045276d98e777f3e3e1289dc33e861bc745941
+EBUILD texlive-2020-r1.ebuild 7176 BLAKE2B 4c2b8a642956e537d8d285680addb2d5753d01b0627c1dc910e4f4b3740b5afdc3d14ad0fba94213eab23d63045716487f5859b45d738288305afb00ac17ec4f SHA512 80f64b08b905c05c392207c9a98cb1c72c0c59cf2f2595d1ffdc50f68eb1569611b7a212fe0e5fb71ee70f0478fddad1e9ff56548e8e34b381cadbd83b82f88c
+MISC metadata.xml 2321 BLAKE2B fc9c387d08100e543a6752ee7644f878c9430db5f2f66b5d16991dc292cf8ac01fc80bb6d805a8d6694edabffb68bc23f031974eece051114809c90deaa32941 SHA512 ca224c87c1bae60752d3d77b62b5a54632bd42379551523f479d8b470ad61c91ac34ddd4c7539f4bd667ae4f60f08d10726f31329b7fc194a24b6d4c642ab536
diff --git a/app-text/texlive/metadata.xml b/app-text/texlive/metadata.xml
index e06f43835505..f79519d87f63 100644
--- a/app-text/texlive/metadata.xml
+++ b/app-text/texlive/metadata.xml
@@ -25,6 +25,5 @@
 		<flag name="tex4ht">Add support for <pkg>dev-tex/tex4ht</pkg> (for converting (La)TeX to (X)HTML, XML and OO.org)</flag>
 		<flag name="texi2html">Add support for <pkg>app-text/texi2html</pkg> which converts texi files to HTML</flag>
 		<flag name="xetex">Add support for XeTeX macros (<pkg>dev-texlive/texlive-xetex</pkg>)</flag>
-		<flag name="xindy">Add support for <pkg>app-text/xindy</pkg>, a flexible indexing system</flag>
 	</use>
 </pkgmetadata>
diff --git a/app-text/texlive/texlive-2019-r1.ebuild b/app-text/texlive/texlive-2019-r1.ebuild
deleted file mode 100644
index 178fedf888c9..000000000000
--- a/app-text/texlive/texlive-2019-r1.ebuild
+++ /dev/null
@@ -1,162 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-DESCRIPTION="A complete TeX distribution"
-HOMEPAGE="http://tug.org/texlive/"
-SRC_URI=""
-
-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"
-IUSE="cjk context detex dvi2tty extra epspdf games graphics
-humanities jadetex luatex metapost music pdfannotextractor png pstricks publishers
-science tex4ht texi2html truetype xetex xindy xml X"
-
-LANGS="af ar as bg bn br ca cs cy da de el en eo es et eu fa fi fr ga gl gu he
-	hi hr hsb hu hy ia id is it ja ko kn la lo lt lv ml mn mr nb nl nn no or pa
-	pl pt rm ro ru sa sco sk sl sq sr sv ta te th tk tr uk vi zh"
-
-for X in ${LANGS}; do
-	IUSE="${IUSE} l10n_${X}"
-done
-
-TEXLIVE_CAT="dev-texlive"
-
-DEPEND=">=app-text/texlive-core-${PV}"
-RDEPEND="${DEPEND}
-	app-text/psutils
-	>=${TEXLIVE_CAT}/texlive-fontutils-${PV}
-	media-gfx/sam2p
-	texi2html? ( app-text/texi2html )
-	sys-apps/texinfo
-	app-text/t1utils
-	>=app-text/lcdf-typetools-2.92[kpathsea]
-	truetype? ( >=app-text/ttf2pk2-2.0_p20150521 )
-	detex? ( dev-tex/detex )
-	app-text/ps2eps
-	dvi2tty? ( dev-tex/dvi2tty )
-	png? ( app-text/dvipng )
-	X? ( >=app-text/xdvik-22.87 )
-	>=${TEXLIVE_CAT}/texlive-basic-${PV}
-	>=${TEXLIVE_CAT}/texlive-fontsrecommended-${PV}
-	>=${TEXLIVE_CAT}/texlive-latex-${PV}
-	luatex? ( >=${TEXLIVE_CAT}/texlive-luatex-${PV} )
-	>=${TEXLIVE_CAT}/texlive-latexrecommended-${PV}
-	>=dev-tex/latex-beamer-3.36
-	metapost? (
-		>=${TEXLIVE_CAT}/texlive-metapost-${PV}
-			dev-tex/feynmf
-	)
-	>=${TEXLIVE_CAT}/texlive-plaingeneric-${PV}
-	pdfannotextractor? ( dev-tex/pdfannotextractor )
-	extra? (
-		dev-tex/chktex
-		app-text/dvisvgm
-		dev-tex/latexdiff
-		>=dev-tex/latexmk-418
-		>=app-text/pdfjam-2.02
-		>=${TEXLIVE_CAT}/texlive-bibtexextra-${PV}
-		>=${TEXLIVE_CAT}/texlive-fontsextra-${PV}
-		>=${TEXLIVE_CAT}/texlive-formatsextra-${PV}
-		>=${TEXLIVE_CAT}/texlive-latexextra-${PV}
-			>=dev-tex/glossaries-2.07
-			>=dev-tex/leaflet-20041222
-			>=dev-tex/currvita-0.9i-r1
-			>=dev-tex/g-brief-4.0.2
-			>=dev-tex/envlab-1.2-r1
-			>=dev-tex/europecv-20060424-r1
-			>=dev-tex/svninfo-0.7.3-r1
-	)
-	xetex? ( >=${TEXLIVE_CAT}/texlive-xetex-${PV} )
-	graphics? ( >=${TEXLIVE_CAT}/texlive-pictures-${PV}
-		dev-tex/dot2texi )
-	epspdf? ( app-text/epspdf )
-	science? ( >=${TEXLIVE_CAT}/texlive-mathscience-${PV} )
-	publishers? ( >=${TEXLIVE_CAT}/texlive-publishers-${PV} )
-	music? ( >=${TEXLIVE_CAT}/texlive-music-${PV} )
-	pstricks? ( >=${TEXLIVE_CAT}/texlive-pstricks-${PV} )
-	context? ( >=${TEXLIVE_CAT}/texlive-context-${PV} )
-	games? ( >=${TEXLIVE_CAT}/texlive-games-${PV} )
-	humanities? ( >=${TEXLIVE_CAT}/texlive-humanities-${PV} )
-	tex4ht? ( >=dev-tex/tex4ht-20090611_p1038-r3 )
-	xml? (
-		>=dev-tex/xmltex-1.9-r2
-		app-text/passivetex
-	)
-	jadetex? ( >=app-text/jadetex-3.13-r2 )
-	l10n_af?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
-	l10n_ar?    ( >=${TEXLIVE_CAT}/texlive-langarabic-${PV} )
-	l10n_fa?    ( >=${TEXLIVE_CAT}/texlive-langarabic-${PV} )
-	l10n_hy?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
-	cjk? ( >=${TEXLIVE_CAT}/texlive-langcjk-${PV}
-		   >=dev-tex/cjk-latex-4.8.4 )
-	l10n_hr?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
-	l10n_bg?    ( >=${TEXLIVE_CAT}/texlive-langcyrillic-${PV} )
-	l10n_br?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
-	l10n_ru?    ( >=${TEXLIVE_CAT}/texlive-langcyrillic-${PV} )
-	l10n_uk?    ( >=${TEXLIVE_CAT}/texlive-langcyrillic-${PV} )
-	l10n_cs?    ( >=${TEXLIVE_CAT}/texlive-langczechslovak-${PV}
-	              >=app-text/vlna-1.3 )
-	l10n_sk?    ( >=${TEXLIVE_CAT}/texlive-langczechslovak-${PV} )
-	l10n_da?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
-	l10n_nl?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
-	l10n_en?    ( >=${TEXLIVE_CAT}/texlive-langenglish-${PV} )
-	l10n_fi?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
-	l10n_eu?    ( >=${TEXLIVE_CAT}/texlive-langfrench-${PV} )
-	l10n_fr?    ( >=${TEXLIVE_CAT}/texlive-langfrench-${PV} )
-	l10n_de?    ( >=${TEXLIVE_CAT}/texlive-langgerman-${PV} )
-	l10n_el?    ( >=${TEXLIVE_CAT}/texlive-langgreek-${PV} )
-	l10n_he?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
-	l10n_hu?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
-	l10n_as?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
-	l10n_bn?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
-	l10n_gu?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
-	l10n_hi?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
-	l10n_kn?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
-	l10n_ml?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
-	l10n_mr?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
-	l10n_or?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
-	l10n_pa?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
-	l10n_sa?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
-	l10n_ta?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
-	l10n_te?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
-	l10n_it?    ( >=${TEXLIVE_CAT}/texlive-langitalian-${PV} )
-	l10n_ja?    ( >=${TEXLIVE_CAT}/texlive-langjapanese-${PV} )
-	l10n_ko?    ( >=${TEXLIVE_CAT}/texlive-langkorean-${PV} )
-	l10n_la?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
-	l10n_lt?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
-	l10n_lv?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
-	l10n_mn?    ( >=${TEXLIVE_CAT}/texlive-langcyrillic-${PV} )
-	l10n_nb?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
-	l10n_nn?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
-	l10n_no?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
-	l10n_cy?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
-	l10n_eo?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
-	l10n_et?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
-	l10n_ga?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
-	l10n_rm?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
-	l10n_hsb?   ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
-	l10n_ia?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
-	l10n_id?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
-	l10n_is?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
-	l10n_lo?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
-	l10n_ro?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
-	l10n_sq?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
-	l10n_sr?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV}
-	              >=${TEXLIVE_CAT}/texlive-langcyrillic-${PV} )
-	l10n_sl?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
-	l10n_tr?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
-	l10n_pl?    ( >=${TEXLIVE_CAT}/texlive-langpolish-${PV} )
-	l10n_pt?    ( >=${TEXLIVE_CAT}/texlive-langportuguese-${PV} )
-	l10n_ca?    ( >=${TEXLIVE_CAT}/texlive-langspanish-${PV} )
-	l10n_gl?    ( >=${TEXLIVE_CAT}/texlive-langspanish-${PV} )
-	l10n_es?    ( >=${TEXLIVE_CAT}/texlive-langspanish-${PV} )
-	l10n_sco?   ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
-	l10n_sv?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
-	l10n_tk?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
-	l10n_vi?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
-	l10n_zh?    ( >=${TEXLIVE_CAT}/texlive-langchinese-${PV} )
-	xindy? ( app-text/xindy )
-"
diff --git a/app-text/texlive/texlive-2020.ebuild b/app-text/texlive/texlive-2020-r1.ebuild
index 7993b002c974..37295dbf78dd 100644
--- a/app-text/texlive/texlive-2020.ebuild
+++ b/app-text/texlive/texlive-2020-r1.ebuild
@@ -44,10 +44,7 @@ RDEPEND="${DEPEND}
 	luatex? ( >=${TEXLIVE_CAT}/texlive-luatex-${PV} )
 	>=${TEXLIVE_CAT}/texlive-latexrecommended-${PV}
 	>=dev-tex/latex-beamer-3.36
-	metapost? (
-		>=${TEXLIVE_CAT}/texlive-metapost-${PV}
-			dev-tex/feynmf
-	)
+	metapost? ( >=${TEXLIVE_CAT}/texlive-metapost-${PV}-r1 )
 	>=${TEXLIVE_CAT}/texlive-plaingeneric-${PV}
 	pdfannotextractor? ( dev-tex/pdfannotextractor )
 	extra? (
diff --git a/app-text/txt2man/Manifest b/app-text/txt2man/Manifest
index 7bb57de45a04..8bf0eca7df60 100644
--- a/app-text/txt2man/Manifest
+++ b/app-text/txt2man/Manifest
@@ -1,3 +1,5 @@
 DIST txt2man-1.6.0.tar.gz 16941 BLAKE2B 4ca7d13bb61b0b65ff47a6a6f37c5035910804cff71f0c6d848105d7ee9b8285fd6433fe019fc075a5b28769df5044a462296ad63514d44a75abc1fa552b64ba SHA512 7ec2cc0bb685d890cf06504d4faacf7a02c5a321963effb71ff63b7310f64f092e666c055c1dbdb699958a62272fe4dc0f31f3947ca6895aa425753a11b75379
+DIST txt2man-1.7.0.tar.gz 17142 BLAKE2B 56dd6e09ed52cac0b203f68b6fe56550b13f4d2e6ca54cc816cc89e29e9ad65b5b9d36e94fb107139d4d4afd400f0b33c35eb824a0ca66dd7ec66b6b4eb25f7d SHA512 55cc51d32bbc47f3ec1b33aeb733fdbf4194d5cc8ed124a3f3f4afa90ed6f025a7684a8c1babdb5b5a65f716eb76ea2a6628261523b00110406b94f922ba825a
 EBUILD txt2man-1.6.0.ebuild 609 BLAKE2B 5791269461f773391ba2080795d7689a9347d36bde85bd2152e62f7215368c47df1e82f2b31d7827c6bb2765976871e31dee9cd06efb3b4811cc657d72332f60 SHA512 312045664e536ae8147e641fda6a3726ad629682f1fe3ef1696a8cd8163fd115ee6082747612157e003cdc62269e108afff65d75c68d505d4865092923bf794f
+EBUILD txt2man-1.7.0.ebuild 615 BLAKE2B b48cb60e8d392a7b2fb1f17aa04a83da7cff32574027cd5fe02551225cf0c43c3405a470157cfd3ec6abb96a14d64e894354f2a4d0c032b90d5e1476b8a95baa SHA512 e619cb6677bf3da4f88993c8b0dbe0efa74ae3a986c9888297d09c741a0d313cef7c4133d8609a04eafd09dd23058b98d7bb498b4952f15d39b782a17c2d9380
 MISC metadata.xml 308 BLAKE2B ed6f6f83ed571ef3966c646eb0b58cb8e711f9ddce51fe8e97e0a961c5d2c88fbce7199308f5460005a393ae8b1854037e152d81290e97aba71465d96cc67159 SHA512 bf9580b121de871786c26826a398b5e0c5108b61da60fbbd797a6ff58360f7c983541574bddcf4ee8809ea0ca603a4bb1ace88e725484227fe810a44608ed51b
diff --git a/app-text/txt2man/txt2man-1.7.0.ebuild b/app-text/txt2man/txt2man-1.7.0.ebuild
new file mode 100644
index 000000000000..06d8cd383865
--- /dev/null
+++ b/app-text/txt2man/txt2man-1.7.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Scripts to convert regular ASCII text to man pages"
+HOMEPAGE="https://github.com/mvertes/txt2man"
+SRC_URI="https://github.com/mvertes/txt2man/archive/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+IUSE=""
+
+RDEPEND="app-shells/bash
+	sys-apps/gawk"
+
+S="${WORKDIR}/${PN}-${P}"
+
+src_compile() { :; }
+
+src_install() {
+	dobin bookman src2man txt2man
+	doman *.1
+	dodoc Changelog README
+}