gentoo resync : 12.05.2022

12 files changed, 22 insertions, 12 deletions

diff --git a/metadata/md5-cache/sci-calculators/Manifest.gz b/metadata/md5-cache/sci-calculators/Manifest.gz
index 2f3be89e0197..5c612e622c52 100644
--- a/metadata/md5-cache/sci-calculators/Manifest.gz
+++ b/metadata/md5-cache/sci-calculators/Manifest.gz
diff --git a/metadata/md5-cache/sci-calculators/calcoo-1.3.18-r1 b/metadata/md5-cache/sci-calculators/calcoo-1.3.18-r1
index 600cabd09f8e..7da9a5ace3b9 100644
--- a/metadata/md5-cache/sci-calculators/calcoo-1.3.18-r1
+++ b/metadata/md5-cache/sci-calculators/calcoo-1.3.18-r1
@@ -3,10 +3,11 @@ DEPEND=x11-libs/gtk+:2 virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-p
 DESCRIPTION=Scientific calculator designed to provide maximum usability
 EAPI=6
 HOMEPAGE=http://calcoo.sourceforge.net/
+INHERIT=autotools desktop
 KEYWORDS=~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=x11-libs/gtk+:2
 SLOT=0
 SRC_URI=mirror://sourceforge/calcoo/calcoo-1.3.18.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_=0cb2d318122366ebd966713ff9e5967c
+_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_=9a95b2ffd4ca8c94ffcc83156484bda8
diff --git a/metadata/md5-cache/sci-calculators/grpn-1.4.0 b/metadata/md5-cache/sci-calculators/grpn-1.4.0
index ea240346efed..fafa32c450cf 100644
--- a/metadata/md5-cache/sci-calculators/grpn-1.4.0
+++ b/metadata/md5-cache/sci-calculators/grpn-1.4.0
@@ -3,10 +3,11 @@ DEPEND=x11-libs/gtk+:2 x11-libs/libX11 virtual/pkgconfig
 DESCRIPTION=A reverse polish notation (RPN) calculator based on GTK+ and libmath
 EAPI=6
 HOMEPAGE=http://www.getreu.net/
+INHERIT=eutils toolchain-funcs
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=x11-libs/gtk+:2 x11-libs/libX11
 SLOT=0
 SRC_URI=http://www.getreu.net/public/downloads/software/grpn/grpn-1.4.0/grpn_1.4.0-1.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=d1f63372edb64bef43f4cf31f4eaaa77
diff --git a/metadata/md5-cache/sci-calculators/hcalc-1.2-r1 b/metadata/md5-cache/sci-calculators/hcalc-1.2-r1
index b9738d1ad1b9..dd3fb43c8ff3 100644
--- a/metadata/md5-cache/sci-calculators/hcalc-1.2-r1
+++ b/metadata/md5-cache/sci-calculators/hcalc-1.2-r1
@@ -4,10 +4,11 @@ DEPEND=x11-libs/libX11 x11-libs/libXpm
 DESCRIPTION=DJ's Hex Calculator
 EAPI=7
 HOMEPAGE=http://www.delorie.com/store/hcalc/ https://github.com/jlec/hcalc
+INHERIT=cmake
 KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=x11-libs/libX11 x11-libs/libXpm
 SLOT=0
 SRC_URI=https://github.com/downloads/jlec/hcalc/hcalc-1.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_=64b79c7ffaaf855ebf3acad49406dbaf
diff --git a/metadata/md5-cache/sci-calculators/keurocalc-1.3.0 b/metadata/md5-cache/sci-calculators/keurocalc-1.3.0
index f5132022dba2..289c0d2394dc 100644
--- a/metadata/md5-cache/sci-calculators/keurocalc-1.3.0
+++ b/metadata/md5-cache/sci-calculators/keurocalc-1.3.0
@@ -4,11 +4,12 @@ DEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.
 DESCRIPTION=Universal currency converter and calculator
 EAPI=7
 HOMEPAGE=https://apps.kde.org/keurocalc/ https://userbase.kde.org/KEuroCalc
+INHERIT=ecm kde.org
 IUSE=debug +handbook
 KEYWORDS=~amd64
 LICENSE=GPL-2+ FDL-1.2
 RDEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 !sci-calculators/keurocalc:4 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/keurocalc/keurocalc-1.3.0.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_=641067253e44389edeb731f7bd1251c9
diff --git a/metadata/md5-cache/sci-calculators/orpie-1.6.1 b/metadata/md5-cache/sci-calculators/orpie-1.6.1
index 070279211dd9..8a58df889ce7 100644
--- a/metadata/md5-cache/sci-calculators/orpie-1.6.1
+++ b/metadata/md5-cache/sci-calculators/orpie-1.6.1
@@ -4,11 +4,12 @@ DEPEND=dev-ml/gsl-ocaml:= dev-ml/curses:= dev-ml/num:= dev-ml/camlp5:= >=dev-lan
 DESCRIPTION=A fullscreen RPN calculator for the console
 EAPI=7
 HOMEPAGE=http://pessimization.com/software/orpie/
+INHERIT=dune
 IUSE=+ocamlopt
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=dev-ml/gsl-ocaml:= dev-ml/curses:= dev-ml/num:= dev-ml/camlp5:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0
 SRC_URI=https://github.com/pelzlpj/orpie/archive/release-1.6.1.tar.gz
-_eclasses_=dune	c8f275f00adf2380fe0a57d8a249885c	multiprocessing	61c959fc55c15c00bbb1079d6a71370b
+_eclasses_=dune	c8f275f00adf2380fe0a57d8a249885c	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
 _md5_=2c3d7e0806d1f4ada2e6a67169b8c756
diff --git a/metadata/md5-cache/sci-calculators/speedcrunch-0.12.0-r1 b/metadata/md5-cache/sci-calculators/speedcrunch-0.12.0-r1
index 5ad0c0031be1..f9171f0d0cf7 100644
--- a/metadata/md5-cache/sci-calculators/speedcrunch-0.12.0-r1
+++ b/metadata/md5-cache/sci-calculators/speedcrunch-0.12.0-r1
@@ -4,11 +4,12 @@ DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qthelp:5 dev-qt/qtwidgets:5
 DESCRIPTION=Fast and usable calculator for power users
 EAPI=7
 HOMEPAGE=https://speedcrunch.org/
+INHERIT=cmake desktop xdg-utils
 IUSE=doc
 KEYWORDS=amd64 ~arm64 x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qthelp:5 dev-qt/qtwidgets:5
 SLOT=0
 SRC_URI=https://bitbucket.org/heldercorreia/speedcrunch/get/release-0.12.0.tar.gz -> speedcrunch-0.12.0.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-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-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=bb4b9d3558b42063daeb6d1d961f06df
diff --git a/metadata/md5-cache/sci-calculators/tiemu-3.03-r1 b/metadata/md5-cache/sci-calculators/tiemu-3.03-r1
index a114a74ba8c4..2164b05c833d 100644
--- a/metadata/md5-cache/sci-calculators/tiemu-3.03-r1
+++ b/metadata/md5-cache/sci-calculators/tiemu-3.03-r1
@@ -3,11 +3,12 @@ DEPEND=sci-libs/libticables2 sci-libs/libticalcs2 sci-libs/libtifiles2 sci-libs/
 DESCRIPTION=Texas Instruments hand-helds emulator
 EAPI=6
 HOMEPAGE=http://lpg.ticalc.org/prj_tiemu/
+INHERIT=eutils
 IUSE=dbus nls sdl threads xinerama
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=sci-libs/libticables2 sci-libs/libticalcs2 sci-libs/libtifiles2 sci-libs/libticonv gnome-base/libglade:2.0 x11-libs/gtk+:2 dbus? ( >=dev-libs/dbus-glib-0.60 ) nls? ( virtual/libintl ) sdl? ( media-libs/libsdl ) xinerama? ( x11-libs/libXinerama )
 SLOT=0
 SRC_URI=http://repo.calcforge.org/debian/source/tiemu_3.03.orig.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=0f4968cf9b37fbd3dec68eb4f1eb5ee1
diff --git a/metadata/md5-cache/sci-calculators/tilp2-1.18 b/metadata/md5-cache/sci-calculators/tilp2-1.18
index e9de55f42a3f..9f98d9f73bdc 100644
--- a/metadata/md5-cache/sci-calculators/tilp2-1.18
+++ b/metadata/md5-cache/sci-calculators/tilp2-1.18
@@ -3,11 +3,12 @@ DEPEND=dev-libs/glib:2 gnome-base/libglade:2.0 >=sci-libs/libticalcs2-1.1.9 >=sc
 DESCRIPTION=Communication program for Texas Instruments calculators
 EAPI=6
 HOMEPAGE=http://lpg.ticalc.org/prj_tilp
+INHERIT=autotools xdg
 IUSE=nls static-libs
 KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 gnome-base/libglade:2.0 >=sci-libs/libticalcs2-1.1.9 >=sci-libs/libticables2-1.3.5 >=sci-libs/libtifiles2-1.1.7 >=sci-libs/libticonv-1.1.5 x11-libs/gtk+:2 nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=mirror://sourceforge/tilp/tilp2-linux/tilp2-1.18.tar.bz2
-_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	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_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	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=9be2433ba49714c4e9429920dafe67e5
diff --git a/metadata/md5-cache/sci-calculators/units-2.21 b/metadata/md5-cache/sci-calculators/units-2.21
index 32a583b930c2..31aff6019469 100644
--- a/metadata/md5-cache/sci-calculators/units-2.21
+++ b/metadata/md5-cache/sci-calculators/units-2.21
@@ -3,6 +3,7 @@ DEPEND=sys-libs/readline:= units-cur? ( python_targets_python3_8? ( >=dev-lang/p
 DESCRIPTION=Unit conversion program
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/units/units.html
+INHERIT=python-r1
 IUSE=+units-cur python_targets_python3_8 python_targets_python3_9
 KEYWORDS=~alpha amd64 ~arm ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=FDL-1.3 GPL-3
@@ -10,5 +11,5 @@ RDEPEND=sys-libs/readline:= units-cur? ( python_targets_python3_8? ( >=dev-lang/
 REQUIRED_USE=units-cur? ( || ( python_targets_python3_8 python_targets_python3_9 ) )
 SLOT=0
 SRC_URI=mirror://gnu/units/units-2.21.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_=93d07e27d35eb991687bce5a2d0e2902
diff --git a/metadata/md5-cache/sci-calculators/wcalc-2.5 b/metadata/md5-cache/sci-calculators/wcalc-2.5
index 02a3b0b768dd..af912013b5af 100644
--- a/metadata/md5-cache/sci-calculators/wcalc-2.5
+++ b/metadata/md5-cache/sci-calculators/wcalc-2.5
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/gmp:0= dev-libs/mpfr:0= readline? ( sys-libs/readline:0= )
 SLOT=0
 SRC_URI=mirror://sourceforge/w-calc/wcalc-2.5.tar.bz2
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	desktop	c0d27bf73aa08ca05b663dbd31fbef28	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	desktop	c0d27bf73aa08ca05b663dbd31fbef28	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=779f8b6b08d0d62c97904f290637fca8
diff --git a/metadata/md5-cache/sci-calculators/xsv-0.13.0 b/metadata/md5-cache/sci-calculators/xsv-0.13.0
index 4e94b3b9bc53..8ea0d2930cac 100644
--- a/metadata/md5-cache/sci-calculators/xsv-0.13.0
+++ b/metadata/md5-cache/sci-calculators/xsv-0.13.0
@@ -3,10 +3,11 @@ DEFINED_PHASES=compile configure install prepare test unpack
 DESCRIPTION=A fast CSV command line toolkit written in Rust
 EAPI=7
 HOMEPAGE=https://github.com/BurntSushi/xsv
+INHERIT=cargo
 IUSE=debug
 KEYWORDS=~amd64
 LICENSE=|| ( MIT Unlicense ) Apache-2.0 Boost-1.0 MIT Unlicense
 SLOT=0
 SRC_URI=https://crates.io/api/v1/crates/aho-corasick/0.7.18/download -> aho-corasick-0.7.18.crate https://crates.io/api/v1/crates/autocfg/1.0.1/download -> autocfg-1.0.1.crate https://crates.io/api/v1/crates/bstr/0.2.16/download -> bstr-0.2.16.crate https://crates.io/api/v1/crates/byteorder/1.4.3/download -> byteorder-1.4.3.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/chan/0.1.23/download -> chan-0.1.23.crate https://crates.io/api/v1/crates/csv/1.1.6/download -> csv-1.1.6.crate https://crates.io/api/v1/crates/csv-core/0.1.10/download -> csv-core-0.1.10.crate https://crates.io/api/v1/crates/csv-index/0.1.6/download -> csv-index-0.1.6.crate https://crates.io/api/v1/crates/docopt/1.1.1/download -> docopt-1.1.1.crate https://crates.io/api/v1/crates/filetime/0.1.15/download -> filetime-0.1.15.crate https://crates.io/api/v1/crates/fuchsia-cprng/0.1.1/download -> fuchsia-cprng-0.1.1.crate https://crates.io/api/v1/crates/hermit-abi/0.1.18/download -> hermit-abi-0.1.18.crate https://crates.io/api/v1/crates/itoa/0.4.7/download -> itoa-0.4.7.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.97/download -> libc-0.2.97.crate https://crates.io/api/v1/crates/log/0.4.14/download -> log-0.4.14.crate https://crates.io/api/v1/crates/memchr/2.4.0/download -> memchr-2.4.0.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/proc-macro2/1.0.27/download -> proc-macro2-1.0.27.crate https://crates.io/api/v1/crates/quickcheck/0.6.2/download -> quickcheck-0.6.2.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.3.23/download -> rand-0.3.23.crate https://crates.io/api/v1/crates/rand/0.4.6/download -> rand-0.4.6.crate https://crates.io/api/v1/crates/rand_core/0.3.1/download -> rand_core-0.3.1.crate https://crates.io/api/v1/crates/rand_core/0.4.2/download -> rand_core-0.4.2.crate https://crates.io/api/v1/crates/rdrand/0.4.0/download -> rdrand-0.4.0.crate https://crates.io/api/v1/crates/redox_syscall/0.1.57/download -> redox_syscall-0.1.57.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/ryu/1.0.5/download -> ryu-1.0.5.crate https://crates.io/api/v1/crates/serde/1.0.126/download -> serde-1.0.126.crate https://crates.io/api/v1/crates/serde_derive/1.0.126/download -> serde_derive-1.0.126.crate https://crates.io/api/v1/crates/streaming-stats/0.2.3/download -> streaming-stats-0.2.3.crate https://crates.io/api/v1/crates/strsim/0.10.0/download -> strsim-0.10.0.crate https://crates.io/api/v1/crates/syn/1.0.73/download -> syn-1.0.73.crate https://crates.io/api/v1/crates/tabwriter/1.2.1/download -> tabwriter-1.2.1.crate https://crates.io/api/v1/crates/threadpool/1.8.1/download -> threadpool-1.8.1.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/winapi/0.3.9/download -> winapi-0.3.9.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 https://github.com/BurntSushi/xsv/archive/refs/tags/0.13.0.tar.gz -> xsv-0.13.0.tar.gz
-_eclasses_=cargo	52a92ed3815080c5f2caac1905687b1c	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=cargo	52a92ed3815080c5f2caac1905687b1c	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=ceb1a9cf8b5fad3c47cc20f0c3563a72