gentoo resync : 31.05.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-05-31 20:59:14 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2021-05-31 20:59:14 +0100
commit: e748ba9741f6540f4675c23e3e37b73e822c13a4 (patch)
tree: 23dece8beabb3a3d7c6c0273b0eb40b21c62a889 /app-text
parent: 908778078736bd36f7a60a2d576d415cb8e000fa (diff)
79 files changed, 440 insertions, 632 deletions
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index d4bcbd11f8f3..30d6267bfd69 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/a2ps/Manifest b/app-text/a2ps/Manifest
index 78a7bdf71758..c32e598b7a11 100644
--- a/app-text/a2ps/Manifest
+++ b/app-text/a2ps/Manifest
@@ -16,5 +16,5 @@ AUX a2ps-4.14-texinfo-5.x.patch 5996 BLAKE2B 720a408c88c848fbe9b6ece319a8eb05a10
 AUX a2ps-4.14-texinfo-6.7-encoding.patch 1372 BLAKE2B 3eb51e4c83e60f7073c4957963dfe92931fa63eee1410e615171f1f823e21702032ae7dca9ae397851e0620df40a09c8e09bbb0ff12e2843b3c7aa511adda8ec SHA512 31d77113c5a727cc2aa72bc31a6e961cfc5d5871c40aa1f59f3edbadaa06ba55cb35bf6cf9b142276c83ac0a69fa49df9eb157d732fe44dc392f7dac7e014db4
 DIST a2ps-4.14-ja_nls.patch.gz 27576 BLAKE2B 7300971fb76f6c8d2b0e5ffa519cf6064519a33f24430b9894e43778dff5b78f7cf7e2b9fe1e98fb475f452b39ccc29f88f579bbe1922ac3ef70775a05591b32 SHA512 f02f553dd9d9dbd9dfe41ebfe103493000aa4e9de5634c94e7453f73b66d88fea6b0010095913a4a99c7285990a1df1ebcc39da451b2b34f96b0c191112b125f
 DIST a2ps-4.14.tar.gz 2552507 BLAKE2B cd15a2b85f54f8bfb92adf9f4cf2c3c29091e528ae8072d0e905c58cc94caf55b76ac3e37891f8a0bc0909a177c5ee434fe5aaab3625a2c14127dabad8b506ed SHA512 fd6ac8ab47d789114c283e8ca508f7f56feabd1a189f4ac772cad9e6be7e3791e210892cfffd04ad1d39efe4b15386b2e61bf4cd56b70ed581c0554f36bfe06f
-EBUILD a2ps-4.14-r6.ebuild 3637 BLAKE2B cc1d04371e996827413900a383d3d76e0476b93fe3da03d06b067a7d7a7f44818cc9eeb25460c7f1610f45f179b5bb08c21d969e17c147fcc924a62fc6b373e7 SHA512 94975723d040b16502306c27be86e1f88b480381300d71f1c60c6248f0c93a3dfca12dcd75c99b60f353cc581c7ad589374d2c998c8d06811291c417a59295f4
+EBUILD a2ps-4.14-r6.ebuild 3650 BLAKE2B 54ee790f20294db365864f42d3d355cfec1d650d505d85500541aa545a7754051aca9d75694195cdbb1e47b846b5c0ebf6846a0db17918aed3a6d9d048e6f4ec SHA512 ce46b31d2a0a6d89eecf34b982ace6f983f41eb56859d8ee40b70f0459341ac77a83c32e381a1246b4f3cd59262b060df6491a02cf30b535378f35209b79ca24
 MISC metadata.xml 346 BLAKE2B 5f3d7c0d868dfb3ce0ec6e47c33087f9d41b6b2e11d569c48b1a6a635f1a46e7cbb51e793f7df235c4b9dc20eb2eb24a5c8764ca2b6eee34a900d1f4641c4de7 SHA512 0973b9c922d40a291ad52b590c40ef122167070e2f3c2c30980a83188bf8ed8742d825542ca1ea88139fd7ceb0e251f91dff13822ffbec4c9a6af2ea2b7a0010
diff --git a/app-text/a2ps/a2ps-4.14-r6.ebuild b/app-text/a2ps/a2ps-4.14-r6.ebuild
index 6414e3d42237..ffcce4cd01eb 100644
--- a/app-text/a2ps/a2ps-4.14-r6.ebuild
+++ b/app-text/a2ps/a2ps-4.14-r6.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit autotools elisp-common flag-o-matic ltprune
+inherit autotools elisp-common flag-o-matic
 
 DESCRIPTION="Any to PostScript filter"
 HOMEPAGE="https://www.gnu.org/software/a2ps/"
@@ -126,7 +126,7 @@ src_install() {
 
 	rm -f "${ED}"/usr/share/{a2ps,a2ps/ppd,ogonkify}/README || die
 
-	prune_libtool_files
+	find "${ED}" -name '*.la' -delete || die
 
 	if use emacs; then
 		elisp-site-file-install "${FILESDIR}"/${SITEFILE} || die
diff --git a/app-text/bibletime/Manifest b/app-text/bibletime/Manifest
index e9d76628818f..e83515883f77 100644
--- a/app-text/bibletime/Manifest
+++ b/app-text/bibletime/Manifest
@@ -1,3 +1,3 @@
 DIST bibletime-3.0.tar.xz 1568732 BLAKE2B f1e9cb23d64d566d8b0934cfbdffabb52193f240523ad3ba79bbf0e3cd3ff516354791bf0b057354820cd3303c01d3ec50aa61f2e7843b1083c74d442d915a89 SHA512 85afc2781807345ea8fdefea6d179955fa76085c0a9c97e47321ea37ef9ea05367678c54bacfc10cf1d6085d46ba6fbd1c7d448044ffdfe3c96007ee8d7e5c00
-EBUILD bibletime-3.0.ebuild 1466 BLAKE2B 913496634dcfe8e4fa3e3a5bd856d65255ccfed1dda8fbb225bee7ad00cb22f429ba2135cf129d7eaa209dd1910cc316348dd29a7a93162dfc247c916f5d7ef9 SHA512 226d64927296a001d9c8d620c6155daea681c00fd788622f9052d8baad1c3c22b8d2238e93319cbac7c94b5bb7018538f3e01fb5bcac33c294e9a1cd10877b9c
+EBUILD bibletime-3.0.ebuild 1305 BLAKE2B bd114fabd567e3ed57a8ab3ceaa993bed146bf5243056583ec74e2cbb1368fe546fc905e4686191e45b21017471409e48113794706680045bd191dd96650ee66 SHA512 adaccb36fd3709860ad17ef107dea9ac1255a36e2dcb83210cd3bcddfc1b209924b8c53a11630e44abf1cba930dd9fdc1334a9da7b09d6aa9abda1998efa55cb
 MISC metadata.xml 656 BLAKE2B 2402db72930eebc4448e4f0e48ae2e0494a20b9f52ba82a4bf61ea446aa476c917ce0af0229bb3c935ee5648aa69ea82943dd3ef98649aa6ae58af85f475eb53 SHA512 4e72b972bdbbb02fd7297414ba11fcf1680f640a05a4d47e45a4765441923f5c3fea4c2e5c758355fec60b809d94897151a30a8c09675c9466201db62940bf83
diff --git a/app-text/bibletime/bibletime-3.0.ebuild b/app-text/bibletime/bibletime-3.0.ebuild
index 2291044e8729..bc31ba995fcc 100644
--- a/app-text/bibletime/bibletime-3.0.ebuild
+++ b/app-text/bibletime/bibletime-3.0.ebuild
@@ -1,22 +1,20 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-VIRTUALX_REQUIRED=test
-
-inherit cmake virtualx
+inherit cmake xdg-utils
 
 DESCRIPTION="Qt Bible-study application using the SWORD library"
-HOMEPAGE="http://bibletime.info/"
+HOMEPAGE="https://bibletime.info/"
 SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
 
-# Some tests fail due to being unable to find an icon directory relative
-# to ${WORKDIR}, some others segfault. Needs work.
+# Known to fail and will all be gone come next release (see upstream commit
+# d05797db79074c526987329dff78d89eef8c501c)
 RESTRICT="test"
 
 RDEPEND=">=app-text/sword-1.8.1
@@ -36,13 +34,6 @@ DEPEND="${RDEPEND}
 	dev-qt/qttest:5
 	net-misc/curl
 	sys-libs/zlib"
-#BDEPEND="test? (
-#	app-dicts/sword-Josephus
-#	app-dicts/sword-KJV
-#	app-dicts/sword-KJVA
-#	app-dicts/sword-Scofield
-#	app-dicts/sword-StrongsGreek
-#)"
 
 DOCS=( ChangeLog README.md )
 
@@ -63,6 +54,10 @@ src_configure() {
 	cmake_src_configure
 }
 
-src_test() {
-	virtx cmake_src_test || die "Test run has failed"
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
 }
diff --git a/app-text/capyt/Manifest b/app-text/capyt/Manifest
index 98222bbc666c..65a10adf613b 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
+EBUILD capyt-1.1.1.ebuild 587 BLAKE2B 09da2c0814de376267ae4a17693bc9e606b1c7e2bf5084e4a4d454cbb613f8eb8a44178333ae7c8bbe21dee97ab1fbe1a7eab07bfcb0b1f577b7af0237e16f6a SHA512 f123d7fed9efe5c78efa7f195fec84b3904d9ec46bd75ac97d359da58cdfd44cb753dce3a4fd6bd32abe98ce04404e448eab4d6e8f0dc407060b177192414c43
 MISC metadata.xml 407 BLAKE2B edeeb79e203dcfb67d68dd96fc485221789def0b23937d68c493c000412eb6712d23c0eb2c7bec000a4a065a257187df0d0c45ce2ccb454b986c1049431f1441 SHA512 f8a8de49955a6e26d14d0e62312a942881ad4f3877c606b732c66fb38c9780667632de9721175952721a39b227d05c2564e500e0490c65d7d6c8a7e18d3ad129
diff --git a/app-text/capyt/capyt-1.1.1.ebuild b/app-text/capyt/capyt-1.1.1.ebuild
index ffd609898993..0e5d70ae2ad9 100644
--- a/app-text/capyt/capyt-1.1.1.ebuild
+++ b/app-text/capyt/capyt-1.1.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1
diff --git a/app-text/chasen/Manifest b/app-text/chasen/Manifest
index 14f43dc9aa2d..521b30f1e131 100644
--- a/app-text/chasen/Manifest
+++ b/app-text/chasen/Manifest
@@ -1,4 +1,4 @@
 AUX chasen-2.4.4-cve-2011-4000.patch 559 BLAKE2B ee5085a642c1b04ab5cefeaedd09690f988e5cb600953d0ffecd479fe8ddc207e67a27980ebb3df2fbf31dab1f9cc55d597ea09d25dd0c0b29b8fe1d0eddc6c6 SHA512 308a82dfcba13fc33733df853f0abf9979f2d8ff18e1c3f552ac7cd3b6c844dd40e125790fa62844a326ef7e546d0b24fc01c801f3e6cee0aa8b7b2a08474623
 DIST chasen-2.4.4.tar.gz 845720 BLAKE2B ae18e71d78588c108f747abc6f28835f90d0a2c84616a01d87acea2ae5e0e54ef6ff296ebb9dbdce9047a223bd34203cf2763e9b3d4fb28522a4add7bc823860 SHA512 4551d28be6c0de7a585decf03cf5b56def3d181cfdfd975565ac7236e2c3e8cc0bcf5331f1ae309a914f95c6715e13ba3e9d80ebbd6e86c2316a43b7ed831075
-EBUILD chasen-2.4.4-r3.ebuild 1088 BLAKE2B 23e3d5d13b60cb4aa0b84d6b8c4d7de319ebc64a017c22b56fa38c40fbdd2accfe081f72e1c7a1abf28f68a6c70e512e9a0cad2a93164520a0bd0aabe9fc28c1 SHA512 8958c36689409d4c4041e9ac65b21d9fb85b5ab5c949adf5d9d7598fd9ca5654ce7b8f914ab4894040a8b00c44c491667e1b070cd77ddc2cbe5f6c95fdf17059
+EBUILD chasen-2.4.4-r3.ebuild 1101 BLAKE2B a304519d9cd0e097d2d2af455846712c236822cb51c65d356da7d0dfd6c9d3b1e002f35f4274f2833badc79f349e313d60c090797cb9fddba14f6b40af2d551a SHA512 4c6f2241bd044b2ab9acb3f5a8a97f2f8349dd1ab60e14b43f7789e0ed87464ef5292bd01a92b97d3871f53e99374aa8f591b0414386db23046e3701890d57cc
 MISC metadata.xml 320 BLAKE2B a218844660f8614413b8afeec00615885e71d7ba7fc1784496ca28fe8c2d689eedb160dfe56080f24cfa369c0652de87597c14b63ab4879cba1970761c8d2ac8 SHA512 1bf81a4a404bd57dd50b071ec19fa00e17b2a733d3988251d195406a8229d0fb3500498ebbb634f863df5d1d56445ceb1605a470421c54697a130769f0f4263c
diff --git a/app-text/chasen/chasen-2.4.4-r3.ebuild b/app-text/chasen/chasen-2.4.4-r3.ebuild
index 1e618a384ee1..e8557113ca4b 100644
--- a/app-text/chasen/chasen-2.4.4-r3.ebuild
+++ b/app-text/chasen/chasen-2.4.4-r3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="5"
 
-inherit epatch ltprune perl-module
+inherit epatch perl-module
 
 DESCRIPTION="Japanese Morphological Analysis System, ChaSen"
 HOMEPAGE="http://chasen-legacy.sourceforge.jp/"
@@ -56,5 +56,5 @@ src_install() {
 		newdoc README README.perl
 	fi
 
-	prune_libtool_files
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/app-text/cherrytree/Manifest b/app-text/cherrytree/Manifest
index cec05bef592d..43e4b6553958 100644
--- a/app-text/cherrytree/Manifest
+++ b/app-text/cherrytree/Manifest
@@ -1,3 +1,5 @@
 DIST cherrytree-0.99.0_p20200523.tar.gz 10452221 BLAKE2B cbac9b5b1c4fc1454d229a56784a59f1622b134d640db720e496cc0f1b4f95ee097343572f33d8b0626903f58ae188e8b85065144fcad8c647732e7eddadd0b9 SHA512 4eb142368bd1d3838879669d5bf1742689b02f08f50edd51a6fa6f22fef83d0f1871147aca3c346e9fcd1193c3f494e112cdc9e10eda4b3124587f605f89cc54
-EBUILD cherrytree-0.99.0_p20200523-r1.ebuild 2088 BLAKE2B ba7d653c4736c3efcdfab9c02bcd5179fc5d15915106b33cd93448e5acb1520822ea6751b60b86820fa38fcd1d573efaa19c4cb7d0802fe1b949bc7a4da18809 SHA512 3f350c0d1f0a7f1ef337d6947775846cab20a829b201c0a003daf861ee355a7b4a32b3f2162dbba82c3881631f7b8e1bb8ba4ee6853fc6ae38e75a4631e7f85a
+DIST cherrytree-0.99.37.tar.gz 17983743 BLAKE2B 42e5464f4cba4364dbbdabe5daaf80517a62f3f4b2c1c3efa764e9b10dfae492bf335403d24a7a33d9b7c8cd55a0c55ad359ffca1f639fa7622e00a416defd60 SHA512 2413924d03c65dfad820bc2b1e345b7dd74b69d11a10ee0d333400936eb31368f53f2aee77a3dd708adb3d4b91578c0499766bca4c85537822e9c4b3d41c6800
+EBUILD cherrytree-0.99.0_p20200523-r1.ebuild 2089 BLAKE2B 038125bfaec0ced1b0a091189a1feefeaaa1bb30210b1c6c41b183f986d06a28ab2f33d8bb728513467cd1b91bc625bcff10936c034ad49213e50a90626fce1c SHA512 7964528b0fbfbd1636f6e1e3df3652cb2a71b39980479c17f30753b7dce2c89d49be2942632b07964fad164e9835a34238f010d42ca163569cf6949af16940b2
+EBUILD cherrytree-0.99.37.ebuild 1938 BLAKE2B 02616be9599b9c31bc85d96f70469be605eff6ad863c5ce7ce68974541d46845ea8ace862635fa2b99ec2fe1335b11d559eae60125236506a6c6c01fd4854c93 SHA512 df1dc2e036a067cb1d0b5d84dc6ea0e4217f68c292c14a94e89161575c6e51bd9a9ac3f473740468af80865a099eb221c467e98ab7d31b132c226b90656bbffe
 MISC metadata.xml 250 BLAKE2B 9f586a12b964da0dbeb5a079a39f8145e2e33e41c4edcd5c937d86a1746b0d291ebc8c6bff25def4d8f433577e2eb6f68892028e06c68044274df0ca782ed3a1 SHA512 d64c36dfd03da64937992558c892459cc634ba06c2d988087299b8c02c497be99875a16038246728a6320ecfaf385d03ca30d6f4fc823f3379bb6f0f48875e06
diff --git a/app-text/cherrytree/cherrytree-0.99.0_p20200523-r1.ebuild b/app-text/cherrytree/cherrytree-0.99.0_p20200523-r1.ebuild
index 55a62632c259..8ea8d40b3a31 100644
--- a/app-text/cherrytree/cherrytree-0.99.0_p20200523-r1.ebuild
+++ b/app-text/cherrytree/cherrytree-0.99.0_p20200523-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..8} )
+PYTHON_COMPAT=( python3_{7..10} )
 
 inherit cmake python-any-r1 xdg-utils
 
diff --git a/app-text/cherrytree/cherrytree-0.99.37.ebuild b/app-text/cherrytree/cherrytree-0.99.37.ebuild
new file mode 100644
index 000000000000..2534d1a2e1ca
--- /dev/null
+++ b/app-text/cherrytree/cherrytree-0.99.37.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..10} )
+
+inherit cmake python-any-r1 xdg
+
+DESCRIPTION="A hierarchical note taking application (C++ version)"
+HOMEPAGE="https://www.giuspen.com/cherrytree https://github.com/giuspen/cherrytree"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/giuspen/cherrytree"
+	S="${WORKDIR}/${P}/future"
+else
+	SRC_URI="https://github.com/giuspen/cherrytree/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+# 	S="${WORKDIR}/${PN}-${COMMIT}/future"
+fi
+
+# GPL-3 — future/src/ct (CherryTree)
+# LGPL-2.1 — future/src/7za (7zip)
+# MIT — future/src/fmt (libfmt)
+LICENSE="GPL-3 LGPL-2.1 MIT"
+SLOT="0"
+IUSE="nls test"
+
+# Has deps that aren't available in ::gentoo repo
+RESTRICT="test"
+
+RDEPEND="
+	app-i18n/uchardet
+	app-text/gspell:=
+	>=dev-cpp/glibmm-2.64.2:2
+	dev-cpp/gtkmm:3.0
+	dev-cpp/gtksourceviewmm:3.0
+	dev-cpp/libxmlpp:2.6
+	dev-cpp/pangomm:1.4
+	dev-db/sqlite:3
+	dev-libs/glib:2
+	dev-libs/libfmt
+	dev-libs/libxml2:2
+	dev-libs/spdlog
+	net-misc/curl
+	"
+DEPEND="${RDEPEND}
+	$(python_gen_any_dep 'dev-python/lxml[${PYTHON_USEDEP}]')"
+BDEPEND="${PYTHON_DEPS}
+	virtual/pkgconfig
+	nls? (
+		dev-util/intltool
+		sys-devel/gettext
+	)
+	test? ( dev-util/cpputest )"
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+}
+
+python_check_deps() {
+	has_version "dev-python/lxml[${PYTHON_USEDEP}]"
+}
+
+src_prepare() {
+	# disable compress man pages
+	sed -i -e \
+		'/install(FILES/s|${MANFILE_FULL_GZ}|${CMAKE_SOURCE_DIR}/data/cherrytree.1|' \
+		CMakeLists.txt || die
+
+	if [[ ${PV} != *9999 ]]; then
+		sed -i \
+			-e "/^set(CT_VERSION/s|\"\(.*\)\"|\"${PV}\"|" \
+			CMakeLists.txt || die
+	fi
+
+# 	python_fix_shebang .
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DPYTHON_EXEC="${PYTHON}"
+		-DUSE_NLS=$(usex nls)
+		-DBUILD_TESTING=$(usex test)
+	)
+
+	cmake_src_configure
+}
diff --git a/app-text/coolreader/Manifest b/app-text/coolreader/Manifest
index 67a8343f5426..8c8816a460f7 100644
--- a/app-text/coolreader/Manifest
+++ b/app-text/coolreader/Manifest
@@ -1,5 +1,3 @@
-DIST coolreader-3.2.55.tar.gz 13230319 BLAKE2B 1cb414f38b76072f66705370162a28505ba2273282755704bb8ad28a7b0eb2928aba0a929291ae33fdf9ce42b442c4b941740d59f4f329a401470e2fceceef18 SHA512 4eef99c86259642d6a5c3d9eb388a11c27b7438c0f05a055ef61a1df93af567d30fa39790cc5d5b3d10dcaa4b2931a51773f967904ff75f7fff2040f313c09d6
 DIST coolreader-3.2.57.tar.gz 13281238 BLAKE2B 8a6739f38d72b13af7b79160dee8cfc08bd9e54d3698fd44c7f6ad8bd575b1f389c2c349c1e2ef71a55fb0068e9d64b5baa4a0a8b945cdb873e833178d81cbbe SHA512 d5bf46f7dbf19177a54742d5c300002c8b7a504052bd003d2e1a7380ac3460dbe648d7f923d26e6390e9296ce6b090c947204725ab2a30c78f26893868a61161
-EBUILD coolreader-3.2.55.ebuild 1838 BLAKE2B f5c912d33d88c0a9040ca6b495aa7a202b4d1f0eb043a57275fe1e9ff61081ed069acd9ae2c86381d7299a13ebfcc46f4eeb5f5bafe92da6c04c86750b8ea8c7 SHA512 50159e31e21ded5890111091f26ee10d91aab33714130be060d8ba7f4510ea90de2eb5f722be9007f67a2bbb71096ec39df3367f235643dfb97d02b3ecd37f4f
-EBUILD coolreader-3.2.57.ebuild 1840 BLAKE2B abd3453c6fe24d69196b10c6046e64ee0ca2639220287955a9453a3f170a85f7da536934518f1486402d593d5e2697be5bd5e90e32b29daf10ee1fcc3525e967 SHA512 a4aa23bd15bd0388e06f782fb90817a70056052277b3ac1cc0c05eab7202ed3ca2dc859809e55a1da0b88a865cad3a428413bf8e2540791f75e8015362769ada
+EBUILD coolreader-3.2.57.ebuild 1838 BLAKE2B f5c912d33d88c0a9040ca6b495aa7a202b4d1f0eb043a57275fe1e9ff61081ed069acd9ae2c86381d7299a13ebfcc46f4eeb5f5bafe92da6c04c86750b8ea8c7 SHA512 50159e31e21ded5890111091f26ee10d91aab33714130be060d8ba7f4510ea90de2eb5f722be9007f67a2bbb71096ec39df3367f235643dfb97d02b3ecd37f4f
 MISC metadata.xml 624 BLAKE2B fa86114594d823c9b73b590ebfa0ffe74955550f1d66b5f1197672484d4095be484f5f8f754acef06e34f9d69d658609653109bf8499235439bb1f3ad95b7be5 SHA512 33e57dbe75c3e2efaf1d793dad06b534fac861b3ffd25e4d441af91b8d6a8cae96b8d5c19bbf0845aa78ff404eee167998e09f948009b4ce1902a2f38625f9a8
diff --git a/app-text/coolreader/coolreader-3.2.55.ebuild b/app-text/coolreader/coolreader-3.2.55.ebuild
deleted file mode 100644
index 115cf9e91673..000000000000
--- a/app-text/coolreader/coolreader-3.2.55.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# 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 wxwidgets l10n 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
-	l10n_find_plocales_changes "${S}"/cr3qt/src/i18n 'cr3_' '.ts'
-	sed -e "s|SET(LANGUAGES .*)|SET(LANGUAGES $(l10n_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/coolreader/coolreader-3.2.57.ebuild b/app-text/coolreader/coolreader-3.2.57.ebuild
index 7c75f5c7adcc..115cf9e91673 100644
--- a/app-text/coolreader/coolreader-3.2.57.ebuild
+++ b/app-text/coolreader/coolreader-3.2.57.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/cuneiform/Manifest b/app-text/cuneiform/Manifest
index 3aa5bbeee7b4..dd25274f01ef 100644
--- a/app-text/cuneiform/Manifest
+++ b/app-text/cuneiform/Manifest
@@ -1,6 +1,7 @@
 AUX cuneiform-1.1.0-c-assert.patch 2012 BLAKE2B e1c71e4b1be912ce604b43b1b09f96b299d9cb7dd553ed818203a2c06f7227e2c140095064accab3f90a32b16948276abd05e3451aaef1e3f66d87e219828424 SHA512 8c05e27e425c5221e6bb47eb8655e21e9f4ecd311679cd1b80a04e255371ffc907a9bca3337e78af6c88f23a3c6cf474971e1e94b6c6f1d30f206d01fb9a3a95
 AUX cuneiform-1.1.0-fix_buffer_overflow.patch 1089 BLAKE2B df9be625fee6806634c56fabe2ea27d0e3457b5c5090a7ff20aad79827fa7e6c25382cc0a230c31c4da3987eaba88de3628adedf2286ca317820134b04980134 SHA512 b701573177788575c540bb2203dab4d3f7ccc150bb71a53a13ac61971b357a4bfa67764f9880fd042798a94d79b70bff85c13b8e6005be344eb51c1bcd9311ab
 AUX cuneiform-1.1.0-fix_buffer_overflow_2.patch 888 BLAKE2B 9185e7190120138cdc0fc943b41878b9036cfedcb71fe47910b6f2c41e2865915570501a20d512c7ca0cacc09ece9e9cf688dc0d57963e76f1e923545fabc9f6 SHA512 182e1756adcbb71bd052fef7caf9b638b448bf995e2a6d2d5646737d22cacedf90840fbabc84e580450e92cb08ae357ff862aab977b8e34459dcc479fb92a292
+AUX cuneiform-1.1.0-gcc11.patch 1214 BLAKE2B 9350442a9061fca2fe377e85e89fd44defde241c1b66f3edbf910f8542d855237ed6db769e09380fec28278ea1542a6134c79f7f3052c950f1fec669a8779c73 SHA512 35b813c3096a6f1277e860a6aaaeb14837b20618ac216dac73a8bc07cdd24f58058e2b58cbc1f4371352959cd5355be5359c47d8bf22f71da519dab96ea99226
 AUX cuneiform-1.1.0-gcc6.patch 6080 BLAKE2B c9cf22db876320005c78f5b96330a11782d2d521fd1dd3024345f61bebb7a7d357c280d30d71193a5f94fee7cdd934351ced1f2073bf69047e8a090bbce66818 SHA512 277cc973a1934d7f722e7a3e30c981cbe57cf268b1553f3f552e15eebcf4c191c7457a8f8c3562f7fb1629b3405c37b10298293c047b8d3b0e67bb0cf72462f4
 AUX cuneiform-1.1.0-gcc7.patch 2814 BLAKE2B fef51b014790b27acd042b5e46e1ff79111a983b869d9591ed16cdbaa36139748987d5b3c91e5dfcac77b1495edb6ccb93ce4e922b8eb1fb49da22d6ea789e9b SHA512 4b164868c4612c28f0f1460ec4fb417a015840705e5fe5aa44c6ee2e350506fe1f7a7cb8f24e29f54b449c2893ff83bbdafd7df8733154bf8759c89e67902088
 AUX cuneiform-1.1.0-graphicsmagick.patch 1500 BLAKE2B 36a9e1292bc889596468f96aa6e515fba1368d9f6f451e3b0f2d51e91032a3093d74fa6496f1360385d1f18a39159a3eaf055e4b748520ac7b7767bdee13b47a SHA512 c3cbd03fd93c172d0b02a49c7f470348f60a46e09413872aefd7e581ac4934e41a75210afefb93f83b28cf2733dd0d025b1198ce6e28a9b950e54097adf33af3
@@ -8,5 +9,5 @@ AUX cuneiform-1.1.0-libm.patch 595 BLAKE2B 7c9bba013f4e3560149eb05504ebb9f600aba
 AUX cuneiform-1.1.0-typos.patch 1757 BLAKE2B b02ad10370a7bfed3201905c3282f5419e05845382084d70d4ce531722098bc1e225b3cb2bc6f6bd9978bea17903a9c2837e093b78935a5ddf1f05e29598b280 SHA512 5b8a1151b85cd2d5e0672b4ca125500047365051c9171bad49354d6e064d1fbe59631aa088183b9b0a3c9859b297cfc61055ab2f0fbfc3df669d3d6fa91ee4ce
 AUX cuneiform.1 2844 BLAKE2B ed7d68de70ebd50caf35bb22ebd23ef7ecf00633be22f237e19830456c1efe83a6c546dd27dcf776e91bdb9189236b48690cdf2b172602e2a0528c12de9b1532 SHA512 55dfaa6fd759a24c1a49ed1455a6f04e63c40f048872bc8309b770942747006bb5ed4704171a53490552c4170471934dcaeeb692921ebbc020f012f84afc6d77
 DIST cuneiform-linux-1.1.0.tar.bz2 26388511 BLAKE2B 9a9406d42b96d814b7342c48b384b7d46b529116e37f9946da6b1158bd223d2e4be0158bd0101f0b9821b7d63374758190e60232483779bdb6a4164d1b06034e SHA512 82395f43aae9f4b1301fb47b8d46613affb0ccb09c92d64ac3d77a593618cd56824225b0306176e4d8b90eb468abf6b9f534e97f28dabd4bba81cb7977b79b56
-EBUILD cuneiform-1.1.0-r3.ebuild 1497 BLAKE2B fecbe9b8d7be47d2cabdc42de3bd65d41525139054f7d018a7de23638514ee0ebce597958ec7b22761276bed2022179a4153670950126ec34800cdb2bb87a631 SHA512 41aedb8f002c8409be220667a1b737f65860bd324f387c963cc05698a80ffcf8022c0e129397448eab1a1ada1f2cc560075e22ea064224c3e9c8ee342b9ee949
+EBUILD cuneiform-1.1.0-r3.ebuild 1529 BLAKE2B 11e4cb0000af2c5691d314ab514f5d76ce77be16bf8790438ee266c1c915bd82e327385ca44c0cd483017f08ef318823d1ba8fb4adbbd8326af503b740e50362 SHA512 b649111f0703bd51f82e290ffc79360b3a5a41d0116085402d44f0f085281f6b19e10c2506beb6c69ab14c8816ae7110500b26dd12b171fa84da1918c6bcd95f
 MISC metadata.xml 250 BLAKE2B a79213869bd5899b9cfe177caee01e12a026f71485466cf3836d2809234fb64fe5c7ca8d945765fb2f40259fb0a9817e521d101d29ae87cd34098d5316f3dcba SHA512 b540aad05003ebec6a4f52250febbca55356d3d2d826d7b3f982d25ca543be928537194325600b5489970288e6500a671b0343735ed9ee052471efa26cd7cdab
diff --git a/app-text/cuneiform/cuneiform-1.1.0-r3.ebuild b/app-text/cuneiform/cuneiform-1.1.0-r3.ebuild
index 3874e69f95e6..16ad43b3ac40 100644
--- a/app-text/cuneiform/cuneiform-1.1.0-r3.ebuild
+++ b/app-text/cuneiform/cuneiform-1.1.0-r3.ebuild
@@ -33,6 +33,7 @@ PATCHES=(
 	"${FILESDIR}"/${P}-gcc6.patch
 	"${FILESDIR}"/${P}-gcc7.patch
 	"${FILESDIR}"/${P}-typos.patch
+	"${FILESDIR}"/${P}-gcc11.patch
 )
 
 src_prepare() {
diff --git a/app-text/cuneiform/files/cuneiform-1.1.0-gcc11.patch b/app-text/cuneiform/files/cuneiform-1.1.0-gcc11.patch
new file mode 100644
index 000000000000..47677507b261
--- /dev/null
+++ b/app-text/cuneiform/files/cuneiform-1.1.0-gcc11.patch
@@ -0,0 +1,30 @@
+--- cuneiform-linux-1.1.0/cuneiform_src/Kern/hh/internal.h.orig	2021-05-23 10:45:12.714043888 +0300
++++ cuneiform-linux-1.1.0/cuneiform_src/Kern/hh/internal.h	2021-05-23 10:45:47.233178549 +0300
+@@ -84,6 +84,7 @@
+    #endif
+ 
+    #if !defined(__MATH_H) && !defined(_INC_MATH)
++      #undef _GLIBCXX_USE_STD_SPEC_FUNCS
+       #include <math.h>
+    #endif
+ 
+--- cuneiform-linux-1.1.0/cuneiform_src/Kern/ced/sources/main/ced_func_rtf.cpp.orig	2021-05-23 10:51:00.757379453 +0300
++++ cuneiform-linux-1.1.0/cuneiform_src/Kern/ced/sources/main/ced_func_rtf.cpp	2021-05-23 10:51:22.445461911 +0300
+@@ -212,7 +212,7 @@
+     }
+ */
+     // write the text lines
+-	for (;sect>0;sect=sect->next)
++	for (;sect;sect=sect->next)
+ 	{
+ 		if (!WriteRtfSection(rtf,sect)) goto WRITE_END; //write section properties
+ 		//	int sectNum=0;
+@@ -897,7 +897,7 @@
+ //    if (curChar->fontNum>=rtf->page->fontsUsed || (prevChar&&prevChar->fontNum>=rtf->page->fontsUsed)) return TRUE;
+ 
+     // extract value for comparison
+-    if (prevChar>0) {
++    if (prevChar) {
+ //       lstrcpy(PrevTypeFace,TerFont[PrevFont].TypeFace);
+        PrevFamily=rtf->table[rtf->page->GetFontByNum(prevChar->fontNum)];
+        PrevStyle=prevChar->fontAttribs;
diff --git a/app-text/dblatex/Manifest b/app-text/dblatex/Manifest
index 977ac0b3a780..01df9c4e4df6 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 1829 BLAKE2B 5818b7ae2576666fb7fe0686b692a68406ce32fdddef81460d767de649827d354d261d7212653b92f00a92a8a79f65a95e4e4ea6daffb27e1a973a95cd4319f8 SHA512 dc481ff1759bddca0861e3be149c23bae39a5438f343b098d65dc1237a6870b64ebee4febcaa69dc55710ec4b7cca54f6d4e2c0b85312ca25ba9dbe69ff1b0af
+EBUILD dblatex-0.3.11-r1.ebuild 1828 BLAKE2B e8076d8450189cf9d9dac43bcb0c8f1659da8d8e83ae7c73b8c3829e4dd95e7c8b7016f7c67060ac5fa32dfcb83c29197a33facf4f070224379ff0c5f4ef8c61 SHA512 a967e261d36f2e05a030a7fbe18956e4bdf01acadc6601182347af035b477ce4812ce106fc6dd28e82b0a86c08a25abed5eda29f867d44b152daace7ddbd8eb6
 EBUILD dblatex-0.3.12.ebuild 1741 BLAKE2B b500a50c81ebf3bd845832d4af60162a3e8ed49dff27dbf61c409c937798e50be131aaaccbb21a720a3bb8859cdb87063a85a146347b623a5bb0628d753b4886 SHA512 fb5baccc7a2330837ad5f776ec9040275a6b8da99dd083a79d1c60d3125bb47d07a847af76cc077bf9c91edea54372042b65162c42fe6ba3f99de5b64fbde54e
 MISC metadata.xml 896 BLAKE2B c01d462757e3af55ccbca34bf8aa601155be93586ab6da5028b9deaf4c71fad74965a1da586a89daddee0e3037ecfac8a59f497cb796fdef45bbf2eb3f6f044e SHA512 79a4f0bd55ea9c240e0490c37db08a365b17ae1837c50d29f5c611a09c3ed2594d8f7dd0d20391b45f740ec69bd36eb99a858aaf921adcaabea97ee6a7743d06
diff --git a/app-text/dblatex/dblatex-0.3.11-r1.ebuild b/app-text/dblatex/dblatex-0.3.11-r1.ebuild
index 2ab851b99209..37b46061e629 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/docbook-xsl-ns-stylesheets/Manifest b/app-text/docbook-xsl-ns-stylesheets/Manifest
index 7d08f50ad6be..1a3eda22663e 100644
--- a/app-text/docbook-xsl-ns-stylesheets/Manifest
+++ b/app-text/docbook-xsl-ns-stylesheets/Manifest
@@ -1,3 +1,3 @@
 DIST docbook-xsl-ns-1.79.1.tar.bz2 21962317 BLAKE2B a68cc31ea8cb98fc07e198fe55f242c6438284d6fa75d4920a9ca7b5038732f966cc6653e058d7fafb26c0ff49f2039025a48a0f8c0392ee892951723703bce3 SHA512 23fd06870bd5afe4efcd08c8ad679821c202a62442b50657c093cbe9cd71b585a3c56a5534a0d41119f58bf98b1f9014a53ff2e48ab59075ec1827e7363980e9
-EBUILD docbook-xsl-ns-stylesheets-1.79.1.ebuild 1664 BLAKE2B 1efbdbc8d8de28bfad7f5e2f6fb0cde288ce48ea826118c975285635b10da6f9e23f727aa4be3b0d0f13ebd72a1fe8ac1cefc65d7d847afd7305a403d7293288 SHA512 51767f1e7bade7c37e3198d63410fc0b0585f433cbd9453f41e1c1b185757ae0a3fdb44761885e9b2a48e74a8fdc40f51b179bb933fdc6f40adf4da89a70fefc
+EBUILD docbook-xsl-ns-stylesheets-1.79.1.ebuild 1671 BLAKE2B 9d8b39c43e3df381c3ce296852d00e61ba7c3fe697c561f353f5fe38b23652eb91d7f0526fe1955a6796c069b8c595da3557e389e1adb4ba22d0f75f3288ff17 SHA512 d60a0a7992b08c7375f4f77724c68cb36cbe95a9ec4a8c018fdface92608f319424eb7b5e38607c6ff454df3f8da7e204483c868b411d0ba4990e8c58b597667
 MISC metadata.xml 435 BLAKE2B ad101421ffb8e517aeb459f60058c45e6c022f496e5053fa25d6f4543b814be1940f327b934cc88d5545844c9a4e6ac9c01954b4f96b2697307425ec0b487e61 SHA512 3d7ea2c260b9d5ebe5517a8b8841d36114433b7276ef247dc88bd2f728c1d0336d83e508fba1ef2d020bdceaf4ecf6750d74bda1678422c083e18323b539b18d
diff --git a/app-text/docbook-xsl-ns-stylesheets/docbook-xsl-ns-stylesheets-1.79.1.ebuild b/app-text/docbook-xsl-ns-stylesheets/docbook-xsl-ns-stylesheets-1.79.1.ebuild
index 81f3232d06e4..1755483b705e 100644
--- a/app-text/docbook-xsl-ns-stylesheets/docbook-xsl-ns-stylesheets-1.79.1.ebuild
+++ b/app-text/docbook-xsl-ns-stylesheets/docbook-xsl-ns-stylesheets-1.79.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/docbook/${MY_P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="ruby"
 
 RDEPEND=">=app-text/build-docbook-catalog-1.4
diff --git a/app-text/evince/Manifest b/app-text/evince/Manifest
index 2dcf2e977301..53284faa0fa4 100644
--- a/app-text/evince/Manifest
+++ b/app-text/evince/Manifest
@@ -1,12 +1,6 @@
-AUX 3.30.2-internal-synctex.patch 964 BLAKE2B cce1d02b40b18a23773985e2d9f39b1782e56ee9e032d625e51796723a2ad43e3cb9083055bcbc10438cb70b15e7c7c6737db3d7276db1e02b19127c5d75e527 SHA512 f1a98d09a0fee6add7a5a44d756ceaa003cbb3840e74a513c1f01ad6826ee4136cc5b862b675401371951468f1cdb2e5137158c44801a0c9ebe79c60951b8fbd
-AUX 40.0-avoid-changing-soname.patch 2136 BLAKE2B 3e9c25711ab9e5e83f3e9407fb03f8259c6bc035e384d1394319df987584cbd71dfe2970a503d0d7939ec4f7744bae498466a34512a35e1b4c1f2e783f621eaf SHA512 c723fce354f0a034f2ad4846d4b9f637f4985a03bdb7caef348328c74ab9488ef3d2f2204583248e35e0d8a27456b7327ac2e8e0ca14e0ab92e8db25e0197dda
 AUX 40.0-internal-synctex.patch 921 BLAKE2B d970afe7dd3ac16d7f285baeb157bba0271a6816326a17527d91b68d481d23ed3ad982211c07c412a61157d17cecafa591cc80482ec22abad3ce29101068bbd5 SHA512 703d9b5ca4e718660fe5af2d59a60b3187beda965e3a7b6eeaf1f7bf61013f3acde54b0ba89c8b493b1f0b1950cd52893ff1fb00a74c6d97645df29a1829902c
 AUX 40.1-build-Fix-t1lib-detection.patch 1017 BLAKE2B fbb53e5c0a0da025b0410af62ae7251d369106c39c22ca5af58854c637a9f59119b96c63e0c76c64e918385f66ec37a9bda4808a2b3a5ddae5640d57e62304d7 SHA512 f77640a39fdc6c4e6aeea312380c0b922395b938557e04d718e29e55a6f0bd7cab8efc738668051f4f45183e68298911234bc35af82f0eb3d79e681ec20712c4
 AUX 40.1-previewer-Fix-build-regression-when-gtk_unix_print-i.patch 1207 BLAKE2B ebcf5f7fe0419ce853c492699b97cc17b0df17c2d86f66ccadd4aef7e08e324a79d358a81c7148b73efc6a4788eeac128532665b9f8abb41a65908771c051219 SHA512 4816954209c20debecc6d6ca20650ac0bb06979d4b0e8d7fc63bda5445372f405fabc6accf44f0c62fad37070dada8cbb157f615e093f7ec894dccabf6069a4d
-DIST evince-3.36.10.tar.xz 2430584 BLAKE2B 7c8b5e3dec7168f4ab6976022bb85041fd8cc9f55b8c032bbf03cf492d243dc49f00d6913c1f2f09498c1b4091b4be126a9367dd3ed235635e9d08e6a9ae5a0d SHA512 2a17fc1fbd18e2685c254194d0e195ec0c6126f37212ae64297fb06f30f2e07f926cb768affb4d5c9c407c4dfc43db3578ffd244c9a6e121d1d3c9b5e653b4d2
-DIST evince-40.0.tar.xz 2928668 BLAKE2B 852c532b595f50e849893670b536b5b8c25f0407a719cbe659faa3f72b51f43a0471c3df9197fa5bd11735c14e0779d8cf28a88cd79aabec4dffa797443b9819 SHA512 995693e4a6e1a3bb31e1d4f3538dc53519102a5a6afa58ba61454a1e2ca582df26bd368876210fce6fab8ff4e218305644fa7a7a88c99e1a1ca5bda8d8f1ece2
 DIST evince-40.1.tar.xz 2928924 BLAKE2B e9376c186da9fed132b820b2e9a1ef6bb0997f22abca3d7b271691291ea4870132b48075ada5a992e056193e6af51bdf95e6bbdac79c789475fb985d692f9ccc SHA512 c688ee962cfff8b024b572161bae689d25b5b566ac623abeff38b4b8e6e541ce343023ed2c1ba0df1f65d6ec9a631aac3a748c940db556dbb89ab45ac565147d
-EBUILD evince-3.36.10.ebuild 3083 BLAKE2B ff940dcedd304464ba5cb06451aa14a1c8943d45f616532e93eeca3b5f6399ff9f6949c676473646f9c4f5d863086dc1388800077022afde3497feb5bd09027e SHA512 58b7f5b0013c9fb6af17e9782dc5b9738412c5bb6c63e744ec66018e4a25dc5b997d5bd75b9e165b4df0f1eed781ea310a8005c1116e11b23f5abca5d92e01a9
-EBUILD evince-40.0.ebuild 3281 BLAKE2B 5fee649a184d6340a05f80503d4737f5a4b58f6aed88b805324a988c4bba0177a909a42fcc0d6f8cc8f6f488edbd2f75f43909968a343de60e6b2f02158ec2ef SHA512 9d2a0a6eba4cfb68a07d5ccfcac21dceb42799fc3b921f67358685d5d86b1281d68615ca820993b5d9567c4111e9befd55d03e06007f4b09e59ffcd65dd292fa
-EBUILD evince-40.1-r1.ebuild 3249 BLAKE2B b1e36874d8b377115f3cd47ba7637a0b23a67a7fc1b6f891ed7eaa99b791ca9f83284eb03928f06148be973f1998ff753955329aac3b8116c5bb18292e9272d8 SHA512 13ad543727c48e37a5601df1f039c677f47cf88be0fa3b0346c8878c5ac08eff4f2667c8a590f1e3362cd2a7af43fc2ecbad23e87d17aa2b94c10520ddec6e92
+EBUILD evince-40.1-r1.ebuild 3247 BLAKE2B 578562594a55320dd6e9d2c9f437cef0e737071cb74e396d1ee0c0e06c0244356bf1dd918b563c72c8dce2ff1d5a29d2c86361383cdbd404e912a90f4ee42b3c SHA512 492261623631a1a5c1192a26c7e3d06839554bbd389303641c7f488b3846ff5662ee06ca565c1db8ab7ab5c97a7c07bf1cc909e5f3a7da95b4498f533cda905d
 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
deleted file mode 100644
index 8a39036dc003..000000000000
--- a/app-text/evince/evince-3.36.10.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-GNOME2_EAUTORECONF="yes"
-
-inherit gnome2 systemd
-
-DESCRIPTION="Simple document viewer for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Evince"
-
-LICENSE="GPL-2+ CC-BY-SA-3.0"
-# subslot = evd3.(suffix of libevdocument3)-evv3.(suffix of libevview3)
-SLOT="0/evd3.4-evv3.3"
-IUSE="djvu dvi gstreamer gnome gnome-keyring +introspection nautilus nsplugin postscript spell t1lib tiff xps"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
-
-# atk used in libview
-# bundles unarr
-DEPEND="
-	dev-libs/atk
-	>=dev-libs/glib-2.38.0:2
-	>=dev-libs/libxml2-2.5:2
-	sys-libs/zlib:=
-	>=x11-libs/gdk-pixbuf-2.36.5:2
-	>=x11-libs/gtk+-3.22.0:3[introspection?]
-	gnome-base/gsettings-desktop-schemas
-	>=x11-libs/cairo-1.10:=
-	>=app-text/poppler-0.76.0[cairo]
-	>=app-arch/libarchive-3.2.0
-	djvu? ( >=app-text/djvu-3.5.22:= )
-	dvi? (
-		virtual/tex-base
-		dev-libs/kpathsea:=
-		t1lib? ( >=media-libs/t1lib-5:= ) )
-	gstreamer? (
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0
-		media-libs/gst-plugins-good:1.0 )
-	gnome? ( gnome-base/gnome-desktop:3= )
-	gnome-keyring? ( >=app-crypt/libsecret-0.5 )
-	introspection? ( >=dev-libs/gobject-introspection-1:= )
-	nautilus? ( >=gnome-base/nautilus-3.28.0 )
-	postscript? ( >=app-text/libspectre-0.2:= )
-	spell? ( >=app-text/gspell-1.6.0:= )
-	tiff? ( >=media-libs/tiff-3.6:0= )
-	xps? ( >=app-text/libgxps-0.2.1:= )
-"
-RDEPEND="${DEPEND}
-	gnome-base/gvfs
-	gnome-base/librsvg
-	|| (
-		>=x11-themes/adwaita-icon-theme-2.17.1
-		>=x11-themes/hicolor-icon-theme-0.10 )
-"
-BDEPEND="
-	app-text/docbook-xml-dtd:4.3
-	dev-libs/appstream-glib
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	>=dev-util/gtk-doc-am-1.13
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	app-text/yelp-tools
-"
-# eautoreconf needs:
-#  app-text/yelp-tools
-
-PATCHES=(
-	"${FILESDIR}"/3.30.2-internal-synctex.patch # don't automagically link to synctex from texlive-core - always use internal copy of this small parser for now; requires eautoreconf
-)
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# Do not depend on adwaita-icon-theme, bug #326855, #391859
-	# https://gitlab.freedesktop.org/xdg/default-icon-theme/issues/7
-	sed -e 's/adwaita-icon-theme >= $ADWAITA_ICON_THEME_REQUIRED//g' \
-		-i configure || die "sed failed"
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-static \
-		--enable-pdf \
-		--enable-comics \
-		--enable-thumbnailer \
-		--with-platform=gnome \
-		--enable-dbus \
-		$(use_enable djvu) \
-		$(use_enable dvi) \
-		$(use_enable gstreamer multimedia) \
-		$(use_enable gnome libgnome-desktop) \
-		$(use_with gnome-keyring keyring) \
-		$(use_enable introspection) \
-		$(use_enable nautilus) \
-		$(use_enable nsplugin browser-plugin) \
-		$(use_enable postscript ps) \
-		$(use_with spell gspell) \
-		$(use_enable t1lib) \
-		$(use_enable tiff) \
-		$(use_enable xps) \
-		BROWSER_PLUGIN_DIR="${EPREFIX}"/usr/$(get_libdir)/nsbrowser/plugins \
-		--with-systemduserunitdir="$(systemd_get_userunitdir)"
-}
diff --git a/app-text/evince/evince-40.0.ebuild b/app-text/evince/evince-40.0.ebuild
deleted file mode 100644
index 6236265c87f2..000000000000
--- a/app-text/evince/evince-40.0.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome.org meson systemd
-
-DESCRIPTION="Simple document viewer for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Evince"
-
-LICENSE="GPL-2+ CC-BY-SA-3.0"
-# subslot = evd3.(suffix of libevdocument3)-evv3.(suffix of libevview3)
-SLOT="0/evd3.4-evv3.3"
-IUSE="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"
-
-# atk used in libview
-# bundles unarr
-DEPEND="
-	dev-libs/atk
-	>=dev-libs/glib-2.44.0:2
-	>=gui-libs/libhandy-1.0:1=
-	>=dev-libs/libxml2-2.5:2
-	sys-libs/zlib:=
-	>=x11-libs/gdk-pixbuf-2.40:2
-	>=x11-libs/gtk+-3.22.0:3[cups?,introspection?]
-	gnome-base/gsettings-desktop-schemas
-	>=x11-libs/cairo-1.10:=
-	>=app-text/poppler-0.76.0[cairo]
-	>=app-arch/libarchive-3.2.0
-	djvu? ( >=app-text/djvu-3.5.22:= )
-	dvi? (
-		>=app-text/libspectre-0.2:=
-		dev-libs/kpathsea:=
-		t1lib? ( >=media-libs/t1lib-5:= ) )
-	gstreamer? (
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0
-		media-libs/gst-plugins-good:1.0 )
-	gnome? ( gnome-base/gnome-desktop:3= )
-	gnome-keyring? ( >=app-crypt/libsecret-0.5 )
-	introspection? ( >=dev-libs/gobject-introspection-1:= )
-	nautilus? ( >=gnome-base/nautilus-3.28.0 )
-	postscript? ( >=app-text/libspectre-0.2:= )
-	spell? ( >=app-text/gspell-1.6.0:= )
-	tiff? ( >=media-libs/tiff-3.6:0= )
-	xps? ( >=app-text/libgxps-0.2.1:= )
-"
-RDEPEND="${DEPEND}
-	gnome-base/gvfs
-	gnome-base/librsvg
-	|| (
-		>=x11-themes/adwaita-icon-theme-2.17.1
-		>=x11-themes/hicolor-icon-theme-0.10
-	)
-"
-BDEPEND="
-	gtk-doc? ( >=dev-util/gtk-doc-1.33 )
-	app-text/docbook-xml-dtd:4.3
-	dev-libs/appstream-glib
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/40.0-internal-synctex.patch
-	"${FILESDIR}"/40.0-avoid-changing-soname.patch
-)
-
-src_prepare() {
-	default
-
-	# Do not depend on adwaita-icon-theme, bug #326855, #391859
-	# https://gitlab.freedesktop.org/xdg/default-icon-theme/issues/7
-	sed -i '/adwaita_icon_theme_dep/d' meson.build shell/meson.build || die
-
-	# https://gitlab.gnome.org/GNOME/evince/-/merge_requests/336
-	sed -i -e 's:T1_initLib:T1_InitLib:' meson.build || die
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dplatform=gnome
-
-		-Dviewer=true
-		-Dpreviewer=false
-		-Dthumbnailer=true
-		$(meson_use nsplugin browser_plugin)
-		$(meson_use nautilus)
-
-		-Dcomics=enabled
-		$(meson_feature djvu)
-		$(meson_feature dvi)
-		-Dpdf=enabled
-		$(meson_feature postscript ps)
-		$(meson_feature tiff)
-		$(meson_feature xps)
-
-		$(meson_use gtk-doc gtk_doc)
-		-Duser_doc=true
-		$(meson_use introspection)
-		-Ddbus=true
-		$(meson_feature gnome-keyring keyring)
-		$(meson_feature cups gtk_unix_print)
-		$(meson_feature gnome thumbnail_cache)
-		$(meson_feature gstreamer multimedia)
-		$(meson_feature spell gspell)
-
-		$(meson_feature t1lib)
-
-		-Dbrowser_plugin_dir="${EPREFIX}/usr/$(get_libdir)/nsbrowser/plugins"
-		-Dsystemduserunitdir="$(systemd_get_userunitdir)"
-
-	)
-	meson_src_configure
-}
-
-src_compile() {
-	meson_src_compile
-}
-
-src_test() {
-	meson_src_test
-}
-
-src_install() {
-	meson_src_install
-}
diff --git a/app-text/evince/evince-40.1-r1.ebuild b/app-text/evince/evince-40.1-r1.ebuild
index 34dc2484fd95..7c02693e334b 100644
--- a/app-text/evince/evince-40.1-r1.ebuild
+++ b/app-text/evince/evince-40.1-r1.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/evince/files/3.30.2-internal-synctex.patch b/app-text/evince/files/3.30.2-internal-synctex.patch
deleted file mode 100644
index 16ef50ecd60f..000000000000
--- a/app-text/evince/files/3.30.2-internal-synctex.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From a4a831f998d513c6d01394d9b106aa42faf60dd3 Mon Sep 17 00:00:00 2001
-From: Mart Raudsepp <leio@gentoo.org>
-Date: Sat, 23 Feb 2019 21:05:28 +0200
-Subject: [PATCH] build: always use internal synctex instead of automagically
-
-We don't have a separate synctex package and would have to pull in
-all of texlive-core; so instead of fixing the automagic use of it,
-just remove support for external synctex, as that's easier.
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 13bdd600..e5334319 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -539,7 +539,7 @@ GOBJECT_INTROSPECTION_CHECK([1.0])
- 
- dnl ================== libsynctex ===========================================
- 
--PKG_CHECK_MODULES(SYNCTEX, [synctex >= $SYNCTEX_REQUIRED], has_synctex=system, has_synctex=internal)
-+has_synctex=internal
- 
- dnl not found? use internal code copy.
- if test "x$has_synctex" = "xinternal"; then
--- 
-2.17.0
-
diff --git a/app-text/evince/files/40.0-avoid-changing-soname.patch b/app-text/evince/files/40.0-avoid-changing-soname.patch
deleted file mode 100644
index 6742d967b10c..000000000000
--- a/app-text/evince/files/40.0-avoid-changing-soname.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From ca4b7aaff690095971de96370317fdf1bcd3af8f Mon Sep 17 00:00:00 2001
-From: Kalev Lember <klember@redhat.com>
-Date: Fri, 26 Mar 2021 14:48:51 +0100
-Subject: [PATCH] Avoid changing soname
-
-Bumping the major version to 40 in commit
-288be740b5bbb59757db5038ab435ceb7a334dcf inadvertently changed the
-soname for shared libevdocument and libevview.
-
-Fix this by making the soname calculation independent from the project
-version as the library ABI hasn't actually changed.
----
- libdocument/meson.build | 2 +-
- libview/meson.build     | 2 +-
- meson.build             | 4 ++--
- 3 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/libdocument/meson.build b/libdocument/meson.build
-index 74fe2fb1..e09de7fc 100644
---- a/libdocument/meson.build
-+++ b/libdocument/meson.build
-@@ -138,7 +138,7 @@ cflags = [
- ]
- 
- libevdocument = shared_library(
--  'evdocument' + ev_major_version.to_string(),
-+  'evdocument3',
-   version: ev_document_version,
-   sources: sources + enum_sources + [version_header],
-   include_directories: top_inc,
-diff --git a/libview/meson.build b/libview/meson.build
-index 20179aff..74c86d51 100644
---- a/libview/meson.build
-+++ b/libview/meson.build
-@@ -82,7 +82,7 @@ if enable_multimedia
- endif
- 
- libevview = shared_library(
--  'evview' + ev_major_version.to_string(),
-+  'evview3',
-   version: ev_view_version,
-   sources: sources + marshal_sources + enum_sources,
-   include_directories: top_inc,
-diff --git a/meson.build b/meson.build
-index 1ed37e96..cafb9023 100644
---- a/meson.build
-+++ b/meson.build
-@@ -43,13 +43,13 @@ ev_document_version = '@0@.@1@.@2@'.format(ev_document_current, ev_document_revi
- ev_document_current_minus_age = ev_document_current - ev_document_age
- 
- # Libtool version of the view library
--ev_view_current = ev_major_version
-+ev_view_current = 3
- ev_view_revision = 0
- ev_view_age = 0
- ev_view_version = '@0@.@1@.@2@'.format(ev_view_current, ev_view_revision, ev_view_age)
- ev_view_current_minus_age = ev_view_current - ev_view_age
- 
--ev_api_version = '@0@.0'.format(ev_major_version)
-+ev_api_version = '3.0'
- 
- ev_include_subdir = join_paths(ev_name, ev_api_version)
- 
--- 
-GitLab
-
diff --git a/app-text/gnome-doc-utils/Manifest b/app-text/gnome-doc-utils/Manifest
index 1c3fc590f438..7c942ceb25d8 100644
--- a/app-text/gnome-doc-utils/Manifest
+++ b/app-text/gnome-doc-utils/Manifest
@@ -1,5 +1,5 @@
 AUX gnome-doc-utils-0.20.10-fix-out-of-tree-build.patch 2101 BLAKE2B f1970ffe2cf1d369ffc3f3a5a6abea2f04fb32cfdc54dde9052ef468c2a274db2318495c80ec1ef0048fb65df8209bacb86392d9ff594fdc60ea92ebb85584ab SHA512 25cff56b05bf4ec0ca55a6fcab1700bd6bec9f60a923e14607fd894bd9b63cd669a4e3e9b7bacc0480e040e393370be05f237ea21074cb439a3cf176be0dd78c
 DIST gnome-doc-utils-0.20.10-python3.patch 21576 BLAKE2B 487b2f7d3758d1df475178154ed92ee548c63fd492d59fb0c6cc3a75e6378ebe75e74e3bdc60b46a74ea0670ca77f9bbad279b625bb64d4cb8a432a869eb426b SHA512 500e952f12c1baae08a0f520ea7e08c09d20ee58c3ed5fdc5f6dd1b7a192d90f66de26956306ab685ef62298df9770af184c0f33b7d4e015023ef2129da351bf
 DIST gnome-doc-utils-0.20.10.tar.xz 526700 BLAKE2B 6019aa9b1d2c8153ddc1e6af589f79628ceafb6c14b0de5dc8f9ef518b5e626bbafdc2a4d93bfb70c6823ba0605a5abe899989e9f893c976d7a5fcd9c99a90dc SHA512 1cb5e3b9ca9e45e6c551801e9c9c4aac725c2ce85238c230a4c70b36c90419886b921d8dd464df0643fc3bbb877df075abaa83a36d1609c5664960c31e11d151
-EBUILD gnome-doc-utils-0.20.10-r2.ebuild 1924 BLAKE2B 15ed597dc47ae7a5fbcd46991dfeeb3097d6b3e7e2c7b5707f72cf0c7c7752a6dfe996fd9dba7c5bb3f1eb117c069360f64221171f5c6d199758e757cdbe11e1 SHA512 b423ec742e42357bd045630cc7c630cb505a4d4594599f9d3374339d51f86758660d353ad2a832f5aa44d5b3e68243cea112cacd851582c5b3ad8b3368e64287
+EBUILD gnome-doc-utils-0.20.10-r2.ebuild 1931 BLAKE2B c95eeb62b7a449dc86f22a621e538f109705ccf202cd34c4bf25379d86af454667744d0cae92f82df629a719d678ec858feb95008cf6ba7697e87f56a4322d98 SHA512 dd7ce0df21b6c20fb88a09737f7b9ec36c59fa576c457f2e0a9e8f14c394498193140f3506e9c783350dbdf4796738ba40a16c1bbc7bade5049f44da19d0712e
 MISC metadata.xml 259 BLAKE2B 32f8c5208a55a1dda504b7df969127393a2c70e672aba383fcdc870de8fe778366d3dde3c3313bd043068d2e7831d1e18bad6fb428e82266fc2a630104e0a193 SHA512 fbef629394690b3a5608abc6344816f6acf1e8e2663f29949fd14a662c628f16fee77a1ec1641066806d143fb94c1571bc5b46b829dc53620af6956377fe15cc
diff --git a/app-text/gnome-doc-utils/gnome-doc-utils-0.20.10-r2.ebuild b/app-text/gnome-doc-utils/gnome-doc-utils-0.20.10-r2.ebuild
index d4447989d81b..4a2508c9489f 100644
--- a/app-text/gnome-doc-utils/gnome-doc-utils-0.20.10-r2.ebuild
+++ b/app-text/gnome-doc-utils/gnome-doc-utils-0.20.10-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI+=" https://dev.gentoo.org/~juippis/distfiles/tmp/gnome-doc-utils-0.20.10
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/app-text/groonga-normalizer-mysql/Manifest b/app-text/groonga-normalizer-mysql/Manifest
index 8a36c326296a..130ca9e9fb8c 100644
--- a/app-text/groonga-normalizer-mysql/Manifest
+++ b/app-text/groonga-normalizer-mysql/Manifest
@@ -1,3 +1,3 @@
 DIST groonga-normalizer-mysql-1.1.1.tar.gz 548788 BLAKE2B c2f06ffa4aaf52266dabf1397d592b772a10a45fe8b9184ffb7fc5f30a8db3c81011c19a80d3d14a228ea47b4b6ba21b7ab7f81e283533beef4596065d0c4b6b SHA512 40686a50133149b614057907c58f5b37d596fcaf697b4a6f3e68b776ac8c728cdd4c8a6e7c5676fe92ff96a4358b623f2b3740f6b72d317f1650c006cfb34369
-EBUILD groonga-normalizer-mysql-1.1.1.ebuild 670 BLAKE2B 862f37e2d473ab0ab79840015579ce6c543600cc01af198d31b12957479ef99c4e8cfbc4b7bee3184e92b8e515fb5df9c6de0bc1638a43e73bb47da63e3d84c9 SHA512 1ca087f80bb60dc1235eef772a4a1950904dec3d495b317414324ef9a19d6105ec9a4f5eead5670d12d12c0c86443496be9aa4227e405723d6cec147205c6278
+EBUILD groonga-normalizer-mysql-1.1.1.ebuild 683 BLAKE2B 827d3a2d18c44f0e7d2e14c7a9adbc2053e33bee4a211372789d950639fbe01895382343bc429ae75e77f5136cb16433d45d7f759113396db097088f456f7131 SHA512 b69be880d2e87f8a92f2ebdf38d0e07d186f9b1db96e510b70c723be83dd5054a3fc7560bd767fcc93d9ee114af203e185d387dcd1dc4b977e112f5fe0393daf
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-text/groonga-normalizer-mysql/groonga-normalizer-mysql-1.1.1.ebuild b/app-text/groonga-normalizer-mysql/groonga-normalizer-mysql-1.1.1.ebuild
index b6a789075490..86f8be4f031a 100644
--- a/app-text/groonga-normalizer-mysql/groonga-normalizer-mysql-1.1.1.ebuild
+++ b/app-text/groonga-normalizer-mysql/groonga-normalizer-mysql-1.1.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit autotools ltprune
+inherit autotools
 
 DESCRIPTION="Groonga plugin that provides MySQL compatible normalizers"
 HOMEPAGE="https://groonga.org/"
@@ -31,6 +31,6 @@ src_configure() {
 src_install() {
 	default
 
-	prune_libtool_files
+	find "${ED}" -name '*.la' -delete || die
 	rm -r "${D}usr/share/doc/${PN}" || die
 }
diff --git a/app-text/gspell/Manifest b/app-text/gspell/Manifest
index 68d2041adde5..0c0d2a02e5ad 100644
--- a/app-text/gspell/Manifest
+++ b/app-text/gspell/Manifest
@@ -1,5 +1,3 @@
-DIST gspell-1.8.4.tar.xz 424356 BLAKE2B 031787c4f5c3f3cfe21d5f74ec72117818da43313c5e6dffb79581ca07033aede2ecf236ffdf2197938d62727c5bd3913d1362e02be7109b0d498304949e1d44 SHA512 adb481590442d81040151746c7747791d76248b1b35af1702dc5389efbd2e0c6bdda070b8e84384d22f4922b5a382ac2c6519e425f417ec85c8efbe22dc38c82
 DIST gspell-1.9.1.tar.xz 424252 BLAKE2B 436e6af50f7d1058dd7692c22b5a5e18c25cc76ea6816193e48728f7e1d55ef29af26127403a40d594a2125e4d3e1ee889abe067d2c065de74ae95ca431e5fbe SHA512 72f1fb384e02bb73397b457c3e8a7b98393c9fab5c0dad07f84d1db3f6b75c093663cc83c13fefe868424c503abc2fb89c8b045d0495dd43ddcedad025f23bca
-EBUILD gspell-1.8.4.ebuild 1477 BLAKE2B 1f646c4fbff986066b6ac3304082a6fd724dbec71bcec313d17039c2d0849f9ef7ee1679c633d8dc98b38dfe12db10358f76a1d5bd93bdff34ceaa6714fc4e36 SHA512 464249fffd2f300ccccd0f59443010b132328bec054863760a097816a100588a83af5df29162351c2ce37315ceb9d3ecc034d1501245b0441a404811b98d82df
-EBUILD gspell-1.9.1.ebuild 1494 BLAKE2B 483fe7669a997593be8d71cb5b4f102ea1215b2954a3cee23cb337a5f316619cc51e9842ff07130d8635da6606495ea6e6fc35cb7af39a8eb7c05c3778c6b223 SHA512 becd98408567af2b1287980cc1d7578415938175e2977436daccf25614a5705824e5066f7e28945bcb8cfa654e32f3ef1764fcb722c95686852a9c465ea36927
+EBUILD gspell-1.9.1.ebuild 1491 BLAKE2B 1451fb6f626d5b5a2d868ce41b931ec5f2c06e3f8b058444735b608425b89fd9c56c5d2d2b4e812935bcc98cb0efc5fb55ae38a5125353da8893da683dddeddc SHA512 2151c268607ef4ee5ae91a549d09764ce7eea36a471002e301a662231b44c57a03d2cfaf74b8ccf2e16726109e8e6f5ed3d153f7ba7c5398863ede4f379bf479
 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
deleted file mode 100644
index 8c255e7c8d2c..000000000000
--- a/app-text/gspell/gspell-1.8.4.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-VALA_USE_DEPEND="vapigen"
-
-inherit gnome2 vala virtualx
-
-DESCRIPTION="Spell check library for GTK+ applications"
-HOMEPAGE="https://wiki.gnome.org/Projects/gspell"
-
-LICENSE="LGPL-2.1+"
-SLOT="0/2" # subslot = libgspell-1 soname version
-KEYWORDS="~alpha amd64 ~arm arm64 ~ppc ~ppc64 ~sparc x86"
-
-IUSE="+introspection +vala"
-REQUIRED_USE="vala? ( introspection )"
-
-RDEPEND="
-	app-text/iso-codes
-	>=app-text/enchant-2.1.3:2
-	>=dev-libs/glib-2.44:2
-	>=x11-libs/gtk+-3.20:3[introspection?]
-	introspection? ( >=dev-libs/gobject-introspection-1.42.0:= )
-"
-DEPEND="${RDEPEND}
-	dev-libs/libxml2:2
-	dev-util/glib-utils
-	>=dev-util/gtk-doc-am-1.25
-	>=sys-devel/gettext-0.19.6
-	virtual/pkgconfig
-	vala? ( $(vala_depend) )
-	test? ( app-text/enchant:2[hunspell]
-		|| (  app-dicts/myspell-en[l10n_en(+)] app-dicts/myspell-en[l10n_en-US(+)] ) )
-"
-# Tests require a en_US dictionary and fail with deprecated enchant aspell backend:
-# So enchant[hunspell] + myspell-en ensure they pass (hunspell is ordered before aspell),
-# however a different backend like hspell or nuspell + their en_US dict might be fine too,
-# but we don't support them at this time (2020-04-12) in enchant:2
-
-src_prepare() {
-	use vala && vala_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		$(use_enable introspection) \
-		$(use_enable vala)
-}
-
-src_test() {
-	virtx emake check
-}
diff --git a/app-text/gspell/gspell-1.9.1.ebuild b/app-text/gspell/gspell-1.9.1.ebuild
index a2a1f1502ecf..f754d7d1f1f6 100644
--- a/app-text/gspell/gspell-1.9.1.ebuild
+++ b/app-text/gspell/gspell-1.9.1.ebuild
@@ -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/gtranslator/Manifest b/app-text/gtranslator/Manifest
index 0f422709885a..e16fdb27d4aa 100644
--- a/app-text/gtranslator/Manifest
+++ b/app-text/gtranslator/Manifest
@@ -1,5 +1,3 @@
-DIST gtranslator-3.36.0.tar.xz 2121776 BLAKE2B 745ae74a9a1a47af609b30712f5e6e99474081da9136cc15ecf0bd121e0dd01d326574466ddf4551df7255247a6a895dd468b085cee91735fe8883e4feb16c97 SHA512 63393a33db031ea549763113d6bc55cd00c081e671a31654d225968d8d31d671ca7e577b4df8336603fe2c769c5c443e9ebf69d558c888438d194a503e044044
 DIST gtranslator-40.0.tar.xz 1509940 BLAKE2B dbf4c4a8765167177959c058b29563a2c3190e103a9f462a976bfc416c7cd995c649b549a40aa6f7c9b26502c5d56f3e4252a52919de979167f7adb5381604fc SHA512 214c5360ada6c98e9e7cd6a653bdc9a1dc5dd6cca995295369f8f9aac7261680fa521f2d2528f275233479d55ef1b03ee9ddc4a4e734e27a25bb24172c855a47
-EBUILD gtranslator-3.36.0.ebuild 1047 BLAKE2B 078ac2c56e4a4cb779bbb195f4bf5a04735c18eb7e4cc3250ba2d2b2e2a5f456aa0688a20f3787a5c5e8a1b364ae8c06fdad7c4061f2a2e69e716c7120b75039 SHA512 5810d411679934605ac7b8285ff87abedd8eb1ad443392278d8fed50dda3557b8bbcc006abb614879d07c4ece98c5d9a4d7c87ec801ea5c748d17edc4be73fc2
-EBUILD gtranslator-40.0.ebuild 1084 BLAKE2B 1eb12502017a3f85c8e4e57b9f7e19aae744e12f26136de757977a2334922b6d7e001eda1997afbba088955934f76e13a798568974373b5a8448b314bc380634 SHA512 7867f37a94cc5e969596ede7c8f7bd2b75c381d4efae29788c6129f3b587ceba47f4cce86680630d37db35a2a12d974bfdc190a35f2515b1a1460293891679cc
+EBUILD gtranslator-40.0.ebuild 1082 BLAKE2B 43c21ae6404f66834f7c0d51fff3c0b185e391c14df85b459159a8de4b6cfbe05618dff11b28438882612e82e1ec83c1999a8ab31207845bf93977d2932a8c16 SHA512 530b34d6b13f54b5480f5819b6f3b776553c96e2455a41fd4b88c9c16795145d731679032f06aa1c772f5ce090d6e26cd4c7c0b417604d82c92b0e330550ec8d
 MISC metadata.xml 812 BLAKE2B 9a347a373b7b39cd522c7bcacd845252798a5b9b06cef89ce14b71160e6b6673d65d5d9eee806c52aa104dde2d937894cb0e12a8d51b8d53feecb4bd52bb3db2 SHA512 e9cab01e3126862ab79cd223d87ed3bb927844b6a0cd7a40e94dc6ece54a2e2c4fe820032b4dd3c25b876a6704c866f3429f5ad98d82b9893ba9337a3a85d6a4
diff --git a/app-text/gtranslator/gtranslator-3.36.0.ebuild b/app-text/gtranslator/gtranslator-3.36.0.ebuild
deleted file mode 100644
index 477aed96e1fa..000000000000
--- a/app-text/gtranslator/gtranslator-3.36.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome.org gnome2-utils meson xdg
-
-DESCRIPTION="GNOME Translation Editor"
-HOMEPAGE="https://wiki.gnome.org/Apps/Gtranslator"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="gtk-doc"
-
-RDEPEND="
-	>=dev-libs/glib-2.36.0:2
-	>=x11-libs/gtk+-3.22.20:3
-	>=dev-libs/libdazzle-3.33.90
-	gnome-extra/libgda:5=
-	gnome-base/gsettings-desktop-schemas
-	>=app-text/gspell-1.2.0:=
-	>=x11-libs/gtksourceview-4.0.2:4
-	>=dev-libs/libxml2-2.4.12:2
-	net-libs/libsoup:2.4
-	>=dev-libs/json-glib-1.2.0
-"
-DEPEND="${RDEPEND}
-	dev-libs/appstream-glib
-	dev-libs/libxml2:2
-	dev-util/glib-utils
-	gtk-doc? ( >=dev-util/gtk-doc-1.28
-		app-text/docbook-xml-dtd:4.1.2 )
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use gtk-doc gtk_doc)
-	)
-	meson_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/app-text/gtranslator/gtranslator-40.0.ebuild b/app-text/gtranslator/gtranslator-40.0.ebuild
index aaa8db2bfd1a..00fa6d54bb65 100644
--- a/app-text/gtranslator/gtranslator-40.0.ebuild
+++ b/app-text/gtranslator/gtranslator-40.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Gtranslator"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="gtk-doc"
 
 DEPEND="
diff --git a/app-text/iso-codes/Manifest b/app-text/iso-codes/Manifest
index 309d9f641df0..9accced14c5b 100644
--- a/app-text/iso-codes/Manifest
+++ b/app-text/iso-codes/Manifest
@@ -1,3 +1,3 @@
 DIST iso-codes-4.6.0.tar.gz 14089611 BLAKE2B 0e85ca49dd40ca053af4b06aca440e55c2b9bb2061fcdceaa25b31ac7fd7942a590756db90c10db64e5e1ffcedbce5a552e60a6d495bb9d60621bc7b862e630b SHA512 fcee802a3f92ef035371ff45fa9d8acbf1e2f490e38d84d2e27d2226d250ad02d088156d0889c0fc0fc09f30c4541b30dc7eb65ca4f40c3764599c1b2143013f
-EBUILD iso-codes-4.6.0.ebuild 2636 BLAKE2B 6ff8645817888c1af9b3ca06fbe1250867de884f2c83a9cda7d1387842bc90694146c64515a65e5f2bf5503e546f1ad0f75578129584f806b56c8483759a167b SHA512 0ab62c60e85ebe7a79f81c270ebdf1c81125560a3a262cf8639d03089f86ad84f079fd565f028613e6dcf78a67daadea1e10851cbe2df61fa496b1d301085d11
+EBUILD iso-codes-4.6.0.ebuild 2643 BLAKE2B 50322620c64da72be5b2945b89f68e0729e33dfc8c811fcd8eb4f98034d0a4d6c59db66cf57af9595483a1cd3a7765f6dabc554d5956419be98d231a4d1de7f0 SHA512 77dc64b9e6d2d16781061a2ad10cf4a42cf694decf4755d0970d4c6023d8c2f2cec43bb0513a89cb1a1613820f4c16b3e9fd8e73e16b21b5342fd6ec1fa84043
 MISC metadata.xml 480 BLAKE2B 3aefef945cb111095839e8fa8b84757e7f51a9aa8848806911d8c01763ab2d2f1d0c5b31c042f6ee307756e007893f6559c54d74a104caa612c9a6d39b2eea7e SHA512 5729ca31911ea7dad748e9f3afdd1f45f9034d783b56a75609101bfdb0a204bda8a078e7d251e89731091726062c4ac962e000ec7a898cb66ff787c8f2308d4c
diff --git a/app-text/iso-codes/iso-codes-4.6.0.ebuild b/app-text/iso-codes/iso-codes-4.6.0.ebuild
index 0ec9beee2ec4..5078155ea34f 100644
--- a/app-text/iso-codes/iso-codes-4.6.0.ebuild
+++ b/app-text/iso-codes/iso-codes-4.6.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 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 
 BDEPEND="${PYTHON_DEPS}
 	sys-devel/gettext
diff --git a/app-text/jabref/Manifest b/app-text/jabref/Manifest
index 181258215af9..7c7e5951c83e 100644
--- a/app-text/jabref/Manifest
+++ b/app-text/jabref/Manifest
@@ -1,3 +1,3 @@
 DIST JabRef-2.10-src.tar.bz2 16769469 BLAKE2B adb0acabd1872d5b9b054e8c4c7e85a0cf0425ad748408e248a66dceef7ba3eca0af8a8d2cc1ef0828bc930cab7e48e8f1800c8e55902af19b4827ae4480fe16 SHA512 72eee8fb08040fc7bfd395729d3c74f0a8841c90d5aa6e6e8d8e68ddcc1ffe1f6659a045aa951d51deffe266ee0b1ff844c4fdf36537d5463de6b361803bb942
-EBUILD jabref-2.10-r5.ebuild 1844 BLAKE2B 0e76e8392a4ceea776949ea002f8ba818ba038c4978c8e7e0c66b0a460e515c14a5972be28f92ed86634ea404701a2ce76faee015032fae85a83ba95b20861cb SHA512 c9454d62e0c8549eeded61ff5185c08ccbcb003833a146954580e78817e147c36729ebc96abb2291ea6f21798ae19a67543e6ff5a9967ea739372c5816601389
+EBUILD jabref-2.10-r6.ebuild 1998 BLAKE2B bdc1a0ed3328e781f096fdf6cbceca743b44adefd551386d05d6c2f2ffaae4640fc3f2ce42228f4928bbb51aa4e896d0248a97fb88823dcd605f1c12efedd533 SHA512 ed531c193206bbbd19313b5baafa9942db8e9a9fe9e05abfc12931ea9b23c430fe240875f889bbf9b3e9df8610a72e63740b730db5de9cf72c877ab13e8e0a65
 MISC metadata.xml 537 BLAKE2B 1aa32da69c977641a51f05b3e615d4cfb15d21912ab649b0db7f6a4b35daf5428225431533e97eca895253e4370dfd03baa60beaee4ee333a225df8942e715d4 SHA512 8478bf7312a365c4fce15051b0cedb465e92a274e215bcf989e744434ed93f568217f953cbaa07e9adfc5e620187d4ed4076d3201806bfe2df55ae8743bfaaa2
diff --git a/app-text/jabref/jabref-2.10-r5.ebuild b/app-text/jabref/jabref-2.10-r6.ebuild
index 094dfeeb4b5f..6a4ad2464020 100644
--- a/app-text/jabref/jabref-2.10-r5.ebuild
+++ b/app-text/jabref/jabref-2.10-r6.ebuild
@@ -10,7 +10,7 @@ inherit desktop java-pkg-2 java-ant-2 java-utils-2
 MY_PV="${PV/_beta/b}"
 
 DESCRIPTION="Java GUI for managing BibTeX and other bibliographies"
-HOMEPAGE="http://jabref.sourceforge.net/"
+HOMEPAGE="https://www.jabref.org/"
 SRC_URI="mirror://sourceforge/${PN}/JabRef-${MY_PV}-src.tar.bz2"
 
 LICENSE="GPL-2"
@@ -30,16 +30,23 @@ COMMON_DEP="
 	"
 
 DEPEND="
-	>=virtual/jdk-1.8:*
+	virtual/jdk:1.8
 	${COMMON_DEP}"
 
 RDEPEND="
-	>=virtual/jre-1.8:*
+	virtual/jre:1.8
 	${COMMON_DEP}"
 
 S="${WORKDIR}/${PN}-${MY_PV}"
 
-java_prepare() {
+src_prepare() {
+	default
+
+	# If we cleanup it complains about missing jarbundler
+	# BUILD FAILED
+	# taskdef class net.sourceforge.jarbundler.JarBundler cannot be found
+#	java-pkg_clean
+
 	# Remove bundled dependencies.
 	rm lib/antlr*.jar || die
 	rm lib/fontbox*.jar || die
diff --git a/app-text/krop/Manifest b/app-text/krop/Manifest
index 96f6942ab5c0..5f218dc31775 100644
--- a/app-text/krop/Manifest
+++ b/app-text/krop/Manifest
@@ -1,4 +1,4 @@
 DIST krop-0.6.0.tar.gz 48331 BLAKE2B ca6a00a410ed4e18a401fab3a21bc49c86f73165f68b192ab83c8fad74111ba9a9941f464a2646faa5a3317bbb45cdc89bed19c901999c0b11db353ac2997a65 SHA512 51a988e4fcb65d11cc26cf5b0c808e79097a66ef8ec4751a6c051289cd77b3328ebc8ecd9829adc466f87330beb8bc715d290cc20be415a7b8f179378b7bcb4f
-EBUILD krop-0.6.0.ebuild 944 BLAKE2B fc2440fb8b3fafe8c9363dfbfa3aa14dfc93f85c1f108a94bb09fb0608967f7e9d614a1c5f514072f40e4e04147fbd47e8885cd3afca98b2c5922d1d5739ce48 SHA512 8d66fe580963dc03d0ce6e8651a3c694d503981b394c6c9bcd30a2a73be9b5f47b0d57daeb3a4422c83efe6f894f2f4a9938c3c1f471a912934583317c57db42
-EBUILD krop-9999.ebuild 945 BLAKE2B 86a5fb97c930fbadff98917e884e74e4974a42a3babbe8e37f3af2649c142c3904eef7b39aec1f5dbd3d1386eb085c27973f3106a9d23b2ec418ba3f26ae4722 SHA512 24a0ae2c9083b3df7aa733e25a7dbf051dc9488bbd165f03f1ea0051081cadef4def3099b2ee8fb3d7c06bc49c52c495018dc556eeddfd93484aa1a71ae33e03
+EBUILD krop-0.6.0-r1.ebuild 946 BLAKE2B 9a19b27762bcdeca0d6cefecb93abe57f1bb87d01a437e3d83554827bf3656da72b4478e1663f4a1251c09d9488bbb1640281c7a3aa7f001fd5a317a05edbae4 SHA512 79763059ace73cc10389fde4d43751f1aac032b0395751ee9f4438e3e6e02863366be3ca3b52885d7cba47e6265b724b834c5f9072d6b4ff22f46925028c5f74
+EBUILD krop-9999.ebuild 947 BLAKE2B 131f959514e4380a67193718148715f96ef26e3078d7635216f6b1bf5998bba5ebbf398b2583167af9bb0669de4d431800d91630415043a6998c39fd45d39b2a SHA512 16b994a95fc62fe6aa889570b1b6cc9c76c8d1f4ccb230d1253adef7096093870ef76b62016f08a7a1936cc2a7137ca16ab3ecdfb364b287b5ca0519a3d50d71
 MISC metadata.xml 333 BLAKE2B b62d23170b13a4d2375de72955c2708368a34435f022231b829b19b60c9f38a1546ec62887dae545691eb1df45998ab7810aa58df3b94729632991e49c4c098f SHA512 30ec13878bbe3b50c90f1849bbc5bf0f8dc05bf1b6a8f79695590f48c76618eef4666965b8130d1909db3c960a43d3149dba525017f342ce9635afc530b873f0
diff --git a/app-text/krop/krop-0.6.0.ebuild b/app-text/krop/krop-0.6.0-r1.ebuild
index 7c6a20c2e0ea..6085c6264fb8 100644
--- a/app-text/krop/krop-0.6.0.ebuild
+++ b/app-text/krop/krop-0.6.0-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit desktop distutils-r1 xdg-utils
diff --git a/app-text/krop/krop-9999.ebuild b/app-text/krop/krop-9999.ebuild
index df73d05761af..71df1f4d3c20 100644
--- a/app-text/krop/krop-9999.ebuild
+++ b/app-text/krop/krop-9999.ebuild
@@ -1,8 +1,8 @@
-# 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_COMPAT=( python3_{7,8,9} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit desktop distutils-r1 xdg-utils
diff --git a/app-text/openpaperwork-core/Manifest b/app-text/openpaperwork-core/Manifest
index 8e4f1131627b..b7600729f404 100644
--- a/app-text/openpaperwork-core/Manifest
+++ b/app-text/openpaperwork-core/Manifest
@@ -1,3 +1,5 @@
 DIST openpaperwork-core-2.0.2.tar.gz 67268 BLAKE2B 85fcd8d4e1c8a054267b28eb5ec826617e13f93bf7cd54d6defffd62be65fb0306a0ae4fadb1cc8e875c23933c3559e41aab46b58a333489fed0174776ede597 SHA512 fb47d1d8b7747274a6b60248180786f4142110feffa1a8f886b0486a1e1cefbe11d06e3ec1f3a3ee33e38cd40d8e7460afefb466ee938e847deb2518d642ed00
+DIST openpaperwork-core-2.0.3.tar.gz 82231 BLAKE2B d113324f5f0f03d0a7c1c9f28bc4bdfa8dc296104f4f7aef4f172ba9ff94bc02caad928aa3db0f314df64935052b6dc4995b8d6e78e2c33367b080321414f40d SHA512 613e1b07b0ef4be3a429cc88f1fed41d1d79adab0cad70ee4e1d74c06cb8917c7fc6f8d2ffca5fcc95f97fb5c0690cdc21aa5cf7966e19cfb5ae5d2ab0fec6f3
 EBUILD openpaperwork-core-2.0.2.ebuild 491 BLAKE2B 9c2f7ecde6a10693a0f7496ce60a4ee721fb987dff963d7a638b1b26f471de31a1d3dc2dc936ed5ff122fa574596b12b51f37cfe91aa05833ae83c0732ab1e01 SHA512 1f68412e29852a2abd6f62907735e813757f1efecbcec7b3575b669e3ba56a49345d1fb846190c3cde642e6e9088a8b3b7456dcef0770580bd692746f0cf9f93
+EBUILD openpaperwork-core-2.0.3.ebuild 491 BLAKE2B 9c2f7ecde6a10693a0f7496ce60a4ee721fb987dff963d7a638b1b26f471de31a1d3dc2dc936ed5ff122fa574596b12b51f37cfe91aa05833ae83c0732ab1e01 SHA512 1f68412e29852a2abd6f62907735e813757f1efecbcec7b3575b669e3ba56a49345d1fb846190c3cde642e6e9088a8b3b7456dcef0770580bd692746f0cf9f93
 MISC metadata.xml 343 BLAKE2B 3b3ef7b9f3c0aff87d5f7f743a17d16a160ce7e03a21ad0f9e61127e591e0dce9a2a9b9483e04ad56779c7c848c5ffcf1f62ba06edd6780b9263fe066ecf6b65 SHA512 8c2967efd1bb4b024bc97b76fb4e3b92a01b08c82e12b5f86015eeadba7a22d5ceea1c9219d7517f79469308afd62e2cae20930931d918afb3b45dfc6400f8ef
diff --git a/app-text/openpaperwork-core/openpaperwork-core-2.0.3.ebuild b/app-text/openpaperwork-core/openpaperwork-core-2.0.3.ebuild
new file mode 100644
index 000000000000..eea70cb44815
--- /dev/null
+++ b/app-text/openpaperwork-core/openpaperwork-core-2.0.3.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+DISTUTILS_USE_SETUPTOOLS=bdepend
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Core part of Paperwork (plugin management)"
+HOMEPAGE="https://gitlab.gnome.org/World/OpenPaperwork"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-python/distro[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/app-text/openpaperwork-gtk/Manifest b/app-text/openpaperwork-gtk/Manifest
index 9f409113a2e5..c451613f35da 100644
--- a/app-text/openpaperwork-gtk/Manifest
+++ b/app-text/openpaperwork-gtk/Manifest
@@ -1,3 +1,5 @@
 DIST openpaperwork-gtk-2.0.2.tar.gz 37740 BLAKE2B 40e1570364dd23cda97184211205186dadf7826624c1d8846a7fb31378fdf0ea9aa715c07adbf657eea9b08f4c583d86eb248b8907317b572bea51ac52c9a54b SHA512 c24f19a47f1ea1452f8efcf5cf1e4492f49a4f1c7fa7572f09341f4a8f70c2e9cfea478c32635d4ad998be90a069a55c4fe2a4c0e12a9835b9fa7e6b707494d7
+DIST openpaperwork-gtk-2.0.3.tar.gz 50590 BLAKE2B 69fd8b9b6b964a375e511dd7ef535a8fea58e6183165a4b7b96239a6a35486f791ca9fc8aced7a5b84cc21cc1ccab12c114276de87e1d1cf55b2565dc44da7fc SHA512 8da5651b7d949dfb4fa32ef84760530bba6d718674e6616ae80d1a274ae51cf5e28a55f7e08fc34e4681f61de8aef9d2094f2c4aa4862f8989b7c81da47e48c8
 EBUILD openpaperwork-gtk-2.0.2.ebuild 578 BLAKE2B 7daf9f8ef3265a47c0e9372c0427c21ae6f60d8493557979584a5b2f90bc1da6f4a93189801a9e9d44b40b9ee50624d52be53f9eefd2782b5a7b303e5a2bc1f2 SHA512 9462ee2ffcb3ceaae642934effffcb2437af109cc993ec0a65918d0ce90d36815845858d279788c43dc10e39dbfb0c139b7edffe977aafef5826354fad859400
+EBUILD openpaperwork-gtk-2.0.3.ebuild 578 BLAKE2B 7daf9f8ef3265a47c0e9372c0427c21ae6f60d8493557979584a5b2f90bc1da6f4a93189801a9e9d44b40b9ee50624d52be53f9eefd2782b5a7b303e5a2bc1f2 SHA512 9462ee2ffcb3ceaae642934effffcb2437af109cc993ec0a65918d0ce90d36815845858d279788c43dc10e39dbfb0c139b7edffe977aafef5826354fad859400
 MISC metadata.xml 342 BLAKE2B dba2557bfd27cb470cdb5a6c4cbdb2b444a02b3f9dd28186075075a31613f33c2f308657c6908060a20967c569a5c2c310fd99ef83d2a2762b4df01bffa4258d SHA512 25e1a179c9d45ca0a587fd60bcd77d05b66b20aa001ed0f45c2163b2f224b486ac337af7bcc3cc2aca4c3a236fe0f7984e02fc2089004062182df69ca33ecc07
diff --git a/app-text/openpaperwork-gtk/openpaperwork-gtk-2.0.3.ebuild b/app-text/openpaperwork-gtk/openpaperwork-gtk-2.0.3.ebuild
new file mode 100644
index 000000000000..5bf52d2c9f69
--- /dev/null
+++ b/app-text/openpaperwork-gtk/openpaperwork-gtk-2.0.3.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+DISTUTILS_USE_SETUPTOOLS=bdepend
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Paperwork plugins"
+HOMEPAGE="https://gitlab.gnome.org/World/OpenPaperwork"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/pycairo[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	x11-libs/gtk+:3[introspection]"
+DEPEND="${RDEPEND}"
diff --git a/app-text/opensp/Manifest b/app-text/opensp/Manifest
index feb2d4479baf..7cf0bc1d26f6 100644
--- a/app-text/opensp/Manifest
+++ b/app-text/opensp/Manifest
@@ -2,6 +2,6 @@ AUX opensp-1.5-gcc34.patch 263 BLAKE2B f881932f2d35c87a13b28608efe853c54e3dd4608
 AUX opensp-1.5.2-c11-using.patch 2626 BLAKE2B 16ff8ba1701831fa0c87e0788f8b420f1d96bf5b2f645d2d6706e82ae1767a99fed8f6ca4bd4f1abbc24bf80c4fa00d848f03056b01ac98f5b8a74d3a78c4467 SHA512 dea5fe17ea2662150b201ab6011bb01ba0f0c07689d267ec4086a914cefef3e91967f8db4be0258bac87d3cd73a9b05eb1f879415860552d9853e66e98e16e11
 AUX opensp-1.5.2-fix-segfault.patch 747 BLAKE2B 544dbb8a638d2fc8fed5c7426e828d1524f4756e6882ac837b4cf3deab4e039a0b66564431b1849d9067f6071955f82b8057cde5168094da70b1419844b000fe SHA512 e0c72df8e8b191c6cecabcac550cc52918bbff7c2fddf8099ff4403de0fe817c1f3f5deb44b4c33e9d135a97a4fd8978c4090f6740c99dbadc6f9b06e24c41cf
 DIST OpenSP-1.5.2.tar.gz 1521390 BLAKE2B 2c6f8dfc721c77ab223aa67e90c8dfb45855b74fdd382ac98303c6fb23af08019ca96b5430bcdb87b9e86fc333114bd8b2e5f243c87f2cf84ee04c880c8c309b SHA512 a7dcc246ba7f58969ecd6d107c7b82dede811e65f375b7aa3e683621f2c6ff3e7dccefdd79098fcadad6cca8bb94c2933c63f4701be2c002f9a56f1bbe6b047e
-EBUILD opensp-1.5.2-r3.ebuild 1997 BLAKE2B fb86230e25fcfb1da28cb366330c7e002ccf63f7c09ba29521733277f92e1d6b2883e6ddacffa75a319f81971db674568c389e5ebc419ba8b5cf5b80364a7fbf SHA512 a02ce69196eaa5f517baebce96ae0e4156d806611122e78571c1eeb01eac7312b8ae19d31652ca81b4130faa3853e6d5e86a4c651e54fbd779813c1d8a99def9
-EBUILD opensp-1.5.2-r6.ebuild 2089 BLAKE2B a13a6fa5c43f2f4837c3b719be27f646eed911d3b4e61eb2a2620a34b16b0b24d9ffc09847997fa516e70e0b589beffc451cf5f7b5c048bca1271a96a1dcde0f SHA512 b8147e133e54c00b1fbe68572597e1c8e483b431411768614928fd1223c80d1fa81d0347fc0e7a947da6602a085c4f7e7eb9b59519f0ce6e3d037d9967d9c260
+EBUILD opensp-1.5.2-r3.ebuild 2010 BLAKE2B ee4008fff75f756f431bf13d49cd26e079b21aff80b5eb12d5644899bb691fe9fa5e4d1050c4541db7be49ff3c4083fe7b25f1c6c3e9414787cbf055658d1383 SHA512 e076ab203bb3f86f15647a85c99dafe128f6ad46aba9d4ace4b89c96b2647ee91af3f1f50b7f595a8ea23d960eb9ee9c00bc87752412f7f5e8e7c52e064e0725
+EBUILD opensp-1.5.2-r6.ebuild 2102 BLAKE2B 3f651da075538b68d1a71ba104199416d25479780147ee05cfeff305ae8ea3ea768017f1ba5adad23a9aec88289eee3caf48030b16417b8b442e32e2bd2104e8 SHA512 2666abd2946ede1881d9b09492dcb9620696a88f07a827337a1929994633e317063692ef85f6674b57a39adbdbe4925a1fc98cad5b3704418d8de2dd7d5b0258
 MISC metadata.xml 320 BLAKE2B b93835e4e002171464888c0ad80df13fa041436cd16525da0bac6087af3013b8c43bbcc2a12e6924894ea65ef141c6e739ca38f914af7e83910b85a4f6700547 SHA512 8614ddb85153854eee8f3a61e308a4590b17bd457f1dcc813fdad1f69265a06f4f74295a608538fcee757e147af9b269adf3d0dafc0e613a936e5e605bedacf4
diff --git a/app-text/opensp/opensp-1.5.2-r3.ebuild b/app-text/opensp/opensp-1.5.2-r3.ebuild
index 79b03eac29a5..805de75745c2 100644
--- a/app-text/opensp/opensp-1.5.2-r3.ebuild
+++ b/app-text/opensp/opensp-1.5.2-r3.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-inherit epatch flag-o-matic ltprune
+inherit epatch flag-o-matic
 
 MY_P=${P/opensp/OpenSP}
 
@@ -73,7 +73,7 @@ src_install() {
 		pkgdocdir="${EPREFIX}"/usr/share/doc/${PF} \
 		install
 
-	prune_libtool_files
+	find "${ED}" -name '*.la' -delete || die
 
 	dodoc AUTHORS BUGS ChangeLog NEWS README
 }
diff --git a/app-text/opensp/opensp-1.5.2-r6.ebuild b/app-text/opensp/opensp-1.5.2-r6.ebuild
index ea411e191909..97aa575d2dc3 100644
--- a/app-text/opensp/opensp-1.5.2-r6.ebuild
+++ b/app-text/opensp/opensp-1.5.2-r6.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-inherit epatch flag-o-matic autotools ltprune
+inherit epatch flag-o-matic autotools
 
 MY_P=${P/opensp/OpenSP}
 
@@ -75,7 +75,7 @@ src_install() {
 		pkgdocdir="${EPREFIX}"/usr/share/doc/${PF} \
 		install
 
-	prune_libtool_files
+	find "${ED}" -name '*.la' -delete || die
 
 	dodoc AUTHORS BUGS ChangeLog NEWS README
 }
diff --git a/app-text/paperwork-backend/Manifest b/app-text/paperwork-backend/Manifest
index fef5d2babbb7..29c93f63de14 100644
--- a/app-text/paperwork-backend/Manifest
+++ b/app-text/paperwork-backend/Manifest
@@ -1,3 +1,5 @@
 DIST paperwork-backend-2.0.2.tar.gz 1293642 BLAKE2B 3785f69e941c14c1146ff1c9a5afa149559821f915ff1068b38f94c3fc3fbd591c2144f24070232e885b616eeb88b5dd1a7c86d608d9ad42f6512688db79b1fe SHA512 36261b89078e7ca10ddda3ad03871db34931d8a04f16edd663873a2f7c46b527bd607c27d0f4ff005ed869c16e0b7065992e629e257677b46d5ccb4b9a1dc7b2
+DIST paperwork-backend-2.0.3.tar.gz 1315449 BLAKE2B b5f788d1f3dd02ae9693ffbde6909fb343d5d68555c2d7225300371d545fc96550a34d5214b7b68594e6c5558aad6c50b38de26e444a7a2ca4f9318a7fbc4c84 SHA512 ed705910a09aedc124d6f14c1fd6d76d5e3790d2d01363bcea3cbb28955c1a08725276f09828ce1e286df06d7310b78630b95201146940d1680395c6420190a6
 EBUILD paperwork-backend-2.0.2-r1.ebuild 967 BLAKE2B 02d46b13c45a45c4b67fe811bed5b79fc9b3ebc89723db821a67d26b2224bf91dad806652fa2a99f558ddcf045525279ff9e5a2f3fb903a1c07b62cd49003995 SHA512 4f0bba571dbdfa8443303bcbd5148480bfa900b415baef8b1698af2f62bcc2268827816abb25b122b960fee955898a26429eee22cef99245930fd06ae1b5d119
+EBUILD paperwork-backend-2.0.3.ebuild 966 BLAKE2B 031fa22522183602901ef701f4f917da55d622d2ba5fd45549c848fc8bf624bcec5e5d90347f06e47ff60e96dd07b7b65c5c2673c24dbe785f0a78017d220602 SHA512 84237765d3e21a2eb6cca39b4cba61d5721be97d9de40a7487508f84e7b03b14a36e8cf9438229f0688d0d41926049abe72e5e6a4ee87251ea36f080b6b7aa08
 MISC metadata.xml 342 BLAKE2B a73c59727e066a3ffa217b622c58343a42d34351791f6619aa94d1a659b9d43ccbdfc9682901fb074c876a3e66b19403c02657aac3956502f400a93bd73ba6b9 SHA512 5a3a63678f9d83107a83c1bc6e4181544627279e89b3b589fcd2b745221dddb0201779f7b8c3ec1d7b2812a92ec7ad8d290ba58c11860f46f3c5329840bf1730
diff --git a/app-text/paperwork-backend/paperwork-backend-2.0.3.ebuild b/app-text/paperwork-backend/paperwork-backend-2.0.3.ebuild
new file mode 100644
index 000000000000..111e95df603f
--- /dev/null
+++ b/app-text/paperwork-backend/paperwork-backend-2.0.3.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+DISTUTILS_USE_SETUPTOOLS=bdepend
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Backend part of Paperwork (Python API, no UI)"
+HOMEPAGE="https://gitlab.gnome.org/World/OpenPaperwork"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="app-text/poppler[introspection]
+	dev-python/distro[${PYTHON_USEDEP}]
+	dev-python/natsort[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]
+	dev-python/pycairo[${PYTHON_USEDEP}]
+	dev-python/pycountry[${PYTHON_USEDEP}]
+	dev-python/pyenchant[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	dev-python/python-levenshtein[${PYTHON_USEDEP}]
+	dev-python/termcolor[${PYTHON_USEDEP}]
+	dev-python/whoosh[${PYTHON_USEDEP}]
+	sci-libs/scikit-learn[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/app-text/paperwork/Manifest b/app-text/paperwork/Manifest
index 6ee27a9a1f13..9772f2d0b73c 100644
--- a/app-text/paperwork/Manifest
+++ b/app-text/paperwork/Manifest
@@ -1,3 +1,6 @@
+AUX paperwork-2.0.3-desktop_file.patch 604 BLAKE2B 7c7a4b8a7fbae4b7d9813b2e5c10edea33a796fdf4cd675d2842f73390e03e5be936c0dc7fc230b06322448791160843bcdacc303b417a12f08081a12cd33696 SHA512 f43469849e1c7926047c515650dfcf417af201457cc872127776665e36e16bbdcf7ad972c370c0bef4ddb1957ae24d1eac49a5f99a0cd56ca9788d6824fb3021
 DIST paperwork-2.0.2.tar.gz 6222075 BLAKE2B 6dba798ae2b18ba81891c8f9c29e1e2bc8670f24a65e554aa169f05fbf1a89382b9ea24abaa1784da657ac5b9d9d145ffbadaff86ddc3583023f164ffb40c351 SHA512 bde28c167eac5b134b4bdf0f2ac8d93eca4f99c1881ca0edc105c33674114b3a4e3508a1f45048f45ce1c2f6b690a0f765c1b980dbe42c7e1282172f12c3a853
+DIST paperwork-2.0.3.tar.gz 6224520 BLAKE2B 099d76893b0b89e5f7914456ec31346f28335333361a4528efed6ab4c596fa24893d375557d6c1e89f7c83f4a1acac161004138b7e1537aa2f3cb2de0460bcc3 SHA512 d5cf30ef8a6011817947c9878d4defe93a0c82f77562fd707c198d944657db754ba57d703ae3f931ac9e2d7f9f1eb7f9f9093a1d26f25dac0e336b03f9b25ed3
 EBUILD paperwork-2.0.2.ebuild 1026 BLAKE2B b9b3e3cd09c0b0575b566119dac1f192044b958c1bfd6e4ec16a588babab28617c3ca23dd3dca7b9e0e4a5efb5355a2315f8d246394b8a12fff02f427097681a SHA512 5814f5c4c2e96fb2fb2204f1423426577b8032f3e536bed454f26f89a6f4abb368305e41eb0d531df776751c0aa9551aa65bcd0c6c32808efff84d2d5cf346f6
+EBUILD paperwork-2.0.3.ebuild 1288 BLAKE2B 334f807727117b11e035a83240cfb6dddfe3db7a9298a189e47e308cebb5559ec3c4745404049323096c3128ad545f0292ab81b530a14ca771cd0ce44cc9ae29 SHA512 0bf82bcb3b9988b5d7b15916abaaa67ad368fdcce31e1721a572fd6753e65924bb59e942f9072aec8030768d98717598cf08e398d758a32e728cbd864a47ad24
 MISC metadata.xml 719 BLAKE2B c97e258d05155df5380f08accfa9736ce44514ef9fa9b0fd0a4d5966a48df7ae940902ce929893ffb828f30883c4591c93a2bc5c8ca0c7a6f636e477e8f52eae SHA512 a36e28273a451c529451602b80ec70bca26d2db40a683e6fc7297db185c88696cc359c3f80951ff9580e81e7e221379913f7d1db3af3d00fb02128e1994e7f4d
diff --git a/app-text/paperwork/files/paperwork-2.0.3-desktop_file.patch b/app-text/paperwork/files/paperwork-2.0.3-desktop_file.patch
new file mode 100644
index 000000000000..0fbad956449a
--- /dev/null
+++ b/app-text/paperwork/files/paperwork-2.0.3-desktop_file.patch
@@ -0,0 +1,12 @@
+diff -Naur paperwork-2.0.3.orig/src/paperwork_gtk/cmd/install.py paperwork-2.0.3/src/paperwork_gtk/cmd/install.py
+--- paperwork-2.0.3.orig/src/paperwork_gtk/cmd/install.py	2021-02-05 17:46:17.000000000 +0100
++++ paperwork-2.0.3/src/paperwork_gtk/cmd/install.py	2021-05-30 12:26:21.316348652 +0200
+@@ -122,8 +122,6 @@
+         # PDF and all image formats supported by pillow
+         entry.set("MimeType",
+                   "application/pdf;"
+-                  "image/png;"
+-                  "image/jpeg;"
+                   "image/bmp;"
+                   "image/gif;"
+                   "image/ico;"
diff --git a/app-text/paperwork/paperwork-2.0.3.ebuild b/app-text/paperwork/paperwork-2.0.3.ebuild
new file mode 100644
index 000000000000..b9ec9918ccc6
--- /dev/null
+++ b/app-text/paperwork/paperwork-2.0.3.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit distutils-r1 xdg
+
+DESCRIPTION="a personal document manager for scanned documents (and PDFs)"
+HOMEPAGE="https://gitlab.gnome.org/World/OpenPaperwork"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="~app-text/openpaperwork-core-${PV}[${PYTHON_USEDEP}]
+	~app-text/openpaperwork-gtk-${PV}[${PYTHON_USEDEP}]
+	~app-text/paperwork-backend-${PV}[${PYTHON_USEDEP}]
+	dev-python/libpillowfight[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/pycairo[${PYTHON_USEDEP}]
+	dev-python/pyenchant[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	>=dev-python/pyocr-0.3.0[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/pyxdg[${PYTHON_USEDEP}]
+	dev-python/simplebayes[${PYTHON_USEDEP}]
+	media-libs/libinsane
+	x11-libs/libnotify[introspection]"
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}"/${P}-desktop_file.patch )
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	PYTHONPATH="src" "${EPYTHON}" src/paperwork_gtk/main.py install \
+		--icon_base_dir="${ED}"/usr/share/icons \
+		--data_base_dir="${ED}"/usr/share
+}
diff --git a/app-text/po4a/Manifest b/app-text/po4a/Manifest
index 603fbb8b0377..56a57f01542b 100644
--- a/app-text/po4a/Manifest
+++ b/app-text/po4a/Manifest
@@ -3,7 +3,7 @@ AUX po4a-man.patch 621 BLAKE2B abdbac744d7395ec5f008e2ac2bcfd9aecf0f24726acd1e32
 DIST po4a-0.57.tar.gz 3079550 BLAKE2B 54b1d3263aa0ebd90eec61d735c3422efb5f67b2d88f91a87a6893bcdb7f06131aedadeb3577d221cf75ba07f8001f6e23409375756afec8357e26e8f0f0a1c2 SHA512 7ac2e614c126b049feeb8edbafb71a875cee78fb85d8cd74f3bf5b555cc8b2d19d5e4606b732e714e937c34e178729d73edfe559de594c5ffe811b5162b27d81
 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 1286 BLAKE2B 67a9d53b3bcf14dd981ab2c378e15f051fa4e3c9b625594c2e2e48c786c78e710077baec05e0ad800e0a35c2be4242a1b08f11c45b7bf9a80c4e6e688fb1c4d3 SHA512 4978a61ad0f888df59048a2cf67d7dae160e9dfb9cca774742a19b3c522d5bba0a393697659fd14091a08b94e73a101fd4faa20759658c824f156817b0288363
-EBUILD po4a-0.62.ebuild 1383 BLAKE2B 2d2f86a2cc71b5f7bd679c846c4c984492662e67a35a609de6527e453bf474e29706cf745fa868be1f10852a5a8b9b1c32d99eb033af82d848eb54b23163e52a SHA512 20b8cc64181a81b51946a3544d690b68360ede8a31632c53fe668a2a0118f2027ff01291da1dac8e90df466894cb67c575f876fdb9e6b784a324b16df2408ec6
-EBUILD po4a-0.63.ebuild 1383 BLAKE2B 2d2f86a2cc71b5f7bd679c846c4c984492662e67a35a609de6527e453bf474e29706cf745fa868be1f10852a5a8b9b1c32d99eb033af82d848eb54b23163e52a SHA512 20b8cc64181a81b51946a3544d690b68360ede8a31632c53fe668a2a0118f2027ff01291da1dac8e90df466894cb67c575f876fdb9e6b784a324b16df2408ec6
+EBUILD po4a-0.57.ebuild 1297 BLAKE2B 42de8293d83f2e8dcdead27369fc17dff75e08aec9e3bda5bc5d6e9e5f9b5364bee5d12beb35f34bfe82e40d12cb9cc886f3dd1f8a7a13a11412ef5e3f907f86 SHA512 d4d445c964236cea24b8994fa2f2a04ed0f378fed6013d0ece1af582cbdfb17563ebed3de951cc8523de69b56ef28b04b00fcfae01a7198a6ebb48b2ed2b777a
+EBUILD po4a-0.62.ebuild 1394 BLAKE2B 14133ffae133b8ba2fe7821baba4826cc304be6449b4e6dc3138cd19d9f4dc591a41d61a1b72005dbab2906e65043c188e23f3898546460c20a0729f27934a6d SHA512 99f4070583570247cec9e2345546ac588f0805828b67179d8e86b998c7bdb752fb899f6942325bebb796130259fba77ea97fbecb04e5759dc77980ab4318bb84
+EBUILD po4a-0.63.ebuild 1394 BLAKE2B 14133ffae133b8ba2fe7821baba4826cc304be6449b4e6dc3138cd19d9f4dc591a41d61a1b72005dbab2906e65043c188e23f3898546460c20a0729f27934a6d SHA512 99f4070583570247cec9e2345546ac588f0805828b67179d8e86b998c7bdb752fb899f6942325bebb796130259fba77ea97fbecb04e5759dc77980ab4318bb84
 MISC metadata.xml 326 BLAKE2B 6ec11e49a2b25069f1e2eeac2eaa7ce8adb48704986f873ba92de8a1328e7d2963cd79efac7d2672bdde1fc6c71cddbfa11fbb4bfd4cda28fa1f92e350ef5be6 SHA512 2fbc62c1bbc9a555103e9ba0eb3389004f9770eaff51e00fea853051ac6da43312366d3a50ba63ad28453219dfc8970f9a78c7af2bf7799f58911a33e0bfd3f9
diff --git a/app-text/po4a/po4a-0.57.ebuild b/app-text/po4a/po4a-0.57.ebuild
index 6dd16a0287b3..ba809c6f215f 100644
--- a/app-text/po4a/po4a-0.57.ebuild
+++ b/app-text/po4a/po4a-0.57.ebuild
@@ -26,7 +26,8 @@ RDEPEND="app-text/opensp
 	dev-perl/YAML-Tiny
 	sys-devel/gettext
 	virtual/perl-Pod-Parser"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	app-text/docbook-xml-dtd:4.1.2
 	app-text/docbook-xsl-stylesheets
 	dev-perl/Module-Build
diff --git a/app-text/po4a/po4a-0.62.ebuild b/app-text/po4a/po4a-0.62.ebuild
index 3cd43355adfe..6cb82437a08f 100644
--- a/app-text/po4a/po4a-0.62.ebuild
+++ b/app-text/po4a/po4a-0.62.ebuild
@@ -26,7 +26,8 @@ RDEPEND="app-text/opensp
 	dev-perl/YAML-Tiny
 	sys-devel/gettext
 	virtual/perl-Pod-Parser"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	app-text/docbook-xml-dtd:4.1.2
 	app-text/docbook-xsl-stylesheets
 	dev-perl/Module-Build
diff --git a/app-text/po4a/po4a-0.63.ebuild b/app-text/po4a/po4a-0.63.ebuild
index 3cd43355adfe..6cb82437a08f 100644
--- a/app-text/po4a/po4a-0.63.ebuild
+++ b/app-text/po4a/po4a-0.63.ebuild
@@ -26,7 +26,8 @@ RDEPEND="app-text/opensp
 	dev-perl/YAML-Tiny
 	sys-devel/gettext
 	virtual/perl-Pod-Parser"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	app-text/docbook-xml-dtd:4.1.2
 	app-text/docbook-xsl-stylesheets
 	dev-perl/Module-Build
diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index e97bcbe19b1b..d0cbe2661f3f 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -4,6 +4,6 @@ AUX poppler-21.04.0-respect-cflags.patch 5738 BLAKE2B d09ed8ca5211b89a06b56d8e7f
 DIST poppler-21.02.0.tar.xz 1684496 BLAKE2B f62399a70baa0af36abd9bf7f5bc69003fcdc9b668a64475a6373dbdd9885092a8beb42f887eafdafac5ee17e9aac5b610bad1c9a64af8112e72c82f47e6a304 SHA512 3964990749f38f4468b244c579ff1f2dab7357dfddecb3035d14d3aaeac6ee4be42e76b4a1cc1a8cf53715518def9e92cc59d08c1e22592ced00a9c948989035
 DIST poppler-21.05.0.tar.xz 1700632 BLAKE2B 5e277f3d9d6fafbd39b395d7730182ec028c0ccdbb59e0b9d6ea93e079eb6dc8ff6e46a2b378ec4502055e8748973d353e1f947d734cdee4c5abb9f1bb6dba2c SHA512 428f63a85fc8a227efebcd64ca7e89fec487fea07c93f9dd990fae343532547bcfec29a3288dd9ffce698cf994ccc2ce5055e4fa677ebceb216c1caaa3e0cdae
 EBUILD poppler-21.02.0.ebuild 3248 BLAKE2B 6eea98c0df7d157fedf39f8ed52f1305542f888b19c8a5adf741bd85df6fc7d5724c8ec03ad88ee9bec30bda82aa30e3fca370d407a6234a4f97aa5d4b3f76ce SHA512 2657dd6d87197953c09ab1ed4852f07e33475e1ceeadea0dcd0627f771500f13057eee927b8341286ba25820c4f2ce6b3f8d6b00d0b75510b27b3b9740585375
-EBUILD poppler-21.05.0.ebuild 3283 BLAKE2B 1b094db33956feade86e5089cc845878439d6fdf8595f4d795d6c253d4a26601b3e4ab2df6ec95ee1b718f442efd3d23748768dffe492445f95077f7cdeaf4d4 SHA512 ccaf9605e0bef9343ffe3346a60ed774dc93b0bc268d6235d88407d60f1580662425dc39c7626ea4f329a0953c3d2b6c6824fbc7fdc95baacef7afe181b2068e
+EBUILD poppler-21.05.0.ebuild 3282 BLAKE2B c310706cf76e64135e4bcc479a1a3cb95c73b0ab2573fa4592dcddf1a55a4b2a59a655cfa647839ba2aa1ade0e929a78c86a7c7d7580370c67dacb19c4310d17 SHA512 01aa706393a3c42272e2fb87833928a3867ca9d11fc83d646c3972ee6e89b1276da6203a326da579011e70f7391e7f5f75d0515515d780732da4cdd9f8b2ad18
 EBUILD poppler-9999.ebuild 3283 BLAKE2B 1b094db33956feade86e5089cc845878439d6fdf8595f4d795d6c253d4a26601b3e4ab2df6ec95ee1b718f442efd3d23748768dffe492445f95077f7cdeaf4d4 SHA512 ccaf9605e0bef9343ffe3346a60ed774dc93b0bc268d6235d88407d60f1580662425dc39c7626ea4f329a0953c3d2b6c6824fbc7fdc95baacef7afe181b2068e
 MISC metadata.xml 995 BLAKE2B 0d99fda69e6b020fd1b6fa879a0c3af278b92111be31d97cabe88703f06b4af56ce64ce9e0fc556d2b056c6770e547ae3b88dcc82da9cc26e15e2d1d0b5f685b SHA512 ae813761c5ab4dab475b737085f14f5874655b31f247f26495c43d8fcc47805dfceb2a8cd23ead39a3f8ee75ac820edc7c2554e573c338c09e5ec8b9d383417c
diff --git a/app-text/poppler/poppler-21.05.0.ebuild b/app-text/poppler/poppler-21.05.0.ebuild
index e66369be54d3..e3df86156aa7 100644
--- a/app-text/poppler/poppler-21.05.0.ebuild
+++ b/app-text/poppler/poppler-21.05.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/110"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
 fi
 
diff --git a/app-text/rarian/Manifest b/app-text/rarian/Manifest
index 8be08bd49545..53e56639f2a9 100644
--- a/app-text/rarian/Manifest
+++ b/app-text/rarian/Manifest
@@ -1,4 +1,4 @@
 DIST rarian-0.8.1-r3-patches.tar.xz 33508 BLAKE2B 772f2e2ff45b707e45da16103da665c54655dae0b904db5240964a25591f5871fb28c37e42a99cb98c760a214e6b039af12015bffb9b51ccb50e6bb054d3effa SHA512 a6a258803ce165854047aacd1ffef32d8d5c271cad3e6b74fb3c694ca6a0de9a8f253c89f9ff53279e7228ae401fad06721f10a6374a03a51bad76b2ef969000
 DIST rarian-0.8.1.tar.gz 459461 BLAKE2B 7589633a3abc188a7e83adede964b4d293984ad9c896e5c8116775905dfc3acc3b0cfbbee574b26d1c3966501f8b42e61df9910c840c58bfcd0b41d065a30c26 SHA512 ddc640e1ac210e9dc3fcdde6bbff6e21dabe97b160b531cac68d47d1b831dec71b7c4aced9819cfafd8f89f290920c4e33550b8e29d9872a1c1a202d6fe8e3eb
-EBUILD rarian-0.8.1-r3.ebuild 1809 BLAKE2B 356931ab454edbf4b6dabafc92a8d6721538bc1166272debaa834c68f832bd12cbcdaee44483823f216e419d9f5383a4f41fbfd7f59a29c8f17b973ad3f9ecf1 SHA512 7fe69353e71b7c10079ed36f19711b5606761ff203133a257abd79b5d9917da05b43e01549db27cf7834263a9cd5bd7b11586f1fe59f0e3950d67471e3e99ef6
+EBUILD rarian-0.8.1-r3.ebuild 1816 BLAKE2B 6bf84f29a00fe5903bd04963234f82f5df0bbd2769b911ece412e30622ce8766bee6b27dcda33740eb897f7235b63266e79e2cd4c4ed384b49805c10db6e4715 SHA512 86be73237698525b3b5df4e46acc202a5993fbfa575e9957dd2c477800ada214016d194b93994c1ee60168113a8707c7d73bf6ec98fe5497d8ae473b05f24ac2
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/app-text/rarian/rarian-0.8.1-r3.ebuild b/app-text/rarian/rarian-0.8.1-r3.ebuild
index 9247ad3e910c..7e123ebc5c1b 100644
--- a/app-text/rarian/rarian-0.8.1-r3.ebuild
+++ b/app-text/rarian/rarian-0.8.1-r3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit autotools eutils ltprune
+inherit autotools eutils
 
 DESCRIPTION="A documentation metadata library"
 HOMEPAGE="https://rarian.freedesktop.org/"
@@ -61,5 +61,5 @@ src_configure() {
 
 src_install() {
 	default
-	prune_libtool_files --all
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/app-text/scrollkeeper-dtd/Manifest b/app-text/scrollkeeper-dtd/Manifest
index 067efaa18720..d71234f52b6d 100644
--- a/app-text/scrollkeeper-dtd/Manifest
+++ b/app-text/scrollkeeper-dtd/Manifest
@@ -1,3 +1,3 @@
 DIST scrollkeeper-omf.dtd 11031 BLAKE2B 47a52f587447f30c1c93ebdb4d1339d714260c7bcf16711591edb0b0f8a41d6694a1f64f0306d0c296c032869176b884adb50762eaa445f50684820effcb9399 SHA512 edb38d85352d0ed4a4fd1eea108cd88696d2f0759bc4402d4b7f85aa56b5647ca5a518de14deb3a429344ede474d42a64b90100e5d3c772ae6e5e47a47d86ff0
-EBUILD scrollkeeper-dtd-1.0-r1.ebuild 1504 BLAKE2B 61fead51a5786879caba3239ab844f78f9cc6a4ff0ccc7631fd5172f2f7d85956a88cedca9df1e76996bbaac526b67c75db7a00dc333176931691543f8cf1cbd SHA512 09b1e639cdaecfff1d2c031029067e4cb082d9eae1560bb310fce5f78d6cf28d12bbabc8b68bc89c39e5b2028a2c4c0b35ce54df359acea285cd88355025d2d5
+EBUILD scrollkeeper-dtd-1.0-r1.ebuild 1511 BLAKE2B b946bff7451b44e8dea33f6232d2558d7b8681a9faa54bd65ebb87a265a77f91f41caf82563377bd83b9ae5e0f5260448103a921c23fe11d68a34007c4fc2eaa SHA512 b943c7de7a4fb55950fe013ee1797ca44c02ada5945cb2ce75d9598c87ce1f90a171e5a24eaf07b58ae773cb2f12a0f429e6ef2e4fafff9cc9d63bf85139019e
 MISC metadata.xml 335 BLAKE2B 5557a7230bee25bc8e1340443746da2d41568635c68904549b2ac2f6227a70444cf2753e6656de56c290c1a96e18dbe882401bcba68e271259cafaa44402a1f1 SHA512 c0180e1504b25daba0b5f2a6556793cf721eca12a4c488a57e7960b9b096129e5f535a24e1da1ffa6b1d9e8b646325edcebd00e5f7e908ace3d81d818e49f8e3
diff --git a/app-text/scrollkeeper-dtd/scrollkeeper-dtd-1.0-r1.ebuild b/app-text/scrollkeeper-dtd/scrollkeeper-dtd-1.0-r1.ebuild
index e36c055a77dd..84cbc50be67e 100644
--- a/app-text/scrollkeeper-dtd/scrollkeeper-dtd-1.0-r1.ebuild
+++ b/app-text/scrollkeeper-dtd/scrollkeeper-dtd-1.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/${DTD_FIL
 
 LICENSE="FDL-1.1"
 SLOT="1.0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-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-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=dev-libs/libxml2-2.4.19"
diff --git a/app-text/tesseract/Manifest b/app-text/tesseract/Manifest
index d48a420d229d..f819469dac64 100644
--- a/app-text/tesseract/Manifest
+++ b/app-text/tesseract/Manifest
@@ -46,7 +46,7 @@ DIST tha.traineddata-3.04.00 13565168 BLAKE2B 1fe254a7ace923a88579c46111a0be81ad
 DIST tur.traineddata-3.04.00 14069931 BLAKE2B 385714a9fb0efa7a8299de7152729a7f7e12a29d4c33cc4df6c5592bd1ddca145acb056caaf93f077279489c3a12e2d95285d0790979cbb036206ecdab910080 SHA512 822b51bf9836f0d2b5923fc8ea14690a16d6e1831dc8828d0aad7cb4bda2bcec06ba7cdc79187d48b93e3541dfd46f1f50dc44dae504af9dd7a788052a05b51e
 DIST ukr.traineddata-3.04.00 8043189 BLAKE2B 3435bdbdac2e4f343479515632f54345c96b9d626db6cdd8dfc190c4b8dd0919e6955db8ccea45dba2877b4959f3146cbdc5472a1fb813093232de8ea4d97a20 SHA512 16117151debf90d79eb9f84c0b215b1d9d72d5b61bbf0004330b34b1502388f7d81051ce5ce296720dd10f53ba08f1e15cebaf4030330b5a071810612f78e0ef
 DIST vie.traineddata-3.04.00 6096118 BLAKE2B 2314880eef055eade892e788cc1458ca1b4b3ee3a8ce7c8657ab7d36c2f57556d21045094f055961ab0ecca38300d4c986162ee79d437e706a8e54c35b552feb SHA512 51087e2141051906a1815798175ff8b9f214ae36c7d87cb60999489ccc684307ea7ef65c5ae4024f95c51b89084ab9f0e8dde0a4d480eaf78dceebfba87350cf
-EBUILD tesseract-3.05.02.ebuild 5845 BLAKE2B d5b83ff146d960a3b4ee13be151c7e1083b038b308c17c55a41b8728dfb3251bd7fb7b8a32e1fd4c9c3405d240f46a312694e7547786e169d7c44253bcf68593 SHA512 8c70b8bb9e09c70f767286cd9a99d35c67f4a59e0f7867968b16bffa0df9538a135c5f2dd774022b6035bda40cf51b59c9c3893078fe41581a72e1fbe0f379e3
+EBUILD tesseract-3.05.02.ebuild 5858 BLAKE2B 896c323d034f43d22594ba2292fca73ee07336f8b4550b6af92bd02e74138a3ffa41a70db1ef52632d52fd7f425225fe69b4996823d87faa7dd933f5277a7fb7 SHA512 e514ee7d2a58eff04bb85e672915985405f3766e2aa4bf0760add3377cfa2e321c484081129dd29cee06090146807c239e4bab9ebd2f55093ce483902f6b55be
 EBUILD tesseract-4.1.0-r1.ebuild 2059 BLAKE2B e817adce0988a94490891f6cb246636cac20f6552852fa2d684546402822b4cc1736e3e50cf390887e7921fce797fe8271618209d49cff076cd989e65e8ec349 SHA512 e3e1ba6bdb0edc304e1ad2b14ae07cef5469f74cfc9e863f4b84761f6dba75ee3b328c4701a720cc4f50d99165d9fefb2f236f80d902bad67c8b2955f086031e
 EBUILD tesseract-4.1.1.ebuild 2053 BLAKE2B c10968fd403a7d4892dde87e027b75648200ad6b0f0b767f59a340e1e6058a948e1f0e713508bafe1b16e64307fa81caf5758d2add86f7859609f659d9a81cbf SHA512 9ecaebe2c0f32e1d01ba029b2dcbcacc59def2642a7dda2edb4002c6dbd7bb5c4a7e31b958808d190e891c24cfac5eb52def28a08e550bdf260f35ef338aac59
 EBUILD tesseract-9999.ebuild 1985 BLAKE2B 61ca3f12ce35a89999de392f8f96a3a55571c7b37a10d59d28fbd8a14f97ba3eea2c96ea17337ace2a6ff768f3bed96efbf45ca0b3bd5cca79ebb0edf15d8a7b SHA512 4e84e0f3a68232333182b1195ef8b443ba95575bd5912acbbe306788d2174ead368becd43fb1d7daa20b7d73e136309143572322b85860adf05826c5289e5023
diff --git a/app-text/tesseract/tesseract-3.05.02.ebuild b/app-text/tesseract/tesseract-3.05.02.ebuild
index bc322d2a94ff..d237b25cfbfd 100644
--- a/app-text/tesseract/tesseract-3.05.02.ebuild
+++ b/app-text/tesseract/tesseract-3.05.02.ebuild
@@ -8,7 +8,7 @@ LANGPACKV="3.04.00"
 URI_PREFIX="https://github.com/${MY_PN}/tessdata/raw/${LANGPACKV}/"
 JAVA_PKG_OPT_USE="scrollview"
 
-inherit autotools java-pkg-opt-2 ltprune toolchain-funcs
+inherit autotools java-pkg-opt-2 toolchain-funcs
 
 DESCRIPTION="An OCR Engine, originally developed at HP, now open source."
 HOMEPAGE="https://github.com/tesseract-ocr"
@@ -131,7 +131,7 @@ src_compile() {
 src_install() {
 	use doc && HTML_DOCS=( doc/html/. )
 	default
-	prune_libtool_files
+	find "${ED}" -name '*.la' -delete || die
 
 	if use training; then
 		emake DESTDIR="${D}" training-install
diff --git a/app-text/wv/Manifest b/app-text/wv/Manifest
index 6e39cfa19f20..4daf85b873f3 100644
--- a/app-text/wv/Manifest
+++ b/app-text/wv/Manifest
@@ -1,4 +1,4 @@
 AUX wv-1.2.9-format-security.patch 336 BLAKE2B 18641a15c75a32250012771bd8ca8b0739f503ef8d1d2eebe23f2d378996aa3f6e2f0cfa72f8077add3db33f8ece86c57e80cc5b868719472b45ba1bed10a7d0 SHA512 99fef3bec0f129ae2d138c50d1e3e9288d5309db87a72d9b1970d1d230e20be3469b423f0b74c5083a0a5cdca8fed0b2ca32ec1fefdca22f213e4a02a6bbd405
 DIST wv-1.2.9.tar.gz 616256 BLAKE2B 6a6aa6b5f87a934c703c8a74d85af3d7aa84dcd2bc613a3af7fb8d69a9339e71ba2618ae8f725b90c3fe0b0199f4b224bdb32a50c2b6b6614f84b6a14437633f SHA512 ae5c762012595ce8922bfda8749ad3e9cb055edab30152c3a5feaaf3ca6601f357d1e301b179e9a5860cd99452dd6e63e5f44f5bcc12f8db148bdd334e0200a5
-EBUILD wv-1.2.9-r2.ebuild 1444 BLAKE2B 5466759bd60b4b14a9c68aea9d1ae7d8a0770cb5535107abe49a00e7ebc7c4320408428135e42e866141bd2a1d52c86e4e32c7ea224de4881f9815c16551a7cd SHA512 6fa5b35949ab12ddef96f2eef5486840b0e9ed0020049f249926aa7a48871413f2ba557cef220a81d6f16eb25b004c48e01545741573b0ac716a20b57b01552f
+EBUILD wv-1.2.9-r2.ebuild 1457 BLAKE2B a94094b2c97a3882ba8d7d1758e8f8257ed105e8fc1149217108d14549c768942923cb4c781a9606bdfb16fe10f5c51d60283974d0d7b38a575167144a4c4332 SHA512 1c4dca445af2a0c2aaf8e4e3f5e12106e1d948e22622d080321c596216607e846dc2ba9c9da51d2de1ce1ea1784b83e52f2ed855d1f43f496142979d175846a7
 MISC metadata.xml 448 BLAKE2B 2ad03c8351da9b74d3420841cbb63aa4a5f8723bdd698ded80bfbc91f0d7bda75b0f2d671a74882e32f7f7e1b1e3d6bc4f1ff491132af931e5914b853b3ff854 SHA512 f6ed1d52b212ac06af826dea4218cdc3017d2d7e417f943bd14f2f223221da1d8a4401852e4fd8375195a77f4f10465d93b8ce62e3981c41570220b5699e4a55
diff --git a/app-text/wv/wv-1.2.9-r2.ebuild b/app-text/wv/wv-1.2.9-r2.ebuild
index 6f316088f9d9..4c6e750d78d5 100644
--- a/app-text/wv/wv-1.2.9-r2.ebuild
+++ b/app-text/wv/wv-1.2.9-r2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit autotools ltprune
+inherit autotools
 
 DESCRIPTION="Tool for conversion of MSWord doc and rtf files to something readable"
 SRC_URI="http://abiword.org/downloads/${PN}/${PV}/${P}.tar.gz"
@@ -53,7 +53,7 @@ src_configure() {
 
 src_install() {
 	default
-	prune_libtool_files
+	find "${ED}" -name '*.la' -delete || die
 
 	rm -f "${ED}"/usr/share/man/man1/wvConvert.1
 	if use tools; then
diff --git a/app-text/xmlto/Manifest b/app-text/xmlto/Manifest
index 08e63be8b69e..928085e93b50 100644
--- a/app-text/xmlto/Manifest
+++ b/app-text/xmlto/Manifest
@@ -2,5 +2,5 @@ AUX xmlto-0.0.22-format_fo_passivetex_check.patch 2286 BLAKE2B eb004b4fa394840b8
 AUX xmlto-0.0.28-allow-links.patch 535 BLAKE2B 71412bff616c9499ed6cf045a5d7ea1e6c697db791c58c1a56a1fea3bd7c1619814e20cf58e3549609fc104b0223f80c9a84ef4f4b203da90d5a8dc3b6c943b8 SHA512 cc3ccd209872a54cd3d91a1e261348ce412efab3d9d6d0d9199bd40396fa9c8de5e1ba6a5fef2e5d23d2819ae74bc19e2705b54792296eb7a3b8dc82b8637f22
 DIST xmlto-0.0.28.tar.bz2 127921 BLAKE2B 12ef3e2e1436c330e7b003d08f4a4d4032d70255777956949eb8b47b6f5466e7c158b0f85dc87069c1e379603cac0b01c88589f98ca1ef9e862f0aef31169f6d SHA512 6e0c4968d4f1b7a3b132904182aa72a73f6167553eabdeb65cfafa6295ef7b960541685769d04144207963cca77b0c44db4f9fbb2796348ffcb37b3b399f18f1
 EBUILD xmlto-0.0.28-r3.ebuild 1422 BLAKE2B 82f75b7468184f59b6b7edbecf2b9a9a06daf91c61f163f0c6501ea5ebb1cec4922d309f4bfb5962ec7192035dc9daa887aa967a1f46e88f390f478ea5565091 SHA512 88c76795131133792a8de0591b183682418e7c670b347276eab3bfc7f1c966d980d9d48de407bc0de746aa7ac5e0371bea5bb149c9a302984de042ed79a674f6
-EBUILD xmlto-0.0.28-r6.ebuild 1442 BLAKE2B a5993d04bc74818acd4c4fb2213067f6ded07baa625e602ebf028a6b59188b340bbbc9b2e00cbdf04023eccd20477a0103ade366b489ed1dba409edefe7a32f7 SHA512 bcbe983428e3a8abb22bfc1fea7bc200a77ede274432c903887053dd5da1a90b4ef9b5c632007466d2050de64fe9463de693309dd6000f04a7d05f2ad53c7a20
+EBUILD xmlto-0.0.28-r6.ebuild 1435 BLAKE2B abcc70422eb5d91bed1137158a33a9d4e2c6a0a2833e37d549d8c573377909e347989c40cc51d5beb09425e6f5f47c4159158ab638088e99464568098e841885 SHA512 c59fc49e086cdc37b40fd4bd7849d4fe191e9e4f3b119d28a5a14c2166bf68e444acb8ca31a0949b400891cab4d7d63b7228c6601cd81f03adccbb288c2b5ea3
 MISC metadata.xml 323 BLAKE2B fc92312d7c96a25a1d35384dd78942a7d6bfdeb0d1c36a7ffddc687d42a83261766e7042dc109b2544da11d72274761a98c62cc8e0ac872e8478e5e027cc69bf SHA512 33789a6e807d048100b32969bfbce0beea9c3b25fe279fe5d318d59b970b4562ec8edd222bf5817a62e46d23961160ccb11384be06e605fb115b3fc7c72299c5
diff --git a/app-text/xmlto/xmlto-0.0.28-r6.ebuild b/app-text/xmlto/xmlto-0.0.28-r6.ebuild
index d56b7a4beafe..87c5faaa209b 100644
--- a/app-text/xmlto/xmlto-0.0.28-r6.ebuild
+++ b/app-text/xmlto/xmlto-0.0.28-r6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://releases.pagure.org/${PN}/${P}.tar.bz2"
 
 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="latex text"
 
 RDEPEND="
diff --git a/app-text/yelp-tools/Manifest b/app-text/yelp-tools/Manifest
index c60448ec5c3c..872d9ee5c463 100644
--- a/app-text/yelp-tools/Manifest
+++ b/app-text/yelp-tools/Manifest
@@ -1,5 +1,3 @@
-DIST yelp-tools-3.38.0.tar.xz 213692 BLAKE2B 87da439f864df8be78f8c2ae3fae387e9d70a5dca7f4ad6b584602fd4a6beec49cf0403dd7a53045d38cfd1ac6945802032689092f2624ba8b421ab5d4d43fd1 SHA512 2042e37f8efbe9974f5a507910393b837a0b9154beb918a5e8d145205fb519c8244bb405cf328ff5014287086be5b6d33ad631951bd0e950c2ad9efc60065d59
 DIST yelp-tools-40.0.tar.xz 38708 BLAKE2B d9533fefc6a9416ed6f887971db62a7db6baed4f65aaf1e03d20c98fa23efb3af9f10189af0284bde3837f58f662f4ca4be8275d597a7c799a14585c87e6ec10 SHA512 b89e514cdc2c6ff96097af0cab5694e9f1dfd2a125e08f99a69c0e7dd51e1e1a859c2e6eec656ecea6103bfc65733e1256a77ef992454db4a554567b46fa2628
-EBUILD yelp-tools-3.38.0.ebuild 642 BLAKE2B a513dd1e389863f653724f48fcccd262e54de3b81bfb01eb80d3a94c3a0ee286e1ca259b6917c13adf47f78a05dac2c841582ad6a8f62af1ef36b965add177d6 SHA512 549c5a7942fee9c90764fb94a6f4de995cd83832947eb666688b9d38577f6290743f20c7e5eff5423a039bf75f90e84ea83a9bfa3a488dbab64c14df38066dee
-EBUILD yelp-tools-40.0.ebuild 937 BLAKE2B 3ff5912b3c2af461227851864e2d5921144cf72a123e32b05f5568ecb04051eaf5a702b73149e16f77653aa434ddbb399801c826c3c65127c6fa03b52b17e8f0 SHA512 ececf944929eff36735b464369a6d5c2d0befdd7d85792dc143c4956ec6cdbb7cac53de28079aa4ea2b240d9361e2142697325d0f038b0849b8a5e9dd038195a
+EBUILD yelp-tools-40.0.ebuild 930 BLAKE2B ae69d549479ff89b360cfe046bddb22459e38ad6cba2d5da38a0b8e5f5b2d9bbc4425f6de60975257446857196c088e467344cf0e7c55187a0bca0a61526bd47 SHA512 789e8f4141f3094d47f835359b8d495c62436bd0063f96b0cd9ac5ab6f70302de08790aad0375d352f33099a092d0162a1335f0e9cdfde23aff8228a2c4a3855
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/app-text/yelp-tools/yelp-tools-3.38.0.ebuild b/app-text/yelp-tools/yelp-tools-3.38.0.ebuild
deleted file mode 100644
index cc554efa4982..000000000000
--- a/app-text/yelp-tools/yelp-tools-3.38.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome2
-
-DESCRIPTION="Collection of tools for building and converting documentation"
-HOMEPAGE="https://wiki.gnome.org/Apps/Yelp/Tools"
-
-LICENSE="|| ( GPL-2+ freedist ) GPL-2+" # yelp.m4 is GPL2 || freely distributable
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="
-	>=dev-libs/libxml2-2.6.12
-	>=dev-libs/libxslt-1.1.8
-	dev-util/itstool
-	>=gnome-extra/yelp-xsl-3.17.3
-	virtual/awk
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-"
diff --git a/app-text/yelp-tools/yelp-tools-40.0.ebuild b/app-text/yelp-tools/yelp-tools-40.0.ebuild
index 89f69c203b36..d1ed655e2e81 100644
--- a/app-text/yelp-tools/yelp-tools-40.0.ebuild
+++ b/app-text/yelp-tools/yelp-tools-40.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Yelp/Tools"
 
 LICENSE="|| ( GPL-2+ freedist ) GPL-2+" # yelp.m4 is GPL2 || freely distributable
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="
diff --git a/app-text/zotero-bin/Manifest b/app-text/zotero-bin/Manifest
new file mode 100644
index 000000000000..59dbb8b837ac
--- /dev/null
+++ b/app-text/zotero-bin/Manifest
@@ -0,0 +1,3 @@
+DIST zotero-bin-5.0.96.2.tar.bz2 60475436 BLAKE2B 2c113fbbb78f0e4ca4e12ed31ed43ba6e65eea88039f9fda1d1f97e6407b95e9ac1d89b2504f220ce96634f5404defcdb5f5346dec83d5d9f02832e1573f1a60 SHA512 4fc988bf74179ad5f28a4649cfc6c6c5d4eeabc3b7aa60e717681bc57dd1c3ba6f2d3310fb83e6e2e55475aa9d7077329acc3dff52b63a0759c32f542ef0ef47
+EBUILD zotero-bin-5.0.96.2.ebuild 1743 BLAKE2B 1fae784ad08e72c0f56b300c2ac57dc70cd87dfc8c022245c6b8387132eec4d9674d298ef85aceb747375aa8963ca19941d23dd9227643085770280e3cb661fa SHA512 8d417609a9e251ef49bd220700bb7f04a941b39e9662d659370ae2d876d33d404046d889b41242de161754a7f0f40702c11d00995f5d9b1ee697afd3b0908529
+MISC metadata.xml 397 BLAKE2B f48e28fccd0f77504f72fa58caccaf122774c308ec6367d76f11706dced05efd74e7075dbdb8dc9689db9555a471b0ed15a904fda9556014d35448eccacb31d7 SHA512 38ccb96f65b58cf9b992fa89d89fbf10bd94f9331a268aafc374332bd02ed136539627754fe807e875c4e2fd4e1a42db4f6f3e937f203c2c1a0c1e03a884b156
diff --git a/app-text/zotero-bin/metadata.xml b/app-text/zotero-bin/metadata.xml
new file mode 100644
index 000000000000..dc1be65adf8e
--- /dev/null
+++ b/app-text/zotero-bin/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>andrewammerlaan@gentoo.org</email>
+		<name>Andrew Ammerlaan</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">zotero/zotero</remote-id>
+		<bugs-to>https://github.com/zotero/zotero/issues</bugs-to>
+	</upstream>
+</pkgmetadata>
diff --git a/app-text/zotero-bin/zotero-bin-5.0.96.2.ebuild b/app-text/zotero-bin/zotero-bin-5.0.96.2.ebuild
new file mode 100644
index 000000000000..a6626cdb8945
--- /dev/null
+++ b/app-text/zotero-bin/zotero-bin-5.0.96.2.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop xdg
+
+DESCRIPTION="Helps you collect, organize, cite, and share your research sources"
+HOMEPAGE="https://www.zotero.org"
+SRC_URI="https://www.zotero.org/download/client/dl?channel=release&platform=linux-x86_64&version=${PV} -> ${P}.tar.bz2"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+
+RDEPEND="
+	dev-libs/atk
+	dev-libs/dbus-glib
+	dev-libs/glib
+	dev-libs/nspr
+	dev-libs/nss
+	media-libs/fontconfig
+	media-libs/freetype
+	sys-apps/dbus
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:2
+	x11-libs/gtk+:3
+	x11-libs/libX11
+	x11-libs/libxcb
+	x11-libs/libXcomposite
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libXrender
+	x11-libs/libXt
+	x11-libs/pango
+"
+
+S="${WORKDIR}/Zotero_linux-x86_64"
+
+QA_PREBUILT="/opt/zotero/*"
+
+src_prepare() {
+	# disable auto-update
+	sed -i -e 's/\(pref("app.update.enabled"\).*/\1, false);/' defaults/preferences/prefs.js || die
+
+	# disable default oo installation questions - manual installation is still possible
+	sed -i -e 's/\(pref("extensions.zoteroOpenOfficeIntegration.skipInstallation"\).*/\1, true);/' \
+		extensions/zoteroOpenOfficeIntegration@zotero.org/defaults/preferences/zoteroOpenOfficeIntegration.js || die
+
+	# fix desktop-file
+	sed -i -e 's#^Exec=.*#Exec=zotero#' zotero.desktop
+	sed -i -e 's#Icon=zotero.*#Icon=zotero#' zotero.desktop
+
+	default
+}
+
+src_install() {
+	dodir opt/zotero
+	cp -a "${S}"/* "${ED}/opt/zotero" || die
+
+	dosym ../../opt/zotero/zotero usr/bin/zotero
+
+	domenu zotero.desktop
+
+	for size in 16 32 48 256; do
+		newicon -s ${size} chrome/icons/default/default${size}.png zotero.png
+	done
+}
author	V3n3RiX <venerix@redcorelinux.org>	2021-05-31 20:59:14 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2021-05-31 20:59:14 +0100
commit	e748ba9741f6540f4675c23e3e37b73e822c13a4 (patch)
tree	23dece8beabb3a3d7c6c0273b0eb40b21c62a889 /app-text
parent	908778078736bd36f7a60a2d576d415cb8e000fa (diff)