gentoo resync : 17.08.2021

23 files changed, 295 insertions, 79 deletions

diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 564e94d212a6..72f62766df4f 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/asciidoc/Manifest b/app-text/asciidoc/Manifest
index c12aaf4f4eb8..824b743c4fbe 100644
--- a/app-text/asciidoc/Manifest
+++ b/app-text/asciidoc/Manifest
@@ -5,5 +5,5 @@ DIST asciidoc-9.1.0.new.tar.gz 1249958 BLAKE2B 0a98f58f7604f84d704092313c3856363
 EBUILD asciidoc-9.0.2-r1.ebuild 2329 BLAKE2B 61dd6902f330bff8023c6bb92d221ec7ea664332ce198380371ca16e4e08272d9f8ef16d3ef7e6e190545d8524a78123d06fbb49fe2baba0a818c71cc053e054 SHA512 dd4208ebd95a7f788ca93c8d3c4a7eec25aca0c8d09cd3182c53f1f5a63ba0808b2c661cea3bb92926b0ffc5629d71c59142991eef17ec1bd42054386aab822b
 EBUILD asciidoc-9.0.4-r1.ebuild 2329 BLAKE2B 61dd6902f330bff8023c6bb92d221ec7ea664332ce198380371ca16e4e08272d9f8ef16d3ef7e6e190545d8524a78123d06fbb49fe2baba0a818c71cc053e054 SHA512 dd4208ebd95a7f788ca93c8d3c4a7eec25aca0c8d09cd3182c53f1f5a63ba0808b2c661cea3bb92926b0ffc5629d71c59142991eef17ec1bd42054386aab822b
 EBUILD asciidoc-9.0.5-r1.ebuild 2329 BLAKE2B 61dd6902f330bff8023c6bb92d221ec7ea664332ce198380371ca16e4e08272d9f8ef16d3ef7e6e190545d8524a78123d06fbb49fe2baba0a818c71cc053e054 SHA512 dd4208ebd95a7f788ca93c8d3c4a7eec25aca0c8d09cd3182c53f1f5a63ba0808b2c661cea3bb92926b0ffc5629d71c59142991eef17ec1bd42054386aab822b
-EBUILD asciidoc-9.1.0.ebuild 2342 BLAKE2B e4456a38d3a61ca69a7f67b34c3f72894632faaf153e4eba2a7ca9081cb85c9f280f8790fd58d5689239583187c35b95087cdbcb02fd9c1c800d68b076952ab3 SHA512 70125871005c31444ce7c21d85f8a75181df2694980cc28e972909c7bb8d7ca681915859c9c9b907ff669c2ba0e4a8aada0d4e7fffc0b588027af7192df94379
-MISC metadata.xml 465 BLAKE2B 7add2c9dc126e1538251b0ba0001a624d7ddb9406adc5151d8388d7a8549e2968fc5a02219f79e63ac1577c4ee55cda9b4ebdfa138eb9d6142375943d8da0e39 SHA512 986aa9ed2b95d5d5a61bfea9aecd3c4371ba76a1a6e9cfe8833b7cdef449527dcde14879565f0302d55533501e082c2f1d4734004218299061bcd87b7adbc8a7
+EBUILD asciidoc-9.1.0.ebuild 2342 BLAKE2B e5c950868bcb3d5e185540c588433deda3ad4d1197cc3062002d66fd8af18471552ad59bc4c6b48203bfc1d22e292bb83ae5e42001f300eb785b424e439e3837 SHA512 b4c7e2232546238a9a4b46b2a59036e64aa13eb46e39747d06f1b55d2a3345f0670a8039f68c463d395053945b14b7144f70e511d66fdabd579707501533dcd7
+MISC metadata.xml 599 BLAKE2B 846e745cb903030b25c8055b6f990124d807bf1eb237d2a46aaf3a4b96dde68ed8e40fd75d0151f9fdf31d51032517d0c3dae0c239b3a927d146fedee06b1c30 SHA512 77fb8e774a74c269f64e27dddf1e97ce69999f2323b1db0dd2ee2fcc7271499de11bd009b8065a06f5102b8c42f2a4ba3c838794b65fc184f3cfe5792afe3a28
diff --git a/app-text/asciidoc/asciidoc-9.1.0.ebuild b/app-text/asciidoc/asciidoc-9.1.0.ebuild
index 43ecd600c6fc..f3c86d982e94 100644
--- a/app-text/asciidoc/asciidoc-9.1.0.ebuild
+++ b/app-text/asciidoc/asciidoc-9.1.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} pypy3 )
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
 
 inherit autotools optfeature python-single-r1 readme.gentoo-r1
 
diff --git a/app-text/asciidoc/metadata.xml b/app-text/asciidoc/metadata.xml
index cde4f44f98ae..a44bf7cd3b50 100644
--- a/app-text/asciidoc/metadata.xml
+++ b/app-text/asciidoc/metadata.xml
@@ -11,5 +11,7 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">asciidoc</remote-id>
+		<remote-id type="github">asciidoc-py/asciidoc-py</remote-id>
+		<bugs-to>https://github.com/asciidoc-py/asciidoc-py/issues</bugs-to>
 	</upstream>
 </pkgmetadata>
diff --git a/app-text/bdf2psf/Manifest b/app-text/bdf2psf/Manifest
index 81966e6ce03b..d0d0102374a6 100644
--- a/app-text/bdf2psf/Manifest
+++ b/app-text/bdf2psf/Manifest
@@ -1,3 +1,3 @@
 DIST console-setup_1.155.tar.xz 1641952 BLAKE2B fbe1e58915c2aac1148a1de31eca5bc9b7fc078c9840b5d51d8b1211e178315360e294d81040c464e2404774594606b3fecab6f7924b1fd4bec4c24b219e9197 SHA512 e00b0b48d91c9587c0659714f74de259bf3efd1caa553c4a06d9bc545335463808db2da16797ffca1dc59cae4f524619d3cf9a68db2ff5ad7b47cdd8aced37ac
 EBUILD bdf2psf-1.155.ebuild 678 BLAKE2B 8004a9359bef3f975bb70aceb4e1bcdf417b3b5e475606f4cc7846b724bce95e96b0d7d56932cddc04fc09439a41573837e1008dec38946b0f88750189203cab SHA512 2b65c85a5682775b3b5e89528ff961a805bb6e09a5f0cf70760cd69201bbc4737c5d0f7323acddbf3cc264ee104d2c9ab14357c524305781db0a71058b963e77
-MISC metadata.xml 246 BLAKE2B f94a229d0ffd7220f14c23ca2b0b6b84128338b5af27cd18ddb0c9e2f95f51c943fdfbc368c03b4a87d7bb381c668158fdc169fd067cc0cd8cd35852acc29d62 SHA512 b6df287a6e1f18bf267a05d8eb6dea788ae7ec74de31d9cea76fea038e4090c6a83d62221505d280d55e9b314d059c409e442951d78eb3a58928307ff118147b
+MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/app-text/bdf2psf/metadata.xml b/app-text/bdf2psf/metadata.xml
index de09ffd8b089..7a38bb900964 100644
--- a/app-text/bdf2psf/metadata.xml
+++ b/app-text/bdf2psf/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>floppym@gentoo.org</email>
-		<name>Mike Gilbert</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/app-text/blahtexml/Manifest b/app-text/blahtexml/Manifest
index 45aae7cf9386..636dca55901e 100644
--- a/app-text/blahtexml/Manifest
+++ b/app-text/blahtexml/Manifest
@@ -2,5 +2,5 @@ AUX blahtexml-0.9-Makefile.patch 1811 BLAKE2B c84ab5b3781413ff04e771849514ec2443
 AUX blahtexml-0.9-gcc-4.7.patch 614 BLAKE2B 1b4f8418c1a5d18271a721328c68dfe86ff9e1ddb4900557e35503a3c1af791d21f8b1ae1cf63045826d0d95c9968a197a9435a5a7fe28015a778ec8c2db02f6 SHA512 2f4d65ae7aec887bcee4719f23cfef762f0a25a4815e86691df86e7675e600211e285a6aab8389cff7adc9899a669a34caa70da5fa42d80c7257636d11ff4eee
 AUX blahtexml.1 3094 BLAKE2B a1b1bd3d1a6952529685b8be5c22f12a1d6168b7d37eea958fd295a593e17ff363c966e46bf26f8f28a2f424a34344c7673e96d976088b9726dfd1717042edb3 SHA512 0f114e4cfb806fe6d120a738118ccd0817d898434a9d878cd20e5ea59d804420f07b90b9763a387e5b29251ca4acf9b1d7b7b845f9f86036d9dc729775155a7d
 DIST blahtexml-0.9-src.tar.gz 168564 BLAKE2B 941f241adf6e423cd0eff4a13b11313d6cad143badb6d862be01bd603f84aa04f224ae2d84abfef05341c66e410ba18bf39d99f636a8a33512e1da9739770a19 SHA512 5a5ddd50c0b3a25954135c44de0ac3a3d992e3e9dd691a552512415c385a39011595683877cdf98aee77d6ef2f9dae750214798ec2af69b8de089d0aec64b042
-EBUILD blahtexml-0.9.ebuild 822 BLAKE2B 815fc988c5a323fdd3f285bb9c4fb15233165458efcf7c5f24b95c05310b8fdef2e956bdad898e20cb574bc855612e4789f5545e64f58b1e318386034b262671 SHA512 7fa1dedf01f73cc8bf7f9fc4f1e083a951fccd5bd68ebd14ff56c61a04f1f7033afa40364bbd5b893cbb5c2aaa813da39306728b203713f4db22fca2e9e02474
+EBUILD blahtexml-0.9.ebuild 829 BLAKE2B 7e5ba589ddf3e7df2ebf2e5096653866d136a4e5a02cc4fb666b4aeba4cc2c25a860b98c6593b46a98deda899d59cd11999f05fd26b42baf48d25753e7b4742f SHA512 9d8b1bbca5ab2454a2e98004d1e49aecadc75553eabac85572eb8590921038f8a8850d95bccd39e0d2cfd16cf09fce1fab61b14d55e02d6b7e65b4a673956a95
 MISC metadata.xml 168 BLAKE2B 5f277cc66dbafa7e7985433f84b0f9a656a176a9b901862e2a8353ca2d4526797dded9696e835b9696c7f72324e94959cfb5a22de49a7e3e61604153886037ab SHA512 00eec08786156434460f5ed77b647579546cf1a86341a4f2c9c9c84326468c2c21dc5101c4277103b19266bb6f788823f4ddf3b9d044da26326d79bf2ac9a274
diff --git a/app-text/blahtexml/blahtexml-0.9.ebuild b/app-text/blahtexml/blahtexml-0.9.ebuild
index f470b6197643..9e5e3851e780 100644
--- a/app-text/blahtexml/blahtexml-0.9.ebuild
+++ b/app-text/blahtexml/blahtexml-0.9.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://gva.noekeon.org/${PN}/${P}-src.tar.gz"
 
 LICENSE="BSD CC-BY-3.0 ZLIB"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 x86"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv x86"
 IUSE="doc"
 
 RDEPEND="dev-libs/xerces-c"
diff --git a/app-text/coolreader/Manifest b/app-text/coolreader/Manifest
index 0cc4b8cf1e88..a8b47ba8f41e 100644
--- a/app-text/coolreader/Manifest
+++ b/app-text/coolreader/Manifest
@@ -1,3 +1,5 @@
 DIST coolreader-3.2.57.tar.gz 13281238 BLAKE2B 8a6739f38d72b13af7b79160dee8cfc08bd9e54d3698fd44c7f6ad8bd575b1f389c2c349c1e2ef71a55fb0068e9d64b5baa4a0a8b945cdb873e833178d81cbbe SHA512 d5bf46f7dbf19177a54742d5c300002c8b7a504052bd003d2e1a7380ac3460dbe648d7f923d26e6390e9296ce6b090c947204725ab2a30c78f26893868a61161
+DIST coolreader-3.2.58.tar.gz 13454079 BLAKE2B e3b85ffbb3e4023a8c0567879a4a67d21141c1025b58f7d2c5017cab773e989e797229529440167a8c83db810f599566a77aaaab06b34081472f0e4b20293ec9 SHA512 d1d3e60bf5b73c20617937850912d7c452863bd5c91f0154be320ad256f774f368039896ad5e8acfc3cafa7361e8c11ca526accf0a14dabb79f059255989bac6
 EBUILD coolreader-3.2.57.ebuild 1838 BLAKE2B 4102bd201652798763151becd33544ead1797676999f2365fb73edd4164bc732dc1402ecfa7e682c51d4d51247485cbb0f929d00862bfdc59a8db8c47a65afbe SHA512 be37d6dcd3a81c8fddd4ed6cc23d210b1d718dff8a1a572c9046789eb50d961766755e1c064603bc59a9827c20bc876bcfe4cf34603058cc85c251e0f02769e7
+EBUILD coolreader-3.2.58.ebuild 1840 BLAKE2B 81e9fa93ea854a110e2e69fa34a91a520f86ac55e0f8da883c0ec6e390a50a5932c2fc9f0fea5d474e73a9eb4cfd6a92e03afc9307bef78ec9171ebb3eefd545 SHA512 cf24327f8e9cc384b26c4352b13cabfedf38dcb870a6f2915a39a1e639514c8cdcba8150f5e1ce3daa885208fab2491292fd2e393523e9e5bdd795841df0534b
 MISC metadata.xml 624 BLAKE2B fa86114594d823c9b73b590ebfa0ffe74955550f1d66b5f1197672484d4095be484f5f8f754acef06e34f9d69d658609653109bf8499235439bb1f3ad95b7be5 SHA512 33e57dbe75c3e2efaf1d793dad06b534fac861b3ffd25e4d441af91b8d6a8cae96b8d5c19bbf0845aa78ff404eee167998e09f948009b4ce1902a2f38625f9a8
diff --git a/app-text/coolreader/coolreader-3.2.58.ebuild b/app-text/coolreader/coolreader-3.2.58.ebuild
new file mode 100644
index 000000000000..32e43b6cdee3
--- /dev/null
+++ b/app-text/coolreader/coolreader-3.2.58.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+WX_GTK_VER="3.0-gtk3"
+PLOCALES="bg cs de es hu pl ru uk"
+inherit cmake plocale wxwidgets xdg
+
+CR_PV=$(ver_rs 3 '-')
+SRC_URI="https://github.com/buggins/${PN}/archive/cr${CR_PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-cr${CR_PV}"
+
+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
+	dev-libs/fribidi
+	media-libs/fontconfig
+	media-libs/harfbuzz
+	dev-libs/libunibreak
+	wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER} )
+	!wxwidgets? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 )"
+BDEPEND="${CDEPEND}
+	!wxwidgets? ( dev-qt/linguist-tools:5 )"
+RDEPEND="${CDEPEND}
+	wxwidgets? ( || ( media-fonts/liberation-fonts media-fonts/corefonts ) )"
+
+src_prepare() {
+	cmake_src_prepare
+	xdg_src_prepare
+
+	# locales
+	plocale_find_changes "${S}"/cr3qt/src/i18n 'cr3_' '.ts'
+	sed -e "s|SET(LANGUAGES .*)|SET(LANGUAGES $(plocale_get_locales))|" \
+		-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_src_configure
+}
+
+src_install() {
+	cmake_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
+}
diff --git a/app-text/evince/Manifest b/app-text/evince/Manifest
index 8324e7bbadb3..a1ec5da4e21b 100644
--- a/app-text/evince/Manifest
+++ b/app-text/evince/Manifest
@@ -2,5 +2,5 @@ AUX 40.0-internal-synctex.patch 921 BLAKE2B d970afe7dd3ac16d7f285baeb157bba0271a
 DIST evince-40.2.tar.xz 2928072 BLAKE2B 86051e8568044ec484a7a3c036a523ee44d22e46bdf5e75c6052d3302f92a27d48cb26e2408b176cfee3fafd3879a8771f4bf29a51f6b8085c31fa28f4885660 SHA512 f3ee19053a0bc6989a50fc790d1d54747d7aac5cbf0cd1e0eaea6cb743c0ebbbdf2565e88ea995fbba31c7f97e4279f9c0fa44c386bcf635a500033f6105ca9f
 DIST evince-40.4.tar.xz 2928100 BLAKE2B 491b2333e21093b032ec9c4f24c61cdaa31e4a46ee058b0f109b0998fb7216ada2c933e6202eae1d6193caad0cfa94a77434ef042555bab7cf4aeed959be759b SHA512 dbec3828f1e8f0b9b48dd90ce605ce83312e53cbeb8f8e7358c1318f1701680a69a9bcd26b7cf1da4b53679ae11e334ce514f5df4c5bbcc976581441e0d654cd
 EBUILD evince-40.2.ebuild 3114 BLAKE2B 212af71efdef680ec92b16edfb8e3e7663f456f66aa33d87f9c6a3f3238ed3d47c560c73a5067290969c88a28e215ad96dcfde4c6e341807f071521de0972c0e SHA512 0868af950d265c5f12ab93a29eb547285cdb7e9ce07a6f82b3067fdaa507c47188f619d53dc3f987a6820a0518690cbac93fe9592df048e22b417194581ee917
-EBUILD evince-40.4.ebuild 3147 BLAKE2B 248a2c2d71d17cc483a1956cf0314d507cd05c0757e0f2b145482c419c8c42ae4ad69f883970091a50f8942bd09387ede3860d11663d9530b84f52a4d8701cca SHA512 de2b40bea62e4cdd2274f1e1100cda0e9d730f093a5d647403a1e573750718226d93f64286917ebb7820e4de93131fdd7b4f9f74496cbc197a8578aa48a7dd1a
+EBUILD evince-40.4.ebuild 3145 BLAKE2B 73e6f842e057d8c4fcd8b009c2bfb962cf63c0886283b24fa32d2e2d9cb6d77cc8eab2dd0c2c9fd95ea24622523b5ec93e80cc48874dedc1bbdf1c553706ea3f SHA512 5cb7ccfec922a1966deeee88680c9be389f4823ca42e0d11247cbfdc5f81eab50964ef19d2741b386602f78df6f40f967dccddad8bd8d904764a4ce8cbc7938f
 MISC metadata.xml 881 BLAKE2B 180e93316fad8f1bf7b80028a86c18964e695c93292b724e864ed50f3fbd951f810fd490b91944f30e42f632ce090dbe34aadf9679b2e62c118aa75b7b0ea834 SHA512 ece377a284a548444c185a7c1fa4c36546709ec00754d066eb4186fba0f079de60b02dcb75f3fd101d50c8ea8f4d4d654d7efd0d8ff8db7b2b85c097c18b43c5
diff --git a/app-text/evince/evince-40.4.ebuild b/app-text/evince/evince-40.4.ebuild
index c63d4e42db3f..11d4bb473a0c 100644
--- a/app-text/evince/evince-40.4.ebuild
+++ b/app-text/evince/evince-40.4.ebuild
@@ -12,7 +12,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="cups djvu dvi gstreamer gnome gnome-keyring gtk-doc +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/hyperestraier/Manifest b/app-text/hyperestraier/Manifest
index fc06baaabb40..ab293e340be2 100644
--- a/app-text/hyperestraier/Manifest
+++ b/app-text/hyperestraier/Manifest
@@ -2,5 +2,6 @@ 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 3597 BLAKE2B 4827f592b08c0e3ddd2352f07e373c937600a4e5415b3b1c9c4a8e939fb88d3e15be6230f2c9c447ac3ffd3ff109e5f3c7a57d5ccab3241389c771a54976c642 SHA512 3be73c6f34d158ddaf1b4948f5460e6f4e6b2e667b2f891591028e229c1d2e8e95db7a9418fc9418ca28a593326d4d81ae813f62f5ec5ef0fa99e79a2209dc43
+EBUILD hyperestraier-1.4.13-r1.ebuild 3602 BLAKE2B 197ece6bf99270359563da1df2883d5f5486bb12de489c9ba80d53f0f1f0eb7f891af834029a107d423af9e6a2ff9127551ed7cf60d53ce147ba06d9663cf0f5 SHA512 9accf57e9aac8b396b4c2536006899efe53af88ac39d923894114c3f87ed0f55b8ff0dbe016ba54bec5c460b3b0aef64a0bd57172b465609e0c19f679bd6f2dc
+EBUILD hyperestraier-1.4.13.ebuild 3597 BLAKE2B 3df6c264d5e5eb5fcab4fbb6a694bed6db512e96dda7f4780b9ba593be85ef50ae6ce8c46432d38a3abebd27a10ebb2583d2af5b386c4528ba53900eddf37112 SHA512 332c3ea1708f5138d3a594c04727167a7b90b8a8681ceebe7d35d9155b1e2731d3360844ae580fe6166bbffbcdd505e93e92a73ba9e38f1f27e8a1b5d84f48b0
 MISC metadata.xml 440 BLAKE2B 5c3edd49e5590ef45d48db13de2f18aa00f332fe955b03b58439a05d3cf8d4ab623b1df6fb39aad7a6f74bef0f8072cf3a097c30be66793957b3cfcc5c35ae9d SHA512 421891e359bfbdafa6759bbaed59a430cbb6bef6bacf0109bb523fe17a19a5804fbdba26ff6cfd00ba19b5fff3d6aca60bd56fd5facbd0e3831f8a34368f142a
diff --git a/app-text/hyperestraier/hyperestraier-1.4.13-r1.ebuild b/app-text/hyperestraier/hyperestraier-1.4.13-r1.ebuild
new file mode 100644
index 000000000000..3b15a1cb6a0e
--- /dev/null
+++ b/app-text/hyperestraier/hyperestraier-1.4.13-r1.ebuild
@@ -0,0 +1,200 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
+RUBY_OPTIONAL="yes"
+
+inherit autotools java-pkg-opt-2 perl-functions ruby-ng
+
+DESCRIPTION="a full-text search system for communities"
+HOMEPAGE="https://fallabs.com/hyperestraier/"
+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 )
+	java? ( >=virtual/jre-1.8:* )
+	lzo? ( dev-libs/lzo )
+	mecab? ( app-text/mecab )
+	perl? ( dev-lang/perl )
+	ruby? ( $(ruby_implementations_depend) )
+	zlib? ( sys-libs/zlib )"
+DEPEND="${RDEPEND}
+	java? ( >=virtual/jdk-1.8:* )"
+BDEPEND="virtual/pkgconfig"
+S="${WORKDIR}/all/${P}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-configure.patch
+	"${FILESDIR}"/${PN}-perl.patch
+	"${FILESDIR}"/${PN}-ruby19.patch
+)
+HTML_DOCS=( doc/. )
+
+AT_NOELIBTOOLIZE="yes"
+
+pkg_setup() {
+	java-pkg-opt-2_pkg_setup
+	use ruby && ruby-ng_pkg_setup
+}
+
+he_foreach_api() {
+	local u d
+	for u in java perl ruby; do
+		if ! use "${u}"; then
+			continue
+		fi
+		if [[ "${u}" != "ruby" ]]; then
+			for d in ${u}native ${u}pure; do
+				if [[ ! -d "${d}" ]]; then
+					continue
+				fi
+				einfo "${EBUILD_PHASE} ${d}"
+				cd "${d}"
+				case "${EBUILD_PHASE}" in
+				prepare)
+					mv configure.{in,ac}
+					eautoreconf
+					;;
+				configure)
+					econf
+					;;
+				compile)
+					emake
+					;;
+				test)
+					if [[ "${d}" == "${u}native" ]]; then
+						emake check
+					fi
+					;;
+				install)
+					if [[ "${u}" != "java" ]]; then
+						emake DESTDIR="${D}" install
+					else
+						java-pkg_dojar *.jar
+						if [[ "${d}" == "${u}native" ]]; then
+							dolib.so lib*.so*
+						fi
+					fi
+					;;
+				esac
+				cd - >/dev/null
+			done
+		else
+			PATCHES= ruby-ng_src_${EBUILD_PHASE}
+		fi
+	done
+}
+
+he_foreach_ruby_api() {
+	local d
+	for d in rubynative rubypure; do
+		cd "${d}"
+		case "${EBUILD_PHASE}" in
+		prepare)
+			sed -i \
+				-e "/RUBY=/cRUBY=\"${RUBY}\"" \
+				-e "/=\`.*ruby/s|ruby|${RUBY}|" \
+				configure.in
+
+			mv configure.{in,ac}
+			eautoreconf
+			;;
+		configure)
+			econf
+			;;
+		compile)
+			emake
+			;;
+		test)
+			if [[ "${d}" == "${u}native" ]]; then
+				emake check
+			fi
+			;;
+		install)
+			emake DESTDIR="${D}" install
+			;;
+		esac
+		cd - >/dev/null
+	done
+}
+
+src_prepare() {
+	default
+	java-pkg-opt-2_src_prepare
+
+	sed -i \
+		-e "/^CFLAGS/s|$| ${CFLAGS}|" \
+		-e "/^JAVACFLAGS/s|$| ${JAVACFLAGS}|" \
+		-e '/^LDENV/d' \
+		-e 's/make\( \|$\)/$(MAKE)\1/g' \
+		Makefile.in {java,perl,ruby}*/Makefile.in
+
+	mv configure.{in,ac}
+	eautoreconf
+	he_foreach_api # prepare
+}
+
+all_ruby_prepare() {
+	sed -i "/^RUNENV /s|\.\.|${WORKDIR}/all/${P}|" ruby*/Makefile.in
+	sed -i "s|\.\./\.\.|${WORKDIR}/all/${P}|" rubynative/src/extconf.rb
+}
+
+each_ruby_prepare() {
+	he_foreach_ruby_api
+}
+
+src_configure() {
+	econf \
+		$(use_enable bzip2 bzip) \
+		$(use_enable debug) \
+		$(use_enable lzo) \
+		$(use_enable mecab) \
+		$(use_enable zlib)
+	he_foreach_api
+}
+
+each_ruby_configure() {
+	he_foreach_ruby_api
+}
+
+src_compile() {
+	default
+	he_foreach_api
+}
+
+each_ruby_compile() {
+	he_foreach_ruby_api
+}
+
+src_test() {
+	default
+	he_foreach_api
+}
+
+each_ruby_test() {
+	he_foreach_ruby_api
+}
+
+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
+		perl_fix_packlist
+	fi
+
+	rm -f "${D}"/usr/bin/*test
+}
+
+each_ruby_install() {
+	he_foreach_ruby_api
+}
diff --git a/app-text/hyperestraier/hyperestraier-1.4.13.ebuild b/app-text/hyperestraier/hyperestraier-1.4.13.ebuild
index f759094eb85b..0556785a6caf 100644
--- a/app-text/hyperestraier/hyperestraier-1.4.13.ebuild
+++ b/app-text/hyperestraier/hyperestraier-1.4.13.ebuild
@@ -24,9 +24,9 @@ RDEPEND="dev-db/qdbm
 	perl? ( dev-lang/perl )
 	ruby? ( $(ruby_implementations_depend) )
 	zlib? ( sys-libs/zlib )"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig
+DEPEND="${RDEPEND}
 	java? ( >=virtual/jdk-1.4:* )"
+BDEPEND="virtual/pkgconfig"
 S="${WORKDIR}/all/${P}"
 
 PATCHES=(
diff --git a/app-text/lesspipe/Manifest b/app-text/lesspipe/Manifest
index e3aac4b646cc..2f52636883cd 100644
--- a/app-text/lesspipe/Manifest
+++ b/app-text/lesspipe/Manifest
@@ -1,8 +1,6 @@
 AUX lesspipe-1.87-fix-tests.patch 3235 BLAKE2B feceffc77cfd62ea3c183d352abe0664db18c7f9765beba6d094a7fc15188e9f6cac255c824b0a42a70faeee7f9b44d77a77094aaadc54fc976a44db27dfb8a4 SHA512 c09a2a65b26ce1f08c559895fcd501dbcf51798547970c7f09b8c24494ea899e0801da47e57dc84fffa595f53cdcdae6233342db08be02db47e01f3c28d9b592
 DIST lesspipe-1.85.tar.gz 120568 BLAKE2B d2c00f4121dc1bbed6b82220dac038068bbff87c732385399542cb212d4664c74d018db07829f90c38e938cb8623a443888c74b0d003fff725d0ddf207d8109e SHA512 420d087b9fc9783b9404855e4656b88c10852502bd2f1931978b7dc7ff15eba1a375b217184480f9b341322c12e7336d0861ba9c2f673f2b2a7fb340a381f5b2
-DIST lesspipe-1.86.tar.gz 120910 BLAKE2B 1065bd95707991380cee8b1be917ae66a6537fdd721e9ec0c326b1ce3358ae518dd28902505967fc086e57e9d3e603e27a328f38c79ae38fe70e5e2a8306b59a SHA512 88a890b91ff3d889f32f23d85d76ef96947e8f1175d54d4301e8891587e87bf1c0a147f1fd5391e52badf4ee31229d337b97c5d5e5f74f4dde966eb93294cfb2
-DIST lesspipe-1.87.tar.gz 120935 BLAKE2B 3c6348c4a00cddfdf11832fda58582483e07e94a1834d6128329e2902356990f1c590300508127a365179a43b0d5c0c82bafd5b0a3a5945270084c8a94e1e3a2 SHA512 774168c6cbb7b13f2efaf7d19a1bba378e51c25553b8ea0bd9783de3a6d0bf7a3f7abf79332b40180eaa1f67274edebf51cb90c13a0fbd4051f33cecc20124b2
+DIST lesspipe-1.88.tar.gz 121053 BLAKE2B 9d754c38b7e13f11799c22ac75d1a3636a1c5a38f1f83bda5b41d24ae9a6ecda0191190edf72132b0bb4e09a16aa3696cad906269ad09c9d2e1f26b44cc6937e SHA512 ece17095e2ba4cabeb689f7a4eb2e04297ec4fd3910af719a067487127bea3f11d2946542048cf152cf9d269152fc5dfa4a57abb0ccd8f60c5e1f9f106f23559
 EBUILD lesspipe-1.85.ebuild 1166 BLAKE2B b4f5ad06062203f195b36dc874c2d91f30f4222ecc94940687225b94a84129e142838c12938cb54ad35d248a3ea48bcc8ceddeda5aad0154b19ee8be6dfaad38 SHA512 7c7c0b9e6e95c1a6821338ba67f9869154b86ec9ab7d9f5e24e027a72c71ce6510da7f7d824dfea3e8e02bd9101111e1d75d45f1ae5518ef7aa50770904f3034
-EBUILD lesspipe-1.86.ebuild 1158 BLAKE2B 72f7b238b32c6bd159f3651a6921256cf034a92deced6c9208c6199735838bf1af481761b32a5e563ce03e75a82c1fe41c3b1970fe3d1d77fec2e3a0af7ff411 SHA512 fe415ed609fdfd64569dd2e1831869c85f550192f2c1521f8fa1a32049587951de2cd2cf483a57935e9572bbcd3fe39fcf284c14fbeb8385fce06caf0053de15
-EBUILD lesspipe-1.87.ebuild 1748 BLAKE2B 736cc316232aa30f193f803e4bb8978478f9ce98644d7596d151508b0ccf3c35ce86a91da796fe4a738fdb644e8edbc96ace07cc0d55db82ac0679877b975114 SHA512 c3fce911b2a9a13123f379a2bcc5ec52a839363a3b0989ae30392aef0bb7fd7f7f6397c7ef169b4a752446aca184a9848c4bbd53447dd79183438d88d8affd70
+EBUILD lesspipe-1.88.ebuild 1699 BLAKE2B 5a2f7a3ce059c3907fcc929f764e25545318d46d7f819bb3be3316946c6201fb7c1c3ab99c62c6205280fcdd4a578b30f4f7d2f872c1064ecea3620996566f66 SHA512 e6c9ddef87efbe09e4dbd03e71173e290a9436730106878c31507cd670edbde6937aec79cd45ccc0177a57eede30d2978d7a7fa0c42abfb21f52ca1edba77fa3
 MISC metadata.xml 303 BLAKE2B 994cf3fadfb22f368dc6f14707fd56a6a4dc019b335d0d241a5f5f6ccbc221bdd284a3544c3171cc10c107ca01248444c23ca5c0f1386bd0d344fa1c13618699 SHA512 079c0445d27021945507ccc075775236d1ddd6f60cfa669928d982ebbff394f8185de0f8e092c3cb3bf3a531d21b80db6c04af9c98a34f28c8d643b25fd00b10
diff --git a/app-text/lesspipe/lesspipe-1.86.ebuild b/app-text/lesspipe/lesspipe-1.86.ebuild
deleted file mode 100644
index 172222094252..000000000000
--- a/app-text/lesspipe/lesspipe-1.86.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="A preprocessor for less"
-HOMEPAGE="https://github.com/wofr06/lesspipe"
-SRC_URI="https://github.com/wofr06/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-# Tests are broken in 1.84, 1.85.
-# Please check again on bumps!
-# bug #734896
-RESTRICT="test"
-
-DEPEND="dev-lang/perl"
-RDEPEND="${DEPEND}
-	!<sys-apps/less-483-r1"
-
-src_configure() {
-	# Not an autoconf script.
-	./configure --fixed || die
-}
-
-src_compile() {
-	# Nothing to build.
-	:
-}
-
-src_install() {
-	emake PREFIX="${EPREFIX}/usr" DESTDIR="${D}" install
-	einstalldocs
-}
-
-pkg_preinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]] ; then
-		elog "This package installs 'lesspipe.sh' which is distinct from 'lesspipe'."
-		elog "The latter is the Gentoo-specific version.  Make sure to update your"
-		elog "LESSOPEN environment variable if you wish to use this copy."
-	fi
-}
diff --git a/app-text/lesspipe/lesspipe-1.87.ebuild b/app-text/lesspipe/lesspipe-1.88.ebuild
index cd3b3f826f89..bc53c82f7b8e 100644
--- a/app-text/lesspipe/lesspipe-1.87.ebuild
+++ b/app-text/lesspipe/lesspipe-1.88.ebuild
@@ -12,7 +12,7 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 # Tests are broken in 1.84, 1.85.
-# Still fragile in 1.87. Passes when lesspipe is not installed.
+# Still fragile in 1.88. Passes when lesspipe is not installed.
 # Please check again on bumps!
 # bug #734896
 RESTRICT="test"
@@ -21,10 +21,6 @@ DEPEND="dev-lang/perl"
 RDEPEND="${DEPEND}
 	!<sys-apps/less-483-r1"
 
-PATCHES=(
-	"${FILESDIR}"/${P}-fix-tests.patch
-)
-
 src_prepare() {
 	default
 
diff --git a/app-text/sigil/Manifest b/app-text/sigil/Manifest
index 720309c76ff3..85d2f9adbfee 100644
--- a/app-text/sigil/Manifest
+++ b/app-text/sigil/Manifest
@@ -2,4 +2,4 @@ DIST sigil-1.5.1.tar.gz 20020962 BLAKE2B ac70c117d69c4062d66151372fc8cbede48be6f
 DIST sigil-1.7.0.tar.gz 21315598 BLAKE2B 29f7c682925d1e1bbff082e96b747ce32df82d78406ccd984b4f8de1f01944c35aa86587ce47a18687d5fe281b8cb656085b52d3a1e72ed17862501121d9d134 SHA512 9918bb0bfbe3d068c95bb31cd84a37a0fac6dd6be9e94cb382e8c0140cdb375f47384f33c62fdff7f27aed379037a4a64e8d4a1065ae297bb389e2be78597c16
 EBUILD sigil-1.5.1.ebuild 2012 BLAKE2B cc0ff455a7cea95499872c82fe675f30ea360b5a6a2777bc448dd913dc0b896cf43c168d372dd4a61bce59e00aaf101643613217ea44bbe45aefa596b3608a1e SHA512 39ca3e0970b166450afe0c955725d99e89b2ba67f30e0d3d348fd87c6b1caef97201dc61286fec258dbc0e1de8c0f3542e2964b8f8217051855d0261256050be
 EBUILD sigil-1.7.0.ebuild 1856 BLAKE2B 33eae27a66f606c38abb130e73a81bf08a4ce8077f3a512f46158c637dcf1284058fcb151defd9c23cafafb06af53c6a9672b6a518ab77f6ef6cefaa83dec4d0 SHA512 5d75662a62912f2f8f03371a7c43eb75a6fd296d4b1120e1ed6450aedf466b856e2aa50e73e935654993059c46f97bb6e7cb04e82b14ded87b99546d7612c128
-MISC metadata.xml 962 BLAKE2B 1f90625c7778f97227f27708f6ca94cc002fc587dab80ed64c0c8c1a809a759da20174ccc4ada91411ae1c9ed761600129caba3fdf81cae97ab544db46bf3258 SHA512 67046450741a9553bbb826b4ae1db7b99e9b09d53a7036fe13fd3c2a99ef41ed02efb6a3a2a2e72e845cf8c28395e87c949de0efc160910be2a6c02ed8b60aa5
+MISC metadata.xml 809 BLAKE2B 98f1480f608f28bc2f39f31ea91a87b276d6ca181da159bc490c8c36f196015081007cfcd5f9d3fd54ac0e211efec434f69014a9c898ad41e97de3048f07d878 SHA512 b593df7b245eb41665eeeceb3ae9dc9be9bdacd5b6cfca3a847d3bc61b4cddbd9c29547cc332eff10ed8149c46f15fdef058f50e7b8e7460f488dd056a74a4ba
diff --git a/app-text/sigil/metadata.xml b/app-text/sigil/metadata.xml
index 0ee8d300aebc..6a4f6e7e529b 100644
--- a/app-text/sigil/metadata.xml
+++ b/app-text/sigil/metadata.xml
@@ -1,14 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>arthurzam+gentoo@gmail.com</email>
+	<maintainer type="person">
+		<email>arthurzam@gentoo.org</email>
 		<name>Arthur Zamarin</name>
 	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<use>
 		<flag name="plugins">Installed needed Python packages for using Sigil plugins</flag>
 		<flag name="system-mathjax">Use the system-wide <pkg>dev-libs/mathjax</pkg> instead of bundled</flag>
diff --git a/app-text/xlsx2csv/Manifest b/app-text/xlsx2csv/Manifest
index 4e34a6c39bfd..09cd85d93d90 100644
--- a/app-text/xlsx2csv/Manifest
+++ b/app-text/xlsx2csv/Manifest
@@ -1,4 +1,4 @@
 AUX xlsx2csv-0.7.6-tests.patch 2180 BLAKE2B 173aa4d2650b86648a7b0897a86f49650acffd1603cb6af4f8fa603d70bc902b23cd280cba0453176e477907e7e93447693ff8ec28b531213c1aa690e9288d7b SHA512 7374e315fbe73532e91278eea825d0171642f4d4d5c412e904932c67ecde0b71291c37d8f5cf8908449663435a587f11e10f409bc82128ef9388be0c002da22e
 DIST xlsx2csv-0.7.6.tar.gz 231283 BLAKE2B d0271c6a82b7ed2825e3224f0e34637db3dacda3fe99c6ef5a087cc8d248592efc169b466514abd18b50f6625e8d9743c812b46ecb6f76ce7d1fdc51dfe34fc4 SHA512 7fc8e0da0c050e12d0cfd73f16ffd9c00f19bf05925b54cc68d6a0858a75db89d52e46312956dfd149e0ec88778f68056942a090db44e6148796fad33fa26489
-EBUILD xlsx2csv-0.7.6.ebuild 684 BLAKE2B 47aaa1207ec9c1287e35eaf2b5789dc322e98a57c292765bd8fbbe7526bfb233269b1c0d0ddf91fe0599acda7c43252edf83eb8b3899b451dcc38be63ee721c0 SHA512 1738363fa7cd77f7827d7dec5cccaa1fbe88d7e7a10f7327c73f1955befc4a562987f66e33e69f3bdf2643b37696e865e967e4858717fb8beed29957864797d4
-MISC metadata.xml 301 BLAKE2B b6bbde41ddb21a05cbfaf8a75bbc5e0d2eb24ce3b62bb93966e7712811cbda3cd258d351f584253d1e831806e2c26fc499092311d2c2d36fa0a8f7323e0b85e0 SHA512 bd16895b82a69676daacc8cf9f4c196423b61600a7dc9ffe8b8d3962cb0a06e46bee7e38a4c692c368a93879be4a83d7d70ce1fb82db6ef4bec25d21a86203c8
+EBUILD xlsx2csv-0.7.6.ebuild 685 BLAKE2B 959291e1c68c1d1da39fa837a6b2d8da1dd5ed7c81ef56ef77b42181088896b528979b4e427e9c8a5b09fb09eeb4629c8f472c5df040bf187413352ce43aa441 SHA512 acf586572b3560242bdf1ba00e8e8fb4a47e4b978793f156f73da18c7ace1607253181976523247e39c8bc1b40dc4b260fca9824701dadd9efdfeb599020b90c
+MISC metadata.xml 326 BLAKE2B ea0d72530a17ff41de3eef128986548161fa240885c0c3c825fcd24285843562c61742832bffca579a4b7d765a1bb1fdc80f207a97194e31cb9e487e016f96ca SHA512 4dd1a973f8ebd062dec866f010b2c93e37df6060064823252a7061d3ec30f091fcd12f3e123ee94be33d4d205ed32f697c78e42ee8c2568e442623821909019e
diff --git a/app-text/xlsx2csv/metadata.xml b/app-text/xlsx2csv/metadata.xml
index 69984cfb9abb..c4f8409e5a34 100644
--- a/app-text/xlsx2csv/metadata.xml
+++ b/app-text/xlsx2csv/metadata.xml
@@ -2,6 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <!-- maintainer-needed -->
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">xlsx2csv</remote-id>
     <remote-id type="github">dilshod/xlsx2csv</remote-id>
diff --git a/app-text/xlsx2csv/xlsx2csv-0.7.6.ebuild b/app-text/xlsx2csv/xlsx2csv-0.7.6.ebuild
index ccf9a6924e03..73061b4a3f00 100644
--- a/app-text/xlsx2csv/xlsx2csv-0.7.6.ebuild
+++ b/app-text/xlsx2csv/xlsx2csv-0.7.6.ebuild
@@ -1,9 +1,9 @@
-# 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..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 PYTHON_REQ_USE="xml"
 DISTUTILS_USE_SETUPTOOLS=no