From c3bc61051d7f12b4c682efa7a5460bbc8815649e Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Fri, 7 Jan 2022 22:48:01 +0000
Subject: gentoo resync : 07.01.2022

---
 app-text/Manifest.gz                               | Bin 48279 -> 48258 bytes
 app-text/a2ps/Manifest                             |   2 +-
 app-text/a2ps/a2ps-4.14-r6.ebuild                  |   8 +-
 app-text/discount/Manifest                         |   1 -
 app-text/discount/discount-2.2.7-r1.ebuild         |  69 ------
 app-text/docbook-sgml-utils/Manifest               |   2 +-
 .../docbook-sgml-utils-0.6.14-r4.ebuild            |   4 +-
 app-text/iso-codes/Manifest                        |   2 +
 app-text/iso-codes/iso-codes-4.9.0.ebuild          |  79 ++++++
 app-text/kjots/Manifest                            |   5 +-
 .../kjots/files/kjots-5.1.0-akonadi-21.12.0.patch  | 272 +++++++++++++++++++++
 .../kjots/files/kjots-5.1.0-implicit-dep.patch     |  26 ++
 app-text/kjots/files/kjots-5.1.0-missing-lib.patch |  25 ++
 app-text/kjots/kjots-5.1.0-r1.ebuild               |  53 ++++
 app-text/kjots/kjots-5.1.0.ebuild                  |  48 ----
 app-text/lesspipe/Manifest                         |   2 +
 app-text/lesspipe/lesspipe-2.01.ebuild             |  43 ++++
 app-text/libnumbertext/Manifest                    |   2 +
 app-text/libnumbertext/libnumbertext-1.0.8.ebuild  |  23 ++
 app-text/mdbook/Manifest                           |   3 +
 app-text/mdbook/mdbook-0.4.15.ebuild               | 259 ++++++++++++++++++++
 app-text/poppler/Manifest                          |   4 +-
 app-text/poppler/poppler-22.01.0.ebuild            | 126 ++++++++++
 app-text/poppler/poppler-9999.ebuild               |   4 +-
 app-text/zotero-bin/Manifest                       |   2 +-
 app-text/zotero-bin/zotero-bin-5.0.96.3.ebuild     |   5 +-
 26 files changed, 936 insertions(+), 133 deletions(-)
 delete mode 100644 app-text/discount/discount-2.2.7-r1.ebuild
 create mode 100644 app-text/iso-codes/iso-codes-4.9.0.ebuild
 create mode 100644 app-text/kjots/files/kjots-5.1.0-akonadi-21.12.0.patch
 create mode 100644 app-text/kjots/files/kjots-5.1.0-implicit-dep.patch
 create mode 100644 app-text/kjots/files/kjots-5.1.0-missing-lib.patch
 create mode 100644 app-text/kjots/kjots-5.1.0-r1.ebuild
 delete mode 100644 app-text/kjots/kjots-5.1.0.ebuild
 create mode 100644 app-text/lesspipe/lesspipe-2.01.ebuild
 create mode 100644 app-text/libnumbertext/libnumbertext-1.0.8.ebuild
 create mode 100644 app-text/mdbook/mdbook-0.4.15.ebuild
 create mode 100644 app-text/poppler/poppler-22.01.0.ebuild

(limited to 'app-text')

diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 4023719318af..9753ea626839 100644
Binary files a/app-text/Manifest.gz and b/app-text/Manifest.gz differ
diff --git a/app-text/a2ps/Manifest b/app-text/a2ps/Manifest
index a3ba3ee74588..16ed7edfb01d 100644
--- a/app-text/a2ps/Manifest
+++ b/app-text/a2ps/Manifest
@@ -16,5 +16,5 @@ AUX a2ps-4.14-texinfo-5.x.patch 5996 BLAKE2B 720a408c88c848fbe9b6ece319a8eb05a10
 AUX a2ps-4.14-texinfo-6.7-encoding.patch 1372 BLAKE2B 3eb51e4c83e60f7073c4957963dfe92931fa63eee1410e615171f1f823e21702032ae7dca9ae397851e0620df40a09c8e09bbb0ff12e2843b3c7aa511adda8ec SHA512 31d77113c5a727cc2aa72bc31a6e961cfc5d5871c40aa1f59f3edbadaa06ba55cb35bf6cf9b142276c83ac0a69fa49df9eb157d732fe44dc392f7dac7e014db4
 DIST a2ps-4.14-ja_nls.patch.gz 27576 BLAKE2B 7300971fb76f6c8d2b0e5ffa519cf6064519a33f24430b9894e43778dff5b78f7cf7e2b9fe1e98fb475f452b39ccc29f88f579bbe1922ac3ef70775a05591b32 SHA512 f02f553dd9d9dbd9dfe41ebfe103493000aa4e9de5634c94e7453f73b66d88fea6b0010095913a4a99c7285990a1df1ebcc39da451b2b34f96b0c191112b125f
 DIST a2ps-4.14.tar.gz 2552507 BLAKE2B cd15a2b85f54f8bfb92adf9f4cf2c3c29091e528ae8072d0e905c58cc94caf55b76ac3e37891f8a0bc0909a177c5ee434fe5aaab3625a2c14127dabad8b506ed SHA512 fd6ac8ab47d789114c283e8ca508f7f56feabd1a189f4ac772cad9e6be7e3791e210892cfffd04ad1d39efe4b15386b2e61bf4cd56b70ed581c0554f36bfe06f
-EBUILD a2ps-4.14-r6.ebuild 3650 BLAKE2B 54ee790f20294db365864f42d3d355cfec1d650d505d85500541aa545a7754051aca9d75694195cdbb1e47b846b5c0ebf6846a0db17918aed3a6d9d048e6f4ec SHA512 ce46b31d2a0a6d89eecf34b982ace6f983f41eb56859d8ee40b70f0459341ac77a83c32e381a1246b4f3cd59262b060df6491a02cf30b535378f35209b79ca24
+EBUILD a2ps-4.14-r6.ebuild 3606 BLAKE2B 26a2e9a35853ca9689ad83d3ed651b616fccba709995254d4643219334be9226a53a396c393941bb628510bcdf10c328f8b39e6ed2c41c8d6e4487a3c38221d7 SHA512 451fc1c89756690ab854f6c0b3dcdd9cc55063013fccd6fff00bae867bbdb9576d53b6286e91a2feee4fcb449e2e85efedb4d6ccbd9f6a8518d760163b31b284
 MISC metadata.xml 347 BLAKE2B 252d70af1bcfb8685137113cd50913be3154245eeac5cad0d719283c87b81af57a48268df9659968f98b4b1e77be16bf4b1af45cc69fd12c8cdbbe8432d4cb49 SHA512 dde37464c0674ff27febf9293b3ea71272d307ae3a61c7a243f8a61ec4283b004cb5496d121aa25dc143f0664bdb212b294dd471c7c10daa9f2f3f0fe5cdc319
diff --git a/app-text/a2ps/a2ps-4.14-r6.ebuild b/app-text/a2ps/a2ps-4.14-r6.ebuild
index ffcce4cd01eb..614a0ba87c55 100644
--- a/app-text/a2ps/a2ps-4.14-r6.ebuild
+++ b/app-text/a2ps/a2ps-4.14-r6.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
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="cjk emacs latex nls static-libs userland_BSD userland_GNU vanilla"
+IUSE="cjk emacs latex nls static-libs vanilla"
 
 RESTRICT=test
 
@@ -20,10 +20,10 @@ RDEPEND="app-text/ghostscript-gpl
 	app-text/libpaper
 	>=app-text/psutils-1.17
 	app-text/wdiff
+	>=sys-apps/coreutils-6.10-r1
 	emacs? ( >=app-editors/emacs-23.1:* )
 	latex? ( virtual/latex-base )
-	nls? ( virtual/libintl )
-	userland_GNU? ( >=sys-apps/coreutils-6.10-r1 )"
+	nls? ( virtual/libintl )"
 DEPEND="${RDEPEND}
 	>=dev-util/gperf-2.7.2
 	virtual/yacc
diff --git a/app-text/discount/Manifest b/app-text/discount/Manifest
index 72b07f66e590..17fdf894c646 100644
--- a/app-text/discount/Manifest
+++ b/app-text/discount/Manifest
@@ -1,5 +1,4 @@
 AUX gethopt-undefined.patch 358 BLAKE2B ccc264eece330bc0c8979731410488b070c91e73381ed4f00ff95f04c5f023948f304dd70c0f8ec4ff67abf266d80ce8931fa46f53486e2e0e003f151fbda4b7 SHA512 a7504f3ab60ff49b72e475e558e128522757874d4328abf7e488313dff7c2fc3650fffc12a03109601a14348f24f21a83ed0e83f9d6fe1176207ac2692800dc1
 DIST discount-2.2.7.tar.bz2 102277 BLAKE2B 58ec3bce2b8fc41a090d9b81b4326cbf54e36bf774f4f9ef63c2a2b1d34ba464e9f0a021f19b4fef165da426742af3045a631af005371d1a8a4cd81dc0be3367 SHA512 1b61eb7c625bb50da0dbe97350a0ccbb15930ccaef449c4b4659950907bce3c0564dabf20578379a7fdd0e375f5d4d5b61acd34db474a85e942b60373688bd08
-EBUILD discount-2.2.7-r1.ebuild 1690 BLAKE2B 710bd40dc677328a0f8aaa6ad3a387d75fe939b289186d889f35002c08c82b52bfaa5fe138816eb7ecdbfd6ec437b863df0c248448cd99e92452a2cafeb995a1 SHA512 27008019ccf6fb42d7e364990baa6facb7f0c8d8e40375dcc44594ccef7c792648f8d1dcd6c69a895c5a059c3799722d43338bbbc1c443dc284433ac0da4156d
 EBUILD discount-2.2.7-r2.ebuild 1697 BLAKE2B f6a68291682e44d6adfa9fdb40fe7e1c1bbac2c0981fd86f223344053c6510b27b4c734613c0acc4f29b31f5ffc862924ceaeda442fc7a52f27f111d6ce7e882 SHA512 cd1653e485b7785f630017210eb5268ac7c42c362cd95e2bea38f977f99c79cfd3aef8c35aa292d6764868f404bb74f77b068596a3b17c7001488c7a0c761308
 MISC metadata.xml 245 BLAKE2B 4988fa1366a9b8a3769e503545339cdd493a0bdc362ca9237b158b94549de1f061477546b00fd3b21dc9325812423f7207071e22e3234d5c0b88c755197557d2 SHA512 e00be68ab9ad3acfce3d2d48721c47cf50e2c6358c9ceb45a2a23fc5303826ea26b9205ce4f230121c2e40c9c467367f2dc57863680899b21e8005034aa9118c
diff --git a/app-text/discount/discount-2.2.7-r1.ebuild b/app-text/discount/discount-2.2.7-r1.ebuild
deleted file mode 100644
index 1ecc2092dae3..000000000000
--- a/app-text/discount/discount-2.2.7-r1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="A Markdown-to HTML translator written in C"
-HOMEPAGE="http://www.pell.portland.or.us/~orc/Code/discount/"
-SRC_URI="http://www.pell.portland.or.us/~orc/Code/${PN}/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ppc ppc64 sparc x86"
-IUSE="minimal test"
-RESTRICT="!test? ( test )"
-
-PATCHES=( "${FILESDIR}"/gethopt-undefined.patch )
-
-src_prepare() {
-	default
-
-	# for QA, we remove the Makefile’s usage of install -s.
-	# Drop ldconfig invocation.
-	# Force “librarian.sh” to respect LDFLAGS ($FLAGS should have CFLAGS
-	# at that point).
-	sed -i \
-		-e '/INSTALL_PROGRAM/s,\$_strip ,,' \
-		-e 's/\(LDCONFIG=\).*/\1:/' \
-		-e 's/\(.\)\$FLAGS/& \1$LDFLAGS/' \
-		configure.inc || die "sed configure.inc failed"
-}
-
-src_configure() {
-	local configure_call=(
-		./configure.sh
-		--libdir="${EPREFIX}/usr/$(get_libdir)"
-		--prefix="${EPREFIX}/usr"
-		--mandir="${EPREFIX}/usr/share/man"
-		--shared
-		--pkg-config
-		$(usex minimal '' --enable-all-features)
-		# Enable deterministic HTML generation behavior. Otherwise, will
-		# actually call rand() as part of its serialization code...
-		--debian-glitch
-	)
-	einfo "Running ${configure_call[@]}"
-	CC="$(tc-getCC)" AR="$(tc-getAR)" \
-	"${configure_call[@]}" || die
-}
-
-src_compile() {
-	emake libmarkdown
-	emake
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		$(usex minimal install install.everything) \
-		SAMPLE_PFX="${PN}-"
-}
-
-pkg_postinst() {
-	if ! use minimal; then
-		elog 'Sample binaries with overly-generic names have been'
-		elog "prefixed with \"${PN}-\"."
-	fi
-}
diff --git a/app-text/docbook-sgml-utils/Manifest b/app-text/docbook-sgml-utils/Manifest
index 1f93888ebf72..5c6c51f5ffb5 100644
--- a/app-text/docbook-sgml-utils/Manifest
+++ b/app-text/docbook-sgml-utils/Manifest
@@ -2,5 +2,5 @@ AUX docbook-sgml-utils-0.6.14-grep-2.7.patch 603 BLAKE2B 9b7832675ae7776e25c2a76
 AUX docbook-utils-0.6.14-elinks.patch 445 BLAKE2B e4e64e0cdc22dec01bc96ce5ae0b73c8e080f2d64bdd0cdecb86618bd6e46e2b00fc076570b26bb16490a47ed9d83ba28e630ecf95c00166ce12ab31b4b40f0b SHA512 67985be1ef2cea086a1029ebce17edbb9508e9b8498cdb304cde71ca3a58a48c461c9a1ff5ec83758864c67cdbc4fa7e414270a7783a41b8cfe95f0526e00f42
 AUX docbook-utils-0.6.14-prefix.patch 3055 BLAKE2B f8b7f5ffa47d0a1d18fcf9ef66dae9db74b30086bed3a6d3900e73f83dda660c6abedf697f71e51f9b5145751bae2d461ace626a7336f95e95b284468ed50857 SHA512 c4f95b8507070dda4ed102c45e6b8fe40172a2a5d8b041259903f46c3bedb351d85924810cb9bae3073b674ec8b39bd86d5f570c8c28c8100134f62abb59c1a8
 DIST docbook-utils-0.6.14.tar.gz 124998 BLAKE2B c0ae31adbbbf78732362638bdc73638cd67205b4ce2b2ac4e740334fd230c8cb031e5ba3ee9e34110c48ea42115f2f5f4dab4b4b6dd45d963976d2b48d7836a2 SHA512 8052316a643b5eaa6c0373a9ed7f2406e7c3cb3da9d3c955a271c89813a8f3196fcd9e6c8385c7b6b7ecb916515e3ec7897aece4473989f0e4dc52a2bc8bbfdf
-EBUILD docbook-sgml-utils-0.6.14-r4.ebuild 1843 BLAKE2B e460fcb5971ebfd8c12afc4a1583cb47d6ea4bd627e047b87c0cf6e267ea9655e9e88d9a4371b50d22549820ddc42e8474b498e04a874da2e95afac9b2dad60f SHA512 9ffe77d6fc1c1ac60f1f10b2955917b1fcc9799a3341e298295a0cf95887c90fb95efe4515b0b5dc953e29c6410a229616fe22483cc59feb60a367e6faa495a8
+EBUILD docbook-sgml-utils-0.6.14-r4.ebuild 1825 BLAKE2B 663ce29c6c25416b5a0a405f4a20059c1b565a218684a4ae7c0a0e2f3ee4ea842c080527aafa0c4a62e14bd825f6d07f47602e3585e4a08709f863778cf6ec99 SHA512 a0ecbc59c6355206064cee0253b4cba479555af7fc13c24c1622a14095a1314cf80ccc7e72aebd79a4ce6e2ded63031e4f0e61fbb15759ebb1d5e3a6b52afbde
 MISC metadata.xml 376 BLAKE2B 41601b1cfab5c502384fe8f8d13e1404d91434eb58573a527d6999d82c26761bce727f42e467f6336c41220d1dc4446b4ff020f3fa66b7ff1c968bf3f688717b SHA512 750848b4e8edd39b3032e4c10f0c3bcb1d5e2251c2faab08cea9effd19ae67263d956dfae37677770fc1a6cce434b3d89b209f78fc164ed48b3fb86968eda59f
diff --git a/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14-r4.ebuild b/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14-r4.ebuild
index 1b6ccb1e5dd7..344496f27daa 100644
--- a/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14-r4.ebuild
+++ b/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14-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
@@ -29,8 +29,8 @@ DEPEND=">=dev-lang/perl-5
 	~app-text/docbook-sgml-dtd-4.1
 	~app-text/docbook-sgml-dtd-4.2
 	~app-text/docbook-sgml-dtd-4.4
+	sys-apps/which
 	jadetex? ( dev-texlive/texlive-formatsextra )
-	userland_GNU? ( sys-apps/which )
 	|| (
 		www-client/lynx
 		www-client/links
diff --git a/app-text/iso-codes/Manifest b/app-text/iso-codes/Manifest
index 7d0e623de205..6d26c6ff7ae2 100644
--- a/app-text/iso-codes/Manifest
+++ b/app-text/iso-codes/Manifest
@@ -1,7 +1,9 @@
 DIST iso-codes-4.6.0.tar.gz 14089611 BLAKE2B 0e85ca49dd40ca053af4b06aca440e55c2b9bb2061fcdceaa25b31ac7fd7942a590756db90c10db64e5e1ffcedbce5a552e60a6d495bb9d60621bc7b862e630b SHA512 fcee802a3f92ef035371ff45fa9d8acbf1e2f490e38d84d2e27d2226d250ad02d088156d0889c0fc0fc09f30c4541b30dc7eb65ca4f40c3764599c1b2143013f
 DIST iso-codes-4.7.0.tar.gz 14122654 BLAKE2B 5dfcf4a0b39ff7b696f157a3938b7c1d35015c346ba4b046dda6b6b5bdcb02e561161afecfd2909fdbfbff6378cd4940335543d0ca7313bb9e80e490ad901abb SHA512 77ceb2ba9f3290f9409efdb50112beda2872ed163a86912b46480407f1135c0263cb70bf84bd2635b304d1af65e5b60f97a20b305219ead9ac98423b5abb255d
 DIST iso-codes-v4.8.0.tar.gz 14359576 BLAKE2B cf1228c8865ae68dad3167a9460c66ca81267df04e83bd495793e729c8db9c93798e3738f2316cd18622c0fe224bad70c6fdd177d2c2b3c2e8bd95508b616b33 SHA512 a96c104eb3f183ea8e5920446a53c15a416762a0ec13b7f7a7a64e6d68341b6a12385e75ba6c9d8b9351921afaa65216f3dcdd3b82babb6227dcf718bea38802
+DIST iso-codes-v4.9.0.tar.gz 14483789 BLAKE2B 683921fede69149cf196b70dded975763746d943f470d21e517334890c4c45b11b551c0746e3907341e55870ac733d1f14f74ea5cf723e3f4df164f56531b7da SHA512 0e14101b6a1480c463d83b32a40715485ad5494e799bf0cb6b7ed927b69dff0454512bbccbcc23de8741bf7dce139feb7490c4edf75b4a0af8473fe5ad9c567c
 EBUILD iso-codes-4.6.0.ebuild 2637 BLAKE2B 96372d652576a4070b2c72792d4596d040e95c857a688612b92eba596433267274aee5b0d07cf86516ccc5ba40860468523b8ec3bf0a1658a020a166cc2580b5 SHA512 51a092a6c6a712e4a862b5735c439d8e8f079e098cffa883aebcbd531468456be49a7a0f20f313dd359ecc3e59f1b783ce2a7ae18e0c603919afa1103cbd0779
 EBUILD iso-codes-4.7.0.ebuild 2638 BLAKE2B 82ece660270b8b61bc7fad445d1f11f6f1c3fa39b67772be4d3edf1251e766752bb87fde75b429e22ff0f017f5b0f0282c1d1578d9eaa09505066e7413c7822a SHA512 efc173f44bc56f3410f9daa01b416fdb1ba406207444e8bb24319a37da9be291f074b23e8111302b576a9c71fea2398adc2208eb838c692f2194d5e21f978160
 EBUILD iso-codes-4.8.0.ebuild 2644 BLAKE2B 263fd1fdaba300466c747dee40d2b1b5d6b710a807a5e8c58c4ae87a6de669622665aeba2d64557c96b547f15a50848671fd59f68ac3989935a2fda7544baea0 SHA512 3fdd6c2989c9c090f2f1fd48c6f7eefcd3a988bd9b5a992e0adf186cdb2ecc1038913359f326451ee513866337136d505d539d63ad8ce36a5584fbbe6610bbf0
+EBUILD iso-codes-4.9.0.ebuild 2644 BLAKE2B 422e4a7fa399816a1c4390d84a99e0049969b3f6f11deb4eebf63c9e9556bbe63a88902b8e203b073943382a7fe2f507de3e4f849a68144672015cb089bb4d54 SHA512 c4f71415a84c30f7b6f713bad3286ed1fcf63ec5f9d3efb52b65bb75d24d726434106f6523fed739debf7beb72bd0943249d7491d1acebc31e7ae1ea294103bd
 MISC metadata.xml 481 BLAKE2B e19ee7de8b2de3aa09f97bb7eb4247ba2979614d768c0dd92a8cc131269e46a560baa1c0ea8fcceb49073efb1b890cd54d939c16ac7412413983a19083f05337 SHA512 f1e20f870fabd59d97ca612c3db3443a6a1544de3b03f12fe0c9c44a1740b06bf38c394b489738e60b22fa0797379d24c0ec8371efa067873910ba39fe30f194
diff --git a/app-text/iso-codes/iso-codes-4.9.0.ebuild b/app-text/iso-codes/iso-codes-4.9.0.ebuild
new file mode 100644
index 000000000000..40294c158f09
--- /dev/null
+++ b/app-text/iso-codes/iso-codes-4.9.0.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+PLOCALES="ab ace ach af ak am an ar as ast ay az ba bar be bg bi bn bn_BD bn_IN br bs byn ca ce ch chr ckb crh cs csb cv cy da de dv dz ee el en eo es et eu fa ff fi fil fo fr frp fur fy ga gez gl gn gu gv ha haw he hi hr ht hu hy ia id io is it iu ja jam ka kab ki kk kl km kmr kn ko kok kv kw ky lo lt lv mai mhr mi mk ml mn mo mr ms mt my na nah nb nb_NO ne nl nn nso nv oc or pa pap pi pl ps pt pt_BR ro ru rw sc sd si sk sl so son sq sr sr@latin sv sw ta te tg th ti tig tk tl tr tt tt@iqtelif tzm ug uk ur uz ve vi wa wal wo xh yo zh_CN zh_HK zh_Hans zh_Hant zh_TW zu"
+
+inherit python-any-r1
+
+DESCRIPTION="ISO language, territory, currency, script codes and their translations"
+HOMEPAGE="https://salsa.debian.org/iso-codes-team/iso-codes"
+SRC_URI="https://salsa.debian.org/${PN}-team/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+
+BDEPEND="${PYTHON_DEPS}
+	sys-devel/gettext
+"
+S="${WORKDIR}/${PN}-v${PV}"
+
+# This ebuild does not install any binaries.
+RESTRICT="binchecks strip"
+
+DOCS=( CHANGELOG.md README.md )
+
+# plocale_find_changes doesn't support multiple directories,
+# so need to do the update scan ourselves.
+check_existing_locales() {
+	local std loc all_locales=()
+
+	ebegin "Looking for new locales"
+	for std in "${all_stds[@]}"; do
+		pushd "${std}" >/dev/null || die
+		for loc in *.po; do
+			all_locales+=( "${loc%.po}" )
+		done
+		popd >/dev/null
+	done
+
+	all_locales=$(echo $(printf '%s\n' "${all_locales[@]}" | LC_COLLATE=C sort -u))
+	if [[ ${PLOCALES} != "${all_locales}" ]]; then
+		eend 1
+		eerror "There are changes in locales! This ebuild should be updated to:"
+		eerror "PLOCALES=\"${all_locales}\""
+		die "Update PLOCALES in the ebuild"
+	else
+		eend 0
+	fi
+}
+
+src_prepare() {
+	default
+
+	local std loc mylinguas
+	local all_stds=( iso_15924 iso_3166-{1,2,3} iso_4217 iso_639-{2,3,5} )
+
+	check_existing_locales
+
+	# Modify the Makefiles so they only install requested locales.
+	for std in "${all_stds[@]}"; do
+		einfo "Preparing ${std} ..."
+		pushd "${std}" >/dev/null || die
+		mylinguas=()
+		for loc in *.po; do
+			if has ${loc%.po} ${LINGUAS-${loc%.po}}; then
+				mylinguas+=( "${loc}" )
+			fi
+		done
+
+		sed \
+			-e "/^pofiles =/s:=.*:= ${mylinguas[*]}:" \
+			-e "/^mofiles =/s:=.*:= ${mylinguas[*]/%.po/.mo}:" \
+			-i Makefile.am Makefile.in || die "sed in ${std} folder failed"
+		popd >/dev/null
+	done
+}
diff --git a/app-text/kjots/Manifest b/app-text/kjots/Manifest
index f85d89f17e26..11e071388f30 100644
--- a/app-text/kjots/Manifest
+++ b/app-text/kjots/Manifest
@@ -1,4 +1,7 @@
+AUX kjots-5.1.0-akonadi-21.12.0.patch 8215 BLAKE2B a192b70f325a84423b88144fdb5dc70a07b10c84cb0feb8faf74859fd1668f97db6972841bad74e313afba46c09cd2d882297cc72b1c8c00e9b5dfe68874fb75 SHA512 5487f7ea196479a64e72d8a8fe2f9f7ba7ed60c3932703795f0698325c737d08aff3c63d36ef60a9c66f2660f6c5318239c493db926d50a98df61256be0b9f65
+AUX kjots-5.1.0-implicit-dep.patch 983 BLAKE2B ca6a6b7b8e72aa0729d3e7ca9d5ecdf24673ef33ef8b752dd5513b93fd25d4b6c1adebd8a8b238d29d04c2bd6802f3303d968effed54d16dca30d6a96815fc11 SHA512 7c68f0807d764222b5b4b8114d4cbd7bfc4922d735b1a12de621bed943d666a4fefbf17ce7ea43eb6cca029cb77b1fb7d217279b3be1cb5a99a3db0f5fc530b8
+AUX kjots-5.1.0-missing-lib.patch 683 BLAKE2B 719f3c4ef39856c33b683f4c7edca664f89510f6b1f21ffd2ca285eb63db4b729c9b2091c704452adbda326eaef61ebba9b3ccce643548c1bdd2f3044687af92 SHA512 c87c741b036b5958faa3a9c892be469ea73e8809807da8f000fc55ae4219996731907d458cacae3f08eb0c3fb8d40e391490f03047dbfed900a3253bb46536c3
 AUX kjots-5.1.0-unused-dep.patch 1423 BLAKE2B 154509cafb0c5822e5ceff10513967e3899d474fb471bb312e0686d6e2875d57c5a7bb8b7392efb211c74f0d31e274a62643998132bdcfc09334ffb26c78c1b7 SHA512 ebad6d5f26af8ca1c55302f9a2fbedcfb70f07bf09cfc8fa4446bdac7ac9ec182523659701e35a69d559772e65786958d3ef434fef4bdf9d75420b5c41241269
 DIST kjots-5.1.0.tar.xz 184972 BLAKE2B 28bea486bcaa552b7463f9a2132230d5729ade7a2eadb06f66f958c660117bd3a1976d6da14f1339abfbd39930708fe77ae923042a0bc8ca59bf074e409375ae SHA512 71c30e0810157cf3d039e683d368cfa9fa3ec88918eee2d85477a9eb9f073af43dfb2318957019f35503d484e2521289bcb043ff9bfc2822eb900a2f5b8d5d62
-EBUILD kjots-5.1.0.ebuild 1283 BLAKE2B 5d001a7d9f3bebd982ab6a4eef595a3f17f675c479863f04d57064fb220358f646608553ac2d6cfd501b09909ad1864916a09c238b6f774d47bef0dab10cc077 SHA512 1e7d7cfc3239c4ee568478697e9140f3e7ab6e0aac2e79aa826f0496881a6e3f2b21baf9c0f29e7360e983e9bb56a10bcad9ad8d6dc975bf02e0065a244b7db8
+EBUILD kjots-5.1.0-r1.ebuild 1415 BLAKE2B a1e6a7c83209627ec20b9f6a9b470964dbbb2d94f09e3950c11b6d7414538592c501f09f0aef808c87fe8f4194b9627a92f8759af47a534292e73719fd022e73 SHA512 c6708d59c260f9637d3fe653629810a94b564145c0d076d743aba934fc8ad008e8aeaf79d1f895ce3df0f49764b300a8afdfcd76bcca12ab7acbd7c5592fa7b7
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/app-text/kjots/files/kjots-5.1.0-akonadi-21.12.0.patch b/app-text/kjots/files/kjots-5.1.0-akonadi-21.12.0.patch
new file mode 100644
index 000000000000..3f0c4e52779b
--- /dev/null
+++ b/app-text/kjots/files/kjots-5.1.0-akonadi-21.12.0.patch
@@ -0,0 +1,272 @@
+From 581548a1de9449efc0c77e9ac85c23066bac983e Mon Sep 17 00:00:00 2001
+From: "Friedrich W. H. Kossebau" <kossebau@kde.org>
+Date: Wed, 8 Sep 2021 00:58:25 +0200
+Subject: [PATCH] Adapt to new Akonadi libraries includes using the C++
+ namespace as prefix
+
+GIT_SILENT
+---
+ src/kjotsedit.cpp                            |  5 +++++
+ src/kjotsmodel.cpp                           |  6 ++++++
+ src/kjotsmodel.h                             |  6 ++++++
+ src/kjotswidget.cpp                          | 20 +++++++++++++++++++-
+ src/kjotswidget.h                            |  5 +++++
+ src/noteshared/notecreatorandselector.cpp    |  7 +++++++
+ src/noteshared/notecreatorandselector.h      |  6 ++++++
+ src/noteshared/notelockattribute.h           |  6 ++++++
+ src/noteshared/notepinattribute.h            |  6 ++++++
+ src/noteshared/standardnoteactionmanager.cpp |  8 ++++++++
+ src/noteshared/standardnoteactionmanager.h   |  9 +++++++--
+ src/notesortproxymodel.cpp                   |  5 +++++
+ 12 files changed, 86 insertions(+), 3 deletions(-)
+
+diff --git a/src/kjotsedit.cpp b/src/kjotsedit.cpp
+index f1d61bd..c20bc42 100644
+--- a/src/kjotsedit.cpp
++++ b/src/kjotsedit.cpp
+@@ -33,7 +33,12 @@
+ #include <KPIMTextEdit/RichTextComposerActions>
+ #include <KPIMTextEdit/RichTextComposerImages>
+ 
++#include <akonadi_version.h>
++#if AKONADI_VERSION >= QT_VERSION_CHECK(5, 18, 41)
++#include <Akonadi/Item>
++#else
+ #include <AkonadiCore/Item>
++#endif
+ 
+ #include "kjotslinkdialog.h"
+ #include "kjotsmodel.h"
+diff --git a/src/kjotsmodel.cpp b/src/kjotsmodel.cpp
+index e35c94f..99ee14f 100644
+--- a/src/kjotsmodel.cpp
++++ b/src/kjotsmodel.cpp
+@@ -13,8 +13,14 @@
+ #include <QTextDocument>
+ #include <QIcon>
+ 
++#include <akonadi_version.h>
++#if AKONADI_VERSION >= QT_VERSION_CHECK(5, 18, 41)
++#include <Akonadi/ChangeRecorder>
++#include <Akonadi/EntityDisplayAttribute>
++#else
+ #include <AkonadiCore/ChangeRecorder>
+ #include <AkonadiCore/EntityDisplayAttribute>
++#endif
+ #include <Akonadi/Notes/NoteUtils>
+ 
+ #include <KMime/Message>
+diff --git a/src/kjotsmodel.h b/src/kjotsmodel.h
+index 71e0ca6..ec564a7 100644
+--- a/src/kjotsmodel.h
++++ b/src/kjotsmodel.h
+@@ -10,7 +10,13 @@
+ #ifndef KJOTSMODEL_H
+ #define KJOTSMODEL_H
+ 
++#include <akonadi_version.h>
++#include <QtGlobal> // for QT_VERSION_CHECK
++#if AKONADI_VERSION >= QT_VERSION_CHECK(5, 18, 41)
++#include <Akonadi/EntityTreeModel>
++#else
+ #include <AkonadiCore/EntityTreeModel>
++#endif
+ 
+ class QTextDocument;
+ 
+diff --git a/src/kjotswidget.cpp b/src/kjotswidget.cpp
+index 3a3abd0..834fc33 100644
+--- a/src/kjotswidget.cpp
++++ b/src/kjotswidget.cpp
+@@ -35,6 +35,24 @@
+ 
+ // Akonadi
+ #include <Akonadi/Notes/NoteUtils>
++#include <akonadi_version.h>
++#if AKONADI_VERSION >= QT_VERSION_CHECK(5, 18, 41)
++#include <Akonadi/AttributeFactory>
++#include <Akonadi/CollectionCreateJob>
++#include <Akonadi/CollectionDeleteJob>
++#include <Akonadi/ChangeRecorder>
++#include <Akonadi/EntityDisplayAttribute>
++#include <Akonadi/EntityMimeTypeFilterModel>
++#include <Akonadi/Item>
++#include <Akonadi/ItemCreateJob>
++#include <Akonadi/ItemModifyJob>
++#include <Akonadi/ItemDeleteJob>
++#include <Akonadi/ItemFetchScope>
++#include <Akonadi/EntityOrderProxyModel>
++#include <Akonadi/EntityTreeView>
++#include <Akonadi/ETMViewStateSaver>
++#include <Akonadi/ControlGui>
++#else
+ #include <AkonadiCore/AttributeFactory>
+ #include <AkonadiCore/CollectionCreateJob>
+ #include <AkonadiCore/CollectionDeleteJob>
+@@ -50,7 +68,7 @@
+ #include <AkonadiWidgets/EntityTreeView>
+ #include <AkonadiWidgets/ETMViewStateSaver>
+ #include <AkonadiWidgets/ControlGui>
+-
++#endif
+ // Grantlee
+ #include <grantlee/template.h>
+ #include <grantlee/engine.h>
+diff --git a/src/kjotswidget.h b/src/kjotswidget.h
+index 7fe91ed..00a41b5 100644
+--- a/src/kjotswidget.h
++++ b/src/kjotswidget.h
+@@ -18,7 +18,12 @@
+ #include <QAbstractItemDelegate>
+ #include <QPrinter>
+ 
++#include <akonadi_version.h>
++#if AKONADI_VERSION >= QT_VERSION_CHECK(5, 18, 41)
++#include <Akonadi/Collection>
++#else
+ #include <AkonadiCore/Collection>
++#endif
+ 
+ #include <grantlee/templateloader.h>
+ 
+diff --git a/src/noteshared/notecreatorandselector.cpp b/src/noteshared/notecreatorandselector.cpp
+index 2172cbf..6d58c83 100644
+--- a/src/noteshared/notecreatorandselector.cpp
++++ b/src/noteshared/notecreatorandselector.cpp
+@@ -14,9 +14,16 @@
+ 
+ #include <KMime/Message>
+ 
++#include <akonadi_version.h>
++#if AKONADI_VERSION >= QT_VERSION_CHECK(5, 18, 41)
++#include <Akonadi/EntityDisplayAttribute>
++#include <Akonadi/EntityTreeModel>
++#include <Akonadi/ItemCreateJob>
++#else
+ #include <AkonadiCore/EntityDisplayAttribute>
+ #include <AkonadiCore/EntityTreeModel>
+ #include <AkonadiCore/ItemCreateJob>
++#endif
+ #include <Akonadi/Notes/NoteUtils>
+ 
+ #include "noteshared_debug.h"
+diff --git a/src/noteshared/notecreatorandselector.h b/src/noteshared/notecreatorandselector.h
+index 90055cf..986d042 100644
+--- a/src/noteshared/notecreatorandselector.h
++++ b/src/noteshared/notecreatorandselector.h
+@@ -14,8 +14,14 @@
+ #include <QItemSelectionModel>
+ #include <QTimer>
+ 
++#include <akonadi_version.h>
++#if AKONADI_VERSION >= QT_VERSION_CHECK(5, 18, 41)
++#include <Akonadi/Collection>
++#include <Akonadi/Item>
++#else
+ #include <AkonadiCore/Collection>
+ #include <AkonadiCore/Item>
++#endif
+ 
+ class KJob;
+ 
+diff --git a/src/noteshared/notelockattribute.h b/src/noteshared/notelockattribute.h
+index 9bdd8a2..b0ee819 100644
+--- a/src/noteshared/notelockattribute.h
++++ b/src/noteshared/notelockattribute.h
+@@ -11,7 +11,13 @@
+ #ifndef KJOTS_LOCK_ATTRIBUTE_H
+ #define KJOTS_LOCK_ATTRIBUTE_H
+ 
++#include <akonadi_version.h>
++#include <QtGlobal> // for QT_VERSION_CHECK
++#if AKONADI_VERSION >= QT_VERSION_CHECK(5, 18, 41)
++#include <Akonadi/Attribute>
++#else
+ #include <AkonadiCore/Attribute>
++#endif
+ 
+ namespace NoteShared
+ {
+diff --git a/src/noteshared/notepinattribute.h b/src/noteshared/notepinattribute.h
+index 3026dea..5f3903c 100644
+--- a/src/noteshared/notepinattribute.h
++++ b/src/noteshared/notepinattribute.h
+@@ -9,7 +9,13 @@
+ #ifndef NOTE_PIN_ATTRIBUTE_H
+ #define NOTE_PIN_ATTRIBUTE_H
+ 
++#include <akonadi_version.h>
++#include <QtGlobal> // for QT_VERSION_CHECK
++#if AKONADI_VERSION >= QT_VERSION_CHECK(5, 18, 41)
++#include <Akonadi/Attribute>
++#else
+ #include <AkonadiCore/Attribute>
++#endif
+ 
+ namespace NoteShared
+ {
+diff --git a/src/noteshared/standardnoteactionmanager.cpp b/src/noteshared/standardnoteactionmanager.cpp
+index a3f4b8b..2a2f4ce 100644
+--- a/src/noteshared/standardnoteactionmanager.cpp
++++ b/src/noteshared/standardnoteactionmanager.cpp
+@@ -13,10 +13,18 @@
+ #include <QColorDialog>
+ #include <QItemSelectionModel>
+ 
++#include <akonadi_version.h>
++#if AKONADI_VERSION >= QT_VERSION_CHECK(5, 18, 41)
++#include <Akonadi/EntityDisplayAttribute>
++#include <Akonadi/EntityTreeModel>
++#include <Akonadi/CollectionModifyJob>
++#include <Akonadi/ItemModifyJob>
++#else
+ #include <AkonadiCore/EntityDisplayAttribute>
+ #include <AkonadiCore/EntityTreeModel>
+ #include <AkonadiCore/CollectionModifyJob>
+ #include <AkonadiCore/ItemModifyJob>
++#endif
+ #include <Akonadi/Notes/NoteUtils>
+ 
+ #include <KXmlGui/KActionCollection>
+diff --git a/src/noteshared/standardnoteactionmanager.h b/src/noteshared/standardnoteactionmanager.h
+index fe80dae..6605820 100644
+--- a/src/noteshared/standardnoteactionmanager.h
++++ b/src/noteshared/standardnoteactionmanager.h
+@@ -10,10 +10,15 @@
+ #ifndef AKONADI_STANDARDNOTESACTIONMANAGER_H
+ #define AKONADI_STANDARDNOTESACTIONMANAGER_H
+ 
+-#include <AkonadiWidgets/StandardActionManager>
+-
+ #include <QObject>
+ 
++#include <akonadi_version.h>
++#if AKONADI_VERSION >= QT_VERSION_CHECK(5, 18, 41)
++#include <Akonadi/StandardActionManager>
++#else
++#include <AkonadiWidgets/StandardActionManager>
++#endif
++
+ class QAction;
+ class KActionCollection;
+ class QItemSelectionModel;
+diff --git a/src/notesortproxymodel.cpp b/src/notesortproxymodel.cpp
+index 89def1c..dbe582f 100644
+--- a/src/notesortproxymodel.cpp
++++ b/src/notesortproxymodel.cpp
+@@ -8,7 +8,12 @@
+ 
+ #include "notesortproxymodel.h"
+ 
++#include <akonadi_version.h>
++#if AKONADI_VERSION >= QT_VERSION_CHECK(5, 18, 41)
++#include <Akonadi/EntityTreeModel>
++#else
+ #include <AkonadiCore/EntityTreeModel>
++#endif
+ 
+ #include "noteshared/notepinattribute.h"
+ 
+-- 
+GitLab
+
diff --git a/app-text/kjots/files/kjots-5.1.0-implicit-dep.patch b/app-text/kjots/files/kjots-5.1.0-implicit-dep.patch
new file mode 100644
index 000000000000..b81bafc1889f
--- /dev/null
+++ b/app-text/kjots/files/kjots-5.1.0-implicit-dep.patch
@@ -0,0 +1,26 @@
+From 8803636bf4e0238d0f23bedebdcb4d1e6283ffb7 Mon Sep 17 00:00:00 2001
+From: Nicolas Fella <nicolas.fella@gmx.de>
+Date: Mon, 26 Apr 2021 17:09:51 +0200
+Subject: [PATCH] Make dependency on KI18n explicit
+
+It already pulled in by KParts, but we better not rely on that
+---
+ src/kontact_plugin/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/kontact_plugin/CMakeLists.txt b/src/kontact_plugin/CMakeLists.txt
+index dec4b8b..f1d56ec 100644
+--- a/src/kontact_plugin/CMakeLists.txt
++++ b/src/kontact_plugin/CMakeLists.txt
+@@ -13,7 +13,7 @@ set(kontact_kjots_PART_SRCS
+ )
+ 
+ add_library(kontact_kjotsplugin MODULE ${kontact_kjots_PART_SRCS})
+-target_link_libraries(kontact_kjotsplugin KF5::KontactInterface)
++target_link_libraries(kontact_kjotsplugin KF5::I18n KF5::KontactInterface)
+ kcoreaddons_desktop_to_json(kontact_kjotsplugin kjotsplugin.desktop)
+ 
+ install(TARGETS kontact_kjotsplugin DESTINATION ${KDE_INSTALL_PLUGINDIR}/kontact5)
+-- 
+GitLab
+
diff --git a/app-text/kjots/files/kjots-5.1.0-missing-lib.patch b/app-text/kjots/files/kjots-5.1.0-missing-lib.patch
new file mode 100644
index 000000000000..28418717d3be
--- /dev/null
+++ b/app-text/kjots/files/kjots-5.1.0-missing-lib.patch
@@ -0,0 +1,25 @@
+From 3d3cee8caeec813802a1af54c14805203fb1ddf6 Mon Sep 17 00:00:00 2001
+From: "Friedrich W. H. Kossebau" <kossebau@kde.org>
+Date: Tue, 7 Sep 2021 23:21:34 +0200
+Subject: [PATCH] noteshared: add missing library to link list
+
+GIT_SILENT
+---
+ src/noteshared/CMakeLists.txt | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/noteshared/CMakeLists.txt b/src/noteshared/CMakeLists.txt
+index 5de60ab..6aa0b0a 100644
+--- a/src/noteshared/CMakeLists.txt
++++ b/src/noteshared/CMakeLists.txt
+@@ -16,6 +16,7 @@ target_link_libraries(noteshared
+     Qt5::Core
+     Qt5::Widgets
+     KF5::I18n
++    KF5::AkonadiWidgets
+     KF5::AkonadiCore
+     KF5::AkonadiNotes
+     KF5::XmlGui
+-- 
+GitLab
+
diff --git a/app-text/kjots/kjots-5.1.0-r1.ebuild b/app-text/kjots/kjots-5.1.0-r1.ebuild
new file mode 100644
index 000000000000..dd1910ad60f6
--- /dev/null
+++ b/app-text/kjots/kjots-5.1.0-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KDE_ORG_CATEGORY="pim"
+KFMIN=5.82.0
+QTMIN=5.15.2
+inherit ecm kde.org
+
+DESCRIPTION="Note taking utility by KDE"
+HOMEPAGE="https://userbase.kde.org/KJots https://community.kde.org/PIM/KJots"
+
+if [[ ${KDE_BUILD_TYPE} != live ]]; then
+	SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="5"
+IUSE=""
+
+DEPEND="
+	dev-libs/grantlee:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtprintsupport-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-apps/akonadi-20.12.2:5
+	>=kde-apps/akonadi-notes-20.12.2:5
+	>=kde-apps/kmime-20.12.2:5
+	>=kde-apps/kontactinterface-20.12.2:5
+	>=kde-apps/kpimtextedit-20.12.2:5
+	>=kde-frameworks/kbookmarks-${KFMIN}:5
+	>=kde-frameworks/kcmutils-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kitemmodels-${KFMIN}:5
+	>=kde-frameworks/kparts-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-unused-dep.patch"
+	"${FILESDIR}/${P}-implicit-dep.patch"
+	"${FILESDIR}/${P}-missing-lib.patch"
+	"${FILESDIR}/${P}-akonadi-21.12.0.patch" # bug 830580
+)
diff --git a/app-text/kjots/kjots-5.1.0.ebuild b/app-text/kjots/kjots-5.1.0.ebuild
deleted file mode 100644
index 933ed290e976..000000000000
--- a/app-text/kjots/kjots-5.1.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_ORG_CATEGORY="pim"
-KFMIN=5.77.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Note taking utility by KDE"
-HOMEPAGE="https://userbase.kde.org/KJots https://community.kde.org/PIM/KJots"
-
-if [[ ${KDE_BUILD_TYPE} != live ]]; then
-	SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="5"
-IUSE=""
-
-DEPEND="
-	dev-libs/grantlee:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/akonadi-20.12.2:5
-	>=kde-apps/akonadi-notes-20.12.2:5
-	>=kde-apps/kmime-20.12.2:5
-	>=kde-apps/kontactinterface-20.12.2:5
-	>=kde-apps/kpimtextedit-20.12.2:5
-	>=kde-frameworks/kbookmarks-${KFMIN}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
-
-PATCHES+=( "${FILESDIR}/${P}-unused-dep.patch" )
diff --git a/app-text/lesspipe/Manifest b/app-text/lesspipe/Manifest
index b8afb8831df5..537404affb7f 100644
--- a/app-text/lesspipe/Manifest
+++ b/app-text/lesspipe/Manifest
@@ -3,9 +3,11 @@ DIST lesspipe-1.89.tar.gz 121118 BLAKE2B e730b6e8afc767a0118abbcc6221d2c18467393
 DIST lesspipe-1.90.tar.gz 121098 BLAKE2B 269f4193f423e4ac5770171156e2f63d14966d7dcc77bf015c3100f281206424ef334acc1edf2edb6fe31f73aed80b9c3ba6c715d6e97993c5a90dfc1ce42405 SHA512 d402bd46c37d2509c90530e9da0560fa3e5da9002c37a515451a8ab9275576d1af44793a10914e74e804f10a3352439815c6763d2d77e5e41a0e9840286f518e
 DIST lesspipe-1.91.tar.gz 121965 BLAKE2B 93c169b2b1a81db7e7b569718a43152a8f2b9ea95258047a00ae4940509817a3eb861fdadb6bafc5861c49e805ce910348a57f634bdae57317811ac6fbfc6945 SHA512 d080ceaae019d8885a53c8abb26f4a159b78578f68c2b9a024960aa69509651e3b6638e78bd6e2e57c23d81123d9a3cab167736f253ba4276a3889890d594bd3
 DIST lesspipe-2.00.tar.gz 190295 BLAKE2B 8f950853673e7939d6dd67c5022219ab101eea26b8efec1a7572e3c2c8465a14d09acbe945b204e927444b10953309b27fa47c5661df02e67aa2e2b98a940980 SHA512 f709bae63b17617d2c02bbe691736826c857ba1771907e37ba56bd407a29c2092a936ecb43d6a6e180a1d2eb5f54dccc894d2cf4eb113d42b4892ca6d8a4378d
+DIST lesspipe-2.01.tar.gz 171601 BLAKE2B 25c65ff0ac97382101fc25f23c52d1d1269d28a30ac472214992fda654946337dfbcd9d9d84e01bbe76902bcdf9c6eb4fdce481b40d2d74632a81d0da4214fa8 SHA512 e050075a43419f735d46314b006ceb16a2255b01a65b192d255a1256178fdca8286473292ef5248c15c8bda305da28275cdedd923c03bc6c601336bb857f2437
 EBUILD lesspipe-1.85.ebuild 1166 BLAKE2B b4f5ad06062203f195b36dc874c2d91f30f4222ecc94940687225b94a84129e142838c12938cb54ad35d248a3ea48bcc8ceddeda5aad0154b19ee8be6dfaad38 SHA512 7c7c0b9e6e95c1a6821338ba67f9869154b86ec9ab7d9f5e24e027a72c71ce6510da7f7d824dfea3e8e02bd9101111e1d75d45f1ae5518ef7aa50770904f3034
 EBUILD lesspipe-1.89.ebuild 1699 BLAKE2B 5a2f7a3ce059c3907fcc929f764e25545318d46d7f819bb3be3316946c6201fb7c1c3ab99c62c6205280fcdd4a578b30f4f7d2f872c1064ecea3620996566f66 SHA512 e6c9ddef87efbe09e4dbd03e71173e290a9436730106878c31507cd670edbde6937aec79cd45ccc0177a57eede30d2978d7a7fa0c42abfb21f52ca1edba77fa3
 EBUILD lesspipe-1.90.ebuild 1697 BLAKE2B b9b89e7d1a12c6ceccec482d956b36c3ada14f5709462563386645984d15f7e8f96083a4fb4bfca130a75c44970aefba11578e8c5e22ebefe15af6d7b6de7394 SHA512 bd62889ed01cdfad435b38e6b165d73fc8c5fc5b80edc1ce14eb236c87727cced1d55eca7562b23ba69b1883f02a75cc436964f7285eb95c6210b211326eeda6
 EBUILD lesspipe-1.91.ebuild 1759 BLAKE2B d61d0be210938702952601dc8685539aa4005d85027906388240c044b6e9435aaef7eb6dafa02bfbea38012b65d75734b5377849bc38059359dd7d0d3e524f93 SHA512 4082d05188d6bd724d28554fa883e470fd5b86d2b79c5d547078341d8966ac84bbc2a9facd33d72c77f85e91d47f9d17548e715f4829ba48241c17ea9f3547b0
 EBUILD lesspipe-2.00.ebuild 1151 BLAKE2B 8548077e644da8332e57fb87ac2cfe96faad4783e2b7bef05141faa1da51def693f33a1efd273e844056432b80789efbb1d11e71e85f932430d50f9381800558 SHA512 29c9c3205fd5a17fc0078decac414fbbca6c3b6276adb6dd981f48cd4f6081de4ed81a68ebec0a8a3836cae7146e1184f9ad09b2629a854ae6b9b9103da3d741
+EBUILD lesspipe-2.01.ebuild 1151 BLAKE2B a1fab056c11281135661629adda35e1eb368c2019495b296042087e2d64006343a9d54d8f0431a3969c565390febe636565ae3537b570d269042410280738e83 SHA512 c3425e65c3ef18352e4cb2998eb3e4bb2dcce7cea1e2685ba727d4d079f98487b167711801e94ddc8a3a292465a5e8eddb1dbbde4a93bce36397d2279afcea62
 MISC metadata.xml 304 BLAKE2B bb5be96b5fd22ce82d800f6bd5ed3ceb04b955182eaadc1f34b6f4b633c21efd6148013fc29b5567f7ada4da5de6efd7e0e420fa63a2976a5cf6bcf719c34f2e SHA512 2c217e67c6c487f7f7f98588a50086daf434bc25ad229b68d37bc12f7ecc4f904b5bc4a3b7b6db4a1daa0267c7e13fde8538de1c16d11e95be6b8071ee675105
diff --git a/app-text/lesspipe/lesspipe-2.01.ebuild b/app-text/lesspipe/lesspipe-2.01.ebuild
new file mode 100644
index 000000000000..9e47976576e2
--- /dev/null
+++ b/app-text/lesspipe/lesspipe-2.01.ebuild
@@ -0,0 +1,43 @@
+# 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/libnumbertext/Manifest b/app-text/libnumbertext/Manifest
index 22400dce7d27..b9f0d84aa642 100644
--- a/app-text/libnumbertext/Manifest
+++ b/app-text/libnumbertext/Manifest
@@ -1,3 +1,5 @@
 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
 MISC metadata.xml 256 BLAKE2B 28554175365761f81817e75e2c125714b94680527103d72118d0daf2eb0d2359082c36f2c8b0e92574e93c9c00038c944486a31d7843108dcc285d809bd52fe6 SHA512 1a0e13dd42f80f5c8669910c7360c6c1542e9a2f143da3a812f874966ba4729248152efb36e03bdfd47f09086797e6e1410e1ac735925d304811c847aa2b6398
diff --git a/app-text/libnumbertext/libnumbertext-1.0.8.ebuild b/app-text/libnumbertext/libnumbertext-1.0.8.ebuild
new file mode 100644
index 000000000000..14a4ecfc51f3
--- /dev/null
+++ b/app-text/libnumbertext/libnumbertext-1.0.8.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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-werror
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -type f -delete || die
+}
diff --git a/app-text/mdbook/Manifest b/app-text/mdbook/Manifest
index 438782941ff3..73657eb7e52f 100644
--- a/app-text/mdbook/Manifest
+++ b/app-text/mdbook/Manifest
@@ -88,6 +88,7 @@ DIST markup5ever-0.10.1.crate 34668 BLAKE2B a13f39ba93a26a558a8f03ebbbaa98bf2c7c
 DIST markup5ever_rcdom-0.1.0.crate 25165 BLAKE2B 4123ee804991e9be31e6a4dbcb7dcce12bb776d22e4409ad388678a92965834acb9b1b2fa51e6472ee2c0db156e4a75e5b6db5f6b6d4220159ab93b056d0418c SHA512 7c21836fcdd45bfdef7305327255291c92d75d3329798d31abab26297de8c381e41b4419fb7ac631310835d590b63751a63bdd87e2697ea3dfdd6599033433c7
 DIST matches-0.1.9.crate 2246 BLAKE2B de155202636c6a03ed68cdb21e8ef96e19b45be040a82943d2d7e5192c0ab5c253ab6d65f0b30b2689e21da79cba684af5be6e63c48266681aceba356f6eea41 SHA512 6a2809687d30ff04ea97bf9d1610d746e097699a4c3625ffd1b7b1e4a9673ece9d559058c9f760b99d6ab509024f7b338e7cfa6fe767499c983efa98bfb98305
 DIST mdbook-0.4.14.tar.gz 1502800 BLAKE2B c1bef8761120bdbdbcbb34454813c620761db16208a935bb0dba39936ca661adc8fbc1cbefc185da7c087de880a8b3c5894536719d01a1376d6d96c72a5539bc SHA512 c45e930e0ff20def1a11e85dbadc3759855fe2a9b5ad63d02d547423abfc16a93d35ff13567ce206274f35e68cf083958cd3caa83a648786e7c32bcfa9bdb6dd
+DIST mdbook-0.4.15.tar.gz 1508364 BLAKE2B 8f0a883908378b440528044136233bc6d481c7c0137cbd0875aee11654246f103c5e301276838bd403a68715eec48ea2d31f6e746f5996a354733f5c3a8c0046 SHA512 da5b1dee3718bb89f61438f39ee72d4d4db42034e620699b62e21513d1ee9f1cb9163456a4673d66c96d83ebd9f35f8b4d5c0829752a500a72f1561fa14060bf
 DIST memchr-2.4.1.crate 64977 BLAKE2B 31479718c118093b684bed946eae0706d77d9d275bd49f5aeff4de490f479abd60c7dc462150eafffc6d6fc1da0853123b78be038826b775d2a41a4c39d93ab5 SHA512 d8912e3902a2126f86159bdc998532a2890b882cbb7d59b5a470fffcad4c32281e045f2fff48a235aa4189f1928866bf3d33b699d50866ad6b6c272bba7adb11
 DIST mime-0.3.16.crate 15206 BLAKE2B 9a599ca82fd0dd6d3d2dea68a47b8441b1024d016ee1fb23cc6431b39ead20c9b3fe1ff3397af79c2c1b2cd277c440d4fff69f6b28c550ddbe15f680923c834b SHA512 cb1d691610cb82720e553247336fc5eab63407ad37febf2eb50aaa4e329cca70959ecd8bb8c7af5753acec2c8e86fc9a0f8ad9ad2de93fe9295ce84033d6054c
 DIST mime_guess-2.0.3.crate 27437 BLAKE2B 6f9176749241dc9b8c08eea3285ac1aeb40ab079f8184d93c436c00b205ab754d9c2b5c481774837bd1c4522b33338fb7ecabe88ee2da471478cdc1391d9281c SHA512 b08013ce235e66eaf49a88ab4c5cf4d1f1b95846c1bbdc1a73efea9052058860c7dbe2b028fe1b33c713621862fe9af2ed097558cbf5e08903ee406a44af162d
@@ -131,6 +132,7 @@ DIST proc-macro-hack-0.5.19.crate 15556 BLAKE2B 98c22fc3e5f5fa8b6f44d15de42b6ffc
 DIST proc-macro-nested-0.1.7.crate 6495 BLAKE2B c27ad92b57837ab1ce220958846253ed29de12ee1ed849948e5202913371d877bb648e6880ac3e6619b8d48342e1fe105df56a0abda1b13bd62262bea4c85fff SHA512 dc5d898c6d5588d279aa0852193105bbb3824798a05875e2181c66da8c3849fcb32189d9b213cad09054242aa4ae9cb602f9c2d1b5e7302963bac244bbaa27c2
 DIST proc-macro2-1.0.28.crate 38732 BLAKE2B f2d4765789d03d5d26c9de7e1283ce6e4086ca640d95a36649f8fdfe96533ad768b2a8ba56726e0462ba4fcd8f332fc455307987e0b7c79a5e96f2e75a641162 SHA512 2a4e34ab2bb692c3661db40ebc6d22f3dbcbc30c2f4d88e1a7f022f8522e943ffe2a1c9b92411c7e04941dc0156cb365e0de953fa45d8710e39b660ee9028741
 DIST pulldown-cmark-0.8.0.crate 106330 BLAKE2B bb59298b605993530e2363f3264c3ac1104ec57885c2dd183dcdf3aa9dc613999d24caeb86848ca3542544238aaa4eb49d5a6599d2fdef53af50b5dbead68e22 SHA512 396ade131c0a74cdfb8454e137e41c21f0b81b7cce654ba6ae9ceb132ba0fa0a467a190e6dd69cd7d59a267efbe83f008c9c8a5c9db47665aabc31a4bb9cb967
+DIST pulldown-cmark-0.9.0.crate 115000 BLAKE2B b627deaf477b27eabb1086f2d4b81450e8d9247c6fb931514e87c9d7b49850bb38bf4aaa8738cf6a74214f00260804c0bbd001e3150c8cd3bde1edd07c173eaf SHA512 57151704ea4e46138b5712d32a67600569615886d7b9f1329324bac2e26ec5cbee3a3db1634348b485bc39e8ccd4531ece3ae377efcce9a4b8e128cdad9792bd
 DIST quick-error-1.2.3.crate 15066 BLAKE2B 1c61525d383f3588c1c5017f016f60b484bbf2035e7f63c553bd9a49b638ab0c6106ac3676a41072b24da4e13dde78706e0f99fd1ec9ee329d5be81d45a85866 SHA512 f8aaf9024d20ccd42b706c756eed8320aee339f8776392b47a41cc82ca06b03df1a5b1f00854cea96689c5af261b4d8c5d2b1a242d10f2755e7e33dc41be35b9
 DIST quick-error-2.0.1.crate 14265 BLAKE2B 3815c89e960923bfe0abc962c38714b953fa1d5af991f3de22d1d084a8cd1ba1761fc961ba97e06ead3992ed1b61f525d04bcce459599e5546315932281c1dfd SHA512 e028deb598466ae91663e5d090606be4f117662d0fa6e0c0b0043c7261f26787057e84e644cae72a45b1a0a7b1fb03fc9712faa3abee94b97ce2c8d25c365c32
 DIST quote-1.0.9.crate 25042 BLAKE2B 26ef31e89fd2f0cc21ff65f8072f30c7977ac634d2536cf9845a0894d6659f62a96cd0a6ee48f7706036c2c1b898ef8c9167bd62714ad0c9cba4fb02f30922af SHA512 dd6cdaea183b85400531ef01e56657edbec0d8f7c27898c1e591b72dff755fa5875b33ca320bd65be0e9aecfc6a61ec119a4bd1291e9f2057fca642ab5b198c8
@@ -217,4 +219,5 @@ DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e
 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.14.ebuild 4806 BLAKE2B e99a2034e4625a07613da4424a453c438ea416b1df02217f5a8e547053d517b727c85b7ad347695df6dd97947ebbf39dca2e9aad7224d8825776816a1f015f68 SHA512 981b91aa13a0260b05731b10f6905f43e6957756700376bab495afb77e0233c153c2912cab83aad8f1d3b172ff809bb22409fcc16ed74c0c4fea794414fad150
+EBUILD mdbook-0.4.15.ebuild 4811 BLAKE2B 690344caab91b349c0aac120f8d9fa133e89dc05219acedcf548026462444a9d8496d3cea39cfa14575a0063ba24bcc2fbda65650f27e959848f841df9493e32 SHA512 c41f8c89ca2d13d3a8421d802fcf845478efa700ec8c40618763ec5357ad9189462f3bca29f5dc0bcbbbd28dec8b83a00afb1503fbece371084953216dd7dd5d
 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
new file mode 100644
index 000000000000..61270c429392
--- /dev/null
+++ b/app-text/mdbook/mdbook-0.4.15.ebuild
@@ -0,0 +1,259 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CRATES="
+	aho-corasick-0.7.18
+	ammonia-3.1.2
+	ansi_term-0.11.0
+	anyhow-1.0.43
+	assert_cmd-1.0.7
+	atty-0.2.14
+	autocfg-1.0.1
+	base64-0.13.0
+	bit-set-0.5.2
+	bit-vec-0.6.3
+	bitflags-1.3.2
+	block-buffer-0.7.3
+	block-buffer-0.9.0
+	block-padding-0.1.5
+	bstr-0.2.17
+	byte-tools-0.3.1
+	byteorder-1.4.3
+	bytes-1.0.1
+	cfg-if-0.1.10
+	cfg-if-1.0.0
+	chrono-0.4.19
+	clap-2.33.3
+	cpufeatures-0.1.5
+	ctor-0.1.20
+	difference-2.0.0
+	difflib-0.4.0
+	digest-0.8.1
+	digest-0.9.0
+	doc-comment-0.3.3
+	either-1.6.1
+	elasticlunr-rs-2.3.13
+	env_logger-0.7.1
+	fake-simd-0.1.2
+	filetime-0.2.15
+	float-cmp-0.9.0
+	fnv-1.0.7
+	form_urlencoded-1.0.1
+	fsevent-0.4.0
+	fsevent-sys-2.0.1
+	fuchsia-zircon-0.3.3
+	fuchsia-zircon-sys-0.3.3
+	futf-0.1.4
+	futures-0.3.16
+	futures-channel-0.3.16
+	futures-core-0.3.16
+	futures-io-0.3.16
+	futures-macro-0.3.16
+	futures-sink-0.3.16
+	futures-task-0.3.16
+	futures-util-0.3.16
+	generic-array-0.12.4
+	generic-array-0.14.4
+	getopts-0.2.21
+	getrandom-0.1.16
+	getrandom-0.2.3
+	gitignore-1.0.7
+	glob-0.3.0
+	h2-0.3.4
+	handlebars-4.1.2
+	hashbrown-0.11.2
+	headers-0.3.4
+	headers-core-0.2.0
+	heck-0.3.3
+	hermit-abi-0.1.19
+	html5ever-0.25.1
+	http-0.2.4
+	http-body-0.4.3
+	httparse-1.5.1
+	httpdate-1.0.1
+	humantime-1.3.0
+	hyper-0.14.11
+	idna-0.2.3
+	indexmap-1.7.0
+	inotify-0.7.1
+	inotify-sys-0.1.5
+	input_buffer-0.4.0
+	iovec-0.1.4
+	itertools-0.10.1
+	itoa-0.4.8
+	kernel32-sys-0.2.2
+	lazy_static-1.4.0
+	lazycell-1.3.0
+	libc-0.2.100
+	log-0.4.14
+	mac-0.1.1
+	maplit-1.0.2
+	markup5ever-0.10.1
+	markup5ever_rcdom-0.1.0
+	matches-0.1.9
+	memchr-2.4.1
+	mime-0.3.16
+	mime_guess-2.0.3
+	mio-0.6.23
+	mio-0.7.13
+	mio-extras-2.0.6
+	miow-0.2.2
+	miow-0.3.7
+	net2-0.2.37
+	new_debug_unreachable-1.0.4
+	normalize-line-endings-0.3.0
+	notify-4.0.17
+	ntapi-0.3.6
+	num-integer-0.1.44
+	num-traits-0.2.14
+	num_cpus-1.13.0
+	opaque-debug-0.2.3
+	opaque-debug-0.3.0
+	opener-0.5.0
+	output_vt100-0.1.2
+	percent-encoding-2.1.0
+	pest-2.1.3
+	pest_derive-2.1.0
+	pest_generator-2.1.3
+	pest_meta-2.1.3
+	phf-0.8.0
+	phf_codegen-0.8.0
+	phf_generator-0.8.0
+	phf_shared-0.8.0
+	pin-project-1.0.8
+	pin-project-internal-1.0.8
+	pin-project-lite-0.2.7
+	pin-utils-0.1.0
+	ppv-lite86-0.2.10
+	precomputed-hash-0.1.1
+	predicates-2.0.1
+	predicates-core-1.0.2
+	predicates-tree-1.0.2
+	pretty_assertions-0.6.1
+	proc-macro-hack-0.5.19
+	proc-macro-nested-0.1.7
+	proc-macro2-1.0.28
+	pulldown-cmark-0.9.0
+	quick-error-1.2.3
+	quick-error-2.0.1
+	quote-1.0.9
+	rand-0.7.3
+	rand-0.8.4
+	rand_chacha-0.2.2
+	rand_chacha-0.3.1
+	rand_core-0.5.1
+	rand_core-0.6.3
+	rand_hc-0.2.0
+	rand_hc-0.3.1
+	rand_pcg-0.2.1
+	redox_syscall-0.2.10
+	regex-1.5.4
+	regex-automata-0.1.10
+	regex-syntax-0.6.25
+	remove_dir_all-0.5.3
+	ryu-1.0.5
+	same-file-1.0.6
+	scoped-tls-1.0.0
+	select-0.5.0
+	semver-0.11.0
+	semver-parser-0.10.2
+	serde-1.0.129
+	serde_derive-1.0.129
+	serde_json-1.0.66
+	serde_urlencoded-0.7.0
+	sha-1-0.8.2
+	sha-1-0.9.7
+	shlex-1.0.0
+	siphasher-0.3.6
+	slab-0.4.4
+	socket2-0.4.1
+	string_cache-0.8.1
+	string_cache_codegen-0.5.1
+	strsim-0.8.0
+	strum-0.21.0
+	strum_macros-0.21.1
+	syn-1.0.75
+	tempfile-3.2.0
+	tendril-0.4.2
+	termcolor-1.1.2
+	textwrap-0.11.0
+	time-0.1.43
+	tinyvec-1.3.1
+	tinyvec_macros-0.1.0
+	tokio-1.10.0
+	tokio-macros-1.3.0
+	tokio-stream-0.1.7
+	tokio-tungstenite-0.13.0
+	tokio-util-0.6.7
+	toml-0.5.8
+	topological-sort-0.1.0
+	tower-service-0.3.1
+	tracing-0.1.26
+	tracing-core-0.1.19
+	treeline-0.1.0
+	try-lock-0.2.3
+	tungstenite-0.12.0
+	typenum-1.13.0
+	ucd-trie-0.1.3
+	unicase-2.6.0
+	unicode-bidi-0.3.6
+	unicode-normalization-0.1.19
+	unicode-segmentation-1.8.0
+	unicode-width-0.1.8
+	unicode-xid-0.2.2
+	url-2.2.2
+	utf-8-0.7.6
+	vec_map-0.8.2
+	version_check-0.9.3
+	wait-timeout-0.2.0
+	walkdir-2.3.2
+	want-0.3.0
+	warp-0.3.1
+	wasi-0.10.2+wasi-snapshot-preview1
+	wasi-0.9.0+wasi-snapshot-preview1
+	winapi-0.2.8
+	winapi-0.3.9
+	winapi-build-0.1.1
+	winapi-i686-pc-windows-gnu-0.4.0
+	winapi-util-0.1.5
+	winapi-x86_64-pc-windows-gnu-0.4.0
+	ws2_32-sys-0.2.1
+	xml5ever-0.16.1"
+inherit cargo toolchain-funcs
+
+DESCRIPTION="Create a book from markdown files"
+HOMEPAGE="https://rust-lang.github.io/mdBook/"
+SRC_URI="
+	https://github.com/rust-lang/mdBook/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
+	$(cargo_crate_uris)"
+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"
+IUSE="doc"
+
+QA_FLAGS_IGNORED="usr/bin/${PN}"
+
+src_compile() {
+	cargo_src_compile
+
+	if use doc; then
+		if tc-is-cross-compiler; then
+			ewarn "html docs were skipped due to cross-compilation"
+		else
+			target/$(usex debug{,} release)/${PN} build -d html guide || die
+		fi
+	fi
+}
+
+src_install() {
+	cargo_src_install
+
+	dodoc CHANGELOG.md README.md
+
+	[[ -e guide/html ]] && dodoc -r guide/html
+}
diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index ab36f1ec112e..118e94a0b0bc 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -4,7 +4,9 @@ AUX poppler-21.09.0-respect-cflags.patch 5473 BLAKE2B 78f12a2f5f582c369ac72b5203
 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-9999.ebuild 3338 BLAKE2B e8fdf3ac099097ab534bbc78dd126b39f2150d4ea68b070f774f6a443a2cc9adf096b2b8e6db432d1b95c4e67f2823dad10c7100fb67a2ba02f6f9eb8b8c01ea SHA512 3b04f844539eaf99d22d8af8121d2fdad37fee28f916a9101c2b404dea52c93d6de8e65ccb738e047f6d4bc2b1069735449ff33941ccc3538cfb385a545a67b9
+EBUILD poppler-22.01.0.ebuild 3338 BLAKE2B 648c9dd4935f5f91f148b697ad846d23ecc18ea0a7335107b3b5c889cc8554623c3ec640f964df85fc8708c0ac1092206e9918f99f81bec6de6e9fc3f969d7dc SHA512 560fea78245663a6e92c904b67b7c9da49cdeb67ed7c80474ae4e09c304675857c49ab32d9baae0fac53a5d2b8587da5c620c7b0c7fa80610a87639947d25462
+EBUILD poppler-9999.ebuild 3338 BLAKE2B 648c9dd4935f5f91f148b697ad846d23ecc18ea0a7335107b3b5c889cc8554623c3ec640f964df85fc8708c0ac1092206e9918f99f81bec6de6e9fc3f969d7dc SHA512 560fea78245663a6e92c904b67b7c9da49cdeb67ed7c80474ae4e09c304675857c49ab32d9baae0fac53a5d2b8587da5c620c7b0c7fa80610a87639947d25462
 MISC metadata.xml 1078 BLAKE2B c5ce2245efedc75eb39a6c649d27698da0ac07b87da3240aeb9fea1435d48c3282a8a3bb9f002c78b79de2a518cb73f3eef563c05f41528bb55ffeca84409e13 SHA512 22c83f7f6a7632fc4fe94223be9e5edac085099bf5c0f6621b0179b16e35b98b0027e467e76c0ca365008d765258e05faf48dbc4b1e8d5eb507f348a533f88f6
diff --git a/app-text/poppler/poppler-22.01.0.ebuild b/app-text/poppler/poppler-22.01.0.ebuild
new file mode 100644
index 000000000000..bd261ab8e292
--- /dev/null
+++ b/app-text/poppler/poppler-22.01.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/117"   # 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 9da7f4e63ab3..bd261ab8e292 100644
--- a/app-text/poppler/poppler-9999.ebuild
+++ b/app-text/poppler/poppler-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2005-2021 Gentoo Authors
+# Copyright 2005-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -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/116"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
+	SLOT="0/117"   # 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/zotero-bin/Manifest b/app-text/zotero-bin/Manifest
index ad138bd71836..d027b7b3d39e 100644
--- a/app-text/zotero-bin/Manifest
+++ b/app-text/zotero-bin/Manifest
@@ -1,3 +1,3 @@
 DIST zotero-bin-5.0.96.3.tar.bz2 61236517 BLAKE2B 3de6d41349f9cc405dd3d44e8e456169d58bdd1f4522c31cd168182878839fe8ca6280eff7339bcf3d66c87c7d4f5af55d768551abcff3cd579342cae37b64e3 SHA512 0777ec41bc151b0bd30076f8a7f59e431c3435728b4d85298421ef11aea5b7c1e122d3bb7fcc5551bb8c4472922796d9508a56df7a0913515d8568fcf3ca6fee
-EBUILD zotero-bin-5.0.96.3.ebuild 1743 BLAKE2B 38874794e3f744cadd85607ef5cfdc9847a1e102070322fef13d083b7c2c7ec9218407f8af23e5f78fd95b7d9b1fa12aea46b736a0d2d941ebddd62f66d6ea7b SHA512 3d059561f4e86f293d92dcacf1b8a984c9f25a7594f7f5f4dca20fdb07ceba0e0db3e13f43a4194f48811708f405906c132acb917f9acdfd5846095527cb1f8a
+EBUILD zotero-bin-5.0.96.3.ebuild 1758 BLAKE2B da6782640b9aef3c697d0f60fd1cc87d1b76539e1f4ea1d23628b769d2b0a0230000a0f4707e317fef3792fd6248e950086ffa0aaf14f52c52a18ed3d422caa9 SHA512 4359f979d921def27016d05e3ef65018f8cf6c2bdf8caeb51bbcb3263b88c6129e4ff645a14018d4a45ae024703aea23a3a5782fcc5016fc1d0fba3d79db1357
 MISC metadata.xml 398 BLAKE2B ef8965041b1ddb5dafacd8d3b913c2c272b50460607018468446993062620044b77ee4033d9811979768aafba6def9b3e06775d48f8f194f7ca95ec6ad048c5c SHA512 5a67ca8cbadcfa83e38f983b3e448073970e71f2d2a3c0756d8cbbe54050382095df564bdd5e52b0976a9588f882d814a71179957e09e429a2881a7f48041e53
diff --git a/app-text/zotero-bin/zotero-bin-5.0.96.3.ebuild b/app-text/zotero-bin/zotero-bin-5.0.96.3.ebuild
index 561cabf9e7f0..0b2db122a690 100644
--- a/app-text/zotero-bin/zotero-bin-5.0.96.3.ebuild
+++ b/app-text/zotero-bin/zotero-bin-5.0.96.3.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
@@ -22,6 +22,7 @@ RDEPEND="
 	media-libs/fontconfig
 	media-libs/freetype
 	sys-apps/dbus
+	sys-libs/glibc
 	x11-libs/cairo
 	x11-libs/gdk-pixbuf
 	x11-libs/gtk+:2
@@ -41,7 +42,7 @@ RDEPEND="
 
 S="${WORKDIR}/Zotero_linux-x86_64"
 
-QA_PREBUILT="/opt/zotero/*"
+QA_PREBUILT="opt/zotero/*"
 
 src_prepare() {
 	# disable auto-update
-- 
cgit v1.2.3