2021-03-22 00:20:46 UTC

24 files changed, 62 insertions, 52 deletions

diff --git a/metadata/md5-cache/app-text/lcdf-typetools-2.108 b/metadata/md5-cache/app-text/lcdf-typetools-2.108
index ddb1d7a3e647..0a82915ecb46 100644
--- a/metadata/md5-cache/app-text/lcdf-typetools-2.108
+++ b/metadata/md5-cache/app-text/lcdf-typetools-2.108
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://lcdf.org/type/#typetools
 INHERIT=toolchain-funcs flag-o-matic
 IUSE=+kpathsea
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=kpathsea? ( virtual/tex-base dev-libs/kpathsea )
 SLOT=0
 SRC_URI=https://lcdf.org/type/lcdf-typetools-2.108.tar.gz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741
-_md5_=8a5431225632cdd5d4919ecc00d1e414
+_md5_=027fbfee10b28086129eea3708b98e0e
diff --git a/metadata/md5-cache/dev-java/hamcrest-generator-1.3-r3 b/metadata/md5-cache/dev-java/hamcrest-generator-1.3-r3
index 90817be9255d..b9489ac64123 100644
--- a/metadata/md5-cache/dev-java/hamcrest-generator-1.3-r3
+++ b/metadata/md5-cache/dev-java/hamcrest-generator-1.3-r3
@@ -5,11 +5,11 @@ EAPI=7
 HOMEPAGE=https://github.com/hamcrest
 INHERIT=java-pkg-2 java-ant-2
 IUSE=elibc_FreeBSD source test elibc_FreeBSD
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~ppc-macos ~x64-macos
+KEYWORDS=~amd64 ~arm ~arm64 ppc64 ~x86 ~ppc-macos ~x64-macos
 LICENSE=BSD-2
 RDEPEND=>=virtual/jre-1.8:* dev-java/qdox:1.12 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1.3
 SRC_URI=mirror://gentoo/hamcrest-1.3.tgz
 _eclasses_=java-utils-2	378e4cda228ea0231a0ac283cb2ad25c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	java-ant-2	fb9e1462d72ecaf7c91ae1d169606d9f
-_md5_=81ee41a33370a19e4e02dce6953aceba
+_md5_=07e2eff9b219a32fd1e8f2a97509596d
diff --git a/metadata/md5-cache/dev-java/javacup-0.11b_p20151001-r1 b/metadata/md5-cache/dev-java/javacup-0.11b_p20151001-r1
index 618e6241b775..bbac1a67f2cb 100644
--- a/metadata/md5-cache/dev-java/javacup-0.11b_p20151001-r1
+++ b/metadata/md5-cache/dev-java/javacup-0.11b_p20151001-r1
@@ -5,10 +5,10 @@ EAPI=7
 HOMEPAGE=http://www2.cs.tum.edu/projects/cup/
 INHERIT=java-pkg-2 java-ant-2
 IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~amd64 ~arm ~arm64 ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://www2.cs.tum.edu/projects/cup/releases/java-cup-src-11b-20151001.tar.gz
 _eclasses_=java-utils-2	378e4cda228ea0231a0ac283cb2ad25c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	java-ant-2	fb9e1462d72ecaf7c91ae1d169606d9f
-_md5_=654eab80a87c41c015447f1f339b4669
+_md5_=e6fb6f0a1282a8831f0dc5861c4bb395
diff --git a/metadata/md5-cache/dev-java/jflex-1.6.1-r1 b/metadata/md5-cache/dev-java/jflex-1.6.1-r1
index ead8981ea886..2820a8d82e01 100644
--- a/metadata/md5-cache/dev-java/jflex-1.6.1-r1
+++ b/metadata/md5-cache/dev-java/jflex-1.6.1-r1
@@ -5,7 +5,7 @@ EAPI=7
 HOMEPAGE=https://www.jflex.de/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=examples test vim-syntax elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~ppc-macos ~x64-macos
+KEYWORDS=~amd64 ~arm ~arm64 ppc64 ~x86 ~ppc-macos ~x64-macos
 LICENSE=BSD
 PDEPEND=dev-java/javacup:0
 RDEPEND=>=virtual/jre-1.8:* vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) dev-java/ant-core:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://jflex.de/jflex-1.6.1.tar.gz
 _eclasses_=java-utils-2	378e4cda228ea0231a0ac283cb2ad25c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	a814c0c1adac3d7902bc7023902a2e1a
-_md5_=47eab6c7641c63c18fcb34ccbf080a20
+_md5_=2b6eb6bc356e7b6e1060637d24ec33f9
diff --git a/metadata/md5-cache/dev-java/xalan-serializer-2.7.2-r1 b/metadata/md5-cache/dev-java/xalan-serializer-2.7.2-r1
index 2958f152aa2b..0fcda8124bc8 100644
--- a/metadata/md5-cache/dev-java/xalan-serializer-2.7.2-r1
+++ b/metadata/md5-cache/dev-java/xalan-serializer-2.7.2-r1
@@ -5,10 +5,10 @@ EAPI=7
 HOMEPAGE=https://xalan.apache.org/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~amd64 ~arm ~arm64 ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://apache/xalan/xalan-j/source/xalan-j_2_7_2-src.tar.gz
 _eclasses_=java-utils-2	378e4cda228ea0231a0ac283cb2ad25c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	a814c0c1adac3d7902bc7023902a2e1a
-_md5_=b9f5e75e3889f27498cc28c215d8425f
+_md5_=0d0da119e81ad7a53f76eb9a10161500
diff --git a/metadata/md5-cache/dev-libs/ell-0.38 b/metadata/md5-cache/dev-libs/ell-0.38
index 4410d8a16a07..fb5f7018d17d 100644
--- a/metadata/md5-cache/dev-libs/ell-0.38
+++ b/metadata/md5-cache/dev-libs/ell-0.38
@@ -3,12 +3,13 @@ DEPEND=glib? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi
 DESCRIPTION=Embedded Linux Library provides core, low-level functionality for system daemons
 EAPI=7
 HOMEPAGE=https://01.org/ell
+INHERIT=flag-o-matic linux-info multilib-minimal
 IUSE=glib pie test kernel_linux abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc ~x86
 LICENSE=LGPL-2.1
 RDEPEND=glib? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://mirrors.edge.kernel.org/pub/linux/libs/ell/ell-0.38.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=b6f33b21368c21749ac3e3cf36354aa3
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566
+_md5_=65f3c7d97284de76210de6e678dd318e
diff --git a/metadata/md5-cache/dev-perl/Font-TTF-1.60.0-r1 b/metadata/md5-cache/dev-perl/Font-TTF-1.60.0-r1
index 0c83acebc041..fdb34e31bfd4 100644
--- a/metadata/md5-cache/dev-perl/Font-TTF-1.60.0-r1
+++ b/metadata/md5-cache/dev-perl/Font-TTF-1.60.0-r1
@@ -4,10 +4,11 @@ DEPEND=dev-lang/perl
 DESCRIPTION=module for compiling and altering fonts
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/Font-TTF
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+INHERIT=perl-module
+KEYWORDS=~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=Artistic-2 OFL-1.1
 RDEPEND=virtual/perl-IO-Compress dev-perl/IO-String dev-perl/XML-Parser dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BH/BHALLISSY/Font-TTF-1.06.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=2131bdd64cd6cd5f1c63bd62727752f3
+_md5_=75d9332546c20ea3db082d8eec1b7447
diff --git a/metadata/md5-cache/dev-python/pydot-1.4.2 b/metadata/md5-cache/dev-python/pydot-1.4.2
index 3cc5fee54134..72abd6380b69 100644
--- a/metadata/md5-cache/dev-python/pydot-1.4.2
+++ b/metadata/md5-cache/dev-python/pydot-1.4.2
@@ -5,7 +5,7 @@ EAPI=7
 HOMEPAGE=https://github.com/pydot/pydot https://pypi.org/project/pydot/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris
 LICENSE=MIT
 RDEPEND=>=dev-python/pyparsing-2.1.4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] media-gfx/graphviz python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pydot/pydot/archive/v1.4.2.tar.gz -> pydot-1.4.2.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	python-r1	6d099888c5b4dd4868c26508df307e95	distutils-r1	16579e06f8839831bd5c03455bb87e3f
-_md5_=0142e4939f2bc011c0fbc6e9b19cc348
+_md5_=586472d5f1689b767f9eecd39286f201
diff --git a/metadata/md5-cache/dev-python/snakeoil-0.9.3 b/metadata/md5-cache/dev-python/snakeoil-0.9.3
index cde59c4278f2..fc00cbe3520f 100644
--- a/metadata/md5-cache/dev-python/snakeoil-0.9.3
+++ b/metadata/md5-cache/dev-python/snakeoil-0.9.3
@@ -5,7 +5,7 @@ EAPI=7
 HOMEPAGE=https://github.com/pkgcore/snakeoil
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ppc ~ppc64 ~s390 sparc ~x86 ~x64-macos
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ppc ppc64 ~s390 sparc ~x86 ~x64-macos
 LICENSE=BSD BSD-2 MIT
 RDEPEND=dev-python/lazy-object-proxy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/snakeoil/snakeoil-0.9.3.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	python-r1	6d099888c5b4dd4868c26508df307e95	distutils-r1	16579e06f8839831bd5c03455bb87e3f
-_md5_=7f3d6e86852b92e72b82e5cea99a8927
+_md5_=4dcccc7d5082678e1293cf4a92c3cce8
diff --git a/metadata/md5-cache/dev-python/tree-sitter-0.19.0 b/metadata/md5-cache/dev-python/tree-sitter-0.19.0
index d2bad9589e9f..9d1b1529e852 100644
--- a/metadata/md5-cache/dev-python/tree-sitter-0.19.0
+++ b/metadata/md5-cache/dev-python/tree-sitter-0.19.0
@@ -5,11 +5,11 @@ EAPI=7
 HOMEPAGE=https://github.com/tree-sitter/py-tree-sitter
 INHERIT=distutils-r1
 IUSE=python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ppc ~ppc64 ~s390 sparc ~x86 ~x64-macos
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ppc ppc64 ~s390 sparc ~x86 ~x64-macos
 LICENSE=MIT
 RDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/t/tree_sitter/tree_sitter-0.19.0.tar.gz -> py-tree-sitter-0.19.0.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	python-r1	6d099888c5b4dd4868c26508df307e95	distutils-r1	16579e06f8839831bd5c03455bb87e3f
-_md5_=e6a2cd9590cebc5682c9b2d64807037d
+_md5_=9be1d20df6dde18f772a521c94005b99
diff --git a/metadata/md5-cache/dev-python/unittest-or-fail-1 b/metadata/md5-cache/dev-python/unittest-or-fail-1
index b1eb8a7eee56..184d95de5b41 100644
--- a/metadata/md5-cache/dev-python/unittest-or-fail-1
+++ b/metadata/md5-cache/dev-python/unittest-or-fail-1
@@ -5,11 +5,11 @@ EAPI=7
 HOMEPAGE=https://github.com/mgorny/unittest-or-fail/
 INHERIT=distutils-r1
 IUSE=python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD-2
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/mgorny/unittest-or-fail/archive/v1.tar.gz -> unittest-or-fail-1.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	python-r1	6d099888c5b4dd4868c26508df307e95	distutils-r1	16579e06f8839831bd5c03455bb87e3f
-_md5_=d7d3995811e68b8cf6810aff4f53a47f
+_md5_=f87ea70a9f1d20508860e7971de747d2
diff --git a/metadata/md5-cache/dev-util/pkgcheck-0.9.2-r2 b/metadata/md5-cache/dev-util/pkgcheck-0.9.2-r2
index 94073e87615a..89476773bc57 100644
--- a/metadata/md5-cache/dev-util/pkgcheck-0.9.2-r2
+++ b/metadata/md5-cache/dev-util/pkgcheck-0.9.2-r2
@@ -5,7 +5,7 @@ EAPI=7
 HOMEPAGE=https://github.com/pkgcore/pkgcheck
 INHERIT=distutils-r1 optfeature
 IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ppc ~ppc64 sparc ~x86 ~x64-macos
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ppc ppc64 sparc ~x86 ~x64-macos
 LICENSE=BSD MIT
 RDEPEND=>=dev-python/snakeoil-0.9.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <sys-apps/pkgcore-0.11.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=sys-apps/pkgcore-0.11.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/chardet[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/lazy-object-proxy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pathspec[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/tree-sitter-0.19.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pkgcheck/pkgcheck-0.9.2.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	python-r1	6d099888c5b4dd4868c26508df307e95	distutils-r1	16579e06f8839831bd5c03455bb87e3f	optfeature	6a2add34e06e5a05d88471a33ccdd73e
-_md5_=eff55b202fe0af99e94af99aa0651001
+_md5_=1f15cd428091ce069b451ee4bcd0c3ef
diff --git a/metadata/md5-cache/dev-vcs/git-2.26.3 b/metadata/md5-cache/dev-vcs/git-2.26.3
index b7ccf558d255..2050053e4e8b 100644
--- a/metadata/md5-cache/dev-vcs/git-2.26.3
+++ b/metadata/md5-cache/dev-vcs/git-2.26.3
@@ -6,7 +6,7 @@ EAPI=7
 HOMEPAGE=https://www.git-scm.com/
 INHERIT=toolchain-funcs elisp-common l10n perl-module bash-completion-r1 python-single-r1 systemd
 IUSE=+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit perforce +perl +ppcsha1 tk +threads +webdav xinetd cvs subversion test python_single_target_python3_7 python_single_target_python3_8
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~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 ~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=gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib pcre? ( pcre-jit? ( dev-libs/libpcre2[jit(+)] ) !pcre-jit? ( dev-libs/libpcre ) ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( >=app-editors/emacs-23.1:* ) iconv? ( virtual/libiconv ) gpg? ( app-crypt/gnupg ) perl? ( dev-perl/Error dev-perl/MailTools dev-perl/Authen-SASL cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite ) mediawiki? ( dev-perl/DateTime-Format-ISO8601 dev-perl/HTML-Tree dev-perl/MediaWiki-API ) subversion? ( dev-vcs/subversion[-dso(-),perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) perforce? ( python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) )
 REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) subversion? ( perl ) webdav? ( curl ) pcre-jit? ( pcre ) perforce? ( ^^ ( python_single_target_python3_7 python_single_target_python3_8 ) )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/software/scm/git/git-2.26.3.tar.xz https://www.kernel.org/pub/software/scm/git/git-manpages-2.26.3.tar.xz doc? ( https://www.kernel.org/pub/software/scm/git/git-htmldocs-2.26.3.tar.xz )
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	elisp-common	d4b53ec63c580b993ed19445f411e1d2	l10n	8cdd85e169b835d518bc2fd59f780d8e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	bash-completion-r1	be99724bde4274de21e581204e9d164a	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	python-single-r1	d3100de905f978df912135806cf27188	systemd	74b223e42834adf09a2d21fe5fe13741
-_md5_=c4aeca37a7fed45b898d2b9e7c3d2cc7
+_md5_=2f7efa17da0ad003c692ce15e9b6a139
diff --git a/metadata/md5-cache/media-fonts/x11fonts-jmk-3.0-r4 b/metadata/md5-cache/media-fonts/x11fonts-jmk-3.0-r4
index 940f6e08a1f7..e9ffc86cafc4 100644
--- a/metadata/md5-cache/media-fonts/x11fonts-jmk-3.0-r4
+++ b/metadata/md5-cache/media-fonts/x11fonts-jmk-3.0-r4
@@ -4,10 +4,11 @@ DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=This package contains character-cell fonts for use with X
 EAPI=7
 HOMEPAGE=http://www.jmknoble.net/fonts/
+INHERIT=font
 IUSE=X
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~s390 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ppc ~s390 ~sparc ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://www.pobox.com/~jmknoble/fonts/jmk-x11-fonts-3.0.tar.gz
 _eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
-_md5_=b40b9059c36764b71dfa25fc87179d0e
+_md5_=44ce7c7ca33e18077598273cc44ae391
diff --git a/metadata/md5-cache/media-gfx/fontforge-20201107 b/metadata/md5-cache/media-gfx/fontforge-20201107
index 57c3fbd3efcf..bafe1a5ef9df 100644
--- a/metadata/md5-cache/media-gfx/fontforge-20201107
+++ b/metadata/md5-cache/media-gfx/fontforge-20201107
@@ -4,13 +4,14 @@ DEPEND=dev-libs/glib:2 dev-libs/libltdl:0 dev-libs/libxml2:2= >=media-libs/freet
 DESCRIPTION=postscript font editor and converter
 EAPI=7
 HOMEPAGE=https://fontforge.org/
+INHERIT=python-single-r1 xdg cmake
 IUSE=doc truetype-debugger gif gtk jpeg png +python readline test tiff svg unicode woff2 X python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=BSD GPL-3+
 RDEPEND=dev-libs/glib:2 dev-libs/libltdl:0 dev-libs/libxml2:2= >=media-libs/freetype-2.3.7:2= gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0 ) png? ( media-libs/libpng:0= ) tiff? ( media-libs/tiff:0= ) truetype-debugger? ( >=media-libs/freetype-2.3.8:2[fontforge,-bindist(-)] ) gtk? ( >=x11-libs/gtk+-3.10:3 ) !gtk? ( X? ( >=x11-libs/cairo-1.6:0= >=x11-libs/pango-1.10:0=[X] x11-libs/libX11:0= x11-libs/libXi:0= ) ) python? ( python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) readline? ( sys-libs/readline:0= ) unicode? ( media-libs/libuninameslist:0= ) woff2? ( media-libs/woff2:0= )
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/fontforge/fontforge/releases/download/20201107/fontforge-20201107.tar.xz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=30a95df985adacc9b199f7de094e42ea
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	python-single-r1	d3100de905f978df912135806cf27188	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	cmake	314a813be2f09820e8978cdee941e501
+_md5_=7f24c0526bf7567956fdb1013c6d23b5
diff --git a/metadata/md5-cache/net-libs/libnetfilter_queue-1.0.5 b/metadata/md5-cache/net-libs/libnetfilter_queue-1.0.5
index 6a39c814e673..0c07715ec2ba 100644
--- a/metadata/md5-cache/net-libs/libnetfilter_queue-1.0.5
+++ b/metadata/md5-cache/net-libs/libnetfilter_queue-1.0.5
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://www.netfilter.org/projects/libnetfilter_queue/
 INHERIT=linux-info
 IUSE=doc static-libs kernel_linux
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~mips ppc ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=>=net-libs/libmnl-1.0.3 >=net-libs/libnfnetlink-0.0.41
 SLOT=0
 SRC_URI=https://www.netfilter.org/projects/libnetfilter_queue/files/libnetfilter_queue-1.0.5.tar.bz2
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955
-_md5_=16c1c5689892066b5978eda49bdacff6
+_md5_=58406b46ac65c20ea9050b282d733c7e
diff --git a/metadata/md5-cache/net-wireless/iwd-1.12 b/metadata/md5-cache/net-wireless/iwd-1.12
index e81ff673e4fe..85afa3679aff 100644
--- a/metadata/md5-cache/net-wireless/iwd-1.12
+++ b/metadata/md5-cache/net-wireless/iwd-1.12
@@ -3,11 +3,12 @@ DEPEND=sys-apps/dbus client? ( sys-libs/readline:0= ) ~dev-libs/ell-0.38 virtual
 DESCRIPTION=Wireless daemon for linux
 EAPI=6
 HOMEPAGE=https://git.kernel.org/pub/scm/network/wireless/iwd.git/
+INHERIT=flag-o-matic linux-info systemd
 IUSE=+client +crda +monitor ofono wired cpu_flags_x86_aes cpu_flags_x86_ssse3 standalone systemd kernel_linux
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ppc ppc64 ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=sys-apps/dbus client? ( sys-libs/readline:0= ) ~dev-libs/ell-0.38 net-wireless/wireless-regdb crda? ( net-wireless/crda ) standalone? ( systemd? ( sys-apps/systemd ) !systemd? ( virtual/resolvconf ) )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/network/wireless/iwd-1.12.tar.xz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=09ba1e2ca8bbc282a916f8c25028b218
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	e8f1ec13660dc2f44b32775765d85e42	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	systemd	74b223e42834adf09a2d21fe5fe13741
+_md5_=60829b4ee006778017f33280191609ec
diff --git a/metadata/md5-cache/sys-apps/pkgcore-0.11.4-r2 b/metadata/md5-cache/sys-apps/pkgcore-0.11.4-r2
index 7c1f14067a21..c537fa4be8cb 100644
--- a/metadata/md5-cache/sys-apps/pkgcore-0.11.4-r2
+++ b/metadata/md5-cache/sys-apps/pkgcore-0.11.4-r2
@@ -5,7 +5,7 @@ EAPI=7
 HOMEPAGE=https://github.com/pkgcore/pkgcore
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ppc ~ppc64 ~s390 sparc ~x86 ~x64-macos
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ppc ppc64 ~s390 sparc ~x86 ~x64-macos
 LICENSE=BSD MIT
 RDEPEND=dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/snakeoil-0.9.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/snakeoil-0.9.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pkgcore/pkgcore-0.11.4.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	python-r1	6d099888c5b4dd4868c26508df307e95	distutils-r1	16579e06f8839831bd5c03455bb87e3f
-_md5_=d022064540d96ac1c6611e7afb4ba454
+_md5_=fa2e7c2c3638645e78cb76982f339fa3
diff --git a/metadata/md5-cache/sys-auth/libfprint-1.90.6 b/metadata/md5-cache/sys-auth/libfprint-1.90.6
index 421180768ccb..8fe7520cc079 100644
--- a/metadata/md5-cache/sys-auth/libfprint-1.90.6
+++ b/metadata/md5-cache/sys-auth/libfprint-1.90.6
@@ -4,11 +4,12 @@ DEPEND=dev-libs/glib:2 >=dev-libs/libgusb-0.3.1 dev-libs/nss virtual/libusb:1= x
 DESCRIPTION=library to add support for consumer fingerprint readers
 EAPI=7
 HOMEPAGE=https://cgit.freedesktop.org/libfprint/libfprint/ https://github.com/freedesktop/libfprint https://gitlab.freedesktop.org/libfprint/libfprint
+INHERIT=meson udev
 IUSE=examples +introspection
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm arm64 ~ia64 ppc ppc64 ~sparc ~x86
 LICENSE=LGPL-2.1
 RDEPEND=dev-libs/glib:2 >=dev-libs/libgusb-0.3.1 dev-libs/nss virtual/libusb:1= x11-libs/gtk+:3 x11-libs/pixman x11-libs/libX11 x11-libs/libXv !>=sys-auth/libfprint-1.90:0
 SLOT=2
 SRC_URI=https://gitlab.freedesktop.org/libfprint/libfprint/-/archive/v1.90.6/libfprint-v1.90.6.tar.gz -> libfprint-1.90.6.tar.gz
-_eclasses_=meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	udev	452708c3f55cf6e918b045adb949a9e6
-_md5_=e2c401bcb23974a6f4db0b309fe4792a
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	meson	e43eef9331f54965a573ed380854ff47	udev	452708c3f55cf6e918b045adb949a9e6
+_md5_=13ffd3d038ff233215b22ad4636ff087
diff --git a/metadata/md5-cache/sys-block/di-4.48.0.1 b/metadata/md5-cache/sys-block/di-4.48.0.1
index 39658e3512bc..3a40652749ff 100644
--- a/metadata/md5-cache/sys-block/di-4.48.0.1
+++ b/metadata/md5-cache/sys-block/di-4.48.0.1
@@ -5,10 +5,10 @@ EAPI=7
 HOMEPAGE=https://diskinfo-di.sourceforge.io/
 INHERIT=toolchain-funcs
 IUSE=nls
-KEYWORDS=~amd64 ppc ~ppc64 ~x86
+KEYWORDS=~amd64 ppc ppc64 ~x86
 LICENSE=ZLIB
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/diskinfo-di/di-4.48.0.1.tar.gz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
-_md5_=edb7e60f9ad8b241b8c75ada1e1f4da8
+_md5_=34ca35b3238c1855396127e17f6e0c21
diff --git a/metadata/md5-cache/xfce-base/garcon-0.8.0 b/metadata/md5-cache/xfce-base/garcon-0.8.0
index 1adc09f73ab4..670fff4aa9c0 100644
--- a/metadata/md5-cache/xfce-base/garcon-0.8.0
+++ b/metadata/md5-cache/xfce-base/garcon-0.8.0
@@ -4,11 +4,12 @@ DEPEND=>=dev-libs/glib-2.50.0 >=x11-libs/gtk+-3.20:3 >=xfce-base/libxfce4util-4.
 DESCRIPTION=Xfce's freedesktop.org specification compatible menu implementation library
 EAPI=7
 HOMEPAGE=https://docs.xfce.org/xfce/exo/start
+INHERIT=xdg-utils
 IUSE=introspection
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=LGPL-2+ FDL-1.1+
 RDEPEND=>=dev-libs/glib-2.50.0 >=x11-libs/gtk+-3.20:3 >=xfce-base/libxfce4util-4.15.6:=[introspection?] >=xfce-base/libxfce4ui-4.15.7:=[introspection?] introspection? ( dev-libs/gobject-introspection:= )
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/xfce/garcon/0.8/garcon-0.8.0.tar.bz2
 _eclasses_=xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=247d08eb6752b6056bd5effb7dc9cefd
+_md5_=b2c943ba843783a358c536524f5c9823
diff --git a/metadata/md5-cache/xfce-base/thunar-4.16.5 b/metadata/md5-cache/xfce-base/thunar-4.16.5
index 00019868ce37..5a93673d580c 100644
--- a/metadata/md5-cache/xfce-base/thunar-4.16.5
+++ b/metadata/md5-cache/xfce-base/thunar-4.16.5
@@ -4,11 +4,12 @@ DEPEND=>=dev-libs/glib-2.50 >=x11-libs/gdk-pixbuf-2.14 >=x11-libs/gtk+-3.22:3 >=
 DESCRIPTION=File manager for the Xfce desktop environment
 EAPI=7
 HOMEPAGE=https://www.xfce.org/projects/ https://docs.xfce.org/xfce/thunar/start
+INHERIT=xdg-utils
 IUSE=exif introspection libnotify pcre +trash-panel-plugin udisks
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=GPL-2+ LGPL-2+
 RDEPEND=>=dev-libs/glib-2.50 >=x11-libs/gdk-pixbuf-2.14 >=x11-libs/gtk+-3.22:3 >=xfce-base/exo-4.15.3:= >=xfce-base/libxfce4ui-4.15.3:= >=xfce-base/libxfce4util-4.15.2:= >=xfce-base/xfconf-4.12:= exif? ( >=media-libs/libexif-0.6.19:= ) introspection? ( dev-libs/gobject-introspection:= ) libnotify? ( >=x11-libs/libnotify-0.7 ) pcre? ( >=dev-libs/libpcre-6:= ) trash-panel-plugin? ( >=xfce-base/xfce4-panel-4.10:= ) udisks? ( dev-libs/libgudev:= ) >=dev-util/desktop-file-utils-0.20-r1 x11-misc/shared-mime-info trash-panel-plugin? ( >=gnome-base/gvfs-1.18.3 ) udisks? ( virtual/udev >=gnome-base/gvfs-1.18.3[udisks,udev] )
 SLOT=0/3
 SRC_URI=https://archive.xfce.org/src/xfce/thunar/4.16/thunar-4.16.5.tar.bz2
 _eclasses_=xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=78244d83b165ca9c164aa8f5a495855b
+_md5_=380e6c61a787b68fa4d32b4a1ac8d470
diff --git a/metadata/md5-cache/xfce-base/xfce4-appfinder-4.16.1 b/metadata/md5-cache/xfce-base/xfce4-appfinder-4.16.1
index 122784acae9a..ad35bb3acba9 100644
--- a/metadata/md5-cache/xfce-base/xfce4-appfinder-4.16.1
+++ b/metadata/md5-cache/xfce-base/xfce4-appfinder-4.16.1
@@ -4,10 +4,11 @@ DEPEND=>=dev-libs/glib-2.50 >=x11-libs/gtk+-3.22:3 >=xfce-base/garcon-0.3:= >=xf
 DESCRIPTION=A tool to find and launch installed applications for the Xfce desktop
 EAPI=7
 HOMEPAGE=https://docs.xfce.org/xfce/xfce4-appfinder/start
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
+INHERIT=xdg-utils
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.50 >=x11-libs/gtk+-3.22:3 >=xfce-base/garcon-0.3:= >=xfce-base/libxfce4util-4.15.2:= >=xfce-base/libxfce4ui-4.14:=[gtk3(+)] >=xfce-base/xfconf-4.14:= !xfce-base/xfce-utils
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/xfce/xfce4-appfinder/4.16/xfce4-appfinder-4.16.1.tar.bz2
 _eclasses_=xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=28adf3872e1dced8660ad1d35c0d724a
+_md5_=7efcc4707152e298fd70cf832ff745fe
diff --git a/metadata/md5-cache/xfce-extra/xfce4-taskmanager-1.4.2 b/metadata/md5-cache/xfce-extra/xfce4-taskmanager-1.4.2
index 44c1e4a6cbc8..4eb08a299b55 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-taskmanager-1.4.2
+++ b/metadata/md5-cache/xfce-extra/xfce4-taskmanager-1.4.2
@@ -4,10 +4,11 @@ DEPEND=x11-libs/cairo x11-libs/libX11 x11-libs/libXmu x11-libs/gtk+:3 x11-libs/l
 DESCRIPTION=Easy to use task manager
 EAPI=7
 HOMEPAGE=https://goodies.xfce.org/projects/applications/xfce4-taskmanager
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+INHERIT=xdg-utils
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2+
 RDEPEND=x11-libs/cairo x11-libs/libX11 x11-libs/libXmu x11-libs/gtk+:3 x11-libs/libwnck:3
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/apps/xfce4-taskmanager/1.4/xfce4-taskmanager-1.4.2.tar.bz2
 _eclasses_=xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=69cfd5d438b10547ba87b6552db01df2
+_md5_=f1c345ffcb269b9a6c8c711f7d3821db