gentoo resync : 29.12.2022

author: V3n3RiX <venerix@koprulu.sector> 2022-06-29 12:04:12 +0100
committer: V3n3RiX <venerix@koprulu.sector> 2022-06-29 12:04:12 +0100
commit: 0f558761aa2dee1017b4751e4017205e015a9560 (patch)
tree: 037df795519468a25d9362b4e95cdaeb84eb1cf9 /metadata/md5-cache/app-text
parent: 752d6256e5204b958b0ef7905675a940b5e9172f (diff)
378 files changed, 1018 insertions, 1003 deletions
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index dd300e9a0b37..016f9e3b0488 100644
--- a/metadata/md5-cache/app-text/Manifest.gz
+++ b/metadata/md5-cache/app-text/Manifest.gz
diff --git a/metadata/md5-cache/app-text/a2ps-4.14-r6 b/metadata/md5-cache/app-text/a2ps-4.14-r6
index 203a9d7090c8..da669cb31ffe 100644
--- a/metadata/md5-cache/app-text/a2ps-4.14-r6
+++ b/metadata/md5-cache/app-text/a2ps-4.14-r6
@@ -11,5 +11,5 @@ RDEPEND=app-text/ghostscript-gpl app-text/libpaper >=app-text/psutils-1.17 app-t
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnu/a2ps/a2ps-4.14.tar.gz cjk? ( mirror://gentoo/a2ps-4.14-ja_nls.patch.gz )
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	e7aaa047873789f549ea3df2f04b2145	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	desktop	22952d8f27cac191d75529d4c38e6bfa	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	e7aaa047873789f549ea3df2f04b2145	epatch	28f0f3c0226306ec5f49e13bf851f171	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4fbbbc98f236f1b43acd99476bc3cd85	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=2894260d0887ecb08afd025efd22936d
diff --git a/metadata/md5-cache/app-text/agrep-2.04-r2 b/metadata/md5-cache/app-text/agrep-2.04-r2
index 3981ccac5832..742c2b12002b 100644
--- a/metadata/md5-cache/app-text/agrep-2.04-r2
+++ b/metadata/md5-cache/app-text/agrep-2.04-r2
@@ -2,10 +2,11 @@ DEFINED_PHASES=compile install
 DESCRIPTION=A tool for the fast searching of text allowing for errors in the search pattern
 EAPI=6
 HOMEPAGE=ftp://ftp.cs.arizona.edu/agrep/README
+INHERIT=toolchain-funcs
 KEYWORDS=amd64 arm ~arm64 ~mips ppc ppc64 sparc x86 ~ppc-macos ~sparc-solaris
 LICENSE=AGREP
 RDEPEND=!dev-libs/tre !dev-ruby/amatch !app-misc/glimpse
 SLOT=0
 SRC_URI=ftp://ftp.cs.arizona.edu/agrep/agrep-2.04.tar.Z
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=e563c99320577b823a280fe6059d5090
diff --git a/metadata/md5-cache/app-text/aiksaurus-1.2.1-r2 b/metadata/md5-cache/app-text/aiksaurus-1.2.1-r2
index 6a0cf60d1ef1..bab719abc9e4 100644
--- a/metadata/md5-cache/app-text/aiksaurus-1.2.1-r2
+++ b/metadata/md5-cache/app-text/aiksaurus-1.2.1-r2
@@ -4,11 +4,12 @@ DEPEND=gtk? ( x11-libs/gtk+:2 )
 DESCRIPTION=A thesaurus lib, tool and database
 EAPI=7
 HOMEPAGE=https://sourceforge.net/projects/aiksaurus
+INHERIT=flag-o-matic libtool
 IUSE=gtk
 KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=GPL-2
 RDEPEND=gtk? ( x11-libs/gtk+:2 )
 SLOT=0
 SRC_URI=mirror://sourceforge/aiksaurus/aiksaurus-1.2.1.tar.gz https://dev.gentoo.org/~soap/distfiles/aiksaurus-1.2.1-patches.txz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=55609aeb4072592c01ba3fede1237c70
diff --git a/metadata/md5-cache/app-text/an-1.2_p6 b/metadata/md5-cache/app-text/an-1.2_p6
index 4a219f551564..85f4a7817287 100644
--- a/metadata/md5-cache/app-text/an-1.2_p6
+++ b/metadata/md5-cache/app-text/an-1.2_p6
@@ -3,10 +3,11 @@ DEPEND=dev-libs/icu:= sys-apps/miscfiles[-minimal] virtual/pkgconfig
 DESCRIPTION=Very fast anagram generator with dictionary lookup
 EAPI=7
 HOMEPAGE=https://packages.debian.org/unstable/games/an
+INHERIT=toolchain-funcs
 KEYWORDS=amd64 ~hppa ppc ppc64 x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/icu:= sys-apps/miscfiles[-minimal]
 SLOT=0
 SRC_URI=mirror://debian/pool/main/a/an/an_1.2.orig.tar.xz mirror://debian/pool/main/a/an/an_1.2-6.debian.tar.xz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=4d51fd669976e7e1e423ef7066c40281
diff --git a/metadata/md5-cache/app-text/ansifilter-2.18 b/metadata/md5-cache/app-text/ansifilter-2.18
index 40bdf9429fab..890567c7240b 100644
--- a/metadata/md5-cache/app-text/ansifilter-2.18
+++ b/metadata/md5-cache/app-text/ansifilter-2.18
@@ -5,10 +5,10 @@ EAPI=7
 HOMEPAGE=http://www.andre-simon.de/
 INHERIT=desktop toolchain-funcs qmake-utils
 IUSE=qt5
-KEYWORDS=amd64 arm arm64 hppa ppc ppc64 ~s390 sparc x86 ~x64-macos
+KEYWORDS=amd64 arm arm64 hppa ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
 LICENSE=GPL-3+
 RDEPEND=qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 )
 SLOT=0
 SRC_URI=http://www.andre-simon.de/zip/ansifilter-2.18.tar.bz2
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=149d73a6de05a1418a3d05988b88090b
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	multilib	4fbbbc98f236f1b43acd99476bc3cd85	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=a612247b653530337093eb3b70fc300c
diff --git a/metadata/md5-cache/app-text/antiword-0.37-r2 b/metadata/md5-cache/app-text/antiword-0.37-r2
index 65e79c1c4a1e..f1f82639b4e7 100644
--- a/metadata/md5-cache/app-text/antiword-0.37-r2
+++ b/metadata/md5-cache/app-text/antiword-0.37-r2
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile configure install prepare
 DESCRIPTION=free MS Word reader
 EAPI=8
 HOMEPAGE=http://www.winfield.demon.nl
+INHERIT=toolchain-funcs
 KEYWORDS=~alpha amd64 ~arm ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://www.winfield.demon.nl/linux/antiword-0.37.tar.gz https://dev.gentoo.org/~grobian/distfiles/antiword-gentoo-patches-r2.tar.bz2
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=4018d81a3770350e4ed27da0729f4d34
diff --git a/metadata/md5-cache/app-text/apvlv-0.1.5-r2 b/metadata/md5-cache/app-text/apvlv-0.1.5-r2
index 79b8558af855..5b5f2af58a81 100644
--- a/metadata/md5-cache/app-text/apvlv-0.1.5-r2
+++ b/metadata/md5-cache/app-text/apvlv-0.1.5-r2
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.20.5
+BDEPEND=virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
 DEPEND=>=app-text/poppler-0.18[cairo,xpdf-headers(+)] dev-libs/glib:2 x11-libs/gtk+:3 djvu? ( app-text/djvu:= ) dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Alf's PDF Viewer Like Vim
@@ -11,5 +11,5 @@ LICENSE=GPL-2
 RDEPEND=>=app-text/poppler-0.18[cairo,xpdf-headers(+)] dev-libs/glib:2 x11-libs/gtk+:3 djvu? ( app-text/djvu:= )
 SLOT=0
 SRC_URI=https://github.com/naihe2010/apvlv/archive/v0.1.5.tar.gz -> apvlv-0.1.5.tar.gz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=de74c8238c69a96c998067df0058837c
diff --git a/metadata/md5-cache/app-text/apvlv-0.4.0 b/metadata/md5-cache/app-text/apvlv-0.4.0
index 654d8dced6b3..949a1c8c280e 100644
--- a/metadata/md5-cache/app-text/apvlv-0.4.0
+++ b/metadata/md5-cache/app-text/apvlv-0.4.0
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.20.5
+BDEPEND=virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
 DEPEND=app-text/ebook-tools >=app-text/poppler-0.5.0:=[cairo,xpdf-headers(+)] dev-libs/glib:2 dev-libs/libxml2 net-libs/webkit-gtk:= x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/pango djvu? ( app-text/djvu ) app-text/ghostscript-gpl media-libs/freetype
 DESCRIPTION=Alf's PDF/DJVU/EPUB Viewer like Vim
@@ -11,5 +11,5 @@ LICENSE=GPL-2
 RDEPEND=app-text/ebook-tools >=app-text/poppler-0.5.0:=[cairo,xpdf-headers(+)] dev-libs/glib:2 dev-libs/libxml2 net-libs/webkit-gtk:= x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/pango djvu? ( app-text/djvu )
 SLOT=0
 SRC_URI=https://github.com/naihe2010/apvlv/archive/refs/tags/v0.4.0.tar.gz -> apvlv-0.4.0.tar.gz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	desktop	c0d27bf73aa08ca05b663dbd31fbef28	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	desktop	22952d8f27cac191d75529d4c38e6bfa	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=1b1d93b9e2881a47b523c196ded84dcc
diff --git a/metadata/md5-cache/app-text/asa-1.1-r1 b/metadata/md5-cache/app-text/asa-1.1-r1
index e05ce7f728e7..16668db30f3d 100644
--- a/metadata/md5-cache/app-text/asa-1.1-r1
+++ b/metadata/md5-cache/app-text/asa-1.1-r1
@@ -2,9 +2,10 @@ DEFINED_PHASES=install prepare
 DESCRIPTION=ASA Carriage control conversion for ouput by Fortran programs
 EAPI=7
 HOMEPAGE=https://www.ibiblio.org/pub/Linux/devel/lang/fortran/
+INHERIT=toolchain-funcs
 KEYWORDS=amd64
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://www.ibiblio.org/pub/Linux/devel/lang/fortran/asa-1.1.tar.gz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=f38e17325c1d28f33dbe49df228f4019
diff --git a/metadata/md5-cache/app-text/asciidoc-10.1.4 b/metadata/md5-cache/app-text/asciidoc-10.1.4
index f0cb4be22ff5..294e7c3253e4 100644
--- a/metadata/md5-cache/app-text/asciidoc-10.1.4
+++ b/metadata/md5-cache/app-text/asciidoc-10.1.4
@@ -11,5 +11,5 @@ RDEPEND=app-text/docbook-xml-dtd:4.5 >=app-text/docbook-xsl-stylesheets-1.75 dev
 REQUIRED_USE=^^ ( python_single_target_pypy3 python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/a/asciidoc/asciidoc-10.1.4.tar.gz
-_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	d524f291c80f9d21ad80fe978e3ca760	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	d524f291c80f9d21ad80fe978e3ca760	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=cb340c8347b23d407d0975bcf96f015d
diff --git a/metadata/md5-cache/app-text/asciidoc-10.2.0 b/metadata/md5-cache/app-text/asciidoc-10.2.0
new file mode 100644
index 000000000000..5c9ad3e20a71
--- /dev/null
+++ b/metadata/md5-cache/app-text/asciidoc-10.2.0
@@ -0,0 +1,15 @@
+BDEPEND=python_single_target_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_single_target_pypy3? ( >=dev-python/gpep517-3[python_targets_pypy3(-)] >=dev-python/setuptools-60.5.0[python_targets_pypy3(-)] dev-python/wheel[python_targets_pypy3(-)] ) python_single_target_python3_8? ( >=dev-python/gpep517-3[python_targets_python3_8(-)] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)] dev-python/wheel[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/gpep517-3[python_targets_python3_9(-)] >=dev-python/setuptools-60.5.0[python_targets_python3_9(-)] dev-python/wheel[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/gpep517-3[python_targets_python3_10(-)] >=dev-python/setuptools-60.5.0[python_targets_python3_10(-)] dev-python/wheel[python_targets_python3_10(-)] )
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DESCRIPTION=A plain text human readable/writable document format
+EAPI=8
+HOMEPAGE=https://asciidoc.org/ https://github.com/asciidoc-py/asciidoc-py/
+INHERIT=distutils-r1 optfeature readme.gentoo-r1
+IUSE=python_single_target_pypy3 python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=app-text/docbook-xml-dtd:4.5 >=app-text/docbook-xsl-stylesheets-1.75 dev-libs/libxslt dev-libs/libxml2:2 python_single_target_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
+REQUIRED_USE=^^ ( python_single_target_pypy3 python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
+SLOT=0
+SRC_URI=mirror://pypi/a/asciidoc/asciidoc-10.2.0.tar.gz
+_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	d524f291c80f9d21ad80fe978e3ca760	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=cb340c8347b23d407d0975bcf96f015d
diff --git a/metadata/md5-cache/app-text/asciidoc-9.1.0 b/metadata/md5-cache/app-text/asciidoc-9.1.0
index 8bdb9013005a..b8a81d1ccd54 100644
--- a/metadata/md5-cache/app-text/asciidoc-9.1.0
+++ b/metadata/md5-cache/app-text/asciidoc-9.1.0
@@ -13,5 +13,5 @@ REQUIRED_USE=^^ ( python_single_target_pypy3 python_single_target_python3_8 pyth
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/asciidoc-py/asciidoc-py/releases/download/9.1.0/asciidoc-9.1.0.tar.gz -> asciidoc-9.1.0.new.tar.gz
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	d524f291c80f9d21ad80fe978e3ca760	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	d524f291c80f9d21ad80fe978e3ca760	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=57ed0ae091e3bdac999fc04608e43607
diff --git a/metadata/md5-cache/app-text/asciidoc-9.1.1 b/metadata/md5-cache/app-text/asciidoc-9.1.1
index 3deb0db8239d..5fa9e933b66b 100644
--- a/metadata/md5-cache/app-text/asciidoc-9.1.1
+++ b/metadata/md5-cache/app-text/asciidoc-9.1.1
@@ -13,5 +13,5 @@ REQUIRED_USE=^^ ( python_single_target_pypy3 python_single_target_python3_8 pyth
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/asciidoc-py/asciidoc-py/releases/download/9.1.1/asciidoc-9.1.1.tar.gz -> asciidoc-9.1.1.new.tar.gz
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	d524f291c80f9d21ad80fe978e3ca760	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	d524f291c80f9d21ad80fe978e3ca760	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=096a5c3a0e0ff7d3e3326aae1462cbe3
diff --git a/metadata/md5-cache/app-text/aspell-0.60.8-r4 b/metadata/md5-cache/app-text/aspell-0.60.8-r4
index 20a0d6ad7469..eca13724d60c 100644
--- a/metadata/md5-cache/app-text/aspell-0.60.8-r4
+++ b/metadata/md5-cache/app-text/aspell-0.60.8-r4
@@ -4,12 +4,13 @@ DEPEND=sys-libs/ncurses:=[unicode(+)?] nls? ( virtual/libintl )
 DESCRIPTION=Free and Open Source spell checker designed to replace Ispell
 EAPI=8
 HOMEPAGE=http://aspell.net/
+INHERIT=autotools flag-o-matic libtool toolchain-funcs
 IUSE=nls unicode l10n_af l10n_am l10n_ar l10n_ast l10n_az l10n_be l10n_bg l10n_bn l10n_br l10n_ca l10n_cs l10n_csb l10n_cy l10n_da l10n_de l10n_de-1901 l10n_el l10n_en l10n_eo l10n_es l10n_et l10n_fa l10n_fi l10n_fo l10n_fr l10n_fy l10n_ga l10n_gd l10n_gl l10n_grc l10n_gu l10n_gv l10n_he l10n_hi l10n_hil l10n_hr l10n_hsb l10n_hu l10n_hus l10n_hy l10n_ia l10n_id l10n_is l10n_it l10n_kn l10n_ku l10n_ky l10n_la l10n_lt l10n_lv l10n_mg l10n_mi l10n_mk l10n_ml l10n_mn l10n_mr l10n_ms l10n_mt l10n_nb l10n_nds l10n_nl l10n_nn l10n_no l10n_ny l10n_or l10n_pa l10n_pl l10n_pt-PT l10n_pt-BR l10n_qu l10n_ro l10n_ru l10n_rw l10n_sc l10n_sk l10n_sl l10n_sr l10n_sv l10n_sw l10n_ta l10n_te l10n_tet l10n_tk l10n_tl l10n_tn l10n_tr l10n_uk l10n_uz l10n_vi l10n_wa l10n_yi l10n_zu
-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
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris
 LICENSE=LGPL-2.1
 PDEPEND=l10n_af? ( app-dicts/aspell-af ) l10n_am? ( app-dicts/aspell-am ) l10n_ar? ( app-dicts/aspell-ar ) l10n_ast? ( app-dicts/aspell-ast ) l10n_az? ( app-dicts/aspell-az ) l10n_be? ( app-dicts/aspell-be ) l10n_bg? ( app-dicts/aspell-bg ) l10n_bn? ( app-dicts/aspell-bn ) l10n_br? ( app-dicts/aspell-br ) l10n_ca? ( app-dicts/aspell-ca ) l10n_cs? ( app-dicts/aspell-cs ) l10n_csb? ( app-dicts/aspell-csb ) l10n_cy? ( app-dicts/aspell-cy ) l10n_da? ( app-dicts/aspell-da ) l10n_de? ( app-dicts/aspell-de ) l10n_de-1901? ( app-dicts/aspell-de-alt ) l10n_el? ( app-dicts/aspell-el ) l10n_en? ( app-dicts/aspell-en ) l10n_eo? ( app-dicts/aspell-eo ) l10n_es? ( app-dicts/aspell-es ) l10n_et? ( app-dicts/aspell-et ) l10n_fa? ( app-dicts/aspell-fa ) l10n_fi? ( app-dicts/aspell-fi ) l10n_fo? ( app-dicts/aspell-fo ) l10n_fr? ( app-dicts/aspell-fr ) l10n_fy? ( app-dicts/aspell-fy ) l10n_ga? ( app-dicts/aspell-ga ) l10n_gd? ( app-dicts/aspell-gd ) l10n_gl? ( app-dicts/aspell-gl ) l10n_grc? ( app-dicts/aspell-grc ) l10n_gu? ( app-dicts/aspell-gu ) l10n_gv? ( app-dicts/aspell-gv ) l10n_he? ( app-dicts/aspell-he ) l10n_hi? ( app-dicts/aspell-hi ) l10n_hil? ( app-dicts/aspell-hil ) l10n_hr? ( app-dicts/aspell-hr ) l10n_hsb? ( app-dicts/aspell-hsb ) l10n_hu? ( app-dicts/aspell-hu ) l10n_hus? ( app-dicts/aspell-hus ) l10n_hy? ( app-dicts/aspell-hy ) l10n_ia? ( app-dicts/aspell-ia ) l10n_id? ( app-dicts/aspell-id ) l10n_is? ( app-dicts/aspell-is ) l10n_it? ( app-dicts/aspell-it ) l10n_kn? ( app-dicts/aspell-kn ) l10n_ku? ( app-dicts/aspell-ku ) l10n_ky? ( app-dicts/aspell-ky ) l10n_la? ( app-dicts/aspell-la ) l10n_lt? ( app-dicts/aspell-lt ) l10n_lv? ( app-dicts/aspell-lv ) l10n_mg? ( app-dicts/aspell-mg ) l10n_mi? ( app-dicts/aspell-mi ) l10n_mk? ( app-dicts/aspell-mk ) l10n_ml? ( app-dicts/aspell-ml ) l10n_mn? ( app-dicts/aspell-mn ) l10n_mr? ( app-dicts/aspell-mr ) l10n_ms? ( app-dicts/aspell-ms ) l10n_mt? ( app-dicts/aspell-mt ) l10n_nb? ( app-dicts/aspell-nb ) l10n_nds? ( app-dicts/aspell-nds ) l10n_nl? ( app-dicts/aspell-nl ) l10n_nn? ( app-dicts/aspell-nn ) l10n_no? ( app-dicts/aspell-no ) l10n_ny? ( app-dicts/aspell-ny ) l10n_or? ( app-dicts/aspell-or ) l10n_pa? ( app-dicts/aspell-pa ) l10n_pl? ( app-dicts/aspell-pl ) l10n_pt-PT? ( app-dicts/aspell-pt ) l10n_pt-BR? ( app-dicts/aspell-pt-br ) l10n_qu? ( app-dicts/aspell-qu ) l10n_ro? ( app-dicts/aspell-ro ) l10n_ru? ( app-dicts/aspell-ru ) l10n_rw? ( app-dicts/aspell-rw ) l10n_sc? ( app-dicts/aspell-sc ) l10n_sk? ( app-dicts/aspell-sk ) l10n_sl? ( app-dicts/aspell-sl ) l10n_sr? ( app-dicts/aspell-sr ) l10n_sv? ( app-dicts/aspell-sv ) l10n_sw? ( app-dicts/aspell-sw ) l10n_ta? ( app-dicts/aspell-ta ) l10n_te? ( app-dicts/aspell-te ) l10n_tet? ( app-dicts/aspell-tet ) l10n_tk? ( app-dicts/aspell-tk ) l10n_tl? ( app-dicts/aspell-tl ) l10n_tn? ( app-dicts/aspell-tn ) l10n_tr? ( app-dicts/aspell-tr ) l10n_uk? ( app-dicts/aspell-uk ) l10n_uz? ( app-dicts/aspell-uz ) l10n_vi? ( app-dicts/aspell-vi ) l10n_wa? ( app-dicts/aspell-wa ) l10n_yi? ( app-dicts/aspell-yi ) l10n_zu? ( app-dicts/aspell-zu )
 RDEPEND=sys-libs/ncurses:=[unicode(+)?] nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=mirror://gnu/aspell/aspell-0.60.8.tar.gz
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=5c13219e15494a8c46243cf3983c4272
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=51aaacc881243f2df952a83489cb7c82
diff --git a/metadata/md5-cache/app-text/atril-1.24.0-r2 b/metadata/md5-cache/app-text/atril-1.24.0-r2
index d0ad2744b0ba..189fa69147ed 100644
--- a/metadata/md5-cache/app-text/atril-1.24.0-r2
+++ b/metadata/md5-cache/app-text/atril-1.24.0-r2
@@ -12,5 +12,5 @@ REQUIRED_USE=t1lib? ( dvi )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://pub.mate-desktop.org/releases/1.24/atril-1.24.0.tar.xz
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	97143780d341cc8d8f1d4c6187a36d29	mate	e29617c33d6e271931938d0073817dde	mate-desktop.org	0da897c64adb500292c6b9db3e424496	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	virtualx	975d49ff3b3f451efe7a95f230532135	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	desktop	22952d8f27cac191d75529d4c38e6bfa	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	28f0f3c0226306ec5f49e13bf851f171	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	97143780d341cc8d8f1d4c6187a36d29	mate	e29617c33d6e271931938d0073817dde	mate-desktop.org	0da897c64adb500292c6b9db3e424496	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	virtualx	975d49ff3b3f451efe7a95f230532135	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=40d17f86ce1fda797a6a651927a07156
diff --git a/metadata/md5-cache/app-text/atril-1.24.1 b/metadata/md5-cache/app-text/atril-1.24.1
index 826309ee5067..d90bdd8b556c 100644
--- a/metadata/md5-cache/app-text/atril-1.24.1
+++ b/metadata/md5-cache/app-text/atril-1.24.1
@@ -5,12 +5,12 @@ EAPI=6
 HOMEPAGE=https://mate-desktop.org
 INHERIT=mate python-any-r1 virtualx
 IUSE=caja dbus debug djvu dvi epub +introspection gnome-keyring +postscript synctex t1lib test tiff xps test
-KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~riscv ~x86
 LICENSE=FDL-1.1+ GPL-2+ GPL-3+ LGPL-2+ LGPL-2.1+
 RDEPEND=>=app-text/poppler-0.22[cairo] dev-libs/atk >=dev-libs/glib-2.62:2 >=dev-libs/libxml2-2.5:2 sys-libs/zlib x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.22:3[introspection?] x11-libs/libICE >=x11-libs/libSM-1:0 x11-libs/libX11 >=x11-libs/cairo-1.14 x11-libs/pango caja? ( >=mate-base/caja-1.17.1[introspection?] ) djvu? ( >=app-text/djvu-3.5.17:0 ) dvi? ( virtual/tex-base t1lib? ( >=media-libs/t1lib-5:5 ) ) epub? ( dev-libs/mathjax >=net-libs/webkit-gtk-2.6.0:4 ) gnome-keyring? ( >=app-crypt/libsecret-0.5 ) introspection? ( >=dev-libs/gobject-introspection-0.6:= ) postscript? ( >=app-text/libspectre-0.2 ) synctex? ( virtual/tex-base ) tiff? ( >=media-libs/tiff-3.6:0 ) xps? ( >=app-text/libgxps-0.2.1 ) virtual/libintl !!app-text/mate-document-viewer
 REQUIRED_USE=t1lib? ( dvi )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://pub.mate-desktop.org/releases/1.24/atril-1.24.1.tar.xz
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	97143780d341cc8d8f1d4c6187a36d29	mate	e29617c33d6e271931938d0073817dde	mate-desktop.org	0da897c64adb500292c6b9db3e424496	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	virtualx	975d49ff3b3f451efe7a95f230532135	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=6811dae266d259552872fa4ceff0a8bf
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	desktop	22952d8f27cac191d75529d4c38e6bfa	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	28f0f3c0226306ec5f49e13bf851f171	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	97143780d341cc8d8f1d4c6187a36d29	mate	e29617c33d6e271931938d0073817dde	mate-desktop.org	0da897c64adb500292c6b9db3e424496	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	virtualx	975d49ff3b3f451efe7a95f230532135	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=9be207fa91989779bf9d7eeca1ea0e66
diff --git a/metadata/md5-cache/app-text/bact-0.13-r1 b/metadata/md5-cache/app-text/bact-0.13-r1
index 268e5dbf18a1..f0e6dfc534be 100644
--- a/metadata/md5-cache/app-text/bact-0.13-r1
+++ b/metadata/md5-cache/app-text/bact-0.13-r1
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile install test
 DESCRIPTION=Boosting Algorithm for Classification of Trees
 EAPI=6
 HOMEPAGE=http://chasen.org/~taku/software/bact/
+INHERIT=toolchain-funcs
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://chasen.org/~taku/software/bact/bact-0.13.tar.gz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=01607b957dca6a3f5f6ce0396f69c04e
diff --git a/metadata/md5-cache/app-text/barcode-0.99-r1 b/metadata/md5-cache/app-text/barcode-0.99-r1
index 6ea8222ab737..9643bb126e44 100644
--- a/metadata/md5-cache/app-text/barcode-0.99-r1
+++ b/metadata/md5-cache/app-text/barcode-0.99-r1
@@ -4,10 +4,11 @@ DEPEND=app-text/libpaper
 DESCRIPTION=barcode generator
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/barcode/
+INHERIT=autotools
 KEYWORDS=amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-2
 RDEPEND=app-text/libpaper
 SLOT=0
 SRC_URI=mirror://gnu/barcode/barcode-0.99.tar.xz
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=25b433e6fa8d7d28eef724fd3837c6d9
diff --git a/metadata/md5-cache/app-text/bibletime-3.0.2 b/metadata/md5-cache/app-text/bibletime-3.0.2
index d28dab3f521a..2dff4973da86 100644
--- a/metadata/md5-cache/app-text/bibletime-3.0.2
+++ b/metadata/md5-cache/app-text/bibletime-3.0.2
@@ -1,4 +1,4 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install postinst postrm prepare test
 DEPEND=>=app-text/sword-1.8.1 dev-cpp/clucene dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwebchannel:5 dev-qt/qtwebengine:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-libs/boost dev-libs/icu:= dev-qt/linguist-tools:5 dev-qt/qttest:5 net-misc/curl sys-libs/zlib
 DESCRIPTION=Qt Bible-study application using the SWORD library
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=app-text/sword-1.8.1 dev-cpp/clucene dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwebchannel:5 dev-qt/qtwebengine:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5
 SLOT=0
 SRC_URI=https://github.com/bibletime/bibletime/releases/download/v3.0.2/bibletime-3.0.2.tar.xz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=1779bd86927225fea079ee33c2cde67b
diff --git a/metadata/md5-cache/app-text/bibletime-3.0.3 b/metadata/md5-cache/app-text/bibletime-3.0.3
new file mode 100644
index 000000000000..2e225f454695
--- /dev/null
+++ b/metadata/md5-cache/app-text/bibletime-3.0.3
@@ -0,0 +1,14 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=>=app-text/sword-1.8.1 dev-cpp/clucene dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwebchannel:5 dev-qt/qtwebengine:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-libs/boost dev-libs/icu:= dev-qt/linguist-tools:5 dev-qt/qttest:5 net-misc/curl sys-libs/zlib
+DESCRIPTION=Qt Bible-study application using the SWORD library
+EAPI=8
+HOMEPAGE=https://bibletime.info/
+INHERIT=cmake xdg-utils
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=app-text/sword-1.8.1 dev-cpp/clucene dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwebchannel:5 dev-qt/qtwebengine:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5
+SLOT=0
+SRC_URI=https://github.com/bibletime/bibletime/releases/download/v3.0.3/bibletime-3.0.3.tar.xz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=b1b9f380f311bb8b446a98f50b530834
diff --git a/metadata/md5-cache/app-text/bibutils-7.1 b/metadata/md5-cache/app-text/bibutils-7.1
index 1ce4cc308c19..1d917ac4f69b 100644
--- a/metadata/md5-cache/app-text/bibutils-7.1
+++ b/metadata/md5-cache/app-text/bibutils-7.1
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile configure prepare test
 DESCRIPTION=Interconverts between various bibliography formats using common XML intermediate
 EAPI=7
 HOMEPAGE=https://sourceforge.net/p/bibutils/home/Bibutils/
+INHERIT=toolchain-funcs
 KEYWORDS=amd64 ~ppc ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/bibutils/bibutils_7.1_src.tgz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=5d1fec2520cbe6d3074de2a8f61d6c49
diff --git a/metadata/md5-cache/app-text/blahtexml-0.9 b/metadata/md5-cache/app-text/blahtexml-0.9
index c416d6d9b384..bac49da6083a 100644
--- a/metadata/md5-cache/app-text/blahtexml-0.9
+++ b/metadata/md5-cache/app-text/blahtexml-0.9
@@ -4,11 +4,12 @@ DEPEND=dev-libs/xerces-c
 DESCRIPTION=TeX-to-MathML converter
 EAPI=7
 HOMEPAGE=http://gva.noekeon.org/blahtexml
+INHERIT=toolchain-funcs
 IUSE=doc
 KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 x86
 LICENSE=BSD CC-BY-3.0 ZLIB
 RDEPEND=dev-libs/xerces-c
 SLOT=0
 SRC_URI=http://gva.noekeon.org/blahtexml/blahtexml-0.9-src.tar.gz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=a0af3c3809a4b9326cd80d292948049e
diff --git a/metadata/md5-cache/app-text/blogc-9999 b/metadata/md5-cache/app-text/blogc-9999
index 1458e2e643d2..0bcd4f9e83a9 100644
--- a/metadata/md5-cache/app-text/blogc-9999
+++ b/metadata/md5-cache/app-text/blogc-9999
@@ -4,11 +4,12 @@ DEPEND=git? ( dev-vcs/git ) test? ( dev-util/cmocka )
 DESCRIPTION=A blog compiler
 EAPI=7
 HOMEPAGE=https://blogc.rgm.io/
+INHERIT=git-r3 autotools
 IUSE=git httpd make test
 LICENSE=BSD
 PROPERTIES=live
 RDEPEND=git? ( dev-vcs/git )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=8d1a91aa0949af7a48cd3c4d9a8ad7e1
diff --git a/metadata/md5-cache/app-text/bogosort-0.4.2-r1 b/metadata/md5-cache/app-text/bogosort-0.4.2-r1
index 2e0f2e27fc5f..fab8823613ab 100644
--- a/metadata/md5-cache/app-text/bogosort-0.4.2-r1
+++ b/metadata/md5-cache/app-text/bogosort-0.4.2-r1
@@ -3,9 +3,10 @@ DEFINED_PHASES=configure install prepare
 DESCRIPTION=A file sorting program which uses the bogosort algorithm
 EAPI=7
 HOMEPAGE=http://www.lysator.liu.se/~qha/bogosort/
+INHERIT=autotools toolchain-funcs
 KEYWORDS=amd64 ~hppa ~mips ppc sparc x86 ~x86-linux ~ppc-macos
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=ftp://ulrik.haugen.se/pub/unix/bogosort/bogosort-0.4.2.tar.gz
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=37ca429dcb261bf3ada91c68e6424848
diff --git a/metadata/md5-cache/app-text/build-docbook-catalog-1.21 b/metadata/md5-cache/app-text/build-docbook-catalog-1.21
deleted file mode 100644
index 52cf1eda1e19..000000000000
--- a/metadata/md5-cache/app-text/build-docbook-catalog-1.21
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=configure postinst prepare
-DESCRIPTION=DocBook XML catalog auto-updater
-EAPI=7
-HOMEPAGE=https://gitweb.gentoo.org/proj/build-docbook-catalog.git/
-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 ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=dev-libs/libxml2 || ( sys-apps/util-linux app-misc/getopt ) !<app-text/docbook-xsl-stylesheets-1.73.1
-SLOT=0
-SRC_URI=mirror://gentoo/build-docbook-catalog-1.21.tar.xz https://dev.gentoo.org/~haubi/distfiles/build-docbook-catalog-1.21.tar.xz
-_md5_=061619f60b3b5b06b38015e0ef702e2f
diff --git a/metadata/md5-cache/app-text/build-docbook-catalog-2.2 b/metadata/md5-cache/app-text/build-docbook-catalog-2.2
deleted file mode 100644
index d9d94b453eb8..000000000000
--- a/metadata/md5-cache/app-text/build-docbook-catalog-2.2
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=configure postinst prepare
-DESCRIPTION=DocBook XML catalog auto-updater
-EAPI=7
-HOMEPAGE=https://gitweb.gentoo.org/proj/build-docbook-catalog.git/
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=dev-libs/libxml2 || ( sys-apps/util-linux app-misc/getopt )
-SLOT=0
-SRC_URI=https://gitweb.gentoo.org/proj/build-docbook-catalog.git/snapshot/build-docbook-catalog-2.2.tar.bz2
-_md5_=bdc85b2db9c05ce384c3e298ba30bb18
diff --git a/metadata/md5-cache/app-text/build-docbook-catalog-2.3 b/metadata/md5-cache/app-text/build-docbook-catalog-2.3
index 7a1599c02183..66b9b808b16f 100644
--- a/metadata/md5-cache/app-text/build-docbook-catalog-2.3
+++ b/metadata/md5-cache/app-text/build-docbook-catalog-2.3
@@ -2,9 +2,9 @@ DEFINED_PHASES=configure postinst prepare
 DESCRIPTION=DocBook XML catalog auto-updater
 EAPI=7
 HOMEPAGE=https://gitweb.gentoo.org/proj/build-docbook-catalog.git/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=dev-libs/libxml2 || ( sys-apps/util-linux app-misc/getopt )
 SLOT=0
 SRC_URI=https://gitweb.gentoo.org/proj/build-docbook-catalog.git/snapshot/build-docbook-catalog-2.3.tar.bz2
-_md5_=022bdb0ffd47d23b8c83fad0651f2a12
+_md5_=bdc85b2db9c05ce384c3e298ba30bb18
diff --git a/metadata/md5-cache/app-text/c2ps-4.0 b/metadata/md5-cache/app-text/c2ps-4.0
index de2389b0edc0..012e9cd2c9cc 100644
--- a/metadata/md5-cache/app-text/c2ps-4.0
+++ b/metadata/md5-cache/app-text/c2ps-4.0
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile install
 DESCRIPTION=Generates a beautified ps document from a source file (c/c++)
 EAPI=7
 HOMEPAGE=https://www.cs.technion.ac.il/users/c2ps
+INHERIT=toolchain-funcs
 KEYWORDS=amd64 ~mips ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-2+
 SLOT=0
 SRC_URI=https://www.cs.technion.ac.il/users/c2ps/c2ps-4.0.tar.gz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=97c7c9aac1f87addf4938d4bff09213f
diff --git a/metadata/md5-cache/app-text/calibre-5.16.1-r1 b/metadata/md5-cache/app-text/calibre-5.16.1-r1
index c39b2515a9c9..e9cc6c3b633c 100644
--- a/metadata/md5-cache/app-text/calibre-5.16.1-r1
+++ b/metadata/md5-cache/app-text/calibre-5.16.1-r1
@@ -1,4 +1,4 @@
-DEFINED_PHASES=install postinst postrm preinst prepare pretend setup
+DEFINED_PHASES=install postinst postrm preinst prepare setup
 DEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[ipv6(+),sqlite,ssl] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[ipv6(+),sqlite,ssl] ) >=app-text/hunspell-1.7:= >=app-text/podofo-0.9.6_pre20171027:= >=app-text/poppler-0.26.5[qt5] dev-libs/glib:2= dev-libs/hyphen:= >=dev-libs/icu-57.1:= dev-libs/libinput:= >=dev-libs/dbus-glib-0.106 >=sys-apps/dbus-1.10.8 python_single_target_python3_8? ( >=dev-python/apsw-3.25.2_p1[python_targets_python3_8(-)] dev-python/beautifulsoup4[python_targets_python3_8(-)] >=dev-python/chardet-3.0.3[python_targets_python3_8(-)] >=dev-python/cssselect-0.7.1[python_targets_python3_8(-)] >=dev-python/css-parser-1.0.4[python_targets_python3_8(-)] >=dev-python/dbus-python-1.2.4[python_targets_python3_8(-)] dev-python/dnspython[python_targets_python3_8(-)] >=dev-python/feedparser-5.2.1[python_targets_python3_8(-)] >=dev-python/html2text-2019.8.11[python_targets_python3_8(-)] >=dev-python/html5-parser-0.4.9[python_targets_python3_8(-)] >=dev-python/lxml-3.8.0[python_targets_python3_8(-)] >=dev-python/markdown-3.0.1[python_targets_python3_8(-)] >=dev-python/mechanize-0.3.5[python_targets_python3_8(-)] >=dev-python/msgpack-0.6.2[python_targets_python3_8(-)] >=dev-python/netifaces-0.10.5[python_targets_python3_8(-)] >=dev-python/pillow-3.2.0[python_targets_python3_8(-)] >=dev-python/psutil-4.3.0[python_targets_python3_8(-)] >=dev-python/pychm-0.8.6[python_targets_python3_8(-)] >=dev-python/pygments-2.3.1[python_targets_python3_8(-)] >=dev-python/python-dateutil-2.5.3[python_targets_python3_8(-)] >=dev-python/PyQt5-5.12[gui,svg,widgets,network,printsupport,python_targets_python3_8(-)] >=dev-python/PyQtWebEngine-5.12[python_targets_python3_8(-)] dev-python/regex[python_targets_python3_8(-)] dev-python/zeroconf[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/apsw-3.25.2_p1[python_targets_python3_9(-)] dev-python/beautifulsoup4[python_targets_python3_9(-)] >=dev-python/chardet-3.0.3[python_targets_python3_9(-)] >=dev-python/cssselect-0.7.1[python_targets_python3_9(-)] >=dev-python/css-parser-1.0.4[python_targets_python3_9(-)] >=dev-python/dbus-python-1.2.4[python_targets_python3_9(-)] dev-python/dnspython[python_targets_python3_9(-)] >=dev-python/feedparser-5.2.1[python_targets_python3_9(-)] >=dev-python/html2text-2019.8.11[python_targets_python3_9(-)] >=dev-python/html5-parser-0.4.9[python_targets_python3_9(-)] >=dev-python/lxml-3.8.0[python_targets_python3_9(-)] >=dev-python/markdown-3.0.1[python_targets_python3_9(-)] >=dev-python/mechanize-0.3.5[python_targets_python3_9(-)] >=dev-python/msgpack-0.6.2[python_targets_python3_9(-)] >=dev-python/netifaces-0.10.5[python_targets_python3_9(-)] >=dev-python/pillow-3.2.0[python_targets_python3_9(-)] >=dev-python/psutil-4.3.0[python_targets_python3_9(-)] >=dev-python/pychm-0.8.6[python_targets_python3_9(-)] >=dev-python/pygments-2.3.1[python_targets_python3_9(-)] >=dev-python/python-dateutil-2.5.3[python_targets_python3_9(-)] >=dev-python/PyQt5-5.12[gui,svg,widgets,network,printsupport,python_targets_python3_9(-)] >=dev-python/PyQtWebEngine-5.12[python_targets_python3_9(-)] dev-python/regex[python_targets_python3_9(-)] dev-python/zeroconf[python_targets_python3_9(-)] ) dev-qt/qtcore:5= dev-qt/qtdbus:5= dev-qt/qtgui:5=[jpeg] 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 ) python_single_target_python3_8? ( >=dev-python/setuptools-23.1.0[python_targets_python3_8(-)] <dev-python/sip-5[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/setuptools-23.1.0[python_targets_python3_9(-)] <dev-python/sip-5[python_targets_python3_9(-)] ) >=virtual/podofo-build-0.9.6_pre20171027 virtual/pkgconfig
 DESCRIPTION=Ebook management application
 EAPI=7
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[ipv
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 SLOT=0
 SRC_URI=https://download.calibre-ebook.com/5.16.1/calibre-5.16.1.tar.xz https://dev.gentoo.org/~zmedico/dist/calibre-5.16.0-SIP-v4.patch.xz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=9c7b00ad529011fb1313cc829c045bba
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	desktop	22952d8f27cac191d75529d4c38e6bfa	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=63238a2856d159796f5956971ebbefd8
diff --git a/metadata/md5-cache/app-text/calibre-5.39.1 b/metadata/md5-cache/app-text/calibre-5.39.1
deleted file mode 100644
index d484dc83b486..000000000000
--- a/metadata/md5-cache/app-text/calibre-5.39.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_single_target_python3_8? ( >=dev-python/setuptools-23.1.0[python_targets_python3_8(-)] >=dev-python/sip-5[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/setuptools-23.1.0[python_targets_python3_9(-)] >=dev-python/sip-5[python_targets_python3_9(-)] ) >=virtual/podofo-build-0.9.6_pre20171027 virtual/pkgconfig
-DEFINED_PHASES=compile install postinst postrm preinst prepare pretend setup test
-DEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[ipv6(+),sqlite,ssl] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[ipv6(+),sqlite,ssl] ) >=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_single_target_python3_8? ( app-accessibility/speech-dispatcher[python,python_targets_python3_8(-)] >=dev-python/apsw-3.25.2_p1[python_targets_python3_8(-)] dev-python/beautifulsoup4[python_targets_python3_8(-)] dev-python/cchardet[python_targets_python3_8(-)] >=dev-python/chardet-3.0.3[python_targets_python3_8(-)] >=dev-python/cssselect-0.7.1[python_targets_python3_8(-)] >=dev-python/css-parser-1.0.4[python_targets_python3_8(-)] >=dev-python/dbus-python-1.2.4[python_targets_python3_8(-)] dev-python/dnspython[python_targets_python3_8(-)] >=dev-python/feedparser-5.2.1[python_targets_python3_8(-)] >=dev-python/html2text-2019.8.11[python_targets_python3_8(-)] >=dev-python/html5-parser-0.4.9[python_targets_python3_8(-)] dev-python/jeepney[python_targets_python3_8(-)] >=dev-python/lxml-3.8.0[python_targets_python3_8(-)] >=dev-python/markdown-3.0.1[python_targets_python3_8(-)] >=dev-python/mechanize-0.3.5[python_targets_python3_8(-)] >=dev-python/msgpack-0.6.2[python_targets_python3_8(-)] >=dev-python/netifaces-0.10.5[python_targets_python3_8(-)] >=dev-python/pillow-3.2.0[python_targets_python3_8(-)] >=dev-python/psutil-4.3.0[python_targets_python3_8(-)] >=dev-python/pychm-0.8.6[python_targets_python3_8(-)] dev-python/pycryptodome[python_targets_python3_8(-)] >=dev-python/pygments-2.3.1[python_targets_python3_8(-)] >=dev-python/python-dateutil-2.5.3[python_targets_python3_8(-)] >=dev-python/PyQt5-5.15.5_pre2107091435[gui,svg,widgets,network,printsupport,python_targets_python3_8(-)] >=dev-python/PyQt-builder-1.10.3[python_targets_python3_8(-)] >=dev-python/PyQtWebEngine-5.15.5_pre2108100905[python_targets_python3_8(-)] dev-python/regex[python_targets_python3_8(-)] dev-python/zeroconf[python_targets_python3_8(-)] ) python_single_target_python3_9? ( app-accessibility/speech-dispatcher[python,python_targets_python3_9(-)] >=dev-python/apsw-3.25.2_p1[python_targets_python3_9(-)] dev-python/beautifulsoup4[python_targets_python3_9(-)] dev-python/cchardet[python_targets_python3_9(-)] >=dev-python/chardet-3.0.3[python_targets_python3_9(-)] >=dev-python/cssselect-0.7.1[python_targets_python3_9(-)] >=dev-python/css-parser-1.0.4[python_targets_python3_9(-)] >=dev-python/dbus-python-1.2.4[python_targets_python3_9(-)] dev-python/dnspython[python_targets_python3_9(-)] >=dev-python/feedparser-5.2.1[python_targets_python3_9(-)] >=dev-python/html2text-2019.8.11[python_targets_python3_9(-)] >=dev-python/html5-parser-0.4.9[python_targets_python3_9(-)] dev-python/jeepney[python_targets_python3_9(-)] >=dev-python/lxml-3.8.0[python_targets_python3_9(-)] >=dev-python/markdown-3.0.1[python_targets_python3_9(-)] >=dev-python/mechanize-0.3.5[python_targets_python3_9(-)] >=dev-python/msgpack-0.6.2[python_targets_python3_9(-)] >=dev-python/netifaces-0.10.5[python_targets_python3_9(-)] >=dev-python/pillow-3.2.0[python_targets_python3_9(-)] >=dev-python/psutil-4.3.0[python_targets_python3_9(-)] >=dev-python/pychm-0.8.6[python_targets_python3_9(-)] dev-python/pycryptodome[python_targets_python3_9(-)] >=dev-python/pygments-2.3.1[python_targets_python3_9(-)] >=dev-python/python-dateutil-2.5.3[python_targets_python3_9(-)] >=dev-python/PyQt5-5.15.5_pre2107091435[gui,svg,widgets,network,printsupport,python_targets_python3_9(-)] >=dev-python/PyQt-builder-1.10.3[python_targets_python3_9(-)] >=dev-python/PyQtWebEngine-5.15.5_pre2108100905[python_targets_python3_9(-)] dev-python/regex[python_targets_python3_9(-)] dev-python/zeroconf[python_targets_python3_9(-)] ) dev-qt/qtcore:5= dev-qt/qtdbus:5= dev-qt/qtgui:5=[jpeg] 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 )
-DESCRIPTION=Ebook management application
-EAPI=8
-HOMEPAGE=https://calibre-ebook.com/
-INHERIT=toolchain-funcs python-single-r1 qmake-utils xdg-utils
-IUSE=ios +udisks python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~amd64 ~arm ~x86
-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
-RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[ipv6(+),sqlite,ssl] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[ipv6(+),sqlite,ssl] ) >=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_single_target_python3_8? ( app-accessibility/speech-dispatcher[python,python_targets_python3_8(-)] >=dev-python/apsw-3.25.2_p1[python_targets_python3_8(-)] dev-python/beautifulsoup4[python_targets_python3_8(-)] dev-python/cchardet[python_targets_python3_8(-)] >=dev-python/chardet-3.0.3[python_targets_python3_8(-)] >=dev-python/cssselect-0.7.1[python_targets_python3_8(-)] >=dev-python/css-parser-1.0.4[python_targets_python3_8(-)] >=dev-python/dbus-python-1.2.4[python_targets_python3_8(-)] dev-python/dnspython[python_targets_python3_8(-)] >=dev-python/feedparser-5.2.1[python_targets_python3_8(-)] >=dev-python/html2text-2019.8.11[python_targets_python3_8(-)] >=dev-python/html5-parser-0.4.9[python_targets_python3_8(-)] dev-python/jeepney[python_targets_python3_8(-)] >=dev-python/lxml-3.8.0[python_targets_python3_8(-)] >=dev-python/markdown-3.0.1[python_targets_python3_8(-)] >=dev-python/mechanize-0.3.5[python_targets_python3_8(-)] >=dev-python/msgpack-0.6.2[python_targets_python3_8(-)] >=dev-python/netifaces-0.10.5[python_targets_python3_8(-)] >=dev-python/pillow-3.2.0[python_targets_python3_8(-)] >=dev-python/psutil-4.3.0[python_targets_python3_8(-)] >=dev-python/pychm-0.8.6[python_targets_python3_8(-)] dev-python/pycryptodome[python_targets_python3_8(-)] >=dev-python/pygments-2.3.1[python_targets_python3_8(-)] >=dev-python/python-dateutil-2.5.3[python_targets_python3_8(-)] >=dev-python/PyQt5-5.15.5_pre2107091435[gui,svg,widgets,network,printsupport,python_targets_python3_8(-)] >=dev-python/PyQt-builder-1.10.3[python_targets_python3_8(-)] >=dev-python/PyQtWebEngine-5.15.5_pre2108100905[python_targets_python3_8(-)] dev-python/regex[python_targets_python3_8(-)] dev-python/zeroconf[python_targets_python3_8(-)] ) python_single_target_python3_9? ( app-accessibility/speech-dispatcher[python,python_targets_python3_9(-)] >=dev-python/apsw-3.25.2_p1[python_targets_python3_9(-)] dev-python/beautifulsoup4[python_targets_python3_9(-)] dev-python/cchardet[python_targets_python3_9(-)] >=dev-python/chardet-3.0.3[python_targets_python3_9(-)] >=dev-python/cssselect-0.7.1[python_targets_python3_9(-)] >=dev-python/css-parser-1.0.4[python_targets_python3_9(-)] >=dev-python/dbus-python-1.2.4[python_targets_python3_9(-)] dev-python/dnspython[python_targets_python3_9(-)] >=dev-python/feedparser-5.2.1[python_targets_python3_9(-)] >=dev-python/html2text-2019.8.11[python_targets_python3_9(-)] >=dev-python/html5-parser-0.4.9[python_targets_python3_9(-)] dev-python/jeepney[python_targets_python3_9(-)] >=dev-python/lxml-3.8.0[python_targets_python3_9(-)] >=dev-python/markdown-3.0.1[python_targets_python3_9(-)] >=dev-python/mechanize-0.3.5[python_targets_python3_9(-)] >=dev-python/msgpack-0.6.2[python_targets_python3_9(-)] >=dev-python/netifaces-0.10.5[python_targets_python3_9(-)] >=dev-python/pillow-3.2.0[python_targets_python3_9(-)] >=dev-python/psutil-4.3.0[python_targets_python3_9(-)] >=dev-python/pychm-0.8.6[python_targets_python3_9(-)] dev-python/pycryptodome[python_targets_python3_9(-)] >=dev-python/pygments-2.3.1[python_targets_python3_9(-)] >=dev-python/python-dateutil-2.5.3[python_targets_python3_9(-)] >=dev-python/PyQt5-5.15.5_pre2107091435[gui,svg,widgets,network,printsupport,python_targets_python3_9(-)] >=dev-python/PyQt-builder-1.10.3[python_targets_python3_9(-)] >=dev-python/PyQtWebEngine-5.15.5_pre2108100905[python_targets_python3_9(-)] dev-python/regex[python_targets_python3_9(-)] dev-python/zeroconf[python_targets_python3_9(-)] ) dev-qt/qtcore:5= dev-qt/qtdbus:5= dev-qt/qtgui:5=[jpeg] 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 ) udisks? ( sys-fs/udisks:2 )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
-SLOT=0
-SRC_URI=https://download.calibre-ebook.com/5.39.1/calibre-5.39.1.tar.xz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=310d4af19f9b5ec985a8e0c4209ead19
diff --git a/metadata/md5-cache/app-text/calibre-5.40.0 b/metadata/md5-cache/app-text/calibre-5.40.0
deleted file mode 100644
index 569e0958649c..000000000000
--- a/metadata/md5-cache/app-text/calibre-5.40.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_single_target_python3_8? ( >=dev-python/setuptools-23.1.0[python_targets_python3_8(-)] >=dev-python/sip-5[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/setuptools-23.1.0[python_targets_python3_9(-)] >=dev-python/sip-5[python_targets_python3_9(-)] ) >=virtual/podofo-build-0.9.6_pre20171027 virtual/pkgconfig
-DEFINED_PHASES=compile install postinst postrm preinst prepare pretend setup test
-DEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[ipv6(+),sqlite,ssl] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[ipv6(+),sqlite,ssl] ) >=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_single_target_python3_8? ( app-accessibility/speech-dispatcher[python,python_targets_python3_8(-)] >=dev-python/apsw-3.25.2_p1[python_targets_python3_8(-)] dev-python/beautifulsoup4[python_targets_python3_8(-)] dev-python/cchardet[python_targets_python3_8(-)] >=dev-python/chardet-3.0.3[python_targets_python3_8(-)] >=dev-python/cssselect-0.7.1[python_targets_python3_8(-)] >=dev-python/css-parser-1.0.4[python_targets_python3_8(-)] >=dev-python/dbus-python-1.2.4[python_targets_python3_8(-)] dev-python/dnspython[python_targets_python3_8(-)] >=dev-python/feedparser-5.2.1[python_targets_python3_8(-)] >=dev-python/html2text-2019.8.11[python_targets_python3_8(-)] >=dev-python/html5-parser-0.4.9[python_targets_python3_8(-)] dev-python/jeepney[python_targets_python3_8(-)] >=dev-python/lxml-3.8.0[python_targets_python3_8(-)] >=dev-python/markdown-3.0.1[python_targets_python3_8(-)] >=dev-python/mechanize-0.3.5[python_targets_python3_8(-)] >=dev-python/msgpack-0.6.2[python_targets_python3_8(-)] >=dev-python/netifaces-0.10.5[python_targets_python3_8(-)] >=dev-python/pillow-3.2.0[python_targets_python3_8(-)] >=dev-python/psutil-4.3.0[python_targets_python3_8(-)] >=dev-python/pychm-0.8.6[python_targets_python3_8(-)] dev-python/pycryptodome[python_targets_python3_8(-)] >=dev-python/pygments-2.3.1[python_targets_python3_8(-)] >=dev-python/python-dateutil-2.5.3[python_targets_python3_8(-)] >=dev-python/PyQt5-5.15.5_pre2107091435[gui,svg,widgets,network,printsupport,python_targets_python3_8(-)] >=dev-python/PyQt-builder-1.10.3[python_targets_python3_8(-)] >=dev-python/PyQtWebEngine-5.15.5_pre2108100905[python_targets_python3_8(-)] dev-python/regex[python_targets_python3_8(-)] dev-python/zeroconf[python_targets_python3_8(-)] ) python_single_target_python3_9? ( app-accessibility/speech-dispatcher[python,python_targets_python3_9(-)] >=dev-python/apsw-3.25.2_p1[python_targets_python3_9(-)] dev-python/beautifulsoup4[python_targets_python3_9(-)] dev-python/cchardet[python_targets_python3_9(-)] >=dev-python/chardet-3.0.3[python_targets_python3_9(-)] >=dev-python/cssselect-0.7.1[python_targets_python3_9(-)] >=dev-python/css-parser-1.0.4[python_targets_python3_9(-)] >=dev-python/dbus-python-1.2.4[python_targets_python3_9(-)] dev-python/dnspython[python_targets_python3_9(-)] >=dev-python/feedparser-5.2.1[python_targets_python3_9(-)] >=dev-python/html2text-2019.8.11[python_targets_python3_9(-)] >=dev-python/html5-parser-0.4.9[python_targets_python3_9(-)] dev-python/jeepney[python_targets_python3_9(-)] >=dev-python/lxml-3.8.0[python_targets_python3_9(-)] >=dev-python/markdown-3.0.1[python_targets_python3_9(-)] >=dev-python/mechanize-0.3.5[python_targets_python3_9(-)] >=dev-python/msgpack-0.6.2[python_targets_python3_9(-)] >=dev-python/netifaces-0.10.5[python_targets_python3_9(-)] >=dev-python/pillow-3.2.0[python_targets_python3_9(-)] >=dev-python/psutil-4.3.0[python_targets_python3_9(-)] >=dev-python/pychm-0.8.6[python_targets_python3_9(-)] dev-python/pycryptodome[python_targets_python3_9(-)] >=dev-python/pygments-2.3.1[python_targets_python3_9(-)] >=dev-python/python-dateutil-2.5.3[python_targets_python3_9(-)] >=dev-python/PyQt5-5.15.5_pre2107091435[gui,svg,widgets,network,printsupport,python_targets_python3_9(-)] >=dev-python/PyQt-builder-1.10.3[python_targets_python3_9(-)] >=dev-python/PyQtWebEngine-5.15.5_pre2108100905[python_targets_python3_9(-)] dev-python/regex[python_targets_python3_9(-)] dev-python/zeroconf[python_targets_python3_9(-)] ) dev-qt/qtcore:5= dev-qt/qtdbus:5= dev-qt/qtgui:5=[jpeg] 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 )
-DESCRIPTION=Ebook management application
-EAPI=8
-HOMEPAGE=https://calibre-ebook.com/
-INHERIT=toolchain-funcs python-single-r1 qmake-utils xdg-utils
-IUSE=ios +udisks python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~amd64 ~arm ~x86
-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
-RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[ipv6(+),sqlite,ssl] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[ipv6(+),sqlite,ssl] ) >=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_single_target_python3_8? ( app-accessibility/speech-dispatcher[python,python_targets_python3_8(-)] >=dev-python/apsw-3.25.2_p1[python_targets_python3_8(-)] dev-python/beautifulsoup4[python_targets_python3_8(-)] dev-python/cchardet[python_targets_python3_8(-)] >=dev-python/chardet-3.0.3[python_targets_python3_8(-)] >=dev-python/cssselect-0.7.1[python_targets_python3_8(-)] >=dev-python/css-parser-1.0.4[python_targets_python3_8(-)] >=dev-python/dbus-python-1.2.4[python_targets_python3_8(-)] dev-python/dnspython[python_targets_python3_8(-)] >=dev-python/feedparser-5.2.1[python_targets_python3_8(-)] >=dev-python/html2text-2019.8.11[python_targets_python3_8(-)] >=dev-python/html5-parser-0.4.9[python_targets_python3_8(-)] dev-python/jeepney[python_targets_python3_8(-)] >=dev-python/lxml-3.8.0[python_targets_python3_8(-)] >=dev-python/markdown-3.0.1[python_targets_python3_8(-)] >=dev-python/mechanize-0.3.5[python_targets_python3_8(-)] >=dev-python/msgpack-0.6.2[python_targets_python3_8(-)] >=dev-python/netifaces-0.10.5[python_targets_python3_8(-)] >=dev-python/pillow-3.2.0[python_targets_python3_8(-)] >=dev-python/psutil-4.3.0[python_targets_python3_8(-)] >=dev-python/pychm-0.8.6[python_targets_python3_8(-)] dev-python/pycryptodome[python_targets_python3_8(-)] >=dev-python/pygments-2.3.1[python_targets_python3_8(-)] >=dev-python/python-dateutil-2.5.3[python_targets_python3_8(-)] >=dev-python/PyQt5-5.15.5_pre2107091435[gui,svg,widgets,network,printsupport,python_targets_python3_8(-)] >=dev-python/PyQt-builder-1.10.3[python_targets_python3_8(-)] >=dev-python/PyQtWebEngine-5.15.5_pre2108100905[python_targets_python3_8(-)] dev-python/regex[python_targets_python3_8(-)] dev-python/zeroconf[python_targets_python3_8(-)] ) python_single_target_python3_9? ( app-accessibility/speech-dispatcher[python,python_targets_python3_9(-)] >=dev-python/apsw-3.25.2_p1[python_targets_python3_9(-)] dev-python/beautifulsoup4[python_targets_python3_9(-)] dev-python/cchardet[python_targets_python3_9(-)] >=dev-python/chardet-3.0.3[python_targets_python3_9(-)] >=dev-python/cssselect-0.7.1[python_targets_python3_9(-)] >=dev-python/css-parser-1.0.4[python_targets_python3_9(-)] >=dev-python/dbus-python-1.2.4[python_targets_python3_9(-)] dev-python/dnspython[python_targets_python3_9(-)] >=dev-python/feedparser-5.2.1[python_targets_python3_9(-)] >=dev-python/html2text-2019.8.11[python_targets_python3_9(-)] >=dev-python/html5-parser-0.4.9[python_targets_python3_9(-)] dev-python/jeepney[python_targets_python3_9(-)] >=dev-python/lxml-3.8.0[python_targets_python3_9(-)] >=dev-python/markdown-3.0.1[python_targets_python3_9(-)] >=dev-python/mechanize-0.3.5[python_targets_python3_9(-)] >=dev-python/msgpack-0.6.2[python_targets_python3_9(-)] >=dev-python/netifaces-0.10.5[python_targets_python3_9(-)] >=dev-python/pillow-3.2.0[python_targets_python3_9(-)] >=dev-python/psutil-4.3.0[python_targets_python3_9(-)] >=dev-python/pychm-0.8.6[python_targets_python3_9(-)] dev-python/pycryptodome[python_targets_python3_9(-)] >=dev-python/pygments-2.3.1[python_targets_python3_9(-)] >=dev-python/python-dateutil-2.5.3[python_targets_python3_9(-)] >=dev-python/PyQt5-5.15.5_pre2107091435[gui,svg,widgets,network,printsupport,python_targets_python3_9(-)] >=dev-python/PyQt-builder-1.10.3[python_targets_python3_9(-)] >=dev-python/PyQtWebEngine-5.15.5_pre2108100905[python_targets_python3_9(-)] dev-python/regex[python_targets_python3_9(-)] dev-python/zeroconf[python_targets_python3_9(-)] ) dev-qt/qtcore:5= dev-qt/qtdbus:5= dev-qt/qtgui:5=[jpeg] 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 ) udisks? ( sys-fs/udisks:2 )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
-SLOT=0
-SRC_URI=https://download.calibre-ebook.com/5.40.0/calibre-5.40.0.tar.xz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=310d4af19f9b5ec985a8e0c4209ead19
diff --git a/metadata/md5-cache/app-text/calibre-5.41.0 b/metadata/md5-cache/app-text/calibre-5.41.0
deleted file mode 100644
index e407c3926e31..000000000000
--- a/metadata/md5-cache/app-text/calibre-5.41.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_single_target_python3_8? ( >=dev-python/setuptools-23.1.0[python_targets_python3_8(-)] >=dev-python/sip-5[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/setuptools-23.1.0[python_targets_python3_9(-)] >=dev-python/sip-5[python_targets_python3_9(-)] ) >=virtual/podofo-build-0.9.6_pre20171027 virtual/pkgconfig
-DEFINED_PHASES=compile install postinst postrm preinst prepare pretend setup test
-DEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[ipv6(+),sqlite,ssl] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[ipv6(+),sqlite,ssl] ) >=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_single_target_python3_8? ( app-accessibility/speech-dispatcher[python,python_targets_python3_8(-)] >=dev-python/apsw-3.25.2_p1[python_targets_python3_8(-)] dev-python/beautifulsoup4[python_targets_python3_8(-)] dev-python/cchardet[python_targets_python3_8(-)] >=dev-python/chardet-3.0.3[python_targets_python3_8(-)] >=dev-python/cssselect-0.7.1[python_targets_python3_8(-)] >=dev-python/css-parser-1.0.4[python_targets_python3_8(-)] >=dev-python/dbus-python-1.2.4[python_targets_python3_8(-)] dev-python/dnspython[python_targets_python3_8(-)] >=dev-python/feedparser-5.2.1[python_targets_python3_8(-)] >=dev-python/html2text-2019.8.11[python_targets_python3_8(-)] >=dev-python/html5-parser-0.4.9[python_targets_python3_8(-)] dev-python/jeepney[python_targets_python3_8(-)] >=dev-python/lxml-3.8.0[python_targets_python3_8(-)] >=dev-python/markdown-3.0.1[python_targets_python3_8(-)] >=dev-python/mechanize-0.3.5[python_targets_python3_8(-)] >=dev-python/msgpack-0.6.2[python_targets_python3_8(-)] >=dev-python/netifaces-0.10.5[python_targets_python3_8(-)] >=dev-python/pillow-3.2.0[python_targets_python3_8(-)] >=dev-python/psutil-4.3.0[python_targets_python3_8(-)] >=dev-python/pychm-0.8.6[python_targets_python3_8(-)] dev-python/pycryptodome[python_targets_python3_8(-)] >=dev-python/pygments-2.3.1[python_targets_python3_8(-)] >=dev-python/python-dateutil-2.5.3[python_targets_python3_8(-)] >=dev-python/PyQt5-5.15.5_pre2107091435[gui,svg,widgets,network,printsupport,python_targets_python3_8(-)] >=dev-python/PyQt-builder-1.10.3[python_targets_python3_8(-)] >=dev-python/PyQtWebEngine-5.15.5_pre2108100905[python_targets_python3_8(-)] dev-python/regex[python_targets_python3_8(-)] dev-python/zeroconf[python_targets_python3_8(-)] ) python_single_target_python3_9? ( app-accessibility/speech-dispatcher[python,python_targets_python3_9(-)] >=dev-python/apsw-3.25.2_p1[python_targets_python3_9(-)] dev-python/beautifulsoup4[python_targets_python3_9(-)] dev-python/cchardet[python_targets_python3_9(-)] >=dev-python/chardet-3.0.3[python_targets_python3_9(-)] >=dev-python/cssselect-0.7.1[python_targets_python3_9(-)] >=dev-python/css-parser-1.0.4[python_targets_python3_9(-)] >=dev-python/dbus-python-1.2.4[python_targets_python3_9(-)] dev-python/dnspython[python_targets_python3_9(-)] >=dev-python/feedparser-5.2.1[python_targets_python3_9(-)] >=dev-python/html2text-2019.8.11[python_targets_python3_9(-)] >=dev-python/html5-parser-0.4.9[python_targets_python3_9(-)] dev-python/jeepney[python_targets_python3_9(-)] >=dev-python/lxml-3.8.0[python_targets_python3_9(-)] >=dev-python/markdown-3.0.1[python_targets_python3_9(-)] >=dev-python/mechanize-0.3.5[python_targets_python3_9(-)] >=dev-python/msgpack-0.6.2[python_targets_python3_9(-)] >=dev-python/netifaces-0.10.5[python_targets_python3_9(-)] >=dev-python/pillow-3.2.0[python_targets_python3_9(-)] >=dev-python/psutil-4.3.0[python_targets_python3_9(-)] >=dev-python/pychm-0.8.6[python_targets_python3_9(-)] dev-python/pycryptodome[python_targets_python3_9(-)] >=dev-python/pygments-2.3.1[python_targets_python3_9(-)] >=dev-python/python-dateutil-2.5.3[python_targets_python3_9(-)] >=dev-python/PyQt5-5.15.5_pre2107091435[gui,svg,widgets,network,printsupport,python_targets_python3_9(-)] >=dev-python/PyQt-builder-1.10.3[python_targets_python3_9(-)] >=dev-python/PyQtWebEngine-5.15.5_pre2108100905[python_targets_python3_9(-)] dev-python/regex[python_targets_python3_9(-)] dev-python/zeroconf[python_targets_python3_9(-)] ) dev-qt/qtcore:5= dev-qt/qtdbus:5= dev-qt/qtgui:5=[jpeg] 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 )
-DESCRIPTION=Ebook management application
-EAPI=8
-HOMEPAGE=https://calibre-ebook.com/
-INHERIT=toolchain-funcs python-single-r1 qmake-utils xdg-utils
-IUSE=ios +udisks python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~amd64 ~arm ~x86
-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
-RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[ipv6(+),sqlite,ssl] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[ipv6(+),sqlite,ssl] ) >=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_single_target_python3_8? ( app-accessibility/speech-dispatcher[python,python_targets_python3_8(-)] >=dev-python/apsw-3.25.2_p1[python_targets_python3_8(-)] dev-python/beautifulsoup4[python_targets_python3_8(-)] dev-python/cchardet[python_targets_python3_8(-)] >=dev-python/chardet-3.0.3[python_targets_python3_8(-)] >=dev-python/cssselect-0.7.1[python_targets_python3_8(-)] >=dev-python/css-parser-1.0.4[python_targets_python3_8(-)] >=dev-python/dbus-python-1.2.4[python_targets_python3_8(-)] dev-python/dnspython[python_targets_python3_8(-)] >=dev-python/feedparser-5.2.1[python_targets_python3_8(-)] >=dev-python/html2text-2019.8.11[python_targets_python3_8(-)] >=dev-python/html5-parser-0.4.9[python_targets_python3_8(-)] dev-python/jeepney[python_targets_python3_8(-)] >=dev-python/lxml-3.8.0[python_targets_python3_8(-)] >=dev-python/markdown-3.0.1[python_targets_python3_8(-)] >=dev-python/mechanize-0.3.5[python_targets_python3_8(-)] >=dev-python/msgpack-0.6.2[python_targets_python3_8(-)] >=dev-python/netifaces-0.10.5[python_targets_python3_8(-)] >=dev-python/pillow-3.2.0[python_targets_python3_8(-)] >=dev-python/psutil-4.3.0[python_targets_python3_8(-)] >=dev-python/pychm-0.8.6[python_targets_python3_8(-)] dev-python/pycryptodome[python_targets_python3_8(-)] >=dev-python/pygments-2.3.1[python_targets_python3_8(-)] >=dev-python/python-dateutil-2.5.3[python_targets_python3_8(-)] >=dev-python/PyQt5-5.15.5_pre2107091435[gui,svg,widgets,network,printsupport,python_targets_python3_8(-)] >=dev-python/PyQt-builder-1.10.3[python_targets_python3_8(-)] >=dev-python/PyQtWebEngine-5.15.5_pre2108100905[python_targets_python3_8(-)] dev-python/regex[python_targets_python3_8(-)] dev-python/zeroconf[python_targets_python3_8(-)] ) python_single_target_python3_9? ( app-accessibility/speech-dispatcher[python,python_targets_python3_9(-)] >=dev-python/apsw-3.25.2_p1[python_targets_python3_9(-)] dev-python/beautifulsoup4[python_targets_python3_9(-)] dev-python/cchardet[python_targets_python3_9(-)] >=dev-python/chardet-3.0.3[python_targets_python3_9(-)] >=dev-python/cssselect-0.7.1[python_targets_python3_9(-)] >=dev-python/css-parser-1.0.4[python_targets_python3_9(-)] >=dev-python/dbus-python-1.2.4[python_targets_python3_9(-)] dev-python/dnspython[python_targets_python3_9(-)] >=dev-python/feedparser-5.2.1[python_targets_python3_9(-)] >=dev-python/html2text-2019.8.11[python_targets_python3_9(-)] >=dev-python/html5-parser-0.4.9[python_targets_python3_9(-)] dev-python/jeepney[python_targets_python3_9(-)] >=dev-python/lxml-3.8.0[python_targets_python3_9(-)] >=dev-python/markdown-3.0.1[python_targets_python3_9(-)] >=dev-python/mechanize-0.3.5[python_targets_python3_9(-)] >=dev-python/msgpack-0.6.2[python_targets_python3_9(-)] >=dev-python/netifaces-0.10.5[python_targets_python3_9(-)] >=dev-python/pillow-3.2.0[python_targets_python3_9(-)] >=dev-python/psutil-4.3.0[python_targets_python3_9(-)] >=dev-python/pychm-0.8.6[python_targets_python3_9(-)] dev-python/pycryptodome[python_targets_python3_9(-)] >=dev-python/pygments-2.3.1[python_targets_python3_9(-)] >=dev-python/python-dateutil-2.5.3[python_targets_python3_9(-)] >=dev-python/PyQt5-5.15.5_pre2107091435[gui,svg,widgets,network,printsupport,python_targets_python3_9(-)] >=dev-python/PyQt-builder-1.10.3[python_targets_python3_9(-)] >=dev-python/PyQtWebEngine-5.15.5_pre2108100905[python_targets_python3_9(-)] dev-python/regex[python_targets_python3_9(-)] dev-python/zeroconf[python_targets_python3_9(-)] ) dev-qt/qtcore:5= dev-qt/qtdbus:5= dev-qt/qtgui:5=[jpeg] 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 ) udisks? ( sys-fs/udisks:2 )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
-SLOT=0
-SRC_URI=https://download.calibre-ebook.com/5.41.0/calibre-5.41.0.tar.xz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=310d4af19f9b5ec985a8e0c4209ead19
diff --git a/metadata/md5-cache/app-text/calibre-5.42.0 b/metadata/md5-cache/app-text/calibre-5.42.0
deleted file mode 100644
index 85676352e9b1..000000000000
--- a/metadata/md5-cache/app-text/calibre-5.42.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_single_target_python3_8? ( >=dev-python/setuptools-23.1.0[python_targets_python3_8(-)] >=dev-python/sip-5[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/setuptools-23.1.0[python_targets_python3_9(-)] >=dev-python/sip-5[python_targets_python3_9(-)] ) >=virtual/podofo-build-0.9.6_pre20171027 virtual/pkgconfig
-DEFINED_PHASES=compile install postinst postrm preinst prepare pretend setup test
-DEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[ipv6(+),sqlite,ssl] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[ipv6(+),sqlite,ssl] ) >=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_single_target_python3_8? ( app-accessibility/speech-dispatcher[python,python_targets_python3_8(-)] >=dev-python/apsw-3.25.2_p1[python_targets_python3_8(-)] dev-python/beautifulsoup4[python_targets_python3_8(-)] dev-python/cchardet[python_targets_python3_8(-)] >=dev-python/chardet-3.0.3[python_targets_python3_8(-)] >=dev-python/cssselect-0.7.1[python_targets_python3_8(-)] >=dev-python/css-parser-1.0.4[python_targets_python3_8(-)] >=dev-python/dbus-python-1.2.4[python_targets_python3_8(-)] dev-python/dnspython[python_targets_python3_8(-)] >=dev-python/feedparser-5.2.1[python_targets_python3_8(-)] >=dev-python/html2text-2019.8.11[python_targets_python3_8(-)] >=dev-python/html5-parser-0.4.9[python_targets_python3_8(-)] dev-python/jeepney[python_targets_python3_8(-)] >=dev-python/lxml-3.8.0[python_targets_python3_8(-)] >=dev-python/markdown-3.0.1[python_targets_python3_8(-)] >=dev-python/mechanize-0.3.5[python_targets_python3_8(-)] >=dev-python/msgpack-0.6.2[python_targets_python3_8(-)] >=dev-python/netifaces-0.10.5[python_targets_python3_8(-)] >=dev-python/pillow-3.2.0[python_targets_python3_8(-)] >=dev-python/psutil-4.3.0[python_targets_python3_8(-)] >=dev-python/pychm-0.8.6[python_targets_python3_8(-)] dev-python/pycryptodome[python_targets_python3_8(-)] >=dev-python/pygments-2.3.1[python_targets_python3_8(-)] >=dev-python/python-dateutil-2.5.3[python_targets_python3_8(-)] >=dev-python/PyQt5-5.15.5_pre2107091435[gui,svg,widgets,network,printsupport,python_targets_python3_8(-)] >=dev-python/PyQt-builder-1.10.3[python_targets_python3_8(-)] >=dev-python/PyQtWebEngine-5.15.5_pre2108100905[python_targets_python3_8(-)] dev-python/regex[python_targets_python3_8(-)] dev-python/zeroconf[python_targets_python3_8(-)] ) python_single_target_python3_9? ( app-accessibility/speech-dispatcher[python,python_targets_python3_9(-)] >=dev-python/apsw-3.25.2_p1[python_targets_python3_9(-)] dev-python/beautifulsoup4[python_targets_python3_9(-)] dev-python/cchardet[python_targets_python3_9(-)] >=dev-python/chardet-3.0.3[python_targets_python3_9(-)] >=dev-python/cssselect-0.7.1[python_targets_python3_9(-)] >=dev-python/css-parser-1.0.4[python_targets_python3_9(-)] >=dev-python/dbus-python-1.2.4[python_targets_python3_9(-)] dev-python/dnspython[python_targets_python3_9(-)] >=dev-python/feedparser-5.2.1[python_targets_python3_9(-)] >=dev-python/html2text-2019.8.11[python_targets_python3_9(-)] >=dev-python/html5-parser-0.4.9[python_targets_python3_9(-)] dev-python/jeepney[python_targets_python3_9(-)] >=dev-python/lxml-3.8.0[python_targets_python3_9(-)] >=dev-python/markdown-3.0.1[python_targets_python3_9(-)] >=dev-python/mechanize-0.3.5[python_targets_python3_9(-)] >=dev-python/msgpack-0.6.2[python_targets_python3_9(-)] >=dev-python/netifaces-0.10.5[python_targets_python3_9(-)] >=dev-python/pillow-3.2.0[python_targets_python3_9(-)] >=dev-python/psutil-4.3.0[python_targets_python3_9(-)] >=dev-python/pychm-0.8.6[python_targets_python3_9(-)] dev-python/pycryptodome[python_targets_python3_9(-)] >=dev-python/pygments-2.3.1[python_targets_python3_9(-)] >=dev-python/python-dateutil-2.5.3[python_targets_python3_9(-)] >=dev-python/PyQt5-5.15.5_pre2107091435[gui,svg,widgets,network,printsupport,python_targets_python3_9(-)] >=dev-python/PyQt-builder-1.10.3[python_targets_python3_9(-)] >=dev-python/PyQtWebEngine-5.15.5_pre2108100905[python_targets_python3_9(-)] dev-python/regex[python_targets_python3_9(-)] dev-python/zeroconf[python_targets_python3_9(-)] ) dev-qt/qtcore:5= dev-qt/qtdbus:5= dev-qt/qtgui:5=[jpeg] 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 )
-DESCRIPTION=Ebook management application
-EAPI=8
-HOMEPAGE=https://calibre-ebook.com/
-INHERIT=toolchain-funcs python-single-r1 qmake-utils xdg-utils
-IUSE=ios +udisks python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~amd64 ~arm ~x86
-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
-RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[ipv6(+),sqlite,ssl] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[ipv6(+),sqlite,ssl] ) >=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_single_target_python3_8? ( app-accessibility/speech-dispatcher[python,python_targets_python3_8(-)] >=dev-python/apsw-3.25.2_p1[python_targets_python3_8(-)] dev-python/beautifulsoup4[python_targets_python3_8(-)] dev-python/cchardet[python_targets_python3_8(-)] >=dev-python/chardet-3.0.3[python_targets_python3_8(-)] >=dev-python/cssselect-0.7.1[python_targets_python3_8(-)] >=dev-python/css-parser-1.0.4[python_targets_python3_8(-)] >=dev-python/dbus-python-1.2.4[python_targets_python3_8(-)] dev-python/dnspython[python_targets_python3_8(-)] >=dev-python/feedparser-5.2.1[python_targets_python3_8(-)] >=dev-python/html2text-2019.8.11[python_targets_python3_8(-)] >=dev-python/html5-parser-0.4.9[python_targets_python3_8(-)] dev-python/jeepney[python_targets_python3_8(-)] >=dev-python/lxml-3.8.0[python_targets_python3_8(-)] >=dev-python/markdown-3.0.1[python_targets_python3_8(-)] >=dev-python/mechanize-0.3.5[python_targets_python3_8(-)] >=dev-python/msgpack-0.6.2[python_targets_python3_8(-)] >=dev-python/netifaces-0.10.5[python_targets_python3_8(-)] >=dev-python/pillow-3.2.0[python_targets_python3_8(-)] >=dev-python/psutil-4.3.0[python_targets_python3_8(-)] >=dev-python/pychm-0.8.6[python_targets_python3_8(-)] dev-python/pycryptodome[python_targets_python3_8(-)] >=dev-python/pygments-2.3.1[python_targets_python3_8(-)] >=dev-python/python-dateutil-2.5.3[python_targets_python3_8(-)] >=dev-python/PyQt5-5.15.5_pre2107091435[gui,svg,widgets,network,printsupport,python_targets_python3_8(-)] >=dev-python/PyQt-builder-1.10.3[python_targets_python3_8(-)] >=dev-python/PyQtWebEngine-5.15.5_pre2108100905[python_targets_python3_8(-)] dev-python/regex[python_targets_python3_8(-)] dev-python/zeroconf[python_targets_python3_8(-)] ) python_single_target_python3_9? ( app-accessibility/speech-dispatcher[python,python_targets_python3_9(-)] >=dev-python/apsw-3.25.2_p1[python_targets_python3_9(-)] dev-python/beautifulsoup4[python_targets_python3_9(-)] dev-python/cchardet[python_targets_python3_9(-)] >=dev-python/chardet-3.0.3[python_targets_python3_9(-)] >=dev-python/cssselect-0.7.1[python_targets_python3_9(-)] >=dev-python/css-parser-1.0.4[python_targets_python3_9(-)] >=dev-python/dbus-python-1.2.4[python_targets_python3_9(-)] dev-python/dnspython[python_targets_python3_9(-)] >=dev-python/feedparser-5.2.1[python_targets_python3_9(-)] >=dev-python/html2text-2019.8.11[python_targets_python3_9(-)] >=dev-python/html5-parser-0.4.9[python_targets_python3_9(-)] dev-python/jeepney[python_targets_python3_9(-)] >=dev-python/lxml-3.8.0[python_targets_python3_9(-)] >=dev-python/markdown-3.0.1[python_targets_python3_9(-)] >=dev-python/mechanize-0.3.5[python_targets_python3_9(-)] >=dev-python/msgpack-0.6.2[python_targets_python3_9(-)] >=dev-python/netifaces-0.10.5[python_targets_python3_9(-)] >=dev-python/pillow-3.2.0[python_targets_python3_9(-)] >=dev-python/psutil-4.3.0[python_targets_python3_9(-)] >=dev-python/pychm-0.8.6[python_targets_python3_9(-)] dev-python/pycryptodome[python_targets_python3_9(-)] >=dev-python/pygments-2.3.1[python_targets_python3_9(-)] >=dev-python/python-dateutil-2.5.3[python_targets_python3_9(-)] >=dev-python/PyQt5-5.15.5_pre2107091435[gui,svg,widgets,network,printsupport,python_targets_python3_9(-)] >=dev-python/PyQt-builder-1.10.3[python_targets_python3_9(-)] >=dev-python/PyQtWebEngine-5.15.5_pre2108100905[python_targets_python3_9(-)] dev-python/regex[python_targets_python3_9(-)] dev-python/zeroconf[python_targets_python3_9(-)] ) dev-qt/qtcore:5= dev-qt/qtdbus:5= dev-qt/qtgui:5=[jpeg] 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 ) udisks? ( sys-fs/udisks:2 )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
-SLOT=0
-SRC_URI=https://download.calibre-ebook.com/5.42.0/calibre-5.42.0.tar.xz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=310d4af19f9b5ec985a8e0c4209ead19
diff --git a/metadata/md5-cache/app-text/calibre-5.43.0 b/metadata/md5-cache/app-text/calibre-5.43.0
new file mode 100644
index 000000000000..6737f9ecef86
--- /dev/null
+++ b/metadata/md5-cache/app-text/calibre-5.43.0
@@ -0,0 +1,16 @@
+BDEPEND=python_single_target_python3_8? ( >=dev-python/setuptools-23.1.0[python_targets_python3_8(-)] >=dev-python/sip-5[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/setuptools-23.1.0[python_targets_python3_9(-)] >=dev-python/sip-5[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/setuptools-23.1.0[python_targets_python3_10(-)] >=dev-python/sip-5[python_targets_python3_10(-)] ) >=virtual/podofo-build-0.9.6_pre20171027 virtual/pkgconfig
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test
+DEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[ipv6(+),sqlite,ssl] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[ipv6(+),sqlite,ssl] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[ipv6(+),sqlite,ssl] ) >=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/openssl:= dev-libs/snowball-stemmer:= >=sys-apps/dbus-1.10.8 python_single_target_python3_8? ( app-accessibility/speech-dispatcher[python,python_targets_python3_8(-)] >=dev-python/apsw-3.25.2_p1[python_targets_python3_8(-)] dev-python/beautifulsoup4[python_targets_python3_8(-)] dev-python/cchardet[python_targets_python3_8(-)] >=dev-python/chardet-3.0.3[python_targets_python3_8(-)] >=dev-python/cssselect-0.7.1[python_targets_python3_8(-)] >=dev-python/css-parser-1.0.4[python_targets_python3_8(-)] >=dev-python/dbus-python-1.2.4[python_targets_python3_8(-)] dev-python/dnspython[python_targets_python3_8(-)] >=dev-python/feedparser-5.2.1[python_targets_python3_8(-)] >=dev-python/html2text-2019.8.11[python_targets_python3_8(-)] >=dev-python/html5-parser-0.4.9[python_targets_python3_8(-)] dev-python/jeepney[python_targets_python3_8(-)] >=dev-python/lxml-3.8.0[python_targets_python3_8(-)] >=dev-python/markdown-3.0.1[python_targets_python3_8(-)] >=dev-python/mechanize-0.3.5[python_targets_python3_8(-)] >=dev-python/msgpack-0.6.2[python_targets_python3_8(-)] >=dev-python/netifaces-0.10.5[python_targets_python3_8(-)] >=dev-python/pillow-3.2.0[python_targets_python3_8(-)] >=dev-python/psutil-4.3.0[python_targets_python3_8(-)] >=dev-python/pychm-0.8.6[python_targets_python3_8(-)] dev-python/pycryptodome[python_targets_python3_8(-)] >=dev-python/pygments-2.3.1[python_targets_python3_8(-)] >=dev-python/python-dateutil-2.5.3[python_targets_python3_8(-)] >=dev-python/PyQt5-5.15.5_pre2107091435[gui,svg,widgets,network,printsupport,python_targets_python3_8(-)] >=dev-python/PyQt-builder-1.10.3[python_targets_python3_8(-)] >=dev-python/PyQtWebEngine-5.15.5_pre2108100905[python_targets_python3_8(-)] dev-python/regex[python_targets_python3_8(-)] dev-python/zeroconf[python_targets_python3_8(-)] ) python_single_target_python3_9? ( app-accessibility/speech-dispatcher[python,python_targets_python3_9(-)] >=dev-python/apsw-3.25.2_p1[python_targets_python3_9(-)] dev-python/beautifulsoup4[python_targets_python3_9(-)] dev-python/cchardet[python_targets_python3_9(-)] >=dev-python/chardet-3.0.3[python_targets_python3_9(-)] >=dev-python/cssselect-0.7.1[python_targets_python3_9(-)] >=dev-python/css-parser-1.0.4[python_targets_python3_9(-)] >=dev-python/dbus-python-1.2.4[python_targets_python3_9(-)] dev-python/dnspython[python_targets_python3_9(-)] >=dev-python/feedparser-5.2.1[python_targets_python3_9(-)] >=dev-python/html2text-2019.8.11[python_targets_python3_9(-)] >=dev-python/html5-parser-0.4.9[python_targets_python3_9(-)] dev-python/jeepney[python_targets_python3_9(-)] >=dev-python/lxml-3.8.0[python_targets_python3_9(-)] >=dev-python/markdown-3.0.1[python_targets_python3_9(-)] >=dev-python/mechanize-0.3.5[python_targets_python3_9(-)] >=dev-python/msgpack-0.6.2[python_targets_python3_9(-)] >=dev-python/netifaces-0.10.5[python_targets_python3_9(-)] >=dev-python/pillow-3.2.0[python_targets_python3_9(-)] >=dev-python/psutil-4.3.0[python_targets_python3_9(-)] >=dev-python/pychm-0.8.6[python_targets_python3_9(-)] dev-python/pycryptodome[python_targets_python3_9(-)] >=dev-python/pygments-2.3.1[python_targets_python3_9(-)] >=dev-python/python-dateutil-2.5.3[python_targets_python3_9(-)] >=dev-python/PyQt5-5.15.5_pre2107091435[gui,svg,widgets,network,printsupport,python_targets_python3_9(-)] >=dev-python/PyQt-builder-1.10.3[python_targets_python3_9(-)] >=dev-python/PyQtWebEngine-5.15.5_pre2108100905[python_targets_python3_9(-)] dev-python/regex[python_targets_python3_9(-)] dev-python/zeroconf[python_targets_python3_9(-)] ) python_single_target_python3_10? ( app-accessibility/speech-dispatcher[python,python_targets_python3_10(-)] >=dev-python/apsw-3.25.2_p1[python_targets_python3_10(-)] dev-python/beautifulsoup4[python_targets_python3_10(-)] dev-python/cchardet[python_targets_python3_10(-)] >=dev-python/chardet-3.0.3[python_targets_python3_10(-)] >=dev-python/cssselect-0.7.1[python_targets_python3_10(-)] >=dev-python/css-parser-1.0.4[python_targets_python3_10(-)] >=dev-python/dbus-python-1.2.4[python_targets_python3_10(-)] dev-python/dnspython[python_targets_python3_10(-)] >=dev-python/feedparser-5.2.1[python_targets_python3_10(-)] >=dev-python/html2text-2019.8.11[python_targets_python3_10(-)] >=dev-python/html5-parser-0.4.9[python_targets_python3_10(-)] dev-python/jeepney[python_targets_python3_10(-)] >=dev-python/lxml-3.8.0[python_targets_python3_10(-)] >=dev-python/markdown-3.0.1[python_targets_python3_10(-)] >=dev-python/mechanize-0.3.5[python_targets_python3_10(-)] >=dev-python/msgpack-0.6.2[python_targets_python3_10(-)] >=dev-python/netifaces-0.10.5[python_targets_python3_10(-)] >=dev-python/pillow-3.2.0[python_targets_python3_10(-)] >=dev-python/psutil-4.3.0[python_targets_python3_10(-)] >=dev-python/pychm-0.8.6[python_targets_python3_10(-)] dev-python/pycryptodome[python_targets_python3_10(-)] >=dev-python/pygments-2.3.1[python_targets_python3_10(-)] >=dev-python/python-dateutil-2.5.3[python_targets_python3_10(-)] >=dev-python/PyQt5-5.15.5_pre2107091435[gui,svg,widgets,network,printsupport,python_targets_python3_10(-)] >=dev-python/PyQt-builder-1.10.3[python_targets_python3_10(-)] >=dev-python/PyQtWebEngine-5.15.5_pre2108100905[python_targets_python3_10(-)] dev-python/regex[python_targets_python3_10(-)] dev-python/zeroconf[python_targets_python3_10(-)] ) dev-qt/qtcore:5= dev-qt/qtdbus:5= dev-qt/qtgui:5=[jpeg] 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 )
+DESCRIPTION=Ebook management application
+EAPI=8
+HOMEPAGE=https://calibre-ebook.com/
+INHERIT=toolchain-funcs python-single-r1 qmake-utils xdg-utils
+IUSE=ios +udisks python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
+KEYWORDS=amd64 ~arm x86
+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
+RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[ipv6(+),sqlite,ssl] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[ipv6(+),sqlite,ssl] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[ipv6(+),sqlite,ssl] ) >=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/openssl:= dev-libs/snowball-stemmer:= >=sys-apps/dbus-1.10.8 python_single_target_python3_8? ( app-accessibility/speech-dispatcher[python,python_targets_python3_8(-)] >=dev-python/apsw-3.25.2_p1[python_targets_python3_8(-)] dev-python/beautifulsoup4[python_targets_python3_8(-)] dev-python/cchardet[python_targets_python3_8(-)] >=dev-python/chardet-3.0.3[python_targets_python3_8(-)] >=dev-python/cssselect-0.7.1[python_targets_python3_8(-)] >=dev-python/css-parser-1.0.4[python_targets_python3_8(-)] >=dev-python/dbus-python-1.2.4[python_targets_python3_8(-)] dev-python/dnspython[python_targets_python3_8(-)] >=dev-python/feedparser-5.2.1[python_targets_python3_8(-)] >=dev-python/html2text-2019.8.11[python_targets_python3_8(-)] >=dev-python/html5-parser-0.4.9[python_targets_python3_8(-)] dev-python/jeepney[python_targets_python3_8(-)] >=dev-python/lxml-3.8.0[python_targets_python3_8(-)] >=dev-python/markdown-3.0.1[python_targets_python3_8(-)] >=dev-python/mechanize-0.3.5[python_targets_python3_8(-)] >=dev-python/msgpack-0.6.2[python_targets_python3_8(-)] >=dev-python/netifaces-0.10.5[python_targets_python3_8(-)] >=dev-python/pillow-3.2.0[python_targets_python3_8(-)] >=dev-python/psutil-4.3.0[python_targets_python3_8(-)] >=dev-python/pychm-0.8.6[python_targets_python3_8(-)] dev-python/pycryptodome[python_targets_python3_8(-)] >=dev-python/pygments-2.3.1[python_targets_python3_8(-)] >=dev-python/python-dateutil-2.5.3[python_targets_python3_8(-)] >=dev-python/PyQt5-5.15.5_pre2107091435[gui,svg,widgets,network,printsupport,python_targets_python3_8(-)] >=dev-python/PyQt-builder-1.10.3[python_targets_python3_8(-)] >=dev-python/PyQtWebEngine-5.15.5_pre2108100905[python_targets_python3_8(-)] dev-python/regex[python_targets_python3_8(-)] dev-python/zeroconf[python_targets_python3_8(-)] ) python_single_target_python3_9? ( app-accessibility/speech-dispatcher[python,python_targets_python3_9(-)] >=dev-python/apsw-3.25.2_p1[python_targets_python3_9(-)] dev-python/beautifulsoup4[python_targets_python3_9(-)] dev-python/cchardet[python_targets_python3_9(-)] >=dev-python/chardet-3.0.3[python_targets_python3_9(-)] >=dev-python/cssselect-0.7.1[python_targets_python3_9(-)] >=dev-python/css-parser-1.0.4[python_targets_python3_9(-)] >=dev-python/dbus-python-1.2.4[python_targets_python3_9(-)] dev-python/dnspython[python_targets_python3_9(-)] >=dev-python/feedparser-5.2.1[python_targets_python3_9(-)] >=dev-python/html2text-2019.8.11[python_targets_python3_9(-)] >=dev-python/html5-parser-0.4.9[python_targets_python3_9(-)] dev-python/jeepney[python_targets_python3_9(-)] >=dev-python/lxml-3.8.0[python_targets_python3_9(-)] >=dev-python/markdown-3.0.1[python_targets_python3_9(-)] >=dev-python/mechanize-0.3.5[python_targets_python3_9(-)] >=dev-python/msgpack-0.6.2[python_targets_python3_9(-)] >=dev-python/netifaces-0.10.5[python_targets_python3_9(-)] >=dev-python/pillow-3.2.0[python_targets_python3_9(-)] >=dev-python/psutil-4.3.0[python_targets_python3_9(-)] >=dev-python/pychm-0.8.6[python_targets_python3_9(-)] dev-python/pycryptodome[python_targets_python3_9(-)] >=dev-python/pygments-2.3.1[python_targets_python3_9(-)] >=dev-python/python-dateutil-2.5.3[python_targets_python3_9(-)] >=dev-python/PyQt5-5.15.5_pre2107091435[gui,svg,widgets,network,printsupport,python_targets_python3_9(-)] >=dev-python/PyQt-builder-1.10.3[python_targets_python3_9(-)] >=dev-python/PyQtWebEngine-5.15.5_pre2108100905[python_targets_python3_9(-)] dev-python/regex[python_targets_python3_9(-)] dev-python/zeroconf[python_targets_python3_9(-)] ) python_single_target_python3_10? ( app-accessibility/speech-dispatcher[python,python_targets_python3_10(-)] >=dev-python/apsw-3.25.2_p1[python_targets_python3_10(-)] dev-python/beautifulsoup4[python_targets_python3_10(-)] dev-python/cchardet[python_targets_python3_10(-)] >=dev-python/chardet-3.0.3[python_targets_python3_10(-)] >=dev-python/cssselect-0.7.1[python_targets_python3_10(-)] >=dev-python/css-parser-1.0.4[python_targets_python3_10(-)] >=dev-python/dbus-python-1.2.4[python_targets_python3_10(-)] dev-python/dnspython[python_targets_python3_10(-)] >=dev-python/feedparser-5.2.1[python_targets_python3_10(-)] >=dev-python/html2text-2019.8.11[python_targets_python3_10(-)] >=dev-python/html5-parser-0.4.9[python_targets_python3_10(-)] dev-python/jeepney[python_targets_python3_10(-)] >=dev-python/lxml-3.8.0[python_targets_python3_10(-)] >=dev-python/markdown-3.0.1[python_targets_python3_10(-)] >=dev-python/mechanize-0.3.5[python_targets_python3_10(-)] >=dev-python/msgpack-0.6.2[python_targets_python3_10(-)] >=dev-python/netifaces-0.10.5[python_targets_python3_10(-)] >=dev-python/pillow-3.2.0[python_targets_python3_10(-)] >=dev-python/psutil-4.3.0[python_targets_python3_10(-)] >=dev-python/pychm-0.8.6[python_targets_python3_10(-)] dev-python/pycryptodome[python_targets_python3_10(-)] >=dev-python/pygments-2.3.1[python_targets_python3_10(-)] >=dev-python/python-dateutil-2.5.3[python_targets_python3_10(-)] >=dev-python/PyQt5-5.15.5_pre2107091435[gui,svg,widgets,network,printsupport,python_targets_python3_10(-)] >=dev-python/PyQt-builder-1.10.3[python_targets_python3_10(-)] >=dev-python/PyQtWebEngine-5.15.5_pre2108100905[python_targets_python3_10(-)] dev-python/regex[python_targets_python3_10(-)] dev-python/zeroconf[python_targets_python3_10(-)] ) dev-qt/qtcore:5= dev-qt/qtdbus:5= dev-qt/qtgui:5=[jpeg] 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 ) udisks? ( sys-fs/udisks:2 )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
+SLOT=0
+SRC_URI=https://download.calibre-ebook.com/5.43.0/calibre-5.43.0.tar.xz
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=98e7d3e0b97c44a62fe83fc05279860a
diff --git a/metadata/md5-cache/app-text/calibre-5.44.0-r1 b/metadata/md5-cache/app-text/calibre-5.44.0-r1
new file mode 100644
index 000000000000..22ff132c39d7
--- /dev/null
+++ b/metadata/md5-cache/app-text/calibre-5.44.0-r1
@@ -0,0 +1,16 @@
+BDEPEND=python_single_target_python3_8? ( >=dev-python/setuptools-23.1.0[python_targets_python3_8(-)] >=dev-python/sip-5[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/setuptools-23.1.0[python_targets_python3_9(-)] >=dev-python/sip-5[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/setuptools-23.1.0[python_targets_python3_10(-)] >=dev-python/sip-5[python_targets_python3_10(-)] ) >=virtual/podofo-build-0.9.6_pre20171027 virtual/pkgconfig
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test
+DEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[ipv6(+),sqlite,ssl] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[ipv6(+),sqlite,ssl] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[ipv6(+),sqlite,ssl] ) >=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/openssl:= dev-libs/snowball-stemmer:= >=sys-apps/dbus-1.10.8 python_single_target_python3_8? ( app-accessibility/speech-dispatcher[python,python_targets_python3_8(-)] >=dev-python/apsw-3.25.2_p1[python_targets_python3_8(-)] dev-python/beautifulsoup4[python_targets_python3_8(-)] dev-python/cchardet[python_targets_python3_8(-)] >=dev-python/chardet-3.0.3[python_targets_python3_8(-)] >=dev-python/cssselect-0.7.1[python_targets_python3_8(-)] >=dev-python/css-parser-1.0.4[python_targets_python3_8(-)] >=dev-python/dbus-python-1.2.4[python_targets_python3_8(-)] dev-python/dnspython[python_targets_python3_8(-)] >=dev-python/feedparser-5.2.1[python_targets_python3_8(-)] >=dev-python/html2text-2019.8.11[python_targets_python3_8(-)] >=dev-python/html5-parser-0.4.9[python_targets_python3_8(-)] dev-python/jeepney[python_targets_python3_8(-)] >=dev-python/lxml-3.8.0[python_targets_python3_8(-)] >=dev-python/markdown-3.0.1[python_targets_python3_8(-)] >=dev-python/mechanize-0.3.5[python_targets_python3_8(-)] >=dev-python/msgpack-0.6.2[python_targets_python3_8(-)] >=dev-python/netifaces-0.10.5[python_targets_python3_8(-)] >=dev-python/pillow-3.2.0[truetype,python_targets_python3_8(-)] >=dev-python/psutil-4.3.0[python_targets_python3_8(-)] >=dev-python/pychm-0.8.6[python_targets_python3_8(-)] dev-python/pycryptodome[python_targets_python3_8(-)] >=dev-python/pygments-2.3.1[python_targets_python3_8(-)] >=dev-python/python-dateutil-2.5.3[python_targets_python3_8(-)] >=dev-python/PyQt5-5.15.5_pre2107091435[gui,svg,widgets,network,printsupport,python_targets_python3_8(-)] >=dev-python/PyQt-builder-1.10.3[python_targets_python3_8(-)] >=dev-python/PyQtWebEngine-5.15.5_pre2108100905[python_targets_python3_8(-)] dev-python/regex[python_targets_python3_8(-)] dev-python/zeroconf[python_targets_python3_8(-)] ) python_single_target_python3_9? ( app-accessibility/speech-dispatcher[python,python_targets_python3_9(-)] >=dev-python/apsw-3.25.2_p1[python_targets_python3_9(-)] dev-python/beautifulsoup4[python_targets_python3_9(-)] dev-python/cchardet[python_targets_python3_9(-)] >=dev-python/chardet-3.0.3[python_targets_python3_9(-)] >=dev-python/cssselect-0.7.1[python_targets_python3_9(-)] >=dev-python/css-parser-1.0.4[python_targets_python3_9(-)] >=dev-python/dbus-python-1.2.4[python_targets_python3_9(-)] dev-python/dnspython[python_targets_python3_9(-)] >=dev-python/feedparser-5.2.1[python_targets_python3_9(-)] >=dev-python/html2text-2019.8.11[python_targets_python3_9(-)] >=dev-python/html5-parser-0.4.9[python_targets_python3_9(-)] dev-python/jeepney[python_targets_python3_9(-)] >=dev-python/lxml-3.8.0[python_targets_python3_9(-)] >=dev-python/markdown-3.0.1[python_targets_python3_9(-)] >=dev-python/mechanize-0.3.5[python_targets_python3_9(-)] >=dev-python/msgpack-0.6.2[python_targets_python3_9(-)] >=dev-python/netifaces-0.10.5[python_targets_python3_9(-)] >=dev-python/pillow-3.2.0[truetype,python_targets_python3_9(-)] >=dev-python/psutil-4.3.0[python_targets_python3_9(-)] >=dev-python/pychm-0.8.6[python_targets_python3_9(-)] dev-python/pycryptodome[python_targets_python3_9(-)] >=dev-python/pygments-2.3.1[python_targets_python3_9(-)] >=dev-python/python-dateutil-2.5.3[python_targets_python3_9(-)] >=dev-python/PyQt5-5.15.5_pre2107091435[gui,svg,widgets,network,printsupport,python_targets_python3_9(-)] >=dev-python/PyQt-builder-1.10.3[python_targets_python3_9(-)] >=dev-python/PyQtWebEngine-5.15.5_pre2108100905[python_targets_python3_9(-)] dev-python/regex[python_targets_python3_9(-)] dev-python/zeroconf[python_targets_python3_9(-)] ) python_single_target_python3_10? ( app-accessibility/speech-dispatcher[python,python_targets_python3_10(-)] >=dev-python/apsw-3.25.2_p1[python_targets_python3_10(-)] dev-python/beautifulsoup4[python_targets_python3_10(-)] dev-python/cchardet[python_targets_python3_10(-)] >=dev-python/chardet-3.0.3[python_targets_python3_10(-)] >=dev-python/cssselect-0.7.1[python_targets_python3_10(-)] >=dev-python/css-parser-1.0.4[python_targets_python3_10(-)] >=dev-python/dbus-python-1.2.4[python_targets_python3_10(-)] dev-python/dnspython[python_targets_python3_10(-)] >=dev-python/feedparser-5.2.1[python_targets_python3_10(-)] >=dev-python/html2text-2019.8.11[python_targets_python3_10(-)] >=dev-python/html5-parser-0.4.9[python_targets_python3_10(-)] dev-python/jeepney[python_targets_python3_10(-)] >=dev-python/lxml-3.8.0[python_targets_python3_10(-)] >=dev-python/markdown-3.0.1[python_targets_python3_10(-)] >=dev-python/mechanize-0.3.5[python_targets_python3_10(-)] >=dev-python/msgpack-0.6.2[python_targets_python3_10(-)] >=dev-python/netifaces-0.10.5[python_targets_python3_10(-)] >=dev-python/pillow-3.2.0[truetype,python_targets_python3_10(-)] >=dev-python/psutil-4.3.0[python_targets_python3_10(-)] >=dev-python/pychm-0.8.6[python_targets_python3_10(-)] dev-python/pycryptodome[python_targets_python3_10(-)] >=dev-python/pygments-2.3.1[python_targets_python3_10(-)] >=dev-python/python-dateutil-2.5.3[python_targets_python3_10(-)] >=dev-python/PyQt5-5.15.5_pre2107091435[gui,svg,widgets,network,printsupport,python_targets_python3_10(-)] >=dev-python/PyQt-builder-1.10.3[python_targets_python3_10(-)] >=dev-python/PyQtWebEngine-5.15.5_pre2108100905[python_targets_python3_10(-)] dev-python/regex[python_targets_python3_10(-)] dev-python/zeroconf[python_targets_python3_10(-)] ) dev-qt/qtcore:5= dev-qt/qtdbus:5= dev-qt/qtgui:5=[jpeg] 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 )
+DESCRIPTION=Ebook management application
+EAPI=8
+HOMEPAGE=https://calibre-ebook.com/
+INHERIT=toolchain-funcs python-single-r1 qmake-utils xdg-utils
+IUSE=ios +udisks python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
+KEYWORDS=~amd64 ~arm ~x86
+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
+RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[ipv6(+),sqlite,ssl] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[ipv6(+),sqlite,ssl] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[ipv6(+),sqlite,ssl] ) >=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/openssl:= dev-libs/snowball-stemmer:= >=sys-apps/dbus-1.10.8 python_single_target_python3_8? ( app-accessibility/speech-dispatcher[python,python_targets_python3_8(-)] >=dev-python/apsw-3.25.2_p1[python_targets_python3_8(-)] dev-python/beautifulsoup4[python_targets_python3_8(-)] dev-python/cchardet[python_targets_python3_8(-)] >=dev-python/chardet-3.0.3[python_targets_python3_8(-)] >=dev-python/cssselect-0.7.1[python_targets_python3_8(-)] >=dev-python/css-parser-1.0.4[python_targets_python3_8(-)] >=dev-python/dbus-python-1.2.4[python_targets_python3_8(-)] dev-python/dnspython[python_targets_python3_8(-)] >=dev-python/feedparser-5.2.1[python_targets_python3_8(-)] >=dev-python/html2text-2019.8.11[python_targets_python3_8(-)] >=dev-python/html5-parser-0.4.9[python_targets_python3_8(-)] dev-python/jeepney[python_targets_python3_8(-)] >=dev-python/lxml-3.8.0[python_targets_python3_8(-)] >=dev-python/markdown-3.0.1[python_targets_python3_8(-)] >=dev-python/mechanize-0.3.5[python_targets_python3_8(-)] >=dev-python/msgpack-0.6.2[python_targets_python3_8(-)] >=dev-python/netifaces-0.10.5[python_targets_python3_8(-)] >=dev-python/pillow-3.2.0[truetype,python_targets_python3_8(-)] >=dev-python/psutil-4.3.0[python_targets_python3_8(-)] >=dev-python/pychm-0.8.6[python_targets_python3_8(-)] dev-python/pycryptodome[python_targets_python3_8(-)] >=dev-python/pygments-2.3.1[python_targets_python3_8(-)] >=dev-python/python-dateutil-2.5.3[python_targets_python3_8(-)] >=dev-python/PyQt5-5.15.5_pre2107091435[gui,svg,widgets,network,printsupport,python_targets_python3_8(-)] >=dev-python/PyQt-builder-1.10.3[python_targets_python3_8(-)] >=dev-python/PyQtWebEngine-5.15.5_pre2108100905[python_targets_python3_8(-)] dev-python/regex[python_targets_python3_8(-)] dev-python/zeroconf[python_targets_python3_8(-)] ) python_single_target_python3_9? ( app-accessibility/speech-dispatcher[python,python_targets_python3_9(-)] >=dev-python/apsw-3.25.2_p1[python_targets_python3_9(-)] dev-python/beautifulsoup4[python_targets_python3_9(-)] dev-python/cchardet[python_targets_python3_9(-)] >=dev-python/chardet-3.0.3[python_targets_python3_9(-)] >=dev-python/cssselect-0.7.1[python_targets_python3_9(-)] >=dev-python/css-parser-1.0.4[python_targets_python3_9(-)] >=dev-python/dbus-python-1.2.4[python_targets_python3_9(-)] dev-python/dnspython[python_targets_python3_9(-)] >=dev-python/feedparser-5.2.1[python_targets_python3_9(-)] >=dev-python/html2text-2019.8.11[python_targets_python3_9(-)] >=dev-python/html5-parser-0.4.9[python_targets_python3_9(-)] dev-python/jeepney[python_targets_python3_9(-)] >=dev-python/lxml-3.8.0[python_targets_python3_9(-)] >=dev-python/markdown-3.0.1[python_targets_python3_9(-)] >=dev-python/mechanize-0.3.5[python_targets_python3_9(-)] >=dev-python/msgpack-0.6.2[python_targets_python3_9(-)] >=dev-python/netifaces-0.10.5[python_targets_python3_9(-)] >=dev-python/pillow-3.2.0[truetype,python_targets_python3_9(-)] >=dev-python/psutil-4.3.0[python_targets_python3_9(-)] >=dev-python/pychm-0.8.6[python_targets_python3_9(-)] dev-python/pycryptodome[python_targets_python3_9(-)] >=dev-python/pygments-2.3.1[python_targets_python3_9(-)] >=dev-python/python-dateutil-2.5.3[python_targets_python3_9(-)] >=dev-python/PyQt5-5.15.5_pre2107091435[gui,svg,widgets,network,printsupport,python_targets_python3_9(-)] >=dev-python/PyQt-builder-1.10.3[python_targets_python3_9(-)] >=dev-python/PyQtWebEngine-5.15.5_pre2108100905[python_targets_python3_9(-)] dev-python/regex[python_targets_python3_9(-)] dev-python/zeroconf[python_targets_python3_9(-)] ) python_single_target_python3_10? ( app-accessibility/speech-dispatcher[python,python_targets_python3_10(-)] >=dev-python/apsw-3.25.2_p1[python_targets_python3_10(-)] dev-python/beautifulsoup4[python_targets_python3_10(-)] dev-python/cchardet[python_targets_python3_10(-)] >=dev-python/chardet-3.0.3[python_targets_python3_10(-)] >=dev-python/cssselect-0.7.1[python_targets_python3_10(-)] >=dev-python/css-parser-1.0.4[python_targets_python3_10(-)] >=dev-python/dbus-python-1.2.4[python_targets_python3_10(-)] dev-python/dnspython[python_targets_python3_10(-)] >=dev-python/feedparser-5.2.1[python_targets_python3_10(-)] >=dev-python/html2text-2019.8.11[python_targets_python3_10(-)] >=dev-python/html5-parser-0.4.9[python_targets_python3_10(-)] dev-python/jeepney[python_targets_python3_10(-)] >=dev-python/lxml-3.8.0[python_targets_python3_10(-)] >=dev-python/markdown-3.0.1[python_targets_python3_10(-)] >=dev-python/mechanize-0.3.5[python_targets_python3_10(-)] >=dev-python/msgpack-0.6.2[python_targets_python3_10(-)] >=dev-python/netifaces-0.10.5[python_targets_python3_10(-)] >=dev-python/pillow-3.2.0[truetype,python_targets_python3_10(-)] >=dev-python/psutil-4.3.0[python_targets_python3_10(-)] >=dev-python/pychm-0.8.6[python_targets_python3_10(-)] dev-python/pycryptodome[python_targets_python3_10(-)] >=dev-python/pygments-2.3.1[python_targets_python3_10(-)] >=dev-python/python-dateutil-2.5.3[python_targets_python3_10(-)] >=dev-python/PyQt5-5.15.5_pre2107091435[gui,svg,widgets,network,printsupport,python_targets_python3_10(-)] >=dev-python/PyQt-builder-1.10.3[python_targets_python3_10(-)] >=dev-python/PyQtWebEngine-5.15.5_pre2108100905[python_targets_python3_10(-)] dev-python/regex[python_targets_python3_10(-)] dev-python/zeroconf[python_targets_python3_10(-)] ) dev-qt/qtcore:5= dev-qt/qtdbus:5= dev-qt/qtgui:5=[jpeg] 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 ) udisks? ( sys-fs/udisks:2 )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
+SLOT=0
+SRC_URI=https://download.calibre-ebook.com/5.44.0/calibre-5.44.0.tar.xz
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=272560abf805fe577fa712bb45ca9b8e
diff --git a/metadata/md5-cache/app-text/capyt-1.1.1 b/metadata/md5-cache/app-text/capyt-1.1.1
index 541e243c4ec9..f6ee92596e85 100644
--- a/metadata/md5-cache/app-text/capyt-1.1.1
+++ b/metadata/md5-cache/app-text/capyt-1.1.1
@@ -1,15 +1,15 @@
-BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=A python3 CLI utility to interface with cpy.pt paste service
 EAPI=7
 HOMEPAGE=https://github.com/lbatalha/capyt https://pypi.org/project/capyt/
 INHERIT=distutils-r1
-IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=amd64 x86
 LICENSE=MIT
-RDEPEND=dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RDEPEND=dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 SLOT=0
 SRC_URI=https://github.com/lbatalha/capyt/archive/1.1-1.tar.gz -> capyt-1.1.1.tar.gz
-_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=a94f3838aa5e8a782b7a5d50507c4f9e
+_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=5dcf35739970c3a28e4b87389691357c
diff --git a/metadata/md5-cache/app-text/cb2bib-2.0.0-r1 b/metadata/md5-cache/app-text/cb2bib-2.0.0-r1
index e42678c8b89c..9c8298ad29d5 100644
--- a/metadata/md5-cache/app-text/cb2bib-2.0.0-r1
+++ b/metadata/md5-cache/app-text/cb2bib-2.0.0-r1
@@ -10,5 +10,5 @@ LICENSE=GPL-3
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwebengine:5[widgets] dev-qt/qtwidgets:5 lzo? ( dev-libs/lzo:2 )
 SLOT=0
 SRC_URI=https://www.molspaces.com/dl/progs/cb2bib-2.0.0.tar.gz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=125610adec86b95b3cc45533848beb31
diff --git a/metadata/md5-cache/app-text/cherrytree-0.99.37 b/metadata/md5-cache/app-text/cherrytree-0.99.37
index 69163cf5a3ba..aeaa041cb46e 100644
--- a/metadata/md5-cache/app-text/cherrytree-0.99.37
+++ b/metadata/md5-cache/app-text/cherrytree-0.99.37
@@ -1,4 +1,4 @@
-BDEPEND=|| ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-lang/python-3.9.9-r1:3.9 >=dev-lang/python-3.8.12_p1-r1:3.8 ) virtual/pkgconfig nls? ( dev-util/intltool sys-devel/gettext ) test? ( dev-util/cpputest ) dev-util/ninja >=dev-util/cmake-3.20.5
+BDEPEND=|| ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-lang/python-3.9.9-r1:3.9 >=dev-lang/python-3.8.12_p1-r1:3.8 ) virtual/pkgconfig nls? ( dev-util/intltool sys-devel/gettext ) test? ( dev-util/cpputest ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
 DEPEND=app-i18n/uchardet app-text/gspell:= >=dev-cpp/glibmm-2.64.2:2 dev-cpp/gtkmm:3.0 dev-cpp/gtksourceviewmm:3.0 dev-cpp/libxmlpp:2.6 dev-cpp/pangomm:1.4 dev-db/sqlite:3 dev-libs/glib:2 dev-libs/libfmt dev-libs/libxml2:2 dev-libs/spdlog net-misc/curl || ( ( >=dev-lang/python-3.10.0_p1-r1:3.10 dev-python/lxml[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 dev-python/lxml[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 dev-python/lxml[python_targets_python3_8(-)] ) ) dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=A hierarchical note taking application (C++ version)
@@ -12,5 +12,5 @@ RDEPEND=app-i18n/uchardet app-text/gspell:= >=dev-cpp/glibmm-2.64.2:2 dev-cpp/gt
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/giuspen/cherrytree/archive/refs/tags/0.99.37.tar.gz -> cherrytree-0.99.37.tar.gz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=dd33a2c59ca8bc2fe2073344e35a979e
diff --git a/metadata/md5-cache/app-text/cherrytree-0.99.47-r1 b/metadata/md5-cache/app-text/cherrytree-0.99.47-r1
index 2f1fa73e53fe..1a04a55de1ff 100644
--- a/metadata/md5-cache/app-text/cherrytree-0.99.47-r1
+++ b/metadata/md5-cache/app-text/cherrytree-0.99.47-r1
@@ -1,4 +1,4 @@
-BDEPEND=|| ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-lang/python-3.9.9-r1:3.9 >=dev-lang/python-3.8.12_p1-r1:3.8 ) virtual/pkgconfig nls? ( sys-devel/gettext ) test? ( dev-util/cpputest ) dev-util/ninja >=dev-util/cmake-3.20.5
+BDEPEND=|| ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-lang/python-3.9.9-r1:3.9 >=dev-lang/python-3.8.12_p1-r1:3.8 ) virtual/pkgconfig nls? ( sys-devel/gettext ) test? ( dev-util/cpputest ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
 DEPEND=app-i18n/uchardet app-text/gspell:= >=dev-cpp/glibmm-2.64.2:2 dev-cpp/gtkmm:3.0 dev-cpp/gtksourceviewmm:3.0 dev-cpp/libxmlpp:2.6 dev-cpp/pangomm:1.4 dev-db/sqlite:3 dev-libs/glib:2 dev-libs/libfmt:= dev-libs/libxml2:2 dev-libs/spdlog net-misc/curl x11-libs/cairo x11-libs/gtk+:3 x11-libs/pango || ( ( >=dev-lang/python-3.10.0_p1-r1:3.10 dev-python/lxml[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 dev-python/lxml[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 dev-python/lxml[python_targets_python3_8(-)] ) )
 DESCRIPTION=A hierarchical note taking application (C++ version)
@@ -12,5 +12,5 @@ RDEPEND=app-i18n/uchardet app-text/gspell:= >=dev-cpp/glibmm-2.64.2:2 dev-cpp/gt
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/giuspen/cherrytree/releases/download/0.99.47/cherrytree_0.99.47.tar.xz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=264df738d85b7dbb9069a6a3b89f723c
diff --git a/metadata/md5-cache/app-text/cmark-0.30.2 b/metadata/md5-cache/app-text/cmark-0.30.2
index 6c798a693301..538d0b3d2452 100644
--- a/metadata/md5-cache/app-text/cmark-0.30.2
+++ b/metadata/md5-cache/app-text/cmark-0.30.2
@@ -1,14 +1,14 @@
-BDEPEND=test? ( || ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-lang/python-3.9.9-r1:3.9 >=dev-lang/python-3.8.12_p1-r1:3.8 ) ) dev-util/ninja >=dev-util/cmake-3.20.5
+BDEPEND=test? ( || ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-lang/python-3.9.9-r1:3.9 >=dev-lang/python-3.8.12_p1-r1:3.8 ) ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare setup test
 DESCRIPTION=CommonMark parsing and rendering library and program in C
 EAPI=8
 HOMEPAGE=https://github.com/commonmark/cmark
 INHERIT=cmake python-any-r1
 IUSE=test
-KEYWORDS=amd64 arm64 ppc ppc64 ~riscv x86
+KEYWORDS=amd64 ~arm arm64 ppc ppc64 ~riscv x86
 LICENSE=BSD-2
 RESTRICT=!test? ( test )
 SLOT=0/0.30.2
 SRC_URI=https://github.com/commonmark/cmark/archive/0.30.2.tar.gz -> cmark-0.30.2.tar.gz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=af989e700e33e74eb7986c4b0cee7f7b
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=b749253d2ba3900fc609ff742d935712
diff --git a/metadata/md5-cache/app-text/cmigemo-1.3c-r3 b/metadata/md5-cache/app-text/cmigemo-1.3c-r3
index ac371b95fab5..3a0d593c50ca 100644
--- a/metadata/md5-cache/app-text/cmigemo-1.3c-r3
+++ b/metadata/md5-cache/app-text/cmigemo-1.3c-r3
@@ -3,11 +3,12 @@ DEPEND=>=app-dicts/migemo-dict-200812[unicode=] dev-lang/perl || ( net-misc/curl
 DESCRIPTION=Migemo library implementation in C
 EAPI=7
 HOMEPAGE=http://www.kaoriya.net/#CMIGEMO
+INHERIT=flag-o-matic toolchain-funcs
 IUSE=unicode vim-syntax
 KEYWORDS=~alpha amd64 ppc x86
 LICENSE=MIT
 RDEPEND=>=app-dicts/migemo-dict-200812[unicode=] dev-lang/perl || ( net-misc/curl net-misc/wget www-client/fetch ) app-i18n/nkf
 SLOT=0
 SRC_URI=http://www.kaoriya.net/dist/var/cmigemo-1.3c-MIT.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=7bb96b5128fdf485d4fd7e691ed5ab97
diff --git a/metadata/md5-cache/app-text/convertlit-1.8-r3 b/metadata/md5-cache/app-text/convertlit-1.8-r3
index e231499e6158..4686f886f84f 100644
--- a/metadata/md5-cache/app-text/convertlit-1.8-r3
+++ b/metadata/md5-cache/app-text/convertlit-1.8-r3
@@ -3,10 +3,11 @@ DEPEND=>=dev-libs/libtommath-0.36-r1 app-arch/unzip
 DESCRIPTION=CLit converts MS ebook .lit files to .opf (xml+html+png+jpg)
 EAPI=6
 HOMEPAGE=http://www.convertlit.com/
+INHERIT=toolchain-funcs
 KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/libtommath-0.36-r1
 SLOT=0
 SRC_URI=http://www.convertlit.com/clit18src.zip
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=7739800625a5bf1f9b6ea8a81043cc0d
diff --git a/metadata/md5-cache/app-text/coolreader-3.2.57-r2 b/metadata/md5-cache/app-text/coolreader-3.2.57-r2
index 5bb966cc5314..9eccc6ddcd06 100644
--- a/metadata/md5-cache/app-text/coolreader-3.2.57-r2
+++ b/metadata/md5-cache/app-text/coolreader-3.2.57-r2
@@ -1,4 +1,4 @@
-BDEPEND=sys-libs/zlib media-libs/libpng:0 virtual/jpeg:0 media-libs/freetype dev-libs/fribidi media-libs/fontconfig media-libs/harfbuzz:= dev-libs/libunibreak:= wxwidgets? ( x11-libs/wxGTK:3.0-gtk3 ) !wxwidgets? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) !wxwidgets? ( dev-qt/linguist-tools:5 ) dev-util/ninja >=dev-util/cmake-3.20.5
+BDEPEND=sys-libs/zlib media-libs/libpng:0 virtual/jpeg:0 media-libs/freetype dev-libs/fribidi media-libs/fontconfig media-libs/harfbuzz:= dev-libs/libunibreak:= wxwidgets? ( x11-libs/wxGTK:3.0-gtk3 ) !wxwidgets? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) !wxwidgets? ( dev-qt/linguist-tools:5 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
 DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=CoolReader - reader of eBook files (fb2,epub,htm,rtf,txt)
@@ -11,5 +11,5 @@ LICENSE=GPL-2
 RDEPEND=sys-libs/zlib media-libs/libpng:0 virtual/jpeg:0 media-libs/freetype dev-libs/fribidi media-libs/fontconfig media-libs/harfbuzz:= dev-libs/libunibreak:= wxwidgets? ( x11-libs/wxGTK:3.0-gtk3 ) !wxwidgets? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) wxwidgets? ( || ( media-fonts/liberation-fonts media-fonts/corefonts ) )
 SLOT=0
 SRC_URI=https://github.com/buggins/coolreader/archive/cr3.2.57.tar.gz -> coolreader-3.2.57.tar.gz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	plocale	7ce00136a77130df46fbbd5966f98a61	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	wxwidgets	c09e9b94378cadaf6ef86ec1534c0fd6	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	plocale	7ce00136a77130df46fbbd5966f98a61	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c	wxwidgets	c09e9b94378cadaf6ef86ec1534c0fd6	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=9225e17d0d0b48efca997af4c06a640a
diff --git a/metadata/md5-cache/app-text/coolreader-3.2.58-r2 b/metadata/md5-cache/app-text/coolreader-3.2.58-r2
index 01730faa9126..71b0d4a67159 100644
--- a/metadata/md5-cache/app-text/coolreader-3.2.58-r2
+++ b/metadata/md5-cache/app-text/coolreader-3.2.58-r2
@@ -1,4 +1,4 @@
-BDEPEND=sys-libs/zlib media-libs/libpng:0 virtual/jpeg:0 media-libs/freetype dev-libs/fribidi media-libs/fontconfig media-libs/harfbuzz:= dev-libs/libunibreak:= wxwidgets? ( x11-libs/wxGTK:3.0-gtk3 ) !wxwidgets? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) !wxwidgets? ( dev-qt/linguist-tools:5 ) dev-util/ninja >=dev-util/cmake-3.20.5
+BDEPEND=sys-libs/zlib media-libs/libpng:0 virtual/jpeg:0 media-libs/freetype dev-libs/fribidi media-libs/fontconfig media-libs/harfbuzz:= dev-libs/libunibreak:= wxwidgets? ( x11-libs/wxGTK:3.0-gtk3 ) !wxwidgets? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) !wxwidgets? ( dev-qt/linguist-tools:5 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
 DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=CoolReader - reader of eBook files (fb2,epub,htm,rtf,txt)
@@ -11,5 +11,5 @@ LICENSE=GPL-2
 RDEPEND=sys-libs/zlib media-libs/libpng:0 virtual/jpeg:0 media-libs/freetype dev-libs/fribidi media-libs/fontconfig media-libs/harfbuzz:= dev-libs/libunibreak:= wxwidgets? ( x11-libs/wxGTK:3.0-gtk3 ) !wxwidgets? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) wxwidgets? ( || ( media-fonts/liberation-fonts media-fonts/corefonts ) )
 SLOT=0
 SRC_URI=https://github.com/buggins/coolreader/archive/cr3.2.58.tar.gz -> coolreader-3.2.58.tar.gz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	plocale	7ce00136a77130df46fbbd5966f98a61	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	wxwidgets	c09e9b94378cadaf6ef86ec1534c0fd6	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	plocale	7ce00136a77130df46fbbd5966f98a61	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c	wxwidgets	c09e9b94378cadaf6ef86ec1534c0fd6	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=1288d7134e4b80d8001977880afaa6b8
diff --git a/metadata/md5-cache/app-text/coolreader-3.2.59-r3 b/metadata/md5-cache/app-text/coolreader-3.2.59-r3
index 4e63d35db598..4507f87c11e5 100644
--- a/metadata/md5-cache/app-text/coolreader-3.2.59-r3
+++ b/metadata/md5-cache/app-text/coolreader-3.2.59-r3
@@ -1,4 +1,4 @@
-BDEPEND=sys-libs/zlib app-arch/zstd:= media-libs/libpng:0 virtual/jpeg:0 media-libs/freetype dev-libs/fribidi media-libs/fontconfig media-libs/harfbuzz:= dev-libs/libunibreak:= dev-libs/libutf8proc:= wxwidgets? ( x11-libs/wxGTK:3.0-gtk3 ) !wxwidgets? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) !wxwidgets? ( dev-qt/linguist-tools:5 ) dev-util/ninja >=dev-util/cmake-3.20.5
+BDEPEND=sys-libs/zlib app-arch/zstd:= media-libs/libpng:0 virtual/jpeg:0 media-libs/freetype dev-libs/fribidi media-libs/fontconfig media-libs/harfbuzz:= dev-libs/libunibreak:= dev-libs/libutf8proc:= wxwidgets? ( x11-libs/wxGTK:3.0-gtk3 ) !wxwidgets? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) !wxwidgets? ( dev-qt/linguist-tools:5 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
 DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=CoolReader - reader of eBook files (fb2,epub,htm,rtf,txt)
@@ -11,5 +11,5 @@ LICENSE=GPL-2
 RDEPEND=sys-libs/zlib app-arch/zstd:= media-libs/libpng:0 virtual/jpeg:0 media-libs/freetype dev-libs/fribidi media-libs/fontconfig media-libs/harfbuzz:= dev-libs/libunibreak:= dev-libs/libutf8proc:= wxwidgets? ( x11-libs/wxGTK:3.0-gtk3 ) !wxwidgets? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) wxwidgets? ( || ( media-fonts/liberation-fonts media-fonts/corefonts ) )
 SLOT=0
 SRC_URI=https://github.com/buggins/coolreader/archive/cr3.2.59.tar.gz -> coolreader-3.2.59.tar.gz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	plocale	7ce00136a77130df46fbbd5966f98a61	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	wxwidgets	c09e9b94378cadaf6ef86ec1534c0fd6	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	plocale	7ce00136a77130df46fbbd5966f98a61	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c	wxwidgets	c09e9b94378cadaf6ef86ec1534c0fd6	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=9e7425df8f22b6d78ab8100101aec34b
diff --git a/metadata/md5-cache/app-text/crf++-0.58 b/metadata/md5-cache/app-text/crf++-0.58
index 032a54f51829..1b9b91667dfb 100644
--- a/metadata/md5-cache/app-text/crf++-0.58
+++ b/metadata/md5-cache/app-text/crf++-0.58
@@ -9,5 +9,5 @@ KEYWORDS=amd64 x86
 LICENSE=|| ( BSD LGPL-2.1 )
 SLOT=0
 SRC_URI=mirror://gentoo/CRF++-0.58.tar.gz
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	28f0f3c0226306ec5f49e13bf851f171	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4fbbbc98f236f1b43acd99476bc3cd85	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=7527e6566c69d4a9b68c324bb4892c4f
diff --git a/metadata/md5-cache/app-text/crm114-20100106-r1 b/metadata/md5-cache/app-text/crm114-20100106-r1
index 963f3e6d1843..038e172b0228 100644
--- a/metadata/md5-cache/app-text/crm114-20100106-r1
+++ b/metadata/md5-cache/app-text/crm114-20100106-r1
@@ -3,6 +3,7 @@ DEPEND=dev-libs/tre mew? ( app-emacs/mew ) mimencode? ( net-mail/metamail ) norm
 DESCRIPTION=A powerful text processing tool, mainly used for spam filtering
 EAPI=7
 HOMEPAGE=http://crm114.sourceforge.net/
+INHERIT=flag-o-matic toolchain-funcs
 IUSE=examples mew mimencode nls normalizemime test
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=GPL-2
@@ -10,5 +11,5 @@ RDEPEND=dev-libs/tre mew? ( app-emacs/mew ) mimencode? ( net-mail/metamail ) nor
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://crm114.sourceforge.net/tarballs/crm114-20100106-BlameMichelson.src.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=2953137335fef9abb51da2108b6d12b9
diff --git a/metadata/md5-cache/app-text/cssmin-0.2.0 b/metadata/md5-cache/app-text/cssmin-0.2.0
index 29e7f92adb09..349b3614bbb3 100644
--- a/metadata/md5-cache/app-text/cssmin-0.2.0
+++ b/metadata/md5-cache/app-text/cssmin-0.2.0
@@ -11,5 +11,5 @@ RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/c/cssmin/cssmin-0.2.0.tar.gz
-_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=7dd5a60ed9b268fb2e36752c6b1a111e
diff --git a/metadata/md5-cache/app-text/cuneiform-1.1.0-r3 b/metadata/md5-cache/app-text/cuneiform-1.1.0-r3
index e6f1f7d2306d..45e658333e29 100644
--- a/metadata/md5-cache/app-text/cuneiform-1.1.0-r3
+++ b/metadata/md5-cache/app-text/cuneiform-1.1.0-r3
@@ -1,4 +1,4 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=!graphicsmagick? ( media-gfx/imagemagick:= ) graphicsmagick? ( media-gfx/graphicsmagick:= )
 DESCRIPTION=An enterprise quality OCR engine by Cognitive Technologies
@@ -11,5 +11,5 @@ LICENSE=BSD
 RDEPEND=!graphicsmagick? ( media-gfx/imagemagick:= ) graphicsmagick? ( media-gfx/graphicsmagick:= )
 SLOT=0
 SRC_URI=https://launchpad.net/cuneiform-linux/1.1/1.1/+download/cuneiform-linux-1.1.0.tar.bz2
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=8c7da9c4774d942e443c28cded49f070
diff --git a/metadata/md5-cache/app-text/cwtext-0.96-r1 b/metadata/md5-cache/app-text/cwtext-0.96-r1
index 2ef54f49bd62..d5c10ecf6f7e 100644
--- a/metadata/md5-cache/app-text/cwtext-0.96-r1
+++ b/metadata/md5-cache/app-text/cwtext-0.96-r1
@@ -2,9 +2,10 @@ DEFINED_PHASES=install prepare
 DESCRIPTION=Text to Morse Code converter
 EAPI=7
 HOMEPAGE=http://cwtext.sourceforge.net
+INHERIT=toolchain-funcs
 KEYWORDS=amd64 ~mips ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/cwtext/cwtext-0.96.tar.gz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=699b3a4fbaa91ce56734bfa3106ddcb6
diff --git a/metadata/md5-cache/app-text/dblatex-0.3.11-r1 b/metadata/md5-cache/app-text/dblatex-0.3.11-r1
index 4d220584d25e..f7c5b7436fa3 100644
--- a/metadata/md5-cache/app-text/dblatex-0.3.11-r1
+++ b/metadata/md5-cache/app-text/dblatex-0.3.11-r1
@@ -1,16 +1,16 @@
-BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=app-text/docbook-xml-dtd:4.5 dev-libs/kpathsea dev-libs/libxslt dev-libs/libxslt dev-texlive/texlive-fontutils dev-texlive/texlive-latex dev-texlive/texlive-latexextra dev-texlive/texlive-latexrecommended dev-texlive/texlive-mathscience dev-texlive/texlive-pictures dev-texlive/texlive-xetex gnome-base/librsvg media-gfx/imagemagick media-gfx/transfig inkscape? ( media-gfx/inkscape )
 DESCRIPTION=Transform DocBook using TeX macros
 EAPI=7
 HOMEPAGE=http://dblatex.sourceforge.net/
 INHERIT=distutils-r1
-IUSE=inkscape python_targets_python3_8 python_targets_python3_9
+IUSE=inkscape python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86
 LICENSE=GPL-2+
-RDEPEND=app-text/docbook-xml-dtd:4.5 dev-libs/kpathsea dev-libs/libxslt dev-libs/libxslt dev-texlive/texlive-fontutils dev-texlive/texlive-latex dev-texlive/texlive-latexextra dev-texlive/texlive-latexrecommended dev-texlive/texlive-mathscience dev-texlive/texlive-pictures dev-texlive/texlive-xetex gnome-base/librsvg media-gfx/imagemagick media-gfx/transfig inkscape? ( media-gfx/inkscape ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=app-text/docbook-xml-dtd:4.5 dev-libs/kpathsea dev-libs/libxslt dev-libs/libxslt dev-texlive/texlive-fontutils dev-texlive/texlive-latex dev-texlive/texlive-latexextra dev-texlive/texlive-latexrecommended dev-texlive/texlive-mathscience dev-texlive/texlive-pictures dev-texlive/texlive-xetex gnome-base/librsvg media-gfx/imagemagick media-gfx/transfig inkscape? ( media-gfx/inkscape ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=https://downloads.sourceforge.net/project/dblatex/dblatex/dblatex-0.3.11/dblatex-0.3.11py3.tar.bz2
-_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=f839b42b78055db142ca1b66483a2ca6
+_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=51c7a4526fb4c6351d59719b8e5ddc34
diff --git a/metadata/md5-cache/app-text/dblatex-0.3.12 b/metadata/md5-cache/app-text/dblatex-0.3.12
index 688c93a51036..a3996349faa8 100644
--- a/metadata/md5-cache/app-text/dblatex-0.3.12
+++ b/metadata/md5-cache/app-text/dblatex-0.3.12
@@ -1,16 +1,16 @@
-BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=app-text/docbook-xml-dtd:4.5 dev-libs/kpathsea dev-libs/libxslt dev-libs/libxslt dev-texlive/texlive-fontutils dev-texlive/texlive-latex dev-texlive/texlive-latexextra dev-texlive/texlive-latexrecommended dev-texlive/texlive-mathscience dev-texlive/texlive-pictures dev-texlive/texlive-xetex gnome-base/librsvg media-gfx/imagemagick media-gfx/transfig inkscape? ( media-gfx/inkscape )
 DESCRIPTION=Transform DocBook using TeX macros
 EAPI=7
 HOMEPAGE=http://dblatex.sourceforge.net/
 INHERIT=distutils-r1
-IUSE=inkscape python_targets_python3_8 python_targets_python3_9
+IUSE=inkscape python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=GPL-2+
-RDEPEND=app-text/docbook-xml-dtd:4.5 dev-libs/kpathsea dev-libs/libxslt dev-libs/libxslt dev-texlive/texlive-fontutils dev-texlive/texlive-latex dev-texlive/texlive-latexextra dev-texlive/texlive-latexrecommended dev-texlive/texlive-mathscience dev-texlive/texlive-pictures dev-texlive/texlive-xetex gnome-base/librsvg media-gfx/imagemagick media-gfx/transfig inkscape? ( media-gfx/inkscape ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=app-text/docbook-xml-dtd:4.5 dev-libs/kpathsea dev-libs/libxslt dev-libs/libxslt dev-texlive/texlive-fontutils dev-texlive/texlive-latex dev-texlive/texlive-latexextra dev-texlive/texlive-latexrecommended dev-texlive/texlive-mathscience dev-texlive/texlive-pictures dev-texlive/texlive-xetex gnome-base/librsvg media-gfx/imagemagick media-gfx/transfig inkscape? ( media-gfx/inkscape ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=https://downloads.sourceforge.net/project/dblatex/dblatex/dblatex-0.3.12/dblatex3-0.3.12.tar.bz2
-_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=89a800adc886ea11d40d41b0bba8c431
+_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=36ece33648188a2ef7e62108c070dcf9
diff --git a/metadata/md5-cache/app-text/delta-20060803-r1 b/metadata/md5-cache/app-text/delta-20060803-r1
index 9e512822b666..323740717e1e 100644
--- a/metadata/md5-cache/app-text/delta-20060803-r1
+++ b/metadata/md5-cache/app-text/delta-20060803-r1
@@ -3,9 +3,10 @@ DEPEND=dev-lang/perl
 DESCRIPTION=Heuristically minimizes interesting files
 EAPI=7
 HOMEPAGE=http://delta.tigris.org/
+INHERIT=toolchain-funcs
 KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~m68k ppc ppc64 ~s390 sparc x86 ~ppc-macos ~x64-macos
 LICENSE=BSD
 SLOT=0
 SRC_URI=http://delta.tigris.org/files/documents/3103/33566/delta-2006.08.03.tar.gz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=1376c8912e04cf1f9f9eed71a24a7309
diff --git a/metadata/md5-cache/app-text/dictd-1.13.0-r3 b/metadata/md5-cache/app-text/dictd-1.13.0-r3
index dfb7fc8d7186..4a5a78da965d 100644
--- a/metadata/md5-cache/app-text/dictd-1.13.0-r3
+++ b/metadata/md5-cache/app-text/dictd-1.13.0-r3
@@ -4,6 +4,7 @@ DEPEND=acct-group/dictd acct-user/dictd >=sys-apps/coreutils-6.10 dev-libs/libma
 DESCRIPTION=Dictionary Client/Server for the DICT protocol
 EAPI=7
 HOMEPAGE=http://www.dict.org/ https://sourceforge.net/projects/dict/
+INHERIT=readme.gentoo-r1 systemd
 IUSE=dbi judy minimal test
 KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
 LICENSE=GPL-1+ GPL-2+
@@ -11,5 +12,5 @@ RDEPEND=acct-group/dictd acct-user/dictd >=sys-apps/coreutils-6.10 dev-libs/libm
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/dict/dictd-1.13.0.tar.gz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=bf9fa45c0752f57f82e627c24e4e2914
diff --git a/metadata/md5-cache/app-text/dictd-1.13.0-r5 b/metadata/md5-cache/app-text/dictd-1.13.0-r5
new file mode 100644
index 000000000000..8154080b318f
--- /dev/null
+++ b/metadata/md5-cache/app-text/dictd-1.13.0-r5
@@ -0,0 +1,16 @@
+BDEPEND=>=sys-apps/gawk-3.1.6 sys-devel/flex virtual/yacc test? ( !~sys-apps/gawk-4.2.1 ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=acct-group/dictd acct-user/dictd >=sys-apps/coreutils-6.10 dev-libs/libmaa sys-libs/zlib dbi? ( dev-db/libdbi ) judy? ( dev-libs/judy )
+DESCRIPTION=Dictionary Client/Server for the DICT protocol
+EAPI=7
+HOMEPAGE=http://www.dict.org/ https://sourceforge.net/projects/dict/
+INHERIT=autotools readme.gentoo-r1 systemd
+IUSE=dbi judy minimal test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
+LICENSE=GPL-1+ GPL-2+
+RDEPEND=acct-group/dictd acct-user/dictd >=sys-apps/coreutils-6.10 dev-libs/libmaa sys-libs/zlib dbi? ( dev-db/libdbi ) judy? ( dev-libs/judy )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://sourceforge/dict/dictd-1.13.0.tar.gz
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=3524a18f0e9fc00b914b8a006165dbcf
diff --git a/metadata/md5-cache/app-text/diff-pdf-0.4.1-r2 b/metadata/md5-cache/app-text/diff-pdf-0.4.1-r2
index 7925c3eb222e..4ca6b38481cc 100644
--- a/metadata/md5-cache/app-text/diff-pdf-0.4.1-r2
+++ b/metadata/md5-cache/app-text/diff-pdf-0.4.1-r2
@@ -4,10 +4,11 @@ DEPEND=app-text/poppler[cairo] dev-libs/glib x11-libs/cairo x11-libs/wxGTK:3.0-g
 DESCRIPTION=A simple tool for visually comparing two PDF files
 EAPI=7
 HOMEPAGE=http://vslavik.github.io/diff-pdf/ https://github.com/vslavik/diff-pdf/
+INHERIT=autotools wxwidgets
 KEYWORDS=amd64
 LICENSE=GPL-2+ LGPL-2+
 RDEPEND=app-text/poppler[cairo] dev-libs/glib x11-libs/cairo x11-libs/wxGTK:3.0-gtk3[X]
 SLOT=0
 SRC_URI=https://github.com/vslavik/diff-pdf/releases/download/v0.4.1/diff-pdf-0.4.1.tar.gz
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	wxwidgets	c09e9b94378cadaf6ef86ec1534c0fd6
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c	wxwidgets	c09e9b94378cadaf6ef86ec1534c0fd6
 _md5_=af8d8fc2e6fbf407ea0785a50a7d611f
diff --git a/metadata/md5-cache/app-text/diff-pdf-0.5 b/metadata/md5-cache/app-text/diff-pdf-0.5
new file mode 100644
index 000000000000..0b6a1dd33437
--- /dev/null
+++ b/metadata/md5-cache/app-text/diff-pdf-0.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure
+DEPEND=app-text/poppler[cairo] dev-libs/glib x11-libs/cairo x11-libs/wxGTK:3.0-gtk3[X]
+DESCRIPTION=A simple tool for visually comparing two PDF files
+EAPI=8
+HOMEPAGE=https://vslavik.github.io/diff-pdf/ https://github.com/vslavik/diff-pdf/
+INHERIT=wxwidgets
+KEYWORDS=~amd64
+LICENSE=GPL-2+ LGPL-2+
+RDEPEND=app-text/poppler[cairo] dev-libs/glib x11-libs/cairo x11-libs/wxGTK:3.0-gtk3[X]
+SLOT=0
+SRC_URI=https://github.com/vslavik/diff-pdf/releases/download/v0.5/diff-pdf-0.5.tar.gz
+_eclasses_=flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wxwidgets	c09e9b94378cadaf6ef86ec1534c0fd6
+_md5_=0dadf0368638d30853490b5bc5b6ba1b
diff --git a/metadata/md5-cache/app-text/diffpdf-2.1.3-r2 b/metadata/md5-cache/app-text/diffpdf-2.1.3-r2
index a4375d88d0ee..2c990f96602d 100644
--- a/metadata/md5-cache/app-text/diffpdf-2.1.3-r2
+++ b/metadata/md5-cache/app-text/diffpdf-2.1.3-r2
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=app-text/poppler[qt5] dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5
 SLOT=0
 SRC_URI=http://www.qtrac.eu/diffpdf-2.1.3.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	multilib	4fbbbc98f236f1b43acd99476bc3cd85	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=c532f187d41206334b960b3ac58a8f7f
diff --git a/metadata/md5-cache/app-text/ding-1.8.1 b/metadata/md5-cache/app-text/ding-1.8.1
index c07b7c9b4779..6f96e7bf17f9 100644
--- a/metadata/md5-cache/app-text/ding-1.8.1
+++ b/metadata/md5-cache/app-text/ding-1.8.1
@@ -2,10 +2,11 @@ DEFINED_PHASES=install
 DESCRIPTION=Tk based dictionary (German-English) (incl. dictionary itself)
 EAPI=6
 HOMEPAGE=https://www-user.tu-chemnitz.de/~fri/ding/
-KEYWORDS=amd64 ppc ~sparc x86
+INHERIT=desktop
+KEYWORDS=amd64 ~ppc ~sparc x86
 LICENSE=GPL-2
 RDEPEND=>=dev-lang/tk-8.3
 SLOT=0
 SRC_URI=http://wftp.tu-chemnitz.de/pub/Local/urz/ding/ding-1.8.1.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28
-_md5_=64bb49fc7eacadc8a6d486303cc6cba3
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa
+_md5_=b2cbb105b298689d5493bae46af5384f
diff --git a/metadata/md5-cache/app-text/ding-1.9 b/metadata/md5-cache/app-text/ding-1.9
index 50b8c4cf84f4..b8d802d59601 100644
--- a/metadata/md5-cache/app-text/ding-1.9
+++ b/metadata/md5-cache/app-text/ding-1.9
@@ -3,10 +3,11 @@ DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Tk based dictionary (German-English) (incl. dictionary itself)
 EAPI=7
 HOMEPAGE=https://www-user.tu-chemnitz.de/~fri/ding/
-KEYWORDS=~amd64 ~ppc ~sparc ~x86
+INHERIT=desktop xdg
+KEYWORDS=amd64 ~ppc ~sparc x86
 LICENSE=GPL-2
 RDEPEND=>=dev-lang/tk-8.3
 SLOT=0
 SRC_URI=http://wftp.tu-chemnitz.de/pub/Local/urz/ding/ding-1.9.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=bc2f61884886d88e7883da6156b160ec
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=a079c55e86c0a853a0077ea946450158
diff --git a/metadata/md5-cache/app-text/discount-2.2.7-r2 b/metadata/md5-cache/app-text/discount-2.2.7-r2
deleted file mode 100644
index 2afe3c9b8133..000000000000
--- a/metadata/md5-cache/app-text/discount-2.2.7-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare
-DESCRIPTION=A Markdown-to HTML translator written in C
-EAPI=8
-HOMEPAGE=http://www.pell.portland.or.us/~orc/Code/discount/
-IUSE=minimal test
-KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ppc ppc64 ~riscv sparc x86
-LICENSE=BSD
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=http://www.pell.portland.or.us/~orc/Code/discount/discount-2.2.7.tar.bz2
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=96a6b1c8da116623ff9b47728de7c5fe
diff --git a/metadata/md5-cache/app-text/discount-2.2.7b b/metadata/md5-cache/app-text/discount-2.2.7b
index 99b7a5c006c2..2390c0283064 100644
--- a/metadata/md5-cache/app-text/discount-2.2.7b
+++ b/metadata/md5-cache/app-text/discount-2.2.7b
@@ -2,11 +2,12 @@ DEFINED_PHASES=compile configure install postinst prepare
 DESCRIPTION=A Markdown-to HTML translator written in C
 EAPI=8
 HOMEPAGE=http://www.pell.portland.or.us/~orc/Code/discount/
+INHERIT=toolchain-funcs
 IUSE=minimal test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ppc ppc64 ~riscv sparc x86
 LICENSE=BSD
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://www.pell.portland.or.us/~orc/Code/discount/discount-2.2.7b.tar.bz2
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=8a4a77887c0e69fd2848818c276dcab9
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=4d45636b15d024ab71b13765031dc0b8
diff --git a/metadata/md5-cache/app-text/djview-4.10.6-r2 b/metadata/md5-cache/app-text/djview-4.10.6-r2
index 6b0061379a9d..612dff4bd995 100644
--- a/metadata/md5-cache/app-text/djview-4.10.6-r2
+++ b/metadata/md5-cache/app-text/djview-4.10.6-r2
@@ -11,5 +11,5 @@ LICENSE=GPL-2
 RDEPEND=>=app-text/djvu-3.5.22-r1 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5
 SLOT=0
 SRC_URI=mirror://sourceforge/djvu/djview-4.10.6.tar.gz
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qmake-utils	59420c906278d16deaaa629f9d115707	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	qmake-utils	59420c906278d16deaaa629f9d115707	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=c4b7f77778ce08d5e5a69e3a7f61912f
diff --git a/metadata/md5-cache/app-text/djvu-3.5.28-r1 b/metadata/md5-cache/app-text/djvu-3.5.28-r1
index 101aea3772a2..6d98aa487c3a 100644
--- a/metadata/md5-cache/app-text/djvu-3.5.28-r1
+++ b/metadata/md5-cache/app-text/djvu-3.5.28-r1
@@ -4,11 +4,12 @@ DEPEND=jpeg? ( virtual/jpeg:0 ) tiff? ( media-libs/tiff:0= ) dev-util/desktop-fi
 DESCRIPTION=DjVu viewers, encoders and utilities
 EAPI=7
 HOMEPAGE=http://djvu.sourceforge.net/
+INHERIT=autotools desktop flag-o-matic optfeature xdg
 IUSE=debug doc jpeg tiff xml
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=jpeg? ( virtual/jpeg:0 ) tiff? ( media-libs/tiff:0= )
 SLOT=0
 SRC_URI=http://downloads.sourceforge.net/djvu/djvulibre-3.5.28.tar.gz
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	optfeature	d524f291c80f9d21ad80fe978e3ca760	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=895080e6e2293fe66e3fb2f2dfccf0bc
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	optfeature	d524f291c80f9d21ad80fe978e3ca760	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=c2a3d38abb66b2a464ad690cc7f85fab
diff --git a/metadata/md5-cache/app-text/docbook-dsssl-stylesheets-1.79-r4 b/metadata/md5-cache/app-text/docbook-dsssl-stylesheets-1.79-r4
index ff5de51e6f85..817a6e4146cf 100644
--- a/metadata/md5-cache/app-text/docbook-dsssl-stylesheets-1.79-r4
+++ b/metadata/md5-cache/app-text/docbook-dsssl-stylesheets-1.79-r4
@@ -2,10 +2,11 @@ DEFINED_PHASES=install postinst postrm preinst
 DESCRIPTION=DSSSL Stylesheets for DocBook
 EAPI=7
 HOMEPAGE=https://github.com/docbook/wiki/wiki
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris
+INHERIT=sgml-catalog-r1
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris
 LICENSE=MIT
 RDEPEND=app-text/docbook-sgml-dtd:3.0 >=app-text/sgml-common-0.6.3-r7
 SLOT=0
 SRC_URI=https://downloads.sourceforge.net/project/docbook/docbook-dsssl/1.79/docbook-dsssl-1.79.tar.bz2
 _eclasses_=sgml-catalog-r1	5d1d74baed1e6235b9a698917e954236
-_md5_=96abb1902c20a8c39080700f10e2df3d
+_md5_=411be6bc60ab4c77c07c8d0674f4fecf
diff --git a/metadata/md5-cache/app-text/docbook-sgml-dtd-3.0-r5 b/metadata/md5-cache/app-text/docbook-sgml-dtd-3.0-r5
index 44c95f12138a..9c11346d8304 100644
--- a/metadata/md5-cache/app-text/docbook-sgml-dtd-3.0-r5
+++ b/metadata/md5-cache/app-text/docbook-sgml-dtd-3.0-r5
@@ -3,10 +3,11 @@ DEFINED_PHASES=install postinst postrm preinst
 DESCRIPTION=Docbook SGML DTD 3.0
 EAPI=7
 HOMEPAGE=https://docbook.org/sgml/
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris
+INHERIT=sgml-catalog-r1
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris
 LICENSE=docbook
 RDEPEND=>=app-text/sgml-common-0.6.3-r7
 SLOT=3.0
 SRC_URI=https://www.oasis-open.org/docbook/sgml/3.0/docbk30.zip
 _eclasses_=sgml-catalog-r1	5d1d74baed1e6235b9a698917e954236
-_md5_=00e19f0e265779f010f59dcacedc90d8
+_md5_=fdb06a3cda921068879568f2436a89ee
diff --git a/metadata/md5-cache/app-text/docbook-sgml-dtd-4.1-r5 b/metadata/md5-cache/app-text/docbook-sgml-dtd-4.1-r5
index ebbb664a8dd1..97bd3bf054a2 100644
--- a/metadata/md5-cache/app-text/docbook-sgml-dtd-4.1-r5
+++ b/metadata/md5-cache/app-text/docbook-sgml-dtd-4.1-r5
@@ -3,10 +3,11 @@ DEFINED_PHASES=install postinst postrm preinst
 DESCRIPTION=Docbook SGML DTD 4.1
 EAPI=7
 HOMEPAGE=https://docbook.org/sgml/
-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
+INHERIT=sgml-catalog-r1
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=docbook
 RDEPEND=>=app-text/sgml-common-0.6.3-r7
 SLOT=4.1
 SRC_URI=https://www.oasis-open.org/docbook/sgml/4.1/docbk41.zip
 _eclasses_=sgml-catalog-r1	5d1d74baed1e6235b9a698917e954236
-_md5_=5ad00ea3d720e6f473478aaddbcfd295
+_md5_=7eae3a9935391eed0d9ff6e56b4d87f6
diff --git a/metadata/md5-cache/app-text/docbook-sgml-utils-0.6.14-r4 b/metadata/md5-cache/app-text/docbook-sgml-utils-0.6.14-r4
index 82881d9c808b..066dc15740b8 100644
--- a/metadata/md5-cache/app-text/docbook-sgml-utils-0.6.14-r4
+++ b/metadata/md5-cache/app-text/docbook-sgml-utils-0.6.14-r4
@@ -4,11 +4,12 @@ DEPEND=>=dev-lang/perl-5 app-text/docbook-dsssl-stylesheets app-text/openjade de
 DESCRIPTION=Shell scripts to manage DocBook documents
 EAPI=7
 HOMEPAGE=https://sourceware.org/docbook-tools/
+INHERIT=autotools prefix
 IUSE=jadetex
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=dev-lang/perl-5 app-text/docbook-dsssl-stylesheets app-text/openjade dev-perl/SGMLSpm ~app-text/docbook-xml-simple-dtd-4.1.2.4 ~app-text/docbook-xml-simple-dtd-1.0 app-text/docbook-xml-dtd ~app-text/docbook-sgml-dtd-3.0 ~app-text/docbook-sgml-dtd-3.1 ~app-text/docbook-sgml-dtd-4.0 ~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 ) || ( www-client/lynx www-client/links www-client/elinks virtual/w3m )
 SLOT=0
 SRC_URI=https://sourceware.org/pub/docbook-tools/new-trials/SOURCES/docbook-utils-0.6.14.tar.gz
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=c172cca99072640302920296df724ca1
diff --git a/metadata/md5-cache/app-text/docbook-sgml-utils-0.6.14-r5 b/metadata/md5-cache/app-text/docbook-sgml-utils-0.6.14-r5
new file mode 100644
index 000000000000..618bdf44fe9f
--- /dev/null
+++ b/metadata/md5-cache/app-text/docbook-sgml-utils-0.6.14-r5
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
+DEFINED_PHASES=install prepare
+DEPEND=>=dev-lang/perl-5 app-text/docbook-dsssl-stylesheets app-text/docbook-xml-dtd:4.2 app-text/openjade app-text/xhtml1 dev-perl/SGMLSpm ~app-text/docbook-sgml-dtd-3.0 ~app-text/docbook-sgml-dtd-3.1 ~app-text/docbook-sgml-dtd-4.0 ~app-text/docbook-sgml-dtd-4.1 ~app-text/docbook-sgml-dtd-4.2 ~app-text/docbook-sgml-dtd-4.4 ~app-text/docbook-xml-simple-dtd-1.0 ~app-text/docbook-xml-simple-dtd-4.1.2.4 sys-apps/which jadetex? ( dev-texlive/texlive-formatsextra ) || ( www-client/lynx www-client/links www-client/elinks virtual/w3m )
+DESCRIPTION=Shell scripts to manage DocBook documents
+EAPI=7
+HOMEPAGE=https://sourceware.org/docbook-tools/
+INHERIT=autotools prefix
+IUSE=jadetex
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=>=dev-lang/perl-5 app-text/docbook-dsssl-stylesheets app-text/docbook-xml-dtd:4.2 app-text/openjade app-text/xhtml1 dev-perl/SGMLSpm ~app-text/docbook-sgml-dtd-3.0 ~app-text/docbook-sgml-dtd-3.1 ~app-text/docbook-sgml-dtd-4.0 ~app-text/docbook-sgml-dtd-4.1 ~app-text/docbook-sgml-dtd-4.2 ~app-text/docbook-sgml-dtd-4.4 ~app-text/docbook-xml-simple-dtd-1.0 ~app-text/docbook-xml-simple-dtd-4.1.2.4 sys-apps/which jadetex? ( dev-texlive/texlive-formatsextra ) || ( www-client/lynx www-client/links www-client/elinks virtual/w3m )
+SLOT=0
+SRC_URI=https://sourceware.org/pub/docbook-tools/new-trials/SOURCES/docbook-utils-0.6.14.tar.gz
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=148ecc6869f584403c70d558bc941049
diff --git a/metadata/md5-cache/app-text/docbook-xsl-ns-stylesheets-1.79.1 b/metadata/md5-cache/app-text/docbook-xsl-ns-stylesheets-1.79.1
index 5a480f7f2e08..400d90f194e4 100644
--- a/metadata/md5-cache/app-text/docbook-xsl-ns-stylesheets-1.79.1
+++ b/metadata/md5-cache/app-text/docbook-xsl-ns-stylesheets-1.79.1
@@ -3,10 +3,10 @@ DESCRIPTION=XSL Stylesheets for Docbook
 EAPI=7
 HOMEPAGE=https://github.com/docbook/wiki/wiki
 IUSE=ruby
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=BSD
 RDEPEND=>=app-text/build-docbook-catalog-1.4 ruby? ( dev-lang/ruby )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/docbook/docbook-xsl-ns-1.79.1.tar.bz2
-_md5_=e6460f97e224a4da98a741aba53ac571
+_md5_=02a032c21426428abe196f75fa5dd8bb
diff --git a/metadata/md5-cache/app-text/docbook-xsl-stylesheets-1.79.1-r2 b/metadata/md5-cache/app-text/docbook-xsl-stylesheets-1.79.1-r3
index f1a2a1733c21..9b976ea62be6 100644
--- a/metadata/md5-cache/app-text/docbook-xsl-stylesheets-1.79.1-r2
+++ b/metadata/md5-cache/app-text/docbook-xsl-stylesheets-1.79.1-r3
@@ -1,7 +1,8 @@
 DEFINED_PHASES=compile install postinst postrm prepare test
 DESCRIPTION=XSL Stylesheets for Docbook
-EAPI=6
+EAPI=8
 HOMEPAGE=https://github.com/docbook/wiki/wiki
+INHERIT=ruby-single
 IUSE=ruby
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD
@@ -10,4 +11,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/docbook/docbook-xsl-1.79.1.tar.bz2
 _eclasses_=ruby-single	d832a35ebec5113ec8d275b948432e59	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed
-_md5_=46b26ed8b839a590e22ce5270f0b35fd
+_md5_=2522e9adab211c4c296583761b23ea4b
diff --git a/metadata/md5-cache/app-text/docbook2X-0.8.8-r4 b/metadata/md5-cache/app-text/docbook2X-0.8.8-r4
index a6fd9ce1b7ec..05907485129a 100644
--- a/metadata/md5-cache/app-text/docbook2X-0.8.8-r4
+++ b/metadata/md5-cache/app-text/docbook2X-0.8.8-r4
@@ -4,6 +4,7 @@ DEPEND=dev-lang/perl dev-libs/libxslt dev-perl/XML-NamespaceSupport dev-perl/XML
 DESCRIPTION=Tools to convert docbook to man and info
 EAPI=7
 HOMEPAGE=http://docbook2x.sourceforge.net/
+INHERIT=autotools
 IUSE=test
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x86-linux ~x64-macos
 LICENSE=MIT
@@ -11,5 +12,5 @@ RDEPEND=dev-lang/perl dev-libs/libxslt dev-perl/XML-NamespaceSupport dev-perl/XM
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/docbook2x/docbook2X-0.8.8.tar.gz
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=6989c8cd19706f6e2dbfa6d1c3495289
diff --git a/metadata/md5-cache/app-text/dos2unix-7.4.2 b/metadata/md5-cache/app-text/dos2unix-7.4.2
index 8ebec3ba398e..027c5f83df49 100644
--- a/metadata/md5-cache/app-text/dos2unix-7.4.2
+++ b/metadata/md5-cache/app-text/dos2unix-7.4.2
@@ -4,6 +4,7 @@ DEPEND=!app-text/hd2u virtual/libintl test? ( virtual/perl-Test-Simple )
 DESCRIPTION=Convert DOS or MAC text files to UNIX format or vice versa
 EAPI=7
 HOMEPAGE=http://www.xs4all.nl/~waterlan/dos2unix.html https://sourceforge.net/projects/dos2unix/
+INHERIT=plocale toolchain-funcs
 IUSE=debug nls test
 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
 LICENSE=BSD-2
@@ -11,5 +12,5 @@ RDEPEND=!app-text/hd2u virtual/libintl
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://www.xs4all.nl/~waterlan/dos2unix/dos2unix-7.4.2.tar.gz mirror://sourceforge/dos2unix/dos2unix-7.4.2.tar.gz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	plocale	7ce00136a77130df46fbbd5966f98a61	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	plocale	7ce00136a77130df46fbbd5966f98a61	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=04d35621304ef7f59feba2ea56105ca5
diff --git a/metadata/md5-cache/app-text/dos2unix-7.4.3 b/metadata/md5-cache/app-text/dos2unix-7.4.3
new file mode 100644
index 000000000000..911f6feda052
--- /dev/null
+++ b/metadata/md5-cache/app-text/dos2unix-7.4.3
@@ -0,0 +1,16 @@
+BDEPEND=dev-lang/perl nls? ( sys-devel/gettext )
+DEFINED_PHASES=compile install prepare
+DEPEND=!app-text/hd2u virtual/libintl test? ( virtual/perl-Test-Simple )
+DESCRIPTION=Convert DOS or MAC text files to UNIX format or vice versa
+EAPI=8
+HOMEPAGE=http://www.xs4all.nl/~waterlan/dos2unix.html https://sourceforge.net/projects/dos2unix/
+INHERIT=plocale toolchain-funcs
+IUSE=debug nls test
+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
+LICENSE=BSD-2
+RDEPEND=!app-text/hd2u virtual/libintl
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=http://www.xs4all.nl/~waterlan/dos2unix/dos2unix-7.4.3.tar.gz mirror://sourceforge/dos2unix/dos2unix-7.4.3.tar.gz
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	plocale	7ce00136a77130df46fbbd5966f98a61	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=ff3523f5734e539de9e90d3463919432
diff --git a/metadata/md5-cache/app-text/dvipng-1.17 b/metadata/md5-cache/app-text/dvipng-1.17
index 59da65c46f18..071c7111afaa 100644
--- a/metadata/md5-cache/app-text/dvipng-1.17
+++ b/metadata/md5-cache/app-text/dvipng-1.17
@@ -3,12 +3,13 @@ DEPEND=>=dev-libs/kpathsea-6.2.1:= media-libs/gd:2=[jpeg,png] media-libs/libpng:
 DESCRIPTION=Translate DVI files into PNG or GIF graphics
 EAPI=7
 HOMEPAGE=http://dvipng.sourceforge.net/
+INHERIT=flag-o-matic toolchain-funcs
 IUSE=truetype test
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris
 LICENSE=LGPL-3+ Texinfo-manual
 RDEPEND=>=dev-libs/kpathsea-6.2.1:= media-libs/gd:2=[jpeg,png] media-libs/libpng:0= virtual/latex-base sys-libs/zlib truetype? ( >=media-libs/freetype-2.1.5 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/dvipng/dvipng-1.17.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=6f878afe38b82092d43596da6e8879f3
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_md5_=d9a328e64d98d511b042150d703b895c
diff --git a/metadata/md5-cache/app-text/dvipsk-2021.1_p20210325-r1 b/metadata/md5-cache/app-text/dvipsk-2021.1_p20210325-r1
index a96d2b6b0b9b..5ae02cf37624 100644
--- a/metadata/md5-cache/app-text/dvipsk-2021.1_p20210325-r1
+++ b/metadata/md5-cache/app-text/dvipsk-2021.1_p20210325-r1
@@ -4,10 +4,11 @@ DEPEND=>=dev-libs/kpathsea-6.2.1:=
 DESCRIPTION=DVI-to-PostScript translator
 EAPI=7
 HOMEPAGE=http://tug.org/texlive/
+INHERIT=texlive-common
 IUSE=doc source
-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 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~zlogene/distfiles/texlive/texlive-20210325-source.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dvips-2021.tar.xz doc? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dvips.doc-2021.tar.xz )
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	texlive-common	c918583cd52e23eacee8a4cb5a623ed0
-_md5_=04b49b83f01d75e1218ae4f8ec01da03
+_md5_=9386acf57dbecfc47c201fe44a6b3cce
diff --git a/metadata/md5-cache/app-text/ebook-tools-0.2.2-r2 b/metadata/md5-cache/app-text/ebook-tools-0.2.2-r2
index 25b69dd52488..154f2cf56660 100644
--- a/metadata/md5-cache/app-text/ebook-tools-0.2.2-r2
+++ b/metadata/md5-cache/app-text/ebook-tools-0.2.2-r2
@@ -1,4 +1,4 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=dev-libs/libxml2 >=dev-libs/libzip-1.7.2:=
 DESCRIPTION=Tools for accessing and converting various ebook file formats
@@ -11,5 +11,5 @@ LICENSE=MIT
 RDEPEND=dev-libs/libxml2 >=dev-libs/libzip-1.7.2:= lit2epub? ( app-text/convertlit )
 SLOT=0
 SRC_URI=mirror://sourceforge/ebook-tools/ebook-tools-0.2.2.tar.gz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=6f3ca39879bf861a51e88e770d28242e
diff --git a/metadata/md5-cache/app-text/editorconfig-core-c-0.12.3-r2 b/metadata/md5-cache/app-text/editorconfig-core-c-0.12.3-r2
index bc7a9f151803..763b019cb7a1 100644
--- a/metadata/md5-cache/app-text/editorconfig-core-c-0.12.3-r2
+++ b/metadata/md5-cache/app-text/editorconfig-core-c-0.12.3-r2
@@ -1,4 +1,4 @@
-BDEPEND=doc? ( app-doc/doxygen ) dev-util/ninja >=dev-util/cmake-3.20.5
+BDEPEND=doc? ( app-doc/doxygen ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=dev-libs/libpcre2:=
 DESCRIPTION=EditorConfig core library written in C
@@ -11,5 +11,5 @@ LICENSE=BSD-2
 RDEPEND=dev-libs/libpcre2:= cli? ( !dev-python/editorconfig-core-py[cli] )
 SLOT=0
 SRC_URI=https://github.com/editorconfig/editorconfig-core-c/archive/v0.12.3.tar.gz -> editorconfig-core-c-0.12.3.tar.gz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=f12803c08d34d75203c20df6bdd71765
diff --git a/metadata/md5-cache/app-text/editorconfig-core-c-0.12.4 b/metadata/md5-cache/app-text/editorconfig-core-c-0.12.4
index ac8e3647aad9..751cbcc5883e 100644
--- a/metadata/md5-cache/app-text/editorconfig-core-c-0.12.4
+++ b/metadata/md5-cache/app-text/editorconfig-core-c-0.12.4
@@ -1,4 +1,4 @@
-BDEPEND=doc? ( app-doc/doxygen ) dev-util/ninja >=dev-util/cmake-3.20.5
+BDEPEND=doc? ( app-doc/doxygen ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=dev-libs/libpcre2:=
 DESCRIPTION=EditorConfig core library written in C
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://github.com/editorconfig/editorconfig-core-c/
 INHERIT=cmake
 IUSE=cli doc
-KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
+KEYWORDS=amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86
 LICENSE=BSD-2
 RDEPEND=dev-libs/libpcre2:= cli? ( !dev-python/editorconfig-core-py[cli] )
 SLOT=0
 SRC_URI=https://github.com/editorconfig/editorconfig-core-c/archive/v0.12.4.tar.gz -> editorconfig-core-c-0.12.4.tar.gz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=201290ac65515ad4d6ba8b1ee8d40685
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=8905ac10d695e9545c1854edb8970ad1
diff --git a/metadata/md5-cache/app-text/enchant-1.6.1-r1 b/metadata/md5-cache/app-text/enchant-1.6.1-r1
deleted file mode 100644
index 1036cf485b3b..000000000000
--- a/metadata/md5-cache/app-text/enchant-1.6.1-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=>=dev-libs/glib-2.6:2 aspell? ( app-text/aspell ) hunspell? ( >=app-text/hunspell-1.2.1:0= ) virtual/pkgconfig
-DESCRIPTION=Spellchecker wrapping library
-EAPI=6
-HOMEPAGE=https://abiword.github.io/enchant/
-IUSE=aspell +hunspell static-libs test
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
-LICENSE=LGPL-2.1
-RDEPEND=>=dev-libs/glib-2.6:2 aspell? ( app-text/aspell ) hunspell? ( >=app-text/hunspell-1.2.1:0= )
-REQUIRED_USE=|| ( hunspell aspell )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/AbiWord/enchant/releases/download/enchant-1-6-1/enchant-1.6.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	versionator	d3fb3ba33acc3bbbdc4d7970227c100d
-_md5_=16b65faf25c362f8991c464905ed2317
diff --git a/metadata/md5-cache/app-text/enchant-1.6.1-r2 b/metadata/md5-cache/app-text/enchant-1.6.1-r2
index afb59b966a97..e5daec61fae8 100644
--- a/metadata/md5-cache/app-text/enchant-1.6.1-r2
+++ b/metadata/md5-cache/app-text/enchant-1.6.1-r2
@@ -5,11 +5,11 @@ DESCRIPTION=Spellchecker wrapping library
 EAPI=8
 HOMEPAGE=https://abiword.github.io/enchant/
 IUSE=aspell +hunspell test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.6:2 aspell? ( app-text/aspell ) hunspell? ( >=app-text/hunspell-1.2.1:0= ) !<app-text/enchant-2.3.3:2
 REQUIRED_USE=|| ( aspell hunspell )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/AbiWord/enchant/releases/download/enchant-1-6-1/enchant-1.6.1.tar.gz
-_md5_=76c2dfe3dc768a389cd767c4e7e65362
+_md5_=65abb793071f67ebde4a3dbc0a43eb86
diff --git a/metadata/md5-cache/app-text/enchant-2.3.2 b/metadata/md5-cache/app-text/enchant-2.3.2
deleted file mode 100644
index d07005fc42d1..000000000000
--- a/metadata/md5-cache/app-text/enchant-2.3.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=configure install
-DEPEND=>=dev-libs/glib-2.6:2 aspell? ( app-text/aspell ) hunspell? ( >=app-text/hunspell-1.2.1:0= ) voikko? ( dev-libs/libvoikko ) test? ( >=dev-libs/unittest++-2.0.0-r2 )
-DESCRIPTION=Spellchecker wrapping library
-EAPI=7
-HOMEPAGE=https://abiword.github.io/enchant/
-IUSE=aspell +hunspell test voikko
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
-LICENSE=LGPL-2.1+
-RDEPEND=>=dev-libs/glib-2.6:2 aspell? ( app-text/aspell ) hunspell? ( >=app-text/hunspell-1.2.1:0= ) voikko? ( dev-libs/libvoikko )
-REQUIRED_USE=|| ( hunspell aspell )
-RESTRICT=test
-SLOT=2
-SRC_URI=https://github.com/AbiWord/enchant/releases/download/v2.3.2/enchant-2.3.2.tar.gz
-_md5_=9d41d5afbd11c9853e8b16bbc17e6803
diff --git a/metadata/md5-cache/app-text/enchant-2.3.3-r1 b/metadata/md5-cache/app-text/enchant-2.3.3-r1
index 32449c5cae20..24864f38b336 100644
--- a/metadata/md5-cache/app-text/enchant-2.3.3-r1
+++ b/metadata/md5-cache/app-text/enchant-2.3.3-r1
@@ -5,11 +5,11 @@ DESCRIPTION=Spellchecker wrapping library
 EAPI=8
 HOMEPAGE=https://abiword.github.io/enchant/
 IUSE=aspell +hunspell nuspell test voikko
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.6:2 aspell? ( app-text/aspell ) hunspell? ( >=app-text/hunspell-1.2.1:0= ) nuspell? ( >=app-text/nuspell-5.1.0:0= ) voikko? ( dev-libs/libvoikko ) !<app-text/enchant-1.6.1-r2:0
 REQUIRED_USE=|| ( aspell hunspell nuspell )
 RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=https://github.com/AbiWord/enchant/releases/download/v2.3.3/enchant-2.3.3.tar.gz
-_md5_=ffae8d17eeb04324d9943e6e24ba38fb
+_md5_=a4fa5ee9700d838fcbd729fe5154e560
diff --git a/metadata/md5-cache/app-text/enscript-1.6.6 b/metadata/md5-cache/app-text/enscript-1.6.6
index 10b853deb75c..b3666f18df18 100644
--- a/metadata/md5-cache/app-text/enscript-1.6.6
+++ b/metadata/md5-cache/app-text/enscript-1.6.6
@@ -4,11 +4,12 @@ DEPEND=nls? ( virtual/libintl )
 DESCRIPTION=Powerful text-to-postscript converter
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/enscript/enscript.html
+INHERIT=toolchain-funcs
 IUSE=nls ruby
 KEYWORDS=~alpha amd64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris
 LICENSE=GPL-3
 RDEPEND=nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=mirror://gnu/enscript/enscript-1.6.6.tar.gz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=c12af29dcc695f25e3803aac0054b3aa
diff --git a/metadata/md5-cache/app-text/epspdf-0.6.3-r1 b/metadata/md5-cache/app-text/epspdf-0.6.3-r1
index 061df34f9f1e..fa7bef396378 100644
--- a/metadata/md5-cache/app-text/epspdf-0.6.3-r1
+++ b/metadata/md5-cache/app-text/epspdf-0.6.3-r1
@@ -3,11 +3,12 @@ DEPEND=sys-apps/texinfo
 DESCRIPTION=GUI and command-line converter for [e]ps and pdf
 EAPI=7
 HOMEPAGE=http://tex.aanhet.net/epspdf/
+INHERIT=desktop texlive-common
 IUSE=doc tk
 KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=!<dev-texlive/texlive-pictures-2011-r1 >=dev-texlive/texlive-basic-2011 app-text/ghostscript-gpl tk? ( dev-lang/tk )
 SLOT=0
 SRC_URI=http://tex.aanhet.net/epspdf/epspdf.0.6.3.tgz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	texlive-common	c918583cd52e23eacee8a4cb5a623ed0
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	texlive-common	c918583cd52e23eacee8a4cb5a623ed0
 _md5_=0ddf49f9789489bf29697c01c3afbcbb
diff --git a/metadata/md5-cache/app-text/epspdf-0.6.5 b/metadata/md5-cache/app-text/epspdf-0.6.5
index 576e0ecb5a5e..a8e288a8f712 100644
--- a/metadata/md5-cache/app-text/epspdf-0.6.5
+++ b/metadata/md5-cache/app-text/epspdf-0.6.5
@@ -3,11 +3,12 @@ DEFINED_PHASES=compile install
 DESCRIPTION=GUI and command-line converter for [e]ps and pdf
 EAPI=7
 HOMEPAGE=http://tex.aanhet.net/epspdf/
+INHERIT=desktop texlive-common
 IUSE=doc tk
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=!<dev-texlive/texlive-pictures-2011-r1 >=dev-texlive/texlive-basic-2011 app-text/ghostscript-gpl tk? ( dev-lang/tk )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~sam/distfiles/app-text/epspdf/epspdf-0.6.5.zip
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	texlive-common	c918583cd52e23eacee8a4cb5a623ed0
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	texlive-common	c918583cd52e23eacee8a4cb5a623ed0
 _md5_=92e545f5842eba0349ca70782491aee0
diff --git a/metadata/md5-cache/app-text/epstool-3.09 b/metadata/md5-cache/app-text/epstool-3.09
index 936cba2f373d..b121536016f2 100644
--- a/metadata/md5-cache/app-text/epstool-3.09
+++ b/metadata/md5-cache/app-text/epstool-3.09
@@ -3,10 +3,11 @@ DEPEND=app-text/ghostscript-gpl
 DESCRIPTION=Creates or extracts preview images in EPS files, fixes bounding boxes
 EAPI=7
 HOMEPAGE=http://www.ghostgum.com.au/software/epstool.htm
+INHERIT=toolchain-funcs
 KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-2
 RDEPEND=app-text/ghostscript-gpl
 SLOT=0
 SRC_URI=http://www.ghostgum.com.au/download/epstool-3.09.tar.gz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=f8edf33417d2e2b7e9111a4f3c07d393
diff --git a/metadata/md5-cache/app-text/evince-41.3 b/metadata/md5-cache/app-text/evince-41.3
deleted file mode 100644
index fd3977ffbebc..000000000000
--- a/metadata/md5-cache/app-text/evince-41.3
+++ /dev/null
@@ -1,15 +0,0 @@
-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 app-arch/xz-utils >=dev-util/meson-0.59.4 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-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.86.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-4.0:0= ) xps? ( >=app-text/libgxps-0.2.1:= ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Simple document viewer for GNOME
-EAPI=7
-HOMEPAGE=https://wiki.gnome.org/Apps/Evince
-INHERIT=gnome.org gnome2-utils meson systemd xdg
-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
-LICENSE=GPL-2+ CC-BY-SA-3.0
-RDEPEND=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.86.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-4.0:0= ) xps? ( >=app-text/libgxps-0.2.1:= ) gnome-base/gvfs gnome-base/librsvg || ( >=x11-themes/adwaita-icon-theme-2.17.1 >=x11-themes/hicolor-icon-theme-0.10 )
-SLOT=0/evd3.4-evv3.3
-SRC_URI=mirror://gnome/sources/evince/41/evince-41.3.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=4e66a2f7d32904701a2cd89a6273994c
diff --git a/metadata/md5-cache/app-text/evince-42.2 b/metadata/md5-cache/app-text/evince-42.2
index b4dc7be14b73..9f6f8bb2642c 100644
--- a/metadata/md5-cache/app-text/evince-42.2
+++ b/metadata/md5-cache/app-text/evince-42.2
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://wiki.gnome.org/Apps/Evince
 INHERIT=gnome.org gnome2-utils meson systemd xdg
 IUSE=cups djvu dvi gstreamer gnome gnome-keyring gtk-doc +introspection nautilus postscript spell 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
 LICENSE=GPL-2+ CC-BY-SA-3.0
 RDEPEND=dev-libs/atk >=dev-libs/glib-2.44.0:2 >=gui-libs/libhandy-1.5.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-22.02.0[cairo] >=app-arch/libarchive-3.6.0 djvu? ( >=app-text/djvu-3.5.22:= ) dvi? ( >=app-text/libspectre-0.2:= dev-libs/kpathsea:= ) 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-4.0:0= ) xps? ( >=app-text/libgxps-0.2.1:= ) gnome-base/gvfs gnome-base/librsvg || ( >=x11-themes/adwaita-icon-theme-2.17.1 >=x11-themes/hicolor-icon-theme-0.10 )
 SLOT=0/evd3.4-evv3.3
 SRC_URI=mirror://gnome/sources/evince/42/evince-42.2.tar.xz
-_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=ba456b5a0beb9f935c45d906792685f1
+_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=403dc741fb58b035db0807e70833a511
diff --git a/metadata/md5-cache/app-text/evince-42.1 b/metadata/md5-cache/app-text/evince-42.3
index 4e6c5a810a65..5cbfd74590e7 100644
--- a/metadata/md5-cache/app-text/evince-42.1
+++ b/metadata/md5-cache/app-text/evince-42.3
@@ -10,6 +10,6 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~a
 LICENSE=GPL-2+ CC-BY-SA-3.0
 RDEPEND=dev-libs/atk >=dev-libs/glib-2.44.0:2 >=gui-libs/libhandy-1.5.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-22.02.0[cairo] >=app-arch/libarchive-3.6.0 djvu? ( >=app-text/djvu-3.5.22:= ) dvi? ( >=app-text/libspectre-0.2:= dev-libs/kpathsea:= ) 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-4.0:0= ) xps? ( >=app-text/libgxps-0.2.1:= ) gnome-base/gvfs gnome-base/librsvg || ( >=x11-themes/adwaita-icon-theme-2.17.1 >=x11-themes/hicolor-icon-theme-0.10 )
 SLOT=0/evd3.4-evv3.3
-SRC_URI=mirror://gnome/sources/evince/42/evince-42.1.tar.xz
-_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+SRC_URI=mirror://gnome/sources/evince/42/evince-42.3.tar.xz
+_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=ba456b5a0beb9f935c45d906792685f1
diff --git a/metadata/md5-cache/app-text/expander-2.0.5-r2 b/metadata/md5-cache/app-text/expander-2.0.5-r2
index 1fa74b94c55f..8be471c45b50 100644
--- a/metadata/md5-cache/app-text/expander-2.0.5-r2
+++ b/metadata/md5-cache/app-text/expander-2.0.5-r2
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile install postinst
 DESCRIPTION=Expander is a utility that acts as a filter for text editors
 EAPI=7
 HOMEPAGE=http://www.nedit.org
+INHERIT=toolchain-funcs
 KEYWORDS=~amd64 ~x86 ~x86-linux ~ppc-macos
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=ftp://ftp.nedit.org/pub/contrib/misc/nedit_expander_kit_2.05.tar.gz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=16b6933320199eff635bdb265ad769d0
diff --git a/metadata/md5-cache/app-text/fblog-1.4.1 b/metadata/md5-cache/app-text/fblog-1.4.1
index 5b72b3f8c544..de20e929c1e8 100644
--- a/metadata/md5-cache/app-text/fblog-1.4.1
+++ b/metadata/md5-cache/app-text/fblog-1.4.1
@@ -9,5 +9,5 @@ KEYWORDS=~amd64 ~ppc64
 LICENSE=Apache-2.0 Boost-1.0 MIT Unlicense WTFPL-2
 SLOT=0
 SRC_URI=https://crates.io/api/v1/crates/aho-corasick/0.7.6/download -> aho-corasick-0.7.6.crate https://crates.io/api/v1/crates/ansi_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/ansi_term/0.12.1/download -> ansi_term-0.12.1.crate https://crates.io/api/v1/crates/atty/0.2.13/download -> atty-0.2.13.crate https://crates.io/api/v1/crates/bitflags/1.1.0/download -> bitflags-1.1.0.crate https://crates.io/api/v1/crates/cc/1.0.45/download -> cc-1.0.45.crate https://crates.io/api/v1/crates/clap/2.33.0/download -> clap-2.33.0.crate https://crates.io/api/v1/crates/fblog/1.4.1/download -> fblog-1.4.1.crate https://crates.io/api/v1/crates/hlua/0.4.1/download -> hlua-0.4.1.crate https://crates.io/api/v1/crates/itoa/0.4.4/download -> itoa-0.4.4.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/libc/0.2.62/download -> libc-0.2.62.crate https://crates.io/api/v1/crates/lua52-sys/0.1.2/download -> lua52-sys-0.1.2.crate https://crates.io/api/v1/crates/maplit/1.0.2/download -> maplit-1.0.2.crate https://crates.io/api/v1/crates/memchr/2.2.1/download -> memchr-2.2.1.crate https://crates.io/api/v1/crates/pkg-config/0.3.16/download -> pkg-config-0.3.16.crate https://crates.io/api/v1/crates/regex/1.3.1/download -> regex-1.3.1.crate https://crates.io/api/v1/crates/regex-syntax/0.6.12/download -> regex-syntax-0.6.12.crate https://crates.io/api/v1/crates/ryu/1.0.0/download -> ryu-1.0.0.crate https://crates.io/api/v1/crates/serde/1.0.100/download -> serde-1.0.100.crate https://crates.io/api/v1/crates/serde_json/1.0.40/download -> serde_json-1.0.40.crate https://crates.io/api/v1/crates/strsim/0.8.0/download -> strsim-0.8.0.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.crate https://crates.io/api/v1/crates/thread_local/0.3.6/download -> thread_local-0.3.6.crate https://crates.io/api/v1/crates/unicode-width/0.1.6/download -> unicode-width-0.1.6.crate https://crates.io/api/v1/crates/vec_map/0.8.1/download -> vec_map-0.8.1.crate https://crates.io/api/v1/crates/winapi/0.3.8/download -> winapi-0.3.8.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate
-_eclasses_=cargo	52a92ed3815080c5f2caac1905687b1c	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=cargo	52a92ed3815080c5f2caac1905687b1c	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=e13cc1cc17fea39213f23bea05c98fc4
diff --git a/metadata/md5-cache/app-text/fbpdf-0_p20200614 b/metadata/md5-cache/app-text/fbpdf-0_p20200614
index 95ff5913214c..89fddbcdb197 100644
--- a/metadata/md5-cache/app-text/fbpdf-0_p20200614
+++ b/metadata/md5-cache/app-text/fbpdf-0_p20200614
@@ -4,10 +4,11 @@ DEPEND=>=app-text/mupdf-1.10:0= app-text/djvu:0= !media-gfx/fbida[fbcon(-)]
 DESCRIPTION=framebuffer pdf and djvu viewer
 EAPI=7
 HOMEPAGE=https://github.com/aligrudi/fbpdf
+INHERIT=toolchain-funcs vcs-snapshot
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD ISC
 RDEPEND=>=app-text/mupdf-1.10:0= app-text/djvu:0= !media-gfx/fbida[fbcon(-)]
 SLOT=0
 SRC_URI=https://github.com/aligrudi/fbpdf/archive/27c9e28e9199a2491d0ee0a885760bedb1d4547b.tar.gz -> fbpdf-0_p20200614-27c9e28e9199a2491d0ee0a885760bedb1d4547b.tar.gz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-snapshot	19dc666868420457132a7514d4621476
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vcs-snapshot	19dc666868420457132a7514d4621476
 _md5_=380772be568c56c72769f032492af54a
diff --git a/metadata/md5-cache/app-text/fbreader-0.99.4-r6 b/metadata/md5-cache/app-text/fbreader-0.99.4-r6
index 7ad41a6ba81d..d33b2e6e71be 100644
--- a/metadata/md5-cache/app-text/fbreader-0.99.4-r6
+++ b/metadata/md5-cache/app-text/fbreader-0.99.4-r6
@@ -11,5 +11,5 @@ LICENSE=GPL-2
 RDEPEND=app-arch/bzip2 dev-db/sqlite dev-libs/expat dev-libs/fribidi dev-libs/libunibreak:= dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtwidgets:5 net-misc/curl sys-libs/zlib
 SLOT=0
 SRC_URI=https://www.fbreader.org/files/desktop/fbreader-sources-0.99.4.tgz https://dev.gentoo.org/~juippis/distfiles/tmp/fbreader-0.99.4-combined.patch
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=74633e9ebebf2af781f17b9a2aa58b88
diff --git a/metadata/md5-cache/app-text/fictionup-0.2.1 b/metadata/md5-cache/app-text/fictionup-0.2.1
index 1320e8b1971e..2589a2681aa0 100644
--- a/metadata/md5-cache/app-text/fictionup-0.2.1
+++ b/metadata/md5-cache/app-text/fictionup-0.2.1
@@ -1,4 +1,4 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=dev-libs/libyaml
 DESCRIPTION=Command-line markdown to fb2 convertor
@@ -10,5 +10,5 @@ LICENSE=GPL-3
 RDEPEND=dev-libs/libyaml
 SLOT=0
 SRC_URI=http://cdslow.org.ru/files/fictionup/fictionup-0.2.1.tar.gz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=31123c5211de169bc56ff71bc9bd3619
diff --git a/metadata/md5-cache/app-text/flpsed-0.7.3 b/metadata/md5-cache/app-text/flpsed-0.7.3
index 4f991e904959..47b2e0331c3a 100644
--- a/metadata/md5-cache/app-text/flpsed-0.7.3
+++ b/metadata/md5-cache/app-text/flpsed-0.7.3
@@ -3,10 +3,11 @@ DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXft >=x11-libs/fltk-1.3.0:1
 DESCRIPTION=Pseudo PostScript editor
 EAPI=7
 HOMEPAGE=https://flpsed.org/flpsed.html
+INHERIT=desktop xdg
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXft >=x11-libs/fltk-1.3.0:1 app-text/ghostscript-gpl[X]
 SLOT=0
 SRC_URI=https://flpsed.org/flpsed-0.7.3.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=711acbc4805e874fef52b21e7ffafffe
diff --git a/metadata/md5-cache/app-text/foliate-2.6.4-r1 b/metadata/md5-cache/app-text/foliate-2.6.4-r1
index 005bfb7329e9..7cdf45d18c69 100644
--- a/metadata/md5-cache/app-text/foliate-2.6.4-r1
+++ b/metadata/md5-cache/app-text/foliate-2.6.4-r1
@@ -10,5 +10,5 @@ LICENSE=GPL-3+
 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] )
 SLOT=0
 SRC_URI=https://github.com/johnfactotum/foliate/archive/2.6.4.tar.gz -> foliate-2.6.4.tar.gz
-_eclasses_=gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	plocale	7ce00136a77130df46fbbd5966f98a61	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	plocale	7ce00136a77130df46fbbd5966f98a61	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=e4dad348b76bfc1cc1a6a7f4a99dcdcf
diff --git a/metadata/md5-cache/app-text/fzy-1.0-r1 b/metadata/md5-cache/app-text/fzy-1.0-r1
index add8066b0c43..6f037a52fa87 100644
--- a/metadata/md5-cache/app-text/fzy-1.0-r1
+++ b/metadata/md5-cache/app-text/fzy-1.0-r1
@@ -2,11 +2,12 @@ DEFINED_PHASES=install postinst prepare
 DESCRIPTION=Fuzzy text selector (interactive grep) for console
 EAPI=7
 HOMEPAGE=https://github.com/jhawthorn/fzy
+INHERIT=optfeature savedconfig toolchain-funcs
 IUSE=test savedconfig
 KEYWORDS=amd64 arm arm64 ppc64 ~riscv x86
 LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jhawthorn/fzy/releases/download/1.0/fzy-1.0.tar.gz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	optfeature	d524f291c80f9d21ad80fe978e3ca760	portability	d33a77692bb47e8227f27e17fb9c3c05	savedconfig	7cb1bf66b4acedc4f06802a012d3b08d	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	optfeature	d524f291c80f9d21ad80fe978e3ca760	portability	d33a77692bb47e8227f27e17fb9c3c05	savedconfig	7cb1bf66b4acedc4f06802a012d3b08d	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=49f25a7780f21748658e4e09bad72328
diff --git a/metadata/md5-cache/app-text/fzy-9999 b/metadata/md5-cache/app-text/fzy-9999
index a4ece88f1804..1d9775a4f7c8 100644
--- a/metadata/md5-cache/app-text/fzy-9999
+++ b/metadata/md5-cache/app-text/fzy-9999
@@ -3,10 +3,11 @@ DEFINED_PHASES=install postinst prepare unpack
 DESCRIPTION=Fuzzy text selector (interactive grep) for console
 EAPI=7
 HOMEPAGE=https://github.com/jhawthorn/fzy
+INHERIT=optfeature savedconfig toolchain-funcs git-r3
 IUSE=test savedconfig
 LICENSE=MIT
 PROPERTIES=live
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	optfeature	d524f291c80f9d21ad80fe978e3ca760	portability	d33a77692bb47e8227f27e17fb9c3c05	savedconfig	7cb1bf66b4acedc4f06802a012d3b08d	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	4fbbbc98f236f1b43acd99476bc3cd85	optfeature	d524f291c80f9d21ad80fe978e3ca760	portability	d33a77692bb47e8227f27e17fb9c3c05	savedconfig	7cb1bf66b4acedc4f06802a012d3b08d	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=582df4bef5f7f052901fbfd57a1435ee
diff --git a/metadata/md5-cache/app-text/ghostscript-gpl-9.55.0-r1 b/metadata/md5-cache/app-text/ghostscript-gpl-9.55.0-r1
index 2fa7dba3e38b..b129e4669c34 100644
--- a/metadata/md5-cache/app-text/ghostscript-gpl-9.55.0-r1
+++ b/metadata/md5-cache/app-text/ghostscript-gpl-9.55.0-r1
@@ -4,11 +4,12 @@ DEPEND=app-text/libpaper media-libs/fontconfig >=media-libs/freetype-2.4.9:2= >=
 DESCRIPTION=Interpreter for the PostScript language and PDF
 EAPI=8
 HOMEPAGE=https://ghostscript.com/
+INHERIT=autotools toolchain-funcs
 IUSE=cups dbus gtk l10n_de static-libs unicode X l10n_ja l10n_ko l10n_zh-CN l10n_zh-TW
 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
 LICENSE=AGPL-3 CPL-1.0
 RDEPEND=app-text/libpaper media-libs/fontconfig >=media-libs/freetype-2.4.9:2= >=media-libs/jbig2dec-0.19:= >=media-libs/lcms-2.6:2 >=media-libs/libpng-1.6.2:0= >=media-libs/openjpeg-2.1.0:2= >=media-libs/tiff-4.0.1:0= >=sys-libs/zlib-1.2.7 virtual/jpeg:0 cups? ( >=net-print/cups-1.3.8 ) dbus? ( sys-apps/dbus ) gtk? ( || ( x11-libs/gtk+:3 x11-libs/gtk+:2 ) ) unicode? ( net-dns/libidn:0= ) X? ( x11-libs/libXt x11-libs/libXext ) app-text/poppler-data >=media-fonts/urw-fonts-2.4.9 l10n_ja? ( media-fonts/kochi-substitute ) l10n_ko? ( media-fonts/baekmuk-fonts ) l10n_zh-CN? ( media-fonts/arphicfonts ) l10n_zh-TW? ( media-fonts/arphicfonts )
 SLOT=0/9.55
 SRC_URI=https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs9550/ghostscript-9.55.0.tar.xz https://dev.gentoo.org/~whissi/dist/ghostscript-gpl/ghostscript-gpl-9.55-patchset-01.tar.xz
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=efe6adf58ee3b84a92925cfc9a120f2c
diff --git a/metadata/md5-cache/app-text/ghostscript-gpl-9.56.1 b/metadata/md5-cache/app-text/ghostscript-gpl-9.56.1
index 9a644621fba2..1bc89973f0e4 100644
--- a/metadata/md5-cache/app-text/ghostscript-gpl-9.56.1
+++ b/metadata/md5-cache/app-text/ghostscript-gpl-9.56.1
@@ -3,12 +3,13 @@ DEFINED_PHASES=compile configure install prepare
 DEPEND=app-text/libpaper media-libs/fontconfig >=media-libs/freetype-2.4.9:2= >=media-libs/jbig2dec-0.19:= >=media-libs/lcms-2.6:2 >=media-libs/libpng-1.6.2:= media-libs/libjpeg-turbo:= >=media-libs/openjpeg-2.1.0:2= >=media-libs/tiff-4.0.1:= >=sys-libs/zlib-1.2.7 cups? ( >=net-print/cups-1.3.8 ) dbus? ( sys-apps/dbus ) gtk? ( x11-libs/gtk+:3 ) unicode? ( net-dns/libidn:= ) X? ( x11-libs/libXt x11-libs/libXext )
 DESCRIPTION=Interpreter for the PostScript language and PDF
 EAPI=8
-HOMEPAGE=https://ghostscript.com/
+HOMEPAGE=https://ghostscript.com/ https://git.ghostscript.com/?p=ghostpdl.git;a=summary
+INHERIT=autotools toolchain-funcs
 IUSE=cups dbus gtk l10n_de static-libs unicode X l10n_ja l10n_ko l10n_zh-CN l10n_zh-TW
-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 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=AGPL-3 CPL-1.0
 RDEPEND=app-text/libpaper media-libs/fontconfig >=media-libs/freetype-2.4.9:2= >=media-libs/jbig2dec-0.19:= >=media-libs/lcms-2.6:2 >=media-libs/libpng-1.6.2:= media-libs/libjpeg-turbo:= >=media-libs/openjpeg-2.1.0:2= >=media-libs/tiff-4.0.1:= >=sys-libs/zlib-1.2.7 cups? ( >=net-print/cups-1.3.8 ) dbus? ( sys-apps/dbus ) gtk? ( x11-libs/gtk+:3 ) unicode? ( net-dns/libidn:= ) X? ( x11-libs/libXt x11-libs/libXext ) app-text/poppler-data >=media-fonts/urw-fonts-2.4.9 l10n_ja? ( media-fonts/kochi-substitute ) l10n_ko? ( media-fonts/baekmuk-fonts ) l10n_zh-CN? ( media-fonts/arphicfonts ) l10n_zh-TW? ( media-fonts/arphicfonts )
 SLOT=0/9.56
 SRC_URI=https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs9561/ghostscript-9.56.1.tar.xz https://dev.gentoo.org/~sam/distfiles/app-text/ghostscript-gpl/ghostscript-gpl-9.56.1-patchset-01.tar.xz https://dev.gentoo.org/~whissi/dist/ghostscript-gpl/ghostscript-gpl-9.56.1-patchset-01.tar.xz
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=e1c6227b4444f24710b23f4b5aa5d773
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=058c8d974a774a32e017d549de78b518
diff --git a/metadata/md5-cache/app-text/gnome-doc-utils-0.20.10-r2 b/metadata/md5-cache/app-text/gnome-doc-utils-0.20.10-r2
index 55f48a45228e..dde8d7e3e8bd 100644
--- a/metadata/md5-cache/app-text/gnome-doc-utils-0.20.10-r2
+++ b/metadata/md5-cache/app-text/gnome-doc-utils-0.20.10-r2
@@ -11,5 +11,5 @@ RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-doc-utils/0.20/gnome-doc-utils-0.20.10.tar.xz https://dev.gentoo.org/~juippis/distfiles/tmp/gnome-doc-utils-0.20.10-python3.patch
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	97143780d341cc8d8f1d4c6187a36d29	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	28f0f3c0226306ec5f49e13bf851f171	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	97143780d341cc8d8f1d4c6187a36d29	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=e7520d8ee471cacc2567a1d8bd86b6ae
diff --git a/metadata/md5-cache/app-text/grip-4.6.0 b/metadata/md5-cache/app-text/grip-4.6.0
deleted file mode 100644
index 365f2ab3da1a..000000000000
--- a/metadata/md5-cache/app-text/grip-4.6.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DESCRIPTION=Preview GitHub Markdown files like Readme locally before committing them
-EAPI=7
-HOMEPAGE=https://github.com/joeyespo/grip
-INHERIT=distutils-r1
-IUSE=python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64
-LICENSE=MIT
-RDEPEND=!media-sound/grip >=dev-python/docopt-0.4.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/flask-0.10.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/markdown-2.5.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/path-and-address-2.0.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pygments-1.6[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requests-2.4.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-SLOT=0
-SRC_URI=mirror://pypi/g/grip/grip-4.6.0.tar.gz
-_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=405e61c4f8f5b6d9d7679e72609241db
diff --git a/metadata/md5-cache/app-text/grip-4.6.1 b/metadata/md5-cache/app-text/grip-4.6.1
index 6aadaa6a76a2..326faa8411f9 100644
--- a/metadata/md5-cache/app-text/grip-4.6.1
+++ b/metadata/md5-cache/app-text/grip-4.6.1
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://github.com/joeyespo/grip
 INHERIT=distutils-r1
 IUSE=python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=MIT
 RDEPEND=!media-sound/grip >=dev-python/docopt-0.4.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/flask-0.10.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/markdown-2.5.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/path-and-address-2.0.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pygments-1.6[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requests-2.4.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/g/grip/grip-4.6.1.tar.gz
-_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=783e79bbe9dbea571b9d29c1a1c0c209
+_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=405e61c4f8f5b6d9d7679e72609241db
diff --git a/metadata/md5-cache/app-text/groonga-8.0.2-r1 b/metadata/md5-cache/app-text/groonga-8.0.2-r1
index 6fcf0091b18a..5a5f253cbd17 100644
--- a/metadata/md5-cache/app-text/groonga-8.0.2-r1
+++ b/metadata/md5-cache/app-text/groonga-8.0.2-r1
@@ -4,6 +4,7 @@ DEPEND=>=dev-libs/onigmo-6.1.1:0= benchmark? ( >=dev-libs/glib-2.8 ) jemalloc? (
 DESCRIPTION=An Embeddable Fulltext Search Engine
 EAPI=7
 HOMEPAGE=https://groonga.org/
+INHERIT=libtool
 IUSE=abort benchmark debug doc dynamic-malloc-change +exact-alloc-count examples fmalloc futex jemalloc libedit libevent lzo +mecab msgpack +nfkc sphinx static-libs uyield zeromq zlib zstd
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2.1
@@ -11,5 +12,5 @@ RDEPEND=>=dev-libs/onigmo-6.1.1:0= benchmark? ( >=dev-libs/glib-2.8 ) jemalloc?
 REQUIRED_USE=abort? ( dynamic-malloc-change ) fmalloc? ( dynamic-malloc-change ) sphinx? ( doc )
 SLOT=0
 SRC_URI=https://packages.groonga.org/source/groonga/groonga-8.0.2.tar.gz
-_eclasses_=libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=efe5e412ffccbbff4517626efe775221
diff --git a/metadata/md5-cache/app-text/groonga-normalizer-mysql-1.1.1-r1 b/metadata/md5-cache/app-text/groonga-normalizer-mysql-1.1.1-r1
index 27e5f44a694e..692910682a36 100644
--- a/metadata/md5-cache/app-text/groonga-normalizer-mysql-1.1.1-r1
+++ b/metadata/md5-cache/app-text/groonga-normalizer-mysql-1.1.1-r1
@@ -4,10 +4,11 @@ DEPEND=app-text/groonga
 DESCRIPTION=Groonga plugin that provides MySQL compatible normalizers
 EAPI=8
 HOMEPAGE=https://groonga.org/
+INHERIT=autotools
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2.1
 RDEPEND=app-text/groonga
 SLOT=0
 SRC_URI=https://packages.groonga.org/source/groonga-normalizer-mysql/groonga-normalizer-mysql-1.1.1.tar.gz
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=3884c977da4eefcbeee82c240d37ac2e
diff --git a/metadata/md5-cache/app-text/gspell-1.10.0 b/metadata/md5-cache/app-text/gspell-1.10.0
index 291644d2ac02..1b976d4098e0 100644
--- a/metadata/md5-cache/app-text/gspell-1.10.0
+++ b/metadata/md5-cache/app-text/gspell-1.10.0
@@ -4,13 +4,14 @@ DEPEND=>=app-text/enchant-2.1.3:2 >=dev-libs/glib-2.44:2 >=x11-libs/gtk+-3.20:3[
 DESCRIPTION=Spell check library for GTK+ applications
 EAPI=8
 HOMEPAGE=https://wiki.gnome.org/Projects/gspell
+INHERIT=gnome2 vala virtualx
 IUSE=+introspection +vala test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=app-text/enchant-2.1.3:2 >=dev-libs/glib-2.44:2 >=x11-libs/gtk+-3.20:3[introspection?] dev-libs/icu:= introspection? ( >=dev-libs/gobject-introspection-1.42.0:= )
 REQUIRED_USE=vala? ( introspection )
 RESTRICT=!test? ( test )
 SLOT=0/2
 SRC_URI=mirror://gnome/sources/gspell/1.10/gspell-1.10.0.tar.xz
-_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vala	9badd41d5aab740ae5ac301c4416c5f8	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=c04b80d513af16f7fb85c949438cfb85
+_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vala	9badd41d5aab740ae5ac301c4416c5f8	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=418b472fdc72483de16a985fbad35afc
diff --git a/metadata/md5-cache/app-text/gspell-1.11.1 b/metadata/md5-cache/app-text/gspell-1.11.1
new file mode 100644
index 000000000000..cbaa84ff8ffc
--- /dev/null
+++ b/metadata/md5-cache/app-text/gspell-1.11.1
@@ -0,0 +1,17 @@
+BDEPEND=dev-libs/libxml2:2 dev-util/glib-utils >=dev-util/gtk-doc-am-1.25 >=sys-devel/gettext-0.19.6 virtual/pkgconfig vala? ( || ( dev-lang/vala:0.56 dev-lang/vala:0.54 dev-lang/vala:0.52 dev-lang/vala:0.50 ) ) test? ( app-text/enchant:2[hunspell] || ( app-dicts/myspell-en[l10n_en(+)] app-dicts/myspell-en[l10n_en-US(+)] ) ) >=app-portage/elt-patches-20170815 app-arch/xz-utils test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=>=app-text/enchant-2.1.3:2 >=dev-libs/glib-2.44:2 >=x11-libs/gtk+-3.20:3[introspection?] dev-libs/icu:= introspection? ( >=dev-libs/gobject-introspection-1.42.0:= ) test? ( sys-apps/dbus )
+DESCRIPTION=Spell check library for GTK+ applications
+EAPI=8
+HOMEPAGE=https://gitlab.gnome.org/GNOME/gspell
+INHERIT=gnome2 vala virtualx
+IUSE=+introspection +vala test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=>=app-text/enchant-2.1.3:2 >=dev-libs/glib-2.44:2 >=x11-libs/gtk+-3.20:3[introspection?] dev-libs/icu:= introspection? ( >=dev-libs/gobject-introspection-1.42.0:= )
+REQUIRED_USE=vala? ( introspection )
+RESTRICT=!test? ( test )
+SLOT=0/2
+SRC_URI=mirror://gnome/sources/gspell/1.11/gspell-1.11.1.tar.xz
+_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vala	9badd41d5aab740ae5ac301c4416c5f8	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=1aa276514ff050a0e59fa17618ef6a3e
diff --git a/metadata/md5-cache/app-text/gspell-1.9.1 b/metadata/md5-cache/app-text/gspell-1.9.1
deleted file mode 100644
index fb58c2b10a01..000000000000
--- a/metadata/md5-cache/app-text/gspell-1.9.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-libs/libxml2:2 dev-util/glib-utils >=dev-util/gtk-doc-am-1.25 >=sys-devel/gettext-0.19.6 virtual/pkgconfig vala? ( || ( dev-lang/vala:0.56[vapigen(+)] dev-lang/vala:0.54[vapigen(+)] dev-lang/vala:0.52[vapigen(+)] dev-lang/vala:0.50[vapigen(+)] ) ) test? ( app-text/enchant:2[hunspell] || ( app-dicts/myspell-en[l10n_en(+)] app-dicts/myspell-en[l10n_en-US(+)] ) ) >=app-portage/elt-patches-20170815 app-arch/xz-utils test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=app-text/enchant-2.1.3:2 >=dev-libs/glib-2.44:2 >=x11-libs/gtk+-3.20:3[introspection?] dev-libs/icu:= introspection? ( >=dev-libs/gobject-introspection-1.42.0:= ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Spell check library for GTK+ applications
-EAPI=7
-HOMEPAGE=https://wiki.gnome.org/Projects/gspell
-IUSE=+introspection +vala test
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=app-text/enchant-2.1.3:2 >=dev-libs/glib-2.44:2 >=x11-libs/gtk+-3.20:3[introspection?] dev-libs/icu:= introspection? ( >=dev-libs/gobject-introspection-1.42.0:= )
-REQUIRED_USE=vala? ( introspection )
-RESTRICT=!test? ( test )
-SLOT=0/2
-SRC_URI=mirror://gnome/sources/gspell/1.9/gspell-1.9.1.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vala	9badd41d5aab740ae5ac301c4416c5f8	virtualx	975d49ff3b3f451efe7a95f230532135	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=710b6e70aae706a224e1dddebc46b823
diff --git a/metadata/md5-cache/app-text/gtkspell-3.0.10 b/metadata/md5-cache/app-text/gtkspell-3.0.10
index d9159d2a72d8..59ee8ccacf5b 100644
--- a/metadata/md5-cache/app-text/gtkspell-3.0.10
+++ b/metadata/md5-cache/app-text/gtkspell-3.0.10
@@ -11,5 +11,5 @@ RDEPEND=app-text/enchant:2 app-text/iso-codes dev-libs/glib:2 x11-libs/gtk+:3[in
 REQUIRED_USE=vala? ( introspection )
 SLOT=3/0
 SRC_URI=mirror://sourceforge/project/gtkspell/3.0.10/gtkspell3-3.0.10.tar.xz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vala	9badd41d5aab740ae5ac301c4416c5f8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	28f0f3c0226306ec5f49e13bf851f171	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4fbbbc98f236f1b43acd99476bc3cd85	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vala	9badd41d5aab740ae5ac301c4416c5f8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=cb4dcbb978d9152bdbf53d48cef90ea3
diff --git a/metadata/md5-cache/app-text/gtranslator-40.0 b/metadata/md5-cache/app-text/gtranslator-40.0
index f8354aa0e7bf..907f4612594e 100644
--- a/metadata/md5-cache/app-text/gtranslator-40.0
+++ b/metadata/md5-cache/app-text/gtranslator-40.0
@@ -11,5 +11,5 @@ LICENSE=GPL-3+
 RDEPEND=>=dev-libs/glib-2.36.0:2 >=x11-libs/gtk+-3.22.20:3 gui-libs/libhandy:1= >=dev-libs/libdazzle-3.33.90 gnome-extra/libgda:5= gnome-base/gsettings-desktop-schemas >=app-text/gspell-1.2.0:= >=x11-libs/gtksourceview-4.0.2:4 >=dev-libs/libxml2-2.4.12:2 net-libs/libsoup:2.4 >=dev-libs/json-glib-1.2.0
 SLOT=0
 SRC_URI=mirror://gnome/sources/gtranslator/40/gtranslator-40.0.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=90cb094fcc1a81cc90518ea9bb952212
diff --git a/metadata/md5-cache/app-text/gv-3.7.3.90 b/metadata/md5-cache/app-text/gv-3.7.3.90
index f3ed4ef150d3..1e0510f34b81 100644
--- a/metadata/md5-cache/app-text/gv-3.7.3.90
+++ b/metadata/md5-cache/app-text/gv-3.7.3.90
@@ -4,11 +4,12 @@ DEPEND=app-text/ghostscript-gpl x11-libs/libICE x11-libs/libSM x11-libs/libX11 >
 DESCRIPTION=Viewer for PostScript and PDF documents using Ghostscript
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/gv/
+INHERIT=desktop
 IUSE=xinerama
 KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-3
 RDEPEND=app-text/ghostscript-gpl x11-libs/libICE x11-libs/libSM x11-libs/libX11 >=x11-libs/libXaw3d-1.6-r1[unicode] x11-libs/libXext x11-libs/libXmu x11-libs/libXpm x11-libs/libXt xinerama? ( x11-libs/libXinerama )
 SLOT=0
 SRC_URI=https://alpha.gnu.org/gnu/gv/gv-3.7.3.90.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa
 _md5_=0f12f614bf58bde8adb9fcb737a3b571
diff --git a/metadata/md5-cache/app-text/highlight-4.1 b/metadata/md5-cache/app-text/highlight-4.1
index 998dc4a40fca..af0ad03a1129 100644
--- a/metadata/md5-cache/app-text/highlight-4.1
+++ b/metadata/md5-cache/app-text/highlight-4.1
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=http://www.andre-simon.de/
 INHERIT=lua-single qmake-utils toolchain-funcs
 IUSE=examples qt5 lua_single_target_lua5-1 lua_single_target_lua5-3
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-3
 RDEPEND=lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 )
 REQUIRED_USE=^^ ( lua_single_target_lua5-1 lua_single_target_lua5-3 )
 SLOT=0
 SRC_URI=http://www.andre-simon.de/zip/highlight-4.1.tar.bz2
-_eclasses_=lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=67c024dec5b03b4fb67f12969067f891
+_eclasses_=lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	4fbbbc98f236f1b43acd99476bc3cd85	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=b520690529e63d3d90edd6b7f3cdb24f
diff --git a/metadata/md5-cache/app-text/hnb-1.9.18-r1 b/metadata/md5-cache/app-text/hnb-1.9.18-r1
index 7f44b3bcdaf2..756029487382 100644
--- a/metadata/md5-cache/app-text/hnb-1.9.18-r1
+++ b/metadata/md5-cache/app-text/hnb-1.9.18-r1
@@ -4,10 +4,11 @@ DEPEND=sys-libs/ncurses
 DESCRIPTION=A program to organize many kinds of data in one place
 EAPI=7
 HOMEPAGE=http://hnb.sourceforge.net/
+INHERIT=toolchain-funcs
 KEYWORDS=amd64 ppc ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-2
 RDEPEND=sys-libs/ncurses
 SLOT=0
 SRC_URI=http://hnb.sourceforge.net/.files/hnb-1.9.18.tar.gz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=d1c96c67cc89844261aba694f4813de9
diff --git a/metadata/md5-cache/app-text/html-xml-utils-7.7 b/metadata/md5-cache/app-text/html-xml-utils-7.7
index 3c05447a3c65..41890dc4cca2 100644
--- a/metadata/md5-cache/app-text/html-xml-utils-7.7
+++ b/metadata/md5-cache/app-text/html-xml-utils-7.7
@@ -3,6 +3,7 @@ DEPEND=net-misc/curl
 DESCRIPTION=A number of simple utilities for manipulating HTML and XML files
 EAPI=6
 HOMEPAGE=http://www.w3.org/Tools/HTML-XML-utils/
+INHERIT=multilib-minimal
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=amd64 ppc ppc64 x86 ~x86-linux ~ppc-macos
 LICENSE=W3C
@@ -10,5 +11,5 @@ RDEPEND=net-misc/curl
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.w3.org/Tools/HTML-XML-utils/html-xml-utils-7.7.tar.gz
-_eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=ca41a4203d2b3ddc596aa2e5b6d06bcf
diff --git a/metadata/md5-cache/app-text/html-xml-utils-7.8 b/metadata/md5-cache/app-text/html-xml-utils-7.8
index ab2d57ae2b7e..a4f81d8e66fb 100644
--- a/metadata/md5-cache/app-text/html-xml-utils-7.8
+++ b/metadata/md5-cache/app-text/html-xml-utils-7.8
@@ -3,6 +3,7 @@ DEPEND=net-misc/curl
 DESCRIPTION=A number of simple utilities for manipulating HTML and XML files
 EAPI=6
 HOMEPAGE=http://www.w3.org/Tools/HTML-XML-utils/
+INHERIT=multilib-minimal
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~x86-linux ~ppc-macos
 LICENSE=W3C
@@ -10,5 +11,5 @@ RDEPEND=net-misc/curl
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.w3.org/Tools/HTML-XML-utils/html-xml-utils-7.8.tar.gz
-_eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=6ea80f93be24f17275d78cc00a19b4d7
diff --git a/metadata/md5-cache/app-text/html2text-1.3.2a-r2 b/metadata/md5-cache/app-text/html2text-1.3.2a-r2
index c7a81ddd218a..b2c9c8b0c2d9 100644
--- a/metadata/md5-cache/app-text/html2text-1.3.2a-r2
+++ b/metadata/md5-cache/app-text/html2text-1.3.2a-r2
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile install prepare
 DESCRIPTION=HTML to text converter
 EAPI=7
 HOMEPAGE=http://www.mbayer.de/html2text/
+INHERIT=toolchain-funcs
 KEYWORDS=~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://www.mbayer.de/html2text/downloads/html2text-1.3.2a.tar.gz http://www.mbayer.de/html2text/downloads/patch-utf8-html2text-1.3.2a.diff http://www.mbayer.de/html2text/downloads/patch-amd64-html2text-1.3.2a.diff
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=bd15a6fa5f4f88ec9b5e9539cc85a909
diff --git a/metadata/md5-cache/app-text/html2text-2.0.0 b/metadata/md5-cache/app-text/html2text-2.0.0
deleted file mode 100644
index f317c2a671ad..000000000000
--- a/metadata/md5-cache/app-text/html2text-2.0.0
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DESCRIPTION=HTML to text converter
-EAPI=7
-HOMEPAGE=https://github.com/grobian/html2text
-KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=https://github.com/grobian/html2text/archive/v2.0.0.tar.gz -> html2text-2.0.0.tar.gz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=2ecea20d5f777ce571b44233a2274ef2
diff --git a/metadata/md5-cache/app-text/html2text-2.0.1 b/metadata/md5-cache/app-text/html2text-2.0.1
index 93ae3aebaf4b..bc9d36fa8204 100644
--- a/metadata/md5-cache/app-text/html2text-2.0.1
+++ b/metadata/md5-cache/app-text/html2text-2.0.1
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile configure install
 DESCRIPTION=HTML to text converter
 EAPI=7
 HOMEPAGE=https://github.com/grobian/html2text
+INHERIT=toolchain-funcs
 KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://github.com/grobian/html2text/archive/v2.0.1.tar.gz -> html2text-2.0.1.tar.gz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=f1390db91d1a4dfeca576c64087341a8
diff --git a/metadata/md5-cache/app-text/html2text-2.1.1 b/metadata/md5-cache/app-text/html2text-2.1.1
new file mode 100644
index 000000000000..45dc2febab4f
--- /dev/null
+++ b/metadata/md5-cache/app-text/html2text-2.1.1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile configure install
+DESCRIPTION=HTML to text converter
+EAPI=7
+HOMEPAGE=https://github.com/grobian/html2text
+INHERIT=toolchain-funcs
+KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=https://github.com/grobian/html2text/archive/v2.1.1.tar.gz -> html2text-2.1.1.tar.gz
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=c9e1c27350beb687c0eab2fd9802960f
diff --git a/metadata/md5-cache/app-text/html2text-9999 b/metadata/md5-cache/app-text/html2text-9999
index 078f75753033..837c0b2fc570 100644
--- a/metadata/md5-cache/app-text/html2text-9999
+++ b/metadata/md5-cache/app-text/html2text-9999
@@ -3,8 +3,9 @@ DEFINED_PHASES=compile configure install unpack
 DESCRIPTION=HTML to text converter
 EAPI=7
 HOMEPAGE=https://github.com/grobian/html2text
+INHERIT=toolchain-funcs git-r3
 LICENSE=GPL-2
 PROPERTIES=live
 SLOT=0
-_eclasses_=git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=f1390db91d1a4dfeca576c64087341a8
+_eclasses_=git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=c9e1c27350beb687c0eab2fd9802960f
diff --git a/metadata/md5-cache/app-text/htmldoc-1.9.11-r1 b/metadata/md5-cache/app-text/htmldoc-1.9.11-r1
index e03c637564c6..88fbd95ede0d 100644
--- a/metadata/md5-cache/app-text/htmldoc-1.9.11-r1
+++ b/metadata/md5-cache/app-text/htmldoc-1.9.11-r1
@@ -4,11 +4,12 @@ DEPEND=>=media-libs/libpng-1.4:0= sys-libs/zlib virtual/jpeg:0 ssl? ( net-libs/g
 DESCRIPTION=Convert HTML pages into a PDF document
 EAPI=7
 HOMEPAGE=https://www.msweet.org/htmldoc/
+INHERIT=autotools toolchain-funcs xdg
 IUSE=fltk ssl
 KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 sparc x86
 LICENSE=GPL-2
 RDEPEND=>=media-libs/libpng-1.4:0= sys-libs/zlib virtual/jpeg:0 ssl? ( net-libs/gnutls ) fltk? ( x11-libs/fltk:1 )
 SLOT=0
 SRC_URI=https://github.com/michaelrsweet/htmldoc/releases/download/v1.9.11/htmldoc-1.9.11-source.tar.gz
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=79224eee72d418ea9601080338c503df
diff --git a/metadata/md5-cache/app-text/htmlinc-1.0_beta1-r2 b/metadata/md5-cache/app-text/htmlinc-1.0_beta1-r2
index 3aa94e7da789..b600ae9332e5 100644
--- a/metadata/md5-cache/app-text/htmlinc-1.0_beta1-r2
+++ b/metadata/md5-cache/app-text/htmlinc-1.0_beta1-r2
@@ -2,9 +2,10 @@ DEFINED_PHASES=configure install
 DESCRIPTION=HTML Include System by Ulli Meybohm
 EAPI=7
 HOMEPAGE=http://www.meybohm.de/
+INHERIT=flag-o-matic toolchain-funcs
 KEYWORDS=amd64 ~ppc sparc x86 ~x86-linux ~ppc-macos
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://gentoo/htmlinc-1.0_beta1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=cf5957746c348b991f3e7b18221224be
diff --git a/metadata/md5-cache/app-text/htmlmin-0.1.12 b/metadata/md5-cache/app-text/htmlmin-0.1.12
index 024077ba97d5..1419dc7d52d8 100644
--- a/metadata/md5-cache/app-text/htmlmin-0.1.12
+++ b/metadata/md5-cache/app-text/htmlmin-0.1.12
@@ -11,5 +11,5 @@ RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=https://github.com/mankyd/htmlmin/archive/220b1d16442eb4b6fafed338ee3b61f698a01e63.tar.gz -> htmlmin-0.1.12.gh.tar.gz
-_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=160d6718c316280eecd37a9cb376c4cf
diff --git a/metadata/md5-cache/app-text/htmlmin-0.1.12-r1 b/metadata/md5-cache/app-text/htmlmin-0.1.12-r1
new file mode 100644
index 000000000000..08b0a54b18a7
--- /dev/null
+++ b/metadata/md5-cache/app-text/htmlmin-0.1.12-r1
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A configurable HTML Minifier with safety features
+EAPI=8
+HOMEPAGE=https://github.com/mankyd/htmlmin
+INHERIT=distutils-r1
+IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~riscv ~x86
+LICENSE=BSD
+RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+SLOT=0
+SRC_URI=https://github.com/mankyd/htmlmin/archive/220b1d16442eb4b6fafed338ee3b61f698a01e63.tar.gz -> htmlmin-0.1.12.gh.tar.gz
+_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=42b0bd3c1ec438392fff12e32703e262
diff --git a/metadata/md5-cache/app-text/htmlrecode-1.3.1-r1 b/metadata/md5-cache/app-text/htmlrecode-1.3.1-r1
index 07bae6ab8de6..dd2dff904cae 100644
--- a/metadata/md5-cache/app-text/htmlrecode-1.3.1-r1
+++ b/metadata/md5-cache/app-text/htmlrecode-1.3.1-r1
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile configure install prepare
 DESCRIPTION=Recodes HTML file using a new character set
 EAPI=7
 HOMEPAGE=https://bisqwit.iki.fi/source/htmlrecode.html
+INHERIT=toolchain-funcs
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://bisqwit.iki.fi/src/arch/htmlrecode-1.3.1.tar.bz2
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=557d4b8bef59093983249f080abefc12
diff --git a/metadata/md5-cache/app-text/htmltidy-5.8.0-r1 b/metadata/md5-cache/app-text/htmltidy-5.8.0-r1
index eec3a16f2a47..7f8ef9c7ce09 100644
--- a/metadata/md5-cache/app-text/htmltidy-5.8.0-r1
+++ b/metadata/md5-cache/app-text/htmltidy-5.8.0-r1
@@ -1,14 +1,14 @@
-BDEPEND=ruby_targets_ruby26? ( test? ( dev-ruby/thor[ruby_targets_ruby26(-)] dev-ruby/tty-editor[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/thor[ruby_targets_ruby27(-)] dev-ruby/tty-editor[ruby_targets_ruby27(-)] ) ) dev-util/ninja >=dev-util/cmake-3.20.5
+BDEPEND=ruby_targets_ruby26? ( test? ( dev-ruby/thor[ruby_targets_ruby26(-)] dev-ruby/tty-editor[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/thor[ruby_targets_ruby27(-)] dev-ruby/tty-editor[ruby_targets_ruby27(-)] ) ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare setup test unpack
 DESCRIPTION=Tidy the layout and correct errors in HTML and XML documents
 EAPI=7
 HOMEPAGE=https://www.html-tidy.org/
 INHERIT=cmake ruby-ng
 IUSE=deprecated test ruby_targets_ruby26 ruby_targets_ruby27
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=BSD
 RESTRICT=!test? ( test )
 SLOT=0/58
 SRC_URI=https://github.com/htacg/tidy-html5/archive/refs/tags/5.8.0.tar.gz -> htmltidy-5.8.0.tar.gz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	ruby-ng	e4c8836049bf65af19ab322fe5a81005	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=fc7797531d448f28b627e20575abd905
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=916979dccf380b5e8ee6aaf044a0eb36
diff --git a/metadata/md5-cache/app-text/htp-1.19 b/metadata/md5-cache/app-text/htp-1.19
index 972aa323d929..ffa5a62baa82 100644
--- a/metadata/md5-cache/app-text/htp-1.19
+++ b/metadata/md5-cache/app-text/htp-1.19
@@ -2,10 +2,11 @@ DEFINED_PHASES=compile install
 DESCRIPTION=An HTML preprocessor
 EAPI=6
 HOMEPAGE=http://htp.sourceforge.net/
+INHERIT=toolchain-funcs
 KEYWORDS=~alpha ~amd64 ~ppc ~sparc ~x86
 LICENSE=Clarified-Artistic
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/htp/htp-1.19.tar.gz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=f0d3778581b40aaa1f2f4016e18a0809
diff --git a/metadata/md5-cache/app-text/hunspell-1.7.0-r2 b/metadata/md5-cache/app-text/hunspell-1.7.0-r2
index d322f79f1311..88d0a17e369a 100644
--- a/metadata/md5-cache/app-text/hunspell-1.7.0-r2
+++ b/metadata/md5-cache/app-text/hunspell-1.7.0-r2
@@ -4,12 +4,13 @@ DEPEND=ncurses? ( sys-libs/ncurses:0= ) readline? ( sys-libs/readline:= )
 DESCRIPTION=Spell checker, morphological analyzer library and command-line tool
 EAPI=7
 HOMEPAGE=https://hunspell.github.io/
+INHERIT=autotools flag-o-matic
 IUSE=ncurses nls readline static-libs l10n_af l10n_bg l10n_ca l10n_cs l10n_cy l10n_da l10n_de l10n_de-1901 l10n_el l10n_en l10n_eo l10n_es l10n_et l10n_fo l10n_fr l10n_ga l10n_gl l10n_he l10n_hr l10n_hu l10n_ia l10n_id l10n_is l10n_it l10n_kk l10n_km l10n_ku l10n_lt l10n_lv l10n_mi l10n_mk l10n_ms l10n_nb l10n_nl l10n_nn l10n_pl l10n_pt l10n_pt-BR l10n_ro l10n_ru l10n_sk l10n_sl l10n_sq l10n_sv l10n_sw l10n_tn l10n_uk l10n_zu
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=MPL-1.1 GPL-2 LGPL-2.1
 PDEPEND=l10n_af? ( app-dicts/myspell-af ) l10n_bg? ( app-dicts/myspell-bg ) l10n_ca? ( app-dicts/myspell-ca ) l10n_cs? ( app-dicts/myspell-cs ) l10n_cy? ( app-dicts/myspell-cy ) l10n_da? ( app-dicts/myspell-da ) l10n_de? ( app-dicts/myspell-de ) l10n_de-1901? ( app-dicts/myspell-de_1901 ) l10n_el? ( app-dicts/myspell-el ) l10n_en? ( app-dicts/myspell-en ) l10n_eo? ( app-dicts/myspell-eo ) l10n_es? ( app-dicts/myspell-es ) l10n_et? ( app-dicts/myspell-et ) l10n_fo? ( app-dicts/myspell-fo ) l10n_fr? ( app-dicts/myspell-fr ) l10n_ga? ( app-dicts/myspell-ga ) l10n_gl? ( app-dicts/myspell-gl ) l10n_he? ( app-dicts/myspell-he ) l10n_hr? ( app-dicts/myspell-hr ) l10n_hu? ( app-dicts/myspell-hu ) l10n_ia? ( app-dicts/myspell-ia ) l10n_id? ( app-dicts/myspell-id ) l10n_is? ( app-dicts/myspell-is ) l10n_it? ( app-dicts/myspell-it ) l10n_kk? ( app-dicts/myspell-kk ) l10n_km? ( app-dicts/myspell-km ) l10n_ku? ( app-dicts/myspell-ku ) l10n_lt? ( app-dicts/myspell-lt ) l10n_lv? ( app-dicts/myspell-lv ) l10n_mi? ( app-dicts/myspell-mi ) l10n_mk? ( app-dicts/myspell-mk ) l10n_ms? ( app-dicts/myspell-ms ) l10n_nb? ( app-dicts/myspell-nb ) l10n_nl? ( app-dicts/myspell-nl ) l10n_nn? ( app-dicts/myspell-nn ) l10n_pl? ( app-dicts/myspell-pl ) l10n_pt? ( app-dicts/myspell-pt ) l10n_pt-BR? ( app-dicts/myspell-pt-br ) l10n_ro? ( app-dicts/myspell-ro ) l10n_ru? ( app-dicts/myspell-ru ) l10n_sk? ( app-dicts/myspell-sk ) l10n_sl? ( app-dicts/myspell-sl ) l10n_sq? ( app-dicts/myspell-sq ) l10n_sv? ( app-dicts/myspell-sv ) l10n_sw? ( app-dicts/myspell-sw ) l10n_tn? ( app-dicts/myspell-tn ) l10n_uk? ( app-dicts/myspell-uk ) l10n_zu? ( app-dicts/myspell-zu )
 RDEPEND=ncurses? ( sys-libs/ncurses:0= ) readline? ( sys-libs/readline:= )
 SLOT=0/1.7
 SRC_URI=https://github.com/hunspell/hunspell/archive/v1.7.0.tar.gz -> hunspell-1.7.0.tar.gz
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=a774cad6fe3feadef3c22c33ec46d7ff
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_md5_=eddfecb0e49e96a54387f624f307a08d
diff --git a/metadata/md5-cache/app-text/hyperestraier-1.4.13-r1 b/metadata/md5-cache/app-text/hyperestraier-1.4.13-r1
index 4c5e0cc938ed..dcf47fd1aa19 100644
--- a/metadata/md5-cache/app-text/hyperestraier-1.4.13-r1
+++ b/metadata/md5-cache/app-text/hyperestraier-1.4.13-r1
@@ -11,5 +11,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-db/qdbm bzip2? ( app-arch/bzip2 ) java? ( >=virtual/jre-1.8:* ) lzo? ( dev-libs/lzo ) mecab? ( app-text/mecab ) perl? ( dev-lang/perl ) ruby? ( ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ) zlib? ( sys-libs/zlib ) java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0
 SRC_URI=https://fallabs.com/hyperestraier/hyperestraier-1.4.13.tar.gz
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	estack	055c42df72f76a4f45ec92b35e83cd56	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-opt-2	a71433e535af8faae0c0f6c861a32054	java-utils-2	e38ea02d8ed864a74078ecf46aa06f30	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	ruby-ng	e4c8836049bf65af19ab322fe5a81005	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	estack	055c42df72f76a4f45ec92b35e83cd56	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-opt-2	a71433e535af8faae0c0f6c861a32054	java-utils-2	cfb5f6911bb70204c94ceafd0372c716	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	perl-functions	fea344a91ebf37efadf172c6a3de5a72	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=674e71f5d31b366857fe94fe62681378
diff --git a/metadata/md5-cache/app-text/iso-codes-4.10.0 b/metadata/md5-cache/app-text/iso-codes-4.10.0
new file mode 100644
index 000000000000..11f91e1911c1
--- /dev/null
+++ b/metadata/md5-cache/app-text/iso-codes-4.10.0
@@ -0,0 +1,13 @@
+BDEPEND=|| ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-lang/python-3.9.9-r1:3.9 >=dev-lang/python-3.8.12_p1-r1:3.8 ) sys-devel/gettext
+DEFINED_PHASES=prepare setup
+DESCRIPTION=ISO language, territory, currency, script codes and their translations
+EAPI=7
+HOMEPAGE=https://salsa.debian.org/iso-codes-team/iso-codes
+INHERIT=python-any-r1
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
+LICENSE=LGPL-2.1+
+RESTRICT=binchecks strip
+SLOT=0
+SRC_URI=https://salsa.debian.org/iso-codes-team/iso-codes/-/archive/v4.10.0/iso-codes-v4.10.0.tar.gz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=540a2e0d34017b6f045b98839f615ee5
diff --git a/metadata/md5-cache/app-text/iso-codes-4.9.0 b/metadata/md5-cache/app-text/iso-codes-4.9.0
index 7c1b212c6955..6935bc02017e 100644
--- a/metadata/md5-cache/app-text/iso-codes-4.9.0
+++ b/metadata/md5-cache/app-text/iso-codes-4.9.0
@@ -4,10 +4,10 @@ DESCRIPTION=ISO language, territory, currency, script codes and their translatio
 EAPI=7
 HOMEPAGE=https://salsa.debian.org/iso-codes-team/iso-codes
 INHERIT=python-any-r1
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
 LICENSE=LGPL-2.1+
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=https://salsa.debian.org/iso-codes-team/iso-codes/-/archive/v4.9.0/iso-codes-v4.9.0.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=2de0ce1ae36cf594e504cedcf27cb49a
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=6310e2dec9262f4d576f839d93b9739e
diff --git a/metadata/md5-cache/app-text/itex2mml-1.5.6 b/metadata/md5-cache/app-text/itex2mml-1.5.6
index 4f7b4703538e..8d5a21691414 100644
--- a/metadata/md5-cache/app-text/itex2mml-1.5.6
+++ b/metadata/md5-cache/app-text/itex2mml-1.5.6
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile install
 DESCRIPTION=A LaTeX into XHTML/MathML converter
 EAPI=6
 HOMEPAGE=https://golem.ph.utexas.edu/~distler/blog/itex2MML.html
+INHERIT=toolchain-funcs
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
 LICENSE=|| ( GPL-2+ MPL-1.1 LGPL-2+ )
 SLOT=0
 SRC_URI=https://golem.ph.utexas.edu/~distler/blog/files/itexToMML-1.5.6.tar.gz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=2292b121efaea40317620ae67757e4c2
diff --git a/metadata/md5-cache/app-text/jabref-2.10-r7 b/metadata/md5-cache/app-text/jabref-2.10-r7
deleted file mode 100644
index 8fc6bcdf19b2..000000000000
--- a/metadata/md5-cache/app-text/jabref-2.10-r7
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=>=virtual/jdk-1.8:* doc? ( dev-java/junit:0 ) test? ( dev-java/junit:0 ) 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 >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
-DESCRIPTION=Java GUI for managing BibTeX and other bibliographies
-EAPI=8
-HOMEPAGE=https://www.jabref.org/
-IDEPEND=dev-util/desktop-file-utils
-INHERIT=desktop java-pkg-2 java-ant-2 virtualx xdg-utils
-IUSE=doc test test
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=virtual/jre:1.8 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 >=dev-java/java-config-2.2.0-r3
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=mirror://sourceforge/jabref/JabRef-2.10-src.tar.bz2
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	e38ea02d8ed864a74078ecf46aa06f30	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=3b426005b0c8bc1ee8682f73efa6a844
diff --git a/metadata/md5-cache/app-text/jabref-bin-3.7 b/metadata/md5-cache/app-text/jabref-bin-3.7
index 36f88e287a37..c87501f14e9a 100644
--- a/metadata/md5-cache/app-text/jabref-bin-3.7
+++ b/metadata/md5-cache/app-text/jabref-bin-3.7
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/jre:1.8 >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=mirror://sourceforge/jabref/JabRef-3.7.jar
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	e38ea02d8ed864a74078ecf46aa06f30	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	28f0f3c0226306ec5f49e13bf851f171	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	cfb5f6911bb70204c94ceafd0372c716	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4fbbbc98f236f1b43acd99476bc3cd85	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=ea9f353b56a23e4bc6fd068d45433d05
diff --git a/metadata/md5-cache/app-text/jabref-bin-3.8 b/metadata/md5-cache/app-text/jabref-bin-3.8
index 02751d21d5b3..4f66c95f7041 100644
--- a/metadata/md5-cache/app-text/jabref-bin-3.8
+++ b/metadata/md5-cache/app-text/jabref-bin-3.8
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/jre:1.8 >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=https://github.com/JabRef/jabref/releases/download/v3.8/JabRef-3.8.jar
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	e38ea02d8ed864a74078ecf46aa06f30	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	28f0f3c0226306ec5f49e13bf851f171	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	cfb5f6911bb70204c94ceafd0372c716	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4fbbbc98f236f1b43acd99476bc3cd85	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=88752d03ac2b4159ce877412201aeb2e
diff --git a/metadata/md5-cache/app-text/jabref-bin-3.8.1 b/metadata/md5-cache/app-text/jabref-bin-3.8.1
index 8bf8617179e4..caecedc4e029 100644
--- a/metadata/md5-cache/app-text/jabref-bin-3.8.1
+++ b/metadata/md5-cache/app-text/jabref-bin-3.8.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/jre:1.8 >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=https://github.com/JabRef/jabref/releases/download/v3.8.1/JabRef-3.8.1.jar
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	e38ea02d8ed864a74078ecf46aa06f30	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	28f0f3c0226306ec5f49e13bf851f171	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	cfb5f6911bb70204c94ceafd0372c716	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4fbbbc98f236f1b43acd99476bc3cd85	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=d72626b76b2ba30f089041efb4ca2758
diff --git a/metadata/md5-cache/app-text/jabref-bin-3.8.2 b/metadata/md5-cache/app-text/jabref-bin-3.8.2
index 5974ae0f9541..4795806fed62 100644
--- a/metadata/md5-cache/app-text/jabref-bin-3.8.2
+++ b/metadata/md5-cache/app-text/jabref-bin-3.8.2
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=virtual/jre:1.8 >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=https://github.com/JabRef/jabref/releases/download/v3.8.2/JabRef-3.8.2.jar
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	e38ea02d8ed864a74078ecf46aa06f30	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	28f0f3c0226306ec5f49e13bf851f171	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	cfb5f6911bb70204c94ceafd0372c716	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4fbbbc98f236f1b43acd99476bc3cd85	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=ebe799138707ceeb42caff25cda1b992
diff --git a/metadata/md5-cache/app-text/jabref-bin-4.0 b/metadata/md5-cache/app-text/jabref-bin-4.0
index 011ace06cbb0..913081d8f521 100644
--- a/metadata/md5-cache/app-text/jabref-bin-4.0
+++ b/metadata/md5-cache/app-text/jabref-bin-4.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=dev-java/openjdk:8[javafx] virtual/jre:1.8 >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=https://github.com/JabRef/jabref/releases/download/v4.0/JabRef-4.0.jar
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	e38ea02d8ed864a74078ecf46aa06f30	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	28f0f3c0226306ec5f49e13bf851f171	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	cfb5f6911bb70204c94ceafd0372c716	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4fbbbc98f236f1b43acd99476bc3cd85	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=365cea59e062e6f5e4483e27a5137e7c
diff --git a/metadata/md5-cache/app-text/jabref-bin-4.1 b/metadata/md5-cache/app-text/jabref-bin-4.1
index 580d898b8c75..6d2810f3146f 100644
--- a/metadata/md5-cache/app-text/jabref-bin-4.1
+++ b/metadata/md5-cache/app-text/jabref-bin-4.1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=dev-java/openjdk:8[javafx] virtual/jre:1.8 >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=https://github.com/JabRef/jabref/releases/download/v4.1/JabRef-4.1.jar
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	e38ea02d8ed864a74078ecf46aa06f30	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	28f0f3c0226306ec5f49e13bf851f171	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	cfb5f6911bb70204c94ceafd0372c716	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4fbbbc98f236f1b43acd99476bc3cd85	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=365cea59e062e6f5e4483e27a5137e7c
diff --git a/metadata/md5-cache/app-text/jabref-bin-4.3.1 b/metadata/md5-cache/app-text/jabref-bin-4.3.1
index 8951a6b2c380..9b437a22f467 100644
--- a/metadata/md5-cache/app-text/jabref-bin-4.3.1
+++ b/metadata/md5-cache/app-text/jabref-bin-4.3.1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=dev-java/openjdk:8[javafx] virtual/jre:1.8 >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=https://github.com/JabRef/jabref/releases/download/v4.3.1/JabRef-4.3.1.jar
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	e38ea02d8ed864a74078ecf46aa06f30	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	28f0f3c0226306ec5f49e13bf851f171	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	cfb5f6911bb70204c94ceafd0372c716	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4fbbbc98f236f1b43acd99476bc3cd85	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=365cea59e062e6f5e4483e27a5137e7c
diff --git a/metadata/md5-cache/app-text/jabref-bin-4.9999 b/metadata/md5-cache/app-text/jabref-bin-4.9999
index c8b226de3c6c..96b74e6b3b54 100644
--- a/metadata/md5-cache/app-text/jabref-bin-4.9999
+++ b/metadata/md5-cache/app-text/jabref-bin-4.9999
@@ -8,5 +8,5 @@ LICENSE=MIT
 PROPERTIES=live
 RDEPEND=dev-java/openjdk:8[javafx] virtual/jre:1.8 >=dev-java/java-config-2.2.0-r3
 SLOT=0
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	e38ea02d8ed864a74078ecf46aa06f30	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	28f0f3c0226306ec5f49e13bf851f171	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	cfb5f6911bb70204c94ceafd0372c716	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4fbbbc98f236f1b43acd99476bc3cd85	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=0100f580fbfed76f32ae5d3d58c65555
diff --git a/metadata/md5-cache/app-text/jo-1.4 b/metadata/md5-cache/app-text/jo-1.4
index 7ae8be68d651..909895e52784 100644
--- a/metadata/md5-cache/app-text/jo-1.4
+++ b/metadata/md5-cache/app-text/jo-1.4
@@ -2,9 +2,10 @@ DEFINED_PHASES=configure install
 DESCRIPTION=JSON output from a shell
 EAPI=7
 HOMEPAGE=https://github.com/jpmens/jo
+INHERIT=bash-completion-r1
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/jpmens/jo/releases/download/1.4/jo-1.4.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=d13ead9bdc666a45bab65221a3947eea
diff --git a/metadata/md5-cache/app-text/jo-99999 b/metadata/md5-cache/app-text/jo-99999
index 1959e26faf71..031eb21f37a5 100644
--- a/metadata/md5-cache/app-text/jo-99999
+++ b/metadata/md5-cache/app-text/jo-99999
@@ -3,8 +3,9 @@ DEFINED_PHASES=configure install prepare unpack
 DESCRIPTION=JSON output from a shell
 EAPI=7
 HOMEPAGE=https://github.com/jpmens/jo
+INHERIT=autotools bash-completion-r1 git-r3
 LICENSE=MIT
 PROPERTIES=live
 SLOT=0
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=30dea3e40b9cf898e75b6239da1cd168
diff --git a/metadata/md5-cache/app-text/katarakt-0.2 b/metadata/md5-cache/app-text/katarakt-0.2
index d529f1e4cda0..d50f6c740120 100644
--- a/metadata/md5-cache/app-text/katarakt-0.2
+++ b/metadata/md5-cache/app-text/katarakt-0.2
@@ -10,5 +10,5 @@ LICENSE=BSD-2
 RDEPEND=app-text/poppler:=[qt5] dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5
 SLOT=0
 SRC_URI=https://gitlab.cs.fau.de/Qui_Sum/katarakt/-/archive/v0.2/katarakt-v0.2.tar.gz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=4a4ab07e0fa0513c876bca41b83c1661
diff --git a/metadata/md5-cache/app-text/kbibtex-0.9.2 b/metadata/md5-cache/app-text/kbibtex-0.9.2
index 0267c8451f08..5b2a231abb14 100644
--- a/metadata/md5-cache/app-text/kbibtex-0.9.2
+++ b/metadata/md5-cache/app-text/kbibtex-0.9.2
@@ -1,4 +1,4 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 handbook? ( >=kde-frameworks/kdoctools-5.60.0:5 ) >=kde-frameworks/extra-cmake-modules-5.60.0:5
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 handbook? ( >=kde-frameworks/kdoctools-5.60.0:5 ) >=kde-frameworks/extra-cmake-modules-5.60.0:5
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
 DEPEND=app-text/poppler[qt5] dev-libs/icu:= >=dev-qt/qtconcurrent-5.12.3:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=dev-qt/qtxmlpatterns-5.12.3:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kitemviews-5.60.0:5 >=kde-frameworks/kjobwidgets-5.60.0:5 >=kde-frameworks/kparts-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/ktexteditor-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-frameworks/kwallet-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 virtual/tex-base webengine? ( >=dev-qt/qtwebengine-5.12.3:5[widgets] ) zotero? ( app-crypt/qca[qt5(+)] dev-libs/qoauth:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
 DESCRIPTION=BibTeX editor to edit bibliographies used with LaTeX
@@ -12,5 +12,5 @@ RDEPEND=app-text/poppler[qt5] dev-libs/icu:= >=dev-qt/qtconcurrent-5.12.3:5 >=de
 RESTRICT=!test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/KBibTeX/0.9.2/kbibtex-0.9.2.tar.xz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	4f2cef3496909640f9114c853d2077b4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	ecm	542fb4c59adc3702f566140a9bdf49f8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	virtualx	975d49ff3b3f451efe7a95f230532135	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=afd6c1850b0f28945cbdafb1a2a5555e
diff --git a/metadata/md5-cache/app-text/kchmviewer-8.0 b/metadata/md5-cache/app-text/kchmviewer-8.0
index 8d34e199ccb8..262790797584 100644
--- a/metadata/md5-cache/app-text/kchmviewer-8.0
+++ b/metadata/md5-cache/app-text/kchmviewer-8.0
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=dev-libs/chmlib dev-libs/libzip:= dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtwebengine:5[widgets] dev-qt/qtwidgets:5 dev-qt/qtxml:5
 SLOT=0
 SRC_URI=https://github.com/gyunaev/kchmviewer/archive/refs/tags/RELEASE_8_0.tar.gz -> kchmviewer-8.0.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	multilib	4fbbbc98f236f1b43acd99476bc3cd85	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=8572aa065e4d4bd5c0d54a92b0fc73e7
diff --git a/metadata/md5-cache/app-text/kjots-5.1.0-r2 b/metadata/md5-cache/app-text/kjots-5.1.0-r2
index 203f21784848..130314a63c2e 100644
--- a/metadata/md5-cache/app-text/kjots-5.1.0-r2
+++ b/metadata/md5-cache/app-text/kjots-5.1.0-r2
@@ -1,4 +1,4 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 >=kde-frameworks/extra-cmake-modules-5.82.0:5
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 >=kde-frameworks/extra-cmake-modules-5.82.0:5
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
 DEPEND=dev-libs/grantlee:5 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtwidgets-5.15.2: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[speech(+)=] >=kde-frameworks/kbookmarks-5.82.0:5 >=kde-frameworks/kcmutils-5.82.0:5 >=kde-frameworks/kconfig-5.82.0:5 >=kde-frameworks/kconfigwidgets-5.82.0:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/ki18n-5.82.0:5 >=kde-frameworks/kio-5.82.0:5 >=kde-frameworks/kitemmodels-5.82.0:5 >=kde-frameworks/kparts-5.82.0:5 >=kde-frameworks/kwidgetsaddons-5.82.0:5 >=kde-frameworks/kxmlgui-5.82.0:5 dev-qt/qtcore:5
 DESCRIPTION=Note taking utility by KDE
@@ -11,5 +11,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/grantlee:5 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtwidgets-5.15.2: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[speech(+)=] >=kde-frameworks/kbookmarks-5.82.0:5 >=kde-frameworks/kcmutils-5.82.0:5 >=kde-frameworks/kconfig-5.82.0:5 >=kde-frameworks/kconfigwidgets-5.82.0:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/ki18n-5.82.0:5 >=kde-frameworks/kio-5.82.0:5 >=kde-frameworks/kitemmodels-5.82.0:5 >=kde-frameworks/kparts-5.82.0:5 >=kde-frameworks/kwidgetsaddons-5.82.0:5 >=kde-frameworks/kxmlgui-5.82.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/kjots/5.1.0/src/kjots-5.1.0.tar.xz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	4f2cef3496909640f9114c853d2077b4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=5323d089314c24784ffa9b9361a5ce24
diff --git a/metadata/md5-cache/app-text/kramdown-rfc-1.6.11 b/metadata/md5-cache/app-text/kramdown-rfc-1.6.11
new file mode 100644
index 000000000000..c98ae532652c
--- /dev/null
+++ b/metadata/md5-cache/app-text/kramdown-rfc-1.6.11
@@ -0,0 +1,17 @@
+BDEPEND=test? ( ruby_targets_ruby26? ( >=dev-ruby/certified-1.0.0[ruby_targets_ruby26(-)] >=dev-ruby/json-2.0.0[ruby_targets_ruby26(-)] >=dev-ruby/kramdown-2.4.0[ruby_targets_ruby26(-)] >=dev-ruby/kramdown-parser-gfm-1.1.0[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/certified-1.0.0[ruby_targets_ruby27(-)] >=dev-ruby/json-2.0.0[ruby_targets_ruby27(-)] >=dev-ruby/kramdown-2.4.0[ruby_targets_ruby27(-)] >=dev-ruby/kramdown-parser-gfm-1.1.0[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+DESCRIPTION=An XML2RFC (RFC799x) backend for Thomas Leitner's kramdown markdown parser
+EAPI=8
+HOMEPAGE=https://github.com/cabo/kramdown-rfc
+INHERIT=ruby-fakegem
+IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 doc test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby26? ( >=dev-ruby/certified-1.0.0[ruby_targets_ruby26(-)] >=dev-ruby/json-2.0.0[ruby_targets_ruby26(-)] >=dev-ruby/kramdown-2.4.0[ruby_targets_ruby26(-)] >=dev-ruby/kramdown-parser-gfm-1.1.0[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/certified-1.0.0[ruby_targets_ruby27(-)] >=dev-ruby/json-2.0.0[ruby_targets_ruby27(-)] >=dev-ruby/kramdown-2.4.0[ruby_targets_ruby27(-)] >=dev-ruby/kramdown-parser-gfm-1.1.0[ruby_targets_ruby27(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://rubygems.org/gems/kramdown-rfc2629-1.6.11.gem
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=cbde43d24bfb15bc4878687bbe072bb4
diff --git a/metadata/md5-cache/app-text/kramdown-rfc-1.6.5 b/metadata/md5-cache/app-text/kramdown-rfc-1.6.5
index 18942e375d52..e017660d82a5 100644
--- a/metadata/md5-cache/app-text/kramdown-rfc-1.6.5
+++ b/metadata/md5-cache/app-text/kramdown-rfc-1.6.5
@@ -4,6 +4,7 @@ DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lan
 DESCRIPTION=An XML2RFC (RFC799x) backend for Thomas Leitner's kramdown markdown parser
 EAPI=8
 HOMEPAGE=https://github.com/cabo/kramdown-rfc
+INHERIT=ruby-fakegem
 IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 doc test
 KEYWORDS=~amd64
 LICENSE=MIT
@@ -12,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/kramdown-rfc-1.6.5.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	ruby-fakegem	242ae0c7650b40198870ae311dc6bea0	ruby-ng	e4c8836049bf65af19ab322fe5a81005	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=b174daa83cdea55f4b77ba82ec980ec2
diff --git a/metadata/md5-cache/app-text/krop-0.6.0-r1 b/metadata/md5-cache/app-text/krop-0.6.0-r1
index b0b6778843fd..21a1add63157 100644
--- a/metadata/md5-cache/app-text/krop-0.6.0-r1
+++ b/metadata/md5-cache/app-text/krop-0.6.0-r1
@@ -11,5 +11,5 @@ RDEPEND=dev-python/python-poppler-qt5[python_targets_python3_8(-)?,python_target
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/arminstraub/krop/archive/v0.6.0.tar.gz -> krop-0.6.0.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	distutils-r1	10a93585889c3ca7651cbcd2ee831e47	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=72ef59a64abbdc3f1a9e404e1b403a04
diff --git a/metadata/md5-cache/app-text/krop-9999 b/metadata/md5-cache/app-text/krop-9999
index 930b1ff2fd94..43581dac45fc 100644
--- a/metadata/md5-cache/app-text/krop-9999
+++ b/metadata/md5-cache/app-text/krop-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=dev-python/python-poppler-qt5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/PyPDF2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/PyQt5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,gui,widgets] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	distutils-r1	10a93585889c3ca7651cbcd2ee831e47	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=d0d8824c802680073f7efabbc19eecdd
diff --git a/metadata/md5-cache/app-text/languagetool-5.4 b/metadata/md5-cache/app-text/languagetool-5.4
index 430af654f86e..765e42564a23 100644
--- a/metadata/md5-cache/app-text/languagetool-5.4
+++ b/metadata/md5-cache/app-text/languagetool-5.4
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.8 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/hamcrest-core:1.3 dev-java/jcommander:0 dev-java/jna:4 dev-java/slf4j-api:0 >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=https://www.languagetool.org/download/LanguageTool-5.4.zip
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	e38ea02d8ed864a74078ecf46aa06f30	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	cfb5f6911bb70204c94ceafd0372c716	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=7a0a5e045ba2b218e36316fdff669fc0
diff --git a/metadata/md5-cache/app-text/lcdf-typetools-2.108-r1 b/metadata/md5-cache/app-text/lcdf-typetools-2.108-r1
index a5e0cae41087..75c8b5dbbda7 100644
--- a/metadata/md5-cache/app-text/lcdf-typetools-2.108-r1
+++ b/metadata/md5-cache/app-text/lcdf-typetools-2.108-r1
@@ -4,11 +4,12 @@ DEPEND=kpathsea? ( virtual/tex-base dev-libs/kpathsea:= )
 DESCRIPTION=Font utilities for eg manipulating OTF
 EAPI=7
 HOMEPAGE=https://lcdf.org/type/#typetools
+INHERIT=toolchain-funcs flag-o-matic
 IUSE=+kpathsea
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=kpathsea? ( virtual/tex-base dev-libs/kpathsea:= )
 SLOT=0
 SRC_URI=https://lcdf.org/type/lcdf-typetools-2.108.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=7c346d19ac07ec1b7bd612388fe00f3e
diff --git a/metadata/md5-cache/app-text/lesspipe-1.91 b/metadata/md5-cache/app-text/lesspipe-1.91
deleted file mode 100644
index e2feeb555df9..000000000000
--- a/metadata/md5-cache/app-text/lesspipe-1.91
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare test
-DEPEND=dev-lang/perl
-DESCRIPTION=A preprocessor for less
-EAPI=7
-HOMEPAGE=https://github.com/wofr06/lesspipe
-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
-LICENSE=GPL-2
-RDEPEND=dev-lang/perl
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/wofr06/lesspipe/archive/1.91.tar.gz -> lesspipe-1.91.tar.gz
-_md5_=19cf35c983fade15faa4ea5c8ee1ec16
diff --git a/metadata/md5-cache/app-text/lesspipe-2.04-r1 b/metadata/md5-cache/app-text/lesspipe-2.04-r1
deleted file mode 100644
index c2ba3d3d5c7a..000000000000
--- a/metadata/md5-cache/app-text/lesspipe-2.04-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=dev-lang/perl
-DEFINED_PHASES=compile configure install preinst
-DESCRIPTION=A preprocessor for less
-EAPI=7
-HOMEPAGE=https://github.com/wofr06/lesspipe
-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
-LICENSE=GPL-2
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/wofr06/lesspipe/archive/v2.04.tar.gz -> lesspipe-2.04.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=6db14d2410827b914b390a848ad6e632
diff --git a/metadata/md5-cache/app-text/lesspipe-2.05 b/metadata/md5-cache/app-text/lesspipe-2.05
index a4570175ea7c..0638f86c25e3 100644
--- a/metadata/md5-cache/app-text/lesspipe-2.05
+++ b/metadata/md5-cache/app-text/lesspipe-2.05
@@ -3,10 +3,11 @@ DEFINED_PHASES=compile configure install preinst
 DESCRIPTION=A preprocessor for less
 EAPI=7
 HOMEPAGE=https://github.com/wofr06/lesspipe
-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
+INHERIT=bash-completion-r1
+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
 LICENSE=GPL-2
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/wofr06/lesspipe/archive/v2.05.tar.gz -> lesspipe-2.05.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=6db14d2410827b914b390a848ad6e632
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=170b55c94fbf28d3f21c76964f0eeb10
diff --git a/metadata/md5-cache/app-text/letterize-1.4 b/metadata/md5-cache/app-text/letterize-1.4
index d8368fdcbc53..299777bcea5f 100644
--- a/metadata/md5-cache/app-text/letterize-1.4
+++ b/metadata/md5-cache/app-text/letterize-1.4
@@ -2,9 +2,10 @@ DEFINED_PHASES=configure install
 DESCRIPTION=Generate English-plausible alphabetic mnemonics for a phone number
 EAPI=7
 HOMEPAGE=http://www.catb.org/~esr/letterize/
+INHERIT=toolchain-funcs
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=http://www.catb.org/~esr/letterize/letterize-1.4.tar.gz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=a24c4a8824fe2f85c2936cfc2dd1b3d5
diff --git a/metadata/md5-cache/app-text/libabw-0.1.3 b/metadata/md5-cache/app-text/libabw-0.1.3
index 640160386a4c..3e55247837dd 100644
--- a/metadata/md5-cache/app-text/libabw-0.1.3
+++ b/metadata/md5-cache/app-text/libabw-0.1.3
@@ -4,11 +4,12 @@ DEPEND=dev-libs/librevenge dev-libs/libxml2 sys-libs/zlib >=dev-libs/boost-1.46
 DESCRIPTION=Library parsing abiword documents
 EAPI=7
 HOMEPAGE=https://wiki.documentfoundation.org/DLP/Libraries/libabw
+INHERIT=flag-o-matic
 IUSE=doc static-libs
 KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
 LICENSE=MPL-2.0
 RDEPEND=dev-libs/librevenge dev-libs/libxml2 sys-libs/zlib
 SLOT=0
 SRC_URI=https://dev-www.libreoffice.org/src/libabw/libabw-0.1.3.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=4722443ad07376b4e9c3705bf370e716
diff --git a/metadata/md5-cache/app-text/libebook-0.1.3-r2 b/metadata/md5-cache/app-text/libebook-0.1.3-r2
index deb78b3159c6..47c6e942cdba 100644
--- a/metadata/md5-cache/app-text/libebook-0.1.3-r2
+++ b/metadata/md5-cache/app-text/libebook-0.1.3-r2
@@ -4,6 +4,7 @@ DEPEND=app-text/liblangtag dev-libs/icu:= dev-libs/librevenge dev-libs/libxml2 s
 DESCRIPTION=Library parsing various ebook formats
 EAPI=7
 HOMEPAGE=https://sourceforge.net/projects/libebook/
+INHERIT=autotools flag-o-matic
 IUSE=doc test tools
 KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
 LICENSE=MPL-2.0
@@ -11,5 +12,5 @@ RDEPEND=app-text/liblangtag dev-libs/icu:= dev-libs/librevenge dev-libs/libxml2
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/libebook/libe-book-0.1.3.tar.bz2
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=4faf0fa5f277252be0f53e10181b3aa4
diff --git a/metadata/md5-cache/app-text/libepubgen-0.1.1 b/metadata/md5-cache/app-text/libepubgen-0.1.1-r1
index 8953124e6c3c..f89a13465ac7 100644
--- a/metadata/md5-cache/app-text/libepubgen-0.1.1
+++ b/metadata/md5-cache/app-text/libepubgen-0.1.1-r1
@@ -1,7 +1,8 @@
+BDEPEND=virtual/pkgconfig doc? ( app-doc/doxygen )
 DEFINED_PHASES=configure install
-DEPEND=dev-libs/librevenge dev-libs/boost virtual/pkgconfig doc? ( app-doc/doxygen ) test? ( dev-util/cppunit dev-libs/libxml2:2 )
+DEPEND=dev-libs/librevenge dev-libs/boost test? ( dev-util/cppunit dev-libs/libxml2:2 )
 DESCRIPTION=EPUB generator for librevenge
-EAPI=6
+EAPI=8
 HOMEPAGE=https://sourceforge.net/projects/libepubgen/
 IUSE=debug doc test
 KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
@@ -10,4 +11,4 @@ RDEPEND=dev-libs/librevenge
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/libepubgen/libepubgen-0.1.1.tar.xz
-_md5_=cf7aae8eb46bbda7a7d3767e0972465e
+_md5_=ac1f7da09a07b7d2d736ceb50a14f0b2
diff --git a/metadata/md5-cache/app-text/libetonyek-0.1.10 b/metadata/md5-cache/app-text/libetonyek-0.1.10
deleted file mode 100644
index ab828e8849a1..000000000000
--- a/metadata/md5-cache/app-text/libetonyek-0.1.10
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig doc? ( app-doc/doxygen )
-DEFINED_PHASES=configure install prepare
-DEPEND=app-text/liblangtag dev-libs/librevenge dev-libs/libxml2 >=dev-util/mdds-1.5:1/1.5 sys-libs/zlib dev-libs/boost media-libs/glm sys-devel/libtool test? ( dev-util/cppunit )
-DESCRIPTION=Library parsing Apple Keynote presentations
-EAPI=7
-HOMEPAGE=https://wiki.documentfoundation.org/DLP/Libraries/libetonyek
-IUSE=doc static-libs test
-KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
-LICENSE=|| ( GPL-2+ LGPL-2.1 MPL-1.1 )
-RDEPEND=app-text/liblangtag dev-libs/librevenge dev-libs/libxml2 >=dev-util/mdds-1.5:1/1.5 sys-libs/zlib
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://dev-www.libreoffice.org/src/libetonyek/libetonyek-0.1.10.tar.xz
-_md5_=486326ec7b8ae6799253fd1e8688d35b
diff --git a/metadata/md5-cache/app-text/libetonyek-0.1.10-r1 b/metadata/md5-cache/app-text/libetonyek-0.1.10-r1
index 1d950f4bc884..51701b0ad911 100644
--- a/metadata/md5-cache/app-text/libetonyek-0.1.10-r1
+++ b/metadata/md5-cache/app-text/libetonyek-0.1.10-r1
@@ -5,10 +5,10 @@ DESCRIPTION=Library parsing Apple Keynote presentations
 EAPI=8
 HOMEPAGE=https://wiki.documentfoundation.org/DLP/Libraries/libetonyek
 IUSE=doc static-libs test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
 LICENSE=|| ( GPL-2+ LGPL-2.1 MPL-1.1 )
 RDEPEND=app-text/liblangtag dev-libs/librevenge dev-libs/libxml2 >=dev-util/mdds-2.0:1= sys-libs/zlib
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://dev-www.libreoffice.org/src/libetonyek/libetonyek-0.1.10.tar.xz
-_md5_=d500423a4bb1683b4676f7ad7679b437
+_md5_=eae603cef28249440c8aceba11628109
diff --git a/metadata/md5-cache/app-text/libetonyek-9999 b/metadata/md5-cache/app-text/libetonyek-9999
index 33bedd4a2dbb..77830a5817ee 100644
--- a/metadata/md5-cache/app-text/libetonyek-9999
+++ b/metadata/md5-cache/app-text/libetonyek-9999
@@ -4,11 +4,12 @@ DEPEND=app-text/liblangtag dev-libs/librevenge dev-libs/libxml2 dev-util/mdds:1/
 DESCRIPTION=Library parsing Apple Keynote presentations
 EAPI=8
 HOMEPAGE=https://wiki.documentfoundation.org/DLP/Libraries/libetonyek
+INHERIT=autotools git-r3
 IUSE=doc static-libs test
 LICENSE=|| ( GPL-2+ LGPL-2.1 MPL-1.1 )
 PROPERTIES=live
 RDEPEND=app-text/liblangtag dev-libs/librevenge dev-libs/libxml2 dev-util/mdds:1/2.0 sys-libs/zlib
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=8a75183984e0e0c7893e8b3d9b59cd07
diff --git a/metadata/md5-cache/app-text/libgepub-0.6.0 b/metadata/md5-cache/app-text/libgepub-0.6.0
index fe9e87bd71c8..64da2b25e935 100644
--- a/metadata/md5-cache/app-text/libgepub-0.6.0
+++ b/metadata/md5-cache/app-text/libgepub-0.6.0
@@ -11,5 +11,5 @@ LICENSE=LGPL-2+
 RDEPEND=app-arch/libarchive dev-libs/glib:2 dev-libs/libxml2 net-libs/libsoup:2.4 net-libs/webkit-gtk:4 x11-libs/gtk+:3 introspection? ( >=dev-libs/gobject-introspection-1.30:= )
 SLOT=0
 SRC_URI=mirror://gnome/sources/libgepub/0.6/libgepub-0.6.0.tar.xz
-_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=ef756aee3a2c04835a31f8ad18ebdb33
diff --git a/metadata/md5-cache/app-text/libgxps-0.3.2 b/metadata/md5-cache/app-text/libgxps-0.3.2
index 481889d39c3f..1d78bcf6c62c 100644
--- a/metadata/md5-cache/app-text/libgxps-0.3.2
+++ b/metadata/md5-cache/app-text/libgxps-0.3.2
@@ -12,5 +12,5 @@ RDEPEND=>=app-arch/libarchive-2.8 >=dev-libs/glib-2.36:2 media-libs/freetype:2 m
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnome/sources/libgxps/0.3/libgxps-0.3.2.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=fd4b1cd53b59e20ddfcf312e3f5a934c
diff --git a/metadata/md5-cache/app-text/libmspub-0.1.4 b/metadata/md5-cache/app-text/libmspub-0.1.4
index 21f15d7e74fa..bf0875003af5 100644
--- a/metadata/md5-cache/app-text/libmspub-0.1.4
+++ b/metadata/md5-cache/app-text/libmspub-0.1.4
@@ -4,11 +4,12 @@ DEPEND=dev-libs/icu:= dev-libs/librevenge sys-libs/zlib dev-libs/boost sys-devel
 DESCRIPTION=Library parsing Microsoft Publisher documents
 EAPI=7
 HOMEPAGE=https://wiki.documentfoundation.org/DLP/Libraries/libmspub
+INHERIT=autotools flag-o-matic
 IUSE=doc static-libs
 KEYWORDS=amd64 ~arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86
 LICENSE=LGPL-2.1
 RDEPEND=dev-libs/icu:= dev-libs/librevenge sys-libs/zlib
 SLOT=0
 SRC_URI=https://dev-www.libreoffice.org/src/libmspub/libmspub-0.1.4.tar.xz
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=a2557929cfc62410a914390cea677d7c
diff --git a/metadata/md5-cache/app-text/libmspub-9999 b/metadata/md5-cache/app-text/libmspub-9999
index 114fbbd1ebbd..fc824de139e9 100644
--- a/metadata/md5-cache/app-text/libmspub-9999
+++ b/metadata/md5-cache/app-text/libmspub-9999
@@ -4,10 +4,11 @@ DEPEND=dev-libs/icu:= dev-libs/librevenge sys-libs/zlib dev-libs/boost sys-devel
 DESCRIPTION=Library parsing Microsoft Publisher documents
 EAPI=7
 HOMEPAGE=https://wiki.documentfoundation.org/DLP/Libraries/libmspub
+INHERIT=autotools flag-o-matic git-r3
 IUSE=doc static-libs
 LICENSE=LGPL-2.1
 PROPERTIES=live
 RDEPEND=dev-libs/icu:= dev-libs/librevenge sys-libs/zlib
 SLOT=0
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=c025a5fc62d0924eb3bc433afaa9dca9
diff --git a/metadata/md5-cache/app-text/libmwaw-0.3.21 b/metadata/md5-cache/app-text/libmwaw-0.3.21
index 6832cc6fe845..ad74bc6d8984 100644
--- a/metadata/md5-cache/app-text/libmwaw-0.3.21
+++ b/metadata/md5-cache/app-text/libmwaw-0.3.21
@@ -4,11 +4,12 @@ DEPEND=dev-libs/librevenge sys-libs/zlib
 DESCRIPTION=Library parsing many pre-OSX MAC text formats
 EAPI=8
 HOMEPAGE=https://sourceforge.net/p/libmwaw/wiki/Home/
+INHERIT=autotools
 IUSE=doc tools
 KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
 LICENSE=LGPL-2.1
 RDEPEND=dev-libs/librevenge sys-libs/zlib
 SLOT=0
 SRC_URI=mirror://sourceforge/libmwaw/libmwaw-0.3.21.tar.xz
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=204faa41f72c59c64e2fe8b2d3fb9fa0
diff --git a/metadata/md5-cache/app-text/libmwaw-9999 b/metadata/md5-cache/app-text/libmwaw-9999
index 4dc725aa1c1f..94376a448946 100644
--- a/metadata/md5-cache/app-text/libmwaw-9999
+++ b/metadata/md5-cache/app-text/libmwaw-9999
@@ -4,10 +4,11 @@ DEPEND=dev-libs/librevenge sys-libs/zlib
 DESCRIPTION=Library parsing many pre-OSX MAC text formats
 EAPI=8
 HOMEPAGE=https://sourceforge.net/p/libmwaw/wiki/Home/
+INHERIT=autotools git-r3
 IUSE=doc tools
 LICENSE=LGPL-2.1
 PROPERTIES=live
 RDEPEND=dev-libs/librevenge sys-libs/zlib
 SLOT=0
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=26500878995727ba1607296e2ba789d5
diff --git a/metadata/md5-cache/app-text/libnumbertext-1.0.10 b/metadata/md5-cache/app-text/libnumbertext-1.0.10
index 5f5806391dea..93b9dbbc4e40 100644
--- a/metadata/md5-cache/app-text/libnumbertext-1.0.10
+++ b/metadata/md5-cache/app-text/libnumbertext-1.0.10
@@ -2,8 +2,8 @@ DEFINED_PHASES=configure install
 DESCRIPTION=Number to number name and money text conversion libraries
 EAPI=8
 HOMEPAGE=https://github.com/Numbertext/libnumbertext
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=LGPL-3+
 SLOT=0
 SRC_URI=https://github.com/Numbertext/libnumbertext/releases/download/1.0.10/libnumbertext-1.0.10.tar.xz
-_md5_=a0d3d7176fa0d524d4bfde41f33083e4
+_md5_=710ed8652f242ffd3a38337c197ec978
diff --git a/metadata/md5-cache/app-text/libnumbertext-1.0.8 b/metadata/md5-cache/app-text/libnumbertext-1.0.8
deleted file mode 100644
index 2c9527005fc4..000000000000
--- a/metadata/md5-cache/app-text/libnumbertext-1.0.8
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=configure install
-DESCRIPTION=Number to number name and money text conversion libraries
-EAPI=8
-HOMEPAGE=https://github.com/Numbertext/libnumbertext
-KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
-LICENSE=LGPL-3+
-SLOT=0
-SRC_URI=https://github.com/Numbertext/libnumbertext/releases/download/1.0.8/libnumbertext-1.0.8.tar.xz
-_md5_=710ed8652f242ffd3a38337c197ec978
diff --git a/metadata/md5-cache/app-text/libodfgen-9999 b/metadata/md5-cache/app-text/libodfgen-9999
index ea193b4d5d54..2c9a7ad8cdf0 100644
--- a/metadata/md5-cache/app-text/libodfgen-9999
+++ b/metadata/md5-cache/app-text/libodfgen-9999
@@ -4,10 +4,11 @@ DEPEND=dev-libs/librevenge dev-libs/libxml2:2
 DESCRIPTION=Library to generate ODF documents from libwpd and libwpg
 EAPI=7
 HOMEPAGE=http://libwpd.sourceforge.net/
+INHERIT=autotools git-r3
 IUSE=doc
 LICENSE=|| ( LGPL-2.1 MPL-2.0 )
 PROPERTIES=live
 RDEPEND=dev-libs/librevenge dev-libs/libxml2:2
 SLOT=0
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=0d225d8ac71bb4962e506a040ef1bb24
diff --git a/metadata/md5-cache/app-text/libpaper-1.1.28 b/metadata/md5-cache/app-text/libpaper-1.1.28
index 0ca0bf467aff..36895c87df3e 100644
--- a/metadata/md5-cache/app-text/libpaper-1.1.28
+++ b/metadata/md5-cache/app-text/libpaper-1.1.28
@@ -3,10 +3,11 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Library for handling paper characteristics
 EAPI=7
 HOMEPAGE=https://packages.debian.org/unstable/source/libpaper
+INHERIT=autotools multilib-minimal
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-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 ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://debian/pool/main/libp/libpaper/libpaper_1.1.28.tar.gz
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=f497f3503167581dfb86a38b31f1f53a
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=67038ecda83683d643047c21fc75900f
diff --git a/metadata/md5-cache/app-text/libspectre-0.2.10 b/metadata/md5-cache/app-text/libspectre-0.2.10
index 474e54476d4a..de58006fd9cb 100644
--- a/metadata/md5-cache/app-text/libspectre-0.2.10
+++ b/metadata/md5-cache/app-text/libspectre-0.2.10
@@ -5,10 +5,10 @@ DESCRIPTION=Library for rendering Postscript documents
 EAPI=8
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/libspectre
 IUSE=debug doc
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x64-solaris
 LICENSE=GPL-2
 RDEPEND=>=app-text/ghostscript-gpl-9.53.0:=
 RESTRICT=test
 SLOT=0
 SRC_URI=https://libspectre.freedesktop.org/releases/libspectre-0.2.10.tar.gz
-_md5_=24994f80ceac5847347c4f7a05cd1006
+_md5_=7d0d54df6f2252834605e48d4be3196f
diff --git a/metadata/md5-cache/app-text/libspectre-0.2.9 b/metadata/md5-cache/app-text/libspectre-0.2.9
index dc42c2b398c0..5ecf5f474323 100644
--- a/metadata/md5-cache/app-text/libspectre-0.2.9
+++ b/metadata/md5-cache/app-text/libspectre-0.2.9
@@ -4,6 +4,7 @@ DEPEND=>=app-text/ghostscript-gpl-9.24:=
 DESCRIPTION=Library for rendering Postscript documents
 EAPI=7
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/libspectre
+INHERIT=autotools
 IUSE=debug doc
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x64-solaris
 LICENSE=GPL-2
@@ -11,5 +12,5 @@ RDEPEND=>=app-text/ghostscript-gpl-9.24:=
 RESTRICT=test
 SLOT=0
 SRC_URI=https://libspectre.freedesktop.org/releases/libspectre-0.2.9.tar.gz
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=a3e4b2702e43e312f959ea7135010328
diff --git a/metadata/md5-cache/app-text/libstaroffice-9999 b/metadata/md5-cache/app-text/libstaroffice-9999
index cd9260a34a50..65c4555fa6b3 100644
--- a/metadata/md5-cache/app-text/libstaroffice-9999
+++ b/metadata/md5-cache/app-text/libstaroffice-9999
@@ -4,10 +4,11 @@ DEPEND=dev-libs/librevenge zlib? ( sys-libs/zlib )
 DESCRIPTION=Import filter for old StarOffice documents
 EAPI=7
 HOMEPAGE=https://github.com/fosnola/libstaroffice
+INHERIT=git-r3 autotools
 IUSE=debug doc tools +zlib
 LICENSE=|| ( LGPL-2.1+ MPL-2.0 )
 PROPERTIES=live
 RDEPEND=dev-libs/librevenge zlib? ( sys-libs/zlib )
 SLOT=0
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=7a37f37a180e1e07aaf12b0fcb910a7f
diff --git a/metadata/md5-cache/app-text/libxmlpatch-0.3.3 b/metadata/md5-cache/app-text/libxmlpatch-0.3.3
index 6276208cbc5f..33ff3cad992d 100644
--- a/metadata/md5-cache/app-text/libxmlpatch-0.3.3
+++ b/metadata/md5-cache/app-text/libxmlpatch-0.3.3
@@ -4,6 +4,7 @@ DEPEND=dev-libs/glib:2 dev-libs/libxml2 test? ( dev-libs/check )
 DESCRIPTION=A set of tools to create and apply patch to XML files using XPath
 EAPI=7
 HOMEPAGE=http://xmlpatch.sourceforge.net/
+INHERIT=autotools
 IUSE=test
 KEYWORDS=~amd64
 LICENSE=LGPL-2.1
@@ -11,5 +12,5 @@ RDEPEND=dev-libs/glib:2 dev-libs/libxml2
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/xmlpatch/libxmlpatch-0.3.3.tar.gz
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=dfb1bd0b5983501c2728797465e486d1
diff --git a/metadata/md5-cache/app-text/linuxdoc-tools-0.9.73-r1 b/metadata/md5-cache/app-text/linuxdoc-tools-0.9.73-r1
index 6b70587feea2..4e21a0cf3687 100644
--- a/metadata/md5-cache/app-text/linuxdoc-tools-0.9.73-r1
+++ b/metadata/md5-cache/app-text/linuxdoc-tools-0.9.73-r1
@@ -4,11 +4,12 @@ DEPEND=|| ( app-text/openjade app-text/opensp ) app-text/sgml-common dev-lang/pe
 DESCRIPTION=A toolset for processing LinuxDoc DTD SGML files
 EAPI=7
 HOMEPAGE=https://gitlab.com/agmartin/linuxdoc-tools
+INHERIT=autotools latex-package perl-functions sgml-catalog-r1 toolchain-funcs
 IUSE=doc
 KEYWORDS=amd64 ~ia64 ppc ~sparc x86
 LICENSE=GPL-3+ MIT SGMLUG
 RDEPEND=|| ( app-text/openjade app-text/opensp ) app-text/sgml-common dev-lang/perl:= sys-apps/groff virtual/latex-base >=app-text/sgml-common-0.6.3-r7
 SLOT=0
 SRC_URI=https://gitlab.com/agmartin/linuxdoc-tools/-/archive/0.9.73/linuxdoc-tools-0.9.73.tar.gz
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	latex-package	c20e442c3953c765f636630631c96194	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	sgml-catalog-r1	5d1d74baed1e6235b9a698917e954236	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	latex-package	c20e442c3953c765f636630631c96194	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	perl-functions	fea344a91ebf37efadf172c6a3de5a72	sgml-catalog-r1	5d1d74baed1e6235b9a698917e954236	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=66c0c6261850b64fa14be1a728a2ad31
diff --git a/metadata/md5-cache/app-text/llpp-33 b/metadata/md5-cache/app-text/llpp-33
index d0608b3db782..b9e0d3dfb4f6 100644
--- a/metadata/md5-cache/app-text/llpp-33
+++ b/metadata/md5-cache/app-text/llpp-33
@@ -4,6 +4,7 @@ DEPEND=>=app-text/mupdf-1.17.0:0= app-arch/bzip2 media-libs/fontconfig:1.0 media
 DESCRIPTION=Graphical PDF viewer which aims to superficially resemble less(1)
 EAPI=7
 HOMEPAGE=https://github.com/moosotc/llpp
+INHERIT=toolchain-funcs xdg
 IUSE=+ocamlopt
 KEYWORDS=amd64 ~ppc x86
 LICENSE=public-domain
@@ -11,5 +12,5 @@ RDEPEND=>=app-text/mupdf-1.17.0:0= app-arch/bzip2 media-libs/fontconfig:1.0 medi
 RESTRICT=!ocamlopt? ( strip )
 SLOT=0
 SRC_URI=https://github.com/moosotc/llpp/archive/v33.tar.gz -> llpp-33.tar.gz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=537fae251231dddca0857518de18bf78
diff --git a/metadata/md5-cache/app-text/lowdown-0.11.1-r1 b/metadata/md5-cache/app-text/lowdown-0.11.1-r1
index 09af79ea73b3..3b3ae84fe2c7 100644
--- a/metadata/md5-cache/app-text/lowdown-0.11.1-r1
+++ b/metadata/md5-cache/app-text/lowdown-0.11.1-r1
@@ -3,10 +3,11 @@ DEPEND=virtual/libcrypt:=
 DESCRIPTION=Markdown translator producing HTML5, roff documents in the ms and man formats
 EAPI=8
 HOMEPAGE=https://kristaps.bsd.lv/lowdown/
+INHERIT=toolchain-funcs flag-o-matic
 KEYWORDS=~amd64 ~x86
 LICENSE=ISC
 RDEPEND=virtual/libcrypt:=
 SLOT=0
 SRC_URI=https://github.com/kristapsdz/lowdown/archive/refs/tags/VERSION_0_11_1.tar.gz -> lowdown-0.11.1.tar.gz
-_eclasses_=flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=b3eff9d693d1666bd4947fede0497a4d
diff --git a/metadata/md5-cache/app-text/lowdown-0.11.2 b/metadata/md5-cache/app-text/lowdown-0.11.2
index f85940a54af3..7b635ea7d7ad 100644
--- a/metadata/md5-cache/app-text/lowdown-0.11.2
+++ b/metadata/md5-cache/app-text/lowdown-0.11.2
@@ -3,10 +3,11 @@ DEPEND=virtual/libcrypt:=
 DESCRIPTION=Markdown translator producing HTML5, roff documents in the ms and man formats
 EAPI=8
 HOMEPAGE=https://kristaps.bsd.lv/lowdown/
-KEYWORDS=~amd64 ~x86
+INHERIT=toolchain-funcs flag-o-matic
+KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=ISC
 RDEPEND=virtual/libcrypt:=
 SLOT=0
 SRC_URI=https://github.com/kristapsdz/lowdown/archive/refs/tags/VERSION_0_11_2.tar.gz -> lowdown-0.11.2.tar.gz
-_eclasses_=flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=b3eff9d693d1666bd4947fede0497a4d
+_eclasses_=flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=de103ab5d418afb31b3372018e0fe64f
diff --git a/metadata/md5-cache/app-text/lv-4.51-r4 b/metadata/md5-cache/app-text/lv-4.51-r4
index 65869b4b64f7..c69975c716ba 100644
--- a/metadata/md5-cache/app-text/lv-4.51-r4
+++ b/metadata/md5-cache/app-text/lv-4.51-r4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!app-editors/levee sys-libs/ncurses:0=
 SLOT=0
 SRC_URI=mirror://gentoo/lv451.tar.gz
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	28f0f3c0226306ec5f49e13bf851f171	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4fbbbc98f236f1b43acd99476bc3cd85	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=79a970379df6fbf7b5a0fa2ab9805510
diff --git a/metadata/md5-cache/app-text/lv-4.51-r5 b/metadata/md5-cache/app-text/lv-4.51-r5
index bae807c6fbef..4f9963e6a784 100644
--- a/metadata/md5-cache/app-text/lv-4.51-r5
+++ b/metadata/md5-cache/app-text/lv-4.51-r5
@@ -4,10 +4,11 @@ DEPEND=!app-editors/levee sys-libs/ncurses:0=
 DESCRIPTION=Powerful Multilingual File Viewer
 EAPI=8
 HOMEPAGE=https://github.com/ttdoda/lv
+INHERIT=autotools toolchain-funcs
 KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-2
 RDEPEND=!app-editors/levee sys-libs/ncurses:0=
 SLOT=0
 SRC_URI=mirror://gentoo/lv451.tar.gz
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=1753ef57c88f49f430c3c6d43ab44800
diff --git a/metadata/md5-cache/app-text/mandoc-1.14.6 b/metadata/md5-cache/app-text/mandoc-1.14.6
index fcf1509aa4e7..0d8be753b563 100644
--- a/metadata/md5-cache/app-text/mandoc-1.14.6
+++ b/metadata/md5-cache/app-text/mandoc-1.14.6
@@ -4,11 +4,12 @@ DEPEND=sys-libs/zlib system-man? ( !sys-apps/man-db ) cgi? ( sys-libs/zlib[stati
 DESCRIPTION=Suite of tools compiling mdoc and man
 EAPI=7
 HOMEPAGE=https://mdocml.bsd.lv/
+INHERIT=toolchain-funcs
 IUSE=cgi system-man
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=ISC
 RDEPEND=sys-libs/zlib system-man? ( !sys-apps/man-db )
 SLOT=0
 SRC_URI=https://mdocml.bsd.lv/snapshots/mandoc-1.14.6.tar.gz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=b3b4dc0cb955d439816433f0654e31ee
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=df9b3fa89e28722ccc8434aa2e33e4e3
diff --git a/metadata/md5-cache/app-text/manpager-1 b/metadata/md5-cache/app-text/manpager-1
index 165b736a3120..0e13a50ac479 100644
--- a/metadata/md5-cache/app-text/manpager-1
+++ b/metadata/md5-cache/app-text/manpager-1
@@ -2,8 +2,9 @@ DEFINED_PHASES=compile install
 DESCRIPTION=Enable colorization of man pages
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
+INHERIT=toolchain-funcs
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 SLOT=0
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=8d854dd35cc46a3a0eb8215b8efa5a09
diff --git a/metadata/md5-cache/app-text/master-pdf-editor-5.7.90 b/metadata/md5-cache/app-text/master-pdf-editor-5.7.90
index a1ebe0bbf18a..b2cde08a0f64 100644
--- a/metadata/md5-cache/app-text/master-pdf-editor-5.7.90
+++ b/metadata/md5-cache/app-text/master-pdf-editor-5.7.90
@@ -3,11 +3,12 @@ DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=A complete solution for viewing and editing PDF files
 EAPI=7
 HOMEPAGE=https://code-industry.net/free-pdf-editor/
+INHERIT=desktop xdg
 KEYWORDS=~amd64
 LICENSE=master-pdf-editor
 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
 RESTRICT=mirror
 SLOT=0
 SRC_URI=https://code-industry.net/public/master-pdf-editor-5.7.90-qt5.x86_64.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=2d3ce1fd5ac00e4cfb6173e86061bf6b
diff --git a/metadata/md5-cache/app-text/master-pdf-editor-5.8.33 b/metadata/md5-cache/app-text/master-pdf-editor-5.8.33
index d67244c30f8d..ade35ed564db 100644
--- a/metadata/md5-cache/app-text/master-pdf-editor-5.8.33
+++ b/metadata/md5-cache/app-text/master-pdf-editor-5.8.33
@@ -2,11 +2,12 @@ DEFINED_PHASES=install postinst postrm preinst
 DESCRIPTION=A complete solution for viewing and editing PDF files
 EAPI=8
 HOMEPAGE=https://code-industry.net/free-pdf-editor/
+INHERIT=desktop xdg
 KEYWORDS=~amd64
 LICENSE=master-pdf-editor
 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
 RESTRICT=mirror
 SLOT=0
 SRC_URI=https://code-industry.net/public/master-pdf-editor-5.8.33-qt5.x86_64.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=0ded33fa595f3a7c8cdbcee15e39ecaa
diff --git a/metadata/md5-cache/app-text/master-pdf-editor-5.8.52 b/metadata/md5-cache/app-text/master-pdf-editor-5.8.52
index 63f65c3b77d8..9ef3b6eda3b2 100644
--- a/metadata/md5-cache/app-text/master-pdf-editor-5.8.52
+++ b/metadata/md5-cache/app-text/master-pdf-editor-5.8.52
@@ -9,5 +9,5 @@ RDEPEND=sys-libs/glibc >=dev-qt/qtcore-5.12.9:5 >=dev-qt/qtgui-5.12.9:5 >=dev-qt
 RESTRICT=mirror
 SLOT=0
 SRC_URI=https://code-industry.net/public/master-pdf-editor-5.8.52-qt5.x86_64.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=0ded33fa595f3a7c8cdbcee15e39ecaa
diff --git a/metadata/md5-cache/app-text/mathtex-1.05 b/metadata/md5-cache/app-text/mathtex-1.05
index e2b1b0a73523..0225f1351465 100644
--- a/metadata/md5-cache/app-text/mathtex-1.05
+++ b/metadata/md5-cache/app-text/mathtex-1.05
@@ -3,11 +3,12 @@ DEFINED_PHASES=compile install postinst
 DESCRIPTION=Lets you easily embed LaTeX math in your own html pages, blogs, wikis, etc
 EAPI=8
 HOMEPAGE=https://www.ctan.org/pkg/mathtex
+INHERIT=toolchain-funcs
 IUSE=png
 KEYWORDS=amd64 ~riscv x86
 LICENSE=GPL-3
 RDEPEND=app-text/dvipng virtual/latex-base
 SLOT=0
 SRC_URI=https://mirrors.ctan.org/support/mathtex.zip -> mathtex-1.05.zip
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=338550f399859d29aea935e38ac7b89f
diff --git a/metadata/md5-cache/app-text/mdbook-0.4.15 b/metadata/md5-cache/app-text/mdbook-0.4.15
deleted file mode 100644
index 350ebacc32fd..000000000000
--- a/metadata/md5-cache/app-text/mdbook-0.4.15
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=>=virtual/rust-1.53
-DEFINED_PHASES=compile configure install test unpack
-DESCRIPTION=Create a book from markdown files
-EAPI=8
-HOMEPAGE=https://rust-lang.github.io/mdBook/
-INHERIT=cargo toolchain-funcs
-IUSE=doc debug
-KEYWORDS=amd64 ~arm64 ~x86
-LICENSE=Apache-2.0 BSD CC-BY-4.0 CC0-1.0 ISC MIT MPL-2.0 OFL-1.1
-SLOT=0
-SRC_URI=https://github.com/rust-lang/mdBook/archive/refs/tags/v0.4.15.tar.gz -> mdbook-0.4.15.tar.gz https://crates.io/api/v1/crates/aho-corasick/0.7.18/download -> aho-corasick-0.7.18.crate https://crates.io/api/v1/crates/ammonia/3.1.2/download -> ammonia-3.1.2.crate https://crates.io/api/v1/crates/ansi_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/anyhow/1.0.43/download -> anyhow-1.0.43.crate https://crates.io/api/v1/crates/assert_cmd/1.0.7/download -> assert_cmd-1.0.7.crate https://crates.io/api/v1/crates/atty/0.2.14/download -> atty-0.2.14.crate https://crates.io/api/v1/crates/autocfg/1.0.1/download -> autocfg-1.0.1.crate https://crates.io/api/v1/crates/base64/0.13.0/download -> base64-0.13.0.crate https://crates.io/api/v1/crates/bit-set/0.5.2/download -> bit-set-0.5.2.crate https://crates.io/api/v1/crates/bit-vec/0.6.3/download -> bit-vec-0.6.3.crate https://crates.io/api/v1/crates/bitflags/1.3.2/download -> bitflags-1.3.2.crate https://crates.io/api/v1/crates/block-buffer/0.7.3/download -> block-buffer-0.7.3.crate https://crates.io/api/v1/crates/block-buffer/0.9.0/download -> block-buffer-0.9.0.crate https://crates.io/api/v1/crates/block-padding/0.1.5/download -> block-padding-0.1.5.crate https://crates.io/api/v1/crates/bstr/0.2.17/download -> bstr-0.2.17.crate https://crates.io/api/v1/crates/byte-tools/0.3.1/download -> byte-tools-0.3.1.crate https://crates.io/api/v1/crates/byteorder/1.4.3/download -> byteorder-1.4.3.crate https://crates.io/api/v1/crates/bytes/1.0.1/download -> bytes-1.0.1.crate https://crates.io/api/v1/crates/cfg-if/0.1.10/download -> cfg-if-0.1.10.crate https://crates.io/api/v1/crates/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/chrono/0.4.19/download -> chrono-0.4.19.crate https://crates.io/api/v1/crates/clap/2.33.3/download -> clap-2.33.3.crate https://crates.io/api/v1/crates/cpufeatures/0.1.5/download -> cpufeatures-0.1.5.crate https://crates.io/api/v1/crates/ctor/0.1.20/download -> ctor-0.1.20.crate https://crates.io/api/v1/crates/difference/2.0.0/download -> difference-2.0.0.crate https://crates.io/api/v1/crates/difflib/0.4.0/download -> difflib-0.4.0.crate https://crates.io/api/v1/crates/digest/0.8.1/download -> digest-0.8.1.crate https://crates.io/api/v1/crates/digest/0.9.0/download -> digest-0.9.0.crate https://crates.io/api/v1/crates/doc-comment/0.3.3/download -> doc-comment-0.3.3.crate https://crates.io/api/v1/crates/either/1.6.1/download -> either-1.6.1.crate https://crates.io/api/v1/crates/elasticlunr-rs/2.3.13/download -> elasticlunr-rs-2.3.13.crate https://crates.io/api/v1/crates/env_logger/0.7.1/download -> env_logger-0.7.1.crate https://crates.io/api/v1/crates/fake-simd/0.1.2/download -> fake-simd-0.1.2.crate https://crates.io/api/v1/crates/filetime/0.2.15/download -> filetime-0.2.15.crate https://crates.io/api/v1/crates/float-cmp/0.9.0/download -> float-cmp-0.9.0.crate https://crates.io/api/v1/crates/fnv/1.0.7/download -> fnv-1.0.7.crate https://crates.io/api/v1/crates/form_urlencoded/1.0.1/download -> form_urlencoded-1.0.1.crate https://crates.io/api/v1/crates/fsevent/0.4.0/download -> fsevent-0.4.0.crate https://crates.io/api/v1/crates/fsevent-sys/2.0.1/download -> fsevent-sys-2.0.1.crate https://crates.io/api/v1/crates/fuchsia-zircon/0.3.3/download -> fuchsia-zircon-0.3.3.crate https://crates.io/api/v1/crates/fuchsia-zircon-sys/0.3.3/download -> fuchsia-zircon-sys-0.3.3.crate https://crates.io/api/v1/crates/futf/0.1.4/download -> futf-0.1.4.crate https://crates.io/api/v1/crates/futures/0.3.16/download -> futures-0.3.16.crate https://crates.io/api/v1/crates/futures-channel/0.3.16/download -> futures-channel-0.3.16.crate https://crates.io/api/v1/crates/futures-core/0.3.16/download -> futures-core-0.3.16.crate https://crates.io/api/v1/crates/futures-io/0.3.16/download -> futures-io-0.3.16.crate https://crates.io/api/v1/crates/futures-macro/0.3.16/download -> futures-macro-0.3.16.crate https://crates.io/api/v1/crates/futures-sink/0.3.16/download -> futures-sink-0.3.16.crate https://crates.io/api/v1/crates/futures-task/0.3.16/download -> futures-task-0.3.16.crate https://crates.io/api/v1/crates/futures-util/0.3.16/download -> futures-util-0.3.16.crate https://crates.io/api/v1/crates/generic-array/0.12.4/download -> generic-array-0.12.4.crate https://crates.io/api/v1/crates/generic-array/0.14.4/download -> generic-array-0.14.4.crate https://crates.io/api/v1/crates/getopts/0.2.21/download -> getopts-0.2.21.crate https://crates.io/api/v1/crates/getrandom/0.1.16/download -> getrandom-0.1.16.crate https://crates.io/api/v1/crates/getrandom/0.2.3/download -> getrandom-0.2.3.crate https://crates.io/api/v1/crates/gitignore/1.0.7/download -> gitignore-1.0.7.crate https://crates.io/api/v1/crates/glob/0.3.0/download -> glob-0.3.0.crate https://crates.io/api/v1/crates/h2/0.3.4/download -> h2-0.3.4.crate https://crates.io/api/v1/crates/handlebars/4.1.2/download -> handlebars-4.1.2.crate https://crates.io/api/v1/crates/hashbrown/0.11.2/download -> hashbrown-0.11.2.crate https://crates.io/api/v1/crates/headers/0.3.4/download -> headers-0.3.4.crate https://crates.io/api/v1/crates/headers-core/0.2.0/download -> headers-core-0.2.0.crate https://crates.io/api/v1/crates/heck/0.3.3/download -> heck-0.3.3.crate https://crates.io/api/v1/crates/hermit-abi/0.1.19/download -> hermit-abi-0.1.19.crate https://crates.io/api/v1/crates/html5ever/0.25.1/download -> html5ever-0.25.1.crate https://crates.io/api/v1/crates/http/0.2.4/download -> http-0.2.4.crate https://crates.io/api/v1/crates/http-body/0.4.3/download -> http-body-0.4.3.crate https://crates.io/api/v1/crates/httparse/1.5.1/download -> httparse-1.5.1.crate https://crates.io/api/v1/crates/httpdate/1.0.1/download -> httpdate-1.0.1.crate https://crates.io/api/v1/crates/humantime/1.3.0/download -> humantime-1.3.0.crate https://crates.io/api/v1/crates/hyper/0.14.11/download -> hyper-0.14.11.crate https://crates.io/api/v1/crates/idna/0.2.3/download -> idna-0.2.3.crate https://crates.io/api/v1/crates/indexmap/1.7.0/download -> indexmap-1.7.0.crate https://crates.io/api/v1/crates/inotify/0.7.1/download -> inotify-0.7.1.crate https://crates.io/api/v1/crates/inotify-sys/0.1.5/download -> inotify-sys-0.1.5.crate https://crates.io/api/v1/crates/input_buffer/0.4.0/download -> input_buffer-0.4.0.crate https://crates.io/api/v1/crates/iovec/0.1.4/download -> iovec-0.1.4.crate https://crates.io/api/v1/crates/itertools/0.10.1/download -> itertools-0.10.1.crate https://crates.io/api/v1/crates/itoa/0.4.8/download -> itoa-0.4.8.crate https://crates.io/api/v1/crates/kernel32-sys/0.2.2/download -> kernel32-sys-0.2.2.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/lazycell/1.3.0/download -> lazycell-1.3.0.crate https://crates.io/api/v1/crates/libc/0.2.100/download -> libc-0.2.100.crate https://crates.io/api/v1/crates/log/0.4.14/download -> log-0.4.14.crate https://crates.io/api/v1/crates/mac/0.1.1/download -> mac-0.1.1.crate https://crates.io/api/v1/crates/maplit/1.0.2/download -> maplit-1.0.2.crate https://crates.io/api/v1/crates/markup5ever/0.10.1/download -> markup5ever-0.10.1.crate https://crates.io/api/v1/crates/markup5ever_rcdom/0.1.0/download -> markup5ever_rcdom-0.1.0.crate https://crates.io/api/v1/crates/matches/0.1.9/download -> matches-0.1.9.crate https://crates.io/api/v1/crates/memchr/2.4.1/download -> memchr-2.4.1.crate https://crates.io/api/v1/crates/mime/0.3.16/download -> mime-0.3.16.crate https://crates.io/api/v1/crates/mime_guess/2.0.3/download -> mime_guess-2.0.3.crate https://crates.io/api/v1/crates/mio/0.6.23/download -> mio-0.6.23.crate https://crates.io/api/v1/crates/mio/0.7.13/download -> mio-0.7.13.crate https://crates.io/api/v1/crates/mio-extras/2.0.6/download -> mio-extras-2.0.6.crate https://crates.io/api/v1/crates/miow/0.2.2/download -> miow-0.2.2.crate https://crates.io/api/v1/crates/miow/0.3.7/download -> miow-0.3.7.crate https://crates.io/api/v1/crates/net2/0.2.37/download -> net2-0.2.37.crate https://crates.io/api/v1/crates/new_debug_unreachable/1.0.4/download -> new_debug_unreachable-1.0.4.crate https://crates.io/api/v1/crates/normalize-line-endings/0.3.0/download -> normalize-line-endings-0.3.0.crate https://crates.io/api/v1/crates/notify/4.0.17/download -> notify-4.0.17.crate https://crates.io/api/v1/crates/ntapi/0.3.6/download -> ntapi-0.3.6.crate https://crates.io/api/v1/crates/num-integer/0.1.44/download -> num-integer-0.1.44.crate https://crates.io/api/v1/crates/num-traits/0.2.14/download -> num-traits-0.2.14.crate https://crates.io/api/v1/crates/num_cpus/1.13.0/download -> num_cpus-1.13.0.crate https://crates.io/api/v1/crates/opaque-debug/0.2.3/download -> opaque-debug-0.2.3.crate https://crates.io/api/v1/crates/opaque-debug/0.3.0/download -> opaque-debug-0.3.0.crate https://crates.io/api/v1/crates/opener/0.5.0/download -> opener-0.5.0.crate https://crates.io/api/v1/crates/output_vt100/0.1.2/download -> output_vt100-0.1.2.crate https://crates.io/api/v1/crates/percent-encoding/2.1.0/download -> percent-encoding-2.1.0.crate https://crates.io/api/v1/crates/pest/2.1.3/download -> pest-2.1.3.crate https://crates.io/api/v1/crates/pest_derive/2.1.0/download -> pest_derive-2.1.0.crate https://crates.io/api/v1/crates/pest_generator/2.1.3/download -> pest_generator-2.1.3.crate https://crates.io/api/v1/crates/pest_meta/2.1.3/download -> pest_meta-2.1.3.crate https://crates.io/api/v1/crates/phf/0.8.0/download -> phf-0.8.0.crate https://crates.io/api/v1/crates/phf_codegen/0.8.0/download -> phf_codegen-0.8.0.crate https://crates.io/api/v1/crates/phf_generator/0.8.0/download -> phf_generator-0.8.0.crate https://crates.io/api/v1/crates/phf_shared/0.8.0/download -> phf_shared-0.8.0.crate https://crates.io/api/v1/crates/pin-project/1.0.8/download -> pin-project-1.0.8.crate https://crates.io/api/v1/crates/pin-project-internal/1.0.8/download -> pin-project-internal-1.0.8.crate https://crates.io/api/v1/crates/pin-project-lite/0.2.7/download -> pin-project-lite-0.2.7.crate https://crates.io/api/v1/crates/pin-utils/0.1.0/download -> pin-utils-0.1.0.crate https://crates.io/api/v1/crates/ppv-lite86/0.2.10/download -> ppv-lite86-0.2.10.crate https://crates.io/api/v1/crates/precomputed-hash/0.1.1/download -> precomputed-hash-0.1.1.crate https://crates.io/api/v1/crates/predicates/2.0.1/download -> predicates-2.0.1.crate https://crates.io/api/v1/crates/predicates-core/1.0.2/download -> predicates-core-1.0.2.crate https://crates.io/api/v1/crates/predicates-tree/1.0.2/download -> predicates-tree-1.0.2.crate https://crates.io/api/v1/crates/pretty_assertions/0.6.1/download -> pretty_assertions-0.6.1.crate https://crates.io/api/v1/crates/proc-macro-hack/0.5.19/download -> proc-macro-hack-0.5.19.crate https://crates.io/api/v1/crates/proc-macro-nested/0.1.7/download -> proc-macro-nested-0.1.7.crate https://crates.io/api/v1/crates/proc-macro2/1.0.28/download -> proc-macro2-1.0.28.crate https://crates.io/api/v1/crates/pulldown-cmark/0.9.0/download -> pulldown-cmark-0.9.0.crate https://crates.io/api/v1/crates/quick-error/1.2.3/download -> quick-error-1.2.3.crate https://crates.io/api/v1/crates/quick-error/2.0.1/download -> quick-error-2.0.1.crate https://crates.io/api/v1/crates/quote/1.0.9/download -> quote-1.0.9.crate https://crates.io/api/v1/crates/rand/0.7.3/download -> rand-0.7.3.crate https://crates.io/api/v1/crates/rand/0.8.4/download -> rand-0.8.4.crate https://crates.io/api/v1/crates/rand_chacha/0.2.2/download -> rand_chacha-0.2.2.crate https://crates.io/api/v1/crates/rand_chacha/0.3.1/download -> rand_chacha-0.3.1.crate https://crates.io/api/v1/crates/rand_core/0.5.1/download -> rand_core-0.5.1.crate https://crates.io/api/v1/crates/rand_core/0.6.3/download -> rand_core-0.6.3.crate https://crates.io/api/v1/crates/rand_hc/0.2.0/download -> rand_hc-0.2.0.crate https://crates.io/api/v1/crates/rand_hc/0.3.1/download -> rand_hc-0.3.1.crate https://crates.io/api/v1/crates/rand_pcg/0.2.1/download -> rand_pcg-0.2.1.crate https://crates.io/api/v1/crates/redox_syscall/0.2.10/download -> redox_syscall-0.2.10.crate https://crates.io/api/v1/crates/regex/1.5.4/download -> regex-1.5.4.crate https://crates.io/api/v1/crates/regex-automata/0.1.10/download -> regex-automata-0.1.10.crate https://crates.io/api/v1/crates/regex-syntax/0.6.25/download -> regex-syntax-0.6.25.crate https://crates.io/api/v1/crates/remove_dir_all/0.5.3/download -> remove_dir_all-0.5.3.crate https://crates.io/api/v1/crates/ryu/1.0.5/download -> ryu-1.0.5.crate https://crates.io/api/v1/crates/same-file/1.0.6/download -> same-file-1.0.6.crate https://crates.io/api/v1/crates/scoped-tls/1.0.0/download -> scoped-tls-1.0.0.crate https://crates.io/api/v1/crates/select/0.5.0/download -> select-0.5.0.crate https://crates.io/api/v1/crates/semver/0.11.0/download -> semver-0.11.0.crate https://crates.io/api/v1/crates/semver-parser/0.10.2/download -> semver-parser-0.10.2.crate https://crates.io/api/v1/crates/serde/1.0.129/download -> serde-1.0.129.crate https://crates.io/api/v1/crates/serde_derive/1.0.129/download -> serde_derive-1.0.129.crate https://crates.io/api/v1/crates/serde_json/1.0.66/download -> serde_json-1.0.66.crate https://crates.io/api/v1/crates/serde_urlencoded/0.7.0/download -> serde_urlencoded-0.7.0.crate https://crates.io/api/v1/crates/sha-1/0.8.2/download -> sha-1-0.8.2.crate https://crates.io/api/v1/crates/sha-1/0.9.7/download -> sha-1-0.9.7.crate https://crates.io/api/v1/crates/shlex/1.0.0/download -> shlex-1.0.0.crate https://crates.io/api/v1/crates/siphasher/0.3.6/download -> siphasher-0.3.6.crate https://crates.io/api/v1/crates/slab/0.4.4/download -> slab-0.4.4.crate https://crates.io/api/v1/crates/socket2/0.4.1/download -> socket2-0.4.1.crate https://crates.io/api/v1/crates/string_cache/0.8.1/download -> string_cache-0.8.1.crate https://crates.io/api/v1/crates/string_cache_codegen/0.5.1/download -> string_cache_codegen-0.5.1.crate https://crates.io/api/v1/crates/strsim/0.8.0/download -> strsim-0.8.0.crate https://crates.io/api/v1/crates/strum/0.21.0/download -> strum-0.21.0.crate https://crates.io/api/v1/crates/strum_macros/0.21.1/download -> strum_macros-0.21.1.crate https://crates.io/api/v1/crates/syn/1.0.75/download -> syn-1.0.75.crate https://crates.io/api/v1/crates/tempfile/3.2.0/download -> tempfile-3.2.0.crate https://crates.io/api/v1/crates/tendril/0.4.2/download -> tendril-0.4.2.crate https://crates.io/api/v1/crates/termcolor/1.1.2/download -> termcolor-1.1.2.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.crate https://crates.io/api/v1/crates/time/0.1.43/download -> time-0.1.43.crate https://crates.io/api/v1/crates/tinyvec/1.3.1/download -> tinyvec-1.3.1.crate https://crates.io/api/v1/crates/tinyvec_macros/0.1.0/download -> tinyvec_macros-0.1.0.crate https://crates.io/api/v1/crates/tokio/1.10.0/download -> tokio-1.10.0.crate https://crates.io/api/v1/crates/tokio-macros/1.3.0/download -> tokio-macros-1.3.0.crate https://crates.io/api/v1/crates/tokio-stream/0.1.7/download -> tokio-stream-0.1.7.crate https://crates.io/api/v1/crates/tokio-tungstenite/0.13.0/download -> tokio-tungstenite-0.13.0.crate https://crates.io/api/v1/crates/tokio-util/0.6.7/download -> tokio-util-0.6.7.crate https://crates.io/api/v1/crates/toml/0.5.8/download -> toml-0.5.8.crate https://crates.io/api/v1/crates/topological-sort/0.1.0/download -> topological-sort-0.1.0.crate https://crates.io/api/v1/crates/tower-service/0.3.1/download -> tower-service-0.3.1.crate https://crates.io/api/v1/crates/tracing/0.1.26/download -> tracing-0.1.26.crate https://crates.io/api/v1/crates/tracing-core/0.1.19/download -> tracing-core-0.1.19.crate https://crates.io/api/v1/crates/treeline/0.1.0/download -> treeline-0.1.0.crate https://crates.io/api/v1/crates/try-lock/0.2.3/download -> try-lock-0.2.3.crate https://crates.io/api/v1/crates/tungstenite/0.12.0/download -> tungstenite-0.12.0.crate https://crates.io/api/v1/crates/typenum/1.13.0/download -> typenum-1.13.0.crate https://crates.io/api/v1/crates/ucd-trie/0.1.3/download -> ucd-trie-0.1.3.crate https://crates.io/api/v1/crates/unicase/2.6.0/download -> unicase-2.6.0.crate https://crates.io/api/v1/crates/unicode-bidi/0.3.6/download -> unicode-bidi-0.3.6.crate https://crates.io/api/v1/crates/unicode-normalization/0.1.19/download -> unicode-normalization-0.1.19.crate https://crates.io/api/v1/crates/unicode-segmentation/1.8.0/download -> unicode-segmentation-1.8.0.crate https://crates.io/api/v1/crates/unicode-width/0.1.8/download -> unicode-width-0.1.8.crate https://crates.io/api/v1/crates/unicode-xid/0.2.2/download -> unicode-xid-0.2.2.crate https://crates.io/api/v1/crates/url/2.2.2/download -> url-2.2.2.crate https://crates.io/api/v1/crates/utf-8/0.7.6/download -> utf-8-0.7.6.crate https://crates.io/api/v1/crates/vec_map/0.8.2/download -> vec_map-0.8.2.crate https://crates.io/api/v1/crates/version_check/0.9.3/download -> version_check-0.9.3.crate https://crates.io/api/v1/crates/wait-timeout/0.2.0/download -> wait-timeout-0.2.0.crate https://crates.io/api/v1/crates/walkdir/2.3.2/download -> walkdir-2.3.2.crate https://crates.io/api/v1/crates/want/0.3.0/download -> want-0.3.0.crate https://crates.io/api/v1/crates/warp/0.3.1/download -> warp-0.3.1.crate https://crates.io/api/v1/crates/wasi/0.10.2+wasi-snapshot-preview1/download -> wasi-0.10.2+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/wasi/0.9.0+wasi-snapshot-preview1/download -> wasi-0.9.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/winapi/0.2.8/download -> winapi-0.2.8.crate https://crates.io/api/v1/crates/winapi/0.3.9/download -> winapi-0.3.9.crate https://crates.io/api/v1/crates/winapi-build/0.1.1/download -> winapi-build-0.1.1.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.5/download -> winapi-util-0.1.5.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/ws2_32-sys/0.2.1/download -> ws2_32-sys-0.2.1.crate https://crates.io/api/v1/crates/xml5ever/0.16.1/download -> xml5ever-0.16.1.crate
-_eclasses_=cargo	52a92ed3815080c5f2caac1905687b1c	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=49657a4f3805e818e40f2c56e39ca738
diff --git a/metadata/md5-cache/app-text/mdbook-0.4.18 b/metadata/md5-cache/app-text/mdbook-0.4.18
index 32a5579e8727..1e1cf72c8457 100644
--- a/metadata/md5-cache/app-text/mdbook-0.4.18
+++ b/metadata/md5-cache/app-text/mdbook-0.4.18
@@ -5,9 +5,9 @@ EAPI=8
 HOMEPAGE=https://rust-lang.github.io/mdBook/
 INHERIT=cargo toolchain-funcs
 IUSE=doc debug
-KEYWORDS=amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~riscv ~x86
 LICENSE=Apache-2.0 BSD CC-BY-4.0 CC0-1.0 ISC MIT MPL-2.0 OFL-1.1
 SLOT=0
 SRC_URI=https://github.com/rust-lang/mdBook/archive/refs/tags/v0.4.18.tar.gz -> mdbook-0.4.18.tar.gz https://crates.io/api/v1/crates/aho-corasick/0.7.18/download -> aho-corasick-0.7.18.crate https://crates.io/api/v1/crates/ammonia/3.1.2/download -> ammonia-3.1.2.crate https://crates.io/api/v1/crates/ansi_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/anyhow/1.0.43/download -> anyhow-1.0.43.crate https://crates.io/api/v1/crates/assert_cmd/1.0.7/download -> assert_cmd-1.0.7.crate https://crates.io/api/v1/crates/atty/0.2.14/download -> atty-0.2.14.crate https://crates.io/api/v1/crates/autocfg/1.0.1/download -> autocfg-1.0.1.crate https://crates.io/api/v1/crates/base64/0.13.0/download -> base64-0.13.0.crate https://crates.io/api/v1/crates/bit-set/0.5.2/download -> bit-set-0.5.2.crate https://crates.io/api/v1/crates/bit-vec/0.6.3/download -> bit-vec-0.6.3.crate https://crates.io/api/v1/crates/bitflags/1.3.2/download -> bitflags-1.3.2.crate https://crates.io/api/v1/crates/block-buffer/0.7.3/download -> block-buffer-0.7.3.crate https://crates.io/api/v1/crates/block-buffer/0.9.0/download -> block-buffer-0.9.0.crate https://crates.io/api/v1/crates/block-padding/0.1.5/download -> block-padding-0.1.5.crate https://crates.io/api/v1/crates/bstr/0.2.17/download -> bstr-0.2.17.crate https://crates.io/api/v1/crates/byte-tools/0.3.1/download -> byte-tools-0.3.1.crate https://crates.io/api/v1/crates/byteorder/1.4.3/download -> byteorder-1.4.3.crate https://crates.io/api/v1/crates/bytes/1.0.1/download -> bytes-1.0.1.crate https://crates.io/api/v1/crates/cfg-if/0.1.10/download -> cfg-if-0.1.10.crate https://crates.io/api/v1/crates/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/chrono/0.4.19/download -> chrono-0.4.19.crate https://crates.io/api/v1/crates/clap/3.0.10/download -> clap-3.0.10.crate https://crates.io/api/v1/crates/clap_complete/3.0.4/download -> clap_complete-3.0.4.crate https://crates.io/api/v1/crates/cpufeatures/0.1.5/download -> cpufeatures-0.1.5.crate https://crates.io/api/v1/crates/ctor/0.1.20/download -> ctor-0.1.20.crate https://crates.io/api/v1/crates/difference/2.0.0/download -> difference-2.0.0.crate https://crates.io/api/v1/crates/difflib/0.4.0/download -> difflib-0.4.0.crate https://crates.io/api/v1/crates/digest/0.8.1/download -> digest-0.8.1.crate https://crates.io/api/v1/crates/digest/0.9.0/download -> digest-0.9.0.crate https://crates.io/api/v1/crates/doc-comment/0.3.3/download -> doc-comment-0.3.3.crate https://crates.io/api/v1/crates/either/1.6.1/download -> either-1.6.1.crate https://crates.io/api/v1/crates/elasticlunr-rs/2.3.13/download -> elasticlunr-rs-2.3.13.crate https://crates.io/api/v1/crates/env_logger/0.7.1/download -> env_logger-0.7.1.crate https://crates.io/api/v1/crates/fake-simd/0.1.2/download -> fake-simd-0.1.2.crate https://crates.io/api/v1/crates/filetime/0.2.15/download -> filetime-0.2.15.crate https://crates.io/api/v1/crates/float-cmp/0.9.0/download -> float-cmp-0.9.0.crate https://crates.io/api/v1/crates/fnv/1.0.7/download -> fnv-1.0.7.crate https://crates.io/api/v1/crates/form_urlencoded/1.0.1/download -> form_urlencoded-1.0.1.crate https://crates.io/api/v1/crates/fsevent/0.4.0/download -> fsevent-0.4.0.crate https://crates.io/api/v1/crates/fsevent-sys/2.0.1/download -> fsevent-sys-2.0.1.crate https://crates.io/api/v1/crates/fuchsia-zircon/0.3.3/download -> fuchsia-zircon-0.3.3.crate https://crates.io/api/v1/crates/fuchsia-zircon-sys/0.3.3/download -> fuchsia-zircon-sys-0.3.3.crate https://crates.io/api/v1/crates/futf/0.1.4/download -> futf-0.1.4.crate https://crates.io/api/v1/crates/futures/0.3.16/download -> futures-0.3.16.crate https://crates.io/api/v1/crates/futures-channel/0.3.16/download -> futures-channel-0.3.16.crate https://crates.io/api/v1/crates/futures-core/0.3.16/download -> futures-core-0.3.16.crate https://crates.io/api/v1/crates/futures-io/0.3.16/download -> futures-io-0.3.16.crate https://crates.io/api/v1/crates/futures-macro/0.3.16/download -> futures-macro-0.3.16.crate https://crates.io/api/v1/crates/futures-sink/0.3.16/download -> futures-sink-0.3.16.crate https://crates.io/api/v1/crates/futures-task/0.3.16/download -> futures-task-0.3.16.crate https://crates.io/api/v1/crates/futures-util/0.3.16/download -> futures-util-0.3.16.crate https://crates.io/api/v1/crates/generic-array/0.12.4/download -> generic-array-0.12.4.crate https://crates.io/api/v1/crates/generic-array/0.14.4/download -> generic-array-0.14.4.crate https://crates.io/api/v1/crates/getrandom/0.1.16/download -> getrandom-0.1.16.crate https://crates.io/api/v1/crates/getrandom/0.2.3/download -> getrandom-0.2.3.crate https://crates.io/api/v1/crates/gitignore/1.0.7/download -> gitignore-1.0.7.crate https://crates.io/api/v1/crates/glob/0.3.0/download -> glob-0.3.0.crate https://crates.io/api/v1/crates/h2/0.3.4/download -> h2-0.3.4.crate https://crates.io/api/v1/crates/handlebars/4.1.2/download -> handlebars-4.1.2.crate https://crates.io/api/v1/crates/hashbrown/0.11.2/download -> hashbrown-0.11.2.crate https://crates.io/api/v1/crates/headers/0.3.4/download -> headers-0.3.4.crate https://crates.io/api/v1/crates/headers-core/0.2.0/download -> headers-core-0.2.0.crate https://crates.io/api/v1/crates/heck/0.3.3/download -> heck-0.3.3.crate https://crates.io/api/v1/crates/hermit-abi/0.1.19/download -> hermit-abi-0.1.19.crate https://crates.io/api/v1/crates/html5ever/0.25.1/download -> html5ever-0.25.1.crate https://crates.io/api/v1/crates/http/0.2.4/download -> http-0.2.4.crate https://crates.io/api/v1/crates/http-body/0.4.3/download -> http-body-0.4.3.crate https://crates.io/api/v1/crates/httparse/1.5.1/download -> httparse-1.5.1.crate https://crates.io/api/v1/crates/httpdate/1.0.1/download -> httpdate-1.0.1.crate https://crates.io/api/v1/crates/humantime/1.3.0/download -> humantime-1.3.0.crate https://crates.io/api/v1/crates/hyper/0.14.11/download -> hyper-0.14.11.crate https://crates.io/api/v1/crates/idna/0.2.3/download -> idna-0.2.3.crate https://crates.io/api/v1/crates/indexmap/1.7.0/download -> indexmap-1.7.0.crate https://crates.io/api/v1/crates/inotify/0.7.1/download -> inotify-0.7.1.crate https://crates.io/api/v1/crates/inotify-sys/0.1.5/download -> inotify-sys-0.1.5.crate https://crates.io/api/v1/crates/input_buffer/0.4.0/download -> input_buffer-0.4.0.crate https://crates.io/api/v1/crates/iovec/0.1.4/download -> iovec-0.1.4.crate https://crates.io/api/v1/crates/itertools/0.10.1/download -> itertools-0.10.1.crate https://crates.io/api/v1/crates/itoa/0.4.8/download -> itoa-0.4.8.crate https://crates.io/api/v1/crates/kernel32-sys/0.2.2/download -> kernel32-sys-0.2.2.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/lazycell/1.3.0/download -> lazycell-1.3.0.crate https://crates.io/api/v1/crates/libc/0.2.100/download -> libc-0.2.100.crate https://crates.io/api/v1/crates/log/0.4.14/download -> log-0.4.14.crate https://crates.io/api/v1/crates/mac/0.1.1/download -> mac-0.1.1.crate https://crates.io/api/v1/crates/maplit/1.0.2/download -> maplit-1.0.2.crate https://crates.io/api/v1/crates/markup5ever/0.10.1/download -> markup5ever-0.10.1.crate https://crates.io/api/v1/crates/markup5ever_rcdom/0.1.0/download -> markup5ever_rcdom-0.1.0.crate https://crates.io/api/v1/crates/matches/0.1.9/download -> matches-0.1.9.crate https://crates.io/api/v1/crates/memchr/2.4.1/download -> memchr-2.4.1.crate https://crates.io/api/v1/crates/mime/0.3.16/download -> mime-0.3.16.crate https://crates.io/api/v1/crates/mime_guess/2.0.3/download -> mime_guess-2.0.3.crate https://crates.io/api/v1/crates/mio/0.6.23/download -> mio-0.6.23.crate https://crates.io/api/v1/crates/mio/0.7.13/download -> mio-0.7.13.crate https://crates.io/api/v1/crates/mio-extras/2.0.6/download -> mio-extras-2.0.6.crate https://crates.io/api/v1/crates/miow/0.2.2/download -> miow-0.2.2.crate https://crates.io/api/v1/crates/miow/0.3.7/download -> miow-0.3.7.crate https://crates.io/api/v1/crates/net2/0.2.37/download -> net2-0.2.37.crate https://crates.io/api/v1/crates/new_debug_unreachable/1.0.4/download -> new_debug_unreachable-1.0.4.crate https://crates.io/api/v1/crates/normalize-line-endings/0.3.0/download -> normalize-line-endings-0.3.0.crate https://crates.io/api/v1/crates/notify/4.0.17/download -> notify-4.0.17.crate https://crates.io/api/v1/crates/ntapi/0.3.6/download -> ntapi-0.3.6.crate https://crates.io/api/v1/crates/num-integer/0.1.44/download -> num-integer-0.1.44.crate https://crates.io/api/v1/crates/num-traits/0.2.14/download -> num-traits-0.2.14.crate https://crates.io/api/v1/crates/num_cpus/1.13.0/download -> num_cpus-1.13.0.crate https://crates.io/api/v1/crates/opaque-debug/0.2.3/download -> opaque-debug-0.2.3.crate https://crates.io/api/v1/crates/opaque-debug/0.3.0/download -> opaque-debug-0.3.0.crate https://crates.io/api/v1/crates/opener/0.5.0/download -> opener-0.5.0.crate https://crates.io/api/v1/crates/os_str_bytes/6.0.0/download -> os_str_bytes-6.0.0.crate https://crates.io/api/v1/crates/output_vt100/0.1.2/download -> output_vt100-0.1.2.crate https://crates.io/api/v1/crates/percent-encoding/2.1.0/download -> percent-encoding-2.1.0.crate https://crates.io/api/v1/crates/pest/2.1.3/download -> pest-2.1.3.crate https://crates.io/api/v1/crates/pest_derive/2.1.0/download -> pest_derive-2.1.0.crate https://crates.io/api/v1/crates/pest_generator/2.1.3/download -> pest_generator-2.1.3.crate https://crates.io/api/v1/crates/pest_meta/2.1.3/download -> pest_meta-2.1.3.crate https://crates.io/api/v1/crates/phf/0.8.0/download -> phf-0.8.0.crate https://crates.io/api/v1/crates/phf_codegen/0.8.0/download -> phf_codegen-0.8.0.crate https://crates.io/api/v1/crates/phf_generator/0.8.0/download -> phf_generator-0.8.0.crate https://crates.io/api/v1/crates/phf_shared/0.8.0/download -> phf_shared-0.8.0.crate https://crates.io/api/v1/crates/pin-project/1.0.8/download -> pin-project-1.0.8.crate https://crates.io/api/v1/crates/pin-project-internal/1.0.8/download -> pin-project-internal-1.0.8.crate https://crates.io/api/v1/crates/pin-project-lite/0.2.7/download -> pin-project-lite-0.2.7.crate https://crates.io/api/v1/crates/pin-utils/0.1.0/download -> pin-utils-0.1.0.crate https://crates.io/api/v1/crates/ppv-lite86/0.2.10/download -> ppv-lite86-0.2.10.crate https://crates.io/api/v1/crates/precomputed-hash/0.1.1/download -> precomputed-hash-0.1.1.crate https://crates.io/api/v1/crates/predicates/2.0.1/download -> predicates-2.0.1.crate https://crates.io/api/v1/crates/predicates-core/1.0.2/download -> predicates-core-1.0.2.crate https://crates.io/api/v1/crates/predicates-tree/1.0.2/download -> predicates-tree-1.0.2.crate https://crates.io/api/v1/crates/pretty_assertions/0.6.1/download -> pretty_assertions-0.6.1.crate https://crates.io/api/v1/crates/proc-macro-hack/0.5.19/download -> proc-macro-hack-0.5.19.crate https://crates.io/api/v1/crates/proc-macro-nested/0.1.7/download -> proc-macro-nested-0.1.7.crate https://crates.io/api/v1/crates/proc-macro2/1.0.28/download -> proc-macro2-1.0.28.crate https://crates.io/api/v1/crates/pulldown-cmark/0.9.1/download -> pulldown-cmark-0.9.1.crate https://crates.io/api/v1/crates/quick-error/1.2.3/download -> quick-error-1.2.3.crate https://crates.io/api/v1/crates/quick-error/2.0.1/download -> quick-error-2.0.1.crate https://crates.io/api/v1/crates/quote/1.0.9/download -> quote-1.0.9.crate https://crates.io/api/v1/crates/rand/0.7.3/download -> rand-0.7.3.crate https://crates.io/api/v1/crates/rand/0.8.4/download -> rand-0.8.4.crate https://crates.io/api/v1/crates/rand_chacha/0.2.2/download -> rand_chacha-0.2.2.crate https://crates.io/api/v1/crates/rand_chacha/0.3.1/download -> rand_chacha-0.3.1.crate https://crates.io/api/v1/crates/rand_core/0.5.1/download -> rand_core-0.5.1.crate https://crates.io/api/v1/crates/rand_core/0.6.3/download -> rand_core-0.6.3.crate https://crates.io/api/v1/crates/rand_hc/0.2.0/download -> rand_hc-0.2.0.crate https://crates.io/api/v1/crates/rand_hc/0.3.1/download -> rand_hc-0.3.1.crate https://crates.io/api/v1/crates/rand_pcg/0.2.1/download -> rand_pcg-0.2.1.crate https://crates.io/api/v1/crates/redox_syscall/0.2.10/download -> redox_syscall-0.2.10.crate https://crates.io/api/v1/crates/regex/1.5.5/download -> regex-1.5.5.crate https://crates.io/api/v1/crates/regex-automata/0.1.10/download -> regex-automata-0.1.10.crate https://crates.io/api/v1/crates/regex-syntax/0.6.25/download -> regex-syntax-0.6.25.crate https://crates.io/api/v1/crates/remove_dir_all/0.5.3/download -> remove_dir_all-0.5.3.crate https://crates.io/api/v1/crates/ryu/1.0.5/download -> ryu-1.0.5.crate https://crates.io/api/v1/crates/same-file/1.0.6/download -> same-file-1.0.6.crate https://crates.io/api/v1/crates/scoped-tls/1.0.0/download -> scoped-tls-1.0.0.crate https://crates.io/api/v1/crates/select/0.5.0/download -> select-0.5.0.crate https://crates.io/api/v1/crates/semver/1.0.4/download -> semver-1.0.4.crate https://crates.io/api/v1/crates/serde/1.0.129/download -> serde-1.0.129.crate https://crates.io/api/v1/crates/serde_derive/1.0.129/download -> serde_derive-1.0.129.crate https://crates.io/api/v1/crates/serde_json/1.0.66/download -> serde_json-1.0.66.crate https://crates.io/api/v1/crates/serde_urlencoded/0.7.0/download -> serde_urlencoded-0.7.0.crate https://crates.io/api/v1/crates/sha-1/0.8.2/download -> sha-1-0.8.2.crate https://crates.io/api/v1/crates/sha-1/0.9.7/download -> sha-1-0.9.7.crate https://crates.io/api/v1/crates/shlex/1.0.0/download -> shlex-1.0.0.crate https://crates.io/api/v1/crates/siphasher/0.3.6/download -> siphasher-0.3.6.crate https://crates.io/api/v1/crates/slab/0.4.4/download -> slab-0.4.4.crate https://crates.io/api/v1/crates/socket2/0.4.1/download -> socket2-0.4.1.crate https://crates.io/api/v1/crates/string_cache/0.8.1/download -> string_cache-0.8.1.crate https://crates.io/api/v1/crates/string_cache_codegen/0.5.1/download -> string_cache_codegen-0.5.1.crate https://crates.io/api/v1/crates/strsim/0.10.0/download -> strsim-0.10.0.crate https://crates.io/api/v1/crates/strum/0.21.0/download -> strum-0.21.0.crate https://crates.io/api/v1/crates/strum_macros/0.21.1/download -> strum_macros-0.21.1.crate https://crates.io/api/v1/crates/syn/1.0.75/download -> syn-1.0.75.crate https://crates.io/api/v1/crates/tempfile/3.2.0/download -> tempfile-3.2.0.crate https://crates.io/api/v1/crates/tendril/0.4.2/download -> tendril-0.4.2.crate https://crates.io/api/v1/crates/termcolor/1.1.2/download -> termcolor-1.1.2.crate https://crates.io/api/v1/crates/textwrap/0.14.2/download -> textwrap-0.14.2.crate https://crates.io/api/v1/crates/time/0.1.43/download -> time-0.1.43.crate https://crates.io/api/v1/crates/tinyvec/1.3.1/download -> tinyvec-1.3.1.crate https://crates.io/api/v1/crates/tinyvec_macros/0.1.0/download -> tinyvec_macros-0.1.0.crate https://crates.io/api/v1/crates/tokio/1.10.0/download -> tokio-1.10.0.crate https://crates.io/api/v1/crates/tokio-macros/1.3.0/download -> tokio-macros-1.3.0.crate https://crates.io/api/v1/crates/tokio-stream/0.1.7/download -> tokio-stream-0.1.7.crate https://crates.io/api/v1/crates/tokio-tungstenite/0.13.0/download -> tokio-tungstenite-0.13.0.crate https://crates.io/api/v1/crates/tokio-util/0.6.7/download -> tokio-util-0.6.7.crate https://crates.io/api/v1/crates/toml/0.5.8/download -> toml-0.5.8.crate https://crates.io/api/v1/crates/topological-sort/0.1.0/download -> topological-sort-0.1.0.crate https://crates.io/api/v1/crates/tower-service/0.3.1/download -> tower-service-0.3.1.crate https://crates.io/api/v1/crates/tracing/0.1.26/download -> tracing-0.1.26.crate https://crates.io/api/v1/crates/tracing-core/0.1.19/download -> tracing-core-0.1.19.crate https://crates.io/api/v1/crates/treeline/0.1.0/download -> treeline-0.1.0.crate https://crates.io/api/v1/crates/try-lock/0.2.3/download -> try-lock-0.2.3.crate https://crates.io/api/v1/crates/tungstenite/0.12.0/download -> tungstenite-0.12.0.crate https://crates.io/api/v1/crates/typenum/1.13.0/download -> typenum-1.13.0.crate https://crates.io/api/v1/crates/ucd-trie/0.1.3/download -> ucd-trie-0.1.3.crate https://crates.io/api/v1/crates/unicase/2.6.0/download -> unicase-2.6.0.crate https://crates.io/api/v1/crates/unicode-bidi/0.3.6/download -> unicode-bidi-0.3.6.crate https://crates.io/api/v1/crates/unicode-normalization/0.1.19/download -> unicode-normalization-0.1.19.crate https://crates.io/api/v1/crates/unicode-segmentation/1.8.0/download -> unicode-segmentation-1.8.0.crate https://crates.io/api/v1/crates/unicode-xid/0.2.2/download -> unicode-xid-0.2.2.crate https://crates.io/api/v1/crates/url/2.2.2/download -> url-2.2.2.crate https://crates.io/api/v1/crates/utf-8/0.7.6/download -> utf-8-0.7.6.crate https://crates.io/api/v1/crates/version_check/0.9.3/download -> version_check-0.9.3.crate https://crates.io/api/v1/crates/wait-timeout/0.2.0/download -> wait-timeout-0.2.0.crate https://crates.io/api/v1/crates/walkdir/2.3.2/download -> walkdir-2.3.2.crate https://crates.io/api/v1/crates/want/0.3.0/download -> want-0.3.0.crate https://crates.io/api/v1/crates/warp/0.3.1/download -> warp-0.3.1.crate https://crates.io/api/v1/crates/wasi/0.10.2+wasi-snapshot-preview1/download -> wasi-0.10.2+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/wasi/0.9.0+wasi-snapshot-preview1/download -> wasi-0.9.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/winapi/0.2.8/download -> winapi-0.2.8.crate https://crates.io/api/v1/crates/winapi/0.3.9/download -> winapi-0.3.9.crate https://crates.io/api/v1/crates/winapi-build/0.1.1/download -> winapi-build-0.1.1.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.5/download -> winapi-util-0.1.5.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/ws2_32-sys/0.2.1/download -> ws2_32-sys-0.2.1.crate https://crates.io/api/v1/crates/xml5ever/0.16.1/download -> xml5ever-0.16.1.crate
-_eclasses_=cargo	52a92ed3815080c5f2caac1905687b1c	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=5eee6d10ea398f41bc9cf329be32ad38
+_eclasses_=cargo	52a92ed3815080c5f2caac1905687b1c	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=3aad0a95a3568ea19126b0bf99a0a92f
diff --git a/metadata/md5-cache/app-text/mecab-0.996-r1 b/metadata/md5-cache/app-text/mecab-0.996-r1
index b9c1d779de7a..962a2ccbff38 100644
--- a/metadata/md5-cache/app-text/mecab-0.996-r1
+++ b/metadata/md5-cache/app-text/mecab-0.996-r1
@@ -5,10 +5,10 @@ EAPI=6
 HOMEPAGE=https://taku910.github.io/mecab/
 INHERIT=autotools
 IUSE=static-libs unicode
-KEYWORDS=amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86
+KEYWORDS=amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=|| ( BSD LGPL-2.1 GPL-2 )
 PDEPEND=|| ( app-dicts/mecab-ipadic[unicode=] app-dicts/mecab-naist-jdic[unicode=] )
 SLOT=0
 SRC_URI=https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/mecab/mecab-0.996.tar.gz
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=b33b70db8497cfb850f63c7cd9c339db
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	28f0f3c0226306ec5f49e13bf851f171	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4fbbbc98f236f1b43acd99476bc3cd85	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_md5_=698f2351dde5b005cd8595500555616e
diff --git a/metadata/md5-cache/app-text/mpage-2.5.6-r1 b/metadata/md5-cache/app-text/mpage-2.5.6-r1
index e61bec3e9192..038956844f37 100644
--- a/metadata/md5-cache/app-text/mpage-2.5.6-r1
+++ b/metadata/md5-cache/app-text/mpage-2.5.6-r1
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile configure install
 DESCRIPTION=Many to one page printing utility
 EAPI=7
 HOMEPAGE=http://www.mesa.nl/
+INHERIT=toolchain-funcs
 KEYWORDS=amd64 ppc x86
 LICENSE=freedist
 SLOT=0
 SRC_URI=http://www.mesa.nl/pub/mpage/mpage-2.5.6.tgz https://dev.gentoo.org/~mgorny/dist/mpage-2.5.6-gentoo-patchset.tar.bz2
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=aa7fe6264951ac493b4b88bdea28979c
diff --git a/metadata/md5-cache/app-text/msort-8.53-r1 b/metadata/md5-cache/app-text/msort-8.53-r1
index 5a9e1489ee5a..50441f58d847 100644
--- a/metadata/md5-cache/app-text/msort-8.53-r1
+++ b/metadata/md5-cache/app-text/msort-8.53-r1
@@ -4,11 +4,12 @@ DEPEND=dev-libs/tre icu? ( dev-libs/icu:= ) !icu? ( dev-libs/libutf8proc:= ) lib
 DESCRIPTION=A program for sorting files in sophisticated ways
 EAPI=8
 HOMEPAGE=https://billposer.org/Software/msort.html
+INHERIT=autotools
 IUSE=heap +icu +libuninum
 KEYWORDS=amd64 x86
 LICENSE=GPL-3 LGPL-3
 RDEPEND=dev-libs/tre icu? ( dev-libs/icu:= ) !icu? ( dev-libs/libutf8proc:= ) libuninum? ( dev-libs/libuninum:= )
 SLOT=0
 SRC_URI=https://billposer.org/Software/Downloads/msort-8.53.tar.bz2
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=9fe14d665ac48a69d7d98843aa285b7d
diff --git a/metadata/md5-cache/app-text/multitail-6.4.2-r1 b/metadata/md5-cache/app-text/multitail-6.4.2-r1
index c82a3a89dd5b..88a0f070cbc8 100644
--- a/metadata/md5-cache/app-text/multitail-6.4.2-r1
+++ b/metadata/md5-cache/app-text/multitail-6.4.2-r1
@@ -4,6 +4,7 @@ DEPEND=sys-libs/ncurses:=[unicode(+)?]
 DESCRIPTION=Tail with multiple windows
 EAPI=7
 HOMEPAGE=http://www.vanheusden.com/multitail/
+INHERIT=flag-o-matic optfeature toolchain-funcs
 IUSE=debug examples unicode
 KEYWORDS=amd64 ~hppa ~ia64 ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
@@ -11,5 +12,5 @@ RDEPEND=sys-libs/ncurses:=[unicode(+)?]
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.vanheusden.com/multitail/multitail-6.4.2.tgz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	optfeature	d524f291c80f9d21ad80fe978e3ca760	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	optfeature	d524f291c80f9d21ad80fe978e3ca760	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=40e4cd7b83e8694b8e01f90def3c87ca
diff --git a/metadata/md5-cache/app-text/mupdf-1.18.0-r4 b/metadata/md5-cache/app-text/mupdf-1.18.0-r4
index 84cceea993d7..3368f4b51826 100644
--- a/metadata/md5-cache/app-text/mupdf-1.18.0-r4
+++ b/metadata/md5-cache/app-text/mupdf-1.18.0-r4
@@ -4,6 +4,7 @@ DEPEND=dev-libs/gumbo media-libs/freetype:2= media-libs/harfbuzz:=[truetype] med
 DESCRIPTION=A lightweight PDF viewer and toolkit written in portable C
 EAPI=7
 HOMEPAGE=https://mupdf.com/ https://git.ghostscript.com/?p=mupdf.git
+INHERIT=desktop flag-o-matic toolchain-funcs xdg
 IUSE=+javascript opengl ssl X
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 x86
 LICENSE=AGPL-3
@@ -11,5 +12,5 @@ RDEPEND=dev-libs/gumbo media-libs/freetype:2= media-libs/harfbuzz:=[truetype] me
 REQUIRED_USE=opengl? ( javascript )
 SLOT=0/1.18.0
 SRC_URI=https://mupdf.com/downloads/archive/mupdf-1.18.0-source.tar.xz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=eda681fd36f55da2e1cef9ce29a7ba9a
diff --git a/metadata/md5-cache/app-text/mupdf-1.19.0 b/metadata/md5-cache/app-text/mupdf-1.19.0
index 4127b13b257d..175c691b0011 100644
--- a/metadata/md5-cache/app-text/mupdf-1.19.0
+++ b/metadata/md5-cache/app-text/mupdf-1.19.0
@@ -4,6 +4,7 @@ DEPEND=dev-libs/gumbo media-libs/freetype:2= media-libs/harfbuzz:=[truetype] med
 DESCRIPTION=A lightweight PDF viewer and toolkit written in portable C
 EAPI=8
 HOMEPAGE=https://mupdf.com/ https://git.ghostscript.com/?p=mupdf.git
+INHERIT=desktop flag-o-matic toolchain-funcs xdg
 IUSE=+javascript opengl ssl X
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 x86
 LICENSE=AGPL-3
@@ -11,5 +12,5 @@ RDEPEND=dev-libs/gumbo media-libs/freetype:2= media-libs/harfbuzz:=[truetype] me
 REQUIRED_USE=opengl? ( javascript )
 SLOT=0/1.19.0
 SRC_URI=https://mupdf.com/downloads/archive/mupdf-1.19.0-source.tar.xz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=c534060f3ce09896b93d97023fcaa761
diff --git a/metadata/md5-cache/app-text/mupdf-1.19.1 b/metadata/md5-cache/app-text/mupdf-1.19.1
index 953af062a7ba..4866df0fad39 100644
--- a/metadata/md5-cache/app-text/mupdf-1.19.1
+++ b/metadata/md5-cache/app-text/mupdf-1.19.1
@@ -4,12 +4,13 @@ DEPEND=dev-libs/gumbo media-libs/freetype:2= media-libs/harfbuzz:=[truetype] med
 DESCRIPTION=A lightweight PDF viewer and toolkit written in portable C
 EAPI=8
 HOMEPAGE=https://mupdf.com/ https://git.ghostscript.com/?p=mupdf.git
+INHERIT=desktop flag-o-matic toolchain-funcs xdg
 IUSE=+javascript opengl ssl X
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 x86
 LICENSE=AGPL-3
 RDEPEND=dev-libs/gumbo media-libs/freetype:2= media-libs/harfbuzz:=[truetype] media-libs/jbig2dec:= media-libs/libpng:0= >=media-libs/openjpeg-2.1:2= >=media-libs/libjpeg-turbo-1.5.3-r2:0 javascript? ( >=dev-lang/mujs-1.0.7:= ) opengl? ( >=media-libs/freeglut-3.0.0 ) ssl? ( >=dev-libs/openssl-1.1:0= ) X? ( x11-libs/libX11 x11-libs/libXext )
 REQUIRED_USE=opengl? ( javascript )
 SLOT=0/1.19.1
 SRC_URI=https://mupdf.com/downloads/archive/mupdf-1.19.1-source.tar.xz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=639c76252ea9f9fa27ba93db8e9ed459
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=bc480a349294da2b81f4daa9da6ece60
diff --git a/metadata/md5-cache/app-text/mupdf-1.20.0 b/metadata/md5-cache/app-text/mupdf-1.20.0
new file mode 100644
index 000000000000..454835b6702f
--- /dev/null
+++ b/metadata/md5-cache/app-text/mupdf-1.20.0
@@ -0,0 +1,16 @@
+BDEPEND=X? ( x11-base/xorg-proto ) virtual/pkgconfig
+DEFINED_PHASES=compile install postinst postrm preinst prepare
+DEPEND=dev-libs/gumbo media-libs/freetype:2= media-libs/harfbuzz:=[truetype] media-libs/jbig2dec:= media-libs/libpng:0= >=media-libs/openjpeg-2.1:2= >=media-libs/libjpeg-turbo-1.5.3-r2:0 javascript? ( >=dev-lang/mujs-1.0.7:= ) opengl? ( >=media-libs/freeglut-3.0.0 ) ssl? ( >=dev-libs/openssl-1.1:0= ) X? ( x11-libs/libX11 x11-libs/libXext )
+DESCRIPTION=A lightweight PDF viewer and toolkit written in portable C
+EAPI=8
+HOMEPAGE=https://mupdf.com/ https://git.ghostscript.com/?p=mupdf.git
+INHERIT=desktop flag-o-matic toolchain-funcs xdg
+IUSE=+javascript opengl ssl X
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~x86
+LICENSE=AGPL-3
+RDEPEND=dev-libs/gumbo media-libs/freetype:2= media-libs/harfbuzz:=[truetype] media-libs/jbig2dec:= media-libs/libpng:0= >=media-libs/openjpeg-2.1:2= >=media-libs/libjpeg-turbo-1.5.3-r2:0 javascript? ( >=dev-lang/mujs-1.0.7:= ) opengl? ( >=media-libs/freeglut-3.0.0 ) ssl? ( >=dev-libs/openssl-1.1:0= ) X? ( x11-libs/libX11 x11-libs/libXext )
+REQUIRED_USE=opengl? ( javascript )
+SLOT=0/1.20.0
+SRC_URI=https://mupdf.com/downloads/archive/mupdf-1.20.0-source.tar.gz
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=a37eeb8ad7e4571b729c8f46348950e9
diff --git a/metadata/md5-cache/app-text/namazu-2.0.21 b/metadata/md5-cache/app-text/namazu-2.0.21
index 2dc335265219..e48bf4a52996 100644
--- a/metadata/md5-cache/app-text/namazu-2.0.21
+++ b/metadata/md5-cache/app-text/namazu-2.0.21
@@ -4,11 +4,12 @@ DEPEND=dev-perl/File-MMagic emacs? ( >=app-editors/emacs-23.1:* ) l10n_ja? ( app
 DESCRIPTION=Namazu is a full-text search engine
 EAPI=7
 HOMEPAGE=http://www.namazu.org/
+INHERIT=autotools elisp-common
 IUSE=emacs l10n_ja nls static-libs tk
 KEYWORDS=amd64 ~ppc ~ppc64 x86
 LICENSE=GPL-2+
 RDEPEND=dev-perl/File-MMagic emacs? ( >=app-editors/emacs-23.1:* ) l10n_ja? ( app-i18n/nkf || ( dev-perl/Text-Kakasi app-i18n/kakasi app-text/chasen app-text/mecab ) ) nls? ( virtual/libintl ) tk? ( dev-lang/tk:0 www-client/lynx )
 SLOT=0
 SRC_URI=http://www.namazu.org/stable/namazu-2.0.21.tar.gz
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	elisp-common	e7aaa047873789f549ea3df2f04b2145	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	elisp-common	e7aaa047873789f549ea3df2f04b2145	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=193b2830769613e8d7a51d6636012396
diff --git a/metadata/md5-cache/app-text/namazu-2.0.22_pre8 b/metadata/md5-cache/app-text/namazu-2.0.22_pre8
index 88b4b38adc98..02504a132d79 100644
--- a/metadata/md5-cache/app-text/namazu-2.0.22_pre8
+++ b/metadata/md5-cache/app-text/namazu-2.0.22_pre8
@@ -4,10 +4,11 @@ DEPEND=dev-perl/File-MMagic emacs? ( >=app-editors/emacs-23.1:* ) l10n_ja? ( app
 DESCRIPTION=Namazu is a full-text search engine
 EAPI=7
 HOMEPAGE=http://www.namazu.org/
+INHERIT=autotools elisp-common
 IUSE=emacs l10n_ja nls static-libs tk
 LICENSE=GPL-2+
 RDEPEND=dev-perl/File-MMagic emacs? ( >=app-editors/emacs-23.1:* ) l10n_ja? ( app-i18n/nkf || ( dev-perl/Text-Kakasi app-i18n/kakasi app-text/chasen app-text/mecab ) ) nls? ( virtual/libintl ) tk? ( dev-lang/tk:0 www-client/lynx )
 SLOT=0
 SRC_URI=http://www.namazu.org/test/namazu-2.0.22pre8.tar.gz
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	elisp-common	e7aaa047873789f549ea3df2f04b2145	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	elisp-common	e7aaa047873789f549ea3df2f04b2145	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=c53fab88204cbfadb1354ea1927f7763
diff --git a/metadata/md5-cache/app-text/nfoview-1.27.1 b/metadata/md5-cache/app-text/nfoview-1.27.1
deleted file mode 100644
index 4c982fd0b531..000000000000
--- a/metadata/md5-cache/app-text/nfoview-1.27.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) sys-devel/gettext python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 )
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=dev-python/pygobject:3[python_targets_python3_8(-)?]
-DESCRIPTION=Simple viewer for NFO files, which are ASCII art in the CP437 codepage
-EAPI=7
-HOMEPAGE=https://otsaloma.io/nfoview/
-INHERIT=distutils-r1 xdg-utils
-IUSE=python_targets_python3_8
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3+
-RDEPEND=dev-python/pygobject:3[python_targets_python3_8(-)?] media-fonts/terminus-font python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 )
-REQUIRED_USE=|| ( python_targets_python3_8 )
-SLOT=0
-SRC_URI=https://github.com/otsaloma/nfoview/archive/1.27.1.tar.gz -> nfoview-1.27.1.tar.gz
-_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=b644e56745a8fc4c2f0b686cd74215c1
diff --git a/metadata/md5-cache/app-text/nfoview-1.28-r1 b/metadata/md5-cache/app-text/nfoview-1.28-r1
deleted file mode 100644
index 6e3674363816..000000000000
--- a/metadata/md5-cache/app-text/nfoview-1.28-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) sys-devel/gettext test? ( dev-python/pygobject:3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] media-fonts/cascadia-code x11-libs/gtk+:3[introspection] >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=dev-python/pygobject:3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Simple viewer for NFO files, which are ASCII art in the CP437 codepage
-EAPI=7
-HOMEPAGE=https://otsaloma.io/nfoview/
-INHERIT=distutils-r1 virtualx xdg
-IUSE=test python_targets_python3_8 python_targets_python3_9 test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3+
-RDEPEND=dev-python/pygobject:3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] media-fonts/cascadia-code x11-libs/gtk+:3[introspection] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/otsaloma/nfoview/archive/1.28.tar.gz -> nfoview-1.28.tar.gz
-_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=51cac78e25c1d3c57e1b3180baabfac1
diff --git a/metadata/md5-cache/app-text/nfoview-1.28.1-r1 b/metadata/md5-cache/app-text/nfoview-1.28.1-r1
new file mode 100644
index 000000000000..9bd7b708bb72
--- /dev/null
+++ b/metadata/md5-cache/app-text/nfoview-1.28.1-r1
@@ -0,0 +1,17 @@
+BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) sys-devel/gettext test? ( dev-python/pygobject:3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] media-fonts/cascadia-code x11-libs/gtk+:3[introspection] >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=dev-python/pygobject:3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DESCRIPTION=Simple viewer for NFO files, which are ASCII art in the CP437 codepage
+EAPI=8
+HOMEPAGE=https://otsaloma.io/nfoview/
+INHERIT=distutils-r1 virtualx xdg
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+RDEPEND=dev-python/pygobject:3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] media-fonts/cascadia-code x11-libs/gtk+:3[introspection] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/otsaloma/nfoview/archive/1.28.1.tar.gz -> nfoview-1.28.1.tar.gz
+_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=bd2a58b6ac21af623c392cd067bc75f3
diff --git a/metadata/md5-cache/app-text/nfoview-9999 b/metadata/md5-cache/app-text/nfoview-9999
deleted file mode 100644
index 55ccf190334e..000000000000
--- a/metadata/md5-cache/app-text/nfoview-9999
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) sys-devel/gettext python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) >=dev-vcs/git-1.8.2.1[curl]
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
-DEPEND=dev-python/pygobject:3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Simple viewer for NFO files, which are ASCII art in the CP437 codepage
-EAPI=7
-HOMEPAGE=https://otsaloma.io/nfoview/
-INHERIT=distutils-r1 xdg git-r3
-IUSE=python_targets_python3_8 python_targets_python3_9
-LICENSE=GPL-3+
-PROPERTIES=live
-RDEPEND=dev-python/pygobject:3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] media-fonts/cascadia-code python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-SLOT=0
-_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=b78f50b1f2797f3fce9c183a187607a9
diff --git a/metadata/md5-cache/app-text/nuspell-3.1.2-r1 b/metadata/md5-cache/app-text/nuspell-3.1.2-r1
deleted file mode 100644
index 53c81bb9bee4..000000000000
--- a/metadata/md5-cache/app-text/nuspell-3.1.2-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=doc? ( || ( app-text/ronn-ng app-text/ronn ) ) dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=dev-libs/icu test? ( >=dev-cpp/catch-2.3.0:0 ) >=dev-libs/boost-1.62[icu,nls]
-DESCRIPTION=Spell checker library and CLI for complex natural languages
-EAPI=7
-HOMEPAGE=https://nuspell.github.io/ https://github.com/nuspell/nuspell
-INHERIT=cmake
-IUSE=doc test
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-3+
-RDEPEND=dev-libs/icu
-RESTRICT=!test? ( test )
-SLOT=0/3
-SRC_URI=https://github.com/nuspell/nuspell/archive/v3.1.2.tar.gz -> nuspell-3.1.2.tar.gz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=862e0e50a7b20196f5b092e5090f027c
diff --git a/metadata/md5-cache/app-text/nuspell-4.0.0-r1 b/metadata/md5-cache/app-text/nuspell-4.0.0-r1
deleted file mode 100644
index 1d08ebd336ce..000000000000
--- a/metadata/md5-cache/app-text/nuspell-4.0.0-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=doc? ( || ( app-text/ronn-ng app-text/ronn ) ) dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=dev-libs/icu test? ( >=dev-cpp/catch-2.3.0:0 ) >=dev-libs/boost-1.62[icu,nls]
-DESCRIPTION=Spell checker library and CLI for complex natural languages
-EAPI=7
-HOMEPAGE=https://nuspell.github.io/ https://github.com/nuspell/nuspell
-INHERIT=cmake
-IUSE=doc test
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-3+
-RDEPEND=dev-libs/icu
-RESTRICT=!test? ( test )
-SLOT=0/4
-SRC_URI=https://github.com/nuspell/nuspell/archive/v4.0.0.tar.gz -> nuspell-4.0.0.tar.gz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=c7e3d644afdce1d1a744595a7048e662
diff --git a/metadata/md5-cache/app-text/nuspell-4.0.1 b/metadata/md5-cache/app-text/nuspell-4.0.1
deleted file mode 100644
index 526ff7506606..000000000000
--- a/metadata/md5-cache/app-text/nuspell-4.0.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=dev-libs/icu doc? ( app-text/pandoc ) test? ( >=dev-cpp/catch-2.3.0:0 ) >=dev-libs/boost-1.62[icu,nls]
-DESCRIPTION=Spell checker library and CLI for complex natural languages
-EAPI=7
-HOMEPAGE=https://nuspell.github.io/ https://github.com/nuspell/nuspell
-INHERIT=cmake
-IUSE=doc test
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-3+
-RDEPEND=dev-libs/icu
-RESTRICT=!test? ( test )
-SLOT=0/4
-SRC_URI=https://github.com/nuspell/nuspell/archive/v4.0.1.tar.gz -> nuspell-4.0.1.tar.gz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=6e6f50fc524038ca24d8e66a27fa2f14
diff --git a/metadata/md5-cache/app-text/nuspell-4.1.0 b/metadata/md5-cache/app-text/nuspell-4.1.0
deleted file mode 100644
index 14e1c6e6d2d8..000000000000
--- a/metadata/md5-cache/app-text/nuspell-4.1.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=dev-libs/icu doc? ( app-text/pandoc ) test? ( >=dev-cpp/catch-2.3.0:0 ) >=dev-libs/boost-1.62[icu,nls]
-DESCRIPTION=Spell checker library and CLI for complex natural languages
-EAPI=7
-HOMEPAGE=https://nuspell.github.io/ https://github.com/nuspell/nuspell
-INHERIT=cmake
-IUSE=doc test
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-3+
-RDEPEND=dev-libs/icu
-RESTRICT=!test? ( test )
-SLOT=0/4
-SRC_URI=https://github.com/nuspell/nuspell/archive/v4.1.0.tar.gz -> nuspell-4.1.0.tar.gz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=6e6f50fc524038ca24d8e66a27fa2f14
diff --git a/metadata/md5-cache/app-text/nuspell-4.2.0 b/metadata/md5-cache/app-text/nuspell-4.2.0
deleted file mode 100644
index 1bd03574d5b0..000000000000
--- a/metadata/md5-cache/app-text/nuspell-4.2.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=dev-libs/icu doc? ( app-text/pandoc ) test? ( >=dev-cpp/catch-2.3.0:0 )
-DESCRIPTION=Spell checker library and CLI for complex natural languages
-EAPI=7
-HOMEPAGE=https://nuspell.github.io/ https://github.com/nuspell/nuspell
-INHERIT=cmake
-IUSE=doc test
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-3+
-RDEPEND=dev-libs/icu
-RESTRICT=!test? ( test )
-SLOT=0/4
-SRC_URI=https://github.com/nuspell/nuspell/archive/v4.2.0.tar.gz -> nuspell-4.2.0.tar.gz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=121fbde0e1394b2ddafa4e17e0ae854c
diff --git a/metadata/md5-cache/app-text/nuspell-5.0.0 b/metadata/md5-cache/app-text/nuspell-5.0.0
deleted file mode 100644
index 8295bf20b00c..000000000000
--- a/metadata/md5-cache/app-text/nuspell-5.0.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=>=dev-libs/icu-59 doc? ( app-text/pandoc ) test? ( >=dev-cpp/catch-2.3.0:0 )
-DESCRIPTION=Spell checker library and CLI for complex natural languages
-EAPI=7
-HOMEPAGE=https://nuspell.github.io/ https://github.com/nuspell/nuspell
-INHERIT=cmake
-IUSE=doc test
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-3+
-RDEPEND=>=dev-libs/icu-59
-RESTRICT=!test? ( test )
-SLOT=0/5
-SRC_URI=https://github.com/nuspell/nuspell/archive/v5.0.0.tar.gz -> nuspell-5.0.0.tar.gz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=401b58eeb46a96042a184ba0e4614358
diff --git a/metadata/md5-cache/app-text/nuspell-5.0.1 b/metadata/md5-cache/app-text/nuspell-5.0.1
deleted file mode 100644
index b051d9ace7db..000000000000
--- a/metadata/md5-cache/app-text/nuspell-5.0.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=>=dev-libs/icu-60 doc? ( app-text/pandoc ) test? ( >=dev-cpp/catch-2.3.0:0 )
-DESCRIPTION=Spell checker library and CLI for complex natural languages
-EAPI=7
-HOMEPAGE=https://nuspell.github.io/ https://github.com/nuspell/nuspell
-INHERIT=cmake
-IUSE=doc test
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-3+
-RDEPEND=>=dev-libs/icu-60
-RESTRICT=!test? ( test )
-SLOT=0/5
-SRC_URI=https://github.com/nuspell/nuspell/archive/v5.0.1.tar.gz -> nuspell-5.0.1.tar.gz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=fbd9be24ab6d81eafcbde88951430883
diff --git a/metadata/md5-cache/app-text/nuspell-5.1.0 b/metadata/md5-cache/app-text/nuspell-5.1.0
index b155610ac752..c35fc99540a9 100644
--- a/metadata/md5-cache/app-text/nuspell-5.1.0
+++ b/metadata/md5-cache/app-text/nuspell-5.1.0
@@ -1,4 +1,4 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install postinst prepare test
 DEPEND=>=dev-libs/icu-60 doc? ( app-text/pandoc ) test? ( >=dev-cpp/catch-2.3.0:0 )
 DESCRIPTION=Spell checker library and CLI for complex natural languages
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://nuspell.github.io/ https://github.com/nuspell/nuspell
 INHERIT=cmake
 IUSE=doc test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~riscv x86
 LICENSE=LGPL-3+
 RDEPEND=>=dev-libs/icu-60
 RESTRICT=!test? ( test )
 SLOT=0/5
 SRC_URI=https://github.com/nuspell/nuspell/archive/v5.1.0.tar.gz -> nuspell-5.1.0.tar.gz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=d6dd6dea8faeec822554765fe027a784
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=ec6b64ae474a21d67f16bc113f1d4b60
diff --git a/metadata/md5-cache/app-text/o3read-0.0.4 b/metadata/md5-cache/app-text/o3read-0.0.4
index 82e3e1b5a15e..2f66a288ffb0 100644
--- a/metadata/md5-cache/app-text/o3read-0.0.4
+++ b/metadata/md5-cache/app-text/o3read-0.0.4
@@ -2,10 +2,11 @@ DEFINED_PHASES=configure install
 DESCRIPTION=Converts OpenOffice formats to text or HTML
 EAPI=7
 HOMEPAGE=http://siag.nu/o3read/
+INHERIT=toolchain-funcs
 KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-2
 RESTRICT=test
 SLOT=0
 SRC_URI=http://siag.nu/pub/o3read/o3read-0.0.4.tar.gz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=cd68624a7b922e51112b55d946590a1e
diff --git a/metadata/md5-cache/app-text/ocrad-0.27 b/metadata/md5-cache/app-text/ocrad-0.27
index a5bdac19ef2d..481ee5b39af5 100644
--- a/metadata/md5-cache/app-text/ocrad-0.27
+++ b/metadata/md5-cache/app-text/ocrad-0.27
@@ -3,9 +3,10 @@ DEFINED_PHASES=compile configure install unpack
 DESCRIPTION=GNU Ocrad is an OCR (Optical Character Recognition) program
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/ocrad/ocrad.html
+INHERIT=unpacker toolchain-funcs
 KEYWORDS=~alpha amd64 ppc ppc64 ~sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://nongnu/ocrad/ocrad-0.27.tar.lz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	unpacker	697382d119fd3d195f110b7979184285
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	unpacker	697382d119fd3d195f110b7979184285
 _md5_=3f3d477df6a7c2dc40984ec4cd16167e
diff --git a/metadata/md5-cache/app-text/odt2txt-0.5 b/metadata/md5-cache/app-text/odt2txt-0.5
index c389ad167ac2..2ed0b1500d12 100644
--- a/metadata/md5-cache/app-text/odt2txt-0.5
+++ b/metadata/md5-cache/app-text/odt2txt-0.5
@@ -3,10 +3,11 @@ DEPEND=!app-office/unoconv sys-libs/zlib virtual/libiconv sys-apps/groff
 DESCRIPTION=A simple converter from OpenDocument Text to plain text
 EAPI=6
 HOMEPAGE=http://stosberg.net/odt2txt/
+INHERIT=toolchain-funcs
 KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=!app-office/unoconv sys-libs/zlib virtual/libiconv
 SLOT=0
 SRC_URI=https://github.com/dstosberg/odt2txt/archive/v0.5.tar.gz -> odt2txt-0.5.tar.gz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=6e9407dc86ea45cbff06d6f8a25eea4d
diff --git a/metadata/md5-cache/app-text/openjade-1.3.2-r9 b/metadata/md5-cache/app-text/openjade-1.3.2-r9
index e9c7ee62fab2..b296a73dad0f 100644
--- a/metadata/md5-cache/app-text/openjade-1.3.2-r9
+++ b/metadata/md5-cache/app-text/openjade-1.3.2-r9
@@ -4,10 +4,11 @@ DEPEND=app-text/sgml-common >=app-text/opensp-1.5.1 dev-lang/perl
 DESCRIPTION=Jade is an implementation of DSSSL for formatting SGML and XML documents
 EAPI=7
 HOMEPAGE=http://openjade.sourceforge.net
-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 ~x64-solaris ~x86-solaris
+INHERIT=autotools flag-o-matic sgml-catalog-r1 toolchain-funcs
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=app-text/sgml-common >=app-text/opensp-1.5.1 >=app-text/sgml-common-0.6.3-r7
 SLOT=0
 SRC_URI=https://downloads.sourceforge.net/project/openjade/openjade/1.3.2/openjade-1.3.2.tar.gz
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	sgml-catalog-r1	5d1d74baed1e6235b9a698917e954236	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=86651bf54834bad0a292d664a18a66d2
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	sgml-catalog-r1	5d1d74baed1e6235b9a698917e954236	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_md5_=0db35bbcc9b09e0c287abefd42c40ab1
diff --git a/metadata/md5-cache/app-text/openpaperwork-core-2.1.0 b/metadata/md5-cache/app-text/openpaperwork-core-2.1.0
index f94d0d73545a..7bf5caf9f903 100644
--- a/metadata/md5-cache/app-text/openpaperwork-core-2.1.0
+++ b/metadata/md5-cache/app-text/openpaperwork-core-2.1.0
@@ -12,5 +12,5 @@ RDEPEND=dev-python/distro[python_targets_python3_8(-)?,python_targets_python3_9(
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/o/openpaperwork-core/openpaperwork-core-2.1.0.tar.gz
-_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=ba5c5a12480962dac5570c4340bb7411
diff --git a/metadata/md5-cache/app-text/openpaperwork-core-2.1.1 b/metadata/md5-cache/app-text/openpaperwork-core-2.1.1
index a8cdb11dd458..ddcbd10e980d 100644
--- a/metadata/md5-cache/app-text/openpaperwork-core-2.1.1
+++ b/metadata/md5-cache/app-text/openpaperwork-core-2.1.1
@@ -12,5 +12,5 @@ RDEPEND=dev-python/distro[python_targets_python3_8(-)?,python_targets_python3_9(
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/o/openpaperwork-core/openpaperwork-core-2.1.1.tar.gz
-_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=5aa4806b6facd8f949590f7fc0b2ca72
diff --git a/metadata/md5-cache/app-text/openpaperwork-gtk-2.1.0-r1 b/metadata/md5-cache/app-text/openpaperwork-gtk-2.1.0-r1
index 5b3876226753..4121a16dc809 100644
--- a/metadata/md5-cache/app-text/openpaperwork-gtk-2.1.0-r1
+++ b/metadata/md5-cache/app-text/openpaperwork-gtk-2.1.0-r1
@@ -12,5 +12,5 @@ RDEPEND=dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/o/openpaperwork-gtk/openpaperwork-gtk-2.1.0.tar.gz
-_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=e03d7d46b6242ee80ea0c53cdde80ba8
diff --git a/metadata/md5-cache/app-text/openpaperwork-gtk-2.1.1 b/metadata/md5-cache/app-text/openpaperwork-gtk-2.1.1
index 8cf2d00a71d3..7a4ad19e9062 100644
--- a/metadata/md5-cache/app-text/openpaperwork-gtk-2.1.1
+++ b/metadata/md5-cache/app-text/openpaperwork-gtk-2.1.1
@@ -12,5 +12,5 @@ RDEPEND=dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/o/openpaperwork-gtk/openpaperwork-gtk-2.1.1.tar.gz
-_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=e03d7d46b6242ee80ea0c53cdde80ba8
diff --git a/metadata/md5-cache/app-text/opensp-1.5.2-r7 b/metadata/md5-cache/app-text/opensp-1.5.2-r7
index c7f8c062b83c..6a4240cc012c 100644
--- a/metadata/md5-cache/app-text/opensp-1.5.2-r7
+++ b/metadata/md5-cache/app-text/opensp-1.5.2-r7
@@ -4,6 +4,7 @@ DEPEND=elibc_glibc? ( net-libs/libnsl:0= )
 DESCRIPTION=A free, object-oriented toolkit for SGML parsing and entity management
 EAPI=8
 HOMEPAGE=http://openjade.sourceforge.net/
+INHERIT=autotools flag-o-matic
 IUSE=doc nls static-libs test
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
@@ -11,5 +12,5 @@ RDEPEND=elibc_glibc? ( net-libs/libnsl:0= )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/openjade/OpenSP-1.5.2.tar.gz
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=faac63d15076c039b6a4df3fd7242ca7
diff --git a/metadata/md5-cache/app-text/pandoc-2.11.3.1 b/metadata/md5-cache/app-text/pandoc-2.11.3.1
index d4757756e0f1..80f08543a231 100644
--- a/metadata/md5-cache/app-text/pandoc-2.11.3.1
+++ b/metadata/md5-cache/app-text/pandoc-2.11.3.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-haskell/aeson-0.7:=[profile?] <dev-haskell/aeson-1.6:=[profile?] >
 RESTRICT=test
 SLOT=0/2.11.3.1
 SRC_URI=https://hackage.haskell.org/package/pandoc-2.11.3.1/pandoc-2.11.3.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	ebeaf198ca6bf70c43b10488b7cdcdcf	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	81cdafdd21e27dfc13f0f7b4947fa145	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=7ea41d3a8458f3217a17d84948035713
diff --git a/metadata/md5-cache/app-text/pandoc-2.13 b/metadata/md5-cache/app-text/pandoc-2.13
index 278159e1a4d9..828ff5b104d2 100644
--- a/metadata/md5-cache/app-text/pandoc-2.13
+++ b/metadata/md5-cache/app-text/pandoc-2.13
@@ -11,5 +11,5 @@ RDEPEND=>=dev-haskell/aeson-0.7:=[profile?] <dev-haskell/aeson-1.6:=[profile?] >
 RESTRICT=test
 SLOT=0/2.13
 SRC_URI=https://hackage.haskell.org/package/pandoc-2.13/pandoc-2.13.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	ebeaf198ca6bf70c43b10488b7cdcdcf	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	81cdafdd21e27dfc13f0f7b4947fa145	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=6c2733eba84471b8275db9869ba89d35
diff --git a/metadata/md5-cache/app-text/pandoc-2.9.2.1 b/metadata/md5-cache/app-text/pandoc-2.9.2.1
index 73fa9683b649..e677bbcdace1 100644
--- a/metadata/md5-cache/app-text/pandoc-2.9.2.1
+++ b/metadata/md5-cache/app-text/pandoc-2.9.2.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-haskell/aeson-0.7:=[profile?] <dev-haskell/aeson-1.5:=[profile?] >
 RESTRICT=test
 SLOT=0/2.9.2.1
 SRC_URI=https://hackage.haskell.org/package/pandoc-2.9.2.1/pandoc-2.9.2.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	ebeaf198ca6bf70c43b10488b7cdcdcf	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	81cdafdd21e27dfc13f0f7b4947fa145	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=bb5336639ac3e4582f53ebc476a3a883
diff --git a/metadata/md5-cache/app-text/pandoc-bin-2.18 b/metadata/md5-cache/app-text/pandoc-bin-2.18
new file mode 100644
index 000000000000..a44a3c99e9b3
--- /dev/null
+++ b/metadata/md5-cache/app-text/pandoc-bin-2.18
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install unpack
+DESCRIPTION=Conversion between markup formats (binary package)
+EAPI=8
+HOMEPAGE=https://pandoc.org/
+IUSE=+pandoc-symlink
+KEYWORDS=-* ~amd64
+LICENSE=GPL-2
+RDEPEND=pandoc-symlink? ( !app-text/pandoc )
+SLOT=0
+SRC_URI=amd64? ( https://github.com/jgm/pandoc/releases/download/2.18/pandoc-2.18-linux-amd64.tar.gz ) arm64? ( https://github.com/jgm/pandoc/releases/download/2.18/pandoc-2.18-linux-arm64.tar.gz )
+_md5_=ab5af9c764c285ff5abbc4af6c0e681e
diff --git a/metadata/md5-cache/app-text/paperwork-2.1.0 b/metadata/md5-cache/app-text/paperwork-2.1.0
index e5b7dde1e5b5..501843431a6c 100644
--- a/metadata/md5-cache/app-text/paperwork-2.1.0
+++ b/metadata/md5-cache/app-text/paperwork-2.1.0
@@ -12,5 +12,5 @@ RDEPEND=~app-text/openpaperwork-core-2.1.0[python_targets_python3_8(-)?,python_t
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/p/paperwork/paperwork-2.1.0.tar.gz
-_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=8cf3f5444f41d20d1536f489211f9f24
+_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=042c5ca355a98ff06d630baff6a0b51f
diff --git a/metadata/md5-cache/app-text/paperwork-2.1.1 b/metadata/md5-cache/app-text/paperwork-2.1.1
index 7bf7fa0b3ae7..bcd74bbdc860 100644
--- a/metadata/md5-cache/app-text/paperwork-2.1.1
+++ b/metadata/md5-cache/app-text/paperwork-2.1.1
@@ -12,5 +12,5 @@ RDEPEND=~app-text/openpaperwork-core-2.1.1[python_targets_python3_8(-)?,python_t
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/p/paperwork/paperwork-2.1.1.tar.gz
-_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=13fa5815cf99df1f7ed6b7612374a6eb
+_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=4ea48931c4ab6f4c16ee8062e9b6a654
diff --git a/metadata/md5-cache/app-text/paperwork-backend-2.1.0 b/metadata/md5-cache/app-text/paperwork-backend-2.1.0
index fa43860f45ef..587a2e44d2a9 100644
--- a/metadata/md5-cache/app-text/paperwork-backend-2.1.0
+++ b/metadata/md5-cache/app-text/paperwork-backend-2.1.0
@@ -12,5 +12,5 @@ RDEPEND=app-text/poppler[introspection] dev-python/distro[python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/p/paperwork-backend/paperwork-backend-2.1.0.tar.gz
-_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=3de151396059d342a398efc9178a4807
diff --git a/metadata/md5-cache/app-text/paperwork-backend-2.1.1 b/metadata/md5-cache/app-text/paperwork-backend-2.1.1
index ec032108e2d0..54d1545d0a7a 100644
--- a/metadata/md5-cache/app-text/paperwork-backend-2.1.1
+++ b/metadata/md5-cache/app-text/paperwork-backend-2.1.1
@@ -12,5 +12,5 @@ RDEPEND=app-text/poppler[introspection] dev-python/distro[python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/p/paperwork-backend/paperwork-backend-2.1.1.tar.gz
-_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=24ea431a17c53c8f2169d91e2811f223
diff --git a/metadata/md5-cache/app-text/paps-0.6.8-r2 b/metadata/md5-cache/app-text/paps-0.6.8-r2
index b6345b42bf52..168a6b14df1d 100644
--- a/metadata/md5-cache/app-text/paps-0.6.8-r2
+++ b/metadata/md5-cache/app-text/paps-0.6.8-r2
@@ -4,10 +4,11 @@ DEPEND=x11-libs/pango
 DESCRIPTION=Unicode-aware text to PostScript converter
 EAPI=7
 HOMEPAGE=http://paps.sourceforge.net/
+INHERIT=autotools
 KEYWORDS=amd64 x86
 LICENSE=LGPL-2
 RDEPEND=x11-libs/pango
 SLOT=0
 SRC_URI=mirror://sourceforge/paps/paps-0.6.8.tar.gz
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=fbd21cc1c8199466e93847a87d6fbb4d
diff --git a/metadata/md5-cache/app-text/par-1.53.0 b/metadata/md5-cache/app-text/par-1.53.0
index 3542d592dfa4..96b0c4225880 100644
--- a/metadata/md5-cache/app-text/par-1.53.0
+++ b/metadata/md5-cache/app-text/par-1.53.0
@@ -3,9 +3,10 @@ DEPEND=!dev-util/par !app-arch/par
 DESCRIPTION=a paragraph reformatter, vaguely similar to fmt, but better
 EAPI=7
 HOMEPAGE=http://www.nicemice.net/par/
+INHERIT=toolchain-funcs
 KEYWORDS=~amd64 ~mips ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=|| ( MIT par )
 SLOT=0
 SRC_URI=http://www.nicemice.net/par/Par-1.53.0.tar.gz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=f05d27c9bd6818133d2b2667133733d3
diff --git a/metadata/md5-cache/app-text/pastebinit-1.5.1 b/metadata/md5-cache/app-text/pastebinit-1.5.1
index 35a17b0eb2ee..ea524e2f5541 100644
--- a/metadata/md5-cache/app-text/pastebinit-1.5.1
+++ b/metadata/md5-cache/app-text/pastebinit-1.5.1
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[xml
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 SLOT=0
 SRC_URI=mirror://ubuntu/pool/main/p/pastebinit/pastebinit_1.5.1.orig.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=98e6022b108ec0dcf761094a80e07e2a
diff --git a/metadata/md5-cache/app-text/pdf2html-1.4 b/metadata/md5-cache/app-text/pdf2html-1.4
index 6c662d68003e..a3ade4edd633 100644
--- a/metadata/md5-cache/app-text/pdf2html-1.4
+++ b/metadata/md5-cache/app-text/pdf2html-1.4
@@ -3,10 +3,11 @@ DEPEND=>=media-libs/libpng-1.4 sys-libs/zlib
 DESCRIPTION=Converts pdf files to html files
 EAPI=7
 HOMEPAGE=http://atrey.karlin.mff.cuni.cz/~clock/twibright/pdf2html/
+INHERIT=toolchain-funcs
 KEYWORDS=~alpha amd64 ~ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-2
 RDEPEND=>=media-libs/libpng-1.4 sys-libs/zlib app-text/ghostscript-gpl >=media-gfx/imagemagick-6
 SLOT=0
 SRC_URI=ftp://atrey.karlin.mff.cuni.cz/pub/local/clock/pdf2html/pdf2html-1.4.tgz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=c4873b43c0416fecc761f2c390452250
diff --git a/metadata/md5-cache/app-text/pdfarranger-1.8.2 b/metadata/md5-cache/app-text/pdfarranger-1.8.2
index 7ba3e661c4f9..6f21739c5f23 100644
--- a/metadata/md5-cache/app-text/pdfarranger-1.8.2
+++ b/metadata/md5-cache/app-text/pdfarranger-1.8.2
@@ -12,5 +12,5 @@ RDEPEND=app-text/poppler[introspection,cairo] dev-python/pikepdf[python_targets_
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=https://github.com/jeromerobert/pdfarranger/archive/1.8.2.tar.gz -> pdfarranger-1.8.2.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	d524f291c80f9d21ad80fe978e3ca760	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	d524f291c80f9d21ad80fe978e3ca760	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=27262624c42099acf5f53addaf40e586
diff --git a/metadata/md5-cache/app-text/pdfminer-20191020 b/metadata/md5-cache/app-text/pdfminer-20191020
index 1215ecdbc048..e87741824917 100644
--- a/metadata/md5-cache/app-text/pdfminer-20191020
+++ b/metadata/md5-cache/app-text/pdfminer-20191020
@@ -11,5 +11,5 @@ RDEPEND=dev-python/pycryptodome[python_targets_python3_8(-)?,python_targets_pyth
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pdfminer/pdfminer-20191020.tar.gz
-_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=b3020a98f2d85353ea61c3a08c43d2c3
diff --git a/metadata/md5-cache/app-text/pdfminer-20220506 b/metadata/md5-cache/app-text/pdfminer-20220506
new file mode 100644
index 000000000000..7cc99d6ee12e
--- /dev/null
+++ b/metadata/md5-cache/app-text/pdfminer-20220506
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=dev-python/charset_normalizer-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/cryptography-36.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Python tool for extracting information from PDF documents
+EAPI=8
+HOMEPAGE=https://pdfminersix.readthedocs.io/en/latest/
+INHERIT=distutils-r1
+IUSE=doc examples test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=amd64 x86
+LICENSE=MIT
+RDEPEND=>=dev-python/charset_normalizer-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/cryptography-36.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/pdfminer/pdfminer.six/archive/refs/tags/20220506.tar.gz -> pdfminer-20220506.tar.gz
+_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=48b4c1d33c05eea7a16ce7c69265906a
diff --git a/metadata/md5-cache/app-text/pdftk-3.3.2 b/metadata/md5-cache/app-text/pdftk-3.3.2
index abed552d7d9f..7475e52c3c72 100644
--- a/metadata/md5-cache/app-text/pdftk-3.3.2
+++ b/metadata/md5-cache/app-text/pdftk-3.3.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-java/bcprov:0 dev-java/commons-lang:3.6 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=https://gitlab.com/pdftk-java/pdftk/-/archive/v3.3.2/pdftk-v3.3.2.tar.bz2
-_eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	e38ea02d8ed864a74078ecf46aa06f30	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	cfb5f6911bb70204c94ceafd0372c716	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=24dfcf509ae9c84ec986bb0d9488a5bd
diff --git a/metadata/md5-cache/app-text/pdftk-9999 b/metadata/md5-cache/app-text/pdftk-9999
index 8d91cd1c9250..5d44d84e3b46 100644
--- a/metadata/md5-cache/app-text/pdftk-9999
+++ b/metadata/md5-cache/app-text/pdftk-9999
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=dev-java/bcprov:0 dev-java/commons-lang:3.6 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3
 SLOT=0
-_eclasses_=git-r3	b9ac6f96d2a88edb5b351df634dc5e53	java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	e38ea02d8ed864a74078ecf46aa06f30	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=git-r3	b9ac6f96d2a88edb5b351df634dc5e53	java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	cfb5f6911bb70204c94ceafd0372c716	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=fcdf62302dc590d1fda658bcc6ac15f4
diff --git a/metadata/md5-cache/app-text/pelican-4.5.3 b/metadata/md5-cache/app-text/pelican-4.5.3
deleted file mode 100644
index f330faabf8cd..000000000000
--- a/metadata/md5-cache/app-text/pelican-4.5.3
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( >=dev-python/feedgenerator-1.9[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/jinja-2.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pygments[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytz[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/unidecode[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/blinker[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/six-1.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?] doc? ( dev-python/sphinx[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) markdown? ( dev-python/markdown[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) >=dev-python/nose-1.3.7-r4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( dev-python/markdown[python_targets_python3_8(-)?,python_targets_python3_9(-)?] )
-DESCRIPTION=A tool to generate a static blog, with restructured text or markdown input files
-EAPI=7
-HOMEPAGE=https://blog.getpelican.com/ https://pypi.org/project/pelican/
-INHERIT=distutils-r1
-IUSE=doc examples markdown test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 x86
-LICENSE=AGPL-3
-RDEPEND=>=dev-python/feedgenerator-1.9[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/jinja-2.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pygments[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytz[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/unidecode[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/blinker[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/six-1.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?] doc? ( dev-python/sphinx[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) markdown? ( dev-python/markdown[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=test !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/getpelican/pelican/archive/4.5.3.tar.gz -> pelican-4.5.3.tar.gz
-_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=651cf8e5c7d25d2a3ebf5c4cc259c529
diff --git a/metadata/md5-cache/app-text/pelican-4.7.2-r1 b/metadata/md5-cache/app-text/pelican-4.7.2-r1
index a96b068428b3..5402f387fc3e 100644
--- a/metadata/md5-cache/app-text/pelican-4.7.2-r1
+++ b/metadata/md5-cache/app-text/pelican-4.7.2-r1
@@ -5,12 +5,12 @@ EAPI=7
 HOMEPAGE=https://blog.getpelican.com/ https://pypi.org/project/pelican/
 INHERIT=distutils-r1
 IUSE=doc examples markdown test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~riscv ~x86
+KEYWORDS=amd64 ~riscv x86
 LICENSE=AGPL-3
 RDEPEND=>=dev-python/docutils-0.16[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/blinker-1.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/feedgenerator-1.9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jinja-2.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pygments-2.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-dateutil-2.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytz-2020.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/rich-10.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/unidecode-1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] doc? ( dev-python/sphinx[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) markdown? ( >=dev-python/markdown-3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/getpelican/pelican/archive/4.7.2.tar.gz -> pelican-4.7.2.tar.gz
-_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=cc667b49659bed5f9faa25a8722d3c42
+_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=55b7e8d0fafb2115ef039c1d3a17750c
diff --git a/metadata/md5-cache/app-text/pelican-9999 b/metadata/md5-cache/app-text/pelican-9999
index d117b3a1ead8..b5dbc1185a1d 100644
--- a/metadata/md5-cache/app-text/pelican-9999
+++ b/metadata/md5-cache/app-text/pelican-9999
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/docutils-0.16[python_targets_python3_8(-)?,python_targets_p
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=test !test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=816f85d5d9f9f3199c83529e490dee25
diff --git a/metadata/md5-cache/app-text/pep-2.8-r2 b/metadata/md5-cache/app-text/pep-2.8-r2
index a4ab944857a6..841c3521cca4 100644
--- a/metadata/md5-cache/app-text/pep-2.8-r2
+++ b/metadata/md5-cache/app-text/pep-2.8-r2
@@ -3,9 +3,10 @@ DEFINED_PHASES=compile install prepare
 DESCRIPTION=General purpose filter and file cleaning program
 EAPI=7
 HOMEPAGE=https://hannemyr.com/enjoy/pep.html
+INHERIT=toolchain-funcs flag-o-matic
 KEYWORDS=amd64 ~mips ppc x86 ~x86-linux ~ppc-macos
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://hannemyr.com/enjoy/pep28.zip -> pep-2.8.zip
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=3cb68fecab866c74f0b0a94c028e91e4
diff --git a/metadata/md5-cache/app-text/pinfo-0.6.13 b/metadata/md5-cache/app-text/pinfo-0.6.13
index 1530e68fe652..008c51052a24 100644
--- a/metadata/md5-cache/app-text/pinfo-0.6.13
+++ b/metadata/md5-cache/app-text/pinfo-0.6.13
@@ -4,11 +4,12 @@ DEPEND=sys-libs/ncurses:0= sys-libs/readline:0= nls? ( virtual/libintl ) sys-app
 DESCRIPTION=Hypertext info and man viewer based on (n)curses
 EAPI=7
 HOMEPAGE=https://github.com/baszoetekouw/pinfo
+INHERIT=autotools flag-o-matic
 IUSE=nls readline
 KEYWORDS=~alpha amd64 ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86
 LICENSE=GPL-2
 RDEPEND=sys-libs/ncurses:0= sys-libs/readline:0= nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=https://github.com/baszoetekouw/pinfo/archive/v0.6.13.tar.gz -> pinfo-0.6.13.tar.gz
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=cd3007a8109bd8317d5473535ef98980
diff --git a/metadata/md5-cache/app-text/pinfo-99999 b/metadata/md5-cache/app-text/pinfo-99999
index 9e25385483b1..c0d3336b9d93 100644
--- a/metadata/md5-cache/app-text/pinfo-99999
+++ b/metadata/md5-cache/app-text/pinfo-99999
@@ -4,10 +4,11 @@ DEPEND=sys-libs/ncurses:0= sys-libs/readline:0= nls? ( virtual/libintl ) sys-app
 DESCRIPTION=Hypertext info and man viewer based on (n)curses
 EAPI=7
 HOMEPAGE=https://github.com/baszoetekouw/pinfo
+INHERIT=autotools flag-o-matic git-r3
 IUSE=nls readline
 LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=sys-libs/ncurses:0= sys-libs/readline:0= nls? ( virtual/libintl )
 SLOT=0
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=41b240e39456e14a3a3b815adbd8f738
diff --git a/metadata/md5-cache/app-text/podofo-0.9.6_p20190928-r100 b/metadata/md5-cache/app-text/podofo-0.9.6_p20190928-r100
index 49fa81d000fd..3790b21c4951 100644
--- a/metadata/md5-cache/app-text/podofo-0.9.6_p20190928-r100
+++ b/metadata/md5-cache/app-text/podofo-0.9.6_p20190928-r100
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig boost? ( dev-util/boost-build ) dev-util/ninja >=dev-util/cmake-3.20.5
+BDEPEND=virtual/pkgconfig boost? ( dev-util/boost-build ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) 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:= test? ( dev-util/cppunit )
 DESCRIPTION=PoDoFo is a C++ library to work with the PDF file format
@@ -13,5 +13,5 @@ REQUIRED_USE=^^ ( lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_t
 RESTRICT=!test? ( test )
 SLOT=0/0.9.6
 SRC_URI=https://dev.gentoo.org/~zmedico/dist/podofo-0.9.6_p20190928.tar.xz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=9d68907403461d90b30b158a820e95d8
diff --git a/metadata/md5-cache/app-text/podofo-0.9.7 b/metadata/md5-cache/app-text/podofo-0.9.7
index cf28e2a847cd..8b2d5f596087 100644
--- a/metadata/md5-cache/app-text/podofo-0.9.7
+++ b/metadata/md5-cache/app-text/podofo-0.9.7
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig boost? ( dev-util/boost-build ) dev-util/ninja >=dev-util/cmake-3.20.5
+BDEPEND=virtual/pkgconfig boost? ( dev-util/boost-build ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) 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:= test? ( dev-util/cppunit )
 DESCRIPTION=PoDoFo is a C++ library to work with the PDF file format
@@ -13,5 +13,5 @@ REQUIRED_USE=^^ ( lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_t
 RESTRICT=test
 SLOT=0/0.9.7
 SRC_URI=https://cfhcable.dl.sourceforge.net/project/podofo/podofo/0.9.7/podofo-0.9.7.tar.gz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=d691cfce01f86169a6ef6585bc313bab
diff --git a/metadata/md5-cache/app-text/poppler-22.03.0 b/metadata/md5-cache/app-text/poppler-22.03.0
deleted file mode 100644
index f3189d8ab995..000000000000
--- a/metadata/md5-cache/app-text/poppler-22.03.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/glib-utils virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare 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 ) boost? ( dev-libs/boost )
-DESCRIPTION=PDF rendering library based on the xpdf-3.0 code base
-EAPI=8
-HOMEPAGE=https://poppler.freedesktop.org/
-INHERIT=cmake toolchain-funcs xdg-utils
-IUSE=boost cairo cjk curl +cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt5 tiff +utils
-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
-LICENSE=GPL-2
-RDEPEND=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 ) cjk? ( app-text/poppler-data )
-RESTRICT=test
-SLOT=0/119
-SRC_URI=https://poppler.freedesktop.org/poppler-22.03.0.tar.xz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=21cb38f8b474b0220f56031c35175e5a
diff --git a/metadata/md5-cache/app-text/poppler-22.05.0 b/metadata/md5-cache/app-text/poppler-22.05.0
index 067272b72e34..f7c388f2a0bb 100644
--- a/metadata/md5-cache/app-text/poppler-22.05.0
+++ b/metadata/md5-cache/app-text/poppler-22.05.0
@@ -1,4 +1,4 @@
-BDEPEND=dev-util/glib-utils virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.20.5
+BDEPEND=dev-util/glib-utils virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=media-libs/fontconfig >=media-libs/freetype-2.8 sys-libs/zlib cairo? ( dev-libs/glib:2 x11-libs/cairo introspection? ( dev-libs/gobject-introspection:= ) ) curl? ( net-misc/curl ) jpeg? ( media-libs/libjpeg-turbo:= ) 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 ) boost? ( dev-libs/boost )
 DESCRIPTION=PDF rendering library based on the xpdf-3.0 code base
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://poppler.freedesktop.org/
 INHERIT=cmake toolchain-funcs xdg-utils
 IUSE=boost cairo cjk curl +cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt5 tiff +utils
-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 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=media-libs/fontconfig >=media-libs/freetype-2.8 sys-libs/zlib cairo? ( dev-libs/glib:2 x11-libs/cairo introspection? ( dev-libs/gobject-introspection:= ) ) curl? ( net-misc/curl ) jpeg? ( media-libs/libjpeg-turbo:= ) 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 ) cjk? ( app-text/poppler-data )
 RESTRICT=test
 SLOT=0/121
 SRC_URI=https://poppler.freedesktop.org/poppler-22.05.0.tar.xz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=0ff6746a3b0a0135e41b58ea60c4b932
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=8e55604a05375fb4ebf9871ca27afc59
diff --git a/metadata/md5-cache/app-text/poppler-22.06.0 b/metadata/md5-cache/app-text/poppler-22.06.0
new file mode 100644
index 000000000000..a1a6a66cca70
--- /dev/null
+++ b/metadata/md5-cache/app-text/poppler-22.06.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/glib-utils virtual/pkgconfig verify-sig? ( sec-keys/openpgp-keys-aacid ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=media-libs/fontconfig >=media-libs/freetype-2.8 sys-libs/zlib cairo? ( dev-libs/glib:2 x11-libs/cairo introspection? ( dev-libs/gobject-introspection:= ) ) curl? ( net-misc/curl ) jpeg? ( media-libs/libjpeg-turbo:= ) 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 ) boost? ( dev-libs/boost )
+DESCRIPTION=PDF rendering library based on the xpdf-3.0 code base
+EAPI=8
+HOMEPAGE=https://poppler.freedesktop.org/
+INHERIT=cmake toolchain-funcs xdg-utils verify-sig
+IUSE=boost cairo cjk curl +cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt5 tiff +utils verify-sig
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=media-libs/fontconfig >=media-libs/freetype-2.8 sys-libs/zlib cairo? ( dev-libs/glib:2 x11-libs/cairo introspection? ( dev-libs/gobject-introspection:= ) ) curl? ( net-misc/curl ) jpeg? ( media-libs/libjpeg-turbo:= ) 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 ) cjk? ( app-text/poppler-data )
+RESTRICT=test
+SLOT=0/122
+SRC_URI=https://poppler.freedesktop.org/poppler-22.06.0.tar.xz verify-sig? ( https://poppler.freedesktop.org/poppler-22.06.0.tar.xz.sig )
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	verify-sig	0748d665fa664a87add00152ed046e16	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=022c1c57f6ff8ba2f2fb86cd577000a3
diff --git a/metadata/md5-cache/app-text/poppler-9999 b/metadata/md5-cache/app-text/poppler-9999
index 5283cd680c12..83a387f5b69d 100644
--- a/metadata/md5-cache/app-text/poppler-9999
+++ b/metadata/md5-cache/app-text/poppler-9999
@@ -1,4 +1,4 @@
-BDEPEND=dev-util/glib-utils virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=dev-util/glib-utils virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
 DEPEND=media-libs/fontconfig >=media-libs/freetype-2.8 sys-libs/zlib cairo? ( dev-libs/glib:2 x11-libs/cairo introspection? ( dev-libs/gobject-introspection:= ) ) curl? ( net-misc/curl ) jpeg? ( media-libs/libjpeg-turbo:= ) 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 ) boost? ( dev-libs/boost )
 DESCRIPTION=PDF rendering library based on the xpdf-3.0 code base
@@ -11,5 +11,5 @@ PROPERTIES=live
 RDEPEND=media-libs/fontconfig >=media-libs/freetype-2.8 sys-libs/zlib cairo? ( dev-libs/glib:2 x11-libs/cairo introspection? ( dev-libs/gobject-introspection:= ) ) curl? ( net-misc/curl ) jpeg? ( media-libs/libjpeg-turbo:= ) 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 ) cjk? ( app-text/poppler-data )
 RESTRICT=test
 SLOT=0/9999
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=2f68b7588afd261f0fad6b98c061c60e
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=ef13b23d7ed5fe33e77d61d56d58bdb7
diff --git a/metadata/md5-cache/app-text/poppler-data-0.4.11 b/metadata/md5-cache/app-text/poppler-data-0.4.11
index 2840f7a44f1c..6e8aaa667d65 100644
--- a/metadata/md5-cache/app-text/poppler-data-0.4.11
+++ b/metadata/md5-cache/app-text/poppler-data-0.4.11
@@ -2,8 +2,8 @@ DEFINED_PHASES=install
 DESCRIPTION=Data files for poppler to support uncommon encodings without xpdfrc
 EAPI=8
 HOMEPAGE=https://poppler.freedesktop.org/
-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 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD GPL-2 MIT
 SLOT=0
 SRC_URI=https://poppler.freedesktop.org/poppler-data-0.4.11.tar.gz
-_md5_=50f67bf26581c19fe471219b2efb6cb0
+_md5_=bd832b28ae56d2666f3177fde85abcd9
diff --git a/metadata/md5-cache/app-text/ps2eps-1.68 b/metadata/md5-cache/app-text/ps2eps-1.68
index be4a9ccd295d..427a81ec6247 100644
--- a/metadata/md5-cache/app-text/ps2eps-1.68
+++ b/metadata/md5-cache/app-text/ps2eps-1.68
@@ -2,10 +2,11 @@ DEFINED_PHASES=compile configure install
 DESCRIPTION=Generate Encapsulated Postscript Format files from one-page Postscript documents
 EAPI=7
 HOMEPAGE=http://www.tm.uka.de/~bless/ps2eps
+INHERIT=toolchain-funcs
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=app-text/ghostscript-gpl !<app-text/texlive-core-2007-r7
 SLOT=0
 SRC_URI=http://www.tm.uka.de/~bless/ps2eps-1.68.tar.gz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=d565510a7d1584ea2599beb83e66c183
diff --git a/metadata/md5-cache/app-text/ps2pkm-1.8_p20210325-r1 b/metadata/md5-cache/app-text/ps2pkm-1.8_p20210325-r1
index f766765d7895..cf73aa305876 100644
--- a/metadata/md5-cache/app-text/ps2pkm-1.8_p20210325-r1
+++ b/metadata/md5-cache/app-text/ps2pkm-1.8_p20210325-r1
@@ -4,9 +4,9 @@ DEPEND=>=dev-libs/kpathsea-6.2.1:=
 DESCRIPTION=Tool that converts a PostScript type1 font into a corresponding TeX PK font
 EAPI=7
 HOMEPAGE=http://tug.org/texlive/
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=>=dev-libs/kpathsea-6.2.1:=
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~zlogene/distfiles/texlive/texlive-20210325-source.tar.xz
-_md5_=77a0bf6bf2c635cfe0db85a68b45b238
+_md5_=ecd581c22ca6b94c29baf152da85e562
diff --git a/metadata/md5-cache/app-text/psiconv-0.8.3-r1 b/metadata/md5-cache/app-text/psiconv-0.8.3-r1
index fd0ddae1c26d..2d896cdc6935 100644
--- a/metadata/md5-cache/app-text/psiconv-0.8.3-r1
+++ b/metadata/md5-cache/app-text/psiconv-0.8.3-r1
@@ -2,9 +2,10 @@ DEFINED_PHASES=configure install
 DESCRIPTION=An interpreter for Psion 5(MX) file formats
 EAPI=7
 HOMEPAGE=http://huizen.dds.nl/~frodol/psiconv
+INHERIT=toolchain-funcs
 KEYWORDS=~alpha ~amd64 ~hppa ~mips ~ppc ~sparc ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://huizen.dds.nl/~frodol/psiconv/psiconv-0.8.3.tar.gz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=f622f65d8b259ca084c2fa6c3dc96e82
diff --git a/metadata/md5-cache/app-text/pspdftool-0.03 b/metadata/md5-cache/app-text/pspdftool-0.03
index d0534cdddd5f..f1336eef1f5a 100644
--- a/metadata/md5-cache/app-text/pspdftool-0.03
+++ b/metadata/md5-cache/app-text/pspdftool-0.03
@@ -4,11 +4,12 @@ DEPEND=zlib? ( sys-libs/zlib )
 DESCRIPTION=Tool for prepress preparation of PDF and PostScript documents
 EAPI=7
 HOMEPAGE=https://sourceforge.net/projects/pspdftool
+INHERIT=autotools
 IUSE=zlib
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=zlib? ( sys-libs/zlib )
 SLOT=0
 SRC_URI=mirror://sourceforge/pspdftool/pspdftool-0.03.tar.bz2
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=1ce2bdbb3b76bd9f4b3277c89b67f241
diff --git a/metadata/md5-cache/app-text/pspresent-1.3-r1 b/metadata/md5-cache/app-text/pspresent-1.3-r1
index ae501cda759f..3820d1a42c08 100644
--- a/metadata/md5-cache/app-text/pspresent-1.3-r1
+++ b/metadata/md5-cache/app-text/pspresent-1.3-r1
@@ -3,11 +3,12 @@ DEPEND=x11-libs/libX11 xinerama? ( x11-libs/libXinerama ) app-text/ghostscript-g
 DESCRIPTION=A tool to display full-screen PostScript presentations
 EAPI=6
 HOMEPAGE=http://www.cse.unsw.edu.au/~matthewc/pspresent/
+INHERIT=toolchain-funcs
 IUSE=xinerama
 KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2
 RDEPEND=x11-libs/libX11 xinerama? ( x11-libs/libXinerama ) app-text/ghostscript-gpl
 SLOT=0
 SRC_URI=http://www.cse.unsw.edu.au/~matthewc/pspresent/pspresent-1.3.tar.gz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=d07e6ddaf0ee532760563771196b3a11
diff --git a/metadata/md5-cache/app-text/pstotext-1.9-r4 b/metadata/md5-cache/app-text/pstotext-1.9-r4
index 6b6c10750657..64afdf8e3071 100644
--- a/metadata/md5-cache/app-text/pstotext-1.9-r4
+++ b/metadata/md5-cache/app-text/pstotext-1.9-r4
@@ -3,10 +3,11 @@ DEPEND=app-arch/ncompress
 DESCRIPTION=Extract ASCII text from a PostScript or PDF file
 EAPI=6
 HOMEPAGE=http://www.cs.wisc.edu/~ghost/doc/pstotext.htm
+INHERIT=toolchain-funcs
 KEYWORDS=amd64 ~hppa ppc ppc64 x86
 LICENSE=PSTT
 RDEPEND=app-text/ghostscript-gpl
 SLOT=0
 SRC_URI=ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/contrib/pstotext-1.9.tar.gz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=d0c094cc22e000383c3c143180bbef68
diff --git a/metadata/md5-cache/app-text/psutils-1.17-r3 b/metadata/md5-cache/app-text/psutils-1.17-r5
index d7bf7101866a..264335b02acd 100644
--- a/metadata/md5-cache/app-text/psutils-1.17-r3
+++ b/metadata/md5-cache/app-text/psutils-1.17-r5
@@ -1,11 +1,12 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=dev-lang/perl
+BDEPEND=dev-lang/perl
+DEFINED_PHASES=compile install
 DESCRIPTION=PostScript Utilities
-EAPI=6
+EAPI=8
 HOMEPAGE=http://web.archive.org/web/20110722005140/http://www.tardis.ed.ac.uk/~ajcd/psutils/
+INHERIT=toolchain-funcs
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=psutils
 SLOT=0
 SRC_URI=mirror://debian/pool/main/p/psutils/psutils_1.17.dfsg.orig.tar.gz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=bf91105b7247ac69ca1946ded2030a55
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=098bbb3169e6e093be4d972e8a4e5919
diff --git a/metadata/md5-cache/app-text/pytextile-4.0.1 b/metadata/md5-cache/app-text/pytextile-4.0.1
index 6b6dd7796e37..370463a8ad30 100644
--- a/metadata/md5-cache/app-text/pytextile-4.0.1
+++ b/metadata/md5-cache/app-text/pytextile-4.0.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/textile/python-textile/archive/4.0.1.tar.gz -> pytextile-4.0.1.tar.gz
-_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=384d4d833a943a032c6b61e232542580
diff --git a/metadata/md5-cache/app-text/q-text-as-data-2.0.10 b/metadata/md5-cache/app-text/q-text-as-data-2.0.10
index 6be4f1f096fd..3a9585d72d66 100644
--- a/metadata/md5-cache/app-text/q-text-as-data-2.0.10
+++ b/metadata/md5-cache/app-text/q-text-as-data-2.0.10
@@ -11,5 +11,5 @@ RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[sqlite] )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/harelba/q/archive/2.0.10.tar.gz -> q-2.0.10.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=e64646cf33edcfb62f1d38faf4538def
diff --git a/metadata/md5-cache/app-text/qpdf-10.5.0 b/metadata/md5-cache/app-text/qpdf-10.5.0
index 6ed1d991f503..8ad2570ea528 100644
--- a/metadata/md5-cache/app-text/qpdf-10.5.0
+++ b/metadata/md5-cache/app-text/qpdf-10.5.0
@@ -4,6 +4,7 @@ DEPEND=sys-libs/zlib virtual/jpeg:0= ssl? ( gnutls? ( net-libs/gnutls:= ) !gnutl
 DESCRIPTION=Command-line tool for structural, content-preserving transformation of PDF files
 EAPI=8
 HOMEPAGE=http://qpdf.sourceforge.net/
+INHERIT=bash-completion-r1
 IUSE=doc examples gnutls ssl test
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris
 LICENSE=|| ( Apache-2.0 Artistic-2 )
@@ -11,5 +12,5 @@ RDEPEND=sys-libs/zlib virtual/jpeg:0= ssl? ( gnutls? ( net-libs/gnutls:= ) !gnut
 RESTRICT=!test? ( test )
 SLOT=0/28
 SRC_URI=mirror://sourceforge/qpdf/qpdf-10.5.0.tar.gz doc? ( mirror://sourceforge/qpdf/qpdf-10.5.0-doc.zip )
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=620706966097ad61c643ebdb8d612b91
diff --git a/metadata/md5-cache/app-text/qpdf-10.6.1 b/metadata/md5-cache/app-text/qpdf-10.6.1
index d185ea71e361..ee0b385f3f1f 100644
--- a/metadata/md5-cache/app-text/qpdf-10.6.1
+++ b/metadata/md5-cache/app-text/qpdf-10.6.1
@@ -4,6 +4,7 @@ DEPEND=sys-libs/zlib virtual/jpeg:0= ssl? ( gnutls? ( net-libs/gnutls:= ) !gnutl
 DESCRIPTION=Command-line tool for structural, content-preserving transformation of PDF files
 EAPI=8
 HOMEPAGE=http://qpdf.sourceforge.net/
+INHERIT=bash-completion-r1
 IUSE=doc examples gnutls ssl test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris
 LICENSE=|| ( Apache-2.0 Artistic-2 )
@@ -11,5 +12,5 @@ RDEPEND=sys-libs/zlib virtual/jpeg:0= ssl? ( gnutls? ( net-libs/gnutls:= ) !gnut
 RESTRICT=!test? ( test )
 SLOT=0/28
 SRC_URI=mirror://sourceforge/qpdf/qpdf-10.6.1.tar.gz doc? ( mirror://sourceforge/qpdf/qpdf-10.6.1-doc.zip )
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=2844bec2d43b539b2eb933b84f39ae39
diff --git a/metadata/md5-cache/app-text/qpdf-10.6.2 b/metadata/md5-cache/app-text/qpdf-10.6.2
index 728e7ae1d1ff..706d0282b722 100644
--- a/metadata/md5-cache/app-text/qpdf-10.6.2
+++ b/metadata/md5-cache/app-text/qpdf-10.6.2
@@ -4,6 +4,7 @@ DEPEND=sys-libs/zlib virtual/jpeg:0= ssl? ( gnutls? ( net-libs/gnutls:= ) !gnutl
 DESCRIPTION=Command-line tool for structural, content-preserving transformation of PDF files
 EAPI=8
 HOMEPAGE=http://qpdf.sourceforge.net/
+INHERIT=bash-completion-r1
 IUSE=doc examples gnutls ssl test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris
 LICENSE=|| ( Apache-2.0 Artistic-2 )
@@ -11,5 +12,5 @@ RDEPEND=sys-libs/zlib virtual/jpeg:0= ssl? ( gnutls? ( net-libs/gnutls:= ) !gnut
 RESTRICT=!test? ( test )
 SLOT=0/28
 SRC_URI=mirror://sourceforge/qpdf/qpdf-10.6.2.tar.gz doc? ( mirror://sourceforge/qpdf/qpdf-10.6.2-doc.zip )
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=5bea46437479727b26bf6975e26cdb4b
diff --git a/metadata/md5-cache/app-text/qpdf-10.6.3 b/metadata/md5-cache/app-text/qpdf-10.6.3
index 97a91123672e..4588aaf3d481 100644
--- a/metadata/md5-cache/app-text/qpdf-10.6.3
+++ b/metadata/md5-cache/app-text/qpdf-10.6.3
@@ -4,12 +4,13 @@ DEPEND=sys-libs/zlib virtual/jpeg:0= ssl? ( gnutls? ( net-libs/gnutls:= ) !gnutl
 DESCRIPTION=Command-line tool for structural, content-preserving transformation of PDF files
 EAPI=8
 HOMEPAGE=http://qpdf.sourceforge.net/
+INHERIT=bash-completion-r1
 IUSE=doc examples gnutls ssl test
-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 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris
 LICENSE=|| ( Apache-2.0 Artistic-2 )
 RDEPEND=sys-libs/zlib virtual/jpeg:0= ssl? ( gnutls? ( net-libs/gnutls:= ) !gnutls? ( dev-libs/openssl:= ) )
 RESTRICT=!test? ( test )
 SLOT=0/28
 SRC_URI=mirror://sourceforge/qpdf/qpdf-10.6.3.tar.gz doc? ( mirror://sourceforge/qpdf/qpdf-10.6.3-doc.zip )
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=2f88c4ed3f2ea7a8b2fcc70cbce8d200
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=cd52d676ff19410f65864d04198e68ee
diff --git a/metadata/md5-cache/app-text/qpdf-10.6.3-r100 b/metadata/md5-cache/app-text/qpdf-10.6.3-r100
index 6f906350a927..c79070797977 100644
--- a/metadata/md5-cache/app-text/qpdf-10.6.3-r100
+++ b/metadata/md5-cache/app-text/qpdf-10.6.3-r100
@@ -1,4 +1,4 @@
-BDEPEND=dev-lang/perl doc? ( app-arch/unzip ) dev-util/ninja >=dev-util/cmake-3.20.5
+BDEPEND=dev-lang/perl doc? ( app-arch/unzip ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=sys-libs/zlib virtual/jpeg:0= ssl? ( gnutls? ( net-libs/gnutls:= ) !gnutls? ( dev-libs/openssl:= ) ) test? ( app-text/ghostscript-gpl[tiff(+)] media-libs/tiff sys-apps/diffutils )
 DESCRIPTION=Command-line tool for structural, content-preserving transformation of PDF files
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib virtual/jpeg:0= ssl? ( gnutls? ( net-libs/gnutls:= ) !gnut
 RESTRICT=!test? ( test )
 SLOT=0/28
 SRC_URI=https://github.com/qpdf/qpdf/releases/download/release-qpdf-10.6.3.0cmake1/qpdf-10.6.3.0cmake1.tar.gz doc? ( https://github.com/qpdf/qpdf/releases/download/release-qpdf-10.6.3.0cmake1/qpdf-10.6.3.0cmake1-doc.zip )
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=2eb00e5687b5c131821a3c873bdeff54
diff --git a/metadata/md5-cache/app-text/qpdfview-0.4.18 b/metadata/md5-cache/app-text/qpdfview-0.4.18
deleted file mode 100644
index 17133cdca9d1..000000000000
--- a/metadata/md5-cache/app-text/qpdfview-0.4.18
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-qt/linguist-tools:5 virtual/pkgconfig
-DEFINED_PHASES=configure install postinst postrm preinst prepare
-DEPEND=cups? ( net-print/cups ) djvu? ( app-text/djvu ) fitz? ( >=app-text/mupdf-1.7:= ) postscript? ( app-text/libspectre ) dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5[cups?] dev-qt/qtwidgets:5 dbus? ( dev-qt/qtdbus:5 ) pdf? ( >=app-text/poppler-0.35[qt5] dev-qt/qtxml:5 ) sqlite? ( dev-qt/qtsql:5[sqlite] ) svg? ( dev-qt/qtsvg:5 ) !svg? ( virtual/freedesktop-icon-theme ) synctex? ( app-text/texlive-core ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=A tabbed document viewer
-EAPI=7
-HOMEPAGE=https://launchpad.net/qpdfview
-INHERIT=plocale qmake-utils xdg
-IUSE=cups +dbus djvu fitz +pdf postscript +sqlite +svg synctex
-KEYWORDS=amd64 ~arm ~ppc64 x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2+
-RDEPEND=cups? ( net-print/cups ) djvu? ( app-text/djvu ) fitz? ( >=app-text/mupdf-1.7:= ) postscript? ( app-text/libspectre ) dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5[cups?] dev-qt/qtwidgets:5 dbus? ( dev-qt/qtdbus:5 ) pdf? ( >=app-text/poppler-0.35[qt5] dev-qt/qtxml:5 ) sqlite? ( dev-qt/qtsql:5[sqlite] ) svg? ( dev-qt/qtsvg:5 ) !svg? ( virtual/freedesktop-icon-theme ) synctex? ( app-text/texlive-core )
-REQUIRED_USE=?? ( fitz pdf )
-SLOT=0
-SRC_URI=https://launchpad.net/qpdfview/trunk/0.4.18/+download/qpdfview-0.4.18.tar.gz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	plocale	7ce00136a77130df46fbbd5966f98a61	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=ba17b467c48730c6528423818dd83de2
diff --git a/metadata/md5-cache/app-text/qpdfview-0.4.18_p1 b/metadata/md5-cache/app-text/qpdfview-0.4.18_p1
index 2f2b6e15d27a..f7a89256b946 100644
--- a/metadata/md5-cache/app-text/qpdfview-0.4.18_p1
+++ b/metadata/md5-cache/app-text/qpdfview-0.4.18_p1
@@ -12,5 +12,5 @@ RDEPEND=cups? ( net-print/cups ) djvu? ( app-text/djvu ) fitz? ( >=app-text/mupd
 REQUIRED_USE=?? ( fitz pdf )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~grozin/qpdfview-0.4.18_p1.tar.bz2
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	plocale	7ce00136a77130df46fbbd5966f98a61	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	plocale	7ce00136a77130df46fbbd5966f98a61	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=1592a278bf3b91d262fd1e0326fd9bd3
diff --git a/metadata/md5-cache/app-text/qpdfview-0.4.18_p20211227 b/metadata/md5-cache/app-text/qpdfview-0.4.18_p20211227
index 0d78743d6af8..5629c7c8bacc 100644
--- a/metadata/md5-cache/app-text/qpdfview-0.4.18_p20211227
+++ b/metadata/md5-cache/app-text/qpdfview-0.4.18_p20211227
@@ -12,5 +12,5 @@ RDEPEND=cups? ( net-print/cups ) djvu? ( app-text/djvu ) fitz? ( >=app-text/mupd
 REQUIRED_USE=?? ( fitz pdf )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~grozin/qpdfview-0.4.18_p20211227.tar.bz2
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	plocale	7ce00136a77130df46fbbd5966f98a61	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	plocale	7ce00136a77130df46fbbd5966f98a61	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=30f613797521c1d8c26b0a7e8291bd90
diff --git a/metadata/md5-cache/app-text/rarian-0.8.1-r3 b/metadata/md5-cache/app-text/rarian-0.8.1-r3
index 2f2996dd453a..458832d69207 100644
--- a/metadata/md5-cache/app-text/rarian-0.8.1-r3
+++ b/metadata/md5-cache/app-text/rarian-0.8.1-r3
@@ -5,10 +5,10 @@ EAPI=6
 HOMEPAGE=https://rarian.freedesktop.org/
 INHERIT=autotools eutils
 IUSE=static-libs
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2.1
 RDEPEND=dev-libs/libxslt dev-libs/tinyxml || ( sys-apps/util-linux app-misc/getopt )
 SLOT=0
 SRC_URI=https://rarian.freedesktop.org/Releases/rarian-0.8.1.tar.gz https://dev.gentoo.org/~eva/distfiles/rarian/rarian-0.8.1-r3-patches.tar.xz
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=9791f08724fab54fef59c6815db35bd7
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	28f0f3c0226306ec5f49e13bf851f171	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4fbbbc98f236f1b43acd99476bc3cd85	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_md5_=598c59359e56c810f6c18abaafb234f3
diff --git a/metadata/md5-cache/app-text/recode-3.7.11 b/metadata/md5-cache/app-text/recode-3.7.11
index be8de7a3c5d0..f8b5f05fd3b5 100644
--- a/metadata/md5-cache/app-text/recode-3.7.11
+++ b/metadata/md5-cache/app-text/recode-3.7.11
@@ -12,5 +12,5 @@ RDEPEND=virtual/libiconv
 RESTRICT=!test? ( test )
 SLOT=0/3
 SRC_URI=https://github.com/rrthomas/recode/releases/download/v3.7.11/recode-3.7.11.tar.gz
-_eclasses_=flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=0f9ec87a855c485dbc0f6f4d7d725e82
diff --git a/metadata/md5-cache/app-text/recode-3.7.12 b/metadata/md5-cache/app-text/recode-3.7.12
index 735c04df455e..19591d368795 100644
--- a/metadata/md5-cache/app-text/recode-3.7.12
+++ b/metadata/md5-cache/app-text/recode-3.7.12
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/rrthomas/recode
 INHERIT=flag-o-matic python-any-r1 toolchain-funcs
 IUSE=nls test
-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
+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
 LICENSE=GPL-3+
 RDEPEND=virtual/libiconv
 RESTRICT=!test? ( test )
 SLOT=0/3
 SRC_URI=https://github.com/rrthomas/recode/releases/download/v3.7.12/recode-3.7.12.tar.gz
-_eclasses_=flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=0f9ec87a855c485dbc0f6f4d7d725e82
+_eclasses_=flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=1baf04ad50e8482608bbf682ff4739d0
diff --git a/metadata/md5-cache/app-text/recode-3.7.9 b/metadata/md5-cache/app-text/recode-3.7.9
index e272f28de7e3..c474edaeec8c 100644
--- a/metadata/md5-cache/app-text/recode-3.7.9
+++ b/metadata/md5-cache/app-text/recode-3.7.9
@@ -12,5 +12,5 @@ RDEPEND=virtual/libiconv
 RESTRICT=!test? ( test )
 SLOT=0/3
 SRC_URI=https://github.com/rrthomas/recode/releases/download/v3.7.9/recode-3.7.9.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=cc765b109f1d8925608fef75923e9b7e
diff --git a/metadata/md5-cache/app-text/reed-5.4-r1 b/metadata/md5-cache/app-text/reed-5.4-r1
index faa70c32f88a..ebacc6f2cea9 100644
--- a/metadata/md5-cache/app-text/reed-5.4-r1
+++ b/metadata/md5-cache/app-text/reed-5.4-r1
@@ -4,10 +4,11 @@ DEPEND=sys-libs/ncurses:=
 DESCRIPTION=This is a text pager (text file viewer), used to display etexts
 EAPI=7
 HOMEPAGE=http://web.archive.org/web/20040217010815/www.sacredchao.net/software/reed/
+INHERIT=toolchain-funcs
 KEYWORDS=~amd64 x86
 LICENSE=GPL-2
 RDEPEND=sys-libs/ncurses:=
 SLOT=0
 SRC_URI=http://www.sacredchao.net/software/reed/reed-5.4.tar.gz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=5c2701237e2f50c7285b63a1c0935a00
diff --git a/metadata/md5-cache/app-text/restview-2.9.2 b/metadata/md5-cache/app-text/restview-2.9.2
index 15eaad431a96..7b459e388a52 100644
--- a/metadata/md5-cache/app-text/restview-2.9.2
+++ b/metadata/md5-cache/app-text/restview-2.9.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/restview/restview-2.9.2.tar.gz
-_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=bca5ca38e357fa044ad21c8bbee06069
diff --git a/metadata/md5-cache/app-text/restview-3.0.0 b/metadata/md5-cache/app-text/restview-3.0.0
new file mode 100644
index 000000000000..8d53173ea7e7
--- /dev/null
+++ b/metadata/md5-cache/app-text/restview-3.0.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pygments[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/readme_renderer[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=reStructuredText viewer
+EAPI=8
+HOMEPAGE=https://mg.pov.lt/restview/ https://pypi.org/project/restview/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pygments[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/readme_renderer[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/r/restview/restview-3.0.0.tar.gz
+_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=a6f77b0ba93b71900bafe7eeac2034bc
diff --git a/metadata/md5-cache/app-text/rman-3.2-r1 b/metadata/md5-cache/app-text/rman-3.2-r1
index 7acf7ab4c9be..a358a7c30654 100644
--- a/metadata/md5-cache/app-text/rman-3.2-r1
+++ b/metadata/md5-cache/app-text/rman-3.2-r1
@@ -2,10 +2,11 @@ DEFINED_PHASES=compile install
 DESCRIPTION=PolyGlotMan man page translator AKA RosettaMan
 EAPI=7
 HOMEPAGE=https://sourceforge.net/projects/polyglotman/
+INHERIT=toolchain-funcs
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=Artistic
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/polyglotman/rman-3.2.tar.gz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=6f5a2a895828b0cd0620bb5ff1346c11
diff --git a/metadata/md5-cache/app-text/rnc2rng-2.6.4 b/metadata/md5-cache/app-text/rnc2rng-2.6.4
index 8e10c21ba533..621ce71bf533 100644
--- a/metadata/md5-cache/app-text/rnc2rng-2.6.4
+++ b/metadata/md5-cache/app-text/rnc2rng-2.6.4
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/rnc2rng/rnc2rng-2.6.4.tar.gz
-_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=8d98c6c4eb10a441b05fffdc78396ab8
diff --git a/metadata/md5-cache/app-text/rnc2rng-2.6.6-r1 b/metadata/md5-cache/app-text/rnc2rng-2.6.6-r1
index 13dad9fa016a..a4b385861f18 100644
--- a/metadata/md5-cache/app-text/rnc2rng-2.6.6-r1
+++ b/metadata/md5-cache/app-text/rnc2rng-2.6.6-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/rnc2rng/rnc2rng-2.6.6.tar.gz
-_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=bbd8b9191857cafd2dac416444e420ae
diff --git a/metadata/md5-cache/app-text/rnv-1.7.11-r1 b/metadata/md5-cache/app-text/rnv-1.7.11-r1
index 98414161f9ab..48dc3e9b500e 100644
--- a/metadata/md5-cache/app-text/rnv-1.7.11-r1
+++ b/metadata/md5-cache/app-text/rnv-1.7.11-r1
@@ -3,10 +3,11 @@ DEPEND=dev-libs/expat dev-scheme/scm[libscm]
 DESCRIPTION=A lightweight Relax NG Compact Syntax validator
 EAPI=6
 HOMEPAGE=http://www.davidashen.net/rnv.html
+INHERIT=unpacker toolchain-funcs
 KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=dev-libs/expat dev-scheme/scm[libscm]
 SLOT=0
 SRC_URI=mirror://sourceforge/rnv/rnv-1.7.11.tar.xz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	unpacker	697382d119fd3d195f110b7979184285
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	unpacker	697382d119fd3d195f110b7979184285
 _md5_=7300efb2c06eb0abeecce9f659cad466
diff --git a/metadata/md5-cache/app-text/ronn-0.7.3-r4 b/metadata/md5-cache/app-text/ronn-0.7.3-r4
index b4fa8921d55d..c370ec77fe49 100644
--- a/metadata/md5-cache/app-text/ronn-0.7.3-r4
+++ b/metadata/md5-cache/app-text/ronn-0.7.3-r4
@@ -4,6 +4,7 @@ DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lan
 DESCRIPTION=Converts simple, human readable textfiles to roff for terminal display, and HTML
 EAPI=7
 HOMEPAGE=https://github.com/rtomayko/ronn/
+INHERIT=ruby-fakegem
 IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 test test
 KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
 LICENSE=MIT
@@ -12,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/ronn-0.7.3.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	ruby-fakegem	242ae0c7650b40198870ae311dc6bea0	ruby-ng	e4c8836049bf65af19ab322fe5a81005	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=233f5916ff605288afb558b43b1147c7
diff --git a/metadata/md5-cache/app-text/ronn-ng-0.9.1 b/metadata/md5-cache/app-text/ronn-ng-0.9.1
index b9e75885bf98..4dc867d79dd9 100644
--- a/metadata/md5-cache/app-text/ronn-ng-0.9.1
+++ b/metadata/md5-cache/app-text/ronn-ng-0.9.1
@@ -4,6 +4,7 @@ DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lan
 DESCRIPTION=Builds manuals in HTML and Unix man page format from Markdown
 EAPI=8
 HOMEPAGE=https://github.com/apjanke/ronn-ng
+INHERIT=ruby-fakegem
 IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 doc test test
 KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
 LICENSE=MIT
@@ -12,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/ronn-ng-0.9.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	ruby-fakegem	242ae0c7650b40198870ae311dc6bea0	ruby-ng	e4c8836049bf65af19ab322fe5a81005	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=71c113894fae9dc690fec32a82905fdc
diff --git a/metadata/md5-cache/app-text/ronn-ng-0.9.1-r1 b/metadata/md5-cache/app-text/ronn-ng-0.9.1-r1
index 7dcbfcd022df..037ae36fbeb8 100644
--- a/metadata/md5-cache/app-text/ronn-ng-0.9.1-r1
+++ b/metadata/md5-cache/app-text/ronn-ng-0.9.1-r1
@@ -4,6 +4,7 @@ DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lan
 DESCRIPTION=Builds manuals in HTML and Unix man page format from Markdown
 EAPI=8
 HOMEPAGE=https://github.com/apjanke/ronn-ng
+INHERIT=ruby-fakegem
 IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 doc test test
 KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86
 LICENSE=MIT
@@ -12,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/ronn-ng-0.9.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	ruby-fakegem	242ae0c7650b40198870ae311dc6bea0	ruby-ng	e4c8836049bf65af19ab322fe5a81005	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=3c3ae57c3ca7646cc168f8ad5b6061e2
diff --git a/metadata/md5-cache/app-text/ronn-ng-0.9.1-r2 b/metadata/md5-cache/app-text/ronn-ng-0.9.1-r2
index 52441db17f5b..c8ccb0b4e204 100644
--- a/metadata/md5-cache/app-text/ronn-ng-0.9.1-r2
+++ b/metadata/md5-cache/app-text/ronn-ng-0.9.1-r2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/ronn-ng-0.9.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	ruby-fakegem	242ae0c7650b40198870ae311dc6bea0	ruby-ng	e4c8836049bf65af19ab322fe5a81005	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=a61c28378eb73a056e84faf80e7fb132
diff --git a/metadata/md5-cache/app-text/rpl-1.6.7 b/metadata/md5-cache/app-text/rpl-1.6.7
index 115385b36413..0359f484a929 100644
--- a/metadata/md5-cache/app-text/rpl-1.6.7
+++ b/metadata/md5-cache/app-text/rpl-1.6.7
@@ -11,5 +11,5 @@ RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 )
 REQUIRED_USE=|| ( python_targets_python3_8 )
 SLOT=0
 SRC_URI=http://deb.debian.org/debian/pool/main/r/rpl/rpl_1.6.7.orig.tar.gz -> rpl-1.6.7.tar.gz
-_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=c943653ab2939339643e1987efe71506
diff --git a/metadata/md5-cache/app-text/rpl-1.9.1 b/metadata/md5-cache/app-text/rpl-1.9.1
index 38331ca1ecab..e05da7a9b794 100644
--- a/metadata/md5-cache/app-text/rpl-1.9.1
+++ b/metadata/md5-cache/app-text/rpl-1.9.1
@@ -11,5 +11,5 @@ RDEPEND=dev-python/chardet[python_targets_python3_8(-)?,python_targets_python3_9
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=https://github.com/rrthomas/rpl/archive/v1.9.1.tar.gz -> rpl-1.9.1.gh.tar.gz
-_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=4b68ef2a2e27f3ae9ad095f864c6863f
diff --git a/metadata/md5-cache/app-text/sablotron-1.0.3-r2 b/metadata/md5-cache/app-text/sablotron-1.0.3-r2
index 70e71f8e31c1..73bd07f7d364 100644
--- a/metadata/md5-cache/app-text/sablotron-1.0.3-r2
+++ b/metadata/md5-cache/app-text/sablotron-1.0.3-r2
@@ -4,11 +4,12 @@ DEPEND=>=dev-libs/expat-1.95.6-r1
 DESCRIPTION=An XSLT Parser in C++
 EAPI=7
 HOMEPAGE=https://sourceforge.net/projects/sablotron/
+INHERIT=autotools
 IUSE=perl
 KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=MPL-1.1
 RDEPEND=>=dev-libs/expat-1.95.6-r1
 SLOT=0
 SRC_URI=mirror://sourceforge/sablotron/Sablot-1.0.3.tar.gz
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=4bc3d07394b7bf9de65118bb544eeabb
diff --git a/metadata/md5-cache/app-text/scdoc-1.11.0 b/metadata/md5-cache/app-text/scdoc-1.11.0
index d8b63b719290..ad915e1de090 100644
--- a/metadata/md5-cache/app-text/scdoc-1.11.0
+++ b/metadata/md5-cache/app-text/scdoc-1.11.0
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile install prepare
 DESCRIPTION=Standalone tool for generating man pages with a simple syntax
 EAPI=7
 HOMEPAGE=https://git.sr.ht/~sircmpwn/scdoc
+INHERIT=toolchain-funcs
 KEYWORDS=amd64 arm64 ~ppc64 x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://git.sr.ht/~sircmpwn/scdoc/archive/1.11.0.tar.gz -> scdoc-1.11.0.tar.gz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=27b880b5aa07b881ca9e027f6cc95ee2
diff --git a/metadata/md5-cache/app-text/scdoc-1.11.1 b/metadata/md5-cache/app-text/scdoc-1.11.1
index df01131e0231..2b12ba6c8774 100644
--- a/metadata/md5-cache/app-text/scdoc-1.11.1
+++ b/metadata/md5-cache/app-text/scdoc-1.11.1
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile install prepare
 DESCRIPTION=Standalone tool for generating man pages with a simple syntax
 EAPI=7
 HOMEPAGE=https://git.sr.ht/~sircmpwn/scdoc
+INHERIT=toolchain-funcs
 KEYWORDS=amd64 arm arm64 ppc64 ~riscv x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://git.sr.ht/~sircmpwn/scdoc/archive/1.11.1.tar.gz -> scdoc-1.11.1.tar.gz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=b771bbc831bfd5ed31aa0aaa1052951b
diff --git a/metadata/md5-cache/app-text/scdoc-1.11.2-r1 b/metadata/md5-cache/app-text/scdoc-1.11.2-r1
index ce0c2c49aace..e7a4dc4f3c2d 100644
--- a/metadata/md5-cache/app-text/scdoc-1.11.2-r1
+++ b/metadata/md5-cache/app-text/scdoc-1.11.2-r1
@@ -3,9 +3,9 @@ DESCRIPTION=Standalone tool for generating man pages with a simple syntax
 EAPI=8
 HOMEPAGE=https://git.sr.ht/~sircmpwn/scdoc
 INHERIT=toolchain-funcs
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://git.sr.ht/~sircmpwn/scdoc/archive/1.11.2.tar.gz -> scdoc-1.11.2.tar.gz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=65e97a04979a77ed55805659037bcda3
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=bf90a29d59f2b2c5df0bfee2127de0a3
diff --git a/metadata/md5-cache/app-text/scdoc-9999 b/metadata/md5-cache/app-text/scdoc-9999
index a6d4ec647382..a88424c68592 100644
--- a/metadata/md5-cache/app-text/scdoc-9999
+++ b/metadata/md5-cache/app-text/scdoc-9999
@@ -7,5 +7,5 @@ INHERIT=toolchain-funcs git-r3
 LICENSE=MIT
 PROPERTIES=live
 SLOT=0
-_eclasses_=git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=65e97a04979a77ed55805659037bcda3
+_eclasses_=git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=bf90a29d59f2b2c5df0bfee2127de0a3
diff --git a/metadata/md5-cache/app-text/scrollkeeper-dtd-1.0-r1 b/metadata/md5-cache/app-text/scrollkeeper-dtd-1.0-r1
index 22f35d118085..afe07c774752 100644
--- a/metadata/md5-cache/app-text/scrollkeeper-dtd-1.0-r1
+++ b/metadata/md5-cache/app-text/scrollkeeper-dtd-1.0-r1
@@ -3,9 +3,9 @@ DEPEND=>=dev-libs/libxml2-2.4.19 !<app-text/scrollkeeper-9999-r1
 DESCRIPTION=DTD from the Scrollkeeper package
 EAPI=6
 HOMEPAGE=http://scrollkeeper.sourceforge.net/
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris ~x86-solaris
 LICENSE=FDL-1.1
 RDEPEND=>=dev-libs/libxml2-2.4.19
 SLOT=1.0
 SRC_URI=http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/scrollkeeper-omf.dtd
-_md5_=0c25b8936c0ca895830445e2e228b723
+_md5_=74ab23e0b9542cf0a4f65b8ded5f85df
diff --git a/metadata/md5-cache/app-text/sdcv-0.5.3 b/metadata/md5-cache/app-text/sdcv-0.5.3
index 7c04cd1a7aeb..d3653692f865 100644
--- a/metadata/md5-cache/app-text/sdcv-0.5.3
+++ b/metadata/md5-cache/app-text/sdcv-0.5.3
@@ -1,4 +1,4 @@
-BDEPEND=nls? ( >=sys-devel/gettext-0.14.1 ) test? ( app-misc/jq ) dev-util/ninja >=dev-util/cmake-3.20.5
+BDEPEND=nls? ( >=sys-devel/gettext-0.14.1 ) test? ( app-misc/jq ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=>=dev-libs/glib-2.36 sys-libs/zlib readline? ( sys-libs/readline:= )
 DESCRIPTION=Console version of Stardict program
@@ -12,5 +12,5 @@ RDEPEND=>=dev-libs/glib-2.36 sys-libs/zlib readline? ( sys-libs/readline:= )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Dushistov/sdcv/archive/v0.5.3.tar.gz -> sdcv-0.5.3.tar.gz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	plocale	7ce00136a77130df46fbbd5966f98a61	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	plocale	7ce00136a77130df46fbbd5966f98a61	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=2267a6b49bd805bd75c2abbd91c17396
diff --git a/metadata/md5-cache/app-text/sigil-1.8.0 b/metadata/md5-cache/app-text/sigil-1.8.0
index 6582520805f0..1ac773f8a782 100644
--- a/metadata/md5-cache/app-text/sigil-1.8.0
+++ b/metadata/md5-cache/app-text/sigil-1.8.0
@@ -1,4 +1,4 @@
-BDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[tk] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[tk] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[tk] ) dev-qt/linguist-tools:5 dev-util/ninja >=dev-util/cmake-3.20.5
+BDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[tk] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[tk] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[tk] ) dev-qt/linguist-tools:5 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
 DEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[tk] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[tk] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[tk] ) app-text/hunspell:= dev-libs/libpcre:3=[pcre16] python_single_target_python3_8? ( dev-python/css-parser[python_targets_python3_8(-)] dev-python/lxml[python_targets_python3_8(-)] dev-python/six[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/css-parser[python_targets_python3_9(-)] dev-python/lxml[python_targets_python3_9(-)] dev-python/six[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/css-parser[python_targets_python3_10(-)] dev-python/lxml[python_targets_python3_10(-)] dev-python/six[python_targets_python3_10(-)] ) dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwebengine:5[widgets] dev-qt/qtwidgets:5 sys-libs/zlib[minizip] plugins? ( python_single_target_python3_8? ( dev-python/chardet[python_targets_python3_8(-)] dev-python/cssselect[python_targets_python3_8(-)] dev-python/dulwich[python_targets_python3_8(-)] dev-python/html5lib[python_targets_python3_8(-)] dev-python/pillow[python_targets_python3_8(-)] dev-python/regex[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/chardet[python_targets_python3_9(-)] dev-python/cssselect[python_targets_python3_9(-)] dev-python/dulwich[python_targets_python3_9(-)] dev-python/html5lib[python_targets_python3_9(-)] dev-python/pillow[python_targets_python3_9(-)] dev-python/regex[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/chardet[python_targets_python3_10(-)] dev-python/cssselect[python_targets_python3_10(-)] dev-python/dulwich[python_targets_python3_10(-)] dev-python/html5lib[python_targets_python3_10(-)] dev-python/pillow[python_targets_python3_10(-)] dev-python/regex[python_targets_python3_10(-)] ) ) system-mathjax? ( dev-libs/mathjax )
 DESCRIPTION=Multi-platform WYSIWYG ebook editor for ePub format
@@ -12,5 +12,5 @@ RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[tk]
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
 SLOT=0
 SRC_URI=https://github.com/Sigil-Ebook/Sigil/archive/1.8.0.tar.gz -> sigil-1.8.0.tar.gz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=e683aa7b6b96f2062cf7bb083c7c5c15
diff --git a/metadata/md5-cache/app-text/sigil-1.9.2-r1 b/metadata/md5-cache/app-text/sigil-1.9.2-r1
index 458d2c3be56f..4b2019afec54 100644
--- a/metadata/md5-cache/app-text/sigil-1.9.2-r1
+++ b/metadata/md5-cache/app-text/sigil-1.9.2-r1
@@ -1,4 +1,4 @@
-BDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[tk] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[tk] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[tk] ) dev-qt/linguist-tools:5 dev-util/ninja >=dev-util/cmake-3.20.5
+BDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[tk] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[tk] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[tk] ) dev-qt/linguist-tools:5 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
 DEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[tk] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[tk] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[tk] ) app-text/hunspell:= dev-libs/libpcre2:=[pcre16] python_single_target_python3_8? ( dev-python/css-parser[python_targets_python3_8(-)] dev-python/lxml[python_targets_python3_8(-)] dev-python/six[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/css-parser[python_targets_python3_9(-)] dev-python/lxml[python_targets_python3_9(-)] dev-python/six[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/css-parser[python_targets_python3_10(-)] dev-python/lxml[python_targets_python3_10(-)] dev-python/six[python_targets_python3_10(-)] ) dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwebengine:5[widgets] dev-qt/qtwidgets:5 sys-libs/zlib[minizip] plugins? ( python_single_target_python3_8? ( dev-python/chardet[python_targets_python3_8(-)] dev-python/cssselect[python_targets_python3_8(-)] dev-python/dulwich[python_targets_python3_8(-)] dev-python/html5lib[python_targets_python3_8(-)] dev-python/pillow[python_targets_python3_8(-)] dev-python/regex[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/chardet[python_targets_python3_9(-)] dev-python/cssselect[python_targets_python3_9(-)] dev-python/dulwich[python_targets_python3_9(-)] dev-python/html5lib[python_targets_python3_9(-)] dev-python/pillow[python_targets_python3_9(-)] dev-python/regex[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/chardet[python_targets_python3_10(-)] dev-python/cssselect[python_targets_python3_10(-)] dev-python/dulwich[python_targets_python3_10(-)] dev-python/html5lib[python_targets_python3_10(-)] dev-python/pillow[python_targets_python3_10(-)] dev-python/regex[python_targets_python3_10(-)] ) ) system-mathjax? ( dev-libs/mathjax )
 DESCRIPTION=Multi-platform WYSIWYG ebook editor for ePub format
@@ -12,5 +12,5 @@ RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[tk]
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
 SLOT=0
 SRC_URI=https://github.com/Sigil-Ebook/Sigil/archive/1.9.2.tar.gz -> sigil-1.9.2.tar.gz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=481ea063d74d62d0ec7b9d51a6f5a064
diff --git a/metadata/md5-cache/app-text/simple-fb2-reader-1.1.3 b/metadata/md5-cache/app-text/simple-fb2-reader-1.1.3
index 0582d445e3e3..9872f0265ecf 100644
--- a/metadata/md5-cache/app-text/simple-fb2-reader-1.1.3
+++ b/metadata/md5-cache/app-text/simple-fb2-reader-1.1.3
@@ -1,4 +1,4 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
 DEPEND=x11-libs/gtk+:3 dev-libs/libxml2 dev-libs/libzip dev-db/sqlite sys-devel/gettext virtual/pkgconfig dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=A simple gtk3 reader for fb2 ebooks
@@ -10,5 +10,5 @@ LICENSE=GPL-3
 RDEPEND=x11-libs/gtk+:3 dev-libs/libxml2 dev-libs/libzip dev-db/sqlite
 SLOT=0
 SRC_URI=https://github.com/Cactus64k/simple-fb2-reader/archive/1.1.3.tar.gz -> simple-fb2-reader-1.1.3.tar.gz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=d9790d5a930afef42fc90113c6187ec2
diff --git a/metadata/md5-cache/app-text/sloccount-2.26-r3 b/metadata/md5-cache/app-text/sloccount-2.26-r3
index 1cfefcf28db3..4107f64e7462 100644
--- a/metadata/md5-cache/app-text/sloccount-2.26-r3
+++ b/metadata/md5-cache/app-text/sloccount-2.26-r3
@@ -3,10 +3,11 @@ DEPEND=dev-lang/perl
 DESCRIPTION=Tools for counting Source Lines of Code (SLOC) for a large number of languages
 EAPI=7
 HOMEPAGE=http://www.dwheeler.com/sloccount/
+INHERIT=toolchain-funcs
 KEYWORDS=~alpha amd64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=dev-lang/perl
 SLOT=0
 SRC_URI=http://www.dwheeler.com/sloccount/sloccount-2.26.tar.gz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=8a056caa582bde5a3f3db48bf3672b76
diff --git a/metadata/md5-cache/app-text/spellutils-0.7 b/metadata/md5-cache/app-text/spellutils-0.7
index f0556925cc42..18271b764435 100644
--- a/metadata/md5-cache/app-text/spellutils-0.7
+++ b/metadata/md5-cache/app-text/spellutils-0.7
@@ -4,11 +4,12 @@ DEPEND=nls? ( virtual/libintl )
 DESCRIPTION=spellutils includes 'newsbody' (useful for spellchecking in mails, etc.)
 EAPI=7
 HOMEPAGE=http://home.worldonline.dk/byrial/spellutils/
+INHERIT=toolchain-funcs
 IUSE=nls
 KEYWORDS=~alpha amd64 ~hppa ~mips ppc ~sparc x86
 LICENSE=GPL-2
 RDEPEND=nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=http://home.worldonline.dk/byrial/spellutils/spellutils-0.7.tar.bz2
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=652893403336788365a2b280bcf44084
diff --git a/metadata/md5-cache/app-text/stardict-3.0.6-r4 b/metadata/md5-cache/app-text/stardict-3.0.6-r4
index 57ad165e262f..c38bc3844475 100644
--- a/metadata/md5-cache/app-text/stardict-3.0.6-r4
+++ b/metadata/md5-cache/app-text/stardict-3.0.6-r4
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/glib-2.16:2 dev-libs/libsigc++:2= sys-libs/zlib:= x11-libs/gd
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/stardict-4/stardict-3.0.6.tar.bz2 pronounce? ( https://stardict-3.googlecode.com/files/WyabdcRealPeopleTTS.tar.bz2 ) qqwry? ( mirror://gentoo/QQWry.Dat.bz2 )
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	28f0f3c0226306ec5f49e13bf851f171	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4fbbbc98f236f1b43acd99476bc3cd85	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=910e43c8bcf3c5ea67c2ac661a605c9f
diff --git a/metadata/md5-cache/app-text/stardict-4.0.0_pre20170304-r1 b/metadata/md5-cache/app-text/stardict-4.0.0_pre20170304-r1
index 2645598456c7..b898a10752d5 100644
--- a/metadata/md5-cache/app-text/stardict-4.0.0_pre20170304-r1
+++ b/metadata/md5-cache/app-text/stardict-4.0.0_pre20170304-r1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/glib-2.32:2 dev-libs/libsigc++:2= media-libs/libcanberra[gtk3
 RESTRICT=test
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~bircoph/distfiles/stardict-4.0.0_pre20170304.tar.xz pronounce? ( https://stardict-3.googlecode.com/files/WyabdcRealPeopleTTS.tar.bz2 ) qqwry? ( mirror://gentoo/QQWry.Dat.bz2 )
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	desktop	22952d8f27cac191d75529d4c38e6bfa	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	28f0f3c0226306ec5f49e13bf851f171	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4fbbbc98f236f1b43acd99476bc3cd85	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=c3222a13d425296588d9eaae843d3c46
diff --git a/metadata/md5-cache/app-text/sword-1.9.0-r1 b/metadata/md5-cache/app-text/sword-1.9.0-r1
index 5ec265718c99..1e525b3fcb22 100644
--- a/metadata/md5-cache/app-text/sword-1.9.0-r1
+++ b/metadata/md5-cache/app-text/sword-1.9.0-r1
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.20.5
+BDEPEND=virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=sys-libs/zlib curl? ( net-misc/curl ) icu? ( dev-libs/icu:= ) clucene? ( dev-cpp/clucene )
 DESCRIPTION=Library for Bible reading software
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://www.crosswire.org/sword/
 INHERIT=cmake
 IUSE=clucene curl debug doc icu
-KEYWORDS=amd64 ~ppc ~riscv x86 ~ppc-macos
+KEYWORDS=amd64 ~loong ~ppc ~riscv x86 ~ppc-macos
 LICENSE=GPL-2
 RDEPEND=sys-libs/zlib curl? ( net-misc/curl ) icu? ( dev-libs/icu:= ) clucene? ( dev-cpp/clucene )
 SLOT=0
 SRC_URI=https://www.crosswire.org/ftpmirror/pub/sword/source/v1.9/sword-1.9.0.tar.gz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=de29932637493b947fc94bbe59d8b6ea
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=7bbab7b8310fe5cff3cda0e47aa3647a
diff --git a/metadata/md5-cache/app-text/sword-modules-2.5 b/metadata/md5-cache/app-text/sword-modules-2.5
deleted file mode 100644
index 2e71fb768ea2..000000000000
--- a/metadata/md5-cache/app-text/sword-modules-2.5
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=All the unlocked modules for app-text/sword, grouped by language
-EAPI=8
-HOMEPAGE=https://www.crosswire.org/sword/modules/
-IUSE=esoteric l10n_af l10n_ar l10n_az l10n_be l10n_bea l10n_bg l10n_br l10n_ceb l10n_ch l10n_chr l10n_ckb l10n_cop l10n_cs l10n_cu l10n_cy l10n_da l10n_de l10n_el l10n_en l10n_eo l10n_es l10n_et l10n_eu l10n_fa l10n_fi l10n_fr l10n_ga l10n_gd l10n_gez l10n_got l10n_grc l10n_gv l10n_he l10n_hi l10n_hr l10n_ht l10n_hu l10n_hy l10n_it l10n_ja l10n_kek l10n_kk l10n_km l10n_ko l10n_kpg l10n_ktu l10n_la l10n_ln l10n_lt l10n_lv l10n_mg l10n_mi l10n_ml l10n_mn l10n_my l10n_nb l10n_nd l10n_nl l10n_nn l10n_pl l10n_pon l10n_pot l10n_ppk l10n_prs l10n_pt l10n_rmq l10n_ro l10n_ru l10n_sl l10n_sml l10n_sn l10n_so l10n_sq l10n_sr l10n_sv l10n_sw l10n_syr l10n_th l10n_tl l10n_tlh l10n_tr l10n_tsg l10n_ug l10n_uk l10n_ur l10n_vi l10n_vls l10n_zh
-KEYWORDS=~amd64 ~ppc ~riscv ~x86
-LICENSE=metapackage
-RDEPEND=|| ( app-dicts/sword-Eusebian_num app-dicts/sword-Eusebian_vs ) app-dicts/sword-Personal esoteric? ( app-dicts/sword-Phaistos app-dicts/sword-Sentiment ) l10n_af? ( app-dicts/sword-Afr1953 ) l10n_ar? ( app-dicts/sword-AraNAV app-dicts/sword-AraSVD app-dicts/sword-alzat ) l10n_az? ( app-dicts/sword-Azeri app-dicts/sword-NorthernAzeri ) l10n_be? ( app-dicts/sword-Bela ) l10n_bea? ( app-dicts/sword-BeaMRK ) l10n_bg? ( app-dicts/sword-BulVeren ) l10n_br? ( app-dicts/sword-BretonNT app-dicts/sword-br_en ) l10n_ceb? ( app-dicts/sword-CebPinadayag ) l10n_ch? ( app-dicts/sword-Chamorro ) l10n_chr? ( app-dicts/sword-Che1860 ) l10n_ckb? ( app-dicts/sword-Sorani ) l10n_cop? ( app-dicts/sword-CopNT app-dicts/sword-CopSahBible2 app-dicts/sword-CopSahHorner app-dicts/sword-CopSahidicMSS app-dicts/sword-CopSahidica app-dicts/sword-SahidicBible ) l10n_cs? ( app-dicts/sword-CzeB21 app-dicts/sword-CzeBKR app-dicts/sword-CzeCEP app-dicts/sword-CzeCSP ) l10n_cu? ( app-dicts/sword-CSlElizabeth ) l10n_cy? ( app-dicts/sword-WelBeiblNet ) l10n_da? ( app-dicts/sword-DaNT1819 app-dicts/sword-DaOT1871NT1907 app-dicts/sword-DaOT1931NT1907 ) l10n_de? ( app-dicts/sword-GerAlbrecht app-dicts/sword-GerAugustinus app-dicts/sword-GerBoLut app-dicts/sword-GerElb1871 app-dicts/sword-GerElb1905 app-dicts/sword-GerGruenewald app-dicts/sword-GerKingComm app-dicts/sword-GerLeoNA28 app-dicts/sword-GerLeoRP18 app-dicts/sword-GerLutherpredigten app-dicts/sword-GerMenge app-dicts/sword-GerNeUe app-dicts/sword-GerOffBiSt app-dicts/sword-GerReinhardt app-dicts/sword-GerSch app-dicts/sword-GerTafel app-dicts/sword-GerTextbibel app-dicts/sword-GerZurcher app-dicts/sword-MAK app-dicts/sword-Rieger ) l10n_el? ( app-dicts/sword-GreVamvas ) l10n_en? ( app-dicts/sword-2BabDict app-dicts/sword-AB app-dicts/sword-ABP app-dicts/sword-ABS_Essay_GoodSam_SWB app-dicts/sword-ACV app-dicts/sword-AKJV app-dicts/sword-ASV app-dicts/sword-Abbott app-dicts/sword-AbbottSmith app-dicts/sword-AbbottSmithStrongs app-dicts/sword-AmTract app-dicts/sword-Anderson app-dicts/sword-BBE app-dicts/sword-BDBGlosses_Strongs app-dicts/sword-BWE app-dicts/sword-BaptistConfession1646 app-dicts/sword-BaptistConfession1689 app-dicts/sword-Barnes app-dicts/sword-Burkitt app-dicts/sword-CBC app-dicts/sword-CPDV app-dicts/sword-Catena app-dicts/sword-Cawdrey app-dicts/sword-Clarke app-dicts/sword-Common app-dicts/sword-Concord app-dicts/sword-DBD app-dicts/sword-DRC app-dicts/sword-DTN app-dicts/sword-Daily app-dicts/sword-Darby app-dicts/sword-DarkNightOfTheSoul app-dicts/sword-Diaglott app-dicts/sword-Dodson app-dicts/sword-EMBReality app-dicts/sword-EMTV app-dicts/sword-Easton app-dicts/sword-Etheridge app-dicts/sword-Family app-dicts/sword-Finney app-dicts/sword-Geneva app-dicts/sword-Geneva1599 app-dicts/sword-Godbey app-dicts/sword-GodsWord app-dicts/sword-Heretics app-dicts/sword-Hitchcock app-dicts/sword-ISBE app-dicts/sword-ISV app-dicts/sword-Imitation app-dicts/sword-Institutes app-dicts/sword-JCRHoliness app-dicts/sword-JEAffections app-dicts/sword-JESermons app-dicts/sword-JFB app-dicts/sword-JOChrist app-dicts/sword-JOCommGod app-dicts/sword-JOGlory app-dicts/sword-JOMortSin app-dicts/sword-JPS app-dicts/sword-JST app-dicts/sword-Josephus app-dicts/sword-Jubilee2000 app-dicts/sword-KD app-dicts/sword-KJV app-dicts/sword-KJVA app-dicts/sword-KJVPCE app-dicts/sword-KingComm app-dicts/sword-LEB app-dicts/sword-LITV app-dicts/sword-LO app-dicts/sword-LawGospel app-dicts/sword-Leeser app-dicts/sword-Lightfoot app-dicts/sword-Luther app-dicts/sword-MHC app-dicts/sword-MHCC app-dicts/sword-MKJV app-dicts/sword-MLStrong app-dicts/sword-MollColossians app-dicts/sword-Montgomery app-dicts/sword-Murdock app-dicts/sword-NETfree app-dicts/sword-NETnotesfree app-dicts/sword-NETtext app-dicts/sword-NHEB app-dicts/sword-NHEBJE app-dicts/sword-NHEBME app-dicts/sword-Nave app-dicts/sword-Noyes app-dicts/sword-OEB app-dicts/sword-OEBcth app-dicts/sword-OSHM app-dicts/sword-OrthJBC app-dicts/sword-Orthodoxy app-dicts/sword-PNT app-dicts/sword-Packard app-dicts/sword-Passion app-dicts/sword-Pilgrim app-dicts/sword-Practice app-dicts/sword-QuotingPassages app-dicts/sword-RKJNT app-dicts/sword-RNKJV app-dicts/sword-RWP app-dicts/sword-RWebster app-dicts/sword-RecVer app-dicts/sword-Robinson app-dicts/sword-Rotherham app-dicts/sword-SAOA app-dicts/sword-SME app-dicts/sword-SPE app-dicts/sword-Scofield app-dicts/sword-Smith app-dicts/sword-Spurious app-dicts/sword-StrongsGreek app-dicts/sword-StrongsHebrew app-dicts/sword-TCR app-dicts/sword-TDavid app-dicts/sword-TFG app-dicts/sword-TSK app-dicts/sword-Torrey app-dicts/sword-Twenty app-dicts/sword-Tyndale app-dicts/sword-UKJV app-dicts/sword-Webster app-dicts/sword-Webster1806 app-dicts/sword-Webster1913 app-dicts/sword-Wesley app-dicts/sword-Westminster app-dicts/sword-Westminster21 app-dicts/sword-Weymouth app-dicts/sword-Worsley app-dicts/sword-Wycliffe app-dicts/sword-YLT ) l10n_eo? ( app-dicts/sword-Esperanto ) l10n_es? ( app-dicts/sword-SpaPlatense app-dicts/sword-SpaRV app-dicts/sword-SpaRV1865 app-dicts/sword-SpaRV1909 app-dicts/sword-SpaRVG app-dicts/sword-SpaTDP app-dicts/sword-SpaVNT ) l10n_et? ( app-dicts/sword-Est ) l10n_eu? ( app-dicts/sword-BasHautin app-dicts/sword-en_eu ) l10n_fa? ( app-dicts/sword-FarHezareNoh app-dicts/sword-FarOPV app-dicts/sword-FarTPV ) l10n_fi? ( app-dicts/sword-FinBiblia app-dicts/sword-FinPR app-dicts/sword-FinPR92 app-dicts/sword-FinRK app-dicts/sword-FinSTLK2017 ) l10n_fr? ( app-dicts/sword-FreBBB app-dicts/sword-FreBDM1707 app-dicts/sword-FreBDM1744 app-dicts/sword-FreBailly app-dicts/sword-FreCJE app-dicts/sword-FreCrampon app-dicts/sword-FreDAW app-dicts/sword-FreGBM app-dicts/sword-FreGeneve1669 app-dicts/sword-FreJND app-dicts/sword-FreKhan app-dicts/sword-FreLSN1872 app-dicts/sword-FreLXX app-dicts/sword-FreOltramare1874 app-dicts/sword-FrePGR app-dicts/sword-FrePilgrim app-dicts/sword-FreSegond1910 app-dicts/sword-FreStapfer1889 app-dicts/sword-FreSynodale1921 ) l10n_ga? ( app-dicts/sword-IriODomhnuill ) l10n_gd? ( app-dicts/sword-ScotsGaelic ) l10n_gez? ( app-dicts/sword-Geez ) l10n_got? ( app-dicts/sword-Wulfila ) l10n_grc? ( app-dicts/sword-ABPGRK app-dicts/sword-Antoniades app-dicts/sword-Byz app-dicts/sword-Elzevir app-dicts/sword-GreekHebrew app-dicts/sword-LXX app-dicts/sword-MorphGNT app-dicts/sword-Nestle1904 app-dicts/sword-OxfordTR app-dicts/sword-SBLGNT app-dicts/sword-SBLGNTApp app-dicts/sword-TNT app-dicts/sword-TR app-dicts/sword-Tisch app-dicts/sword-VarApp app-dicts/sword-WHNU app-dicts/sword-f35 ) l10n_gv? ( app-dicts/sword-ManxGaelic ) l10n_he? ( app-dicts/sword-Aleppo app-dicts/sword-HebDelitzsch app-dicts/sword-HebModern app-dicts/sword-HebrewGreek app-dicts/sword-MapM app-dicts/sword-OSHB app-dicts/sword-SP app-dicts/sword-SPDSS app-dicts/sword-SPMT app-dicts/sword-SPVar app-dicts/sword-WLC ) l10n_hi? ( app-dicts/sword-HinERV ) l10n_hr? ( app-dicts/sword-CroSaric ) l10n_ht? ( app-dicts/sword-Haitian ) l10n_hu? ( app-dicts/sword-HunIMIT app-dicts/sword-HunKNB app-dicts/sword-HunKar app-dicts/sword-HunRUF app-dicts/sword-HunUj ) l10n_hy? ( app-dicts/sword-ArmEastern app-dicts/sword-ArmWestern ) l10n_it? ( app-dicts/sword-ItDizGreco app-dicts/sword-ItNomiBibbia app-dicts/sword-ItaDio app-dicts/sword-ItaRive ) l10n_ja? ( app-dicts/sword-JapBungo app-dicts/sword-JapDenmo app-dicts/sword-JapKougo app-dicts/sword-JapMeiji app-dicts/sword-JapRaguet ) l10n_kek? ( app-dicts/sword-Kekchi ) l10n_kk? ( app-dicts/sword-Kaz ) l10n_km? ( app-dicts/sword-KhmerNT ) l10n_ko? ( app-dicts/sword-KorHKJV app-dicts/sword-KorRV ) l10n_kpg? ( app-dicts/sword-Kapingamarangi ) l10n_ktu? ( app-dicts/sword-KtuVb ) l10n_la? ( app-dicts/sword-VulgClementine app-dicts/sword-VulgConte app-dicts/sword-VulgGlossa app-dicts/sword-VulgHetzenauer app-dicts/sword-VulgSistine app-dicts/sword-Vulgate app-dicts/sword-Vulgate_HebPs app-dicts/sword-la_en ) l10n_ln? ( app-dicts/sword-LinVB ) l10n_lt? ( app-dicts/sword-LtKBB ) l10n_lv? ( app-dicts/sword-Latvian app-dicts/sword-LvGluck8 ) l10n_mg? ( app-dicts/sword-Mg1865 ) l10n_mi? ( app-dicts/sword-Maori ) l10n_ml? ( app-dicts/sword-Mal1910 ) l10n_mn? ( app-dicts/sword-MonKJV ) l10n_my? ( app-dicts/sword-BurCBCM app-dicts/sword-BurJudson ) l10n_nb? ( app-dicts/sword-NorBroed app-dicts/sword-Norsk ) l10n_nd? ( app-dicts/sword-Ndebele ) l10n_nl? ( app-dicts/sword-DutKant app-dicts/sword-DutKingComm app-dicts/sword-DutSVV app-dicts/sword-DutSVVA app-dicts/sword-NlCanisius1939 ) l10n_nn? ( app-dicts/sword-NorSMB ) l10n_pl? ( app-dicts/sword-PolGdanska app-dicts/sword-PolUGdanska ) l10n_pon? ( app-dicts/sword-PohnOld app-dicts/sword-Pohnpeian ) l10n_pot? ( app-dicts/sword-PotLykins ) l10n_ppk? ( app-dicts/sword-Uma ) l10n_prs? ( app-dicts/sword-Dari ) l10n_pt? ( app-dicts/sword-PorAR app-dicts/sword-PorAlmeida1911 app-dicts/sword-PorBLivre app-dicts/sword-PorBLivreTR app-dicts/sword-PorCap app-dicts/sword-PorIBP ) l10n_rmq? ( app-dicts/sword-Calo ) l10n_ro? ( app-dicts/sword-RomCor ) l10n_ru? ( app-dicts/sword-RusCARS app-dicts/sword-RusCARSA app-dicts/sword-RusCARSADICT app-dicts/sword-RusCARSDict app-dicts/sword-RusCARST app-dicts/sword-RusCARSTDICT app-dicts/sword-RusMakarij app-dicts/sword-RusSynodal app-dicts/sword-RusSynodalLIO app-dicts/sword-RusVZh ) l10n_sl? ( app-dicts/sword-SloKJV app-dicts/sword-SloOjacano app-dicts/sword-SloStritar ) l10n_sml? ( app-dicts/sword-sml_BL_2008 ) l10n_sn? ( app-dicts/sword-Shona ) l10n_so? ( app-dicts/sword-SomKQA ) l10n_sq? ( app-dicts/sword-Alb ) l10n_sr? ( app-dicts/sword-SrKDEkavski app-dicts/sword-SrKDIjekav ) l10n_sv? ( app-dicts/sword-Swe1917 app-dicts/sword-Swe1917Of app-dicts/sword-SweFolk1998 app-dicts/sword-SweKarlXII app-dicts/sword-SweKarlXII1873 ) l10n_sw? ( app-dicts/sword-Swahili ) l10n_syr? ( app-dicts/sword-Peshitta ) l10n_th? ( app-dicts/sword-ThaiKJV ) l10n_tl? ( app-dicts/sword-TagAngBiblia app-dicts/sword-Tagalog ) l10n_tlh? ( app-dicts/sword-KLV app-dicts/sword-KLVen_iklingon app-dicts/sword-KLViklingon_en ) l10n_tr? ( app-dicts/sword-TurHADI app-dicts/sword-TurNTB ) l10n_tsg? ( app-dicts/sword-Tausug ) l10n_ug? ( app-dicts/sword-UyCyr ) l10n_uk? ( app-dicts/sword-UkrKulish app-dicts/sword-Ukrainian ) l10n_ur? ( app-dicts/sword-UrduGeo app-dicts/sword-UrduGeoDeva app-dicts/sword-UrduGeoRoman ) l10n_vi? ( app-dicts/sword-FVDPVietAnh app-dicts/sword-VieRobinson app-dicts/sword-VieStrongsGreek app-dicts/sword-Viet app-dicts/sword-VietLCCMN app-dicts/sword-VietLCCMNCT app-dicts/sword-VietNVB ) l10n_vls? ( app-dicts/sword-vlsJoNT ) l10n_zh? ( app-dicts/sword-ChiNCVs app-dicts/sword-ChiNCVt app-dicts/sword-ChiSB app-dicts/sword-ChiUn app-dicts/sword-ChiUnL app-dicts/sword-ChiUns app-dicts/sword-ZhEnglish app-dicts/sword-ZhHanzi app-dicts/sword-ZhPinyin )
-SLOT=0
-_md5_=d36b99836d2057330ab5ba5beece438b
diff --git a/metadata/md5-cache/app-text/sword-modules-2.6 b/metadata/md5-cache/app-text/sword-modules-2.6
new file mode 100644
index 000000000000..25953750b008
--- /dev/null
+++ b/metadata/md5-cache/app-text/sword-modules-2.6
@@ -0,0 +1,10 @@
+DEFINED_PHASES=-
+DESCRIPTION=All the unlocked modules for app-text/sword, grouped by language
+EAPI=8
+HOMEPAGE=https://www.crosswire.org/sword/modules/
+IUSE=esoteric l10n_af l10n_ar l10n_az l10n_be l10n_bea l10n_bg l10n_br l10n_ceb l10n_ch l10n_chr l10n_ckb l10n_cop l10n_cs l10n_cu l10n_cy l10n_da l10n_de l10n_el l10n_en l10n_eo l10n_es l10n_et l10n_eu l10n_fa l10n_fi l10n_fr l10n_ga l10n_gd l10n_gez l10n_got l10n_grc l10n_gv l10n_he l10n_hi l10n_hr l10n_ht l10n_hu l10n_hy l10n_it l10n_ja l10n_kek l10n_kk l10n_km l10n_ko l10n_kpg l10n_ktu l10n_la l10n_ln l10n_lt l10n_lv l10n_mg l10n_mi l10n_ml l10n_mn l10n_my l10n_nb l10n_nd l10n_nl l10n_nn l10n_pl l10n_pon l10n_pot l10n_ppk l10n_prs l10n_pt l10n_rmq l10n_ro l10n_ru l10n_sl l10n_sml l10n_sn l10n_so l10n_sq l10n_sr l10n_sv l10n_sw l10n_syr l10n_th l10n_tl l10n_tlh l10n_tr l10n_tsg l10n_ug l10n_uk l10n_ur l10n_vi l10n_vls l10n_zh
+KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
+LICENSE=metapackage
+RDEPEND=|| ( app-dicts/sword-Eusebian_num app-dicts/sword-Eusebian_vs ) app-dicts/sword-Personal esoteric? ( app-dicts/sword-Phaistos app-dicts/sword-Sentiment ) l10n_af? ( app-dicts/sword-Afr1953 ) l10n_ar? ( app-dicts/sword-AraNAV app-dicts/sword-AraSVD app-dicts/sword-alzat ) l10n_az? ( app-dicts/sword-Azeri app-dicts/sword-NorthernAzeri ) l10n_be? ( app-dicts/sword-Bela ) l10n_bea? ( app-dicts/sword-BeaMRK ) l10n_bg? ( app-dicts/sword-BulCarigradNT app-dicts/sword-BulVeren ) l10n_br? ( app-dicts/sword-BretonNT app-dicts/sword-br_en ) l10n_ceb? ( app-dicts/sword-CebPinadayag ) l10n_ch? ( app-dicts/sword-Chamorro ) l10n_chr? ( app-dicts/sword-Che1860 ) l10n_ckb? ( app-dicts/sword-Sorani ) l10n_cop? ( app-dicts/sword-CopNT app-dicts/sword-CopSahBible2 app-dicts/sword-CopSahHorner app-dicts/sword-CopSahidicMSS app-dicts/sword-CopSahidica app-dicts/sword-SahidicBible ) l10n_cs? ( app-dicts/sword-CzeB21 app-dicts/sword-CzeBKR app-dicts/sword-CzeCEP app-dicts/sword-CzeCSP ) l10n_cu? ( app-dicts/sword-CSlElizabeth ) l10n_cy? ( app-dicts/sword-WelBeiblNet ) l10n_da? ( app-dicts/sword-DaNT1819 app-dicts/sword-DaOT1871NT1907 app-dicts/sword-DaOT1931NT1907 ) l10n_de? ( app-dicts/sword-GerAlbrecht app-dicts/sword-GerAugustinus app-dicts/sword-GerBoLut app-dicts/sword-GerElb1871 app-dicts/sword-GerElb1905 app-dicts/sword-GerGruenewald app-dicts/sword-GerKingComm app-dicts/sword-GerLeoNA28 app-dicts/sword-GerLeoRP18 app-dicts/sword-GerLutherpredigten app-dicts/sword-GerMenge app-dicts/sword-GerNeUe app-dicts/sword-GerOffBiSt app-dicts/sword-GerReinhardt app-dicts/sword-GerSch app-dicts/sword-GerTafel app-dicts/sword-GerTextbibel app-dicts/sword-GerZurcher app-dicts/sword-MAK app-dicts/sword-Rieger ) l10n_el? ( app-dicts/sword-GreVamvas ) l10n_en? ( app-dicts/sword-2BabDict app-dicts/sword-AB app-dicts/sword-ABP app-dicts/sword-ABS_Essay_GoodSam_SWB app-dicts/sword-ACV app-dicts/sword-AKJV app-dicts/sword-ASV app-dicts/sword-Abbott app-dicts/sword-AbbottSmith app-dicts/sword-AbbottSmithStrongs app-dicts/sword-AmTract app-dicts/sword-Anderson app-dicts/sword-BBE app-dicts/sword-BDBGlosses_Strongs app-dicts/sword-BWE app-dicts/sword-BaptistConfession1646 app-dicts/sword-BaptistConfession1689 app-dicts/sword-Barnes app-dicts/sword-Burkitt app-dicts/sword-CBC app-dicts/sword-CPDV app-dicts/sword-Catena app-dicts/sword-Cawdrey app-dicts/sword-Clarke app-dicts/sword-Common app-dicts/sword-Concord app-dicts/sword-DBD app-dicts/sword-DRC app-dicts/sword-DTN app-dicts/sword-Daily app-dicts/sword-Darby app-dicts/sword-DarkNightOfTheSoul app-dicts/sword-Diaglott app-dicts/sword-Dodson app-dicts/sword-EMBReality app-dicts/sword-EMTV app-dicts/sword-Easton app-dicts/sword-Etheridge app-dicts/sword-Family app-dicts/sword-Finney app-dicts/sword-Geneva app-dicts/sword-Geneva1599 app-dicts/sword-Godbey app-dicts/sword-GodsWord app-dicts/sword-Heretics app-dicts/sword-Hitchcock app-dicts/sword-ISBE app-dicts/sword-ISV app-dicts/sword-Imitation app-dicts/sword-Institutes app-dicts/sword-JCRHoliness app-dicts/sword-JEAffections app-dicts/sword-JESermons app-dicts/sword-JFB app-dicts/sword-JOChrist app-dicts/sword-JOCommGod app-dicts/sword-JOGlory app-dicts/sword-JOMortSin app-dicts/sword-JPS app-dicts/sword-JST app-dicts/sword-Josephus app-dicts/sword-Jubilee2000 app-dicts/sword-KD app-dicts/sword-KJV app-dicts/sword-KJVA app-dicts/sword-KJVPCE app-dicts/sword-KingComm app-dicts/sword-LEB app-dicts/sword-LITV app-dicts/sword-LO app-dicts/sword-LawGospel app-dicts/sword-Leeser app-dicts/sword-Lightfoot app-dicts/sword-Luther app-dicts/sword-MHC app-dicts/sword-MHCC app-dicts/sword-MKJV app-dicts/sword-MLStrong app-dicts/sword-MollColossians app-dicts/sword-Montgomery app-dicts/sword-Murdock app-dicts/sword-NETfree app-dicts/sword-NETnotesfree app-dicts/sword-NETtext app-dicts/sword-NHEB app-dicts/sword-NHEBJE app-dicts/sword-NHEBME app-dicts/sword-Nave app-dicts/sword-Noyes app-dicts/sword-OEB app-dicts/sword-OEBcth app-dicts/sword-OSHM app-dicts/sword-OrthJBC app-dicts/sword-Orthodoxy app-dicts/sword-PNT app-dicts/sword-Packard app-dicts/sword-Passion app-dicts/sword-Pilgrim app-dicts/sword-Practice app-dicts/sword-QuotingPassages app-dicts/sword-RKJNT app-dicts/sword-RNKJV app-dicts/sword-RWP app-dicts/sword-RWebster app-dicts/sword-RecVer app-dicts/sword-Robinson app-dicts/sword-Rotherham app-dicts/sword-SAOA app-dicts/sword-SME app-dicts/sword-SPE app-dicts/sword-Scofield app-dicts/sword-Smith app-dicts/sword-Spurious app-dicts/sword-StrongsGreek app-dicts/sword-StrongsHebrew app-dicts/sword-TCR app-dicts/sword-TDavid app-dicts/sword-TFG app-dicts/sword-TSK app-dicts/sword-Torrey app-dicts/sword-Twenty app-dicts/sword-Tyndale app-dicts/sword-UKJV app-dicts/sword-Webster app-dicts/sword-Webster1806 app-dicts/sword-Webster1913 app-dicts/sword-Wesley app-dicts/sword-Westminster app-dicts/sword-Westminster21 app-dicts/sword-Weymouth app-dicts/sword-Worsley app-dicts/sword-Wycliffe app-dicts/sword-YLT ) l10n_eo? ( app-dicts/sword-Esperanto ) l10n_es? ( app-dicts/sword-SpaPlatense app-dicts/sword-SpaRV app-dicts/sword-SpaRV1865 app-dicts/sword-SpaRV1909 app-dicts/sword-SpaRVG app-dicts/sword-SpaTDP app-dicts/sword-SpaVNT ) l10n_et? ( app-dicts/sword-Est ) l10n_eu? ( app-dicts/sword-BasHautin app-dicts/sword-en_eu ) l10n_fa? ( app-dicts/sword-FarHezareNoh app-dicts/sword-FarOPV app-dicts/sword-FarTPV ) l10n_fi? ( app-dicts/sword-FinBiblia app-dicts/sword-FinPR app-dicts/sword-FinPR92 app-dicts/sword-FinRK app-dicts/sword-FinSTLK2017 ) l10n_fr? ( app-dicts/sword-FreAug app-dicts/sword-FreBBB app-dicts/sword-FreBDM1707 app-dicts/sword-FreBDM1744 app-dicts/sword-FreBailly app-dicts/sword-FreCJE app-dicts/sword-FreChry app-dicts/sword-FreCrampon app-dicts/sword-FreDAW app-dicts/sword-FreGBM app-dicts/sword-FreGeneve1669 app-dicts/sword-FreJND app-dicts/sword-FreKhan app-dicts/sword-FreLSN1872 app-dicts/sword-FreLXX app-dicts/sword-FreOltramare1874 app-dicts/sword-FrePGR app-dicts/sword-FrePilgrim app-dicts/sword-FreSegond1910 app-dicts/sword-FreStapfer1889 app-dicts/sword-FreSynodale1921 ) l10n_ga? ( app-dicts/sword-IriODomhnuill ) l10n_gd? ( app-dicts/sword-ScotsGaelic ) l10n_gez? ( app-dicts/sword-Geez ) l10n_got? ( app-dicts/sword-Wulfila ) l10n_grc? ( app-dicts/sword-ABPGRK app-dicts/sword-Antoniades app-dicts/sword-Byz app-dicts/sword-Elzevir app-dicts/sword-GreekHebrew app-dicts/sword-LXX app-dicts/sword-MorphGNT app-dicts/sword-Nestle1904 app-dicts/sword-OxfordTR app-dicts/sword-SBLGNT app-dicts/sword-SBLGNTApp app-dicts/sword-TNT app-dicts/sword-TR app-dicts/sword-Tisch app-dicts/sword-VarApp app-dicts/sword-WHNU app-dicts/sword-f35 ) l10n_gv? ( app-dicts/sword-ManxGaelic ) l10n_he? ( app-dicts/sword-Aleppo app-dicts/sword-HebDelitzsch app-dicts/sword-HebModern app-dicts/sword-HebrewGreek app-dicts/sword-MapM app-dicts/sword-OSHB app-dicts/sword-SP app-dicts/sword-SPDSS app-dicts/sword-SPMT app-dicts/sword-SPVar app-dicts/sword-WLC ) l10n_hi? ( app-dicts/sword-HinERV ) l10n_hr? ( app-dicts/sword-CroSaric ) l10n_ht? ( app-dicts/sword-Haitian ) l10n_hu? ( app-dicts/sword-HunIMIT app-dicts/sword-HunKNB app-dicts/sword-HunKar app-dicts/sword-HunRUF app-dicts/sword-HunUj ) l10n_hy? ( app-dicts/sword-ArmEastern app-dicts/sword-ArmWestern ) l10n_it? ( app-dicts/sword-ItDizGreco app-dicts/sword-ItNomiBibbia app-dicts/sword-ItaDio app-dicts/sword-ItaRive ) l10n_ja? ( app-dicts/sword-JapBungo app-dicts/sword-JapDenmo app-dicts/sword-JapKougo app-dicts/sword-JapMeiji app-dicts/sword-JapRaguet ) l10n_kek? ( app-dicts/sword-Kekchi ) l10n_kk? ( app-dicts/sword-Kaz ) l10n_km? ( app-dicts/sword-KhmerNT ) l10n_ko? ( app-dicts/sword-KorHKJV app-dicts/sword-KorRV ) l10n_kpg? ( app-dicts/sword-Kapingamarangi ) l10n_ktu? ( app-dicts/sword-KtuVB ) l10n_la? ( app-dicts/sword-VulgClementine app-dicts/sword-VulgConte app-dicts/sword-VulgGlossa app-dicts/sword-VulgHetzenauer app-dicts/sword-VulgSistine app-dicts/sword-Vulgate app-dicts/sword-Vulgate_HebPs app-dicts/sword-la_en ) l10n_ln? ( app-dicts/sword-LinVB ) l10n_lt? ( app-dicts/sword-LtKBB ) l10n_lv? ( app-dicts/sword-Latvian app-dicts/sword-LvGluck8 ) l10n_mg? ( app-dicts/sword-Mg1865 ) l10n_mi? ( app-dicts/sword-Maori ) l10n_ml? ( app-dicts/sword-Mal1910 ) l10n_mn? ( app-dicts/sword-MonKJV ) l10n_my? ( app-dicts/sword-BurCBCM app-dicts/sword-BurJudson ) l10n_nb? ( app-dicts/sword-NorBroed app-dicts/sword-Norsk ) l10n_nd? ( app-dicts/sword-Ndebele ) l10n_nl? ( app-dicts/sword-DutKant app-dicts/sword-DutKingComm app-dicts/sword-DutSVV app-dicts/sword-DutSVVA app-dicts/sword-NlCanisius1939 ) l10n_nn? ( app-dicts/sword-NorSMB ) l10n_pl? ( app-dicts/sword-PolGdanska app-dicts/sword-PolUGdanska ) l10n_pon? ( app-dicts/sword-PohnOld app-dicts/sword-Pohnpeian ) l10n_pot? ( app-dicts/sword-PotLykins ) l10n_ppk? ( app-dicts/sword-Uma ) l10n_prs? ( app-dicts/sword-Dari ) l10n_pt? ( app-dicts/sword-PorAR app-dicts/sword-PorAlmeida1911 app-dicts/sword-PorBLivre app-dicts/sword-PorBLivreTR app-dicts/sword-PorCap app-dicts/sword-PorIBP ) l10n_rmq? ( app-dicts/sword-Calo ) l10n_ro? ( app-dicts/sword-RomCor ) l10n_ru? ( app-dicts/sword-RusCARS app-dicts/sword-RusCARSA app-dicts/sword-RusCARSADICT app-dicts/sword-RusCARSDict app-dicts/sword-RusCARST app-dicts/sword-RusCARSTDICT app-dicts/sword-RusMakarij app-dicts/sword-RusSynodal app-dicts/sword-RusSynodalLIO app-dicts/sword-RusVZh ) l10n_sl? ( app-dicts/sword-SloKJV app-dicts/sword-SloOjacano app-dicts/sword-SloStritar ) l10n_sml? ( app-dicts/sword-sml_BL_2008 ) l10n_sn? ( app-dicts/sword-Shona ) l10n_so? ( app-dicts/sword-SomKQA ) l10n_sq? ( app-dicts/sword-Alb ) l10n_sr? ( app-dicts/sword-SrKDEkavski app-dicts/sword-SrKDIjekav ) l10n_sv? ( app-dicts/sword-Swe1917 app-dicts/sword-Swe1917Of app-dicts/sword-SweFolk1998 app-dicts/sword-SweKarlXII app-dicts/sword-SweKarlXII1873 ) l10n_sw? ( app-dicts/sword-Swahili ) l10n_syr? ( app-dicts/sword-Peshitta ) l10n_th? ( app-dicts/sword-ThaiKJV ) l10n_tl? ( app-dicts/sword-TagAngBiblia app-dicts/sword-Tagalog ) l10n_tlh? ( app-dicts/sword-KLV app-dicts/sword-KLVen_iklingon app-dicts/sword-KLViklingon_en ) l10n_tr? ( app-dicts/sword-TurHADI app-dicts/sword-TurNTB ) l10n_tsg? ( app-dicts/sword-Tausug ) l10n_ug? ( app-dicts/sword-UyCyr ) l10n_uk? ( app-dicts/sword-UkrKulish app-dicts/sword-Ukrainian ) l10n_ur? ( app-dicts/sword-UrduGeo app-dicts/sword-UrduGeoDeva app-dicts/sword-UrduGeoRoman ) l10n_vi? ( app-dicts/sword-FVDPVietAnh app-dicts/sword-VieRobinson app-dicts/sword-VieStrongsGreek app-dicts/sword-Viet app-dicts/sword-VietLCCMN app-dicts/sword-VietLCCMNCT app-dicts/sword-VietNVB ) l10n_vls? ( app-dicts/sword-vlsJoNT ) l10n_zh? ( app-dicts/sword-ChiNCVs app-dicts/sword-ChiNCVt app-dicts/sword-ChiSB app-dicts/sword-ChiUn app-dicts/sword-ChiUnL app-dicts/sword-ChiUns app-dicts/sword-ZhEnglish app-dicts/sword-ZhHanzi app-dicts/sword-ZhPinyin )
+SLOT=0
+_md5_=aaea3f75e920ae2828ea0c5f929837b1
diff --git a/metadata/md5-cache/app-text/t1utils-1.41-r2 b/metadata/md5-cache/app-text/t1utils-1.41-r2
index 9ebc4d929d6f..9d3b79e6d3ef 100644
--- a/metadata/md5-cache/app-text/t1utils-1.41-r2
+++ b/metadata/md5-cache/app-text/t1utils-1.41-r2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=!<media-libs/freetype-1.4_pre20080316
 SLOT=0
 SRC_URI=http://www.lcdf.org/type/t1utils-1.41.tar.gz
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	28f0f3c0226306ec5f49e13bf851f171	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4fbbbc98f236f1b43acd99476bc3cd85	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=e28e30ad4cecb7b681c8b1947ae6e85f
diff --git a/metadata/md5-cache/app-text/teckit-2.5.10 b/metadata/md5-cache/app-text/teckit-2.5.10
index 12c70dbd3cb9..715aebfae189 100644
--- a/metadata/md5-cache/app-text/teckit-2.5.10
+++ b/metadata/md5-cache/app-text/teckit-2.5.10
@@ -4,10 +4,11 @@ DEPEND=dev-libs/expat sys-libs/zlib
 DESCRIPTION=Text Encoding Conversion toolkit
 EAPI=7
 HOMEPAGE=https://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&cat_id=TECkit
-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
+INHERIT=autotools
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( CPL-0.5 LGPL-2.1 )
 RDEPEND=dev-libs/expat sys-libs/zlib
 SLOT=0
 SRC_URI=https://github.com/silnrsi/teckit/releases/download/v2.5.10/teckit-2.5.10.tar.gz
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=6e8dc09788770ee3ffb04a8c80a2f073
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=044d86d0809bec1b3ab45dde0ef0fc27
diff --git a/metadata/md5-cache/app-text/tesseract-4.1.1 b/metadata/md5-cache/app-text/tesseract-4.1.1
index 5efdb39acde4..887bd9326b3b 100644
--- a/metadata/md5-cache/app-text/tesseract-4.1.1
+++ b/metadata/md5-cache/app-text/tesseract-4.1.1
@@ -4,11 +4,12 @@ DEPEND=>=media-libs/leptonica-1.74:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-
 DESCRIPTION=An OCR Engine, originally developed at HP, now open source
 EAPI=7
 HOMEPAGE=https://github.com/tesseract-ocr
+INHERIT=autotools multilib-minimal toolchain-funcs
 IUSE=doc jpeg opencl openmp png static-libs tiff training webp abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha amd64 arm arm64 ~mips ppc ppc64 ~riscv ~sparc x86
 LICENSE=Apache-2.0
 RDEPEND=>=media-libs/leptonica-1.74:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,zlib,tiff?,jpeg?,png?,webp?] opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/tiff:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/leptonica:=[tiff] ) training? ( dev-libs/icu:= x11-libs/pango:= x11-libs/cairo:= ) || ( >=app-text/tessdata_fast-4.0.0 >=app-text/tessdata_best-4.0.0 >=app-text/tessdata_legacy-4.0.0 )
 SLOT=0
 SRC_URI=https://github.com/tesseract-ocr/tesseract/archive/4.1.1.tar.gz -> tesseract-4.1.1.tar.gz
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=71c3cea34710119af306366224fd0aa5
diff --git a/metadata/md5-cache/app-text/tesseract-5.0.1 b/metadata/md5-cache/app-text/tesseract-5.0.1
index 7f745db83c17..3830c3bced25 100644
--- a/metadata/md5-cache/app-text/tesseract-5.0.1
+++ b/metadata/md5-cache/app-text/tesseract-5.0.1
@@ -4,11 +4,12 @@ DEPEND=>=media-libs/leptonica-1.74:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-
 DESCRIPTION=An OCR Engine, originally developed at HP, now open source
 EAPI=8
 HOMEPAGE=https://github.com/tesseract-ocr
+INHERIT=autotools multilib-minimal toolchain-funcs
 IUSE=doc float32 jpeg opencl openmp png static-libs tiff training webp abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
 LICENSE=Apache-2.0
 RDEPEND=>=media-libs/leptonica-1.74:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,zlib,tiff?,jpeg?,png?,webp?] opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/tiff:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/leptonica:=[tiff] ) training? ( dev-libs/icu:= x11-libs/pango:= x11-libs/cairo:= ) || ( >=app-text/tessdata_fast-4.0.0 >=app-text/tessdata_best-4.0.0 >=app-text/tessdata_legacy-4.0.0 )
 SLOT=0/5
 SRC_URI=https://github.com/tesseract-ocr/tesseract/archive/5.0.1.tar.gz -> tesseract-5.0.1.tar.gz
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=6f1bca121d6bce4181c139ea1cd6f1db
diff --git a/metadata/md5-cache/app-text/tesseract-5.1.0 b/metadata/md5-cache/app-text/tesseract-5.1.0
index 71ad2f7cc798..c887ba78e2c7 100644
--- a/metadata/md5-cache/app-text/tesseract-5.1.0
+++ b/metadata/md5-cache/app-text/tesseract-5.1.0
@@ -4,11 +4,12 @@ DEPEND=>=media-libs/leptonica-1.74:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-
 DESCRIPTION=An OCR Engine, originally developed at HP, now open source
 EAPI=8
 HOMEPAGE=https://github.com/tesseract-ocr
+INHERIT=autotools multilib-minimal toolchain-funcs
 IUSE=doc float32 jpeg opencl openmp png static-libs tiff training webp abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
 LICENSE=Apache-2.0
 RDEPEND=>=media-libs/leptonica-1.74:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,zlib,tiff?,jpeg?,png?,webp?] opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/tiff:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/leptonica:=[tiff] ) training? ( dev-libs/icu:= x11-libs/pango:= x11-libs/cairo:= ) || ( >=app-text/tessdata_fast-4.0.0 >=app-text/tessdata_best-4.0.0 >=app-text/tessdata_legacy-4.0.0 )
 SLOT=0/5
 SRC_URI=https://github.com/tesseract-ocr/tesseract/archive/5.1.0.tar.gz -> tesseract-5.1.0.tar.gz
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=6f1bca121d6bce4181c139ea1cd6f1db
diff --git a/metadata/md5-cache/app-text/tesseract-9999 b/metadata/md5-cache/app-text/tesseract-9999
index 5799f2ae13fb..bd27bac73be9 100644
--- a/metadata/md5-cache/app-text/tesseract-9999
+++ b/metadata/md5-cache/app-text/tesseract-9999
@@ -4,10 +4,11 @@ DEPEND=>=media-libs/leptonica-1.74:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-
 DESCRIPTION=An OCR Engine, originally developed at HP, now open source
 EAPI=8
 HOMEPAGE=https://github.com/tesseract-ocr
+INHERIT=autotools git-r3 multilib-minimal toolchain-funcs
 IUSE=doc float32 jpeg opencl openmp png static-libs tiff training webp abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 LICENSE=Apache-2.0
 PROPERTIES=live
 RDEPEND=>=media-libs/leptonica-1.74:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,zlib,tiff?,jpeg?,png?,webp?] opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/tiff:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/leptonica:=[tiff] ) training? ( dev-libs/icu:= x11-libs/pango:= x11-libs/cairo:= ) || ( >=app-text/tessdata_fast-4.0.0 >=app-text/tessdata_best-4.0.0 >=app-text/tessdata_legacy-4.0.0 )
 SLOT=0
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=634511bb64daac6fd1bc2855f6ce09fa
diff --git a/metadata/md5-cache/app-text/texlive-core-2021-r1 b/metadata/md5-cache/app-text/texlive-core-2021-r1
index 6ca2d5a26a11..ea887a8c6638 100644
--- a/metadata/md5-cache/app-text/texlive-core-2021-r1
+++ b/metadata/md5-cache/app-text/texlive-core-2021-r1
@@ -4,11 +4,12 @@ DEPEND=X? ( x11-libs/libX11 x11-libs/libXmu ) !app-text/epspdf !app-text/pdfjam
 DESCRIPTION=A complete TeX distribution
 EAPI=7
 HOMEPAGE=https://tug.org/texlive/
+INHERIT=flag-o-matic toolchain-funcs libtool texlive-common
 IUSE=cjk X doc source tk +luajittex xetex xindy
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris
 LICENSE=GPL-2 LPPL-1.3c TeX
 RDEPEND=X? ( x11-libs/libX11 x11-libs/libXmu ) !app-text/epspdf !app-text/pdfjam sys-libs/zlib >=media-libs/harfbuzz-1.4.5:=[icu,graphite] >=media-libs/libpng-1.2.43-r2:0= media-libs/gd[png] media-gfx/graphite2 >=x11-libs/cairo-1.12 >=x11-libs/pixman-0.18 dev-libs/zziplib:= app-text/libpaper dev-libs/gmp:0 dev-libs/mpfr:0= >=dev-libs/ptexenc-1.3.8 xetex? ( >=app-text/teckit-2.5.3 media-libs/fontconfig ) xindy? ( dev-lisp/clisp:= ) media-libs/freetype:2 >=dev-libs/icu-50:= >=dev-libs/kpathsea-6.3.2:= >=app-text/ps2pkm-1.8_p20170524 >=app-text/dvipsk-5.997 >=dev-tex/bibtexu-3.71_p20170524 virtual/perl-Getopt-Long dev-perl/File-HomeDir dev-perl/Log-Dispatch dev-perl/Unicode-LineBreak dev-perl/YAML-Tiny tk? ( dev-lang/tk dev-perl/Tk )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~zlogene/distfiles/texlive/texlive-20210325-source.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/texlive-tlpdb-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/texlive-core-patches-2021-1.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-base-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gsftopk-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texlive.infra-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texlive-scripts-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-a2ping-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-adhocfilelist-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-arara-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-asymptote-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bundledoc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-checklistings-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chklref-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ctan_chk-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-clojure-pamphlet-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cluttex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ctanify-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ctan-o-mat-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ctanbib-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ctanupload-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ctie-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cweb-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-de-macro-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dtl-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dtxgen-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dvi2tty-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dviasm-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dvicopy-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dvidvi-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dviinfox-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dviout-util-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dviljk-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dvipos-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-findhyph-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fragmaster-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hook-pre-commit-pkg-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-installfont-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ketcindy-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lacheck-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex-git-log-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex-papersize-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex2man-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex2nemeth-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latexfileversion-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latexpand-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latexindent-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ltxfileinfo-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ltximg-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-listings-ext-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-make4ht-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-match_parens-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mflua-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mkjobtexmf-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-patgen-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfbook2-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfcrop-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfjam-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdflatexpicscale-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdftex-quiet-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfxup-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdftosrc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pfarrei-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pkfix-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pkfix-helper-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-purifyeps-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-seetexk-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-spix-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-srcredact-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sty2dtx-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-synctex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tex4ebook-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texcount-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texdef-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texdiff-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texdirflatten-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texdoc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texfot-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texliveonfly-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texlive-scripts-extra-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texloganalyser-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texosquery-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texplate-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texware-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tie-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tlcockpit-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tpic2pdftex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-typeoutfileinfo-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-web-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xindy-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xindex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xpdfopen-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-collection-binextra-2021.tar.xz doc? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gsftopk.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texlive.infra.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texlive-scripts.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-a2ping.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-adhocfilelist.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-arara.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-asymptote.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bundledoc.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-checklistings.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chklref.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ctan_chk.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-clojure-pamphlet.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cluttex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ctanify.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ctan-o-mat.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ctanbib.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ctanupload.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ctie.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cweb.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-de-macro.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dtl.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dtxgen.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dvi2tty.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dviasm.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dvicopy.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dvidvi.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dviinfox.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dviljk.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dvipos.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dviout-util.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-findhyph.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fragmaster.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hook-pre-commit-pkg.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-installfont.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ketcindy.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lacheck.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex-git-log.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex-papersize.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex2man.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex2nemeth.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latexfileversion.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latexpand.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latexindent.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ltxfileinfo.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ltximg.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-listings-ext.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-make4ht.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-match_parens.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mkjobtexmf.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-patgen.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfbook2.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfcrop.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfjam.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdflatexpicscale.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdftex-quiet.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfxup.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdftosrc.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pfarrei.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pkfix.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pkfix-helper.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-purifyeps.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pythontex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-seetexk.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-spix.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-srcredact.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sty2dtx.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-synctex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tex4ebook.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texcount.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texdef.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texdiff.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texdirflatten.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texdoc.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texfot.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texliveonfly.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texlive-scripts-extra.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texloganalyser.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texosquery.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texware.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tie.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tlcockpit.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tpic2pdftex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-typeoutfileinfo.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texplate.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-web.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xindy.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xindex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xpdfopen.doc-2021.tar.xz ) source? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-adhocfilelist.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-arara.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-checklistings.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-clojure-pamphlet.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-listings-ext.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mkjobtexmf.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pfarrei.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pythontex.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texdef.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texosquery.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texplate.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tlcockpit.source-2021.tar.xz )
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	texlive-common	c918583cd52e23eacee8a4cb5a623ed0	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=ee7e4647d98ab65bda8ccddd82bfb4ee
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	texlive-common	c918583cd52e23eacee8a4cb5a623ed0	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_md5_=3540e511332fd9a50aaa330a5f1ac6ab
diff --git a/metadata/md5-cache/app-text/tkman-2.2-r3 b/metadata/md5-cache/app-text/tkman-2.2-r3
index 9c320c7839f0..4fa9f0dab561 100644
--- a/metadata/md5-cache/app-text/tkman-2.2-r3
+++ b/metadata/md5-cache/app-text/tkman-2.2-r3
@@ -3,10 +3,11 @@ DEPEND=>=app-text/rman-3.1 >=dev-lang/tcl-8.4:= >=dev-lang/tk-8.4:=
 DESCRIPTION=Graphical, hypertex man and info page browser
 EAPI=8
 HOMEPAGE=https://sourceforge.net/projects/tkman/
+INHERIT=desktop
 KEYWORDS=~amd64 ppc sparc x86
 LICENSE=Artistic
 RDEPEND=>=app-text/rman-3.1 >=dev-lang/tcl-8.4:= >=dev-lang/tk-8.4:=
 SLOT=0
 SRC_URI=mirror://sourceforge/project/tkman/tkman/2.2/tkman-2.2.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa
 _md5_=14f9ac561dd84008c8dd6fb7559adf54
diff --git a/metadata/md5-cache/app-text/tofrodos-1.7.13 b/metadata/md5-cache/app-text/tofrodos-1.7.13
index 27fc2dae88c5..938bea0ac5ab 100644
--- a/metadata/md5-cache/app-text/tofrodos-1.7.13
+++ b/metadata/md5-cache/app-text/tofrodos-1.7.13
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile install
 DESCRIPTION=Utility that converts ASCII files between the MSDOS and the Unix format
 EAPI=7
 HOMEPAGE=http://tofrodos.sourceforge.net/
+INHERIT=toolchain-funcs
 KEYWORDS=~amd64 ~arm ~hppa ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://tofrodos.sourceforge.net/download/tofrodos-1.7.13.tar.gz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=6caadc466ccc50338c8108db1fbef8f4
diff --git a/metadata/md5-cache/app-text/trang-20181222 b/metadata/md5-cache/app-text/trang-20181222
index 1fcd0fe72891..5ef36c57f1f0 100644
--- a/metadata/md5-cache/app-text/trang-20181222
+++ b/metadata/md5-cache/app-text/trang-20181222
@@ -10,5 +10,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.8:* dev-java/xerces:2 dev-java/xml-commons-resolver:0 >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=https://github.com/relaxng/jing-trang/archive/V20181222.tar.gz -> trang-20181222.tar.gz
-_eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	e38ea02d8ed864a74078ecf46aa06f30	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	cfb5f6911bb70204c94ceafd0372c716	multilib	4fbbbc98f236f1b43acd99476bc3cd85	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=d3b2a0ce976735b9eb69599aac0a8b8c
diff --git a/metadata/md5-cache/app-text/tree-1.8.0 b/metadata/md5-cache/app-text/tree-1.8.0
index 5c435decd061..cf53757f4853 100644
--- a/metadata/md5-cache/app-text/tree-1.8.0
+++ b/metadata/md5-cache/app-text/tree-1.8.0
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile install prepare
 DESCRIPTION=Lists directories recursively, and produces an indented listing of files
 EAPI=7
 HOMEPAGE=http://mama.indstate.edu/users/ice/tree/
+INHERIT=toolchain-funcs flag-o-matic bash-completion-r1
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=ftp://mama.indstate.edu/linux/tree/tree-1.8.0.tgz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=dc6bcc0dde771a83395cda3faeeb5015
diff --git a/metadata/md5-cache/app-text/tree-2.0.1 b/metadata/md5-cache/app-text/tree-2.0.1
index 5940c125d7b4..a3c4cc4e1a01 100644
--- a/metadata/md5-cache/app-text/tree-2.0.1
+++ b/metadata/md5-cache/app-text/tree-2.0.1
@@ -7,5 +7,5 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~r
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=ftp://mama.indstate.edu/linux/tree/tree-2.0.1.tgz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=7bf54acea4b4888a0a8f1672799c1e8b
diff --git a/metadata/md5-cache/app-text/ttf2pt1-3.4.4-r1 b/metadata/md5-cache/app-text/ttf2pt1-3.4.4-r1
index 590e5c9f8b03..b5f1424e228c 100644
--- a/metadata/md5-cache/app-text/ttf2pt1-3.4.4-r1
+++ b/metadata/md5-cache/app-text/ttf2pt1-3.4.4-r1
@@ -4,10 +4,11 @@ DEPEND=>=media-libs/freetype-2.5.1:2
 DESCRIPTION=True Type Font to Postscript Type 1 Converter
 EAPI=7
 HOMEPAGE=http://ttf2pt1.sourceforge.net/
+INHERIT=toolchain-funcs
 KEYWORDS=amd64 ppc sparc x86
 LICENSE=ttf2pt1
 RDEPEND=>=media-libs/freetype-2.5.1:2
 SLOT=0
 SRC_URI=mirror://sourceforge/ttf2pt1/ttf2pt1-3.4.4.tgz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=712c6662c144ddc7a44fb7499bdc91ac
diff --git a/metadata/md5-cache/app-text/txt2pdbdoc-1.4.4 b/metadata/md5-cache/app-text/txt2pdbdoc-1.4.4
index 7bca9fe678ed..87920034a2b9 100644
--- a/metadata/md5-cache/app-text/txt2pdbdoc-1.4.4
+++ b/metadata/md5-cache/app-text/txt2pdbdoc-1.4.4
@@ -4,10 +4,11 @@ DEPEND=dev-lang/perl
 DESCRIPTION=Text/HTML to Doc file converter for the Palm Pilot
 EAPI=7
 HOMEPAGE=http://homepage.mac.com/pauljlucas/software/txt2pdbdoc/
+INHERIT=autotools
 KEYWORDS=amd64 ppc sparc x86
 LICENSE=GPL-2
 RDEPEND=dev-lang/perl
 SLOT=0
 SRC_URI=http://homepage.mac.com/pauljlucas/software/txt2pdbdoc-1.4.4.tar.gz
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=f442bedf9665f9fd932c8583ad3b0250
diff --git a/metadata/md5-cache/app-text/txt2tags-3.7 b/metadata/md5-cache/app-text/txt2tags-3.7
index 5ac60ca70c54..79b6fd3070f8 100644
--- a/metadata/md5-cache/app-text/txt2tags-3.7
+++ b/metadata/md5-cache/app-text/txt2tags-3.7
@@ -5,11 +5,11 @@ EAPI=7
 HOMEPAGE=https://txt2tags.org
 INHERIT=distutils-r1
 IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris
+KEYWORDS=amd64 ~arm64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris
 LICENSE=GPL-2+
 RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=https://codeload.github.com/txt2tags/txt2tags/tar.gz/3.7 -> txt2tags-3.7.tar.gz
-_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=14b8e6d136fa818e94774c570e3a3849
+_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=5526478309240fedef52d8497e0f14c3
diff --git a/metadata/md5-cache/app-text/u2ps-1.2 b/metadata/md5-cache/app-text/u2ps-1.2
index a13a162b9ee3..7a92c1ad3990 100644
--- a/metadata/md5-cache/app-text/u2ps-1.2
+++ b/metadata/md5-cache/app-text/u2ps-1.2
@@ -4,10 +4,11 @@ DEPEND=app-text/ghostscript-gpl
 DESCRIPTION=A text to PostScript converter like a2ps, but supports UTF-8
 EAPI=7
 HOMEPAGE=https://github.com/arsv/u2ps
+INHERIT=toolchain-funcs
 KEYWORDS=amd64 ~x86
 LICENSE=GPL-3
 RDEPEND=app-text/ghostscript-gpl
 SLOT=0
 SRC_URI=https://github.com/arsv/u2ps/releases/download/1.2/u2ps-1.2.tar.gz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=9d241f4f4e476a6298ebfafb717c5bb0
diff --git a/metadata/md5-cache/app-text/unac-1.8.0 b/metadata/md5-cache/app-text/unac-1.8.0
index 177faeb2ffbd..289567b0f044 100644
--- a/metadata/md5-cache/app-text/unac-1.8.0
+++ b/metadata/md5-cache/app-text/unac-1.8.0
@@ -4,6 +4,7 @@ DEPEND=virtual/libiconv test? ( dev-lang/perl )
 DESCRIPTION=Library and command-line tool for removing accents from characters
 EAPI=7
 HOMEPAGE=http://www.nongnu.org/unac/
+INHERIT=autotools
 IUSE=test
 KEYWORDS=amd64 ~arm64 ~riscv x86
 LICENSE=GPL-2+
@@ -11,5 +12,5 @@ RDEPEND=virtual/libiconv
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://debian/pool/main/u/unac/unac_1.8.0.orig.tar.gz
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=081bf2d0b5142ac614c045916e6509e9
diff --git a/metadata/md5-cache/app-text/unpaper-9999 b/metadata/md5-cache/app-text/unpaper-9999
index 01e58343be20..5a530e2934d4 100644
--- a/metadata/md5-cache/app-text/unpaper-9999
+++ b/metadata/md5-cache/app-text/unpaper-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=>=media-video/ffmpeg-2:0=[encode]
 RESTRICT=test
 SLOT=0
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	28f0f3c0226306ec5f49e13bf851f171	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4fbbbc98f236f1b43acd99476bc3cd85	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=e46b13b744c3de2763b47a795a12d990
diff --git a/metadata/md5-cache/app-text/uudeview-0.5.20-r2 b/metadata/md5-cache/app-text/uudeview-0.5.20-r2
index 4e7357d6f5a2..b8d1e42a369c 100644
--- a/metadata/md5-cache/app-text/uudeview-0.5.20-r2
+++ b/metadata/md5-cache/app-text/uudeview-0.5.20-r2
@@ -3,9 +3,10 @@ DEFINED_PHASES=configure prepare
 DESCRIPTION=uu, xx, base64, binhex decoder
 EAPI=7
 HOMEPAGE=http://www.fpx.de/fp/Software/UUDeview/
+INHERIT=autotools toolchain-funcs
 KEYWORDS=~alpha amd64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://www.fpx.de/fp/Software/UUDeview/download/uudeview-0.5.20.tar.gz
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=08321c8655eab59b5bf30aa464ae3d05
diff --git a/metadata/md5-cache/app-text/vilistextum-2.8.0.20200411 b/metadata/md5-cache/app-text/vilistextum-2.8.0.20200411
index 83e5f65f89f0..79c1034e8fdc 100644
--- a/metadata/md5-cache/app-text/vilistextum-2.8.0.20200411
+++ b/metadata/md5-cache/app-text/vilistextum-2.8.0.20200411
@@ -4,11 +4,12 @@ DEPEND=virtual/libiconv
 DESCRIPTION=HTML to ASCII converter programmed to handle incorrect html
 EAPI=7
 HOMEPAGE=https://bhaak.net/vilistextum/
+INHERIT=autotools
 IUSE=unicode
 KEYWORDS=amd64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/bhaak/vilistextum/archive/06cc8a637efd9097af4f138b1b7c755120ffaa88.tar.gz -> vilistextum-2.8.0.20200411.tar.gz
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=837c2e4df73a1d033099308d14b11f3f
diff --git a/metadata/md5-cache/app-text/webgen-1.7.2 b/metadata/md5-cache/app-text/webgen-1.7.2
index 38f98755b5b4..5b92d6bfebea 100644
--- a/metadata/md5-cache/app-text/webgen-1.7.2
+++ b/metadata/md5-cache/app-text/webgen-1.7.2
@@ -4,6 +4,7 @@ DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lan
 DESCRIPTION=A template-based static website generator
 EAPI=7
 HOMEPAGE=https://webgen.gettalong.org
+INHERIT=ruby-fakegem
 IUSE=builder doc highlight markdown test ruby_targets_ruby26 ruby_targets_ruby27 test test
 KEYWORDS=~amd64
 LICENSE=GPL-3
@@ -12,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/webgen-1.7.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	ruby-fakegem	242ae0c7650b40198870ae311dc6bea0	ruby-ng	e4c8836049bf65af19ab322fe5a81005	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=fa9ca4a8d5024df7eb8254a04f1986ae
diff --git a/metadata/md5-cache/app-text/wgetpaste-2.32 b/metadata/md5-cache/app-text/wgetpaste-2.32
index 7ca876155b64..2a5b4683896f 100644
--- a/metadata/md5-cache/app-text/wgetpaste-2.32
+++ b/metadata/md5-cache/app-text/wgetpaste-2.32
@@ -3,9 +3,9 @@ DESCRIPTION=Command-line interface to various pastebins
 EAPI=7
 HOMEPAGE=https://wgetpaste.zlin.dk/
 IUSE=+ssl
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=MIT
 RDEPEND=net-misc/wget[ssl?]
 SLOT=0
 SRC_URI=https://github.com/zlin/wgetpaste/archive/2.32.tar.gz -> wgetpaste-2.32.tar.gz
-_md5_=96e0543c93dc3a1c56ebe40907d1422f
+_md5_=734af226b12e73366f2d221ecce38cbc
diff --git a/metadata/md5-cache/app-text/wiki2beamer-0.10.0 b/metadata/md5-cache/app-text/wiki2beamer-0.10.0
index ad1fc5c43da2..da5ae0ece42e 100644
--- a/metadata/md5-cache/app-text/wiki2beamer-0.10.0
+++ b/metadata/md5-cache/app-text/wiki2beamer-0.10.0
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) p
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/wiki2beamer/wiki2beamer/archive/wiki2beamer-v0.10.0.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=4d77d3698969d4c58c8ceb4790bd1861
diff --git a/metadata/md5-cache/app-text/wiki2beamer-0.10.0-r1 b/metadata/md5-cache/app-text/wiki2beamer-0.10.0-r1
new file mode 100644
index 000000000000..e8ac7a7d7356
--- /dev/null
+++ b/metadata/md5-cache/app-text/wiki2beamer-0.10.0-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install setup
+DEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) app-arch/unzip doc? ( dev-ruby/asciidoctor )
+DESCRIPTION=Tool to produce LaTeX Beamer code from wiki-like input
+EAPI=8
+HOMEPAGE=https://wiki2beamer.github.io/
+INHERIT=python-single-r1
+IUSE=doc +examples python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ FDL-1.3
+RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
+SLOT=0
+SRC_URI=https://github.com/wiki2beamer/wiki2beamer/archive/wiki2beamer-v0.10.0.tar.gz
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=01cfc429abf2ae2679f857aa78c07d79
diff --git a/metadata/md5-cache/app-text/wscr-1.2-r2 b/metadata/md5-cache/app-text/wscr-1.2-r2
index 344d61b59b23..724a0b49be8a 100644
--- a/metadata/md5-cache/app-text/wscr-1.2-r2
+++ b/metadata/md5-cache/app-text/wscr-1.2-r2
@@ -2,10 +2,11 @@ DEFINED_PHASES=compile install prepare
 DESCRIPTION=A Lightweight and Fast Anagram Solver
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
+INHERIT=toolchain-funcs
 KEYWORDS=amd64 ~mips ppc x86
 LICENSE=public-domain
 RDEPEND=sys-apps/miscfiles
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~jsmolic/distfiles/wscr-1.2.tar.gz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=cae166b05e4ed1bfa32fe3524eac15c3
diff --git a/metadata/md5-cache/app-text/wv-1.2.9-r2 b/metadata/md5-cache/app-text/wv-1.2.9-r2
deleted file mode 100644
index 60bc76f85977..000000000000
--- a/metadata/md5-cache/app-text/wv-1.2.9-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=>=dev-libs/glib-2:2 >=gnome-extra/libgsf-1.13:= sys-libs/zlib media-libs/libpng:0= dev-libs/libxml2:2 tools? ( app-text/texlive-core dev-texlive/texlive-latex ) wmf? ( >=media-libs/libwmf-0.2.2 ) virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
-DESCRIPTION=Tool for conversion of MSWord doc and rtf files to something readable
-EAPI=6
-HOMEPAGE=http://wvware.sourceforge.net/
-INHERIT=autotools
-IUSE=tools wmf
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2:2 >=gnome-extra/libgsf-1.13:= sys-libs/zlib media-libs/libpng:0= dev-libs/libxml2:2 tools? ( app-text/texlive-core dev-texlive/texlive-latex ) wmf? ( >=media-libs/libwmf-0.2.2 )
-SLOT=0
-SRC_URI=http://abiword.org/downloads/wv/1.2.9/wv-1.2.9.tar.gz
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=3fd0f02ba67a2474db9c45018ad42a4a
diff --git a/metadata/md5-cache/app-text/wv-1.2.9-r3 b/metadata/md5-cache/app-text/wv-1.2.9-r3
new file mode 100644
index 000000000000..92ff32d996cd
--- /dev/null
+++ b/metadata/md5-cache/app-text/wv-1.2.9-r3
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install prepare
+DEPEND=>=dev-libs/glib-2:2 >=gnome-extra/libgsf-1.13:= sys-libs/zlib media-libs/libpng:0= dev-libs/libxml2:2 tools? ( app-text/texlive-core dev-texlive/texlive-latex ) wmf? ( >=media-libs/libwmf-0.2.2 )
+DESCRIPTION=Tool for conversion of MSWord doc and rtf files to something readable
+EAPI=8
+HOMEPAGE=http://wvware.sourceforge.net/
+INHERIT=autotools
+IUSE=tools wmf
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/glib-2:2 >=gnome-extra/libgsf-1.13:= sys-libs/zlib media-libs/libpng:0= dev-libs/libxml2:2 tools? ( app-text/texlive-core dev-texlive/texlive-latex ) wmf? ( >=media-libs/libwmf-0.2.2 )
+SLOT=0
+SRC_URI=http://abiword.org/downloads/wv/1.2.9/wv-1.2.9.tar.gz
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=709d2d5abd04ba38c316be46bcb9ed33
diff --git a/metadata/md5-cache/app-text/wv2-0.4.2-r3 b/metadata/md5-cache/app-text/wv2-0.4.2-r3
index 7c26d5fb86ab..e832ee9a14fb 100644
--- a/metadata/md5-cache/app-text/wv2-0.4.2-r3
+++ b/metadata/md5-cache/app-text/wv2-0.4.2-r3
@@ -1,4 +1,4 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=dev-libs/glib >=gnome-extra/libgsf-1.8:= virtual/libiconv zlib? ( sys-libs/zlib )
 DESCRIPTION=Excellent MS Word filter lib, used in most Office suites
@@ -11,5 +11,5 @@ LICENSE=LGPL-2
 RDEPEND=dev-libs/glib >=gnome-extra/libgsf-1.8:= virtual/libiconv zlib? ( sys-libs/zlib )
 SLOT=0
 SRC_URI=mirror://sourceforge/wvware/wv2-0.4.2.tar.bz2
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=a2092adaa2276d13842529e9e9410cd1
diff --git a/metadata/md5-cache/app-text/xapers-0.9.0 b/metadata/md5-cache/app-text/xapers-0.9.0
index da9934b482f6..77bb1c15765e 100644
--- a/metadata/md5-cache/app-text/xapers-0.9.0
+++ b/metadata/md5-cache/app-text/xapers-0.9.0
@@ -1,16 +1,16 @@
-BDEPEND=test? ( app-text/poppler[utils] dev-libs/xapian-bindings[python,python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pybtex[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pycurl[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/urwid[python_targets_python3_8(-)?,python_targets_python3_9(-)?] x11-misc/xclip x11-misc/xdg-utils ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+BDEPEND=test? ( app-text/poppler[utils] dev-libs/xapian-bindings[python,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pybtex[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pycurl[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/urwid[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] x11-misc/xclip x11-misc/xdg-utils ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Personal document indexing system
 EAPI=7
 HOMEPAGE=https://finestructure.net/xapers/ https://gitlab.com/jrollins/xapers/
 INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64
 LICENSE=GPL-3
-RDEPEND=app-text/poppler[utils] dev-libs/xapian-bindings[python,python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pybtex[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pycurl[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/urwid[python_targets_python3_8(-)?,python_targets_python3_9(-)?] x11-misc/xclip x11-misc/xdg-utils python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=app-text/poppler[utils] dev-libs/xapian-bindings[python,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pybtex[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pycurl[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/urwid[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] x11-misc/xclip x11-misc/xdg-utils python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://gitlab.com/jrollins/xapers/-/archive/0.9.0/xapers-0.9.0.tar.gz
-_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=54794b0e74a83b167a8c623b73bebbc8
+_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=3c5c7c49dd1154976e51d9cb37cf8bf8
diff --git a/metadata/md5-cache/app-text/xapian-omega-1.4.19 b/metadata/md5-cache/app-text/xapian-omega-1.4.19
index 0870c2910736..0e0b65ab5dd8 100644
--- a/metadata/md5-cache/app-text/xapian-omega-1.4.19
+++ b/metadata/md5-cache/app-text/xapian-omega-1.4.19
@@ -3,9 +3,9 @@ DEPEND=~dev-libs/xapian-1.4.19:0/30 dev-lang/perl dev-libs/libpcre sys-libs/zlib
 DESCRIPTION=An application built on Xapian, consisting of indexers and a CGI search frontend
 EAPI=8
 HOMEPAGE=https://xapian.org/
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=~dev-libs/xapian-1.4.19:0/30 dev-lang/perl dev-libs/libpcre sys-libs/zlib
 SLOT=0
 SRC_URI=http://www.oligarchy.co.uk/xapian/1.4.19/xapian-omega-1.4.19.tar.xz
-_md5_=c7c488e3482f4405bd27cbf937e86edf
+_md5_=b61e497ff307b53429bd02e3d21650ca
diff --git a/metadata/md5-cache/app-text/xchm-1.33 b/metadata/md5-cache/app-text/xchm-1.33
index f0192d60259c..cd07752726da 100644
--- a/metadata/md5-cache/app-text/xchm-1.33
+++ b/metadata/md5-cache/app-text/xchm-1.33
@@ -4,11 +4,12 @@ DEPEND=>=dev-libs/chmlib-0.36 x11-libs/wxGTK:3.0-gtk3[X] nls? ( virtual/libintl
 DESCRIPTION=Utility for viewing Compiled HTML Help (CHM) files
 EAPI=7
 HOMEPAGE=https://github.com/rzvncj/xCHM/
+INHERIT=desktop wxwidgets xdg-utils
 IUSE=nls
 KEYWORDS=amd64 ppc ~riscv x86
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/chmlib-0.36 x11-libs/wxGTK:3.0-gtk3[X] nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=https://github.com/rzvncj/xCHM/releases/download/1.33/xchm-1.33.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	wxwidgets	c09e9b94378cadaf6ef86ec1534c0fd6	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c	wxwidgets	c09e9b94378cadaf6ef86ec1534c0fd6	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=833c4d32a7d2f7d96e1431d3c7715a7e
diff --git a/metadata/md5-cache/app-text/xdvik-22.87.03-r3 b/metadata/md5-cache/app-text/xdvik-22.87.03-r3
index b15331c56c93..d2da82d8c350 100644
--- a/metadata/md5-cache/app-text/xdvik-22.87.03-r3
+++ b/metadata/md5-cache/app-text/xdvik-22.87.03-r3
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-libs/freetype-2.9.1-r2:2 x11-libs/libX11 x11-libs/libXi x11-libs/libXmu x11-libs/libXpm x11-libs/libXt emacs? ( >=app-editors/emacs-23.1:* ) motif? ( >=x11-libs/motif-2.3:0 ) !motif? ( neXt? ( x11-libs/neXtaw ) !neXt? ( Xaw3d? ( x11-libs/libXaw3d ) !Xaw3d? ( x11-libs/libXaw ) ) ) dev-libs/kpathsea:= virtual/latex-base !<app-text/texlive-2007
 SLOT=0
 SRC_URI=mirror://sourceforge/xdvi/xdvik-22.87.03.tar.gz
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	e7aaa047873789f549ea3df2f04b2145	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	desktop	22952d8f27cac191d75529d4c38e6bfa	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	e7aaa047873789f549ea3df2f04b2145	epatch	28f0f3c0226306ec5f49e13bf851f171	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4fbbbc98f236f1b43acd99476bc3cd85	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=75ae4b87a4a19c2df5df8969cf2f322b
diff --git a/metadata/md5-cache/app-text/xdvik-22.87.03-r4 b/metadata/md5-cache/app-text/xdvik-22.87.03-r4
new file mode 100644
index 000000000000..049ff1b5fd30
--- /dev/null
+++ b/metadata/md5-cache/app-text/xdvik-22.87.03-r4
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/flex virtual/yacc virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=media-libs/freetype-2.9.1-r2:2 x11-libs/libX11 x11-libs/libXi x11-libs/libXmu x11-libs/libXpm x11-libs/libXt emacs? ( >=app-editors/emacs-23.1:* ) motif? ( >=x11-libs/motif-2.3:0 ) !motif? ( neXt? ( x11-libs/neXtaw ) !neXt? ( Xaw3d? ( x11-libs/libXaw3d ) !Xaw3d? ( x11-libs/libXaw ) ) ) dev-libs/kpathsea:=
+DESCRIPTION=DVI previewer for X Window System
+EAPI=8
+HOMEPAGE=http://xdvi.sourceforge.net/
+INHERIT=autotools desktop elisp-common flag-o-matic toolchain-funcs xdg
+IUSE=motif neXt Xaw3d emacs
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=>=media-libs/freetype-2.9.1-r2:2 x11-libs/libX11 x11-libs/libXi x11-libs/libXmu x11-libs/libXpm x11-libs/libXt emacs? ( >=app-editors/emacs-23.1:* ) motif? ( >=x11-libs/motif-2.3:0 ) !motif? ( neXt? ( x11-libs/neXtaw ) !neXt? ( Xaw3d? ( x11-libs/libXaw3d ) !Xaw3d? ( x11-libs/libXaw ) ) ) dev-libs/kpathsea:= virtual/latex-base !<app-text/texlive-2007
+SLOT=0
+SRC_URI=mirror://sourceforge/xdvi/xdvik-22.87.03.tar.gz
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	desktop	22952d8f27cac191d75529d4c38e6bfa	elisp-common	e7aaa047873789f549ea3df2f04b2145	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=64d34aac91adc45685f8f9b9ba611d61
diff --git a/metadata/md5-cache/app-text/xhtml1-20020801-r6 b/metadata/md5-cache/app-text/xhtml1-20020801-r6
index 9d8592f5e06b..ac28b489140f 100644
--- a/metadata/md5-cache/app-text/xhtml1-20020801-r6
+++ b/metadata/md5-cache/app-text/xhtml1-20020801-r6
@@ -3,10 +3,11 @@ DEPEND=app-text/sgml-common dev-libs/libxml2
 DESCRIPTION=DTDs for the eXtensible HyperText Markup Language 1.0
 EAPI=7
 HOMEPAGE=https://www.w3.org/TR/xhtml1/
-KEYWORDS=amd64 arm64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos
+INHERIT=sgml-catalog-r1
+KEYWORDS=amd64 ~arm arm64 ~hppa ~ia64 ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=W3C
 RDEPEND=>=app-text/sgml-common-0.6.3-r7
 SLOT=0
 SRC_URI=mirror://gentoo/xhtml1-20020801.tgz
 _eclasses_=sgml-catalog-r1	5d1d74baed1e6235b9a698917e954236
-_md5_=402d6a6259c96a1ac62518965e1e00c0
+_md5_=f4fddbb85e87be9fcff72e116776ae6d
diff --git a/metadata/md5-cache/app-text/xiphos-4.2.1 b/metadata/md5-cache/app-text/xiphos-4.2.1
index 5c4e5d6069cd..c4cdc07ba5cd 100644
--- a/metadata/md5-cache/app-text/xiphos-4.2.1
+++ b/metadata/md5-cache/app-text/xiphos-4.2.1
@@ -1,4 +1,4 @@
-BDEPEND=sys-apps/util-linux dev-libs/libxml2 dev-libs/libxslt dbus? ( dev-libs/dbus-glib ) app-arch/zip app-text/yelp-tools dev-libs/appstream-glib dev-util/desktop-file-utils dev-util/glib-utils dev-util/itstool virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.20.5
+BDEPEND=sys-apps/util-linux dev-libs/libxml2 dev-libs/libxslt dbus? ( dev-libs/dbus-glib ) app-arch/zip app-text/yelp-tools dev-libs/appstream-glib dev-util/desktop-file-utils dev-util/glib-utils dev-util/itstool virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install postinst postrm prepare test
 DEPEND=sys-apps/util-linux dev-libs/libxml2 dev-libs/libxslt dbus? ( dev-libs/dbus-glib ) >=app-text/sword-1.8.1 dev-libs/glib:2 dev-libs/icu gnome-extra/gtkhtml:4.0 >=net-libs/biblesync-1.2.0 net-libs/webkit-gtk:4 sys-libs/zlib[minizip] x11-libs/gtk+:3
 DESCRIPTION=A Gtk+-based Bible-study frontend for SWORD
@@ -11,5 +11,5 @@ LICENSE=GPL-2 FDL-1.1 LGPL-2 MIT MPL-1.1
 RDEPEND=sys-apps/util-linux dev-libs/libxml2 dev-libs/libxslt dbus? ( dev-libs/dbus-glib ) >=app-text/sword-1.8.1 dev-libs/glib:2 dev-libs/icu gnome-extra/gtkhtml:4.0 >=net-libs/biblesync-1.2.0 net-libs/webkit-gtk:4 sys-libs/zlib[minizip] x11-libs/gtk+:3
 SLOT=0
 SRC_URI=https://github.com/crosswire/xiphos/releases/download/4.2.1/xiphos-4.2.1.tar.xz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=5fc4042d4056b53829a9d101cb7d2d2a
diff --git a/metadata/md5-cache/app-text/xiphos-4.2.1-r1 b/metadata/md5-cache/app-text/xiphos-4.2.1-r1
new file mode 100644
index 000000000000..0895f4ba12a4
--- /dev/null
+++ b/metadata/md5-cache/app-text/xiphos-4.2.1-r1
@@ -0,0 +1,15 @@
+BDEPEND=sys-apps/util-linux dev-libs/libxml2 dev-libs/libxslt dbus? ( dev-libs/dbus-glib ) app-arch/zip app-text/yelp-tools dev-libs/appstream-glib dev-util/desktop-file-utils dev-util/glib-utils dev-util/itstool virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=sys-apps/util-linux dev-libs/libxml2 dev-libs/libxslt dbus? ( dev-libs/dbus-glib ) >=app-text/sword-1.8.1 dev-libs/glib:2 dev-libs/icu >=net-libs/biblesync-1.2.0 net-libs/webkit-gtk:4 sys-libs/zlib[minizip] x11-libs/gtk+:3
+DESCRIPTION=A Gtk+-based Bible-study frontend for SWORD
+EAPI=8
+HOMEPAGE=https://xiphos.org/
+INHERIT=cmake xdg-utils
+IUSE=dbus debug
+KEYWORDS=~amd64
+LICENSE=GPL-2 FDL-1.1 LGPL-2 MIT MPL-1.1
+RDEPEND=sys-apps/util-linux dev-libs/libxml2 dev-libs/libxslt dbus? ( dev-libs/dbus-glib ) >=app-text/sword-1.8.1 dev-libs/glib:2 dev-libs/icu >=net-libs/biblesync-1.2.0 net-libs/webkit-gtk:4 sys-libs/zlib[minizip] x11-libs/gtk+:3
+SLOT=0
+SRC_URI=https://github.com/crosswire/xiphos/releases/download/4.2.1/xiphos-4.2.1.tar.xz https://dev.gentoo.org/~marecki/dists/app-text/xiphos/xiphos-4.2.1-disable_webkit_editor.patch.xz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=32009804e391e4c0839f80c51b62f715
diff --git a/metadata/md5-cache/app-text/xlhtml-0.5.1_p6 b/metadata/md5-cache/app-text/xlhtml-0.5.1_p6
index 74440d23ea08..8f94e00411ac 100644
--- a/metadata/md5-cache/app-text/xlhtml-0.5.1_p6
+++ b/metadata/md5-cache/app-text/xlhtml-0.5.1_p6
@@ -3,9 +3,10 @@ DEFINED_PHASES=install prepare
 DESCRIPTION=Convert MS Excel and Powerpoint files to HTML
 EAPI=7
 HOMEPAGE=http://chicago.sourceforge.net/xlhtml/ http://packages.debian.org/etch/xlhtml/
+INHERIT=autotools vcs-clean
 KEYWORDS=~alpha amd64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://debian/pool/main/x/xlhtml/xlhtml_0.5.1.orig.tar.gz mirror://debian/pool/main/x/xlhtml/xlhtml_0.5.1-6.diff.gz
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3
 _md5_=a28578178d0c7ec12d87e22bb050a564
diff --git a/metadata/md5-cache/app-text/xlsx2csv-0.7.6 b/metadata/md5-cache/app-text/xlsx2csv-0.7.6
index 7db91f4a74a3..6f1a8e058e53 100644
--- a/metadata/md5-cache/app-text/xlsx2csv-0.7.6
+++ b/metadata/md5-cache/app-text/xlsx2csv-0.7.6
@@ -11,5 +11,5 @@ RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[xml] ) py
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/x/xlsx2csv/xlsx2csv-0.7.6.tar.gz
-_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=8187074496484056344c326120026e2d
diff --git a/metadata/md5-cache/app-text/xml2doc-20030510-r1 b/metadata/md5-cache/app-text/xml2doc-20030510-r1
index 41eb7b5463c1..b3e97fc7780f 100644
--- a/metadata/md5-cache/app-text/xml2doc-20030510-r1
+++ b/metadata/md5-cache/app-text/xml2doc-20030510-r1
@@ -3,10 +3,11 @@ DEPEND=dev-libs/libxml2:2
 DESCRIPTION=Tool to convert simple XML to a variety of formats (pdf, html, txt, manpage)
 EAPI=7
 HOMEPAGE=http://xml2doc.sourceforge.net
+INHERIT=toolchain-funcs
 KEYWORDS=~alpha amd64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/libxml2:2
 SLOT=0
 SRC_URI=mirror://sourceforge/xml2doc/xml2doc-20030510.tgz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=a0b139bb7e63182f6d05e721be791096
diff --git a/metadata/md5-cache/app-text/xmldiff-2.4 b/metadata/md5-cache/app-text/xmldiff-2.4
index 24381a2ec8e7..ee7b9b95bd1a 100644
--- a/metadata/md5-cache/app-text/xmldiff-2.4
+++ b/metadata/md5-cache/app-text/xmldiff-2.4
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Shoobx/xmldiff/archive/2.4.tar.gz -> xmldiff-2.4.tar.gz
-_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=2e2c1fa32b534fb3fc8b02552027236c
diff --git a/metadata/md5-cache/app-text/xmlstarlet-1.6.1 b/metadata/md5-cache/app-text/xmlstarlet-1.6.1
index ba84c0d05605..97aa84f7eb63 100644
--- a/metadata/md5-cache/app-text/xmlstarlet-1.6.1
+++ b/metadata/md5-cache/app-text/xmlstarlet-1.6.1
@@ -4,10 +4,11 @@ DEPEND=dev-libs/libxml2 dev-libs/libxslt dev-libs/libgcrypt:0= virtual/libiconv
 DESCRIPTION=A set of tools to transform, query, validate, and edit XML documents
 EAPI=7
 HOMEPAGE=http://xmlstar.sourceforge.net/
+INHERIT=autotools flag-o-matic toolchain-funcs
 KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ppc ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=MIT
 RDEPEND=dev-libs/libxml2 dev-libs/libxslt dev-libs/libgcrypt:0= virtual/libiconv
 SLOT=0
 SRC_URI=mirror://sourceforge/xmlstar/xmlstarlet-1.6.1.tar.gz
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=98e90b08bcbd9b1c7cf9e0073dc69a9a
diff --git a/metadata/md5-cache/app-text/xmlto-0.0.28-r8 b/metadata/md5-cache/app-text/xmlto-0.0.28-r8
index 863ba4e16523..149a1acb3cb6 100644
--- a/metadata/md5-cache/app-text/xmlto-0.0.28-r8
+++ b/metadata/md5-cache/app-text/xmlto-0.0.28-r8
@@ -4,11 +4,12 @@ DEPEND=app-text/docbook-xsl-stylesheets app-text/docbook-xml-dtd:4.2 dev-libs/li
 DESCRIPTION=Script for converting XML and DocBook documents to a variety of output formats
 EAPI=7
 HOMEPAGE=https://pagure.io/xmlto
+INHERIT=autotools
 IUSE=latex text
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=app-text/docbook-xsl-stylesheets app-text/docbook-xml-dtd:4.2 dev-libs/libxslt || ( sys-apps/util-linux app-misc/getopt ) text? ( || ( virtual/w3m www-client/elinks www-client/links www-client/lynx ) ) latex? ( dev-texlive/texlive-formatsextra )
 SLOT=0
 SRC_URI=https://releases.pagure.org/xmlto/xmlto-0.0.28.tar.bz2
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=01988daffc3ef713a820ca40d7b1f31c
diff --git a/metadata/md5-cache/app-text/xournal-0.4.8.2016 b/metadata/md5-cache/app-text/xournal-0.4.8.2016
index cf174f859712..6e3addd1e8d5 100644
--- a/metadata/md5-cache/app-text/xournal-0.4.8.2016
+++ b/metadata/md5-cache/app-text/xournal-0.4.8.2016
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=app-text/poppler[cairo] dev-libs/atk dev-libs/glib gnome-base/libgnomecanvas media-libs/freetype media-libs/fontconfig sys-libs/zlib x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/pango pdf? ( app-text/poppler[utils] app-text/ghostscript-gpl )
 SLOT=0
 SRC_URI=mirror://sourceforge/xournal/xournal-0.4.8.2016.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	28f0f3c0226306ec5f49e13bf851f171	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4fbbbc98f236f1b43acd99476bc3cd85	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=e04178de02e6dca4245793712e572a3f
diff --git a/metadata/md5-cache/app-text/xournal-9999 b/metadata/md5-cache/app-text/xournal-9999
index 8cfc3c63ed70..9119f3ce19a0 100644
--- a/metadata/md5-cache/app-text/xournal-9999
+++ b/metadata/md5-cache/app-text/xournal-9999
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=app-text/poppler[cairo] dev-libs/atk dev-libs/glib gnome-base/libgnomecanvas media-libs/freetype media-libs/fontconfig sys-libs/zlib x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/pango pdf? ( app-text/poppler[utils] app-text/ghostscript-gpl )
 SLOT=0
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	desktop	22952d8f27cac191d75529d4c38e6bfa	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	28f0f3c0226306ec5f49e13bf851f171	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4fbbbc98f236f1b43acd99476bc3cd85	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=48669c3fd71a0632090133e5fc2cdec1
diff --git a/metadata/md5-cache/app-text/xournalpp-1.0.20 b/metadata/md5-cache/app-text/xournalpp-1.0.20
index e040577c7fc0..63ce83f81f2f 100644
--- a/metadata/md5-cache/app-text/xournalpp-1.0.20
+++ b/metadata/md5-cache/app-text/xournalpp-1.0.20
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig sys-apps/lsb-release dev-util/ninja >=dev-util/cmake-3.20.5
+BDEPEND=virtual/pkgconfig sys-apps/lsb-release >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
 DEPEND=app-text/poppler[cairo] dev-libs/glib dev-libs/libxml2 dev-libs/libzip:= media-libs/portaudio[cxx] media-libs/libsndfile sys-libs/zlib:= x11-libs/gtk+:3 dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Handwriting notetaking software with PDF annotation support
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=app-text/poppler[cairo] dev-libs/glib dev-libs/libxml2 dev-libs/libzip:= media-libs/portaudio[cxx] media-libs/libsndfile sys-libs/zlib:= x11-libs/gtk+:3
 SLOT=0
 SRC_URI=https://github.com/xournalpp/xournalpp/archive/1.0.20.tar.gz -> xournalpp-1.0.20.tgz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=81f0f85e5b6ff0c55d178a93f2e08657
diff --git a/metadata/md5-cache/app-text/xournalpp-1.1.1 b/metadata/md5-cache/app-text/xournalpp-1.1.1
index 194e66b31d8f..cf4f427ee737 100644
--- a/metadata/md5-cache/app-text/xournalpp-1.1.1
+++ b/metadata/md5-cache/app-text/xournalpp-1.1.1
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig sys-apps/lsb-release dev-util/ninja >=dev-util/cmake-3.20.5
+BDEPEND=virtual/pkgconfig sys-apps/lsb-release >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
 DEPEND=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
 DESCRIPTION=Handwriting notetaking software with PDF annotation support
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=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
 SLOT=0
 SRC_URI=https://github.com/xournalpp/xournalpp/archive/refs/tags/v1.1.1.tar.gz -> xournalpp-1.1.1.tgz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=eb3f50c25c568bd687f77db457007bdc
diff --git a/metadata/md5-cache/app-text/xournalpp-1.1.1-r1 b/metadata/md5-cache/app-text/xournalpp-1.1.1-r1
index 25df59dc4454..8e9c8504b257 100644
--- a/metadata/md5-cache/app-text/xournalpp-1.1.1-r1
+++ b/metadata/md5-cache/app-text/xournalpp-1.1.1-r1
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig sys-apps/lsb-release elibc_musl? ( sys-libs/libbacktrace ) dev-util/ninja >=dev-util/cmake-3.20.5
+BDEPEND=virtual/pkgconfig sys-apps/lsb-release elibc_musl? ( sys-libs/libbacktrace ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
 DEPEND=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
 DESCRIPTION=Handwriting notetaking software with PDF annotation support
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=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
 SLOT=0
 SRC_URI=https://github.com/xournalpp/xournalpp/archive/refs/tags/v1.1.1.tar.gz -> xournalpp-1.1.1.tgz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=9be8a8f84a6e105fca09aa52f19f55b1
diff --git a/metadata/md5-cache/app-text/xournalpp-9999 b/metadata/md5-cache/app-text/xournalpp-9999
index 64d56b89095c..e8347f084535 100644
--- a/metadata/md5-cache/app-text/xournalpp-9999
+++ b/metadata/md5-cache/app-text/xournalpp-9999
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig sys-apps/lsb-release elibc_musl? ( sys-libs/libbacktrace ) dev-util/ninja >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=virtual/pkgconfig sys-apps/lsb-release elibc_musl? ( sys-libs/libbacktrace ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
 DEPEND=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
 DESCRIPTION=Handwriting notetaking software with PDF annotation support
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=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
 SLOT=0
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=70b627a3923df30bb10020faee138157
diff --git a/metadata/md5-cache/app-text/xpdf-4.03 b/metadata/md5-cache/app-text/xpdf-4.03
index 5c72b719e20d..eb8415272ace 100644
--- a/metadata/md5-cache/app-text/xpdf-4.03
+++ b/metadata/md5-cache/app-text/xpdf-4.03
@@ -1,4 +1,4 @@
-BDEPEND=icons? ( gnome-base/librsvg ) dev-util/ninja >=dev-util/cmake-3.20.5
+BDEPEND=icons? ( gnome-base/librsvg ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
 DEPEND=cups? ( dev-qt/qtprintsupport:5[cups] net-print/cups ) fontconfig? ( media-libs/fontconfig ) libpaper? ( app-text/libpaper ) utils? ( png? ( media-libs/libpng:0 ) ) dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 media-libs/freetype sys-libs/zlib dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=The PDF viewer and tools
@@ -11,5 +11,5 @@ LICENSE=|| ( GPL-2 GPL-3 ) i18n? ( BSD )
 RDEPEND=cups? ( dev-qt/qtprintsupport:5[cups] net-print/cups ) fontconfig? ( media-libs/fontconfig ) libpaper? ( app-text/libpaper ) utils? ( png? ( media-libs/libpng:0 ) ) dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 media-libs/freetype sys-libs/zlib dev-qt/qtsvg:5 media-fonts/urw-fonts
 SLOT=0
 SRC_URI=https://dl.xpdfreader.com/xpdf-4.03.tar.gz i18n? ( https://dl.xpdfreader.com/xpdf-arabic.tar.gz https://dl.xpdfreader.com/xpdf-chinese-simplified.tar.gz -> xpdf-chinese-simplified-20201222.tar.gz https://dl.xpdfreader.com/xpdf-chinese-traditional.tar.gz -> xpdf-chinese-traditional-20201222.tar.gz https://dl.xpdfreader.com/xpdf-cyrillic.tar.gz https://dl.xpdfreader.com/xpdf-greek.tar.gz https://dl.xpdfreader.com/xpdf-hebrew.tar.gz https://dl.xpdfreader.com/xpdf-japanese.tar.gz -> xpdf-japanese-20201222.tar.gz https://dl.xpdfreader.com/xpdf-korean.tar.gz -> xpdf-korean-20201222.tar.gz https://dl.xpdfreader.com/xpdf-latin2.tar.gz https://dl.xpdfreader.com/xpdf-thai.tar.gz https://dl.xpdfreader.com/xpdf-turkish.tar.gz )
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=7d71f7c3c90307ad420dc9a1285a76d0
diff --git a/metadata/md5-cache/app-text/xpdf-4.04 b/metadata/md5-cache/app-text/xpdf-4.04
new file mode 100644
index 000000000000..27184d05af33
--- /dev/null
+++ b/metadata/md5-cache/app-text/xpdf-4.04
@@ -0,0 +1,15 @@
+BDEPEND=icons? ( gnome-base/librsvg ) verify-sig? ( sec-keys/openpgp-keys-xpdf ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
+DEPEND=cups? ( dev-qt/qtprintsupport:5[cups] net-print/cups ) fontconfig? ( media-libs/fontconfig ) libpaper? ( app-text/libpaper ) utils? ( png? ( media-libs/libpng:0 ) ) dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 media-libs/freetype sys-libs/zlib
+DESCRIPTION=The PDF viewer and tools
+EAPI=8
+HOMEPAGE=https://www.xpdfreader.com
+INHERIT=cmake desktop verify-sig xdg
+IUSE=cmyk cups +fontconfig i18n icons +libpaper metric opi png +textselect utils verify-sig
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( GPL-2 GPL-3 ) i18n? ( BSD )
+RDEPEND=cups? ( dev-qt/qtprintsupport:5[cups] net-print/cups ) fontconfig? ( media-libs/fontconfig ) libpaper? ( app-text/libpaper ) utils? ( png? ( media-libs/libpng:0 ) ) dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 media-libs/freetype sys-libs/zlib dev-qt/qtsvg:5 media-fonts/urw-fonts
+SLOT=0
+SRC_URI=https://dl.xpdfreader.com/xpdf-4.04.tar.gz i18n? ( https://dl.xpdfreader.com/xpdf-arabic.tar.gz https://dl.xpdfreader.com/xpdf-chinese-simplified.tar.gz -> xpdf-chinese-simplified-20201222.tar.gz https://dl.xpdfreader.com/xpdf-chinese-traditional.tar.gz -> xpdf-chinese-traditional-20201222.tar.gz https://dl.xpdfreader.com/xpdf-cyrillic.tar.gz https://dl.xpdfreader.com/xpdf-greek.tar.gz https://dl.xpdfreader.com/xpdf-hebrew.tar.gz https://dl.xpdfreader.com/xpdf-japanese.tar.gz -> xpdf-japanese-20201222.tar.gz https://dl.xpdfreader.com/xpdf-korean.tar.gz -> xpdf-korean-20201222.tar.gz https://dl.xpdfreader.com/xpdf-latin2.tar.gz https://dl.xpdfreader.com/xpdf-thai.tar.gz https://dl.xpdfreader.com/xpdf-turkish.tar.gz ) verify-sig? ( https://dl.xpdfreader.com/xpdf-4.04.tar.gz.sig )
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	desktop	22952d8f27cac191d75529d4c38e6bfa	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	verify-sig	0748d665fa664a87add00152ed046e16	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=fb891a2fd78cfbfc8f5fe8e184f00f4a
diff --git a/metadata/md5-cache/app-text/yelp-tools-41.0 b/metadata/md5-cache/app-text/yelp-tools-41.0
deleted file mode 100644
index 8e217fa56657..000000000000
--- a/metadata/md5-cache/app-text/yelp-tools-41.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils >=dev-util/meson-0.59.4 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_single_target_python3_8? ( dev-python/lxml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/lxml[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/lxml[python_targets_python3_10(-)] ) >=dev-libs/libxml2-2.6.12 >=dev-libs/libxslt-1.1.8 dev-util/itstool >=gnome-extra/yelp-xsl-3.38 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Collection of tools for building and converting documentation
-EAPI=7
-HOMEPAGE=https://wiki.gnome.org/Apps/Yelp/Tools
-INHERIT=gnome2 meson python-single-r1
-IUSE=python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
-LICENSE=|| ( GPL-2+ freedist ) GPL-2+
-RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_single_target_python3_8? ( dev-python/lxml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/lxml[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/lxml[python_targets_python3_10(-)] ) >=dev-libs/libxml2-2.6.12 >=dev-libs/libxslt-1.1.8 dev-util/itstool >=gnome-extra/yelp-xsl-3.38
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
-SLOT=0
-SRC_URI=mirror://gnome/sources/yelp-tools/41/yelp-tools-41.0.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=c2a3b75c879306eb789b9ae7407402d4
diff --git a/metadata/md5-cache/app-text/yelp-tools-42.0 b/metadata/md5-cache/app-text/yelp-tools-42.0
index af80388d621f..3cbf21befea8 100644
--- a/metadata/md5-cache/app-text/yelp-tools-42.0
+++ b/metadata/md5-cache/app-text/yelp-tools-42.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://wiki.gnome.org/Apps/Yelp/Tools
 INHERIT=gnome2 meson python-single-r1
 IUSE=python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-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 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=|| ( GPL-2+ freedist ) GPL-2+
 RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_single_target_python3_8? ( dev-python/lxml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/lxml[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/lxml[python_targets_python3_10(-)] ) >=dev-libs/libxml2-2.6.12 >=dev-libs/libxslt-1.1.8 dev-util/itstool >=gnome-extra/yelp-xsl-3.38
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/yelp-tools/42/yelp-tools-42.0.tar.xz
-_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=30d433c33b3c8c276891c2c352586b9a
+_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=ec4aced93e014c5a7eec037437e5ea52
diff --git a/metadata/md5-cache/app-text/yodl-4.03.00 b/metadata/md5-cache/app-text/yodl-4.03.00
index 6252846758bf..eacd3b8c066d 100644
--- a/metadata/md5-cache/app-text/yodl-4.03.00
+++ b/metadata/md5-cache/app-text/yodl-4.03.00
@@ -1,12 +1,13 @@
 BDEPEND=>=dev-util/icmake-8.00.00 doc? ( dev-texlive/texlive-latexextra dev-texlive/texlive-plaingeneric )
-DEFINED_PHASES=compile install prepare pretend
+DEFINED_PHASES=compile install prepare
 DESCRIPTION=Your Own Document Language: a pre-document language and tools to process it
 EAPI=7
 HOMEPAGE=https://fbb-git.gitlab.io/yodl/ https://gitlab.com/fbb-git/yodl
+INHERIT=toolchain-funcs flag-o-matic
 IUSE=doc
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
 SLOT=0
 SRC_URI=https://gitlab.com/fbb-git/yodl/-/archive/4.03.00/yodl-4.03.00.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=5fefe2eff1ac967a280f1b3cbaac9411
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_md5_=78c990bf79dba4caeddc78fe1b596f23
diff --git a/metadata/md5-cache/app-text/zathura-0.4.7 b/metadata/md5-cache/app-text/zathura-0.4.7
index fd63f0280dc4..f3e2b8167e9a 100644
--- a/metadata/md5-cache/app-text/zathura-0.4.7
+++ b/metadata/md5-cache/app-text/zathura-0.4.7
@@ -12,5 +12,5 @@ RDEPEND=>=dev-libs/girara-0.3.3 >=dev-libs/glib-2.50:2 >=sys-devel/gettext-0.19.
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pwmt/zathura/archive/0.4.7.tar.gz -> zathura-0.4.7.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=ea4ec8967773ec0a3653ccf8b456ab3c
diff --git a/metadata/md5-cache/app-text/zathura-0.4.8 b/metadata/md5-cache/app-text/zathura-0.4.8
index b23a4da15a19..ac179c5886e5 100644
--- a/metadata/md5-cache/app-text/zathura-0.4.8
+++ b/metadata/md5-cache/app-text/zathura-0.4.8
@@ -12,5 +12,5 @@ RDEPEND=>=dev-libs/girara-0.3.6 >=dev-libs/glib-2.50:2 >=sys-devel/gettext-0.19.
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pwmt/zathura/archive/0.4.8.tar.gz -> zathura-0.4.8.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=01506226f0f4c36333583aa0fc60f71a
diff --git a/metadata/md5-cache/app-text/zathura-0.4.9 b/metadata/md5-cache/app-text/zathura-0.4.9
index 87292b1e92bd..69c838ad7e4f 100644
--- a/metadata/md5-cache/app-text/zathura-0.4.9
+++ b/metadata/md5-cache/app-text/zathura-0.4.9
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://pwmt.org/projects/zathura/
 INHERIT=meson virtualx xdg
 IUSE=doc +magic seccomp sqlite synctex test test
-KEYWORDS=amd64 ~arm ~riscv x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 arm ~riscv x86 ~amd64-linux ~x86-linux
 LICENSE=ZLIB
 RDEPEND=>=dev-libs/girara-0.3.7 >=dev-libs/glib-2.50:2 >=sys-devel/gettext-0.19.8 x11-libs/cairo >=x11-libs/gtk+-3.22:3 magic? ( sys-apps/file ) seccomp? ( sys-libs/libseccomp ) sqlite? ( >=dev-db/sqlite-3.5.9:3 ) synctex? ( app-text/texlive-core )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pwmt/zathura/archive/0.4.9.tar.gz -> zathura-0.4.9.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=4c62d1826254a8e1b388d408f0d85311
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=d8a6f192517c06685532f18e7c4c7f6d
diff --git a/metadata/md5-cache/app-text/zathura-9999 b/metadata/md5-cache/app-text/zathura-9999
index 5aeb8b6ac683..642b8896dd2d 100644
--- a/metadata/md5-cache/app-text/zathura-9999
+++ b/metadata/md5-cache/app-text/zathura-9999
@@ -11,5 +11,5 @@ PROPERTIES=live
 RDEPEND=>=dev-libs/girara-0.3.6 >=dev-libs/glib-2.50:2 >=sys-devel/gettext-0.19.8 x11-libs/cairo >=x11-libs/gtk+-3.22:3 magic? ( sys-apps/file ) seccomp? ( sys-libs/libseccomp ) sqlite? ( >=dev-db/sqlite-3.5.9:3 ) synctex? ( app-text/texlive-core )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=199f6d15b31b66f345f9384025de5827
diff --git a/metadata/md5-cache/app-text/zathura-cb-0.1.8 b/metadata/md5-cache/app-text/zathura-cb-0.1.8
index 8c49b8350956..3123d30b8030 100644
--- a/metadata/md5-cache/app-text/zathura-cb-0.1.8
+++ b/metadata/md5-cache/app-text/zathura-cb-0.1.8
@@ -10,5 +10,5 @@ LICENSE=ZLIB
 RDEPEND=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
 SLOT=0
 SRC_URI=https://pwmt.org/projects/zathura/plugins/download/zathura-cb-0.1.8.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	optfeature	d524f291c80f9d21ad80fe978e3ca760	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	optfeature	d524f291c80f9d21ad80fe978e3ca760	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=a5463965426382dc1ae716b49f05e1f6
diff --git a/metadata/md5-cache/app-text/zathura-cb-0.1.9 b/metadata/md5-cache/app-text/zathura-cb-0.1.9
index 505feefdba3d..e94517e501c3 100644
--- a/metadata/md5-cache/app-text/zathura-cb-0.1.9
+++ b/metadata/md5-cache/app-text/zathura-cb-0.1.9
@@ -5,10 +5,10 @@ DESCRIPTION=Comic book plug-in for zathura with 7zip, rar, tar and zip support
 EAPI=8
 HOMEPAGE=https://pwmt.org/projects/zathura-cb/
 INHERIT=meson xdg-utils optfeature
-KEYWORDS=amd64 ~arm ~riscv x86
+KEYWORDS=amd64 arm ~riscv x86
 LICENSE=ZLIB
 RDEPEND=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
 SLOT=0
 SRC_URI=https://pwmt.org/projects/zathura-cb/download/zathura-cb-0.1.9.tar.xz
-_eclasses_=meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	optfeature	d524f291c80f9d21ad80fe978e3ca760	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=de1e73dbfc37215a7434060089372db9
+_eclasses_=meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	optfeature	d524f291c80f9d21ad80fe978e3ca760	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=6b902c8e1475570b7b2bf4ca255aae80
diff --git a/metadata/md5-cache/app-text/zathura-cb-9999 b/metadata/md5-cache/app-text/zathura-cb-9999
index e5190113094e..6978a6d18e86 100644
--- a/metadata/md5-cache/app-text/zathura-cb-9999
+++ b/metadata/md5-cache/app-text/zathura-cb-9999
@@ -9,5 +9,5 @@ LICENSE=ZLIB
 PROPERTIES=live
 RDEPEND=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
 SLOT=0
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	optfeature	d524f291c80f9d21ad80fe978e3ca760	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	optfeature	d524f291c80f9d21ad80fe978e3ca760	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=c35e7a98dcac0b31ce2098d8818cf0b1
diff --git a/metadata/md5-cache/app-text/zathura-djvu-0.2.9 b/metadata/md5-cache/app-text/zathura-djvu-0.2.9
index aff80f947430..769f3d930a04 100644
--- a/metadata/md5-cache/app-text/zathura-djvu-0.2.9
+++ b/metadata/md5-cache/app-text/zathura-djvu-0.2.9
@@ -10,5 +10,5 @@ LICENSE=ZLIB
 RDEPEND=app-text/djvu >=app-text/zathura-0.3.9 dev-libs/girara dev-libs/glib:2 x11-libs/cairo
 SLOT=0
 SRC_URI=https://pwmt.org/projects/zathura-djvu/download/zathura-djvu-0.2.9.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=cde9217ecda215ea5fc9df3209d10f78
diff --git a/metadata/md5-cache/app-text/zathura-djvu-9999 b/metadata/md5-cache/app-text/zathura-djvu-9999
index 7646b4c9fed0..7000ad07e8eb 100644
--- a/metadata/md5-cache/app-text/zathura-djvu-9999
+++ b/metadata/md5-cache/app-text/zathura-djvu-9999
@@ -9,5 +9,5 @@ LICENSE=ZLIB
 PROPERTIES=live
 RDEPEND=app-text/djvu >=app-text/zathura-0.3.9 dev-libs/girara dev-libs/glib:2 x11-libs/cairo
 SLOT=0
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=8654d284301e84386b008938a5ceffee
diff --git a/metadata/md5-cache/app-text/zathura-pdf-mupdf-0.3.6 b/metadata/md5-cache/app-text/zathura-pdf-mupdf-0.3.6
index 0c15383f7252..81963cb75e29 100644
--- a/metadata/md5-cache/app-text/zathura-pdf-mupdf-0.3.6
+++ b/metadata/md5-cache/app-text/zathura-pdf-mupdf-0.3.6
@@ -10,5 +10,5 @@ LICENSE=ZLIB
 RDEPEND=>=app-text/mupdf-1.17:= >=app-text/zathura-0.3.9 dev-libs/girara dev-libs/glib:2 media-libs/jbig2dec:= media-libs/openjpeg:2= virtual/jpeg:0 x11-libs/cairo
 SLOT=0
 SRC_URI=https://git.pwmt.org/pwmt/zathura-pdf-mupdf/-/archive/0.3.6/zathura-pdf-mupdf-0.3.6.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=ce6006a62636f68e7b89e4f53fe8d0d3
diff --git a/metadata/md5-cache/app-text/zathura-pdf-mupdf-0.3.7-r1 b/metadata/md5-cache/app-text/zathura-pdf-mupdf-0.3.7-r1
index e775b416510f..b736019d3c02 100644
--- a/metadata/md5-cache/app-text/zathura-pdf-mupdf-0.3.7-r1
+++ b/metadata/md5-cache/app-text/zathura-pdf-mupdf-0.3.7-r1
@@ -10,5 +10,5 @@ LICENSE=ZLIB
 RDEPEND=>=app-text/mupdf-1.17:= >=app-text/zathura-0.3.9 dev-libs/girara dev-libs/glib:2 x11-libs/cairo
 SLOT=0
 SRC_URI=https://git.pwmt.org/pwmt/zathura-pdf-mupdf/-/archive/0.3.7/zathura-pdf-mupdf-0.3.7.tar.gz
-_eclasses_=meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=ed58eb10d748a186a050cd2c374f33ed
diff --git a/metadata/md5-cache/app-text/zathura-pdf-mupdf-0.3.8-r1 b/metadata/md5-cache/app-text/zathura-pdf-mupdf-0.3.8-r2
index e8e98343231d..fe83200c0e86 100644
--- a/metadata/md5-cache/app-text/zathura-pdf-mupdf-0.3.8-r1
+++ b/metadata/md5-cache/app-text/zathura-pdf-mupdf-0.3.8-r2
@@ -1,14 +1,14 @@
 BDEPEND=app-text/tesseract dev-lang/mujs media-libs/leptonica virtual/pkgconfig >=dev-util/meson-0.59.4 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
 DEFINED_PHASES=compile configure install postinst postrm preinst test
-DEPEND=>=app-text/mupdf-1.19:= >=app-text/zathura-0.3.9 dev-libs/girara dev-libs/glib:2 x11-libs/cairo
+DEPEND=~app-text/mupdf-1.19.1:= >=app-text/zathura-0.3.9 dev-libs/girara dev-libs/glib:2 x11-libs/cairo
 DESCRIPTION=PDF plug-in for zathura
 EAPI=8
 HOMEPAGE=https://git.pwmt.org/pwmt/zathura-pdf-mupdf
 INHERIT=meson xdg
-KEYWORDS=amd64 ~arm x86
+KEYWORDS=amd64 arm x86
 LICENSE=ZLIB
-RDEPEND=>=app-text/mupdf-1.19:= >=app-text/zathura-0.3.9 dev-libs/girara dev-libs/glib:2 x11-libs/cairo
+RDEPEND=~app-text/mupdf-1.19.1:= >=app-text/zathura-0.3.9 dev-libs/girara dev-libs/glib:2 x11-libs/cairo
 SLOT=0
 SRC_URI=https://git.pwmt.org/pwmt/zathura-pdf-mupdf/-/archive/0.3.8/zathura-pdf-mupdf-0.3.8.tar.gz
-_eclasses_=meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=11ab9e8576489dcaef423fba0b273ac8
+_eclasses_=meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=8fcb544db6cdb5a97e3070602d8daf2d
diff --git a/metadata/md5-cache/app-text/zathura-pdf-mupdf-9999 b/metadata/md5-cache/app-text/zathura-pdf-mupdf-9999
index e9e5a49850a0..a799156c8079 100644
--- a/metadata/md5-cache/app-text/zathura-pdf-mupdf-9999
+++ b/metadata/md5-cache/app-text/zathura-pdf-mupdf-9999
@@ -9,5 +9,5 @@ LICENSE=ZLIB
 PROPERTIES=live
 RDEPEND=>=app-text/mupdf-1.19:= >=app-text/zathura-0.3.9 dev-libs/girara dev-libs/glib:2 x11-libs/cairo
 SLOT=0
-_eclasses_=git-r3	b9ac6f96d2a88edb5b351df634dc5e53	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=git-r3	b9ac6f96d2a88edb5b351df634dc5e53	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=c56bb9cae09df39048fe261abeca7561
diff --git a/metadata/md5-cache/app-text/zathura-pdf-poppler-0.2.9 b/metadata/md5-cache/app-text/zathura-pdf-poppler-0.2.9
index 2aa4f5116291..633ac8dd904b 100644
--- a/metadata/md5-cache/app-text/zathura-pdf-poppler-0.2.9
+++ b/metadata/md5-cache/app-text/zathura-pdf-poppler-0.2.9
@@ -10,5 +10,5 @@ LICENSE=ZLIB
 RDEPEND=app-text/poppler[cairo] >=app-text/zathura-0.3.9 dev-libs/girara dev-libs/glib:2
 SLOT=0
 SRC_URI=http://pwmt.org/projects/zathura/plugins/download/zathura-pdf-poppler-0.2.9.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=4a1b0d4d2227e2e7ca9c2582b12a33b4
diff --git a/metadata/md5-cache/app-text/zathura-pdf-poppler-0.3.0 b/metadata/md5-cache/app-text/zathura-pdf-poppler-0.3.0
index 378720be2b93..4ada231a3e72 100644
--- a/metadata/md5-cache/app-text/zathura-pdf-poppler-0.3.0
+++ b/metadata/md5-cache/app-text/zathura-pdf-poppler-0.3.0
@@ -10,5 +10,5 @@ LICENSE=ZLIB
 RDEPEND=app-text/poppler[cairo] >=app-text/zathura-0.3.9 dev-libs/girara dev-libs/glib:2
 SLOT=0
 SRC_URI=https://github.com/pwmt/zathura-pdf-poppler/archive/0.3.0.tar.gz -> zathura-pdf-poppler-0.3.0.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=176a91bc60717434a2bbde90262748bf
diff --git a/metadata/md5-cache/app-text/zathura-pdf-poppler-9999 b/metadata/md5-cache/app-text/zathura-pdf-poppler-9999
index e42cd3269ba7..2be1744fc164 100644
--- a/metadata/md5-cache/app-text/zathura-pdf-poppler-9999
+++ b/metadata/md5-cache/app-text/zathura-pdf-poppler-9999
@@ -9,5 +9,5 @@ LICENSE=ZLIB
 PROPERTIES=live
 RDEPEND=app-text/poppler[cairo] >=app-text/zathura-0.3.9 dev-libs/girara dev-libs/glib:2
 SLOT=0
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=f373ebcc5f8dbeb4f4f1e666d73ba284
diff --git a/metadata/md5-cache/app-text/zathura-ps-0.2.6 b/metadata/md5-cache/app-text/zathura-ps-0.2.6
index eb4f497eaf19..81debca9d3c9 100644
--- a/metadata/md5-cache/app-text/zathura-ps-0.2.6
+++ b/metadata/md5-cache/app-text/zathura-ps-0.2.6
@@ -10,5 +10,5 @@ LICENSE=ZLIB
 RDEPEND=app-text/libspectre >=app-text/zathura-0.3.9 dev-libs/girara dev-libs/glib:2 x11-libs/cairo
 SLOT=0
 SRC_URI=https://pwmt.org/projects/zathura/plugins/download/zathura-ps-0.2.6.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=3ee76e1b5ae75d4d71013fa4f3201b52
diff --git a/metadata/md5-cache/app-text/zathura-ps-0.2.7 b/metadata/md5-cache/app-text/zathura-ps-0.2.7
index 3d3bd80ac5a8..7f5144aaa134 100644
--- a/metadata/md5-cache/app-text/zathura-ps-0.2.7
+++ b/metadata/md5-cache/app-text/zathura-ps-0.2.7
@@ -5,10 +5,10 @@ DESCRIPTION=PostScript plug-in for zathura
 EAPI=8
 HOMEPAGE=https://pwmt.org/projects/zathura-ps/download/
 INHERIT=meson xdg-utils
-KEYWORDS=amd64 ~arm ~riscv x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 arm ~riscv x86 ~amd64-linux ~x86-linux
 LICENSE=ZLIB
 RDEPEND=app-text/libspectre >=app-text/zathura-0.3.9 dev-libs/girara dev-libs/glib:2 x11-libs/cairo
 SLOT=0
 SRC_URI=https://pwmt.org/projects/zathura-ps/download/zathura-ps-0.2.7.tar.xz
-_eclasses_=meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=03898303d95bf223e5aaa52138c399a9
+_eclasses_=meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=ede4db90cba9c839204228d28a6a07f4
diff --git a/metadata/md5-cache/app-text/zathura-ps-9999 b/metadata/md5-cache/app-text/zathura-ps-9999
index 0759e6030bd8..da0763e6e7cb 100644
--- a/metadata/md5-cache/app-text/zathura-ps-9999
+++ b/metadata/md5-cache/app-text/zathura-ps-9999
@@ -9,5 +9,5 @@ LICENSE=ZLIB
 PROPERTIES=live
 RDEPEND=app-text/libspectre >=app-text/zathura-0.3.9 dev-libs/girara dev-libs/glib:2 x11-libs/cairo
 SLOT=0
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=bfd45a592fe7c7cdc374bb51ef1860df
diff --git a/metadata/md5-cache/app-text/zotero-bin-6.0.7 b/metadata/md5-cache/app-text/zotero-bin-6.0.8
index 0bc28c95d63a..7ad0050cbc95 100644
--- a/metadata/md5-cache/app-text/zotero-bin-6.0.7
+++ b/metadata/md5-cache/app-text/zotero-bin-6.0.8
@@ -7,6 +7,6 @@ KEYWORDS=-* ~amd64
 LICENSE=AGPL-3
 RDEPEND=dev-libs/atk dev-libs/dbus-glib dev-libs/glib dev-libs/nspr dev-libs/nss media-libs/fontconfig media-libs/freetype sys-apps/dbus sys-libs/glibc x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libxcb x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrender x11-libs/libXt x11-libs/pango
 SLOT=0
-SRC_URI=https://www.zotero.org/download/client/dl?channel=release&platform=linux-x86_64&version=6.0.7 -> zotero-bin-6.0.7.tar.bz2
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+SRC_URI=https://www.zotero.org/download/client/dl?channel=release&platform=linux-x86_64&version=6.0.8 -> zotero-bin-6.0.8.tar.bz2
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=0e6b483ced1b4b2b0848a10f8f1dfcd4
author	V3n3RiX <venerix@koprulu.sector>	2022-06-29 12:04:12 +0100
committer	V3n3RiX <venerix@koprulu.sector>	2022-06-29 12:04:12 +0100
commit	0f558761aa2dee1017b4751e4017205e015a9560 (patch)
tree	037df795519468a25d9362b4e95cdaeb84eb1cf9 /metadata/md5-cache/app-text
parent	752d6256e5204b958b0ef7905675a940b5e9172f (diff)