From 4cbcc855382a06088e2f016f62cafdbcb7e40665 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Sun, 20 Mar 2022 00:40:44 +0000
Subject: gentoo resync : 20.03.2022

---
 .../App-XML-DocBook-Builder-0.100.300-r1.ebuild    |   2 +-
 app-text/App-XML-DocBook-Builder/Manifest          |   2 +-
 app-text/Manifest.gz                               | Bin 48422 -> 48403 bytes
 app-text/ansifilter/Manifest                       |   2 +-
 app-text/ansifilter/ansifilter-2.18.ebuild         |   5 +-
 app-text/antiword/Manifest                         |   1 -
 app-text/antiword/antiword-0.37-r1.ebuild          |  50 ---
 app-text/asciidoc/Manifest                         |   4 +-
 app-text/asciidoc/asciidoc-10.1.3.ebuild           |  48 +++
 app-text/asciidoc/asciidoc-9.1.0.ebuild            |   2 +-
 app-text/aspell/Manifest                           |   2 +-
 app-text/aspell/aspell-0.60.8-r3.ebuild            | 113 -------
 app-text/aspell/aspell-0.60.8-r4.ebuild            | 113 +++++++
 app-text/calibre/Manifest                          |   8 +-
 app-text/calibre/calibre-5.33.2.ebuild             | 315 -------------------
 app-text/calibre/calibre-5.35.0.ebuild             | 315 -------------------
 app-text/calibre/calibre-5.38.0.ebuild             | 316 +++++++++++++++++++
 app-text/calibre/calibre-5.39.0.ebuild             | 316 +++++++++++++++++++
 app-text/crf++/Manifest                            |   2 +-
 app-text/crf++/crf++-0.58.ebuild                   |   8 +-
 app-text/evince/Manifest                           |   4 +-
 app-text/evince/evince-40.4.ebuild                 | 127 --------
 app-text/evince/evince-41.3.ebuild                 |   6 +-
 app-text/expander/Manifest                         |   2 +-
 app-text/expander/expander-2.0.5-r2.ebuild         |   4 +-
 app-text/foliate/Manifest                          |   4 +-
 app-text/foliate/foliate-2.6.2.ebuild              |  51 ---
 app-text/foliate/foliate-2.6.4-r1.ebuild           |  52 +++
 app-text/foliate/foliate-2.6.4.ebuild              |  51 ---
 app-text/grip/Manifest                             |   2 +
 app-text/grip/grip-4.6.0.ebuild                    |  27 ++
 app-text/highlight/Manifest                        |   6 +-
 app-text/highlight/highlight-3.57-r100.ebuild      |  22 +-
 app-text/highlight/highlight-3.60.ebuild           |  22 +-
 app-text/highlight/highlight-4.1.ebuild            |  22 +-
 app-text/jabref/Manifest                           |   5 +
 .../files/jabref-2.10-javax.swing-java-9+.patch    | 313 ++++++++++++++++++
 .../files/jabref-2.10-skip-failing-tests.patch     | 349 +++++++++++++++++++++
 .../files/jabref-2.10-test-jvm-props-args.patch    |  49 +++
 app-text/jabref/files/jabref-2.10-test-prefs.xml   |  19 ++
 app-text/jabref/jabref-2.10-r7.ebuild              | 132 ++++++++
 app-text/kramdown-rfc2629/Manifest                 |   4 +
 .../kramdown-rfc2629-1.5.26.ebuild                 |  30 ++
 .../kramdown-rfc2629/kramdown-rfc2629-1.6.5.ebuild |  30 ++
 app-text/languagetool/Manifest                     |   4 -
 app-text/languagetool/languagetool-4.5.ebuild      |  66 ----
 app-text/languagetool/languagetool-4.6.ebuild      |  77 -----
 app-text/lesspipe/Manifest                         |  10 +-
 app-text/lesspipe/lesspipe-1.91.ebuild             |   5 +-
 app-text/lesspipe/lesspipe-2.01.ebuild             |  43 ---
 app-text/lesspipe/lesspipe-2.02.ebuild             |  43 ---
 app-text/lesspipe/lesspipe-2.03.ebuild             |  42 +++
 app-text/lesspipe/lesspipe-2.04-r1.ebuild          |  47 +++
 app-text/libetonyek/Manifest                       |   4 +-
 app-text/libetonyek/libetonyek-0.1.10.ebuild       |   4 +-
 app-text/libetonyek/libetonyek-9999.ebuild         |   8 +-
 app-text/libmspub/Manifest                         |   4 +-
 app-text/libmspub/libmspub-0.1.4.ebuild            |  10 +-
 app-text/libmspub/libmspub-9999.ebuild             |  10 +-
 app-text/libnumbertext/Manifest                    |   4 +-
 app-text/libnumbertext/libnumbertext-1.0.7.ebuild  |  24 --
 app-text/libnumbertext/libnumbertext-1.0.8.ebuild  |   2 +-
 app-text/lowdown/Manifest                          |   8 +-
 .../lowdown/files/lowdown-0.10.0-linking.patch     |   7 +-
 .../files/lowdown-0.10.0-pkgconfig-libmd.patch     |  11 +
 .../lowdown/files/lowdown-0.11.1-linking.patch     |  37 +++
 app-text/lowdown/lowdown-0.10.0-r1.ebuild          |  47 +++
 app-text/lowdown/lowdown-0.10.0.ebuild             |  46 ---
 app-text/lowdown/lowdown-0.11.1-r1.ebuild          |  45 +++
 app-text/master-pdf-editor/Manifest                |   6 +-
 .../master-pdf-editor-5.8.06.ebuild                |  42 ---
 .../master-pdf-editor-5.8.20-r1.ebuild             |  44 +++
 .../master-pdf-editor-5.8.20.ebuild                |  43 ---
 .../master-pdf-editor-5.8.33.ebuild                |  44 +++
 app-text/mdbook/Manifest                           |   2 +-
 app-text/mdbook/mdbook-0.4.15.ebuild               |   2 +-
 app-text/msort/Manifest                            |   2 +-
 app-text/msort/msort-8.53-r1.ebuild                |  46 +++
 app-text/msort/msort-8.53.ebuild                   |  46 ---
 app-text/mupdf/Manifest                            |   2 +-
 app-text/mupdf/mupdf-1.19.0.ebuild                 |   2 +-
 app-text/nuspell/Manifest                          |   2 +
 app-text/nuspell/nuspell-5.1.0.ebuild              |  51 +++
 app-text/openpaperwork-core/Manifest               |   6 +-
 .../openpaperwork-core-2.0.2.ebuild                |  20 --
 .../openpaperwork-core-2.0.3.ebuild                |  20 --
 .../openpaperwork-core-2.1.1.ebuild                |  20 ++
 app-text/openpaperwork-gtk/Manifest                |   6 +-
 .../openpaperwork-gtk-2.0.2.ebuild                 |  23 --
 .../openpaperwork-gtk-2.0.3.ebuild                 |  23 --
 .../openpaperwork-gtk-2.1.1.ebuild                 |  24 ++
 app-text/opensp/Manifest                           |   2 +-
 app-text/opensp/opensp-1.5.2-r7.ebuild             |   2 +-
 app-text/paperwork-backend/Manifest                |   6 +-
 .../paperwork-backend-2.0.2-r1.ebuild              |  32 --
 .../paperwork-backend-2.0.3.ebuild                 |  32 --
 .../paperwork-backend-2.1.1.ebuild                 |  32 ++
 app-text/paperwork/Manifest                        |   7 +-
 .../files/paperwork-2.0.3-desktop_file.patch       |  12 -
 app-text/paperwork/paperwork-2.0.2.ebuild          |  32 --
 app-text/paperwork/paperwork-2.0.3.ebuild          |  46 ---
 app-text/paperwork/paperwork-2.1.1.ebuild          |  43 +++
 app-text/pdfarranger/Manifest                      |   6 +-
 app-text/pdfarranger/pdfarranger-1.7.1.ebuild      |  51 ---
 app-text/pdfarranger/pdfarranger-1.8.1.ebuild      |  51 ---
 app-text/pdfarranger/pdfarranger-1.8.2.ebuild      |   2 +-
 app-text/po4a/Manifest                             |   2 +
 app-text/po4a/po4a-0.66.ebuild                     |  53 ++++
 app-text/podofo/Manifest                           |   2 +
 app-text/podofo/podofo-0.9.7.ebuild                | 114 +++++++
 app-text/poppler-data/Manifest                     |   2 +-
 app-text/poppler-data/poppler-data-0.4.11.ebuild   |   4 +-
 app-text/poppler/Manifest                          |  13 +-
 .../files/poppler-21.12.0-include-csetjmp.patch    |  27 --
 app-text/poppler/poppler-21.11.0.ebuild            | 126 --------
 app-text/poppler/poppler-21.12.0.ebuild            | 127 --------
 app-text/poppler/poppler-22.01.0.ebuild            |   2 +-
 app-text/poppler/poppler-22.02.0.ebuild            | 126 ++++++++
 app-text/poppler/poppler-22.03.0.ebuild            | 126 ++++++++
 app-text/poppler/poppler-9999.ebuild               |   2 +-
 app-text/pspresent/Manifest                        |   2 +-
 app-text/pspresent/pspresent-1.3-r1.ebuild         |   4 +-
 app-text/qpdf/Manifest                             |   8 +-
 app-text/qpdf/qpdf-10.5.0.ebuild                   |   4 +-
 app-text/qpdf/qpdf-10.6.1.ebuild                   |  88 ++++++
 app-text/qpdf/qpdf-10.6.2.ebuild                   |  89 ++++++
 app-text/recode/Manifest                           |   2 +
 app-text/recode/recode-3.7.12.ebuild               |  59 ++++
 app-text/ronn-ng/Manifest                          |   4 +-
 app-text/ronn-ng/ronn-ng-0.9.1-r1.ebuild           |   4 +-
 app-text/ronn-ng/ronn-ng-0.9.1.ebuild              |   4 +-
 app-text/ronn/Manifest                             |   2 +-
 app-text/ronn/ronn-0.7.3-r4.ebuild                 |   4 +-
 app-text/sigil/Manifest                            |   2 +-
 app-text/sigil/sigil-1.8.0.ebuild                  |   4 +-
 app-text/stardict/Manifest                         |   4 +-
 app-text/stardict/stardict-3.0.6-r4.ebuild         |  12 +-
 .../stardict/stardict-4.0.0_pre20170304-r1.ebuild  |  12 +-
 app-text/tesseract/Manifest                        |   4 +-
 app-text/tesseract/tesseract-5.0.0.ebuild          |  92 ------
 app-text/tesseract/tesseract-5.1.0.ebuild          |  92 ++++++
 app-text/trang/Manifest                            |   4 +-
 app-text/trang/trang-20151127.ebuild               |  79 -----
 app-text/trang/trang-20181222.ebuild               |   2 +-
 app-text/tree/Manifest                             |   2 +
 app-text/tree/tree-2.0.1.ebuild                    |  41 +++
 app-text/ttf2pk2/Manifest                          |   2 +-
 app-text/ttf2pk2/ttf2pk2-2.0_p20210325.ebuild      |   4 +-
 app-text/unpaper/Manifest                          |   2 +-
 app-text/unpaper/unpaper-6.1-r1.ebuild             |   4 +-
 app-text/webgen/Manifest                           |   2 -
 app-text/webgen/webgen-1.7.1.ebuild                |  52 ---
 app-text/wv2/Manifest                              |   2 +-
 app-text/wv2/wv2-0.4.2-r2.ebuild                   |  39 ---
 app-text/wv2/wv2-0.4.2-r3.ebuild                   |  39 +++
 app-text/xchm/Manifest                             |   5 +-
 app-text/xchm/xchm-1.32.ebuild                     |  47 ---
 app-text/xchm/xchm-1.33.ebuild                     |   2 +-
 app-text/xchm/xchm-9999.ebuild                     |  58 ----
 app-text/xmlstarlet/Manifest                       |   2 +-
 app-text/xmlstarlet/xmlstarlet-1.6.1.ebuild        |   4 +-
 app-text/xmlto/Manifest                            |   2 +-
 app-text/xmlto/xmlto-0.0.28-r8.ebuild              |   4 +-
 app-text/xournalpp/Manifest                        |   7 +-
 .../files/xournalpp-1.1.1-nocompress.patch         |  53 ++++
 .../xournalpp/files/xournalpp-1.1.1-nostrip.patch  |  31 ++
 app-text/xournalpp/xournalpp-1.1.1-r1.ebuild       |  52 +++
 app-text/xournalpp/xournalpp-1.1.1.ebuild          |  46 +++
 app-text/xournalpp/xournalpp-9999.ebuild           |  15 +-
 app-text/yelp-tools/Manifest                       |   4 +-
 app-text/yelp-tools/yelp-tools-40.0.ebuild         |  36 ---
 app-text/yelp-tools/yelp-tools-41.0.ebuild         |   4 +-
 app-text/zathura-cb/Manifest                       |   2 +
 app-text/zathura-cb/zathura-cb-0.1.9.ebuild        |  43 +++
 app-text/zathura-pdf-mupdf/Manifest                |  10 +-
 app-text/zathura-pdf-mupdf/metadata.xml            |   5 +-
 .../zathura-pdf-mupdf-0.3.6.ebuild                 |   4 +-
 .../zathura-pdf-mupdf-0.3.7-r1.ebuild              |   2 +-
 .../zathura-pdf-mupdf-0.3.8.ebuild                 |  40 +++
 .../zathura-pdf-mupdf-9999.ebuild                  |  15 +-
 app-text/zathura-ps/Manifest                       |   2 +
 app-text/zathura-ps/zathura-ps-0.2.7.ebuild        |  39 +++
 182 files changed, 3714 insertions(+), 2713 deletions(-)
 delete mode 100644 app-text/antiword/antiword-0.37-r1.ebuild
 create mode 100644 app-text/asciidoc/asciidoc-10.1.3.ebuild
 delete mode 100644 app-text/aspell/aspell-0.60.8-r3.ebuild
 create mode 100644 app-text/aspell/aspell-0.60.8-r4.ebuild
 delete mode 100644 app-text/calibre/calibre-5.33.2.ebuild
 delete mode 100644 app-text/calibre/calibre-5.35.0.ebuild
 create mode 100644 app-text/calibre/calibre-5.38.0.ebuild
 create mode 100644 app-text/calibre/calibre-5.39.0.ebuild
 delete mode 100644 app-text/evince/evince-40.4.ebuild
 delete mode 100644 app-text/foliate/foliate-2.6.2.ebuild
 create mode 100644 app-text/foliate/foliate-2.6.4-r1.ebuild
 delete mode 100644 app-text/foliate/foliate-2.6.4.ebuild
 create mode 100644 app-text/grip/grip-4.6.0.ebuild
 create mode 100644 app-text/jabref/files/jabref-2.10-javax.swing-java-9+.patch
 create mode 100644 app-text/jabref/files/jabref-2.10-skip-failing-tests.patch
 create mode 100644 app-text/jabref/files/jabref-2.10-test-jvm-props-args.patch
 create mode 100644 app-text/jabref/files/jabref-2.10-test-prefs.xml
 create mode 100644 app-text/jabref/jabref-2.10-r7.ebuild
 create mode 100644 app-text/kramdown-rfc2629/kramdown-rfc2629-1.5.26.ebuild
 create mode 100644 app-text/kramdown-rfc2629/kramdown-rfc2629-1.6.5.ebuild
 delete mode 100644 app-text/languagetool/languagetool-4.5.ebuild
 delete mode 100644 app-text/languagetool/languagetool-4.6.ebuild
 delete mode 100644 app-text/lesspipe/lesspipe-2.01.ebuild
 delete mode 100644 app-text/lesspipe/lesspipe-2.02.ebuild
 create mode 100644 app-text/lesspipe/lesspipe-2.03.ebuild
 create mode 100644 app-text/lesspipe/lesspipe-2.04-r1.ebuild
 delete mode 100644 app-text/libnumbertext/libnumbertext-1.0.7.ebuild
 create mode 100644 app-text/lowdown/files/lowdown-0.10.0-pkgconfig-libmd.patch
 create mode 100644 app-text/lowdown/files/lowdown-0.11.1-linking.patch
 create mode 100644 app-text/lowdown/lowdown-0.10.0-r1.ebuild
 delete mode 100644 app-text/lowdown/lowdown-0.10.0.ebuild
 create mode 100644 app-text/lowdown/lowdown-0.11.1-r1.ebuild
 delete mode 100644 app-text/master-pdf-editor/master-pdf-editor-5.8.06.ebuild
 create mode 100644 app-text/master-pdf-editor/master-pdf-editor-5.8.20-r1.ebuild
 delete mode 100644 app-text/master-pdf-editor/master-pdf-editor-5.8.20.ebuild
 create mode 100644 app-text/master-pdf-editor/master-pdf-editor-5.8.33.ebuild
 create mode 100644 app-text/msort/msort-8.53-r1.ebuild
 delete mode 100644 app-text/msort/msort-8.53.ebuild
 create mode 100644 app-text/nuspell/nuspell-5.1.0.ebuild
 delete mode 100644 app-text/openpaperwork-core/openpaperwork-core-2.0.2.ebuild
 delete mode 100644 app-text/openpaperwork-core/openpaperwork-core-2.0.3.ebuild
 create mode 100644 app-text/openpaperwork-core/openpaperwork-core-2.1.1.ebuild
 delete mode 100644 app-text/openpaperwork-gtk/openpaperwork-gtk-2.0.2.ebuild
 delete mode 100644 app-text/openpaperwork-gtk/openpaperwork-gtk-2.0.3.ebuild
 create mode 100644 app-text/openpaperwork-gtk/openpaperwork-gtk-2.1.1.ebuild
 delete mode 100644 app-text/paperwork-backend/paperwork-backend-2.0.2-r1.ebuild
 delete mode 100644 app-text/paperwork-backend/paperwork-backend-2.0.3.ebuild
 create mode 100644 app-text/paperwork-backend/paperwork-backend-2.1.1.ebuild
 delete mode 100644 app-text/paperwork/files/paperwork-2.0.3-desktop_file.patch
 delete mode 100644 app-text/paperwork/paperwork-2.0.2.ebuild
 delete mode 100644 app-text/paperwork/paperwork-2.0.3.ebuild
 create mode 100644 app-text/paperwork/paperwork-2.1.1.ebuild
 delete mode 100644 app-text/pdfarranger/pdfarranger-1.7.1.ebuild
 delete mode 100644 app-text/pdfarranger/pdfarranger-1.8.1.ebuild
 create mode 100644 app-text/po4a/po4a-0.66.ebuild
 create mode 100644 app-text/podofo/podofo-0.9.7.ebuild
 delete mode 100644 app-text/poppler/files/poppler-21.12.0-include-csetjmp.patch
 delete mode 100644 app-text/poppler/poppler-21.11.0.ebuild
 delete mode 100644 app-text/poppler/poppler-21.12.0.ebuild
 create mode 100644 app-text/poppler/poppler-22.02.0.ebuild
 create mode 100644 app-text/poppler/poppler-22.03.0.ebuild
 create mode 100644 app-text/qpdf/qpdf-10.6.1.ebuild
 create mode 100644 app-text/qpdf/qpdf-10.6.2.ebuild
 create mode 100644 app-text/recode/recode-3.7.12.ebuild
 delete mode 100644 app-text/tesseract/tesseract-5.0.0.ebuild
 create mode 100644 app-text/tesseract/tesseract-5.1.0.ebuild
 delete mode 100644 app-text/trang/trang-20151127.ebuild
 create mode 100644 app-text/tree/tree-2.0.1.ebuild
 delete mode 100644 app-text/webgen/webgen-1.7.1.ebuild
 delete mode 100644 app-text/wv2/wv2-0.4.2-r2.ebuild
 create mode 100644 app-text/wv2/wv2-0.4.2-r3.ebuild
 delete mode 100644 app-text/xchm/xchm-1.32.ebuild
 delete mode 100644 app-text/xchm/xchm-9999.ebuild
 create mode 100644 app-text/xournalpp/files/xournalpp-1.1.1-nocompress.patch
 create mode 100644 app-text/xournalpp/files/xournalpp-1.1.1-nostrip.patch
 create mode 100644 app-text/xournalpp/xournalpp-1.1.1-r1.ebuild
 create mode 100644 app-text/xournalpp/xournalpp-1.1.1.ebuild
 delete mode 100644 app-text/yelp-tools/yelp-tools-40.0.ebuild
 create mode 100644 app-text/zathura-cb/zathura-cb-0.1.9.ebuild
 create mode 100644 app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.3.8.ebuild
 create mode 100644 app-text/zathura-ps/zathura-ps-0.2.7.ebuild

(limited to 'app-text')

diff --git a/app-text/App-XML-DocBook-Builder/App-XML-DocBook-Builder-0.100.300-r1.ebuild b/app-text/App-XML-DocBook-Builder/App-XML-DocBook-Builder-0.100.300-r1.ebuild
index b7cdf2082ead..1bc0e918f218 100644
--- a/app-text/App-XML-DocBook-Builder/App-XML-DocBook-Builder-0.100.300-r1.ebuild
+++ b/app-text/App-XML-DocBook-Builder/App-XML-DocBook-Builder-0.100.300-r1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://www.shlomifish.org/open-source/projects/docmake/"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~riscv ~sparc ~x86"
 
 RDEPEND="dev-perl/Class-XSAccessor
 	virtual/perl-Getopt-Long
diff --git a/app-text/App-XML-DocBook-Builder/Manifest b/app-text/App-XML-DocBook-Builder/Manifest
index b9b816c6d3a0..c596a8598fbf 100644
--- a/app-text/App-XML-DocBook-Builder/Manifest
+++ b/app-text/App-XML-DocBook-Builder/Manifest
@@ -1,3 +1,3 @@
 DIST App-XML-DocBook-Builder-0.1003.tar.gz 18414 BLAKE2B d9a9442c46e171fdd8cd11cb997b8f1dd6ddd92c1ca03f0430be01828c0b46439a3aa14f6d68c2550f21bdee17871a8b314c2f1712b7810344d3a8385e9fea8d SHA512 421fdb84c2d9373ccdefa6b490bba1a78660414d27f470fbad48ac48178e3cb383345cd63a232bcf4ce13561e6775ff97397f5ab06c6142e1d8da34a92d6dcbb
-EBUILD App-XML-DocBook-Builder-0.100.300-r1.ebuild 594 BLAKE2B 7a769cb00bcc11dae9c83aded3cf588e399ad63c3040e7c1585017de6cfe24afb13bfed79fee447fd557674f6751f6a0c29544ef339c844fa9453eefaf25a9a8 SHA512 6c70262a35de8cc8b8410964de98f4cf5a6e21205010e1cc27e5bd409b659ee27a2cb94f2713bcc64db8f2045117c4501d933d06cae679143ea54d055d3f586a
+EBUILD App-XML-DocBook-Builder-0.100.300-r1.ebuild 601 BLAKE2B 0a99b53cbf8dbcc5aca5fa7bdfc251a2e67639c4d4f1aef88cff79293d28baba87d8ee71196e9c4da5684d3f81ed5dafbd65e15b4d9f2bb1b528c7ea3c3c667c SHA512 6fcad5e55c16ab130e4fbe1a458474fa61b798eaafe8c64e424bf9cfbc533d3d5fff212e52f8a3fdd344db8499f0545262461c53554b637289753c7b5b8692e3
 MISC metadata.xml 375 BLAKE2B 7b6956381a455fffbe920a0706a91819fd70eac409a10a32c7c609a85dfef6bf97a64d2781dcac0bb624fa64be2b56b8f1e2f2dc9d42b728c019e514839f6492 SHA512 dd707b431ec91e6cb9da5dc0e2b21937739e480d0e3f2fb42f8236d7f9c1bbe1f8e2f3d95b506c49c3a982b4769eb441eb306310b82cb425a4550b51728f6a1c
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 52dfca186322..bec273c14803 100644
Binary files a/app-text/Manifest.gz and b/app-text/Manifest.gz differ
diff --git a/app-text/ansifilter/Manifest b/app-text/ansifilter/Manifest
index 9f96feb71acf..fb50dc768431 100644
--- a/app-text/ansifilter/Manifest
+++ b/app-text/ansifilter/Manifest
@@ -1,3 +1,3 @@
 DIST ansifilter-2.18.tar.bz2 436432 BLAKE2B 43c592e83a967ee86404332a464d57d202a73651b2e29da2d1d21163d295b6efba96ecb5861dacfa89b8f567c0367f7a32b8e658f8cefad82c5982f2f2bf70bb SHA512 ef7febed1fc31f5c7503648e4fc0a7aefc3da8e30ea649bd6f03eac2904667fb779049106ccb77ad16fbf655e979f6651b25b84ab126c940c66bedee115a28e2
-EBUILD ansifilter-2.18.ebuild 1129 BLAKE2B 269f9616cb0092cf02bb95b40e6b06e8b5ae03142ce7d1782801f0be3036571141791d9c224217e07d1c1e716ed2b9901f989f8b1f27afc6365d27f607e15a4d SHA512 0dbc53979d988ca1fefb3fe811290dbfcf94b8000dbd30db2f98321e5ed7a0eff7395d766d2aa2bd9118ceec545171fd2e55e5fd6032ddc728ecc5cbd9af1bc0
+EBUILD ansifilter-2.18.ebuild 1104 BLAKE2B 0ea12120d3091076273db9c7d056bb36b902e464c525bfd832186688169ee9ac779ed787041e9dabbe96c2fb1f29366a1e4c2c2c1424331a956fc48d6c88284b SHA512 03834a0796df4733241ea1f329f2e783b7056d18a069f584a3c5f593aff797dc6717ccf50ce9e3f11c1da3aa841092c7990155d4dcd61a3706da83004277de59
 MISC metadata.xml 222 BLAKE2B b5daf033ea46a708411a54d1b465effb557d4f48cef8f0f4b6872917da7e8efbc9b69db6e04f6331c7a27b473d1ea83e2bdf54247e7c6b427c94c492e62ef21d SHA512 52f592a4e8342cae9f7a982302b75c68af50523b23b4d8a13b5434b150d3c0e812ba66a13b8d5d093e59b64ccbb550640064aabd9748a200e63d170d0b6f327d
diff --git a/app-text/ansifilter/ansifilter-2.18.ebuild b/app-text/ansifilter/ansifilter-2.18.ebuild
index 521a408a2afd..d93cd18e002d 100644
--- a/app-text/ansifilter/ansifilter-2.18.ebuild
+++ b/app-text/ansifilter/ansifilter-2.18.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit toolchain-funcs qmake-utils
+inherit desktop toolchain-funcs qmake-utils
 
 DESCRIPTION="Handles text files containing ANSI terminal escape codes"
 HOMEPAGE="http://www.andre-simon.de/"
@@ -55,8 +55,7 @@ src_install() {
 	dobin src/${PN}
 	if use qt5 ; then
 		dobin src/qt-gui/${PN}-gui
-		insinto /usr/share/applications
-		doins ${PN}.desktop
+		domenu ${PN}.desktop
 	fi
 
 	doman man/${PN}.1
diff --git a/app-text/antiword/Manifest b/app-text/antiword/Manifest
index 5c26e056022b..3861ff385411 100644
--- a/app-text/antiword/Manifest
+++ b/app-text/antiword/Manifest
@@ -1,6 +1,5 @@
 AUX antiword-0.37-CVE-2014-8123.patch 528 BLAKE2B 612718b3af9f3e91b5b755401a124c65268c482075b4f96ea71260f63e43d8fc5a1e009dce5a6ec527a56e013e4627855ea20259a6d72154e51ca0abf870554b SHA512 412884a236abb5ee75e5c707581c7e0158614d0e168cd9a8fe02dd8dcb8c0963ae2269c9575cd9cb9f4876efb3bec6bef7934fec5c7738530012495637a2d694
 DIST antiword-0.37.tar.gz 317884 BLAKE2B f47c815e2c6a1ddb33fefa33b3579fa5ba6e3900d3b9339350d28ebd0223853ad60ed717a1bccf4960c835427ebacc4de944548f9b354cd34889f0742de4e74a SHA512 6cd8fb9137238417544cf8754829a2d5296055d730ea62a8a025236baa79516190317d146401ff40cde73e1ee2c3c374a2ea01b2e5d24e149310bcabb8bfdce8
 DIST antiword-gentoo-patches-r2.tar.bz2 1747 BLAKE2B c01aa7c02539fb5148cb1ec01983a8406315bc3cb2f909118c022c2f218660919e6862582cda34dbd4c08a21beb02c928f685273853d1ff3350548957ae30cde SHA512 45ed3ee1c514a9ee78bc8963e56be18426b47ea628f02934dbcec83c2d632162e458f75f998da438daae4794fcce36fd8922a172804c0fc83c6f32c9a8092ffe
-EBUILD antiword-0.37-r1.ebuild 1359 BLAKE2B 439002b6ce33a663b68c282770dbb3b43f86bb8e3255a8e15027c5a480f0642cfa71359be9628a5ca0a77520d1aa45ff337aa7c00902a77ed198941b0b06f6f5 SHA512 5ec8979802319c426e7899a56700bed2beecc656a5469b86f86cb353efe172cd221e0940f65457894b1af607b511459e947a02eb488b55ca27a8b2089df9e544
 EBUILD antiword-0.37-r2.ebuild 1331 BLAKE2B f42119acb912de393b39f19df9815b8b00a2fc2a808400e53f16939eb089e7e69ea901e73252782ca8cef6719afae2cc8f5c3a03ac5990215bc0ce1317cab4be SHA512 a0a417107e6c9443308aaf715f1f369b91dce63b1f32eae49a7cabd330ef5791bd16d2cd585fa29b8ea9bc87d3120cc2297aaccbc158ef404ab14a723e2e7190
 MISC metadata.xml 343 BLAKE2B 43a8dd808338ef2c570ac118c0600029bb805033af3f7e70d8b3afd7e9c685949c4b4e006e1c5bc51b72f9b8ab54104a0f9c731223d73dd5909f04a5bd964526 SHA512 184ff7031a9864c1ee3daa6c3714d148216f556fd112a62c1c2e352f3eef08bd6a1813dbb46dde3a163cc69f59f06ff99570460e4af1c2d4a31085b9aa7043ce
diff --git a/app-text/antiword/antiword-0.37-r1.ebuild b/app-text/antiword/antiword-0.37-r1.ebuild
deleted file mode 100644
index b9ae5e10151d..000000000000
--- a/app-text/antiword/antiword-0.37-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit epatch toolchain-funcs
-
-IUSE="kde"
-PATCHVER="r2"
-DESCRIPTION="free MS Word reader"
-HOMEPAGE="http://www.winfield.demon.nl"
-SRC_URI="http://www.winfield.demon.nl/linux/${P}.tar.gz
-	https://dev.gentoo.org/~grobian/distfiles/${PN}-gentoo-patches-${PATCHVER}.tar.bz2"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 ~arm ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-
-src_prepare() {
-	# Makefile is a symlink to Makefile.Linux, avoid that we patch it by
-	# accident using patch <2.7, see bug #435492
-	rm Makefile || die
-
-	EPATCH_SUFFIX="patch" epatch "${WORKDIR}/${PN}-gentoo-patches-${PATCHVER}"
-
-	# Re-add convenience symlink, see above
-	ln -s Makefile.Linux Makefile
-
-	epatch "${FILESDIR}"/${P}-CVE-2014-8123.patch
-}
-
-src_configure() { :; }
-
-src_compile() {
-	emake PREFIX="${EPREFIX}" OPT="${CFLAGS}" CC="$(tc-getCC)" LD="$(tc-getCC)" \
-		LDFLAGS="${LDFLAGS}"
-}
-
-src_install() {
-	emake -j1 PREFIX="${EPREFIX}" DESTDIR="${D}" global_install
-
-	use kde || rm -f "${ED}"/usr/bin/kantiword
-
-	insinto /usr/share/${PN}/examples
-	doins Docs/testdoc.doc Docs/antiword.php
-
-	cd Docs
-	doman antiword.1
-	dodoc ChangeLog Exmh Emacs FAQ History Netscape QandA ReadMe Mozilla Mutt
-}
diff --git a/app-text/asciidoc/Manifest b/app-text/asciidoc/Manifest
index 0d18a9dd2520..6c50914c6468 100644
--- a/app-text/asciidoc/Manifest
+++ b/app-text/asciidoc/Manifest
@@ -1,9 +1,11 @@
 DIST asciidoc-10.1.1.tar.gz 214619 BLAKE2B b7dc12d57cc3ad72301335ea84aea45db1a1e98f13aebf17fac6cf86657c509daa48ce1755817076c1c82f0a61c68fa7b178bc78bc6fda7274708bfde619491a SHA512 7b2b1ed9ea32b7336c271faf1e40e3a24d3b3af803c87f9d5d32c2b40cadaed682fbbedc6ec67bbe5a51377812d18180128c27779d7190898446266adee92842
+DIST asciidoc-10.1.3.tar.gz 215537 BLAKE2B 61613ded3f0b6b08b097534d88a14ff4b3820077dac14d9136462fe01727ea3134f05b0ddd3d81b31f9a6c2654cc8b775d6e4eb85b9edf8812a16191a43f587f SHA512 b060cb547e008dc2d4ca4646826c0968a0907ac0a2c13d8503e68be69e0ecef12d9a2f742e4614411202b6ea5fff6975bed0dbc07931b0b07a1462841d19c9ab
 DIST asciidoc-9.0.5.new.tar.gz 1225334 BLAKE2B c3e428098dc4d71704ed13b54fd5f640b9de81d12939facb5faaf38a3123794e57201ecd9c312a22c220a2ec6b06c88a76ab47f05ffa972fc8751089b3471cfc SHA512 9125631fdee464f96f7e3c76a60fe37331905e9e55a81db27aece4065b246dc05a35db4c157dc7dbb2345eb95c153b474251d6a447d65774bf1b3f57e1883895
 DIST asciidoc-9.1.0.new.tar.gz 1249958 BLAKE2B 0a98f58f7604f84d704092313c38563634bad5d697d60d02760f3be1d2a78a97ee2488dda3a9918b02e0062710175c6513d600f3fbd850fe700bf3fa917a3980 SHA512 c30854a936228fe5bcf2f9305741fbc4b17ef088b2fa637d5f3b19c7803306085634fb71146f0b089c2fad01f986da71a4fae364139f520c0906525317c0c4a6
 DIST asciidoc-9.1.1.new.tar.gz 1259206 BLAKE2B da274d3a9389ee2e42ad1be70467f11d0164df3e6f9102e6ef1be6a802dbeb12898786fa1fe37a95755d0db8c9df5d5dd3faf000dfb73b701a83af3cc0261606 SHA512 74b83e8c8904fd761783c2f572d353656fc0794c6cb427f61e9179c9f80b6fc3b3ee8d028baba4e25eafe5f8cf5318f9984a5828849a793a7520f83e6fe50d66
 EBUILD asciidoc-10.1.1-r2.ebuild 1654 BLAKE2B 870db651ec6e6f6c2992eb18fbeb48f07df484bb16a0b70333a82a6bd1b374abca87dac6e8229c9898f753550547f734ea7288bb893d69b352d721084bcb15b8 SHA512 228c9778988ac516d182a143073f8208ad83012a056c88bdff1905eb22037cc46ba08aadb033cf23e3229762185ecbef1aaf6a7dddeebfee53dc5a396fff7e21
+EBUILD asciidoc-10.1.3.ebuild 1685 BLAKE2B 56b8bfdec5d77ff72cc4c6fe808a6367e0e53fbd248218670a65600522b58e69e93fe2d6d1df9bb68e83bd04c24901bcf8e7c2098f569f1638792b961b80cb43 SHA512 b35e06a0692f33085a45879867aef7699f82152006b7dae00041865500a259093a8f05007f736fea68b7e4d1abaeca4e38c209173a0327737240aac1ebb6e735
 EBUILD asciidoc-9.0.5-r1.ebuild 2329 BLAKE2B 61dd6902f330bff8023c6bb92d221ec7ea664332ce198380371ca16e4e08272d9f8ef16d3ef7e6e190545d8524a78123d06fbb49fe2baba0a818c71cc053e054 SHA512 dd4208ebd95a7f788ca93c8d3c4a7eec25aca0c8d09cd3182c53f1f5a63ba0808b2c661cea3bb92926b0ffc5629d71c59142991eef17ec1bd42054386aab822b
-EBUILD asciidoc-9.1.0.ebuild 2335 BLAKE2B abb52d1e593b9bcf266b65a27e62823d1fb9573c88b6104a48f1ea6d53b271e4099825217eca27f010e9323d4f0fe7d6be61792263b89ec14949dc87d6c632b2 SHA512 bd2cbea0a31aadd05784ba20d57c2f812a771c68323e4c3de88f8e4b3c5c94a9dab0c4906911e72e8b37d8be21398b030e3aa4af93eca34848864485dea2ba39
+EBUILD asciidoc-9.1.0.ebuild 2334 BLAKE2B 17cf7c01cdec7a9b24f82a82446e8dfb7033396efdd4941660a47fc9d87938a52e18b20ce739797ba0409c8a2f27fff3db131a56c6f45a93d36062a166ea0fef SHA512 e3fdf9af5fc2ddfbf935616ac49a13691952fc2f6fefb16b1bfd7b2c35428ad4730ea01a8eda7402a80982e5d4d98b15e71fb1aa172b74b758916939188b774b
 EBUILD asciidoc-9.1.1.ebuild 2342 BLAKE2B e5c950868bcb3d5e185540c588433deda3ad4d1197cc3062002d66fd8af18471552ad59bc4c6b48203bfc1d22e292bb83ae5e42001f300eb785b424e439e3837 SHA512 b4c7e2232546238a9a4b46b2a59036e64aa13eb46e39747d06f1b55d2a3345f0670a8039f68c463d395053945b14b7144f70e511d66fdabd579707501533dcd7
 MISC metadata.xml 380 BLAKE2B b305117b6bc883045d912377e57fde1a62e33ae3194b722d88e3afa0c062d913c1c3ccdc62d789ee97db89fb4fc1b02edc0dd97d2dfdc1a112b71962d35ee819 SHA512 027c6862485a219997037b8d418a03fbb7da9f4a50cfefac573c3f87d7f1c23cc7e82206e0b3c3ee000a7e05dfc446c340c068ca089bc1af16ed9ddeeb378aa4
diff --git a/app-text/asciidoc/asciidoc-10.1.3.ebuild b/app-text/asciidoc/asciidoc-10.1.3.ebuild
new file mode 100644
index 000000000000..705aa07cc25d
--- /dev/null
+++ b/app-text/asciidoc/asciidoc-10.1.3.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+inherit distutils-r1 optfeature readme.gentoo-r1
+
+DESCRIPTION="A plain text human readable/writable document format"
+HOMEPAGE="https://asciidoc.org/ https://github.com/asciidoc-py/asciidoc-py/"
+# Could use the github tarball but we need autotools then
+#SRC_URI="https://github.com/asciidoc-py/asciidoc-py/releases/download/${PV}/${P}.tar.gz"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND="app-text/docbook-xml-dtd:4.5
+	>=app-text/docbook-xsl-stylesheets-1.75
+	dev-libs/libxslt
+	dev-libs/libxml2:2"
+
+DOC_CONTENTS="
+If you are going to use a2x, please also look at a2x(1) under
+REQUISITES for a list of runtime dependencies.
+"
+
+src_install() {
+	distutils-r1_src_install
+
+	# TODO: Consider using Debian patch to allow /usr/share?
+	insinto /usr/share/asciidoc
+	doins -r asciidoc/resources/.
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+
+	optfeature "music filter support" "media-sound/lilypond virtual/imagemagick-tools"
+	optfeature "source filter support" "dev-util/source-highlight dev-python/pygments app-text/highlight"
+	optfeature "latex filter support" "dev-texlive/texlive-latex app-text/dvipng" "dev-texlive/texlive-latex app-text/dvisvgm"
+	optfeature "graphviz filter support" "media-gfx/graphviz"
+}
diff --git a/app-text/asciidoc/asciidoc-9.1.0.ebuild b/app-text/asciidoc/asciidoc-9.1.0.ebuild
index ecac9b882fd4..437f83acac43 100644
--- a/app-text/asciidoc/asciidoc-9.1.0.ebuild
+++ b/app-text/asciidoc/asciidoc-9.1.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/asciidoc-py/asciidoc-py/releases/download/${PV}/${P}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/app-text/aspell/Manifest b/app-text/aspell/Manifest
index 4f7b0ae50aa3..2a02e715dc69 100644
--- a/app-text/aspell/Manifest
+++ b/app-text/aspell/Manifest
@@ -5,5 +5,5 @@ AUX aspell-0.60.6.1-clang.patch 1288 BLAKE2B fa2da2471f3ec3c6d5c9a98c0afd000bd86
 AUX aspell-0.60.6.1-unicode.patch 8273 BLAKE2B ceadde03ffb1904e58c76074444013d2517a20dafeb5847963b6d8e3dbd4ab7fb00fe0d13fd26d3381edeb4e68b2feefb2c8b44186336bdfe197d483920dd509 SHA512 8601183d2e84801c193f5a4412e021ff79ccd27e031c0e8ec85a879619868d13389cb60fb0f4fa971114da64645dd4fc5cbe480f49e88d575826cf429a533b98
 AUX aspell-0.60.8-cve-2019-25051.patch 2880 BLAKE2B b181caf27feae7eae908c92496a5f05f7e7f1f1a089c460b757c2f745b97f5339d4c8e13cf851e704cff7952c5dcd5ad0a8496ec1ae45c1e83fb1fa577134c63 SHA512 529f3f4737d2e19f7571f4c8666b1cd089cc4e9dfdaa52dc468919f01ce9f8f8112d8fe8afda295b3dfb92f5e0c2bbd79bf1ec69f06c163c32eb28f0168ab263
 DIST aspell-0.60.8.tar.gz 3486448 BLAKE2B a72e70af65749059a576740377f93b20ab283f73fa7919894f6af189b5aa73581fa0410800851c9396e7d13f4cbc2f7edc23c53d46874d0389ffdb2432ff08c2 SHA512 8ef4952c553b6234dfe777240d2d97beb13ef9201e18d56bee3b5068d13525db3625b7130d9f5122f7c529da0ccb0c70eb852a81472a7d15fb7c4ee5ba21cd29
-EBUILD aspell-0.60.8-r3.ebuild 2836 BLAKE2B f263110d907b5d3906863e2196f873073b209662d4a885fd5d2dd0d58e2f4fc81f743f0b7b9d28506656ac350ff4a37419229870897de24308eb465ada95c32d SHA512 f2275e2d87c00600d7ad265db2a6822f3ac7af84b0474fb500acdf70ed152cb48969e8d41c0e5703e3a6a2aaa4f26e6be6b17c03cb1a71f9cb8770410dbd33d2
+EBUILD aspell-0.60.8-r4.ebuild 2836 BLAKE2B 5553d8ec37b515b00e56d229a7e53b0a24bcccc775b77559b43324486968acaa048507336733085866c0ae44bc3a25341e94b807e8f371cc240ac6ca7b5ddf61 SHA512 94d920384d06b497dd0113a6473b17d3adbc8222386cabd474da167ef2a1e043d4af2b7f097751fdac9cca91e4a9f201d5b00dc4efab42c570d7951c7ad6764b
 MISC metadata.xml 251 BLAKE2B ba937d5724c861b8bfd1d287a325357d6a63656cf5c2314185a486be769eb22b39fa780b38c05407bce5f0707585d499a849a28e15a2fde9eebba6f529e686a3 SHA512 0fb5b55fc7db96153970767478727504fd0e87c1c8a77593f1f30720064e95776b92e4993f9aed076c983eee5cebca446fe8894e36fbcc02802bb1c158747dd3
diff --git a/app-text/aspell/aspell-0.60.8-r3.ebuild b/app-text/aspell/aspell-0.60.8-r3.ebuild
deleted file mode 100644
index 499e003d437d..000000000000
--- a/app-text/aspell/aspell-0.60.8-r3.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic libtool toolchain-funcs
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="Free and Open Source spell checker designed to replace Ispell"
-HOMEPAGE="http://aspell.net/"
-SRC_URI="mirror://gnu/aspell/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="LGPL-2.1"
-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 ~x86-solaris"
-IUSE="nls unicode"
-
-# All available language app-dicts/aspell-* packages.
-LANGUAGES=( af am ar ast az be bg bn br ca cs csb cy da de de-1901 el en eo es et fa
-	fi fo fr fy ga gd gl grc gu gv he hi hil hr hsb hu hus hy ia id is it kn ku
-	ky la lt lv mg mi mk ml mn mr ms mt nb nds nl nn no ny or pa pl pt-PT pt-BR
-	qu ro ru rw sc sk sl sr sv sw ta te tet tk tl tn tr uk uz vi wa yi zu
-)
-
-for LANG in ${LANGUAGES[@]}; do
-	IUSE+=" l10n_${LANG}"
-
-	case ${LANG} in
-		de-1901)
-			DICT="de-alt"
-			;;
-		pt-BR)
-			DICT="pt-br"
-			;;
-		pt-PT)
-			DICT="pt"
-			;;
-		*)
-			DICT="${LANG}"
-			;;
-	esac
-
-	PDEPEND+=" l10n_${LANG}? ( app-dicts/aspell-${DICT} )"
-done
-unset DICT LANG LANGUAGES
-
-RDEPEND="
-	sys-libs/ncurses:=[unicode(+)?]
-	nls? ( virtual/libintl )
-"
-
-DEPEND="${RDEPEND}"
-
-BDEPEND="
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-"
-
-HTML_DOCS=( manual/aspell{,-dev}.html )
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.60.5-nls.patch"
-	"${FILESDIR}/${PN}-0.60.5-solaris.patch"
-	"${FILESDIR}/${PN}-0.60.6-darwin-bundles.patch"
-	"${FILESDIR}/${PN}-0.60.6.1-clang.patch"
-	"${FILESDIR}/${PN}-0.60.6.1-unicode.patch"
-	"${FILESDIR}/${PN}-0.60.8-cve-2019-25051.patch"
-)
-
-src_prepare() {
-	default
-
-	rm m4/lt* m4/libtool.m4 || die
-	eautoreconf
-	elibtoolize --reverse-deps
-
-	# Parallel install of libtool libraries doesn't always work.
-	# https://lists.gnu.org/archive/html/libtool/2011-03/msg00003.html
-	# This has to be after automake has run so that we don't clobber
-	# the default target that automake creates for us.
-	echo 'install-filterLTLIBRARIES: install-libLTLIBRARIES' >> Makefile.in || die
-
-	# The unicode patch breaks on Darwin as NCURSES_WIDECHAR won't get set any more.
-	[[ ${CHOST} == *-darwin* ]] || [[ ${CHOST} == *-musl* ]] && use unicode && append-cppflags -DNCURSES_WIDECHAR=1
-}
-
-src_configure() {
-	local myeconfargs=(
-		--disable-static
-		$(use_enable nls)
-		$(use_enable unicode)
-		--sysconfdir="${EPREFIX}"/etc/aspell
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	docinto examples
-	dodoc "${S}"/examples/*.c
-
-	# Install Aspell/Ispell compatibility scripts.
-	newbin scripts/ispell ispell-aspell
-	newbin scripts/spell spell-aspell
-
-	# As static build has been disabled,
-	# all .la files can be deleted unconditionally.
-	find "${ED}" -type f -name '*.la' -delete || die
-}
diff --git a/app-text/aspell/aspell-0.60.8-r4.ebuild b/app-text/aspell/aspell-0.60.8-r4.ebuild
new file mode 100644
index 000000000000..605340fb6230
--- /dev/null
+++ b/app-text/aspell/aspell-0.60.8-r4.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic libtool toolchain-funcs
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="Free and Open Source spell checker designed to replace Ispell"
+HOMEPAGE="http://aspell.net/"
+SRC_URI="mirror://gnu/aspell/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="LGPL-2.1"
+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 ~x86-solaris"
+IUSE="nls unicode"
+
+# All available language app-dicts/aspell-* packages.
+LANGUAGES=( af am ar ast az be bg bn br ca cs csb cy da de de-1901 el en eo es et fa
+	fi fo fr fy ga gd gl grc gu gv he hi hil hr hsb hu hus hy ia id is it kn ku
+	ky la lt lv mg mi mk ml mn mr ms mt nb nds nl nn no ny or pa pl pt-PT pt-BR
+	qu ro ru rw sc sk sl sr sv sw ta te tet tk tl tn tr uk uz vi wa yi zu
+)
+
+for LANG in ${LANGUAGES[@]}; do
+	IUSE+=" l10n_${LANG}"
+
+	case ${LANG} in
+		de-1901)
+			DICT="de-alt"
+			;;
+		pt-BR)
+			DICT="pt-br"
+			;;
+		pt-PT)
+			DICT="pt"
+			;;
+		*)
+			DICT="${LANG}"
+			;;
+	esac
+
+	PDEPEND+=" l10n_${LANG}? ( app-dicts/aspell-${DICT} )"
+done
+unset DICT LANG LANGUAGES
+
+RDEPEND="
+	sys-libs/ncurses:=[unicode(+)?]
+	nls? ( virtual/libintl )
+"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+"
+
+HTML_DOCS=( manual/aspell{,-dev}.html )
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.60.5-nls.patch"
+	"${FILESDIR}/${PN}-0.60.5-solaris.patch"
+	"${FILESDIR}/${PN}-0.60.6-darwin-bundles.patch"
+	"${FILESDIR}/${PN}-0.60.6.1-clang.patch"
+	"${FILESDIR}/${PN}-0.60.6.1-unicode.patch"
+	"${FILESDIR}/${PN}-0.60.8-cve-2019-25051.patch"
+)
+
+src_prepare() {
+	default
+
+	rm m4/lt* m4/libtool.m4 || die
+	eautoreconf
+	elibtoolize --reverse-deps
+
+	# Parallel install of libtool libraries doesn't always work.
+	# https://lists.gnu.org/archive/html/libtool/2011-03/msg00003.html
+	# This has to be after automake has run so that we don't clobber
+	# the default target that automake creates for us.
+	echo 'install-filterLTLIBRARIES: install-libLTLIBRARIES' >> Makefile.in || die
+
+	# The unicode patch breaks on Darwin as NCURSES_WIDECHAR won't get set any more.
+	[[ ${CHOST} == *-darwin* ]] || [[ ${CHOST} == *-musl* ]] && use unicode && append-cppflags -DNCURSES_WIDECHAR=1
+}
+
+src_configure() {
+	local myeconfargs=(
+		--disable-static
+		$(use_enable nls)
+		$(use_enable unicode)
+		--sysconfdir="${EPREFIX}"/etc/aspell
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	docinto examples
+	dodoc "${S}"/examples/*.c
+
+	# Install Aspell/Ispell compatibility scripts.
+	newbin scripts/ispell ispell-aspell
+	newbin scripts/spell spell-aspell
+
+	# As static build has been disabled,
+	# all .la files can be deleted unconditionally.
+	find "${ED}" -type f -name '*.la' -delete || die
+}
diff --git a/app-text/calibre/Manifest b/app-text/calibre/Manifest
index 0df2ef48f422..8be175c439e8 100644
--- a/app-text/calibre/Manifest
+++ b/app-text/calibre/Manifest
@@ -8,9 +8,9 @@ AUX calibre-server-3.conf 541 BLAKE2B 06593633721e6adf2cf2077dffa83953eea46ccdcd
 AUX calibre-server-3.init 1796 BLAKE2B f87d785d6f6fc10fa648d40944ec8538027854bb872d9a3be6b5b35b0abf3cda1e4e93874a9422914da5eb4287f193459733956e3f1e25e61bec0c214c552c99 SHA512 88110ded1b9c6cf8d3bfc3d5889654f77578f9d299e88daea9023767b930082e00fbddbb92a6e43c46d900248f3684232d93396ec1d0e784c7ec14b44783f98a
 DIST calibre-5.16.0-SIP-v4.patch.xz 6768 BLAKE2B b939233266c7cab0fa71ccdeb748bbcffbf16248081ccf0ab313420fe3898954da71e0796b3d6c44e93c636113221f95fa6affc6be97bf41f4086a909b2849f9 SHA512 eb19e6bb328f60eb4af2c38d54c3d2a09989d41d71d27de10ab5ae443af902c3c12fc70042d4735dd785573cb63bb7d7a10ae5f7ed72afc1e1a9c6aacaf64aec
 DIST calibre-5.16.1.tar.xz 36757204 BLAKE2B 71114eed723180142f5428a680d8c5ceabcd007acbc6a70a9298e45a9f21fc793f0ef86bf60b36c96bbd15e9e3f8d8638d179872fb6ff1f9b9f5e31a93e65ba1 SHA512 41cf29cc32c7af08215baf80609f8f099d44f2b82d34181451cbf3ed1648e07d64712dba9ff0ddec5bad3d342c7d8bde40bb822f6bd5fb93a4b29d25cf188aae
-DIST calibre-5.33.2.tar.xz 37081104 BLAKE2B 7ef40e39d47b10378918dcdefbec5925d9a43f47c345ccb6fd8811b99a2c417923467724f3ba92152b0951e473af7dd20dcb779e1fc6ad7970ac527fc06fe09c SHA512 5886730000005f4e36373ef6d0b3da4e4f06941886f05d1703420720c16aa913dcfca9358c33e4fcec764f0e4bd24e0223ff35421b41f1cc3f818d6d53896d64
-DIST calibre-5.35.0.tar.xz 37801424 BLAKE2B fcef3dfc3fa09d3a6324b3b9a860a3f0eb4cfe1311df84aea39beed9c0f42e620bfe3ec1a33c89e0e701b955fe44cf9b15f1e4b0f24529847c9b28d2eb7b2fa2 SHA512 b99a5c86a48d29bcc6f6188f9e4a20fe8ac1c4115147a964596e2bc3635d20c2556ae0be90c7deac95d4ef430b6ce6c7b712510358f71a22817c9360203b1f11
+DIST calibre-5.38.0.tar.xz 38365980 BLAKE2B 1c6939e69abde52426d32ab56a91f9b31f687f1d20792c5b360bf5563d72384db395b29e63d8becc1e196f54522a8643588109891943eb1fa525a5395873bb3e SHA512 2744e9d0d3f6daa578360ffb8334adbc49b4dc41100fbe0820b73e4a5a1e24c70c1e75bf1f03b9590f2a64d6c0c7710b26884356567f51200d5c00fe23ed5772
+DIST calibre-5.39.0.tar.xz 38372008 BLAKE2B e56513c918d7ac3e7f1b28e98dc82c29170577991714185791b0723daa4adbd404a6fac6584c7d2ad7ceafc19ab6aee519ab0c2d5f0bcc66f4de6236d7096b68 SHA512 ea6c739339603abea890a06f43c16522746352bde3abaebd6f2fa64771ec63800a62bd7f0cd47d1c7fb865a6cd73f9ff7522d71d7f4f593247f8eeb93a9263f6
 EBUILD calibre-5.16.1-r1.ebuild 8515 BLAKE2B c9dc7b66d93d6020cde09a360b0aa92894eafab75e7ca4f18a1a9a9286c6eb4f2af17fb162583fcc05088775abd0fa28ff849888775d964a396ab09cfcc02eea SHA512 cd76c560e8acfeb4e41de7ae8cce3fd4294b54ac7bee585ed562a596791054a7ad2918f09105b86587271002f7690b681ac9bc3e53bf1e5657b80f94aa37cbe9
-EBUILD calibre-5.33.2.ebuild 10358 BLAKE2B 5a45a111ce35949075dd77b7f3113456f22613fb4957f031cce2878eb5706c47393b09cdc75846ab89047f87a4f644df6f723b577663a0f8b0c06043590b4009 SHA512 95f4c46743d61ce1deef6f32e4eb7bc703da29e35064703e1a9d7b5990b3147bfa7c6f3a445746a2eff1712f77ec9940bc278b7d0a409ec3953149384a657337
-EBUILD calibre-5.35.0.ebuild 10358 BLAKE2B 24d8c5fb1ce51010fe59b35b38f6935b19604c05dac80b146f26b0ba470c3ca8dfa1ced3321c864cc5f90314b4f25dd14151511e01cacd41830a5d53f58f685d SHA512 9e6c9112a25ddbdc922fb204c6d9735d82cbfdbf13bfdee68501ec1db38512e08ba94459737ca54680505766e744eaf1fc71eac19df17341da8d6c8f8cebbbdb
+EBUILD calibre-5.38.0.ebuild 10398 BLAKE2B 4d0a5485c6d720e270adb31cbc442106c0289a3807d6a18fb0f0c24e519d6f7e15af5ebf978d3f947ccc44703fbea8d2b942117640daab29456241897d1cdf9e SHA512 c8af58ae4cf0a8d7895444eb044fe68fb69919efb0324ea6b4c6fb94ed3b66349deeb60bd03959f10139be3b639b7ce7939de37bd0dded54dd932e1d2cfc9660
+EBUILD calibre-5.39.0.ebuild 10398 BLAKE2B 4d0a5485c6d720e270adb31cbc442106c0289a3807d6a18fb0f0c24e519d6f7e15af5ebf978d3f947ccc44703fbea8d2b942117640daab29456241897d1cdf9e SHA512 c8af58ae4cf0a8d7895444eb044fe68fb69919efb0324ea6b4c6fb94ed3b66349deeb60bd03959f10139be3b639b7ce7939de37bd0dded54dd932e1d2cfc9660
 MISC metadata.xml 304 BLAKE2B 0d93b1c7606c37cb8b7308b507a1d2988a05f780a93ae80c98e021f5af75128954d57b102afc1d96728872c81bf0adc40e32b31197dfa825cd040af3a8739fb7 SHA512 e193c0b78ed4140b695c44d273310207c9f2f745bf31589c69e81230a9eed68fa1c361c1e3f68a60e135ef0628aa480002229871f4a50f4000aea6df7e5f067d
diff --git a/app-text/calibre/calibre-5.33.2.ebuild b/app-text/calibre/calibre-5.33.2.ebuild
deleted file mode 100644
index 7b6a8c3a07b4..000000000000
--- a/app-text/calibre/calibre-5.33.2.ebuild
+++ /dev/null
@@ -1,315 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..9} )
-PYTHON_REQ_USE="ipv6(+),sqlite,ssl"
-
-inherit toolchain-funcs python-single-r1 xdg-utils
-
-DESCRIPTION="Ebook management application"
-HOMEPAGE="https://calibre-ebook.com/"
-SRC_URI="https://download.calibre-ebook.com/${PV}/${P}.tar.xz"
-
-LICENSE="
-	GPL-3+
-	GPL-3
-	GPL-2+
-	GPL-2
-	GPL-1+
-	LGPL-3+
-	LGPL-2.1+
-	LGPL-2.1
-	BSD
-	MIT
-	Old-MIT
-	Apache-2.0
-	public-domain
-	|| ( Artistic GPL-1+ )
-	CC-BY-3.0
-	OFL-1.1
-	PSF-2
-"
-KEYWORDS="~amd64 ~arm ~x86"
-SLOT="0"
-IUSE="ios +udisks"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND="${PYTHON_DEPS}
-	>=app-text/hunspell-1.7:=
-	>=app-text/podofo-0.9.6_pre20171027:=
-	>=app-text/poppler-0.26.5[qt5]
-	dev-libs/glib:2=
-	dev-libs/hyphen:=
-	>=dev-libs/icu-57.1:=
-	dev-libs/libinput:=
-	>=dev-libs/dbus-glib-0.106
-	dev-libs/snowball-stemmer:=
-	>=sys-apps/dbus-1.10.8
-	$(python_gen_cond_dep '
-		app-accessibility/speech-dispatcher[python,${PYTHON_USEDEP}]
-		>=dev-python/apsw-3.25.2_p1[${PYTHON_USEDEP}]
-		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
-		dev-python/cchardet[${PYTHON_USEDEP}]
-		>=dev-python/chardet-3.0.3[${PYTHON_USEDEP}]
-		>=dev-python/cssselect-0.7.1[${PYTHON_USEDEP}]
-		>=dev-python/css-parser-1.0.4[${PYTHON_USEDEP}]
-		>=dev-python/dbus-python-1.2.4[${PYTHON_USEDEP}]
-		dev-python/dnspython[${PYTHON_USEDEP}]
-		>=dev-python/feedparser-5.2.1[${PYTHON_USEDEP}]
-		>=dev-python/html2text-2019.8.11[${PYTHON_USEDEP}]
-		>=dev-python/html5-parser-0.4.9[${PYTHON_USEDEP}]
-		dev-python/jeepney[${PYTHON_USEDEP}]
-		>=dev-python/lxml-3.8.0[${PYTHON_USEDEP}]
-		>=dev-python/markdown-3.0.1[${PYTHON_USEDEP}]
-		>=dev-python/mechanize-0.3.5[${PYTHON_USEDEP}]
-		>=dev-python/msgpack-0.6.2[${PYTHON_USEDEP}]
-		>=dev-python/netifaces-0.10.5[${PYTHON_USEDEP}]
-		>=dev-python/pillow-3.2.0[${PYTHON_USEDEP}]
-		>=dev-python/psutil-4.3.0[${PYTHON_USEDEP}]
-		>=dev-python/pychm-0.8.6[${PYTHON_USEDEP}]
-		dev-python/pycryptodome[${PYTHON_USEDEP}]
-		>=dev-python/pygments-2.3.1[${PYTHON_USEDEP}]
-		>=dev-python/python-dateutil-2.5.3[${PYTHON_USEDEP}]
-		>=dev-python/PyQt5-5.15.5_pre2107091435[gui,svg,widgets,network,printsupport,${PYTHON_USEDEP}]
-		>=dev-python/PyQt-builder-1.10.3[${PYTHON_USEDEP}]
-		>=dev-python/PyQtWebEngine-5.15.5_pre2108100905[${PYTHON_USEDEP}]
-		dev-python/regex[${PYTHON_USEDEP}]
-		dev-python/zeroconf[${PYTHON_USEDEP}]
-	')
-	dev-qt/qtcore:5=
-	dev-qt/qtdbus:5=
-	dev-qt/qtgui:5=[jpeg]
-	>=dev-qt/qtwebengine-5.12
-	dev-qt/qtwidgets:5=
-	dev-util/desktop-file-utils
-	dev-util/gtk-update-icon-cache
-	media-fonts/liberation-fonts
-	media-libs/fontconfig:=
-	>=media-libs/freetype-2:=
-	>=media-libs/libmtp-1.1.11:=
-	>=media-libs/libwmf-0.2.8
-	>=media-gfx/optipng-0.7.6
-	>=sys-libs/zlib-1.2.11:=
-	virtual/libusb:1=
-	x11-libs/libxkbcommon:=
-	x11-libs/libX11:=
-	x11-libs/libXext:=
-	x11-libs/libXrender:=
-	x11-misc/shared-mime-info
-	>=x11-misc/xdg-utils-1.0.2-r2
-	ios? (
-		>=app-pda/usbmuxd-1.0.8
-		>=app-pda/libimobiledevice-1.2.0
-	)
-	udisks? ( virtual/libudev )"
-RDEPEND="${COMMON_DEPEND}
-	udisks? ( sys-fs/udisks:2 )"
-DEPEND="${COMMON_DEPEND}"
-BDEPEND="$(python_gen_cond_dep '
-		>=dev-python/setuptools-23.1.0[${PYTHON_USEDEP}]
-		>=dev-python/sip-5[${PYTHON_USEDEP}]
-	')
-	>=virtual/podofo-build-0.9.6_pre20171027
-	virtual/pkgconfig"
-
-PATCHES=(
-	# Don't prompt the user for updates - they've installed via
-	# an ebuild.
-	"${FILESDIR}/${PN}-2.9.0-no_updates_dialog.patch"
-
-	# Skip calling a binary (JxrDecApp) from libjxr which is used for tests
-	# We don't (yet?) package libjxr and it seems to be dead upstream
-	# (last commit in 2017)
-	"${FILESDIR}/${PN}-5.31.0-jxr-test.patch"
-
-	# TODO:
-	# test_qt tries to load a bunch of images using Qt and it currently fails
-	# due to some presumably missing dependencies. This is important and
-	# we need to look into it, but at time of writing, none of the tests
-	# are even bring run, so I'd like to return to this later.
-	# We don't want to skip test_qt entirely, so just skip this particular
-	# assert for now.
-	"${FILESDIR}/${PN}-5.31.0-qt-image-test.patch"
-)
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]] && tc-is-gcc && [[ $(gcc-major-version) -lt 6 ]]; then
-		eerror "Calibre cannot be built with this version of gcc."
-		eerror "You need at least gcc-6.0"
-		die "Your C compiler is too old for this package."
-	fi
-}
-
-src_prepare() {
-	default
-
-	# Warning:
-	#
-	# While it might be rather tempting to add yet another sed here,
-	# please don't. There have been several bugs in Gentoo's packaging
-	# of calibre from seds-which-become-stale. Please consider
-	# creating a patch instead, but in any case, run the test suite
-	# and ensure it passes.
-	#
-	# If in doubt about a problem, checking Fedora or Arch Linux's packaging
-	# is recommended, as Arch Linux's PKGBUILD is maintained by a Calibre
-	# contributor. Or just ask them.
-
-	# Fix outdated version constant.
-	#sed -e "s#\\(^numeric_version =\\).*#\\1 (${PV//./, })#" \
-	#	-i src/calibre/constants.py || \
-	#	die "sed failed to patch constants.py"
-
-	# Avoid sandbox violation in /usr/share/gnome/apps when linux.py
-	# calls xdg-* (bug #258938).
-	sed -e "s|'xdg-desktop-menu', 'install'|\\0, '--mode', 'user'|" \
-		-e "s|check_call(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \
-		-e "s|\\(CurrentDir(tdir)\\), \\\\\$|\\1:|" \
-		-e "s|, PreserveMIMEDefaults():|:|" \
-		-e "s|'xdg-icon-resource', 'install'|\\0, '--mode', 'user'|" \
-		-e "s|cmd\[2\]|cmd[4]|" \
-		-e "s|cc(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \
-		-e "s|'xdg-mime', 'install'|\\0, '--mode', 'user'|" \
-		-i src/calibre/linux.py || die "sed failed to patch linux.py"
-
-	# Disable unnecessary privilege dropping for bug #287067.
-	sed -e "s:if os.geteuid() == 0:if False and os.geteuid() == 0:" \
-		-i setup/install.py || die "sed failed to patch install.py"
-	sed -e "/^            os.chdir(os.path.join(src_dir, 'build'))$/a\
-\\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ self.check_call(['sed', \
-'-e', 's|^CFLAGS .*|\\\\\\\\0 ${CFLAGS}|', \
-'-e', 's|^CXXFLAGS .*|\\\\\\\\0 ${CXXFLAGS}|', \
-'-e', 's|^LFLAGS .*|\\\\\\\\0 ${LDFLAGS}|', \
-'-i', os.path.join(os.path.basename(src_dir), 'Makefile')])" \
-		-e "s|open(self.j(bdir, '.qmake.conf'), 'wb').close()|open(self.j(bdir, '.qmake.conf'), 'wb').write(b'QMAKE_LFLAGS += ${LDFLAGS}')|" \
-		-i setup/build.py || die "sed failed to patch build.py"
-}
-
-src_compile() {
-	# TODO: get qmake called by setup.py to respect CC and CXX too
-	tc-export CC CXX
-
-	# bug 821871
-	local MY_LIBDIR="${ESYSROOT}/usr/$(get_libdir)"
-	export FT_LIB_DIR="${MY_LIBDIR}" HUNSPELL_LIB_DIR="${MY_LIBDIR}" PODOFO_LIB_DIR="${MY_LIBDIR}"
-
-	PATH="${T}/bin:${PATH}" ${EPYTHON} setup.py build || die
-}
-
-src_test() {
-	# Skipped tests:
-	# - 7z (unpackaged Python dependency: py7zr)
-	# - test_unrar (unpackaged Python dependency: unrardll)
-	#
-	# Note that we currently have a hack to skip one part of test_qt!
-	# See PATCHES for more.
-	CALIBRE_PY3_PORT=1 ${PYTHON} setup.py test \
-			--exclude-test-name 7z \
-			--exclude-test-name test_searching \
-			--exclude-test-name test_unrar || die
-}
-
-src_install() {
-	# calibre works with python 3, so remove the python 2 constraint
-	export CALIBRE_PY3_PORT=1
-
-	# Bypass kbuildsycoca and update-mime-database in order to
-	# avoid sandbox violations if xdg-mime tries to call them.
-	mkdir "${T}/bin" || die
-	cat - > "${T}/bin/kbuildsycoca" <<-EOF
-	#!${BASH}
-	echo $0 : $@
-	exit 0
-	EOF
-
-	cp "${T}"/bin/{kbuildsycoca,update-mime-database} || die
-	chmod +x "${T}"/bin/{kbuildsycoca,update-mime-database} || die
-
-	export QMAKE="${EPREFIX}/usr/$(get_libdir)/qt5/bin/qmake"
-
-	# Unset DISPLAY in order to prevent xdg-mime from triggering a sandbox
-	# violation with kbuildsycoca as in bug #287067, comment #13.
-	export -n DISPLAY
-
-	# Bug #352625 - Some LANGUAGE values can trigger the following ValueError:
-	#   File "/usr/lib/python2.6/locale.py", line 486, in getdefaultlocale
-	#    return _parse_localename(localename)
-	#  File "/usr/lib/python2.6/locale.py", line 418, in _parse_localename
-	#    raise ValueError, 'unknown locale: %s' % localename
-	#ValueError: unknown locale: 46
-	export -n LANG LANGUAGE ${!LC_*}
-	export LC_ALL=C.utf8 #709682
-
-	# Bug #295672 - Avoid sandbox violation in ~/.config by forcing
-	# variables to point to our fake temporary $HOME.
-	export HOME="${T}/fake_homedir"
-	export XDG_CONFIG_HOME="${HOME}/.config"
-	export XDG_DATA_HOME="${HOME}/.local/share"
-	export CALIBRE_CONFIG_DIRECTORY="${XDG_CONFIG_HOME}/calibre"
-	mkdir -p "${XDG_DATA_HOME}" "${CALIBRE_CONFIG_DIRECTORY}" || die
-
-	tc-export CC CXX
-	# Bug #334243 - respect LDFLAGS when building extensions
-	export OVERRIDE_CFLAGS="$CFLAGS" OVERRIDE_LDFLAGS="$LDFLAGS"
-	local libdir=$(get_libdir)
-	[[ -n $libdir ]] || die "get_libdir returned an empty string"
-
-	addpredict /dev/dri #665310
-
-	PATH=${T}/bin:${PATH} PYTHONPATH=${S}/src${PYTHONPATH:+:}${PYTHONPATH} \
-		"${PYTHON}" setup.py install \
-		--root="${D}" \
-		--prefix="${EPREFIX}/usr" \
-		--libdir="${EPREFIX}/usr/${libdir}" \
-		--staging-root="${ED}/usr" \
-		--staging-libdir="${ED}/usr/${libdir}" || die
-
-	find "${ED}"/usr/share -type d -empty -delete
-
-	cd "${ED}"/usr/share/calibre/fonts/liberation || die
-	local x
-	for x in * ; do
-		[[ -f ${EPREFIX}/usr/share/fonts/liberation-fonts/${x} ]] || continue
-		ln -sf "../../../fonts/liberation-fonts/${x}" "${x}" || die
-	done
-
-	einfo "Converting python shebangs"
-	python_fix_shebang --force "${ED}"
-
-	einfo "Compiling python modules"
-	python_optimize "${ED}"/usr/$(get_libdir)/calibre "${D}/$(python_get_sitedir)"
-
-	newinitd "${FILESDIR}"/calibre-server-3.init calibre-server
-	newconfd "${FILESDIR}"/calibre-server-3.conf calibre-server
-}
-
-pkg_preinst() {
-	# Indentify stray directories from upstream's "Binary install"
-	# method (see bug 622728).
-	CALIBRE_LIB_DIR=/usr/$(get_libdir)/calibre
-	CALIBRE_LIB_CONTENT=$(for x in "${ED}${CALIBRE_LIB_DIR}"/*; do
-		printf -- "${x##*/} "; done) || die "Failed to list ${ED}${CALIBRE_LIB_DIR}"
-}
-
-pkg_postinst() {
-	[[ -n ${CALIBRE_LIB_DIR} ]] || die "CALIBRE_LIB_DIR is unset"
-	local x
-	for x in "${EROOT}${CALIBRE_LIB_DIR}"/*; do
-		if [[ " ${CALIBRE_LIB_CONTENT} " != *" ${x##*/} "* ]]; then
-			elog "Purging '${x}'"
-			rm -rf "${x}"
-		fi
-	done
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	xdg_icon_cache_update
-}
diff --git a/app-text/calibre/calibre-5.35.0.ebuild b/app-text/calibre/calibre-5.35.0.ebuild
deleted file mode 100644
index 59a9f2a0e0b8..000000000000
--- a/app-text/calibre/calibre-5.35.0.ebuild
+++ /dev/null
@@ -1,315 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..9} )
-PYTHON_REQ_USE="ipv6(+),sqlite,ssl"
-
-inherit toolchain-funcs python-single-r1 xdg-utils
-
-DESCRIPTION="Ebook management application"
-HOMEPAGE="https://calibre-ebook.com/"
-SRC_URI="https://download.calibre-ebook.com/${PV}/${P}.tar.xz"
-
-LICENSE="
-	GPL-3+
-	GPL-3
-	GPL-2+
-	GPL-2
-	GPL-1+
-	LGPL-3+
-	LGPL-2.1+
-	LGPL-2.1
-	BSD
-	MIT
-	Old-MIT
-	Apache-2.0
-	public-domain
-	|| ( Artistic GPL-1+ )
-	CC-BY-3.0
-	OFL-1.1
-	PSF-2
-"
-KEYWORDS="~amd64 ~arm ~x86"
-SLOT="0"
-IUSE="ios +udisks"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND="${PYTHON_DEPS}
-	>=app-text/hunspell-1.7:=
-	>=app-text/podofo-0.9.6_pre20171027:=
-	>=app-text/poppler-0.26.5[qt5]
-	dev-libs/glib:2=
-	dev-libs/hyphen:=
-	>=dev-libs/icu-57.1:=
-	dev-libs/libinput:=
-	>=dev-libs/dbus-glib-0.106
-	dev-libs/snowball-stemmer:=
-	>=sys-apps/dbus-1.10.8
-	$(python_gen_cond_dep '
-		app-accessibility/speech-dispatcher[python,${PYTHON_USEDEP}]
-		>=dev-python/apsw-3.25.2_p1[${PYTHON_USEDEP}]
-		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
-		dev-python/cchardet[${PYTHON_USEDEP}]
-		>=dev-python/chardet-3.0.3[${PYTHON_USEDEP}]
-		>=dev-python/cssselect-0.7.1[${PYTHON_USEDEP}]
-		>=dev-python/css-parser-1.0.4[${PYTHON_USEDEP}]
-		>=dev-python/dbus-python-1.2.4[${PYTHON_USEDEP}]
-		dev-python/dnspython[${PYTHON_USEDEP}]
-		>=dev-python/feedparser-5.2.1[${PYTHON_USEDEP}]
-		>=dev-python/html2text-2019.8.11[${PYTHON_USEDEP}]
-		>=dev-python/html5-parser-0.4.9[${PYTHON_USEDEP}]
-		dev-python/jeepney[${PYTHON_USEDEP}]
-		>=dev-python/lxml-3.8.0[${PYTHON_USEDEP}]
-		>=dev-python/markdown-3.0.1[${PYTHON_USEDEP}]
-		>=dev-python/mechanize-0.3.5[${PYTHON_USEDEP}]
-		>=dev-python/msgpack-0.6.2[${PYTHON_USEDEP}]
-		>=dev-python/netifaces-0.10.5[${PYTHON_USEDEP}]
-		>=dev-python/pillow-3.2.0[${PYTHON_USEDEP}]
-		>=dev-python/psutil-4.3.0[${PYTHON_USEDEP}]
-		>=dev-python/pychm-0.8.6[${PYTHON_USEDEP}]
-		dev-python/pycryptodome[${PYTHON_USEDEP}]
-		>=dev-python/pygments-2.3.1[${PYTHON_USEDEP}]
-		>=dev-python/python-dateutil-2.5.3[${PYTHON_USEDEP}]
-		>=dev-python/PyQt5-5.15.5_pre2107091435[gui,svg,widgets,network,printsupport,${PYTHON_USEDEP}]
-		>=dev-python/PyQt-builder-1.10.3[${PYTHON_USEDEP}]
-		>=dev-python/PyQtWebEngine-5.15.5_pre2108100905[${PYTHON_USEDEP}]
-		dev-python/regex[${PYTHON_USEDEP}]
-		dev-python/zeroconf[${PYTHON_USEDEP}]
-	')
-	dev-qt/qtcore:5=
-	dev-qt/qtdbus:5=
-	dev-qt/qtgui:5=[jpeg]
-	>=dev-qt/qtwebengine-5.12
-	dev-qt/qtwidgets:5=
-	dev-util/desktop-file-utils
-	dev-util/gtk-update-icon-cache
-	media-fonts/liberation-fonts
-	media-libs/fontconfig:=
-	>=media-libs/freetype-2:=
-	>=media-libs/libmtp-1.1.11:=
-	>=media-libs/libwmf-0.2.8
-	>=media-gfx/optipng-0.7.6
-	>=sys-libs/zlib-1.2.11:=
-	virtual/libusb:1=
-	x11-libs/libxkbcommon:=
-	x11-libs/libX11:=
-	x11-libs/libXext:=
-	x11-libs/libXrender:=
-	x11-misc/shared-mime-info
-	>=x11-misc/xdg-utils-1.0.2-r2
-	ios? (
-		>=app-pda/usbmuxd-1.0.8
-		>=app-pda/libimobiledevice-1.2.0
-	)
-	udisks? ( virtual/libudev )"
-RDEPEND="${COMMON_DEPEND}
-	udisks? ( sys-fs/udisks:2 )"
-DEPEND="${COMMON_DEPEND}"
-BDEPEND="$(python_gen_cond_dep '
-		>=dev-python/setuptools-23.1.0[${PYTHON_USEDEP}]
-		>=dev-python/sip-5[${PYTHON_USEDEP}]
-	')
-	>=virtual/podofo-build-0.9.6_pre20171027
-	virtual/pkgconfig"
-
-PATCHES=(
-	# Don't prompt the user for updates - they've installed via
-	# an ebuild.
-	"${FILESDIR}/${PN}-2.9.0-no_updates_dialog.patch"
-
-	# Skip calling a binary (JxrDecApp) from libjxr which is used for tests
-	# We don't (yet?) package libjxr and it seems to be dead upstream
-	# (last commit in 2017)
-	"${FILESDIR}/${PN}-5.35.0-jxr-test.patch"
-
-	# TODO:
-	# test_qt tries to load a bunch of images using Qt and it currently fails
-	# due to some presumably missing dependencies. This is important and
-	# we need to look into it, but at time of writing, none of the tests
-	# are even bring run, so I'd like to return to this later.
-	# We don't want to skip test_qt entirely, so just skip this particular
-	# assert for now.
-	"${FILESDIR}/${PN}-5.31.0-qt-image-test.patch"
-)
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]] && tc-is-gcc && [[ $(gcc-major-version) -lt 6 ]]; then
-		eerror "Calibre cannot be built with this version of gcc."
-		eerror "You need at least gcc-6.0"
-		die "Your C compiler is too old for this package."
-	fi
-}
-
-src_prepare() {
-	default
-
-	# Warning:
-	#
-	# While it might be rather tempting to add yet another sed here,
-	# please don't. There have been several bugs in Gentoo's packaging
-	# of calibre from seds-which-become-stale. Please consider
-	# creating a patch instead, but in any case, run the test suite
-	# and ensure it passes.
-	#
-	# If in doubt about a problem, checking Fedora or Arch Linux's packaging
-	# is recommended, as Arch Linux's PKGBUILD is maintained by a Calibre
-	# contributor. Or just ask them.
-
-	# Fix outdated version constant.
-	#sed -e "s#\\(^numeric_version =\\).*#\\1 (${PV//./, })#" \
-	#	-i src/calibre/constants.py || \
-	#	die "sed failed to patch constants.py"
-
-	# Avoid sandbox violation in /usr/share/gnome/apps when linux.py
-	# calls xdg-* (bug #258938).
-	sed -e "s|'xdg-desktop-menu', 'install'|\\0, '--mode', 'user'|" \
-		-e "s|check_call(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \
-		-e "s|\\(CurrentDir(tdir)\\), \\\\\$|\\1:|" \
-		-e "s|, PreserveMIMEDefaults():|:|" \
-		-e "s|'xdg-icon-resource', 'install'|\\0, '--mode', 'user'|" \
-		-e "s|cmd\[2\]|cmd[4]|" \
-		-e "s|cc(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \
-		-e "s|'xdg-mime', 'install'|\\0, '--mode', 'user'|" \
-		-i src/calibre/linux.py || die "sed failed to patch linux.py"
-
-	# Disable unnecessary privilege dropping for bug #287067.
-	sed -e "s:if os.geteuid() == 0:if False and os.geteuid() == 0:" \
-		-i setup/install.py || die "sed failed to patch install.py"
-	sed -e "/^            os.chdir(os.path.join(src_dir, 'build'))$/a\
-\\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ self.check_call(['sed', \
-'-e', 's|^CFLAGS .*|\\\\\\\\0 ${CFLAGS}|', \
-'-e', 's|^CXXFLAGS .*|\\\\\\\\0 ${CXXFLAGS}|', \
-'-e', 's|^LFLAGS .*|\\\\\\\\0 ${LDFLAGS}|', \
-'-i', os.path.join(os.path.basename(src_dir), 'Makefile')])" \
-		-e "s|open(self.j(bdir, '.qmake.conf'), 'wb').close()|open(self.j(bdir, '.qmake.conf'), 'wb').write(b'QMAKE_LFLAGS += ${LDFLAGS}')|" \
-		-i setup/build.py || die "sed failed to patch build.py"
-}
-
-src_compile() {
-	# TODO: get qmake called by setup.py to respect CC and CXX too
-	tc-export CC CXX
-
-	# bug 821871
-	local MY_LIBDIR="${ESYSROOT}/usr/$(get_libdir)"
-	export FT_LIB_DIR="${MY_LIBDIR}" HUNSPELL_LIB_DIR="${MY_LIBDIR}" PODOFO_LIB_DIR="${MY_LIBDIR}"
-
-	PATH="${T}/bin:${PATH}" ${EPYTHON} setup.py build || die
-}
-
-src_test() {
-	# Skipped tests:
-	# - 7z (unpackaged Python dependency: py7zr)
-	# - test_unrar (unpackaged Python dependency: unrardll)
-	#
-	# Note that we currently have a hack to skip one part of test_qt!
-	# See PATCHES for more.
-	CALIBRE_PY3_PORT=1 ${PYTHON} setup.py test \
-			--exclude-test-name 7z \
-			--exclude-test-name test_searching \
-			--exclude-test-name test_unrar || die
-}
-
-src_install() {
-	# calibre works with python 3, so remove the python 2 constraint
-	export CALIBRE_PY3_PORT=1
-
-	# Bypass kbuildsycoca and update-mime-database in order to
-	# avoid sandbox violations if xdg-mime tries to call them.
-	mkdir "${T}/bin" || die
-	cat - > "${T}/bin/kbuildsycoca" <<-EOF
-	#!${BASH}
-	echo $0 : $@
-	exit 0
-	EOF
-
-	cp "${T}"/bin/{kbuildsycoca,update-mime-database} || die
-	chmod +x "${T}"/bin/{kbuildsycoca,update-mime-database} || die
-
-	export QMAKE="${EPREFIX}/usr/$(get_libdir)/qt5/bin/qmake"
-
-	# Unset DISPLAY in order to prevent xdg-mime from triggering a sandbox
-	# violation with kbuildsycoca as in bug #287067, comment #13.
-	export -n DISPLAY
-
-	# Bug #352625 - Some LANGUAGE values can trigger the following ValueError:
-	#   File "/usr/lib/python2.6/locale.py", line 486, in getdefaultlocale
-	#    return _parse_localename(localename)
-	#  File "/usr/lib/python2.6/locale.py", line 418, in _parse_localename
-	#    raise ValueError, 'unknown locale: %s' % localename
-	#ValueError: unknown locale: 46
-	export -n LANG LANGUAGE ${!LC_*}
-	export LC_ALL=C.utf8 #709682
-
-	# Bug #295672 - Avoid sandbox violation in ~/.config by forcing
-	# variables to point to our fake temporary $HOME.
-	export HOME="${T}/fake_homedir"
-	export XDG_CONFIG_HOME="${HOME}/.config"
-	export XDG_DATA_HOME="${HOME}/.local/share"
-	export CALIBRE_CONFIG_DIRECTORY="${XDG_CONFIG_HOME}/calibre"
-	mkdir -p "${XDG_DATA_HOME}" "${CALIBRE_CONFIG_DIRECTORY}" || die
-
-	tc-export CC CXX
-	# Bug #334243 - respect LDFLAGS when building extensions
-	export OVERRIDE_CFLAGS="$CFLAGS" OVERRIDE_LDFLAGS="$LDFLAGS"
-	local libdir=$(get_libdir)
-	[[ -n $libdir ]] || die "get_libdir returned an empty string"
-
-	addpredict /dev/dri #665310
-
-	PATH=${T}/bin:${PATH} PYTHONPATH=${S}/src${PYTHONPATH:+:}${PYTHONPATH} \
-		"${PYTHON}" setup.py install \
-		--root="${D}" \
-		--prefix="${EPREFIX}/usr" \
-		--libdir="${EPREFIX}/usr/${libdir}" \
-		--staging-root="${ED}/usr" \
-		--staging-libdir="${ED}/usr/${libdir}" || die
-
-	find "${ED}"/usr/share -type d -empty -delete
-
-	cd "${ED}"/usr/share/calibre/fonts/liberation || die
-	local x
-	for x in * ; do
-		[[ -f ${EPREFIX}/usr/share/fonts/liberation-fonts/${x} ]] || continue
-		ln -sf "../../../fonts/liberation-fonts/${x}" "${x}" || die
-	done
-
-	einfo "Converting python shebangs"
-	python_fix_shebang --force "${ED}"
-
-	einfo "Compiling python modules"
-	python_optimize "${ED}"/usr/$(get_libdir)/calibre "${D}/$(python_get_sitedir)"
-
-	newinitd "${FILESDIR}"/calibre-server-3.init calibre-server
-	newconfd "${FILESDIR}"/calibre-server-3.conf calibre-server
-}
-
-pkg_preinst() {
-	# Indentify stray directories from upstream's "Binary install"
-	# method (see bug 622728).
-	CALIBRE_LIB_DIR=/usr/$(get_libdir)/calibre
-	CALIBRE_LIB_CONTENT=$(for x in "${ED}${CALIBRE_LIB_DIR}"/*; do
-		printf -- "${x##*/} "; done) || die "Failed to list ${ED}${CALIBRE_LIB_DIR}"
-}
-
-pkg_postinst() {
-	[[ -n ${CALIBRE_LIB_DIR} ]] || die "CALIBRE_LIB_DIR is unset"
-	local x
-	for x in "${EROOT}${CALIBRE_LIB_DIR}"/*; do
-		if [[ " ${CALIBRE_LIB_CONTENT} " != *" ${x##*/} "* ]]; then
-			elog "Purging '${x}'"
-			rm -rf "${x}"
-		fi
-	done
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	xdg_icon_cache_update
-}
diff --git a/app-text/calibre/calibre-5.38.0.ebuild b/app-text/calibre/calibre-5.38.0.ebuild
new file mode 100644
index 000000000000..a9f64cfe2e57
--- /dev/null
+++ b/app-text/calibre/calibre-5.38.0.ebuild
@@ -0,0 +1,316 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_REQ_USE="ipv6(+),sqlite,ssl"
+
+inherit toolchain-funcs python-single-r1 xdg-utils
+
+DESCRIPTION="Ebook management application"
+HOMEPAGE="https://calibre-ebook.com/"
+SRC_URI="https://download.calibre-ebook.com/${PV}/${P}.tar.xz"
+
+LICENSE="
+	GPL-3+
+	GPL-3
+	GPL-2+
+	GPL-2
+	GPL-1+
+	LGPL-3+
+	LGPL-2.1+
+	LGPL-2.1
+	BSD
+	MIT
+	Old-MIT
+	Apache-2.0
+	public-domain
+	|| ( Artistic GPL-1+ )
+	CC-BY-3.0
+	OFL-1.1
+	PSF-2
+"
+KEYWORDS="~amd64 ~arm ~x86"
+SLOT="0"
+IUSE="ios +udisks"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+	>=app-text/hunspell-1.7:=
+	>=app-text/podofo-0.9.6_pre20171027:=
+	>=app-text/poppler-0.26.5[qt5]
+	dev-libs/glib:2=
+	dev-libs/hyphen:=
+	>=dev-libs/icu-57.1:=
+	dev-libs/libinput:=
+	>=dev-libs/dbus-glib-0.106
+	dev-libs/snowball-stemmer:=
+	>=sys-apps/dbus-1.10.8
+	$(python_gen_cond_dep '
+		app-accessibility/speech-dispatcher[python,${PYTHON_USEDEP}]
+		>=dev-python/apsw-3.25.2_p1[${PYTHON_USEDEP}]
+		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
+		dev-python/cchardet[${PYTHON_USEDEP}]
+		>=dev-python/chardet-3.0.3[${PYTHON_USEDEP}]
+		>=dev-python/cssselect-0.7.1[${PYTHON_USEDEP}]
+		>=dev-python/css-parser-1.0.4[${PYTHON_USEDEP}]
+		>=dev-python/dbus-python-1.2.4[${PYTHON_USEDEP}]
+		dev-python/dnspython[${PYTHON_USEDEP}]
+		>=dev-python/feedparser-5.2.1[${PYTHON_USEDEP}]
+		>=dev-python/html2text-2019.8.11[${PYTHON_USEDEP}]
+		>=dev-python/html5-parser-0.4.9[${PYTHON_USEDEP}]
+		dev-python/jeepney[${PYTHON_USEDEP}]
+		>=dev-python/lxml-3.8.0[${PYTHON_USEDEP}]
+		>=dev-python/markdown-3.0.1[${PYTHON_USEDEP}]
+		>=dev-python/mechanize-0.3.5[${PYTHON_USEDEP}]
+		>=dev-python/msgpack-0.6.2[${PYTHON_USEDEP}]
+		>=dev-python/netifaces-0.10.5[${PYTHON_USEDEP}]
+		>=dev-python/pillow-3.2.0[${PYTHON_USEDEP}]
+		>=dev-python/psutil-4.3.0[${PYTHON_USEDEP}]
+		>=dev-python/pychm-0.8.6[${PYTHON_USEDEP}]
+		dev-python/pycryptodome[${PYTHON_USEDEP}]
+		>=dev-python/pygments-2.3.1[${PYTHON_USEDEP}]
+		>=dev-python/python-dateutil-2.5.3[${PYTHON_USEDEP}]
+		>=dev-python/PyQt5-5.15.5_pre2107091435[gui,svg,widgets,network,printsupport,${PYTHON_USEDEP}]
+		>=dev-python/PyQt-builder-1.10.3[${PYTHON_USEDEP}]
+		>=dev-python/PyQtWebEngine-5.15.5_pre2108100905[${PYTHON_USEDEP}]
+		dev-python/regex[${PYTHON_USEDEP}]
+		dev-python/zeroconf[${PYTHON_USEDEP}]
+	')
+	dev-qt/qtcore:5=
+	dev-qt/qtdbus:5=
+	dev-qt/qtgui:5=[jpeg]
+	>=dev-qt/qtwebengine-5.12
+	dev-qt/qtwidgets:5=
+	dev-util/desktop-file-utils
+	dev-util/gtk-update-icon-cache
+	media-fonts/liberation-fonts
+	media-libs/fontconfig:=
+	>=media-libs/freetype-2:=
+	>=media-libs/libmtp-1.1.11:=
+	>=media-libs/libwmf-0.2.8
+	>=media-gfx/optipng-0.7.6
+	>=sys-libs/zlib-1.2.11:=
+	virtual/libusb:1=
+	x11-libs/libxkbcommon:=
+	x11-libs/libX11:=
+	x11-libs/libXext:=
+	x11-libs/libXrender:=
+	x11-misc/shared-mime-info
+	>=x11-misc/xdg-utils-1.0.2-r2
+	ios? (
+		>=app-pda/usbmuxd-1.0.8
+		>=app-pda/libimobiledevice-1.2.0
+	)
+	udisks? ( virtual/libudev )"
+RDEPEND="${COMMON_DEPEND}
+	udisks? ( sys-fs/udisks:2 )"
+DEPEND="${COMMON_DEPEND}"
+BDEPEND="$(python_gen_cond_dep '
+		>=dev-python/setuptools-23.1.0[${PYTHON_USEDEP}]
+		>=dev-python/sip-5[${PYTHON_USEDEP}]
+	')
+	>=virtual/podofo-build-0.9.6_pre20171027
+	virtual/pkgconfig"
+
+PATCHES=(
+	# Don't prompt the user for updates - they've installed via
+	# an ebuild.
+	"${FILESDIR}/${PN}-2.9.0-no_updates_dialog.patch"
+
+	# Skip calling a binary (JxrDecApp) from libjxr which is used for tests
+	# We don't (yet?) package libjxr and it seems to be dead upstream
+	# (last commit in 2017)
+	"${FILESDIR}/${PN}-5.35.0-jxr-test.patch"
+
+	# TODO:
+	# test_qt tries to load a bunch of images using Qt and it currently fails
+	# due to some presumably missing dependencies. This is important and
+	# we need to look into it, but at time of writing, none of the tests
+	# are even bring run, so I'd like to return to this later.
+	# We don't want to skip test_qt entirely, so just skip this particular
+	# assert for now.
+	"${FILESDIR}/${PN}-5.31.0-qt-image-test.patch"
+)
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]] && tc-is-gcc && [[ $(gcc-major-version) -lt 6 ]]; then
+		eerror "Calibre cannot be built with this version of gcc."
+		eerror "You need at least gcc-6.0"
+		die "Your C compiler is too old for this package."
+	fi
+}
+
+src_prepare() {
+	default
+
+	# Warning:
+	#
+	# While it might be rather tempting to add yet another sed here,
+	# please don't. There have been several bugs in Gentoo's packaging
+	# of calibre from seds-which-become-stale. Please consider
+	# creating a patch instead, but in any case, run the test suite
+	# and ensure it passes.
+	#
+	# If in doubt about a problem, checking Fedora or Arch Linux's packaging
+	# is recommended, as Arch Linux's PKGBUILD is maintained by a Calibre
+	# contributor. Or just ask them.
+
+	# Fix outdated version constant.
+	#sed -e "s#\\(^numeric_version =\\).*#\\1 (${PV//./, })#" \
+	#	-i src/calibre/constants.py || \
+	#	die "sed failed to patch constants.py"
+
+	# Avoid sandbox violation in /usr/share/gnome/apps when linux.py
+	# calls xdg-* (bug #258938).
+	sed -e "s|'xdg-desktop-menu', 'install'|\\0, '--mode', 'user'|" \
+		-e "s|check_call(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \
+		-e "s|\\(CurrentDir(tdir)\\), \\\\\$|\\1:|" \
+		-e "s|, PreserveMIMEDefaults():|:|" \
+		-e "s|'xdg-icon-resource', 'install'|\\0, '--mode', 'user'|" \
+		-e "s|cmd\[2\]|cmd[4]|" \
+		-e "s|cc(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \
+		-e "s|'xdg-mime', 'install'|\\0, '--mode', 'user'|" \
+		-i src/calibre/linux.py || die "sed failed to patch linux.py"
+
+	# Disable unnecessary privilege dropping for bug #287067.
+	sed -e "s:if os.geteuid() == 0:if False and os.geteuid() == 0:" \
+		-i setup/install.py || die "sed failed to patch install.py"
+	sed -e "/^            os.chdir(os.path.join(src_dir, 'build'))$/a\
+\\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ self.check_call(['sed', \
+'-e', 's|^CFLAGS .*|\\\\\\\\0 ${CFLAGS}|', \
+'-e', 's|^CXXFLAGS .*|\\\\\\\\0 ${CXXFLAGS}|', \
+'-e', 's|^LFLAGS .*|\\\\\\\\0 ${LDFLAGS}|', \
+'-i', os.path.join(os.path.basename(src_dir), 'Makefile')])" \
+		-e "s|open(self.j(bdir, '.qmake.conf'), 'wb').close()|open(self.j(bdir, '.qmake.conf'), 'wb').write(b'QMAKE_LFLAGS += ${LDFLAGS}')|" \
+		-i setup/build.py || die "sed failed to patch build.py"
+}
+
+src_compile() {
+	# TODO: get qmake called by setup.py to respect CC and CXX too
+	tc-export CC CXX
+
+	# bug 821871
+	local MY_LIBDIR="${ESYSROOT}/usr/$(get_libdir)"
+	export FT_LIB_DIR="${MY_LIBDIR}" HUNSPELL_LIB_DIR="${MY_LIBDIR}" PODOFO_LIB_DIR="${MY_LIBDIR}"
+
+	PATH="${T}/bin:${PATH}" ${EPYTHON} setup.py build || die
+}
+
+src_test() {
+	# Skipped tests:
+	# - 7z (unpackaged Python dependency: py7zr)
+	# - test_unrar (unpackaged Python dependency: unrardll)
+	#
+	# Note that we currently have a hack to skip one part of test_qt!
+	# See PATCHES for more.
+	CALIBRE_PY3_PORT=1 ${PYTHON} setup.py test \
+			--exclude-test-name 7z \
+			--exclude-test-name test_mem_leaks \
+			--exclude-test-name test_searching \
+			--exclude-test-name test_unrar || die
+}
+
+src_install() {
+	# calibre works with python 3, so remove the python 2 constraint
+	export CALIBRE_PY3_PORT=1
+
+	# Bypass kbuildsycoca and update-mime-database in order to
+	# avoid sandbox violations if xdg-mime tries to call them.
+	mkdir "${T}/bin" || die
+	cat - > "${T}/bin/kbuildsycoca" <<-EOF
+	#!${BASH}
+	echo $0 : $@
+	exit 0
+	EOF
+
+	cp "${T}"/bin/{kbuildsycoca,update-mime-database} || die
+	chmod +x "${T}"/bin/{kbuildsycoca,update-mime-database} || die
+
+	export QMAKE="${EPREFIX}/usr/$(get_libdir)/qt5/bin/qmake"
+
+	# Unset DISPLAY in order to prevent xdg-mime from triggering a sandbox
+	# violation with kbuildsycoca as in bug #287067, comment #13.
+	export -n DISPLAY
+
+	# Bug #352625 - Some LANGUAGE values can trigger the following ValueError:
+	#   File "/usr/lib/python2.6/locale.py", line 486, in getdefaultlocale
+	#    return _parse_localename(localename)
+	#  File "/usr/lib/python2.6/locale.py", line 418, in _parse_localename
+	#    raise ValueError, 'unknown locale: %s' % localename
+	#ValueError: unknown locale: 46
+	export -n LANG LANGUAGE ${!LC_*}
+	export LC_ALL=C.utf8 #709682
+
+	# Bug #295672 - Avoid sandbox violation in ~/.config by forcing
+	# variables to point to our fake temporary $HOME.
+	export HOME="${T}/fake_homedir"
+	export XDG_CONFIG_HOME="${HOME}/.config"
+	export XDG_DATA_HOME="${HOME}/.local/share"
+	export CALIBRE_CONFIG_DIRECTORY="${XDG_CONFIG_HOME}/calibre"
+	mkdir -p "${XDG_DATA_HOME}" "${CALIBRE_CONFIG_DIRECTORY}" || die
+
+	tc-export CC CXX
+	# Bug #334243 - respect LDFLAGS when building extensions
+	export OVERRIDE_CFLAGS="$CFLAGS" OVERRIDE_LDFLAGS="$LDFLAGS"
+	local libdir=$(get_libdir)
+	[[ -n $libdir ]] || die "get_libdir returned an empty string"
+
+	addpredict /dev/dri #665310
+
+	PATH=${T}/bin:${PATH} PYTHONPATH=${S}/src${PYTHONPATH:+:}${PYTHONPATH} \
+		"${PYTHON}" setup.py install \
+		--root="${D}" \
+		--prefix="${EPREFIX}/usr" \
+		--libdir="${EPREFIX}/usr/${libdir}" \
+		--staging-root="${ED}/usr" \
+		--staging-libdir="${ED}/usr/${libdir}" || die
+
+	find "${ED}"/usr/share -type d -empty -delete
+
+	cd "${ED}"/usr/share/calibre/fonts/liberation || die
+	local x
+	for x in * ; do
+		[[ -f ${EPREFIX}/usr/share/fonts/liberation-fonts/${x} ]] || continue
+		ln -sf "../../../fonts/liberation-fonts/${x}" "${x}" || die
+	done
+
+	einfo "Converting python shebangs"
+	python_fix_shebang --force "${ED}"
+
+	einfo "Compiling python modules"
+	python_optimize "${ED}"/usr/$(get_libdir)/calibre "${D}/$(python_get_sitedir)"
+
+	newinitd "${FILESDIR}"/calibre-server-3.init calibre-server
+	newconfd "${FILESDIR}"/calibre-server-3.conf calibre-server
+}
+
+pkg_preinst() {
+	# Indentify stray directories from upstream's "Binary install"
+	# method (see bug 622728).
+	CALIBRE_LIB_DIR=/usr/$(get_libdir)/calibre
+	CALIBRE_LIB_CONTENT=$(for x in "${ED}${CALIBRE_LIB_DIR}"/*; do
+		printf -- "${x##*/} "; done) || die "Failed to list ${ED}${CALIBRE_LIB_DIR}"
+}
+
+pkg_postinst() {
+	[[ -n ${CALIBRE_LIB_DIR} ]] || die "CALIBRE_LIB_DIR is unset"
+	local x
+	for x in "${EROOT}${CALIBRE_LIB_DIR}"/*; do
+		if [[ " ${CALIBRE_LIB_CONTENT} " != *" ${x##*/} "* ]]; then
+			elog "Purging '${x}'"
+			rm -rf "${x}"
+		fi
+	done
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	xdg_icon_cache_update
+}
diff --git a/app-text/calibre/calibre-5.39.0.ebuild b/app-text/calibre/calibre-5.39.0.ebuild
new file mode 100644
index 000000000000..a9f64cfe2e57
--- /dev/null
+++ b/app-text/calibre/calibre-5.39.0.ebuild
@@ -0,0 +1,316 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_REQ_USE="ipv6(+),sqlite,ssl"
+
+inherit toolchain-funcs python-single-r1 xdg-utils
+
+DESCRIPTION="Ebook management application"
+HOMEPAGE="https://calibre-ebook.com/"
+SRC_URI="https://download.calibre-ebook.com/${PV}/${P}.tar.xz"
+
+LICENSE="
+	GPL-3+
+	GPL-3
+	GPL-2+
+	GPL-2
+	GPL-1+
+	LGPL-3+
+	LGPL-2.1+
+	LGPL-2.1
+	BSD
+	MIT
+	Old-MIT
+	Apache-2.0
+	public-domain
+	|| ( Artistic GPL-1+ )
+	CC-BY-3.0
+	OFL-1.1
+	PSF-2
+"
+KEYWORDS="~amd64 ~arm ~x86"
+SLOT="0"
+IUSE="ios +udisks"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+	>=app-text/hunspell-1.7:=
+	>=app-text/podofo-0.9.6_pre20171027:=
+	>=app-text/poppler-0.26.5[qt5]
+	dev-libs/glib:2=
+	dev-libs/hyphen:=
+	>=dev-libs/icu-57.1:=
+	dev-libs/libinput:=
+	>=dev-libs/dbus-glib-0.106
+	dev-libs/snowball-stemmer:=
+	>=sys-apps/dbus-1.10.8
+	$(python_gen_cond_dep '
+		app-accessibility/speech-dispatcher[python,${PYTHON_USEDEP}]
+		>=dev-python/apsw-3.25.2_p1[${PYTHON_USEDEP}]
+		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
+		dev-python/cchardet[${PYTHON_USEDEP}]
+		>=dev-python/chardet-3.0.3[${PYTHON_USEDEP}]
+		>=dev-python/cssselect-0.7.1[${PYTHON_USEDEP}]
+		>=dev-python/css-parser-1.0.4[${PYTHON_USEDEP}]
+		>=dev-python/dbus-python-1.2.4[${PYTHON_USEDEP}]
+		dev-python/dnspython[${PYTHON_USEDEP}]
+		>=dev-python/feedparser-5.2.1[${PYTHON_USEDEP}]
+		>=dev-python/html2text-2019.8.11[${PYTHON_USEDEP}]
+		>=dev-python/html5-parser-0.4.9[${PYTHON_USEDEP}]
+		dev-python/jeepney[${PYTHON_USEDEP}]
+		>=dev-python/lxml-3.8.0[${PYTHON_USEDEP}]
+		>=dev-python/markdown-3.0.1[${PYTHON_USEDEP}]
+		>=dev-python/mechanize-0.3.5[${PYTHON_USEDEP}]
+		>=dev-python/msgpack-0.6.2[${PYTHON_USEDEP}]
+		>=dev-python/netifaces-0.10.5[${PYTHON_USEDEP}]
+		>=dev-python/pillow-3.2.0[${PYTHON_USEDEP}]
+		>=dev-python/psutil-4.3.0[${PYTHON_USEDEP}]
+		>=dev-python/pychm-0.8.6[${PYTHON_USEDEP}]
+		dev-python/pycryptodome[${PYTHON_USEDEP}]
+		>=dev-python/pygments-2.3.1[${PYTHON_USEDEP}]
+		>=dev-python/python-dateutil-2.5.3[${PYTHON_USEDEP}]
+		>=dev-python/PyQt5-5.15.5_pre2107091435[gui,svg,widgets,network,printsupport,${PYTHON_USEDEP}]
+		>=dev-python/PyQt-builder-1.10.3[${PYTHON_USEDEP}]
+		>=dev-python/PyQtWebEngine-5.15.5_pre2108100905[${PYTHON_USEDEP}]
+		dev-python/regex[${PYTHON_USEDEP}]
+		dev-python/zeroconf[${PYTHON_USEDEP}]
+	')
+	dev-qt/qtcore:5=
+	dev-qt/qtdbus:5=
+	dev-qt/qtgui:5=[jpeg]
+	>=dev-qt/qtwebengine-5.12
+	dev-qt/qtwidgets:5=
+	dev-util/desktop-file-utils
+	dev-util/gtk-update-icon-cache
+	media-fonts/liberation-fonts
+	media-libs/fontconfig:=
+	>=media-libs/freetype-2:=
+	>=media-libs/libmtp-1.1.11:=
+	>=media-libs/libwmf-0.2.8
+	>=media-gfx/optipng-0.7.6
+	>=sys-libs/zlib-1.2.11:=
+	virtual/libusb:1=
+	x11-libs/libxkbcommon:=
+	x11-libs/libX11:=
+	x11-libs/libXext:=
+	x11-libs/libXrender:=
+	x11-misc/shared-mime-info
+	>=x11-misc/xdg-utils-1.0.2-r2
+	ios? (
+		>=app-pda/usbmuxd-1.0.8
+		>=app-pda/libimobiledevice-1.2.0
+	)
+	udisks? ( virtual/libudev )"
+RDEPEND="${COMMON_DEPEND}
+	udisks? ( sys-fs/udisks:2 )"
+DEPEND="${COMMON_DEPEND}"
+BDEPEND="$(python_gen_cond_dep '
+		>=dev-python/setuptools-23.1.0[${PYTHON_USEDEP}]
+		>=dev-python/sip-5[${PYTHON_USEDEP}]
+	')
+	>=virtual/podofo-build-0.9.6_pre20171027
+	virtual/pkgconfig"
+
+PATCHES=(
+	# Don't prompt the user for updates - they've installed via
+	# an ebuild.
+	"${FILESDIR}/${PN}-2.9.0-no_updates_dialog.patch"
+
+	# Skip calling a binary (JxrDecApp) from libjxr which is used for tests
+	# We don't (yet?) package libjxr and it seems to be dead upstream
+	# (last commit in 2017)
+	"${FILESDIR}/${PN}-5.35.0-jxr-test.patch"
+
+	# TODO:
+	# test_qt tries to load a bunch of images using Qt and it currently fails
+	# due to some presumably missing dependencies. This is important and
+	# we need to look into it, but at time of writing, none of the tests
+	# are even bring run, so I'd like to return to this later.
+	# We don't want to skip test_qt entirely, so just skip this particular
+	# assert for now.
+	"${FILESDIR}/${PN}-5.31.0-qt-image-test.patch"
+)
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]] && tc-is-gcc && [[ $(gcc-major-version) -lt 6 ]]; then
+		eerror "Calibre cannot be built with this version of gcc."
+		eerror "You need at least gcc-6.0"
+		die "Your C compiler is too old for this package."
+	fi
+}
+
+src_prepare() {
+	default
+
+	# Warning:
+	#
+	# While it might be rather tempting to add yet another sed here,
+	# please don't. There have been several bugs in Gentoo's packaging
+	# of calibre from seds-which-become-stale. Please consider
+	# creating a patch instead, but in any case, run the test suite
+	# and ensure it passes.
+	#
+	# If in doubt about a problem, checking Fedora or Arch Linux's packaging
+	# is recommended, as Arch Linux's PKGBUILD is maintained by a Calibre
+	# contributor. Or just ask them.
+
+	# Fix outdated version constant.
+	#sed -e "s#\\(^numeric_version =\\).*#\\1 (${PV//./, })#" \
+	#	-i src/calibre/constants.py || \
+	#	die "sed failed to patch constants.py"
+
+	# Avoid sandbox violation in /usr/share/gnome/apps when linux.py
+	# calls xdg-* (bug #258938).
+	sed -e "s|'xdg-desktop-menu', 'install'|\\0, '--mode', 'user'|" \
+		-e "s|check_call(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \
+		-e "s|\\(CurrentDir(tdir)\\), \\\\\$|\\1:|" \
+		-e "s|, PreserveMIMEDefaults():|:|" \
+		-e "s|'xdg-icon-resource', 'install'|\\0, '--mode', 'user'|" \
+		-e "s|cmd\[2\]|cmd[4]|" \
+		-e "s|cc(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \
+		-e "s|'xdg-mime', 'install'|\\0, '--mode', 'user'|" \
+		-i src/calibre/linux.py || die "sed failed to patch linux.py"
+
+	# Disable unnecessary privilege dropping for bug #287067.
+	sed -e "s:if os.geteuid() == 0:if False and os.geteuid() == 0:" \
+		-i setup/install.py || die "sed failed to patch install.py"
+	sed -e "/^            os.chdir(os.path.join(src_dir, 'build'))$/a\
+\\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ self.check_call(['sed', \
+'-e', 's|^CFLAGS .*|\\\\\\\\0 ${CFLAGS}|', \
+'-e', 's|^CXXFLAGS .*|\\\\\\\\0 ${CXXFLAGS}|', \
+'-e', 's|^LFLAGS .*|\\\\\\\\0 ${LDFLAGS}|', \
+'-i', os.path.join(os.path.basename(src_dir), 'Makefile')])" \
+		-e "s|open(self.j(bdir, '.qmake.conf'), 'wb').close()|open(self.j(bdir, '.qmake.conf'), 'wb').write(b'QMAKE_LFLAGS += ${LDFLAGS}')|" \
+		-i setup/build.py || die "sed failed to patch build.py"
+}
+
+src_compile() {
+	# TODO: get qmake called by setup.py to respect CC and CXX too
+	tc-export CC CXX
+
+	# bug 821871
+	local MY_LIBDIR="${ESYSROOT}/usr/$(get_libdir)"
+	export FT_LIB_DIR="${MY_LIBDIR}" HUNSPELL_LIB_DIR="${MY_LIBDIR}" PODOFO_LIB_DIR="${MY_LIBDIR}"
+
+	PATH="${T}/bin:${PATH}" ${EPYTHON} setup.py build || die
+}
+
+src_test() {
+	# Skipped tests:
+	# - 7z (unpackaged Python dependency: py7zr)
+	# - test_unrar (unpackaged Python dependency: unrardll)
+	#
+	# Note that we currently have a hack to skip one part of test_qt!
+	# See PATCHES for more.
+	CALIBRE_PY3_PORT=1 ${PYTHON} setup.py test \
+			--exclude-test-name 7z \
+			--exclude-test-name test_mem_leaks \
+			--exclude-test-name test_searching \
+			--exclude-test-name test_unrar || die
+}
+
+src_install() {
+	# calibre works with python 3, so remove the python 2 constraint
+	export CALIBRE_PY3_PORT=1
+
+	# Bypass kbuildsycoca and update-mime-database in order to
+	# avoid sandbox violations if xdg-mime tries to call them.
+	mkdir "${T}/bin" || die
+	cat - > "${T}/bin/kbuildsycoca" <<-EOF
+	#!${BASH}
+	echo $0 : $@
+	exit 0
+	EOF
+
+	cp "${T}"/bin/{kbuildsycoca,update-mime-database} || die
+	chmod +x "${T}"/bin/{kbuildsycoca,update-mime-database} || die
+
+	export QMAKE="${EPREFIX}/usr/$(get_libdir)/qt5/bin/qmake"
+
+	# Unset DISPLAY in order to prevent xdg-mime from triggering a sandbox
+	# violation with kbuildsycoca as in bug #287067, comment #13.
+	export -n DISPLAY
+
+	# Bug #352625 - Some LANGUAGE values can trigger the following ValueError:
+	#   File "/usr/lib/python2.6/locale.py", line 486, in getdefaultlocale
+	#    return _parse_localename(localename)
+	#  File "/usr/lib/python2.6/locale.py", line 418, in _parse_localename
+	#    raise ValueError, 'unknown locale: %s' % localename
+	#ValueError: unknown locale: 46
+	export -n LANG LANGUAGE ${!LC_*}
+	export LC_ALL=C.utf8 #709682
+
+	# Bug #295672 - Avoid sandbox violation in ~/.config by forcing
+	# variables to point to our fake temporary $HOME.
+	export HOME="${T}/fake_homedir"
+	export XDG_CONFIG_HOME="${HOME}/.config"
+	export XDG_DATA_HOME="${HOME}/.local/share"
+	export CALIBRE_CONFIG_DIRECTORY="${XDG_CONFIG_HOME}/calibre"
+	mkdir -p "${XDG_DATA_HOME}" "${CALIBRE_CONFIG_DIRECTORY}" || die
+
+	tc-export CC CXX
+	# Bug #334243 - respect LDFLAGS when building extensions
+	export OVERRIDE_CFLAGS="$CFLAGS" OVERRIDE_LDFLAGS="$LDFLAGS"
+	local libdir=$(get_libdir)
+	[[ -n $libdir ]] || die "get_libdir returned an empty string"
+
+	addpredict /dev/dri #665310
+
+	PATH=${T}/bin:${PATH} PYTHONPATH=${S}/src${PYTHONPATH:+:}${PYTHONPATH} \
+		"${PYTHON}" setup.py install \
+		--root="${D}" \
+		--prefix="${EPREFIX}/usr" \
+		--libdir="${EPREFIX}/usr/${libdir}" \
+		--staging-root="${ED}/usr" \
+		--staging-libdir="${ED}/usr/${libdir}" || die
+
+	find "${ED}"/usr/share -type d -empty -delete
+
+	cd "${ED}"/usr/share/calibre/fonts/liberation || die
+	local x
+	for x in * ; do
+		[[ -f ${EPREFIX}/usr/share/fonts/liberation-fonts/${x} ]] || continue
+		ln -sf "../../../fonts/liberation-fonts/${x}" "${x}" || die
+	done
+
+	einfo "Converting python shebangs"
+	python_fix_shebang --force "${ED}"
+
+	einfo "Compiling python modules"
+	python_optimize "${ED}"/usr/$(get_libdir)/calibre "${D}/$(python_get_sitedir)"
+
+	newinitd "${FILESDIR}"/calibre-server-3.init calibre-server
+	newconfd "${FILESDIR}"/calibre-server-3.conf calibre-server
+}
+
+pkg_preinst() {
+	# Indentify stray directories from upstream's "Binary install"
+	# method (see bug 622728).
+	CALIBRE_LIB_DIR=/usr/$(get_libdir)/calibre
+	CALIBRE_LIB_CONTENT=$(for x in "${ED}${CALIBRE_LIB_DIR}"/*; do
+		printf -- "${x##*/} "; done) || die "Failed to list ${ED}${CALIBRE_LIB_DIR}"
+}
+
+pkg_postinst() {
+	[[ -n ${CALIBRE_LIB_DIR} ]] || die "CALIBRE_LIB_DIR is unset"
+	local x
+	for x in "${EROOT}${CALIBRE_LIB_DIR}"/*; do
+		if [[ " ${CALIBRE_LIB_CONTENT} " != *" ${x##*/} "* ]]; then
+			elog "Purging '${x}'"
+			rm -rf "${x}"
+		fi
+	done
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	xdg_icon_cache_update
+}
diff --git a/app-text/crf++/Manifest b/app-text/crf++/Manifest
index b9561fa7de28..aa19d972b17f 100644
--- a/app-text/crf++/Manifest
+++ b/app-text/crf++/Manifest
@@ -1,4 +1,4 @@
 AUX crf++-automake-1.13.patch 216 BLAKE2B 129027abc820acf499b9fd49ea152f0d404c458af0584c0f7acc3dde6a02c46f1f14f96321b0ea7e2d00e9345276e8bdefb2206cc475772e5c23890143c78d0d SHA512 5bd02a0d3f67e37d544255984341beda8c958e5f76ce51521fd2157eb7dc70dfb1d43d30913e4d02e7dfe21526f04520f6539e28a58beed6e577a31b5d4a16ca
 DIST CRF++-0.58.tar.gz 790570 BLAKE2B 8fdd3fea3e30f4196560e2e265519c961739aabbad75e9805040a8f7da0f501620d6bb2c4f589c6d0c8bb79af5c8f46bbe27b610a4ec6a0db632fef219ea5b46 SHA512 676b3e9ed89b5fb2f246175b58c384f10cab09fff8329c07311fed3832f55dbad26a25d2946c9efaa75cd8026517cb9e1742bb70ca26187367747852073e4eb9
-EBUILD crf++-0.58.ebuild 1129 BLAKE2B 03f4411757b8e2bdac0c7b0589babe60d0ec61a51b9af072be4cb6339ebcd4c7ebf7b8c6fbcc957ea8065a1ae65865ca94db2fff489ba1c7f67e00799eb0edef SHA512 0c867ebdd6e85e31e02b0f3d145226b9804f33e7eb3128c9902ba5dc43d29a0ec5937ac759e9c6d51234329c701a38a93ac75e34435d2b8735ae50612077515f
+EBUILD crf++-0.58.ebuild 1097 BLAKE2B afc590d65d22590d2bc02bb523953097f681875f8034adccbdb1ac5e79b12f7cea8865eccbf6340b7b1e9fe799d64e7ec8aee47b1106542bef574c782c6122f6 SHA512 a5f6db965938aee9d8ddf2079e1d996dbea715f87beeaff24fee2be0a47fad105eb8766958c84d8608d21b9eb6b1fc517a6a9400f5af9e57b2af983dcb0ef36f
 MISC metadata.xml 670 BLAKE2B c37096e57c935e0d90c1434e509857577275165424fecbc8fe3a836c1330ff4fa4dffa174dd8004e3c923fd890dbbd370f8269b2ebe0b1538fec41ca25edeeed SHA512 e42bf715ac69cc4d61ee289a8ab14bc3e15bad7d4002b826fc9d5ca8bbf79998e4f79d76d0b698c30602d6dbd4dd64553085bbb354a30c466a3b1ab6ce62ca9c
diff --git a/app-text/crf++/crf++-0.58.ebuild b/app-text/crf++/crf++-0.58.ebuild
index 006c97d4b825..f14ffbc4defd 100644
--- a/app-text/crf++/crf++-0.58.ebuild
+++ b/app-text/crf++/crf++-0.58.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -10,14 +10,13 @@ MY_P="${P^^[crf]}"
 DESCRIPTION="Yet Another CRF toolkit for segmenting/labelling sequential data"
 HOMEPAGE="https://taku910.github.io/crfpp/"
 SRC_URI="mirror://gentoo/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="|| ( BSD LGPL-2.1 )"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="examples static-libs"
 
-S="${WORKDIR}/${MY_P}"
-
 PATCHES=( "${FILESDIR}"/${PN}-automake-1.13.patch )
 HTML_DOCS=( doc/. )
 
@@ -50,9 +49,8 @@ src_install() {
 	einstalldocs
 
 	if use examples; then
+		dodoc -r example
 		docompress -x /usr/share/doc/${PF}/example
-		insinto /usr/share/doc/${PF}
-		doins -r example
 	fi
 
 	if ! use static-libs; then
diff --git a/app-text/evince/Manifest b/app-text/evince/Manifest
index 3e8d63daa3f6..3c8d542749b6 100644
--- a/app-text/evince/Manifest
+++ b/app-text/evince/Manifest
@@ -1,7 +1,5 @@
 AUX 40.0-internal-synctex.patch 921 BLAKE2B d970afe7dd3ac16d7f285baeb157bba0271a6816326a17527d91b68d481d23ed3ad982211c07c412a61157d17cecafa591cc80482ec22abad3ce29101068bbd5 SHA512 703d9b5ca4e718660fe5af2d59a60b3187beda965e3a7b6eeaf1f7bf61013f3acde54b0ba89c8b493b1f0b1950cd52893ff1fb00a74c6d97645df29a1829902c
 AUX 41.3-fix-build-with-meson-0.61.1.patch 1385 BLAKE2B 70740f1424234b056537cd2781aed5c9b114aa6eaa629d48a24022de0a6ec789630a8ab32b8451655b049e3b55db88895654cdd78cee89d4d91858cb60237a47 SHA512 588b93f599b31cd80ada5b599b267ba9eced928b3b9597c43dc1319f41996df056704860cbf7ebe1815b0e91ffd467fb019d7ec64eb09f08d1a969fbea55f46e
-DIST evince-40.4.tar.xz 2928100 BLAKE2B 491b2333e21093b032ec9c4f24c61cdaa31e4a46ee058b0f109b0998fb7216ada2c933e6202eae1d6193caad0cfa94a77434ef042555bab7cf4aeed959be759b SHA512 dbec3828f1e8f0b9b48dd90ce605ce83312e53cbeb8f8e7358c1318f1701680a69a9bcd26b7cf1da4b53679ae11e334ce514f5df4c5bbcc976581441e0d654cd
 DIST evince-41.3.tar.xz 2889368 BLAKE2B c6ef9b4c126f938ef8b50aa65d8591e0ce02e7404dd1984bce27e0acce6e62462d42665ad19992cb2fa22afd09d6da49ecdbbb51eb209518d415966824523628 SHA512 b00422ef0fd752e5afacea2db852ad71d8d16514945a9a54c54967cecd2b1f5058b762ec53eb9057b8f583d5e1e3363c2b7ae1f4434fa6637ad45c5217f082cd
-EBUILD evince-40.4.ebuild 3156 BLAKE2B 73037ed0f0b38c1cc0e0ae2d8609d543b120de95c94a9d73ba85c1c8d8a7dcf8f1446d5fc8c23badb791c2e273f8b45c4dc43f011e7773c79a47d3c2d7df8813 SHA512 2c50a03f52775b4d43cf75b05d850e6948bba51107d4e367fbff1024f23367b3f854462722f11231de3de201b746829546999bb32086cc79e112535b699b83cd
-EBUILD evince-41.3.ebuild 3097 BLAKE2B 7c1a45a85dd0e95cb8be16edd96d3d52f1e6a4461d1c84cbceaba7dfc750ca7674a935bb805ae0e71011adebfa93d184adce810f98b3b551127de0b07e19a29f SHA512 4306ed1b6232731acd0e8dbd7e77f3815353027acaf68714d07ca7984b67de05a2b2c15547f97fd65d62d179347f3a85028dd999d0a3cf62074923bc288da596
+EBUILD evince-41.3.ebuild 3094 BLAKE2B fe2c2043c253f814971a5b969362ee476888cf84d77aa3c2c3fbe9739f5c0bbca71fa4e299443b37b3cd50a915a0cb23dc515ab9f589f36c3669283d810250e5 SHA512 8e433656bb0a3a0906a70e76face51562382024dabb7354114010517e6134cd25fe46f1a0def22d748445730273c58db2ba22f8c57731cb12a95cdb264cc7950
 MISC metadata.xml 882 BLAKE2B 5a52fc8a3986b5a07774f6b157e0c13b3c29a6f5d9bbbedba6367a0dce8a057c6c43ac9b2864a98ec4413e66365971935e4f111ae2be0d2430769f3fcb2b5047 SHA512 73a18d8f42a94322d8292b4ace3bc256dd170af87f160f9e33c12c3b5c76c2032beebbb7eaf9facd2f9d9ee8d669f0f5f805dfeef5c406f75f13f90105521f9f
diff --git a/app-text/evince/evince-40.4.ebuild b/app-text/evince/evince-40.4.ebuild
deleted file mode 100644
index 043cb0568ad4..000000000000
--- a/app-text/evince/evince-40.4.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome.org gnome2-utils meson systemd xdg
-
-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 ~riscv ~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
-)
-
-src_prepare() {
-	xdg_src_prepare
-
-	# 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
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dplatform=gnome
-
-		-Dviewer=true
-		-Dpreviewer=true
-		-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
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/app-text/evince/evince-41.3.ebuild b/app-text/evince/evince-41.3.ebuild
index 75e615774832..59de9f043515 100644
--- a/app-text/evince/evince-41.3.ebuild
+++ b/app-text/evince/evince-41.3.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 postscript spell t1lib tiff xps"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
 
 # atk used in libview
 # bundles unarr
@@ -26,7 +26,7 @@ DEPEND="
 	>=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-text/poppler-0.86.0[cairo]
 	>=app-arch/libarchive-3.2.0
 	djvu? ( >=app-text/djvu-3.5.22:= )
 	dvi? (
@@ -43,7 +43,7 @@ DEPEND="
 	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= )
+	tiff? ( >=media-libs/tiff-4.0:0= )
 	xps? ( >=app-text/libgxps-0.2.1:= )
 "
 RDEPEND="${DEPEND}
diff --git a/app-text/expander/Manifest b/app-text/expander/Manifest
index 756259310988..65ffaeeead58 100644
--- a/app-text/expander/Manifest
+++ b/app-text/expander/Manifest
@@ -1,4 +1,4 @@
 AUX expander-2.0.5-gentoo.patch 1971 BLAKE2B 16459adb991e28472c569ef77bd4f688110e0d2a99970ed65e5332736a1a90a82afa6a04aaec38ba53b16b3303efbe8706324ffe1a37d6b00637550802d23960 SHA512 f81577c3ee11d2e13b59258a59e02a3ec26b265ee2206fde5585f75c21db015907835ade2db88a19ab1afd778a3a7d146d99d1dfb891237d04b2e6a052f49f57
 DIST nedit_expander_kit_2.05.tar.gz 92571 BLAKE2B 0b77640b87372003e873a9e9146aeec82220dfc86b4f6d57220807443c007b6f4f99da8da505d7b6d2f1350150698deed84c8cb710297c6d8646ed192d3ee04a SHA512 a9d5e97db95eec9f98d71360c6af5a6908f31f59221ac1f509ae4f661b0614610b9591b9e2f58bba1175a6b609407d720369ba99cecb5496133d889bf93788ee
-EBUILD expander-2.0.5-r2.ebuild 950 BLAKE2B 2e75ea39d52d7518fbb632422083e3f760f8bc5bd1a67a4476aef16c271128c9db793a55abe2999677f085ba236ece498e22fd7fdec526a02bcfa697ffc4d35c SHA512 f1e4f13b0e24ed43fe61eebb6cbd557c3bf369a8baf9a8aba4bb9b55c33052132722a31e9c2e0d94aee8c502ae4118d9aa803c9ce171786cdf4ed272df892b0a
+EBUILD expander-2.0.5-r2.ebuild 952 BLAKE2B 44e941c8817d949c5ab0832f6f9e3b64a590c1a55563844428469daba0540a06e48c85edae474c3693de0f93c44af4f8cbf73efba18b1223e3d9a419feba4ec4 SHA512 86365e5dbc02dbc8a57a67884e256e50ab8c74b3a61c1648a814599cac2ef6d77ec5fbe33b323ca26d90a4b5efd74e16d52603fb4e6317e45baaa277c24295a9
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/app-text/expander/expander-2.0.5-r2.ebuild b/app-text/expander/expander-2.0.5-r2.ebuild
index c1ddd2ee423e..6684a72038d5 100644
--- a/app-text/expander/expander-2.0.5-r2.ebuild
+++ b/app-text/expander/expander-2.0.5-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,7 +18,7 @@ S="${WORKDIR}/${PN}"
 PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
 
 src_compile() {
-	emake -C src CC=$(tc-getCC)
+	emake -C src CC="$(tc-getCC)"
 }
 
 src_install() {
diff --git a/app-text/foliate/Manifest b/app-text/foliate/Manifest
index 765543d2818c..4af649e22e97 100644
--- a/app-text/foliate/Manifest
+++ b/app-text/foliate/Manifest
@@ -1,7 +1,5 @@
-DIST foliate-2.6.2.tar.gz 4760966 BLAKE2B 299dd8ab9f489772d18b85749cb312c8ddd4b21855452f87176ddfe068ff9e1e78cb5465fec97dbf70de22e7a773cf0910c11c3be7d0adb19279f4d9813249a1 SHA512 30bff00c34f90bfbd26b9e2b567a7cbcb1243cc5da17ff060762b7f1aafa4159daacee615de7f9bfef7d29d8209c8191094a154564f04321280037d2ec76a63e
 DIST foliate-2.6.3.tar.gz 4822251 BLAKE2B c6cedf4f5ae4e728ab2a7fc35a9fa1e9c69f9d2f8af92060b5363675d5e3fc5cb90698f4b184e792852d66a51e90c361b14d38034149304d10cdacc94100dda7 SHA512 b3dd5bc5a02d3f2210b0c7376426a7ea1668a81fa64fea179da2ab1d852778414cce45171143814d2010d6c03b0287dbbc512884107774ec211e24c6ed8127cb
 DIST foliate-2.6.4.tar.gz 4824560 BLAKE2B fd109d76a7cd0cfbff3fb7273b232a7c749922c5e4d782ed4b7dcb63e914a7cc0bd6e7623a509c3117e45ead5c1d7538c57f322742e4e826b88bddc6182abdf1 SHA512 af58efa2c33451617dbf7327b56551557d762ac80f1b489d5da1c5a46ebbfe329052149deb8b2f4c7729a7fd46deccd5500fd96c0a662b731c871c1ad8061cd3
-EBUILD foliate-2.6.2.ebuild 1217 BLAKE2B bad2c61ebe50ad2780fcf432273ce882f04eefb16119d6627b185db713717ef68d408e08cd18b5af63db2d94971291744b734fbad43ae2e20ba66e3ae78aec9a SHA512 253edf5d06def6414bc22ae06a834260609b065a292dadc5a038fd8e0a44116f7ed68372be55b731a97f1bc4c12a002a247a6886d1bbc0723f923cc3748cff7a
 EBUILD foliate-2.6.3.ebuild 1202 BLAKE2B c3e662e2218eb04cb4be8090eedeea2325c49d586e52040f5dcf976cfbdd9f029e0c9d41fd5b9165d9d760d46d3afcba116b85063b76187e816017f81148f9c9 SHA512 4e2c3de331b47ae613dd90d5fba956a4c7ed80788737a321e9a91612004328cf1f6cb6c286964431bbf8d88712c98fc219aa91efad5fa6ca358a5f4a70c5d6b7
-EBUILD foliate-2.6.4.ebuild 1202 BLAKE2B 5393135b4883f5cd16ca754cfd1ad41f53606118c44469d5fb03788ed1069d7dab0890628cc80aad692be1f4a345558eaad8bf1f95c4993290bb6f572a9b88b5 SHA512 e5b91817a3abac0ad25b54b0adaa0450937383a7f5bfba879c62c072658e38632218fc1fc9ee9345228d8266418de8e4fca43de4f3771e5af20dfd3be8b5e760
+EBUILD foliate-2.6.4-r1.ebuild 1210 BLAKE2B 8fa95a0d012751c378194e284391d30f0f4dec8e13ab8bc299cd3bbc4633a9385528dc0cb5576172a9e91abeec157ccc564492c1402b0009cc50ecac5a692ea0 SHA512 01d4b52af39728a8cfe02810c8c154c99451aafb90eae8791be2bd70f4cb7fdc9111b0bcaf51109b9e5b38bc83abf9b383f5a8c61354116c94f169e39e61ada7
 MISC metadata.xml 607 BLAKE2B ab5cffaca496e55fe6c7cce465104fe2c0010d4ef6110c816575944d7f48ae94d834ac61430e1c722daca0ceb739fdb4e2ad35b2afef010675726aea967d2ea2 SHA512 7e1d53bcd78408d6ef3803871d131beced46b118555d7daf0ccc0abf6233d3892568ca3264f1b123f20524d56600cb162c53057fb38a0811571a98ca0051573b
diff --git a/app-text/foliate/foliate-2.6.2.ebuild b/app-text/foliate/foliate-2.6.2.ebuild
deleted file mode 100644
index 685d66123a4f..000000000000
--- a/app-text/foliate/foliate-2.6.2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PLOCALES="cs_CS de_DE es eu fr_FR id_ID ie it ko nb nl nn pt_BR ru_RU sv tr uk zh_CN zh_TW"
-inherit meson plocale xdg-utils gnome2-utils
-SRC_URI="https://github.com/johnfactotum/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-DESCRIPTION="gtk ebook reader built with gjs"
-HOMEPAGE="https://github.com/johnfactotum/foliate/"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="handy spell"
-
-BDEPEND="${MESON_DEPEND}
-	sys-devel/gettext"
-RDEPEND="dev-libs/gjs
-	x11-libs/gtk+:3[introspection]
-	x11-libs/pango[introspection]
-	x11-libs/gdk-pixbuf:2[introspection]
-	net-libs/webkit-gtk:4[introspection]
-	handy? ( gui-libs/libhandy:=[introspection] )
-	spell? ( app-text/gspell[introspection] )"
-
-src_prepare() {
-	default
-
-	plocale_find_changes "${S}"/po '' '.po'
-
-	rm_po() {
-		rm po/${1}.po
-		sed -e "/^${1}/d" -i po/LINGUAS
-	}
-
-	plocale_for_each_disabled_locale rm_po
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	xdg_icon_cache_update
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	xdg_icon_cache_update
-	gnome2_schemas_update
-}
diff --git a/app-text/foliate/foliate-2.6.4-r1.ebuild b/app-text/foliate/foliate-2.6.4-r1.ebuild
new file mode 100644
index 000000000000..f6ded40f0ee6
--- /dev/null
+++ b/app-text/foliate/foliate-2.6.4-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PLOCALES="cs de es eu fr id ie it ko nb nl nn pt_BR ru sv tr uk zh_CN zh_TW"
+PYTHON_COMPAT=( python3_{8..10} )
+inherit meson python-any-r1 plocale xdg gnome2-utils
+SRC_URI="https://github.com/johnfactotum/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+DESCRIPTION="gtk ebook reader built with gjs"
+HOMEPAGE="https://github.com/johnfactotum/foliate/"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="handy spell"
+
+BDEPEND="${MESON_DEPEND}
+	${PYTHON_DEPS}
+	sys-devel/gettext"
+RDEPEND="dev-libs/gjs
+	x11-libs/gtk+:3[introspection]
+	x11-libs/pango[introspection]
+	x11-libs/gdk-pixbuf:2[introspection]
+	net-libs/webkit-gtk:4[introspection]
+	sys-devel/gettext
+	handy? ( gui-libs/libhandy:=[introspection] )
+	spell? ( app-text/gspell[introspection] )"
+
+src_prepare() {
+	default
+	python_fix_shebang build-aux/meson
+	xdg_environment_reset
+
+	plocale_find_changes "${S}"/po '' '.po'
+
+	rm_po() {
+		rm po/${1}.po
+		sed -e "/^${1}/d" -i po/LINGUAS
+	}
+
+	plocale_for_each_disabled_locale rm_po
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
diff --git a/app-text/foliate/foliate-2.6.4.ebuild b/app-text/foliate/foliate-2.6.4.ebuild
deleted file mode 100644
index e884210fcfef..000000000000
--- a/app-text/foliate/foliate-2.6.4.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PLOCALES="cs de es eu fr id ie it ko nb nl nn pt_BR ru sv tr uk zh_CN zh_TW"
-inherit meson plocale xdg-utils gnome2-utils
-SRC_URI="https://github.com/johnfactotum/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-DESCRIPTION="gtk ebook reader built with gjs"
-HOMEPAGE="https://github.com/johnfactotum/foliate/"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="handy spell"
-
-BDEPEND="${MESON_DEPEND}
-	sys-devel/gettext"
-RDEPEND="dev-libs/gjs
-	x11-libs/gtk+:3[introspection]
-	x11-libs/pango[introspection]
-	x11-libs/gdk-pixbuf:2[introspection]
-	net-libs/webkit-gtk:4[introspection]
-	handy? ( gui-libs/libhandy:=[introspection] )
-	spell? ( app-text/gspell[introspection] )"
-
-src_prepare() {
-	default
-
-	plocale_find_changes "${S}"/po '' '.po'
-
-	rm_po() {
-		rm po/${1}.po
-		sed -e "/^${1}/d" -i po/LINGUAS
-	}
-
-	plocale_for_each_disabled_locale rm_po
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	xdg_icon_cache_update
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	xdg_icon_cache_update
-	gnome2_schemas_update
-}
diff --git a/app-text/grip/Manifest b/app-text/grip/Manifest
index 056a59faca59..4b3fd18d112d 100644
--- a/app-text/grip/Manifest
+++ b/app-text/grip/Manifest
@@ -1,3 +1,5 @@
 DIST grip-4.5.2.tar.gz 145644 BLAKE2B a353a74d55d6496f3dad362b74e434ff22c8130368f6773ab2bfdf66e43c62e8dcba0e3a786157d37b81d7c7e49d0c83a60c847100169684ede9c09f4eb06c3f SHA512 a8937d8ba3633a2d47587eb5c1b0583df7e8a8cacebb87fd50dab3fd2deb91981b38a83a3ed182f4e5e7435c8e2c8d87829e45fa9d32d8823c821f6217c7ccc9
+DIST grip-4.6.0.tar.gz 147222 BLAKE2B ee5c10ca47ca0e9089d2618dc765a4ca01f4927da8c4256a251a9cf90ee15d63eb6136848cef0005d5f3af1f12b603f6f0fd55b65840bf542dcb9cd29ff35518 SHA512 483170996e593593781b684986dcb8eec20afb02dca84a9f5baeb3917220706332037f7b18f504aba8aa7d1d1c3587a1af18d6d5628f1e96517511c0be40a6ac
 EBUILD grip-4.5.2-r2.ebuild 764 BLAKE2B a6052b65931aa1ba8fa8d1943a6621dcf749aef2e26830026347d69936615809dd163c073dde46389cd81269ac45a68cb9871ce6e2bd62c5fdaaf1395c2f7f18 SHA512 2330d10a8f6186414dc77bf85a19e4069aac540fb2de217cda68f06fad313b740b0f5547238dd801b6ae748de9bb4dae82e0a1ed15da2e61cabf13c365a738ce
+EBUILD grip-4.6.0.ebuild 765 BLAKE2B c416b4bad1593370f9811d2b587487b2a809955016f2688fab75ba1ee90ea3e0c8362067adb91e3b095b78ed987353a53f888935e312c22804134616f79b59d1 SHA512 a23265346713fd6cdf9dc7a4d7ca8961608122970575c80d429b288776f72864ecceab87f860cb47939b56cef38440e2b3523c6e153497b6eabb9d23f6bd6b21
 MISC metadata.xml 365 BLAKE2B e01f58764eda42b4e6d7ece18b3f2996fe55e640d91cdba317f1f9677a59b114d7caab6c2ea7556f1962e30b8e2b453814179d7e978b52c4c07fe6e89d9a4978 SHA512 286ffe7168abf8d980ad5e713a31751241901246c6b2fe8372942e50bef53a70b3ff17045e99cb951c968309fcab5c9776a1fb26222c0ea4edfa467e8209eb4b
diff --git a/app-text/grip/grip-4.6.0.ebuild b/app-text/grip/grip-4.6.0.ebuild
new file mode 100644
index 000000000000..224d3078f628
--- /dev/null
+++ b/app-text/grip/grip-4.6.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Preview GitHub Markdown files like Readme locally before committing them"
+HOMEPAGE="https://github.com/joeyespo/grip"
+LICENSE="MIT"
+
+SLOT="0"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+KEYWORDS="amd64"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="
+	!media-sound/grip
+	>=dev-python/docopt-0.4.0[${PYTHON_USEDEP}]
+	>=dev-python/flask-0.10.1[${PYTHON_USEDEP}]
+	>=dev-python/markdown-2.5.1[${PYTHON_USEDEP}]
+	>=dev-python/path-and-address-2.0.1[${PYTHON_USEDEP}]
+	>=dev-python/pygments-1.6[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.4.1[${PYTHON_USEDEP}]
+"
diff --git a/app-text/highlight/Manifest b/app-text/highlight/Manifest
index 0b8c3d0d57e1..76ce9fa0c611 100644
--- a/app-text/highlight/Manifest
+++ b/app-text/highlight/Manifest
@@ -2,7 +2,7 @@ AUX highlight-3.57-qt_libs_lua.patch 334 BLAKE2B 6cd387009986ef29f309dc52668f08c
 DIST highlight-3.57.tar.bz2 1412857 BLAKE2B c0ee8189294feac3b5e8c6d356634d8074a8960f2010918de52f23515ad4a13626971e9106ecc6d2adbdb45e0ebb66ff60eb3cbe86d2449666e3424f1c0dc3a6 SHA512 a086f6b8c4a4fc0b6651d456b178350a6c59a32cd613451d81b53fe3294eb0f80d673cb64fb615ef91d6c4d4bbc8a57413aec2490d2a5ad67e695ec6e92b3d99
 DIST highlight-3.60.tar.bz2 1412486 BLAKE2B 3651a44c7e492ce02de04d21ed2e25afb40e871e21eacef88416f98226046e99a2a0a27c3354119715f320df1653ad7065c1c9a4a23b3081971df4d72c6fa19c SHA512 e4d0822592675115c7c2121d6ed066f997d315fecea384caeb506de1933f6bd60fd0dea57dcdafba85465f9f6b922ed168db57ce725bd7f19689d30624412f1b
 DIST highlight-4.1.tar.bz2 1469115 BLAKE2B 9ee4c61ea5ebdfd04c2bb341838cc66a755d5deb6dfb5d863d22dbb86be9b5d08999f22bb184053126bdaf8858777eb2ac504fed8998dc51bd6e1cd64f911ad8 SHA512 6e3ba72b2109f1b33fcebd1a426a8d4b3e12ee224b8a2069e7aab1391473594ccf9b35303bca5ca1339d2ce42bc6db2d16c1da7b1cdd451f5fabe672ca388731
-EBUILD highlight-3.57-r100.ebuild 2392 BLAKE2B a3de7dd2b7c503d9f2231d0e2850d673e338eb10ed49c01bc43fd4520577c148b4d566515f143a1e23ce081e17529185db960f882e6457fa2a7b921f452a9bf0 SHA512 d8cf9752b5a3127bbc3a3db03a9473ba7fc551135eca0c7d61ac33aae0f496c1ddc756c0ff02df33455e4c46ec308232966288f3954085dc0224f70e66746eea
-EBUILD highlight-3.60.ebuild 2392 BLAKE2B a3de7dd2b7c503d9f2231d0e2850d673e338eb10ed49c01bc43fd4520577c148b4d566515f143a1e23ce081e17529185db960f882e6457fa2a7b921f452a9bf0 SHA512 d8cf9752b5a3127bbc3a3db03a9473ba7fc551135eca0c7d61ac33aae0f496c1ddc756c0ff02df33455e4c46ec308232966288f3954085dc0224f70e66746eea
-EBUILD highlight-4.1.ebuild 2405 BLAKE2B 3514f6ce607909e7446ce97f23c8b44ab04ad75ef328863e17f4719b9af2b0fdf6e01611774a00d38fc6721823fb58c517b246eb441de67e12a7cadea6be17ca SHA512 50c808d2081d2bb3b276890a1c1e0f7f067465650c2df376ceaa839273fe1e9085d1df9f6df1005c8f6dfe5eb53d62d651b6514389de75188b443a6fb0d74f4b
+EBUILD highlight-3.57-r100.ebuild 2392 BLAKE2B ea840d9f56ac50e22d0a21c0339b696a6b1de4f82f281e0afab93b54e199239b986a70e1795e146ef469d8108a2ff179deef726f646d6f7b6f1053e791f8aeb6 SHA512 e50889e2b8a1b62c8706f399c2fddb04fe405ca824e4d3291c99620a604d3f1bc5aa1f730a6a7985029b93a92d5f210ad37f2d4aca945907f95cd120f02b6f47
+EBUILD highlight-3.60.ebuild 2392 BLAKE2B ea840d9f56ac50e22d0a21c0339b696a6b1de4f82f281e0afab93b54e199239b986a70e1795e146ef469d8108a2ff179deef726f646d6f7b6f1053e791f8aeb6 SHA512 e50889e2b8a1b62c8706f399c2fddb04fe405ca824e4d3291c99620a604d3f1bc5aa1f730a6a7985029b93a92d5f210ad37f2d4aca945907f95cd120f02b6f47
+EBUILD highlight-4.1.ebuild 2405 BLAKE2B d7945a424f4f958f15c384973acbe0192b473bf913a9bfcb7b01ea3684e5eabc5bcc0f981c9922db2851944a7851239e0dca672f75558763f1911b05e7edfd7b SHA512 b4354913bfde963192077d2f5824b29806dbb8498b4630f30e688169697fe2ddaecd00ab6d9dac021c201d20f874343f161e6b918d21cfcf32e5ed7e8ab89939
 MISC metadata.xml 331 BLAKE2B 3c864f08058c451342b7f7799f36e901f392207b36114dd123bb3faa59f04fe3b00d8e65cee4ad3bbbe44606bdafbd246c64d5fce03cd54fc64cd40cfde59788 SHA512 eb96ee44971855de0b12f9e230d58714acb54de1b0a814c0681f8c31124a5c3e39290e2fd17523b2b52b65efaf30f64580f00777a8e9c908779b582577897906
diff --git a/app-text/highlight/highlight-3.57-r100.ebuild b/app-text/highlight/highlight-3.57-r100.ebuild
index b302b8a2f602..8b9689954ce7 100644
--- a/app-text/highlight/highlight-3.57-r100.ebuild
+++ b/app-text/highlight/highlight-3.57-r100.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -39,16 +39,16 @@ PATCHES=(
 )
 
 myhlopts=(
-	"CXX=$(tc-getCXX)"
-	"AR=$(tc-getAR)"
-	"LDFLAGS=${LDFLAGS}"
-	"CFLAGS=${CXXFLAGS} -DNDEBUG"
-	"DESTDIR=${D}"
-	"PREFIX=${EPREFIX}/usr"
-	"HL_CONFIG_DIR=${EPREFIX}/etc/highlight/"
-	"HL_DATA_DIR=${EPREFIX}/usr/share/highlight/"
-	"doc_dir=${EPREFIX}/usr/share/doc/${PF}/"
-	"conf_dir=${EPREFIX}/etc/highlight/"
+	CXX="$(tc-getCXX)"
+	AR="$(tc-getAR)"
+	LDFLAGS="${LDFLAGS}"
+	CFLAGS="${CXXFLAGS} -DNDEBUG"
+	DESTDIR="${D}"
+	PREFIX="${EPREFIX}/usr"
+	HL_CONFIG_DIR="${EPREFIX}/etc/highlight/"
+	HL_DATA_DIR="${EPREFIX}/usr/share/highlight/"
+	doc_dir="${EPREFIX}/usr/share/doc/${PF}/"
+	conf_dir="${EPREFIX}/etc/highlight/"
 )
 
 src_prepare() {
diff --git a/app-text/highlight/highlight-3.60.ebuild b/app-text/highlight/highlight-3.60.ebuild
index b302b8a2f602..8b9689954ce7 100644
--- a/app-text/highlight/highlight-3.60.ebuild
+++ b/app-text/highlight/highlight-3.60.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -39,16 +39,16 @@ PATCHES=(
 )
 
 myhlopts=(
-	"CXX=$(tc-getCXX)"
-	"AR=$(tc-getAR)"
-	"LDFLAGS=${LDFLAGS}"
-	"CFLAGS=${CXXFLAGS} -DNDEBUG"
-	"DESTDIR=${D}"
-	"PREFIX=${EPREFIX}/usr"
-	"HL_CONFIG_DIR=${EPREFIX}/etc/highlight/"
-	"HL_DATA_DIR=${EPREFIX}/usr/share/highlight/"
-	"doc_dir=${EPREFIX}/usr/share/doc/${PF}/"
-	"conf_dir=${EPREFIX}/etc/highlight/"
+	CXX="$(tc-getCXX)"
+	AR="$(tc-getAR)"
+	LDFLAGS="${LDFLAGS}"
+	CFLAGS="${CXXFLAGS} -DNDEBUG"
+	DESTDIR="${D}"
+	PREFIX="${EPREFIX}/usr"
+	HL_CONFIG_DIR="${EPREFIX}/etc/highlight/"
+	HL_DATA_DIR="${EPREFIX}/usr/share/highlight/"
+	doc_dir="${EPREFIX}/usr/share/doc/${PF}/"
+	conf_dir="${EPREFIX}/etc/highlight/"
 )
 
 src_prepare() {
diff --git a/app-text/highlight/highlight-4.1.ebuild b/app-text/highlight/highlight-4.1.ebuild
index c9571abe99d0..bf1c828666e9 100644
--- a/app-text/highlight/highlight-4.1.ebuild
+++ b/app-text/highlight/highlight-4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -39,16 +39,16 @@ PATCHES=(
 )
 
 myhlopts=(
-	"CXX=$(tc-getCXX)"
-	"AR=$(tc-getAR)"
-	"LDFLAGS=${LDFLAGS}"
-	"CFLAGS=${CXXFLAGS} -DNDEBUG"
-	"DESTDIR=${D}"
-	"PREFIX=${EPREFIX}/usr"
-	"HL_CONFIG_DIR=${EPREFIX}/etc/highlight/"
-	"HL_DATA_DIR=${EPREFIX}/usr/share/highlight/"
-	"doc_dir=${EPREFIX}/usr/share/doc/${PF}/"
-	"conf_dir=${EPREFIX}/etc/highlight/"
+	CXX="$(tc-getCXX)"
+	AR="$(tc-getAR)"
+	LDFLAGS="${LDFLAGS}"
+	CFLAGS="${CXXFLAGS} -DNDEBUG"
+	DESTDIR="${D}"
+	PREFIX="${EPREFIX}/usr"
+	HL_CONFIG_DIR="${EPREFIX}/etc/highlight/"
+	HL_DATA_DIR="${EPREFIX}/usr/share/highlight/"
+	doc_dir="${EPREFIX}/usr/share/doc/${PF}/"
+	conf_dir="${EPREFIX}/etc/highlight/"
 )
 
 src_prepare() {
diff --git a/app-text/jabref/Manifest b/app-text/jabref/Manifest
index 2fa1503d2222..aa8a06300919 100644
--- a/app-text/jabref/Manifest
+++ b/app-text/jabref/Manifest
@@ -1,3 +1,8 @@
+AUX jabref-2.10-javax.swing-java-9+.patch 14266 BLAKE2B cfd504d6258b3318865996fdeb2e19fe1712b713d80e73af2f813b2854e26e769e18a8e7ee70d28ac47f889c1c84ddd27c7a40dcf01bcfa219ed310130230b3f SHA512 e01ddaaf8ca0d4d6cf78f1a4a367164173decb345e400f16f2ea5eef78f80970ddaa75a8c23f2552b48d33c3989d21ff6701c0631c72d3000a28716257eca40d
+AUX jabref-2.10-skip-failing-tests.patch 14972 BLAKE2B bbe4e6b4b94890cfe0db1c03ce6823a782ad93ffd0ccb9b1f23f218152ad556db92db25a9ab96c46d0cb47e2d288fe854d72932675ced23c7add01a25c448801 SHA512 d3669dd6520c6ac18e1d8be7966acdccd429de00f814ba71623f7abb183ccc933dc46c39ba90744ad301918140eafaf5adc17ae78281dcccc96dea2e1b8697dd
+AUX jabref-2.10-test-jvm-props-args.patch 1846 BLAKE2B 1d278c20ecfea4923d4e28bb8ceb1af35b23b8ca7324d68a1852f289bc29ecf8bed44a483b13d87e9e9d48162ac56d6d09f5cdb42e41b25d7ddedfa20b0cf3fc SHA512 b81aa6b7e2c65409180dedcf4e0e1bdd65f32b64a72ec2588b9fcda1caa31d3dfd82690c975ef1ca39a2040f549b97267643a5b1633812bcddc0a428f9330429
+AUX jabref-2.10-test-prefs.xml 935 BLAKE2B 6429d261893c8388d4f2f5ee8328a649ded5d9756f48187d77a317a97bf20ef4d3c9da5c29a754e40548a774ab59bb9dfc2ef3e2e0d1708f1b9fbd7b3d15fd90 SHA512 e9ab3bb2faa4eda9e2fe8f282c9b669934d94d0461baa0cfbfddfffd3a7abf5c75f7d164ef6d5ad46f54aa7783c560c87ccfba82ec8cc98dc6dc0c6aded029f9
 DIST JabRef-2.10-src.tar.bz2 16769469 BLAKE2B adb0acabd1872d5b9b054e8c4c7e85a0cf0425ad748408e248a66dceef7ba3eca0af8a8d2cc1ef0828bc930cab7e48e8f1800c8e55902af19b4827ae4480fe16 SHA512 72eee8fb08040fc7bfd395729d3c74f0a8841c90d5aa6e6e8d8e68ddcc1ffe1f6659a045aa951d51deffe266ee0b1ff844c4fdf36537d5463de6b361803bb942
 EBUILD jabref-2.10-r6.ebuild 1998 BLAKE2B bdc1a0ed3328e781f096fdf6cbceca743b44adefd551386d05d6c2f2ffaae4640fc3f2ce42228f4928bbb51aa4e896d0248a97fb88823dcd605f1c12efedd533 SHA512 ed531c193206bbbd19313b5baafa9942db8e9a9fe9e05abfc12931ea9b23c430fe240875f889bbf9b3e9df8610a72e63740b730db5de9cf72c877ab13e8e0a65
+EBUILD jabref-2.10-r7.ebuild 3936 BLAKE2B b028c2117e2c2981244e69e74e2bd0541509cb2a4bf0b038917698ebac17e195714e88dd41a15483df9cbbd1b58883059ecf90d1a3e8625ffc2c6eb10bfaca62 SHA512 7822d3e1ca3b43e493811dfe6d5ad713912f48658fbc775ace264c3cfa34915c244f61a419c5712de117f61fb1c835d6bd7e9c1ca8f895c6da83fa8a20ce7101
 MISC metadata.xml 538 BLAKE2B 42838a006f22851a46a0327962db710293807bf0a88ada771d14a55109d4b304a3c128547d9e9fcbf98c7d7f4807ce40310f32040109d7531f22c5f2cf93e050 SHA512 6023ce4d2b7ce8165511cc356dc99fcfb2b6f6c16064ea64558c96d83973ae8dd826b8b4a0fedac134f4609739d15fa981a444900b4b281d2f4c85affc5a8087
diff --git a/app-text/jabref/files/jabref-2.10-javax.swing-java-9+.patch b/app-text/jabref/files/jabref-2.10-javax.swing-java-9+.patch
new file mode 100644
index 000000000000..30dbe53e9725
--- /dev/null
+++ b/app-text/jabref/files/jabref-2.10-javax.swing-java-9+.patch
@@ -0,0 +1,313 @@
+From bd03f07b5bcc5feb558caec4fbfd556947630fb9 Mon Sep 17 00:00:00 2001
+From: Yuan Liao <liaoyuan@gmail.com>
+Date: Sat, 19 Feb 2022 08:25:21 -0800
+Subject: [PATCH] Update uses of javax.swing API members for Java 9+
+
+These changes are backward compatible with Java 8.
+
+Signed-off-by: Yuan Liao <liaoyuan@gmail.com>
+---
+ .../sf/jabref/FindUnlinkedFilesDialog.java    |  9 ++++-----
+ .../net/sf/jabref/collab/EntryChange.java     |  6 +++---
+ .../sf/jabref/groups/AddToGroupAction.java    |  5 +++--
+ .../net/sf/jabref/groups/GroupSelector.java   |  9 +++++----
+ .../net/sf/jabref/groups/GroupTreeNode.java   | 20 ++++++++-----------
+ src/java/net/sf/jabref/groups/GroupsTree.java | 17 ++++++++--------
+ .../jabref/imports/AppendDatabaseAction.java  |  5 +++--
+ .../sf/jabref/sql/exporter/DBExporter.java    |  9 +++++----
+ 8 files changed, 40 insertions(+), 40 deletions(-)
+
+diff --git a/src/java/net/sf/jabref/FindUnlinkedFilesDialog.java b/src/java/net/sf/jabref/FindUnlinkedFilesDialog.java
+index 4bcbd73..5f7473d 100644
+--- a/src/java/net/sf/jabref/FindUnlinkedFilesDialog.java
++++ b/src/java/net/sf/jabref/FindUnlinkedFilesDialog.java
+@@ -669,13 +669,12 @@ public class FindUnlinkedFilesDialog extends JDialog {
+ 	 *            The root node representing a tree structure.
+ 	 * @return A list of files of all checked leaf nodes.
+ 	 */
+-	@SuppressWarnings("unchecked")
+ 	private List<File> getFileListFromNode(CheckableTreeNode node) {
+ 		List<File> filesList = new ArrayList<File>();
+-		Enumeration<CheckableTreeNode> childs = node.depthFirstEnumeration();
++		Enumeration<TreeNode> childs = node.depthFirstEnumeration();
+ 		ArrayList<CheckableTreeNode> nodesToRemove = new ArrayList<FindUnlinkedFilesDialog.CheckableTreeNode>();
+ 		while (childs.hasMoreElements()) {
+-			CheckableTreeNode child = childs.nextElement();
++			CheckableTreeNode child = (CheckableTreeNode) childs.nextElement();
+ 			if (child.isLeaf() && child.getSelected()) {
+ 				File nodeFile = ((FileNodeWrapper) child.getUserObject()).file;
+ 				if (nodeFile != null && nodeFile.isFile()) {
+@@ -1105,9 +1104,9 @@ public class FindUnlinkedFilesDialog extends JDialog {
+ 		@SuppressWarnings("unchecked")
+ 		public void setSelected(boolean bSelected) {
+ 			isSelected = bSelected;
+-			Enumeration<CheckableTreeNode> children = this.children();
++			Enumeration<TreeNode> children = this.children();
+ 			while (children.hasMoreElements()) {
+-				CheckableTreeNode child = children.nextElement();
++				CheckableTreeNode child = (CheckableTreeNode) children.nextElement();
+ 				child.setSelected(bSelected);
+ 			}
+ 
+diff --git a/src/java/net/sf/jabref/collab/EntryChange.java b/src/java/net/sf/jabref/collab/EntryChange.java
+index 924fd25..d479995 100644
+--- a/src/java/net/sf/jabref/collab/EntryChange.java
++++ b/src/java/net/sf/jabref/collab/EntryChange.java
+@@ -21,6 +21,7 @@ import java.util.TreeSet;
+ import javax.swing.JComponent;
+ import javax.swing.JLabel;
+ import javax.swing.JScrollPane;
++import javax.swing.tree.TreeNode;
+ 
+ import net.sf.jabref.*;
+ import net.sf.jabref.undo.NamedCompound;
+@@ -83,11 +84,10 @@ public class EntryChange extends Change {
+ 
+   
+ public boolean makeChange(BasePanel panel, BibtexDatabase secondary, NamedCompound undoEdit) {
+-    @SuppressWarnings("unchecked")
+     boolean allAccepted = true;
+-    Enumeration<Change> e = children();
++    Enumeration<TreeNode> e = children();
+     for (; e.hasMoreElements();) {
+-        Change c = e.nextElement();
++        Change c = (Change) e.nextElement();
+         if (c.isAcceptable() && c.isAccepted())
+             c.makeChange(panel, secondary, undoEdit);
+         else allAccepted = false;
+diff --git a/src/java/net/sf/jabref/groups/AddToGroupAction.java b/src/java/net/sf/jabref/groups/AddToGroupAction.java
+index 30d57c8..1840e32 100644
+--- a/src/java/net/sf/jabref/groups/AddToGroupAction.java
++++ b/src/java/net/sf/jabref/groups/AddToGroupAction.java
+@@ -20,6 +20,7 @@ import java.util.Enumeration;
+ import java.util.Vector;
+ 
+ import javax.swing.AbstractAction;
++import javax.swing.tree.TreeNode;
+ import javax.swing.undo.AbstractUndoableEdit;
+ 
+ import net.sf.jabref.BasePanel;
+@@ -59,10 +60,10 @@ public class AddToGroupAction extends AbstractAction {
+         
+         if (m_move) {
+             // collect warnings for removal
+-            Enumeration<GroupTreeNode> e = ((GroupTreeNode) m_node.getRoot()).preorderEnumeration();
++            Enumeration<TreeNode> e = ((GroupTreeNode) m_node.getRoot()).preorderEnumeration();
+             GroupTreeNode node;
+             while (e.hasMoreElements()) {
+-                node = e.nextElement();
++                node = (GroupTreeNode) e.nextElement();
+                 if (!node.getGroup().supportsRemove())
+                     continue;
+                 for (int i = 0; i < entries.length; ++i) {
+diff --git a/src/java/net/sf/jabref/groups/GroupSelector.java b/src/java/net/sf/jabref/groups/GroupSelector.java
+index 4700d13..4813f12 100644
+--- a/src/java/net/sf/jabref/groups/GroupSelector.java
++++ b/src/java/net/sf/jabref/groups/GroupSelector.java
+@@ -60,6 +60,7 @@ import javax.swing.event.PopupMenuListener;
+ import javax.swing.event.TreeSelectionEvent;
+ import javax.swing.event.TreeSelectionListener;
+ import javax.swing.tree.DefaultTreeModel;
++import javax.swing.tree.TreeNode;
+ import javax.swing.tree.TreePath;
+ import javax.swing.undo.AbstractUndoableEdit;
+ import javax.swing.undo.CompoundEdit;
+@@ -1498,8 +1499,8 @@ public class GroupSelector extends SidePaneComponent implements
+         GroupTreeNode node;
+         AbstractGroup group;
+         Vector<GroupTreeNode> vec = new Vector<GroupTreeNode>();
+-        for (Enumeration<GroupTreeNode> e = groupsRoot.preorderEnumeration(); e.hasMoreElements();) {
+-            node = e.nextElement();
++        for (Enumeration<TreeNode> e = groupsRoot.preorderEnumeration(); e.hasMoreElements();) {
++            node = (GroupTreeNode) e.nextElement();
+             group = node.getGroup();
+             int i;
+             for (i = 0; i < entries.length; ++i) {
+@@ -1537,8 +1538,8 @@ public class GroupSelector extends SidePaneComponent implements
+       BibtexEntry entry;
+       Vector<GroupTreeNode> vec = new Vector<GroupTreeNode>();
+       Map<String, String> dummyMap = new HashMap<String, String>(); // just because I don't want to use null...
+-        for (Enumeration<GroupTreeNode> e = groupsRoot.depthFirstEnumeration(); e.hasMoreElements();) {
+-          node = e.nextElement();
++        for (Enumeration<TreeNode> e = groupsRoot.depthFirstEnumeration(); e.hasMoreElements();) {
++          node = (GroupTreeNode) e.nextElement();
+           rule = node.getSearchRule();
+             for (Iterator<BibtexEntry> it = matches.iterator(); it.hasNext();) {
+               entry = it.next();
+diff --git a/src/java/net/sf/jabref/groups/GroupTreeNode.java b/src/java/net/sf/jabref/groups/GroupTreeNode.java
+index 9013af4..c55c7cf 100644
+--- a/src/java/net/sf/jabref/groups/GroupTreeNode.java
++++ b/src/java/net/sf/jabref/groups/GroupTreeNode.java
+@@ -81,10 +81,10 @@ public class GroupTreeNode extends DefaultMutableTreeNode implements
+ 	 */
+ 	public String getTreeAsString() {
+ 		StringBuffer sb = new StringBuffer();
+-		Enumeration<GroupTreeNode> e = preorderEnumeration();
++		Enumeration<TreeNode> e = preorderEnumeration();
+ 		GroupTreeNode cursor;
+ 		while (e.hasMoreElements()) {
+-			cursor = e.nextElement();
++			cursor = (GroupTreeNode) e.nextElement();
+             sb.append(cursor.getLevel()).append(" ").append(cursor.getGroup().toString()).append("\n");
+ 		}
+ 		return sb.toString();
+@@ -194,26 +194,22 @@ public class GroupTreeNode extends DefaultMutableTreeNode implements
+ 	}
+ 
+ 	@Override
+-	@SuppressWarnings("unchecked")
+-	public Enumeration<GroupTreeNode> preorderEnumeration(){
++	public Enumeration<TreeNode> preorderEnumeration(){
+ 		return super.preorderEnumeration();
+ 	}
+ 	
+ 	@Override
+-	@SuppressWarnings("unchecked")
+-	public Enumeration<GroupTreeNode> depthFirstEnumeration(){
++	public Enumeration<TreeNode> depthFirstEnumeration(){
+ 		return super.depthFirstEnumeration();
+ 	}
+ 	
+ 	@Override
+-	@SuppressWarnings("unchecked")
+-	public Enumeration<GroupTreeNode> breadthFirstEnumeration(){
++	public Enumeration<TreeNode> breadthFirstEnumeration(){
+ 		return super.breadthFirstEnumeration();
+ 	}
+ 	
+ 	@Override
+-	@SuppressWarnings("unchecked")
+-	public Enumeration<GroupTreeNode> children(){
++	public Enumeration<TreeNode> children(){
+ 		return super.children();
+ 	}
+ 	
+@@ -224,10 +220,10 @@ public class GroupTreeNode extends DefaultMutableTreeNode implements
+ 	 */
+ 	public AbstractGroup[] getMatchingGroups(BibtexEntry entry) {
+ 		Vector<AbstractGroup> matchingGroups = new Vector<AbstractGroup>();
+-		Enumeration<GroupTreeNode> e = preorderEnumeration();
++		Enumeration<TreeNode> e = preorderEnumeration();
+ 		AbstractGroup group;
+ 		while (e.hasMoreElements()) {
+-			group = (e.nextElement()).getGroup();
++			group = ((GroupTreeNode) e.nextElement()).getGroup();
+ 			if (group.contains(null, entry)) // first argument is never used
+ 				matchingGroups.add(group);
+ 		}
+diff --git a/src/java/net/sf/jabref/groups/GroupsTree.java b/src/java/net/sf/jabref/groups/GroupsTree.java
+index e58a567..c3daf94 100644
+--- a/src/java/net/sf/jabref/groups/GroupsTree.java
++++ b/src/java/net/sf/jabref/groups/GroupsTree.java
+@@ -31,6 +31,7 @@ import javax.swing.JTree;
+ import javax.swing.SwingUtilities;
+ import javax.swing.ToolTipManager;
+ import javax.swing.tree.DefaultMutableTreeNode;
++import javax.swing.tree.TreeNode;
+ import javax.swing.tree.TreePath;
+ import javax.swing.tree.TreeSelectionModel;
+ import javax.swing.undo.AbstractUndoableEdit;
+@@ -415,14 +416,14 @@ public class GroupsTree extends JTree implements DragSourceListener,
+ 
+ 	/** Expand this node and all its children. */
+ 	public void expandSubtree(GroupTreeNode node) {
+-		for (Enumeration<GroupTreeNode> e = node.depthFirstEnumeration(); e.hasMoreElements();)
+-			expandPath(new TreePath(e.nextElement().getPath()));
++		for (Enumeration<TreeNode> e = node.depthFirstEnumeration(); e.hasMoreElements();)
++			expandPath(new TreePath(((GroupTreeNode) e.nextElement()).getPath()));
+ 	}
+ 
+ 	/** Collapse this node and all its children. */
+ 	public void collapseSubtree(GroupTreeNode node) {
+-		for (Enumeration<GroupTreeNode> e = node.depthFirstEnumeration(); e.hasMoreElements();)
+-			collapsePath(new TreePath((e.nextElement())
++		for (Enumeration<TreeNode> e = node.depthFirstEnumeration(); e.hasMoreElements();)
++			collapsePath(new TreePath(((GroupTreeNode) e.nextElement())
+ 					.getPath()));
+ 	}
+ 
+@@ -432,8 +433,8 @@ public class GroupsTree extends JTree implements DragSourceListener,
+ 	 */
+ 	public boolean hasExpandedDescendant(TreePath path) {
+ 		GroupTreeNode node = (GroupTreeNode) path.getLastPathComponent();
+-		for (Enumeration<GroupTreeNode> e = node.children(); e.hasMoreElements();) {
+-			GroupTreeNode child = e.nextElement();
++		for (Enumeration<TreeNode> e = node.children(); e.hasMoreElements();) {
++			GroupTreeNode child = (GroupTreeNode) e.nextElement();
+ 			if (child.isLeaf())
+ 				continue; // don't care about this case
+ 			TreePath pathToChild = path.pathByAddingChild(child);
+@@ -449,8 +450,8 @@ public class GroupsTree extends JTree implements DragSourceListener,
+ 	 */
+ 	public boolean hasCollapsedDescendant(TreePath path) {
+ 		GroupTreeNode node = (GroupTreeNode) path.getLastPathComponent();
+-		for (Enumeration<GroupTreeNode> e = node.children(); e.hasMoreElements();) {
+-			GroupTreeNode child = e.nextElement();
++		for (Enumeration<TreeNode> e = node.children(); e.hasMoreElements();) {
++			GroupTreeNode child = (GroupTreeNode) e.nextElement();
+ 			if (child.isLeaf())
+ 				continue; // don't care about this case
+ 			TreePath pathToChild = path.pathByAddingChild(child);
+diff --git a/src/java/net/sf/jabref/imports/AppendDatabaseAction.java b/src/java/net/sf/jabref/imports/AppendDatabaseAction.java
+index ad84bbc..5fdce20 100644
+--- a/src/java/net/sf/jabref/imports/AppendDatabaseAction.java
++++ b/src/java/net/sf/jabref/imports/AppendDatabaseAction.java
+@@ -22,6 +22,7 @@ import java.util.Iterator;
+ import java.util.List;
+ 
+ import javax.swing.JOptionPane;
++import javax.swing.tree.TreeNode;
+ 
+ import net.sf.jabref.BaseAction;
+ import net.sf.jabref.BasePanel;
+@@ -175,9 +176,9 @@ public class AppendDatabaseAction extends BaseAction {
+                   ExplicitGroup group;
+                   BibtexEntry entry;
+                   
+-                  for (Enumeration<GroupTreeNode> e = newGroups
++                  for (Enumeration<TreeNode> e = newGroups
+ 					.preorderEnumeration(); e.hasMoreElements();) {
+-					node = e.nextElement();
++					node = (GroupTreeNode) e.nextElement();
+ 					if (!(node.getGroup() instanceof ExplicitGroup))
+ 						continue;
+ 					group = (ExplicitGroup) node.getGroup();
+diff --git a/src/java/net/sf/jabref/sql/exporter/DBExporter.java b/src/java/net/sf/jabref/sql/exporter/DBExporter.java
+index deb9126..1518e0b 100644
+--- a/src/java/net/sf/jabref/sql/exporter/DBExporter.java
++++ b/src/java/net/sf/jabref/sql/exporter/DBExporter.java
+@@ -32,6 +32,7 @@ import java.util.Set;
+ import java.util.Vector;
+ 
+ import javax.swing.JOptionPane;
++import javax.swing.tree.TreeNode;
+ 
+ import net.sf.jabref.BibtexDatabase;
+ import net.sf.jabref.BibtexEntry;
+@@ -201,9 +202,9 @@ public abstract class DBExporter extends DBImporterExporter{
+ 			rs.next();
+ 			myID = rs.getInt("groups_id");
+ 		}
+-		for (Enumeration<GroupTreeNode> e = cursor.children(); e
++		for (Enumeration<TreeNode> e = cursor.children(); e
+ 				.hasMoreElements();)
+-			currentID = populateEntryGroupsTable(e.nextElement(), myID,
++			currentID = populateEntryGroupsTable((GroupTreeNode) e.nextElement(), myID,
+ 					currentID, out, database_id);
+ 		return currentID;
+ 	}
+@@ -338,9 +339,9 @@ public abstract class DBExporter extends DBImporterExporter{
+ 			rs.next();
+ 			myID = rs.getInt("groups_id");
+ 		}
+-		for (Enumeration<GroupTreeNode> e = cursor.children(); e
++		for (Enumeration<TreeNode> e = cursor.children(); e
+ 				.hasMoreElements();)
+-			currentID = populateGroupsTable(e.nextElement(), myID, ++currentID,
++			currentID = populateGroupsTable((GroupTreeNode) e.nextElement(), myID, ++currentID,
+ 					out, database_id);
+ 		return currentID;
+ 	}
+-- 
+2.34.1
+
diff --git a/app-text/jabref/files/jabref-2.10-skip-failing-tests.patch b/app-text/jabref/files/jabref-2.10-skip-failing-tests.patch
new file mode 100644
index 000000000000..95a2e7310fe6
--- /dev/null
+++ b/app-text/jabref/files/jabref-2.10-skip-failing-tests.patch
@@ -0,0 +1,349 @@
+From 0791be415c4104a4c7ff79487823a9f0a7a1d2ec Mon Sep 17 00:00:00 2001
+From: Yuan Liao <liaoyuan@gmail.com>
+Date: Sat, 19 Feb 2022 10:47:42 -0800
+Subject: [PATCH] Skip tests that fail when run directly outside Portage
+
+Because the tests are JUnit 3 tests, to skip them, each test's method
+name needs to be changed to something that does not start with 'test'.
+
+Signed-off-by: Yuan Liao <liaoyuan@gmail.com>
+---
+ .../tests/net/sf/jabref/UtilFindFileTest.java |  4 ++--
+ src/java/tests/net/sf/jabref/UtilTest.java    | 10 +++++-----
+ .../jabref/export/layout/LayoutEntryTest.java | 19 ++++++++++++++-----
+ .../sf/jabref/export/layout/LayoutTest.java   |  4 ++--
+ .../sf/jabref/export/layout/RTFCharsTest.java |  4 ++--
+ .../AuthorLastFirstAbbreviatorTester.java     |  2 +-
+ .../export/layout/format/DOICheckTest.java    | 10 +++++++++-
+ .../sf/jabref/imports/BibtexParserTest.java   |  4 ++--
+ .../sf/jabref/imports/CopacImporterTest.java  |  4 ++--
+ .../sf/jabref/imports/IsiImporterTest.java    |  4 ++--
+ .../net/sf/jabref/imports/OAI2ImportTest.java |  2 +-
+ .../tests/net/sf/jabref/util/XMPUtilTest.java |  6 +++---
+ 12 files changed, 45 insertions(+), 28 deletions(-)
+
+diff --git a/src/java/tests/net/sf/jabref/UtilFindFileTest.java b/src/java/tests/net/sf/jabref/UtilFindFileTest.java
+index 7718c2c..b82360b 100644
+--- a/src/java/tests/net/sf/jabref/UtilFindFileTest.java
++++ b/src/java/tests/net/sf/jabref/UtilFindFileTest.java
+@@ -27,7 +27,7 @@ public class UtilFindFileTest extends FileBasedTestCase {
+ 	 * 
+ 	 * @throws IOException
+ 	 */
+-	public void testFindFileRelative() throws IOException {
++	public void skipTestFindFileRelative() throws IOException {
+ 
+ 		// Most basic case
+ 		assertEqualPaths("HipKro03.pdf", findFile(root.getAbsolutePath() + "/test/",
+@@ -144,7 +144,7 @@ public class UtilFindFileTest extends FileBasedTestCase {
+ 
+ 	}
+ 
+-	public void testFindFile() throws IOException {
++	public void skipTestFindFile() throws IOException {
+ 
+ 		// Simple case
+ 		assertEqualPaths("HipKro03.pdf", Util.findFile(entry, database, root.getAbsolutePath()
+diff --git a/src/java/tests/net/sf/jabref/UtilTest.java b/src/java/tests/net/sf/jabref/UtilTest.java
+index a2e4ac6..50a6cad 100644
+--- a/src/java/tests/net/sf/jabref/UtilTest.java
++++ b/src/java/tests/net/sf/jabref/UtilTest.java
+@@ -65,7 +65,7 @@ public class UtilTest extends TestCase {
+ 
+ 	}
+ 
+-	public void testPlaceDialog() {
++	public void skipTestPlaceDialog() {
+ 		Dialog d = new JDialog();
+ 		d.setSize(50, 50);
+ 		Container c = new JWindow();
+@@ -111,7 +111,7 @@ public class UtilTest extends TestCase {
+ 		assertEquals("\"{a\"}", Util.shaveString("  \"{a\"}    "));
+ 	}
+ 
+-	public void testCheckLegalKey() {
++	public void skipTestCheckLegalKey() {
+ 
+ 		assertEquals("AAAA", Util.checkLegalKey("AA AA"));
+ 		assertEquals("SPECIALCHARS", Util.checkLegalKey("SPECIAL CHARS#{\\\"}~,^"));
+@@ -119,7 +119,7 @@ public class UtilTest extends TestCase {
+ 		assertEquals("", Util.checkLegalKey("\n\t\r"));
+ 	}
+ 
+-	public void testReplaceSpecialCharacters() {
++	public void skipTestReplaceSpecialCharacters() {
+ 		// Shouldn't German � be resolved to Ae
+ 		assertEquals("AeaeaAAA", Util.replaceSpecialCharacters("������"));
+ 		assertEquals("Hallo Arger", Util.replaceSpecialCharacters("Hallo Arger"));
+@@ -221,7 +221,7 @@ public class UtilTest extends TestCase {
+ 	}
+ 
+ 
+-	public void testFieldAndFormat(){
++	public void skipTestFieldAndFormat(){
+ 		assertEquals("Eric von Hippel and Georg von Krogh", Util.getFieldAndFormat("[author]", entry, database));
+ 
+ 		assertEquals("Eric von Hippel and Georg von Krogh", Util.getFieldAndFormat("author", entry, database));
+@@ -239,7 +239,7 @@ public class UtilTest extends TestCase {
+ 		assertEquals("HipKro03", Util.getFieldAndFormat("[bibtexkey:]", entry, database));
+ 	}
+ 
+-	public void testUserFieldAndFormat(){
++	public void skipTestUserFieldAndFormat(){
+ 
+ 		String[] names = Globals.prefs.getStringArray(NameFormatterTab.NAME_FORMATER_KEY);
+ 		if (names == null)
+diff --git a/src/java/tests/net/sf/jabref/export/layout/LayoutEntryTest.java b/src/java/tests/net/sf/jabref/export/layout/LayoutEntryTest.java
+index 8d6cea9..3197bf0 100644
+--- a/src/java/tests/net/sf/jabref/export/layout/LayoutEntryTest.java
++++ b/src/java/tests/net/sf/jabref/export/layout/LayoutEntryTest.java
+@@ -92,11 +92,20 @@ public class LayoutEntryTest extends TestCase
+ 	/*************************/
+ 	/****** tests Cases ******/
+ 	/*************************/
++
++	/*
++	 * An empty test case to avoid "No tests found" failure:
++	 *
++	 * warning(junit.framework.TestSuite$1)junit.framework.AssertionFailedError:
++	 * No tests found in tests.net.sf.jabref.export.layout.LayoutEntryTest
++	 */
++	public void testDummy() {
++	}
+ 	
+ 	/**
+ 	 * @throws Exception
+ 	 */
+-	public void testNoHighlighting() throws Exception
++	public void skipTestNoHighlighting() throws Exception
+ 	{
+ 		// say that this bibtex object was found
+ 		mBTE.setSearchHit(true);
+@@ -113,7 +122,7 @@ public class LayoutEntryTest extends TestCase
+ 	/**
+ 	 * @throws Exception
+ 	 */
+-	public void testHighlightingOneWordCaseInsesitive() throws Exception
++	public void skipTestHighlightingOneWordCaseInsesitive() throws Exception
+ 	{
+ 		// say that this bibtex object was found
+ 		mBTE.setSearchHit(true);
+@@ -135,7 +144,7 @@ public class LayoutEntryTest extends TestCase
+ 	/**
+ 	 * @throws Exception
+ 	 */
+-	public void testHighlightingTwoWordsCaseInsesitive() throws Exception
++	public void skipTestHighlightingTwoWordsCaseInsesitive() throws Exception
+ 	{
+ 		// say that this bibtex object was found
+ 		mBTE.setSearchHit(true);
+@@ -162,7 +171,7 @@ public class LayoutEntryTest extends TestCase
+ 	/**
+ 	 * @throws Exception
+ 	 */
+-	public void testHighlightingOneWordCaseSesitive() throws Exception
++	public void skipTestHighlightingOneWordCaseSesitive() throws Exception
+ 	{
+ 		// say that this bibtex object was found
+ 		mBTE.setSearchHit(true);
+@@ -184,7 +193,7 @@ public class LayoutEntryTest extends TestCase
+ 	/**
+ 	 * @throws Exception
+ 	 */
+-	public void testHighlightingMoreWordsCaseSesitive() throws Exception
++	public void skipTestHighlightingMoreWordsCaseSesitive() throws Exception
+ 	{
+ 		// say that this bibtex object was found
+ 		mBTE.setSearchHit(true);
+diff --git a/src/java/tests/net/sf/jabref/export/layout/LayoutTest.java b/src/java/tests/net/sf/jabref/export/layout/LayoutTest.java
+index cb98fe3..e54a9b8 100644
+--- a/src/java/tests/net/sf/jabref/export/layout/LayoutTest.java
++++ b/src/java/tests/net/sf/jabref/export/layout/LayoutTest.java
+@@ -66,7 +66,7 @@ public class LayoutTest extends TestCase {
+ 		assertEquals("Misc", layout("\\bibtextype", "@misc{bla, author={This\nis\na\ntext}}"));
+ 	}
+ 
+-	public void testHTMLChar() throws Exception {
++	public void skipTestHTMLChar() throws Exception {
+ 		String layoutText = layout("\\begin{author}\\format[HTMLChars]{\\author}\\end{author} ",
+ 			"@other{bla, author={This\nis\na\ntext}}");
+ 
+@@ -95,7 +95,7 @@ public class LayoutTest extends TestCase {
+ 	 * 
+ 	 * @throws Exception
+ 	 */
+-	public void testLayout() throws Exception {
++	public void skipTestLayout() throws Exception {
+ 
+ 		String layoutText = layout(
+ 			"<font face=\"arial\">\\begin{abstract}<BR><BR><b>Abstract: </b> \\format[HTMLChars]{\\abstract}\\end{abstract}</font>",
+diff --git a/src/java/tests/net/sf/jabref/export/layout/RTFCharsTest.java b/src/java/tests/net/sf/jabref/export/layout/RTFCharsTest.java
+index 43627ba..e977614 100644
+--- a/src/java/tests/net/sf/jabref/export/layout/RTFCharsTest.java
++++ b/src/java/tests/net/sf/jabref/export/layout/RTFCharsTest.java
+@@ -35,7 +35,7 @@ public class RTFCharsTest extends TestCase {
+ 		assertEquals("{\\b hallo}", layout.format("{\\textbf hallo}"));
+ 	}
+ 	
+-	public void testComplicated() {
++	public void skipTestComplicated() {
+ 		LayoutFormatter layout = new RTFChars();
+ 
+ 		assertEquals("R\\u233eflexions sur le timing de la quantit\\u233e \\u230ae should be \\u230ae", layout.format("Réflexions sur le timing de la quantité \\ae should be æ"));
+@@ -43,7 +43,7 @@ public class RTFCharsTest extends TestCase {
+ 		assertEquals("h\\u225all{\\uc2\\u339oe}", layout.format("h\\'all\\oe "));
+ 	}
+ 
+-	public void testSpecialCharacters() {
++	public void skipTestSpecialCharacters() {
+ 
+ 		LayoutFormatter layout = new RTFChars();
+ 
+diff --git a/src/java/tests/net/sf/jabref/export/layout/format/AuthorLastFirstAbbreviatorTester.java b/src/java/tests/net/sf/jabref/export/layout/format/AuthorLastFirstAbbreviatorTester.java
+index 446a89c..496f18b 100644
+--- a/src/java/tests/net/sf/jabref/export/layout/format/AuthorLastFirstAbbreviatorTester.java
++++ b/src/java/tests/net/sf/jabref/export/layout/format/AuthorLastFirstAbbreviatorTester.java
+@@ -76,7 +76,7 @@ public class AuthorLastFirstAbbreviatorTester extends TestCase {
+ 	 * Testcase for 
+ 	 * http://sourceforge.net/tracker/index.php?func=detail&aid=1466924&group_id=92314&atid=600306
+ 	 */
+-	public void testJrAuthor(){
++	public void skipTestJrAuthor(){
+ 		String name = "Other, Jr., Anthony N.";
+ 		assertEquals("Other, A. N.", abbreviate(name));
+ 	}
+diff --git a/src/java/tests/net/sf/jabref/export/layout/format/DOICheckTest.java b/src/java/tests/net/sf/jabref/export/layout/format/DOICheckTest.java
+index dceb88c..d0680e3 100644
+--- a/src/java/tests/net/sf/jabref/export/layout/format/DOICheckTest.java
++++ b/src/java/tests/net/sf/jabref/export/layout/format/DOICheckTest.java
+@@ -5,8 +5,16 @@ import net.sf.jabref.export.layout.LayoutFormatter;
+ import net.sf.jabref.export.layout.format.DOICheck;
+ 
+ public class DOICheckTest extends TestCase {
++	/*
++	 * An empty test case to avoid "No tests found" failure:
++	 *
++	 * warning(junit.framework.TestSuite$1)junit.framework.AssertionFailedError:
++	 * No tests found in tests.net.sf.jabref.export.layout.format.DOICheckTest
++	 */
++	public void testDummy() {
++	}
+ 
+-	public void testFormat() {
++	public void skipTestFormat() {
+ 		LayoutFormatter lf = new DOICheck();
+ 
+ 		assertEquals("", lf.format(""));
+diff --git a/src/java/tests/net/sf/jabref/imports/BibtexParserTest.java b/src/java/tests/net/sf/jabref/imports/BibtexParserTest.java
+index f8bc3dc..ad4899b 100644
+--- a/src/java/tests/net/sf/jabref/imports/BibtexParserTest.java
++++ b/src/java/tests/net/sf/jabref/imports/BibtexParserTest.java
+@@ -257,7 +257,7 @@ public class BibtexParserTest extends TestCase {
+ 		assertEquals("2002", e.getField("year"));
+ 	}
+ 
+-	public void testNewlineHandling() throws IOException {
++	public void skipTestNewlineHandling() throws IOException {
+ 
+ 		BibtexEntry e = BibtexParser.singleFromString("@article{canh05," +
+ 				"a = {a\nb}," +
+@@ -320,7 +320,7 @@ public class BibtexParserTest extends TestCase {
+ 	 * @author Uwe Kuehn
+ 	 * @author Andrei Haralevich
+ 	 */
+-	public void testFileNaming3(){
++	public void skipTestFileNaming3(){
+ 		BibtexEntry e = BibtexParser.singleFromString("@article{canh05," 
+ 			+ "title = {\nHallo \nWorld \nthis \n is\n\nnot \n\nan \n\n exercise \n \n.\n \n\n},\n"
+ 			+ "tabs = {\nHallo \tWorld \tthis \t is\t\tnot \t\tan \t\n exercise \t \n.\t \n\t},\n"
+diff --git a/src/java/tests/net/sf/jabref/imports/CopacImporterTest.java b/src/java/tests/net/sf/jabref/imports/CopacImporterTest.java
+index 558ebb7..20f6c02 100644
+--- a/src/java/tests/net/sf/jabref/imports/CopacImporterTest.java
++++ b/src/java/tests/net/sf/jabref/imports/CopacImporterTest.java
+@@ -24,7 +24,7 @@ public class CopacImporterTest extends TestCase {
+ 		super.tearDown();
+ 	}
+ 
+-	public void testIsRecognizedFormat() throws IOException {
++	public void skipTestIsRecognizedFormat() throws IOException {
+ 
+         CopacImporter importer = new CopacImporter();
+ 		assertTrue(importer.isRecognizedFormat(CopacImporterTest.class
+@@ -46,7 +46,7 @@ public class CopacImporterTest extends TestCase {
+ 			.getResourceAsStream("IsiImporterTestMedline.isi")));
+ 	}
+ 
+-	public void testImportEntries() throws IOException {
++	public void skipTestImportEntries() throws IOException {
+ 		CopacImporter importer = new CopacImporter();
+ 
+ 		List<BibtexEntry> entries = importer.importEntries(CopacImporterTest.class
+diff --git a/src/java/tests/net/sf/jabref/imports/IsiImporterTest.java b/src/java/tests/net/sf/jabref/imports/IsiImporterTest.java
+index 041a31e..ee89a2b 100644
+--- a/src/java/tests/net/sf/jabref/imports/IsiImporterTest.java
++++ b/src/java/tests/net/sf/jabref/imports/IsiImporterTest.java
+@@ -33,7 +33,7 @@ public class IsiImporterTest extends TestCase {
+ 		super.tearDown();
+ 	}
+ 
+-	public void testIsRecognizedFormat() throws IOException {
++	public void skipTestIsRecognizedFormat() throws IOException {
+ 
+         IsiImporter importer = new IsiImporter();
+ 		assertTrue(importer.isRecognizedFormat(IsiImporterTest.class
+@@ -201,7 +201,7 @@ public class IsiImporterTest extends TestCase {
+ 		assertEquals(BibtexEntryType.ARTICLE, b.getType());
+ 	}
+ 
+-	public void testImportEntriesWOS() throws IOException {
++	public void skipTestImportEntriesWOS() throws IOException {
+ 		IsiImporter importer = new IsiImporter();
+ 
+ 		List<BibtexEntry> entries = importer.importEntries(IsiImporterTest.class
+diff --git a/src/java/tests/net/sf/jabref/imports/OAI2ImportTest.java b/src/java/tests/net/sf/jabref/imports/OAI2ImportTest.java
+index 9e7e73f..e0bfdf5 100644
+--- a/src/java/tests/net/sf/jabref/imports/OAI2ImportTest.java
++++ b/src/java/tests/net/sf/jabref/imports/OAI2ImportTest.java
+@@ -112,7 +112,7 @@ public class OAI2ImportTest extends TestCase {
+ 		assertEquals("", OAI2Fetcher.fixKey("arXiv:"));
+ 	}
+ 
+-	public void testOnline() throws InterruptedException {
++	public void skipTestOnline() throws InterruptedException {
+ 
+ 		{
+ 			OAI2Fetcher fetcher = new OAI2Fetcher();
+diff --git a/src/java/tests/net/sf/jabref/util/XMPUtilTest.java b/src/java/tests/net/sf/jabref/util/XMPUtilTest.java
+index 74571f5..5b74057 100644
+--- a/src/java/tests/net/sf/jabref/util/XMPUtilTest.java
++++ b/src/java/tests/net/sf/jabref/util/XMPUtilTest.java
+@@ -345,7 +345,7 @@ public class XMPUtilTest extends TestCase {
+ 	 * @throws TransformerException
+ 	 *             Should not happen.
+ 	 */
+-	public void testPrivacyFilter() throws IOException, TransformerException {
++	public void skipTestPrivacyFilter() throws IOException, TransformerException {
+ 
+ 		{ // First set:
+ 			prefs.putBoolean("useXmpPrivacyFilter", true);
+@@ -1023,7 +1023,7 @@ public class XMPUtilTest extends TestCase {
+ 		assertEquals(t3BibtexEntry(), b);
+ 	}
+ 
+-	public void testReadWriteDC() throws IOException, TransformerException {
++	public void skipTestReadWriteDC() throws IOException, TransformerException {
+ 		List<BibtexEntry> l = new LinkedList<BibtexEntry>();
+ 		l.add(t3BibtexEntry());
+ 
+@@ -1103,7 +1103,7 @@ public class XMPUtilTest extends TestCase {
+ 
+ 	}
+ 
+-	public void testWriteSingleUpdatesDCAndInfo() throws IOException,
++	public void skipTestWriteSingleUpdatesDCAndInfo() throws IOException,
+ 			TransformerException {
+ 		List<BibtexEntry> l = new LinkedList<BibtexEntry>();
+ 		l.add(t3BibtexEntry());
+-- 
+2.34.1
+
diff --git a/app-text/jabref/files/jabref-2.10-test-jvm-props-args.patch b/app-text/jabref/files/jabref-2.10-test-jvm-props-args.patch
new file mode 100644
index 000000000000..d3e413e9b0fd
--- /dev/null
+++ b/app-text/jabref/files/jabref-2.10-test-jvm-props-args.patch
@@ -0,0 +1,49 @@
+From f24492bff17f728bcf2b5a50069669ae08b8b372 Mon Sep 17 00:00:00 2001
+From: Yuan Liao <liaoyuan@gmail.com>
+Date: Sat, 19 Feb 2022 10:21:04 -0800
+Subject: [PATCH] Add JVM system properties and argument for tests
+
+The changes to system properties ensure that all paths the application
+may write to during the tests are not protected by the Portage sandbox.
+
+The extra argument added is required on Java 17+, but it should also be
+compatible with all Java versions that support the Java Platform Module
+System (JPMS), namely Java 9+.  On older Java versions, it is optional.
+On Java 8, however, including it in JVM arguments would cause an error.
+
+Signed-off-by: Yuan Liao <liaoyuan@gmail.com>
+---
+ build.xml | 9 ++++++++-
+ 1 file changed, 8 insertions(+), 1 deletion(-)
+
+diff --git a/build.xml b/build.xml
+index d13a9f3..788a4d1 100644
+--- a/build.xml
++++ b/build.xml
+@@ -28,7 +28,7 @@
+ 
+ +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-->
+ 
+-<project name="JabRef" default="jars" basedir=".">
++<project name="JabRef" default="jars" basedir="." xmlns:if="ant:if">
+ 
+ 	<!--++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+         PROPERTY SETUP
+@@ -596,7 +596,14 @@ version=${jabref.version}</echo>
+ 	</target>
+ 
+ 	<target name="test" depends="buildtest" description="Runs all unit tests">
++		<condition property="shouldAddOpens">
++			<javaversion atleast="9" />
++		</condition>
+ 		<java fork="yes" classname="junit.textui.TestRunner" failonerror="true">
++			<sysproperty key="java.io.tmpdir" value="${java.io.tmpdir}" />
++			<sysproperty key="user.home" value="${user.home}" />
++			<jvmarg if:set="shouldAddOpens"
++				value="--add-opens=java.desktop/java.awt=ALL-UNNAMED" />
+ 			<arg value="tests.net.sf.jabref.AllTests" />
+ 			<classpath refid="classpathTest" />
+ 		</java>
+-- 
+2.34.1
+
diff --git a/app-text/jabref/files/jabref-2.10-test-prefs.xml b/app-text/jabref/files/jabref-2.10-test-prefs.xml
new file mode 100644
index 000000000000..aea6c9f32bbd
--- /dev/null
+++ b/app-text/jabref/files/jabref-2.10-test-prefs.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE map SYSTEM "http://java.sun.com/dtd/preferences.dtd">
+<map MAP_XML_VERSION="1.0">
+  <entry key="autoAssignGroup" value="true"/>
+  <entry key="autoCompFF" value="false"/>
+  <entry key="autoCompFirstNameMode" value="both"/>
+  <entry key="autoCompLF" value="false"/>
+  <entry key="autoComplete" value="true"/>
+  <entry key="autolinkExactKeyOnly" value="true"/>
+  <entry key="caseSensitiveSearch" value="false"/>
+  <entry key="nameFormatterFormats" value=""/>
+  <entry key="nameFormatterNames" value=""/>
+  <entry key="pdfDirectory" value=""/>
+  <entry key="pushToApplication" value="Insert selected citations into LyX/Kile"/>
+  <entry key="showFileLinksUpgradeWarning" value="false"/>
+  <entry key="useRegExpSearch" value="false"/>
+  <entry key="useXmpPrivacyFilter" value="false"/>
+  <entry key="xmpPrivacyFilter" value="pdf;timestamp;keywords;owner;note;review"/>
+</map>
diff --git a/app-text/jabref/jabref-2.10-r7.ebuild b/app-text/jabref/jabref-2.10-r7.ebuild
new file mode 100644
index 000000000000..852b9fb5305b
--- /dev/null
+++ b/app-text/jabref/jabref-2.10-r7.ebuild
@@ -0,0 +1,132 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc test"
+
+inherit desktop java-pkg-2 java-ant-2 virtualx xdg-utils
+
+MY_PV="${PV/_beta/b}"
+
+DESCRIPTION="Java GUI for managing BibTeX and other bibliographies"
+HOMEPAGE="https://www.jabref.org/"
+SRC_URI="mirror://sourceforge/${PN}/JabRef-${MY_PV}-src.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+CP_DEPEND="
+	dev-java/antlr:0
+	dev-java/antlr:3
+	dev-java/commons-logging:0
+	dev-java/fontbox:1.7
+	dev-java/jaxb-api:2
+	dev-java/jempbox:1.7
+	dev-java/log4j-12-api:2
+	dev-java/log4j-api:2
+	dev-java/spin:0
+	dev-java/microba:0
+	>=dev-java/glazedlists-1.8.0:0"
+
+TEST_DEPEND="dev-java/junit:0"
+
+# Since Java 9, all dependencies ever imported by the source files need to be
+# present in the classpath for Javadoc generation; in particular, for this
+# package, the test sources will be passed to 'javadoc' as well as the non-test
+# sources, so all test dependencies are required for Javadoc generation too.
+DEPEND="
+	>=virtual/jdk-1.8:*
+	doc? ( ${TEST_DEPEND} )
+	test? ( ${TEST_DEPEND} )
+	${CP_DEPEND}"
+
+# Java 17+ requires "--add-opens=java.desktop/java.awt=ALL-UNNAMED" in
+# arguments to the JVM that runs this application; Java 8 and 11 are OK,
+# but dev-java/java-config currently does not support declaration like
+# RDEPEND="|| ( virtual/jre:1.8 virtual/jre:11 )" yet, so only one JRE
+# version can be chosen to run this application at the moment.
+RDEPEND="
+	virtual/jre:1.8
+	${CP_DEPEND}"
+
+IDEPEND="dev-util/desktop-file-utils"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-javax.swing-java-9+.patch"
+	"${FILESDIR}/${P}-skip-failing-tests.patch"
+	"${FILESDIR}/${P}-test-jvm-props-args.patch"
+)
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+EANT_BUILD_TARGET="jars"
+EANT_DOC_TARGET="docs"
+
+# Some dependencies that are also used by the tests need to be explicitly
+# listed to avoid "package does not exist" compiler errors.
+EANT_TEST_GENTOO_CLASSPATH="junit"
+EANT_TEST_GENTOO_CLASSPATH+=",antlr-3,commons-logging,glazedlists"
+EANT_TEST_GENTOO_CLASSPATH+=",jempbox-1.7,microba,spin"
+EANT_TEST_EXTRA_ARGS="-Djava.io.tmpdir=${T} -Duser.home=${HOME}"
+
+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
+	rm lib/glazedlists*.jar || die
+	rm lib/jempbox*.jar || die
+	rm lib/microba.jar || die
+	rm lib/spin.jar || die
+	rm lib/plugin/commons-logging.jar || die
+
+	# Remove unjarlib target (do this only once we have removed all
+	# bundled dependencies in lib).
+	#sed -i -e 's:depends="build, unjarlib":depends="build":' build.xml
+
+	# Fix license file copy operation for microba bundled lib.
+	sed -i -e 's:^.*microba-license.*::' build.xml
+
+	use doc && EANT_GENTOO_CLASSPATH_EXTRA="$(\
+		java-pkg_getjars --build-only junit)"
+}
+
+src_test() {
+	# Tests will launch the application, which requires an X environment.
+	# An existing application preference file is needed to make the tests
+	# non-interactive; otherwise, the application will hang for user input.
+	local prefs_dir="${HOME}/.java/.userPrefs/net/sf/jabref"
+	mkdir -p "${prefs_dir}" ||
+		die "Failed to create application preference directory for tests"
+	cp "${FILESDIR}/${P}-test-prefs.xml" "${prefs_dir}/prefs.xml" ||
+		die "Failed to copy application preference file for tests"
+	virtx java-pkg-2_src_test
+}
+
+src_install() {
+	java-pkg_newjar build/lib/JabRef-${MY_PV}.jar
+
+	dodoc src/txt/README
+	use doc && java-pkg_dojavadoc build/docs/API
+
+	java-pkg_dolauncher ${PN} --main net.sf.jabref.JabRef
+	newicon src/images/JabRef-icon-48.png JabRef-icon.png
+	make_desktop_entry ${PN} JabRef JabRef-icon Office
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/app-text/kramdown-rfc2629/Manifest b/app-text/kramdown-rfc2629/Manifest
index 2dcb432dccf4..2c6199a35ada 100644
--- a/app-text/kramdown-rfc2629/Manifest
+++ b/app-text/kramdown-rfc2629/Manifest
@@ -1,3 +1,7 @@
 DIST kramdown-rfc2629-1.5.24.gem 51712 BLAKE2B bedca34835233e6db72b52ed634f07efa97a121903097230c95cc8db60c14662f697a5e02df5b87d8f2fa8614ac5bbc22d0a018d5dd339229da14c3517897c0e SHA512 6e358ad09afef4768e9c1698732c2058040f05180a8fda36c96dbbc68e670c8bf509ebdd92f51d9696b5305fb54398885230daa09b82ac5805a5c4d4eb10a4ba
+DIST kramdown-rfc2629-1.5.26.gem 53248 BLAKE2B 2df5ae9715afd09ee2388280838687d4dc4694a9d2c309847c56986afe86b53a4bb4fdbdc0805f8bb2811fbce502b837d60ce96ff18d9b51b2e6ffc62ba6b65c SHA512 978d216d8ff4df309dad6408fbc5164c65e4a0a857d0e4599bdfe9763f68af7c3ea0a90827ef4f5d3102d3972d4cae85673aeac4f6cdd510fd3fa6ed6756b1b6
+DIST kramdown-rfc2629-1.6.5.gem 54784 BLAKE2B bc51d59303f4537881cf2af54167bec64b5760d11725582444a169bd05d34ed3a43ec8d3e412d8da725f3180cdeb502901bea9eb910e1d5d1590e16c1f701385 SHA512 a7c202770b699c2d06236418d54df1a52d6918c2c53b18d18a8988a274cf216e1c949777274b1f10ec7905ad5467678b209f420c365caf513422ff95d43fae6f
 EBUILD kramdown-rfc2629-1.5.24.ebuild 653 BLAKE2B 7bb06b55d72f27e09787ba115c14faaa3b2fbce1ecc0dfa7c1c0681cba6cf8eb3a895c98da9390b1923c29e98df7c4e9bcc5066833bb8253c409b7b71acd6f55 SHA512 0eec3f27b5a5c385a1bd70a0f71c9cd5a9fac465277cb854afd0b9f4d151ab8bedda7368e93f9083520ccc42170dec3aa04036656cdac74915146d5d698b0e1a
+EBUILD kramdown-rfc2629-1.5.26.ebuild 653 BLAKE2B 9a11565110ea45f3979b1c14ff00a83986d5ae953e1c8444c33f591d6efd0a9a9d0b248ee3a680caf36afb98d7c72cc58f02ccf943474cd6decdd59b599c4420 SHA512 b6a4a3026de6d50319fc5cf7635f5eb63ea6b6ef7466f2160440dc0a307b38d0ea56dbcba3e53f096ede60c7d40741a926e6f3bf197ff7d1dbff1be040b36239
+EBUILD kramdown-rfc2629-1.6.5.ebuild 649 BLAKE2B 9e26f558df1325b5d87b6043e9f0656c0d7d8ce77572d804ce22110f478695f376f346591270328e1d55dfbf2a6927ccdf957dbb4d9992bcbac59a547811ad68 SHA512 a754314dc538b0a543f63b607f4fce2aa6b26f808d8df3562545a434de67cc0998453d094de9f049691cfe96af9ebc182b4b223310a432c11eaafda723cd61fe
 MISC metadata.xml 247 BLAKE2B aa1ac899418ae6358314e4cbda5c7db1a4f1e7fd8587e101508aa77bfe6d127e1c7bc762c52a81810f22baf7cf6a3a3a22da3810beecdccc5307c42d028dbbcc SHA512 b93f40a4fe9148f409cb20b5db2233ef29cbd27ce7dfeac19e0f3d9cb6b81c6eb2fcb19ce31739eb83911298f089f0bec7e372b5581fc3c839174129f3ab36cc
diff --git a/app-text/kramdown-rfc2629/kramdown-rfc2629-1.5.26.ebuild b/app-text/kramdown-rfc2629/kramdown-rfc2629-1.5.26.ebuild
new file mode 100644
index 000000000000..f0ec06c97afc
--- /dev/null
+++ b/app-text/kramdown-rfc2629/kramdown-rfc2629-1.5.26.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby26 ruby27"
+
+RUBY_FAKEGEM_RECIPE_TEST="none"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+RUBY_FAKEGEM_EXTRAINSTALL="data"
+
+inherit ruby-fakegem
+
+DESCRIPTION="An RFC2629 (XML2RFC) backend for Thomas Leitner's kramdown markdown parser"
+HOMEPAGE="https://github.com/cabo/kramdown-rfc2629"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+ruby_add_rdepend "
+	>=dev-ruby/certified-1.0.0
+	>=dev-ruby/json-2.0.0
+	>=dev-ruby/kramdown-2.3.0
+	>=dev-ruby/kramdown-parser-gfm-1.1.0
+"
+
+all_ruby_prepare() {
+	sed -i 's/json_pure/json/' ../metadata || die
+}
diff --git a/app-text/kramdown-rfc2629/kramdown-rfc2629-1.6.5.ebuild b/app-text/kramdown-rfc2629/kramdown-rfc2629-1.6.5.ebuild
new file mode 100644
index 000000000000..ea795b2d7efc
--- /dev/null
+++ b/app-text/kramdown-rfc2629/kramdown-rfc2629-1.6.5.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby26 ruby27"
+
+RUBY_FAKEGEM_RECIPE_TEST="none"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+RUBY_FAKEGEM_EXTRAINSTALL="data"
+
+inherit ruby-fakegem
+
+DESCRIPTION="An XML2RFC (RFC799x) backend for Thomas Leitner's kramdown markdown parser"
+HOMEPAGE="https://github.com/cabo/kramdown-rfc"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+ruby_add_rdepend "
+	>=dev-ruby/certified-1.0.0
+	>=dev-ruby/json-2.0.0
+	>=dev-ruby/kramdown-2.3.0
+	>=dev-ruby/kramdown-parser-gfm-1.1.0
+"
+
+all_ruby_prepare() {
+	sed -i 's/json_pure/json/' ../metadata || die
+}
diff --git a/app-text/languagetool/Manifest b/app-text/languagetool/Manifest
index 3cdd7c643e73..8e6f173dadcf 100644
--- a/app-text/languagetool/Manifest
+++ b/app-text/languagetool/Manifest
@@ -1,10 +1,6 @@
 AUX languagetool.desktop 191 BLAKE2B 726e670645f78c3ea11c788a6440116753d66cf9886155ffa0f9cfad7deab000891276526aea17bae4977472c5d154837fb779de6abdb9cbe47148ce6ff96fe7 SHA512 d54542d4e742e83a7514857a11756f66966a9714f0f7b781aabd635b14cfa4f4d2b0fc1f98b2148af92e469fe877ffb61995c2abe5f59678174eae1d9c3dcbfe
 AUX languagetool.initd 473 BLAKE2B 74f55cfaf5b6c2e2fa166533c031408dc7e2e2b1882e6e09227af38e500f12481a551e8cec166620c73e671f00063cb63cc9dda500355110ff048d806dfa2d77 SHA512 fb9ab4fa28df1f43791995557fc4568ee79f7af7991481d295c28739c975c6648999676ea078ee852dc3dc9f49fbb9945c9dc571c385dd4db3d69ca5bf501623
 AUX logo.svg 2824 BLAKE2B 7653478b44ebd3dc80691849751745aba14a652d1ffaf52ef27910a52fae15b39c9ef0224795f698b1ac6f95a3e677ee46603b29261dff0d50d9eedba5e09de5 SHA512 501e3dee99f762556774f42829a9e450fc412271a7ade87f17ffb211929d24564ea3385b2bfc1c261e46d4b0b3562be62903b111ecd1c7dacb97c3c8ffb0d6d5
-DIST LanguageTool-4.5.zip 189327638 BLAKE2B b0ba0a67ee3de4ef6e452e6c47d5c03800f4e93acdaee03da37dca1a626e808bef91a167a62bd1fd7e732c86010523193d197083179cd40aa22de67bbbe5c4d5 SHA512 66bf6c99425d66ca8bc03b609f07d85f3989dbe73d7a93e81b6dc21d751fe05dd439d4753b51282d359a08ecdd92a18d9deab53d7b3a144c605d4429b2949eef
-DIST LanguageTool-4.6.zip 170185393 BLAKE2B 323b313933f7fd5c4ea4ab32d2b31c85495daac02ba1aba678482d9077f4f86331caa5d98546735ab1cee213276488ca00ad3181499bd09cbb26a9fffff5642f SHA512 eff159a1387a914447e3dcf1061efe445d2d939cbfcfa0a19e427cda58cbe5ca90db074dd1bb7e52c939ada3924cbe2e3c5392ac57a93a07922114dc354e849d
 DIST LanguageTool-5.4.zip 202761711 BLAKE2B b23c2944bf40dbef70d43391761849fb83b55538ac1cf0312c82079caef0a91f177f67c0e5818ea558c485d0bc2f4425f6cd32064095aede755a3b1233cf62d7 SHA512 08048f5bb8c5f7050ca2081a9f00405b0b397c37511a8297675f031bbb59e19863195e3b624dabb0964d436ad1570112e8c85225905ae22f2bde2a0200fcd883
-EBUILD languagetool-4.5.ebuild 1404 BLAKE2B 2b2717f6a7a5e934461f865e924bc97db50a02eebab44c0e3d6ab44c4342cd8844950e1592cd509ac6ca76ba8cd996efbf7096112167c1f551930fe5ec33bc36 SHA512 d438bcb7e1b9125793501fd923ab1703efd5d4532e6099a8887cd5a42d48d69ddd4fbbefafa192683e6cee3ae306534a8b6682e4b3df037902d745c93a9016f7
-EBUILD languagetool-4.6.ebuild 1665 BLAKE2B 62e05624a11e46aef1aa2e4e8b4b1f2ad2a743d3ee6843f5b6dcff449451518e50740acf7a6a579f414fb9ca919407a053d65b3be2bf03c3603d188f13fe31b2 SHA512 52b40e0af61da7098716c52e21343d069055bdef56ba25b2f631c90553204e73153780b89612971975ed76afce381b47c741f34396ae28e14ea0de3f02b7d0f7
 EBUILD languagetool-5.4.ebuild 1699 BLAKE2B 0cb39a453278852524a7e4495f2b16d5d157ca3074fe994d9a858308e3507c0a3221647fc82c9c2501141c5987cc9462cf2f5846d63c36fa1aff5499cf94dac1 SHA512 470199e51884c0294df159ec4a2399fd460bb27ba8eeec6ee7deff925ea80374c77e09953bc958ee75a58c090572d34168bca344f6d4984ea935992d435da246
 MISC metadata.xml 256 BLAKE2B a2cc41acd036354767d8637d65524b95dd6a79ae0126f7e6ba61abd53bf681cc4b7eb8f06c2842be9a634ef4b6820aa20bf7931debb508b2e819706665dd6eef SHA512 bd920ac1d3d1ac26afc3685652533d93bed59162ce9acab9f44cf4548f75ebcec2a1713f0f596a1d3e08a06a72fa27c56331a19321eeae5bce74e8a10a79ae70
diff --git a/app-text/languagetool/languagetool-4.5.ebuild b/app-text/languagetool/languagetool-4.5.ebuild
deleted file mode 100644
index afb2f0cde174..000000000000
--- a/app-text/languagetool/languagetool-4.5.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit java-pkg-2
-
-MY_PN=LanguageTool
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="A proof-reading tool for many languages"
-HOMEPAGE="https://www.languagetool.org/"
-SRC_URI="https://www.languagetool.org/download/${MY_P}.zip"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-CP_DEPEND="
-	dev-java/commons-cli:1
-	dev-java/commons-collections:4
-	dev-java/commons-io:1
-	dev-java/commons-lang:2.1
-	dev-java/commons-logging:0
-	dev-java/guava:20
-	dev-java/hamcrest-core:1.3
-	dev-java/jcommander:0
-	dev-java/jna:4
-	dev-java/slf4j-api:0
-	dev-java/slf4j-nop:0
-"
-
-RDEPEND=">=virtual/jre-1.8
-	${CP_DEPEND}"
-
-BDEPEND="app-arch/unzip"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	default
-	rm libs/commons-{cli,collections4,io,lang,logging}.jar || die
-	rm libs/{hamcrest-core,guava,jcommander,jna,junit,slf4j-api}.jar || die
-
-	# Loads of bundled stuff :(
-	#java-pkg-2_src_prepare
-}
-
-src_compile() { :; }
-
-src_install() {
-	java-pkg_dojar *.jar libs/*.jar
-
-	local DIR=/usr/share/${PN}/lib/language-modules
-	java-pkg_addcp "${EPREFIX}${DIR}"
-	insinto ${DIR}
-	doins -r org META-INF
-
-	java-pkg_dolauncher ${PN} --main org.${PN}.commandline.Main
-	java-pkg_dolauncher ${PN}-gui --main org.${PN}.gui.Main
-
-	dodoc CHANGES.md README.md
-
-	unset MY_DEPEND
-	java-pkg_gen-cp MY_DEPEND
-	java-pkg_register-dependency "${MY_DEPEND}"
-}
diff --git a/app-text/languagetool/languagetool-4.6.ebuild b/app-text/languagetool/languagetool-4.6.ebuild
deleted file mode 100644
index 8f9296077b67..000000000000
--- a/app-text/languagetool/languagetool-4.6.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit java-pkg-2 desktop xdg-utils
-
-MY_PN=LanguageTool
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="A proof-reading tool for many languages"
-HOMEPAGE="https://www.languagetool.org/"
-SRC_URI="https://www.languagetool.org/download/${MY_P}.zip"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-CP_DEPEND="
-	dev-java/commons-cli:1
-	dev-java/commons-collections:4
-	dev-java/commons-io:1
-	dev-java/commons-lang:2.1
-	dev-java/commons-logging:0
-	dev-java/guava:20
-	dev-java/hamcrest-core:1.3
-	dev-java/jcommander:0
-	dev-java/jna:4
-	dev-java/slf4j-api:0
-	dev-java/slf4j-nop:0
-"
-
-RDEPEND=">=virtual/jre-1.8
-	${CP_DEPEND}"
-
-BDEPEND="app-arch/unzip"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	default
-	rm libs/commons-{cli,collections4,io,lang,logging}.jar || die
-	rm libs/{hamcrest-core,guava,jcommander,jna,junit,slf4j-api}.jar || die
-
-	# Loads of bundled stuff :(
-	#java-pkg-2_src_prepare
-}
-
-src_compile() { :; }
-
-src_install() {
-	java-pkg_dojar *.jar libs/*.jar
-
-	local DIR=/usr/share/${PN}/lib/language-modules
-	java-pkg_addcp "${EPREFIX}${DIR}"
-	insinto ${DIR}
-	doins -r org META-INF
-
-	java-pkg_dolauncher ${PN} --main org.${PN}.commandline.Main
-	java-pkg_dolauncher ${PN}-gui --main org.${PN}.gui.Main
-	java-pkg_dolauncher ${PN}-server --main org.${PN}.server.HTTPServer
-	newicon -s scalable "${FILESDIR}"/logo.svg ${PN}.svg
-	domenu "${FILESDIR}"/${PN}.desktop
-
-	dodoc CHANGES.md README.md
-
-	unset MY_DEPEND
-	java-pkg_gen-cp MY_DEPEND
-	java-pkg_register-dependency "${MY_DEPEND}"
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/app-text/lesspipe/Manifest b/app-text/lesspipe/Manifest
index 93f256c948e9..69b496b53ea9 100644
--- a/app-text/lesspipe/Manifest
+++ b/app-text/lesspipe/Manifest
@@ -1,7 +1,7 @@
 DIST lesspipe-1.91.tar.gz 121965 BLAKE2B 93c169b2b1a81db7e7b569718a43152a8f2b9ea95258047a00ae4940509817a3eb861fdadb6bafc5861c49e805ce910348a57f634bdae57317811ac6fbfc6945 SHA512 d080ceaae019d8885a53c8abb26f4a159b78578f68c2b9a024960aa69509651e3b6638e78bd6e2e57c23d81123d9a3cab167736f253ba4276a3889890d594bd3
-DIST lesspipe-2.01.tar.gz 171601 BLAKE2B 25c65ff0ac97382101fc25f23c52d1d1269d28a30ac472214992fda654946337dfbcd9d9d84e01bbe76902bcdf9c6eb4fdce481b40d2d74632a81d0da4214fa8 SHA512 e050075a43419f735d46314b006ceb16a2255b01a65b192d255a1256178fdca8286473292ef5248c15c8bda305da28275cdedd923c03bc6c601336bb857f2437
-DIST lesspipe-2.02.tar.gz 166136 BLAKE2B 337dfbb3e15fb1acd6727fc1d99e8c72895c861babf1c3cd755e77ee31dd94e354c6eb66cd8935b0c7bb6c604b543fd9b269266f1b4abf603585cbb10d46b2de SHA512 7e61199f6b70ae0662d6e75cd15ce1adbb98e6b845f73282e3981bbc58b6ddee6cf2307317e9ebbef285bad57413e18c0f6116cf73491750017667f1af6a0cc6
-EBUILD lesspipe-1.91.ebuild 1759 BLAKE2B d61d0be210938702952601dc8685539aa4005d85027906388240c044b6e9435aaef7eb6dafa02bfbea38012b65d75734b5377849bc38059359dd7d0d3e524f93 SHA512 4082d05188d6bd724d28554fa883e470fd5b86d2b79c5d547078341d8966ac84bbc2a9facd33d72c77f85e91d47f9d17548e715f4829ba48241c17ea9f3547b0
-EBUILD lesspipe-2.01.ebuild 1151 BLAKE2B a1fab056c11281135661629adda35e1eb368c2019495b296042087e2d64006343a9d54d8f0431a3969c565390febe636565ae3537b570d269042410280738e83 SHA512 c3425e65c3ef18352e4cb2998eb3e4bb2dcce7cea1e2685ba727d4d079f98487b167711801e94ddc8a3a292465a5e8eddb1dbbde4a93bce36397d2279afcea62
-EBUILD lesspipe-2.02.ebuild 1151 BLAKE2B a1fab056c11281135661629adda35e1eb368c2019495b296042087e2d64006343a9d54d8f0431a3969c565390febe636565ae3537b570d269042410280738e83 SHA512 c3425e65c3ef18352e4cb2998eb3e4bb2dcce7cea1e2685ba727d4d079f98487b167711801e94ddc8a3a292465a5e8eddb1dbbde4a93bce36397d2279afcea62
+DIST lesspipe-2.03.tar.gz 166602 BLAKE2B a90324726f0401417c0f452f489463ac2ef2a710b790ef41c306803dc5c981637530abe034048c0739c1cd698b7901fcdcc074350d1d2a87f848ad5c4f9807ac SHA512 d83b4532f7f1cb58c48e274b34ad1f16c3392b120fbca1d66ff45997e1a28ca8804574e19522745f56344944fa8219ea0457dcb9579bd9b9fe7a8df8a82113f6
+DIST lesspipe-2.04.tar.gz 166831 BLAKE2B c33620b1c2714b01a89eaaeaeccfd72e62fd5123270ec84d3e27e914bda8f734758b36ea850126aa1ecd6ab36b9442577ac591024c373bdf6540b95816ed750b SHA512 04312d21c4f45b1630efd597ffafd69fc46ceff1fd5872d296a7811940f9d34da805c4ef4fa543af839de7e8bb4225c6ef5e680e9675eae4f56de669ec975669
+EBUILD lesspipe-1.91.ebuild 1735 BLAKE2B f09055204a532dc057d43bbf1113c9bc7467f06a97c1ac26555dfc207842610fb863ee485a8b790e436c580f52bcc9ea3533c0ae771331bd031acca9189bdcba SHA512 7b47ec9975fa13326a09998fb059fa81f03f6c2b28e364a12e7e8b6e9e6ca201c64f5a650def68b132856f0b15a9524f82e5089992632db3069a42db7db3b43f
+EBUILD lesspipe-2.03.ebuild 1134 BLAKE2B 01cc742355be55724425e79132ed7acee8f945d34f836027083aba49ce9fdd67ea5332d6757f74f2ca063360f44c770aa56c0204740ca71452443c6f68d5af86 SHA512 33f9c95a38c54e3f47971453bd5a7699730ac3715bc46463a34b58c367d43777b7ce24f031656f14433f73abd60d6f2107bb49b544afc8c25dc87b949b8d884c
+EBUILD lesspipe-2.04-r1.ebuild 1241 BLAKE2B a74271a5e3777c9988cd1ae5221837468dd7ac241afc62413e06aac6e89b69fcf66ff94fdf2e029836786f9ae04d7011ccc0f00b49fea7f29c4fab83c5cf7598 SHA512 9ae0f89a7044b34ab5d6983e1e3dad36b42ccaa857554e551bef2b5ba059ee243a9d04b07c179426ae9d9a0604fa26ac56dd5289dec14d6854e5bc612b17d50d
 MISC metadata.xml 304 BLAKE2B bb5be96b5fd22ce82d800f6bd5ed3ceb04b955182eaadc1f34b6f4b633c21efd6148013fc29b5567f7ada4da5de6efd7e0e420fa63a2976a5cf6bcf719c34f2e SHA512 2c217e67c6c487f7f7f98588a50086daf434bc25ad229b68d37bc12f7ecc4f904b5bc4a3b7b6db4a1daa0267c7e13fde8538de1c16d11e95be6b8071ee675105
diff --git a/app-text/lesspipe/lesspipe-1.91.ebuild b/app-text/lesspipe/lesspipe-1.91.ebuild
index 1ee33944f652..39cb02be3074 100644
--- a/app-text/lesspipe/lesspipe-1.91.ebuild
+++ b/app-text/lesspipe/lesspipe-1.91.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -19,8 +19,7 @@ KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s
 RESTRICT="test"
 
 DEPEND="dev-lang/perl"
-RDEPEND="${DEPEND}
-	!<sys-apps/less-483-r1"
+RDEPEND="${DEPEND}"
 
 src_prepare() {
 	default
diff --git a/app-text/lesspipe/lesspipe-2.01.ebuild b/app-text/lesspipe/lesspipe-2.01.ebuild
deleted file mode 100644
index 9e47976576e2..000000000000
--- a/app-text/lesspipe/lesspipe-2.01.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="A preprocessor for less"
-HOMEPAGE="https://github.com/wofr06/lesspipe"
-SRC_URI="https://github.com/wofr06/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-# Please check again on bumps!
-# bug #734896
-RESTRICT="test"
-
-BDEPEND="dev-lang/perl"
-RDEPEND="${DEPEND}
-	!<sys-apps/less-483-r1"
-
-src_configure() {
-	# Not an autoconf script.
-	./configure --fixed || die
-}
-
-src_compile() {
-	# Nothing to build (avoids the "all" target)
-	:
-}
-
-src_install() {
-	emake PREFIX="${EPREFIX}/usr" DESTDIR="${D}" install
-	einstalldocs
-}
-
-pkg_preinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]] ; then
-		elog "This package installs 'lesspipe.sh' which is distinct from 'lesspipe'."
-		elog "The latter is the Gentoo-specific version.  Make sure to update your"
-		elog "LESSOPEN environment variable if you wish to use this copy."
-	fi
-}
diff --git a/app-text/lesspipe/lesspipe-2.02.ebuild b/app-text/lesspipe/lesspipe-2.02.ebuild
deleted file mode 100644
index 9e47976576e2..000000000000
--- a/app-text/lesspipe/lesspipe-2.02.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="A preprocessor for less"
-HOMEPAGE="https://github.com/wofr06/lesspipe"
-SRC_URI="https://github.com/wofr06/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-# Please check again on bumps!
-# bug #734896
-RESTRICT="test"
-
-BDEPEND="dev-lang/perl"
-RDEPEND="${DEPEND}
-	!<sys-apps/less-483-r1"
-
-src_configure() {
-	# Not an autoconf script.
-	./configure --fixed || die
-}
-
-src_compile() {
-	# Nothing to build (avoids the "all" target)
-	:
-}
-
-src_install() {
-	emake PREFIX="${EPREFIX}/usr" DESTDIR="${D}" install
-	einstalldocs
-}
-
-pkg_preinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]] ; then
-		elog "This package installs 'lesspipe.sh' which is distinct from 'lesspipe'."
-		elog "The latter is the Gentoo-specific version.  Make sure to update your"
-		elog "LESSOPEN environment variable if you wish to use this copy."
-	fi
-}
diff --git a/app-text/lesspipe/lesspipe-2.03.ebuild b/app-text/lesspipe/lesspipe-2.03.ebuild
new file mode 100644
index 000000000000..ece7aa8140b7
--- /dev/null
+++ b/app-text/lesspipe/lesspipe-2.03.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="A preprocessor for less"
+HOMEPAGE="https://github.com/wofr06/lesspipe"
+SRC_URI="https://github.com/wofr06/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+# Please check again on bumps!
+# bug #734896
+RESTRICT="test"
+
+BDEPEND="dev-lang/perl"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	# Not an autoconf script.
+	./configure --fixed || die
+}
+
+src_compile() {
+	# Nothing to build (avoids the "all" target)
+	:
+}
+
+src_install() {
+	emake PREFIX="${EPREFIX}/usr" DESTDIR="${D}" install
+	einstalldocs
+}
+
+pkg_preinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]] ; then
+		elog "This package installs 'lesspipe.sh' which is distinct from 'lesspipe'."
+		elog "The latter is the Gentoo-specific version.  Make sure to update your"
+		elog "LESSOPEN environment variable if you wish to use this copy."
+	fi
+}
diff --git a/app-text/lesspipe/lesspipe-2.04-r1.ebuild b/app-text/lesspipe/lesspipe-2.04-r1.ebuild
new file mode 100644
index 000000000000..dc26753ae52b
--- /dev/null
+++ b/app-text/lesspipe/lesspipe-2.04-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit bash-completion-r1
+
+DESCRIPTION="A preprocessor for less"
+HOMEPAGE="https://github.com/wofr06/lesspipe"
+SRC_URI="https://github.com/wofr06/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+# Please check again on bumps!
+# bug #734896
+RESTRICT="test"
+
+BDEPEND="dev-lang/perl"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	# Not an autoconf script.
+	./configure --fixed || die
+}
+
+src_compile() {
+	# Nothing to build (avoids the "all" target)
+	:
+}
+
+src_install() {
+	emake PREFIX="${EPREFIX}/usr" DESTDIR="${D}" install
+	einstalldocs
+
+	rm -r "${ED}"/etc/bash_completion.d || die
+	newbashcomp less_completion less
+}
+
+pkg_preinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]] ; then
+		elog "This package installs 'lesspipe.sh' which is distinct from 'lesspipe'."
+		elog "The latter is the Gentoo-specific version.  Make sure to update your"
+		elog "LESSOPEN environment variable if you wish to use this copy."
+	fi
+}
diff --git a/app-text/libetonyek/Manifest b/app-text/libetonyek/Manifest
index 85f480308355..8e27dfea9e97 100644
--- a/app-text/libetonyek/Manifest
+++ b/app-text/libetonyek/Manifest
@@ -1,5 +1,5 @@
 DIST libetonyek-0.1.10.tar.xz 1494000 BLAKE2B 1c47b410050380d134d96b5551f0c9186c24aa0ea52c801e26655e3013f030e92198d8e3f19e8a341744206eeaad2d10ca130f286fd42c8a9c3b56f773cfa7d5 SHA512 516a14fcb7b7b5898484a4263d593a036ac728b90144da9d1c22a5d0fdffc879839e19a7b390f99d924c390d433e64433fb08939b1e04ca24359315571c5772b
 EBUILD libetonyek-0.1.10-r1.ebuild 1363 BLAKE2B ee20a6074d7ecfb6bbed07a45c82f8ab0fdc1fb079753340744fe0cb220e482483b5bd59bf2a3570f05ca48b96148433614a68c1ac98fadcdbe3987e9cd09535 SHA512 648e142284165075bd4f669afaec698d7fe2a6d5908c844be64970e25ae499b677a23c5f5758e3236b1c7fe0504046da88c9fc89b04ae867c45f367163354ed8
-EBUILD libetonyek-0.1.10.ebuild 1224 BLAKE2B 06b921e82438ed42221f77b9ad5abb8c32aae41784d75c0c35dbc4b62258a313ccd7e4cbd4ef20b04a9c0dd15397582fc60d7799dfa83ec9933413b6af669d15 SHA512 073453bc467a95ca68adad984c17cf0e0979832065577d2d14c0506d76a606e3e49feafd988e02ba32b87762a2306e997d0274b926cb24e5360b549bb54601f3
-EBUILD libetonyek-9999.ebuild 1289 BLAKE2B 877e867d9b733e51bc113301f5fd0ace23b710131f1224dd3ea17e01cc16f8ea1eabdfea9895d70cbb9a76914e167192ae5927efa69dd5041b072cbbe2fa78a0 SHA512 e976dcefbfd858cbc5773e224c2935a4a74c60fde91fa0d2809447ed0ec3e74ed3d72fcd1c44d01a6c8f9cde77dec18b904ea27016a91f8ccfb0f03798efc8f2
+EBUILD libetonyek-0.1.10.ebuild 1227 BLAKE2B 8b9d5d6e7f5ba4f359789de601f3342c402076f618ae8ef8a5d458cedc204f61ccabf1f7e105fbfd425fb777efaf0874b0df6ac13d2bfba8277c45f22b9d6d55 SHA512 6fcbe6c765e07e1bfa5b49436dfd30e334bd1b2a5f511b1009d1c59dabfdfdb3f77ac60cf61c71dd5048b63b65a100d972fbb2cef5df73a1a482dbba4c84d8a1
+EBUILD libetonyek-9999.ebuild 1269 BLAKE2B 88400841ba8cfab02e93ae101488e37ce337cf32de6afc3389ac9b8c58d0a084a077d0a9becf34a42319d772d08592582003b6455da789a4b87055e112637955 SHA512 e6b8b76335fd85cda6fc148f53ca98f36701ba12d6a698328f6c67757114a1df8f5897f77e2f374cefeb2b5290f7c3aae12c880f7708bb0ad492a084db746488
 MISC metadata.xml 256 BLAKE2B 28554175365761f81817e75e2c125714b94680527103d72118d0daf2eb0d2359082c36f2c8b0e92574e93c9c00038c944486a31d7843108dcc285d809bd52fe6 SHA512 1a0e13dd42f80f5c8669910c7360c6c1542e9a2f143da3a812f874966ba4729248152efb36e03bdfd47f09086797e6e1410e1ac735925d304811c847aa2b6398
diff --git a/app-text/libetonyek/libetonyek-0.1.10.ebuild b/app-text/libetonyek/libetonyek-0.1.10.ebuild
index 34da27480c4b..141836ac1196 100644
--- a/app-text/libetonyek/libetonyek-0.1.10.ebuild
+++ b/app-text/libetonyek/libetonyek-0.1.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -26,7 +26,7 @@ RDEPEND="
 	app-text/liblangtag
 	dev-libs/librevenge
 	dev-libs/libxml2
-	>=dev-util/mdds-1.5:1=
+	>=dev-util/mdds-1.5:1/1.5
 	sys-libs/zlib
 "
 DEPEND="${RDEPEND}
diff --git a/app-text/libetonyek/libetonyek-9999.ebuild b/app-text/libetonyek/libetonyek-9999.ebuild
index 7493c2947bb9..b7576e139572 100644
--- a/app-text/libetonyek/libetonyek-9999.ebuild
+++ b/app-text/libetonyek/libetonyek-9999.ebuild
@@ -1,14 +1,12 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 if [[ ${PV} == *9999 ]]; then
-	MDDS_VER="9999"
 	EGIT_REPO_URI="https://anongit.freedesktop.org/git/libreoffice/libetonyek.git"
 	inherit autotools git-r3
 else
-	MDDS_VER="2.0"
 	SRC_URI="https://dev-www.libreoffice.org/src/libetonyek/${P}.tar.xz"
 	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 fi
@@ -20,6 +18,8 @@ SLOT="0"
 IUSE="doc static-libs test"
 RESTRICT="!test? ( test )"
 
+MDDS_VER="2.0"
+
 BDEPEND="
 	virtual/pkgconfig
 	doc? ( app-doc/doxygen )
@@ -28,7 +28,7 @@ RDEPEND="
 	app-text/liblangtag
 	dev-libs/librevenge
 	dev-libs/libxml2
-	>=dev-util/mdds-${MDDS_VER}:1=
+	dev-util/mdds:1/${MDDS_VER}
 	sys-libs/zlib
 "
 DEPEND="${RDEPEND}
diff --git a/app-text/libmspub/Manifest b/app-text/libmspub/Manifest
index 90bcc3a68ff6..4d718b93693a 100644
--- a/app-text/libmspub/Manifest
+++ b/app-text/libmspub/Manifest
@@ -1,5 +1,5 @@
 AUX libmspub-0.1.4-gcc10.patch 752 BLAKE2B b59c1feef001da863688cf108dd30b3624577eb6cf7c8fadb8295cc6a0336dcd98c39c79dd369c3ed239da12574439737e85fe6bb5d7d0a1aae85d0d72c28686 SHA512 f38730c9e552dd1b0264b789e5138c7c09feb717934bc0d80bf65797343422d64f9d0173edae47af15d89a1bd352636ed56de74b7f3d5bfa69030cc1e994db00
 DIST libmspub-0.1.4.tar.xz 377472 BLAKE2B 89bd994a5aa2b3a22681dfe78fcea19561ea6057210e61630fa904ded12cca4694d715dd8f2fe8f687a91951bfa2f7aec1ff11d0b978a517476545bb07f654dd SHA512 7275f890645961b3fd56df4584788962e8c064fe3f99f5834c6ba6177ce76d00d544fbe9a25b7ab2f4180d2f3a90c609fe0bb68d61ea24e95b086190390fff31
-EBUILD libmspub-0.1.4.ebuild 1165 BLAKE2B ab9846fc3edf364dbe9c645e6fe84fca03e7c77b8390faa2a5767f1f3dddbe1ac0e418732e03132bd629f9bf390aabf4f6b87467ef079ee154fcd6f95b7c59c2 SHA512 3cbc945ec4eb955f181ec8e57071b059530f15693a9f7fdd7a3d4d5eb549199fae7edf73438a3023ea15294272900576c4b779c616b5a637ebc94eb12fe24770
-EBUILD libmspub-9999.ebuild 1126 BLAKE2B c552dd2106be6bbf6a8433ac4470fe60168b8a3ecd4ec728d216fc181e6e89043547cfbc0860c49a5377b9e6b94959ad29ec70167aeae14e846da53595b0f761 SHA512 77f8370a5cbd3b32a518399c0e2a7a744bb4224a24f42587e5d8fc7183f33d43612d3158da02e6811f501491fe989d1bc1a5d7631929d46f10b51a5529975c5d
+EBUILD libmspub-0.1.4.ebuild 1190 BLAKE2B 43d070a2a540bdc46ef7e28f99b2dc0369f3cdb2325e2e414df66a337923c00ef19ad8def589b3c60214d54b205e6c7d9b01ac9766beafbe00e96924ba8dce63 SHA512 fce9184ccf431a2a467d046ea500388901e640bfcd5e91b017405ba564bc1084ff4d0fa81e5db987b8cc87d9e29155a69ef38d7941fc752dca11e1c1874732ad
+EBUILD libmspub-9999.ebuild 1151 BLAKE2B 4f0eed197827389f11e711580c3bbbf5cd1f8aa739dffa66b4e10c1eb97fda3ce8bd0b9a0d2e4474b66cfb36f52a687359015ce56f73bbc541be60d67d5deffa SHA512 ed227a0116d226dec8e94d1ef920123a1a35d73200972f87ea3c6a725c52af143843f8f01b64dd79a650810e65a4eedaf908b41c22e0c6f74756ca8a034a7082
 MISC metadata.xml 256 BLAKE2B 28554175365761f81817e75e2c125714b94680527103d72118d0daf2eb0d2359082c36f2c8b0e92574e93c9c00038c944486a31d7843108dcc285d809bd52fe6 SHA512 1a0e13dd42f80f5c8669910c7360c6c1542e9a2f143da3a812f874966ba4729248152efb36e03bdfd47f09086797e6e1410e1ac735925d304811c847aa2b6398
diff --git a/app-text/libmspub/libmspub-0.1.4.ebuild b/app-text/libmspub/libmspub-0.1.4.ebuild
index 20eba626a22a..aac80c71a965 100644
--- a/app-text/libmspub/libmspub-0.1.4.ebuild
+++ b/app-text/libmspub/libmspub-0.1.4.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit flag-o-matic
+inherit autotools flag-o-matic
 
 if [[ ${PV} = *9999 ]]; then
 	EGIT_REPO_URI="https://anongit.freedesktop.org/git/libreoffice/libmspub.git"
-	inherit autotools git-r3
+	inherit git-r3
 else
 	SRC_URI="https://dev-www.libreoffice.org/src/libmspub/${P}.tar.xz"
 	KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 ~sparc x86"
@@ -38,7 +38,9 @@ PATCHES=( "${FILESDIR}/${P}-gcc10.patch" )
 src_prepare() {
 	default
 	[[ -d m4 ]] || mkdir "m4"
-	[[ ${PV} == *9999 ]] && eautoreconf
+
+	# Needed for Clang: stale libtool. bug #832764
+	eautoreconf
 }
 
 src_configure() {
diff --git a/app-text/libmspub/libmspub-9999.ebuild b/app-text/libmspub/libmspub-9999.ebuild
index 2035408ee17b..93a7036a4d2e 100644
--- a/app-text/libmspub/libmspub-9999.ebuild
+++ b/app-text/libmspub/libmspub-9999.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit flag-o-matic
+inherit autotools flag-o-matic
 
 if [[ ${PV} = *9999 ]]; then
 	EGIT_REPO_URI="https://anongit.freedesktop.org/git/libreoffice/libmspub.git"
-	inherit autotools git-r3
+	inherit git-r3
 else
 	SRC_URI="https://dev-www.libreoffice.org/src/libmspub/${P}.tar.xz"
 	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
@@ -36,7 +36,9 @@ DEPEND="${RDEPEND}
 src_prepare() {
 	default
 	[[ -d m4 ]] || mkdir "m4"
-	[[ ${PV} == *9999 ]] && eautoreconf
+
+	# Needed for Clang: stale libtool. bug #832764
+	eautoreconf
 }
 
 src_configure() {
diff --git a/app-text/libnumbertext/Manifest b/app-text/libnumbertext/Manifest
index b9f0d84aa642..0e94d708fa7a 100644
--- a/app-text/libnumbertext/Manifest
+++ b/app-text/libnumbertext/Manifest
@@ -1,5 +1,3 @@
-DIST libnumbertext-1.0.7.tar.xz 289764 BLAKE2B dc7a340dd1843ac77088fd31d4343b570bba0bd5758b939ad228d9d31a7f283ce9c11cf8a504e0c14464bfc6962911b7d1c075122d3efaa7014180a57d419248 SHA512 7755c713dd9b9b75e486eac7ffbfb418c3bdfefd67ecb149f0e25a339410814bf73296f69a4e009a17f9f21292f0eeafa931aef60596cd3d932dab47278de8c2
 DIST libnumbertext-1.0.8.tar.xz 292568 BLAKE2B d385f0bdb19013673190533a21305e12211e1427d59503a9b3c54bc1deda27f405dae347c4cc43161766a901ec14c9ea4b0eed17ba468eb0855ef1a6b0ec95c3 SHA512 b29e544eac25a0603ba7fc68744ac54a372402af32f4bbf52f2373b280efce2eb6831c803d0a10e1f674988839f4c123b8a120e2697bcfa2510d3852d856fe2d
-EBUILD libnumbertext-1.0.7.ebuild 544 BLAKE2B ae8f45785571d5eab9a52e195d1461a38e65e05d0dfe3034fc4da5fda093365861ebdf8d70ada7283362917d10b49144024e35d4869576ed33a4c3eea76e0808 SHA512 2f4e9a60eaeabb0cbad2b567ae0fe07cbba21eba5b91e69a4da1a7336d341efc60f1385068390bd03c1152ec93d23a01cf8d769707b0c667248cd518ad4f5977
-EBUILD libnumbertext-1.0.8.ebuild 526 BLAKE2B ad078935df9ab52a613337240acfd2abbc6800f4c4064e49ed664badc254610aa3c5ce413beb08131cdb4dcb7e121b8e8292e284f12aaea2d55b1693b966c658 SHA512 bd24b329c3a3ae9f8a4ffd48f92f94529a7678c643cd9a90d0bb3408f327c95c05595c86f77c553d18839c0db867f0201230a7931f100e97618492421b07b3b3
+EBUILD libnumbertext-1.0.8.ebuild 523 BLAKE2B 9b6d75ee1dfad2dd7d235d162e97b9f6794b3fbb49443af00556a24fc9fe3a4badb3ea8c22bdbe9ffeb3d7d6e8df101a655fa69a20c7e8e79c2659caaae1fd7d SHA512 7d1743a4682fc83315af6204d72ea37f68c76dbf66f8dcc108ef03138e0cbcad970a88938d86390e14954aabeb77f8c12fea2b6b9a834021125f2330698014cb
 MISC metadata.xml 256 BLAKE2B 28554175365761f81817e75e2c125714b94680527103d72118d0daf2eb0d2359082c36f2c8b0e92574e93c9c00038c944486a31d7843108dcc285d809bd52fe6 SHA512 1a0e13dd42f80f5c8669910c7360c6c1542e9a2f143da3a812f874966ba4729248152efb36e03bdfd47f09086797e6e1410e1ac735925d304811c847aa2b6398
diff --git a/app-text/libnumbertext/libnumbertext-1.0.7.ebuild b/app-text/libnumbertext/libnumbertext-1.0.7.ebuild
deleted file mode 100644
index 53b9c0af234e..000000000000
--- a/app-text/libnumbertext/libnumbertext-1.0.7.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Number to number name and money text conversion libraries"
-HOMEPAGE="https://github.com/Numbertext/libnumbertext"
-SRC_URI="https://github.com/Numbertext/${PN}/releases/download/${PV}/${P}.tar.xz"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE=""
-
-src_configure() {
-	econf \
-		--disable-static \
-		--disable-werror
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -type f -delete || die
-}
diff --git a/app-text/libnumbertext/libnumbertext-1.0.8.ebuild b/app-text/libnumbertext/libnumbertext-1.0.8.ebuild
index 14a4ecfc51f3..33ff29c4d146 100644
--- a/app-text/libnumbertext/libnumbertext-1.0.8.ebuild
+++ b/app-text/libnumbertext/libnumbertext-1.0.8.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/Numbertext/${PN}/releases/download/${PV}/${P}.tar.xz
 
 LICENSE="LGPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 src_configure() {
diff --git a/app-text/lowdown/Manifest b/app-text/lowdown/Manifest
index a3af625d46f3..2c5821b5f297 100644
--- a/app-text/lowdown/Manifest
+++ b/app-text/lowdown/Manifest
@@ -1,9 +1,13 @@
 AUX lowdown-0.10.0-dont-install-static-lib.patch 467 BLAKE2B dcf6e7e61025248ad62af0534a9a04d8f113889ab8a909f746e26928733c243c49bafff41eeac0fb618bd49ceb980998b41c54b7ac62790868419e3e384a1d21 SHA512 9d4ba6ed91376b9013c6104d1157721efcda390471d9b89716573a74f73167d469ba23769197f7c8ea8f534c34920f1329313660579722f85f53291153b22cd2
-AUX lowdown-0.10.0-linking.patch 1628 BLAKE2B 7a390371b9969722c1651f1c79a8d07fddc42a1466b0f85dffc395b59a0f5dab2e92e3d9ca562b804e7ca5fef32b9f65a84cb458aa3fa465ff37a09185de5d5f SHA512 b38f6c9d96be0097a59dd99ad04b5da53267af243aa8e2f42ec61b6a777725fd0d6477890d2290ab875f0a5fc035c5aff7d38330bc3e910218e2f0e1299fa8b4
+AUX lowdown-0.10.0-linking.patch 1569 BLAKE2B f69db3407a8175fcb7f267a9b7328c7830cc01589d71405e528f8cf96270c2b17bc607de21ecf88afd2b9589fd71e60fa3f19c82f35bc3cc65273cb7e49f330d SHA512 a50e9a6e1461bcf315c6ac05d6a1896b21d35e4ee25e26f925fb21dfd347a74d95ee45ba2a0373557a8245e2c608b34018f041d3fb70aa49927568408da524ca
+AUX lowdown-0.10.0-pkgconfig-libmd.patch 309 BLAKE2B 617d3af07f0414fce674573e48f86f541f3b6c6c6b1649d7ba4302b0817fa8a8edf0beb1d0628c7deb79eb64934089b8ae9ff8f50171f3e94cd93427464a9c59 SHA512 f40f0a04deb70708b3059ccce394cbb78b8ba6020db4df62533abe1d3d125e1372947a5c249b9aa9a655b9b67f3f448a8963fe53fbd7d13c87b637143b36e9b0
 AUX lowdown-0.10.0-shared-library.patch 1847 BLAKE2B 42d32a96aed20ac8419805c4d5e3f3ae5bde9801121452fdad68d085c618c22064770ebe6b021d25f104557c149a1f1e279873987400161b5a57e9313023a36a SHA512 dafec418078bdc9ca047fb69e299a5508d2be12f7ce37cd34322ef7d415031cb8db7b8f688f1f5d100398672eccc7cecd0de290fd748252655a8813f9ae2991d
+AUX lowdown-0.11.1-linking.patch 1330 BLAKE2B adffc64357e84d9f6ef82b4c85e0c7302995304859c20c5dc1c6ab3f4c32c0aca4d4c5739f43515386f00f59e4ab58a2c9d3e9ffde15a338bdcc210de5ab9ad5 SHA512 47c44d73eeac0a7b607c16afe8a24e9ee9a75672e90119cc63d577bd39db69d1dce8985a90535504f33eb1ea39728a175bcedd718730cf47fb822a0a0169aea3
 AUX lowdown-0.8.4-configure.patch 770 BLAKE2B c91c27b9d7a33435515214ab8701ee0c5c2ea79b074e4ba8f96d57d0ced14ca77a918258cdbcb60b6ad9522e14f298b707b69aa70aae3e89b9b061c91905da72 SHA512 b768fade94fc2369e75d4c59b13cc2a053c3edf8502e246abd0a90123a9483f2160ab470c2c162cdf439dfacf4fd184751a069d6b008775f6ffa8bf4eba85463
 DIST lowdown-0.10.0.tar.gz 547397 BLAKE2B 93d87e3aca2466398a625750b928062fbafd26311899e52ddd8264218675e78d30714c920f3331619fcd510a92cc6046401c946f5bd1465d6fd46f26937318ac SHA512 7454e618607628ec0a1649f44f5ec64f8778ecaa151f6aad4984935e297abfe8e84ffc321d3c93cec5d336ff14b6bf9a0ff9054e7363cc58ba708a5b60db9048
+DIST lowdown-0.11.1.tar.gz 571320 BLAKE2B 28fe8cb4f164618be602770c602f3ce51c0f0e765fb9869b82cb29c50bdbe0fd92c09c10074d8968108eca59096d7e176531eb56cb2b40f1d9c00a3f944e3b8c SHA512 5a8ca9d731171b97daed7a9095bc4206d2bed9095fa267eb9270782770247743f1a096c5235fd301320418c37a478fbc71552ade105eba0e756ff687835d4efb
 DIST lowdown-0.8.4.tar.gz 520735 BLAKE2B dc66b92f285b186ca83b9fad1cccfef9b395233ef56756e9ea9071b5502cd81dc6ce2d67d7ef265dab8953010af0907cd76125cd4442cfbfc2bcf8c63e097809 SHA512 cd46ead69ed038bf3ccf848b784327d66c78dd8adbc9ae4bfee660b9b1e52844ac8c7ad0377f8f38a3fee0d2e523f979a22d6b547c7964304accef0951cfca34
-EBUILD lowdown-0.10.0.ebuild 1038 BLAKE2B 7afcb03620a4472430ee5e66e470da9416bd88d1978f725bb8016f7d7fc5fdb952ce5d44d3aab79d83b90476613fd9d5fdbe873ce7bf7d791356240d3e68d2e3 SHA512 8ee31b181cc2e0e6cc42c4796e48c58ef796a763fdd2dd25fb5f1763253ebde9f677e5a8ad5c4a4718f9139eeab7f6d8d1776f74d0fd307c553df2424d19cf48
+EBUILD lowdown-0.10.0-r1.ebuild 1090 BLAKE2B 86a81147c8526d853cbe6a685ba7dba5457c0c806703f56f08926e2f11818ca3d741b530d12ac5cbf3016ccc77767bca42edc2abc8d16ec366eb1738d5679172 SHA512 14362d2ad669c06bfccf72b11cf1731d7dfe38a3467a3df7d20a8554b8c78c048f57b473027000a5510128d1307973683f400336ad94bd232398c60959c104b4
+EBUILD lowdown-0.11.1-r1.ebuild 979 BLAKE2B 203bb3e6a99fd8e256c02464a3b015925e0c5a8e1293bd1c16ddad4a463ab1f11718771ba2d722d316bcb17dfa3a8ccdcc04a82aa6e86afa782e66d01deabaf5 SHA512 c7271fea2e918847f42cd24b47d95589e4d37900d433d5d56b178317cfb06647a4674f23802ba3b26ebda67730d4266d659f3359263e3bb93d6faeb6d6bcb697
 EBUILD lowdown-0.8.4-r1.ebuild 793 BLAKE2B bd37690ad0713dd2d74fba662ac26f6cde745eb3ae57b19a44bdf8b9b62f559f3217b16e97848657f9b962627abb58bc42a1ef2c442a6455bea67419e62d8655 SHA512 8dc701ba341787364ae600391f2945d3f4d1fb5a47fdbcfffa4eada6f5a10aedd9b3403876b9f78afec654790822bae3a3cb0976629161b9804b9a0f34248d4d
 MISC metadata.xml 250 BLAKE2B 0b272f56e53b7d76c6d5c253fbe5d7c4c9a1d7b58c21e2f59b8323a5f5cd2791c64651fdfa243a8f560ac9c0a0ff38fcffdc24290fa6d18100da0cadffc19845 SHA512 076f0dbffbab6987cfab48a5ff3631789190c570c35515cc77de5757760f19a8ad615f642e7d61b12344ffc77c599e6ff8b79b67329e69929fdd19a7c80723ff
diff --git a/app-text/lowdown/files/lowdown-0.10.0-linking.patch b/app-text/lowdown/files/lowdown-0.10.0-linking.patch
index e0ab7285e07a..1581e94b7c9d 100644
--- a/app-text/lowdown/files/lowdown-0.10.0-linking.patch
+++ b/app-text/lowdown/files/lowdown-0.10.0-linking.patch
@@ -23,16 +23,15 @@ index d013a1c..c9de4d4 100644
  
  install: all
  	mkdir -p $(DESTDIR)$(BINDIR)
-@@ -153,7 +154,7 @@ install: all
- 	$(INSTALL_DATA) lowdown.pc $(DESTDIR)$(LIBDIR)/pkgconfig
+@@ -153,6 +154,7 @@ install: all
  	$(INSTALL_PROGRAM) lowdown $(DESTDIR)$(BINDIR)
  	$(INSTALL_PROGRAM) lowdown-diff $(DESTDIR)$(BINDIR)
--	$(INSTALL_LIB) liblowdown.so $(DESTDIR)$(LIBDIR)
+ 	$(INSTALL_LIB) liblowdown.so $(DESTDIR)$(LIBDIR)
 +	$(INSTALL_LIB) liblowdown.so.1 $(DESTDIR)$(LIBDIR)
  	$(INSTALL_DATA) lowdown.h $(DESTDIR)$(INCLUDEDIR)
  	for f in $(MANS) ; do \
  		name=`basename $$f .html` ; \
-@@ -271,7 +272,7 @@ main.o: lowdown.h
+@@ -271,7 +273,7 @@ main.o: lowdown.h
  
  clean:
  	rm -f $(OBJS) $(COMPAT_OBJS) main.o
diff --git a/app-text/lowdown/files/lowdown-0.10.0-pkgconfig-libmd.patch b/app-text/lowdown/files/lowdown-0.10.0-pkgconfig-libmd.patch
new file mode 100644
index 000000000000..0337f3d68d99
--- /dev/null
+++ b/app-text/lowdown/files/lowdown-0.10.0-pkgconfig-libmd.patch
@@ -0,0 +1,11 @@
+diff --git a/lowdown.in.pc b/lowdown.in.pc
+index 078d0c0..a31aaac 100644
+--- a/lowdown.in.pc
++++ b/lowdown.in.pc
+@@ -9,5 +9,5 @@ URL: https://kristaps.bsd.lv/lowdown
+ Version: @VERSION@
+ Requires:
+ Libs.private: 
+-Libs: -L${libdir} -llowdown -lm
++Libs: -L${libdir} -llowdown -lm -lmd
+ Cflags: -I${includedir}
diff --git a/app-text/lowdown/files/lowdown-0.11.1-linking.patch b/app-text/lowdown/files/lowdown-0.11.1-linking.patch
new file mode 100644
index 000000000000..2aa5cb1fe58e
--- /dev/null
+++ b/app-text/lowdown/files/lowdown-0.11.1-linking.patch
@@ -0,0 +1,37 @@
+diff --git a/Makefile b/Makefile
+index ccc163d..d148da6 100644
+--- a/Makefile
++++ b/Makefile
+@@ -173,8 +173,8 @@ installwww: www
+ 	$(INSTALL) -m 0444 lowdown.tar.gz $(WWWDIR)/snapshots
+ 	$(INSTALL) -m 0444 lowdown.tar.gz.sha512 $(WWWDIR)/snapshots
+ 
+-lowdown: liblowdown.a main.o
+-	$(CC) -o $@ main.o liblowdown.a $(LDFLAGS) $(LDADD_MD5) -lm
++lowdown: liblowdown.so main.o
++	$(CC) -o $@ main.o $(LDADD_MD5) -lm -L. -llowdown $(LDFLAGS)
+ 
+ lowdown-diff: lowdown
+ 	ln -f lowdown lowdown-diff
+@@ -183,10 +183,10 @@ liblowdown.a: $(OBJS) $(COMPAT_OBJS)
+ 	$(AR) rs $@ $(OBJS) $(COMPAT_OBJS)
+ 
+ liblowdown.so: $(OBJS) $(COMPAT_OBJS)
+-	$(CC) -shared -o $@.$(LIBVER) $(OBJS) $(COMPAT_OBJS) $(LDFLAGS) $(LDADD_MD5) -Wl,-soname,$@.$(LIBVER)
++	$(CC) -shared -o $@.$(LIBVER) $(OBJS) $(COMPAT_OBJS) $(LDFLAGS) $(LDADD_MD5) -lm  -Wl,-soname,$@.$(LIBVER)
+ 	ln -sf $@.$(LIBVER) $@
+ 
+-install: bins
++install: bins install_libs
+ 	mkdir -p $(DESTDIR)$(BINDIR)
+ 	mkdir -p $(DESTDIR)$(MANDIR)/man1
+ 	mkdir -p $(DESTDIR)$(MANDIR)/man5
+@@ -218,7 +218,7 @@ install_shared: liblowdown.so install_lib_common
+ install_static: liblowdown.a install_lib_common
+ 	$(INSTALL_LIB) liblowdown.a $(DESTDIR)$(LIBDIR)
+ 
+-install_libs: install_shared install_static
++install_libs: install_shared
+ 
+ distcheck: lowdown.tar.gz.sha512
+ 	mandoc -Tlint -Werror man/*.[135]
diff --git a/app-text/lowdown/lowdown-0.10.0-r1.ebuild b/app-text/lowdown/lowdown-0.10.0-r1.ebuild
new file mode 100644
index 000000000000..c0a7c32c57ec
--- /dev/null
+++ b/app-text/lowdown/lowdown-0.10.0-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs flag-o-matic
+
+MY_PV="VERSION_${PV//./_}"
+DESCRIPTION="Markdown translator producing HTML5, roff documents in the ms and man formats"
+HOMEPAGE="https://kristaps.bsd.lv/lowdown/"
+SRC_URI="https://github.com/kristapsdz/lowdown/archive/refs/tags/${MY_PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="virtual/libcrypt:="
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/lowdown-0.10.0-shared-library.patch"
+	"${FILESDIR}/lowdown-0.10.0-dont-install-static-lib.patch"
+	"${FILESDIR}/lowdown-0.10.0-linking.patch"
+	"${FILESDIR}/lowdown-0.10.0-pkgconfig-libmd.patch"
+)
+
+src_configure() {
+	append-flags -fPIC
+	tc-export CC AR
+
+	./configure \
+		PREFIX="/usr" \
+		MANDIR="/usr/share/man" \
+		LDFLAGS="${LDFLAGS}" \
+		CPPFLAGS="${CPPFLAGS}" \
+		LIBDIR="/usr/$(get_libdir)" \
+		|| die "./configure failed"
+}
+
+src_compile() {
+	emake $(usex elibc_musl UTF8_LOCALE=C.UTF-8 '')
+}
+
+src_test() {
+	emake regress
+}
diff --git a/app-text/lowdown/lowdown-0.10.0.ebuild b/app-text/lowdown/lowdown-0.10.0.ebuild
deleted file mode 100644
index a38987c1e1aa..000000000000
--- a/app-text/lowdown/lowdown-0.10.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs flag-o-matic
-
-MY_PV="VERSION_${PV//./_}"
-DESCRIPTION="Markdown translator producing HTML5, roff documents in the ms and man formats"
-HOMEPAGE="https://kristaps.bsd.lv/lowdown/"
-SRC_URI="https://github.com/kristapsdz/lowdown/archive/refs/tags/${MY_PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="virtual/libcrypt:="
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/lowdown-0.10.0-shared-library.patch"
-	"${FILESDIR}/lowdown-0.10.0-dont-install-static-lib.patch"
-	"${FILESDIR}/lowdown-0.10.0-linking.patch"
-)
-
-src_configure() {
-	append-flags -fPIC
-	tc-export CC AR
-
-	./configure \
-		PREFIX="/usr" \
-		MANDIR="/usr/share/man" \
-		LDFLAGS="${LDFLAGS}" \
-		CPPFLAGS="${CPPFLAGS}" \
-		LIBDIR="/usr/$(get_libdir)" \
-		|| die "./configure failed"
-}
-
-src_compile() {
-	emake $(usex elibc_musl UTF8_LOCALE=C.UTF-8 '')
-}
-
-src_test() {
-	emake regress
-}
diff --git a/app-text/lowdown/lowdown-0.11.1-r1.ebuild b/app-text/lowdown/lowdown-0.11.1-r1.ebuild
new file mode 100644
index 000000000000..203b145ffc66
--- /dev/null
+++ b/app-text/lowdown/lowdown-0.11.1-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs flag-o-matic
+
+MY_PV="VERSION_${PV//./_}"
+DESCRIPTION="Markdown translator producing HTML5, roff documents in the ms and man formats"
+HOMEPAGE="https://kristaps.bsd.lv/lowdown/"
+SRC_URI="https://github.com/kristapsdz/lowdown/archive/refs/tags/${MY_PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="virtual/libcrypt:="
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/lowdown-0.10.0-pkgconfig-libmd.patch"
+	"${FILESDIR}/lowdown-0.11.1-linking.patch"
+)
+
+src_configure() {
+	append-flags -fPIC
+	tc-export CC AR
+
+	./configure \
+		PREFIX="/usr" \
+		MANDIR="/usr/share/man" \
+		LDFLAGS="${LDFLAGS}" \
+		CPPFLAGS="${CPPFLAGS}" \
+		LIBDIR="/usr/$(get_libdir)" \
+		|| die "./configure failed"
+}
+
+src_compile() {
+	emake $(usex elibc_musl UTF8_LOCALE=C.UTF-8 '')
+}
+
+src_test() {
+	emake regress
+}
diff --git a/app-text/master-pdf-editor/Manifest b/app-text/master-pdf-editor/Manifest
index 21f22071740f..b0c0855a2603 100644
--- a/app-text/master-pdf-editor/Manifest
+++ b/app-text/master-pdf-editor/Manifest
@@ -1,7 +1,7 @@
 DIST master-pdf-editor-5.7.90-qt5.x86_64.tar.gz 15962243 BLAKE2B 4331a5d17ed9a0ff7a70c353907a4c0d5e99db447760f6103d412eabe0064b1e4ac59ca85bb0cab2bffc5867c8ccde96f68e7ceee227b7b319d93b70482f233d SHA512 823c7212cd3d469bb972e7da66e6eada31149c0bab2a6c577e537ca203862d0fe862e8c9b0cbb479eca0557da4b69a91a88ae0c9215d3b5f105288a9c6c1f2bf
-DIST master-pdf-editor-5.8.06-qt5.x86_64.tar.gz 15975595 BLAKE2B 627a4a1f551ffe13917f44768dc6b990d3582a5c2c7d6b7670c94fd880882dcec93c8ccca69240ecb568a7ab20d752180c2981870e5d5671d69c404a7b99c791 SHA512 dd079d11d570909faaf1129342d075550dca3095c5a76748f6f77e2e7df50ec4b46646c5edf40fd2d2f783baaa602fee292dd2fd54ac94fa723e3a40c454e7ad
 DIST master-pdf-editor-5.8.20-qt5.x86_64.tar.gz 16755926 BLAKE2B 7694b825ca846767a0bf776fdd637595d4bd9fe8a9525c2212be7cd186aa230fe6446e157dabdf0a6c2314b49f2a987d2a0b62ac377bec1e3f3e58302668c05d SHA512 006478e65f55e2e24afd9f9581cd3f3ea8cc38c156a7e5c62410fa5bbb94482b627ca4645cbb91d3fdcdda1a779ccda6825107ba65b60b8d50d034b409eabd61
+DIST master-pdf-editor-5.8.33-qt5.x86_64.tar.gz 16917660 BLAKE2B 9461759f75c1c8dde19d5434ce9f404093695385d66777ebe71086a5992ff02830743fb4d87a118605a75f50d53732333a9c51f63acf370c5e53aff04ab47a0c SHA512 e6010a427abe424b0f6c9a6af16280f09445a51c46c62b7c6d58dfb5580cd19486741e9389ef835c33d7ca2e5c1eaffe6b2ccf1046c83c6f7746ba4c446ab28b
 EBUILD master-pdf-editor-5.7.90.ebuild 1092 BLAKE2B 0d43d8511a262454d533e3961fc1f313de5e17638cab6178cc4357edfa750a80dde9e0e32c32a05c522dfb699738054ad2953fd489e754158558780c6fc697cf SHA512 8870aba2272c522a995fa2cda76530e0847e3ba06102599595e8dcc2d1209b0a2b6588876fd3292e938e9c69c8a5fa3561922a788149cccdea7ccece18901e56
-EBUILD master-pdf-editor-5.8.06.ebuild 1090 BLAKE2B d5330620c8deaf59887cc302acb5ada48cf24a09fd9b870737403e5ab756dbfe7b982af7edb4fbbe4cf92f721ac197c38114e0f298b67af4e8160c3a16a801db SHA512 cd989d52947cb890faf76a83c2707fc384c5e8f832b85ad1de434a286a14ae183b299e7b6df9aad5efcfe88bf41bd67e9c7b8c157f846493e63a54da15543069
-EBUILD master-pdf-editor-5.8.20.ebuild 1117 BLAKE2B 638e82d62ac4b1b9d6db471f16ec3a87b246fbf1dc5ce97b528892a6c4e41e642d11924c37d8f7354361b90e316c6c51f352d89e50c75066812ba19cef61806d SHA512 972e7cd2443024c7f971a05cb33604430ebf6ece49182bef73c772424525aff8bd510aebe7651dd9780b53e654b23ad37c330d18faeb54330c5e08c653513c43
+EBUILD master-pdf-editor-5.8.20-r1.ebuild 1133 BLAKE2B a57f7c94e36afcf532b6512dc3e0e53992c98ef9b137135931573f56aa36419a4e0405ca9bd7a0c7de9fc4809f636a42b334083deb22a8cea3b8591bdab6e3cf SHA512 a8911c0a09f113f1cefb276190f8574e3565563fc4d2349509bac38e7a688f5ea8eb23ec4255ade3b51124e4f87445b998db824720b6f492b8da67e6a4f4a491
+EBUILD master-pdf-editor-5.8.33.ebuild 1133 BLAKE2B a57f7c94e36afcf532b6512dc3e0e53992c98ef9b137135931573f56aa36419a4e0405ca9bd7a0c7de9fc4809f636a42b334083deb22a8cea3b8591bdab6e3cf SHA512 a8911c0a09f113f1cefb276190f8574e3565563fc4d2349509bac38e7a688f5ea8eb23ec4255ade3b51124e4f87445b998db824720b6f492b8da67e6a4f4a491
 MISC metadata.xml 398 BLAKE2B 77ea4e0c5491a2722b46aed4e28ae0dc69dc59b68b44d527bde9b29647a3051b515a806729efe587ab80e08befe791871c043b4cde22755a69bcc73ac7d775a2 SHA512 8d84545bedebf1d841388e3c36c6f5e3bf696de1b008629c6ec367e5040e73a7a971bc8ea93a9ce1096471c01d0ed541deb3d9fe17d4c2ad37d598c614c88906
diff --git a/app-text/master-pdf-editor/master-pdf-editor-5.8.06.ebuild b/app-text/master-pdf-editor/master-pdf-editor-5.8.06.ebuild
deleted file mode 100644
index b6b616512c5b..000000000000
--- a/app-text/master-pdf-editor/master-pdf-editor-5.8.06.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop xdg
-
-DESCRIPTION="A complete solution for viewing and editing PDF files"
-HOMEPAGE="https://code-industry.net/free-pdf-editor/"
-SRC_URI="https://code-industry.net/public/${P}-qt5.x86_64.tar.gz"
-S="${WORKDIR}/${PN}-${PV%%.*}"
-
-LICENSE="master-pdf-editor"
-SLOT="0"
-KEYWORDS="~amd64"
-RESTRICT="mirror"
-
-RDEPEND="
-	dev-libs/nss
-	>=dev-qt/qtcore-5.12.9:5
-	>=dev-qt/qtgui-5.12.9:5
-	>=dev-qt/qtnetwork-5.12.9:5
-	>=dev-qt/qtprintsupport-5.12.9:5
-	>=dev-qt/qtsvg-5.12.9:5
-	>=media-gfx/sane-backends-1.0
-"
-
-QA_PREBUILT="opt/${PN}/masterpdfeditor5"
-
-src_install() {
-	insinto /opt/${PN}
-	doins -r fonts lang stamps templates masterpdfeditor5.png
-
-	exeinto /opt/${PN}
-	doexe masterpdfeditor5
-	dosym ../${PN}/masterpdfeditor5 /opt/bin/masterpdfeditor5
-
-	make_desktop_entry "masterpdfeditor5 %f" \
-		"Master PDF Editor ${PV}" /opt/${PN}/masterpdfeditor5.png \
-		"Office;Graphics;Viewer" \
-		"MimeType=application/pdf;application/x-bzpdf;application/x-gzpdf;\nTerminal=false"
-}
diff --git a/app-text/master-pdf-editor/master-pdf-editor-5.8.20-r1.ebuild b/app-text/master-pdf-editor/master-pdf-editor-5.8.20-r1.ebuild
new file mode 100644
index 000000000000..f944cce74811
--- /dev/null
+++ b/app-text/master-pdf-editor/master-pdf-editor-5.8.20-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop xdg
+
+DESCRIPTION="A complete solution for viewing and editing PDF files"
+HOMEPAGE="https://code-industry.net/free-pdf-editor/"
+SRC_URI="https://code-industry.net/public/${P}-qt5.x86_64.tar.gz"
+S="${WORKDIR}/${PN}-${PV%%.*}"
+
+LICENSE="master-pdf-editor"
+SLOT="0"
+KEYWORDS="~amd64"
+RESTRICT="mirror"
+
+RDEPEND="
+	sys-libs/glibc
+	>=dev-qt/qtcore-5.12.9:5
+	>=dev-qt/qtgui-5.12.9:5
+	>=dev-qt/qtnetwork-5.12.9:5
+	>=dev-qt/qtprintsupport-5.12.9:5
+	>=dev-qt/qtsvg-5.12.9:5
+	dev-qt/qtwidgets:5
+	media-libs/libglvnd
+	>=media-gfx/sane-backends-1.0
+"
+
+QA_PREBUILT="opt/${PN}/masterpdfeditor5"
+
+src_install() {
+	insinto /opt/${PN}
+	doins -r fonts lang stamps templates masterpdfeditor5.png
+
+	exeinto /opt/${PN}
+	doexe masterpdfeditor5
+	dosym ../${PN}/masterpdfeditor5 /opt/bin/masterpdfeditor5
+
+	make_desktop_entry "masterpdfeditor5 %f" \
+		"Master PDF Editor ${PV}" /opt/${PN}/masterpdfeditor5.png \
+		"Office;Graphics;Viewer" \
+		"MimeType=application/pdf;application/x-bzpdf;application/x-gzpdf;\nTerminal=false"
+}
diff --git a/app-text/master-pdf-editor/master-pdf-editor-5.8.20.ebuild b/app-text/master-pdf-editor/master-pdf-editor-5.8.20.ebuild
deleted file mode 100644
index 14038cc98d00..000000000000
--- a/app-text/master-pdf-editor/master-pdf-editor-5.8.20.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit desktop xdg
-
-DESCRIPTION="A complete solution for viewing and editing PDF files"
-HOMEPAGE="https://code-industry.net/free-pdf-editor/"
-SRC_URI="https://code-industry.net/public/${P}-qt5.x86_64.tar.gz"
-S="${WORKDIR}/${PN}-${PV%%.*}"
-
-LICENSE="master-pdf-editor"
-SLOT="0"
-KEYWORDS="~amd64"
-RESTRICT="mirror"
-
-RDEPEND="
-	>=dev-qt/qtcore-5.12.9:5
-	>=dev-qt/qtgui-5.12.9:5
-	>=dev-qt/qtnetwork-5.12.9:5
-	>=dev-qt/qtprintsupport-5.12.9:5
-	>=dev-qt/qtsvg-5.12.9:5
-	dev-qt/qtwidgets:5
-	media-libs/libglvnd
-	>=media-gfx/sane-backends-1.0
-"
-
-QA_PREBUILT="opt/${PN}/masterpdfeditor5"
-
-src_install() {
-	insinto /opt/${PN}
-	doins -r fonts lang stamps templates masterpdfeditor5.png
-
-	exeinto /opt/${PN}
-	doexe masterpdfeditor5
-	dosym ../${PN}/masterpdfeditor5 /opt/bin/masterpdfeditor5
-
-	make_desktop_entry "masterpdfeditor5 %f" \
-		"Master PDF Editor ${PV}" /opt/${PN}/masterpdfeditor5.png \
-		"Office;Graphics;Viewer" \
-		"MimeType=application/pdf;application/x-bzpdf;application/x-gzpdf;\nTerminal=false"
-}
diff --git a/app-text/master-pdf-editor/master-pdf-editor-5.8.33.ebuild b/app-text/master-pdf-editor/master-pdf-editor-5.8.33.ebuild
new file mode 100644
index 000000000000..f944cce74811
--- /dev/null
+++ b/app-text/master-pdf-editor/master-pdf-editor-5.8.33.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop xdg
+
+DESCRIPTION="A complete solution for viewing and editing PDF files"
+HOMEPAGE="https://code-industry.net/free-pdf-editor/"
+SRC_URI="https://code-industry.net/public/${P}-qt5.x86_64.tar.gz"
+S="${WORKDIR}/${PN}-${PV%%.*}"
+
+LICENSE="master-pdf-editor"
+SLOT="0"
+KEYWORDS="~amd64"
+RESTRICT="mirror"
+
+RDEPEND="
+	sys-libs/glibc
+	>=dev-qt/qtcore-5.12.9:5
+	>=dev-qt/qtgui-5.12.9:5
+	>=dev-qt/qtnetwork-5.12.9:5
+	>=dev-qt/qtprintsupport-5.12.9:5
+	>=dev-qt/qtsvg-5.12.9:5
+	dev-qt/qtwidgets:5
+	media-libs/libglvnd
+	>=media-gfx/sane-backends-1.0
+"
+
+QA_PREBUILT="opt/${PN}/masterpdfeditor5"
+
+src_install() {
+	insinto /opt/${PN}
+	doins -r fonts lang stamps templates masterpdfeditor5.png
+
+	exeinto /opt/${PN}
+	doexe masterpdfeditor5
+	dosym ../${PN}/masterpdfeditor5 /opt/bin/masterpdfeditor5
+
+	make_desktop_entry "masterpdfeditor5 %f" \
+		"Master PDF Editor ${PV}" /opt/${PN}/masterpdfeditor5.png \
+		"Office;Graphics;Viewer" \
+		"MimeType=application/pdf;application/x-bzpdf;application/x-gzpdf;\nTerminal=false"
+}
diff --git a/app-text/mdbook/Manifest b/app-text/mdbook/Manifest
index e27182781d68..996d907e13c7 100644
--- a/app-text/mdbook/Manifest
+++ b/app-text/mdbook/Manifest
@@ -216,5 +216,5 @@ DIST winapi-util-0.1.5.crate 10164 BLAKE2B fc800aceae5249a858c806c3e969ef2545766
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
 DIST ws2_32-sys-0.2.1.crate 4697 BLAKE2B 52a7a3f57bcd73156730ada4d78fe12a54a498c9064e0928e09de13a95bd9237f884538e5f9368b47a7ac3c425f0f798c26bad85f20bed4ea26c2fa16c779b97 SHA512 18356861fc595efe7d0180afb8ce7649da35a4f9ba456271d2068679ab258a861af32a2e016e241fbfbf5f6ef0eb33127b26eabfc11428af39506538faa4821f
 DIST xml5ever-0.16.1.crate 41282 BLAKE2B 3a1a634244a138faf665ca3a287bafb54adad829a1e8edc541d6cd6a2357c5afd00114e340f33b0735139a630475a58d7e5d36bef094574efcceccfd08b57778 SHA512 20ad09f202336950c13867d69582a12e5daba671d5ffc79d3f8a69a13f7911b04e135cf5791a24744d6bb909b10e6eef5d5f0b52b5d1124ead2b1017e4d4c4ee
-EBUILD mdbook-0.4.15.ebuild 4811 BLAKE2B 690344caab91b349c0aac120f8d9fa133e89dc05219acedcf548026462444a9d8496d3cea39cfa14575a0063ba24bcc2fbda65650f27e959848f841df9493e32 SHA512 c41f8c89ca2d13d3a8421d802fcf845478efa700ec8c40618763ec5357ad9189462f3bca29f5dc0bcbbbd28dec8b83a00afb1503fbece371084953216dd7dd5d
+EBUILD mdbook-0.4.15.ebuild 4810 BLAKE2B 76238f023f2c83406c6983157093b97201bc559889c4b4615dc8683d11cb1d8eb8eff77e018bb07d86d97e1f3d9ebb63916aef314544bd5c389b6a27ed0364f8 SHA512 867eff6a8a4a20a2b2cf992f8b482637b55a1db60b906d6370b083fa2edceaaaee59a29cb323570e6d3152bb5d77ed1a8095934ffb6e8057974fed6d13daef3d
 MISC metadata.xml 327 BLAKE2B bb56613ec49f3b00a39b3131534cb064154ca05d46fda58d4e1d0c601e49561b4d73bc3d075e378e7ab2df720560d169fbe9fd39b40171184aa8e88d8f7291a4 SHA512 e678a70558e83d27e5c0146174d9e740f3ec2e6bdbbb17e61b71fdea6879d61b7babbd9437ee9928dc0322e65a0863b3909bffc7b3ad9313566c5de5baa17f62
diff --git a/app-text/mdbook/mdbook-0.4.15.ebuild b/app-text/mdbook/mdbook-0.4.15.ebuild
index 61270c429392..5344aa50907f 100644
--- a/app-text/mdbook/mdbook-0.4.15.ebuild
+++ b/app-text/mdbook/mdbook-0.4.15.ebuild
@@ -233,7 +233,7 @@ S="${WORKDIR}/${P/b/B}"
 # CC-BY-4.0/OFL-1.1: embeds fonts inside the executable
 LICENSE="Apache-2.0 BSD CC-BY-4.0 CC0-1.0 ISC MIT MPL-2.0 OFL-1.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 IUSE="doc"
 
 QA_FLAGS_IGNORED="usr/bin/${PN}"
diff --git a/app-text/msort/Manifest b/app-text/msort/Manifest
index 8481f1023acf..64bc1e9f0d64 100644
--- a/app-text/msort/Manifest
+++ b/app-text/msort/Manifest
@@ -3,5 +3,5 @@ AUX msort-8.53-fix-missing-limits-header.patch 559 BLAKE2B cb158b619540aa9679d84
 AUX msort-8.53-fix-segfault-on-certain-input.patch 384 BLAKE2B bec03b23365bfe010b04a8fbb24c2043f5436dc866c2dc5b76de4c2639103ecf75bd12ec6d63fa9e2922ac79c8e97a6939c74fe5f37d026af8325c1b161b0f42 SHA512 6d7e1ddf68240f27055a43cddf9e99594ca2ff20c0d666b8e3e09f74c319b38432d15c0b608f76aa5732b6145f1d3120f618cca398c8a68bef4a394949df55dc
 AUX msort-8.53-respect-users-cflags.patch 238 BLAKE2B 50efa37a87f42112524bd8e281c634b0e2527dc4d63597433616a9f220a3cf935138a32eab9a11f5acedf37bc1c6b25efe1e862b81c0b3ba930c6545fce05cff SHA512 c157bf5babc42db689cf9e0b9ee8c9f372c065570b2728833036658215ae508565db2ec4f00688766ce5a18ea3589747c7cce7172232fe0493a8037689f8152e
 DIST msort-8.53.tar.bz2 440307 BLAKE2B 024fa62c9424dd7f994fd9aabdb2414116ba78c2f6bbbfd88c11cde4ed1688260d7bb7f7a18dd36822f4725817df93d218c4382e8b15232fc6d3583098d44db0 SHA512 9afba189d8b703cd6668065ace86733b52a39f6783272849b3582308da5a33db8ae6747501846523ba3671c9fb38a7584fe0db2462cff446b15d79200055a573
-EBUILD msort-8.53.ebuild 977 BLAKE2B dd13d82936ba2f22ca96a0f5c9eb52a89ad415710418f8f35fdc4b520efb9152df497e7d722b54cca6d18ce17a69f4d1970aa1c97de7d375eb13536d39061b0d SHA512 2abf69beb5c31b3372389e9c2382d47a2c95f81a6423739236410b34478010fa7432a758bbcdc6940c5da2d07cd70b3e8e9658408c1f85273e06b8e223ab3118
+EBUILD msort-8.53-r1.ebuild 977 BLAKE2B dd7a2d2220d626de9e1319769465e66e51e3007766494fc728732476ce5af14d48bcaa1a4503e56709ed504fb0b76d3eb8edd745e6e124f028ee400c8118d3f4 SHA512 50910b18d2462593b4bf4ab8ae0169a0de1069e70c348f49465a6698e003ea795067a676b6e22c217648be3ee58836f5b3609e5636cd3b708318025097d14d76
 MISC metadata.xml 1001 BLAKE2B 85c37e686432dc1f791c14ad0d07ece535b835c0fe7b2f220f682abfb494411849a69fb0c197981d1cf97b3f2d3bb7e7d0d621179cec0a1980218dc72115b0ff SHA512 63558ec0d6109f89d80700048f62df5fb57245ba7ba5aed4467f63041777c8cb9d6fa9d0a2c75fd64bdc5f72b23ba8d2c61746e34a4d8a20b18831900fd880f2
diff --git a/app-text/msort/msort-8.53-r1.ebuild b/app-text/msort/msort-8.53-r1.ebuild
new file mode 100644
index 000000000000..7165b1210a09
--- /dev/null
+++ b/app-text/msort/msort-8.53-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="A program for sorting files in sophisticated ways"
+HOMEPAGE="https://billposer.org/Software/msort.html"
+SRC_URI="https://billposer.org/Software/Downloads/${P}.tar.bz2"
+
+KEYWORDS="amd64 x86"
+LICENSE="GPL-3 LGPL-3"
+SLOT="0"
+IUSE="heap +icu +libuninum"
+
+RDEPEND="dev-libs/tre
+	icu? ( dev-libs/icu:= )
+	!icu? ( dev-libs/libutf8proc:= )
+	libuninum? ( dev-libs/libuninum:= )"
+
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-fix-icu-build.patch"
+	"${FILESDIR}/${P}-fix-missing-limits-header.patch"
+	"${FILESDIR}/${P}-fix-segfault-on-certain-input.patch"
+	"${FILESDIR}/${P}-respect-users-cflags.patch"
+	)
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable !heap allocaok)
+		$(use_enable !icu utf8proc)
+		$(use_enable libuninum uninum)
+		--disable-debugbuild
+	)
+
+	econf "${myeconfargs[@]}"
+}
diff --git a/app-text/msort/msort-8.53.ebuild b/app-text/msort/msort-8.53.ebuild
deleted file mode 100644
index 62a6fff19ef6..000000000000
--- a/app-text/msort/msort-8.53.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="A program for sorting files in sophisticated ways"
-HOMEPAGE="https://billposer.org/Software/msort.html"
-SRC_URI="https://billposer.org/Software/Downloads/${P}.tar.bz2"
-
-KEYWORDS="amd64 x86"
-LICENSE="GPL-3 LGPL-3"
-SLOT="0"
-IUSE="heap +icu +libuninum"
-
-RDEPEND="dev-libs/tre
-	icu? ( dev-libs/icu:= )
-	!icu? ( dev-libs/libutf8proc:= )
-	libuninum? ( dev-libs/libuninum:= )"
-
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${P}-fix-icu-build.patch"
-	"${FILESDIR}/${P}-fix-missing-limits-header.patch"
-	"${FILESDIR}/${P}-fix-segfault-on-certain-input.patch"
-	"${FILESDIR}/${P}-respect-users-cflags.patch"
-	)
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable !heap allocaok)
-		$(use_enable !icu utf8proc)
-		$(use_enable libuninum uninum)
-		--disable-debugbuild
-	)
-
-	econf "${myeconfargs[@]}"
-}
diff --git a/app-text/mupdf/Manifest b/app-text/mupdf/Manifest
index bb63f2a2f1f8..a48f9e268820 100644
--- a/app-text/mupdf/Manifest
+++ b/app-text/mupdf/Manifest
@@ -13,5 +13,5 @@ AUX mupdf-1.19.0-darwin.patch 1056 BLAKE2B ae532c2d68842c3a1bb424c707a51a5ed56a7
 DIST mupdf-1.18.0-source.tar.xz 53621544 BLAKE2B d0057f4240bd4f6b4b6d9381ae1c3871c56b97604d5c6ea6438a8bde72d4696c10a9f0e8e2ed8f43d63a04bb1d973bade8a708327c00b0d0c6802b28af697a55 SHA512 7551f18b9bac6e2dc1cf073741cbc975ce3a16dc7e37c9d5a58254c67bf2c07bb36185d6585e435d4126f3ae351f67d7432d19a986c9b47b15105ca43db0edb8
 DIST mupdf-1.19.0-source.tar.xz 64077324 BLAKE2B 4c30cfc004b4f354ae349e5460327775a4dbdd689e561888c156e9e69e22b45ea1f260dfed8d2d8c017fe65a1e83cabc8ff29dad8de47a2c541f9e335bf11285 SHA512 421e8e49f83cf00bfb2c86b5425939056fe866a048cf18e4c8f5764cdee9829974eea655c944d0f3f5a9407347cceaef34030f4079aa399e798da3ff849230e7
 EBUILD mupdf-1.18.0-r4.ebuild 4358 BLAKE2B 67d3b045314556eb3e81a668015e36115e7729436a91bfebededdf316bce062bac229c64b63f0aebae7553b8a5595fa0d4db53bb7a7a9b452a087967cd04547c SHA512 90dd0ae5d0376dafbce8b19d711d92ab9debceb467578f0e529881b219e8b3166fe5ec1f0b535036300a1e4a60d9969ba21450ca54b6f7e18f8631b035b8a4b8
-EBUILD mupdf-1.19.0.ebuild 4458 BLAKE2B 606bebc50aef75584a837505d863d051a4c805309144236698e77d56715550e353b0582304c5688fbafad4323640be9b8d84f16dbcf6a174528b20072afc2bcc SHA512 56fd53e94c1a9aac683aba53143c5d16eb96ad2b867d2379386830799c27be39a1d399009313d557779dfd64d56d7b6df1328b003c07d43c9280e2cbedc124ed
+EBUILD mupdf-1.19.0.ebuild 4465 BLAKE2B 28283005cf1c4c688cf24544bedc20683d2e043221c74a3922e3f86b6affddbf8a0e62c8d79f8805bc5c5a508e999a57c4d212f6ec3f4b88036b512ea0251017 SHA512 ba83c50f6bca1cfcaabc7410f4fcfc842cdf8e4381ed7763af895cac78861f0f585069fd8b92d50bdc1e22baf30b56533a00b4ebfd8d0cb7515450c5f19eaf5b
 MISC metadata.xml 405 BLAKE2B 8b71db6f16bfb481e524a331eac615661b267d2d2fddde3aa6c9244b75026eacada167e2ed2ad6e7611bad234b53c0b073063925ae6745832585771d5342c913 SHA512 23f707e5ed833c5901d482e0d9cedbae751434311d8c67e7b300b452faabd958eb0c12a5b1c48a3c6d4773891cf3c7426d60a85eecd4b3ceb3358f68f4c8ad87
diff --git a/app-text/mupdf/mupdf-1.19.0.ebuild b/app-text/mupdf/mupdf-1.19.0.ebuild
index f88096d3c7b6..6dfeb8c2ecc4 100644
--- a/app-text/mupdf/mupdf-1.19.0.ebuild
+++ b/app-text/mupdf/mupdf-1.19.0.ebuild
@@ -39,7 +39,7 @@ RDEPEND="
 	)
 "
 DEPEND="${RDEPEND}"
-BDEPEND="x11-base/xorg-proto
+BDEPEND="X? ( x11-base/xorg-proto )
 	virtual/pkgconfig"
 
 PATCHES=(
diff --git a/app-text/nuspell/Manifest b/app-text/nuspell/Manifest
index 6f5f67cdb287..d182a3b035c5 100644
--- a/app-text/nuspell/Manifest
+++ b/app-text/nuspell/Manifest
@@ -5,6 +5,7 @@ DIST nuspell-4.1.0.tar.gz 380814 BLAKE2B 500da0797e4f0d1939afd8451b734f309b5c58e
 DIST nuspell-4.2.0.tar.gz 382635 BLAKE2B cc141e764ce4e649a7a10f213c392973eb98eb21adddc7d2cd46c01f3cc9a6c85432bfb13ce178fba387a01aa1661e7c9b6a4717fca18fb3bfa220732daf53eb SHA512 ae9157e9753868c002ed69a765fb705d29d993f3940e11efbc2699778a8b1abee2eb7daa0ff51187b899d6935a215a24662e5b52ec1ef5c644e90a0245f7583d
 DIST nuspell-5.0.0.tar.gz 372940 BLAKE2B 67e3b9b73f79d39c7cdb371ae7699fdaf8323db15dacd17907642f3d799eeb3e3303678d4a9ee4c5a88a5f61d7f1778745590fbac880625dc08c78e94752da6b SHA512 92605c5f0d413b86711fea3b993d656552d5e72440303d3e71907a503d060ead032dfeb0dd8dbb790f35599b8cca8854bdd8650f0560793d9c62a11aebccc2e5
 DIST nuspell-5.0.1.tar.gz 372917 BLAKE2B 30743620035fa49b9d2d190673de1b3de4be0978633eeead1775586c5ab4f0912e4f778867b5839105d1b4f4597e8a2ece33ddbb3290b6447755bfe4a742ea5c SHA512 f883d8c8a3a722a62d411d7b0973dd409c6d09d08ea678c577cef68ec8b5c7e4a4e4cb8a1323e632114414fc17137d1add996a72fbd522ab4de8c6f70fc77073
+DIST nuspell-5.1.0.tar.gz 370368 BLAKE2B 67338fe79ddb98267e0c1efc575e47fc1a8f894cd09b6ada6c6a3f5e89b02fe3a81686b1ff1af73e28fd86437d0f115e04fd5f5aea1954c3da4414f25325ec46 SHA512 08ce776d224c66ba4bdd8cb22943741f30e8e5ba03396bfef1db598321c9b0f8814dacffcb52287b3b669426c7b08e2c1a40323341a9ff9768a7187002e1d77a
 EBUILD nuspell-3.1.2-r1.ebuild 1203 BLAKE2B 4fce19158989243e396139e92e5e26649c23d8b041dfddeb0135564660af39dcf9eee19d33db57304b508882dfb08a444e10d39958ab3de14ff4f4340255050b SHA512 48703b751d89adfe0fa14170c5a52007c7a87dfc47a8a9a16b2242a89c2701d73c76b5d84529146d8ef9af31b92cfaf27f78c96dc25385d27fde8a2466e1f0b7
 EBUILD nuspell-4.0.0-r1.ebuild 1203 BLAKE2B 862c4521ddbe12201cebc5feebf00269f6ab3930858337008fe5019be804fda1fe23d74d7dc3a41bf8948bece3a92f317ba0dafbd9c2d8c381e6e8b175e35826 SHA512 e5d5becea73860e081f851977ff48ff4a0f72b86101276cd20268fb4672ef90d8ff50d34b7d1cf5c0a488b4a0ce24d54278469a23278166255603a48d9eb9e20
 EBUILD nuspell-4.0.1.ebuild 1172 BLAKE2B 71b47bc2e71e680cbaf050c851332e0c58fa63e61fbeec724c740571132f8fe38fae1abbe758d4236456ab788aad1b931c346df72d71eb5733ad155548259034 SHA512 140180c0c6f8f2a9e8bca2677601a8129dfb4761db93265affee61f0f57fcb33b428817b03a8619f2b1cc775a1c126e73ae58e24ca84fde3787fd127d0464ede
@@ -12,4 +13,5 @@ EBUILD nuspell-4.1.0.ebuild 1172 BLAKE2B 71b47bc2e71e680cbaf050c851332e0c58fa63e
 EBUILD nuspell-4.2.0.ebuild 1142 BLAKE2B 940a20fd21b52017c1e8d2d2a9dcc56de5f1e2eaabfe72b2c6c06052fc8bb8f372e88452eeb0f7d702c6ff93d630212a53d66b5939a786f2b72de437b2a693dc SHA512 3c4c91aa5cd1f38389884bce74fb343877ad0977ed8ad4919ef69dc00f87350416e964384f2b62c875221657b37a398279838dbe3f0e1c5b00c36293046c99c0
 EBUILD nuspell-5.0.0.ebuild 1147 BLAKE2B 126b9cfdc11fb89ec73179038058758659048f232cd7704fe0f1a4956ba85d04dbd9902ff97511585cc0507a0f581baf615b7fbf8978c2af96945194d88f8599 SHA512 e0db32e32a9a2e94dec39bfc11f5d8065358f8738184bf8b1ab65316a523e7f9b9a50f59e49b68dab4569be1ca5249eddfbbf9cad1f95a469c91e12c1b347064
 EBUILD nuspell-5.0.1.ebuild 1147 BLAKE2B e68afc28c0783eb5c798b90a7e38651122eb15673530e2eaeb3ce5be5c3070d3cc127bb00270e8c1034b4af4d43a66053ef219ceffafcef24fc6e92017c9258f SHA512 f99e283a1f4fb8c1db4cbf2b8ab8fced4b98aea8b8042ce3ae9a0d63fa981c18346d41c11e30742130a188120c2e07ebb1eca0894837eb6fed70eff5939f207f
+EBUILD nuspell-5.1.0.ebuild 1147 BLAKE2B 10398d0ca67487619c4c570147b0e81fcf93a77a69219346e5ac100e37a61cf7084cf3342a72c31475acc68257d145b8ccb260a85858d83c95671880138ecf64 SHA512 b2477723cd18df5b1aed47a778cea16ce7eebd5868f6f3c2de8209d5361515e2851923038d81cc79cfcc695360fefd1ab3ec54f8e08031fa7a43b78dadbddfec
 MISC metadata.xml 490 BLAKE2B ba276bc01e3f077ef3845e104f0ae93d2985d4f0dd90e36deb4623a82f2dced53c59b98035fac64a6e61b0747e93687ea2233042e248fe80f46b302297d81f7e SHA512 5529ab198114d1aeb0af3a6315074255360fb5e15aea6b0de05fed1032092819cdbf9cf6103fe6bf4cb55df193cae870dc47764ccc9570824477dae08abf3f88
diff --git a/app-text/nuspell/nuspell-5.1.0.ebuild b/app-text/nuspell/nuspell-5.1.0.ebuild
new file mode 100644
index 000000000000..2c97c1b790c9
--- /dev/null
+++ b/app-text/nuspell/nuspell-5.1.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Spell checker library and CLI for complex natural languages"
+HOMEPAGE="https://nuspell.github.io/ https://github.com/nuspell/nuspell"
+SRC_URI="https://github.com/nuspell/nuspell/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-3+"
+SLOT="0/5"  # due to libnuspell.so.5
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+RDEPEND=">=dev-libs/icu-60"
+DEPEND="${RDEPEND}
+	doc? ( app-text/pandoc )
+	test? ( >=dev-cpp/catch-2.3.0:0 )
+	"
+
+DOCS=( CHANGELOG.md )
+
+RESTRICT="!test? ( test )"
+
+src_prepare() {
+	rm -R external/Catch2/ || die
+	if ! use test ; then
+		rm -R external/hunspell/ || die
+	fi
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTING=$(usex test)
+	)
+
+	cmake_src_configure
+}
+
+pkg_postinst() {
+	einfo
+	einfo 'Nuspell needs language packs and/or dictionaries to be of use'
+	einfo 'e.g. package app-dicts/myspell-en or one of its siblings.'
+	einfo
+	einfo 'Besides MySpell dictionaries, for other options please'
+	einfo 'see https://nuspell.github.io/#languages-and-users .'
+	einfo
+}
diff --git a/app-text/openpaperwork-core/Manifest b/app-text/openpaperwork-core/Manifest
index b7ac97af0eb9..bf1d331c36a3 100644
--- a/app-text/openpaperwork-core/Manifest
+++ b/app-text/openpaperwork-core/Manifest
@@ -1,7 +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
 DIST openpaperwork-core-2.1.0.tar.gz 105113 BLAKE2B a9f37bab4e5af8bb2bbdca2c6785086962d78d0c27791b42a81b5a246152572c987f174bfd501aa9d25e9548b1e17c98115736f2403eb5669d758aa6552d4ccc SHA512 3fd92928416763cedec86de01fdb610b5826a76a092c996451f70f3d6959fc946dcdfce27f3d746b1eee1d5a38a09c4f5161572c72f5d3e0ef471e3af18dac1c
-EBUILD openpaperwork-core-2.0.2.ebuild 491 BLAKE2B 9c2f7ecde6a10693a0f7496ce60a4ee721fb987dff963d7a638b1b26f471de31a1d3dc2dc936ed5ff122fa574596b12b51f37cfe91aa05833ae83c0732ab1e01 SHA512 1f68412e29852a2abd6f62907735e813757f1efecbcec7b3575b669e3ba56a49345d1fb846190c3cde642e6e9088a8b3b7456dcef0770580bd692746f0cf9f93
-EBUILD openpaperwork-core-2.0.3.ebuild 491 BLAKE2B 9c2f7ecde6a10693a0f7496ce60a4ee721fb987dff963d7a638b1b26f471de31a1d3dc2dc936ed5ff122fa574596b12b51f37cfe91aa05833ae83c0732ab1e01 SHA512 1f68412e29852a2abd6f62907735e813757f1efecbcec7b3575b669e3ba56a49345d1fb846190c3cde642e6e9088a8b3b7456dcef0770580bd692746f0cf9f93
+DIST openpaperwork-core-2.1.1.tar.gz 115580 BLAKE2B a6abd47967b1f94e41d2c491cbbaead3cc2c509e1dc980269e5575d2c08e0a30d50357b5e42ba56569f35b44a470992e45994413dddefd63ba65f8018853a939 SHA512 ef7917dcc0c2520ff63c776b170770a936743fbc8ff2a15993bae7090ef43aa76e66b787aeee6f6d43961fac2f67ebeaf8ba4eb93a912ecfe93567e3c78ed219
 EBUILD openpaperwork-core-2.1.0.ebuild 491 BLAKE2B 327a737669b912546c917379a8fcac1501a525c58cdeab69abd0f11dff99ff01e11662ff3720f70c311acd026b1d2c3a25bf2661feb4108c08da2f8097d8028e SHA512 7ec18fe619f65ea1fb7edc57684e4de71624939e5d92ad76cbf585ad1256ecafa5aa054cb4cd8cfb97f48eb293653e6c173dd40d93fa626ec5973cc6a666a801
+EBUILD openpaperwork-core-2.1.1.ebuild 491 BLAKE2B cd8583d90aa817dec06f6b822489b65f107db6fc29a11a9843f2878a7c36bdcdbee63d0def26320727451344689506590b74376c57fe6a8d85c03dfc36cd3375 SHA512 b8ab6c4ed49cbdbb8ac32a7b797df551baaff1a7d98bdc6bcf4abc72419a267969068bbcb8b04add0fe5eabe51d53838461a9b65f3528c36cb9f6c14a729efb1
 MISC metadata.xml 344 BLAKE2B 48fc04f8bd5fcb77182c4cc7a2a9af5cf63bd392fd0f7982e07bee34df9eee34d134724674d0b4fd14d6b306962110c2ba3c79a8b285e44c7cedcd07c05a7b9c SHA512 48da1afc8ecb34bfdf5a1ff3109b93620040b253b9fc5440bda49985193aa239c8eaf5e02b20863d83da93865a9202501b5720709aca740d34ae7006f3cd8f90
diff --git a/app-text/openpaperwork-core/openpaperwork-core-2.0.2.ebuild b/app-text/openpaperwork-core/openpaperwork-core-2.0.2.ebuild
deleted file mode 100644
index eea70cb44815..000000000000
--- a/app-text/openpaperwork-core/openpaperwork-core-2.0.2.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# 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-core/openpaperwork-core-2.0.3.ebuild b/app-text/openpaperwork-core/openpaperwork-core-2.0.3.ebuild
deleted file mode 100644
index eea70cb44815..000000000000
--- a/app-text/openpaperwork-core/openpaperwork-core-2.0.3.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# 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-core/openpaperwork-core-2.1.1.ebuild b/app-text/openpaperwork-core/openpaperwork-core-2.1.1.ebuild
new file mode 100644
index 000000000000..cdfc38ca447e
--- /dev/null
+++ b/app-text/openpaperwork-core/openpaperwork-core-2.1.1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+DISTUTILS_USE_SETUPTOOLS=bdepend
+PYTHON_COMPAT=( python3_{8..10} )
+
+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 25f8936d82b7..ab353649a5aa 100644
--- a/app-text/openpaperwork-gtk/Manifest
+++ b/app-text/openpaperwork-gtk/Manifest
@@ -1,7 +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
 DIST openpaperwork-gtk-2.1.0.tar.gz 57327 BLAKE2B 13f3f0ded868948a9b489629e12c56625ce85aa13617fa72a40fa80b7182587340a295631a898e69267ace1df3ef75529e1e2b9d8654131d67224868aefba172 SHA512 73bd7e12c804d2e31920f16f8d2b48ff4d6e387d8982573c1960851b1b6d082ae4961aa163059831b0698d8072a4f9374f9c0b5b3deb52534ed6aa2734e7f916
-EBUILD openpaperwork-gtk-2.0.2.ebuild 578 BLAKE2B 7daf9f8ef3265a47c0e9372c0427c21ae6f60d8493557979584a5b2f90bc1da6f4a93189801a9e9d44b40b9ee50624d52be53f9eefd2782b5a7b303e5a2bc1f2 SHA512 9462ee2ffcb3ceaae642934effffcb2437af109cc993ec0a65918d0ce90d36815845858d279788c43dc10e39dbfb0c139b7edffe977aafef5826354fad859400
-EBUILD openpaperwork-gtk-2.0.3.ebuild 578 BLAKE2B 7daf9f8ef3265a47c0e9372c0427c21ae6f60d8493557979584a5b2f90bc1da6f4a93189801a9e9d44b40b9ee50624d52be53f9eefd2782b5a7b303e5a2bc1f2 SHA512 9462ee2ffcb3ceaae642934effffcb2437af109cc993ec0a65918d0ce90d36815845858d279788c43dc10e39dbfb0c139b7edffe977aafef5826354fad859400
+DIST openpaperwork-gtk-2.1.1.tar.gz 57893 BLAKE2B 387e04fe0e280f8ac4b8ed7d1c94c2fd8c76d556ee8f7ed7e76e7a1c298e8323664511538c947da4d460e5626cc8b7e3da984360467b96add50ca0c9a77075eb SHA512 0250c457639068a8b6e95f98570872340a145d5b6939d00f9a33139a7c539978e5591dda148e1d3fbedc366f9a0a58ddfb89510374c7b135bcf1550ec744857e
 EBUILD openpaperwork-gtk-2.1.0-r1.ebuild 597 BLAKE2B 5a4c7a70f3b6f850bcc0ee68c21a59ddc58aed26ee7ea7e8a98969f8c0372f37a03f09bcf40f5a164d884a9783f6d704e747bc9edd1f06e7649c9cc6cf74a591 SHA512 63c40a6acbc43c764be4368a6c81a4870c450367cb46e4fdf83fe9cbda2c0c02924fa17f0ba6fe206214b83fd7173ab7417dbcbbc5e84ddd269a16d52dd545b4
+EBUILD openpaperwork-gtk-2.1.1.ebuild 597 BLAKE2B 5a4c7a70f3b6f850bcc0ee68c21a59ddc58aed26ee7ea7e8a98969f8c0372f37a03f09bcf40f5a164d884a9783f6d704e747bc9edd1f06e7649c9cc6cf74a591 SHA512 63c40a6acbc43c764be4368a6c81a4870c450367cb46e4fdf83fe9cbda2c0c02924fa17f0ba6fe206214b83fd7173ab7417dbcbbc5e84ddd269a16d52dd545b4
 MISC metadata.xml 343 BLAKE2B 35fde19732b50c49e298e60e5ec65ae843d164538bef292c7a7bc8fc793c180529d892a3e7c912d3765c0c294708c25750edc4b40a2c2047c0657310fa38904b SHA512 b4b3795779ea6ba524bd5542793e3fe4947e08b1b14c7651699b3956a75727e848450a9a5c07b7d918c000e3b698d6600f6fc0df0635f758df0e58d25c73d9d5
diff --git a/app-text/openpaperwork-gtk/openpaperwork-gtk-2.0.2.ebuild b/app-text/openpaperwork-gtk/openpaperwork-gtk-2.0.2.ebuild
deleted file mode 100644
index 5bf52d2c9f69..000000000000
--- a/app-text/openpaperwork-gtk/openpaperwork-gtk-2.0.2.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# 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/openpaperwork-gtk/openpaperwork-gtk-2.0.3.ebuild b/app-text/openpaperwork-gtk/openpaperwork-gtk-2.0.3.ebuild
deleted file mode 100644
index 5bf52d2c9f69..000000000000
--- a/app-text/openpaperwork-gtk/openpaperwork-gtk-2.0.3.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# 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/openpaperwork-gtk/openpaperwork-gtk-2.1.1.ebuild b/app-text/openpaperwork-gtk/openpaperwork-gtk-2.1.1.ebuild
new file mode 100644
index 000000000000..9ad618a87c2c
--- /dev/null
+++ b/app-text/openpaperwork-gtk/openpaperwork-gtk-2.1.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+DISTUTILS_USE_SETUPTOOLS=bdepend
+PYTHON_COMPAT=( python3_{8..10} )
+
+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}]
+	gui-libs/libhandy
+	x11-libs/gtk+:3[introspection]"
+DEPEND="${RDEPEND}"
diff --git a/app-text/opensp/Manifest b/app-text/opensp/Manifest
index add8918a8886..bb9b4683089c 100644
--- a/app-text/opensp/Manifest
+++ b/app-text/opensp/Manifest
@@ -1,5 +1,5 @@
 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-r7.ebuild 2103 BLAKE2B 3fc8034b281bf7f97fa2f8b30ba7e7a43f835ad1d5b9011115a810cf508c5861a2cb965a7316990e85e96403109fcddfc7eb34bea2375241bbfd36e87fc32a0a SHA512 142cb390ab5fec7703eec1f62c63bbad2043c20797eac2752d16b03d7b43a41de2ea67c7c94bac4982d6b99c6bc24ff5a5850e8eded03dd325e5a3d456981b56
+EBUILD opensp-1.5.2-r7.ebuild 2091 BLAKE2B a76a0ca3bb06d29f1d797e3110f66649204e0c2972c150e4ac42bad7249b44f257a5fbbe549de41a430172f7714530032935ad9d98cef1e6e744eaf99f8d1ae6 SHA512 c3c5d3565da3fafff674bbca32b0c945bc32dff000ba0b000e2968495bcd7fad8425473c86753cdef0b4a61598d9f98d7e813b2483167b8d62a18ff65b8c3e1a
 MISC metadata.xml 321 BLAKE2B 5571226bba817c3d5cc47e0bd7d67e82399403e24e7773104f33b13bf40d95113da9613db2bd77408557e6793b9efb6d435402a7b680d07e1e3e6952614bdedd SHA512 95c0d6759a91874b81b707e479eee48bf67ba762584587b4027b583e42d63a83018a3243fe81b6649090d1e0167ab825b591dfccbd3a8db9078b1a80f729de15
diff --git a/app-text/opensp/opensp-1.5.2-r7.ebuild b/app-text/opensp/opensp-1.5.2-r7.ebuild
index ddf0d6074591..0611f6bab276 100644
--- a/app-text/opensp/opensp-1.5.2-r7.ebuild
+++ b/app-text/opensp/opensp-1.5.2-r7.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}"/${MY_P}
 LICENSE="MIT"
 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"
-IUSE="doc elibc_glibc nls static-libs test"
+IUSE="doc nls static-libs test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="elibc_glibc? ( net-libs/libnsl:0= )"
diff --git a/app-text/paperwork-backend/Manifest b/app-text/paperwork-backend/Manifest
index 7070f32899eb..7f0cee546892 100644
--- a/app-text/paperwork-backend/Manifest
+++ b/app-text/paperwork-backend/Manifest
@@ -1,7 +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
 DIST paperwork-backend-2.1.0.tar.gz 1352553 BLAKE2B 84bf9f34be50c2cd762c1afb496e4625bed50018242e94925ad4d5428228fadc9ac8d3866f8fbb9f0a78d049599048db62c6d7201852638cc5ad0674ebc791f0 SHA512 72cf3176091d899433a50d8a166a2505f0be9e5917df311a6f5139af472363df427102dcde99e6097b11f6aa26571bdaba06047fafd2365b4dedec0d3a47da7a
-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
+DIST paperwork-backend-2.1.1.tar.gz 1383107 BLAKE2B 0e814a829581fe6322cc0ae44e9e3a20a2fc066e9be5de038c4d08b9d85218961ca87777271ebc646b03425e78017109ddf35c05a4b11e8fcc3bb4b6d10a6273 SHA512 ab75aaf01571eaa52a283ac6e1b9ff080d09e2514e1efb98bc96e9986acf85ec2ab2d94fc27ba15230370c642e39fddf6e11922a3d18b16af38f4281ff9c628f
 EBUILD paperwork-backend-2.1.0.ebuild 966 BLAKE2B efb007d0b4b88d7db2699fe01a2ffe41271abc6bb2f6e5c098f2036bf81ac56a6690f324670ddb4bdfa76ed81fa2488e070bb220fd2339da098f14910e4369ce SHA512 c3ba9143f84d87e93dd293de8b762cae8a1e64e416a170d3ec28a487756c5b4449eb638157189c3562d8a759aa5c190d07beebc93715f796352921f737c81073
+EBUILD paperwork-backend-2.1.1.ebuild 966 BLAKE2B 723ba57f3359846ebcb5e1fcddaa7cd6a21d3e59d80d528b950af039ccae75e0022b64deeebce7d288ee14c3e970d035f3974064af0129527e303cafe61a00a8 SHA512 52c308e27710a1310d92687b3d7a7fa468497987b56baf9fd5c50e3ef16f8eb8fea1c6685a26f042e69f1a809844c39af30c29239ee71dc86083d9703ff9c3e0
 MISC metadata.xml 343 BLAKE2B c205d91c4a58119baa58d40a20915a1cbf44ee65b05d2e42150b45010c0802512008c53c487b1622f6370c46f741082347ec6241290ff1ec93142ad8fb4a9081 SHA512 e0b32b862f07314143878a643d0c8475b1d17ccf7eaddeb9cf77a787e68ebd231ccb4176c71a65ac47eefa97af2a04fedce0cb4efda24c08452c63d390a4dd8f
diff --git a/app-text/paperwork-backend/paperwork-backend-2.0.2-r1.ebuild b/app-text/paperwork-backend/paperwork-backend-2.0.2-r1.ebuild
deleted file mode 100644
index 6b3c1b66ea73..000000000000
--- a/app-text/paperwork-backend/paperwork-backend-2.0.2-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# 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/simplebayes[${PYTHON_USEDEP}]
-	dev-python/termcolor[${PYTHON_USEDEP}]
-	dev-python/whoosh[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
diff --git a/app-text/paperwork-backend/paperwork-backend-2.0.3.ebuild b/app-text/paperwork-backend/paperwork-backend-2.0.3.ebuild
deleted file mode 100644
index 111e95df603f..000000000000
--- a/app-text/paperwork-backend/paperwork-backend-2.0.3.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# 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-backend/paperwork-backend-2.1.1.ebuild b/app-text/paperwork-backend/paperwork-backend-2.1.1.ebuild
new file mode 100644
index 000000000000..03be19a641d1
--- /dev/null
+++ b/app-text/paperwork-backend/paperwork-backend-2.1.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+DISTUTILS_USE_SETUPTOOLS=bdepend
+PYTHON_COMPAT=( python3_{8..10} )
+
+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 6a4415ca2a62..cbe5784b246a 100644
--- a/app-text/paperwork/Manifest
+++ b/app-text/paperwork/Manifest
@@ -1,8 +1,5 @@
-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
 DIST paperwork-2.1.0.tar.gz 5887310 BLAKE2B a28229c73342769fe004be38d5782c6e29d3893bf1fbdd8ccac9790057e2af0b01ef0ad6719310a40d609811efd6c13c7b3761bb9d5feab91a6127eca1526a3a SHA512 4362b7feba917017d5c04cbfaf3d77a2619b7431f2687800f112ecac2edc48604f8bca8d4e6defd09bae1c69c6dfc3e1f22327166aa3563eb6b2c575827e536c
-EBUILD paperwork-2.0.2.ebuild 1026 BLAKE2B b9b3e3cd09c0b0575b566119dac1f192044b958c1bfd6e4ec16a588babab28617c3ca23dd3dca7b9e0e4a5efb5355a2315f8d246394b8a12fff02f427097681a SHA512 5814f5c4c2e96fb2fb2204f1423426577b8032f3e536bed454f26f89a6f4abb368305e41eb0d531df776751c0aa9551aa65bcd0c6c32808efff84d2d5cf346f6
-EBUILD paperwork-2.0.3.ebuild 1406 BLAKE2B 673bae79df2dcfe41da6223d641e66769bc1fe6210fc18a532e8441cac1c7dfb446de834bebaf133d0edf3faf7d21fe48c6f16105833ba453ba85aea55324145 SHA512 c33021dc523e4cd0090470b0fed84e08161d838e754603d7a46c0745b5a7ee925f7b2761232bbfb25b3785df55c30ec589a4fb7a629cfcfcbb4559a1e5879d1b
+DIST paperwork-2.1.1.tar.gz 5886436 BLAKE2B 5fd5a8a5d45a39298d3bc905360544f695c8c1ffa6e4bac56f3ec7bb9f31842aa71e2dadf0c8f072da59065f15fe5e768e42b8a1574722dfb99f66cc24c5b038 SHA512 e2164dc54eacb6153182c073e15f0605ec2131e17fa1c508d4923d37c1848c286d36807994ce07de99fb9cc5da012c111d84768c2c7c876dfb163811995b10c0
 EBUILD paperwork-2.1.0.ebuild 1343 BLAKE2B 4b909a5d2a422a0310991cc53e80105d124b7e34811021307684824ab5a9369ae9ccc8eff03dfc08bdcdffadd3225f81a46df2007ec081478f19084a2685b351 SHA512 9a020266b0b6feb47f23cbbe8aaa8e5f96125b8aee73aa50073a3568f8ab59e8a4389063cb30c0d4a1c8a1193fc58ee1f77d17075b8cbe10f1f122a3b8de90e1
+EBUILD paperwork-2.1.1.ebuild 1297 BLAKE2B b1086a3ca3fd6e84b436d6ac9e7cf452b8a3ddf78ae6caafdfd55c0e46e05ac793a8294e711a1b8e2fd72e4c9ed7ca870a54f099c4b9994feffdc62022da862b SHA512 ce2dcb3b3ea13fdff12d5ea30cfdf25ff7076b47204bfbe6c95b7518f9b188396a84221d6f72c4ddf2bb3d8ae75b64fdd564b1c298aae4d522fba63b5e0d1fe6
 MISC metadata.xml 720 BLAKE2B e5c9fad4e92180e274b83e4add8480c987abf6b463dcf199d7d44eccde7c03beaa9ab8066d5db72b88e7644b6714ac57b8120cac128c1c132adaeccfc569e8d3 SHA512 4449763d4603c9b94be9f6abc2addee08143fc85d886c2b1ee0d2f0cdc552ebaec9941cbd91de6f76516ac71dd1a4c33f232301713bfaf28ce096229832422d9
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
deleted file mode 100644
index 0fbad956449a..000000000000
--- a/app-text/paperwork/files/paperwork-2.0.3-desktop_file.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-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.2.ebuild b/app-text/paperwork/paperwork-2.0.2.ebuild
deleted file mode 100644
index d106fb32559b..000000000000
--- a/app-text/paperwork/paperwork-2.0.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# 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
-
-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}"
diff --git a/app-text/paperwork/paperwork-2.0.3.ebuild b/app-text/paperwork/paperwork-2.0.3.ebuild
deleted file mode 100644
index 3095f01e5a0d..000000000000
--- a/app-text/paperwork/paperwork-2.0.3.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# 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
-
-	# This queries tesseract languages and will fail sandbox with
-	# USE=opencl, bug #793446
-	addpredict /dev/nvidiactl
-
-	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/paperwork/paperwork-2.1.1.ebuild b/app-text/paperwork/paperwork-2.1.1.ebuild
new file mode 100644
index 000000000000..27169a2d1a1f
--- /dev/null
+++ b/app-text/paperwork/paperwork-2.1.1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{8..10} )
+
+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/pyxdg[${PYTHON_USEDEP}]
+	media-libs/libinsane
+	x11-libs/libnotify[introspection]"
+DEPEND="${RDEPEND}"
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	# This queries tesseract languages and will fail sandbox with
+	# USE=opencl, bugs #793446 #830012
+	addpredict /dev/nvidiactl
+	addpredict /dev/kfd
+
+	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/pdfarranger/Manifest b/app-text/pdfarranger/Manifest
index 8cd1dba80623..be1973a4f2ec 100644
--- a/app-text/pdfarranger/Manifest
+++ b/app-text/pdfarranger/Manifest
@@ -1,7 +1,3 @@
-DIST pdfarranger-1.7.1.tar.gz 236699 BLAKE2B b82a1f2309cc326bfba33458aaccee5396597a5c937c67baba767632cadddfae4f7ad21e0c86300c889f8e6d5f7dba9c6483b11bc97c83077e5ab01596b76617 SHA512 1adb5700b6497db95c3f727d1c18fc7b98ecc382cf15bc58bb7ce784d094e0d8cd45a26241e06a593eeb7601aa9f32ebba7d7f0f3a816e9384be09102eb0b4db
-DIST pdfarranger-1.8.1.tar.gz 258488 BLAKE2B e595735fceb156a9fb0dd1221e290f990dc2ee57b623278d9adac69308d0a3258849366d04541d5e7fc4db3605c4478f3e822274de4291286e888d7ae0b8f603 SHA512 de2d48816a362b082b66853f8a7bdc0f3aab78ca4a033ce44752ad755c22b23bcc6ecb796d7e2f3dd29525450807821b55b396dc2922e4092c79c84b8a703425
 DIST pdfarranger-1.8.2.tar.gz 258995 BLAKE2B 019d41e6c89ee4e7a93bd4be9aa593bebf00c3489bae5db46f201e519e7dbd6c011ac5b15ba6450906a8e8ef8610dc9083c32b01fb88828281c0206e32c9d601 SHA512 e0b1ed59158681766e6b707a207363a8ccd38bdc76311600d338ef443e0ee79405af6afb65b878a68d7e52d2ea35f6a7aa700d9aaf46b31bcf64fd863c8784f2
-EBUILD pdfarranger-1.7.1.ebuild 1226 BLAKE2B ec949fded7d82fcffd6c66b4b0b89f7b2581a964aca5147a1232ecefa3eb9eca9c7a2bfdd56b4eba25684c350a43665a18715eb716f12a975cfe9f510563905e SHA512 ba0a895b30e827ed5300634812532cb0dad2586712c5cd5615d5f57886a846b50838305b518d3106fe3847b21f3c06852a5fa9a6d2acf7073d374e9c736ea90e
-EBUILD pdfarranger-1.8.1.ebuild 1228 BLAKE2B b390cca257ec594ded9b6dfe521558db10c636da1f29fd99402fa522776b3753978c43d34d0448b389704332f3d195da17fc7f21b6da75026ae6ddfbaea0d682 SHA512 26c40780456d0d601c925d805d8eef13401297d3ba5cdbc4490995a000774cea786c9a376087d2a74f3c56b1094932658f618e345063508f87295f26e5fc121e
-EBUILD pdfarranger-1.8.2.ebuild 1057 BLAKE2B f194d594598bdc51e522afb487398b94d45e1b3b94fd9b5eeb4a72c2593dc904e815339cf1c5d09a3b6b40e685483d970b03daf4aef607defb22ac95661d15bb SHA512 ee62cc0af678f02007f11c347fd847e1da914ae00dc59eace97a68fad8ca9123cbda711f01d52a574224f5c0bece083565b1c94b8f8a107713a0371013d8034f
+EBUILD pdfarranger-1.8.2.ebuild 1056 BLAKE2B 2a2359e6624f38c36f74d3ab5bc771d3730c48349e7b91367f96628406bbf26ac4e667188e468ed35316c8fc20a8136c7ab1456dbb7236a7edddfd292bef323a SHA512 957c05d13d2884bbabe12be65619850ed6880180981c449031433f20dcfbd604dcbdfa7aa8c9a7b36c1bf19b079a347eb33b752620599867ddb3ed913a8cfcf0
 MISC metadata.xml 623 BLAKE2B 97df25f636b64ca18e0ba7160d85e683459b8c701c903187628924f5b7c2084c953284e2c727fbdcde0edf87a0a895d1b57d8570423f3ffaf88ad8a3ca3e5aee SHA512 3bc66e897609200efdc078f029998feba9cf4918cee1fba2f1edb6c79334a0f8bb1f716103eae2c7b2250533d1cd6845bdce27527798e76db0fa88fd6b0ba923
diff --git a/app-text/pdfarranger/pdfarranger-1.7.1.ebuild b/app-text/pdfarranger/pdfarranger-1.7.1.ebuild
deleted file mode 100644
index 42de8e155050..000000000000
--- a/app-text/pdfarranger/pdfarranger-1.7.1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-inherit distutils-r1 optfeature xdg-utils desktop
-
-DESCRIPTION="Merge or split pdfs; rearrange, rotate, crop pages"
-HOMEPAGE="https://github.com/jeromerobert/pdfarranger"
-SRC_URI="https://github.com/jeromerobert/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE=""
-
-RDEPEND="
-	app-text/poppler[introspection,cairo]
-	dev-python/pikepdf[${PYTHON_USEDEP}]
-	dev-python/pycairo[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP},cairo]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	x11-libs/gtk+:3[introspection]
-	x11-libs/pango[introspection]
-"
-DEPEND="${RDEPEND}
-	dev-python/python-distutils-extra[${PYTHON_USEDEP}]
-"
-
-src_install() {
-	distutils-r1_src_install
-	for x in 16 32 48 256 scalable
-	do doicon -s ${x} data/icons/hicolor/${x}*/*
-	done
-}
-
-pkg_postinst() {
-	optfeature "image file import" media-gfx/img2pdf
-
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
diff --git a/app-text/pdfarranger/pdfarranger-1.8.1.ebuild b/app-text/pdfarranger/pdfarranger-1.8.1.ebuild
deleted file mode 100644
index e43d780ef1a3..000000000000
--- a/app-text/pdfarranger/pdfarranger-1.8.1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-inherit distutils-r1 optfeature xdg-utils desktop
-
-DESCRIPTION="Merge or split pdfs; rearrange, rotate, crop pages"
-HOMEPAGE="https://github.com/jeromerobert/pdfarranger"
-SRC_URI="https://github.com/jeromerobert/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="
-	app-text/poppler[introspection,cairo]
-	dev-python/pikepdf[${PYTHON_USEDEP}]
-	dev-python/pycairo[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP},cairo]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	x11-libs/gtk+:3[introspection]
-	x11-libs/pango[introspection]
-"
-DEPEND="${RDEPEND}
-	dev-python/python-distutils-extra[${PYTHON_USEDEP}]
-"
-
-src_install() {
-	distutils-r1_src_install
-	for x in 16 32 48 256 scalable
-	do doicon -s ${x} data/icons/hicolor/${x}*/*
-	done
-}
-
-pkg_postinst() {
-	optfeature "image file import" media-gfx/img2pdf
-
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
diff --git a/app-text/pdfarranger/pdfarranger-1.8.2.ebuild b/app-text/pdfarranger/pdfarranger-1.8.2.ebuild
index 1e052966bb8d..68059a57f5cb 100644
--- a/app-text/pdfarranger/pdfarranger-1.8.2.ebuild
+++ b/app-text/pdfarranger/pdfarranger-1.8.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/jeromerobert/${PN}/archive/${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE=""
 
 RDEPEND="
diff --git a/app-text/po4a/Manifest b/app-text/po4a/Manifest
index 136d420b861b..e39078845e4a 100644
--- a/app-text/po4a/Manifest
+++ b/app-text/po4a/Manifest
@@ -2,7 +2,9 @@ AUX po4a-man.patch 577 BLAKE2B e2f9263b5c92b798224a1ae9ba9e3358bbf755f0573c34512
 DIST po4a-0.63.tar.gz 4067940 BLAKE2B 4cfa4163c21f5f8b783a5bdc29595f10cd172f7813de5617ed67a25bef547697084511a6f3897c47acb9158f15b3fcd97600bec7e23ba560cffe7cc646ce4c39 SHA512 556859b73728249795df22676a3cde1cbf575c608ad20f267fe7a6ee224d0262db2db19df8b7369ebf1ab568c017548ff118ae035608cca7a4d0963db8acd633
 DIST po4a-0.64.tar.gz 4121565 BLAKE2B a579aabb4245501be4ec7c319e8cef91db2e10883a09ef5a7eaf2d97aad64e8e59f25101c20286c955067fef2f58bc08c9865d5d608dd72913a38eaaff0ac542 SHA512 3d51aaa5894365087523b82e218819ba8a92d3cbc1b389648526f26fbbf37ccaa7ed6643bb388e5fa73a7a1abadee2b4ee2ebbcac14790c56567bf1a3e766fb0
 DIST po4a-0.65.tar.gz 4152612 BLAKE2B 81d330f234cae10f228b5de7e8417f79d7008f827faf676a68c83b05044a2198c1c03f8d19d8bbbfdb71a83cb93abc319e7e6ac5ce57704294d0f3b858bb9b56 SHA512 eea2ddc1344d371ee685e73dc3c3b1b58d24f8bae7edbe7f2112bfead1c481c6796d02c5f7d9fc9bbac57bd93c4194ade51368bb8b29ba62aee333a7afa2e7e6
+DIST po4a-0.66.tar.gz 4240059 BLAKE2B 1d88665b8aa0d7f81854c97265f483934adc51503c2d33252d6ae08a00fddfa8aaa6e9c652f764ae46bf14fea3bcd1093f923fcbf08d96e97296954199e9b900 SHA512 f72e1267cbd6ced01ecc362c327b1634c47dff15398b48644548d28e01ba91108d5626e6d4abcfcb360697e4c0affa3228c6993653ce8f257acbbb3d7ae20fc4
 EBUILD po4a-0.63-r1.ebuild 1372 BLAKE2B 1f74822760c0db37f0644721e1c7b8f17635c268b7ed802e4ae60127c0d59a7c073faa8706b3455adfaa952869c603ab843f96f2fefa994eeed04b997eeb2431 SHA512 82f12d2cc7b3a27e5f1aa2ebe65870855b164b4a4127d1396fe6c015865107e03ccf9e8d655419d3e70a147b2b08b95aff625510408973427dca7e5a051781e9
 EBUILD po4a-0.64.ebuild 1385 BLAKE2B d8dc3462be2d9ad83c9046542c7c4878b0708c6097af240e5165a1d03ae118a0619a63e5c508ede6b85b7470f4221dfcf22a11f7aeb5f2c10c61bd86bbe83873 SHA512 eb30319d6d96c536cf8c2344a6b160306170db4ca973dcb17144aaf617bef7882555b3525b41a81f81db31a9ca26ebcba9e0f40f630e7829ba685cf901a05da7
 EBUILD po4a-0.65.ebuild 1411 BLAKE2B 0450c2b8a4258daa5a36024a03bcf7566f171761eb0145684d6a79c3c2996ca41f01f20f231251f24e16afd13193b65bcbca356740a2546c1ab05e7434bfdc7d SHA512 66a22a0d55bdd5aa71aecb5d9a275a9d5d043d395e7e2b3d629366a85f4903125b12991918f63127b56eb6a52561335bb11005beb2d47fa0051bbb6da2f370be
+EBUILD po4a-0.66.ebuild 1411 BLAKE2B 33ad0af6a847784c1c54ff0b414d0e23dcbe7ed794bd8de7a9ac3ac0d0bec71576a4d1bec74b0edb0ad75e90e0254efaa9d8a3128c2aa06ba32a721d84ac01eb SHA512 c246ce90626308b3cfcc307ab367f5226dd577e190470de4a912d51bcd632aac8abe1710fef73e9dfdc51fba5567f955709269c42c464fe7d3c7d12a42c18ee0
 MISC metadata.xml 327 BLAKE2B e4ac438b10bde7e247b0f098c104aa9956b264df04c81d10aff0f0a0ae45184a953443062f38bbc5fe0c7fd9a4e48219c5e0a76c5bb0b4fee9edf51e35ad50ec SHA512 934e9519050daf07edfee9e4a0041d808ea5eec4d414b738f1e2b909e821b83c8c7b39a15170041a9aba31df1c1a0b6323bd245507f7c9bea9556a332c6939ec
diff --git a/app-text/po4a/po4a-0.66.ebuild b/app-text/po4a/po4a-0.66.ebuild
new file mode 100644
index 000000000000..db6bc3212044
--- /dev/null
+++ b/app-text/po4a/po4a-0.66.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+PLOCALES="ace af ar ca cs da de eo es et eu fr hr hu id it ja kn ko nb nl pl pt pt_BR ru sl sr_Cyrl sv uk vi zh_CN zh_HK zh_Hant"
+
+inherit perl-module plocale
+
+DESCRIPTION="Tools to ease the translation of documentation"
+HOMEPAGE="https://po4a.org/"
+SRC_URI="https://github.com/mquinson/${PN}/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+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"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="app-text/opensp
+	dev-libs/libxslt
+	dev-perl/Locale-gettext
+	dev-perl/Pod-Parser
+	dev-perl/SGMLSpm
+	dev-perl/TermReadKey
+	dev-perl/Text-WrapI18N
+	dev-perl/Unicode-LineBreak
+	dev-perl/YAML-Tiny
+	sys-devel/gettext"
+DEPEND="${RDEPEND}"
+BDEPEND="app-text/docbook-xml-dtd:4.1.2
+	app-text/docbook-xsl-stylesheets
+	dev-perl/Module-Build
+	sys-devel/gettext
+	test? (
+		app-text/docbook-sgml-dtd:4.1
+		dev-perl/Test-Pod
+		virtual/latex-base
+	)"
+
+PATCHES=( "${FILESDIR}"/${PN}-man.patch )
+
+DIST_TEST="do"
+
+src_prepare() {
+	plocale_find_changes "${S}/po/bin" '' '.po'
+
+	rm_locale() {
+		PERL_RM_FILES+=( po/{bin,pod}/${1}.po )
+	}
+	plocale_for_each_disabled_locale rm_locale
+
+	perl-module_src_prepare
+}
diff --git a/app-text/podofo/Manifest b/app-text/podofo/Manifest
index 4143e9ce4f59..4a93511411c7 100644
--- a/app-text/podofo/Manifest
+++ b/app-text/podofo/Manifest
@@ -1,4 +1,6 @@
 AUX podofo-0.9.6_p20190928-cmake_lua_version.patch 522 BLAKE2B b911b2ab2b35f5eccb58b32e575a775fe43cac1576831bb4e47d10c666a1e7040d8c01c865ee63ef1c3ff3c1a1feb2059dc25c71924b61995302dad21c32c868 SHA512 953f41b44468918aa96af42ecf3de8e3dd0d7721ed7c6283d8a6d44941caf70d9ef63d7d59ee1d94081fdc91a915ba8770bc335f8af5d60b24cd1f6c04698f6f
 DIST podofo-0.9.6_p20190928.tar.xz 747532 BLAKE2B 39d051e6adca85bf0f124e5d48e1ff88dc951d7c1b38bc76dc7e3640ea9c3f8a59c6ba9a9105a263234e94932e450bec12dde455850dbf96cd7eec3e69a1a28d SHA512 b9d46fb02eeba61190a0efd17b507bba62d7246af6fff3c3514c9970e99e085f9aad92baa05cc6cf0a8c3c2843554099c904bff10be54dbb4d4cb7de460fc3cc
+DIST podofo-0.9.7.tar.gz 1005247 BLAKE2B d8f123008d272c1c39f60438d7cd6112cdd851488775e7e0fcb3fd9c4669fd64867fa293ef18b3189eac01f84a8a6b3c536171528f2b6097a5fe181c98501a71 SHA512 0e699739c2fb7d4d02ffca371504bb19f3a8a97ddcbfc06f8d9636db9e73064b4f633f7f09bce92140bb2174610ad68c1e5f8460d474d176ab803ed28295251b
 EBUILD podofo-0.9.6_p20190928-r100.ebuild 4628 BLAKE2B c56190961516725347024e985203929e09dd46addd0f3fb74ca42402231388e053a3d0b723aed6b3805e11586f03c05a7462931890d6eaf889c9f3c2c0ea5779 SHA512 f7568d43e7afcfe1e59f34ff91a342995cccdeec13073b09b326d2e1b2f9d14ff91c08e64e9fa37f9bcca69d205d2afccd428dd3915da4022bd1f57047474741
+EBUILD podofo-0.9.7.ebuild 3068 BLAKE2B 2e840d40db7a62fba8106e85f569f4ae033353fb0110f94fb9821eb65b23b116e1e2fba23dbeceb5140547a8b99a81da216dca09e02996940767a3498742cca8 SHA512 a2cec4effac6c690868d33e51b589bb284adfb0cae20630dda1b559b3ae4974144d388959c5d6978b23fb03249a99ca1368af0fe065f8ac59cbc881b1c4d2586
 MISC metadata.xml 510 BLAKE2B a8b777ebbbbadbb251c30aa0c662509559849d74c326e38d8ef965aa32f4cdd613a8d2251771d43fd217dbedd195dc11c8167e09bb2aa7ecf064a7dc2e13abe9 SHA512 d47dfa7ef44f0f0758662550afafd90e2566ad1ee418173aa27ead580ec0d328e0facd812e68b9701a2a6d7e6dcb9d62576c62c9a441c2c7f2fd664cd8f92bbc
diff --git a/app-text/podofo/podofo-0.9.7.ebuild b/app-text/podofo/podofo-0.9.7.ebuild
new file mode 100644
index 000000000000..5510e90dad7e
--- /dev/null
+++ b/app-text/podofo/podofo-0.9.7.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..4} )
+
+inherit cmake flag-o-matic lua-single toolchain-funcs
+
+DESCRIPTION="PoDoFo is a C++ library to work with the PDF file format"
+HOMEPAGE="https://sourceforge.net/projects/podofo/"
+SRC_URI="https://cfhcable.dl.sourceforge.net/project/podofo/podofo/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="+boost idn debug test +tools"
+RESTRICT="test"
+REQUIRED_USE="${LUA_REQUIRED_USE}
+	test? ( tools )"
+
+RDEPEND="${LUA_DEPS}
+	idn? ( net-dns/libidn:= )
+	dev-libs/openssl:0=
+	media-libs/fontconfig:=
+	media-libs/freetype:2=
+	virtual/jpeg:0=
+	media-libs/libpng:0=
+	media-libs/tiff:0=
+	sys-libs/zlib:="
+DEPEND="${RDEPEND}
+	test? ( dev-util/cppunit )
+"
+
+BDEPEND="virtual/pkgconfig
+	boost? ( dev-util/boost-build )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.9.6_p20190928-cmake_lua_version.patch
+)
+
+DOCS="AUTHORS ChangeLog TODO"
+
+src_prepare() {
+	cmake_src_prepare
+	local x sed_args
+
+	# bug 620934 - Disable linking with cppunit when possible, since it
+	# triggers errors with some older compilers.
+	use test || sed -e 's:^FIND_PACKAGE(CppUnit):#\0:' -i CMakeLists.txt || die
+
+	# bug 556962
+	sed -i -e 's|Decrypt( pEncryptedBuffer, nOutputLen, pDecryptedBuffer, m_lLen );|Decrypt( pEncryptedBuffer, (pdf_long)nOutputLen, pDecryptedBuffer, (pdf_long\&)m_lLen );|' \
+		test/unit/EncryptTest.cpp || die
+
+	sed -i \
+		-e "s:LIBDIRNAME \"lib\":LIBDIRNAME \"$(get_libdir)\":" \
+		-e "s:LIBIDN_FOUND:HAVE_LIBIDN:g" \
+		CMakeLists.txt || die
+
+	# Use pkg-config to find headers for bug #459404.
+	sed_args=
+	for x in $($(tc-getPKG_CONFIG) --cflags freetype2) ; do
+		[[ ${x} == -I* ]] || continue
+		x=${x#-I}
+		if [[ -f ${x}/ft2build.h ]] ; then
+			sed_args+=" -e s:/usr/include/\\r\$:${x}:"
+		elif [[ -f ${x}/freetype/config/ftheader.h ]] ; then
+			sed_args+=" -e s:/usr/include/freetype2\\r\$:${x}:"
+		fi
+	done
+	[[ -n ${sed_args} ]] && \
+		{ sed -i ${sed_args} cmake/modules/FindFREETYPE.cmake || die; }
+
+	# Bug #407015: fix to compile with Lua 5.2+
+	case "${ELUA}" in
+		lua5-1|luajit)
+			;;
+		*)
+			sed -e 's: lua_open(: luaL_newstate(:' \
+				-e 's: luaL_getn(: lua_rawlen(:' -i \
+				tools/podofocolor/luaconverter.cpp \
+				tools/podofoimpose/planreader_lua.cpp || die
+			;;
+	esac
+}
+
+src_configure() {
+
+	# Bug #381359: undefined reference to `PoDoFo::PdfVariant::DelayedLoadImpl()'
+	filter-flags -fvisibility-inlines-hidden
+
+	mycmakeargs+=(
+		"-DPODOFO_BUILD_SHARED=1"
+		"-DPODOFO_HAVE_JPEG_LIB=1"
+		"-DPODOFO_HAVE_PNG_LIB=1"
+		"-DPODOFO_HAVE_TIFF_LIB=1"
+		"-DWANT_FONTCONFIG=1"
+		"-DUSE_STLPORT=0"
+		-DLUA_VERSION="$(lua_get_version)"
+		-DWANT_BOOST=$(usex boost ON OFF)
+		-DHAVE_LIBIDN=$(usex idn ON OFF)
+		-DPODOFO_HAVE_CPPUNIT=$(usex test ON OFF)
+		-DPODOFO_BUILD_LIB_ONLY=$(usex tools OFF ON)
+		)
+
+	cmake_src_configure
+	mkdir -p "${S}/test/TokenizerTest/objects" || die
+}
+
+src_test() {
+	cd "${BUILD_DIR}"/test/unit || die
+	./podofo-test --selftest || die "self test failed"
+}
diff --git a/app-text/poppler-data/Manifest b/app-text/poppler-data/Manifest
index 641895d027ed..f2485cb384ba 100644
--- a/app-text/poppler-data/Manifest
+++ b/app-text/poppler-data/Manifest
@@ -1,5 +1,5 @@
 DIST poppler-data-0.4.10.tar.gz 4497684 BLAKE2B 2c262223a971fe49b7f9848e424ba78a6d96e193d18b0bbad4eb343deea7808a6d9e234ebbb252c5becd40840221ba86d2b87ad36595fe982546b32ea6201f0b SHA512 4bebad0791b55b5e2805cf864393d1f777a7996c962398fc178211d2abbf110f75ef2fa6699e275b126aca0540eabb89542a672e0587248db9414e357a32bfd3
 DIST poppler-data-0.4.11.tar.gz 4497282 BLAKE2B 01f0f9f3d933f45683a702c4d538d8fc59874512290f199b601c16f98f9b596ff249fbc992574d046931cc80f3685f94733248450d3a54f2f961951cdeda7c39 SHA512 a5b7ace28d1677e12f7500ab6345b277dc22cd48ace8d472c083933416879edf4da4efe8217b0e11f75a3387ed98d832fe50567884095b6c0e09ebd8802b0f32
 EBUILD poppler-data-0.4.10.ebuild 746 BLAKE2B 1d2428e3dd1f7c1e1e1dac88b44a42b3a2f13528300db22b29677e10d628fdfdf537f4f274e9e02429a20da2d9d9a5a432dc618bd3a60df6112aa00c541f0a4e SHA512 dd910001f1d884c6d78d4a0fe865d8e68c462ad26ec32e9e09294f9a36cc1261443f41f78deea135cbe7c980c2a9e2851b3cfc60b96ce4bf96409012314c7bd4
-EBUILD poppler-data-0.4.11.ebuild 737 BLAKE2B 6a874c1e95c6b33ab923819fecc059001edb4ab56c21311a8e3173f3362163d1f540b94e0a2245e176263cd73679d5dab29ed1bd11ddff9474b51733cf49d583 SHA512 b48307a18005d43c0baa158cd457d8017a7e1b703c775b7922881ecee7c3152a0154920fa937c29437fc510bb2730c63877dd6114df55b7012c3dde0fa1da7ff
+EBUILD poppler-data-0.4.11.ebuild 729 BLAKE2B c585ecff6843f970ac86a90256dca660a8f875466212b2124047b1772d22c3d0e9cb0c53cea9f61ebaa1cf7151741abd4c494af4d1e1643514455ccc3065b9d1 SHA512 9f72ebfbcf4dcc80ec1263448f536ca0004e25c14a820f7be28491b60de51ab87ca154e9914e37ba023d981c1e14c01b3e245e6820e4f90128e854a586b2e51d
 MISC metadata.xml 256 BLAKE2B 16ea76357721c3ab7d672ade29d27338ddf9da983571e4ca4efe2520c741fc71315d9609b711850b00c19ed4eea848dea0d5b3955eecb401c42c4db257c300bf SHA512 2748afab7ffea0b3ddadf72dc720f7d83a1d76453fa569091abffe834ec187144a47f9365ccb4a97f676dbcfd799a6be92671f283b179fe4589d95486d7fd24d
diff --git a/app-text/poppler-data/poppler-data-0.4.11.ebuild b/app-text/poppler-data/poppler-data-0.4.11.ebuild
index bbc24bd33be5..866cf996cfef 100644
--- a/app-text/poppler-data/poppler-data-0.4.11.ebuild
+++ b/app-text/poppler-data/poppler-data-0.4.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -9,7 +9,7 @@ SRC_URI="https://poppler.freedesktop.org/${P}.tar.gz"
 
 LICENSE="BSD GPL-2 MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 src_install() {
 	emake prefix="${EPREFIX}"/usr DESTDIR="${D}" install
diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index 118e94a0b0bc..475d37b3a19c 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -1,12 +1,11 @@
 AUX poppler-0.57.0-disable-internal-jpx.patch 892 BLAKE2B 811ce3bbeb3b3c0720902a2a57463d352d102a2d6faef209723558eb93d638f35108f83674e29314632ebcf5fae521bcd8893eb1f77b931c7348b9d7446dae76 SHA512 aca1738fa33fcb5efcc8b0f5062abca2f32d329d3e2e1609386f15cce33d2e7aeae3e36b41dae292d3dceea7bde62210d2527b2552047d33d57ea4f44dabc1ee
 AUX poppler-20.12.1-qt5-deps.patch 1626 BLAKE2B 7dfd227e1e8d4449e0cc72ca297afa78b58e97dea19fe7f72bc65a599890db586dcb46780b3c737e2c2723749cf53078fddf565aa58bec0cbf553993d18bb6ce SHA512 286ddcae2bb639107f3d3ffab9317b10c437014d466efc8e39407d6350acc77900ee60888863b9dfa95c546c39b5b7f1a97a8936a4ac3ed7c6b2a30666eee537
 AUX poppler-21.09.0-respect-cflags.patch 5473 BLAKE2B 78f12a2f5f582c369ac72b5203cdc5391dfbe8f48ab00e2684f58386147d2e35b33a93882535227031d52ae298dcd14f4e584b8ec248f83c463ce3169479822f SHA512 f18ac99639f8278c8eef622a98f42ca39e9612ddc1d701d8684e170fa7c300b9f73b80eb35c68a18cf413a9beabeb8610901fa3fabf92d0c6521f4020c971956
-AUX poppler-21.12.0-include-csetjmp.patch 737 BLAKE2B 69215658a6d5f075c0d9b0aea3bd9539e1a415225552b6328c635a071f417a5cf7f29edc44e790a96e69b5aad4efe1e04534ff78db211ee470f5d6ed3bf02a00 SHA512 ffa0521d9265431be3e98e088f66c6156ceafa9dc9c118a6d78315832fe04b58ea8b0a44a49038cc2c4a0fe3d640b1109c6de6ea4eae92cc2f7ecd28c7a6f777
-DIST poppler-21.11.0.tar.xz 1783592 BLAKE2B b0448ae0456ffda29c18732e6dd94cb285af67cf4adbaded05a4abe2e465cb63a17e0041240c82c83c89b313ec8c7bf9d68fc8d727b7d41c1ee70722529ce45d SHA512 354d6372093e7ecedf95c43e8d203e9b2781ff7ecd81cd3920cb8c72a37463b47423ce7ab3c8233c0f031f2c024ac1ba5c8d442c80e6643722192fb9638e5d3a
-DIST poppler-21.12.0.tar.xz 1798780 BLAKE2B 403f928dfe8f94048307eb120dcd85c9821a12e100b7030831864fbc630244e79923e48061352e49e1a6daf5eda7f05b32254735ef5037db108ac4e3fedd877e SHA512 86856e33479a357deb671b4fdd6336a7581b5ac14b9715ffc2482d8dba7a455aab07317b1fc0c33f479f11de38012958fffa619105c255de51929e61a6b63e33
 DIST poppler-22.01.0.tar.xz 1801984 BLAKE2B f238636a0b1f07e0b70de99d8f0b3afcb7e2424c9dee4a044edaa5bd34753061e58a7c530792264ffb5a520cb4dc7dc52de17573fda350de97bef6346048fb76 SHA512 c6ea908a9188483ca588ac81d3e92dd15a405f90d36cc7059e618c8a7e3e9faeda82717aba5df34adb4a0a94e2fbecd472acec44972272349cc8d5a57b7405d1
-EBUILD poppler-21.11.0.ebuild 3330 BLAKE2B 98babbca9cf633b92235569e7cd3d790fbbfb714be2ddce49e7f238d2eb234e4ae37a280e3a7d753f3e0b22a7480038dd87940f1a7bd6b3d731eafa5a1c2c756 SHA512 f6672b5a613f3933a83b702a1ace108eb62f644e5ce38b53e59ceadf602f815ae5c69bd536325d0cb668fc73fed7c767da48b6312caf3be03bef886d6db97f2a
-EBUILD poppler-21.12.0.ebuild 3380 BLAKE2B a01131242d38a8f53806365578205f354127126c6eb334b9357325e347eb810558b6bf0baf6ab0af8f6584e1f27d966878a236d43e285ba1f65a6a43e62c7173 SHA512 679d8c829a42558702b591030edb5f766058ae697e136d73569f36d98bf7f2531b3313c734b06a9fa8dd0524bb6804818da83ee55e9b1442d45a11dcb3188e62
-EBUILD poppler-22.01.0.ebuild 3338 BLAKE2B 648c9dd4935f5f91f148b697ad846d23ecc18ea0a7335107b3b5c889cc8554623c3ec640f964df85fc8708c0ac1092206e9918f99f81bec6de6e9fc3f969d7dc SHA512 560fea78245663a6e92c904b67b7c9da49cdeb67ed7c80474ae4e09c304675857c49ab32d9baae0fac53a5d2b8587da5c620c7b0c7fa80610a87639947d25462
-EBUILD poppler-9999.ebuild 3338 BLAKE2B 648c9dd4935f5f91f148b697ad846d23ecc18ea0a7335107b3b5c889cc8554623c3ec640f964df85fc8708c0ac1092206e9918f99f81bec6de6e9fc3f969d7dc SHA512 560fea78245663a6e92c904b67b7c9da49cdeb67ed7c80474ae4e09c304675857c49ab32d9baae0fac53a5d2b8587da5c620c7b0c7fa80610a87639947d25462
+DIST poppler-22.02.0.tar.xz 1807024 BLAKE2B 97d27fb6d31535b5fce0aa518d00ab9da218a8d49dcb45dbaa5ab3cc669d8ffc75e07bd617b5fe9842c8b7b8ac843e9aa07ee0d31504f1e2b6c4f89b2177add6 SHA512 61867241d6d076dae554d654a8ad3b1a073079bad31f45170516b886fabb4c238ff2d49705924da219e128eb4052ac6337121967347600e54f61790dd0eed487
+DIST poppler-22.03.0.tar.xz 1809940 BLAKE2B 0307e9225645b289105fe5a55a712ab821a0961a5dd53467b7db41432d74ec763e9ab0494f6b4d1bed94f7b0c2a74cb849878ad5f0c877fa4df0888f97a10ef6 SHA512 f87bbff4f394f192095da0c00bdf8b5c70b7eb864941225aad2025e91283c3c42a0016a772e7e9ea73a86746251928fc64500f923e8fd841adae1c6e67d72569
+EBUILD poppler-22.01.0.ebuild 3330 BLAKE2B 1c7ec6c2c9c73b4aa986b64c759ae00b84861e5ac6fa3baca3cfa25a2f415876aedd7128dc165aa884e75be5a80049ba4d140a77c336ee2ff771a315b6d2ff99 SHA512 6ca473ecc0db537dff052c2ac0c94e4c0f6bd71ca5d146f0497d7d4c7eb31a93881fdb078f82ac6deaa1d5f3776ec28649464f72aa8a39b4d238ecd932db2095
+EBUILD poppler-22.02.0.ebuild 3338 BLAKE2B 8b05c54797c29bb7315eb938b0b1a314778c8b3c1c96399dd1366d452b90a8c09887ba6e08e0b868b1286b1de6d1bafe0c6a3fba69436e21c4dc212ead409944 SHA512 af04053679a47d9b27c7670a9892b040c0addf151ab064469bbde184797e9f861a475b2204afe570c776f47b5274af20326427ae6e859e5f524c9fa32be3b668
+EBUILD poppler-22.03.0.ebuild 3338 BLAKE2B 28fdcef00e520a468f0bed2c6a82e2aafcd78943ae1e7d6c2e03d1a3c3be2e26412ef8f6f19e99d3add9b51de90f71ccc449e65cf5ed5277a35ae3f7ad4a1801 SHA512 1a2a060803939614762adcc8c2ed956e559c0a72cdb854e8b71df82307e0424e4b57962ab519f59aec5691429840b477521c502fe942bf485f94d50eb3e43918
+EBUILD poppler-9999.ebuild 3338 BLAKE2B 28fdcef00e520a468f0bed2c6a82e2aafcd78943ae1e7d6c2e03d1a3c3be2e26412ef8f6f19e99d3add9b51de90f71ccc449e65cf5ed5277a35ae3f7ad4a1801 SHA512 1a2a060803939614762adcc8c2ed956e559c0a72cdb854e8b71df82307e0424e4b57962ab519f59aec5691429840b477521c502fe942bf485f94d50eb3e43918
 MISC metadata.xml 1078 BLAKE2B c5ce2245efedc75eb39a6c649d27698da0ac07b87da3240aeb9fea1435d48c3282a8a3bb9f002c78b79de2a518cb73f3eef563c05f41528bb55ffeca84409e13 SHA512 22c83f7f6a7632fc4fe94223be9e5edac085099bf5c0f6621b0179b16e35b98b0027e467e76c0ca365008d765258e05faf48dbc4b1e8d5eb507f348a533f88f6
diff --git a/app-text/poppler/files/poppler-21.12.0-include-csetjmp.patch b/app-text/poppler/files/poppler-21.12.0-include-csetjmp.patch
deleted file mode 100644
index 0f0029269673..000000000000
--- a/app-text/poppler/files/poppler-21.12.0-include-csetjmp.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-https://bugs.gentoo.org/828578
-https://gitlab.freedesktop.org/poppler/poppler/-/merge_requests/1016
-
-From 3ea6bca90d87d3f91556205c4e58ca425c6ac437 Mon Sep 17 00:00:00 2001
-From: Marco Genasci <fedeliallalinea@gmail.com>
-Date: Sun, 12 Dec 2021 10:23:37 +0100
-Subject: [PATCH] Include setjmp.h when WITH_JPEG=yes and WITH_PNG=no
-
----
- poppler/ImageEmbeddingUtils.cc | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/poppler/ImageEmbeddingUtils.cc b/poppler/ImageEmbeddingUtils.cc
-index 5c50f1269..c26b9eb2a 100644
---- a/poppler/ImageEmbeddingUtils.cc
-+++ b/poppler/ImageEmbeddingUtils.cc
-@@ -16,6 +16,7 @@
- extern "C" {
- #    include <jpeglib.h>
- }
-+#    include <csetjmp>
- #endif
- #ifdef ENABLE_LIBPNG
- #    include <png.h>
--- 
-GitLab
-
diff --git a/app-text/poppler/poppler-21.11.0.ebuild b/app-text/poppler/poppler-21.11.0.ebuild
deleted file mode 100644
index 705d9b333728..000000000000
--- a/app-text/poppler/poppler-21.11.0.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 2005-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake toolchain-funcs xdg-utils
-
-if [[ ${PV} == *9999* ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://anongit.freedesktop.org/git/poppler/poppler.git"
-	SLOT="0/9999"
-else
-	SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-	SLOT="0/115"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
-fi
-
-DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
-HOMEPAGE="https://poppler.freedesktop.org/"
-
-LICENSE="GPL-2"
-IUSE="boost cairo cjk curl +cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt5 tiff +utils"
-
-# No test data provided
-RESTRICT="test"
-
-DEPEND="
-	media-libs/fontconfig
-	media-libs/freetype
-	sys-libs/zlib
-	cairo? (
-		dev-libs/glib:2
-		x11-libs/cairo
-		introspection? ( dev-libs/gobject-introspection:= )
-	)
-	curl? ( net-misc/curl )
-	jpeg? ( virtual/jpeg:0 )
-	jpeg2k? ( >=media-libs/openjpeg-2.3.0-r1:2= )
-	lcms? ( media-libs/lcms:2 )
-	nss? ( >=dev-libs/nss-3.19:0 )
-	png? ( media-libs/libpng:0= )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtxml:5
-	)
-	tiff? ( media-libs/tiff:0 )
-"
-RDEPEND="${DEPEND}
-	cjk? ( app-text/poppler-data )
-"
-DEPEND+="
-	boost? ( dev-libs/boost )
-"
-BDEPEND="
-	dev-util/glib-utils
-	virtual/pkgconfig
-"
-
-DOCS=( AUTHORS NEWS README.md README-XPDF )
-
-PATCHES=(
-	"${FILESDIR}/${PN}-20.12.1-qt5-deps.patch"
-	"${FILESDIR}/${PN}-21.09.0-respect-cflags.patch"
-	"${FILESDIR}/${PN}-0.57.0-disable-internal-jpx.patch"
-)
-
-src_prepare() {
-	cmake_src_prepare
-
-	# Clang doesn't grok this flag, the configure nicely tests that, but
-	# cmake just uses it, so remove it if we use clang
-	if tc-is-clang ; then
-		sed -e 's/-fno-check-new//' -i cmake/modules/PopplerMacros.cmake || die
-	fi
-
-	if ! grep -Fq 'cmake_policy(SET CMP0002 OLD)' CMakeLists.txt ; then
-		sed -e '/^cmake_minimum_required/acmake_policy(SET CMP0002 OLD)' \
-			-i CMakeLists.txt || die
-	else
-		einfo "policy(SET CMP0002 OLD) - workaround can be removed"
-	fi
-}
-
-src_configure() {
-	xdg_environment_reset
-	local mycmakeargs=(
-		-DBUILD_GTK_TESTS=OFF
-		-DBUILD_QT5_TESTS=OFF
-		-DBUILD_CPP_TESTS=OFF
-		-DBUILD_MANUAL_TESTS=OFF
-		-DRUN_GPERF_IF_PRESENT=OFF
-		-DENABLE_BOOST="$(usex boost)"
-		-DENABLE_ZLIB=ON
-		-DENABLE_ZLIB_UNCOMPRESS=OFF
-		-DENABLE_UNSTABLE_API_ABI_HEADERS=ON
-		-DUSE_FLOAT=OFF
-		-DWITH_Cairo=$(usex cairo)
-		-DENABLE_LIBCURL=$(usex curl)
-		-DENABLE_CPP=$(usex cxx)
-		-DWITH_JPEG=$(usex jpeg)
-		-DENABLE_DCTDECODER=$(usex jpeg libjpeg none)
-		-DENABLE_LIBOPENJPEG=$(usex jpeg2k openjpeg2 none)
-		-DENABLE_CMS=$(usex lcms lcms2 none)
-		-DWITH_NSS3=$(usex nss)
-		-DWITH_PNG=$(usex png)
-		$(cmake_use_find_package qt5 Qt5Core)
-		-DWITH_TIFF=$(usex tiff)
-		-DENABLE_UTILS=$(usex utils)
-		-DENABLE_QT6=OFF
-	)
-	use cairo && mycmakeargs+=( -DWITH_GObjectIntrospection=$(usex introspection) )
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	# live version doesn't provide html documentation
-	if use cairo && use doc && [[ ${PV} != *9999* ]]; then
-		# For now install gtk-doc there
-		insinto /usr/share/gtk-doc/html/poppler
-		doins -r "${S}"/glib/reference/html/*
-	fi
-}
diff --git a/app-text/poppler/poppler-21.12.0.ebuild b/app-text/poppler/poppler-21.12.0.ebuild
deleted file mode 100644
index 4b6f8bce95bf..000000000000
--- a/app-text/poppler/poppler-21.12.0.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 2005-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake toolchain-funcs xdg-utils
-
-if [[ ${PV} == *9999* ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://anongit.freedesktop.org/git/poppler/poppler.git"
-	SLOT="0/9999"
-else
-	SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-	SLOT="0/116"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
-fi
-
-DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
-HOMEPAGE="https://poppler.freedesktop.org/"
-
-LICENSE="GPL-2"
-IUSE="boost cairo cjk curl +cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt5 tiff +utils"
-
-# No test data provided
-RESTRICT="test"
-
-DEPEND="
-	media-libs/fontconfig
-	media-libs/freetype
-	sys-libs/zlib
-	cairo? (
-		dev-libs/glib:2
-		x11-libs/cairo
-		introspection? ( dev-libs/gobject-introspection:= )
-	)
-	curl? ( net-misc/curl )
-	jpeg? ( virtual/jpeg:0 )
-	jpeg2k? ( >=media-libs/openjpeg-2.3.0-r1:2= )
-	lcms? ( media-libs/lcms:2 )
-	nss? ( >=dev-libs/nss-3.19:0 )
-	png? ( media-libs/libpng:0= )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtxml:5
-	)
-	tiff? ( media-libs/tiff:0 )
-"
-RDEPEND="${DEPEND}
-	cjk? ( app-text/poppler-data )
-"
-DEPEND+="
-	boost? ( dev-libs/boost )
-"
-BDEPEND="
-	dev-util/glib-utils
-	virtual/pkgconfig
-"
-
-DOCS=( AUTHORS NEWS README.md README-XPDF )
-
-PATCHES=(
-	"${FILESDIR}/${PN}-20.12.1-qt5-deps.patch"
-	"${FILESDIR}/${PN}-21.09.0-respect-cflags.patch"
-	"${FILESDIR}/${PN}-0.57.0-disable-internal-jpx.patch"
-	"${FILESDIR}/${P}-include-csetjmp.patch"
-)
-
-src_prepare() {
-	cmake_src_prepare
-
-	# Clang doesn't grok this flag, the configure nicely tests that, but
-	# cmake just uses it, so remove it if we use clang
-	if tc-is-clang ; then
-		sed -e 's/-fno-check-new//' -i cmake/modules/PopplerMacros.cmake || die
-	fi
-
-	if ! grep -Fq 'cmake_policy(SET CMP0002 OLD)' CMakeLists.txt ; then
-		sed -e '/^cmake_minimum_required/acmake_policy(SET CMP0002 OLD)' \
-			-i CMakeLists.txt || die
-	else
-		einfo "policy(SET CMP0002 OLD) - workaround can be removed"
-	fi
-}
-
-src_configure() {
-	xdg_environment_reset
-	local mycmakeargs=(
-		-DBUILD_GTK_TESTS=OFF
-		-DBUILD_QT5_TESTS=OFF
-		-DBUILD_CPP_TESTS=OFF
-		-DBUILD_MANUAL_TESTS=OFF
-		-DRUN_GPERF_IF_PRESENT=OFF
-		-DENABLE_BOOST="$(usex boost)"
-		-DENABLE_ZLIB=ON
-		-DENABLE_ZLIB_UNCOMPRESS=OFF
-		-DENABLE_UNSTABLE_API_ABI_HEADERS=ON
-		-DUSE_FLOAT=OFF
-		-DWITH_Cairo=$(usex cairo)
-		-DENABLE_LIBCURL=$(usex curl)
-		-DENABLE_CPP=$(usex cxx)
-		-DWITH_JPEG=$(usex jpeg)
-		-DENABLE_DCTDECODER=$(usex jpeg libjpeg none)
-		-DENABLE_LIBOPENJPEG=$(usex jpeg2k openjpeg2 none)
-		-DENABLE_CMS=$(usex lcms lcms2 none)
-		-DWITH_NSS3=$(usex nss)
-		-DWITH_PNG=$(usex png)
-		$(cmake_use_find_package qt5 Qt5Core)
-		-DWITH_TIFF=$(usex tiff)
-		-DENABLE_UTILS=$(usex utils)
-		-DENABLE_QT6=OFF
-	)
-	use cairo && mycmakeargs+=( -DWITH_GObjectIntrospection=$(usex introspection) )
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	# live version doesn't provide html documentation
-	if use cairo && use doc && [[ ${PV} != *9999* ]]; then
-		# For now install gtk-doc there
-		insinto /usr/share/gtk-doc/html/poppler
-		doins -r "${S}"/glib/reference/html/*
-	fi
-}
diff --git a/app-text/poppler/poppler-22.01.0.ebuild b/app-text/poppler/poppler-22.01.0.ebuild
index bd261ab8e292..47850488dd64 100644
--- a/app-text/poppler/poppler-22.01.0.ebuild
+++ b/app-text/poppler/poppler-22.01.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 ~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 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	SLOT="0/117"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
 fi
 
diff --git a/app-text/poppler/poppler-22.02.0.ebuild b/app-text/poppler/poppler-22.02.0.ebuild
new file mode 100644
index 000000000000..35b2f4f41bef
--- /dev/null
+++ b/app-text/poppler/poppler-22.02.0.ebuild
@@ -0,0 +1,126 @@
+# Copyright 2005-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake toolchain-funcs xdg-utils
+
+if [[ ${PV} == *9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://anongit.freedesktop.org/git/poppler/poppler.git"
+	SLOT="0/9999"
+else
+	SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	SLOT="0/118"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
+fi
+
+DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
+HOMEPAGE="https://poppler.freedesktop.org/"
+
+LICENSE="GPL-2"
+IUSE="boost cairo cjk curl +cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt5 tiff +utils"
+
+# No test data provided
+RESTRICT="test"
+
+DEPEND="
+	media-libs/fontconfig
+	media-libs/freetype
+	sys-libs/zlib
+	cairo? (
+		dev-libs/glib:2
+		x11-libs/cairo
+		introspection? ( dev-libs/gobject-introspection:= )
+	)
+	curl? ( net-misc/curl )
+	jpeg? ( virtual/jpeg:0 )
+	jpeg2k? ( >=media-libs/openjpeg-2.3.0-r1:2= )
+	lcms? ( media-libs/lcms:2 )
+	nss? ( >=dev-libs/nss-3.19:0 )
+	png? ( media-libs/libpng:0= )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtxml:5
+	)
+	tiff? ( media-libs/tiff:0 )
+"
+RDEPEND="${DEPEND}
+	cjk? ( app-text/poppler-data )
+"
+DEPEND+="
+	boost? ( dev-libs/boost )
+"
+BDEPEND="
+	dev-util/glib-utils
+	virtual/pkgconfig
+"
+
+DOCS=( AUTHORS NEWS README.md README-XPDF )
+
+PATCHES=(
+	"${FILESDIR}/${PN}-20.12.1-qt5-deps.patch"
+	"${FILESDIR}/${PN}-21.09.0-respect-cflags.patch"
+	"${FILESDIR}/${PN}-0.57.0-disable-internal-jpx.patch"
+)
+
+src_prepare() {
+	cmake_src_prepare
+
+	# Clang doesn't grok this flag, the configure nicely tests that, but
+	# cmake just uses it, so remove it if we use clang
+	if tc-is-clang ; then
+		sed -e 's/-fno-check-new//' -i cmake/modules/PopplerMacros.cmake || die
+	fi
+
+	if ! grep -Fq 'cmake_policy(SET CMP0002 OLD)' CMakeLists.txt ; then
+		sed -e '/^cmake_minimum_required/acmake_policy(SET CMP0002 OLD)' \
+			-i CMakeLists.txt || die
+	else
+		einfo "policy(SET CMP0002 OLD) - workaround can be removed"
+	fi
+}
+
+src_configure() {
+	xdg_environment_reset
+	local mycmakeargs=(
+		-DBUILD_GTK_TESTS=OFF
+		-DBUILD_QT5_TESTS=OFF
+		-DBUILD_CPP_TESTS=OFF
+		-DBUILD_MANUAL_TESTS=OFF
+		-DRUN_GPERF_IF_PRESENT=OFF
+		-DENABLE_BOOST="$(usex boost)"
+		-DENABLE_ZLIB=ON
+		-DENABLE_ZLIB_UNCOMPRESS=OFF
+		-DENABLE_UNSTABLE_API_ABI_HEADERS=ON
+		-DUSE_FLOAT=OFF
+		-DWITH_Cairo=$(usex cairo)
+		-DENABLE_LIBCURL=$(usex curl)
+		-DENABLE_CPP=$(usex cxx)
+		-DWITH_JPEG=$(usex jpeg)
+		-DENABLE_DCTDECODER=$(usex jpeg libjpeg none)
+		-DENABLE_LIBOPENJPEG=$(usex jpeg2k openjpeg2 none)
+		-DENABLE_CMS=$(usex lcms lcms2 none)
+		-DWITH_NSS3=$(usex nss)
+		-DWITH_PNG=$(usex png)
+		$(cmake_use_find_package qt5 Qt5Core)
+		-DWITH_TIFF=$(usex tiff)
+		-DENABLE_UTILS=$(usex utils)
+		-DENABLE_QT6=OFF
+	)
+	use cairo && mycmakeargs+=( -DWITH_GObjectIntrospection=$(usex introspection) )
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	# live version doesn't provide html documentation
+	if use cairo && use doc && [[ ${PV} != *9999* ]]; then
+		# For now install gtk-doc there
+		insinto /usr/share/gtk-doc/html/poppler
+		doins -r "${S}"/glib/reference/html/*
+	fi
+}
diff --git a/app-text/poppler/poppler-22.03.0.ebuild b/app-text/poppler/poppler-22.03.0.ebuild
new file mode 100644
index 000000000000..a1d70422f692
--- /dev/null
+++ b/app-text/poppler/poppler-22.03.0.ebuild
@@ -0,0 +1,126 @@
+# Copyright 2005-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake toolchain-funcs xdg-utils
+
+if [[ ${PV} == *9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://anongit.freedesktop.org/git/poppler/poppler.git"
+	SLOT="0/9999"
+else
+	SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	SLOT="0/119"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
+fi
+
+DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
+HOMEPAGE="https://poppler.freedesktop.org/"
+
+LICENSE="GPL-2"
+IUSE="boost cairo cjk curl +cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt5 tiff +utils"
+
+# No test data provided
+RESTRICT="test"
+
+DEPEND="
+	media-libs/fontconfig
+	media-libs/freetype
+	sys-libs/zlib
+	cairo? (
+		dev-libs/glib:2
+		x11-libs/cairo
+		introspection? ( dev-libs/gobject-introspection:= )
+	)
+	curl? ( net-misc/curl )
+	jpeg? ( virtual/jpeg:0 )
+	jpeg2k? ( >=media-libs/openjpeg-2.3.0-r1:2= )
+	lcms? ( media-libs/lcms:2 )
+	nss? ( >=dev-libs/nss-3.19:0 )
+	png? ( media-libs/libpng:0= )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtxml:5
+	)
+	tiff? ( media-libs/tiff:0 )
+"
+RDEPEND="${DEPEND}
+	cjk? ( app-text/poppler-data )
+"
+DEPEND+="
+	boost? ( dev-libs/boost )
+"
+BDEPEND="
+	dev-util/glib-utils
+	virtual/pkgconfig
+"
+
+DOCS=( AUTHORS NEWS README.md README-XPDF )
+
+PATCHES=(
+	"${FILESDIR}/${PN}-20.12.1-qt5-deps.patch"
+	"${FILESDIR}/${PN}-21.09.0-respect-cflags.patch"
+	"${FILESDIR}/${PN}-0.57.0-disable-internal-jpx.patch"
+)
+
+src_prepare() {
+	cmake_src_prepare
+
+	# Clang doesn't grok this flag, the configure nicely tests that, but
+	# cmake just uses it, so remove it if we use clang
+	if tc-is-clang ; then
+		sed -e 's/-fno-check-new//' -i cmake/modules/PopplerMacros.cmake || die
+	fi
+
+	if ! grep -Fq 'cmake_policy(SET CMP0002 OLD)' CMakeLists.txt ; then
+		sed -e '/^cmake_minimum_required/acmake_policy(SET CMP0002 OLD)' \
+			-i CMakeLists.txt || die
+	else
+		einfo "policy(SET CMP0002 OLD) - workaround can be removed"
+	fi
+}
+
+src_configure() {
+	xdg_environment_reset
+	local mycmakeargs=(
+		-DBUILD_GTK_TESTS=OFF
+		-DBUILD_QT5_TESTS=OFF
+		-DBUILD_CPP_TESTS=OFF
+		-DBUILD_MANUAL_TESTS=OFF
+		-DRUN_GPERF_IF_PRESENT=OFF
+		-DENABLE_BOOST="$(usex boost)"
+		-DENABLE_ZLIB=ON
+		-DENABLE_ZLIB_UNCOMPRESS=OFF
+		-DENABLE_UNSTABLE_API_ABI_HEADERS=ON
+		-DUSE_FLOAT=OFF
+		-DWITH_Cairo=$(usex cairo)
+		-DENABLE_LIBCURL=$(usex curl)
+		-DENABLE_CPP=$(usex cxx)
+		-DWITH_JPEG=$(usex jpeg)
+		-DENABLE_DCTDECODER=$(usex jpeg libjpeg none)
+		-DENABLE_LIBOPENJPEG=$(usex jpeg2k openjpeg2 none)
+		-DENABLE_CMS=$(usex lcms lcms2 none)
+		-DWITH_NSS3=$(usex nss)
+		-DWITH_PNG=$(usex png)
+		$(cmake_use_find_package qt5 Qt5Core)
+		-DWITH_TIFF=$(usex tiff)
+		-DENABLE_UTILS=$(usex utils)
+		-DENABLE_QT6=OFF
+	)
+	use cairo && mycmakeargs+=( -DWITH_GObjectIntrospection=$(usex introspection) )
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	# live version doesn't provide html documentation
+	if use cairo && use doc && [[ ${PV} != *9999* ]]; then
+		# For now install gtk-doc there
+		insinto /usr/share/gtk-doc/html/poppler
+		doins -r "${S}"/glib/reference/html/*
+	fi
+}
diff --git a/app-text/poppler/poppler-9999.ebuild b/app-text/poppler/poppler-9999.ebuild
index bd261ab8e292..a1d70422f692 100644
--- a/app-text/poppler/poppler-9999.ebuild
+++ b/app-text/poppler/poppler-9999.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999* ]] ; then
 else
 	SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-	SLOT="0/117"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
+	SLOT="0/119"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
 fi
 
 DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
diff --git a/app-text/pspresent/Manifest b/app-text/pspresent/Manifest
index 3268bbeb5dff..da453a50ec8a 100644
--- a/app-text/pspresent/Manifest
+++ b/app-text/pspresent/Manifest
@@ -1,3 +1,3 @@
 DIST pspresent-1.3.tar.gz 14357 BLAKE2B b15f288f2446ef0a9a00bcf454d9e55fc60a0547c534f0015695c6d2b23c5bd779acd2b423b01f6cd019cff419cdc79da8f8575804440c3f70bbeb29e5fa1b32 SHA512 cfca0b4758d03051cea95d077a45239103f6fd24dada775c3b7fb0b7f78863f6628b530a21834546546dc935596b6d93dbe45048a661fcc41152a4b97b8f21f3
-EBUILD pspresent-1.3-r1.ebuild 861 BLAKE2B b0cd66024af91d76c1862eb7bf99afb7c7eff7115e6c2394aa51d48b905db07ef3d640d0085a74f37518f96a27975154f3f55f424105d06eb55d4a75454f4073 SHA512 fe62aa87d4b7acf113991fed91a39c12a2192c1e0d2dcaffe06b3d64ae546be7dbdcb4b71f72bea89e76cf38e78dad2111163eae7b2bf6df020ca770a31899bb
+EBUILD pspresent-1.3-r1.ebuild 860 BLAKE2B e13256c827c441f64e42d289d03f52b629d9ef0e705cf6c2d9aa63375e9cf650664e033374e307d0a52ea2e9882ff1e9f5f2acde8965ffad1a28f9cb2d2229d1 SHA512 ecbd928c625cde9db7a01e79dc200994f323eddf7521b199091fabf19e9dcafc179da1616588181f57a14db2a3158113ea3a062f4b726ba42bc827c8c9a13773
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/app-text/pspresent/pspresent-1.3-r1.ebuild b/app-text/pspresent/pspresent-1.3-r1.ebuild
index 20931af5b1d4..24ed68ea8e0b 100644
--- a/app-text/pspresent/pspresent-1.3-r1.ebuild
+++ b/app-text/pspresent/pspresent-1.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -32,7 +32,7 @@ src_prepare() {
 }
 
 src_compile() {
-	emake CC=$(tc-getCC)
+	emake CC="$(tc-getCC)"
 }
 
 src_install() {
diff --git a/app-text/qpdf/Manifest b/app-text/qpdf/Manifest
index eb086fa32522..3c3adc8cba7c 100644
--- a/app-text/qpdf/Manifest
+++ b/app-text/qpdf/Manifest
@@ -2,7 +2,13 @@ DIST qpdf-10.3.2.tar.gz 18943834 BLAKE2B 5b4e320ddd663721d8201139842bb09a752347f
 DIST qpdf-10.4.0.tar.gz 18942833 BLAKE2B bc984c742bec582b5b67f7a4f4f00bb22a36e8e14d78b8e8848baed0c94489f6920070bc317928c53aca855c252c2fa5de0fba8b64ba16ba37afc2362d6ae7ba SHA512 7a17cc2b3168bb60ac05d01b585d34d94f62e44e309b86635351b2564bc2c3b7846d3a008ae0d6c068bce3b1d9c42d3a3ab40de3f85a1ec4952280cf8321a041
 DIST qpdf-10.5.0-doc.zip 6621139 BLAKE2B 9297946619df67799a450495ead8a980d8e2cfa92556e9eb6ac6f365b80d489bb11a9c5dd95e13df9a8fb013a3f254e89ae1682e8be73799ba0c872dc50075c5 SHA512 75c4eac6e828eb5f8544b4194b775e8258a769aa5e18006b9491d9658981abcd286cd082a233122805e785f283704dccaf2078cd84965ab58ebc6c80fdb4a06f
 DIST qpdf-10.5.0.tar.gz 18362586 BLAKE2B efb0a051df9824c6324ce3c4de7b6f5890a04e0a0e1e08a1086c7b7a7e3d29e01d8b6760eeb36cd5461f5ea8a9ac1e6453711df53b514c223abd3d2a41ae1a93 SHA512 758dd4fd86b79a8b08738abb36685cf4a458dcf70a480efe3207d1148a691cf06a8040c83075ace9c3bbaf372cefe78508df2e52513cc969dca76442ed43775d
+DIST qpdf-10.6.1-doc.zip 6850012 BLAKE2B 866bfd1261f392b9e666a948c4002a625952950aeeca974402ddbf1172329a8186fd6c74282002e566cf844a9af5f1a78d433717e9ec350faac5b9649f517fe9 SHA512 73180e1fc562b163a70b4c2c7342b1d7769fe070137db9d5c4e3345d4d994400a39d64c4364b2188681a915e1df4ab3f2ab6ce28e5dad1d710b254d1d1b021ab
+DIST qpdf-10.6.1.tar.gz 18518114 BLAKE2B a51e856cf6af380845b30a396d2f4a73ddc2ea6d85ce29198744b781556782d9b9e02a3b575c2f94aa1bcbb5e94818e8a4d7e19625258032b09f2e5d98f6efca SHA512 01bc02da2e389423d575053f1460638efb0af069bc63cd898b958e7105990c21670a281c834e3d72846542c74f2bda083f1cb786b4599332fec5b817934e44df
+DIST qpdf-10.6.2-doc.zip 6850957 BLAKE2B cc287e7b5dee4829a150b536ae2f092a1773fd7b1449ef7c249893cde756b82e503579149c4907f9d7f268de1f34c393d02ff96fe071641f55f8d6c33e164a39 SHA512 aecce306e334f172b9d3beb3f1a0d56eb8e5066682fc549741c1c5db2f0390b050f55fb97a9f2bd5efc48fc5c654dde0b14772c05d22ee6605ca9231f8b28bff
+DIST qpdf-10.6.2.tar.gz 18524447 BLAKE2B caf5b0c683c26ace1afbd83c454a4a787bbf49ac08d1ace8652e57866fba3f0f2e05b97ab36db59db78c5dbcb841935ddbd2fab5e57bd92c33e1eec776e83d1c SHA512 87a76c5e199b9af9744114120649f80aa271347262646c1b4a3c6008668f8a5ec215f6389a1f3202a61904f1ba74db442df59132f5090555b29ccedea60481f0
 EBUILD qpdf-10.3.2.ebuild 1251 BLAKE2B a6c12b3178f671060f2c01633ec3a6b0de3343ca9087998ca54a3364f06ae055d442595ad173057c936c55024cb90b81f170d09259f2d14b7f82aa414c7701df SHA512 84fe44d555383379f59fac01481619e3282ee334e862ba16df186f58ecf73ced5a6a1877e2ac8519ae604850910c07133b4e1cf60be0caeb29d129e81cb7e8c2
 EBUILD qpdf-10.4.0.ebuild 1247 BLAKE2B e769fc2ee7cb79b7311f193ef3cca6d2733255f24ce4c1d854ce0f7d4a2c6c49a9d7c4d351be4faff5d76ad098c3f144e54130699c6a307551af0e8196a2de4b SHA512 e5642af4915aaad62124c6df5c2bb8d16d5006c0e84166b4ee9cd37468bcc34b71d8cd556d7b84d2d2b68b036724a007581dcf1eb53f425d6245a9215bd14149
-EBUILD qpdf-10.5.0.ebuild 1895 BLAKE2B 4f655622af49383d4cea2354042215f58e25e5241e0c6f378a7c65f9739c60adb9aee8d8bc1ab5c5879e15e0ebf2c0513899504a13bf9e9594b0b46efe90310f SHA512 0a90e110633cd12a3fa5d115cb0b3cd189dfbd0ac8985433dbc57106deb296457108f64a1bcb0126deeb1bec78c1a440baee8f0a18898d7cc3bc7da3a7472bf5
+EBUILD qpdf-10.5.0.ebuild 1887 BLAKE2B 61a270a2743e608c1d5131774d30b0aec81338c8d3d427d2d5093b57bc671594361b2e10be669b03057f24e50738e1205f1fb03a2dabcef0fd858791ffb8cf2e SHA512 553425265679b4c58a2a0c612cbd3c1ceab7e6031436d1b15297ff9a32276caf3cfb4c478305b0ca0dc0982a65bf0062bb522b47274d92856a86920f4b8d8bb1
+EBUILD qpdf-10.6.1.ebuild 1895 BLAKE2B 82efd2fa7f5a6d4057c99f52b0511567292b3f9c2d2d90e922bfe3004d7789c8d0c5bd7f8d6535c692162d0792765de4da41b7aef4902bb21a9c51382d6c362c SHA512 87a392c575c22b987e5a62f9889231a986264cb5ad7df080640e88e7101b69c4fae5155f14ec0c6c6316e29d7d003e65bab7ebd9767924edb505446a4fd898b3
+EBUILD qpdf-10.6.2.ebuild 1856 BLAKE2B f491e4961857ec4f4dc54852268f12a1c057b128e620ad242eaa0f691f58ced77bb0f113761b45c2c0b44ea6448cf091a5cfb99d2383953ca7a42d70767add78 SHA512 256fe8e5016f57b9c8ebbd36aa7c9c5e9cc85cdd05cd0dfa3c23510b4e985dbcebd173078ffef5a25f2f83a46349908fed79393d848a6803aeb8cc83d2c97ca0
 MISC metadata.xml 444 BLAKE2B 1febc86d8f85aff5ec02d910550aca3bde66111c3e7364b264db3fca10020ea9bc2887dc8283217e2cb8d05ba46c176a92993e0d418528cbe590771dccc49d90 SHA512 dde5e34ef0d6c65df8a2ca8d630182413800f4c10f4b9860ed752623b6f4864dd4969c757e06b2689c8c5da3377bfcc28ec223e531432add083cd4a68211ea1c
diff --git a/app-text/qpdf/qpdf-10.5.0.ebuild b/app-text/qpdf/qpdf-10.5.0.ebuild
index d83ec13d06ca..ed57a49349ff 100644
--- a/app-text/qpdf/qpdf-10.5.0.ebuild
+++ b/app-text/qpdf/qpdf-10.5.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -13,7 +13,7 @@ SRC_URI+=" doc? ( mirror://sourceforge/qpdf/${P}-doc.zip )"
 LICENSE="|| ( Apache-2.0 Artistic-2 )"
 # subslot = libqpdf soname version
 SLOT="0/28"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris"
 IUSE="doc examples gnutls ssl test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-text/qpdf/qpdf-10.6.1.ebuild b/app-text/qpdf/qpdf-10.6.1.ebuild
new file mode 100644
index 000000000000..0b1fa0eff5ea
--- /dev/null
+++ b/app-text/qpdf/qpdf-10.6.1.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit bash-completion-r1
+
+DESCRIPTION="Command-line tool for structural, content-preserving transformation of PDF files"
+HOMEPAGE="http://qpdf.sourceforge.net/"
+SRC_URI="mirror://sourceforge/qpdf/${P}.tar.gz"
+SRC_URI+=" doc? ( mirror://sourceforge/qpdf/${P}-doc.zip )"
+
+LICENSE="|| ( Apache-2.0 Artistic-2 )"
+# subslot = libqpdf soname version
+SLOT="0/28"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris"
+IUSE="doc examples gnutls ssl test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	sys-libs/zlib
+	virtual/jpeg:0=
+	ssl? (
+		gnutls? ( net-libs/gnutls:= )
+		!gnutls? ( dev-libs/openssl:= )
+	)
+"
+DEPEND="${RDEPEND}
+	test? (
+		app-text/ghostscript-gpl[tiff(+)]
+		media-libs/tiff
+		sys-apps/diffutils
+	)
+"
+BDEPEND="dev-lang/perl
+	doc? ( app-arch/unzip )"
+
+DOCS=( ChangeLog README.md TODO )
+
+src_configure() {
+	# Keep an eye on https://qpdf.readthedocs.io/en/stable/packaging.html.
+	local myeconfargs=(
+		--disable-check-autofiles
+
+		--disable-implicit-crypto
+		--enable-crypto-native
+
+		--disable-oss-fuzz
+		$(use_enable test test-compare-images)
+	)
+
+	if use ssl ; then
+		local crypto_provider=openssl
+
+		if use gnutls ; then
+			crypto_provider=gnutls
+		fi
+
+		myeconfargs+=(
+			--with-default-crypto=${crypto_provider}
+			--enable-crypto-${crypto_provider}
+		)
+	fi
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	if use doc ; then
+		docompress -x /usr/share/doc/${PF}/singlehtml
+		dodoc -r "${WORKDIR}"/${P}-doc/.
+
+	fi
+
+	if use examples ; then
+		dobin $(find examples/build/.libs -maxdepth 1 -type f -executable || die)
+	fi
+
+	# Completions
+	dobashcomp completions/bash/qpdf
+
+	insinto /usr/share/zsh/site-functions
+	doins completions/zsh/_qpdf
+
+	find "${ED}" -type f -name '*.la' -delete || die
+}
diff --git a/app-text/qpdf/qpdf-10.6.2.ebuild b/app-text/qpdf/qpdf-10.6.2.ebuild
new file mode 100644
index 000000000000..85eaaf317a88
--- /dev/null
+++ b/app-text/qpdf/qpdf-10.6.2.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit bash-completion-r1
+
+DESCRIPTION="Command-line tool for structural, content-preserving transformation of PDF files"
+HOMEPAGE="http://qpdf.sourceforge.net/"
+SRC_URI="
+	mirror://sourceforge/qpdf/${P}.tar.gz
+	doc? ( mirror://sourceforge/qpdf/${P}-doc.zip )
+"
+
+LICENSE="|| ( Apache-2.0 Artistic-2 )"
+# subslot = libqpdf soname version
+SLOT="0/28"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris"
+IUSE="doc examples gnutls ssl test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	sys-libs/zlib
+	virtual/jpeg:0=
+	ssl? (
+		gnutls? ( net-libs/gnutls:= )
+		!gnutls? ( dev-libs/openssl:= )
+	)
+"
+DEPEND="
+	${RDEPEND}
+	test? (
+		app-text/ghostscript-gpl[tiff(+)]
+		media-libs/tiff
+		sys-apps/diffutils
+	)
+"
+BDEPEND="
+	dev-lang/perl
+	doc? ( app-arch/unzip )
+"
+
+DOCS=( ChangeLog README.md TODO )
+
+src_configure() {
+	# Keep an eye on https://qpdf.readthedocs.io/en/stable/packaging.html.
+	local myconf=(
+		--disable-check-autofiles
+
+		--disable-implicit-crypto
+		--enable-crypto-native
+
+		--disable-oss-fuzz
+		$(use_enable test test-compare-images)
+	)
+
+	if use ssl ; then
+		local crypto_provider=$(usex gnutls gnutls openssl)
+		myconf+=(
+			--with-default-crypto=${crypto_provider}
+			--enable-crypto-${crypto_provider}
+		)
+	fi
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+
+	if use doc ; then
+		docompress -x /usr/share/doc/${PF}/singlehtml
+		dodoc -r "${WORKDIR}"/${P}-doc/.
+
+	fi
+
+	if use examples ; then
+		find examples/build/.libs -maxdepth 1 -type f -executable \
+			-exec dobin {} + || die
+	fi
+
+	# Completions
+	dobashcomp completions/bash/qpdf
+
+	insinto /usr/share/zsh/site-functions
+	doins completions/zsh/_qpdf
+
+	find "${ED}" -type f -name '*.la' -delete || die
+}
diff --git a/app-text/recode/Manifest b/app-text/recode/Manifest
index b521611d09d7..09512df81836 100644
--- a/app-text/recode/Manifest
+++ b/app-text/recode/Manifest
@@ -1,5 +1,7 @@
 DIST recode-3.7.11.tar.gz 2405035 BLAKE2B 363499d265c201e9c8c4be0821efd9900e72aa21aee2e6f77ea85b5a31afb43a905eb5a88cbf1be0fd40bdc44f8707b24fe5a896cd645f5674ae69027bd167a9 SHA512 b00be87c321f5fef6aa0a7813f97b2368cbcac28f0c9e856b81e84ff878689428e1ca079a255ad44beecdcdf6efc7406517fa3116f12886bcc421b323e3810ce
+DIST recode-3.7.12.tar.gz 2399126 BLAKE2B 420ba6f96d532da4ae0e1861b512c39ad59f1f63b0e0ef061dcff95c15ff4ed82a3b7bb72f6abb29f85588476a76cb5d50151ca9e3f857c2c1c09727ccdd2890 SHA512 365602bf7b20e5362d13d1ab5269419f7f0838fb81dc01c466ea99c38eb1b979f8d707d24ca3dabbd3a0c65cde97704b570007ac60689d88bbafd33351d37d95
 DIST recode-3.7.9.tar.gz 2230259 BLAKE2B 36039ba9e62c5113231764dfa9cffa73b7ff5cd91bab622a0daf0a48a73ab8a62afd16132cec2590eed14623ce5b86ad057e8ca8454cf8185869f0780b3523e7 SHA512 277074dee63cdc7f1a1be2acca67481b8fb816bd4319fe8e882696e42d15309750b930fa9e8d6286e714132a976f0eaf87f718560d6cb86eeaa79b86f0700a6c
 EBUILD recode-3.7.11.ebuild 1316 BLAKE2B 5eb3d2a848d845b971889e8016a28b0bb1b15e6fb5afaea150637f37966c04d2c4440f9a445b4498915e80a5c6e77dddb23fdd146da8b7ca56bfc16c35061b2e SHA512 8f339cbc1f190e3963766a6ac0ca938d4ef67eed0395b30630e233b5e6274ceb3f1ed28fd1fd0614440fe0d84e45a93f389ed8411531a1e98c15e796635bf768
+EBUILD recode-3.7.12.ebuild 1316 BLAKE2B 5eb3d2a848d845b971889e8016a28b0bb1b15e6fb5afaea150637f37966c04d2c4440f9a445b4498915e80a5c6e77dddb23fdd146da8b7ca56bfc16c35061b2e SHA512 8f339cbc1f190e3963766a6ac0ca938d4ef67eed0395b30630e233b5e6274ceb3f1ed28fd1fd0614440fe0d84e45a93f389ed8411531a1e98c15e796635bf768
 EBUILD recode-3.7.9.ebuild 1307 BLAKE2B fa1ea275681fa935a04ae1bc1f460aa8f1ea150663026dbcb22fd43e6b00d5ad8ce0e877d1a197761ff2c4632059b8627be0a7d9bf3a93830cb6fba4dfde274e SHA512 3ce036702e82736f1f8e1380228b033293c26cc084c00540e0a31b682a6778c91178d29d8b95aa46595f138cac552af4fc8d08d83a6d1c713bf16e0ddf6c25f6
 MISC metadata.xml 431 BLAKE2B a2f1b90590a30ec6d561845193e29d2fde7254ece1cc31b777bc5d3ed85aae53a6abb23cd9a00f9fd07ac4e13ccabd35e2fc71816106e46c89ff0607e869419c SHA512 388038f9e95b0491e8061def1c405facb327e8feefeca08d7b425b143db03d4f7745c6b7515cc000f42992b97cc9e82aac7660e313a2159d324883792d6d85fb
diff --git a/app-text/recode/recode-3.7.12.ebuild b/app-text/recode/recode-3.7.12.ebuild
new file mode 100644
index 000000000000..84074fbac49b
--- /dev/null
+++ b/app-text/recode/recode-3.7.12.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit flag-o-matic python-any-r1 toolchain-funcs
+
+DESCRIPTION="Convert files between various character sets"
+HOMEPAGE="https://github.com/rrthomas/recode"
+SRC_URI="https://github.com/rrthomas/recode/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+# librecode soname version
+SLOT="0/3"
+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 ~x86-solaris"
+IUSE="nls test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="virtual/libiconv"
+DEPEND="
+	${RDEPEND}
+	sys-devel/flex
+"
+BDEPEND="
+	nls? ( sys-devel/gettext )
+	test? (
+		${PYTHON_DEPS}
+		$(python_gen_any_dep '
+			dev-python/cython[${PYTHON_USEDEP}]
+		')
+	)
+"
+
+python_check_deps() {
+	if use test ; then
+		has_version -b "dev-python/cython[${PYTHON_USEDEP}]" || return 1
+	fi
+}
+
+src_configure() {
+	tc-export CC LD
+
+	# on solaris -lintl is needed to compile
+	[[ ${CHOST} == *-solaris* ]] && append-libs "-lintl"
+
+	# --without-included-gettext means we always use system headers
+	# and library
+	econf \
+		$(use_enable nls) \
+		--disable-static
+}
+
+src_install() {
+	default
+
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/app-text/ronn-ng/Manifest b/app-text/ronn-ng/Manifest
index f521768abd52..92e7944f5805 100644
--- a/app-text/ronn-ng/Manifest
+++ b/app-text/ronn-ng/Manifest
@@ -1,4 +1,4 @@
 DIST ronn-ng-0.9.1.gem 69120 BLAKE2B 9da30156104ef448c458199ee33fb5369f7d97c7bbeac8072567127b964456a34226bcc15f72d6f2875f524175d31ec9652a282b369e818748790cd07f290786 SHA512 5ad7dc426d9bc77bca86fbb06775a3b19f1b8d79f5a4331d117e9fa394e7a9c3b0440b70b993672d77a24f56f5da3ebd0e41a5183f4330707b7ddb83c9108bdf
-EBUILD ronn-ng-0.9.1-r1.ebuild 1017 BLAKE2B 6f9271362d8000e7a6cb7a97de947758e9a134b3f20d6c4e7aad011d0a83efa54534465d94f02fe11fae3c8c2aec633df90a856d63de98ff770bbe491cfd8225 SHA512 724a4c53fb5e74ee5633133a33bf984f43fab69e4b369d75819d01c9a8004cfd2bdf878784ca5e46016f81035f6b22d496797b8edbcc136534ef510027f1ce94
-EBUILD ronn-ng-0.9.1.ebuild 858 BLAKE2B 2ad34b9242ba36872038d15e870ec7d9eeffd90be167aef12f4a17ab6d6c0601211d31f9e6b015cbf2a70f5401561b62cbe7100903da3167f38dbdbb47bf869d SHA512 6bb66e36b0e592481254f2e6a3a1209d515fd3f552dd4e741af8ec67f99584ccce0c9f8c38e19008b597be8ad50862311cd17762084bf763c580395982219f97
+EBUILD ronn-ng-0.9.1-r1.ebuild 1042 BLAKE2B 3dafc566661b2c26aa5bef3c7596d1bc3dfff4b5a8da62b9e86690512739010f19e24c86de1acfc0a65271dd47c98e0a9eb99422d228ea1121c045926c9f0fd8 SHA512 0f8e700b14cf6978b4c976bf0491e9e5df8ad4c0ee0f3548978ecba5fd720a7c907dc37e85e8e621802b7d716409df759089232458548bea7dcd63f539d54cd9
+EBUILD ronn-ng-0.9.1.ebuild 863 BLAKE2B fed56aad57398dcd1ef31bc4eb8306763bdbcb5ed1279769dd36b450bee1d50f33549b980d30a003b28b1e1024ef976e56996e6460125cfc6f0a4de1b5d978bd SHA512 86a2137c9f8437c7de9b79a2a6a04a29af3e4dc6fccda25639f8873533a7cbdcc547d9c66134d4d366491267729155402c7d27960144a1e44e67cc99b9d95af7
 MISC metadata.xml 342 BLAKE2B 71ab5a2d2a9e2d20165f54c1cf79f483768c3637cc87a32acf80708d79b3be9d24408a330ed23ad837848933b0a40f1165f60d7b7e08146a28088a4d9d558630 SHA512 92e6778f8a2f44a81dfdbbd6699ce2186cc48b801f5c462c99b4bc35f79806ff154d72bec2916d79dc7435c1a9b75f2bf3842b7dba2b132335afc38d00d22780
diff --git a/app-text/ronn-ng/ronn-ng-0.9.1-r1.ebuild b/app-text/ronn-ng/ronn-ng-0.9.1-r1.ebuild
index 421aa12c568d..efd0ff6ffd2c 100644
--- a/app-text/ronn-ng/ronn-ng-0.9.1-r1.ebuild
+++ b/app-text/ronn-ng/ronn-ng-0.9.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/apjanke/ronn-ng"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 IUSE=""
 
diff --git a/app-text/ronn-ng/ronn-ng-0.9.1.ebuild b/app-text/ronn-ng/ronn-ng-0.9.1.ebuild
index d25040770266..6a13d881df77 100644
--- a/app-text/ronn-ng/ronn-ng-0.9.1.ebuild
+++ b/app-text/ronn-ng/ronn-ng-0.9.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -13,7 +13,7 @@ HOMEPAGE="https://github.com/apjanke/ronn-ng"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 
 IUSE=""
 
diff --git a/app-text/ronn/Manifest b/app-text/ronn/Manifest
index f27891af8149..a03565f40826 100644
--- a/app-text/ronn/Manifest
+++ b/app-text/ronn/Manifest
@@ -1,3 +1,3 @@
 DIST ronn-0.7.3.gem 61440 BLAKE2B 3ff0a1752d7a972b7d8319cac2b1287e7d21207e22b9eb288694172eb9b30b2198e4378eb02df8418585a44d3d2c89b4695675933dc5ef5d9ba63c78e71f4e7c SHA512 885418c88d5a1073f9457ea11e29d82d3bb40ad12506589ccfab83ad447445e41282c9688aba5646082ae5ecc6a047fa9439ffae14561152fc61a136474f611c
-EBUILD ronn-0.7.3-r4.ebuild 1187 BLAKE2B ad0c49b6ebbbde948c725d99dc7218b36852898bd816427f418d603c01d13781b4a33e46ce977414eac391cb85914dd4cad025f9653978b3e93f0f9a4cf1b375 SHA512 4b4b509dccc0f0daf36a44ba909c12811fe8039395aed1355d707609918deed829f31fafd81863fcaaf9c3e1554b2546cfab5cae346f791df25f7b5837f00037
+EBUILD ronn-0.7.3-r4.ebuild 1193 BLAKE2B e8031f3e85a799532241e54d76f49a1f8e81f4763e911aea1ca79c1c7c2d7216b2242737a383b61b7c25f756c6b454bd98483cc567631e4de1147ab6ded09f0b SHA512 4ca5e8c56020944c24f046a9f3430ecde5033da98ad2d60515def28b35ba7cb94d5df1bab5b684ec86455dd7ecf402827d70f301d05b3786fadcb08329abdcd1
 MISC metadata.xml 340 BLAKE2B 5c81ed7f765b4cc320c1618ceee5d79a03016fb835ec2a536b93e0d593cd89eec3cd67d585e6d361fceff1ce9546d71af269bc0d6dfbd445a5d5fad05ffe5803 SHA512 0d1e7e71bbec8f20dcc5863f130bffc115cd48c3c41397ce83773252e4f1ecbe5ac608785c7b22210a1a9e5bc7d6c62c6afa6ad6783e4e498baee1a63e0520de
diff --git a/app-text/ronn/ronn-0.7.3-r4.ebuild b/app-text/ronn/ronn-0.7.3-r4.ebuild
index 152a4c80af6b..7822285c4841 100644
--- a/app-text/ronn/ronn-0.7.3-r4.ebuild
+++ b/app-text/ronn/ronn-0.7.3-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/rtomayko/ronn/"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 
 IUSE=""
 
diff --git a/app-text/sigil/Manifest b/app-text/sigil/Manifest
index 3265e3f00a73..3e55495ffe67 100644
--- a/app-text/sigil/Manifest
+++ b/app-text/sigil/Manifest
@@ -1,5 +1,5 @@
 DIST sigil-1.7.0.tar.gz 21315598 BLAKE2B 29f7c682925d1e1bbff082e96b747ce32df82d78406ccd984b4f8de1f01944c35aa86587ce47a18687d5fe281b8cb656085b52d3a1e72ed17862501121d9d134 SHA512 9918bb0bfbe3d068c95bb31cd84a37a0fac6dd6be9e94cb382e8c0140cdb375f47384f33c62fdff7f27aed379037a4a64e8d4a1065ae297bb389e2be78597c16
 DIST sigil-1.8.0.tar.gz 21217901 BLAKE2B 78615652859d1f61bab18b1b248d342dc6892943a2310659859ab577981c4452fbaeb567758097427453c8dfe95e42b499616a423b5c11b42238f763ac0653c8 SHA512 1a911aac996d3519f501820f8da9c810db9793063e481a6169288d402ef7e6b797308cf7ca5517162d0eb4d80f38f968627bca676b724ea5be5109c427473c95
 EBUILD sigil-1.7.0.ebuild 1854 BLAKE2B ff67b41ebc8fb7939753b212070cd6cc2ebc15800e647b8988f01f8ec0c96c9b282b3694fc446918380921ef211d81c14ab1d677b7e1607c3b0c9548eaaae058 SHA512 2daad4895f948c7c946d3e20b0602f6486d816bc48f06b2d3f621a6b6144b19bb1e6fb02921212fe8aa192ff3b203bc989265ead5d4eda039c30293172521dd6
-EBUILD sigil-1.8.0.ebuild 1857 BLAKE2B 54968f660e181bbf31bb803874ccd3db7709ffb40de0fa4451146873f3c81d5216bbdc83dd68191bc6f86b414cc2bf288275c839b7af59211846627a75853af7 SHA512 5fa79e7b452f93bb4a7e5d88b31ff90f03e294c995df702c74061ea19b1895aa6c60ea9e1c6d3bec2699636d052aea52ef0f3d93f62d8a739a07b9ed2d532596
+EBUILD sigil-1.8.0.ebuild 1855 BLAKE2B ff3a7e71bcfce93086fa4ceb1d37b4ea4cf25c01a92d3d4da1de7a2fdad2e5ac214f5f90e2caf96ac95e52fa8a298775993ed4cc71a621f2bcea6de56860b445 SHA512 98b95e6d8c2ad6db9c536f9e692670ba9040a556f4355456c328d5442b1eb213d5911b162897edfdb28fec4499af4a1c052cdd8f355ce30acbc08a392f0c07a8
 MISC metadata.xml 810 BLAKE2B 9790a33fa436de084e57410b5fea4fc477bef40dafbc9b0467b0b01a27dfcb9b6874df529f5e0ecc1aca5e48fb07adde0b3a8c99fdd1ff1bd14f6877ecfedc98 SHA512 8b0c12e38cf8516e139bc1277062f0499148b6eba417e9c65389dd5aa8fdae9b967cffbe066f5e3bee5ed11d2eac2d909c782dc3b3f1432b3f4515adb04acaf2
diff --git a/app-text/sigil/sigil-1.8.0.ebuild b/app-text/sigil/sigil-1.8.0.ebuild
index 11d9e2e1dd89..7eba49a4ab03 100644
--- a/app-text/sigil/sigil-1.8.0.ebuild
+++ b/app-text/sigil/sigil-1.8.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -15,7 +15,7 @@ S="${WORKDIR}/${P^}"
 
 LICENSE="GPL-3+ Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+plugins system-mathjax"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/app-text/stardict/Manifest b/app-text/stardict/Manifest
index 926fd91a0c31..26dd7b821ce5 100644
--- a/app-text/stardict/Manifest
+++ b/app-text/stardict/Manifest
@@ -3,6 +3,6 @@ DIST QQWry.Dat.bz2 4114875 BLAKE2B 3fb1a3b223b799645fcc7adc3d8158c80551bd1d35689
 DIST WyabdcRealPeopleTTS.tar.bz2 84329208 BLAKE2B 1dd9c00e4e914b0d747876aa566db59a4b973b3ec61fa1ed7a55f885d7f415f573f2f8783eca46c565bc52df4ba3576b3a0f4e863b4f7ba688007f6d6b375209 SHA512 1553e62c139ecb005bb04163147d94aa58e4ba7f9ee3172b760c6e4776587c12bf816c42e0131c82195b7c738ec9ee5082f39b974790f5cacd522367919beaa0
 DIST stardict-3.0.6.tar.bz2 9341740 BLAKE2B df0ccfbd485dfb514bdcf4edaf92b2faf3c11016b025ca09596adcc12738027395a049d9d27420427acdf5c46923cb43ba521d334f875070f5451b7ff147e36f SHA512 81d93324b6e8954af7c20ea6d2a3054bb564d786a21b1cb541c728da7a18a6e7ddb23e595055ccc77e6866bbb8c89fb4f17023e33664761dbe1ee8cd55768658
 DIST stardict-4.0.0_pre20170304.tar.xz 3603012 BLAKE2B c9ac41f1e27c013e9c20e5b5477889cb4933ebaf35629311362ec48e820b10a7492d464ac7eddded697ca49f56f65032a1af36088e8e731643e83532e0586e48 SHA512 ec27bb95069d727fd96cb30f2d7ad94992cc53e55903b373612e29265263ea5da2c8a25f6c9618db50dc38c33efebe13324c2b8eb09b198559a1ee70029f0b6a
-EBUILD stardict-3.0.6-r4.ebuild 5389 BLAKE2B a4926bb81e81b31181ede64891197b2e05d43a69423bfa7cd6ca669627891798784b0a7bc52c597cec045ef3f2bf8e76282a0a193169906b406a81889376a3ab SHA512 d5643b2e9f262ef7c22ca3ba5694ca49cf298f6a48d91471e5c75223414051a75d3489334e1048484acd6aae8317416311ddac98493b2c40187958cf4e4dc92a
-EBUILD stardict-4.0.0_pre20170304-r1.ebuild 5809 BLAKE2B bbb48ef9d460ccf1ced07ec062bbf0f2ebe5d00f1126f932f6b94f8f65a125b300867c014e8815e2d0e6641447bc511b4b406fc3b430f304533b7843956fca94 SHA512 7125c4a7c8a8b9352b5ed20e305e5aae25fbb071fb17e0976af3199c3ca666fb4638a095ea5bc7f69b98d6b6ff8206c2ce297e078e4b127ee559369c44d7f7cf
+EBUILD stardict-3.0.6-r4.ebuild 5433 BLAKE2B 6c70eb2c7393962fcc9c1e1ebbaff57dd897020d599ec0f3f87248b475602d737cb2e29d05dfd526dee762c539101b3419fd87548b079e7e59cf2b32bbcf65d6 SHA512 4e0c91951d25013922c5231470b61d89aca65536d3d197b5abb8f6a49e47241f18ef5c6d6a546e41951a3c9de5486d0b5420e161c7508e18377711c23012349a
+EBUILD stardict-4.0.0_pre20170304-r1.ebuild 5853 BLAKE2B 43f01a1b58210823e14ec82d8bc342b122231705a400fe065cfa973c7c3495b594a5b211996ab1cc1611b61d8b66136c71c36e6f6b83062bf35fe5ebb0f45ca9 SHA512 9e18e6999d3c474e82504a5fea4db77721833e956f740929313022342ac8c9d3879177fcb47e6b916a510699ffb77107e1dda48af1ad094c210a00dd1bc15919
 MISC metadata.xml 2669 BLAKE2B ec9679f3182809ae806b8d5f2735c2b29b20e2832905a4bc95b3af426ecc737b91869db0623d75ea46311a35cd3a1a6bd76dc67dec221fe821329fca1b380270 SHA512 a131d14f75441548ce82a628bfcb4b9ba2cf27480ea7207b31233e64a2260e64e0e8e8d209e4fb701d93ef45dad661d6f9f063b178484ad9f5ee5c1fe9e562ac
diff --git a/app-text/stardict/stardict-3.0.6-r4.ebuild b/app-text/stardict/stardict-3.0.6-r4.ebuild
index c41fc396803b..717768451a5b 100644
--- a/app-text/stardict/stardict-3.0.6-r4.ebuild
+++ b/app-text/stardict/stardict-3.0.6-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -115,8 +115,9 @@ src_install() {
 	dodoc lib/{AUTHORS,ChangeLog,README}
 
 	if use examples; then
-		insinto /usr/share/doc/${PF}/dict
-		doins dict/doc/stardict-textual-dict*
+		docinto dict
+		dodoc dict/doc/stardict-textual-dict*
+		docompress -x /usr/share/doc/${PF}/dict
 	fi
 
 	if use qqwry; then
@@ -161,8 +162,9 @@ src_install() {
 		dodoc tools/{AUTHORS,ChangeLog,README}
 
 		if use examples; then
-			insinto /usr/share/doc/${PF}/tools
-			doins tools/src/{dictbuilder.{example,readme},example.ifo,example_treedict.tar.bz2}
+			docinto tools
+			dodoc tools/src/{dictbuilder.{example,readme},example.ifo,example_treedict.tar.bz2}
+			docompress -x /usr/share/doc/${PF}/tools
 		fi
 	fi
 }
diff --git a/app-text/stardict/stardict-4.0.0_pre20170304-r1.ebuild b/app-text/stardict/stardict-4.0.0_pre20170304-r1.ebuild
index a0b09d5647aa..5f1a969db7bd 100644
--- a/app-text/stardict/stardict-4.0.0_pre20170304-r1.ebuild
+++ b/app-text/stardict/stardict-4.0.0_pre20170304-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -132,8 +132,9 @@ src_install() {
 	dodoc lib/{AUTHORS,ChangeLog,README}
 
 	if use examples; then
-		insinto /usr/share/doc/${PF}/dict
-		doins dict/doc/stardict-textual-dict*
+		docinto dict
+		dodoc dict/doc/stardict-textual-dict*
+		docompress -x /usr/share/doc/${PF}/dict
 	fi
 
 	if use qqwry; then
@@ -178,8 +179,9 @@ src_install() {
 		dodoc tools/{AUTHORS,ChangeLog,README}
 
 		if use examples; then
-			insinto /usr/share/doc/${PF}/tools
-			doins tools/src/{dictbuilder.{example,readme},example.ifo,example_treedict.tar.bz2}
+			docinto tools
+			dodoc tools/src/{dictbuilder.{example,readme},example.ifo,example_treedict.tar.bz2}
+			docompress -x /usr/share/doc/${PF}/tools
 		fi
 	fi
 }
diff --git a/app-text/tesseract/Manifest b/app-text/tesseract/Manifest
index 52d26b64480e..30039b5b3d0a 100644
--- a/app-text/tesseract/Manifest
+++ b/app-text/tesseract/Manifest
@@ -1,8 +1,8 @@
 DIST tesseract-4.1.1.tar.gz 1974988 BLAKE2B f729beb017ec81704b84f5e6539706ff0cd6a51a4d1b7b730c394af58ce2ea2a659203bf239417e8d500cfbde845a73d6e6e181ca946257c2f22525820899602 SHA512 017723a2268be789fe98978eed02fd294968cc8050dde376dee026f56f2b99df42db935049ae5e72c4519a920e263b40af1a6a40d9942e66608145b3131a71a2
-DIST tesseract-5.0.0.tar.gz 1919742 BLAKE2B 39897f8778017627ce70227c6c162d6b53b504a95c92d9c13e1a27f8b71ec9828bfba8497535cd1684330a110001380433ad6120c0d2a61d86a01bbf1f1db015 SHA512 80e0d6e9076eb8d6b0d99942586acbb43aaec7bee7f7b13a500470aa11bf03f1c128434d764abd67839355e3fb80d41d0bcf10400b33e57fa0ae4659adb42af9
 DIST tesseract-5.0.1.tar.gz 1913596 BLAKE2B 94098704c0a177eb1afc365036f9ff8d7648f80398f20a410e11b7884e1411432c2938e3ab176930630500793ef2e3f33b82f214461ef6677d289c56919f8d55 SHA512 0a4824f71eb76ab022f3b9258d12b9a059adcf2f37fac6442ae1096d0efc80404ba1bfd9c90e8263178c1af606c2aad2b277ceb93efc3b9e93c125f931ff08c1
+DIST tesseract-5.1.0.tar.gz 1910376 BLAKE2B e1c1c5c563e30689d66fb09ab73fdce853a469dfcf3c759571f6e6e1da71809a8fd1fb74c0be38588e97bbdac230c2ce10a35fd66faa6a4370d78efe112d3243 SHA512 d874fc995182c2c7ce210ebd79ad36414fa73afc53063505bc0b0aa0f090dc48db09c650c86a727778584f34a421b7d64c129cefe282ea112560cd7ca24e7f59
 EBUILD tesseract-4.1.1.ebuild 2059 BLAKE2B e571ac11d2d9b42c0aa97ce6b61ae21c553fec237c420b62bfa43c01b12b156766ba1afcb5c54e08b222823683815a5b82de19a302f52043c7b4c2d4f0da50e3 SHA512 3f8b8168ec4139e78387540b2593e210145a58d60a31aefa58ddd3132adeabc87f810c343498a90b644748cbc57028b7b0b983691dd5c139183ba0f4de30ea43
-EBUILD tesseract-5.0.0.ebuild 2099 BLAKE2B d564a122758e40d67dfa2fc1a77f4bec7ae86209b674d6c9e10e3393fcf7d58b2cb29585da0a9f246e79da24ff94e892516e4e6019405084e679c5a8f546ed73 SHA512 5cfbe011ad054555d9bd19e1634d653da7e92bbb6217603a6a603a82cd95332160a107221528dc6cd69b826e477aa8aa5017f76aeb5803226dad783b9e5ab8f8
 EBUILD tesseract-5.0.1.ebuild 2099 BLAKE2B 0dd97154e37643e9b9bd155ac24e67d137a8316b204dcbe3d36d99482054bcd3e350b0624b5a2d91fe6f07df13186193113a8cbd231254c84247ef772bbd2647 SHA512 3c6e7d6d908898f78fa362bbd3760c202cd8337b40d239efa90aa2a8388d0aa9e9152033e3e91a457f2177c31393bf2e8c5dda9a25001acca906178a3de43814
+EBUILD tesseract-5.1.0.ebuild 2099 BLAKE2B 0dd97154e37643e9b9bd155ac24e67d137a8316b204dcbe3d36d99482054bcd3e350b0624b5a2d91fe6f07df13186193113a8cbd231254c84247ef772bbd2647 SHA512 3c6e7d6d908898f78fa362bbd3760c202cd8337b40d239efa90aa2a8388d0aa9e9152033e3e91a457f2177c31393bf2e8c5dda9a25001acca906178a3de43814
 EBUILD tesseract-9999.ebuild 2016 BLAKE2B 25fbf431abce082969e2a1c2f83ca0382617cf34796295737372dbee9f0d5c7123252dd007f82068e907462447c175d1824feb1670c4ac610e00d5c3487abf8a SHA512 286eb30f1c6f36dbf0f18b97a9dd7d8f1416c8362fe1a8df60593392a0289eee5bc96c57cca91505e0ca5cfa5bc853869a0b1322307683f82dcec2edf3b63a2c
 MISC metadata.xml 1020 BLAKE2B 77f6c8f3962e00b65495fff0176e7765a9583de651db12b0e532ad5ff4b8005ede93d42d58093ae3b397c40d085963f47ef0e41cfed609b581c1a2f8231ccc72 SHA512 d9ea277a6ad9ec5178252863d60bac1244e372ab6c4f4ce3fe4f7220492e78dec2349742699031ed727251f87173e821c64dec44fb9787c08aad216cad64fa05
diff --git a/app-text/tesseract/tesseract-5.0.0.ebuild b/app-text/tesseract/tesseract-5.0.0.ebuild
deleted file mode 100644
index e33c4ece03f9..000000000000
--- a/app-text/tesseract/tesseract-5.0.0.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools multilib-minimal toolchain-funcs
-
-DESCRIPTION="An OCR Engine, originally developed at HP, now open source"
-HOMEPAGE="https://github.com/tesseract-ocr"
-SRC_URI="https://github.com/tesseract-ocr/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0/5"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE="doc float32 jpeg opencl openmp png static-libs tiff training webp"
-
-COMMON_DEPEND=">=media-libs/leptonica-1.74:=[${MULTILIB_USEDEP},zlib,tiff?,jpeg?,png?,webp?]
-	opencl? (
-		virtual/opencl[${MULTILIB_USEDEP}]
-		media-libs/tiff:0=[${MULTILIB_USEDEP}]
-		media-libs/leptonica:=[tiff]
-	)
-	training? (
-		dev-libs/icu:=
-		x11-libs/pango:=
-		x11-libs/cairo:=
-	)"
-RDEPEND="${COMMON_DEPEND}
-	|| (
-		>=app-text/tessdata_fast-4.0.0
-		>=app-text/tessdata_best-4.0.0
-		>=app-text/tessdata_legacy-4.0.0
-	)"
-DEPEND="${COMMON_DEPEND}
-	app-text/asciidoc
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	doc? ( app-doc/doxygen )"
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-multilib_src_configure() {
-	# scrollview disabled for now, see bug #686944
-	local myeconfargs=(
-		--enable-shared
-		--disable-graphics
-		$(use_enable float32)
-		$(use_enable opencl)
-		$(use_enable openmp)
-		$(use_enable static-libs static)
-	)
-
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_compile() {
-	default
-	if multilib_is_native_abi; then
-		use doc && emake doc
-		use training && emake training
-	fi
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi; then
-		DOCS=( "${S}"/AUTHORS "${S}"/ChangeLog "${S}"/README.md )
-		if use doc; then
-			HTML_DOCS=( doc/html/. )
-		fi
-		einstalldocs
-
-		if use training; then
-			emake DESTDIR="${D}" training-install
-		fi
-	fi
-	emake DESTDIR="${D}" install
-}
-
-multilib_src_install_all() {
-	find "${D}" -name '*.la' -type f -delete || die
-}
diff --git a/app-text/tesseract/tesseract-5.1.0.ebuild b/app-text/tesseract/tesseract-5.1.0.ebuild
new file mode 100644
index 000000000000..302638df9e4d
--- /dev/null
+++ b/app-text/tesseract/tesseract-5.1.0.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools multilib-minimal toolchain-funcs
+
+DESCRIPTION="An OCR Engine, originally developed at HP, now open source"
+HOMEPAGE="https://github.com/tesseract-ocr"
+SRC_URI="https://github.com/tesseract-ocr/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/5"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="doc float32 jpeg opencl openmp png static-libs tiff training webp"
+
+COMMON_DEPEND=">=media-libs/leptonica-1.74:=[${MULTILIB_USEDEP},zlib,tiff?,jpeg?,png?,webp?]
+	opencl? (
+		virtual/opencl[${MULTILIB_USEDEP}]
+		media-libs/tiff:0=[${MULTILIB_USEDEP}]
+		media-libs/leptonica:=[tiff]
+	)
+	training? (
+		dev-libs/icu:=
+		x11-libs/pango:=
+		x11-libs/cairo:=
+	)"
+RDEPEND="${COMMON_DEPEND}
+	|| (
+		>=app-text/tessdata_fast-4.0.0
+		>=app-text/tessdata_best-4.0.0
+		>=app-text/tessdata_legacy-4.0.0
+	)"
+DEPEND="${COMMON_DEPEND}
+	app-text/asciidoc
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	doc? ( app-doc/doxygen )"
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+multilib_src_configure() {
+	# scrollview disabled for now, see bug #686944
+	local myeconfargs=(
+		--enable-shared
+		--disable-graphics
+		$(use_enable float32)
+		$(use_enable opencl)
+		$(use_enable openmp)
+		$(use_enable static-libs static)
+	)
+
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_compile() {
+	default
+	if multilib_is_native_abi; then
+		use doc && emake doc
+		use training && emake training
+	fi
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi; then
+		DOCS=( "${S}"/AUTHORS "${S}"/ChangeLog "${S}"/README.md )
+		if use doc; then
+			HTML_DOCS=( doc/html/. )
+		fi
+		einstalldocs
+
+		if use training; then
+			emake DESTDIR="${D}" training-install
+		fi
+	fi
+	emake DESTDIR="${D}" install
+}
+
+multilib_src_install_all() {
+	find "${D}" -name '*.la' -type f -delete || die
+}
diff --git a/app-text/trang/Manifest b/app-text/trang/Manifest
index cb9af82ff3d4..c480d9a90228 100644
--- a/app-text/trang/Manifest
+++ b/app-text/trang/Manifest
@@ -1,8 +1,6 @@
 AUX test.xml 3053 BLAKE2B f9837b05c4ac00fa63ce75f04318f3378c2cc0c99680c21520d7d75a74e0e9ad00a9fcdf4857655ac32a3eea935208dc86e51d2bbef3e2349cd78d65ed74ac30 SHA512 11b4faef6fce89d72e8cdcc25cc1dc6c89ea7bc44252e0521a9a5ff47f686e78c46eac6b606e47f51b0bdb8175e583d5c1c56bdcb8bea105c70a63b65f20ea67
 AUX trang-20181222-build-fixes.patch 968 BLAKE2B 5f84f3388133b126c711024750f85aff03cd76027ebd526e3eec4b4a605c4e3515662e2d2b1abcf3df08e88176a248442478d1350946e3b3150e00ab928a85db SHA512 ac8bf8e5f8f71f9271a9adba732112b39c379946298b859ab7504e4f861274670666f4a2e0337712a607049f34dbc206962fe2ff8883b8a8a7c5e09037f67062
 AUX trang-20181222-unicode-data-path.patch 627 BLAKE2B 78ed1c0ad5cf4327311ba9a65113bbc38554444625fa1da1ac90586e7cc4b87722458b483219c9c6a1132ffff3076a8d4dec120de772b4191ebf7db8cdc33224 SHA512 51909cfdac55204197478e7484794cd6d4a0892baa94d0a98e46bf1e227b7e21ac544451ff1fe9c4a4fb67fe3dc2b557d98471abc5ba130a92da973aebe41495
-DIST trang-20151127.tar.gz 13746141 BLAKE2B 8895fefa8be62a524a2bfb603a64bcf641f13cd500dbe51b9efdaed7d5147dd6478963d356aec81c5c5b6af12a59edcb908d203b6b8edaf093fe29f76db80b7c SHA512 f5c6973791e8caa8dcce6bbf92cbd58491f55edd7819523947ad718ea3973eb81afc6b21d4e830949c2f183b485915dab98dbb5b90e01324677cfa41f5746e26
 DIST trang-20181222.tar.gz 14847113 BLAKE2B 335722853b2d373fd9a6e9d4478b8248ca49d0559d5a8f60566f5550e60d5a004f26338897617acc617f84d1d55546afb9c51da64b7634514fa2ec508fa7a47a SHA512 fa412a5beeff07a620c4aa5723cf5b73bdb6b1cda561e3bf7764a609110f538da5313bcc79aca4d7742f71b3b071d3537681845d17ece46bc871c0964f4e251d
-EBUILD trang-20151127.ebuild 2070 BLAKE2B 6302b85f0047cb8fae003b7bccbdcf2bde3f24d4395fe8b3023bf425bf9cda31d4b3ef9bb42c73db51e4e14858ce907bb13a9d2744f8e3e1ec4db6ef1810f23a SHA512 45ef3c04539287046ba9792f018f838079e9d40b8c46771702c0f6ab3c952bd3072e5e071f8205bf747610e1a4ee059fe847081d2ea256865893a6dc3bcf3fb4
-EBUILD trang-20181222.ebuild 2224 BLAKE2B a5bbe67ccbd909bbb01f48dff6b61f641fd8b8cfc2afff743a16d3a0d525d5a75dd7910076ffd4980be4f1defb6c14ef875b49fc55c76fcedfc3427ad872cc3c SHA512 ce5232eb5bf83c5e029b0866f4ed97d62c8df6b619fb11a474c19d2c297e37e5ba6246e539b065763be2a88f7059770355a31191ed5d03f6f28f0457231421c3
+EBUILD trang-20181222.ebuild 2222 BLAKE2B beab45edaad346bdf72e21de7e9b14b8a4e6ac792cbea7d01579709443078be1b8231bdf9c47759b5253e32cc2ae3442370280411fe2994488db08e8a377ed11 SHA512 76e9d9de00d100cde4e6641772fe1ab6a591646907752ad4e015b369108799cdcb453910e387c8a3fa35ac64b5e7189e31b0296dc8d5668c11a31ca5b76c271b
 MISC metadata.xml 375 BLAKE2B 0c05bab3ec0ef8605c8422510fea174514ce9fee8e642a2172c6e1eff07ad7cd0f10bacf1478477cf3a94abfca23a48ad2a18d5ed8133c4165694f1bbe930045 SHA512 fdd72c06fc6e618e789ef0bf85e6f4bb566f4bc36032d8d428ea8596d610dc3d0b435b03de0e157ce5cf3402edf4832e9c45c3b4d69401846f004ab69377a00b
diff --git a/app-text/trang/trang-20151127.ebuild b/app-text/trang/trang-20151127.ebuild
deleted file mode 100644
index d04740027209..000000000000
--- a/app-text/trang/trang-20151127.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-COMMIT="1e74846999bbd14ce5248acbd2be9f1e624a9846"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Multi-format schema converter based on RELAX NG"
-HOMEPAGE="http://thaiopensource.com/relaxng/trang.html"
-SRC_URI="https://github.com/relaxng/jing-trang/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-COMMON_DEP="
-	dev-java/xerces:2
-	dev-java/xml-commons-resolver:0"
-
-RDEPEND="
-	>=virtual/jre-1.7
-	${COMMON_DEP}"
-
-DEPEND="
-	>=virtual/jdk-1.7
-	dev-java/javacc:0
-	dev-java/saxon:6.5
-	dev-java/testng:0
-	${COMMON_DEP}"
-
-S="${WORKDIR}/jing-${PN}-${COMMIT}"
-
-EANT_ANT_TASKS="testng"
-EANT_GENTOO_CLASSPATH="xerces-2,xml-commons-resolver"
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-JAVA_PKG_BSFIX_NAME="build.xsl"
-
-java_prepare() {
-	java-pkg_clean
-	echo "<version>${PV}</version>" > version.xml || die
-}
-
-src_configure() {
-	java-ant-2_src_configure
-
-	# Because this crazy package uses XSLT, we need to escape this.
-	sed -i 's:\${gentoo\.classpath}:${{gentoo.classpath}}:g' build.xsl || die
-
-	EANT_EXTRA_ARGS="-Djavacc.dir=${EPREFIX}/usr/share/javacc/lib"
-	export LOCALCLASSPATH=$(java-pkg_getjars --build-only --with-dependencies saxon-6.5)
-}
-
-src_compile() {
-	EANT_BUILD_TARGET="modbuild trang-doc" java-pkg-2_src_compile
-	EANT_BUILD_TARGET="mod.trang.jar" EANT_BUILD_XML="modbuild.xml" java-pkg-2_src_compile
-}
-
-src_install() {
-	java-pkg_dojar build/${PN}.jar
-	java-pkg_dolauncher ${PN} \
-		--main com.thaiopensource.relaxng.translate.Driver
-
-	docinto html
-	dodoc build/*.html
-}
-
-src_test() {
-	java -jar build/${PN}.jar "${FILESDIR}/test.xml" test/test.xsd
-	java -jar build/${PN}.jar "${FILESDIR}/test.xml" test/test.dtd
-	java -jar build/${PN}.jar test/test.dtd test/test.dtd.xsd
-
-	md5sum -c <<EOF || die "Failed to verify md5sum"
-4bcb454ade46c0188f809d2e8ce15315  ${FILESDIR}/test.xml
-d096c1fb462902e10a3440a604a21664  test/test.xsd
-3fb46bdb16dc75a2a1e36e421b13e51d  test/test.dtd
-fce355ca962cb063d7baa5d7fd571bcf  test/test.dtd.xsd
-EOF
-}
diff --git a/app-text/trang/trang-20181222.ebuild b/app-text/trang/trang-20181222.ebuild
index 3ca0be320143..1bd1c56592c4 100644
--- a/app-text/trang/trang-20181222.ebuild
+++ b/app-text/trang/trang-20181222.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}"/jing-${P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 COMMON_DEP="
 	dev-java/xerces:2
diff --git a/app-text/tree/Manifest b/app-text/tree/Manifest
index 9a4cacdff720..7c04bee3652d 100644
--- a/app-text/tree/Manifest
+++ b/app-text/tree/Manifest
@@ -1,4 +1,6 @@
 AUX tree.bashcomp 847 BLAKE2B de05dacd7b54426e89e4afbbb6fba74376212a8f02995ff9babec369244bdb57fcb46989a437a100bf1415f7ecb8b0e142d729bae27f7fef6319de9e4cb06d54 SHA512 8df777721a7974015b5e717d89a4ff8701a2598e227d6cf71077fe498a5bb2a578c96c4667ab80e34b1064e109d38665fb6a4de8f52bb6401445088d5cdca922
 DIST tree-1.8.0.tgz 50286 BLAKE2B 51a27500b89a46add6e792d446b465696d2b34339bbd06f03baff9ce589131b5d82c414849f891dbb79a3f3cfb23b89336e783ad23b84c1fb5415a13fb9488cd SHA512 3f657a6278ec5eab2fccab39dfd69bf9376811189a368b5e3213dc900b90a4e7a4961fc58eb80ad2efd5b40d2fbd0146ec59f30fe0bba576f93519214f240695
+DIST tree-2.0.1.tgz 57213 BLAKE2B 977f3bd606881f92f7e39fb167205b468f77408a2fa3ff14c20eeab0e6f194115d2d41a3919751c9c9d103ae185dc231710a464f0c57ea244e8a410782503d6f SHA512 11a45136d62ee7b4acdb599025ddddc250f3b95c46c94cea132bdc226357561bbae3ed874a99e554d2e01a93eaac639fb89d8a2539964ce788540ac3537f0e4c
 EBUILD tree-1.8.0.ebuild 1030 BLAKE2B dda6d49d3582067f9504129acb79111f7696f6d04bc5f15099c86a6775ea8075c7eb6dc016de73810657ffe051d875a3115742342b5640da06d90ed85f3c5a87 SHA512 0836995a09b56e93f1f3fbc87cd443115d401512c19682f745f9152d1212372129707b6a21db6ce73b23b2fafd9d48b6b996011f852fe284a17236f7b89a8951
+EBUILD tree-2.0.1.ebuild 1006 BLAKE2B ef8b714336dd86d3c73e7bc2820b9cc79c652080a34730e48c781bf7146b84e11d0ed2bc965181e0f020e64673ea9e64c47d2b378671946b72ad27ae83980bfc SHA512 2397fe51a3ee5d9711f4fdf2bb3cae95aa502ffcac1781776118d7104f92233839abd7de9e4002b8cfb46ef85951fd3191df2d0e96068b1edd6701b270651373
 MISC metadata.xml 582 BLAKE2B 58d776e2a0478f77ba165f80ff3f097d18d51e7b9a234bbd769917f704224ca80b842ddd874ca44f81bd886d0e64354f4004f7099f54bcba7e2b87911251f4dd SHA512 063693cd9029b3a05fc1e8c87fea9de1c5ad3f23bb663b2da81504d9a75c2199054a622d63790b28bd5e65f546f7b8c9c02788e0b5f0c0d36b2d10ecb7cdb9dd
diff --git a/app-text/tree/tree-2.0.1.ebuild b/app-text/tree/tree-2.0.1.ebuild
new file mode 100644
index 000000000000..3abae6ee3bd9
--- /dev/null
+++ b/app-text/tree/tree-2.0.1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit toolchain-funcs flag-o-matic bash-completion-r1
+
+DESCRIPTION="Lists directories recursively, and produces an indented listing of files"
+HOMEPAGE="http://mama.indstate.edu/users/ice/tree/"
+SRC_URI="ftp://mama.indstate.edu/linux/tree/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+IUSE=""
+
+RDEPEND=""
+DEPEND=""
+
+src_prepare() {
+	sed -i -e 's:LINUX:__linux__:' tree.c || die
+	if use !elibc_glibc ; then
+		# 433972, also previously done only for elibc_uclibc
+		sed -i -e '/^OBJS=/s/$/ strverscmp.o/' Makefile || die
+	fi
+	default
+}
+
+src_compile() {
+	append-lfs-flags
+	emake \
+		CC="$(tc-getCC)" \
+		CFLAGS="${CFLAGS} ${CPPFLAGS}" \
+		LDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+	dobin tree
+	doman doc/tree*.1
+	einstalldocs
+	newbashcomp "${FILESDIR}"/${PN}.bashcomp ${PN}
+}
diff --git a/app-text/ttf2pk2/Manifest b/app-text/ttf2pk2/Manifest
index b2250a346466..58929033b50f 100644
--- a/app-text/ttf2pk2/Manifest
+++ b/app-text/ttf2pk2/Manifest
@@ -1,3 +1,3 @@
 DIST texlive-20210325-source.tar.xz 54837368 BLAKE2B 66bd4bdd43ff53513004b9b9b90ababa0ab5efcf183a27864a3d39cde9cf90721456bda90c49ad6014f4b12d2e6293feaf9a8b152b85a89ffaa96bf5056347df SHA512 afd6eb24efaeac7c58d43ff24162aece919079a9ae02934509f068c7a3828223c33c14d9db11ff7fea3560b08a06f352446ba7f845eefb4a56a87b96f088f213
-EBUILD ttf2pk2-2.0_p20210325.ebuild 1127 BLAKE2B da57d70060b0700bc39f6dd4c67d9814c52598a84c4d60dcada43c9f02a1f6d418b3f3262a8e898fa661a08480e972fc88a2e567a8f4e50d0eb59993002d2c4d SHA512 fafd829b86d364d6cdb997707df15dbe15fd20a57c008edb83d118906ac6a170d32247e4dd657c6255ae543ff732b4b76c94275cf77d08187530a1f649cdc0fb
+EBUILD ttf2pk2-2.0_p20210325.ebuild 1108 BLAKE2B e612c65d7768c8ca30f4201897fb588a5a20ca9ac9f522b1a052effec119a47e1149376ffdd59995f4dc40b91d690d26521f7d8deb37ea50f03413d3ab92f704 SHA512 a76c9c06f8cae7084ed1b67d92a18fb35d3a32abfb5623813120fba00acfce877e385bb828e93029e03e0730f2f19e4e25f8b33f70b1959d99e48bf4d1c7c639
 MISC metadata.xml 246 BLAKE2B b56c934f8eecd3492d6abe15cf5883fdbc1979c37abbc5ad196e345ee17bb865db5eab10ac7de93bbfce94c4e865bf6b86d5f8bc081b5cb1d3d58d1158b81921 SHA512 b61f56c5e078714565ff9e33c81217e788f78bae9cf10d6ca78a82703a8e08119dff3afa68306eced0b7c62db9220d28efa4c9782e943c991e30b25b9ead82f5
diff --git a/app-text/ttf2pk2/ttf2pk2-2.0_p20210325.ebuild b/app-text/ttf2pk2/ttf2pk2-2.0_p20210325.ebuild
index f86a90004523..d4e043026b38 100644
--- a/app-text/ttf2pk2/ttf2pk2-2.0_p20210325.ebuild
+++ b/app-text/ttf2pk2/ttf2pk2-2.0_p20210325.ebuild
@@ -1,10 +1,8 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit autotools
-
 DESCRIPTION="Freetype 2 based TrueType font to TeX's PK format converter"
 HOMEPAGE="http://tug.org/texlive/"
 SRC_URI="https://dev.gentoo.org/~zlogene/texlive/texlive-${PV#*_p}-source.tar.xz"
diff --git a/app-text/unpaper/Manifest b/app-text/unpaper/Manifest
index 4b0050f628da..6b41da75345d 100644
--- a/app-text/unpaper/Manifest
+++ b/app-text/unpaper/Manifest
@@ -1,4 +1,4 @@
 DIST unpaper-6.1.tar.xz 2655724 BLAKE2B df16261d37d5d493aa640cd940b63f55e90ba091e6028dc11dd0c685ec880a7be202d4056756ef0fa54b48b89f1845b9cf23aceeb87945a1b6a25eec4b7c0915 SHA512 afef705985d3c265672c9e42130acc34befc080c361f3169e299b5110c662d0b9845a9d0ca4fc3aad468f49967ded36fb60ffed296373569dd7337c3cb81e79c
-EBUILD unpaper-6.1-r1.ebuild 816 BLAKE2B 47c30f71aa120846a9a89023149eefd04437999c2fb4e24eac58482b90b04d62da69d625b86fe2cae6947a82397880076af5300ac903641d3c85dd80abca82ea SHA512 f8a041478ddb1f2de9892a1c575b1b5686ab7f01b41d95e57c20f750a0d56622dbef009e4f6a27cc60ad0977cdde8d1139bbbcef4b8c36e3bab576a13a74ab22
+EBUILD unpaper-6.1-r1.ebuild 823 BLAKE2B 318fda0b47ddcc8eaab88966f880bf358821e4df02a1bc0addf983e5be9c133dcdf70d0721c032d3775a8955f6febea884cb978921994fe7095d2f180c1558a5 SHA512 1a4052031ce06b27c637dc516a49d09808d10022fb972ae6c554339a89ab2aa2af5b8e4a1ff7db4454b844a08e0a5c8c9837bc37ff6018b270f63accc6d93564
 EBUILD unpaper-9999.ebuild 818 BLAKE2B dc5c7a2ce9088a035f8008076c4c4e259560188bf97da9dfd8a8936738c54ae675db870aca245b2afbf9b015d215cc6778e3ee58ac0faa452f3a4fc3db9690b4 SHA512 53c0ec0cee2048193a3954eb9f2bd8bf06872dda4cccae54d1594bc3c2d13a1ba7e416f0752b96c18b62e47a16d44d201828d08c95897d1781df5ae261686ab9
 MISC metadata.xml 320 BLAKE2B c844f3f7eff324b61dff5a96c72ba23a86fde18e40a6fa0bc3362101114198c64ee93f7e24b5bf3452bd605485530098e58352d1b1a2d6c07efcb3ffc94e41cd SHA512 9cb1be315b8af9e4478a6bf13ba7e76c75fe8b7e70b5673c487d0ff6144ae715851d658d924d37f1c74d0b22e553d388cf0bd1597e84cce75a687f544ccfd853
diff --git a/app-text/unpaper/unpaper-6.1-r1.ebuild b/app-text/unpaper/unpaper-6.1-r1.ebuild
index 7b1433f52f43..91982d16e2cb 100644
--- a/app-text/unpaper/unpaper-6.1-r1.ebuild
+++ b/app-text/unpaper/unpaper-6.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ if [[ ${PV} == *9999 ]]; then
 	inherit git-r3 autotools
 else
 	SRC_URI="https://www.flameeyes.eu/files/${P}.tar.xz"
-	KEYWORDS="amd64 x86"
+	KEYWORDS="amd64 ~arm64 x86"
 fi
 
 DESCRIPTION="Post-processor for scanned and photocopied book pages"
diff --git a/app-text/webgen/Manifest b/app-text/webgen/Manifest
index 3470b4314497..744761265a74 100644
--- a/app-text/webgen/Manifest
+++ b/app-text/webgen/Manifest
@@ -1,5 +1,3 @@
-DIST webgen-1.7.1.gem 201728 BLAKE2B 2ea7d7911b4edf29cb7310a676593a77956b3fffd1a4ca5f69731270e648365fb8293a292b8fdd717444ed8f690dd5f095ac5dd77f5c950253b5de7d6086f966 SHA512 7b58c7d2b8ff6a4feabc1435e6bddbf25b3e4695517c2bd8d97b698a49b6fd61538f1a77bdd4e13f7368fdfbeae9f007dfc09ecfcde4eb75a366b8e0ccc8c58a
 DIST webgen-1.7.2.gem 201728 BLAKE2B abd3a8a9accfbc1a1e0070b7cbd4d0cc24796540ce1c8c0cfd3dc50882bf953b1e794971a90e2a429b3ecd64b1cb009b16c96ce1e6cfa05516ce48c10e39cd95 SHA512 806303f56319b6f55d8457b0b68438a9732bc1adc95ea50a955ad02b184814d0b878d618fc0547831cac53292208f1d0837d190b078ebb2ba42641dbaa5ffd93
-EBUILD webgen-1.7.1.ebuild 1436 BLAKE2B cb17a23980c87ab2d27e51e165c859cc2a0c863f33e404aa7d8f15190acd745c951ac57319f2071dbdf275864a1e9e16132fce547a66487afbb0505c915cc6d8 SHA512 156f808cf029a5895bc5077ad11d4005112b526addfcbe82783d7d82af3112a1809499318d931c5d34bc046e8fc788dc2bef08a932481c3653e3756035adb3a3
 EBUILD webgen-1.7.2.ebuild 1443 BLAKE2B 060a0bbd2e67a24dfd1c9d931ded623b166b08d612c0a9efb5949f6b7361b3a56c5c48aff453eb75fb9a1fa72b40eb7ab4b6cee3f9d40fa392cb7ef92c84443a SHA512 0d593f5e4731cd1ace11a8c310a145e003e52c37eb5d750dd0839752c33c1db91caa9d6197bba1974776581622d6599a69a8400969b594b51063e6b60217d5dd
 MISC metadata.xml 478 BLAKE2B 297ea371504ae0040f1231b00c0dc953b946e2cd4008fdc2c2a3df557f4761a26240e7a082b134543d71be20b2288ae117640edca38a372742dd24a70f1f8f6b SHA512 41f0578e2710a0524e8991da5b545f2978de3e1da2e873bc230e97b258c93b62e7bfecd97500c617c41da85c9a42bf202aa731bd5a20b8e9f13f55f9ea4c7e11
diff --git a/app-text/webgen/webgen-1.7.1.ebuild b/app-text/webgen/webgen-1.7.1.ebuild
deleted file mode 100644
index 143a53059e74..000000000000
--- a/app-text/webgen/webgen-1.7.1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby26"
-
-RUBY_FAKEGEM_RECIPE_DOC="task"
-RUBY_FAKEGEM_DOCDIR="htmldoc/rdoc"
-RUBY_FAKEGEM_EXTRADOC="AUTHORS THANKS"
-RUBY_FAKEGEM_EXTRAINSTALL="data"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A template-based static website generator"
-HOMEPAGE="https://webgen.gettalong.org"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="builder doc highlight markdown"
-
-ruby_add_bdepend "doc? ( dev-ruby/rdoc )
-	test? (
-		dev-ruby/minitest:5
-		dev-ruby/rdiscount
-		>=dev-ruby/sass-3.2:* )"
-
-ruby_add_rdepend ">=dev-ruby/cmdparse-3.0.1:3
-	>=dev-ruby/systemu-2.5 =dev-ruby/systemu-2*
-	>=dev-ruby/kramdown-2.3:2
-	builder? ( >=dev-ruby/builder-2.1.0:* )
-	highlight? ( >=dev-ruby/coderay-1.0 )
-	markdown? ( dev-ruby/maruku )"
-
-all_ruby_prepare() {
-	# Avoid a test fragile for sass version differences
-	sed -i -e '/test_static_call/,/^  end/ s:^:#:' test/webgen/content_processor/test_sass.rb || die
-	# Avoid a test with fragile whitespace tests
-	rm -f test/webgen/content_processor/test_haml.rb || die
-
-	# Avoid tests for rdoc since that requires an obsolete version
-	sed -i -e '/def test_create_nodes/askip' test/webgen/path_handler/test_api.rb || die
-
-	# Avoid tests for unpackaged dependencies
-	rm -f test/webgen/content_processor/test_{css_minify,tikz}.rb || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	doman man/man1/webgen.1
-}
diff --git a/app-text/wv2/Manifest b/app-text/wv2/Manifest
index b5aa0db999ef..e3c7cdf9a97a 100644
--- a/app-text/wv2/Manifest
+++ b/app-text/wv2/Manifest
@@ -1,5 +1,5 @@
 AUX wv2-0.4.2-glib.patch 312 BLAKE2B 7c68aff28688cf4ad7ee99c73d4509197e958bf05fc6dc8a556e2c2376cd586942778dcb8cbb1aa1a80cf24b1ab94415224b5af122756eeae02a316464eb6323 SHA512 0dfa6f75d9c117869eff3c4c5aadaf6096af8b2239626fc249a3df3ddb5437c417c3265a0a5d956af2241c9d7b3cc137b6c79598c38506fedd2964e85bcf54ea
 AUX wv2-0.4.2-libgsf.patch 425 BLAKE2B 417d6b340c34dffee0301308ee5a04f4468a5627670638399535f7336cca7515927392e66dd723e8a13742e71ccb1bf850c7b91608b7f280b545a707d6425a2d SHA512 634b1a336506777f8976b81cd906f8a896e2b777a3f04c5791277ed5ca2856dacb71adab807efecdf29d07c02e4c95b5d6fe143b1660be77e37ed9d7bd177143
 DIST wv2-0.4.2.tar.bz2 452759 BLAKE2B 6134739459617189f9d4e11a660dac25114b5d329b43d02fffe773d25bf62f2eb9f4ccb2712016e670c72f089a6d48f764e99b0ce5d44554d3e9d69ea9e14762 SHA512 7b4fb1dc6aa05da52ea169bf13f3bb544a7a896cf9127b6d67a08e991d798e81e2bf65724cf9396a9b89902f7856007006d8b123fcaaccce77e2a4668a9c9d5b
-EBUILD wv2-0.4.2-r2.ebuild 821 BLAKE2B 60ccf8920cff67dcbfbea46ea71389a73dbbc02d39743af6dd8393378ccdf78b92e0a6b5029cb6fc8abc1b387c1b026fb48983a903220d2492674be00ebf8cf6 SHA512 ed0bf0d11f2c64042a357830700f78dda76c4280e7a967a7731766c308df17d4c6eea05054675a1954ef59b853cc85dd931aaf6fcbab71a38f47570d3e3574f2
+EBUILD wv2-0.4.2-r3.ebuild 807 BLAKE2B 7982b0c6e94bfaf8614ec00d380c494336afe0e90ab42013fa0404160df4cf048dcfb1e060db9854c7867617eb0715c3b644523fa5e9bc4d25127a35301aaa0d SHA512 1edf4ea5013be1b8706c92496ddf8274ce1b04dcdf8e994a6193d163389405c759b5f6af3da00476e326519875d5c933594f3e10fa5c9fd3c77d18bea00c5533
 MISC metadata.xml 386 BLAKE2B 0396f27bba8e94b9a420d5e8a76433fc99d5552bb4e1c6065536184255418ed5329208c72d2810ae08425bb1cfcdcf711154886298de0ea0e249fca2aac7a921 SHA512 0c0494abe579cc546426df511abebd6f02d5907976fd7f21cbd2f2fd1a0fcfd9662540b115a1768f1957d48b228d41d582f888a14f08956c14d4c55dd792392f
diff --git a/app-text/wv2/wv2-0.4.2-r2.ebuild b/app-text/wv2/wv2-0.4.2-r2.ebuild
deleted file mode 100644
index 0bd111c40a1e..000000000000
--- a/app-text/wv2/wv2-0.4.2-r2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils flag-o-matic
-
-DESCRIPTION="Excellent MS Word filter lib, used in most Office suites"
-HOMEPAGE="http://wvware.sourceforge.net"
-SRC_URI="mirror://sourceforge/wvware/${P}.tar.bz2"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86"
-IUSE="zlib"
-
-RDEPEND="
-	dev-libs/glib
-	>=gnome-extra/libgsf-1.8:=
-	virtual/libiconv
-	zlib? ( sys-libs/zlib )"
-DEPEND="
-	${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-glib.patch
-	"${FILESDIR}"/${P}-libgsf.patch
-)
-DOCS=( AUTHORS ChangeLog README RELEASE THANKS TODO )
-
-src_configure() {
-	# due to ICU 59 requiring C++11 now
-	append-cxxflags -std=c++11
-
-	local mycmakeargs=(
-		-DWITH_ZLIB=$(usex zlib)
-	)
-	cmake-utils_src_configure
-}
diff --git a/app-text/wv2/wv2-0.4.2-r3.ebuild b/app-text/wv2/wv2-0.4.2-r3.ebuild
new file mode 100644
index 000000000000..4b22d2a50e99
--- /dev/null
+++ b/app-text/wv2/wv2-0.4.2-r3.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake flag-o-matic
+
+DESCRIPTION="Excellent MS Word filter lib, used in most Office suites"
+HOMEPAGE="http://wvware.sourceforge.net"
+SRC_URI="mirror://sourceforge/wvware/${P}.tar.bz2"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86"
+IUSE="zlib"
+
+RDEPEND="dev-libs/glib
+	>=gnome-extra/libgsf-1.8:=
+	virtual/libiconv
+	zlib? ( sys-libs/zlib )"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-glib.patch
+	"${FILESDIR}"/${P}-libgsf.patch
+)
+
+DOCS=( AUTHORS ChangeLog README RELEASE THANKS TODO )
+
+src_configure() {
+	# Due to ICU 59 requiring C++11 now
+	append-cxxflags -std=c++11
+
+	local mycmakeargs=(
+		-DWITH_ZLIB=$(usex zlib)
+	)
+
+	cmake_src_configure
+}
diff --git a/app-text/xchm/Manifest b/app-text/xchm/Manifest
index f9aa62f786b6..716a7d1df1fc 100644
--- a/app-text/xchm/Manifest
+++ b/app-text/xchm/Manifest
@@ -1,8 +1,5 @@
 AUX xchm.desktop 251 BLAKE2B 69b8a13fbf6129aedb89f558541728bdce055a585387d1cec49c08f86b6a5d972287b63fe2ba719b83bcab9270e07c1c0d50ccaeff36bc8cd291fa7602a67863 SHA512 c17e6e3957d4c0720e43dd64b169daf221e26652fd6487d2838a4c4aa86cd9640e651d55e6bc28dd4c4cc7b37624baf83df55061583f65eeecc592bd2c9a5e54
 AUX xchm.xml 257 BLAKE2B 0b32e654afe5af057c219830f61989e2266d55c726b90cc73795ab260034e162d16af2ecce463d74feb136b5b7bfd6e8544a56d883c349bf3158f750aba05212 SHA512 c2dc02da01dce9be31c92d95c28d8ada8c9532499d4f5d8875b41a42bd1f070f6f938e7f4cafdb8d42b13298d81eb03c3347e19c70b395f872888fac5a658533
-DIST xchm-1.32.tar.gz 986604 BLAKE2B f2a1d27ee747bb2d599452f1fa91864afbd2d604e9c27322d70c0925c9c313d4c80ab647ed5bb7ae3672687decfaafb2be23f7b9ed09fb95ae7490b0a65d7cab SHA512 e8250660ff28c80ddda62b886b296d98fb60e8d482ad6791c775a51a860ca78e310222bd0f5baa40c941a3f345c0bb07edb932c0417835ab0b090d14b7b4c0f6
 DIST xchm-1.33.tar.gz 886169 BLAKE2B 26b6c664307de3ef1bef21d3fd240b5636f5abc8196c5aa1b7cd6b91f12addbbd5a8c54d133de2fd8ce9132ea2677f79f0ef722b1da6c87429cd3df54d208585 SHA512 06f5c191ef9f2c608259261839d6641f202a21150a6622b8162e06e3cc857802390f551dcef47f25d048b3d407511c5a8cc6aabd3003942006847366ebb08989
-EBUILD xchm-1.32.ebuild 953 BLAKE2B 13415d881258107cdb94802e522cba3f1a4e79a9e3119c80707654cc83265f7df4e4f914e2348cdad3e662e39be76980d5334b03b1100715f9163ce1176ac3e9 SHA512 7689a6f7b4ed8832fe65d45bb307148edce53c0ade7e8eed0f9a67e82b657ecb9cfd7f24256ff9e51aa5fbe2f4505ef4918f2adee32092dbfd247d2feb623c26
-EBUILD xchm-1.33.ebuild 973 BLAKE2B d8615cbe5915e79cf3bf7820edb6ecad52f91738efc9de855986136d7112a0da9549199d1b6ffd6a628aa531834e0da60eb7de75ac5b8c6fcd9d5b750c2006f8 SHA512 1310fb3a0336ac8791396473126984669e3206b5779377ccd2599866fa5cbac3bf0a3ad778945707cd2cbbc0ca98ef1383a7ae5de9d8d8c6ebb660a69a9d02e9
-EBUILD xchm-9999.ebuild 1107 BLAKE2B 735bd0f230d0ea1a8cf34805dccbe600b29dd11fca03ac34dc9c96f96064214667f772a2fb2a67c58cf9a7184688282dab944955df83560426e0954510935e25 SHA512 82a8f548dbae62af0df893eed30cb3b332c1bba1ca1ec3af3a82a1f272fec3b57f159e9bdadfb916f422e822aeb0f55be0563d022b9300fe75642a55d4ea5e6b
+EBUILD xchm-1.33.ebuild 970 BLAKE2B 0fa84e34510016d5639c076a214c235c888d46254822fdafdafe707b2325b10f5ae6f50af2767b9ae591e60ff374bd2d72e4c4b192689a4a6f71173b5465c6d1 SHA512 0d66aef4ee322afc1eae8d49c9b35261cb0d98b0fa462a6ce897cdc0cfc7522fe5f743411fdd2823160262da1429a92908ff6704c79bb6fc564fc70d6087cb6e
 MISC metadata.xml 322 BLAKE2B 66ab995c1a7252d656f8f7b74dd6ae09fd6d83912b16bdff6300ac24eb0271d2d74964147b9c72c7fdc03df42d17d2341b694e07b64cfe793b760a9b8e2cef99 SHA512 1ecb1f165786fcc62a09f792b5316b9434059a0741bd9066493a7875f800ac0402c3b3e835a46491f614fea25806d6220940b38009cc937bef90abbcd46134f9
diff --git a/app-text/xchm/xchm-1.32.ebuild b/app-text/xchm/xchm-1.32.ebuild
deleted file mode 100644
index 4f682b41d68d..000000000000
--- a/app-text/xchm/xchm-1.32.ebuild
+++ /dev/null
@@ -1,47 +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"
-
-inherit desktop wxwidgets xdg-utils
-
-DESCRIPTION="Utility for viewing Compiled HTML Help (CHM) files"
-HOMEPAGE="https://github.com/rzvncj/xCHM/"
-SRC_URI="https://github.com/rzvncj/xCHM/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ~riscv x86"
-IUSE="nls"
-
-RDEPEND=">=dev-libs/chmlib-0.36
-	x11-libs/wxGTK:${WX_GTK_VER}[X]
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}"
-BDEPEND="nls? ( sys-devel/gettext )"
-
-src_configure() {
-	econf $(use_enable nls)
-}
-
-src_install() {
-	default
-
-	domenu "${FILESDIR}"/xchm.desktop
-	insinto /usr/share/mime/packages
-	doins "${FILESDIR}"/xchm.xml
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
diff --git a/app-text/xchm/xchm-1.33.ebuild b/app-text/xchm/xchm-1.33.ebuild
index 27f28acfd7aa..bf624116cb69 100644
--- a/app-text/xchm/xchm-1.33.ebuild
+++ b/app-text/xchm/xchm-1.33.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/rzvncj/xCHM/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~riscv ~x86"
+KEYWORDS="amd64 ppc ~riscv x86"
 IUSE="nls"
 
 RDEPEND=">=dev-libs/chmlib-0.36
diff --git a/app-text/xchm/xchm-9999.ebuild b/app-text/xchm/xchm-9999.ebuild
deleted file mode 100644
index b652fcfc7a2e..000000000000
--- a/app-text/xchm/xchm-9999.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-WX_GTK_VER="3.0-gtk3"
-
-inherit autotools desktop wxwidgets xdg-utils
-
-DESCRIPTION="Utility for viewing Compiled HTML Help (CHM) files"
-HOMEPAGE="https://github.com/rzvncj/xCHM/"
-
-if [[ ${PV} == *9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/rzvncj/xCHM/"
-else
-	SRC_URI="https://github.com/rzvncj/xCHM/releases/download/${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="nls"
-
-RDEPEND=">=dev-libs/chmlib-0.36
-	x11-libs/wxGTK:${WX_GTK_VER}[X]
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}"
-BDEPEND="nls? ( sys-devel/gettext )"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_enable nls)
-}
-
-src_install() {
-	default
-
-	domenu "${FILESDIR}"/xchm.desktop
-	insinto /usr/share/mime/packages
-	doins "${FILESDIR}"/xchm.xml
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
diff --git a/app-text/xmlstarlet/Manifest b/app-text/xmlstarlet/Manifest
index 4fed39b12b7c..22aec36b1789 100644
--- a/app-text/xmlstarlet/Manifest
+++ b/app-text/xmlstarlet/Manifest
@@ -1,3 +1,3 @@
 DIST xmlstarlet-1.6.1.tar.gz 420923 BLAKE2B 56bf29f62549a7445e3cf15b6a3f60558dbcacf96645c3acc5a45b432d61f47614274a5d3e7234399f7dbdb854b503d73a6cfb8989710b7363d743dce4dff8f0 SHA512 4228df812caec7059d7a76986c4d9a4262bd861cc53dca05f341ae6c062be05f1c39fc637918ab00f60f40587c6c556e3c9bfaf8a18b149e3c321a92214dbe8b
-EBUILD xmlstarlet-1.6.1.ebuild 1446 BLAKE2B f9a6499dccb3edcba02665bdc94f2c06b0b3ebb9c65489efa31fef03e70f2954869eaab555532527c184523d15bcbe43bb17a46749c0e0465cc3087bf820c5aa SHA512 16ff0d0dbabc518687cee24decdaab3546c0c595373aaefdc4d618c75a27185183374211ba086037848da2b71df641789a56b8ee35e73a26bc2d4569f5223904
+EBUILD xmlstarlet-1.6.1.ebuild 1437 BLAKE2B df2690179781bbc9ac32ad4bd3d2c8d258652436ad5370bd04e5d2a4a7588b7b8d3ea7491168ba98b46aaab1d40084c6814e03e757ae554f1e5efa304289f92e SHA512 bbb8800b2c6a7929f3e9fa410edbf98dc247d787c976e06a496f821ea89b75dac684d09fec86e12a5b135fb6308302ee1ca490e544130b186fc6f573d4ab4f95
 MISC metadata.xml 294 BLAKE2B 15c32d1ad62c8dc9e94ca2cd9554c9f16dd8eb26194eb24f5810202b9d0da8ab6d2638ebdc2f8c43aa6068de35616f3c29609fa85016f34839ddf46f2ec3be2b SHA512 518df7e45f852b93f924300a846be03d00c8dc9a4ad23d0f90b115e0f1fb98f7b41de45a550d05ccf290fe5cbadffb3dacb4e9d632b64996063b42b4289c80bc
diff --git a/app-text/xmlstarlet/xmlstarlet-1.6.1.ebuild b/app-text/xmlstarlet/xmlstarlet-1.6.1.ebuild
index 0ff17e1a8107..37ed9694ee5f 100644
--- a/app-text/xmlstarlet/xmlstarlet-1.6.1.ebuild
+++ b/app-text/xmlstarlet/xmlstarlet-1.6.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit autotools multilib flag-o-matic toolchain-funcs
+inherit autotools flag-o-matic toolchain-funcs
 
 DESCRIPTION="A set of tools to transform, query, validate, and edit XML documents"
 HOMEPAGE="http://xmlstar.sourceforge.net/"
diff --git a/app-text/xmlto/Manifest b/app-text/xmlto/Manifest
index 32d7aadbccbd..4e0110abe6f4 100644
--- a/app-text/xmlto/Manifest
+++ b/app-text/xmlto/Manifest
@@ -3,5 +3,5 @@ AUX xmlto-0.0.28-allow-links.patch 535 BLAKE2B 71412bff616c9499ed6cf045a5d7ea1e6
 AUX xmlto-0.0.28-dont-hardcode-paths.patch 845 BLAKE2B 37618989b609bc7dd2d94d22fad0562d6e0580541d8f6ec2a222316da89a6744a16cac9b4cd446ef80f58cf415f4a784aefedf53349ea85e98cf33000b7799b6 SHA512 9947787a1c3ebbd0a73e271ebab3dfcd01b7aad3bcaa627e7a236947bc7edbc23696c38f96aae62785013e2ac8c5171ce6f386f655676a4cde8d820f49d5df7d
 DIST xmlto-0.0.28.tar.bz2 127921 BLAKE2B 12ef3e2e1436c330e7b003d08f4a4d4032d70255777956949eb8b47b6f5466e7c158b0f85dc87069c1e379603cac0b01c88589f98ca1ef9e862f0aef31169f6d SHA512 6e0c4968d4f1b7a3b132904182aa72a73f6167553eabdeb65cfafa6295ef7b960541685769d04144207963cca77b0c44db4f9fbb2796348ffcb37b3b399f18f1
 EBUILD xmlto-0.0.28-r6.ebuild 1434 BLAKE2B 0d9830777786cdad0b056f0f9e4b3c60d7dae2c5fa89bcd90e81d9b0e7a538523f5ee918f7944c18179bad04a0eaf581c1bc4f83e40f02856e70fb89c3282987 SHA512 e6e3c76f5a90e308f29f2a2b4cf61f3d5462322c92a6537be718b73e007e5b2ab92d501d4be72580feb4da8a14ba1f75e0bfcb62b3d1f4856e305202b49e7ea5
-EBUILD xmlto-0.0.28-r8.ebuild 1496 BLAKE2B 1169a22eb7e73831633e5cf73817a95c05b214cbfc846570392ce98e089fbacbe1c87f9383a39bb8f5e1981b08df7627ddac43095d6157e5f423fb5482721f9e SHA512 4cf19496ccf9ff462da5547d2df92edd80dde84c409ac594dc2187068c150cf7d074ebe84ba88b823e71f5c10e1208632a21061a7a9d545e9a9a62b3f135d0b8
+EBUILD xmlto-0.0.28-r8.ebuild 1490 BLAKE2B e78ce11b8550451cc51ea21456ec0af754c6d94bc0adc214adaaf0e315e2f7acbd5513fcc0f657ee946f38732c5c085bc5f6bd2dd63f7462e77b9634058d97cd SHA512 bc26bac1a7d1bb90ffdd17c9bf46d4d87413291a6b4ff7b71014681b97a1d5ca3c02dd54875a5b405139bd59df6c4ce7565a347b24c3d01c47ac19e534b196ac
 MISC metadata.xml 324 BLAKE2B 3cabb2600d6843ebecec023a16fef87a40432202ff195a6130e57f97802d4c0ed2e82ffee506c65afe554291f05c64c7ae2fe524c708db7a9c6bf4a71c4c8710 SHA512 19ed2fabc04f96b1b61495e2fdba674ca4b4a9a1cee11b3cb13baec6d9e7fe0d82b653a0cbb523de3fcd4ed1ef18d8111686f8b618db9924674ee274ae5a21ed
diff --git a/app-text/xmlto/xmlto-0.0.28-r8.ebuild b/app-text/xmlto/xmlto-0.0.28-r8.ebuild
index c54987d45d2f..d28ba15e6679 100644
--- a/app-text/xmlto/xmlto-0.0.28-r8.ebuild
+++ b/app-text/xmlto/xmlto-0.0.28-r8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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/xournalpp/Manifest b/app-text/xournalpp/Manifest
index d0d6951fb4d3..402506bb9d93 100644
--- a/app-text/xournalpp/Manifest
+++ b/app-text/xournalpp/Manifest
@@ -1,5 +1,10 @@
 AUX xournalpp-1.0.18-nostrip.patch 498 BLAKE2B 451eff71c86eff703d7b9dbee910c8938e10fe963d416c10fc0a5da04071672a26313d7c6fd887e960df3dc9b717a74d7b3974020ea6dfafefe2f06ec539cd6e SHA512 b883ba8094f46462c8415df10154fcbe2e773df981bc31fae5695a7d34de97bb984aa7b912cab3c9dcb121f10d52796c766f295d1d6a6ff424fa4d99a9f04e2e
+AUX xournalpp-1.1.1-nocompress.patch 2302 BLAKE2B 1f381d9cc89725aa2ab04c71ceb65c8bf3fad11979c4c689570c9153a9eff456644a38ddee89468f1de976c6e1d837ef46fbb88a771f7eabb1edfa784c51b7ff SHA512 f5222e7764fbbbf8fa20ee8b32609e3d001537c0ac6ef80ab44a8346f6b5545d1339577f4c4001b3516504d9dce45cf441317881a8ede8e331ede7060c197e48
+AUX xournalpp-1.1.1-nostrip.patch 1037 BLAKE2B 5016e48f6abd9368ae703f693efe3ae84d395c939f08e9244443c6aaee794729abbc52195816c7e21f08c751b8c953fef3ffda1c0f0ea73a0203f243f614e81d SHA512 5651db0248ad71967412d33cc2f39b8638c38c185635936e988ef7561dd7a51ebb0c7be803a69b7b4eb4cc548dfd237f2920b2b8c8dd779a38b90b4b28e322e1
 DIST xournalpp-1.0.20.tgz 14895705 BLAKE2B f1a4721f4f0b2f0e666c7466d7ddbd1f299172576d5f86b4ab8150d3bf05231cc7bb40e750394d892fe8ce32b6106e29456e3e9fa976b1bf07a808bf1bfff953 SHA512 c73783d5e40262b2c6f7f6be372839c73a19ab25fc258a7524660654526a3a35a6ba16ba282f793e7982ff97d006703c103fdd579fc16a3e636bf6daf94fe346
+DIST xournalpp-1.1.1.tgz 15093900 BLAKE2B 87988bc78a0d904f1e3533e393bcdfc7b76517f6cc13343cb63ceaa83de25eca885274238ce45840334ea653964c9cd1834fc22d5b2c89a731ae5616f01f22c8 SHA512 efba97d26f624e3a1b8164ef6333a0f1d2992d0245414bdb51692d845965f6c37071f687520b43a94f713465796a16cbafd8929fd3bf8e6c3face847df92251d
 EBUILD xournalpp-1.0.20.ebuild 919 BLAKE2B 7528a7ca321f0d96b1e6bf3577457aa71e079599674064dc0e9be296a39736399daeb03fce279f965f25366921245a386ff374fb52236a05a5bbea0c6d8476ed SHA512 93e304cfa2d0e63523eda840b7e65572bf7ec1263cbf02d60c8a5dbc91b6efd587f53921cba2705d138150480cebd53317efe0968f36046ab351d8223532a9d4
-EBUILD xournalpp-9999.ebuild 845 BLAKE2B 054a68301b4d46cf6dd3a7a768d113b1782775612a768181fb4c384e2ba16b6e1f21abbacf05bb3b7a6396d026164cd462273a7f05b3d24d4a5cab310229e54f SHA512 a2a7f9a71aeea60780b89cc0cf3a0ef0a62c3de72c6fa0f9a3863a4245069975ae230a14aac59940bcad919edb031d686bf0c7a3f2da444fc836eb911e510d26
+EBUILD xournalpp-1.1.1-r1.ebuild 1020 BLAKE2B fcf320ceb2c2f98ea1f67733e35dd635fad716ef82ef51d6d7ef6be2918207c4f5c669f0bc6996aafdac83cedab2f398968402afe9f30c8b7ca4dd1e3a54e36b SHA512 fb359216608c29ab46fedf91bb1a6b9ccec6f91a1fc53da5e809508c76993e87d524cc8167faa7b8271fc1935af898bbe31655dba5fe29bcc668e7c479855058
+EBUILD xournalpp-1.1.1.ebuild 883 BLAKE2B 359cb7146ce2b94f0bfc8a836c589b0d7212cfcc2e76bb4c5c7aa476652494c0c0541718ca2c72e1b877db971ec66e7ad9731218a9472736726cc4f77dc3eff8 SHA512 41f852b1c631f229e3e9e9de8b80233eb4b0c9dc1a06eff9e2afdf761b5640f7fb788259815a29864077c256642dff5228a45ff2b68bb47a987c457fc2b24610
+EBUILD xournalpp-9999.ebuild 1020 BLAKE2B fcf320ceb2c2f98ea1f67733e35dd635fad716ef82ef51d6d7ef6be2918207c4f5c669f0bc6996aafdac83cedab2f398968402afe9f30c8b7ca4dd1e3a54e36b SHA512 fb359216608c29ab46fedf91bb1a6b9ccec6f91a1fc53da5e809508c76993e87d524cc8167faa7b8271fc1935af898bbe31655dba5fe29bcc668e7c479855058
 MISC metadata.xml 221 BLAKE2B 4b8e1435358aa300f6debd1760de3509ae9e0ae2678b4d55057c3940efa9b15d62881ac988725e58cce5d2cf63d1de6791cb0b98aa797eecbcdd29c85d8a682f SHA512 40bf10d939c1f6ba4a0594cff7f4a44c16660489226a9a23a6e9327a43dbf757b42a8be0bc8d82daa8818b90c1b4f8c3d093a6b9f36ca15dc36301cda2a308dc
diff --git a/app-text/xournalpp/files/xournalpp-1.1.1-nocompress.patch b/app-text/xournalpp/files/xournalpp-1.1.1-nocompress.patch
new file mode 100644
index 000000000000..dc3ecca1bad0
--- /dev/null
+++ b/app-text/xournalpp/files/xournalpp-1.1.1-nocompress.patch
@@ -0,0 +1,53 @@
+From 91319980ebddf80f797118fd67bf95b509b31725 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20K=2E=20H=C3=BCttel?= <dilfridge@gentoo.org>
+Date: Sat, 26 Feb 2022 19:05:39 +0100
+Subject: [PATCH 2/2] Do not compress manpages, this is done by the package
+ manager
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Andreas K. Hüttel <dilfridge@gentoo.org>
+---
+ man/CMakeLists.txt | 12 ++++--------
+ 1 file changed, 4 insertions(+), 8 deletions(-)
+
+diff --git a/man/CMakeLists.txt b/man/CMakeLists.txt
+index 499d9297..974aea4b 100644
+--- a/man/CMakeLists.txt
++++ b/man/CMakeLists.txt
+@@ -9,27 +9,23 @@ mark_as_advanced(HELP2MAN)
+ if (HELP2MAN)
+   set(MAN_INCLUDE "${PROJECT_SOURCE_DIR}/man/extra.groff")
+   set(MAN_PAGE "${CMAKE_CURRENT_BINARY_DIR}/xournalpp.1")
+-  set(MAN_FILE "${CMAKE_CURRENT_BINARY_DIR}/xournalpp.1.gz")
+ 
+   add_custom_command(
+-      OUTPUT ${MAN_FILE}
++      OUTPUT ${MAN_PAGE}
+       COMMAND ${HELP2MAN} --no-info -i ${MAN_INCLUDE} -o ${MAN_PAGE} --version-string=${PROJECT_VERSION} --name="open-source hand note-taking program" ${CMAKE_BINARY_DIR}/src/xournalpp
+-      COMMAND gzip -n -f -9 ${MAN_PAGE}
+       DEPENDS ${CMAKE_BINARY_DIR}/src/xournalpp
+   )
+ 
+   set(MAN_PAGE_THUMBNAILER "${CMAKE_CURRENT_BINARY_DIR}/xournalpp-thumbnailer.1")
+-  set(MAN_FILE_THUMBNAILER "${CMAKE_CURRENT_BINARY_DIR}/xournalpp-thumbnailer.1.gz")
+ 
+   add_custom_command(
+-      OUTPUT ${MAN_FILE_THUMBNAILER}
++      OUTPUT ${MAN_PAGE_THUMBNAILER}
+       COMMAND ${HELP2MAN} --no-info  --no-discard-stderr -o ${MAN_PAGE_THUMBNAILER} --version-string=${PROJECT_VERSION} --name="creates thumbnails" ${CMAKE_BINARY_DIR}/src/xoj-preview-extractor/xournalpp-thumbnailer
+-      COMMAND gzip -n -f -9 ${MAN_PAGE_THUMBNAILER}
+       DEPENDS ${CMAKE_BINARY_DIR}/src/xoj-preview-extractor/xournalpp-thumbnailer
+   )
+ 
+-  add_custom_target(manpage ALL DEPENDS ${MAN_FILE} ${MAN_FILE_THUMBNAILER})
+-  install(FILES ${MAN_FILE} ${MAN_FILE_THUMBNAILER} DESTINATION "share/man/man1")
++  add_custom_target(manpage ALL DEPENDS ${MAN_PAGE} ${MAN_PAGE_THUMBNAILER})
++  install(FILES ${MAN_PAGE} ${MAN_PAGE_THUMBNAILER} DESTINATION "share/man/man1")
+ else(HELP2MAN)
+   message("help2man is missing; no man pages will be generated")
+ endif(HELP2MAN)
+-- 
+2.34.1
+
diff --git a/app-text/xournalpp/files/xournalpp-1.1.1-nostrip.patch b/app-text/xournalpp/files/xournalpp-1.1.1-nostrip.patch
new file mode 100644
index 000000000000..0698bc443fda
--- /dev/null
+++ b/app-text/xournalpp/files/xournalpp-1.1.1-nostrip.patch
@@ -0,0 +1,31 @@
+From 9686113b760cf5838a63ba6bee438ec3b7ab99e8 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20K=2E=20H=C3=BCttel?= <dilfridge@gentoo.org>
+Date: Sat, 26 Feb 2022 19:01:17 +0100
+Subject: [PATCH 1/2] Do not explicitly strip the thumbnailer (why?)
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Andreas K. Hüttel <dilfridge@gentoo.org>
+---
+ src/xoj-preview-extractor/CMakeLists.txt | 4 ----
+ 1 file changed, 4 deletions(-)
+
+diff --git a/src/xoj-preview-extractor/CMakeLists.txt b/src/xoj-preview-extractor/CMakeLists.txt
+index 50d1b410..b653d983 100644
+--- a/src/xoj-preview-extractor/CMakeLists.txt
++++ b/src/xoj-preview-extractor/CMakeLists.txt
+@@ -41,10 +41,6 @@ target_include_directories (xournalpp-thumbnailer PRIVATE ${librsvg_INCLUDE_DIRS
+ 
+ set (THUMBNAILER_BIN "xournalpp-thumbnailer")
+ 
+-add_custom_command (TARGET xournalpp-thumbnailer POST_BUILD
+-  COMMAND ${CMAKE_STRIP} ${THUMBNAILER_BIN}
+-)
+-
+ ## Install ##
+ 
+ install (TARGETS xournalpp-thumbnailer
+-- 
+2.34.1
+
diff --git a/app-text/xournalpp/xournalpp-1.1.1-r1.ebuild b/app-text/xournalpp/xournalpp-1.1.1-r1.ebuild
new file mode 100644
index 000000000000..761bc8769f66
--- /dev/null
+++ b/app-text/xournalpp/xournalpp-1.1.1-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake xdg
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/xournalpp/xournalpp.git"
+	unset SRC_URI
+else
+	KEYWORDS="~amd64 ~ppc64"
+	SRC_URI="https://github.com/xournalpp/xournalpp/archive/refs/tags/v${PV}.tar.gz -> ${P}.tgz"
+fi
+
+DESCRIPTION="Handwriting notetaking software with PDF annotation support"
+HOMEPAGE="https://github.com/xournalpp/xournalpp"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+COMMONDEPEND="
+	app-text/poppler[cairo]
+	dev-libs/glib
+	dev-libs/libxml2
+	dev-libs/libzip:=
+	gnome-base/librsvg
+	media-libs/portaudio[cxx]
+	media-libs/libsndfile
+	sys-libs/zlib:=
+	x11-libs/gtk+:3
+"
+RDEPEND="${COMMONDEPEND}
+"
+DEPEND="${COMMONDEPEND}
+"
+BDEPEND="
+	virtual/pkgconfig
+	sys-apps/lsb-release
+	elibc_musl? ( sys-libs/libbacktrace )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.1.1-nostrip.patch"
+	"${FILESDIR}/${PN}-1.1.1-nocompress.patch"
+)
+
+src_prepare() {
+	cmake_src_prepare
+}
diff --git a/app-text/xournalpp/xournalpp-1.1.1.ebuild b/app-text/xournalpp/xournalpp-1.1.1.ebuild
new file mode 100644
index 000000000000..2c5a3a5f0527
--- /dev/null
+++ b/app-text/xournalpp/xournalpp-1.1.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake xdg
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/xournalpp/xournalpp.git"
+	unset SRC_URI
+else
+	KEYWORDS="~amd64 ~ppc64"
+	SRC_URI="https://github.com/xournalpp/xournalpp/archive/refs/tags/v${PV}.tar.gz -> ${P}.tgz"
+fi
+
+DESCRIPTION="Handwriting notetaking software with PDF annotation support"
+HOMEPAGE="https://github.com/xournalpp/xournalpp"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+COMMONDEPEND="
+	app-text/poppler[cairo]
+	dev-libs/glib
+	dev-libs/libxml2
+	dev-libs/libzip:=
+	gnome-base/librsvg
+	media-libs/portaudio[cxx]
+	media-libs/libsndfile
+	sys-libs/zlib:=
+	x11-libs/gtk+:3
+"
+RDEPEND="${COMMONDEPEND}
+"
+DEPEND="${COMMONDEPEND}
+"
+BDEPEND="
+	virtual/pkgconfig
+	sys-apps/lsb-release
+"
+
+src_prepare() {
+	cmake_src_prepare
+}
diff --git a/app-text/xournalpp/xournalpp-9999.ebuild b/app-text/xournalpp/xournalpp-9999.ebuild
index a2510c4f8952..761bc8769f66 100644
--- a/app-text/xournalpp/xournalpp-9999.ebuild
+++ b/app-text/xournalpp/xournalpp-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit cmake xdg
 
@@ -10,8 +10,8 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/xournalpp/xournalpp.git"
 	unset SRC_URI
 else
-	KEYWORDS="~amd64"
-	SRC_URI="https://github.com/xournalpp/xournalpp/archive/${PV}.tar.gz -> ${P}.tgz"
+	KEYWORDS="~amd64 ~ppc64"
+	SRC_URI="https://github.com/xournalpp/xournalpp/archive/refs/tags/v${PV}.tar.gz -> ${P}.tgz"
 fi
 
 DESCRIPTION="Handwriting notetaking software with PDF annotation support"
@@ -26,6 +26,7 @@ COMMONDEPEND="
 	dev-libs/glib
 	dev-libs/libxml2
 	dev-libs/libzip:=
+	gnome-base/librsvg
 	media-libs/portaudio[cxx]
 	media-libs/libsndfile
 	sys-libs/zlib:=
@@ -38,8 +39,14 @@ DEPEND="${COMMONDEPEND}
 BDEPEND="
 	virtual/pkgconfig
 	sys-apps/lsb-release
+	elibc_musl? ( sys-libs/libbacktrace )
 "
 
+PATCHES=(
+	"${FILESDIR}/${PN}-1.1.1-nostrip.patch"
+	"${FILESDIR}/${PN}-1.1.1-nocompress.patch"
+)
+
 src_prepare() {
 	cmake_src_prepare
 }
diff --git a/app-text/yelp-tools/Manifest b/app-text/yelp-tools/Manifest
index 84b4ddc274ab..102bea1b73f1 100644
--- a/app-text/yelp-tools/Manifest
+++ b/app-text/yelp-tools/Manifest
@@ -1,5 +1,3 @@
-DIST yelp-tools-40.0.tar.xz 38708 BLAKE2B d9533fefc6a9416ed6f887971db62a7db6baed4f65aaf1e03d20c98fa23efb3af9f10189af0284bde3837f58f662f4ca4be8275d597a7c799a14585c87e6ec10 SHA512 b89e514cdc2c6ff96097af0cab5694e9f1dfd2a125e08f99a69c0e7dd51e1e1a859c2e6eec656ecea6103bfc65733e1256a77ef992454db4a554567b46fa2628
 DIST yelp-tools-41.0.tar.xz 38696 BLAKE2B 6e742e0a5c05c07fb3eb80fc10201650597fb36702edb1d9fc022895daf2837daed15a2b69b8bed7aaf0106139c7138e8f13b65b63cf18971e14eaeb0068b061 SHA512 76b8f9568942426698716d655bc2e7a614a26e40a820d1f4ce5021a54c6baa081d494bda06657cfc1c11999e14a8601c97ae51bb3519555b8ee1111489c0e10e
-EBUILD yelp-tools-40.0.ebuild 938 BLAKE2B 72ba4da0112a0d1d13e720332060301b315576315977fc03038f41908fea2c4a515e2dd7e5d4d475c6d23a3154ead23c72dcdd844f1688acbe89fed419a4adbc SHA512 1032d3a2b1a705bac569c14561caaa60a92afa306453b9772871c45277234c4c983f33bce75e432be9ec884938da7c1d27a46c490d965087ab8ebd856cee25eb
-EBUILD yelp-tools-41.0.ebuild 945 BLAKE2B 3ca6b1c1c0ba50745f8fbcb0202409ac1c01029a5e2253fdbc4b91b1b618232e114141a8e48f8e18961efce99fd33c14bdcdf8a5a4a2e1e682b277bafe5f9503 SHA512 298ef364d6569e4fde1f56a58cf335f681800997d9e8f602fca6e462c712c196d16efe0f0e1c1ba664799cd330011a716998683a3c0cf3ff8751b7f9bfc7bb12
+EBUILD yelp-tools-41.0.ebuild 938 BLAKE2B fcf0fe7e317d01bebcb1367f6b4fc2a6634031bf699b6f1b3f1dd4466904214f026e12a81cf5090c72ce0593715f1ba8dea4ee597161258c38f1cd46cde3dbb5 SHA512 b510ec02125d500cd606cab89f52230ecbb1339d71c97d4287f66e0583ad7584034cc39af7d987a8d01bb5357819f3dee918ef11f0a303853852f47369d72d8a
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/app-text/yelp-tools/yelp-tools-40.0.ebuild b/app-text/yelp-tools/yelp-tools-40.0.ebuild
deleted file mode 100644
index df5d518f592c..000000000000
--- a/app-text/yelp-tools/yelp-tools-40.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..10} )
-inherit gnome2 meson python-single-r1
-
-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 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	$(python_gen_cond_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
-	>=dev-libs/libxml2-2.6.12
-	>=dev-libs/libxslt-1.1.8
-	dev-util/itstool
-	>=gnome-extra/yelp-xsl-3.38
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_install() {
-	meson_src_install
-	python_fix_shebang "${ED}"/usr/bin/yelp-{build,check,new}
-}
diff --git a/app-text/yelp-tools/yelp-tools-41.0.ebuild b/app-text/yelp-tools/yelp-tools-41.0.ebuild
index 5ecbd011540a..4e78eaca75ea 100644
--- a/app-text/yelp-tools/yelp-tools-41.0.ebuild
+++ b/app-text/yelp-tools/yelp-tools-41.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="
diff --git a/app-text/zathura-cb/Manifest b/app-text/zathura-cb/Manifest
index 49fc8a0081bc..b07daafa3aa8 100644
--- a/app-text/zathura-cb/Manifest
+++ b/app-text/zathura-cb/Manifest
@@ -1,4 +1,6 @@
 DIST zathura-cb-0.1.8.tar.xz 5616 BLAKE2B bfce33d56f7a28ae66f8bbee4bbb164238abba7ae3de0e7d9dd0874516b703a4e841749dd825a618aa09204e06a3fa339832412cd5b1cacf6814c4292634052e SHA512 ca9b57e59f3955afabb246b8f71989647ce4c86f7f59aa13e4d7150f22dfb1bd64642efc155bba5997633d8bf5144e7ef42bea05512a2c2d20e13fb180c89cb8
+DIST zathura-cb-0.1.9.tar.xz 5848 BLAKE2B 665efbc8dc83585dc3a55a31d92b8ebdb92eba955aa8f5f74b7e055c096046ce4b1f02e2d2b06e73fe3351c1c113bfae298eade9a6ee34beec68c4d39b335da5 SHA512 5c45f112a077af53caec6fbdfc46ffdf20e9f923d97b69395e327cf05e131b3cd2db617d5650bc0cace0935719d8e68645230d7de9ddc1a8d4fbc01ede0f72cc
 EBUILD zathura-cb-0.1.8.ebuild 895 BLAKE2B 9b6a276bcbd0685f05aec8f492b25f168be8ff1d5a2395f91c336fd6ec33205a70084f2dbc7dc88c7322f47c9c65c072ae922650bfbb6f730cee25319215955f SHA512 a4d85eb270e731c207c8ac69646f35302f6ebcb5ba80711d77203d7cd8cece902808ac41f3a7b598d910fe3ff84daede5eabbe780572159142488a436f9c9232
+EBUILD zathura-cb-0.1.9.ebuild 893 BLAKE2B 10d8d81684467fc0676cec24e554fbd204b9d58ce6df85d2ce9873d193a8aa89bc349afea4457546c11e02207b6e4a2bf1dff76c1202bf7f2284fd25850223d0 SHA512 284c23d10550e71915600ab7a7d6f491d2e97334ee7c0d51fe1f690a5c992f427202c0eb0de443be45695b03a11dafa331bef59b5c7c79cddcadea560f7303b7
 EBUILD zathura-cb-9999.ebuild 898 BLAKE2B 591b8e8c047fe736b2271d6ee4f685b6443fc7919146ff8dfaae88bddaa3c70d3aea48f766f3bece87d3360e5437bc2ff55a85e8c8442bb0eef59e2e9be8dc56 SHA512 603db72b8c1e77da38575f97d6523dbd02a8c32823298ed2532e0871353854c2cf4280f35f085eb02968ff999db9f5630bcd7666d71f70c0f71413c27acb77c5
 MISC metadata.xml 583 BLAKE2B ca246e0a76aa83c55397bb48f58b196e816b11fa1c873a49b21ebee38512566d377b23ea926377ae8a08325d8494e49a12aad7caa2b8a3a19a1342ab2f8178ce SHA512 81c6f5d849fd80dd4b226db01e97f34ce8ae6affafd6b680ae31130484859983f1f1c7eaa5abaec9ca9c225fe7a7b3ecd0481f44fc9861b8c488e3c0aba24166
diff --git a/app-text/zathura-cb/zathura-cb-0.1.9.ebuild b/app-text/zathura-cb/zathura-cb-0.1.9.ebuild
new file mode 100644
index 000000000000..3686e39e9456
--- /dev/null
+++ b/app-text/zathura-cb/zathura-cb-0.1.9.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson xdg-utils optfeature
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura-cb.git"
+	EGIT_BRANCH="develop"
+else
+	KEYWORDS="~amd64 ~arm ~riscv ~x86"
+	SRC_URI="https://pwmt.org/projects/zathura-cb/download/${P}.tar.xz"
+fi
+
+DESCRIPTION="Comic book plug-in for zathura with 7zip, rar, tar and zip support"
+HOMEPAGE="https://pwmt.org/projects/zathura-cb/"
+
+LICENSE="ZLIB"
+SLOT="0"
+
+DEPEND="app-arch/libarchive:=
+	>=app-text/zathura-0.3.9
+	dev-libs/girara
+	dev-libs/glib:2
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:3"
+
+RDEPEND="${DEPEND}"
+
+BDEPEND="virtual/pkgconfig"
+
+pkg_postinst() {
+	xdg_desktop_database_update
+
+	optfeature "jpeg support" x11-libs/gdk-pixbuf[jpeg]
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/app-text/zathura-pdf-mupdf/Manifest b/app-text/zathura-pdf-mupdf/Manifest
index a2d7d2e8aa04..d2cd67a980a2 100644
--- a/app-text/zathura-pdf-mupdf/Manifest
+++ b/app-text/zathura-pdf-mupdf/Manifest
@@ -1,6 +1,8 @@
 DIST zathura-pdf-mupdf-0.3.6.tar.gz 8925 BLAKE2B ee74a1655da7d16070b8909dd0f44239eb21055a40a525b766dc3d9e81f84377abe0623ba33925a25739bccf885f8967496be30c27e421d30b1a78dd64b84aee SHA512 f6783c3fc08849d7dc6fd527b7fcdb51d4ef9214379ca6b4dc6d29e75b10f37e3ada2046e205449a7d0465f07e65a6cf3f2f44fba98360cba16676e705390a97
 DIST zathura-pdf-mupdf-0.3.7.tar.gz 8957 BLAKE2B e25412423ba8ec7c9c96d320129f9a3e71a974a118476f2720a356a0c51476f7c827d16b4fbb00d4cebcd803e75ff34b5e7d5c024db57fae17861c137487e021 SHA512 1e27bcf0fc2eb730e77d3dab7c25575e0ae830ca251f380d740a4b8bef588122d279b2c97a7b75fb749daaf24bb458cd54ec7a11321d75bfb5c1b4b0dc0fccac
-EBUILD zathura-pdf-mupdf-0.3.6.ebuild 820 BLAKE2B 8b7e4971575be372a30c98a8fbd348e3df257adcc1e4e2a02a0c09d8c3967e3e7c6c352fb98c239aff269eddbd765f6fce0e0995ef07f8b6fc56bcd4851a8cb8 SHA512 866df18c6496c891994782243fcea2fbd3301042e12f1cdb1358fe7195e30fa23e469ec462c604ad27250f235ff4833ec65664cfc571f0751b507b790d6ef4b6
-EBUILD zathura-pdf-mupdf-0.3.7-r1.ebuild 788 BLAKE2B d2693364d49dfb413554148616d543faaabee72dcf2edd047092ff75b40c16520b90afef49d1e0b4b35b1df367be4ee570786468e7775a63fac03f7ed8edf831 SHA512 832eada866899d6eb5b85f05fd26b1268b76b378d6ec05781f49dad5353c41f6f8cd5f1d888129d31d6cc66dd9d47b9941abbf3102caad62d8e254af293c2e7a
-EBUILD zathura-pdf-mupdf-9999.ebuild 791 BLAKE2B 1c404c508b0dc647056799051ca1eebee5e340f8031f306fe9bbfe08dd5d9719532eb4dc5e22ab5659001d90860488f1b14ceceb35175c5c44056314a6f94032 SHA512 376fd36b73f1fcaeec6e72cabef9f2b7afb646a6b27262b6b2ab360502e55ac195ee9d4d8a8461ea24953304ab458093e49522ec48ae76b55343a9b7b09d82da
-MISC metadata.xml 830 BLAKE2B fbae9ee1ad786f6defe68a52311be5334c0699a67aaddb17ee4e1d09df395f01ab7484dfe370e269ed0c52f0af94e7493d6a535eda1ed6696f50aba81ec55337 SHA512 5692ec06aef6fbff3cb481c2b3706601c0dfea1c61e570cb9077548a9b48627a3c2fd85a2a6993ef10046adca3edcbabf67fec524dcbd29a10ca09d09a4e9150
+DIST zathura-pdf-mupdf-0.3.8.tar.gz 9198 BLAKE2B b873d3352d4f324d5dfceebe0ca1cd13e5e5b9bbedf89a5fdae553a2d2cf59ece455bbe931fc021310a7be3c765663ef73931016d48abaedaf2d3488f96d0866 SHA512 5742f22fc919af390a8a42f64640c36aaf1499a20d1c6603e70cc47b3f6634dafc94a31bfbb30c88524ac0c18c040f0fd6c63d236dbb556784cb17a9b0446374
+EBUILD zathura-pdf-mupdf-0.3.6.ebuild 802 BLAKE2B 0d21f475acdc3b1db922101a735e23aa981ed6eac5f9998cd9f6c149ffbf4f127a76bff6dd2bb95fc610ad29367f498325de498f259a14ff46a5c8462b9822c5 SHA512 9f9e1d8f6600d6689a8f67d20cfea8a98b2884522e2e213ae48b33b6c229433f2e10cc502b7ee60672ead65ac6385096f812b07318dd4f082faaf7eae8a96c84
+EBUILD zathura-pdf-mupdf-0.3.7-r1.ebuild 770 BLAKE2B b03dbb81d5570940d90c4f91c755a5c95ff9e09b9932a44e8a0edcad2811762f8ddf20d78fa17dafe91d3e7984c9bbe5f0c9b7cb89032f1d6fee4a1dbf42db9a SHA512 3284605db9a02201670e81ce465bd8c3005b4755114ba2e92dfe76fd60242d5cfaa5ce32bc1ed53f90be60213a5ed7e089db4ae98ae6f81380b5d06e4ec8b6d6
+EBUILD zathura-pdf-mupdf-0.3.8.ebuild 831 BLAKE2B c2f8f64744a4aaa57708745edb3d3256e22f51d0e96643376fb79b3af96e2904000b2a2b0fb5af9123d886da83d91544787e1e29e3bc485b507f3e7e2a33bd3e SHA512 1bafe45d1a7c84105845607d3676c5cfb912d49d1263316d6a1f39eee2315078ff3b52231d9f07a4276cd30aa789e92c75d467c26e5c3453739181d487676424
+EBUILD zathura-pdf-mupdf-9999.ebuild 846 BLAKE2B d950486cfcd743d7eb94028936de5987a8e179fb27b4b7bed7bc777990839b917beaaaf817deb847d7f7397a316940f608e5e7eea7f32b7a40a399a6884a0f5c SHA512 239dfe881f0c965a5e61efae8add848111e2f3734743bf4c66aefce9b1076ec05b4dac92ba64c122358ba50e3764fcda3c549eec629d82e484f0b6223c5cf905
+MISC metadata.xml 827 BLAKE2B 3260695042be5b2fa3df9337f1888467d43d79c210d466c9cad94c12f50400563e3c7a34aaa920d43160835fa90267c39a8266a927c184b60b86ab520a9deafc SHA512 1129c85640589275b1a973de6b5b61cfd1e54a294cb405e9e6b42e6b58bc92e3f82cfded1f6e7e8d49f2d81203f761a871085771c4eb0b2fe11cb1da190b3e5c
diff --git a/app-text/zathura-pdf-mupdf/metadata.xml b/app-text/zathura-pdf-mupdf/metadata.xml
index 90a532bc0a5f..348798600314 100644
--- a/app-text/zathura-pdf-mupdf/metadata.xml
+++ b/app-text/zathura-pdf-mupdf/metadata.xml
@@ -18,8 +18,7 @@
 			<email>sebastian+dev@ramacher.at</email>
 		<name>Sebastian Ramacher</name>
 		</maintainer>
-		<changelog>http://pwmt.org/projects/zathura/download/</changelog>
-		<doc lang="en">http://pwmt.org/projects/zathura/</doc>
-		<bugs-to>http://bugs.pwmt.org/</bugs-to>
+		<doc lang="en">https://git.pwmt.org/pwmt/zathura-pdf-mupdf/-/blob/master/README.md</doc>
+		<bugs-to>https://git.pwmt.org/pwmt/zathura-pdf-mupdf/-/issues</bugs-to>
 	</upstream>
 </pkgmetadata>
diff --git a/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.3.6.ebuild b/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.3.6.ebuild
index c9664c2423f9..1be8dffa6bb1 100644
--- a/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.3.6.ebuild
+++ b/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.3.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_BRANCH="develop"
 else
 	KEYWORDS="amd64 arm x86"
-	SRC_URI="https://github.com/pwmt/zathura-pdf-mupdf/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://git.pwmt.org/pwmt/${PN}/-/archive/${PV}/${P}.tar.gz"
 fi
 
 DESCRIPTION="PDF plug-in for zathura"
diff --git a/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.3.7-r1.ebuild b/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.3.7-r1.ebuild
index 36993e63161f..9c4eda569f63 100644
--- a/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.3.7-r1.ebuild
+++ b/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.3.7-r1.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_BRANCH="develop"
 else
 	KEYWORDS="amd64 arm x86"
-	SRC_URI="https://github.com/pwmt/zathura-pdf-mupdf/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://git.pwmt.org/pwmt/${PN}/-/archive/${PV}/${P}.tar.gz"
 fi
 
 DESCRIPTION="PDF plug-in for zathura"
diff --git a/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.3.8.ebuild b/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.3.8.ebuild
new file mode 100644
index 000000000000..f77ce12d862e
--- /dev/null
+++ b/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.3.8.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson xdg
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura-pdf-mupdf.git"
+	EGIT_BRANCH="develop"
+else
+	KEYWORDS="~amd64 ~arm ~x86"
+	SRC_URI="https://git.pwmt.org/pwmt/${PN}/-/archive/${PV}/${P}.tar.gz"
+fi
+
+DESCRIPTION="PDF plug-in for zathura"
+HOMEPAGE="https://git.pwmt.org/pwmt/zathura-pdf-mupdf"
+
+LICENSE="ZLIB"
+SLOT="0"
+
+DEPEND=">=app-text/mupdf-1.19:=
+	>=app-text/zathura-0.3.9
+	dev-libs/girara
+	dev-libs/glib:2
+	x11-libs/cairo"
+
+RDEPEND="${DEPEND}"
+
+BDEPEND="app-text/tesseract
+	dev-lang/mujs
+	media-libs/leptonica
+	virtual/pkgconfig"
+
+src_prepare() {
+	sed -i -e '/mupdfthird/d' meson.build || die "Failed removing mupdfthird from meson.build"
+
+	default
+}
diff --git a/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-9999.ebuild b/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-9999.ebuild
index 35451c79f998..657da8ef975a 100644
--- a/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-9999.ebuild
+++ b/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -7,20 +7,20 @@ inherit meson xdg
 
 if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
-	EGIT_REPO_URI="https://github.com/pwmt/zathura-pdf-mupdf.git"
+	EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura-pdf-mupdf.git"
 	EGIT_BRANCH="develop"
 else
 	KEYWORDS="~amd64 ~arm ~x86"
-	SRC_URI="https://github.com/pwmt/zathura-pdf-mupdf/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://git.pwmt.org/pwmt/${PN}/-/archive/${PV}/${P}.tar.gz -> ${P}.tar.gz"
 fi
 
 DESCRIPTION="PDF plug-in for zathura"
-HOMEPAGE="https://pwmt.org/projects/zathura-pdf-mupdf/"
+HOMEPAGE="https://git.pwmt.org/pwmt/zathura-pdf-mupdf"
 
 LICENSE="ZLIB"
 SLOT="0"
 
-DEPEND=">=app-text/mupdf-1.17:=
+DEPEND=">=app-text/mupdf-1.19:=
 	>=app-text/zathura-0.3.9
 	dev-libs/girara
 	dev-libs/glib:2
@@ -28,7 +28,10 @@ DEPEND=">=app-text/mupdf-1.17:=
 
 RDEPEND="${DEPEND}"
 
-BDEPEND="virtual/pkgconfig"
+BDEPEND="app-text/tesseract
+	virtual/pkgconfig
+	media-libs/leptonica
+	dev-lang/mujs"
 
 src_prepare() {
 	sed -i -e '/mupdfthird/d' meson.build || die "Failed removing mupdfthird from meson.build"
diff --git a/app-text/zathura-ps/Manifest b/app-text/zathura-ps/Manifest
index 5ec60f86d3c3..c9ffca2c47e7 100644
--- a/app-text/zathura-ps/Manifest
+++ b/app-text/zathura-ps/Manifest
@@ -1,4 +1,6 @@
 DIST zathura-ps-0.2.6.tar.xz 4336 BLAKE2B 9129ae5c5b6b7452fbee720ded0a69d4ae735811b81ec49485fffc81833e5e0adf0563b005770082adcc17dc90d4650b5bd309154b64377625c2cef86f0b7978 SHA512 6631f9b1c951b6f91f2a5217c3de47176205102206f15b596fb21285dae8d01fd759cfaca1b8a23bf47166dfbc3f8cf6061ce5a4d7a1c3a2b671a3beef5a07bb
+DIST zathura-ps-0.2.7.tar.xz 4488 BLAKE2B 4513173a2f9ca725abf8444516a78fd789286b082a1146ab5d0dee504cdda92962f3e6cef46f24e0307bc5ea6bb6595577fac2dfbd2d4ef0cf8e69d34337baf5 SHA512 86cf4cea8f32e446960c7727745711d6bb6723bb41127ccba335fbdaeb78e9f681ce4104b2be8718a2f19e06aef30d49ae7c90091fa0774b5ffe22303cf37d5f
 EBUILD zathura-ps-0.2.6.ebuild 785 BLAKE2B ea456f3cee1a359e4176d2cceca60445224f0c0f2b63e19376ad1875ecc84f579a59f77c3626b11df22a416b41c60fbcbc08119c08d327e4591f151fa53b4166 SHA512 ded381a60d4e220c4f5a71bb89873daafa9a6135763727d41c30a8ae87b90f07a7b2ccd9e2c65bef06651c0d6a2c7705aa72bf9aad5f9b17f78f7d79efe2f618
+EBUILD zathura-ps-0.2.7.ebuild 783 BLAKE2B fd0580968eda5cab5aea8a4d073d0891db52ce8f25b431ef037f8f8d3e7904adf12605e8f129ebdf530c99f8199d8596aca6f0a51eae1eabf1a05cc1ad2d6aa4 SHA512 27e382034e7c50c6465390a6e10a80858b07d484e1c243f214eae1757a75382949c9bd5ceba206882f4d6caf48fdd6894a87b902799b98d4b18a14bbfc2ffdc8
 EBUILD zathura-ps-9999.ebuild 788 BLAKE2B 5cca1dd318b0b42d25d5256c8a8ac041982ec42aecbad33f74fb41ec1ee9304725913c93d29ff6fa7dce1a7c120eaa1bb546c7c84c1acf38153650738146197b SHA512 87db8d6a258a48923eed12296c924e253cec2201780c24f169b7a22118818b394e9c1ac674a748377a49de4b39f02257c469b0fd4ad0cb81d9287ab8d7fd0b47
 MISC metadata.xml 583 BLAKE2B ca246e0a76aa83c55397bb48f58b196e816b11fa1c873a49b21ebee38512566d377b23ea926377ae8a08325d8494e49a12aad7caa2b8a3a19a1342ab2f8178ce SHA512 81c6f5d849fd80dd4b226db01e97f34ce8ae6affafd6b680ae31130484859983f1f1c7eaa5abaec9ca9c225fe7a7b3ecd0481f44fc9861b8c488e3c0aba24166
diff --git a/app-text/zathura-ps/zathura-ps-0.2.7.ebuild b/app-text/zathura-ps/zathura-ps-0.2.7.ebuild
new file mode 100644
index 000000000000..52b16b0f9b8d
--- /dev/null
+++ b/app-text/zathura-ps/zathura-ps-0.2.7.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson xdg-utils
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura-ps.git"
+	EGIT_BRANCH="develop"
+else
+	KEYWORDS="~amd64 ~arm ~riscv ~x86 ~amd64-linux ~x86-linux"
+	SRC_URI="https://pwmt.org/projects/zathura-ps/download/${P}.tar.xz"
+fi
+
+DESCRIPTION="PostScript plug-in for zathura"
+HOMEPAGE="https://pwmt.org/projects/zathura-ps/download/"
+
+LICENSE="ZLIB"
+SLOT="0"
+
+DEPEND="app-text/libspectre
+	>=app-text/zathura-0.3.9
+	dev-libs/girara
+	dev-libs/glib:2
+	x11-libs/cairo"
+
+RDEPEND="${DEPEND}"
+
+BDEPEND="virtual/pkgconfig"
+
+pkg_postinst() {
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
-- 
cgit v1.2.3