gentoo resync : 12.05.2022

author: V3n3RiX <venerix@koprulu.sector> 2022-05-12 16:42:50 +0300
committer: V3n3RiX <venerix@koprulu.sector> 2022-05-12 16:42:50 +0300
commit: 752d6256e5204b958b0ef7905675a940b5e9172f (patch)
tree: 330d16e6362a49cbed8875a777fe641a43376cd3 /metadata/md5-cache/app-text
parent: 0c100b7dd2b30e75b799d806df4ef899fd98e1ea (diff)
278 files changed, 727 insertions, 548 deletions
diff --git a/metadata/md5-cache/app-text/App-XML-DocBook-Builder-0.100.300-r1 b/metadata/md5-cache/app-text/App-XML-DocBook-Builder-0.100.300-r1
index 2a9daa1de020..79f126720561 100644
--- a/metadata/md5-cache/app-text/App-XML-DocBook-Builder-0.100.300-r1
+++ b/metadata/md5-cache/app-text/App-XML-DocBook-Builder-0.100.300-r1
@@ -4,12 +4,13 @@ DEPEND=dev-lang/perl
 DESCRIPTION=A Perl-based tool to Render DocBook/XML
 EAPI=8
 HOMEPAGE=https://www.shlomifish.org/open-source/projects/docmake/
+INHERIT=perl-module
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~m68k ~mips ppc64 ~riscv ~sparc x86
 LICENSE=MIT
 RDEPEND=dev-perl/Class-XSAccessor virtual/perl-Getopt-Long virtual/perl-File-Path dev-perl/Path-Tiny dev-perl/Test-Trap dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SH/SHLOMIF/App-XML-DocBook-Builder-0.1003.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	8eed4e2982026c684ff7c19cd4c88ed0	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
-_md5_=c8c35f42170e070bf23b2bf14531aa7a
+_eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	8eed4e2982026c684ff7c19cd4c88ed0	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
+_md5_=7734bf9b40edc8b630d32916d65c9a3d
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index 7de06ea80ac8..dd300e9a0b37 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 0ef219bd7abe..203a9d7090c8 100644
--- a/metadata/md5-cache/app-text/a2ps-4.14-r6
+++ b/metadata/md5-cache/app-text/a2ps-4.14-r6
@@ -3,6 +3,7 @@ DEPEND=app-text/ghostscript-gpl app-text/libpaper >=app-text/psutils-1.17 app-te
 DESCRIPTION=Any to PostScript filter
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/a2ps/
+INHERIT=autotools elisp-common flag-o-matic
 IUSE=cjk emacs latex nls static-libs vanilla
 KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-3
@@ -10,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	9724194ab651ce63fd9bc06e4e1410b4	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	f9c72486dbcb18b633c9d0949211d86e	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_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
 _md5_=2894260d0887ecb08afd025efd22936d
diff --git a/metadata/md5-cache/app-text/aiksaurus-1.2.1 b/metadata/md5-cache/app-text/aiksaurus-1.2.1
deleted file mode 100644
index 298b39da3620..000000000000
--- a/metadata/md5-cache/app-text/aiksaurus-1.2.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure prepare
-DEPEND=gtk? ( x11-libs/gtk+:2 ) gtk? ( virtual/pkgconfig ) >=app-portage/elt-patches-20170815
-DESCRIPTION=A thesaurus lib, tool and database
-EAPI=6
-HOMEPAGE=https://sourceforge.net/projects/aiksaurus
-IUSE=gtk
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 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
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=ba02db35e9012526655211c7e6909ffc
diff --git a/metadata/md5-cache/app-text/ansifilter-2.18 b/metadata/md5-cache/app-text/ansifilter-2.18
index 6193c296b44c..40bdf9429fab 100644
--- a/metadata/md5-cache/app-text/ansifilter-2.18
+++ b/metadata/md5-cache/app-text/ansifilter-2.18
@@ -3,11 +3,12 @@ DEPEND=qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 )
 DESCRIPTION=Handles text files containing ANSI terminal escape codes
 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
 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	f5eb2f69fffe94292aaaf802fb21c8d1	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=149d73a6de05a1418a3d05988b88090b
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 78e4b75e391b..79b8558af855 100644
--- a/metadata/md5-cache/app-text/apvlv-0.1.5-r2
+++ b/metadata/md5-cache/app-text/apvlv-0.1.5-r2
@@ -4,11 +4,12 @@ DEPEND=>=app-text/poppler-0.18[cairo,xpdf-headers(+)] dev-libs/glib:2 x11-libs/g
 DESCRIPTION=Alf's PDF Viewer Like Vim
 EAPI=7
 HOMEPAGE=https://github.com/naihe2010/apvlv/
+INHERIT=xdg cmake desktop
 IUSE=debug djvu
 KEYWORDS=amd64 x86
 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	3c38df051095289667b6f09ebd0cc149	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_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
 _md5_=de74c8238c69a96c998067df0058837c
diff --git a/metadata/md5-cache/app-text/apvlv-0.4.0 b/metadata/md5-cache/app-text/apvlv-0.4.0
new file mode 100644
index 000000000000..654d8dced6b3
--- /dev/null
+++ b/metadata/md5-cache/app-text/apvlv-0.4.0
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig dev-util/ninja >=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
+EAPI=8
+HOMEPAGE=https://github.com/naihe2010/apvlv/
+INHERIT=xdg cmake desktop
+IUSE=debug djvu
+KEYWORDS=~amd64 ~x86
+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
+_md5_=1b1d93b9e2881a47b523c196ded84dcc
diff --git a/metadata/md5-cache/app-text/asciidoc-10.1.3 b/metadata/md5-cache/app-text/asciidoc-10.1.3
deleted file mode 100644
index e6043bc99d6b..000000000000
--- a/metadata/md5-cache/app-text/asciidoc-10.1.3
+++ /dev/null
@@ -1,14 +0,0 @@
-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/installer-0.4.0_p20220124[python_targets_pypy3(-)] >=dev-python/tomli-1.2.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/installer-0.4.0_p20220124[python_targets_python3_8(-)] >=dev-python/tomli-1.2.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/installer-0.4.0_p20220124[python_targets_python3_9(-)] >=dev-python/tomli-1.2.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/installer-0.4.0_p20220124[python_targets_python3_10(-)] >=dev-python/tomli-1.2.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/
-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 ~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.1.3.tar.gz
-_eclasses_=distutils-r1	779bc733c68a72273cfce64602bada1d	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	d524f291c80f9d21ad80fe978e3ca760	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	59dddabd6a41ab69723654916142f63b	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=624eb8aef300ee8b55919c05068726b4
diff --git a/metadata/md5-cache/app-text/asciidoc-10.1.1-r2 b/metadata/md5-cache/app-text/asciidoc-10.1.4
index a6c5b6966a13..f0cb4be22ff5 100644
--- a/metadata/md5-cache/app-text/asciidoc-10.1.1-r2
+++ b/metadata/md5-cache/app-text/asciidoc-10.1.4
@@ -1,14 +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/setuptools-42.0.2[python_targets_pypy3(-)] ) python_single_target_python3_8? ( >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/setuptools-42.0.2[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/setuptools-42.0.2[python_targets_python3_10(-)] )
+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 ~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=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.1.1.tar.gz
-_eclasses_=distutils-r1	779bc733c68a72273cfce64602bada1d	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	d524f291c80f9d21ad80fe978e3ca760	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	59dddabd6a41ab69723654916142f63b	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=2f98c93775b328a967436e775c63c91e
+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
+_md5_=cb340c8347b23d407d0975bcf96f015d
diff --git a/metadata/md5-cache/app-text/asciidoc-9.0.5-r1 b/metadata/md5-cache/app-text/asciidoc-9.0.5-r1
deleted file mode 100644
index 218fb1473547..000000000000
--- a/metadata/md5-cache/app-text/asciidoc-9.0.5-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-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=configure install postinst prepare setup
-DEPEND=test? ( 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 ) app-text/dvipng app-text/dvisvgm dev-texlive/texlive-latex dev-util/source-highlight media-gfx/graphviz media-gfx/imagemagick media-sound/lilypond )
-DESCRIPTION=A plain text human readable/writable document format
-EAPI=7
-HOMEPAGE=https://asciidoc.org/ https://github.com/asciidoc-py/asciidoc-py/
-IUSE=doc test python_single_target_pypy3 python_single_target_python3_8 python_single_target_python3_9
-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=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 ) app-text/docbook-xml-dtd:4.5 >=app-text/docbook-xsl-stylesheets-1.75 dev-libs/libxslt dev-libs/libxml2:2
-REQUIRED_USE=^^ ( python_single_target_pypy3 python_single_target_python3_8 python_single_target_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/asciidoc-py/asciidoc-py/releases/download/9.0.5/asciidoc-9.0.5.tar.gz -> asciidoc-9.0.5.new.tar.gz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	d524f291c80f9d21ad80fe978e3ca760	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	59dddabd6a41ab69723654916142f63b	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=d73cced182d73a60ef5a6d037d9b4295
diff --git a/metadata/md5-cache/app-text/asciidoc-9.1.0 b/metadata/md5-cache/app-text/asciidoc-9.1.0
index 6842c7110bba..8bdb9013005a 100644
--- a/metadata/md5-cache/app-text/asciidoc-9.1.0
+++ b/metadata/md5-cache/app-text/asciidoc-9.1.0
@@ -4,6 +4,7 @@ DEPEND=test? ( python_single_target_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) py
 DESCRIPTION=A plain text human readable/writable document format
 EAPI=7
 HOMEPAGE=https://asciidoc.org/ https://github.com/asciidoc-py/asciidoc-py/
+INHERIT=autotools optfeature python-single-r1 readme.gentoo-r1
 IUSE=doc test 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 ~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
@@ -12,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	9724194ab651ce63fd9bc06e4e1410b4	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	d524f291c80f9d21ad80fe978e3ca760	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	59dddabd6a41ab69723654916142f63b	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_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
 _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 197ad3441360..3deb0db8239d 100644
--- a/metadata/md5-cache/app-text/asciidoc-9.1.1
+++ b/metadata/md5-cache/app-text/asciidoc-9.1.1
@@ -4,6 +4,7 @@ DEPEND=test? ( python_single_target_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) py
 DESCRIPTION=A plain text human readable/writable document format
 EAPI=7
 HOMEPAGE=https://asciidoc.org/ https://github.com/asciidoc-py/asciidoc-py/
+INHERIT=autotools optfeature python-single-r1 readme.gentoo-r1
 IUSE=doc test 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 ~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
@@ -12,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	9724194ab651ce63fd9bc06e4e1410b4	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	d524f291c80f9d21ad80fe978e3ca760	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	59dddabd6a41ab69723654916142f63b	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_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
 _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 d68e19f23e9e..20a0d6ad7469 100644
--- a/metadata/md5-cache/app-text/aspell-0.60.8-r4
+++ b/metadata/md5-cache/app-text/aspell-0.60.8-r4
@@ -11,5 +11,5 @@ PDEPEND=l10n_af? ( app-dicts/aspell-af ) l10n_am? ( app-dicts/aspell-am ) l10n_a
 RDEPEND=sys-libs/ncurses:=[unicode(+)?] nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=mirror://gnu/aspell/aspell-0.60.8.tar.gz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=5c13219e15494a8c46243cf3983c4272
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 8509c02ae473..d0ad2744b0ba 100644
--- a/metadata/md5-cache/app-text/atril-1.24.0-r2
+++ b/metadata/md5-cache/app-text/atril-1.24.0-r2
@@ -3,6 +3,7 @@ DEPEND=>=app-text/poppler-0.22[cairo] dev-libs/atk >=dev-libs/glib-2.62:2 >=dev-
 DESCRIPTION=Atril document viewer for MATE
 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 x86
 LICENSE=FDL-1.1+ GPL-2+ GPL-3+ LGPL-2+ LGPL-2.1+
@@ -11,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	9724194ab651ce63fd9bc06e4e1410b4	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	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	mate	e29617c33d6e271931938d0073817dde	mate-desktop.org	0da897c64adb500292c6b9db3e424496	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	59dddabd6a41ab69723654916142f63b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	virtualx	975d49ff3b3f451efe7a95f230532135	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_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_=40d17f86ce1fda797a6a651927a07156
diff --git a/metadata/md5-cache/app-text/atril-1.24.1 b/metadata/md5-cache/app-text/atril-1.24.1
index e1edef747329..826309ee5067 100644
--- a/metadata/md5-cache/app-text/atril-1.24.1
+++ b/metadata/md5-cache/app-text/atril-1.24.1
@@ -3,6 +3,7 @@ DEPEND=>=app-text/poppler-0.22[cairo] dev-libs/atk >=dev-libs/glib-2.62:2 >=dev-
 DESCRIPTION=Atril document viewer for MATE
 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
 LICENSE=FDL-1.1+ GPL-2+ GPL-3+ LGPL-2+ LGPL-2.1+
@@ -11,5 +12,5 @@ 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	9724194ab651ce63fd9bc06e4e1410b4	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	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	mate	e29617c33d6e271931938d0073817dde	mate-desktop.org	0da897c64adb500292c6b9db3e424496	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	59dddabd6a41ab69723654916142f63b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	virtualx	975d49ff3b3f451efe7a95f230532135	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_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
diff --git a/metadata/md5-cache/app-text/barcode-0.99-r1 b/metadata/md5-cache/app-text/barcode-0.99-r1
index 41a3baffa809..6ea8222ab737 100644
--- a/metadata/md5-cache/app-text/barcode-0.99-r1
+++ b/metadata/md5-cache/app-text/barcode-0.99-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=app-text/libpaper
 SLOT=0
 SRC_URI=mirror://gnu/barcode/barcode-0.99.tar.xz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=25b433e6fa8d7d28eef724fd3837c6d9
diff --git a/metadata/md5-cache/app-text/bibclean-3.04 b/metadata/md5-cache/app-text/bibclean-3.04
deleted file mode 100644
index bbe9f40de83f..000000000000
--- a/metadata/md5-cache/app-text/bibclean-3.04
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install
-DESCRIPTION=BibTeX bibliography prettyprinter and syntax checker
-EAPI=7
-HOMEPAGE=http://www.math.utah.edu/pub/bibclean/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=ftp://ftp.math.utah.edu/pub/bibclean/bibclean-3.04.tar.xz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=b99236f4253e704cdc9ec8ac6e0f2108
diff --git a/metadata/md5-cache/app-text/bibletime-3.0.2 b/metadata/md5-cache/app-text/bibletime-3.0.2
index 6257b9ca57fc..d28dab3f521a 100644
--- a/metadata/md5-cache/app-text/bibletime-3.0.2
+++ b/metadata/md5-cache/app-text/bibletime-3.0.2
@@ -4,10 +4,11 @@ DEPEND=>=app-text/sword-1.8.1 dev-cpp/clucene dev-qt/qtcore:5 dev-qt/qtgui:5 dev
 DESCRIPTION=Qt Bible-study application using the SWORD library
 EAPI=7
 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.2/bibletime-3.0.2.tar.xz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_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_=1779bd86927225fea079ee33c2cde67b
diff --git a/metadata/md5-cache/app-text/blahtexml-0.9 b/metadata/md5-cache/app-text/blahtexml-0.9
index a9ee2ea06a93..c416d6d9b384 100644
--- a/metadata/md5-cache/app-text/blahtexml-0.9
+++ b/metadata/md5-cache/app-text/blahtexml-0.9
@@ -5,10 +5,10 @@ DESCRIPTION=TeX-to-MathML converter
 EAPI=7
 HOMEPAGE=http://gva.noekeon.org/blahtexml
 IUSE=doc
-KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 ~riscv x86
+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
-_md5_=50bac6c1538fc8206755c58c00d63129
+_md5_=a0af3c3809a4b9326cd80d292948049e
diff --git a/metadata/md5-cache/app-text/blogc-9999 b/metadata/md5-cache/app-text/blogc-9999
index 72d58b9984dc..1458e2e643d2 100644
--- a/metadata/md5-cache/app-text/blogc-9999
+++ b/metadata/md5-cache/app-text/blogc-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=git? ( dev-vcs/git )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _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 e53801db8baf..2e0f2e27fc5f 100644
--- a/metadata/md5-cache/app-text/bogosort-0.4.2-r1
+++ b/metadata/md5-cache/app-text/bogosort-0.4.2-r1
@@ -7,5 +7,5 @@ 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	9724194ab651ce63fd9bc06e4e1410b4	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=37ca429dcb261bf3ada91c68e6424848
diff --git a/metadata/md5-cache/app-text/build-docbook-catalog-2.2 b/metadata/md5-cache/app-text/build-docbook-catalog-2.2
index 84fa1b31c825..d9d94b453eb8 100644
--- a/metadata/md5-cache/app-text/build-docbook-catalog-2.2
+++ b/metadata/md5-cache/app-text/build-docbook-catalog-2.2
@@ -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 ~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.2.tar.bz2
-_md5_=fa7e002bd2242cc26e8b6885ab9bd064
+_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
new file mode 100644
index 000000000000..7a1599c02183
--- /dev/null
+++ b/metadata/md5-cache/app-text/build-docbook-catalog-2.3
@@ -0,0 +1,10 @@
+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.3.tar.bz2
+_md5_=022bdb0ffd47d23b8c83fad0651f2a12
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 f3c742ba42b8..c39b2515a9c9 100644
--- a/metadata/md5-cache/app-text/calibre-5.16.1-r1
+++ b/metadata/md5-cache/app-text/calibre-5.16.1-r1
@@ -1,14 +1,15 @@
 DEFINED_PHASES=install postinst postrm preinst prepare pretend 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/qtwebengine-5.12 dev-qt/qtwidgets:5= dev-util/desktop-file-utils dev-util/gtk-update-icon-cache media-fonts/liberation-fonts media-libs/fontconfig:= >=media-libs/freetype-2:= >=media-libs/libmtp-1.1.11:= >=media-libs/libwmf-0.2.8 >=media-gfx/optipng-0.7.6 >=sys-libs/zlib-1.2.11:= virtual/libusb:1= x11-libs/libxkbcommon:= x11-libs/libX11:= x11-libs/libXext:= x11-libs/libXrender:= x11-misc/shared-mime-info >=x11-misc/xdg-utils-1.0.2-r2 ios? ( >=app-pda/usbmuxd-1.0.8 >=app-pda/libimobiledevice-1.2.0 ) udisks? ( virtual/libudev ) 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
+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
 HOMEPAGE=https://calibre-ebook.com/
+INHERIT=bash-completion-r1 desktop 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 >=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/qtwebengine-5.12 dev-qt/qtwidgets:5= dev-util/desktop-file-utils dev-util/gtk-update-icon-cache media-fonts/liberation-fonts media-libs/fontconfig:= >=media-libs/freetype-2:= >=media-libs/libmtp-1.1.11:= >=media-libs/libwmf-0.2.8 >=media-gfx/optipng-0.7.6 >=sys-libs/zlib-1.2.11:= virtual/libusb:1= x11-libs/libxkbcommon:= x11-libs/libX11:= x11-libs/libXext:= x11-libs/libXrender:= x11-misc/shared-mime-info >=x11-misc/xdg-utils-1.0.2-r2 ios? ( >=app-pda/usbmuxd-1.0.8 >=app-pda/libimobiledevice-1.2.0 ) udisks? ( virtual/libudev ) udisks? ( sys-fs/udisks: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 >=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 ) 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.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	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	59dddabd6a41ab69723654916142f63b	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=1774946ac31eade725a4999ff9b50282
+_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
diff --git a/metadata/md5-cache/app-text/calibre-5.39.1 b/metadata/md5-cache/app-text/calibre-5.39.1
index 4e025665bfc9..d484dc83b486 100644
--- a/metadata/md5-cache/app-text/calibre-5.39.1
+++ b/metadata/md5-cache/app-text/calibre-5.39.1
@@ -1,15 +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(-)] ) >=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/qtwebengine-5.12 dev-qt/qtwidgets:5= dev-util/desktop-file-utils dev-util/gtk-update-icon-cache media-fonts/liberation-fonts media-libs/fontconfig:= >=media-libs/freetype-2:= >=media-libs/libmtp-1.1.11:= >=media-libs/libwmf-0.2.8 >=media-gfx/optipng-0.7.6 >=sys-libs/zlib-1.2.11:= virtual/libusb:1= x11-libs/libxkbcommon:= x11-libs/libX11:= x11-libs/libXext:= x11-libs/libXrender:= x11-misc/shared-mime-info >=x11-misc/xdg-utils-1.0.2-r2 ios? ( >=app-pda/usbmuxd-1.0.8 >=app-pda/libimobiledevice-1.2.0 ) udisks? ( virtual/libudev )
+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/qtwebengine-5.12 dev-qt/qtwidgets:5= dev-util/desktop-file-utils dev-util/gtk-update-icon-cache media-fonts/liberation-fonts media-libs/fontconfig:= >=media-libs/freetype-2:= >=media-libs/libmtp-1.1.11:= >=media-libs/libwmf-0.2.8 >=media-gfx/optipng-0.7.6 >=sys-libs/zlib-1.2.11:= virtual/libusb:1= x11-libs/libxkbcommon:= x11-libs/libX11:= x11-libs/libXext:= x11-libs/libXrender:= x11-misc/shared-mime-info >=x11-misc/xdg-utils-1.0.2-r2 ios? ( >=app-pda/usbmuxd-1.0.8 >=app-pda/libimobiledevice-1.2.0 ) udisks? ( virtual/libudev ) udisks? ( sys-fs/udisks: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	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	59dddabd6a41ab69723654916142f63b	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=d95f4e240263f460865f8f6523a6f9dd
+_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
index fc26968833b6..569e0958649c 100644
--- a/metadata/md5-cache/app-text/calibre-5.40.0
+++ b/metadata/md5-cache/app-text/calibre-5.40.0
@@ -1,15 +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(-)] ) >=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/qtwebengine-5.12 dev-qt/qtwidgets:5= dev-util/desktop-file-utils dev-util/gtk-update-icon-cache media-fonts/liberation-fonts media-libs/fontconfig:= >=media-libs/freetype-2:= >=media-libs/libmtp-1.1.11:= >=media-libs/libwmf-0.2.8 >=media-gfx/optipng-0.7.6 >=sys-libs/zlib-1.2.11:= virtual/libusb:1= x11-libs/libxkbcommon:= x11-libs/libX11:= x11-libs/libXext:= x11-libs/libXrender:= x11-misc/shared-mime-info >=x11-misc/xdg-utils-1.0.2-r2 ios? ( >=app-pda/usbmuxd-1.0.8 >=app-pda/libimobiledevice-1.2.0 ) udisks? ( virtual/libudev )
+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/qtwebengine-5.12 dev-qt/qtwidgets:5= dev-util/desktop-file-utils dev-util/gtk-update-icon-cache media-fonts/liberation-fonts media-libs/fontconfig:= >=media-libs/freetype-2:= >=media-libs/libmtp-1.1.11:= >=media-libs/libwmf-0.2.8 >=media-gfx/optipng-0.7.6 >=sys-libs/zlib-1.2.11:= virtual/libusb:1= x11-libs/libxkbcommon:= x11-libs/libX11:= x11-libs/libXext:= x11-libs/libXrender:= x11-misc/shared-mime-info >=x11-misc/xdg-utils-1.0.2-r2 ios? ( >=app-pda/usbmuxd-1.0.8 >=app-pda/libimobiledevice-1.2.0 ) udisks? ( virtual/libudev ) udisks? ( sys-fs/udisks: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	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	59dddabd6a41ab69723654916142f63b	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=d95f4e240263f460865f8f6523a6f9dd
+_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
new file mode 100644
index 000000000000..e407c3926e31
--- /dev/null
+++ b/metadata/md5-cache/app-text/calibre-5.41.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(-)] ) >=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
new file mode 100644
index 000000000000..85676352e9b1
--- /dev/null
+++ b/metadata/md5-cache/app-text/calibre-5.42.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(-)] ) >=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/capyt-1.1.1 b/metadata/md5-cache/app-text/capyt-1.1.1
index 6773b5c07c65..541e243c4ec9 100644
--- a/metadata/md5-cache/app-text/capyt-1.1.1
+++ b/metadata/md5-cache/app-text/capyt-1.1.1
@@ -3,6 +3,7 @@ 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
 KEYWORDS=amd64 x86
 LICENSE=MIT
@@ -10,5 +11,5 @@ RDEPEND=dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=https://github.com/lbatalha/capyt/archive/1.1-1.tar.gz -> capyt-1.1.1.tar.gz
-_eclasses_=distutils-r1	779bc733c68a72273cfce64602bada1d	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_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
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 0e42e24f9ba2..e42678c8b89c 100644
--- a/metadata/md5-cache/app-text/cb2bib-2.0.0-r1
+++ b/metadata/md5-cache/app-text/cb2bib-2.0.0-r1
@@ -3,11 +3,12 @@ DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwebengine:5[wi
 DESCRIPTION=Tool for extracting unformatted bibliographic references
 EAPI=7
 HOMEPAGE=https://www.molspaces.com/cb2bib/
+INHERIT=qmake-utils xdg-utils
 IUSE=+lzo
 KEYWORDS=amd64 x86
 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	f5eb2f69fffe94292aaaf802fb21c8d1	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=125610adec86b95b3cc45533848beb31
diff --git a/metadata/md5-cache/app-text/chasen-2.4.5 b/metadata/md5-cache/app-text/chasen-2.4.5
index 081a5ea0fd38..1ee04d08a311 100644
--- a/metadata/md5-cache/app-text/chasen-2.4.5
+++ b/metadata/md5-cache/app-text/chasen-2.4.5
@@ -4,6 +4,7 @@ DEPEND=>=dev-libs/darts-0.32 dev-lang/perl
 DESCRIPTION=Japanese Morphological Analysis System, ChaSen
 EAPI=8
 HOMEPAGE=https://chasen-legacy.osdn.jp/
+INHERIT=perl-module
 IUSE=perl static-libs test
 KEYWORDS=amd64 ppc ~ppc64 ~riscv x86 ~sparc-solaris
 LICENSE=BSD
@@ -12,5 +13,5 @@ RDEPEND=virtual/libiconv dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge.jp/chasen-legacy/56305/chasen-2.4.5.tar.xz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	8eed4e2982026c684ff7c19cd4c88ed0	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
+_eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	8eed4e2982026c684ff7c19cd4c88ed0	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
 _md5_=6c7fbe1bdf35e21579e6211d4fd5b617
diff --git a/metadata/md5-cache/app-text/cherrytree-0.99.0_p20200523-r1 b/metadata/md5-cache/app-text/cherrytree-0.99.0_p20200523-r1
deleted file mode 100644
index a890e7c30d88..000000000000
--- a/metadata/md5-cache/app-text/cherrytree-0.99.0_p20200523-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-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
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=app-text/gspell:= dev-libs/glib:2 >=dev-cpp/glibmm-2.64.2:2 dev-cpp/gtkmm:3.0 dev-cpp/gtksourceviewmm:3.0 dev-libs/libxml2:2 dev-cpp/libxmlpp:2.6 dev-cpp/pangomm:1.4 dev-db/sqlite:3 || ( ( >=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)
-EAPI=7
-HOMEPAGE=https://www.giuspen.com/cherrytree https://github.com/giuspen/cherrytree
-IUSE=nls test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3 LGPL-2.1 MIT
-RDEPEND=app-text/gspell:= dev-libs/glib:2 >=dev-cpp/glibmm-2.64.2:2 dev-cpp/gtkmm:3.0 dev-cpp/gtksourceviewmm:3.0 dev-libs/libxml2:2 dev-cpp/libxmlpp:2.6 dev-cpp/pangomm:1.4 dev-db/sqlite:3
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/giuspen/cherrytree/archive/074a09ce3c1130ec60f5f5a3b8be958337b6d5ab.tar.gz -> cherrytree-0.99.0_p20200523.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	59dddabd6a41ab69723654916142f63b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=55993ffc250bcdcb1c9077a31c152fea
diff --git a/metadata/md5-cache/app-text/cherrytree-0.99.37 b/metadata/md5-cache/app-text/cherrytree-0.99.37
index 4e9058243282..69163cf5a3ba 100644
--- a/metadata/md5-cache/app-text/cherrytree-0.99.37
+++ b/metadata/md5-cache/app-text/cherrytree-0.99.37
@@ -4,6 +4,7 @@ DEPEND=app-i18n/uchardet app-text/gspell:= >=dev-cpp/glibmm-2.64.2:2 dev-cpp/gtk
 DESCRIPTION=A hierarchical note taking application (C++ version)
 EAPI=7
 HOMEPAGE=https://www.giuspen.com/cherrytree https://github.com/giuspen/cherrytree
+INHERIT=cmake python-any-r1 xdg
 IUSE=nls test
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3 LGPL-2.1 MIT
@@ -11,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	3c38df051095289667b6f09ebd0cc149	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	59dddabd6a41ab69723654916142f63b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_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
 _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
new file mode 100644
index 000000000000..2f1fa73e53fe
--- /dev/null
+++ b/metadata/md5-cache/app-text/cherrytree-0.99.47-r1
@@ -0,0 +1,16 @@
+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
+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)
+EAPI=8
+HOMEPAGE=https://www.giuspen.com/cherrytree https://github.com/giuspen/cherrytree
+INHERIT=cmake python-any-r1 xdg
+IUSE=nls test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3 LGPL-2.1 MIT
+RDEPEND=app-i18n/uchardet app-text/gspell:= >=dev-cpp/glibmm-2.64.2:2 dev-cpp/gtkmm:3.0 dev-cpp/gtksourceviewmm:3.0 dev-cpp/libxmlpp:2.6 dev-cpp/pangomm:1.4 dev-db/sqlite:3 dev-libs/glib:2 dev-libs/libfmt:= dev-libs/libxml2:2 dev-libs/spdlog net-misc/curl x11-libs/cairo x11-libs/gtk+:3 x11-libs/pango
+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
+_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 c844a8e5bd7f..6c798a693301 100644
--- a/metadata/md5-cache/app-text/cmark-0.30.2
+++ b/metadata/md5-cache/app-text/cmark-0.30.2
@@ -3,11 +3,12 @@ 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 ppc ppc64 ~riscv x86
+KEYWORDS=amd64 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	3c38df051095289667b6f09ebd0cc149	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=edb59c9382c41385fdfcb240783cc73f
+_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
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 e6227b17c60a..5bb966cc5314 100644
--- a/metadata/md5-cache/app-text/coolreader-3.2.57-r2
+++ b/metadata/md5-cache/app-text/coolreader-3.2.57-r2
@@ -4,11 +4,12 @@ DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=CoolReader - reader of eBook files (fb2,epub,htm,rtf,txt)
 EAPI=7
 HOMEPAGE=https://github.com/buggins/coolreader/
+INHERIT=cmake plocale wxwidgets xdg
 IUSE=wxwidgets
 KEYWORDS=amd64 x86
 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	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	plocale	7ce00136a77130df46fbbd5966f98a61	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	wxwidgets	c09e9b94378cadaf6ef86ec1534c0fd6	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_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
 _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 7a874e71e8ed..01730faa9126 100644
--- a/metadata/md5-cache/app-text/coolreader-3.2.58-r2
+++ b/metadata/md5-cache/app-text/coolreader-3.2.58-r2
@@ -4,11 +4,12 @@ DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=CoolReader - reader of eBook files (fb2,epub,htm,rtf,txt)
 EAPI=7
 HOMEPAGE=https://github.com/buggins/coolreader/
+INHERIT=cmake plocale wxwidgets xdg
 IUSE=wxwidgets
 KEYWORDS=~amd64 ~x86
 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	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	plocale	7ce00136a77130df46fbbd5966f98a61	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	wxwidgets	c09e9b94378cadaf6ef86ec1534c0fd6	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_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
 _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 d7897fafbf7f..4e63d35db598 100644
--- a/metadata/md5-cache/app-text/coolreader-3.2.59-r3
+++ b/metadata/md5-cache/app-text/coolreader-3.2.59-r3
@@ -4,11 +4,12 @@ DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=CoolReader - reader of eBook files (fb2,epub,htm,rtf,txt)
 EAPI=7
 HOMEPAGE=https://github.com/buggins/coolreader/
+INHERIT=cmake plocale wxwidgets xdg
 IUSE=wxwidgets
 KEYWORDS=~amd64 ~x86
 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	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	plocale	7ce00136a77130df46fbbd5966f98a61	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	wxwidgets	c09e9b94378cadaf6ef86ec1534c0fd6	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_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
 _md5_=9e7425df8f22b6d78ab8100101aec34b
diff --git a/metadata/md5-cache/app-text/crf++-0.58 b/metadata/md5-cache/app-text/crf++-0.58
index f3256670d2a3..032a54f51829 100644
--- a/metadata/md5-cache/app-text/crf++-0.58
+++ b/metadata/md5-cache/app-text/crf++-0.58
@@ -3,10 +3,11 @@ DEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/a
 DESCRIPTION=Yet Another CRF toolkit for segmenting/labelling sequential data
 EAPI=6
 HOMEPAGE=https://taku910.github.io/crfpp/
+INHERIT=autotools
 IUSE=examples static-libs
 KEYWORDS=amd64 x86
 LICENSE=|| ( BSD LGPL-2.1 )
 SLOT=0
 SRC_URI=mirror://gentoo/CRF++-0.58.tar.gz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_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_=7527e6566c69d4a9b68c324bb4892c4f
diff --git a/metadata/md5-cache/app-text/cssmin-0.2.0 b/metadata/md5-cache/app-text/cssmin-0.2.0
index 1e4159a2f846..29e7f92adb09 100644
--- a/metadata/md5-cache/app-text/cssmin-0.2.0
+++ b/metadata/md5-cache/app-text/cssmin-0.2.0
@@ -3,6 +3,7 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Python port of the YUI CSS compression algorithm
 EAPI=8
 HOMEPAGE=https://pypi.org/project/cssmin/ https://github.com/zacharyvoase/cssmin
+INHERIT=distutils-r1
 IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 x86
 LICENSE=MIT BSD
@@ -10,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	779bc733c68a72273cfce64602bada1d	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _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 97140b61ee54..e6f1f7d2306d 100644
--- a/metadata/md5-cache/app-text/cuneiform-1.1.0-r3
+++ b/metadata/md5-cache/app-text/cuneiform-1.1.0-r3
@@ -4,11 +4,12 @@ DEPEND=!graphicsmagick? ( media-gfx/imagemagick:= ) graphicsmagick? ( media-gfx/
 DESCRIPTION=An enterprise quality OCR engine by Cognitive Technologies
 EAPI=7
 HOMEPAGE=https://launchpad.net/cuneiform-linux
+INHERIT=cmake flag-o-matic
 IUSE=debug graphicsmagick
 KEYWORDS=~amd64 ~x86
 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	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_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_=8c7da9c4774d942e443c28cded49f070
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 ef02222aea57..4d220584d25e 100644
--- a/metadata/md5-cache/app-text/dblatex-0.3.11-r1
+++ b/metadata/md5-cache/app-text/dblatex-0.3.11-r1
@@ -4,6 +4,7 @@ DEPEND=app-text/docbook-xml-dtd:4.5 dev-libs/kpathsea dev-libs/libxslt dev-libs/
 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
 KEYWORDS=amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86
 LICENSE=GPL-2+
@@ -11,5 +12,5 @@ RDEPEND=app-text/docbook-xml-dtd:4.5 dev-libs/kpathsea dev-libs/libxslt dev-libs
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://downloads.sourceforge.net/project/dblatex/dblatex/dblatex-0.3.11/dblatex-0.3.11py3.tar.bz2
-_eclasses_=distutils-r1	779bc733c68a72273cfce64602bada1d	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_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
diff --git a/metadata/md5-cache/app-text/dblatex-0.3.12 b/metadata/md5-cache/app-text/dblatex-0.3.12
index 07439e9c8548..688c93a51036 100644
--- a/metadata/md5-cache/app-text/dblatex-0.3.12
+++ b/metadata/md5-cache/app-text/dblatex-0.3.12
@@ -4,6 +4,7 @@ DEPEND=app-text/docbook-xml-dtd:4.5 dev-libs/kpathsea dev-libs/libxslt dev-libs/
 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
 KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=GPL-2+
@@ -11,5 +12,5 @@ RDEPEND=app-text/docbook-xml-dtd:4.5 dev-libs/kpathsea dev-libs/libxslt dev-libs
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://downloads.sourceforge.net/project/dblatex/dblatex/dblatex-0.3.12/dblatex3-0.3.12.tar.bz2
-_eclasses_=distutils-r1	779bc733c68a72273cfce64602bada1d	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_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
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 bb890fdda950..7925c3eb222e 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
@@ -9,5 +9,5 @@ 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	9724194ab651ce63fd9bc06e4e1410b4	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	wxwidgets	c09e9b94378cadaf6ef86ec1534c0fd6
+_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
 _md5_=af8d8fc2e6fbf407ea0785a50a7d611f
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 d81e47051634..a4375d88d0ee 100644
--- a/metadata/md5-cache/app-text/diffpdf-2.1.3-r2
+++ b/metadata/md5-cache/app-text/diffpdf-2.1.3-r2
@@ -4,10 +4,11 @@ DEPEND=app-text/poppler[qt5] dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsuppor
 DESCRIPTION=Program that textually or visually compares two PDF files
 EAPI=7
 HOMEPAGE=https://www.qtrac.eu/diffpdf.html
+INHERIT=desktop qmake-utils
 KEYWORDS=~amd64 ~x86
 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	f5eb2f69fffe94292aaaf802fb21c8d1	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=c532f187d41206334b960b3ac58a8f7f
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 54615872bd4a..6b0061379a9d 100644
--- a/metadata/md5-cache/app-text/djview-4.10.6-r2
+++ b/metadata/md5-cache/app-text/djview-4.10.6-r2
@@ -4,11 +4,12 @@ DEPEND=>=app-text/djvu-3.5.22-r1 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork
 DESCRIPTION=Portable DjVu viewer using Qt
 EAPI=7
 HOMEPAGE=http://djvu.sourceforge.net/djview4.html
+INHERIT=autotools desktop flag-o-matic qmake-utils toolchain-funcs xdg-utils
 IUSE=debug
 KEYWORDS=amd64 ~hppa ppc ppc64 x86
 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	9724194ab651ce63fd9bc06e4e1410b4	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_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
 _md5_=c4b7f77778ce08d5e5a69e3a7f61912f
diff --git a/metadata/md5-cache/app-text/djvu-3.5.27-r2 b/metadata/md5-cache/app-text/djvu-3.5.27-r2
deleted file mode 100644
index 7cf390f97545..000000000000
--- a/metadata/md5-cache/app-text/djvu-3.5.27-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=app-arch/unzip 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 postinst postrm prepare
-DEPEND=jpeg? ( virtual/jpeg:0 ) tiff? ( media-libs/tiff:0= ) || ( gnome-base/librsvg media-gfx/inkscape )
-DESCRIPTION=DjVu viewers, encoders and utilities
-EAPI=7
-HOMEPAGE=http://djvu.sourceforge.net/
-IUSE=debug doc jpeg tiff xml
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~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=https://ajakk.github.io/djvu-3.5.27-a00b7618c22fb35b030582147a4479c4cf41c349.zip -> djvu-3.5.27.zip
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	optfeature	d524f291c80f9d21ad80fe978e3ca760	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=f35b01e31f4ae456366c89e1cc226ddc
diff --git a/metadata/md5-cache/app-text/djvu-3.5.28 b/metadata/md5-cache/app-text/djvu-3.5.28
deleted file mode 100644
index de414318ba7d..000000000000
--- a/metadata/md5-cache/app-text/djvu-3.5.28
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=app-arch/unzip 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 postinst postrm preinst prepare
-DEPEND=jpeg? ( virtual/jpeg:0 ) tiff? ( media-libs/tiff:0= ) || ( gnome-base/librsvg media-gfx/inkscape ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=DjVu viewers, encoders and utilities
-EAPI=7
-HOMEPAGE=http://djvu.sourceforge.net/
-IUSE=debug doc jpeg tiff xml
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~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	9724194ab651ce63fd9bc06e4e1410b4	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	optfeature	d524f291c80f9d21ad80fe978e3ca760	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=aaaa23b7c6c13d8c04b12f10fcd1754c
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 0df2b630dd94..101aea3772a2 100644
--- a/metadata/md5-cache/app-text/djvu-3.5.28-r1
+++ b/metadata/md5-cache/app-text/djvu-3.5.28-r1
@@ -10,5 +10,5 @@ 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	9724194ab651ce63fd9bc06e4e1410b4	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	optfeature	d524f291c80f9d21ad80fe978e3ca760	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_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
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 01ac2d3933e2..82881d9c808b 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
@@ -10,5 +10,5 @@ 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	9724194ab651ce63fd9bc06e4e1410b4	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=c172cca99072640302920296df724ca1
diff --git a/metadata/md5-cache/app-text/docbook-xml-dtd-4.1.2-r7 b/metadata/md5-cache/app-text/docbook-xml-dtd-4.1.2-r7
index 3b89a562ffbf..dd468cf9ce06 100644
--- a/metadata/md5-cache/app-text/docbook-xml-dtd-4.1.2-r7
+++ b/metadata/md5-cache/app-text/docbook-xml-dtd-4.1.2-r7
@@ -3,10 +3,10 @@ DEPEND=>=app-arch/unzip-5.41
 DESCRIPTION=Docbook DTD for XML
 EAPI=7
 HOMEPAGE=https://docbook.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 ~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=docbook
 RDEPEND=>=app-text/docbook-xsl-stylesheets-1.65 >=app-text/build-docbook-catalog-1.2 >=app-text/sgml-common-0.6.3-r7
 SLOT=4.1.2
 SRC_URI=https://docbook.org/xml/4.1.2/docbkx412.zip
 _eclasses_=sgml-catalog-r1	5d1d74baed1e6235b9a698917e954236
-_md5_=1b0bf6c72b88e39dcba0a51c173dc820
+_md5_=8e5d751740564c3b398c87a526e2d7ec
diff --git a/metadata/md5-cache/app-text/docbook-xml-dtd-4.2-r3 b/metadata/md5-cache/app-text/docbook-xml-dtd-4.2-r3
index a0ea1f5ec0a2..8f33c3355897 100644
--- a/metadata/md5-cache/app-text/docbook-xml-dtd-4.2-r3
+++ b/metadata/md5-cache/app-text/docbook-xml-dtd-4.2-r3
@@ -3,10 +3,10 @@ DEPEND=>=app-arch/unzip-5.41
 DESCRIPTION=Docbook DTD for XML
 EAPI=7
 HOMEPAGE=https://docbook.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 ~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=docbook
 RDEPEND=>=app-text/docbook-xsl-stylesheets-1.65 >=app-text/build-docbook-catalog-1.2 >=app-text/sgml-common-0.6.3-r7
 SLOT=4.2
 SRC_URI=https://docbook.org/xml/4.2/docbook-xml-4.2.zip
 _eclasses_=sgml-catalog-r1	5d1d74baed1e6235b9a698917e954236
-_md5_=ae2296071103e9b843a61e0ed905fa51
+_md5_=ba000bdac341e44bb35e6fe1e6884641
diff --git a/metadata/md5-cache/app-text/docbook-xml-dtd-4.3-r2 b/metadata/md5-cache/app-text/docbook-xml-dtd-4.3-r2
index 6007fc9d9193..79c20a3e96a0 100644
--- a/metadata/md5-cache/app-text/docbook-xml-dtd-4.3-r2
+++ b/metadata/md5-cache/app-text/docbook-xml-dtd-4.3-r2
@@ -3,10 +3,11 @@ DEPEND=>=app-arch/unzip-5.41
 DESCRIPTION=Docbook DTD for XML
 EAPI=7
 HOMEPAGE=https://docbook.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 ~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 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=docbook
 RDEPEND=>=app-text/docbook-xsl-stylesheets-1.65 >=app-text/build-docbook-catalog-1.2 >=app-text/sgml-common-0.6.3-r7
 SLOT=4.3
 SRC_URI=https://docbook.org/xml/4.3/docbook-xml-4.3.zip
 _eclasses_=sgml-catalog-r1	5d1d74baed1e6235b9a698917e954236
-_md5_=ae2296071103e9b843a61e0ed905fa51
+_md5_=ba000bdac341e44bb35e6fe1e6884641
diff --git a/metadata/md5-cache/app-text/docbook-xml-dtd-4.4-r3 b/metadata/md5-cache/app-text/docbook-xml-dtd-4.4-r3
index 03c5cec0a5a5..de3520ecf330 100644
--- a/metadata/md5-cache/app-text/docbook-xml-dtd-4.4-r3
+++ b/metadata/md5-cache/app-text/docbook-xml-dtd-4.4-r3
@@ -3,10 +3,10 @@ DEPEND=>=app-arch/unzip-5.41
 DESCRIPTION=Docbook DTD for XML
 EAPI=7
 HOMEPAGE=https://docbook.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 ~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=docbook
 RDEPEND=>=app-text/docbook-xsl-stylesheets-1.65 >=app-text/build-docbook-catalog-1.2 >=app-text/sgml-common-0.6.3-r7
 SLOT=4.4
 SRC_URI=https://docbook.org/xml/4.4/docbook-xml-4.4.zip
 _eclasses_=sgml-catalog-r1	5d1d74baed1e6235b9a698917e954236
-_md5_=a557658d12fd1200a06861c368458666
+_md5_=57c1c8281f55012e526503949386cdce
diff --git a/metadata/md5-cache/app-text/docbook-xml-dtd-4.5-r2 b/metadata/md5-cache/app-text/docbook-xml-dtd-4.5-r2
index 3900aacdda95..cdb8258abfdd 100644
--- a/metadata/md5-cache/app-text/docbook-xml-dtd-4.5-r2
+++ b/metadata/md5-cache/app-text/docbook-xml-dtd-4.5-r2
@@ -3,10 +3,10 @@ DEPEND=>=app-arch/unzip-5.41
 DESCRIPTION=Docbook DTD for XML
 EAPI=7
 HOMEPAGE=https://docbook.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 ~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=docbook
 RDEPEND=>=app-text/docbook-xsl-stylesheets-1.65 >=app-text/build-docbook-catalog-1.2 >=app-text/sgml-common-0.6.3-r7
 SLOT=4.5
 SRC_URI=https://docbook.org/xml/4.5/docbook-xml-4.5.zip
 _eclasses_=sgml-catalog-r1	5d1d74baed1e6235b9a698917e954236
-_md5_=a557658d12fd1200a06861c368458666
+_md5_=57c1c8281f55012e526503949386cdce
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-r2
index 4a3260bb15a4..f1a2a1733c21 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-r2
@@ -3,11 +3,11 @@ DESCRIPTION=XSL Stylesheets for Docbook
 EAPI=6
 HOMEPAGE=https://github.com/docbook/wiki/wiki
 IUSE=ruby
-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=BSD
 RDEPEND=>=app-text/build-docbook-catalog-1.1 ruby? ( || ( dev-lang/ruby:2.6 dev-lang/ruby:2.7 ) virtual/rubygems )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/docbook/docbook-xsl-1.79.1.tar.bz2
 _eclasses_=ruby-single	d832a35ebec5113ec8d275b948432e59	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed
-_md5_=c5339c0a9e02583f3438b46fa4fd8aba
+_md5_=46b26ed8b839a590e22ce5270f0b35fd
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 81ef3b9f2787..a6fd9ce1b7ec 100644
--- a/metadata/md5-cache/app-text/docbook2X-0.8.8-r4
+++ b/metadata/md5-cache/app-text/docbook2X-0.8.8-r4
@@ -11,5 +11,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	9724194ab651ce63fd9bc06e4e1410b4	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=6989c8cd19706f6e2dbfa6d1c3495289
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 ac3b099c1325..25b69dd52488 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
@@ -4,11 +4,12 @@ DEPEND=dev-libs/libxml2 >=dev-libs/libzip-1.7.2:=
 DESCRIPTION=Tools for accessing and converting various ebook file formats
 EAPI=7
 HOMEPAGE=https://sourceforge.net/projects/ebook-tools/
+INHERIT=cmake
 IUSE=+lit2epub
 KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv x86
 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	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_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_=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 a567524067dc..bc7a9f151803 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
@@ -4,11 +4,12 @@ DEPEND=dev-libs/libpcre2:=
 DESCRIPTION=EditorConfig core library written in C
 EAPI=7
 HOMEPAGE=https://github.com/editorconfig/editorconfig-core-c/
+INHERIT=cmake
 IUSE=cli doc
 KEYWORDS=amd64 ~arm arm64 ~ppc64 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.3.tar.gz -> editorconfig-core-c-0.12.3.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_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_=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 dee3b0cac319..ac8e3647aad9 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
@@ -4,11 +4,12 @@ DEPEND=dev-libs/libpcre2:=
 DESCRIPTION=EditorConfig core library written in C
 EAPI=7
 HOMEPAGE=https://github.com/editorconfig/editorconfig-core-c/
+INHERIT=cmake
 IUSE=cli doc
 KEYWORDS=amd64 ~arm arm64 ~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	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_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
diff --git a/metadata/md5-cache/app-text/enchant-1.6.1-r2 b/metadata/md5-cache/app-text/enchant-1.6.1-r2
new file mode 100644
index 000000000000..afb59b966a97
--- /dev/null
+++ b/metadata/md5-cache/app-text/enchant-1.6.1-r2
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=configure install prepare
+DEPEND=>=dev-libs/glib-2.6:2 aspell? ( app-text/aspell ) hunspell? ( >=app-text/hunspell-1.2.1:0= ) test? ( >=dev-libs/unittest++-2.0.0-r2 )
+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
+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
diff --git a/metadata/md5-cache/app-text/enchant-2.3.3-r1 b/metadata/md5-cache/app-text/enchant-2.3.3-r1
new file mode 100644
index 000000000000..32449c5cae20
--- /dev/null
+++ b/metadata/md5-cache/app-text/enchant-2.3.3-r1
@@ -0,0 +1,15 @@
+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= ) nuspell? ( >=app-text/nuspell-5.1.0:0= ) voikko? ( dev-libs/libvoikko ) test? ( >=dev-libs/unittest++-2.0.0-r2 )
+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
+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
diff --git a/metadata/md5-cache/app-text/evince-41.3 b/metadata/md5-cache/app-text/evince-41.3
index 01a99a1c8d6d..fd3977ffbebc 100644
--- a/metadata/md5-cache/app-text/evince-41.3
+++ b/metadata/md5-cache/app-text/evince-41.3
@@ -4,11 +4,12 @@ DEPEND=dev-libs/atk >=dev-libs/glib-2.44.0:2 >=gui-libs/libhandy-1.0:1= >=dev-li
 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	2d8a51910bc57e004c37aa55c7d99ce4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-utils-r1	59dddabd6a41ab69723654916142f63b	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_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.1 b/metadata/md5-cache/app-text/evince-42.1
index f25d34dcae45..4e6c5a810a65 100644
--- a/metadata/md5-cache/app-text/evince-42.1
+++ b/metadata/md5-cache/app-text/evince-42.1
@@ -4,11 +4,12 @@ DEPEND=dev-libs/atk >=dev-libs/glib-2.44.0:2 >=gui-libs/libhandy-1.5.0:1= >=dev-
 DESCRIPTION=Simple document viewer for GNOME
 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
 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	2d8a51910bc57e004c37aa55c7d99ce4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-utils-r1	59dddabd6a41ab69723654916142f63b	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_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
diff --git a/metadata/md5-cache/app-text/evince-42.2 b/metadata/md5-cache/app-text/evince-42.2
new file mode 100644
index 000000000000..b4dc7be14b73
--- /dev/null
+++ b/metadata/md5-cache/app-text/evince-42.2
@@ -0,0 +1,15 @@
+BDEPEND=gtk-doc? ( >=dev-util/gi-docgen-2021.1 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.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:= )
+DESCRIPTION=Simple document viewer for GNOME
+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
+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
diff --git a/metadata/md5-cache/app-text/fblog-1.4.1 b/metadata/md5-cache/app-text/fblog-1.4.1
index e78aa42bfadd..5b72b3f8c544 100644
--- a/metadata/md5-cache/app-text/fblog-1.4.1
+++ b/metadata/md5-cache/app-text/fblog-1.4.1
@@ -3,10 +3,11 @@ DEFINED_PHASES=compile configure install test unpack
 DESCRIPTION=Small command-line JSON Log viewer
 EAPI=7
 HOMEPAGE=https://github.com/brocode/fblog
+INHERIT=cargo
 IUSE=debug
 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	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=cargo	52a92ed3815080c5f2caac1905687b1c	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=e13cc1cc17fea39213f23bea05c98fc4
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 b09f0ef96de1..7ad41a6ba81d 100644
--- a/metadata/md5-cache/app-text/fbreader-0.99.4-r6
+++ b/metadata/md5-cache/app-text/fbreader-0.99.4-r6
@@ -4,11 +4,12 @@ DEPEND=app-arch/bzip2 dev-db/sqlite dev-libs/expat dev-libs/fribidi dev-libs/lib
 DESCRIPTION=E-Book Reader. Supports many e-book formats
 EAPI=7
 HOMEPAGE=https://www.fbreader.org/
+INHERIT=qmake-utils toolchain-funcs xdg
 IUSE=debug
 KEYWORDS=amd64 ~arm ~ppc x86
 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	f5eb2f69fffe94292aaaf802fb21c8d1	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	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 f2b02136bb2f..1320e8b1971e 100644
--- a/metadata/md5-cache/app-text/fictionup-0.2.1
+++ b/metadata/md5-cache/app-text/fictionup-0.2.1
@@ -4,10 +4,11 @@ DEPEND=dev-libs/libyaml
 DESCRIPTION=Command-line markdown to fb2 convertor
 EAPI=7
 HOMEPAGE=http://cdslow.org.ru/fictionup/
+INHERIT=cmake
 KEYWORDS=~amd64 ~x86
 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	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_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_=31123c5211de169bc56ff71bc9bd3619
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 51da8d942905..005bfb7329e9 100644
--- a/metadata/md5-cache/app-text/foliate-2.6.4-r1
+++ b/metadata/md5-cache/app-text/foliate-2.6.4-r1
@@ -3,11 +3,12 @@ DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup t
 DESCRIPTION=gtk ebook reader built with gjs
 EAPI=8
 HOMEPAGE=https://github.com/johnfactotum/foliate/
+INHERIT=meson python-any-r1 plocale xdg gnome2-utils
 IUSE=handy spell
 KEYWORDS=amd64
 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	2d8a51910bc57e004c37aa55c7d99ce4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	plocale	7ce00136a77130df46fbbd5966f98a61	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_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
 _md5_=e4dad348b76bfc1cc1a6a7f4a99dcdcf
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 67b04b8617bc..2fa7dba3e38b 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
@@ -10,5 +10,5 @@ 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	9724194ab651ce63fd9bc06e4e1410b4	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=c54b192cd449420ee8c6b6ae9eb957f6
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_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
new file mode 100644
index 000000000000..9a644621fba2
--- /dev/null
+++ b/metadata/md5-cache/app-text/ghostscript-gpl-9.56.1
@@ -0,0 +1,14 @@
+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=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/
+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:= 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
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 c14a62c58597..55f48a45228e 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
@@ -3,6 +3,7 @@ DEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_t
 DESCRIPTION=A collection of documentation utilities for the Gnome project
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/GnomeDocUtils
+INHERIT=gnome2 multibuild python-r1
 IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2 LGPL-2.1
@@ -10,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	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	59dddabd6a41ab69723654916142f63b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_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
 _md5_=e7520d8ee471cacc2567a1d8bd86b6ae
diff --git a/metadata/md5-cache/app-text/gocr-0.50 b/metadata/md5-cache/app-text/gocr-0.50
deleted file mode 100644
index 52202629acc2..000000000000
--- a/metadata/md5-cache/app-text/gocr-0.50
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=>=media-libs/netpbm-9.12 doc? ( >=media-gfx/transfig-3.2 app-text/ghostscript-gpl ) tk? ( dev-lang/tk )
-DESCRIPTION=An OCR (Optical Character Recognition) reader
-EAPI=7
-HOMEPAGE=http://jocr.sourceforge.net
-IUSE=doc scanner tk
-KEYWORDS=~alpha amd64 ~arm ~arm64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=>=media-libs/netpbm-9.12 doc? ( >=media-gfx/transfig-3.2 app-text/ghostscript-gpl ) tk? ( dev-lang/tk ) tk? ( media-gfx/xli scanner? ( media-gfx/xsane ) )
-SLOT=0
-SRC_URI=http://www-e.uni-magdeburg.de/jschulen/ocr/gocr-0.50.tar.gz
-_md5_=d47150766f9daf0016bdbd26fc6c8eff
diff --git a/metadata/md5-cache/app-text/grip-4.6.0 b/metadata/md5-cache/app-text/grip-4.6.0
index 6c8d15d2484a..365f2ab3da1a 100644
--- a/metadata/md5-cache/app-text/grip-4.6.0
+++ b/metadata/md5-cache/app-text/grip-4.6.0
@@ -4,6 +4,7 @@ DEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_8(-
 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
@@ -11,5 +12,5 @@ RDEPEND=!media-sound/grip >=dev-python/docopt-0.4.0[python_targets_pypy3(-)?,pyt
 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	779bc733c68a72273cfce64602bada1d	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_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 f3ee3fe48479..6aadaa6a76a2 100644
--- a/metadata/md5-cache/app-text/grip-4.6.1
+++ b/metadata/md5-cache/app-text/grip-4.6.1
@@ -4,6 +4,7 @@ DEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_8(-
 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
@@ -11,5 +12,5 @@ RDEPEND=!media-sound/grip >=dev-python/docopt-0.4.0[python_targets_pypy3(-)?,pyt
 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	779bc733c68a72273cfce64602bada1d	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_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
diff --git a/metadata/md5-cache/app-text/groonga-normalizer-mysql-1.1.1 b/metadata/md5-cache/app-text/groonga-normalizer-mysql-1.1.1
deleted file mode 100644
index 6782c7949a7d..000000000000
--- a/metadata/md5-cache/app-text/groonga-normalizer-mysql-1.1.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=app-text/groonga 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=Groonga plugin that provides MySQL compatible normalizers
-EAPI=6
-HOMEPAGE=https://groonga.org/
-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	9724194ab651ce63fd9bc06e4e1410b4	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=3fc21c4a723744ff011cd39aea08f972
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
new file mode 100644
index 000000000000..27e5f44a694e
--- /dev/null
+++ b/metadata/md5-cache/app-text/groonga-normalizer-mysql-1.1.1-r1
@@ -0,0 +1,13 @@
+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=app-text/groonga
+DESCRIPTION=Groonga plugin that provides MySQL compatible normalizers
+EAPI=8
+HOMEPAGE=https://groonga.org/
+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
+_md5_=3884c977da4eefcbeee82c240d37ac2e
diff --git a/metadata/md5-cache/app-text/grutatxt-2.200.0 b/metadata/md5-cache/app-text/grutatxt-2.200.0
index a7ec92ff1c1d..7968ae4ad26d 100644
--- a/metadata/md5-cache/app-text/grutatxt-2.200.0
+++ b/metadata/md5-cache/app-text/grutatxt-2.200.0
@@ -4,6 +4,7 @@ DEPEND=dev-lang/perl
 DESCRIPTION=A converter from plain text to HTML and other markup languages
 EAPI=8
 HOMEPAGE=https://triptico.com/software/grutatxt.html
+INHERIT=perl-module
 IUSE=test
 KEYWORDS=~alpha amd64 ~ia64 ppc ppc64 sparc x86 ~x86-linux ~ppc-macos ~sparc-solaris
 LICENSE=public-domain
@@ -11,5 +12,5 @@ RDEPEND=dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://triptico.com/download/grutatxt.tar.gz -> grutatxt-2.200.0.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	8eed4e2982026c684ff7c19cd4c88ed0	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
+_eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	8eed4e2982026c684ff7c19cd4c88ed0	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
 _md5_=7895278982a555cab279c45de95932ab
diff --git a/metadata/md5-cache/app-text/gspell-1.10.0 b/metadata/md5-cache/app-text/gspell-1.10.0
new file mode 100644
index 000000000000..291644d2ac02
--- /dev/null
+++ b/metadata/md5-cache/app-text/gspell-1.10.0
@@ -0,0 +1,16 @@
+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://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.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
diff --git a/metadata/md5-cache/app-text/gtkspell-3.0.10 b/metadata/md5-cache/app-text/gtkspell-3.0.10
index 62a39e74f331..d9159d2a72d8 100644
--- a/metadata/md5-cache/app-text/gtkspell-3.0.10
+++ b/metadata/md5-cache/app-text/gtkspell-3.0.10
@@ -3,6 +3,7 @@ DEPEND=app-text/enchant:2 app-text/iso-codes dev-libs/glib:2 x11-libs/gtk+:3[int
 DESCRIPTION=Spell checking widget for GTK
 EAPI=6
 HOMEPAGE=http://gtkspell.sourceforge.net/
+INHERIT=gnome2 vala
 IUSE=+introspection vala
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=GPL-2+
@@ -10,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	4f3f2db5ce3ccbeeacdf3f94954043aa	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	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
 _md5_=cb4dcbb978d9152bdbf53d48cef90ea3
diff --git a/metadata/md5-cache/app-text/gtranslator-40.0 b/metadata/md5-cache/app-text/gtranslator-40.0
index 608ce9b79ae5..f8354aa0e7bf 100644
--- a/metadata/md5-cache/app-text/gtranslator-40.0
+++ b/metadata/md5-cache/app-text/gtranslator-40.0
@@ -4,11 +4,12 @@ DEPEND=>=dev-libs/glib-2.36.0:2 >=x11-libs/gtk+-3.22.20:3 gui-libs/libhandy:1= >
 DESCRIPTION=GNOME Translation Editor
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Apps/Gtranslator
+INHERIT=gnome.org gnome2-utils meson xdg
 IUSE=gtk-doc
 KEYWORDS=amd64 ~ppc x86
 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	2d8a51910bc57e004c37aa55c7d99ce4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_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
 _md5_=90cb094fcc1a81cc90518ea9bb952212
diff --git a/metadata/md5-cache/app-text/highlight-3.57-r100 b/metadata/md5-cache/app-text/highlight-3.57-r100
deleted file mode 100644
index 4014913dc4f1..000000000000
--- a/metadata/md5-cache/app-text/highlight-3.57-r100
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig qt5? ( dev-qt/linguist-tools:5 )
-DEFINED_PHASES=compile configure install prepare setup
-DEPEND=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 ) dev-libs/boost
-DESCRIPTION=Converts source code to formatted text (HTML, LaTeX, etc.) with syntax highlight
-EAPI=7
-HOMEPAGE=http://www.andre-simon.de/
-IUSE=examples qt5 lua_single_target_lua5-1 lua_single_target_lua5-3
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~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-3.57.tar.bz2
-_eclasses_=lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=0087eb55745e071fa96e0b26791adf49
diff --git a/metadata/md5-cache/app-text/highlight-3.60 b/metadata/md5-cache/app-text/highlight-3.60
deleted file mode 100644
index dd3a554e4604..000000000000
--- a/metadata/md5-cache/app-text/highlight-3.60
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig qt5? ( dev-qt/linguist-tools:5 )
-DEFINED_PHASES=compile configure install prepare setup
-DEPEND=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 ) dev-libs/boost
-DESCRIPTION=Converts source code to formatted text (HTML, LaTeX, etc.) with syntax highlight
-EAPI=7
-HOMEPAGE=http://www.andre-simon.de/
-IUSE=examples qt5 lua_single_target_lua5-1 lua_single_target_lua5-3
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~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-3.60.tar.bz2
-_eclasses_=lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=0087eb55745e071fa96e0b26791adf49
diff --git a/metadata/md5-cache/app-text/highlight-4.1 b/metadata/md5-cache/app-text/highlight-4.1
index d3192a021215..998dc4a40fca 100644
--- a/metadata/md5-cache/app-text/highlight-4.1
+++ b/metadata/md5-cache/app-text/highlight-4.1
@@ -4,6 +4,7 @@ DEPEND=lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3?
 DESCRIPTION=Converts source code to formatted text (HTML, LaTeX, etc.) with syntax highlight
 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
 LICENSE=GPL-3
@@ -11,5 +12,5 @@ RDEPEND=lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3?
 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	f5eb2f69fffe94292aaaf802fb21c8d1	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=67c024dec5b03b4fb67f12969067f891
diff --git a/metadata/md5-cache/app-text/htag-0.0.24-r1 b/metadata/md5-cache/app-text/htag-0.0.24-r1
index 50c0c1889db3..1977f7e4e1a7 100644
--- a/metadata/md5-cache/app-text/htag-0.0.24-r1
+++ b/metadata/md5-cache/app-text/htag-0.0.24-r1
@@ -4,6 +4,7 @@ DEPEND=dev-lang/perl
 DESCRIPTION=random signature maker
 EAPI=8
 HOMEPAGE=http://www.earth.li/projectpurple/progs/htag.html
+INHERIT=perl-module
 IUSE=test
 KEYWORDS=amd64 ~mips ppc ~sparc x86
 LICENSE=GPL-2
@@ -11,5 +12,5 @@ RDEPEND=dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://www.earth.li/projectpurple/files/htag-0.0.24.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	8eed4e2982026c684ff7c19cd4c88ed0	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
+_eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	8eed4e2982026c684ff7c19cd4c88ed0	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
 _md5_=c1994b363a6ad0fbffd4e7cca344f8bf
diff --git a/metadata/md5-cache/app-text/html2text-2.0.1 b/metadata/md5-cache/app-text/html2text-2.0.1
new file mode 100644
index 000000000000..93ae3aebaf4b
--- /dev/null
+++ b/metadata/md5-cache/app-text/html2text-2.0.1
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile configure install
+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.1.tar.gz -> html2text-2.0.1.tar.gz
+_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_md5_=f1390db91d1a4dfeca576c64087341a8
diff --git a/metadata/md5-cache/app-text/html2text-9999 b/metadata/md5-cache/app-text/html2text-9999
index da263cf9fedc..078f75753033 100644
--- a/metadata/md5-cache/app-text/html2text-9999
+++ b/metadata/md5-cache/app-text/html2text-9999
@@ -1,5 +1,5 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl]
-DEFINED_PHASES=compile install prepare unpack
+DEFINED_PHASES=compile configure install unpack
 DESCRIPTION=HTML to text converter
 EAPI=7
 HOMEPAGE=https://github.com/grobian/html2text
@@ -7,4 +7,4 @@ LICENSE=GPL-2
 PROPERTIES=live
 SLOT=0
 _eclasses_=git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=2ecea20d5f777ce571b44233a2274ef2
+_md5_=f1390db91d1a4dfeca576c64087341a8
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 3a8dc814aec8..e03c637564c6 100644
--- a/metadata/md5-cache/app-text/htmldoc-1.9.11-r1
+++ b/metadata/md5-cache/app-text/htmldoc-1.9.11-r1
@@ -10,5 +10,5 @@ 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	9724194ab651ce63fd9bc06e4e1410b4	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=79224eee72d418ea9601080338c503df
diff --git a/metadata/md5-cache/app-text/htmlmin-0.1.12 b/metadata/md5-cache/app-text/htmlmin-0.1.12
index a00de652fbfc..024077ba97d5 100644
--- a/metadata/md5-cache/app-text/htmlmin-0.1.12
+++ b/metadata/md5-cache/app-text/htmlmin-0.1.12
@@ -3,6 +3,7 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=A configurable HTML Minifier with safety features
 EAPI=7
 HOMEPAGE=https://github.com/mankyd/htmlmin
+INHERIT=distutils-r1
 IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 ~riscv x86
 LICENSE=BSD
@@ -10,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	779bc733c68a72273cfce64602bada1d	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=160d6718c316280eecd37a9cb376c4cf
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 44aa42ecfe1f..eec3a16f2a47 100644
--- a/metadata/md5-cache/app-text/htmltidy-5.8.0-r1
+++ b/metadata/md5-cache/app-text/htmltidy-5.8.0-r1
@@ -3,11 +3,12 @@ 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
 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	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	ruby-ng	840098b934fa20199984384b02780370	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_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
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 fe5df4ddcd94..d322f79f1311 100644
--- a/metadata/md5-cache/app-text/hunspell-1.7.0-r2
+++ b/metadata/md5-cache/app-text/hunspell-1.7.0-r2
@@ -11,5 +11,5 @@ PDEPEND=l10n_af? ( app-dicts/myspell-af ) l10n_bg? ( app-dicts/myspell-bg ) l10n
 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	9724194ab651ce63fd9bc06e4e1410b4	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_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
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 3d3901c885c5..4c5e0cc938ed 100644
--- a/metadata/md5-cache/app-text/hyperestraier-1.4.13-r1
+++ b/metadata/md5-cache/app-text/hyperestraier-1.4.13-r1
@@ -4,11 +4,12 @@ DEPEND=dev-db/qdbm bzip2? ( app-arch/bzip2 ) java? ( >=virtual/jre-1.8:* ) lzo?
 DESCRIPTION=a full-text search system for communities
 EAPI=7
 HOMEPAGE=https://fallabs.com/hyperestraier/
+INHERIT=autotools java-pkg-opt-2 perl-functions ruby-ng
 IUSE=bzip2 debug java lzo mecab perl ruby static-libs +zlib java ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30
 KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 sparc x86
 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	9724194ab651ce63fd9bc06e4e1410b4	estack	055c42df72f76a4f45ec92b35e83cd56	gnuconfig	262062cef0ba4f22b397193da514a350	java-pkg-opt-2	a71433e535af8faae0c0f6c861a32054	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	ruby-ng	840098b934fa20199984384b02780370	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_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
 _md5_=674e71f5d31b366857fe94fe62681378
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 551c5757118d..7c1b212c6955 100644
--- a/metadata/md5-cache/app-text/iso-codes-4.9.0
+++ b/metadata/md5-cache/app-text/iso-codes-4.9.0
@@ -3,10 +3,11 @@ 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 ~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	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=2de0ce1ae36cf594e504cedcf27cb49a
diff --git a/metadata/md5-cache/app-text/jabref-2.10-r7 b/metadata/md5-cache/app-text/jabref-2.10-r7
index 7e69e8b577fd..8fc6bcdf19b2 100644
--- a/metadata/md5-cache/app-text/jabref-2.10-r7
+++ b/metadata/md5-cache/app-text/jabref-2.10-r7
@@ -5,6 +5,7 @@ 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
@@ -12,5 +13,5 @@ RDEPEND=virtual/jre:1.8 dev-java/antlr:0 dev-java/antlr:3 dev-java/commons-loggi
 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	92b5a4d196abffe2dbe3bdc1cf4ef2ae	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_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 bc410b7e7c02..36f88e287a37 100644
--- a/metadata/md5-cache/app-text/jabref-bin-3.7
+++ b/metadata/md5-cache/app-text/jabref-bin-3.7
@@ -3,10 +3,11 @@ DEPEND=app-arch/unzip >=dev-java/java-config-2.2.0-r3
 DESCRIPTION=Java GUI for managing BibTeX and other bibliographies
 EAPI=6
 HOMEPAGE=http://www.jabref.org/
+INHERIT=eutils java-pkg-2
 KEYWORDS=amd64 x86
 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	92b5a4d196abffe2dbe3bdc1cf4ef2ae	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_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
 _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 06dcee81163c..02751d21d5b3 100644
--- a/metadata/md5-cache/app-text/jabref-bin-3.8
+++ b/metadata/md5-cache/app-text/jabref-bin-3.8
@@ -3,10 +3,11 @@ DEPEND=app-arch/unzip >=dev-java/java-config-2.2.0-r3
 DESCRIPTION=Java GUI for managing BibTeX and other bibliographies
 EAPI=6
 HOMEPAGE=http://www.jabref.org/
+INHERIT=eutils java-pkg-2
 KEYWORDS=~amd64 ~x86
 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	92b5a4d196abffe2dbe3bdc1cf4ef2ae	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_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
 _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 73692884ca20..8bf8617179e4 100644
--- a/metadata/md5-cache/app-text/jabref-bin-3.8.1
+++ b/metadata/md5-cache/app-text/jabref-bin-3.8.1
@@ -3,10 +3,11 @@ DEPEND=app-arch/unzip >=dev-java/java-config-2.2.0-r3
 DESCRIPTION=Java GUI for managing BibTeX and other bibliographies
 EAPI=6
 HOMEPAGE=http://www.jabref.org/
+INHERIT=eutils java-pkg-2
 KEYWORDS=~amd64 ~x86
 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	92b5a4d196abffe2dbe3bdc1cf4ef2ae	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_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
 _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 43ecd4b6d6ee..5974ae0f9541 100644
--- a/metadata/md5-cache/app-text/jabref-bin-3.8.2
+++ b/metadata/md5-cache/app-text/jabref-bin-3.8.2
@@ -3,10 +3,11 @@ DEPEND=app-arch/unzip >=dev-java/java-config-2.2.0-r3
 DESCRIPTION=Java GUI for managing BibTeX and other bibliographies
 EAPI=6
 HOMEPAGE=http://www.jabref.org/
+INHERIT=eutils java-pkg-2
 KEYWORDS=amd64 x86
 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	92b5a4d196abffe2dbe3bdc1cf4ef2ae	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_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
 _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 4d884f5fc6a9..011ace06cbb0 100644
--- a/metadata/md5-cache/app-text/jabref-bin-4.0
+++ b/metadata/md5-cache/app-text/jabref-bin-4.0
@@ -3,10 +3,11 @@ DEPEND=app-arch/unzip >=dev-java/java-config-2.2.0-r3
 DESCRIPTION=Java GUI for managing BibTeX and other bibliographies
 EAPI=6
 HOMEPAGE=http://www.jabref.org/
+INHERIT=eutils java-pkg-2
 KEYWORDS=~amd64 ~x86
 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	92b5a4d196abffe2dbe3bdc1cf4ef2ae	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_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
 _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 a728865fcc16..580d898b8c75 100644
--- a/metadata/md5-cache/app-text/jabref-bin-4.1
+++ b/metadata/md5-cache/app-text/jabref-bin-4.1
@@ -3,10 +3,11 @@ DEPEND=app-arch/unzip >=dev-java/java-config-2.2.0-r3
 DESCRIPTION=Java GUI for managing BibTeX and other bibliographies
 EAPI=6
 HOMEPAGE=http://www.jabref.org/
+INHERIT=eutils java-pkg-2
 KEYWORDS=~amd64 ~x86
 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	92b5a4d196abffe2dbe3bdc1cf4ef2ae	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_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
 _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 02e0b102117c..8951a6b2c380 100644
--- a/metadata/md5-cache/app-text/jabref-bin-4.3.1
+++ b/metadata/md5-cache/app-text/jabref-bin-4.3.1
@@ -3,10 +3,11 @@ DEPEND=app-arch/unzip >=dev-java/java-config-2.2.0-r3
 DESCRIPTION=Java GUI for managing BibTeX and other bibliographies
 EAPI=6
 HOMEPAGE=http://www.jabref.org/
+INHERIT=eutils java-pkg-2
 KEYWORDS=~amd64 ~x86
 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	92b5a4d196abffe2dbe3bdc1cf4ef2ae	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_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
 _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 6478ecd0c06f..c8b226de3c6c 100644
--- a/metadata/md5-cache/app-text/jabref-bin-4.9999
+++ b/metadata/md5-cache/app-text/jabref-bin-4.9999
@@ -3,9 +3,10 @@ DEPEND=app-arch/unzip >=dev-java/java-config-2.2.0-r3
 DESCRIPTION=Java GUI manages bibliographies in a BibTeX database
 EAPI=6
 HOMEPAGE=http://www.jabref.org/
+INHERIT=eutils java-pkg-2
 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	92b5a4d196abffe2dbe3bdc1cf4ef2ae	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_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
 _md5_=0100f580fbfed76f32ae5d3d58c65555
diff --git a/metadata/md5-cache/app-text/jo-99999 b/metadata/md5-cache/app-text/jo-99999
index 0d0dd36f6c53..1959e26faf71 100644
--- a/metadata/md5-cache/app-text/jo-99999
+++ b/metadata/md5-cache/app-text/jo-99999
@@ -6,5 +6,5 @@ HOMEPAGE=https://github.com/jpmens/jo
 LICENSE=MIT
 PROPERTIES=live
 SLOT=0
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=30dea3e40b9cf898e75b6239da1cd168
diff --git a/metadata/md5-cache/app-text/katarakt-0.2 b/metadata/md5-cache/app-text/katarakt-0.2
index a4b69f726fd1..d529f1e4cda0 100644
--- a/metadata/md5-cache/app-text/katarakt-0.2
+++ b/metadata/md5-cache/app-text/katarakt-0.2
@@ -4,10 +4,11 @@ DEPEND=app-text/poppler:=[qt5] dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 de
 DESCRIPTION=A simple PDF viewer designed to use as much available screen space as possible
 EAPI=8
 HOMEPAGE=https://gitlab.cs.fau.de/Qui_Sum/katarakt
+INHERIT=qmake-utils
 KEYWORDS=~amd64 ~x86
 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	f5eb2f69fffe94292aaaf802fb21c8d1	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _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 6721a0e3d570..0267c8451f08 100644
--- a/metadata/md5-cache/app-text/kbibtex-0.9.2
+++ b/metadata/md5-cache/app-text/kbibtex-0.9.2
@@ -4,6 +4,7 @@ DEPEND=app-text/poppler[qt5] dev-libs/icu:= >=dev-qt/qtconcurrent-5.12.3:5 >=dev
 DESCRIPTION=BibTeX editor to edit bibliographies used with LaTeX
 EAPI=7
 HOMEPAGE=https://apps.kde.org/kbibtex/ https://userbase.kde.org/KBibTeX
+INHERIT=ecm kde.org
 IUSE=webengine zotero debug +handbook test
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
@@ -11,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	3c38df051095289667b6f09ebd0cc149	ecm	542fb4c59adc3702f566140a9bdf49f8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	4f2cef3496909640f9114c853d2077b4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_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
 _md5_=afd6c1850b0f28945cbdafb1a2a5555e
diff --git a/metadata/md5-cache/app-text/kchmviewer-8.0 b/metadata/md5-cache/app-text/kchmviewer-8.0
index f177ee22f316..8d34e199ccb8 100644
--- a/metadata/md5-cache/app-text/kchmviewer-8.0
+++ b/metadata/md5-cache/app-text/kchmviewer-8.0
@@ -3,10 +3,11 @@ DEPEND=dev-libs/chmlib dev-libs/libzip:= dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/
 DESCRIPTION=Feature rich chm file viewer, based on Qt
 EAPI=7
 HOMEPAGE=https://www.ulduzsoft.com/kchmviewer/
+INHERIT=desktop qmake-utils xdg
 KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
 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	f5eb2f69fffe94292aaaf802fb21c8d1	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	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 98eaaf172d06..203f21784848 100644
--- a/metadata/md5-cache/app-text/kjots-5.1.0-r2
+++ b/metadata/md5-cache/app-text/kjots-5.1.0-r2
@@ -4,11 +4,12 @@ DEPEND=dev-libs/grantlee:5 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=de
 DESCRIPTION=Note taking utility by KDE
 EAPI=8
 HOMEPAGE=https://userbase.kde.org/KJots https://community.kde.org/PIM/KJots
+INHERIT=ecm kde.org
 IUSE=speech debug
 KEYWORDS=~amd64 ~x86
 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	3c38df051095289667b6f09ebd0cc149	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	4f2cef3496909640f9114c853d2077b4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=202554323e4d0e88a1b009e2307fbbe5
+_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
+_md5_=5323d089314c24784ffa9b9361a5ce24
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 75607dc32d05..18942e375d52 100644
--- a/metadata/md5-cache/app-text/kramdown-rfc-1.6.5
+++ b/metadata/md5-cache/app-text/kramdown-rfc-1.6.5
@@ -12,5 +12,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	08015e64ff76dc2e2b177418bc2acb08	ruby-ng	840098b934fa20199984384b02780370	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	ruby-fakegem	242ae0c7650b40198870ae311dc6bea0	ruby-ng	e4c8836049bf65af19ab322fe5a81005	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _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 0b0af49325c2..b0b6778843fd 100644
--- a/metadata/md5-cache/app-text/krop-0.6.0-r1
+++ b/metadata/md5-cache/app-text/krop-0.6.0-r1
@@ -3,6 +3,7 @@ DEFINED_PHASES=compile configure install postinst postrm prepare test
 DESCRIPTION=A tool to crop PDF files
 EAPI=7
 HOMEPAGE=http://arminstraub.com/software/krop
+INHERIT=desktop distutils-r1 xdg-utils
 IUSE=python_targets_python3_8 python_targets_python3_9
 KEYWORDS=amd64 ~x86
 LICENSE=GPL-3
@@ -10,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	779bc733c68a72273cfce64602bada1d	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_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
 _md5_=72ef59a64abbdc3f1a9e404e1b403a04
diff --git a/metadata/md5-cache/app-text/krop-9999 b/metadata/md5-cache/app-text/krop-9999
index 410f74dac7ae..930b1ff2fd94 100644
--- a/metadata/md5-cache/app-text/krop-9999
+++ b/metadata/md5-cache/app-text/krop-9999
@@ -3,11 +3,12 @@ DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
 DESCRIPTION=A tool to crop PDF files
 EAPI=7
 HOMEPAGE=http://arminstraub.com/software/krop
+INHERIT=desktop distutils-r1 xdg-utils git-r3
 IUSE=python_targets_python3_8 python_targets_python3_9
 LICENSE=GPL-3
 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	779bc733c68a72273cfce64602bada1d	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_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
 _md5_=d0d8824c802680073f7efabbc19eecdd
diff --git a/metadata/md5-cache/app-text/languagetool-5.4 b/metadata/md5-cache/app-text/languagetool-5.4
index b2a1a0977cd7..430af654f86e 100644
--- a/metadata/md5-cache/app-text/languagetool-5.4
+++ b/metadata/md5-cache/app-text/languagetool-5.4
@@ -4,10 +4,11 @@ DEPEND=>=dev-java/java-config-2.2.0-r3
 DESCRIPTION=A proof-reading tool for many languages
 EAPI=7
 HOMEPAGE=https://www.languagetool.org/
+INHERIT=java-pkg-2 desktop xdg-utils
 KEYWORDS=~amd64 ~x86
 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	92b5a4d196abffe2dbe3bdc1cf4ef2ae	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	e38ea02d8ed864a74078ecf46aa06f30	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=7a0a5e045ba2b218e36316fdff669fc0
diff --git a/metadata/md5-cache/app-text/lesspipe-2.03 b/metadata/md5-cache/app-text/lesspipe-2.05
index 94d2cb01beeb..a4570175ea7c 100644
--- a/metadata/md5-cache/app-text/lesspipe-2.03
+++ b/metadata/md5-cache/app-text/lesspipe-2.05
@@ -7,5 +7,6 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s
 LICENSE=GPL-2
 RESTRICT=test
 SLOT=0
-SRC_URI=https://github.com/wofr06/lesspipe/archive/v2.03.tar.gz -> lesspipe-2.03.tar.gz
-_md5_=da4ce67ae210a60260e7ddf73f6a8a42
+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
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 3d588a38e21a..deb78b3159c6 100644
--- a/metadata/md5-cache/app-text/libebook-0.1.3-r2
+++ b/metadata/md5-cache/app-text/libebook-0.1.3-r2
@@ -11,5 +11,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	9724194ab651ce63fd9bc06e4e1410b4	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_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_=4faf0fa5f277252be0f53e10181b3aa4
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 4638bbba07ff..1d950f4bc884 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 ~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_=b5967a49107c3fd42ab4755da198e27c
+_md5_=d500423a4bb1683b4676f7ad7679b437
diff --git a/metadata/md5-cache/app-text/libetonyek-9999 b/metadata/md5-cache/app-text/libetonyek-9999
index 019da5796b07..33bedd4a2dbb 100644
--- a/metadata/md5-cache/app-text/libetonyek-9999
+++ b/metadata/md5-cache/app-text/libetonyek-9999
@@ -10,5 +10,5 @@ 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	9724194ab651ce63fd9bc06e4e1410b4	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=2f239c490783da663ae2120bf0fa05a3
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_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 08b5d29e2e2a..fe9e87bd71c8 100644
--- a/metadata/md5-cache/app-text/libgepub-0.6.0
+++ b/metadata/md5-cache/app-text/libgepub-0.6.0
@@ -4,11 +4,12 @@ DEPEND=app-arch/libarchive dev-libs/glib:2 dev-libs/libxml2 net-libs/libsoup:2.4
 DESCRIPTION=GObject based library for handling and rendering epub documents
 EAPI=8
 HOMEPAGE=https://gitlab.gnome.org/GNOME/libgepub
+INHERIT=gnome.org meson xdg
 IUSE=+introspection
 KEYWORDS=amd64 arm arm64 ppc ppc64 ~riscv ~sparc x86
 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	2d8a51910bc57e004c37aa55c7d99ce4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_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
 _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 2ec31d9afa0a..481889d39c3f 100644
--- a/metadata/md5-cache/app-text/libgxps-0.3.2
+++ b/metadata/md5-cache/app-text/libgxps-0.3.2
@@ -4,6 +4,7 @@ DEPEND=>=app-arch/libarchive-2.8 >=dev-libs/glib-2.36:2 media-libs/freetype:2 me
 DESCRIPTION=Library for handling and rendering XPS documents
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Projects/libgxps
+INHERIT=gnome.org meson xdg-utils
 IUSE=gtk-doc +introspection jpeg lcms tiff
 KEYWORDS=~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~riscv sparc x86
 LICENSE=LGPL-2.1
@@ -11,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	2d8a51910bc57e004c37aa55c7d99ce4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_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
 _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 24b10a5336dc..21f15d7e74fa 100644
--- a/metadata/md5-cache/app-text/libmspub-0.1.4
+++ b/metadata/md5-cache/app-text/libmspub-0.1.4
@@ -10,5 +10,5 @@ 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	9724194ab651ce63fd9bc06e4e1410b4	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_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_=a2557929cfc62410a914390cea677d7c
diff --git a/metadata/md5-cache/app-text/libmspub-9999 b/metadata/md5-cache/app-text/libmspub-9999
index a27d60624a6c..114fbbd1ebbd 100644
--- a/metadata/md5-cache/app-text/libmspub-9999
+++ b/metadata/md5-cache/app-text/libmspub-9999
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 PROPERTIES=live
 RDEPEND=dev-libs/icu:= dev-libs/librevenge sys-libs/zlib
 SLOT=0
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_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
 _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 926419641a2a..6832cc6fe845 100644
--- a/metadata/md5-cache/app-text/libmwaw-0.3.21
+++ b/metadata/md5-cache/app-text/libmwaw-0.3.21
@@ -10,5 +10,5 @@ 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	9724194ab651ce63fd9bc06e4e1410b4	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=204faa41f72c59c64e2fe8b2d3fb9fa0
diff --git a/metadata/md5-cache/app-text/libmwaw-9999 b/metadata/md5-cache/app-text/libmwaw-9999
index 3dac1ccb410d..4dc725aa1c1f 100644
--- a/metadata/md5-cache/app-text/libmwaw-9999
+++ b/metadata/md5-cache/app-text/libmwaw-9999
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 PROPERTIES=live
 RDEPEND=dev-libs/librevenge sys-libs/zlib
 SLOT=0
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=26500878995727ba1607296e2ba789d5
diff --git a/metadata/md5-cache/app-text/libodfgen-9999 b/metadata/md5-cache/app-text/libodfgen-9999
index 60ec622e1004..ea193b4d5d54 100644
--- a/metadata/md5-cache/app-text/libodfgen-9999
+++ b/metadata/md5-cache/app-text/libodfgen-9999
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 MPL-2.0 )
 PROPERTIES=live
 RDEPEND=dev-libs/librevenge dev-libs/libxml2:2
 SLOT=0
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _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 4e585eda7ea6..0ca0bf467aff 100644
--- a/metadata/md5-cache/app-text/libpaper-1.1.28
+++ b/metadata/md5-cache/app-text/libpaper-1.1.28
@@ -8,5 +8,5 @@ KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sp
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://debian/pool/main/libp/libpaper/libpaper_1.1.28.tar.gz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=f497f3503167581dfb86a38b31f1f53a
diff --git a/metadata/md5-cache/app-text/libspectre-0.2.10 b/metadata/md5-cache/app-text/libspectre-0.2.10
new file mode 100644
index 000000000000..474e54476d4a
--- /dev/null
+++ b/metadata/md5-cache/app-text/libspectre-0.2.10
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig doc? ( app-doc/doxygen )
+DEFINED_PHASES=compile configure install
+DEPEND=>=app-text/ghostscript-gpl-9.53.0:=
+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
+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
diff --git a/metadata/md5-cache/app-text/libspectre-0.2.9 b/metadata/md5-cache/app-text/libspectre-0.2.9
index 56551a199cd6..dc42c2b398c0 100644
--- a/metadata/md5-cache/app-text/libspectre-0.2.9
+++ b/metadata/md5-cache/app-text/libspectre-0.2.9
@@ -11,5 +11,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	9724194ab651ce63fd9bc06e4e1410b4	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=a3e4b2702e43e312f959ea7135010328
diff --git a/metadata/md5-cache/app-text/libstaroffice-9999 b/metadata/md5-cache/app-text/libstaroffice-9999
index fba734c3e207..cd9260a34a50 100644
--- a/metadata/md5-cache/app-text/libstaroffice-9999
+++ b/metadata/md5-cache/app-text/libstaroffice-9999
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1+ MPL-2.0 )
 PROPERTIES=live
 RDEPEND=dev-libs/librevenge zlib? ( sys-libs/zlib )
 SLOT=0
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _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 8ae4a69ca68a..6276208cbc5f 100644
--- a/metadata/md5-cache/app-text/libxmlpatch-0.3.3
+++ b/metadata/md5-cache/app-text/libxmlpatch-0.3.3
@@ -11,5 +11,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	9724194ab651ce63fd9bc06e4e1410b4	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _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 a66f503937c5..6b70587feea2 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
@@ -10,5 +10,5 @@ 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	9724194ab651ce63fd9bc06e4e1410b4	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	latex-package	c20e442c3953c765f636630631c96194	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	sgml-catalog-r1	5d1d74baed1e6235b9a698917e954236	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_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
 _md5_=66c0c6261850b64fa14be1a728a2ad31
diff --git a/metadata/md5-cache/app-text/lv-4.51-r4 b/metadata/md5-cache/app-text/lv-4.51-r4
index c9b15c8acb7e..65869b4b64f7 100644
--- a/metadata/md5-cache/app-text/lv-4.51-r4
+++ b/metadata/md5-cache/app-text/lv-4.51-r4
@@ -3,10 +3,11 @@ DEPEND=!app-editors/levee sys-libs/ncurses:0= dev-lang/perl sys-devel/gnuconfig
 DESCRIPTION=Powerful Multilingual File Viewer
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
+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	9724194ab651ce63fd9bc06e4e1410b4	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_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_=79a970379df6fbf7b5a0fa2ab9805510
diff --git a/metadata/md5-cache/app-text/lv-4.51-r5 b/metadata/md5-cache/app-text/lv-4.51-r5
index 5e52d3ae6c71..bae807c6fbef 100644
--- a/metadata/md5-cache/app-text/lv-4.51-r5
+++ b/metadata/md5-cache/app-text/lv-4.51-r5
@@ -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	9724194ab651ce63fd9bc06e4e1410b4	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=1753ef57c88f49f430c3c6d43ab44800
diff --git a/metadata/md5-cache/app-text/mandoc-1.14.5-r1 b/metadata/md5-cache/app-text/mandoc-1.14.5-r1
deleted file mode 100644
index 53e6d0ef61ea..000000000000
--- a/metadata/md5-cache/app-text/mandoc-1.14.5-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=cgi? ( app-text/highlight )
-DEFINED_PHASES=compile install postinst prepare pretend
-DEPEND=sys-libs/zlib system-man? ( !sys-apps/man-db ) cgi? ( sys-libs/zlib[static-libs] )
-DESCRIPTION=Suite of tools compiling mdoc and man
-EAPI=7
-HOMEPAGE=https://mdocml.bsd.lv/
-IUSE=cgi system-man
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~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.5.tar.gz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=8abee88b0daef87ac74fe6d67e94a0df
diff --git a/metadata/md5-cache/app-text/manpager-1 b/metadata/md5-cache/app-text/manpager-1
index 6107558c3e37..165b736a3120 100644
--- a/metadata/md5-cache/app-text/manpager-1
+++ b/metadata/md5-cache/app-text/manpager-1
@@ -2,8 +2,8 @@ DEFINED_PHASES=compile install
 DESCRIPTION=Enable colorization of man pages
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
-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=GPL-2
 SLOT=0
 _eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=cb756f8bf392467e9e087824f4247832
+_md5_=8d854dd35cc46a3a0eb8215b8efa5a09
diff --git a/metadata/md5-cache/app-text/master-pdf-editor-5.8.20-r1 b/metadata/md5-cache/app-text/master-pdf-editor-5.8.52
index 7238887a5c50..63f65c3b77d8 100644
--- a/metadata/md5-cache/app-text/master-pdf-editor-5.8.20-r1
+++ b/metadata/md5-cache/app-text/master-pdf-editor-5.8.52
@@ -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.20-qt5.x86_64.tar.gz
+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
 _md5_=0ded33fa595f3a7c8cdbcee15e39ecaa
diff --git a/metadata/md5-cache/app-text/mdbook-0.4.15 b/metadata/md5-cache/app-text/mdbook-0.4.15
index 7de3ca1aeb8b..350ebacc32fd 100644
--- a/metadata/md5-cache/app-text/mdbook-0.4.15
+++ b/metadata/md5-cache/app-text/mdbook-0.4.15
@@ -3,10 +3,11 @@ 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	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=cargo	52a92ed3815080c5f2caac1905687b1c	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=49657a4f3805e818e40f2c56e39ca738
diff --git a/metadata/md5-cache/app-text/mdbook-0.4.17 b/metadata/md5-cache/app-text/mdbook-0.4.17
deleted file mode 100644
index 15957802f9aa..000000000000
--- a/metadata/md5-cache/app-text/mdbook-0.4.17
+++ /dev/null
@@ -1,12 +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/
-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.17.tar.gz -> mdbook-0.4.17.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	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=5e1fdcdb9505038a31df2397b8bdea70
diff --git a/metadata/md5-cache/app-text/mdbook-0.4.18 b/metadata/md5-cache/app-text/mdbook-0.4.18
index e840e306cdb0..32a5579e8727 100644
--- a/metadata/md5-cache/app-text/mdbook-0.4.18
+++ b/metadata/md5-cache/app-text/mdbook-0.4.18
@@ -3,10 +3,11 @@ 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
+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.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	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=5e1fdcdb9505038a31df2397b8bdea70
+_eclasses_=cargo	52a92ed3815080c5f2caac1905687b1c	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_md5_=5eee6d10ea398f41bc9cf329be32ad38
diff --git a/metadata/md5-cache/app-text/mecab-0.996-r1 b/metadata/md5-cache/app-text/mecab-0.996-r1
index e500aa78ece5..b9c1d779de7a 100644
--- a/metadata/md5-cache/app-text/mecab-0.996-r1
+++ b/metadata/md5-cache/app-text/mecab-0.996-r1
@@ -3,11 +3,12 @@ DEPEND=dev-lang/perl virtual/libiconv sys-devel/gnuconfig >=app-portage/elt-patc
 DESCRIPTION=Yet Another Part-of-Speech and Morphological Analyzer
 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
 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	9724194ab651ce63fd9bc06e4e1410b4	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_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
diff --git a/metadata/md5-cache/app-text/msort-8.53-r1 b/metadata/md5-cache/app-text/msort-8.53-r1
index 930677d13c5e..5a9e1489ee5a 100644
--- a/metadata/md5-cache/app-text/msort-8.53-r1
+++ b/metadata/md5-cache/app-text/msort-8.53-r1
@@ -10,5 +10,5 @@ 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	9724194ab651ce63fd9bc06e4e1410b4	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=9fe14d665ac48a69d7d98843aa285b7d
diff --git a/metadata/md5-cache/app-text/mupdf-1.19.1 b/metadata/md5-cache/app-text/mupdf-1.19.1
new file mode 100644
index 000000000000..953af062a7ba
--- /dev/null
+++ b/metadata/md5-cache/app-text/mupdf-1.19.1
@@ -0,0 +1,15 @@
+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
+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.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
diff --git a/metadata/md5-cache/app-text/namazu-2.0.21 b/metadata/md5-cache/app-text/namazu-2.0.21
index 65c382e2daed..2dc335265219 100644
--- a/metadata/md5-cache/app-text/namazu-2.0.21
+++ b/metadata/md5-cache/app-text/namazu-2.0.21
@@ -10,5 +10,5 @@ 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	9724194ab651ce63fd9bc06e4e1410b4	elisp-common	f9c72486dbcb18b633c9d0949211d86e	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	elisp-common	e7aaa047873789f549ea3df2f04b2145	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _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 c453ae8188f8..88b4b38adc98 100644
--- a/metadata/md5-cache/app-text/namazu-2.0.22_pre8
+++ b/metadata/md5-cache/app-text/namazu-2.0.22_pre8
@@ -9,5 +9,5 @@ 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	9724194ab651ce63fd9bc06e4e1410b4	elisp-common	f9c72486dbcb18b633c9d0949211d86e	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	elisp-common	e7aaa047873789f549ea3df2f04b2145	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=c53fab88204cbfadb1354ea1927f7763
diff --git a/metadata/md5-cache/app-text/nfoview-1.27.1 b/metadata/md5-cache/app-text/nfoview-1.27.1
index 5a8c8b17c07a..4c982fd0b531 100644
--- a/metadata/md5-cache/app-text/nfoview-1.27.1
+++ b/metadata/md5-cache/app-text/nfoview-1.27.1
@@ -4,6 +4,7 @@ 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+
@@ -11,5 +12,5 @@ RDEPEND=dev-python/pygobject:3[python_targets_python3_8(-)?] media-fonts/terminu
 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	779bc733c68a72273cfce64602bada1d	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_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
index 8b35253c4ca5..6e3674363816 100644
--- a/metadata/md5-cache/app-text/nfoview-1.28-r1
+++ b/metadata/md5-cache/app-text/nfoview-1.28-r1
@@ -4,6 +4,7 @@ DEPEND=dev-python/pygobject:3[python_targets_python3_8(-)?,python_targets_python
 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+
@@ -12,5 +13,5 @@ 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	779bc733c68a72273cfce64602bada1d	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_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-9999 b/metadata/md5-cache/app-text/nfoview-9999
index 9a81687eaca4..55ccf190334e 100644
--- a/metadata/md5-cache/app-text/nfoview-9999
+++ b/metadata/md5-cache/app-text/nfoview-9999
@@ -4,11 +4,12 @@ DEPEND=dev-python/pygobject:3[python_targets_python3_8(-)?,python_targets_python
 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	779bc733c68a72273cfce64602bada1d	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_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
index f59c7228eca6..53c81bb9bee4 100644
--- a/metadata/md5-cache/app-text/nuspell-3.1.2-r1
+++ b/metadata/md5-cache/app-text/nuspell-3.1.2-r1
@@ -4,6 +4,7 @@ DEPEND=dev-libs/icu test? ( >=dev-cpp/catch-2.3.0:0 ) >=dev-libs/boost-1.62[icu,
 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+
@@ -11,5 +12,5 @@ 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	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_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
index 630137422083..1d08ebd336ce 100644
--- a/metadata/md5-cache/app-text/nuspell-4.0.0-r1
+++ b/metadata/md5-cache/app-text/nuspell-4.0.0-r1
@@ -4,6 +4,7 @@ DEPEND=dev-libs/icu test? ( >=dev-cpp/catch-2.3.0:0 ) >=dev-libs/boost-1.62[icu,
 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+
@@ -11,5 +12,5 @@ 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	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_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
index 23d96be17fc1..526ff7506606 100644
--- a/metadata/md5-cache/app-text/nuspell-4.0.1
+++ b/metadata/md5-cache/app-text/nuspell-4.0.1
@@ -4,6 +4,7 @@ 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+
@@ -11,5 +12,5 @@ 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	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_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
index 93bfc44b5c83..14e1c6e6d2d8 100644
--- a/metadata/md5-cache/app-text/nuspell-4.1.0
+++ b/metadata/md5-cache/app-text/nuspell-4.1.0
@@ -4,6 +4,7 @@ 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+
@@ -11,5 +12,5 @@ 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	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_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
index 94052f9a82be..1bd03574d5b0 100644
--- a/metadata/md5-cache/app-text/nuspell-4.2.0
+++ b/metadata/md5-cache/app-text/nuspell-4.2.0
@@ -4,6 +4,7 @@ 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+
@@ -11,5 +12,5 @@ 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	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_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
index 1ebe81f2d9d1..8295bf20b00c 100644
--- a/metadata/md5-cache/app-text/nuspell-5.0.0
+++ b/metadata/md5-cache/app-text/nuspell-5.0.0
@@ -4,6 +4,7 @@ DEPEND=>=dev-libs/icu-59 doc? ( app-text/pandoc ) test? ( >=dev-cpp/catch-2.3.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+
@@ -11,5 +12,5 @@ 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	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_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
index a3220e3eed77..b051d9ace7db 100644
--- a/metadata/md5-cache/app-text/nuspell-5.0.1
+++ b/metadata/md5-cache/app-text/nuspell-5.0.1
@@ -4,6 +4,7 @@ DEPEND=>=dev-libs/icu-60 doc? ( app-text/pandoc ) test? ( >=dev-cpp/catch-2.3.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+
@@ -11,5 +12,5 @@ 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	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_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 f6e6cccdef45..b155610ac752 100644
--- a/metadata/md5-cache/app-text/nuspell-5.1.0
+++ b/metadata/md5-cache/app-text/nuspell-5.1.0
@@ -4,6 +4,7 @@ DEPEND=>=dev-libs/icu-60 doc? ( app-text/pandoc ) test? ( >=dev-cpp/catch-2.3.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+
@@ -11,5 +12,5 @@ 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	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_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
diff --git a/metadata/md5-cache/app-text/ocrad-0.26 b/metadata/md5-cache/app-text/ocrad-0.26
deleted file mode 100644
index 15d6b761a3ed..000000000000
--- a/metadata/md5-cache/app-text/ocrad-0.26
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=configure install unpack
-DEPEND=|| ( app-arch/plzip app-arch/pdlzip app-arch/lzip )
-DESCRIPTION=GNU Ocrad is an OCR (Optical Character Recognition) program
-EAPI=7
-HOMEPAGE=https://www.gnu.org/software/ocrad/ocrad.html
-KEYWORDS=~alpha amd64 ppc ppc64 ~sparc x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=mirror://nongnu/ocrad/ocrad-0.26.tar.lz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	unpacker	697382d119fd3d195f110b7979184285
-_md5_=1c8c3738d05bd63acdb864a28441e795
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 b1d76851a3d7..e9c7ee62fab2 100644
--- a/metadata/md5-cache/app-text/openjade-1.3.2-r9
+++ b/metadata/md5-cache/app-text/openjade-1.3.2-r9
@@ -9,5 +9,5 @@ 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	9724194ab651ce63fd9bc06e4e1410b4	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	sgml-catalog-r1	5d1d74baed1e6235b9a698917e954236	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_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
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 e0dcf73988db..f94d0d73545a 100644
--- a/metadata/md5-cache/app-text/openpaperwork-core-2.1.0
+++ b/metadata/md5-cache/app-text/openpaperwork-core-2.1.0
@@ -4,6 +4,7 @@ DEPEND=dev-python/distro[python_targets_python3_8(-)?,python_targets_python3_9(-
 DESCRIPTION=Core part of Paperwork (plugin management)
 EAPI=8
 HOMEPAGE=https://gitlab.gnome.org/World/OpenPaperwork
+INHERIT=distutils-r1
 IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
@@ -11,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	779bc733c68a72273cfce64602bada1d	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _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 e422f3b1c32e..a8cdb11dd458 100644
--- a/metadata/md5-cache/app-text/openpaperwork-core-2.1.1
+++ b/metadata/md5-cache/app-text/openpaperwork-core-2.1.1
@@ -4,6 +4,7 @@ DEPEND=dev-python/distro[python_targets_python3_8(-)?,python_targets_python3_9(-
 DESCRIPTION=Core part of Paperwork (plugin management)
 EAPI=8
 HOMEPAGE=https://gitlab.gnome.org/World/OpenPaperwork
+INHERIT=distutils-r1
 IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
@@ -11,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	779bc733c68a72273cfce64602bada1d	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _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 e22fb38e1d9e..5b3876226753 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
@@ -4,6 +4,7 @@ DEPEND=dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-
 DESCRIPTION=Paperwork plugins
 EAPI=8
 HOMEPAGE=https://gitlab.gnome.org/World/OpenPaperwork
+INHERIT=distutils-r1
 IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
@@ -11,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	779bc733c68a72273cfce64602bada1d	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _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 fee2393df6c9..8cf2d00a71d3 100644
--- a/metadata/md5-cache/app-text/openpaperwork-gtk-2.1.1
+++ b/metadata/md5-cache/app-text/openpaperwork-gtk-2.1.1
@@ -4,6 +4,7 @@ DEPEND=dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-
 DESCRIPTION=Paperwork plugins
 EAPI=8
 HOMEPAGE=https://gitlab.gnome.org/World/OpenPaperwork
+INHERIT=distutils-r1
 IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
@@ -11,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	779bc733c68a72273cfce64602bada1d	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _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 3914c63089d2..c7f8c062b83c 100644
--- a/metadata/md5-cache/app-text/opensp-1.5.2-r7
+++ b/metadata/md5-cache/app-text/opensp-1.5.2-r7
@@ -5,11 +5,11 @@ DESCRIPTION=A free, object-oriented toolkit for SGML parsing and entity manageme
 EAPI=8
 HOMEPAGE=http://openjade.sourceforge.net/
 IUSE=doc nls static-libs 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 ~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=MIT
 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	9724194ab651ce63fd9bc06e4e1410b4	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=7f7af4a72bdb36803b0d6470046f924a
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_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 59ae5ecf7175..d4757756e0f1 100644
--- a/metadata/md5-cache/app-text/pandoc-2.11.3.1
+++ b/metadata/md5-cache/app-text/pandoc-2.11.3.1
@@ -3,6 +3,7 @@ DEPEND=>=dev-haskell/aeson-0.7:=[profile?] <dev-haskell/aeson-1.6:=[profile?] >=
 DESCRIPTION=Conversion between markup formats
 EAPI=7
 HOMEPAGE=https://pandoc.org
+INHERIT=haskell-cabal
 IUSE=embed-data-files optimize trypandoc doc hscolour profile test
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
@@ -10,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	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	ebeaf198ca6bf70c43b10488b7cdcdcf	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	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 944a7da01ce7..278159e1a4d9 100644
--- a/metadata/md5-cache/app-text/pandoc-2.13
+++ b/metadata/md5-cache/app-text/pandoc-2.13
@@ -3,6 +3,7 @@ DEPEND=>=dev-haskell/aeson-0.7:=[profile?] <dev-haskell/aeson-1.6:=[profile?] >=
 DESCRIPTION=Conversion between markup formats
 EAPI=7
 HOMEPAGE=https://pandoc.org
+INHERIT=haskell-cabal
 IUSE=embed-data-files optimize trypandoc doc hscolour profile test
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
@@ -10,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	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	ebeaf198ca6bf70c43b10488b7cdcdcf	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	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 bba481dc70f8..73fa9683b649 100644
--- a/metadata/md5-cache/app-text/pandoc-2.9.2.1
+++ b/metadata/md5-cache/app-text/pandoc-2.9.2.1
@@ -3,6 +3,7 @@ DEPEND=>=dev-haskell/aeson-0.7:=[profile?] <dev-haskell/aeson-1.5:=[profile?] >=
 DESCRIPTION=Conversion between markup formats
 EAPI=7
 HOMEPAGE=https://pandoc.org
+INHERIT=haskell-cabal
 IUSE=embed-data-files optimize static trypandoc doc hscolour profile test
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
@@ -10,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	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	ebeaf198ca6bf70c43b10488b7cdcdcf	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=bb5336639ac3e4582f53ebc476a3a883
diff --git a/metadata/md5-cache/app-text/paperwork-2.1.0 b/metadata/md5-cache/app-text/paperwork-2.1.0
index 1a74d6351f0a..e5b7dde1e5b5 100644
--- a/metadata/md5-cache/app-text/paperwork-2.1.0
+++ b/metadata/md5-cache/app-text/paperwork-2.1.0
@@ -4,6 +4,7 @@ DEPEND=~app-text/openpaperwork-core-2.1.0[python_targets_python3_8(-)?,python_ta
 DESCRIPTION=a personal document manager for scanned documents (and PDFs)
 EAPI=8
 HOMEPAGE=https://gitlab.gnome.org/World/OpenPaperwork
+INHERIT=distutils-r1 xdg
 IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
@@ -11,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	779bc733c68a72273cfce64602bada1d	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_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
diff --git a/metadata/md5-cache/app-text/paperwork-2.1.1 b/metadata/md5-cache/app-text/paperwork-2.1.1
index b053cb1d0a51..7bf7fa0b3ae7 100644
--- a/metadata/md5-cache/app-text/paperwork-2.1.1
+++ b/metadata/md5-cache/app-text/paperwork-2.1.1
@@ -4,6 +4,7 @@ DEPEND=~app-text/openpaperwork-core-2.1.1[python_targets_python3_8(-)?,python_ta
 DESCRIPTION=a personal document manager for scanned documents (and PDFs)
 EAPI=8
 HOMEPAGE=https://gitlab.gnome.org/World/OpenPaperwork
+INHERIT=distutils-r1 xdg
 IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
@@ -11,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	779bc733c68a72273cfce64602bada1d	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_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
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 09a604fc4c1e..fa43860f45ef 100644
--- a/metadata/md5-cache/app-text/paperwork-backend-2.1.0
+++ b/metadata/md5-cache/app-text/paperwork-backend-2.1.0
@@ -4,6 +4,7 @@ DEPEND=app-text/poppler[introspection] dev-python/distro[python_targets_python3_
 DESCRIPTION=Backend part of Paperwork (Python API, no UI)
 EAPI=8
 HOMEPAGE=https://gitlab.gnome.org/World/OpenPaperwork
+INHERIT=distutils-r1
 IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
@@ -11,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	779bc733c68a72273cfce64602bada1d	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _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 86c13791db5a..ec032108e2d0 100644
--- a/metadata/md5-cache/app-text/paperwork-backend-2.1.1
+++ b/metadata/md5-cache/app-text/paperwork-backend-2.1.1
@@ -4,6 +4,7 @@ DEPEND=app-text/poppler[introspection] dev-python/distro[python_targets_python3_
 DESCRIPTION=Backend part of Paperwork (Python API, no UI)
 EAPI=8
 HOMEPAGE=https://gitlab.gnome.org/World/OpenPaperwork
+INHERIT=distutils-r1
 IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
@@ -11,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	779bc733c68a72273cfce64602bada1d	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _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 15c8c7029724..b6345b42bf52 100644
--- a/metadata/md5-cache/app-text/paps-0.6.8-r2
+++ b/metadata/md5-cache/app-text/paps-0.6.8-r2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=x11-libs/pango
 SLOT=0
 SRC_URI=mirror://sourceforge/paps/paps-0.6.8.tar.gz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=fbd21cc1c8199466e93847a87d6fbb4d
diff --git a/metadata/md5-cache/app-text/pastebinit-1.5.1 b/metadata/md5-cache/app-text/pastebinit-1.5.1
index 1f107bebbe5e..35a17b0eb2ee 100644
--- a/metadata/md5-cache/app-text/pastebinit-1.5.1
+++ b/metadata/md5-cache/app-text/pastebinit-1.5.1
@@ -3,6 +3,7 @@ DEFINED_PHASES=compile install prepare setup
 DESCRIPTION=A software that lets you send anything you want directly to a pastebin
 EAPI=7
 HOMEPAGE=https://launchpad.net/pastebinit
+INHERIT=python-single-r1
 IUSE=crypt python_single_target_python3_8 python_single_target_python3_9
 KEYWORDS=amd64 ~riscv x86
 LICENSE=GPL-2
@@ -10,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	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=98e6022b108ec0dcf761094a80e07e2a
diff --git a/metadata/md5-cache/app-text/pdfarranger-1.8.2 b/metadata/md5-cache/app-text/pdfarranger-1.8.2
index 28e54b1cc42d..7ba3e661c4f9 100644
--- a/metadata/md5-cache/app-text/pdfarranger-1.8.2
+++ b/metadata/md5-cache/app-text/pdfarranger-1.8.2
@@ -4,6 +4,7 @@ DEPEND=app-text/poppler[introspection,cairo] dev-python/pikepdf[python_targets_p
 DESCRIPTION=Merge or split pdfs; rearrange, rotate, crop pages
 EAPI=8
 HOMEPAGE=https://github.com/jeromerobert/pdfarranger
+INHERIT=distutils-r1 optfeature xdg desktop
 IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64
 LICENSE=GPL-3
@@ -11,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	779bc733c68a72273cfce64602bada1d	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	d524f291c80f9d21ad80fe978e3ca760	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_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
 _md5_=27262624c42099acf5f53addaf40e586
diff --git a/metadata/md5-cache/app-text/pdfminer-20191020 b/metadata/md5-cache/app-text/pdfminer-20191020
index d7fa298f62f6..1215ecdbc048 100644
--- a/metadata/md5-cache/app-text/pdfminer-20191020
+++ b/metadata/md5-cache/app-text/pdfminer-20191020
@@ -3,6 +3,7 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Python tool for extracting information from PDF documents
 EAPI=7
 HOMEPAGE=https://euske.github.io/pdfminer/ https://pypi.org/project/pdfminer/
+INHERIT=distutils-r1
 IUSE=doc examples python_targets_python3_8 python_targets_python3_9
 KEYWORDS=amd64 x86
 LICENSE=MIT
@@ -10,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	779bc733c68a72273cfce64602bada1d	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=b3020a98f2d85353ea61c3a08c43d2c3
diff --git a/metadata/md5-cache/app-text/pdftk-3.3.2 b/metadata/md5-cache/app-text/pdftk-3.3.2
index aca69debb997..abed552d7d9f 100644
--- a/metadata/md5-cache/app-text/pdftk-3.3.2
+++ b/metadata/md5-cache/app-text/pdftk-3.3.2
@@ -3,10 +3,11 @@ DEPEND=dev-java/bcprov:0 dev-java/commons-lang:3.6 >=virtual/jdk-1.8:* >=dev-jav
 DESCRIPTION=gcj-free version of pdftk written in Java
 EAPI=7
 HOMEPAGE=https://gitlab.com/pdftk-java/pdftk
+INHERIT=java-pkg-2 java-ant-2
 KEYWORDS=amd64 ~arm64 ~ppc64 x86
 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	92b5a4d196abffe2dbe3bdc1cf4ef2ae	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	e38ea02d8ed864a74078ecf46aa06f30	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=24dfcf509ae9c84ec986bb0d9488a5bd
diff --git a/metadata/md5-cache/app-text/pdftk-9999 b/metadata/md5-cache/app-text/pdftk-9999
index cbd4a937dfb0..8d91cd1c9250 100644
--- a/metadata/md5-cache/app-text/pdftk-9999
+++ b/metadata/md5-cache/app-text/pdftk-9999
@@ -4,9 +4,10 @@ DEPEND=dev-java/bcprov:0 dev-java/commons-lang:3.6 >=virtual/jdk-1.8:* >=dev-jav
 DESCRIPTION=gcj-free version of pdftk written in Java
 EAPI=7
 HOMEPAGE=https://gitlab.com/pdftk-java/pdftk
+INHERIT=java-pkg-2 java-ant-2 git-r3
 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	92b5a4d196abffe2dbe3bdc1cf4ef2ae	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=git-r3	b9ac6f96d2a88edb5b351df634dc5e53	java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	e38ea02d8ed864a74078ecf46aa06f30	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=fcdf62302dc590d1fda658bcc6ac15f4
diff --git a/metadata/md5-cache/app-text/pelican-4.5.3 b/metadata/md5-cache/app-text/pelican-4.5.3
index 1606aee87e2d..f330faabf8cd 100644
--- a/metadata/md5-cache/app-text/pelican-4.5.3
+++ b/metadata/md5-cache/app-text/pelican-4.5.3
@@ -4,6 +4,7 @@ DEPEND=test? ( dev-python/markdown[python_targets_python3_8(-)?,python_targets_p
 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
@@ -12,5 +13,5 @@ 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	779bc733c68a72273cfce64602bada1d	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_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 6c3ebd7d54f3..a96b068428b3 100644
--- a/metadata/md5-cache/app-text/pelican-4.7.2-r1
+++ b/metadata/md5-cache/app-text/pelican-4.7.2-r1
@@ -3,13 +3,14 @@ DEFINED_PHASES=compile configure install prepare test
 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 python_targets_python3_10
-KEYWORDS=~amd64 ~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	779bc733c68a72273cfce64602bada1d	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=06079de2b23845cccd8bd245223c96ce
+_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
diff --git a/metadata/md5-cache/app-text/pelican-9999 b/metadata/md5-cache/app-text/pelican-9999
index f7e55e104c75..d117b3a1ead8 100644
--- a/metadata/md5-cache/app-text/pelican-9999
+++ b/metadata/md5-cache/app-text/pelican-9999
@@ -3,6 +3,7 @@ DEFINED_PHASES=compile configure install prepare test unpack
 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 git-r3
 IUSE=doc examples markdown test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 LICENSE=AGPL-3
 PROPERTIES=live
@@ -10,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	779bc733c68a72273cfce64602bada1d	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_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
 _md5_=816f85d5d9f9f3199c83529e490dee25
diff --git a/metadata/md5-cache/app-text/pinfo-0.6.13 b/metadata/md5-cache/app-text/pinfo-0.6.13
index 2f86310a2b11..1530e68fe652 100644
--- a/metadata/md5-cache/app-text/pinfo-0.6.13
+++ b/metadata/md5-cache/app-text/pinfo-0.6.13
@@ -10,5 +10,5 @@ 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	9724194ab651ce63fd9bc06e4e1410b4	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_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_=cd3007a8109bd8317d5473535ef98980
diff --git a/metadata/md5-cache/app-text/pinfo-99999 b/metadata/md5-cache/app-text/pinfo-99999
index 2e2f2cd45428..9e25385483b1 100644
--- a/metadata/md5-cache/app-text/pinfo-99999
+++ b/metadata/md5-cache/app-text/pinfo-99999
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=sys-libs/ncurses:0= sys-libs/readline:0= nls? ( virtual/libintl )
 SLOT=0
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_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
 _md5_=41b240e39456e14a3a3b815adbd8f738
diff --git a/metadata/md5-cache/app-text/po4a-0.63-r1 b/metadata/md5-cache/app-text/po4a-0.63-r1
index 2e4f9251066b..9efe147dc745 100644
--- a/metadata/md5-cache/app-text/po4a-0.63-r1
+++ b/metadata/md5-cache/app-text/po4a-0.63-r1
@@ -4,6 +4,7 @@ DEPEND=app-text/opensp dev-libs/libxslt dev-perl/Locale-gettext dev-perl/Pod-Par
 DESCRIPTION=Tools to ease the translation of documentation
 EAPI=8
 HOMEPAGE=https://po4a.org/
+INHERIT=perl-module plocale
 IUSE=test 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 ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2+
@@ -11,5 +12,5 @@ RDEPEND=app-text/opensp dev-libs/libxslt dev-perl/Locale-gettext dev-perl/Pod-Pa
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mquinson/po4a/releases/download/v0.63/po4a-0.63.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	8eed4e2982026c684ff7c19cd4c88ed0	plocale	7ce00136a77130df46fbbd5966f98a61	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
+_eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	8eed4e2982026c684ff7c19cd4c88ed0	plocale	7ce00136a77130df46fbbd5966f98a61	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
 _md5_=e96e3b61fa374b7673baba62384e336d
diff --git a/metadata/md5-cache/app-text/po4a-0.64 b/metadata/md5-cache/app-text/po4a-0.64
index 73ae34cbd742..c236d9541031 100644
--- a/metadata/md5-cache/app-text/po4a-0.64
+++ b/metadata/md5-cache/app-text/po4a-0.64
@@ -4,6 +4,7 @@ DEPEND=app-text/opensp dev-libs/libxslt dev-perl/Locale-gettext dev-perl/Pod-Par
 DESCRIPTION=Tools to ease the translation of documentation
 EAPI=8
 HOMEPAGE=https://po4a.org/
+INHERIT=perl-module plocale
 IUSE=test 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 ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2+
@@ -11,5 +12,5 @@ RDEPEND=app-text/opensp dev-libs/libxslt dev-perl/Locale-gettext dev-perl/Pod-Pa
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mquinson/po4a/releases/download/v0.64/po4a-0.64.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	8eed4e2982026c684ff7c19cd4c88ed0	plocale	7ce00136a77130df46fbbd5966f98a61	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
+_eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	8eed4e2982026c684ff7c19cd4c88ed0	plocale	7ce00136a77130df46fbbd5966f98a61	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
 _md5_=48436132ef446a41cd467f01f8565dc4
diff --git a/metadata/md5-cache/app-text/po4a-0.65 b/metadata/md5-cache/app-text/po4a-0.65
index 019f78e7a897..25e28b8ccdf5 100644
--- a/metadata/md5-cache/app-text/po4a-0.65
+++ b/metadata/md5-cache/app-text/po4a-0.65
@@ -4,6 +4,7 @@ DEPEND=app-text/opensp dev-libs/libxslt dev-perl/Locale-gettext dev-perl/Pod-Par
 DESCRIPTION=Tools to ease the translation of documentation
 EAPI=8
 HOMEPAGE=https://po4a.org/
+INHERIT=perl-module plocale
 IUSE=test 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 ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2+
@@ -11,5 +12,5 @@ RDEPEND=app-text/opensp dev-libs/libxslt dev-perl/Locale-gettext dev-perl/Pod-Pa
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mquinson/po4a/releases/download/v0.65/po4a-0.65.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	8eed4e2982026c684ff7c19cd4c88ed0	plocale	7ce00136a77130df46fbbd5966f98a61	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
+_eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	8eed4e2982026c684ff7c19cd4c88ed0	plocale	7ce00136a77130df46fbbd5966f98a61	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
 _md5_=f88027e8fcc9f001b965e747396a1d84
diff --git a/metadata/md5-cache/app-text/po4a-0.66 b/metadata/md5-cache/app-text/po4a-0.66
index 382c724d5ae1..8a6aa7d6924e 100644
--- a/metadata/md5-cache/app-text/po4a-0.66
+++ b/metadata/md5-cache/app-text/po4a-0.66
@@ -4,12 +4,13 @@ DEPEND=app-text/opensp dev-libs/libxslt dev-perl/Locale-gettext dev-perl/Pod-Par
 DESCRIPTION=Tools to ease the translation of documentation
 EAPI=8
 HOMEPAGE=https://po4a.org/
+INHERIT=perl-module plocale
 IUSE=test 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 ~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=GPL-2+
 RDEPEND=app-text/opensp dev-libs/libxslt dev-perl/Locale-gettext dev-perl/Pod-Parser dev-perl/SGMLSpm dev-perl/TermReadKey dev-perl/Text-WrapI18N dev-perl/Unicode-LineBreak dev-perl/YAML-Tiny sys-devel/gettext dev-lang/perl:=
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mquinson/po4a/releases/download/v0.66/po4a-0.66.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	8eed4e2982026c684ff7c19cd4c88ed0	plocale	7ce00136a77130df46fbbd5966f98a61	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
-_md5_=cccc83de2e926a0abdd915f424fca94b
+_eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	8eed4e2982026c684ff7c19cd4c88ed0	plocale	7ce00136a77130df46fbbd5966f98a61	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
+_md5_=f84d01ec526a0768d3dcc4742a608158
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 b9cbbb0d4a84..49fa81d000fd 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
@@ -4,6 +4,7 @@ DEPEND=lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3?
 DESCRIPTION=PoDoFo is a C++ library to work with the PDF file format
 EAPI=7
 HOMEPAGE=https://sourceforge.net/projects/podofo/
+INHERIT=cmake flag-o-matic lua-single toolchain-funcs
 IUSE=+boost idn debug test +tools lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4
 KEYWORDS=amd64 ~arm ~arm64 ~hppa ppc ppc64 ~sparc x86
 LICENSE=GPL-2 LGPL-2.1
@@ -12,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	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_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
 _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 56d7b4e26029..cf28e2a847cd 100644
--- a/metadata/md5-cache/app-text/podofo-0.9.7
+++ b/metadata/md5-cache/app-text/podofo-0.9.7
@@ -4,6 +4,7 @@ DEPEND=lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3?
 DESCRIPTION=PoDoFo is a C++ library to work with the PDF file format
 EAPI=7
 HOMEPAGE=https://sourceforge.net/projects/podofo/
+INHERIT=cmake flag-o-matic lua-single toolchain-funcs
 IUSE=+boost idn debug test +tools lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4
 KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2 LGPL-2.1
@@ -12,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	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_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
 _md5_=d691cfce01f86169a6ef6585bc313bab
diff --git a/metadata/md5-cache/app-text/poppler-22.01.0 b/metadata/md5-cache/app-text/poppler-22.01.0
deleted file mode 100644
index a1502905d09d..000000000000
--- a/metadata/md5-cache/app-text/poppler-22.01.0
+++ /dev/null
@@ -1,15 +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/
-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/117
-SRC_URI=https://poppler.freedesktop.org/poppler-22.01.0.tar.xz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=f0cfab0f9034f26bb95640232941faab
diff --git a/metadata/md5-cache/app-text/poppler-22.02.0 b/metadata/md5-cache/app-text/poppler-22.02.0
deleted file mode 100644
index 28aa5fae5cfe..000000000000
--- a/metadata/md5-cache/app-text/poppler-22.02.0
+++ /dev/null
@@ -1,15 +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/
-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/118
-SRC_URI=https://poppler.freedesktop.org/poppler-22.02.0.tar.xz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=2076dcb1676ac8af5d5dee5eb9f85a6e
diff --git a/metadata/md5-cache/app-text/poppler-22.03.0 b/metadata/md5-cache/app-text/poppler-22.03.0
index 5d53d48f469d..f3189d8ab995 100644
--- a/metadata/md5-cache/app-text/poppler-22.03.0
+++ b/metadata/md5-cache/app-text/poppler-22.03.0
@@ -4,12 +4,13 @@ DEPEND=media-libs/fontconfig media-libs/freetype sys-libs/zlib cairo? ( dev-libs
 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
+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	3c38df051095289667b6f09ebd0cc149	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=e3e28359538891e3a7484205887eb519
+_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
new file mode 100644
index 000000000000..067272b72e34
--- /dev/null
+++ b/metadata/md5-cache/app-text/poppler-22.05.0
@@ -0,0 +1,16 @@
+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-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
+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-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
diff --git a/metadata/md5-cache/app-text/poppler-9999 b/metadata/md5-cache/app-text/poppler-9999
index 86a4d279414e..5283cd680c12 100644
--- a/metadata/md5-cache/app-text/poppler-9999
+++ b/metadata/md5-cache/app-text/poppler-9999
@@ -1,14 +1,15 @@
 BDEPEND=dev-util/glib-utils virtual/pkgconfig dev-util/ninja >=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 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 )
+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 git-r3
 IUSE=boost cairo cjk curl +cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt5 tiff +utils
 LICENSE=GPL-2
 PROPERTIES=live
-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 )
+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	3c38df051095289667b6f09ebd0cc149	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=e7cde91a95982fe39ad04e611a6d192a
+_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
diff --git a/metadata/md5-cache/app-text/pspdftool-0.03 b/metadata/md5-cache/app-text/pspdftool-0.03
index d389ab16ae33..d0534cdddd5f 100644
--- a/metadata/md5-cache/app-text/pspdftool-0.03
+++ b/metadata/md5-cache/app-text/pspdftool-0.03
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=zlib? ( sys-libs/zlib )
 SLOT=0
 SRC_URI=mirror://sourceforge/pspdftool/pspdftool-0.03.tar.bz2
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=1ce2bdbb3b76bd9f4b3277c89b67f241
diff --git a/metadata/md5-cache/app-text/pytextile-4.0.1 b/metadata/md5-cache/app-text/pytextile-4.0.1
index c06ed6cd594e..6b6dd7796e37 100644
--- a/metadata/md5-cache/app-text/pytextile-4.0.1
+++ b/metadata/md5-cache/app-text/pytextile-4.0.1
@@ -3,6 +3,7 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=A Python port of Textile, A humane web text generator
 EAPI=7
 HOMEPAGE=https://github.com/textile/python-textile
+INHERIT=distutils-r1
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 ppc ppc64 ~riscv sparc x86
 LICENSE=BSD
@@ -11,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	779bc733c68a72273cfce64602bada1d	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _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 6e57802029f4..6be4f1f096fd 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
@@ -3,6 +3,7 @@ DEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[sqlite] )
 DESCRIPTION=A CLI tool that allows direct execution of SQL-like queries on text
 EAPI=7
 HOMEPAGE=http://harelba.github.io/q/
+INHERIT=python-r1
 IUSE=python_targets_python3_8 python_targets_python3_9
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
@@ -10,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	61c959fc55c15c00bbb1079d6a71370b	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=e64646cf33edcfb62f1d38faf4538def
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 aa1ef1cabe8f..6f906350a927 100644
--- a/metadata/md5-cache/app-text/qpdf-10.6.3-r100
+++ b/metadata/md5-cache/app-text/qpdf-10.6.3-r100
@@ -4,11 +4,12 @@ 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=https://qpdf.sourceforge.net/
+INHERIT=cmake bash-completion-r1
 IUSE=doc examples gnutls ssl test
 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=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	3c38df051095289667b6f09ebd0cc149	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	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
index f95e01c8ec5d..17133cdca9d1 100644
--- a/metadata/md5-cache/app-text/qpdfview-0.4.18
+++ b/metadata/md5-cache/app-text/qpdfview-0.4.18
@@ -4,6 +4,7 @@ DEPEND=cups? ( net-print/cups ) djvu? ( app-text/djvu ) fitz? ( >=app-text/mupdf
 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+
@@ -11,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://launchpad.net/qpdfview/trunk/0.4.18/+download/qpdfview-0.4.18.tar.gz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	plocale	7ce00136a77130df46fbbd5966f98a61	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_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 5b27ad3c940f..2f2b6e15d27a 100644
--- a/metadata/md5-cache/app-text/qpdfview-0.4.18_p1
+++ b/metadata/md5-cache/app-text/qpdfview-0.4.18_p1
@@ -4,6 +4,7 @@ DEPEND=cups? ( net-print/cups ) djvu? ( app-text/djvu ) fitz? ( >=app-text/mupdf
 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 ~arm64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2+
@@ -11,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	f5eb2f69fffe94292aaaf802fb21c8d1	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	plocale	7ce00136a77130df46fbbd5966f98a61	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	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 bfc12c1e04e0..0d78743d6af8 100644
--- a/metadata/md5-cache/app-text/qpdfview-0.4.18_p20211227
+++ b/metadata/md5-cache/app-text/qpdfview-0.4.18_p20211227
@@ -4,6 +4,7 @@ DEPEND=cups? ( net-print/cups ) djvu? ( app-text/djvu ) fitz? ( >=app-text/mupdf
 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 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2+
@@ -11,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	f5eb2f69fffe94292aaaf802fb21c8d1	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	plocale	7ce00136a77130df46fbbd5966f98a61	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	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 1a7e4595da78..2f2996dd453a 100644
--- a/metadata/md5-cache/app-text/rarian-0.8.1-r3
+++ b/metadata/md5-cache/app-text/rarian-0.8.1-r3
@@ -3,11 +3,12 @@ DEPEND=dev-libs/libxslt dev-libs/tinyxml || ( sys-apps/util-linux app-misc/getop
 DESCRIPTION=A documentation metadata library
 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
 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	9724194ab651ce63fd9bc06e4e1410b4	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_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
diff --git a/metadata/md5-cache/app-text/recode-3.7.11 b/metadata/md5-cache/app-text/recode-3.7.11
index e7c2dfd06b3e..be8de7a3c5d0 100644
--- a/metadata/md5-cache/app-text/recode-3.7.11
+++ b/metadata/md5-cache/app-text/recode-3.7.11
@@ -4,6 +4,7 @@ DEPEND=virtual/libiconv sys-devel/flex
 DESCRIPTION=Convert files between various character sets
 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
 LICENSE=GPL-3+
@@ -11,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	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _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 dab4dbbb463d..735c04df455e 100644
--- a/metadata/md5-cache/app-text/recode-3.7.12
+++ b/metadata/md5-cache/app-text/recode-3.7.12
@@ -4,6 +4,7 @@ DEPEND=virtual/libiconv sys-devel/flex
 DESCRIPTION=Convert files between various character sets
 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
 LICENSE=GPL-3+
@@ -11,5 +12,5 @@ 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	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=0f9ec87a855c485dbc0f6f4d7d725e82
diff --git a/metadata/md5-cache/app-text/recode-3.7.9 b/metadata/md5-cache/app-text/recode-3.7.9
index ae5a1ad14e05..e272f28de7e3 100644
--- a/metadata/md5-cache/app-text/recode-3.7.9
+++ b/metadata/md5-cache/app-text/recode-3.7.9
@@ -4,6 +4,7 @@ DEPEND=virtual/libiconv sys-devel/flex
 DESCRIPTION=Convert files between various character sets
 EAPI=7
 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
 LICENSE=GPL-3+
@@ -11,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	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	59dddabd6a41ab69723654916142f63b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_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
 _md5_=cc765b109f1d8925608fef75923e9b7e
diff --git a/metadata/md5-cache/app-text/restview-2.9.2 b/metadata/md5-cache/app-text/restview-2.9.2
index 2df7ac5d0aee..15eaad431a96 100644
--- a/metadata/md5-cache/app-text/restview-2.9.2
+++ b/metadata/md5-cache/app-text/restview-2.9.2
@@ -4,6 +4,7 @@ DEPEND=dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9
 DESCRIPTION=reStructuredText viewer
 EAPI=7
 HOMEPAGE=https://mg.pov.lt/restview/ https://pypi.org/project/restview/
+INHERIT=distutils-r1
 IUSE=test python_targets_python3_8 python_targets_python3_9
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
@@ -12,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	779bc733c68a72273cfce64602bada1d	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=bca5ca38e357fa044ad21c8bbee06069
diff --git a/metadata/md5-cache/app-text/rnc2rng-2.6.4 b/metadata/md5-cache/app-text/rnc2rng-2.6.4
index 022ac5162626..8e10c21ba533 100644
--- a/metadata/md5-cache/app-text/rnc2rng-2.6.4
+++ b/metadata/md5-cache/app-text/rnc2rng-2.6.4
@@ -4,6 +4,7 @@ DEPEND=dev-python/rply[python_targets_python3_8(-)?,python_targets_python3_9(-)?
 DESCRIPTION=RELAX NG Compact to regular syntax conversion library
 EAPI=7
 HOMEPAGE=https://github.com/djc/rnc2rng
+INHERIT=distutils-r1
 IUSE=test python_targets_python3_8 python_targets_python3_9
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
@@ -12,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	779bc733c68a72273cfce64602bada1d	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _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 83c9a636aab2..13dad9fa016a 100644
--- a/metadata/md5-cache/app-text/rnc2rng-2.6.6-r1
+++ b/metadata/md5-cache/app-text/rnc2rng-2.6.6-r1
@@ -3,6 +3,7 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=RELAX NG Compact to regular syntax conversion library
 EAPI=7
 HOMEPAGE=https://github.com/djc/rnc2rng
+INHERIT=distutils-r1
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
@@ -11,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	779bc733c68a72273cfce64602bada1d	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=bbd8b9191857cafd2dac416444e420ae
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 865f11f45b31..b4fa8921d55d 100644
--- a/metadata/md5-cache/app-text/ronn-0.7.3-r4
+++ b/metadata/md5-cache/app-text/ronn-0.7.3-r4
@@ -12,5 +12,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	08015e64ff76dc2e2b177418bc2acb08	ruby-ng	840098b934fa20199984384b02780370	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	ruby-fakegem	242ae0c7650b40198870ae311dc6bea0	ruby-ng	e4c8836049bf65af19ab322fe5a81005	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _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 65d3ba25e9df..b9e75885bf98 100644
--- a/metadata/md5-cache/app-text/ronn-ng-0.9.1
+++ b/metadata/md5-cache/app-text/ronn-ng-0.9.1
@@ -12,5 +12,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	08015e64ff76dc2e2b177418bc2acb08	ruby-ng	840098b934fa20199984384b02780370	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	ruby-fakegem	242ae0c7650b40198870ae311dc6bea0	ruby-ng	e4c8836049bf65af19ab322fe5a81005	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _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 aca569dae043..7dcbfcd022df 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
@@ -12,5 +12,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	08015e64ff76dc2e2b177418bc2acb08	ruby-ng	840098b934fa20199984384b02780370	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	ruby-fakegem	242ae0c7650b40198870ae311dc6bea0	ruby-ng	e4c8836049bf65af19ab322fe5a81005	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _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
new file mode 100644
index 000000000000..52441db17f5b
--- /dev/null
+++ b/metadata/md5-cache/app-text/ronn-ng-0.9.1-r2
@@ -0,0 +1,17 @@
+BDEPEND=test? ( ruby_targets_ruby26? ( =dev-ruby/mustache-1*[ruby_targets_ruby26(-)] >=dev-ruby/kramdown-2.1:2[ruby_targets_ruby26(-)] >=dev-ruby/nokogiri-1.9.0:0[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( =dev-ruby/mustache-1*[ruby_targets_ruby27(-)] >=dev-ruby/kramdown-2.1:2[ruby_targets_ruby27(-)] >=dev-ruby/nokogiri-1.9.0:0[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( =dev-ruby/mustache-1*[ruby_targets_ruby30(-)] >=dev-ruby/kramdown-2.1:2[ruby_targets_ruby30(-)] >=dev-ruby/nokogiri-1.9.0:0[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( >=dev-ruby/kramdown-2.1:2[ruby_targets_ruby26(-)] >=dev-ruby/nokogiri-1.9.0:0[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/kramdown-2.1:2[ruby_targets_ruby27(-)] >=dev-ruby/nokogiri-1.9.0:0[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/kramdown-2.1:2[ruby_targets_ruby30(-)] >=dev-ruby/nokogiri-1.9.0:0[ruby_targets_ruby30(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
+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_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+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 ruby_targets_ruby30 doc test test
+KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~sparc ~x86
+LICENSE=MIT
+RDEPEND=!app-text/ronn ruby_targets_ruby26? ( =dev-ruby/mustache-1*[ruby_targets_ruby26(-)] >=dev-ruby/kramdown-2.1:2[ruby_targets_ruby26(-)] >=dev-ruby/nokogiri-1.9.0:0[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( =dev-ruby/mustache-1*[ruby_targets_ruby27(-)] >=dev-ruby/kramdown-2.1:2[ruby_targets_ruby27(-)] >=dev-ruby/nokogiri-1.9.0:0[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( =dev-ruby/mustache-1*[ruby_targets_ruby30(-)] >=dev-ruby/kramdown-2.1:2[ruby_targets_ruby30(-)] >=dev-ruby/nokogiri-1.9.0:0[ruby_targets_ruby30(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+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
+_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 495633fe3635..115385b36413 100644
--- a/metadata/md5-cache/app-text/rpl-1.6.7
+++ b/metadata/md5-cache/app-text/rpl-1.6.7
@@ -3,6 +3,7 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Intelligent recursive search/replace utility
 EAPI=7
 HOMEPAGE=http://rpl.sourceforge.net/
+INHERIT=distutils-r1
 IUSE=python_targets_python3_8
 KEYWORDS=~amd64 ~mips ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-2
@@ -10,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	779bc733c68a72273cfce64602bada1d	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _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 c59f8e18e600..38331ca1ecab 100644
--- a/metadata/md5-cache/app-text/rpl-1.9.1
+++ b/metadata/md5-cache/app-text/rpl-1.9.1
@@ -3,6 +3,7 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Intelligent recursive search/replace utility
 EAPI=8
 HOMEPAGE=http://rpl.sourceforge.net/ https://github.com/rrthomas/rpl
+INHERIT=distutils-r1
 IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64 ~ppc ~sparc ~x86
 LICENSE=GPL-3+
@@ -10,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	779bc733c68a72273cfce64602bada1d	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _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 fbb41680c278..70e71f8e31c1 100644
--- a/metadata/md5-cache/app-text/sablotron-1.0.3-r2
+++ b/metadata/md5-cache/app-text/sablotron-1.0.3-r2
@@ -10,5 +10,5 @@ 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	9724194ab651ce63fd9bc06e4e1410b4	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=4bc3d07394b7bf9de65118bb544eeabb
diff --git a/metadata/md5-cache/app-text/scdoc-1.11.1 b/metadata/md5-cache/app-text/scdoc-1.11.1
index c03c35b6f809..df01131e0231 100644
--- a/metadata/md5-cache/app-text/scdoc-1.11.1
+++ b/metadata/md5-cache/app-text/scdoc-1.11.1
@@ -2,9 +2,9 @@ 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
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+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
-_md5_=3c5f27245b554425b5c3aec4d7277147
+_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
new file mode 100644
index 000000000000..ce0c2c49aace
--- /dev/null
+++ b/metadata/md5-cache/app-text/scdoc-1.11.2-r1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install prepare
+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
+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
diff --git a/metadata/md5-cache/app-text/scdoc-9999 b/metadata/md5-cache/app-text/scdoc-9999
index 3c8bf06837b3..a6d4ec647382 100644
--- a/metadata/md5-cache/app-text/scdoc-9999
+++ b/metadata/md5-cache/app-text/scdoc-9999
@@ -1,10 +1,11 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile install prepare unpack
 DESCRIPTION=Standalone tool for generating man pages with a simple syntax
-EAPI=7
+EAPI=8
 HOMEPAGE=https://git.sr.ht/~sircmpwn/scdoc
+INHERIT=toolchain-funcs git-r3
 LICENSE=MIT
 PROPERTIES=live
 SLOT=0
 _eclasses_=git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=80df616ed00d31cf8f7cdcd9531a132f
+_md5_=65e97a04979a77ed55805659037bcda3
diff --git a/metadata/md5-cache/app-text/sdcv-0.5.3 b/metadata/md5-cache/app-text/sdcv-0.5.3
index 08164fb7e5bc..7c04cd1a7aeb 100644
--- a/metadata/md5-cache/app-text/sdcv-0.5.3
+++ b/metadata/md5-cache/app-text/sdcv-0.5.3
@@ -4,6 +4,7 @@ DEPEND=>=dev-libs/glib-2.36 sys-libs/zlib readline? ( sys-libs/readline:= )
 DESCRIPTION=Console version of Stardict program
 EAPI=7
 HOMEPAGE=https://dushistov.github.io/sdcv/
+INHERIT=cmake plocale
 IUSE=darkterm nls readline test
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
@@ -11,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	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	plocale	7ce00136a77130df46fbbd5966f98a61	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_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
 _md5_=2267a6b49bd805bd75c2abbd91c17396
diff --git a/metadata/md5-cache/app-text/sgml-common-0.6.3-r7 b/metadata/md5-cache/app-text/sgml-common-0.6.3-r7
index fd04aca9386c..0418a1db3854 100644
--- a/metadata/md5-cache/app-text/sgml-common-0.6.3-r7
+++ b/metadata/md5-cache/app-text/sgml-common-0.6.3-r7
@@ -2,9 +2,9 @@ DEFINED_PHASES=install postinst postrm preinst prepare
 DESCRIPTION=Base ISO character entities and utilities for SGML
 EAPI=7
 HOMEPAGE=https://www.iso.org/standard/16387.html
-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=FDL-1.1+ GPL-2
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~floppym/dist/sgml-common/sgml-common-0.6.3-gentoo.tar.gz
 _eclasses_=prefix	eab3c99d77fe00506c109c8a736186f7	sgml-catalog-r1	5d1d74baed1e6235b9a698917e954236
-_md5_=ce0764c621e4ef1cd9529a1c11852f86
+_md5_=5b729bea012c18211b768f840b17af23
diff --git a/metadata/md5-cache/app-text/sigil-1.8.0 b/metadata/md5-cache/app-text/sigil-1.8.0
index 896dd52983ef..6582520805f0 100644
--- a/metadata/md5-cache/app-text/sigil-1.8.0
+++ b/metadata/md5-cache/app-text/sigil-1.8.0
@@ -4,6 +4,7 @@ DEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[tk]
 DESCRIPTION=Multi-platform WYSIWYG ebook editor for ePub format
 EAPI=8
 HOMEPAGE=https://sigil-ebook.com/ https://github.com/Sigil-Ebook/Sigil
+INHERIT=xdg cmake python-single-r1
 IUSE=+plugins system-mathjax python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
 KEYWORDS=amd64 x86
 LICENSE=GPL-3+ Apache-2.0
@@ -11,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	3c38df051095289667b6f09ebd0cc149	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_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
 _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 ed362424d2be..458d2c3be56f 100644
--- a/metadata/md5-cache/app-text/sigil-1.9.2-r1
+++ b/metadata/md5-cache/app-text/sigil-1.9.2-r1
@@ -4,6 +4,7 @@ DEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[tk]
 DESCRIPTION=Multi-platform WYSIWYG ebook editor for ePub format
 EAPI=8
 HOMEPAGE=https://sigil-ebook.com/ https://github.com/Sigil-Ebook/Sigil
+INHERIT=xdg cmake python-single-r1
 IUSE=+plugins system-mathjax python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3+ Apache-2.0
@@ -11,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	3c38df051095289667b6f09ebd0cc149	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_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
 _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 672fd1fcd572..0582d445e3e3 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
@@ -4,10 +4,11 @@ DEPEND=x11-libs/gtk+:3 dev-libs/libxml2 dev-libs/libzip dev-db/sqlite sys-devel/
 DESCRIPTION=A simple gtk3 reader for fb2 ebooks
 EAPI=7
 HOMEPAGE=https://github.com/Cactus64k/simple-fb2-reader
+INHERIT=cmake xdg
 KEYWORDS=~amd64
 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	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_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
 _md5_=d9790d5a930afef42fc90113c6187ec2
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 d1e532b644e8..57ad165e262f 100644
--- a/metadata/md5-cache/app-text/stardict-3.0.6-r4
+++ b/metadata/md5-cache/app-text/stardict-3.0.6-r4
@@ -3,6 +3,7 @@ DEPEND=>=dev-libs/glib-2.16:2 dev-libs/libsigc++:2= sys-libs/zlib:= x11-libs/gdk
 DESCRIPTION=A international dictionary supporting fuzzy and glob style matching
 EAPI=6
 HOMEPAGE=http://stardict-4.sourceforge.net/
+INHERIT=flag-o-matic gnome2
 IUSE=advertisement debug dictdotcn espeak examples +gucharmap +htmlparse man perl +powerwordparse pronounce qqwry spell tools updateinfo +wikiparse +wordnet +xdxfparse
 KEYWORDS=amd64 ~arm ~arm64 ppc ppc64 sparc x86
 LICENSE=CPL-1.0 GPL-3 LGPL-2
@@ -10,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	4f3f2db5ce3ccbeeacdf3f94954043aa	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	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
 _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 ac6c1afa85ac..2645598456c7 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
@@ -3,6 +3,7 @@ DEPEND=>=dev-libs/glib-2.32:2 dev-libs/libsigc++:2= media-libs/libcanberra[gtk3]
 DESCRIPTION=A international dictionary supporting fuzzy and glob style matching
 EAPI=6
 HOMEPAGE=http://stardict-4.sourceforge.net/ https://github.com/huzheng001/stardict-3
+INHERIT=autotools flag-o-matic gnome2
 IUSE=advertisement cal debug dictdotcn espeak examples flite fortune gucharmap +htmlparse info man perl +powerwordparse pronounce qqwry spell tools updateinfo +wikiparse +wordnet +xdxfparse youdaodict
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86
 LICENSE=CPL-1.0 GPL-3 LGPL-2
@@ -10,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	9724194ab651ce63fd9bc06e4e1410b4	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	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	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	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
 _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 ce94d9265df3..5ec265718c99 100644
--- a/metadata/md5-cache/app-text/sword-1.9.0-r1
+++ b/metadata/md5-cache/app-text/sword-1.9.0-r1
@@ -4,11 +4,12 @@ DEPEND=sys-libs/zlib curl? ( net-misc/curl ) icu? ( dev-libs/icu:= ) clucene? (
 DESCRIPTION=Library for Bible reading software
 EAPI=7
 HOMEPAGE=https://www.crosswire.org/sword/
+INHERIT=cmake
 IUSE=clucene curl debug doc icu
 KEYWORDS=amd64 ~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	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_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
diff --git a/metadata/md5-cache/app-text/t1utils-1.41-r2 b/metadata/md5-cache/app-text/t1utils-1.41-r2
index 0f7869d7c28b..9ebc4d929d6f 100644
--- a/metadata/md5-cache/app-text/t1utils-1.41-r2
+++ b/metadata/md5-cache/app-text/t1utils-1.41-r2
@@ -3,10 +3,11 @@ DEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/a
 DESCRIPTION=Type 1 Font utilities
 EAPI=6
 HOMEPAGE=http://www.lcdf.org/type/#t1utils
+INHERIT=autotools
 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=BSD
 RDEPEND=!<media-libs/freetype-1.4_pre20080316
 SLOT=0
 SRC_URI=http://www.lcdf.org/type/t1utils-1.41.tar.gz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_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_=e28e30ad4cecb7b681c8b1947ae6e85f
diff --git a/metadata/md5-cache/app-text/teckit-2.5.10 b/metadata/md5-cache/app-text/teckit-2.5.10
index 12494ee402e2..12c70dbd3cb9 100644
--- a/metadata/md5-cache/app-text/teckit-2.5.10
+++ b/metadata/md5-cache/app-text/teckit-2.5.10
@@ -9,5 +9,5 @@ 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	9724194ab651ce63fd9bc06e4e1410b4	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=6e8dc09788770ee3ffb04a8c80a2f073
diff --git a/metadata/md5-cache/app-text/tesseract-4.1.1 b/metadata/md5-cache/app-text/tesseract-4.1.1
index 8d82b22d8db9..5efdb39acde4 100644
--- a/metadata/md5-cache/app-text/tesseract-4.1.1
+++ b/metadata/md5-cache/app-text/tesseract-4.1.1
@@ -10,5 +10,5 @@ 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	9724194ab651ce63fd9bc06e4e1410b4	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _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 5149e9474525..7f745db83c17 100644
--- a/metadata/md5-cache/app-text/tesseract-5.0.1
+++ b/metadata/md5-cache/app-text/tesseract-5.0.1
@@ -10,5 +10,5 @@ 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	9724194ab651ce63fd9bc06e4e1410b4	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _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 b047ecc08bdf..71ad2f7cc798 100644
--- a/metadata/md5-cache/app-text/tesseract-5.1.0
+++ b/metadata/md5-cache/app-text/tesseract-5.1.0
@@ -10,5 +10,5 @@ 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	9724194ab651ce63fd9bc06e4e1410b4	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=6f1bca121d6bce4181c139ea1cd6f1db
diff --git a/metadata/md5-cache/app-text/tesseract-9999 b/metadata/md5-cache/app-text/tesseract-9999
index fef40c6e63d0..5799f2ae13fb 100644
--- a/metadata/md5-cache/app-text/tesseract-9999
+++ b/metadata/md5-cache/app-text/tesseract-9999
@@ -9,5 +9,5 @@ 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	9724194ab651ce63fd9bc06e4e1410b4	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=634511bb64daac6fd1bc2855f6ce09fa
diff --git a/metadata/md5-cache/app-text/tkman-2.2-r2 b/metadata/md5-cache/app-text/tkman-2.2-r3
index 2ea91d9cd5e1..9c320c7839f0 100644
--- a/metadata/md5-cache/app-text/tkman-2.2-r2
+++ b/metadata/md5-cache/app-text/tkman-2.2-r3
@@ -1,12 +1,12 @@
 DEFINED_PHASES=install
-DEPEND=>=app-text/rman-3.1 >=dev-lang/tcl-8.4:0 >=dev-lang/tk-8.4:0
+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/
 KEYWORDS=~amd64 ppc sparc x86
 LICENSE=Artistic
-RDEPEND=>=app-text/rman-3.1 >=dev-lang/tcl-8.4:0 >=dev-lang/tk-8.4:0
+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
-_md5_=433584450f3209d62d5c84a4b6d8f18c
+_md5_=14f9ac561dd84008c8dd6fb7559adf54
diff --git a/metadata/md5-cache/app-text/trang-20181222 b/metadata/md5-cache/app-text/trang-20181222
index 75b78fd41846..1fcd0fe72891 100644
--- a/metadata/md5-cache/app-text/trang-20181222
+++ b/metadata/md5-cache/app-text/trang-20181222
@@ -4,10 +4,11 @@ DEPEND=>=virtual/jdk-1.8:* dev-java/javacc:0 dev-java/saxon:6.5 dev-java/testng:
 DESCRIPTION=Multi-format schema converter based on RELAX NG
 EAPI=8
 HOMEPAGE=http://thaiopensource.com/relaxng/trang.html
+INHERIT=java-pkg-2 java-ant-2 prefix
 KEYWORDS=amd64 x86
 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	92b5a4d196abffe2dbe3bdc1cf4ef2ae	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	e38ea02d8ed864a74078ecf46aa06f30	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=d3b2a0ce976735b9eb69599aac0a8b8c
diff --git a/metadata/md5-cache/app-text/tree-2.0.1 b/metadata/md5-cache/app-text/tree-2.0.1
index 99287d6a4b0f..5940c125d7b4 100644
--- a/metadata/md5-cache/app-text/tree-2.0.1
+++ b/metadata/md5-cache/app-text/tree-2.0.1
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile install prepare
 DESCRIPTION=Lists directories recursively, and produces an indented listing of files
 EAPI=8
 HOMEPAGE=http://mama.indstate.edu/users/ice/tree/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
+INHERIT=toolchain-funcs flag-o-matic bash-completion-r1
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~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-2.0.1.tgz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=ae27e1ef272459034ad83549e1ae254b
+_md5_=7bf54acea4b4888a0a8f1672799c1e8b
diff --git a/metadata/md5-cache/app-text/txt2pdbdoc-1.4.4 b/metadata/md5-cache/app-text/txt2pdbdoc-1.4.4
index f4f7ad0fbf75..7bca9fe678ed 100644
--- a/metadata/md5-cache/app-text/txt2pdbdoc-1.4.4
+++ b/metadata/md5-cache/app-text/txt2pdbdoc-1.4.4
@@ -9,5 +9,5 @@ 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	9724194ab651ce63fd9bc06e4e1410b4	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=f442bedf9665f9fd932c8583ad3b0250
diff --git a/metadata/md5-cache/app-text/txt2tags-3.7 b/metadata/md5-cache/app-text/txt2tags-3.7
index 68ba49bc0d93..5ac60ca70c54 100644
--- a/metadata/md5-cache/app-text/txt2tags-3.7
+++ b/metadata/md5-cache/app-text/txt2tags-3.7
@@ -3,6 +3,7 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Generate marked up documents (HTML, etc.)from a plain text file with markup
 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
 LICENSE=GPL-2+
@@ -10,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://codeload.github.com/txt2tags/txt2tags/tar.gz/3.7 -> txt2tags-3.7.tar.gz
-_eclasses_=distutils-r1	779bc733c68a72273cfce64602bada1d	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_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
diff --git a/metadata/md5-cache/app-text/unac-1.8.0 b/metadata/md5-cache/app-text/unac-1.8.0
index 71dee75d3e2f..177faeb2ffbd 100644
--- a/metadata/md5-cache/app-text/unac-1.8.0
+++ b/metadata/md5-cache/app-text/unac-1.8.0
@@ -11,5 +11,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	9724194ab651ce63fd9bc06e4e1410b4	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=081bf2d0b5142ac614c045916e6509e9
diff --git a/metadata/md5-cache/app-text/unpaper-9999 b/metadata/md5-cache/app-text/unpaper-9999
index 822db86c99e8..01e58343be20 100644
--- a/metadata/md5-cache/app-text/unpaper-9999
+++ b/metadata/md5-cache/app-text/unpaper-9999
@@ -3,11 +3,12 @@ DEPEND=dev-libs/libxslt app-text/docbook-xsl-ns-stylesheets virtual/pkgconfig >=
 DESCRIPTION=Post-processor for scanned and photocopied book pages
 EAPI=6
 HOMEPAGE=https://www.flameeyes.eu/projects/unpaper
+INHERIT=git-r3 autotools
 IUSE=test
 LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=media-video/ffmpeg-2:0=[encode]
 RESTRICT=test
 SLOT=0
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_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
 _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 0ea22ba95190..4e7357d6f5a2 100644
--- a/metadata/md5-cache/app-text/uudeview-0.5.20-r2
+++ b/metadata/md5-cache/app-text/uudeview-0.5.20-r2
@@ -7,5 +7,5 @@ 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	9724194ab651ce63fd9bc06e4e1410b4	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _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 691623765990..83e5f65f89f0 100644
--- a/metadata/md5-cache/app-text/vilistextum-2.8.0.20200411
+++ b/metadata/md5-cache/app-text/vilistextum-2.8.0.20200411
@@ -10,5 +10,5 @@ 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	9724194ab651ce63fd9bc06e4e1410b4	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _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 e7da8770e815..38f98755b5b4 100644
--- a/metadata/md5-cache/app-text/webgen-1.7.2
+++ b/metadata/md5-cache/app-text/webgen-1.7.2
@@ -12,5 +12,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	08015e64ff76dc2e2b177418bc2acb08	ruby-ng	840098b934fa20199984384b02780370	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	ruby-fakegem	242ae0c7650b40198870ae311dc6bea0	ruby-ng	e4c8836049bf65af19ab322fe5a81005	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=fa9ca4a8d5024df7eb8254a04f1986ae
diff --git a/metadata/md5-cache/app-text/wiki2beamer-0.10.0 b/metadata/md5-cache/app-text/wiki2beamer-0.10.0
index d50590a6be1f..ad1fc5c43da2 100644
--- a/metadata/md5-cache/app-text/wiki2beamer-0.10.0
+++ b/metadata/md5-cache/app-text/wiki2beamer-0.10.0
@@ -3,6 +3,7 @@ DEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) py
 DESCRIPTION=Tool to produce LaTeX Beamer code from wiki-like input
 EAPI=7
 HOMEPAGE=https://wiki2beamer.github.io/
+INHERIT=python-single-r1
 IUSE=doc +examples python_single_target_python3_8 python_single_target_python3_9
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+ FDL-1.3
@@ -10,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	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=4d77d3698969d4c58c8ceb4790bd1861
diff --git a/metadata/md5-cache/app-text/wv-1.2.9-r2 b/metadata/md5-cache/app-text/wv-1.2.9-r2
index b36c5fbd6e56..60bc76f85977 100644
--- a/metadata/md5-cache/app-text/wv-1.2.9-r2
+++ b/metadata/md5-cache/app-text/wv-1.2.9-r2
@@ -3,11 +3,12 @@ DEPEND=>=dev-libs/glib-2:2 >=gnome-extra/libgsf-1.13:= sys-libs/zlib media-libs/
 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	9724194ab651ce63fd9bc06e4e1410b4	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_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/wv2-0.4.2-r3 b/metadata/md5-cache/app-text/wv2-0.4.2-r3
index ad34457edfdf..7c26d5fb86ab 100644
--- a/metadata/md5-cache/app-text/wv2-0.4.2-r3
+++ b/metadata/md5-cache/app-text/wv2-0.4.2-r3
@@ -4,11 +4,12 @@ DEPEND=dev-libs/glib >=gnome-extra/libgsf-1.8:= virtual/libiconv zlib? ( sys-lib
 DESCRIPTION=Excellent MS Word filter lib, used in most Office suites
 EAPI=8
 HOMEPAGE=http://wvware.sourceforge.net
+INHERIT=cmake flag-o-matic
 IUSE=zlib
 KEYWORDS=~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86
 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	3c38df051095289667b6f09ebd0cc149	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	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 e18ae65d0cd4..da9934b482f6 100644
--- a/metadata/md5-cache/app-text/xapers-0.9.0
+++ b/metadata/md5-cache/app-text/xapers-0.9.0
@@ -3,6 +3,7 @@ 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
 KEYWORDS=~amd64
 LICENSE=GPL-3
@@ -11,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 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	779bc733c68a72273cfce64602bada1d	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_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
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 ddc54c4397e5..b15331c56c93 100644
--- a/metadata/md5-cache/app-text/xdvik-22.87.03-r3
+++ b/metadata/md5-cache/app-text/xdvik-22.87.03-r3
@@ -3,11 +3,12 @@ DEPEND=sys-devel/flex virtual/yacc virtual/pkgconfig >=media-libs/freetype-2.9.1
 DESCRIPTION=DVI previewer for X Window System
 EAPI=6
 HOMEPAGE=http://xdvi.sourceforge.net/
+INHERIT=autotools desktop elisp-common flag-o-matic toolchain-funcs xdg-utils
 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	9724194ab651ce63fd9bc06e4e1410b4	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	f9c72486dbcb18b633c9d0949211d86e	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_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
 _md5_=75ae4b87a4a19c2df5df8969cf2f322b
diff --git a/metadata/md5-cache/app-text/xiphos-4.2.1 b/metadata/md5-cache/app-text/xiphos-4.2.1
index d63658308e7f..5c4e5d6069cd 100644
--- a/metadata/md5-cache/app-text/xiphos-4.2.1
+++ b/metadata/md5-cache/app-text/xiphos-4.2.1
@@ -4,11 +4,12 @@ DEPEND=sys-apps/util-linux dev-libs/libxml2 dev-libs/libxslt dbus? ( dev-libs/db
 DESCRIPTION=A Gtk+-based Bible-study frontend for SWORD
 EAPI=7
 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 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	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_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_=5fc4042d4056b53829a9d101cb7d2d2a
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 c3d30db7e8bb..74440d23ea08 100644
--- a/metadata/md5-cache/app-text/xlhtml-0.5.1_p6
+++ b/metadata/md5-cache/app-text/xlhtml-0.5.1_p6
@@ -7,5 +7,5 @@ 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	9724194ab651ce63fd9bc06e4e1410b4	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	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 96c4241e3b06..7db91f4a74a3 100644
--- a/metadata/md5-cache/app-text/xlsx2csv-0.7.6
+++ b/metadata/md5-cache/app-text/xlsx2csv-0.7.6
@@ -3,6 +3,7 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Convert MS Office xlsx files to CSV
 EAPI=7
 HOMEPAGE=https://github.com/dilshod/xlsx2csv/
+INHERIT=distutils-r1
 IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
@@ -10,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	779bc733c68a72273cfce64602bada1d	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=8187074496484056344c326120026e2d
diff --git a/metadata/md5-cache/app-text/xmldiff-2.4 b/metadata/md5-cache/app-text/xmldiff-2.4
index 267ba2cf0952..24381a2ec8e7 100644
--- a/metadata/md5-cache/app-text/xmldiff-2.4
+++ b/metadata/md5-cache/app-text/xmldiff-2.4
@@ -3,6 +3,7 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=A tool that figures out the differences between two similar XML files
 EAPI=7
 HOMEPAGE=https://github.com/Shoobx/xmldiff
+INHERIT=distutils-r1
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~alpha amd64 ~ia64 ppc sparc x86 ~x86-linux
 LICENSE=MIT
@@ -11,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	779bc733c68a72273cfce64602bada1d	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _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 f8886183ce61..ba84c0d05605 100644
--- a/metadata/md5-cache/app-text/xmlstarlet-1.6.1
+++ b/metadata/md5-cache/app-text/xmlstarlet-1.6.1
@@ -9,5 +9,5 @@ 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	9724194ab651ce63fd9bc06e4e1410b4	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_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_=98e90b08bcbd9b1c7cf9e0073dc69a9a
diff --git a/metadata/md5-cache/app-text/xmlto-0.0.28-r6 b/metadata/md5-cache/app-text/xmlto-0.0.28-r6
deleted file mode 100644
index 1f20d444f58b..000000000000
--- a/metadata/md5-cache/app-text/xmlto-0.0.28-r6
+++ /dev/null
@@ -1,14 +0,0 @@
-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=configure prepare
-DEPEND=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 )
-DESCRIPTION=Script for converting XML and DocBook documents to a variety of output formats
-EAPI=7
-HOMEPAGE=https://pagure.io/xmlto
-IUSE=latex text
-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=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	9724194ab651ce63fd9bc06e4e1410b4	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=a839fe7cd940a9173c38943f8f19d7bc
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 378a9e689abd..863ba4e16523 100644
--- a/metadata/md5-cache/app-text/xmlto-0.0.28-r8
+++ b/metadata/md5-cache/app-text/xmlto-0.0.28-r8
@@ -5,10 +5,10 @@ DESCRIPTION=Script for converting XML and DocBook documents to a variety of outp
 EAPI=7
 HOMEPAGE=https://pagure.io/xmlto
 IUSE=latex text
-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=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	9724194ab651ce63fd9bc06e4e1410b4	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=1b78dac0e4ce381194bea081dcc3655f
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_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 c19035a0d022..cf174f859712 100644
--- a/metadata/md5-cache/app-text/xournal-0.4.8.2016
+++ b/metadata/md5-cache/app-text/xournal-0.4.8.2016
@@ -3,11 +3,12 @@ DEPEND=app-text/poppler[cairo] dev-libs/atk dev-libs/glib gnome-base/libgnomecan
 DESCRIPTION=An application for notetaking, sketching, and keeping a journal using a stylus
 EAPI=6
 HOMEPAGE=http://xournal.sourceforge.net/
+INHERIT=gnome2
 IUSE=+pdf vanilla
 KEYWORDS=amd64 ~ppc64 ~x86
 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	4f3f2db5ce3ccbeeacdf3f94954043aa	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	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
 _md5_=e04178de02e6dca4245793712e572a3f
diff --git a/metadata/md5-cache/app-text/xournal-9999 b/metadata/md5-cache/app-text/xournal-9999
index f5d5a4457ee8..8cfc3c63ed70 100644
--- a/metadata/md5-cache/app-text/xournal-9999
+++ b/metadata/md5-cache/app-text/xournal-9999
@@ -3,10 +3,11 @@ DEPEND=app-text/poppler[cairo] dev-libs/atk dev-libs/glib gnome-base/libgnomecan
 DESCRIPTION=An application for notetaking, sketching, and keeping a journal using a stylus
 EAPI=6
 HOMEPAGE=http://xournal.sourceforge.net/
+INHERIT=gnome2 git-r3
 IUSE=+pdf
 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	9724194ab651ce63fd9bc06e4e1410b4	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	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	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	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
 _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 813bb34e35b3..e040577c7fc0 100644
--- a/metadata/md5-cache/app-text/xournalpp-1.0.20
+++ b/metadata/md5-cache/app-text/xournalpp-1.0.20
@@ -4,10 +4,11 @@ DEPEND=app-text/poppler[cairo] dev-libs/glib dev-libs/libxml2 dev-libs/libzip:=
 DESCRIPTION=Handwriting notetaking software with PDF annotation support
 EAPI=7
 HOMEPAGE=https://github.com/xournalpp/xournalpp
+INHERIT=cmake xdg
 KEYWORDS=amd64 ~ppc64
 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	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_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
 _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 37207e614751..194e66b31d8f 100644
--- a/metadata/md5-cache/app-text/xournalpp-1.1.1
+++ b/metadata/md5-cache/app-text/xournalpp-1.1.1
@@ -4,10 +4,11 @@ DEPEND=app-text/poppler[cairo] dev-libs/glib dev-libs/libxml2 dev-libs/libzip:=
 DESCRIPTION=Handwriting notetaking software with PDF annotation support
 EAPI=8
 HOMEPAGE=https://github.com/xournalpp/xournalpp
+INHERIT=cmake xdg
 KEYWORDS=~amd64 ~ppc64
 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	3c38df051095289667b6f09ebd0cc149	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	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 5d3d05e28de3..25df59dc4454 100644
--- a/metadata/md5-cache/app-text/xournalpp-1.1.1-r1
+++ b/metadata/md5-cache/app-text/xournalpp-1.1.1-r1
@@ -4,10 +4,11 @@ DEPEND=app-text/poppler[cairo] dev-libs/glib dev-libs/libxml2 dev-libs/libzip:=
 DESCRIPTION=Handwriting notetaking software with PDF annotation support
 EAPI=8
 HOMEPAGE=https://github.com/xournalpp/xournalpp
-KEYWORDS=~amd64 ~ppc64
+INHERIT=cmake xdg
+KEYWORDS=amd64 ~ppc64
 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	3c38df051095289667b6f09ebd0cc149	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=70b627a3923df30bb10020faee138157
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	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 6f195c759855..64d56b89095c 100644
--- a/metadata/md5-cache/app-text/xournalpp-9999
+++ b/metadata/md5-cache/app-text/xournalpp-9999
@@ -4,9 +4,10 @@ DEPEND=app-text/poppler[cairo] dev-libs/glib dev-libs/libxml2 dev-libs/libzip:=
 DESCRIPTION=Handwriting notetaking software with PDF annotation support
 EAPI=8
 HOMEPAGE=https://github.com/xournalpp/xournalpp
+INHERIT=cmake xdg git-r3
 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	3c38df051095289667b6f09ebd0cc149	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_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
 _md5_=70b627a3923df30bb10020faee138157
diff --git a/metadata/md5-cache/app-text/xpdf-4.03 b/metadata/md5-cache/app-text/xpdf-4.03
index 2576aa8d8a65..5c72b719e20d 100644
--- a/metadata/md5-cache/app-text/xpdf-4.03
+++ b/metadata/md5-cache/app-text/xpdf-4.03
@@ -4,11 +4,12 @@ DEPEND=cups? ( dev-qt/qtprintsupport:5[cups] net-print/cups ) fontconfig? ( medi
 DESCRIPTION=The PDF viewer and tools
 EAPI=7
 HOMEPAGE=https://www.xpdfreader.com
+INHERIT=cmake desktop xdg
 IUSE=cmyk cups +fontconfig i18n icons +libpaper metric opi png +textselect utils
 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.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	3c38df051095289667b6f09ebd0cc149	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_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
 _md5_=7d71f7c3c90307ad420dc9a1285a76d0
diff --git a/metadata/md5-cache/app-text/yelp-tools-41.0 b/metadata/md5-cache/app-text/yelp-tools-41.0
index c2d969c79348..8e217fa56657 100644
--- a/metadata/md5-cache/app-text/yelp-tools-41.0
+++ b/metadata/md5-cache/app-text/yelp-tools-41.0
@@ -4,6 +4,7 @@ DEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) py
 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+
@@ -11,5 +12,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 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	2d8a51910bc57e004c37aa55c7d99ce4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_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 86c9acd28033..af80388d621f 100644
--- a/metadata/md5-cache/app-text/yelp-tools-42.0
+++ b/metadata/md5-cache/app-text/yelp-tools-42.0
@@ -4,6 +4,7 @@ DEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) py
 DESCRIPTION=Collection of tools for building and converting documentation
 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
 LICENSE=|| ( GPL-2+ freedist ) GPL-2+
@@ -11,5 +12,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 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	2d8a51910bc57e004c37aa55c7d99ce4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_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
diff --git a/metadata/md5-cache/app-text/zathura-0.4.7 b/metadata/md5-cache/app-text/zathura-0.4.7
index 4483ee023741..fd63f0280dc4 100644
--- a/metadata/md5-cache/app-text/zathura-0.4.7
+++ b/metadata/md5-cache/app-text/zathura-0.4.7
@@ -4,6 +4,7 @@ DEPEND=>=dev-libs/girara-0.3.3 >=dev-libs/glib-2.50:2 >=sys-devel/gettext-0.19.8
 DESCRIPTION=A highly customizable and functional document viewer
 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
 LICENSE=ZLIB
@@ -11,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	2d8a51910bc57e004c37aa55c7d99ce4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_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_=ea4ec8967773ec0a3653ccf8b456ab3c
diff --git a/metadata/md5-cache/app-text/zathura-0.4.8 b/metadata/md5-cache/app-text/zathura-0.4.8
index 9d8d1c253bd7..b23a4da15a19 100644
--- a/metadata/md5-cache/app-text/zathura-0.4.8
+++ b/metadata/md5-cache/app-text/zathura-0.4.8
@@ -4,6 +4,7 @@ DEPEND=>=dev-libs/girara-0.3.6 >=dev-libs/glib-2.50:2 >=sys-devel/gettext-0.19.8
 DESCRIPTION=A highly customizable and functional document viewer
 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
 LICENSE=ZLIB
@@ -11,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	2d8a51910bc57e004c37aa55c7d99ce4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_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_=01506226f0f4c36333583aa0fc60f71a
diff --git a/metadata/md5-cache/app-text/zathura-0.4.9 b/metadata/md5-cache/app-text/zathura-0.4.9
index 0074f447f0da..87292b1e92bd 100644
--- a/metadata/md5-cache/app-text/zathura-0.4.9
+++ b/metadata/md5-cache/app-text/zathura-0.4.9
@@ -4,12 +4,13 @@ DEPEND=>=dev-libs/girara-0.3.7 >=dev-libs/glib-2.50:2 >=sys-devel/gettext-0.19.8
 DESCRIPTION=A highly customizable and functional document viewer
 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	2d8a51910bc57e004c37aa55c7d99ce4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=883b4b8f3f94254e25391e131fa0b09d
+_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
diff --git a/metadata/md5-cache/app-text/zathura-9999 b/metadata/md5-cache/app-text/zathura-9999
index 232d90120ce4..5aeb8b6ac683 100644
--- a/metadata/md5-cache/app-text/zathura-9999
+++ b/metadata/md5-cache/app-text/zathura-9999
@@ -4,11 +4,12 @@ DEPEND=>=dev-libs/girara-0.3.6 >=dev-libs/glib-2.50:2 >=sys-devel/gettext-0.19.8
 DESCRIPTION=A highly customizable and functional document viewer
 EAPI=7
 HOMEPAGE=https://pwmt.org/projects/zathura/
+INHERIT=meson virtualx xdg git-r3
 IUSE=doc +magic seccomp sqlite synctex test test
 LICENSE=ZLIB
 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	2d8a51910bc57e004c37aa55c7d99ce4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_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
 _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 1ed0718a8117..8c49b8350956 100644
--- a/metadata/md5-cache/app-text/zathura-cb-0.1.8
+++ b/metadata/md5-cache/app-text/zathura-cb-0.1.8
@@ -4,10 +4,11 @@ DEPEND=app-arch/libarchive:= >=app-text/zathura-0.3.9 dev-libs/girara dev-libs/g
 DESCRIPTION=Comic book plug-in for zathura with 7zip, rar, tar and zip support
 EAPI=7
 HOMEPAGE=https://pwmt.org/projects/zathura-cb/
+INHERIT=meson xdg-utils optfeature
 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/plugins/download/zathura-cb-0.1.8.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	2d8a51910bc57e004c37aa55c7d99ce4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	optfeature	d524f291c80f9d21ad80fe978e3ca760	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_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
 _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 3c710ed4ad50..505feefdba3d 100644
--- a/metadata/md5-cache/app-text/zathura-cb-0.1.9
+++ b/metadata/md5-cache/app-text/zathura-cb-0.1.9
@@ -4,10 +4,11 @@ DEPEND=app-arch/libarchive:= >=app-text/zathura-0.3.9 dev-libs/girara dev-libs/g
 DESCRIPTION=Comic book plug-in for zathura with 7zip, rar, tar and zip support
 EAPI=8
 HOMEPAGE=https://pwmt.org/projects/zathura-cb/
-KEYWORDS=~amd64 ~arm ~riscv ~x86
+INHERIT=meson xdg-utils optfeature
+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	2d8a51910bc57e004c37aa55c7d99ce4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	optfeature	d524f291c80f9d21ad80fe978e3ca760	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=883317814f6b79574ed002816546efe0
+_eclasses_=meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	optfeature	d524f291c80f9d21ad80fe978e3ca760	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=de1e73dbfc37215a7434060089372db9
diff --git a/metadata/md5-cache/app-text/zathura-cb-9999 b/metadata/md5-cache/app-text/zathura-cb-9999
index ea62999aa6fd..e5190113094e 100644
--- a/metadata/md5-cache/app-text/zathura-cb-9999
+++ b/metadata/md5-cache/app-text/zathura-cb-9999
@@ -4,9 +4,10 @@ DEPEND=app-arch/libarchive:= >=app-text/zathura-0.3.9 dev-libs/girara dev-libs/g
 DESCRIPTION=Comic book plug-in for zathura with 7zip, rar, tar and zip support
 EAPI=7
 HOMEPAGE=https://pwmt.org/projects/zathura-cb/
+INHERIT=meson xdg-utils optfeature git-r3
 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	2d8a51910bc57e004c37aa55c7d99ce4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	optfeature	d524f291c80f9d21ad80fe978e3ca760	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_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
 _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 634a77b4e36a..aff80f947430 100644
--- a/metadata/md5-cache/app-text/zathura-djvu-0.2.9
+++ b/metadata/md5-cache/app-text/zathura-djvu-0.2.9
@@ -4,10 +4,11 @@ DEPEND=app-text/djvu >=app-text/zathura-0.3.9 dev-libs/girara dev-libs/glib:2 x1
 DESCRIPTION=DjVu plug-in for zathura
 EAPI=7
 HOMEPAGE=https://pwmt.org/projects/zathura-djvu/
+INHERIT=meson xdg
 KEYWORDS=amd64 arm ~riscv x86
 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	2d8a51910bc57e004c37aa55c7d99ce4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_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
 _md5_=cde9217ecda215ea5fc9df3209d10f78
diff --git a/metadata/md5-cache/app-text/zathura-djvu-9999 b/metadata/md5-cache/app-text/zathura-djvu-9999
index b705e5bc7228..7646b4c9fed0 100644
--- a/metadata/md5-cache/app-text/zathura-djvu-9999
+++ b/metadata/md5-cache/app-text/zathura-djvu-9999
@@ -4,9 +4,10 @@ DEPEND=app-text/djvu >=app-text/zathura-0.3.9 dev-libs/girara dev-libs/glib:2 x1
 DESCRIPTION=DjVu plug-in for zathura
 EAPI=7
 HOMEPAGE=https://pwmt.org/projects/zathura-djvu/
+INHERIT=meson xdg git-r3
 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	2d8a51910bc57e004c37aa55c7d99ce4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_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
 _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 20faa3dbc954..0c15383f7252 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
@@ -4,10 +4,11 @@ DEPEND=>=app-text/mupdf-1.17:= >=app-text/zathura-0.3.9 dev-libs/girara dev-libs
 DESCRIPTION=PDF plug-in for zathura
 EAPI=7
 HOMEPAGE=https://pwmt.org/projects/zathura-pdf-mupdf/
+INHERIT=meson xdg
 KEYWORDS=amd64 arm x86
 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	2d8a51910bc57e004c37aa55c7d99ce4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_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
 _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 b908173232cd..e775b416510f 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
@@ -4,10 +4,11 @@ DEPEND=>=app-text/mupdf-1.17:= >=app-text/zathura-0.3.9 dev-libs/girara dev-libs
 DESCRIPTION=PDF plug-in for zathura
 EAPI=8
 HOMEPAGE=https://pwmt.org/projects/zathura-pdf-mupdf/
+INHERIT=meson xdg
 KEYWORDS=amd64 arm x86
 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	2d8a51910bc57e004c37aa55c7d99ce4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	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-r1
index c4d428ad6693..e8e98343231d 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-r1
@@ -4,10 +4,11 @@ DEPEND=>=app-text/mupdf-1.19:= >=app-text/zathura-0.3.9 dev-libs/girara dev-libs
 DESCRIPTION=PDF plug-in for zathura
 EAPI=8
 HOMEPAGE=https://git.pwmt.org/pwmt/zathura-pdf-mupdf
-KEYWORDS=~amd64 ~arm ~x86
+INHERIT=meson xdg
+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
 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	2d8a51910bc57e004c37aa55c7d99ce4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=14f15af7dbc8945670a3f778bfeca8c1
+_eclasses_=meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=11ab9e8576489dcaef423fba0b273ac8
diff --git a/metadata/md5-cache/app-text/zathura-pdf-mupdf-9999 b/metadata/md5-cache/app-text/zathura-pdf-mupdf-9999
index 2b22c944bd3a..e9e5a49850a0 100644
--- a/metadata/md5-cache/app-text/zathura-pdf-mupdf-9999
+++ b/metadata/md5-cache/app-text/zathura-pdf-mupdf-9999
@@ -4,9 +4,10 @@ DEPEND=>=app-text/mupdf-1.19:= >=app-text/zathura-0.3.9 dev-libs/girara dev-libs
 DESCRIPTION=PDF plug-in for zathura
 EAPI=8
 HOMEPAGE=https://git.pwmt.org/pwmt/zathura-pdf-mupdf
+INHERIT=meson xdg git-r3
 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	2d8a51910bc57e004c37aa55c7d99ce4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_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
 _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 e1eb44a948fc..2aa4f5116291 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
@@ -4,10 +4,11 @@ DEPEND=app-text/poppler[cairo] >=app-text/zathura-0.3.9 dev-libs/girara dev-libs
 DESCRIPTION=PDF plug-in for zathura
 EAPI=7
 HOMEPAGE=https://pwmt.org/projects/zathura-pdf-poppler
+INHERIT=meson xdg-utils
 KEYWORDS=amd64 arm x86
 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	2d8a51910bc57e004c37aa55c7d99ce4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	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 3a4e8e6db3f8..378720be2b93 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
@@ -4,10 +4,11 @@ DEPEND=app-text/poppler[cairo] >=app-text/zathura-0.3.9 dev-libs/girara dev-libs
 DESCRIPTION=PDF plug-in for zathura
 EAPI=7
 HOMEPAGE=https://pwmt.org/projects/zathura-pdf-poppler
+INHERIT=meson xdg-utils
 KEYWORDS=amd64 arm ~riscv x86
 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	2d8a51910bc57e004c37aa55c7d99ce4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	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 007a8c6d9717..e42cd3269ba7 100644
--- a/metadata/md5-cache/app-text/zathura-pdf-poppler-9999
+++ b/metadata/md5-cache/app-text/zathura-pdf-poppler-9999
@@ -4,9 +4,10 @@ DEPEND=app-text/poppler[cairo] >=app-text/zathura-0.3.9 dev-libs/girara dev-libs
 DESCRIPTION=PDF plug-in for zathura
 EAPI=7
 HOMEPAGE=https://pwmt.org/projects/zathura-pdf-poppler
+INHERIT=meson xdg-utils git-r3
 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	2d8a51910bc57e004c37aa55c7d99ce4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_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
 _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 9afa19a1d729..eb4f497eaf19 100644
--- a/metadata/md5-cache/app-text/zathura-ps-0.2.6
+++ b/metadata/md5-cache/app-text/zathura-ps-0.2.6
@@ -4,10 +4,11 @@ DEPEND=app-text/libspectre >=app-text/zathura-0.3.9 dev-libs/girara dev-libs/gli
 DESCRIPTION=PostScript plug-in for zathura
 EAPI=7
 HOMEPAGE=https://pwmt.org/projects/zathura-ps/download/
+INHERIT=meson xdg-utils
 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/plugins/download/zathura-ps-0.2.6.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	2d8a51910bc57e004c37aa55c7d99ce4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	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 f130d9702e88..3d3bd80ac5a8 100644
--- a/metadata/md5-cache/app-text/zathura-ps-0.2.7
+++ b/metadata/md5-cache/app-text/zathura-ps-0.2.7
@@ -4,10 +4,11 @@ DEPEND=app-text/libspectre >=app-text/zathura-0.3.9 dev-libs/girara dev-libs/gli
 DESCRIPTION=PostScript plug-in for zathura
 EAPI=8
 HOMEPAGE=https://pwmt.org/projects/zathura-ps/download/
-KEYWORDS=~amd64 ~arm ~riscv ~x86 ~amd64-linux ~x86-linux
+INHERIT=meson xdg-utils
+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	2d8a51910bc57e004c37aa55c7d99ce4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=ba69182c062e8c85aa8a22b636852932
+_eclasses_=meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=03898303d95bf223e5aaa52138c399a9
diff --git a/metadata/md5-cache/app-text/zathura-ps-9999 b/metadata/md5-cache/app-text/zathura-ps-9999
index fa0d0f2dff8c..0759e6030bd8 100644
--- a/metadata/md5-cache/app-text/zathura-ps-9999
+++ b/metadata/md5-cache/app-text/zathura-ps-9999
@@ -4,9 +4,10 @@ DEPEND=app-text/libspectre >=app-text/zathura-0.3.9 dev-libs/girara dev-libs/gli
 DESCRIPTION=PostScript plug-in for zathura
 EAPI=7
 HOMEPAGE=https://pwmt.org/projects/zathura-ps/download/
+INHERIT=meson xdg-utils git-r3
 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	2d8a51910bc57e004c37aa55c7d99ce4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_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
 _md5_=bfd45a592fe7c7cdc374bb51ef1860df
diff --git a/metadata/md5-cache/app-text/zotero-bin-5.0.96.3 b/metadata/md5-cache/app-text/zotero-bin-5.0.96.3
deleted file mode 100644
index 15c15f20876f..000000000000
--- a/metadata/md5-cache/app-text/zotero-bin-5.0.96.3
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst prepare
-DESCRIPTION=Helps you collect, organize, cite, and share your research sources
-EAPI=8
-HOMEPAGE=https://www.zotero.org
-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=5.0.96.3 -> zotero-bin-5.0.96.3.tar.bz2
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=656230306a7b687cca69a17a96b7dfb1
diff --git a/metadata/md5-cache/app-text/zotero-bin-6.0.4 b/metadata/md5-cache/app-text/zotero-bin-6.0.7
index 5910b059ed83..0bc28c95d63a 100644
--- a/metadata/md5-cache/app-text/zotero-bin-6.0.4
+++ b/metadata/md5-cache/app-text/zotero-bin-6.0.7
@@ -2,10 +2,11 @@ DEFINED_PHASES=install postinst postrm preinst prepare
 DESCRIPTION=Helps you collect, organize, cite, and share your research sources
 EAPI=8
 HOMEPAGE=https://www.zotero.org
+INHERIT=desktop xdg
 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.4 -> zotero-bin-6.0.4.tar.bz2
+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
-_md5_=e0cf18b23555584f7922adc8bc04ba3e
+_md5_=0e6b483ced1b4b2b0848a10f8f1dfcd4
author	V3n3RiX <venerix@koprulu.sector>	2022-05-12 16:42:50 +0300
committer	V3n3RiX <venerix@koprulu.sector>	2022-05-12 16:42:50 +0300
commit	752d6256e5204b958b0ef7905675a940b5e9172f (patch)
tree	330d16e6362a49cbed8875a777fe641a43376cd3 /metadata/md5-cache/app-text
parent	0c100b7dd2b30e75b799d806df4ef899fd98e1ea (diff)