gentoo resync : 12.03.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-03-12 21:55:15 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2021-03-12 21:55:15 +0000
commit: 7218e1b46bceac05841e90472501742d905fb3fc (patch)
tree: 56fae051db521b8fce8014cbc8b11484885b14b3 /app-text
parent: 6d691ad5b6239929063441bbd14c489e92e7396e (diff)
52 files changed, 669 insertions, 255 deletions
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index ac3910f8cf09..ad30e59eacbb 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/asciidoc/Manifest b/app-text/asciidoc/Manifest
index 969e32418256..83b46c18dbad 100644
--- a/app-text/asciidoc/Manifest
+++ b/app-text/asciidoc/Manifest
@@ -2,6 +2,6 @@ DIST asciidoc-9.0.2.tar.gz 1144308 BLAKE2B 5f5deca6b8c15d4b86e2bd6fdb131908eecd8
 DIST asciidoc-9.0.4.tar.gz 1111102 BLAKE2B 3c073e20e0b4cb1c3e43d45217240675d5a1349c5d27c8e03c4499505c17ad0a149f9495a42e28490f9c89f29dc25a1216e9145a6fd1483e589b5fee49a6279f SHA512 9e24aaaf33ab56cf1dfa510a6be9722af364633234c9ffb20eeee3d0ba756059290f443de53b040570654a316ab4782a177c31377fc69747814da75760fcc88b
 DIST asciidoc-9.0.5.tar.gz 1119318 BLAKE2B 3e5a454f4d47bb3c71e4c180ab05a0d23985473ca83d987435614ddafc9ee0d340a6e6cdafcb7371f719487954233f6d4bae69b4fc7d3818fc1d8e91c94ef36e SHA512 5b79d74c1efd43a960e8a415d3a68f26dcd3a3eee748b830101cec69475b0af40de7ad190ae105cade8ee558a59a643d04f38c1be490d253e3a6740c347d94e3
 EBUILD asciidoc-9.0.2.ebuild 2337 BLAKE2B 19c198213cc90c59641f89cfa9f483b1d5796c2b1e53329ed5a45774607e72cb60dc6a54caab8c32e0061e4d55e9f935dd760cb2106ff7f6cbb063f65aefde73 SHA512 b2491f68d4ebf1fece0af110f465755f8e2bbb97f575923e8f3788f01496a2adb2ec56aa543ef2a2de10bfff3f335fef0b7a2c11b4241cb025b772c31121304a
-EBUILD asciidoc-9.0.4.ebuild 2341 BLAKE2B b713201f9947e9faeb87d48f20027c2757c9e3c436b3210a51575c1a5254c7de0f391a494247feb3add6ee0674db339c5be9425c15733a691988fdb408a59143 SHA512 339e7775de6576a0a623de1fa501ae9ff35a27daeae28f77929cda0ec58916e3c3c148510837bfe9b5be09f8a9f401cae0e7db0960b7ecf3ff543419e80cad23
+EBUILD asciidoc-9.0.4.ebuild 2339 BLAKE2B d70827665f449472bb892754a1e591b3cf30706534b92998dae33869bd5af8032ae8ae74719e95d8462aa100efcc579c07072e3f4d471fa6a7b5e7268de8bd46 SHA512 483afdbb7ff4e0691e423f593d2b2b9c0fe8cafa8efcd0fda5a5083981efafcdb62f58a668db85269673f36b1400e5c287c7bc4f11bbe66c2753694101ece09f
 EBUILD asciidoc-9.0.5.ebuild 2346 BLAKE2B 80653cf44e489e875e63225de8cc7e5a16690093b456d85503cf81167161623dfc656fbc727b0f6d508a3b52d52e5ca4f3b668b6fbfe12e6b825757aba531b38 SHA512 97ebf07a34348e36fbb56d190978c333b2df2c5b196114bfd8123187f5f86f42024f640fc1825d99a5acf9e5235eddfbf6b436559706db0249ebd426c6809e55
 MISC metadata.xml 435 BLAKE2B c6a62f25ed62fc8bb28f94a51985d44a2b048eed430d1e92670bf257039c15ccf741414f9c64f3a60220217fd8c2e995910c611890664f0118541996d7b9c9d3 SHA512 b18f244fd4bce0103b7a3c6a5d1e063d45fd1f17458d9a8c4cb2b6543bb38d7bb7047105be81b39d309ff0c3d9343e36df44345f31e32c348fc8aff30ef6d837
diff --git a/app-text/asciidoc/asciidoc-9.0.4.ebuild b/app-text/asciidoc/asciidoc-9.0.4.ebuild
index a3dc79e0e16c..e83f4aa564af 100644
--- a/app-text/asciidoc/asciidoc-9.0.4.ebuild
+++ b/app-text/asciidoc/asciidoc-9.0.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}-py3/archive/${PV/_/}.tar.gz -> ${P}.tar.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/app-text/calibre/Manifest b/app-text/calibre/Manifest
index 99f2c570730a..165359188aac 100644
--- a/app-text/calibre/Manifest
+++ b/app-text/calibre/Manifest
@@ -5,11 +5,14 @@ AUX calibre-server-3.conf 541 BLAKE2B 06593633721e6adf2cf2077dffa83953eea46ccdcd
 AUX calibre-server-3.init 1796 BLAKE2B f87d785d6f6fc10fa648d40944ec8538027854bb872d9a3be6b5b35b0abf3cda1e4e93874a9422914da5eb4287f193459733956e3f1e25e61bec0c214c552c99 SHA512 88110ded1b9c6cf8d3bfc3d5889654f77578f9d299e88daea9023767b930082e00fbddbb92a6e43c46d900248f3684232d93396ec1d0e784c7ec14b44783f98a
 DIST calibre-4.22.0.tar.xz 36924876 BLAKE2B 19576d5cfc1a4ed6a505ef46656675980b6736be01f55874951a9a0c81a70c82e23e723db1d81d13917eaf615e65752a100fbc1cb43bdca0b3c4543e3b17cf43 SHA512 b9db1c72cf010c25563e3f86a75478ac872249034b3c8b09bb8f0c2519487bb78dea821c9e45564fb645d17431bbee96459a28ee036e57830faedea4cd94b423
 DIST calibre-4.23.0.tar.xz 36908740 BLAKE2B 3a950ac2b3aade547bb686cc99b963357e76b5931049ecb4a5e09ddaf1db26c74fa3b4ebd74e42d83f68c5c9827c534c0247a3c6a9b000641a778cfe5ac33599 SHA512 2a512f29ddc2fed7f6a229314a9f7fceac198c9422b3be19078685032f1d1cb3b9258ac2609c33d15da20683c1277ed09419ea1e9bbc70430cdc676f60395719
+DIST calibre-5.13.0.tar.xz 36746972 BLAKE2B b011114fa558c2dd7418a449b2a43bbbbe6e850ad6ba14bdb8ee70d63b475839a6f489eb273c1c88eb841156feee1f0a6f13b19a38eab11820e8e14a05242a6d SHA512 99f2e007af70e4de9ffc05fc4ed41ac3e62ed5196d05e066ab2624e15694f8a0aa149769e0a2cf163f59e330ed7ab43bc938e65064ac2a9825d641b1735f13cf
+DIST calibre-5.4.2-SIP-v4-04ad7b.patch 1534 BLAKE2B a0d3a49e13499ec55098c8639ba93c21e04a1b23b857ca8c7e0cb665f6e40b138f44a13c78b7a240784919effa9870817b2ec7ce5b494448807a4b77dd95b06f SHA512 f0acd97fc57bce9b22dd2061be7a85f4b39b7a9c3492304dec4108ede087a9e58ee886e21734823021709686dc1317f41eb1ac99a947a7dc07660b5c1849bc1b
 DIST calibre-5.4.2-SIP-v4.patch.xz 4640 BLAKE2B e8d20d9e23922885ecc3d24b7dd83579911dc83520037bad4e9323725c3127d348dc745dc725d137a3172e8891764355d3fcdee640a26cd6b142a2c26d00da0b SHA512 e79ee69ba0ca7e44c10c6670743889d0391d708e75c798e345e6228f483347f72b070e01e2a258590420a1eea6313d88d816817886747c699e6783bd965ab557
 DIST calibre-5.4.2.tar.xz 36596800 BLAKE2B 00373cdc9af56a8dacc70096d1e7925f8d3da4eaf37727ad58c211d18e6c593a21c3ad0f283048ae28b1bb83889c8c801baaa5e240eb65d972ebc78a79922ec1 SHA512 ef3839f5ff4ceecb3bbd6c84819d6f57cc4bb2a1ae789a9dcf8f029680bc778ef86f9c2eb01832c4990f68c2de892eedafa449205470cec4d86a3bbe9d4b4527
 DIST calibre-5.6.0.tar.xz 36653328 BLAKE2B 44941c50873c285aa552c5b4ac716e5d3dd6bc3e1a4f13b1003d42adb808566ec3a5083c683a40d9679524e4ae70eed6ec8bc4c70770991f9791bcea25387c42 SHA512 5d06b60467bbf332acb8666d4117407c2876cfe2726dca3e9d9ed5d77561614406c7150c2800aacefe3cecb0869c1cd7b2681eba27830248b3c32e362123d50f
 EBUILD calibre-4.22.0.ebuild 8777 BLAKE2B b78353ba501d4ac3368da8299922e33fe2d7fc58664ff5ca05b266b0925118c866fc2716f41a9c106c8a3c837826c2980bdff44459fef341625515e8fdc768c6 SHA512 88b39be1bbeafbf26b4b0ffd1e0db7384dcbacf6a70c38b0faed20b60d9e1cbaf78630de58876fdd8aa92d54c8d22861ff94a4c489f44448ebcd7aa0ea9877b2
 EBUILD calibre-4.23.0.ebuild 8820 BLAKE2B 0261c81666ec54dfe6f57f39c8ca053fcec41a1c517fb529114c9717821279dc3ad3b0ea58c27674db50af66bacb5a45149ca4713890915b90d98cea35b95005 SHA512 664e403f05da722425f51d6d95dc7acbadabbbffd2f82aee483b3cccee83ae5f13d13108987e82020625e018278c5f42626f78cdc2d851edf3e1fdd2c2c00a4c
+EBUILD calibre-5.13.0.ebuild 8749 BLAKE2B 409524828435e53a9e6db54d1c53db7a1279090473667cf8efbdc2ef7fbfe24696bf77ad079352b7af5a0cf36d9dca600fde92fa47045546c881a922e0b3ae4d SHA512 ecca2407914b1b9a94a8cb6a52759154e01669b5187b00364a544f3c18d1132373670747362e99f0c1d4c7de4c5a37d8d9efae5d614ec1f1eb8c50ca8edd889a
 EBUILD calibre-5.4.2-r1.ebuild 8769 BLAKE2B 89ceb815e215bded42d3be69be882a973fc86f4bcb30871c7cceb527113e83185f71a7c230af5320e44b20f433c84d3ebe71d937c7b3af2c83cc902fca20e1ce SHA512 d445de23fa2826877e562f9b95a21bba21a173dc244d68320c39110215b58a0ee32cabf57edd4184ed571b50ce898a1725877122aab195f62a813a638d4b4a2f
 EBUILD calibre-5.6.0.ebuild 8713 BLAKE2B a26ee08f18f7e819a6d28e18162036b67a1bbb6459a7a3be5afee012ee9fc254f83c29fb0953ed9310cda882dbdd36a6819101e707418be2b70f26077a78d6a4 SHA512 592fce01d289f6c3206e0ba9d7139122f767bb035acff99bc5c73a88752759458b03eb50c93c99b941b6b39b59b1dc6a16b3cceb8929dd501caace7c38d829f7
 MISC metadata.xml 303 BLAKE2B f50da5b3e8c1e9b4553180ccce38939e7c8e11e5a0527f94c3df7ac4d93a37d5e838c633e58b3fe960dc60ce52c6c6ec6901eedbcd99039c0cc1ccf6dc8a0a44 SHA512 38da4e43d91a3a1d1adf6daf32e4ec69696ab7df6179788fbda75a40219acf01cedbff28943c0b169b2de9f490f3a324285294a9b2783c90757c8cd23aa9e847
diff --git a/app-text/calibre/calibre-5.13.0.ebuild b/app-text/calibre/calibre-5.13.0.ebuild
new file mode 100644
index 000000000000..0f9dbc728c7f
--- /dev/null
+++ b/app-text/calibre/calibre-5.13.0.ebuild
@@ -0,0 +1,264 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_REQ_USE="ipv6,sqlite,ssl"
+
+inherit bash-completion-r1 desktop toolchain-funcs python-single-r1 xdg-utils
+
+DESCRIPTION="Ebook management application"
+HOMEPAGE="https://calibre-ebook.com/"
+SRC_URI="https://download.calibre-ebook.com/${PV}/${P}.tar.xz
+	https://dev.gentoo.org/~zmedico/dist/calibre-5.4.2-SIP-v4-04ad7b.patch
+	https://dev.gentoo.org/~zmedico/dist/calibre-5.4.2-SIP-v4.patch.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/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/pychm-0.8.6[${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=[jpeg]
+	>=dev-qt/qtwebengine-5.12
+	dev-qt/qtwidgets:5=
+	dev-util/desktop-file-utils
+	dev-util/gtk-update-icon-cache
+	media-fonts/liberation-fonts
+	media-libs/fontconfig:=
+	>=media-libs/freetype-2:=
+	>=media-libs/libmtp-1.1.11:=
+	>=media-libs/libwmf-0.2.8
+	>=media-gfx/optipng-0.7.6
+	>=sys-libs/zlib-1.2.11:=
+	virtual/libusb:1=
+	x11-libs/libxkbcommon:=
+	x11-libs/libX11:=
+	x11-libs/libXext:=
+	x11-libs/libXrender:=
+	x11-misc/shared-mime-info
+	>=x11-misc/xdg-utils-1.0.2-r2
+	ios? (
+		>=app-pda/usbmuxd-1.0.8
+		>=app-pda/libimobiledevice-1.2.0
+	)
+	udisks? ( virtual/libudev )"
+RDEPEND="${COMMON_DEPEND}
+	udisks? ( sys-fs/udisks:2 )"
+DEPEND="${COMMON_DEPEND}
+	$(python_gen_cond_dep '
+		>=dev-python/setuptools-23.1.0[${PYTHON_MULTI_USEDEP}]
+		dev-python/sip[${PYTHON_MULTI_USEDEP}]
+	')
+	>=virtual/podofo-build-0.9.6_pre20171027
+	virtual/pkgconfig"
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]] && tc-is-gcc && [[ $(gcc-major-version) -lt 6 ]]; then
+		eerror "Calibre cannot be built with this version of gcc."
+		eerror "You need at least gcc-6.0"
+		die "Your C compiler is too old for this package."
+	fi
+}
+
+src_prepare() {
+	# no_updates: do not annoy user with "new version is availible all the time
+	# disable_plugins: walking sec-hole, wait for upstream to use GHNS interface
+	eapply \
+		"${FILESDIR}/${PN}-2.9.0-no_updates_dialog.patch" \
+		"${FILESDIR}/${PN}-disable_plugins.patch" \
+		"${DISTDIR}/${PN}-5.4.2-SIP-v4-04ad7b.patch" \
+		"${WORKDIR}/${PN}-5.4.2-SIP-v4.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'])" \
+		-e "s|open(self.j(bdir, '.qmake.conf'), 'wb').close()|open(self.j(bdir, '.qmake.conf'), 'wb').write(b'QMAKE_LFLAGS += ${LDFLAGS}')|" \
+		-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.
+	mkdir "${T}/bin" || die
+	cat - > "${T}/bin/kbuildsycoca" <<-EOF
+	#!${BASH}
+	echo $0 : $@
+	exit 0
+	EOF
+
+	cp "${T}"/bin/{kbuildsycoca,update-mime-database} || die
+	chmod +x "${T}"/bin/{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}/bin:${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
+
+	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/$(get_libdir)/calibre "${D}/$(python_get_sitedir)"
+
+	newinitd "${FILESDIR}"/calibre-server-3.init calibre-server
+	newconfd "${FILESDIR}"/calibre-server-3.conf calibre-server
+}
+
+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/capyt/Manifest b/app-text/capyt/Manifest
index f42bcf9ca1a4..98222bbc666c 100644
--- a/app-text/capyt/Manifest
+++ b/app-text/capyt/Manifest
@@ -1,3 +1,3 @@
 DIST capyt-1.1.1.tar.gz 3247 BLAKE2B 259c1cc7eddc88853518ed106f25e9b1d47a5c4604e749d25fb2133f11d90e78672473a9dd31fa80322b4c5177163fe5a177d27a6fd9a7cd31ef12db7ee3ed0f SHA512 863164967aab93088d39b0324d1324145f41ba76b9d21874ea6a3aa49955e1ec3430c7bcc9eb100c51b9e159c63758b6474d3bad586383d7c10d9f1118340123
 EBUILD capyt-1.1.1.ebuild 586 BLAKE2B c3db7b0845ee47d93d1e4f15e487fe17fda3b1160bb7baf5f67ed99165ef2cc4272256eacf6f3dea495bff8ae068dbe05e1eb35c13df215ca090ec8d621a8fdc SHA512 a4f00d09af5e0c9074fedc11a556c39e530be4d06429f656ff4c6574d2c55abfdab2d38ee5abaa3c62f0028ad3b87b912264e3611a7e944132eb3888a8e1a58f
-MISC metadata.xml 370 BLAKE2B a110aa5a03154a5505f9ff4add2d67e8e75f1313129dc8f0a83026f6d81fc84045046333f016bcea58ebedd030e844c48ec362ad5ec928b318c5ef9d60d93da5 SHA512 176af2d46cd2e63f642a2e9575b427c7feef57440d07cd8389241a03741af9983dfb2272b1034cb34b4b1b42de8949a1c6e9eb64aa3f0acebaa42cab4cc48f63
+MISC metadata.xml 407 BLAKE2B edeeb79e203dcfb67d68dd96fc485221789def0b23937d68c493c000412eb6712d23c0eb2c7bec000a4a065a257187df0d0c45ce2ccb454b986c1049431f1441 SHA512 f8a8de49955a6e26d14d0e62312a942881ad4f3877c606b732c66fb38c9780667632de9721175952721a39b227d05c2564e500e0490c65d7d6c8a7e18d3ad129
diff --git a/app-text/capyt/metadata.xml b/app-text/capyt/metadata.xml
index 60660574b441..302b667eb004 100644
--- a/app-text/capyt/metadata.xml
+++ b/app-text/capyt/metadata.xml
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>juippis@gentoo.org</email>
-		<name>Joonas Niilola</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="pypi">capyt</remote-id>
-		<remote-id type="github">lbatalha/capyt</remote-id>
-	</upstream>
+  <maintainer type="person">
+    <email>juippis@gentoo.org</email>
+    <name>Joonas Niilola</name>
+  </maintainer>
+  <stabilize-allarches/>
+  <upstream>
+    <remote-id type="pypi">capyt</remote-id>
+    <remote-id type="github">lbatalha/capyt</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/app-text/coolreader/Manifest b/app-text/coolreader/Manifest
index b3cdf1a391a5..f581181b3f40 100644
--- a/app-text/coolreader/Manifest
+++ b/app-text/coolreader/Manifest
@@ -1,7 +1,5 @@
-DIST coolreader-3.2.50.tar.gz 21252394 BLAKE2B 68550656c644d623e24a7da310baf77881c72621db03f481eeaaceddc0a3c77ecd4d2098c4afe0b56fc50a67f471a9a6a20c172590365bd888222894d27c1826 SHA512 01417c1daae5da6ebb4d92fd68693d3aff09013d1f5679a30138941e23f79db58bdf2b20721deb10ad3d0b9ab0530f8237aeaa2b6f1c1fabbff1c43f48d68ac3
-DIST coolreader-3.2.53.tar.gz 12550563 BLAKE2B 24543cac98349f4c0587149a3eb8f964cfb46891a0ed7c613a4a0bd644e8d24cb0ff057eab74aecf3c574e604d4208dbbee4c7023d8197282589184317312ee3 SHA512 4f500d877287b3c391cb0be7038586897e7c0eb9cfbe87d9b3ee3923db82c4ce04533249dee83a259a084bc142236cc5cc67f3e4428f05756da8c593a47a9558
 DIST coolreader-3.2.54.tar.gz 13231261 BLAKE2B aac948ab4535238caf0541f25b3fb1332d17aa46dc7b116543d37c4cd5d900f0e7861e1ab745ba455feec236c6dc05fde6faad2f4e378e33441cee7736b22b9f SHA512 11ca3588a3794dcc5c5970dc508ade43e29a9d6db7d8ef01c7f04d7cfad2c50a21f6f333574d057c45c8f6d7eb619b5f0f072b1163327f694dcbdcc4b7539220
-EBUILD coolreader-3.2.50.ebuild 2450 BLAKE2B 94b8e8cbfaee42fca275ba15fe910e0feb5962f3f1b5a5388e4e45281d7089300904dcda2e38085fb9510b1535320d4e260c63e9480eba5bf0f1e0b87747159c SHA512 2ce5d70774b33bf61efb62ce5546210b07521709e55da040d849fc4d84b225dae16148b6f30aa199c7d991675a33ce94627af77a128d37d4e2bf100821119d80
-EBUILD coolreader-3.2.53.ebuild 1840 BLAKE2B abd3453c6fe24d69196b10c6046e64ee0ca2639220287955a9453a3f170a85f7da536934518f1486402d593d5e2697be5bd5e90e32b29daf10ee1fcc3525e967 SHA512 a4aa23bd15bd0388e06f782fb90817a70056052277b3ac1cc0c05eab7202ed3ca2dc859809e55a1da0b88a865cad3a428413bf8e2540791f75e8015362769ada
-EBUILD coolreader-3.2.54.ebuild 1840 BLAKE2B abd3453c6fe24d69196b10c6046e64ee0ca2639220287955a9453a3f170a85f7da536934518f1486402d593d5e2697be5bd5e90e32b29daf10ee1fcc3525e967 SHA512 a4aa23bd15bd0388e06f782fb90817a70056052277b3ac1cc0c05eab7202ed3ca2dc859809e55a1da0b88a865cad3a428413bf8e2540791f75e8015362769ada
+DIST coolreader-3.2.55.tar.gz 13230319 BLAKE2B 1cb414f38b76072f66705370162a28505ba2273282755704bb8ad28a7b0eb2928aba0a929291ae33fdf9ce42b442c4b941740d59f4f329a401470e2fceceef18 SHA512 4eef99c86259642d6a5c3d9eb388a11c27b7438c0f05a055ef61a1df93af567d30fa39790cc5d5b3d10dcaa4b2931a51773f967904ff75f7fff2040f313c09d6
+EBUILD coolreader-3.2.54.ebuild 1839 BLAKE2B 673b2b3ae56bca9431a6e7511cda0d9327f6c84ffa2f5b8d9400380c9b8d7fae57b67f8b8901db1e4a5a1fba8745535ddfe40ef93be5509aa2145c16169a6e94 SHA512 88d66c608f741744c644dd98527cd379082a86d50395fd6413939db28cd5493858704ef8c7f71aee374a3d8cb87b84c512a5815a86dc719280de554a6e2f1c14
+EBUILD coolreader-3.2.55.ebuild 1840 BLAKE2B abd3453c6fe24d69196b10c6046e64ee0ca2639220287955a9453a3f170a85f7da536934518f1486402d593d5e2697be5bd5e90e32b29daf10ee1fcc3525e967 SHA512 a4aa23bd15bd0388e06f782fb90817a70056052277b3ac1cc0c05eab7202ed3ca2dc859809e55a1da0b88a865cad3a428413bf8e2540791f75e8015362769ada
 MISC metadata.xml 624 BLAKE2B fa86114594d823c9b73b590ebfa0ffe74955550f1d66b5f1197672484d4095be484f5f8f754acef06e34f9d69d658609653109bf8499235439bb1f3ad95b7be5 SHA512 33e57dbe75c3e2efaf1d793dad06b534fac861b3ffd25e4d441af91b8d6a8cae96b8d5c19bbf0845aa78ff404eee167998e09f948009b4ce1902a2f38625f9a8
diff --git a/app-text/coolreader/coolreader-3.2.50.ebuild b/app-text/coolreader/coolreader-3.2.50.ebuild
deleted file mode 100644
index 0f27ef3e2ac8..000000000000
--- a/app-text/coolreader/coolreader-3.2.50.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-WX_GTK_VER="3.0"
-PLOCALES="bg cs de es hu pl ru uk"
-inherit cmake-utils wxwidgets l10n xdg-utils gnome2-utils eapi7-ver
-
-CR_PV=$(ver_rs 3 '-')
-
-if [ "${PV}" != 9999 ]
-then
-	SRC_URI="https://github.com/buggins/${PN}/archive/cr${CR_PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/${PN}-cr${CR_PV}"
-else
-	inherit git-r3
-	# github mirror has some new commits to fix page margins settings
-	# sourceforge mirror saved as backup
-	#EGIT_REPO_URI="git://git.code.sf.net/p/crengine/crengine"
-	EGIT_REPO_URI="https://github.com/buggins/${PN}.git"
-	SRC_URI=""
-fi
-
-DESCRIPTION="CoolReader - reader of eBook files (fb2,epub,htm,rtf,txt)"
-HOMEPAGE="https://github.com/buggins/coolreader/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE="wxwidgets"
-
-CDEPEND="sys-libs/zlib
-	media-libs/libpng:0
-	virtual/jpeg:0
-	media-libs/freetype
-	wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER} )
-	!wxwidgets? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 )"
-DEPEND="${CDEPEND}
-	!wxwidgets? ( dev-qt/linguist-tools:5 )"
-RDEPEND="${CDEPEND}
-	wxwidgets? ( || ( media-fonts/liberation-fonts media-fonts/corefonts ) )"
-
-for lang in ${PLOCALES}; do
-	IUSE="${IUSE} l10n_${lang}"
-done
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# locales
-	l10n_find_plocales_changes "${S}"/cr3qt/src/i18n 'cr3_' '.ts'
-	local lang langs
-	langs=""
-	for lang in ${PLOCALES}; do
-		if use l10n_${lang}; then
-			langs="${langs} ${lang}"
-		fi
-	done
-	sed -e "s|SET(LANGUAGES .*)|SET(LANGUAGES ${langs})|" \
-		-i "${S}"/cr3qt/CMakeLists.txt \
-		|| die "sed CMakeLists.txt failed"
-}
-
-src_configure() {
-	CMAKE_USE_DIR="${S}"
-	CMAKE_BUILD_TYPE="Release"
-	if use wxwidgets; then
-		setup-wxwidgets
-		local mycmakeargs=(-D GUI=WX)
-	else
-		local mycmakeargs=(-D GUI=QT5)
-	fi
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	if ! use wxwidgets; then
-		mv "${D}"usr/share/doc/cr3/changelog.gz "${D}"usr/share/doc/${PF}/ || die "mv changelog.gz failed"
-		rmdir "${D}"usr/share/doc/cr3 || die "rmdir doc/cr3 failed"
-		gunzip "${D}"usr/share/doc/${PF}/changelog.gz || die "gunzip changelog.gz failed"
-		gunzip "${D}"usr/share/man/man1/cr3.1.gz || die "gunzip cr3.1.gz failed"
-	fi
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
diff --git a/app-text/coolreader/coolreader-3.2.54.ebuild b/app-text/coolreader/coolreader-3.2.54.ebuild
index 7c75f5c7adcc..9167008cc902 100644
--- a/app-text/coolreader/coolreader-3.2.54.ebuild
+++ b/app-text/coolreader/coolreader-3.2.54.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://github.com/buggins/coolreader/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="wxwidgets"
 
 CDEPEND="sys-libs/zlib
diff --git a/app-text/coolreader/coolreader-3.2.53.ebuild b/app-text/coolreader/coolreader-3.2.55.ebuild
index 7c75f5c7adcc..7c75f5c7adcc 100644
--- a/app-text/coolreader/coolreader-3.2.53.ebuild
+++ b/app-text/coolreader/coolreader-3.2.55.ebuild
diff --git a/app-text/dblatex/Manifest b/app-text/dblatex/Manifest
index 7d546265b6f5..428458f9b5c8 100644
--- a/app-text/dblatex/Manifest
+++ b/app-text/dblatex/Manifest
@@ -5,6 +5,6 @@ AUX dblatex-0.3.11-path-logging.patch 554 BLAKE2B 7b078b4f0bacaffb3449122b561c26
 AUX dblatex-0.3.11-setup.patch 1751 BLAKE2B a83e41c4fa68eaee1b6e80404cd5486e64f117ca07314463ca0369cd3bc9d64dbdeb8f5fa2f44bee2704c37dda0e1564c461c7d39b1439aa76800032dd96acad SHA512 f77a82876fe28fdc6f9cc689c8b789fd09e703ca4625207fe81a35b1491bcd46a398eb78781fac60c33ac2efcd3d0957fb3604f8a54cd411b0fd4031016ef5fc
 DIST dblatex-0.3.11py3.tar.bz2 1671505 BLAKE2B 44e89f5f8d81105a3401074ad765479c04a495962c3efb3677cec81bf3b85c67a03585e7da8bdbd103cbea84e38d2bc633bd13704a5835c98d70fed644bfc6ba SHA512 48c1445c702e9c7c3ff83c57bb8a0caf5f4b027669a70887af0a23f75f5f99fb6840c4281b8bad9402910f3850af485d432e3109e5fd93184434cc87eb712695
 DIST dblatex3-0.3.12.tar.bz2 1693272 BLAKE2B 9310ce5db3b5f92e183f2656c5b1881edaf0208ae4f78f853332c844258fa38d443921fc42c03301773b1451ce272a538c305d765acbdc6eafbdcf25ebf5d2d3 SHA512 5bfa774c8dbe362775f6bbb5e1196e5a2bb1af239778133c12ddc725406ced67f3ff422433a2a1aa02d4431e9be58ba12e918379deb81fcd5b96533d2bdf029a
-EBUILD dblatex-0.3.11-r1.ebuild 1830 BLAKE2B 19459a6270d075254d3cded46d3824810ce7e00adbb801c9993558d447668426a071842a375bffdea7367800d6903644042748897163faed5914fe20f2f399e6 SHA512 f19d1c65ef766f7dc371e0daf9b1abb8390cfeba3d65dc0f02845aed5e88ed76904dafafdeba12668b00f984a442897aa3aab85531e0f82137146726e615a813
+EBUILD dblatex-0.3.11-r1.ebuild 1829 BLAKE2B 5818b7ae2576666fb7fe0686b692a68406ce32fdddef81460d767de649827d354d261d7212653b92f00a92a8a79f65a95e4e4ea6daffb27e1a973a95cd4319f8 SHA512 dc481ff1759bddca0861e3be149c23bae39a5438f343b098d65dc1237a6870b64ebee4febcaa69dc55710ec4b7cca54f6d4e2c0b85312ca25ba9dbe69ff1b0af
 EBUILD dblatex-0.3.12.ebuild 1741 BLAKE2B b500a50c81ebf3bd845832d4af60162a3e8ed49dff27dbf61c409c937798e50be131aaaccbb21a720a3bb8859cdb87063a85a146347b623a5bb0628d753b4886 SHA512 fb5baccc7a2330837ad5f776ec9040275a6b8da99dd083a79d1c60d3125bb47d07a847af76cc077bf9c91edea54372042b65162c42fe6ba3f99de5b64fbde54e
 MISC metadata.xml 866 BLAKE2B 3776cf07848836c14fd82031a49284f982b04b573fd28080c0fa9c7cbe6155fa63c89b897461dc996842a0d66be38fbde2326cdce8aeddebbfcfd777677e2011 SHA512 9806f0804fc5b14a222974a9e2c2cc8a13a7378b99deca9cd9ac5f7cbdb776b3c240b521a6077cb80d1685574ca47a372712526ec994c6bf228b2c784568cf93
diff --git a/app-text/dblatex/dblatex-0.3.11-r1.ebuild b/app-text/dblatex/dblatex-0.3.11-r1.ebuild
index 14c834cb4886..2ab851b99209 100644
--- a/app-text/dblatex/dblatex-0.3.11-r1.ebuild
+++ b/app-text/dblatex/dblatex-0.3.11-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://downloads.sourceforge.net/project/dblatex/dblatex/${P}/${P}py3.
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~hppa ~ia64 ppc ~ppc64 sparc x86"
+KEYWORDS="amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
 IUSE="inkscape"
 
 RDEPEND="
diff --git a/app-text/enchant/Manifest b/app-text/enchant/Manifest
index e1bd51045f03..58057a388893 100644
--- a/app-text/enchant/Manifest
+++ b/app-text/enchant/Manifest
@@ -3,6 +3,6 @@ DIST enchant-1.6.1.tar.gz 642124 BLAKE2B d41aa9b313e7fe8b0887728b55f3c5218e270c7
 DIST enchant-2.2.15.tar.gz 990693 BLAKE2B 09d380fc90cf8404345e88fb4e676f92e795b43e1caa5f21e52c6f3037268b1959e9cd1adf04b08e05fce78dbbcfd3163795e8d2079c484c530065566a0307f2 SHA512 e29b3a85d993af28044a86dd23a3ca74c7d50b4218e542c380053a3eaf70c3ea2406feb3361ba8e793bac586c252330bb20fb56c65f3a0a54f63f103cc0abb35
 DIST enchant-2.2.8.tar.gz 976715 BLAKE2B 50a96c69b6f6575db0a8d6f30420db4b273901a9a0261ae606d81d96b044ece03078a2549f34972fef47a36f0b85c27af90c90c2f2efab2fb258e17621d927af SHA512 4bfa771af0deab3d0ca5523abab1fdb14cb596747dba7cf887e8cd812601015f52502cbd3df68247f102bba259cb281414e9ccde83b8bdd3c8cc83c2fcbc9090
 EBUILD enchant-1.6.1-r1.ebuild 1618 BLAKE2B 339676eff2871a9abd5bf85a3509924677ec5d9939e49416d4d09b71d4d228b45e81f8ac6b207c449c8ca837aab0d8d63add052598a0ce9430873bf0ea3df250 SHA512 eedb24e76290dffa83a68a565e2f5dc10544360a62617bea107a4270d13b5a6dbb19418a245c84923ad3dd5d6e77dda2338f14bee2b3a17ddeff1b7c2414ad2c
-EBUILD enchant-2.2.15-r1.ebuild 1241 BLAKE2B be853d1f72faf5dca852318b15cf3c61c5b0b2938a76863df67602dbc244a58d651c080e5f367a8e6ad226367808de6415b931781a2507a5d0440c27de635f1b SHA512 3f4176267b8e7cbd0278bacccafc89c4ee3210947db628a4dc919c418541f47ba46685c31eb5378b978205c30de406c424507dadaa01ca7a506844fcc1b054a1
+EBUILD enchant-2.2.15-r1.ebuild 1240 BLAKE2B e96ab8758d54126a9e72cb204da24c34da7e5daa0a14c132eec7588f9928bc26adb163ad501c3e21d28f3c1f7a169b26eb3f6a9d939ec15231a5b0be9f092766 SHA512 0417b01eda97208805d6be1d63e88dd09232e4ef68b38ac152632f9574e8e218226acbe28551b21f0938794beec692d2f9c6080f4997d785ef3f54dad652e02b
 EBUILD enchant-2.2.8.ebuild 1219 BLAKE2B a68741164e6cb8eb2e96ae2349bc18e584327a10aeb4fe9c6ee0a294a2101709327afda22567832248b36fbeb4d84f6281e99acd0840ba93619d9daa3180ba44 SHA512 a3549c67b4543d18180e6b09072f56b234b04cb374535b3535f71ce5f9156e90705748f0289f127ff5c1074349c57a467f77f2669172abb9b3f6c3929686aebc
 MISC metadata.xml 536 BLAKE2B 5f66bf0da00c6cfd8d6e22b9644486d0df8cf81cf5875768572965f60927edbe4d46ed2502659bcb71431c715129d1d7da051f9320b3f2834905a0cac3c2556b SHA512 920c2056608571d6a2e52d0c52b995b664c95aa53c8f8cb51129b059c32180d977ab3c840ef7fb59af3dec5f984f3e1488de26cf3ba4d93c2eb81c08e6688d5b
diff --git a/app-text/enchant/enchant-2.2.15-r1.ebuild b/app-text/enchant/enchant-2.2.15-r1.ebuild
index 1c7845af2065..3ccf7b9f85f2 100644
--- a/app-text/enchant/enchant-2.2.15-r1.ebuild
+++ b/app-text/enchant/enchant-2.2.15-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/AbiWord/enchant/releases/download/v${PV}/${P}.tar.gz
 
 LICENSE="LGPL-2.1+"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 
 IUSE="aspell +hunspell test voikko"
 REQUIRED_USE="|| ( hunspell aspell )"
diff --git a/app-text/evince/Manifest b/app-text/evince/Manifest
index bf4a1df6ca16..ab9774360567 100644
--- a/app-text/evince/Manifest
+++ b/app-text/evince/Manifest
@@ -2,7 +2,7 @@ AUX 3.30.2-internal-synctex.patch 964 BLAKE2B cce1d02b40b18a23773985e2d9f39b1782
 DIST evince-3.36.10.tar.xz 2430584 BLAKE2B 7c8b5e3dec7168f4ab6976022bb85041fd8cc9f55b8c032bbf03cf492d243dc49f00d6913c1f2f09498c1b4091b4be126a9367dd3ed235635e9d08e6a9ae5a0d SHA512 2a17fc1fbd18e2685c254194d0e195ec0c6126f37212ae64297fb06f30f2e07f926cb768affb4d5c9c407c4dfc43db3578ffd244c9a6e121d1d3c9b5e653b4d2
 DIST evince-3.36.7.tar.xz 2580208 BLAKE2B 76ba6d206289f9981af24e5d82c9567c05984ad71efe83391aa1f8fdd94d31c284e600cf81eab9868e01f120f71cde1ae9b6ee6b7a4b1da47458d17b95b78d87 SHA512 dacc26d2d75c3dcadceb0a35c995ae3501bd91e84632cdf87decd359350e74032444707ea152e24c01fb57fe0ef2a426813a33919833cefdeb8699f8c642d910
 DIST evince-3.36.9.tar.xz 2429740 BLAKE2B 7154d473561955df9be545bbda520034e7de1556ea241dd30833ac014af2bb20fc3ef1d7fe6777cdcfab90553eb3f0562e1452df62c1c1eeb6b47b5bb64298bf SHA512 54f2dfc287fa627e1474c4bb23e6127bc5daa7044c2158805e5af487b7d65e776da9b86adbb83ec63fad3ce4c339f57483a3a2d7b95ad14de2dc76e29a29a8fb
-EBUILD evince-3.36.10.ebuild 3085 BLAKE2B 2a03f08a70a2601cf8d7bfec6407467e894c5e90abb44f95bf85c8153cdb08ab15035f4e092329cb381b18724002fcfcde179ce98fc28e9f7a9b5dd95a966998 SHA512 f47f5d5ce87b54ac71d319186b8de8092dad584d8035e98488e63ba62f8c18f9a566e46f777c8dd559a24f6f887340814d529927e3c4b87a94e7a4baeb7246da
+EBUILD evince-3.36.10.ebuild 3084 BLAKE2B e6e11a3ac3b73977fa9c0f1b8dff67a9009a596520004ec77c1553bedf473a4db2e138a6f5694057ea935180d6c4f54c4c717af39e774eadfb791ac42bb8a087 SHA512 945e1e90ac2a93bdb7d4e8556429c0a5810be6e50a5f3d437daf6c62057e0d1224b455c851db6b258876e10f48c85f652524f2a4edc6f4c50051a61b3dd8d1f6
 EBUILD evince-3.36.7.ebuild 3133 BLAKE2B d178be50e5460d9d834cbb0b940c19541570fc4b2de8439b06c44db95685ef7e66a95e88c8e42b30b05461586bfbec3188053a7a98fe781d4c514e7aca8cdd0d SHA512 74a824eddcd0caf3c5a87432535bdc779fe1f328baa10f6d3ad3483d4b8e38eaff561785e1920413ee8e4955b259c2755b17ae15b6e2ab0a077d779dd84b7740
 EBUILD evince-3.36.9.ebuild 3085 BLAKE2B 2a03f08a70a2601cf8d7bfec6407467e894c5e90abb44f95bf85c8153cdb08ab15035f4e092329cb381b18724002fcfcde179ce98fc28e9f7a9b5dd95a966998 SHA512 f47f5d5ce87b54ac71d319186b8de8092dad584d8035e98488e63ba62f8c18f9a566e46f777c8dd559a24f6f887340814d529927e3c4b87a94e7a4baeb7246da
 MISC metadata.xml 881 BLAKE2B 180e93316fad8f1bf7b80028a86c18964e695c93292b724e864ed50f3fbd951f810fd490b91944f30e42f632ce090dbe34aadf9679b2e62c118aa75b7b0ea834 SHA512 ece377a284a548444c185a7c1fa4c36546709ec00754d066eb4186fba0f079de60b02dcb75f3fd101d50c8ea8f4d4d654d7efd0d8ff8db7b2b85c097c18b43c5
diff --git a/app-text/evince/evince-3.36.10.ebuild b/app-text/evince/evince-3.36.10.ebuild
index 55eb01fe8865..64014ae0e5a1 100644
--- a/app-text/evince/evince-3.36.10.ebuild
+++ b/app-text/evince/evince-3.36.10.ebuild
@@ -13,7 +13,7 @@ LICENSE="GPL-2+ CC-BY-SA-3.0"
 # subslot = evd3.(suffix of libevdocument3)-evv3.(suffix of libevview3)
 SLOT="0/evd3.4-evv3.3"
 IUSE="djvu dvi gstreamer gnome gnome-keyring +introspection nautilus nsplugin postscript spell t1lib tiff xps"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
 
 # atk used in libview
 # bundles unarr
diff --git a/app-text/groonga/Manifest b/app-text/groonga/Manifest
index 9433ea61f9dc..f3b18628a2f5 100644
--- a/app-text/groonga/Manifest
+++ b/app-text/groonga/Manifest
@@ -2,6 +2,6 @@ AUX groonga.confd 259 BLAKE2B 440b084d0e41da1b81e27ffa1e42963ce22d83027841039d48
 AUX groonga.initd 715 BLAKE2B 0cf870704257490477a7a254a670ef5ce48141b8c9c4119446bcfab92972319857c77ebe41044c7d338b10bb720744788ce0313f8b2ee50277571513d0cfdb83 SHA512 7b4f789c9201f40fee0d99b94554bc33aebf024da02794143317215713cea3f2a9fda2e87d2a8bb864a7d0c8a2c44e824c65deecd4c95360423f7d3a4f04f8c2
 DIST groonga-6.1.2.tar.gz 14028916 BLAKE2B c05a1a5a73bce63655eb588b3021570d22a0016837810c12813bb4f208bf9b114fc514a8887e4f756fb0ec27ad2c991eea026bf57391e9234e49ee084656d26c SHA512 cd2dd667608fac856b36a824c5ea285da937cc11b6d4e5ad2f84581f6fbc714b4bb381515ec7b467ddccfad77c77c080000def653d9cdd8725c0f512c7b83f20
 DIST groonga-8.0.2.tar.gz 15095427 BLAKE2B fa83034a434edaa35dede08cb042e48f15e1e2edd78a121f9341f53f53a5eef863d02e2ea6384428c720c4ff9acf1083504046c8c11a1ea8d7bfc4b541db66b5 SHA512 bc5590604054c4adfbc80b39c7cf367e8a989c47d80c37c48feffb9a427b4b4e360289f3d732f6affa7d26a1c8559f23bda1c70b6736a06601398fce9a53acf1
-EBUILD groonga-6.1.2.ebuild 2415 BLAKE2B e7e4765e5fecee4a93db394121c490bc86fed89eb3b52e17fdc474393f020f1a65eb8f7108289d2a8ff291d0f5cd96d5d0d1a9f8fda45b1bd7ec16fda39898e5 SHA512 55e1234b5465175f906dca409bcd47808250bbe87feada889ded367c0a768d2515b9178745b4f03c35052f06aeb6526e3a20b3e78e1cff3b581bf9d203ca0ea4
-EBUILD groonga-8.0.2.ebuild 2621 BLAKE2B efcfa60f6d05c88d765973434c2fa53f25d28de79ac627cd1d5ba7a3f7313e214c88ecff5b70f16b1fac046f7b8ad919311c6d5abef3ce762f413a0de4fe2627 SHA512 875ffc1cd44664637e860ffd5ac91ae1e5b8b6858ca6413fa0076090e04a0bf78fa89e03e3e8f52941adf1d8a748bdbd4d0c46a8aa3bcf6ec00914b219b03aea
+EBUILD groonga-6.1.2.ebuild 2419 BLAKE2B bf0fd1932677a7542a6865794fe5c4decb70013b727bc6b9e320c4acdf9fa3000440b49bdd916b659dc20965017f29138c011877086af70546d83d2f7771743b SHA512 8c8cca7676eb0c8d3769a774ea87c019189d9ee3c2c098a60dca1da38cb34e245677afc64788dd2b2a46b676549f6913f5adb08c99faad46e2fc20702cfe82ed
+EBUILD groonga-8.0.2.ebuild 2643 BLAKE2B bdda1f1a9fac1df44ed2cf51897d87752a44b80313a621e3607bacbff659fe5e37a387b5da9933177701f93d1857cdbc4200cdab1748f1bcb2e296b2f2276950 SHA512 7615cf4c3bb5efd15dc45199f87615105b5fd5147ebe32374a6e2e4c10043556f4fceaf65e8104a80f06c53c69c4c1ae4760c94cb03d7889ac4ef3ab63e1a548
 MISC metadata.xml 1156 BLAKE2B a6fdcf212e2de097ea99dee4c071da0af7c4024a9c4390aaee67a94f1940ff3483e08a5c20e301e47de63dffc59856a2114c2bf72de9f22e2031bd60c719fe6d SHA512 a1e8936921f6688690cc70ef39eee1abfcdb7b6940de9a29c6f1f3750c3dab4e8f50d1e189ee57ca87085e8e0daf81ff52a93cd81076745f6f479d291fabe079
diff --git a/app-text/groonga/groonga-6.1.2.ebuild b/app-text/groonga/groonga-6.1.2.ebuild
index f10e95ad95db..436498af5536 100644
--- a/app-text/groonga/groonga-6.1.2.ebuild
+++ b/app-text/groonga/groonga-6.1.2.ebuild
@@ -63,7 +63,7 @@ src_configure() {
 		$(use_with libevent) \
 		$(use_with lzo) \
 		$(use_with mecab) \
-		$(use_with msgpack message-pack "${EROOT}usr") \
+		$(use_with msgpack message-pack "${EPREFIX}/usr") \
 		$(use_enable nfkc) \
 		$(use_with sphinx sphinx-build) \
 		$(use_enable static-libs static) \
@@ -74,6 +74,7 @@ src_configure() {
 
 src_install() {
 	local DOCS=( README.md )
+
 	default
 
 	prune_libtool_files
diff --git a/app-text/groonga/groonga-8.0.2.ebuild b/app-text/groonga/groonga-8.0.2.ebuild
index c429f681ca08..19c48773526c 100644
--- a/app-text/groonga/groonga-8.0.2.ebuild
+++ b/app-text/groonga/groonga-8.0.2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit libtool user
 
@@ -26,11 +26,17 @@ RDEPEND=">=dev-libs/onigmo-6.1.1:0=
 	zeromq? ( net-libs/zeromq:0= )
 	zlib? ( sys-libs/zlib:0= )
 	zstd? ( app-arch/zstd:0= )"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	virtual/pkgconfig
-	sphinx? ( dev-python/sphinx )"
+	sphinx? ( dev-python/sphinx )
+"
 
-REQUIRED_USE=" abort? ( dynamic-malloc-change ) fmalloc? ( dynamic-malloc-change ) sphinx? ( doc )"
+REQUIRED_USE="
+	abort? ( dynamic-malloc-change )
+	fmalloc? ( dynamic-malloc-change )
+	sphinx? ( doc )
+"
 
 pkg_setup() {
 	enewgroup groonga
@@ -38,7 +44,8 @@ pkg_setup() {
 }
 
 src_prepare() {
-	default_src_prepare
+	default
+
 	elibtoolize
 }
 
@@ -71,7 +78,7 @@ src_configure() {
 		$(use_with lzo)
 		$(use_with mecab)
 		$(use_enable msgpack message-pack)
-		$(use_with msgpack message-pack "${EROOT%/}/usr")
+		$(use_with msgpack message-pack "${EPREFIX}/usr")
 		$(use_enable nfkc)
 		$(use_with sphinx sphinx-build)
 		$(use_enable static-libs static)
@@ -80,14 +87,16 @@ src_configure() {
 		$(use_with zlib)
 		$(use_with zstd)
 	)
+
 	econf "${econfopts[@]}"
 }
 
 src_install() {
 	local DOCS=( README.md )
+
 	default
 
-	find "${D}" -name '*.la' -delete || die
+	find "${ED}" -name '*.la' -delete || die
 
 	newinitd "${FILESDIR}/${PN}.initd" ${PN}
 	newconfd "${FILESDIR}/${PN}.confd" ${PN}
@@ -95,5 +104,7 @@ src_install() {
 	keepdir /var/{log,lib}/${PN}
 	fowners groonga:groonga /var/{log,lib}/${PN}
 
-	use examples || rm -r "${D%/}/usr/share/${PN}" || die
+	if ! use examples ; then
+		rm -r "${ED}/usr/share/${PN}" || die
+	fi
 }
diff --git a/app-text/gspell/Manifest b/app-text/gspell/Manifest
index a5def6d0c799..c847e04a1a55 100644
--- a/app-text/gspell/Manifest
+++ b/app-text/gspell/Manifest
@@ -1,5 +1,5 @@
 DIST gspell-1.8.3.tar.xz 421468 BLAKE2B 70a8c0649a9f1f0d5e1bbc170734c6ce7aeb4875ed1cca52c4c582688c56553ad2363b9fed732c504f3ff6bc33d994fc4ba12cd3754e4f3b602be2a2015144df SHA512 4116231fdfb416e70ee34c73e0ecf81f0071e81ad477135e3c1e270534dfe4be20c7f45e316e13d33c79944d282ed3223251122983a0f3199ea57c3431a24c1d
 DIST gspell-1.8.4.tar.xz 424356 BLAKE2B 031787c4f5c3f3cfe21d5f74ec72117818da43313c5e6dffb79581ca07033aede2ecf236ffdf2197938d62727c5bd3913d1362e02be7109b0d498304949e1d44 SHA512 adb481590442d81040151746c7747791d76248b1b35af1702dc5389efbd2e0c6bdda070b8e84384d22f4922b5a382ac2c6519e425f417ec85c8efbe22dc38c82
 EBUILD gspell-1.8.3.ebuild 1477 BLAKE2B 6ad6e2c4522506edbd658ba763a3620fb5b7b7f7ea88d4268b0312b38bd6d6774cc208808953a9035b11e9d6dc5c8ca99f7adeb8f53e82255dfe53eac93bd752 SHA512 3b57665e5aadbe512253792b41b1f688b23653a56da2b90ef5370bc33781682937670e719b69c9eed89d7924abbc9d23ad4b3f4535a2cbac3baeb01ebee223fd
-EBUILD gspell-1.8.4.ebuild 1480 BLAKE2B 1033489ba41997af757377589f1922c7384c5b69048b52e0239cc2a3845b6bdcdc6f1b499cfe379346473d0399db810f3df47c7af6b5eaae6b1330ef5a40e8a0 SHA512 e29f3b1325a57bb9732adfde8fec6101f7e0a5ae4cfcbef710cbd2d7d41eca56a5831bdb732a5397ecfb5f6f62ff326b54a8fb6f3953019c19fc5c0ebd913d5b
+EBUILD gspell-1.8.4.ebuild 1479 BLAKE2B ef21a34dc5b1de6892f81db4985828dbcf8c4790f8847887a9317e7dddaaa02905efb8e8bb5518c1f18a2fa75d0b1fc1c942a77d5fbea847234b56df1bacbdca SHA512 3c468218f7655c14be37e05d6702133ffabdda48c15366b9bdde42440c97f557548068580def6938a180aa6cfecc521f737a4df58428fc6b7580c03449e48124
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/app-text/gspell/gspell-1.8.4.ebuild b/app-text/gspell/gspell-1.8.4.ebuild
index 70eb544cba3a..64919831d8ba 100644
--- a/app-text/gspell/gspell-1.8.4.ebuild
+++ b/app-text/gspell/gspell-1.8.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/gspell"
 
 LICENSE="LGPL-2.1+"
 SLOT="0/2" # subslot = libgspell-1 soname version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
 
 IUSE="+introspection +vala"
 REQUIRED_USE="vala? ( introspection )"
diff --git a/app-text/iso-codes/Manifest b/app-text/iso-codes/Manifest
index f61708df98d7..673f83573004 100644
--- a/app-text/iso-codes/Manifest
+++ b/app-text/iso-codes/Manifest
@@ -1,5 +1,5 @@
 DIST iso-codes-4.4.tar.gz 13299605 BLAKE2B 485f3b0240f1892fb96f2b5c391b3f0adc593fac97d53748aa104208936d1bf81de1d40e742ab48e3663cea0ce5b28a20782df2f4eed251bab5b8a7055745d0e SHA512 d22ecdef75cd07b59ea0dbc87d25eb254676ab83297c1a43dbad9d3471ba355630f5588b4590972526f9e885b2e1ec307303ac0bb94b2dd5c707377c1cfa64d8
 DIST iso-codes-4.5.0.tar.gz 13635723 BLAKE2B e96cbf80a93fd4901decd59006e51b39eb35b64b6ead28c0f0f1b0103f341dd79849db07f63be16154e5041a85a563d477b6470143ad325f1d25880d539807d0 SHA512 457585de1bfb848bbdbd15754588e690e3214f5d4442c32df4044f8a5b2cf6035c9c0cea84cc9b6e6ef093c0e9c8f7317e5bea920060b09d121b042e66046ca5
 EBUILD iso-codes-4.4.ebuild 2622 BLAKE2B 1d50fe1b7b86ddb2e4ea632db1913f3484b1d320e0826486d56a2ff325b43e20cc388f3fb650897860f5acbb9807829f98d6733ecdcbd0f74a83f8bbb4a1ac15 SHA512 32416dba78245fe22d42fa75b6cb53175145ac7e450498fa1df7906836e97cb8bf722c448d8ef3d10ec497b63cedebc5526619dd249286d86c90efc129f2b1b9
-EBUILD iso-codes-4.5.0.ebuild 2635 BLAKE2B 02c0d43e54294c8408f2839954465f5e0edb19913967eec1a9fb43a7adf8472c0654f10e7ae833ac7f94321b0344b87de6c56779f27bd0ad5b2786fb8b80a8ee SHA512 3b3b1a2b5e45685e80e6a7b0ec5b5eef5e19dce7cc9ebb0b4c5e3fda4f9d2143633e8323e64beb12b3c3e2a1d8ecfb9bb58ae79754f9065b9c906bcc9655f268
+EBUILD iso-codes-4.5.0.ebuild 2634 BLAKE2B 569275085ec5bf492763195c175741526944fa8ff1f82bdca6d6fce9d7501766043932dc5fc422fa25374787799df321e24586077c1eb4d8deb5124093b18ddc SHA512 89f9b1e97bdfb92f63fac82841ccdd565a30a4a956e96c269433d930e5cd202b7f24298c09498fef7e735619a445f2b09d5c568ee4ff1945340ba896c25a9002
 MISC metadata.xml 480 BLAKE2B 3aefef945cb111095839e8fa8b84757e7f51a9aa8848806911d8c01763ab2d2f1d0c5b31c042f6ee307756e007893f6559c54d74a104caa612c9a6d39b2eea7e SHA512 5729ca31911ea7dad748e9f3afdd1f45f9034d783b56a75609101bfdb0a204bda8a078e7d251e89731091726062c4ac962e000ec7a898cb66ff787c8f2308d4c
diff --git a/app-text/iso-codes/iso-codes-4.5.0.ebuild b/app-text/iso-codes/iso-codes-4.5.0.ebuild
index f22d651e826d..8232e7373025 100644
--- a/app-text/iso-codes/iso-codes-4.5.0.ebuild
+++ b/app-text/iso-codes/iso-codes-4.5.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://salsa.debian.org/${PN}-team/${PN}/-/archive/${P}/${PN}-${P}.tar
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 
 BDEPEND="${PYTHON_DEPS}
 	sys-devel/gettext
diff --git a/app-text/libnumbertext/Manifest b/app-text/libnumbertext/Manifest
index 60f82f91b5a5..0b2abee3527e 100644
--- a/app-text/libnumbertext/Manifest
+++ b/app-text/libnumbertext/Manifest
@@ -1,5 +1,3 @@
-DIST libnumbertext-1.0.6.tar.xz 283416 BLAKE2B d02a521db19a21c6036412f902af7227d7442ca25d38e5e35339f74c8ee6e275ed085aeb4c4f07f998bcdc33ac62be84ce6915dd430594dedad1fa0f65b388b6 SHA512 0b2a5226f363af9a6df90f788f6cdc5fe95ddb524d96ad2db1caf2e7f414649ce2975eae3c9e5fceecbf825a90c736a0717b02ec9671e980ab9cfb3e2df73b8d
 DIST libnumbertext-1.0.7.tar.xz 289764 BLAKE2B dc7a340dd1843ac77088fd31d4343b570bba0bd5758b939ad228d9d31a7f283ce9c11cf8a504e0c14464bfc6962911b7d1c075122d3efaa7014180a57d419248 SHA512 7755c713dd9b9b75e486eac7ffbfb418c3bdfefd67ecb149f0e25a339410814bf73296f69a4e009a17f9f21292f0eeafa931aef60596cd3d932dab47278de8c2
-EBUILD libnumbertext-1.0.6.ebuild 544 BLAKE2B 886724679f53691089fe45359180712ee3bf74c16c7a939fda4b84493283065fc6f9cf9ca4b6890adf6e0f2f390cac52fe4c20294232db7f96fb278e28da4b83 SHA512 d3737fb073898718813b7b0465a295a9e772f6fb119250b6d70522ca09802f79e2a3741788f63985a29c1d55d25f78f55e2f3271ae9b7327b013e486fe38b786
-EBUILD libnumbertext-1.0.7.ebuild 547 BLAKE2B 01bcf67a2e05382f90add525bd38c16a416971e456654c0bd13bf25052c7db56b08c8f49213539d63027674c347b87940271cd528e5b9318bc32ab272c271a61 SHA512 124f3ce9fefb6248c8308ffab658a7827c510aa7a00b7dd3c5ab5e2804436cb39bb359085062d95d9b331c566ef64b11b0d354366c568288e261747c57eea97d
+EBUILD libnumbertext-1.0.7.ebuild 544 BLAKE2B ae8f45785571d5eab9a52e195d1461a38e65e05d0dfe3034fc4da5fda093365861ebdf8d70ada7283362917d10b49144024e35d4869576ed33a4c3eea76e0808 SHA512 2f4e9a60eaeabb0cbad2b567ae0fe07cbba21eba5b91e69a4da1a7336d341efc60f1385068390bd03c1152ec93d23a01cf8d769707b0c667248cd518ad4f5977
 MISC metadata.xml 255 BLAKE2B 9b8486730bea2158e8be5cbbe0552c5460d1b18e2236a68e3f11d85ce4eeb96eb0e746f44a10cb7cdcf1bf498190a512ef42f47852c6843b9a3c937ceabc338d SHA512 ac646e8ac676faf0aac283e4be31c5f2b29e98ccf07327073ed05e688ce696caf639bdfea63e4aed141a90e84c0a86892bc717a52b95cdf1739aaa15240013c3
diff --git a/app-text/libnumbertext/libnumbertext-1.0.6.ebuild b/app-text/libnumbertext/libnumbertext-1.0.6.ebuild
deleted file mode 100644
index a0453adf49fc..000000000000
--- a/app-text/libnumbertext/libnumbertext-1.0.6.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Number to number name and money text conversion libraries"
-HOMEPAGE="https://github.com/Numbertext/libnumbertext"
-SRC_URI="https://github.com/Numbertext/${PN}/releases/download/${PV}/${P}.tar.xz"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE=""
-
-src_configure() {
-	econf \
-		--disable-static \
-		--disable-werror
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -type f -delete || die
-}
diff --git a/app-text/libnumbertext/libnumbertext-1.0.7.ebuild b/app-text/libnumbertext/libnumbertext-1.0.7.ebuild
index bb54e140daaa..53b9c0af234e 100644
--- a/app-text/libnumbertext/libnumbertext-1.0.7.ebuild
+++ b/app-text/libnumbertext/libnumbertext-1.0.7.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/Numbertext/${PN}/releases/download/${PV}/${P}.tar.xz
 
 LICENSE="LGPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 src_configure() {
diff --git a/app-text/libodfgen/Manifest b/app-text/libodfgen/Manifest
index f5b28e14e7ac..f5aa84c82971 100644
--- a/app-text/libodfgen/Manifest
+++ b/app-text/libodfgen/Manifest
@@ -1,6 +1,4 @@
-DIST libodfgen-0.1.7.tar.xz 384760 BLAKE2B 93066e52c0651e3714843764f0d023178cf0ddb52c1185f085c70180f4123cd26d79b9ea2c211a82f2681c42c8795c3f062f081161effa7fe821b64b54b82cd8 SHA512 eaf5c6646a9cacf54cb0416b08526f35d18d0618f3f64cf14f4b24537b0285da2786d2f6d6e2c204c8248f900d37287b2c5af79720b0d49452f67b14c86ea36e
 DIST libodfgen-0.1.8.tar.xz 386156 BLAKE2B 8cc55cd6ad39927ca1fec459cb484362877f0eb0a044d806a93ec573ca2d840fece17fdbb58b0b30869af945fe9ddaa23a88729c1802b2b1321d5551f94a32c5 SHA512 e4a15aa7f1db483cdbb9c531bfb234b4794890cc583c70e8aa3374771be8928e7917105d48dab80d1ab6d57e43fa78415097d9b897cb12fb2a609f4647ee99d6
-EBUILD libodfgen-0.1.7.ebuild 835 BLAKE2B 43fc3f7b2c4e7bad4d5e11fa8070e8b173c20956a5c22c51a8861982ab24194555840ce02fe9e83e64f4cb0b4947196d1818a88c8ace31d254e3e9f5efc9213c SHA512 067986c043c2e4966d25e3fd9722718c30a670cbdbdd6980b8d7ec6da604cfe5fd239d28dfe67a46bd0a1abc606d22749347ab777551c46be440a0a636f21160
-EBUILD libodfgen-0.1.8.ebuild 863 BLAKE2B 60fa18c07806a0a8a09e68f0d6aa116eb637dc8df08b813ea17c6f360b5aab8a5c5522c72b6b3a567deacbe3f9eda4ead76043a5ed89438c5749a43040bb769d SHA512 008322ed33958c52ee33e5d902a3f01cd60875ee208a2292ebad92bd2e259b033131a1246b6d965afe922c2729919c7eea1db755feb441d3f169f5715d4d514b
+EBUILD libodfgen-0.1.8.ebuild 860 BLAKE2B 80ede519612954a38a78c70d5ac5815e2d4d713f86500e9fff996088468a9d679a30a57ab045c2c754cfc56876bfa51d283cbd97e8b4e48396d01b93e9d2ee17 SHA512 49967e444470787c4ce01ac270a6485cda1e15f037cc230fb5ea4c875d0b7de0d74b6df345e02dbd6cf30ca84faaf28036d2669b4f9e5a9d927a26c51387e0fa
 EBUILD libodfgen-9999.ebuild 863 BLAKE2B 60fa18c07806a0a8a09e68f0d6aa116eb637dc8df08b813ea17c6f360b5aab8a5c5522c72b6b3a567deacbe3f9eda4ead76043a5ed89438c5749a43040bb769d SHA512 008322ed33958c52ee33e5d902a3f01cd60875ee208a2292ebad92bd2e259b033131a1246b6d965afe922c2729919c7eea1db755feb441d3f169f5715d4d514b
 MISC metadata.xml 331 BLAKE2B 4bb9537b8eacb393e4dd38a4199d954aa12aa917f626ffd125cecb49c2fe4b4e866bc33c941323eae45c2b804fdadc1e7200a1dfe6f57472a5e1a7881bf68bc1 SHA512 f96053e0336bf862446e0ca96ca743a1b7fac4977e6d5d4b9781424ac33a3d89c3e4c334eb27a427d3f83c2c437e8fe4b0eaf4ed87513c3eeaae39a72db8767d
diff --git a/app-text/libodfgen/libodfgen-0.1.7.ebuild b/app-text/libodfgen/libodfgen-0.1.7.ebuild
deleted file mode 100644
index 7d98bc7374e8..000000000000
--- a/app-text/libodfgen/libodfgen-0.1.7.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://git.code.sf.net/p/libwpd/libodfgen"
-	inherit autotools git-r3
-else
-	SRC_URI="mirror://sourceforge/libwpd/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
-fi
-
-DESCRIPTION="Library to generate ODF documents from libwpd and libwpg"
-HOMEPAGE="http://libwpd.sourceforge.net/"
-LICENSE="|| ( LGPL-2.1 MPL-2.0 )"
-SLOT="0"
-
-IUSE="doc"
-
-RDEPEND="dev-libs/librevenge"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-"
-
-src_prepare() {
-	default
-	[[ ${PV} == 9999 ]] && eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-static \
-		$(use_with doc docs)
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/app-text/libodfgen/libodfgen-0.1.8.ebuild b/app-text/libodfgen/libodfgen-0.1.8.ebuild
index 6c33ab30007c..e93e04f93338 100644
--- a/app-text/libodfgen/libodfgen-0.1.8.ebuild
+++ b/app-text/libodfgen/libodfgen-0.1.8.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit autotools git-r3
 else
 	SRC_URI="mirror://sourceforge/libwpd/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 ~arm arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
 fi
 
 DESCRIPTION="Library to generate ODF documents from libwpd and libwpg"
diff --git a/app-text/pastebinit/Manifest b/app-text/pastebinit/Manifest
index 1bc8e86488be..bf155520d91b 100644
--- a/app-text/pastebinit/Manifest
+++ b/app-text/pastebinit/Manifest
@@ -1,3 +1,3 @@
 DIST pastebinit_1.5.1.orig.tar.gz 51448 BLAKE2B a5cfa13c770e234d6e08d4f0b662c09398a5f20ac4e3f7c10ab086261923851239a3e6c1bda78ba6ba810f95cd90e6517b74aa41c5b5e3d50bca5b8c100aa594 SHA512 02b7faa54862d240eac3a8edaae2edb895cbb476cbf89dc71514a5a0a42aa2b0d26f07e5485627d1deb61f62e37018459e4d072bd4aacc886f259fced35e352c
-EBUILD pastebinit-1.5.1.ebuild 1335 BLAKE2B de1626383491379b3c9b04cef9aa19dbe36ce364fad754d196e1fa944e962ffda57f8f3c1b7f5dcde0bc65f93fd230886e8105f5e518cbcb345420d923a83127 SHA512 7ea3759337015fde7bd30476f9391e4910667d022f57da038edf8bf10758dce85669609c11b57210286f53edb1ba2f700558ffb81f4b257c1253bee08086031a
-MISC metadata.xml 326 BLAKE2B d50cef7d0035889868a74b6a2794648129bf06b854208dc28eefe82251c2c2bb4562d19103a6abae51e3f40afccfd901a4c1e2ed8bfcf9910fa99d9543b069c3 SHA512 cd582b088098d0163e91ea17e6b4fa2fb5b816e44590ff8f159730215d9b8118b747b43fdcb9d7a6cad3dfbfbcd8d8b6e29cd509b7a9d6e3b860c77c4ac10c4c
+EBUILD pastebinit-1.5.1.ebuild 1365 BLAKE2B 96c27cd94d5773265eb4ee2866d413380882046b5ffe6a5fd07cab769f3947d4d9fbfc238b3b8f37635ccbdc44d476a2a7fd319afee4eab4985f53b0aa5510ec SHA512 c3b70c11c241d6d038a8c172cc7d229b675ec91438084d1b4e5c8fcc54b362e72755ac4bb02410f7af29ba927956a0ccfafd1211cfe33efd208f4ec5c5b1e1fc
+MISC metadata.xml 350 BLAKE2B 48e5e06f98f204858522d5d157b7739cc8b4e6d9b22ebadd9318fdded30361594ca8e5ebc8b64dc26135b60de12adac9dece6560a0a68fa7f49876e63c90d1b5 SHA512 19b844196638bcb27fa6dbcd46516e0ca0a1861737fd29f196fddbe0489a077d11bba1efac5f21c395616923dd67b55e3797e508fd3ae48516cc4991afd54bda
diff --git a/app-text/pastebinit/metadata.xml b/app-text/pastebinit/metadata.xml
index c5629ce6ee70..6a9946b0c43c 100644
--- a/app-text/pastebinit/metadata.xml
+++ b/app-text/pastebinit/metadata.xml
@@ -2,6 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!--maintainer-needed-->
+	<stabilize-allarches/>
 	<use>
 		<flag name="crypt">Install pbputs for gpg-encrypted pastes</flag>
 	</use>
diff --git a/app-text/pastebinit/pastebinit-1.5.1.ebuild b/app-text/pastebinit/pastebinit-1.5.1.ebuild
index ae5a31bb904b..7a0e41a109ba 100644
--- a/app-text/pastebinit/pastebinit-1.5.1.ebuild
+++ b/app-text/pastebinit/pastebinit-1.5.1.ebuild
@@ -1,15 +1,15 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
-PYTHON_REQ_USE="xml"
 
+PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_REQ_USE="xml"
 inherit python-single-r1
 
+MY_P="${PN}_${PV}"
 DESCRIPTION="A software that lets you send anything you want directly to a pastebin"
 HOMEPAGE="https://launchpad.net/pastebinit"
-MY_P="${PN}_${PV}"
 SRC_URI="mirror://ubuntu/pool/main/p/${PN}/${MY_P}.orig.tar.gz"
 
 LICENSE="GPL-2"
@@ -19,42 +19,55 @@ IUSE="crypt"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-RDEPEND="${PYTHON_DEPS}
+BDEPEND="app-text/docbook-xsl-stylesheets"
+RDEPEND="
+	${PYTHON_DEPS}
 	$(python_gen_cond_dep '
-		dev-python/configobj[${PYTHON_MULTI_USEDEP}]
+		dev-python/configobj[${PYTHON_USEDEP}]
 	')
-	crypt? ( app-crypt/gnupg )"
-DEPEND="app-text/docbook-xsl-stylesheets"
+	crypt? ( app-crypt/gnupg )
+"
 
 src_prepare() {
 	local mo=""
 
 	for lang in ${LINGUAS}; do
-		if [ -f po/${lang}.po ]; then
+		if [[ -f po/${lang}.po ]]; then
 			mo="${mo} ${lang}.mo"
 		fi
 	done
 
 	sed -i -e "/^build-mo/s/:.*/:${mo}/" po/Makefile || die
-	eapply_user
+
+	default
 }
 
 src_compile() {
 	emake -C po
 	xsltproc --nonet \
-		"${EROOT}"/usr/share/sgml/docbook/xsl-stylesheets/manpages/docbook.xsl \
+		"${BROOT}"/usr/share/sgml/docbook/xsl-stylesheets/manpages/docbook.xsl \
 		pastebinit.xml || die
 }
 
 src_install() {
 	dobin pastebinit utils/pbput
+
 	python_fix_shebang "${ED}/usr/bin/${PN}"
+
 	dosym pbput /usr/bin/pbget
-	use crypt && dosym pbput /usr/bin/pbputs
+
+	if use crypt; then
+		dosym pbput /usr/bin/pbputs
+	fi
+
 	dodoc README
 	doman pastebinit.1 utils/*.1
-	insinto /usr/share/locale
-	[[ -d po/mo ]] && doins -r po/mo/*
+
+	if [[ -d po/mo ]]; then
+		insinto /usr/share/locale
+		doins -r po/mo/*
+	fi
+
 	insinto /usr/share
 	doins -r pastebin.d
 }
diff --git a/app-text/po4a/Manifest b/app-text/po4a/Manifest
index 384c218ecc6c..0c7e3d60535b 100644
--- a/app-text/po4a/Manifest
+++ b/app-text/po4a/Manifest
@@ -1,9 +1,9 @@
 AUX po4a-0.60-man.patch 577 BLAKE2B e2f9263b5c92b798224a1ae9ba9e3358bbf755f0573c34512151e7110517ecd7570b7946291de945f8f6557f6ff4b33c2d4f7900c4937ea284fe11e23f50c8a4 SHA512 5d88645d35234723f3b397953bf1aaaa8160fa591dd86430663f270ad10e4d5cceb7957774ce741bc0a46f37120473cb511eab88e78c0826717a4c5761d1c13a
 AUX po4a-man.patch 621 BLAKE2B abdbac744d7395ec5f008e2ac2bcfd9aecf0f24726acd1e32a2a243995d9f26b0099e2194848a9a4d3b01dc24d4657cdc4470977838a96a1979495871dac5b8b SHA512 0d797b92c551eb75fa144e9b39d1aacc8acb00104a6d9e0dbdf4d00219b4c0c074637c953764e8cf1d67bdb1f3941fa0727da242b7761a96a8dafe66af224397
 DIST po4a-0.57.tar.gz 3079550 BLAKE2B 54b1d3263aa0ebd90eec61d735c3422efb5f67b2d88f91a87a6893bcdb7f06131aedadeb3577d221cf75ba07f8001f6e23409375756afec8357e26e8f0f0a1c2 SHA512 7ac2e614c126b049feeb8edbafb71a875cee78fb85d8cd74f3bf5b555cc8b2d19d5e4606b732e714e937c34e178729d73edfe559de594c5ffe811b5162b27d81
-DIST po4a-0.61.tar.gz 3863796 BLAKE2B f10c7d8b42c32be1b100f724e6d0d1b419e5ed10e0762c45bda8d91bbec7d5de331265611edc8cfcb04e3afeb044258697a54bea996240c27eb113f2f6aa0df3 SHA512 51038a3d2b2056de9bb258bc0b83dba4dec4414d6a06dedc17067441fba6824cd93296308abaa418248e3583bfacd6c81621fa6eb42e5596a3c29968ce154e77
 DIST po4a-0.62.tar.gz 3980028 BLAKE2B 4336c09254728b6a8d9c1220628612735e10d1531e3473eb7606900b9f20db3cfec1bb1c1c57f5c40bf8fce84fe823d25c743e2d50b3c56558239526f12bf09a SHA512 a91a31d9d80bb48ee071f39148572a4ec2b65f472a26696aa517c9d52ad56accf9fbdf971dcf15dd1c492cca7efab328ebffe1f20e98f7fe2532d4bf490a9997
+DIST po4a-0.63.tar.gz 4067940 BLAKE2B 4cfa4163c21f5f8b783a5bdc29595f10cd172f7813de5617ed67a25bef547697084511a6f3897c47acb9158f15b3fcd97600bec7e23ba560cffe7cc646ce4c39 SHA512 556859b73728249795df22676a3cde1cbf575c608ad20f267fe7a6ee224d0262db2db19df8b7369ebf1ab568c017548ff118ae035608cca7a4d0963db8acd633
 EBUILD po4a-0.57.ebuild 1285 BLAKE2B bcf6b815289c5ee26d89fa62cdc838214c55c96c389fd3c702b8805250154662f857035f830254ee845e940e247ee5233703045b08746cef04d935643f93021a SHA512 0708efd6af416b9041c046a4d4ef6ac3548f31c971a818813e72b2eba1e19a68ca1b898557f1c9984f514efd8855bc0c807a8528fef90bcbf627cfa8580b956f
-EBUILD po4a-0.61-r1.ebuild 1351 BLAKE2B 6debc9afb688b43cb32ceb5f7917725bdc3789b5a85608f9bb04b7ad0c068736d9aa017e833736975391822238a7da423693b47e9dedaead57e411d3163b5920 SHA512 bfc6365370153ef887cd12c35b54bf266cfa058f10e897394cdbc39e663ee059b17414c9dcd758ad8efed8efd2de36c49f1edd5e4d19887227af41161752adb9
 EBUILD po4a-0.62.ebuild 1383 BLAKE2B 2d2f86a2cc71b5f7bd679c846c4c984492662e67a35a609de6527e453bf474e29706cf745fa868be1f10852a5a8b9b1c32d99eb033af82d848eb54b23163e52a SHA512 20b8cc64181a81b51946a3544d690b68360ede8a31632c53fe668a2a0118f2027ff01291da1dac8e90df466894cb67c575f876fdb9e6b784a324b16df2408ec6
+EBUILD po4a-0.63.ebuild 1383 BLAKE2B 2d2f86a2cc71b5f7bd679c846c4c984492662e67a35a609de6527e453bf474e29706cf745fa868be1f10852a5a8b9b1c32d99eb033af82d848eb54b23163e52a SHA512 20b8cc64181a81b51946a3544d690b68360ede8a31632c53fe668a2a0118f2027ff01291da1dac8e90df466894cb67c575f876fdb9e6b784a324b16df2408ec6
 MISC metadata.xml 326 BLAKE2B 6ec11e49a2b25069f1e2eeac2eaa7ce8adb48704986f873ba92de8a1328e7d2963cd79efac7d2672bdde1fc6c71cddbfa11fbb4bfd4cda28fa1f92e350ef5be6 SHA512 2fbc62c1bbc9a555103e9ba0eb3389004f9770eaff51e00fea853051ac6da43312366d3a50ba63ad28453219dfc8970f9a78c7af2bf7799f58911a33e0bfd3f9
diff --git a/app-text/po4a/po4a-0.61-r1.ebuild b/app-text/po4a/po4a-0.63.ebuild
index 2732597fc5fa..3cd43355adfe 100644
--- a/app-text/po4a/po4a-0.61-r1.ebuild
+++ b/app-text/po4a/po4a-0.63.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/mquinson/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index e9071625655d..22bb8dc4e474 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -7,7 +7,9 @@ AUX poppler-20.12.0-respect-cflags.patch 5494 BLAKE2B 8107bd3cb374694aea1dbd66cb
 AUX poppler-20.12.1-qt5-deps.patch 1626 BLAKE2B 7dfd227e1e8d4449e0cc72ca297afa78b58e97dea19fe7f72bc65a599890db586dcb46780b3c737e2c2723749cf53078fddf565aa58bec0cbf553993d18bb6ce SHA512 286ddcae2bb639107f3d3ffab9317b10c437014d466efc8e39407d6350acc77900ee60888863b9dfa95c546c39b5b7f1a97a8936a4ac3ed7c6b2a30666eee537
 DIST poppler-20.11.0.tar.xz 1648432 BLAKE2B 373464ba60ed84863b40eca2e4f99ebc1625ea06f68a1621165675cf46e70713b649f90630049d15c5c2bc59bd0befb437a4039b47e17509d4fcc4fed8586d53 SHA512 c8237e931ef20d939656e2600453fffb12a2beeafb273782b2069aec6e5915d8cc85136982b7eaf5956af30ce00da2faf84d86ffab47f725447dfbb9d6ffe335
 DIST poppler-21.02.0.tar.xz 1684496 BLAKE2B f62399a70baa0af36abd9bf7f5bc69003fcdc9b668a64475a6373dbdd9885092a8beb42f887eafdafac5ee17e9aac5b610bad1c9a64af8112e72c82f47e6a304 SHA512 3964990749f38f4468b244c579ff1f2dab7357dfddecb3035d14d3aaeac6ee4be42e76b4a1cc1a8cf53715518def9e92cc59d08c1e22592ced00a9c948989035
+DIST poppler-21.03.0.tar.xz 1690848 BLAKE2B 60aef92bdfdc603b38dfb2a1aebd59c9085e6d51a2e22864edb3b0fd535421f47fb8041241e321d44cd8539538b61c6e19fe2d99a8a2d21fd85c3757ccadb5d2 SHA512 0eea1b5f32d79c3a497351a6491b5f617b089bef0a9a446723e87185acadba535e3146c0c141f4c2165ced1aa6fa853b54760a322d0932cfe3049c0ad94d64fa
 EBUILD poppler-20.11.0.ebuild 3364 BLAKE2B 0bed70002e75a2ef80c1504057f77c6fc89b0729d219352d534f6cec73a117d718364773520ed5fddc6e9f339e275a9ac2278e1755b01d6099fa8bd27fdb8d0d SHA512 674e487dee7bd6cb117de9c4eac0e0c7602e397b0c20224a90edd848ba373364d6d270f51fbbd49ada7528b26675e41179ed03cc6e608abc070e4aaeaa9252b1
-EBUILD poppler-21.02.0.ebuild 3256 BLAKE2B ef04f78cddc929747c2060e4c2fe0e1fe8ae6fc427af0c4fadde96d8bb6e30a7b6b761eccab339aa13ff185ebca2b8c15cb3a7ffce22086babd37e0a1ada7a01 SHA512 f0d74a22a12dadfb27c0b74060494fa753937134ce510e83cb8081de9199dfb98d5620d6d1f8fea755a589d112b940cafd9b7c206a9073b0e9ac72673bf54489
-EBUILD poppler-9999.ebuild 3256 BLAKE2B ef04f78cddc929747c2060e4c2fe0e1fe8ae6fc427af0c4fadde96d8bb6e30a7b6b761eccab339aa13ff185ebca2b8c15cb3a7ffce22086babd37e0a1ada7a01 SHA512 f0d74a22a12dadfb27c0b74060494fa753937134ce510e83cb8081de9199dfb98d5620d6d1f8fea755a589d112b940cafd9b7c206a9073b0e9ac72673bf54489
+EBUILD poppler-21.02.0.ebuild 3248 BLAKE2B c586ed066559ded8afac18d7d85cb24d34164b42503f8c87a5c6c791f4faee990237abed528432b02a5f66bf6feac598807177b498a1c1ca53e740481ad6d183 SHA512 c0514348aa20d7f80b13a3f7343548b7c0dd0f3e1f4f4f777f8df1779c30df70bfe642d14293e31af07ca80e7590f5ad32a890692ddab80dc9dc40d7416c41e2
+EBUILD poppler-21.03.0.ebuild 3256 BLAKE2B 785cf6a6d91167077ab0a8b441e4f879b8cc82b6c789d4632d2270438099c006589dbbc6d5137540cd38c3397ae728efbc3e69eaa67def9b3d1302713f3fbe3e SHA512 34244bb699446c2ebd406e12fafe59ab8dddc0578b2437515732bf7d2c7d0043c6c3d0eab8a7a7d667439b36532cb5198e941f384cd11d72c2fbea3466b7dda2
+EBUILD poppler-9999.ebuild 3256 BLAKE2B 785cf6a6d91167077ab0a8b441e4f879b8cc82b6c789d4632d2270438099c006589dbbc6d5137540cd38c3397ae728efbc3e69eaa67def9b3d1302713f3fbe3e SHA512 34244bb699446c2ebd406e12fafe59ab8dddc0578b2437515732bf7d2c7d0043c6c3d0eab8a7a7d667439b36532cb5198e941f384cd11d72c2fbea3466b7dda2
 MISC metadata.xml 995 BLAKE2B 0d99fda69e6b020fd1b6fa879a0c3af278b92111be31d97cabe88703f06b4af56ce64ce9e0fc556d2b056c6770e547ae3b88dcc82da9cc26e15e2d1d0b5f685b SHA512 ae813761c5ab4dab475b737085f14f5874655b31f247f26495c43d8fcc47805dfceb2a8cd23ead39a3f8ee75ac820edc7c2554e573c338c09e5ec8b9d383417c
diff --git a/app-text/poppler/poppler-21.02.0.ebuild b/app-text/poppler/poppler-21.02.0.ebuild
index e6d3d0fbfba5..d24ddd8550fb 100644
--- a/app-text/poppler/poppler-21.02.0.ebuild
+++ b/app-text/poppler/poppler-21.02.0.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999* ]] ; then
 	SLOT="0/9999"
 else
 	SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	SLOT="0/107"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
 fi
 
diff --git a/app-text/poppler/poppler-21.03.0.ebuild b/app-text/poppler/poppler-21.03.0.ebuild
new file mode 100644
index 000000000000..8c97e95774bf
--- /dev/null
+++ b/app-text/poppler/poppler-21.03.0.ebuild
@@ -0,0 +1,122 @@
+# Copyright 2005-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake toolchain-funcs xdg-utils
+
+if [[ ${PV} == *9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://anongit.freedesktop.org/git/poppler/poppler.git"
+	SLOT="0/9999"
+else
+	SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	SLOT="0/108"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
+fi
+
+DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
+HOMEPAGE="https://poppler.freedesktop.org/"
+
+LICENSE="GPL-2"
+IUSE="cairo cjk curl +cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt5 tiff +utils"
+
+# No test data provided
+RESTRICT="test"
+
+BDEPEND="
+	dev-util/glib-utils
+	virtual/pkgconfig
+"
+DEPEND="
+	media-libs/fontconfig
+	media-libs/freetype
+	sys-libs/zlib
+	cairo? (
+		dev-libs/glib:2
+		x11-libs/cairo
+		introspection? ( dev-libs/gobject-introspection:= )
+	)
+	curl? ( net-misc/curl )
+	jpeg? ( virtual/jpeg:0 )
+	jpeg2k? ( >=media-libs/openjpeg-2.3.0-r1:2= )
+	lcms? ( media-libs/lcms:2 )
+	nss? ( >=dev-libs/nss-3.19:0 )
+	png? ( media-libs/libpng:0= )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtxml:5
+	)
+	tiff? ( media-libs/tiff:0 )
+"
+RDEPEND="${DEPEND}
+	cjk? ( app-text/poppler-data )
+"
+
+DOCS=( AUTHORS NEWS README.md README-XPDF )
+
+PATCHES=(
+	"${FILESDIR}/${PN}-20.12.1-qt5-deps.patch"
+	"${FILESDIR}/${PN}-20.12.0-respect-cflags.patch"
+	"${FILESDIR}/${PN}-0.57.0-disable-internal-jpx.patch"
+)
+
+src_prepare() {
+	cmake_src_prepare
+
+	# Clang doesn't grok this flag, the configure nicely tests that, but
+	# cmake just uses it, so remove it if we use clang
+	if [[ ${CC} == clang ]] ; then
+		sed -e 's/-fno-check-new//' -i cmake/modules/PopplerMacros.cmake || die
+	fi
+
+	if ! grep -Fq 'cmake_policy(SET CMP0002 OLD)' CMakeLists.txt ; then
+		sed -e '/^cmake_minimum_required/acmake_policy(SET CMP0002 OLD)' \
+			-i CMakeLists.txt || die
+	else
+		einfo "policy(SET CMP0002 OLD) - workaround can be removed"
+	fi
+}
+
+src_configure() {
+	xdg_environment_reset
+	local mycmakeargs=(
+		-DBUILD_GTK_TESTS=OFF
+		-DBUILD_QT5_TESTS=OFF
+		-DBUILD_CPP_TESTS=OFF
+		-DRUN_GPERF_IF_PRESENT=OFF
+		-DENABLE_SPLASH=ON
+		-DENABLE_ZLIB=ON
+		-DENABLE_ZLIB_UNCOMPRESS=OFF
+		-DENABLE_UNSTABLE_API_ABI_HEADERS=ON
+		-DUSE_FLOAT=OFF
+		-DWITH_Cairo=$(usex cairo)
+		-DENABLE_LIBCURL=$(usex curl)
+		-DENABLE_CPP=$(usex cxx)
+		-DWITH_JPEG=$(usex jpeg)
+		-DENABLE_DCTDECODER=$(usex jpeg libjpeg none)
+		-DENABLE_LIBOPENJPEG=$(usex jpeg2k openjpeg2 none)
+		-DENABLE_CMS=$(usex lcms lcms2 none)
+		-DWITH_NSS3=$(usex nss)
+		-DWITH_PNG=$(usex png)
+		$(cmake_use_find_package qt5 Qt5Core)
+		-DWITH_TIFF=$(usex tiff)
+		-DENABLE_UTILS=$(usex utils)
+		-DENABLE_QT6=OFF
+	)
+	use cairo && mycmakeargs+=( -DWITH_GObjectIntrospection=$(usex introspection) )
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	# live version doesn't provide html documentation
+	if use cairo && use doc && [[ ${PV} != *9999* ]]; then
+		# For now install gtk-doc there
+		insinto /usr/share/gtk-doc/html/poppler
+		doins -r "${S}"/glib/reference/html/*
+	fi
+}
diff --git a/app-text/poppler/poppler-9999.ebuild b/app-text/poppler/poppler-9999.ebuild
index e6d3d0fbfba5..8c97e95774bf 100644
--- a/app-text/poppler/poppler-9999.ebuild
+++ b/app-text/poppler/poppler-9999.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999* ]] ; then
 else
 	SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-	SLOT="0/107"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
+	SLOT="0/108"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
 fi
 
 DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
diff --git a/app-text/qpdf/Manifest b/app-text/qpdf/Manifest
index c7f8767b3f29..599bd3b86ef9 100644
--- a/app-text/qpdf/Manifest
+++ b/app-text/qpdf/Manifest
@@ -1,7 +1,9 @@
 DIST qpdf-10.0.4.tar.gz 18465085 BLAKE2B 3b9edc38069d58d43d26b131da755b7921b7add905ed652e3abb48d9b2e140d0c3b38f0250dbd3dca1c4b3dadf76c636606c6fa802b1ebe2dda77444badd828e SHA512 0a8c243928a3273d78b4a898e17a619f1565ec5e9b6f637800a2937749fb8006d0438fee2e623d2f8dc715bfb478ee818e86e9da7c7e0fcf14af496464b79a07
 DIST qpdf-10.1.0.tar.gz 18528427 BLAKE2B e62b1c8ca8d301b082cde292cb8430d6ae26433c77a30a6a21379f00cbfb3df09117d042f532f77d372d091a89a3f6581ef7d7734c67a4a1b29c1708129078f3 SHA512 f9b22d89fc62e430e6232c840ad74d220ac9eb09d7f2dfe2c42c1c943d35b5fd25e2abec9970ac19ad7ad25dc3d95c74e68e50bad395abf815cf71c432233106
 DIST qpdf-10.2.0.tar.gz 18816798 BLAKE2B 2983dd4ab8d234d6acb838abb57cd8e75edc540804608c3c3d387ee4c2f8ca8060b77e1b6f1a0950640835065fc681d9ad1dec5d8cf2a706727e237b71eabf8d SHA512 07a37aafccb670034aedfc031a4c2c1d3b6aa001e5c1bde5a3f57520a0523eebd890011a8225bb26b5beb83be15d4be3d2f1f40ad91f8370032db984cf788c0a
+DIST qpdf-10.3.0.tar.gz 18954381 BLAKE2B e0029cb1e3b8b318f0d72fa235ab08ebadb7d9479e23308398292e5374e05ae369b0fc3bbdd98554c48e55228aceb2bd8b645cbb7995cf40e21922dfd24e0485 SHA512 43afa0127d296fb314cf428403882fe200339f4620f842c129056d9498bd46574c83147e4db12405fff8ee27e0c0618ded024d46be1582ee5378c06bfae19f1f
 EBUILD qpdf-10.0.4.ebuild 1304 BLAKE2B f646282ac712a633e11ccbac8843da606371c91285e6f92df82febaf1161b90f0a19a62afcc00d3396e09078a3272cb666d3fb5f766be0260d8c4ee4ddd4b320 SHA512 e692d7326d710d7508e29348966323e43c802d5e9d9abe7062553f565b43bf565fa5069952420eb0b509570bb4b2106d34c65011767f3385abc8e8f0869192ed
-EBUILD qpdf-10.1.0.ebuild 1308 BLAKE2B 48b2bb5bf508403c9da242e713abd9951672bbc022be57764eb5bd0fd206ec0da125d7252d5a82c8c20d671bf5c5a171be456148b1805245efa10124daeaee3d SHA512 9cf693420da63a6aa04201a81ee4a05d0f98e5da6cf38544928caa2282e35838358d0c9230ccb8580f631c65f1c1d5ca9dc48ee641a8164a2c3736485c4210e2
+EBUILD qpdf-10.1.0.ebuild 1307 BLAKE2B 155b1d9ffc578aa92f657759cb181a5a62001241e318c866ff6a08b37c0e7bd4606e80f9e351c4b647affe6ba5cf21f4afe80e844ee555dc01a6599d831ab69b SHA512 d9465dc9e98a26db87e9efc11d68502b73942204ba87a89a9b10a2cc928698ee9976439c7de4e0f7a0d2ffba016bc7183809362ce580d2096fc37a59981a62b0
 EBUILD qpdf-10.2.0.ebuild 1313 BLAKE2B 7575b134b18c0eb1417c715679248f5f8dcc83f57a6b5fdec88379cec30a40876de1fe628967a746f8d4d6383dfbc8906ecfcbb54f412c36cf637c7680902a66 SHA512 216a2b8f8ddd7d5f830df667d156011fb31ade13a8ea62d4197ba159eb5dfcbd4f7cbd20ecdd3b9f5024915a999b9e0f3422b95f3e4266dd25aa3c03ed6a27b8
+EBUILD qpdf-10.3.0.ebuild 1313 BLAKE2B 7575b134b18c0eb1417c715679248f5f8dcc83f57a6b5fdec88379cec30a40876de1fe628967a746f8d4d6383dfbc8906ecfcbb54f412c36cf637c7680902a66 SHA512 216a2b8f8ddd7d5f830df667d156011fb31ade13a8ea62d4197ba159eb5dfcbd4f7cbd20ecdd3b9f5024915a999b9e0f3422b95f3e4266dd25aa3c03ed6a27b8
 MISC metadata.xml 443 BLAKE2B 4522681371216196a58ef46575aad835e548c7f4e18a7137d6c780b1a5b8596f121e223fbfa6face7e33d5fe487b20219f0a40c68c5b0cb4d7eae1dfe7e8dc92 SHA512 1fcc6699cc87a906f341f9ebf45158a18870df921c573bba5f348375cd1ef0a204270abc9c6337e81d48082bf970ba16b09d940c4dea94b92d1d4efbeac5fbde
diff --git a/app-text/qpdf/qpdf-10.1.0.ebuild b/app-text/qpdf/qpdf-10.1.0.ebuild
index f3ac3d72fe96..5fef6854272d 100644
--- a/app-text/qpdf/qpdf-10.1.0.ebuild
+++ b/app-text/qpdf/qpdf-10.1.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/qpdf/${P}.tar.gz"
 LICENSE="|| ( Apache-2.0 Artistic-2 )"
 # subslot = libqpdf soname version
 SLOT="0/28"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris"
 IUSE="doc examples libressl ssl test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-text/qpdf/qpdf-10.3.0.ebuild b/app-text/qpdf/qpdf-10.3.0.ebuild
new file mode 100644
index 000000000000..fa194fe13674
--- /dev/null
+++ b/app-text/qpdf/qpdf-10.3.0.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Command-line tool for structural, content-preserving transformation of PDF files"
+HOMEPAGE="http://qpdf.sourceforge.net/"
+SRC_URI="mirror://sourceforge/qpdf/${P}.tar.gz"
+
+LICENSE="|| ( Apache-2.0 Artistic-2 )"
+# subslot = libqpdf soname version
+SLOT="0/28"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris"
+IUSE="doc examples libressl ssl test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	net-libs/gnutls:0=
+	sys-libs/zlib
+	virtual/jpeg:0=
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+"
+DEPEND="${RDEPEND}
+	test? (
+		app-text/ghostscript-gpl[tiff(+)]
+		media-libs/tiff
+		sys-apps/diffutils
+	)
+"
+
+DOCS=( ChangeLog README.md TODO )
+
+src_configure() {
+	local myeconfargs=(
+		--disable-implicit-crypto
+		--enable-crypto-gnutls
+		--enable-crypto-native
+		--with-default-crypto=gnutls
+		--disable-static
+		$(use_enable ssl crypto-openssl)
+		$(use_enable test test-compare-images)
+	)
+	CONFIG_SHELL="${BROOT}/bin/bash" econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	if use examples ; then
+		dobin examples/build/.libs/*
+	fi
+
+	find "${ED}" -type f -name '*.la' -delete || die
+}
diff --git a/app-text/ronn/Manifest b/app-text/ronn/Manifest
index 66f495588bb0..cfe1a09dc0c5 100644
--- a/app-text/ronn/Manifest
+++ b/app-text/ronn/Manifest
@@ -1,3 +1,4 @@
 DIST ronn-0.7.3.gem 61440 BLAKE2B 3ff0a1752d7a972b7d8319cac2b1287e7d21207e22b9eb288694172eb9b30b2198e4378eb02df8418585a44d3d2c89b4695675933dc5ef5d9ba63c78e71f4e7c SHA512 885418c88d5a1073f9457ea11e29d82d3bb40ad12506589ccfab83ad447445e41282c9688aba5646082ae5ecc6a047fa9439ffae14561152fc61a136474f611c
 EBUILD ronn-0.7.3-r3.ebuild 1163 BLAKE2B 69f0e58f11eeac58714bcef08c6e62ec182ebdd68c21e0b589db88eee8209a696f6d62da1ff1a6a78c08ecdcfad892966af16dcd53fb77d4ecbfc2a756706ce4 SHA512 6714f18e70c27e9a67a6dfab82a34d9505f5b975204f57ef0bf9c843872fc18429a592d8d762fde9877145977fc5669d67cd4da009a6fc8364b9e755a607409d
+EBUILD ronn-0.7.3-r4.ebuild 1162 BLAKE2B 00ff26318e4644f3eb0cb90939820c0dfe6af8e7e1772ceee6ac4c50f398d8087ef413982249d4aba39fc970ff7ed0fafc2f92660921746b0bcf630a234f4faf SHA512 aac2be29211f89280a53690e0d27fd56103db2b097beac2b07d41ee7b390d97b78bd89f2c4910992b8ad3b722ad02fe9e720815577fbd3f22db366c87ddeb153
 MISC metadata.xml 339 BLAKE2B 2a1722a0531a1ccaba0d29a1ace114b95789ba4b0c692e8efcf38605f81de4dd1210671331fcdb5baa6536cf38fbf63f11b85fb13bd6a067be56f22a372fc5b6 SHA512 0be4072cf3514eba60569138ed409362b318616ad4514e319d9b4add120e74fd7655e2fc5c3ab8d7b5d813cfcf8e1054fb98395a1a89d9fb90e447a825ee9439
diff --git a/app-text/ronn/ronn-0.7.3-r4.ebuild b/app-text/ronn/ronn-0.7.3-r4.ebuild
new file mode 100644
index 000000000000..ae854cc60751
--- /dev/null
+++ b/app-text/ronn/ronn-0.7.3-r4.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="AUTHORS CHANGES README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Converts simple, human readable textfiles to roff for terminal display, and HTML"
+HOMEPAGE="https://github.com/rtomayko/ronn/"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+
+IUSE=""
+
+DEPS="
+	>=dev-ruby/hpricot-0.8.2
+	>=dev-ruby/mustache-0.7.0
+	>=dev-ruby/rdiscount-1.5.8"
+
+ruby_add_rdepend "${DEPS}"
+
+ruby_add_bdepend "${DEPS}"
+
+all_ruby_prepare() {
+	# Avoid test failing due to changes in hash handling in ruby 1.8.7:
+	# https://github.com/rtomayko/ronn/issues/56
+	sed -i -e '81 s:^:#:' test/test_ronn.rb || die
+}
+
+each_ruby_prepare() {
+	# Make sure that we always use the right interpreter during tests.
+	sed -i -e "/output/ s:ronn:${RUBY} bin/ronn:" test/test_ronn.rb
+}
+
+all_ruby_compile() {
+	PATH="${S}/bin:${PATH}" rake man || die
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	doman man/ronn.1 man/ronn-format.7
+}
diff --git a/app-text/sword-modules/Manifest b/app-text/sword-modules/Manifest
index cbcfeff3afce..38f205997405 100644
--- a/app-text/sword-modules/Manifest
+++ b/app-text/sword-modules/Manifest
@@ -1,2 +1,2 @@
 EBUILD sword-modules-2.2.ebuild 11993 BLAKE2B fb7977dafa649085c49b66681a47a73ff34e7e3f00f9102d5411a2ccaf864efbb95f2907672a15d90ff43e2d5e81ca187021b51e215092ae2c68514b828fe755 SHA512 5165164dd8c1859c4432f52159d16560c6b0b9c1e69f687be55165f1420ced9bc0cbe8fb60bc0a7b1d1ce5e0ae39617428f3226f6d4e77cac26940347b5b99e8
-MISC metadata.xml 361 BLAKE2B 51316035c5e4197a328d336f328b3b3b777bcd14dfea50f11060624e86ec566b5d4e1bca5f755cd8f165aad8100bcb9c9a8aa12f036ad4df52276a9a16fab51f SHA512 61c6526b5fd049d5c13ee6af9bae3eaabc7151fe45de3ba63869a5ef8f2a4b00a4257c5a8d244f245b4e3f92d47a97a54c83ad03bf0742c1dda143efe392a10d
+MISC metadata.xml 385 BLAKE2B 58e3a018c64e0068b39c728415f94cf05afe3c63e4ecb340ef47e6ecad5a3c8aa0776b6390acfa6eef8775e5065d5a65c3ea8ebc07219a0a990be36e3bf305f3 SHA512 a305a1265342a3674f5bc0f2b5adb788732ccc78c5e05cbdb116fb4a556ae099d8394c10572e5e01e3dae70bf9b4eb982079bf130b4567f4aadb55d3e76bbc1a
diff --git a/app-text/sword-modules/metadata.xml b/app-text/sword-modules/metadata.xml
index f24236186ef2..49ef5f0ab296 100644
--- a/app-text/sword-modules/metadata.xml
+++ b/app-text/sword-modules/metadata.xml
@@ -5,6 +5,7 @@
 		<email>marecki@gentoo.org</email>
 		<name>Marek Szuba</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<use>
 		<flag name="esoteric">Install modules with no linguistic content, in unknown languages etc.</flag>
 	</use>
diff --git a/app-text/vilistextum/Manifest b/app-text/vilistextum/Manifest
index 8b2a75e0afd4..aa22fb41194a 100644
--- a/app-text/vilistextum/Manifest
+++ b/app-text/vilistextum/Manifest
@@ -15,5 +15,5 @@ DIST vilistextum-2.8.0.20191023.tar.gz 219395 BLAKE2B 5e3962b4b18b9e6e3896f26e04
 DIST vilistextum-2.8.0.20200411.tar.gz 219791 BLAKE2B 95b86d17e8dbf29b520aa48c88eb8c9e8abb01a234848ed55bdad0a63a7c0ec8ca9ae7c437fe7f84bbf7f4dad74fc8437a9e3b53493552e9e01b8029b10ef18a SHA512 40a219ebe7bebd61548a3bad794690cf091b67b70e8e6c44548a0c1b9f61077b141a035335e7128b191a8501103707f5324b00326a407e29ec0fee383c4d0917
 EBUILD vilistextum-2.6.9-r1.ebuild 1795 BLAKE2B 3a9b4d9462338f2524f649aedb4945012c093f7275f3a9ee1f5852f049318ac06634c74362f6eddae65cca4e339aff8d87801b18628785f3c72b6eba794b983c SHA512 ce2733938218ede9fc6577567887cc9d6d6668ee04a1c077ad125ddc4f3db263cf96d863ff9402a3200370d10552bbf5a21433aa72746c034fda5e337c545697
 EBUILD vilistextum-2.8.0.20191023-r1.ebuild 2042 BLAKE2B 43f180fa1d9526d2b86d33512195ca3601808bd82cbbf9ec4f6bcf19c1b00edd30cf05a148070fdbe455dd851da0ebe84b27b6715e0f702518eed32364803bf9 SHA512 b68a906d38a98ea2a69d1d1eead9588f181a118c83ea84a6ae05d768b54d29718af2b8549e6ed98b45064b1e0ea6b45bf8b7258d61e6baf7a5314b4523b2fa56
-EBUILD vilistextum-2.8.0.20200411.ebuild 2015 BLAKE2B 19050a34ede2add243ef731ad4b37f4aa127e60133d407e26578020b83ef5ffca408e5e5ca1466555624d6f69367ebb4191c779626cd1b8655ee431908827e13 SHA512 8f8e333f9a7c57a6728bd5d46223f16969bbcd0d554bed2e985a73e2398088438b3d2ae907de6c68fb15ffe4009832924dc62d9e5251ece3498122ff440d9797
+EBUILD vilistextum-2.8.0.20200411.ebuild 2072 BLAKE2B 5f2a8e4838deb1216f89d15c0652c78e9c9e46684345a46299e1f7a2a8c107e66b2b34b1af37d2f831a6488f1b01dd10263b2f7cad7e670eb45f667f6d80532d SHA512 6301cab1fb083038645a4a71c46cf1a2bc0ebfde46421a08a8cfabec73a847461fc4027cc89008f3b7a6ca1654f64d577032a5f4457a8bb53acceedebbcc8ccf
 MISC metadata.xml 271 BLAKE2B 46146f4bf13e9f4d33435225ec1012dd9bb89b20812963dc50368cab2a60a3c542052cb72f8963cc72074b2c13a5b054c77152de1d108027752601a349bc4ef8 SHA512 3e98f5382cf789992bdfc0f32e6e36eba31944be654c03f2ed9bd00baf56c8b768c256c4f8778d5775d6df38da4afcf8e32b6e6495a1ecfc8e7982c7c8943b1b
diff --git a/app-text/vilistextum/vilistextum-2.8.0.20200411.ebuild b/app-text/vilistextum/vilistextum-2.8.0.20200411.ebuild
index fafcf1807767..e421c8382737 100644
--- a/app-text/vilistextum/vilistextum-2.8.0.20200411.ebuild
+++ b/app-text/vilistextum/vilistextum-2.8.0.20200411.ebuild
@@ -13,9 +13,12 @@ S="${WORKDIR}/${PN}-${GITID}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~ppc ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
 IUSE="unicode"
 
+# Known test failures nobody cares about
+RESTRICT="test"
+
 DEPEND="virtual/libiconv"
 
 PATCHES=(
diff --git a/app-text/webgen/Manifest b/app-text/webgen/Manifest
index 97878764ce85..539b5ab7162e 100644
--- a/app-text/webgen/Manifest
+++ b/app-text/webgen/Manifest
@@ -1,3 +1,5 @@
 DIST webgen-1.7.1.gem 201728 BLAKE2B 2ea7d7911b4edf29cb7310a676593a77956b3fffd1a4ca5f69731270e648365fb8293a292b8fdd717444ed8f690dd5f095ac5dd77f5c950253b5de7d6086f966 SHA512 7b58c7d2b8ff6a4feabc1435e6bddbf25b3e4695517c2bd8d97b698a49b6fd61538f1a77bdd4e13f7368fdfbeae9f007dfc09ecfcde4eb75a366b8e0ccc8c58a
+DIST webgen-1.7.2.gem 201728 BLAKE2B abd3a8a9accfbc1a1e0070b7cbd4d0cc24796540ce1c8c0cfd3dc50882bf953b1e794971a90e2a429b3ecd64b1cb009b16c96ce1e6cfa05516ce48c10e39cd95 SHA512 806303f56319b6f55d8457b0b68438a9732bc1adc95ea50a955ad02b184814d0b878d618fc0547831cac53292208f1d0837d190b078ebb2ba42641dbaa5ffd93
 EBUILD webgen-1.7.1.ebuild 1436 BLAKE2B cb17a23980c87ab2d27e51e165c859cc2a0c863f33e404aa7d8f15190acd745c951ac57319f2071dbdf275864a1e9e16132fce547a66487afbb0505c915cc6d8 SHA512 156f808cf029a5895bc5077ad11d4005112b526addfcbe82783d7d82af3112a1809499318d931c5d34bc046e8fc788dc2bef08a932481c3653e3756035adb3a3
+EBUILD webgen-1.7.2.ebuild 1443 BLAKE2B 060a0bbd2e67a24dfd1c9d931ded623b166b08d612c0a9efb5949f6b7361b3a56c5c48aff453eb75fb9a1fa72b40eb7ab4b6cee3f9d40fa392cb7ef92c84443a SHA512 0d593f5e4731cd1ace11a8c310a145e003e52c37eb5d750dd0839752c33c1db91caa9d6197bba1974776581622d6599a69a8400969b594b51063e6b60217d5dd
 MISC metadata.xml 477 BLAKE2B c8293490729904a1a67e6c0861f6fc01b00190322213b566de36e6a56d474118c32a81a9573bb8e43f433d5eba8d5f111878cda00866a5f1b5fb36e052b779d1 SHA512 d872a0fb051b79b34541fafe549c2283a4a92edd7bad4a97adb1c3124e82820a67c286d04a004cdd2fe132a44ea4f0ec8cc3b335f3a1d91aa8877533a1c278bb
diff --git a/app-text/webgen/webgen-1.7.2.ebuild b/app-text/webgen/webgen-1.7.2.ebuild
new file mode 100644
index 000000000000..6dd141bf8cc1
--- /dev/null
+++ b/app-text/webgen/webgen-1.7.2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby26 ruby27"
+
+RUBY_FAKEGEM_RECIPE_DOC="task"
+RUBY_FAKEGEM_DOCDIR="htmldoc/rdoc"
+RUBY_FAKEGEM_EXTRADOC="AUTHORS THANKS"
+RUBY_FAKEGEM_EXTRAINSTALL="data"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A template-based static website generator"
+HOMEPAGE="https://webgen.gettalong.org"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="builder doc highlight markdown"
+
+ruby_add_bdepend "doc? ( dev-ruby/rdoc )
+	test? (
+		dev-ruby/minitest:5
+		dev-ruby/rdiscount
+		>=dev-ruby/sass-3.2:* )"
+
+ruby_add_rdepend ">=dev-ruby/cmdparse-3.0.1:3
+	>=dev-ruby/systemu-2.5 =dev-ruby/systemu-2*
+	>=dev-ruby/kramdown-2.3:2
+	builder? ( >=dev-ruby/builder-2.1.0:* )
+	highlight? ( >=dev-ruby/coderay-1.0 )
+	markdown? ( dev-ruby/maruku )"
+
+all_ruby_prepare() {
+	# Avoid a test fragile for sass version differences
+	sed -i -e '/test_static_call/,/^  end/ s:^:#:' test/webgen/content_processor/test_sass.rb || die
+	# Avoid a test with fragile whitespace tests
+	rm -f test/webgen/content_processor/test_haml.rb || die
+
+	# Avoid tests for rdoc since that requires an obsolete version
+	sed -i -e '/def test_create_nodes/askip' test/webgen/path_handler/test_api.rb || die
+
+	# Avoid tests for unpackaged dependencies
+	rm -f test/webgen/content_processor/test_{css_minify,tikz}.rb || die
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	doman man/man1/webgen.1
+}
diff --git a/app-text/xmlformat/Manifest b/app-text/xmlformat/Manifest
index 7a88a0c39759..22f98829aa2d 100644
--- a/app-text/xmlformat/Manifest
+++ b/app-text/xmlformat/Manifest
@@ -1,3 +1,3 @@
 DIST xmlformat-1.04.tar.gz 156498 BLAKE2B 18463dea611a5d080056b0ed314eb12555e2abb12d630fb879421fa6359606f7606fda42e146eaaea7ae2fa470661ab4e28a86762375024704e607316f6323cf SHA512 e45471accf0c04e016d3a9a5bbc2f984a9a76e1d5406a80300bf9da9d04bd78b67716055271923669462b70a1713b94a1e1937318115dfd9eb9d258b69a3c14d
-EBUILD xmlformat-1.04.ebuild 961 BLAKE2B e367356edd902f01698fcea9447ffd504c66e8f7d17918a5354ad0a1df4428f682354c0e16a83b982d5bf09e25ecec0e9770289f573a7489c612a498c9e175e2 SHA512 24e4c400d9611df4df428670eda1b6ca0059198fd667a8a086f97e86ad5c3871b1e3b7a0f33ae834db2c424fd54e86a45e3ebf7e48a297306e3906152a74ad7a
+EBUILD xmlformat-1.04.ebuild 934 BLAKE2B e7f14a90ccfc8c529eadad43d641cd2f1c4ec04560b634822534a15793df1d86164e43acc2b0ea120f5645eef0cffd34ad03715ed777851e731da78b8f7003af SHA512 6191ac9a87aa91b95d004e1762ea94ca66f25a919f2a3df1b677f73b01c156e16fb08163c7a218d1e80012aa6b0bd97f2231d14e34452e6436d630b2e49f1ff0
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-text/xmlformat/xmlformat-1.04.ebuild b/app-text/xmlformat/xmlformat-1.04.ebuild
index 044ee876c257..7e10ca1cc039 100644
--- a/app-text/xmlformat/xmlformat-1.04.ebuild
+++ b/app-text/xmlformat/xmlformat-1.04.ebuild
@@ -1,30 +1,30 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 USE_RUBY="ruby24 ruby25 ruby26"
-
 inherit ruby-single
 
 DESCRIPTION="Reformat XML documents to your custom style"
 SRC_URI="http://www.kitebird.com/software/${PN}/${P}.tar.gz"
 HOMEPAGE="http://www.kitebird.com/software/xmlformat/"
 
-SLOT="0"
 LICENSE="xmlformat"
+SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="doc ruby"
 
-DEPEND="ruby? ( ${RUBY_DEPS} )
-	!ruby? ( dev-lang/perl )"
-RDEPEND=${DEPEND}
-IUSE="ruby doc"
+DEPEND="
+	ruby? ( ${RUBY_DEPS} )
+	!ruby? ( dev-lang/perl )
+"
+RDEPEND="${DEPEND}"
 
 src_install() {
 	dobin xmlformat.pl
 
-	if use ruby
-	then
+	if use ruby; then
 		dobin xmlformat.rb
 		dosym xmlformat.rb /usr/bin/xmlformat
 	else
@@ -33,17 +33,14 @@ src_install() {
 
 	dodoc BUGS ChangeLog README TODO
 
-	if use doc
-	then
+	if use doc; then
 		# APIs
-		insinto /usr/share/doc/${PF}
-		doins -r docs/*
+		dodoc -r docs/*
 	fi
 }
 
 src_test() {
-	if use ruby
-	then
+	if use ruby; then
 		./runtest all || die "runtest for ruby failed."
 	else
 		./runtest -p all || die "runtest for perl failed."
author	V3n3RiX <venerix@redcorelinux.org>	2021-03-12 21:55:15 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2021-03-12 21:55:15 +0000
commit	7218e1b46bceac05841e90472501742d905fb3fc (patch)
tree	56fae051db521b8fce8014cbc8b11484885b14b3 /app-text
parent	6d691ad5b6239929063441bbd14c489e92e7396e (diff)