gentoo auto-resync : 07:05:2023 - 05:35:45

37 files changed, 289 insertions, 153 deletions

diff --git a/Manifest b/Manifest
index b3a05667a537..e623ade7cbf9 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29483 BLAKE2B 0e833ff8de3158a2085943ae1f3bd2e818ff8c5bd002bdd11208dacfeebe5b5711904574831f0724ccfec2ad13e8f8f8a8ea4cb5015404c92436b1a8bdbdbfae SHA512 9d800a853f280b5c91f6c764719c158750a29eea5f9a1da9ffcdfec905d97fed325ba4759ae2259ce044a01b1f4d57e151b893d6ee042bb96ab297ba3fe57498
-TIMESTAMP 2023-05-06T22:09:45Z
+MANIFEST Manifest.files.gz 29490 BLAKE2B 333ef04e1251f121d3ea337c85e1f791d3bdf75bc3010ee9e42d471d976d5aaa8265ec143f3039f7b23085ff9e40ea7b32e188de6ed84e5e6830df8b04953514 SHA512 8834b6a2004e7db7c7f9a770c35dea0db82c46dce07a42526e017b3f6a3136f98a656e3692b0adb01bc18f19042c334a63d2efb263d2e86becb2ef541e6ed35f
+TIMESTAMP 2023-05-07T04:09:44Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmRW0ClfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmRXJIhfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCQuA//R73AJe3fxlygYrvSZPiUxGrZhv3uKDwBTQnw/8wS3jX0ZWBjNQBqoNt8
-EGXk72VDkiyMMYEhS3pYB8SYcdI0iIQJDxpQCk+rgQDkvG6yhcqFdnfU8xWHvYQR
-JZYtkpG8G5pKB+255ZB1Cy1dVXKQLYSYD6CRHYNCrl4cCOn6FTwnmz3xnqz4ltVJ
-FzGefLy96OKLQB2cysltI06VQnyKy8BS5Avlio5mQwWtv+BCsMKltFC3NzFL4udl
-QDNbLBvAhsGGKC9BCAswvXskYoWU5dPQichm+iRAzmXMYW16CczOp88GhTsxadab
-AJMZLZskWRAVXcupuXA3dEnGmHF7Cilh96X6YDiQ5siucRlkChG9f45PaQlNKVZI
-ts9LkSxhVTo9AHTxhrO3dU/spVy76R6qy6Qd+v+dTbOkfY9pRcksKZqKzJJXnw0+
-TWKBWptptxy19MF6h1jji3JqV3ssZor6wlf+2HI1HlI+ZXjtisglLQa6/30RJpVQ
-kQnaRHb44UIMm3CqE/68P2y4uNVPhvkzgwFGF46FbszLrn0m21lLOe+muldyauff
-V6CKF2ZxoS10hnXBCRTDOaRw0+vUpdSRQT5YIncw+XWryock6l8Y42VUGXeam1LC
-on8/zNMWYjBez9GmXFbE4Ew47cG3GA7d1x4eidqVLwxUs2G7yrU=
-=FvY6
+klAEEQ/+I7x2LneIQ2O/EAk2tVWNjivcPz5t6EnoITFhsbxvKU+sGD+A1CqXmBsC
+mbHqBQNCYWuIbSy4wyZ+nAcorG0+jl/EANkS0qwaxPmvIb8iIbm1eZJ1hNvz5vrf
+ze24JfLO5nFcnDtDEugLmLz1pGvT9oYbupZJqZnWl7ORCbXVj8sBBSeQY/QRBFtS
+H6yvGbaIOjregYFuVRhv9tKgEODhjCVbQPsy1pyJ+XcSrtK2sD98Isbk1apm5ZtX
+l/mIWqDRXRXEWCajAtrpi+arh00YpjHLYChrEvHRn7T/ljjSo+8rEUVu5GmtLsQo
+jbc3XTBeTZp2WMkRbQM0YNE3fitIL+syAJdqKhYE0opmu5dAdEmPRoh9cYEKBPoC
+Hy2jImg5rjpLEX3H7wNH4SGyuZsJBDYrZTNrcu260tG7d3KJ83rOVYLa3Bm569Qy
+lE0AzOsnhz3kKNl9NnQkn6z/GmPZ+ioW4rc0nMaJV4tukwW4JoQjPxwW4iI1uL4x
+zVDq2UEO7YSrie1SwZInYXKlQvjhCyVd3rS3YO7XM+W4KQ1SY4Ze16FGid5o+2IK
+w0kPD/33Oy+wph45OyIGcJbGoEHyx2S32xlnNNdvh3LBkf3xHIefOF4lp9fupcF5
+hYdXWF4PbII2sZECBgTojm5GBjcLj7c/n02cHGduiv0MmaWZjqM=
+=5ArU
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index a00067564339..7c3c9cc2433e 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 5d8a487134f3..0d00ccffc84c 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/gexiv2/Manifest b/media-libs/gexiv2/Manifest
index 5450325dc123..258f141d199a 100644
--- a/media-libs/gexiv2/Manifest
+++ b/media-libs/gexiv2/Manifest
@@ -1,4 +1,6 @@
 AUX 0.14.0-clean-up-python-support.patch 7005 BLAKE2B 623b003ab5c03ed86585ac662c5ddae0857bc09ddf28f5a42ea40f60601758111bcb408f38bfaa1aa081d882750d343eef355977da2ee84b3a9675d560243e11 SHA512 3de9ec1e11e859b393e16ae9d6a15e98157869b8b9cb2e939e8642eb4f38e9aaca05c969094dae001425475113ce4dc0224d3bcffd72a581b310174d039d1fd8
 DIST gexiv2-0.14.0.tar.xz 387288 BLAKE2B bdbb4547486a248cd9c6559276ebac20d3af5211474b86eb6ebfb3a8c76670ff7c2d162435e0cbcb270f96c64f5bc1eedc2d63c021b65f57e1ad9ec8cf9a4bf8 SHA512 d745ae2d8ddcf0c8a2a7980eaa489f9b520af54242c5e4ddded9c3ae4a579c824c8cb659bd7e985ffa09f9fe37bdf73d6d9181d456711e0953b73023eb0f9f50
+DIST gexiv2-0.14.1.tar.xz 387604 BLAKE2B 5939e377d8b20cfa0c000b1fb0311a0a904acb35b5cbb7841e9def80b20b79f42393524e761fa0d20dba5095b55b46a712759569eb869b832190f7448896de82 SHA512 f510e49c0b2633bcc370ca21af0822032f04f5d5b57c7f76807797601b0a98b7749fdf68df37a405c9d90734adf75282a3dad59c24830874f64f7bd33152052d
 EBUILD gexiv2-0.14.0.ebuild 1876 BLAKE2B 46df7ac87775001557d46b06e9bda3439054c1457f246984ffcc2cb1ca4e7b8c8c27f41d446331bd36c92486a18f366b7c6ba59757643bdf658664ba182f7d3a SHA512 a02d4cea39bcef8f5483e8bd7a260fabe78facf73812b9f79649388782a5d0710163d619cc6d7f8371115f32fbcee8efad6aba9dfc9cc6379c1ed70201e59845
+EBUILD gexiv2-0.14.1.ebuild 1775 BLAKE2B 81f6bedcc51ad8d888dc13e9be2f1b55ee4805c1adcd0a085e1ade452fe90d5faa8b76e7744e86270a56cb7d377925b83334753266cf5b59462d727378a0cb24 SHA512 718cf944d611821ad2853f4aa6054a5358a81fe8adf0b0b8200133e8dc95264f8e0c74da729dc116caa3244d540374fa5d6061e8d633202ce45421eba1bbd358
 MISC metadata.xml 615 BLAKE2B 76b7eab8ca423cb9a816de9ee01bcf7211b14da002292e95bda41db4ed779523b97b95115803ab10ba6b4117c03ff1fd83308d6eac111c1a7813620cc5c56080 SHA512 0a85fe161f01d944a319018dd1dd63b96eafb1d83f3547c707498697dc554088c5ab9fa8fd978a326357fc8a78728e548da2f16b2ccfdcbd2b6c68c5d3623f85
diff --git a/media-libs/gexiv2/gexiv2-0.14.1.ebuild b/media-libs/gexiv2/gexiv2-0.14.1.ebuild
new file mode 100644
index 000000000000..3d6e9af9775e
--- /dev/null
+++ b/media-libs/gexiv2/gexiv2-0.14.1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit gnome.org meson python-r1 vala
+
+DESCRIPTION="GObject-based wrapper around the Exiv2 library"
+HOMEPAGE="https://wiki.gnome.org/Projects/gexiv2"
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/gexiv2.git"
+	inherit git-r3
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+LICENSE="LGPL-2.1+ GPL-2"
+SLOT="0"
+IUSE="gtk-doc +introspection python test +vala"
+REQUIRED_USE="
+	python? ( introspection ${PYTHON_REQUIRED_USE} )
+	test? ( python introspection )
+	vala? ( introspection )
+"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=media-gfx/exiv2-0.26:=
+	>=dev-libs/glib-2.46.0:2
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+	python? (
+		${PYTHON_DEPS}
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/glib-utils
+	gtk-doc? (
+		dev-util/gtk-doc
+		app-text/docbook-xml-dtd:4.3
+	)
+	test? ( media-gfx/exiv2[xmp] )
+	virtual/pkgconfig
+	vala? ( $(vala_depend) )
+"
+src_prepare() {
+	default
+	use vala && vala_setup
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use test tests)
+		$(meson_use gtk-doc gtk_doc)
+		$(meson_use introspection)
+		$(meson_use vala vapi)
+		-Dtools=false # requires vala, freshly promoted tool that some other distros don't ship yet either
+		# Prevents installation of python modules (uses install_data from meson
+		# which does not optimize the modules)
+		-Dpython3=false
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	if use python ; then
+		python_moduleinto gi/overrides/
+		python_foreach_impl python_domodule GExiv2.py
+		python_foreach_impl python_optimize
+	fi
+}
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 58a911dcd429..67b9b65cdfb1 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index e921c804a905..806685dd8f2c 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Sat, 06 May 2023 22:09:40 +0000
+Sun, 07 May 2023 04:09:40 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index baf00b2cfec9..096e1ef99114 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 543888 BLAKE2B da15fb010da91c403608af1847df77a89c9a8a24b2f5c1999256191c31d7755cd7667c19867e75c2bbdd07063f4ce4dd641cf53415eb08b83e35cbb3d2cd35e2 SHA512 ac5e51b2bf8075889870e4eedfe469274eaf28945ed1e974bc76ae0576dc1aa0db2a5fdacfc15e8cfb28486195fad65b487cf50896a207c5fcad4ffae850adbc
-TIMESTAMP 2023-05-06T22:09:44Z
+TIMESTAMP 2023-05-07T04:09:43Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmRW0ChfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmRXJIdfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klAedg//fIK0XxFSafHb0U9VVc9E4wEBQQLRZ8IOG4ArDqYS4rzjse1CK1t9L7Rf
-d5RoeOQodRJDu/OLz4O7fJG3yxcTjv0iZxH6vqB1Q3P6zs7sK//nay3XKSLnyxQ5
-Psrs24j2aqZbzNqk5M52QgjsN1eJ61ojXkksvj47A2CdXHKKeKxataJECtHrvKNV
-fZR0WIQWdPiqaYq+dr56PLxDm9puSYNVeHnLS4/Q24D4u69GWOxItNt7yBKgQuQF
-R0XHN9aaUQHCVwzkcdDpA52NRgSKojuaaiaNW51XACTAS3dcZDivnC9xSNU9L7E4
-aT+l9lde6Yp3t9tLVA/mDzrr62zOk5RYj9GAK/qGPcHGRvc7a0nWe0S7iqi44gXM
-b53P2m9X5nughef9+1izCMDifSZOmtU0a9YYU+Vt2T9FfECv2CDXEc1SFWV2mgoL
-sns7F36IRgOZVhjMVg5eFbwnh6giszWdr58iWE5izJ5AU8V0hjkiWGLDegcU5CPU
-zqDq0lb0g3BAmI2g+8meGsSS5xu9Chyu10XTAk08KdPZSBLIf9iIfAjyX+pxgP1W
-oPXbabPcc3TY8iGiCOjZgWGPbvOiDqxjS1RjayKdlQhBjHIMlGsAep5krTz+bprJ
-qQo1g1bGvAycL8gXaaj1/v4ucHjOlyEPW0hVyXNRE/yyyeVmjzM=
-=0unM
+klDSghAAoZ1sobaftJkPInBcAy89gLqJ2riw6teI4GqAj0EsshZe6dNwSHtTRiUh
+kT70FvmyEIQ4sDJHXbloLCKHwPRjIEhw1/MRMonxemefGx88KqGu2zBds5M3GY85
+M6xNzM3ukmRRnJ3DwrF0FyhlVAiePsG7IsFWgirEj7CoidEmun5Sazf2bHtxd6ej
+CxQJO8ox/ENIL2O9gQM1Eb7wygIP3Acndg2FRnT7wIdpM26JVmJnOyWaa0e1Q+TC
+RLPyzxIIr3Ao0CSOALLNiR+KcPNmaq9HP1EQvGK5BbVkZeo68+xyw3i0RY6sjVuX
+zyHfE70rXlnwPUHlmzfpHYjvWF5C8zpo/VzhiOrcLjCUOr4jjS5+iMlW9uirmeIb
+FB6oAzNephPGmucSu2oigqYK/0Fe5e9+5mnnbT+mgSx8JKiMdPCRKqWsTMFBOLaF
+aWV91WLHb15DTwqptZQkiUWmS1lgCVLFIPTJXxiGLbJubmyvv2GERG2mkzMSuP+7
+dHsxoBtwC6v5eTRjGlxBW/3TfSD1janyy8FvUA5usovaV/n1/j8NQf35Ofcw3SVI
+CKp0iwJfImC4zewGFpmD7Cfw5Mv/q1QgmSTh5hzbaC5EzFHiFN96WyZM5Xk+xF4Y
+vV9gpVAgOrW92Mf4w+mTB+/kWSOUilfpSPXGbiRK6htrG1kxdZc=
+=kM1D
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index e921c804a905..806685dd8f2c 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Sat, 06 May 2023 22:09:40 +0000
+Sun, 07 May 2023 04:09:40 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index c38e0be3a09c..ac653c568c44 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index 50707dc8bb7f..855b3b387b9e 100644
--- a/metadata/md5-cache/media-libs/Manifest.gz
+++ b/metadata/md5-cache/media-libs/Manifest.gz
diff --git a/metadata/md5-cache/media-libs/gexiv2-0.14.1 b/metadata/md5-cache/media-libs/gexiv2-0.14.1
new file mode 100644
index 000000000000..cf4a4b15d681
--- /dev/null
+++ b/metadata/md5-cache/media-libs/gexiv2-0.14.1
@@ -0,0 +1,17 @@
+BDEPEND=dev-util/glib-utils gtk-doc? ( dev-util/gtk-doc app-text/docbook-xml-dtd:4.3 ) test? ( media-gfx/exiv2[xmp] ) virtual/pkgconfig vala? ( || ( dev-lang/vala:0.56 ) ) app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=media-gfx/exiv2-0.26:= >=dev-libs/glib-2.46.0:2 introspection? ( >=dev-libs/gobject-introspection-1.54:= ) python? ( python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) dev-python/pygobject:3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] )
+DESCRIPTION=GObject-based wrapper around the Exiv2 library
+EAPI=8
+HOMEPAGE=https://wiki.gnome.org/Projects/gexiv2
+INHERIT=gnome.org meson python-r1 vala
+IUSE=gtk-doc +introspection python test +vala python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=LGPL-2.1+ GPL-2
+RDEPEND=>=media-gfx/exiv2-0.26:= >=dev-libs/glib-2.46.0:2 introspection? ( >=dev-libs/gobject-introspection-1.54:= ) python? ( python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) dev-python/pygobject:3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] )
+REQUIRED_USE=python? ( introspection || ( python_targets_python3_10 python_targets_python3_11 ) ) test? ( python introspection ) vala? ( introspection )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://gnome/sources/gexiv2/0.14/gexiv2-0.14.1.tar.xz
+_eclasses_=gnome.org	6b39404f1491c60a2d32e3c693a683fe	meson	915ec7c25e08d7886558215e6809ca1e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	vala	1343f639cc74d2aa8b36fc08677da58d
+_md5_=a01216172ace293d9def658f672fd8c3
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index 66dea7976329..f96e582b5e2f 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/cpuid-20230406 b/metadata/md5-cache/sys-apps/cpuid-20230406
index d3c92e4992de..98f4e7643cef 100644
--- a/metadata/md5-cache/sys-apps/cpuid-20230406
+++ b/metadata/md5-cache/sys-apps/cpuid-20230406
@@ -4,9 +4,9 @@ DESCRIPTION=Linux tool to dump x86 CPUID information about the CPUs
 EAPI=8
 HOMEPAGE=http://www.etallen.com/cpuid.html
 INHERIT=toolchain-funcs
-KEYWORDS=-* ~amd64 ~x86
+KEYWORDS=-* amd64 x86
 LICENSE=GPL-2+
 SLOT=0
 SRC_URI=http://www.etallen.com/cpuid/cpuid-20230406.src.tar.gz
 _eclasses_=multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=f980166b28626ddbcd4f322140d3d119
+_md5_=ad747c7342f270da9d4e0ed0e138f137
diff --git a/metadata/md5-cache/sys-apps/cpuid-20230120 b/metadata/md5-cache/sys-apps/cpuid-20230505
index a437ff1ccab3..950110bdcbbd 100644
--- a/metadata/md5-cache/sys-apps/cpuid-20230120
+++ b/metadata/md5-cache/sys-apps/cpuid-20230505
@@ -4,9 +4,9 @@ DESCRIPTION=Linux tool to dump x86 CPUID information about the CPUs
 EAPI=8
 HOMEPAGE=http://www.etallen.com/cpuid.html
 INHERIT=toolchain-funcs
-KEYWORDS=-* amd64 x86
+KEYWORDS=-* ~amd64 ~x86
 LICENSE=GPL-2+
 SLOT=0
-SRC_URI=http://www.etallen.com/cpuid/cpuid-20230120.src.tar.gz
+SRC_URI=http://www.etallen.com/cpuid/cpuid-20230505.src.tar.gz
 _eclasses_=multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=ad747c7342f270da9d4e0ed0e138f137
+_md5_=f980166b28626ddbcd4f322140d3d119
diff --git a/metadata/md5-cache/sys-apps/locale-gen-2.23 b/metadata/md5-cache/sys-apps/locale-gen-2.23
new file mode 100644
index 000000000000..93c1cd2b9e44
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/locale-gen-2.23
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install prepare
+DESCRIPTION=Generate locales based upon the config file /etc/locale.gen
+EAPI=8
+HOMEPAGE=https://gitweb.gentoo.org/proj/locale-gen.git/
+INHERIT=prefix
+LICENSE=GPL-2+
+RDEPEND=app-alternatives/awk app-arch/gzip sys-apps/gentoo-functions sys-apps/grep >=sys-libs/glibc-2.38 !<sys-libs/glibc-2.38
+SLOT=0
+SRC_URI=https://gitweb.gentoo.org/proj/locale-gen.git/snapshot/locale-gen-2.23.tar.bz2
+_eclasses_=prefix	eab3c99d77fe00506c109c8a736186f7
+_md5_=5c1f96248ecd7e6a649386fac880a41d
diff --git a/metadata/md5-cache/sys-libs/Manifest.gz b/metadata/md5-cache/sys-libs/Manifest.gz
index a416c29093fd..b5c336e760fd 100644
--- a/metadata/md5-cache/sys-libs/Manifest.gz
+++ b/metadata/md5-cache/sys-libs/Manifest.gz
diff --git a/metadata/md5-cache/sys-libs/glibc-2.37-r2 b/metadata/md5-cache/sys-libs/glibc-2.37-r2
index 1c781f2187fb..5f013d5366d0 100644
--- a/metadata/md5-cache/sys-libs/glibc-2.37-r2
+++ b/metadata/md5-cache/sys-libs/glibc-2.37-r2
@@ -1,6 +1,6 @@
 BDEPEND=|| ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 ) >=app-misc/pax-utils-1.3.3 sys-devel/bison doc? ( sys-apps/texinfo ) !compile-locales? ( app-arch/gzip sys-apps/grep app-alternatives/awk ) test? ( dev-lang/perl ) >=sys-devel/binutils-2.27 >=sys-devel/gcc-6.2 sys-devel/gnuconfig virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst preinst prepare pretend setup test unpack
-DEPEND=gd? ( media-libs/gd:2= ) nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap ) ) ) perl? ( dev-lang/perl ) test? ( dev-lang/perl ) suid? ( caps? ( sys-libs/libcap ) ) selinux? ( sys-libs/libselinux ) systemtap? ( dev-util/systemtap ) compile-locales? ( app-arch/gzip sys-apps/grep app-alternatives/awk ) test? ( >=net-dns/libidn2-2.3.0 ) virtual/os-headers
+DEPEND=gd? ( media-libs/gd:2= ) nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap ) ) ) perl? ( dev-lang/perl ) test? ( dev-lang/perl ) suid? ( caps? ( sys-libs/libcap ) ) selinux? ( sys-libs/libselinux ) systemtap? ( dev-util/systemtap ) compile-locales? ( app-arch/gzip sys-apps/grep app-alternatives/awk ) doc? ( dev-lang/perl ) test? ( >=net-dns/libidn2-2.3.0 ) virtual/os-headers
 DESCRIPTION=GNU libc C library
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/libc/
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=2.2
 SRC_URI=mirror://gnu/glibc/glibc-2.37.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/glibc-2.37-patches-4.tar.xz https://gitweb.gentoo.org/proj/locale-gen.git/snapshot/locale-gen-2.23.tar.gz multilib-bootstrap? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-multilib-bootstrap-20201208.tar.xz ) systemd? ( https://gitweb.gentoo.org/proj/toolchain/glibc-systemd.git/snapshot/glibc-systemd-20210729.tar.gz )
 _eclasses_=eapi8-dosym	741bfa77afb2a9321261501aca58c208	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	prefix	eab3c99d77fe00506c109c8a736186f7	preserve-libs	21162ec96c87041004a75348d97342dd	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=860dd3e484b4d896ae6b8f5527d51cba
+_md5_=b954d8916249619fa0dc6fb364301124
diff --git a/metadata/md5-cache/sys-libs/glibc-9999 b/metadata/md5-cache/sys-libs/glibc-9999
index 0bd698a130a5..34b9a303614b 100644
--- a/metadata/md5-cache/sys-libs/glibc-9999
+++ b/metadata/md5-cache/sys-libs/glibc-9999
@@ -1,17 +1,18 @@
-BDEPEND=|| ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 ) >=app-misc/pax-utils-1.3.3 sys-devel/bison doc? ( sys-apps/texinfo ) !compile-locales? ( app-arch/gzip sys-apps/grep app-alternatives/awk ) test? ( dev-lang/perl ) >=sys-devel/binutils-2.27 >=sys-devel/gcc-6.2 sys-devel/gnuconfig virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=|| ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 ) >=app-misc/pax-utils-1.3.3 sys-devel/bison compile-locales? ( sys-apps/locale-gen ) doc? ( dev-lang/perl sys-apps/texinfo ) test? ( dev-lang/perl >=net-dns/libidn2-2.3.0 ) >=sys-devel/binutils-2.27 >=sys-devel/gcc-6.2 sys-devel/gnuconfig virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst preinst prepare pretend setup test unpack
-DEPEND=gd? ( media-libs/gd:2= ) nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap ) ) ) perl? ( dev-lang/perl ) test? ( dev-lang/perl ) suid? ( caps? ( sys-libs/libcap ) ) selinux? ( sys-libs/libselinux ) systemtap? ( dev-util/systemtap ) compile-locales? ( app-arch/gzip sys-apps/grep app-alternatives/awk ) test? ( >=net-dns/libidn2-2.3.0 ) virtual/os-headers
+DEPEND=gd? ( media-libs/gd:2= ) nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap ) ) ) suid? ( caps? ( sys-libs/libcap ) ) selinux? ( sys-libs/libselinux ) systemtap? ( dev-util/systemtap ) virtual/os-headers
 DESCRIPTION=GNU libc C library
-EAPI=7
+EAPI=8
 HOMEPAGE=https://www.gnu.org/software/libc/
+IDEPEND=!compile-locales? ( sys-apps/locale-gen )
 INHERIT=python-any-r1 prefix preserve-libs toolchain-funcs flag-o-matic gnuconfig multilib systemd multiprocessing tmpfiles git-r3
 IUSE=audit caps cet compile-locales +crypt custom-cflags doc gd hash-sysv-compat headers-only +multiarch multilib multilib-bootstrap nscd perl profile selinux +ssp stack-realign +static-libs suid systemd systemtap test vanilla
 LICENSE=LGPL-2.1+ BSD HPND ISC inner-net rc PCRE
 PDEPEND=!vanilla? ( sys-libs/timezone-data )
 PROPERTIES=live
-RDEPEND=gd? ( media-libs/gd:2= ) nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap ) ) ) perl? ( dev-lang/perl ) test? ( dev-lang/perl ) suid? ( caps? ( sys-libs/libcap ) ) selinux? ( sys-libs/libselinux ) systemtap? ( dev-util/systemtap ) app-arch/gzip sys-apps/grep app-alternatives/awk sys-apps/gentoo-functions !<app-misc/pax-utils-1.3.3 >=net-dns/libidn2-2.3.0 vanilla? ( !sys-libs/timezone-data )
+RDEPEND=gd? ( media-libs/gd:2= ) nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap ) ) ) suid? ( caps? ( sys-libs/libcap ) ) selinux? ( sys-libs/libselinux ) systemtap? ( dev-util/systemtap ) sys-apps/locale-gen !<app-misc/pax-utils-1.3.3 perl? ( dev-lang/perl ) >=net-dns/libidn2-2.3.0 vanilla? ( !sys-libs/timezone-data )
 RESTRICT=!test? ( test )
 SLOT=2.2
-SRC_URI=https://gitweb.gentoo.org/proj/locale-gen.git/snapshot/locale-gen-2.23.tar.gz multilib-bootstrap? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-multilib-bootstrap-20201208.tar.xz ) systemd? ( https://gitweb.gentoo.org/proj/toolchain/glibc-systemd.git/snapshot/glibc-systemd-20210729.tar.gz )
-_eclasses_=eapi8-dosym	741bfa77afb2a9321261501aca58c208	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	git-r3	27e13c09a4c7e4c78ac812f74727e676	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	prefix	eab3c99d77fe00506c109c8a736186f7	preserve-libs	21162ec96c87041004a75348d97342dd	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=bfcf3e17194e8a8ed9a8f1c5122c0f80
+SRC_URI=multilib-bootstrap? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-multilib-bootstrap-20201208.tar.xz ) systemd? ( https://gitweb.gentoo.org/proj/toolchain/glibc-systemd.git/snapshot/glibc-systemd-20210729.tar.gz )
+_eclasses_=flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	git-r3	27e13c09a4c7e4c78ac812f74727e676	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	prefix	eab3c99d77fe00506c109c8a736186f7	preserve-libs	21162ec96c87041004a75348d97342dd	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=3e6d0127672176ad6efb4a54a3227acd
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index 544fffdcf3f4..99e7d0662ac4 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 15493 BLAKE2B ec5ea168778a79b147975de4177e6e700a7d37e6ee037cb43e8a2fb5109fe7703b6271a466b25edb7a1f6a61aa9467b69f02382396560dc259c3acdd5e880f30 SHA512 24314abdcaad22302e8e4885bab38f0250026f6284cc14fc2d6d81378bea47d1c1e985134c2fc0d63a8bc88f3563b53ea9e7b90d1e24f24b6733a9cc9fe4c83a
-TIMESTAMP 2023-05-06T22:09:44Z
+TIMESTAMP 2023-05-07T04:09:43Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmRW0ClfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmRXJIdfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDYFQ//ZDzdLQy0UiIcioavMKcqe2bYOwDrCPyHWeeyO75UHs/FJMmJ31x+MsNt
-whut31qwi1p3eRVTeDUX9UP6mCK95y6ODK9xSzq5iM7+i/rzqAKXcKNequqaQOI9
-WVgmyyDvGH6ial8288kww7YJxvwS7ASJZrle/wIAuLgpEg1mZ7zpCWZxt8SQswbp
-0LfLVvvHJyk+PBGoXFgu8nUzwAvhJKCP7FklSs1ACWP+2oks5mwxZPdHTA9gIrpl
-M0OSImpg16X8meXCcW7gbYGtshAaiA65Ls4ImmWyy1pjJIAH1tkbqyd7YeQdF3RQ
-nBoEoomS9JktpYZBOCl23h4mnBn0zTKCcSPHcL/8AomaVM0Ym2N0en5ZM121Grdw
-c1V7sy0cCngAG7R5JPLGj5z1NmEIHUtarsO9ivEvFV5KR3W9G0UK+51vsG5OaW8u
-miZnS/wIukrTnSuBK6akcVcdDjcLnNpeYwCI+6Y+PYdA7J0KqlqPGMtwMg4gU4OY
-EvOEt1ZAajIXZq5Bg0IRMqj93YZarJZWGkHMuUOqosaZv47d80dfplNvH3HDJS2Y
-hMWLKLvvkzSOc5WG/4RSzlt8b8p5OtQv9uej4jsR4pX1vTT1t/rJCNZCUSLTSmwz
-LvcVXRL5Kszm7WhwhOM54PuEL8EaSHRQG6BL7eP9GmD6lqJ8RVk=
-=j7YV
+klDbzRAAm4G5LQPG3pCeeliRh9v+uvJcjUXdDRR7WDvii5tzuw4ftRLGC5g7FGXc
+6U9FD0LfLbiY7UKDMX/aClzKz3oF0iqUKATmj3ohBJSATZI0KyPFMP0c8sTV9TSw
+PhyQsJZVB/4nBdLYIHNHNG7u6fMjqq0NntXVqRgJSkWnGBIH6NMY9KJsZpeSVScQ
+m3OqhCMp6a8+5UtB6skq4+BpW8pGwk0VUiXGAUBM6uLuo6P1pQBsfw6Np9/jR7zL
+X9Ioz04G5KuR6k7jAVHeIrtRho7CDXlbs88GeLemokd/jxNt/p7tKoFrCAVNKwYi
+Zkfj3Rvl+h/siRJzFFufW7+TvneNSCZjJeYbDFRJvICBzzUgSrPw/AxLcbgFy9qK
+oGgiqX4P4q5/pRgI+W/CrXVZhY/RyR9J8h+/CjTrAnqbV8hLuFdmwb+mATTrMd32
+0emxBBfRMZlClHOdkPLOS7jz8oTflxaXhJuBs2lRXjAws1qmE4kAZGZKYHt+4veT
+mlmbXTzyoRPR5yfmzX0aB7G743p0gMmXGBK7Z4DTGX04zS7hIGn63PNXS52mvaMI
+Dqbxwr6F2oPlZWCyM1dlmetNKu+C4+3gvRLuisRHkhUqODjuWfQE/++Gd1/dYkMk
+4ES7umoPdkVI37Kry7OX2hltnGHIJkb2wTQQ+CJKPt4xYe/Uths=
+=qVeP
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 6d98c326c325..806685dd8f2c 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Sat, 06 May 2023 22:09:41 +0000
+Sun, 07 May 2023 04:09:40 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index f9b299894314..85254e21ea76 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Sat May  6 10:09:40 PM UTC 2023
+Sun May  7 04:09:40 AM UTC 2023
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index d81479579857..7f1b5e62c59c 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Sat, 06 May 2023 22:15:01 +0000
+Sun, 07 May 2023 04:15:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 2c2acc594f91..b450234788a4 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-8c6fab56400b1b06b788c7c72c98490f46cd848b 1683408476 2023-05-06T21:27:56+00:00
+2cb5d0e2319f88c99f7a1a55b74fea0a3066a6d2 1683417727 2023-05-07T00:02:07+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index b25dbd7592a5..045e88b10aa8 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1683411001 Sat 06 May 2023 10:10:01 PM UTC
+1683432601 Sun 07 May 2023 04:10:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index e921c804a905..806685dd8f2c 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Sat, 06 May 2023 22:09:40 +0000
+Sun, 07 May 2023 04:09:40 +0000
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index ec3f3fe7e7ec..874bfc6f4fa6 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/cpuid/Manifest b/sys-apps/cpuid/Manifest
index 787fc5f4c1e9..4a166993d85b 100644
--- a/sys-apps/cpuid/Manifest
+++ b/sys-apps/cpuid/Manifest
@@ -1,6 +1,6 @@
 AUX cpuid-20220620-makefile.patch 1359 BLAKE2B b16bd455de251f3989718fa56c1b19f97d79271998ccf774f74f0886ab8072be482e480604bfad462e0ac9c325470d12e80150e6fc588abfae629cd6499e0ea4 SHA512 680e477460679ae016c95d0e0c5cef916486629011b43cafb5f90c1c097b8c245d4c8b7861a20bdeee05b87b2220ad37a5ca589ff952dd9d7580ca301aac0ada
-DIST cpuid-20230120.src.tar.gz 141652 BLAKE2B 54843915be232762e35e6dfed3b7b582d192838bdc5e3b7ebb88b9ada217a3fd21d40faf248244047664f52c8e0c0689196b4373b01c2988aaa3738b7e69af3d SHA512 2b662c2db0ad013626245190be34aa3c04c01bb694111aafc4a491e0816fbb38d94e3d9b20770050efce0c08e6eaa9b22f6c8e9ea304d195afae17b6a4bbf2ab
 DIST cpuid-20230406.src.tar.gz 147932 BLAKE2B 530d1d9207d6c2cb2bfe7006a445ac870edac77b35193042aa198a463aa3815b0eaf398f6831e7d6ae026256224b06b74d7682de6e6a7554d023cc32065b2beb SHA512 7b53e36c104fddb8a4c29d45d5fef80ad57fa2025e1daa116bb22aa184a3415c751affcf8b190aadd08af7cdca7801504b8ba84d87d14226318e0be72ee914d5
-EBUILD cpuid-20230120.ebuild 600 BLAKE2B 0ef114696d7551a49446b327ee2ca0ac4207111703b304f75e850ded69988fd3003ea3de01d2253afe260291998c0ff50c5746b77334265b03ca3b8225f6f9fc SHA512 8458a7ce22cb425e738a18a1a764e8793de4e2af15fc6ac0b33af87a4792e00072c1cf8a27dcc1e2ecd0626c3ad9c243000e1eb63641f39a46dd8836bacb8ffa
-EBUILD cpuid-20230406.ebuild 602 BLAKE2B 432fc76d642caacbe4160969eb9af0d50b5f5a8bf2741eacca6ebbdb21b435f5c800b6b9bf78fb87a08d5e74810b754a129447ac5aeb094f641d219ebb23601f SHA512 274de9b03d2a816315f2f45d0512979cd03dfac584a059ec3027a66ef57ce5697600852542f141d11b7a84e451e2c74718801a98d671381b9c833608efbb2b3f
+DIST cpuid-20230505.src.tar.gz 148584 BLAKE2B 6f1e6f9666b22d3df8e93ff695a650d2cd6d8c12531ede58d2f9517bbd03e2bd833645a7ea26df23c2edee78507b2ffb9697684c3d702c5aae48dca6e97222f8 SHA512 695b7bab729526021decef57e938d74188bfa4e918435367550f950373760e726b60a278ccb92c91013624a06c077124182f51077b50f60b1dbabf4ff1740461
+EBUILD cpuid-20230406.ebuild 600 BLAKE2B 0ef114696d7551a49446b327ee2ca0ac4207111703b304f75e850ded69988fd3003ea3de01d2253afe260291998c0ff50c5746b77334265b03ca3b8225f6f9fc SHA512 8458a7ce22cb425e738a18a1a764e8793de4e2af15fc6ac0b33af87a4792e00072c1cf8a27dcc1e2ecd0626c3ad9c243000e1eb63641f39a46dd8836bacb8ffa
+EBUILD cpuid-20230505.ebuild 602 BLAKE2B 432fc76d642caacbe4160969eb9af0d50b5f5a8bf2741eacca6ebbdb21b435f5c800b6b9bf78fb87a08d5e74810b754a129447ac5aeb094f641d219ebb23601f SHA512 274de9b03d2a816315f2f45d0512979cd03dfac584a059ec3027a66ef57ce5697600852542f141d11b7a84e451e2c74718801a98d671381b9c833608efbb2b3f
 MISC metadata.xml 532 BLAKE2B 49d1eb34a9859763d42159adcf9a2dca3128af78aef52cedc4483950084238ba780bd841788f4b27eb72fc44e61c2c5bd264b6c6e2c57824ccf146b6ecad50e9 SHA512 f51db55a3cc5478afba39a42731122db8ac720af8685e093b6952efd2778c9f0668ac936d2a1cdacaf2586d62d0f13240d664a7bd4fbd18236c816e9e6745600
diff --git a/sys-apps/cpuid/cpuid-20230406.ebuild b/sys-apps/cpuid/cpuid-20230406.ebuild
index 18c1efcd3afe..fab516d7110f 100644
--- a/sys-apps/cpuid/cpuid-20230406.ebuild
+++ b/sys-apps/cpuid/cpuid-20230406.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.etallen.com/${PN}/${P}.src.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 x86"
 
 BDEPEND="
 	app-arch/gzip
diff --git a/sys-apps/cpuid/cpuid-20230120.ebuild b/sys-apps/cpuid/cpuid-20230505.ebuild
index fab516d7110f..18c1efcd3afe 100644
--- a/sys-apps/cpuid/cpuid-20230120.ebuild
+++ b/sys-apps/cpuid/cpuid-20230505.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.etallen.com/${PN}/${P}.src.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="-* amd64 x86"
+KEYWORDS="-* ~amd64 ~x86"
 
 BDEPEND="
 	app-arch/gzip
diff --git a/sys-apps/locale-gen/Manifest b/sys-apps/locale-gen/Manifest
new file mode 100644
index 000000000000..e0c649e84544
--- /dev/null
+++ b/sys-apps/locale-gen/Manifest
@@ -0,0 +1,3 @@
+DIST locale-gen-2.23.tar.bz2 7664 BLAKE2B a529b62fbb840c9352f06e8f5c80fc764425a2619dc69cc820f550a026d391788d5e2cfeeb46a8b5b9716da63340b4fce57a5b523edd4196ee1219c1200cb752 SHA512 c1245caadb04403c535a836f19bc410d0f04b5c0e297ea5be9852e6d71e08e528071ae769d63d31a677dda8fdd618b4c4d581ed525cf8786b82d8f37636db754
+EBUILD locale-gen-2.23.ebuild 824 BLAKE2B fc4748e947f04cc0a57d552958af68c98b71510348b0a6701a7c3116a01c0985032773adaf59ba8bfa15e64638802c770937fab139a3bb803bc1791b9460786a SHA512 99733cc6cd2546d5a2b83411a561cf064685d0e185b32e31de3cef0469583a81d8d64f19202c87d2220c01bc184739a8e122c75d078cc84cb29a00c032ede1f9
+MISC metadata.xml 262 BLAKE2B fe330d67755784d14f5c5d664d7127d3cdb9edfab55b907ae3632f434d86323604f5095e1c1a9fbd169ae7a4cbb38f359e55f75047531786247c0674a4a53715 SHA512 3bcaca4e730edeed06fed73e79a5ce0a3358174672735ea4b27240c6c421ac9c33bc2b63a31e596fe1bbb6b1816c16cbc7ef4f258ca906ba04ea7db4aedc86b9
diff --git a/sys-apps/locale-gen/locale-gen-2.23.ebuild b/sys-apps/locale-gen/locale-gen-2.23.ebuild
new file mode 100644
index 000000000000..4b6dadbfa5d4
--- /dev/null
+++ b/sys-apps/locale-gen/locale-gen-2.23.ebuild
@@ -0,0 +1,40 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit prefix
+
+DESCRIPTION="Generate locales based upon the config file /etc/locale.gen"
+HOMEPAGE="https://gitweb.gentoo.org/proj/locale-gen.git/"
+SRC_URI="https://gitweb.gentoo.org/proj/locale-gen.git/snapshot/${P}.tar.bz2"
+
+# Totally unclear what the license is. Following here the statement
+# in the Debian file that the tools accompanying glibc are GPL-2+
+LICENSE="GPL-2+"
+
+SLOT="0"
+#KEYWORDS="~amd64"
+
+RDEPEND="
+	app-alternatives/awk
+	app-arch/gzip
+	sys-apps/gentoo-functions
+	sys-apps/grep
+	>=sys-libs/glibc-2.38
+	!<sys-libs/glibc-2.38
+"
+DEPEND=""
+
+src_prepare() {
+	default
+	eprefixify locale-gen
+}
+
+src_install() {
+	dosbin locale-gen
+	doman *.[0-8]
+	insinto /etc
+	doins locale.gen
+	keepdir /usr/lib/locale
+}
diff --git a/sys-apps/locale-gen/metadata.xml b/sys-apps/locale-gen/metadata.xml
new file mode 100644
index 000000000000..e9de1423720b
--- /dev/null
+++ b/sys-apps/locale-gen/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>toolchain@gentoo.org</email>
+		<name>Gentoo Toolchain Project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index 1e8b2e4f04ff..89aa18607382 100644
--- a/sys-libs/Manifest.gz
+++ b/sys-libs/Manifest.gz
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index da8274d79f06..b4d6f4e1b95c 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -45,6 +45,6 @@ EBUILD glibc-2.34-r14.ebuild 49635 BLAKE2B 38e4c1a6ba5e9ec521635859a3e3e40653f01
 EBUILD glibc-2.35-r11.ebuild 50176 BLAKE2B a7999672c0039cb7ef79fd84b13ea7d8d752adeb185eac0744383f514b0897ad8b7518c9ea8392b8f4217ec0873f2d4b9e56bd1424378c83c2dd98122b2caf7d SHA512 bf7d103bb91722cd61720290bf38c6cb73d8d199e6479e35ab017de83006826b014c49d6dc0188cd3f4aaf906578ee4ae9f851d37346a4d9a228bee683930bfa
 EBUILD glibc-2.36-r7.ebuild 52453 BLAKE2B ef5c9a4cbcc7fde3003910973c6d2fdcbb8fdc52e1eb75771919617651f2edc34f615d5508894e7f0a4ee3605bb2b638e001adfbe86a2183100c42808cd5dce6 SHA512 3101657a81f9110ce0072c070bb9aab2fad50fe46f968d99307faad572b426b204cbb6734d367e26c2708556628fb7d0dfb3f4a407432e7907032dfb5ead6666
 EBUILD glibc-2.36-r8.ebuild 52462 BLAKE2B 96eb234269a40aa9b72c52e76274b9539e60a217969fffa8f3febbbe2e244b375349a8a5ff0b9d7939b757ee5b401a91dec1a66ad43af7d3afcfd58d1c9e8557 SHA512 aef4a0c782fcb79004d2a38d0b05c8c2e7cda13a333d2bd70791a09dddee61dc69af0fe3f1a785e2bdb237654f98a365e7f5c762d852a55b35a589d215c4eba7
-EBUILD glibc-2.37-r2.ebuild 52461 BLAKE2B 03101051b3b6c6fa22c15b86a8fd4eaf737f274e74792ceaa091f978fbba58ce5624061467de6331169b1c4412d02140896c05bc26e55ddd307bafb7d50199a6 SHA512 8abf464428ade62c5719087b8e026402f1732d4452c3f2f371612ecc561775eaa4b5382b7bd538a4121bf40849bfe892ee6031d55d129fe50ff66652cd470bd3
-EBUILD glibc-9999.ebuild 52432 BLAKE2B 0988666562a1d49f59d52a6368b426c154e532747f1bf1cba50529d3f2b5f71ff82c1b2af101e0dd87e158591f0a1a711b94959b794c56bcee92eaf03e8c16b6 SHA512 f97ee9b4c19ccbdae6ba17689ac11d5ef692359b6e82950c0ee83ddd9744d3fb05f1e1e20ca19a5394bc11e7162a363ddf62dbc3a33ef9148d01d561f7d13fe8
+EBUILD glibc-2.37-r2.ebuild 52523 BLAKE2B 756d34eac40dee2e5cc7d63cbf3c732a025610bc7e41cb9af7a60fec230f1f9d416769a89989e5821e9136dd47cd6359c05698d6c32d394694ad6f84b8bd9349 SHA512 cc7a1bd335ae344cf60385be072b560c6af3e4b3cf19a60de3bf02df8a1c8b63c63059368f8944728bf6968cb59dc4a7ba9e5be228f4a281ddda12129ad53466
+EBUILD glibc-9999.ebuild 51643 BLAKE2B 9c0e4e750405fd606fdeb7a12b47744a3eb1ba029bd111695793bf4f057a97a1a3b9a2ac1afa81c16b1ef94b024154d9b5794552264127ff7c40f7b7f6e9fb65 SHA512 b3a41250c36598015fd45e8ab8b8074021791725e842540098ef8d986d60491831a31dd3aa46d5b108fe3780b7f9bef898fd568a0237a00bca5d5630d44cafaa
 MISC metadata.xml 2142 BLAKE2B 765ba540eb10afccd1bade4de56f0c13ce269225500a62d1d17328194de69e7fa15d359a14eac6bfa8a36df45344db3d52f5e1811b174cf1fa2bfb95ad7760a7 SHA512 2f4a148c076a0967663d14e76b85a698ddae7093ff299b0dc95a6c3b00957c9bf73443f2bace9670eb62a45465efbcca892bb52b6aac8577acb2bc5f74a7397c
diff --git a/sys-libs/glibc/glibc-2.37-r2.ebuild b/sys-libs/glibc/glibc-2.37-r2.ebuild
index 6e9fa3dcb8b2..3b760ddcf5b3 100644
--- a/sys-libs/glibc/glibc-2.37-r2.ebuild
+++ b/sys-libs/glibc/glibc-2.37-r2.ebuild
@@ -131,6 +131,7 @@ DEPEND="${COMMON_DEPEND}
 		sys-apps/grep
 		app-alternatives/awk
 	)
+	doc? ( dev-lang/perl )
 	test? ( >=net-dns/libidn2-2.3.0 )
 "
 RDEPEND="${COMMON_DEPEND}
@@ -1032,7 +1033,7 @@ glibc_do_configure() {
 		# execute Perl during configure if we're cross-compiling a prefix, but
 		# it will just disable mtrace in that case.
 		# Note: mtrace is needed by the test suite.
-		ac_cv_path_PERL="$(usex perl "${EPREFIX}"/usr/bin/perl $(usex test "${EPREFIX}"/usr/bin/perl no))"
+		ac_cv_path_PERL="$(usex perl "${EPREFIX}"/usr/bin/perl $(usex test "${EPREFIX}"/usr/bin/perl $(usex doc "${EPREFIX}"/usr/bin/perl no)))"
 
 		# locale data is arch-independent
 		# https://bugs.gentoo.org/753740
diff --git a/sys-libs/glibc/glibc-9999.ebuild b/sys-libs/glibc/glibc-9999.ebuild
index 38cec1fa3414..2375fd18f6a9 100644
--- a/sys-libs/glibc/glibc-9999.ebuild
+++ b/sys-libs/glibc/glibc-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 # Bumping notes: https://wiki.gentoo.org/wiki/Project:Toolchain/sys-libs/glibc
 # Please read & adapt the page as necessary if obsolete.
@@ -23,6 +23,19 @@ EMULTILIB_PKG="true"
 PATCH_VER=1
 PATCH_DEV=dilfridge
 
+# gcc mulitilib bootstrap files version
+GCC_BOOTSTRAP_VER=20201208
+
+# systemd integration version
+GLIBC_SYSTEMD_VER=20210729
+
+# Minimum kernel version that glibc requires
+MIN_KERN_VER="3.2.0"
+
+# Minimum pax-utils version needed (which contains any new syscall changes for
+# its seccomp filter!). Please double check this!
+MIN_PAX_UTILS_VER="1.3.3"
+
 if [[ ${PV} == 9999* ]]; then
 	inherit git-r3
 else
@@ -31,26 +44,11 @@ else
 	SRC_URI+=" https://dev.gentoo.org/~${PATCH_DEV}/distfiles/${P}-patches-${PATCH_VER}.tar.xz"
 fi
 
-RELEASE_VER=${PV}
-
-GCC_BOOTSTRAP_VER=20201208
-
-LOCALE_GEN_VER=2.23
-
-GLIBC_SYSTEMD_VER=20210729
-
-SRC_URI+=" https://gitweb.gentoo.org/proj/locale-gen.git/snapshot/locale-gen-${LOCALE_GEN_VER}.tar.gz"
 SRC_URI+=" multilib-bootstrap? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-multilib-bootstrap-${GCC_BOOTSTRAP_VER}.tar.xz )"
 SRC_URI+=" systemd? ( https://gitweb.gentoo.org/proj/toolchain/glibc-systemd.git/snapshot/glibc-systemd-${GLIBC_SYSTEMD_VER}.tar.gz )"
 
 IUSE="audit caps cet compile-locales +crypt custom-cflags doc gd hash-sysv-compat headers-only +multiarch multilib multilib-bootstrap nscd perl profile selinux +ssp stack-realign +static-libs suid systemd systemtap test vanilla"
 
-# Minimum kernel version that glibc requires
-MIN_KERN_VER="3.2.0"
-# Minimum pax-utils version needed (which contains any new syscall changes for
-# its seccomp filter!). Please double check this!
-MIN_PAX_UTILS_VER="1.3.3"
-
 # Here's how the cross-compile logic breaks down ...
 #  CTARGET - machine that will target the binaries
 #  CHOST   - machine that will host the binaries
@@ -99,19 +97,25 @@ fi
 # Lastly, let's avoid some openssh nastiness, bug 708224, as
 # convenience to our users.
 
-# gzip, grep, awk are needed by locale-gen, bug 740750
+# gzip, grep, awk are needed by locale-gen, bug 740750; depending on the
+# compile-locales useflag either in src_install or in pkg_postinst.
 
+IDEPEND="
+	!compile-locales? ( sys-apps/locale-gen )
+"
 BDEPEND="
 	${PYTHON_DEPS}
 	>=app-misc/pax-utils-${MIN_PAX_UTILS_VER}
 	sys-devel/bison
-	doc? ( sys-apps/texinfo )
-	!compile-locales? (
-		app-arch/gzip
-		sys-apps/grep
-		app-alternatives/awk
+	compile-locales? ( sys-apps/locale-gen )
+	doc? (
+		dev-lang/perl
+		sys-apps/texinfo
+	)
+	test? (
+		dev-lang/perl
+		>=net-dns/libidn2-2.3.0
 	)
-	test? ( dev-lang/perl )
 "
 COMMON_DEPEND="
 	gd? ( media-libs/gd:2= )
@@ -119,26 +123,16 @@ COMMON_DEPEND="
 		audit? ( sys-process/audit )
 		caps? ( sys-libs/libcap )
 	) )
-	perl? ( dev-lang/perl )
-	test? ( dev-lang/perl )
 	suid? ( caps? ( sys-libs/libcap ) )
 	selinux? ( sys-libs/libselinux )
 	systemtap? ( dev-util/systemtap )
 "
 DEPEND="${COMMON_DEPEND}
-	compile-locales? (
-		app-arch/gzip
-		sys-apps/grep
-		app-alternatives/awk
-	)
-	test? ( >=net-dns/libidn2-2.3.0 )
 "
 RDEPEND="${COMMON_DEPEND}
-	app-arch/gzip
-	sys-apps/grep
-	app-alternatives/awk
-	sys-apps/gentoo-functions
+	sys-apps/locale-gen
 	!<app-misc/pax-utils-${MIN_PAX_UTILS_VER}
+	perl? ( dev-lang/perl )
 "
 
 RESTRICT="!test? ( test )"
@@ -670,7 +664,7 @@ foreach_abi() {
 
 glibc_banner() {
 	local b="Gentoo ${PVR}"
-	[[ -n ${PATCH_VER} ]] && ! use vanilla && b+=" p${PATCH_VER}"
+	[[ -n ${PATCH_VER} ]] && ! use vanilla && b+=" (patchset ${PATCH_VER})"
 	echo "${b}"
 }
 
@@ -766,13 +760,6 @@ sanity_prechecks() {
 		fi
 	fi
 
-	# Users have had a chance to phase themselves, time to give em the boot
-	if [[ -e ${EROOT}/etc/locale.gen ]] && [[ -e ${EROOT}/etc/locales.build ]] ; then
-		eerror "You still haven't deleted ${EROOT}/etc/locales.build."
-		eerror "Do so now after making sure ${EROOT}/etc/locale.gen is kosher."
-		die "Lazy upgrader detected"
-	fi
-
 	if [[ ${CTARGET} == i386-* ]] ; then
 		eerror "i386 CHOSTs are no longer supported."
 		eerror "Chances are you don't actually want/need i386."
@@ -879,6 +866,8 @@ pkg_pretend() {
 	upgrade_warning
 }
 
+# pkg_setup
+
 pkg_setup() {
 	# see bug 682570
 	[[ -z ${BOOTSTRAP_RAP} ]] && python-any-r1_pkg_setup
@@ -907,23 +896,24 @@ src_unpack() {
 		unpack ${P}.tar.xz
 
 		cd "${WORKDIR}" || die
-		unpack glibc-${RELEASE_VER}-patches-${PATCH_VER}.tar.xz
+		unpack glibc-${PV}-patches-${PATCH_VER}.tar.xz
 	fi
 
 	cd "${WORKDIR}" || die
-	unpack locale-gen-${LOCALE_GEN_VER}.tar.gz
 	use systemd && unpack glibc-systemd-${GLIBC_SYSTEMD_VER}.tar.gz
 }
 
+# src_prepare
+
 src_prepare() {
 	local patchsetname
 	if ! use vanilla ; then
 		if [[ ${PV} == 9999* ]] ; then
 			patchsetname="from git master"
 		else
-			patchsetname="${RELEASE_VER}-${PATCH_VER}"
+			patchsetname="${PV}-${PATCH_VER}"
 		fi
-		einfo "Applying Gentoo Glibc Patchset ${patchsetname}"
+		einfo "Applying Gentoo Glibc patchset ${patchsetname}"
 		eapply "${WORKDIR}"/patches
 		einfo "Done."
 	fi
@@ -932,21 +922,17 @@ src_prepare() {
 
 	gnuconfig_update
 
-	cd "${WORKDIR}"
+	cd "${WORKDIR}" || die
 	find . -name configure -exec touch {} +
 
-	# move the external locale-gen to its old place
-	mkdir extra || die
-	mv locale-gen-${LOCALE_GEN_VER} extra/locale || die
-
-	eprefixify extra/locale/locale-gen
-
 	# Fix permissions on some of the scripts.
 	chmod u+x "${S}"/scripts/*.sh
 
-	cd "${S}"
+	cd "${S}" || die
 }
 
+# src_configure
+
 glibc_do_configure() {
 	dump_build_environment
 
@@ -962,7 +948,7 @@ glibc_do_configure() {
 	#    https://sourceware.org/PR22634#c0
 	case $(tc-arch ${CTARGET}) in
 		# Keep whitelist of targets where autodetection mostly works.
-		amd64|x86|sparc|ppc|ppc64|arm|arm64|s390) ;;
+		amd64|x86|sparc|ppc|ppc64|arm|arm64|s390|riscv|loong) ;;
 		# Blacklist everywhere else
 		*) myconf+=( libc_cv_ld_gnu_indirect_function=no ) ;;
 	esac
@@ -1031,7 +1017,7 @@ glibc_do_configure() {
 		# execute Perl during configure if we're cross-compiling a prefix, but
 		# it will just disable mtrace in that case.
 		# Note: mtrace is needed by the test suite.
-		ac_cv_path_PERL="$(usex perl "${EPREFIX}"/usr/bin/perl $(usex test "${EPREFIX}"/usr/bin/perl no))"
+		ac_cv_path_PERL="$(usex perl "${EPREFIX}"/usr/bin/perl $(usex test "${EPREFIX}"/usr/bin/perl $(usex doc "${EPREFIX}"/usr/bin/perl no)))"
 
 		# locale data is arch-independent
 		# https://bugs.gentoo.org/753740
@@ -1040,6 +1026,7 @@ glibc_do_configure() {
 		# -march= option tricks build system to infer too
 		# high ISA level: https://sourceware.org/PR27318
 		libc_cv_include_x86_isa_level=no
+
 		# Explicit override of https://sourceware.org/PR27991
 		# exposes a bug in glibc's configure:
 		# https://sourceware.org/PR27991
@@ -1219,6 +1206,8 @@ src_configure() {
 	foreach_abi do_src_configure
 }
 
+# src_compile
+
 do_src_compile() {
 	emake -C "$(builddir nptl)"
 }
@@ -1231,6 +1220,8 @@ src_compile() {
 	foreach_abi do_src_compile
 }
 
+# src_test
+
 glibc_src_test() {
 	cd "$(builddir nptl)"
 
@@ -1250,26 +1241,16 @@ glibc_src_test() {
 	SANDBOX_ON=0 LD_PRELOAD= TIMEOUTFACTOR=16 emake ${myxfailparams} check
 }
 
-do_src_test() {
-	local ret=0
-
-	glibc_src_test
-	: $(( ret |= $? ))
-
-	return ${ret}
-}
-
 src_test() {
 	if just_headers ; then
 		return
 	fi
 
-	# Give tests more time to complete.
-	export TIMEOUTFACTOR=5
-
-	foreach_abi do_src_test || die "tests failed"
+	foreach_abi glibc_src_test || die "tests failed"
 }
 
+# src_install
+
 run_locale_gen() {
 	# if the host locales.gen contains no entries, we'll install everything
 	local root="$1"
@@ -1317,7 +1298,8 @@ glibc_do_src_install() {
 	# Avoid stripping binaries not targeted by ${CHOST}. Or else
 	# ${CHOST}-strip would break binaries build for ${CTARGET}.
 	is_crosscompile && dostrip -x /
-	# gdb thread introspection relies on local libpthreas symbols. stripping breaks it
+
+	# gdb thread introspection relies on local libpthreads symbols. stripping breaks it
 	# See Note [Disable automatic stripping]
 	dostrip -x $(alt_libdir)/libpthread-${upstream_pv}.so
 
@@ -1435,6 +1417,8 @@ glibc_do_src_install() {
 
 	#################################################################
 	# EVERYTHING AFTER THIS POINT IS FOR NATIVE GLIBC INSTALLS ONLY #
+	#################################################################
+
 	# Make sure we install some symlink hacks so that when we build
 	# a 2nd stage cross-compiler, gcc finds the target system
 	# headers correctly.  See gcc/doc/gccinstall.info
@@ -1458,15 +1442,8 @@ glibc_do_src_install() {
 		-e "s: \\\\::g" -e "s:/: :g" \
 		"${S}"/localedata/SUPPORTED > "${ED}"/usr/share/i18n/SUPPORTED \
 		|| die "generating /usr/share/i18n/SUPPORTED failed"
-	cd "${WORKDIR}"/extra/locale
-	dosbin locale-gen
-	doman *.[0-8]
-	insinto /etc
-	doins locale.gen
-
-	keepdir /usr/lib/locale
 
-	cd "${S}"
+	cd "${S}" || die
 
 	# Install misc network config files
 	insinto /etc
@@ -1511,7 +1488,6 @@ glibc_do_src_install() {
 	# Generate all locales if this is a native build as locale generation
 	if use compile-locales && ! is_crosscompile ; then
 		run_locale_gen --inplace-glibc "${ED}/"
-		sed -e 's:COMPILED_LOCALES="":COMPILED_LOCALES="1":' -i "${ED}"/usr/sbin/locale-gen || die
 	fi
 }