8 files changed, 20 insertions, 22 deletions
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index 0ea43689f1fd..100c7d90c0e9 100644
--- a/metadata/md5-cache/sys-apps/Manifest.gz
+++ b/metadata/md5-cache/sys-apps/Manifest.gz
diff --git a/metadata/md5-cache/sys-apps/earlyoom-1.7 b/metadata/md5-cache/sys-apps/earlyoom-1.7
index 4e8ce3367fd5..38edef13618a 100644
--- a/metadata/md5-cache/sys-apps/earlyoom-1.7
+++ b/metadata/md5-cache/sys-apps/earlyoom-1.7
@@ -10,5 +10,5 @@ LICENSE=MIT-with-advertising
 RESTRICT=!test? ( test ) strip
 SLOT=0
 SRC_URI=https://github.com/rfjakob/earlyoom/archive/v1.7.tar.gz -> earlyoom-1.7.tar.gz test? ( https://dev.gentoo.org/~sam/distfiles/sys-apps/earlyoom/earlyoom-1.7-deps.tar.xz )
-_eclasses_=go-module	a13d34fe4e2996720e1ca6c53b9ea95a	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_eclasses_=go-module	05668e36c51c78c9681fdf4aefa0abec	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961
 _md5_=5f8dcfcaffef40d4cc368783a4eff8da
diff --git a/metadata/md5-cache/sys-apps/earlyoom-9999 b/metadata/md5-cache/sys-apps/earlyoom-9999
index ac7cfe29b0d8..a594d801b811 100644
--- a/metadata/md5-cache/sys-apps/earlyoom-9999
+++ b/metadata/md5-cache/sys-apps/earlyoom-9999
@@ -9,5 +9,5 @@ LICENSE=MIT-with-advertising
 PROPERTIES=live
 RESTRICT=!test? ( test ) strip
 SLOT=0
-_eclasses_=git-r3	b9ac6f96d2a88edb5b351df634dc5e53	go-module	a13d34fe4e2996720e1ca6c53b9ea95a	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_eclasses_=git-r3	b9ac6f96d2a88edb5b351df634dc5e53	go-module	05668e36c51c78c9681fdf4aefa0abec	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961
 _md5_=5f8dcfcaffef40d4cc368783a4eff8da
diff --git a/metadata/md5-cache/sys-apps/grep-3.7_p20220425 b/metadata/md5-cache/sys-apps/grep-3.7_p20220425
deleted file mode 100644
index b4635af4edf4..000000000000
--- a/metadata/md5-cache/sys-apps/grep-3.7_p20220425
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig nls? ( sys-devel/gettext ) verify-sig? ( sec-keys/openpgp-keys-grep ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=configure prepare unpack
-DEPEND=!static? ( pcre? ( >=dev-libs/libpcre2-7.8-r1 ) sparc? ( dev-libs/libsigsegv ) ) nls? ( virtual/libintl ) virtual/libiconv static? ( pcre? ( >=dev-libs/libpcre2-7.8-r1[static-libs(+)] ) sparc? ( dev-libs/libsigsegv ) )
-DESCRIPTION=GNU regular expression matcher
-EAPI=7
-HOMEPAGE=https://www.gnu.org/software/grep/
-INHERIT=flag-o-matic verify-sig
-IUSE=nls pcre static verify-sig
-LICENSE=GPL-3+
-RDEPEND=!static? ( pcre? ( >=dev-libs/libpcre2-7.8-r1 ) sparc? ( dev-libs/libsigsegv ) ) nls? ( virtual/libintl ) virtual/libiconv
-REQUIRED_USE=static? ( !sparc )
-SLOT=0
-SRC_URI=https://meyering.net/grep/grep-3.7.62-9a668.tar.xz verify-sig? ( https://meyering.net/grep/grep-3.7.62-9a668.tar.xz.sig )
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	verify-sig	0748d665fa664a87add00152ed046e16	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=474ab3359b8c7bdfc71d10314bc19811
diff --git a/metadata/md5-cache/sys-apps/grep-3.7_p20220702 b/metadata/md5-cache/sys-apps/grep-3.8
index d96316c1b15e..8c9965032218 100644
--- a/metadata/md5-cache/sys-apps/grep-3.7_p20220702
+++ b/metadata/md5-cache/sys-apps/grep-3.8
@@ -6,10 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.gnu.org/software/grep/
 INHERIT=flag-o-matic verify-sig
 IUSE=nls pcre static verify-sig
+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-3+
 RDEPEND=!static? ( pcre? ( >=dev-libs/libpcre2-7.8-r1 ) sparc? ( dev-libs/libsigsegv ) ) nls? ( virtual/libintl ) virtual/libiconv
 REQUIRED_USE=static? ( !sparc )
 SLOT=0
-SRC_URI=https://meyering.net/grep/grep-3.7.98-c9ac.tar.xz verify-sig? ( https://meyering.net/grep/grep-3.7.98-c9ac.tar.xz.sig )
+SRC_URI=mirror://gnu/grep/grep-3.8.tar.xz verify-sig? ( mirror://gnu/grep/grep-3.8.tar.xz.sig )
 _eclasses_=flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961	verify-sig	0748d665fa664a87add00152ed046e16
 _md5_=828c16dfbafc92dc58ce3453517d4501
diff --git a/metadata/md5-cache/sys-apps/less-608 b/metadata/md5-cache/sys-apps/less-608
new file mode 100644
index 000000000000..b0a60a9b5310
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/less-608
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install preinst
+DEPEND=>=app-misc/editor-wrapper-3 >=sys-libs/ncurses-5.2:0= pcre? ( dev-libs/libpcre2 )
+DESCRIPTION=Excellent text file viewer
+EAPI=7
+HOMEPAGE=http://www.greenwoodsoftware.com/less/
+IUSE=pcre unicode
+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-3 BSD-2 )
+RDEPEND=>=app-misc/editor-wrapper-3 >=sys-libs/ncurses-5.2:0= pcre? ( dev-libs/libpcre2 )
+SLOT=0
+SRC_URI=http://www.greenwoodsoftware.com/less/less-608.tar.gz
+_md5_=a3084c403e21dfe16eb0729cdae29dc0
diff --git a/metadata/md5-cache/sys-apps/merge-usr-0 b/metadata/md5-cache/sys-apps/merge-usr-0
index a5dfa2952058..0dea9a1743de 100644
--- a/metadata/md5-cache/sys-apps/merge-usr-0
+++ b/metadata/md5-cache/sys-apps/merge-usr-0
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://github.com/floppym/merge-usr
 INHERIT=python-single-r1
 IUSE=python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~arm ~arm64 ~s390 ~sparc
 LICENSE=GPL-2+
 RDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
 REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
 SLOT=0
 SRC_URI=https://github.com/floppym/merge-usr/archive/refs/tags/v0.tar.gz -> merge-usr-0.tar.gz
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=fdd9c7233e3f392e1b6cea3ade5dff83
+_md5_=f76c87e289778b02b7053c18bf8bb01c
diff --git a/metadata/md5-cache/sys-apps/rootlesskit-0.14.2 b/metadata/md5-cache/sys-apps/rootlesskit-0.14.2
index 713a10fe98b1..86efcc09ef11 100644
--- a/metadata/md5-cache/sys-apps/rootlesskit-0.14.2
+++ b/metadata/md5-cache/sys-apps/rootlesskit-0.14.2
@@ -1,4 +1,4 @@
-BDEPEND=>=dev-lang/go-1.16 app-arch/unzip
+BDEPEND=>=dev-lang/go-1.18 app-arch/unzip
 DEFINED_PHASES=prepare unpack
 DESCRIPTION=Linux-native "fake root" for implementing rootless containers
 EAPI=7
@@ -11,5 +11,5 @@ RDEPEND=selinux? ( sec-policy/selinux-rootlesskit )
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://github.com/rootless-containers/rootlesskit/archive/refs/tags/v0.14.2.tar.gz -> rootlesskit-0.14.2.tar.gz https://dev.gentoo.org/~zmedico/dist/rootlesskit-0.14.2-deps.tar.xz
-_eclasses_=go-module	a13d34fe4e2996720e1ca6c53b9ea95a
+_eclasses_=go-module	05668e36c51c78c9681fdf4aefa0abec
 _md5_=dd92e3806ac629070c168bd6c6d0289e