2023-06-28 22:39:54+00:00

39 files changed, 430 insertions, 64 deletions

diff --git a/Manifest b/Manifest
index 432c850046384..35282aefb8f39 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29304 BLAKE2B c040c27fae8160e3f9691e6fef16dd20d510052d0d613c5f2dd253453d767ab1a75185a8d398bd60c4c4f9b6a925e30c40e4fcb3f8c78d1c3356c1929da6c8a4 SHA512 9cde21733a5bdf891f1eaf0622ef0cf1590be2db49d31c0d0fc790fa0d55414d0c173043973273d891de08ca55e9fbd1b0f81f7322aeb718eba8b9a7e84f9d35
-TIMESTAMP 2023-06-28T22:09:54Z
+MANIFEST Manifest.files.gz 29294 BLAKE2B 7ad3028be2acc0c06ee68ab81198f7080fd1941720f33fd6941e091e6028258a23b0ddb3d35f0238e0f427c5795863e0ca5ed698cfe40e849ff60705eff61bc9 SHA512 a7175ccd013353fa19c482976a17fa00f0afcaa6e45932cc253dabfcda51dc200cc84690f21d9f0dfbcee122e75f3021ea453745f70b25e41f297356020b8357
+TIMESTAMP 2023-06-28T22:39:57Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmScr7JfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmSctr1fFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klC/whAAnc3wyxX5rAGveJMsnf9pn9hSzmAM/9HOVgA00y5FjJuoEBBuCj/RPvhN
-A+XB1mH04X8NHYlgDjyyyvkupTRTKt2nokbOmuk3lhabxMEv3cL2hi5Spl9IE8Ck
-4+AhWkaDIWA72yBJ1u8YeDXnPyktzMmSm+ecVh1RTHjAN4xZKasj9OSbR2yKma5T
-mHBU7y23MzUCOaFhM9chfkbxx/dG8s6yqevFZmhcL4eTBfzI0hEzCiRQxTwkXV5c
-2wiALzYyziimQFmaXPtfxNPcNBxBZbsDD0neBDSMJlfgdc0BnFqwqNEwfwvAeH3Q
-5lAfGi/2AxaUkxSk0GLbY8EpkDrzcjqijB/kaeRMr+BXdUnsF/nXNDxjlpaTR3Ro
-Ua4T6K2aRUM83Utd5X5UWK486MzYMExGVcUdeE/scUv5KvF0iuVPNzphyCYdBfI5
-iWhHbLeFlKDga4O7MG5HWIFEh3mBFwfBUkQof9BTXWeSum7zY4Sk0qwWVuU/yio1
-2TA9mRz63wxkBgiFzFXTASduYuXUcnYkVM5/XP7oqOxYFiVAuvGO7MfbIu9o0Lct
-9Eu87NWdEaluCXFROt5pxxMQOB1ocGYIqDUThjgDQqjdlGjvCmZyqRzL7mbj6FHS
-7NdJ/yqJqfvOrkbxzNGxR74kOhj2z5XYeEtPmBGRvUGHsWkc0Bs=
-=WZw5
+klDBMA//T1onbHLHlPcAWtzavm3ruR2tfAkiOIezlo7Z8dgE/6kwWbWr/mET1XFH
+xSE483uak8CVAUeBKFQGQdgpz6qvyy9H2ZcNJ0Crt4hrICMnWw1EBe4lUv9EJHRY
+whgywWPhLH9bz7dCSKRx5bZWKU5rj6iC/FUDUZ30hmsEKjb/BHXwgGCTSr2FAU1R
+QH3cGm+xdjDno7fHaJYoiqu/sr3uCGBU6du8DcZmmu3gEd4R2VXwnQBh9XXoEVQs
+iJEX+OKLxhCOOFHhlBTq6pqrhPimi/J1D0Qcxy68NlCORsVfg2Hkcy59/ZjQ5wB4
+gNjdpSDWK346NSVSP+j5OYVUKqfd/FtzHHi5k+xUBOKvw8o4UeEnmbrndSNOi9xq
+Umb/9fRXWpwrVfuPD5okXKGgpMSPqZnHh7TTrl3/yh2KPjOZb7E5oikCgFPmpnS3
+M11RoT8meg2+usmqOhgV+d6slL5OG7RzzSwxOXuWuAjbmVg9tGMp/0+ghqgaJM97
+9Y6OZvOMPDFIXgj4cxPkCv/oTUWKAT2Hq8CVuZMMvg6+kuTBOzwixLKY04Kws/jp
+IBeELkqEsAfn+2C4qyAvBJAJuE4+hsm0D4PyPVjZu1ncizTt8S5pNJOwhTH76JuV
+LLruqwAm827M+U0N6MalvDTkLqQLhAASLMEIe/g3guTHzsp/Uvg=
+=l/Aw
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index 16e0500722b0a..d43824dc93793 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/dev-lua/Manifest.gz b/dev-lua/Manifest.gz
index 1ea937341c5b4..57993daf743a2 100644
--- a/dev-lua/Manifest.gz
+++ b/dev-lua/Manifest.gz
diff --git a/dev-lua/lpeg/Manifest b/dev-lua/lpeg/Manifest
index 835ea4cdf992f..584778670fc67 100644
--- a/dev-lua/lpeg/Manifest
+++ b/dev-lua/lpeg/Manifest
@@ -1,4 +1,4 @@
 AUX lpeg-1.0.2-makefile.patch 671 BLAKE2B 4ed03dc08e737fe6cc45f4fe9c53657a71341cac69a3ec6fa52d124dbf5c3b58bcf1077d255598f98952eb2329905a25b45e4c031ab9fb82700d919d7f264452 SHA512 0d17351cda382ddb5574f7d14bc6479439cc703ac0c360b2b0f043288427beda9aea1f229fd2e0ea8b604bd935bce2fc959a2410804bfd82bb2c2e128ab501ac
 DIST lpeg-1.0.2.tar.gz 71840 BLAKE2B e0d8fb4e9d17c9018f0b206cd3f7c9c0e21398c119600b5b0705c8df19e0956347bea795c7c3ded8e62e0c09802dd8eab931a5e3769fcacf44c35aa2b17fa8d6 SHA512 110527ddf9f8e5e8a80ef0ae8847c8ba8cd2597dba3bfe2865cba9af60daafbb885f21e74231952f5ab793d021e050b482066a821c6954d52090a5eae77e9814
-EBUILD lpeg-1.0.2-r101.ebuild 1970 BLAKE2B 3d1305e370b779579c575ca5f17bd33d8f6323f9cfa2e6b0d7a555499bc490cfb0b1c2eb65f440d390001a8b48491dc9706932db61ced6f00dbe3e8bca1deff7 SHA512 388eec995598d7f8bc40249f88663fcc70b5ca8d12947287c69dcc97bc26a61bc2f67a27862b4bb73a2389ff7319b79eae415a1f0e87ea4e3945922b179fe46d
+EBUILD lpeg-1.0.2-r101.ebuild 1969 BLAKE2B 94ef434afb41a7f685e20fa54689a1ffe1878c4b3b560cd17ff03d2ab7ab7bf3d69ad997f83e2afcc5df48698895212dde0394688eed99098c3d93856c18ff23 SHA512 05a3f82f0362f51e1f19790f8d0793fe6ab53587d7386ba290fac58cb1e2a6c5cfeaabb461b3a4bcb49f64df7b9454ef988c295b8153a0080d96d70c336001c8
 MISC metadata.xml 258 BLAKE2B c0d0fed17412419de0d059e7ccb4289f3ffb2628a07c3d15329cba8ed726b2c52efde7ad15857b845ce71e7eeca903467f592e3e324d91147583f5178e5378fa SHA512 0dbe2c5806353798c494bddc4034ccd37181951a6f5085bbb25d15d36d4a800634db47d25d1834bc920000533e4f4db7a02840dd18bd460b35c1f77b743fa1d1
diff --git a/dev-lua/lpeg/lpeg-1.0.2-r101.ebuild b/dev-lua/lpeg/lpeg-1.0.2-r101.ebuild
index 411d41357574d..cb9aa50746f35 100644
--- a/dev-lua/lpeg/lpeg-1.0.2-r101.ebuild
+++ b/dev-lua/lpeg/lpeg-1.0.2-r101.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -50,7 +50,7 @@ src_prepare() {
 lua_src_compile() {
 	cd "${S}.${ELUA}/" || die
 	emake CC="$(tc-getCC)" \
-		LUADIR="${ESYSROOT}/$(lua_get_include_dir)"
+		LUADIR="${EPREFIX}/$(lua_get_include_dir)"
 }
 
 src_compile() {
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 96896a2ab0613..a601bf440f28a 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/meson/Manifest b/dev-util/meson/Manifest
index 1da15a9714ce9..693a9e63045be 100644
--- a/dev-util/meson/Manifest
+++ b/dev-util/meson/Manifest
@@ -1,5 +1,7 @@
 AUX meson-0.63-xtools-support.patch 1136 BLAKE2B 7600b29f1c4accbf33ca587b848566d4f9d30e26695b125aa895ec8a48ee0f7355c7692845c0d9bbb59eb452fc0cd8b634bd2a90d8918efa0b65ef4759b56d8e SHA512 725b193afe229690b6ef0d7a2a832695b7c09ca3376512097baec597a84df6e8e18791e9f29221e8a4a3537ad2371672e74041aa05ec6a218ed9b6218ea2ab61
 DIST meson-1.1.1.tar.gz 2125503 BLAKE2B 295b46d19c8a1d64d326a6c826e2abe11d9768902ed2f8816df18677e7f3f58decc0c660925821825ecd9a4955a65bda8b2aa66a7bb1961810d8f78f92a3fd8a SHA512 c6259d73566d2532b87e8a23951363103f7be2aacdf120e50946273a2fed6b1602104a3ffbfda159138ac8f780d2c3e67a6fe2c8c228b73c1266775491797adb
+DIST meson-1.2.0rc1.tar.gz 2176016 BLAKE2B c7c19b5fe8e25964dbdacaf7b2aa8e348e81e387f79b9576c6d8541064cd499008d70b527299eb02280828b7c1f91b194f2c6d2e54f702295b52b5d7a24c5d3f SHA512 2511b40a8cc55093758599e3e51926a5ccac16c92a5bd33239c743fa6926af9ba0f7508dd2f04adbb2c4599ebad5d34f1a2e112d7ac10dd211e9511522d23962
 EBUILD meson-1.1.1.ebuild 2938 BLAKE2B 1896e10e1d442716eaf50b776bdb52c6d438c9a3a6f2e3b5125f4de2f5bd01932dbd12a6e69016032defafd7a62068f810090342b766a8b14928bc38f3e72946 SHA512 3038284a26a397055050c8236b6c13f7a7b01ce94faa5f299dbf180366aed166bc3a22443febb5c9c32e966f789dec63b8e5ea293a976c871d86647afe529249
-EBUILD meson-9999.ebuild 2940 BLAKE2B 2561a89d308e94b6815a2099b3aed020df40080c1f1ab21fe8de0a3eed439417b72512056a180087d8e3624d9d1769e9031bc08f18a7bbbc732fd85e4a6403fc SHA512 215fbf63eb8a8a1566f68aa993f5ca4075e5305f27d69a6147f29af8a49fa975516d2e63287a402f4d2fba06e357d65d449de70c479ef75aa4147ef7557a539d
+EBUILD meson-1.2.0_rc1.ebuild 2886 BLAKE2B 3cc344e676d5c260f20942469e01da9bd6be5578cde92be8c91d55b80d3b18c018e16497b6f1015427fc65d712d5520db598d35f53e2035911718cc8ed27c588 SHA512 22ccf7c0a146e90e69eea1a821fdeeed0f240b6b6e071782a877ffad04038dae09cfa1370fb438036cd3cb04dd0889a477c1cdfe94f9e578cdec81a85a6036c2
+EBUILD meson-9999.ebuild 2946 BLAKE2B 0fc44fb33f5d79d53c15ab84caad219f80437530f4b3620f2c0a1f336a11710601bd2a3eb408ec6adf6204a1dafa09d97b3fe403d66a380c7017d753849aaca0 SHA512 3101b94bdb792a5bbc7b3411e5d77d7b36781d08b7746523c9e7584e65204b025ccbfba7cc924829b7f0a84309a6a90455293cc8dd0964e98de7798200a7241d
 MISC metadata.xml 480 BLAKE2B 5d3a0af4d84e497dcc2ccd5eb680e898beda896d5c37dc71fcaad2fe63f436f758d356990a5bca06baee9d265389b6e7084daec90d13c004f5523df4d0badbff SHA512 748f91fc17a18302ad0892d458e8e59650ab23dd3db5e83da85cfbca03d7932633c37b16f039faa12d87f6e4ec75a7a7fe4cc22f17328e61d57d99b073b6df3f
diff --git a/dev-util/meson/meson-1.2.0_rc1.ebuild b/dev-util/meson/meson-1.2.0_rc1.ebuild
new file mode 100644
index 0000000000000..fefd68d177e56
--- /dev/null
+++ b/dev-util/meson/meson-1.2.0_rc1.ebuild
@@ -0,0 +1,117 @@
+# Copyright 2016-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} pypy3 )
+DISTUTILS_USE_PEP517=setuptools
+
+if [[ ${PV} = *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/mesonbuild/meson"
+	inherit git-r3
+else
+	inherit pypi
+
+	MY_P=${P/_/}
+	S=${WORKDIR}/${MY_P}
+
+	if [[ ${PV} != *_rc* ]] ; then
+		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+	fi
+fi
+
+inherit bash-completion-r1 distutils-r1 toolchain-funcs
+
+DESCRIPTION="Open source build system"
+HOMEPAGE="https://mesonbuild.com/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	test? (
+		dev-libs/glib:2
+		dev-libs/gobject-introspection
+		dev-util/ninja
+		dev-vcs/git
+		sys-libs/zlib[static-libs(+)]
+		virtual/pkgconfig
+	)
+"
+RDEPEND="
+	virtual/pkgconfig
+"
+
+python_prepare_all() {
+	local disable_unittests=(
+		# ASAN and sandbox both want control over LD_PRELOAD
+		# https://bugs.gentoo.org/673016
+		-e 's/test_generate_gir_with_address_sanitizer/_&/'
+
+		# ASAN is unsupported on some targets
+		# https://bugs.gentoo.org/692822
+		-e 's/test_pch_with_address_sanitizer/_&/'
+
+		# https://github.com/mesonbuild/meson/issues/7203
+		-e 's/test_templates/_&/'
+
+		# Broken due to python2 wrapper
+		-e 's/test_python_module/_&/'
+	)
+
+	sed -i "${disable_unittests[@]}" unittests/*.py || die
+
+	# Broken due to python2 script created by python_wrapper_setup
+	rm -r "test cases/frameworks/1 boost" || die
+
+	distutils-r1_python_prepare_all
+}
+
+src_test() {
+	tc-export PKG_CONFIG
+	if ${PKG_CONFIG} --exists Qt5Core && ! ${PKG_CONFIG} --exists Qt5Gui; then
+		ewarn "Found Qt5Core but not Qt5Gui; skipping tests"
+	else
+		distutils-r1_src_test
+	fi
+}
+
+python_test() {
+	(
+		# test_meson_installed
+		unset PYTHONDONTWRITEBYTECODE
+
+		# https://bugs.gentoo.org/687792
+		unset PKG_CONFIG
+
+		# test_cross_file_system_paths
+		unset XDG_DATA_HOME
+
+		# 'test cases/unit/73 summary' expects 80 columns
+		export COLUMNS=80
+
+		# If JAVA_HOME is not set, meson looks for javac in PATH.
+		# If javac is in /usr/bin, meson assumes /usr/include is a valid
+		# JDK include path. Setting JAVA_HOME works around this broken
+		# autodetection. If no JDK is installed, we should end up with an empty
+		# value in JAVA_HOME, and the tests should get skipped.
+		export JAVA_HOME=$(java-config -O 2>/dev/null)
+
+		# Call python3 instead of EPYTHON to satisfy test_meson_uninstalled.
+		python3 run_tests.py
+	) || die "Testing failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	insinto /usr/share/vim/vimfiles
+	doins -r data/syntax-highlighting/vim/{ftdetect,indent,syntax}
+
+	insinto /usr/share/zsh/site-functions
+	doins data/shell-completions/zsh/_meson
+
+	dobashcomp data/shell-completions/bash/meson
+}
diff --git a/dev-util/meson/meson-9999.ebuild b/dev-util/meson/meson-9999.ebuild
index c9781cdd78c0d..86cedf266f219 100644
--- a/dev-util/meson/meson-9999.ebuild
+++ b/dev-util/meson/meson-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..12} pypy3 )
 DISTUTILS_USE_PEP517=setuptools
 
 if [[ ${PV} = *9999* ]]; then
diff --git a/metadata/.checksum-test-marker b/metadata/.checksum-test-marker
index 5cc273a740345..ea446a24dae4c 100644
--- a/metadata/.checksum-test-marker
+++ b/metadata/.checksum-test-marker
@@ -1,4 +1,4 @@
-1687990227 Wed Jun 28 10:10:27 PM UTC 2023
+1687992031 Wed Jun 28 10:40:31 PM UTC 2023
 # Testcase for mirror network:
 # Watch the value over a day, if unchanging then
 # one or more mirrors is missing --checksum
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index e7873a59c8f60..409b3e7e61c94 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index ddcab8b1199f1..d15b1f000c17a 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Wed, 28 Jun 2023 22:09:51 +0000
+Wed, 28 Jun 2023 22:39:54 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index 9e024673f0aa9..eb5d61d748e27 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 546124 BLAKE2B b8c960a7f19f0cac8ea254b9330e3a1add1f4be28ff0a9b4020f5e68f250a6b511280b7dd1dec4e472c73320abae493b0ab8441075c681803abfb19ea280332e SHA512 0dccc4f920463740ab2803f55b50f1cf0df2af9d58750c12c98fe5963dc8738d5a3e8d6a895c2e0d3ba8230bb61557b6e88b4fa56b2f05f5697577b68a9413df
-TIMESTAMP 2023-06-28T22:09:54Z
+TIMESTAMP 2023-06-28T22:39:57Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmScr7JfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmSctr1fFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCrPQ//betg8L0aCt8lmOsHEdqF7IgniUIUpXs5Oi31RGZt/UmAZ10sWA38UxkP
-QcsuVNHcT9PQjJZ8DaPoi+aKcpmf69LbT5df2K/k6e5A4e0HwM57pnD0+NusnCzz
-uYvFgF4U7JRym5w/ggeAxlcl5M7E/5gAotmcPbmjBrG+6I/3b+fiUxbG/LHjCsJU
-cDh6CKTXO5L7sTaxwrOO/yTDCkWZV/6oiOwgtEJbYzotKj59OMBXshZZEQHYmK/i
-QuEr0v0yMowu2aJv9z0xn9qDkfxLlX+1RKkWx8X3wecPmzOMO9QOffRNt+uG+Xhy
-VY94bfLOd/vzml9MGMm4GXdO/hbmzufFhYphuDfTjgTR4s5b+po/hKZ4HDfqhe/9
-jZpq6raNd+nqWpB4yS0YmQLBApMyonBJGYwosZL2LpO9yhZUIL1W0xuOh5GZBr8p
-Ev6AiUNESAkfi1mqvOpF5WXU3tK9NdtirfHCxoYChiu5YQSezB/x+0P5AovrvWWb
-JeZBzvXjyqM6Igz87uoX1z6W53gwT36Nqx6qe8RZzGBWnBwTGoJqZgHO4wlf7A/R
-+3WSXuhLfvEf+j1if+xpiCn5dFyUoaL+/r5Cb32T5JOmvP7X4rTGdJB0xiOENMOW
-pi+5q3EuiA7kVnqX3RHuYFc8brT7lu/fhEx7d4fV9/UYoxmzSFQ=
-=BA0A
+klBn7g//bMrJLvt2kPhQpyHjdDtlF4woKsu6TCSjtBbWeNbMReqRjSolt3jZVwnT
+EJaLgdqpUjiOCndOMK0sQg3aBnlLrjSjETQgklM0rUwOnE8KANzRQelPNyN2y3VH
+7RV9shwwqOoM7YTQqa0rT4G/9mu6g1QpusTvQwEufxEVJ2yyg4HwMZ0fYlieES1g
+HHveZLggznGrIZY8isj0Iu+xcbCVyKI4DRaYSoka72nghBu6uZHuE9brBh4GHdT8
+N4ylbp2wrcSqye8ma2SuZcRYBfw4bM87a8ZQZ1T2pdFgTTzb+u4jDmyElC9B5b28
+a2Rtn05Tsk6Rqo/FniSCaJSVSs5GwYi2uRRC/YYXYoM1nYIsCwITTP5UJEMKbTcB
+TrY+gL2Sv5BNh3shbarP0pfkgm2uacpvONYgZCtw2CN/xl3Thgtpd4c9eCRbHFUC
+CJ1pqjDqsIlxwXcfkOXFbliAO56VX1Di0GX+QG6OgQa7y4Em7huwJ8BiaEKNCyxa
+pSaIazDsvlVRnpB1BfeCBbC3Y7fuBV+7ng+xmc97633d3y0sUTRTwUjEB+WqP8Gh
+GzGzDyv1jAvHg2xKQzI2BF2Euh1DWlhJ14BcqGtMrshmu07tKEwmc+3AIywYlXCD
+ammv3cJ+GOB8FQmRXmywNF9tpr4ChZKot8X+alWIDQzuh/AXbh4=
+=JyHs
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index ddcab8b1199f1..d15b1f000c17a 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Wed, 28 Jun 2023 22:09:51 +0000
+Wed, 28 Jun 2023 22:39:54 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index be2bd127d6bc2..4cc41e0536a5c 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
diff --git a/metadata/md5-cache/dev-lua/Manifest.gz b/metadata/md5-cache/dev-lua/Manifest.gz
index 38364023b7e65..6d5a3b56c8ead 100644
--- a/metadata/md5-cache/dev-lua/Manifest.gz
+++ b/metadata/md5-cache/dev-lua/Manifest.gz
diff --git a/metadata/md5-cache/dev-lua/lpeg-1.0.2-r101 b/metadata/md5-cache/dev-lua/lpeg-1.0.2-r101
index f31418c2b6c16..96b93fc3bf519 100644
--- a/metadata/md5-cache/dev-lua/lpeg-1.0.2-r101
+++ b/metadata/md5-cache/dev-lua/lpeg-1.0.2-r101
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://www.inf.puc-rio.br/~roberto/lpeg/lpeg-1.0.2.tar.gz
 _eclasses_=flag-o-matic	ad475baa777c9978fa035216c8264a10	lua	8f9406bfff123a92ad04e4ace3e7f89b	lua-utils	d37a16dbcc1f07f71bc48da75ed7a0cb	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=57302fd31c8e9ded0e46d11324145bdb
+_md5_=0dff4d4f5df2faf77e58cd21ad75a6a3
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index 5cc0e27b8835b..99662d45c7a4e 100644
--- a/metadata/md5-cache/dev-util/Manifest.gz
+++ b/metadata/md5-cache/dev-util/Manifest.gz
diff --git a/metadata/md5-cache/dev-util/meson-1.2.0_rc1 b/metadata/md5-cache/dev-util/meson-1.2.0_rc1
new file mode 100644
index 0000000000000..2c4be589e177f
--- /dev/null
+++ b/metadata/md5-cache/dev-util/meson-1.2.0_rc1
@@ -0,0 +1,16 @@
+BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta1:3.12 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-67.7.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/wheel-0.40.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=test? ( dev-libs/glib:2 dev-libs/gobject-introspection dev-util/ninja dev-vcs/git sys-libs/zlib[static-libs(+)] virtual/pkgconfig )
+DESCRIPTION=Open source build system
+EAPI=8
+HOMEPAGE=https://mesonbuild.com/
+INHERIT=pypi bash-completion-r1 distutils-r1 toolchain-funcs
+IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
+LICENSE=Apache-2.0
+RDEPEND=virtual/pkgconfig python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta1:3.12 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/m/meson/meson-1.2.0rc1.tar.gz
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	2d32e797ee29a8ffdd452f4a85860666	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	6b97d2db40ff6be180030687e6003199	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a34d5f83235297b76d71eaf8deb53768	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
+_md5_=5c98fc14cfe15d91418327180e7df574
diff --git a/metadata/md5-cache/dev-util/meson-9999 b/metadata/md5-cache/dev-util/meson-9999
index 89f0106dcf5d5..be90caf7c6fa5 100644
--- a/metadata/md5-cache/dev-util/meson-9999
+++ b/metadata/md5-cache/dev-util/meson-9999
@@ -1,16 +1,16 @@
-BDEPEND=>=dev-vcs/git-1.8.2.1[curl] python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta1:3.12 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-67.7.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/wheel-0.40.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta1:3.12 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-67.7.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/wheel-0.40.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
 DEFINED_PHASES=compile configure install prepare test unpack
 DEPEND=test? ( dev-libs/glib:2 dev-libs/gobject-introspection dev-util/ninja dev-vcs/git sys-libs/zlib[static-libs(+)] virtual/pkgconfig )
 DESCRIPTION=Open source build system
 EAPI=8
 HOMEPAGE=https://mesonbuild.com/
 INHERIT=git-r3 bash-completion-r1 distutils-r1 toolchain-funcs
-IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
+IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
 LICENSE=Apache-2.0
 PROPERTIES=live
-RDEPEND=virtual/pkgconfig python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta1:3.12 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
+RDEPEND=virtual/pkgconfig python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta1:3.12 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	2d32e797ee29a8ffdd452f4a85860666	git-r3	27e13c09a4c7e4c78ac812f74727e676	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a34d5f83235297b76d71eaf8deb53768	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=3c657080fe91b6b1b4ec1b5cf77506dd
+_md5_=f3c72bb21f585515fbf2cf273f778053
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index 6e4d5ed56d279..c41fdc69d94f1 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/kbd-2.6.1 b/metadata/md5-cache/sys-apps/kbd-2.6.1
new file mode 100644
index 0000000000000..485c61d3f2cac
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/kbd-2.6.1
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig test? ( dev-libs/check )
+DEFINED_PHASES=configure install prepare
+DEPEND=app-alternatives/gzip pam? ( !app-misc/vlock sys-libs/pam )
+DESCRIPTION=Keyboard and console utilities
+EAPI=8
+HOMEPAGE=https://kbd-project.org/
+IUSE=nls selinux pam test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=app-alternatives/gzip pam? ( !app-misc/vlock sys-libs/pam ) selinux? ( sec-policy/selinux-loadkeys )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://www.kernel.org/pub/linux/utils/kbd/kbd-2.6.1.tar.xz
+_md5_=93b4173d272b1e5357e0ea4d81169a13
diff --git a/metadata/md5-cache/x11-terms/Manifest.gz b/metadata/md5-cache/x11-terms/Manifest.gz
index eb502bf53f662..742daf62ac8c4 100644
--- a/metadata/md5-cache/x11-terms/Manifest.gz
+++ b/metadata/md5-cache/x11-terms/Manifest.gz
diff --git a/metadata/md5-cache/x11-terms/xterm-383 b/metadata/md5-cache/x11-terms/xterm-383
new file mode 100644
index 0000000000000..637f34b28a1dc
--- /dev/null
+++ b/metadata/md5-cache/x11-terms/xterm-383
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig verify-sig? ( sec-keys/openpgp-keys-thomasdickey ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=configure install postinst postrm preinst unpack
+DEPEND=kernel_linux? ( sys-libs/libutempter ) media-libs/fontconfig:1.0 >=sys-libs/ncurses-5.7-r7:= x11-apps/xmessage x11-libs/libICE x11-libs/libX11 x11-libs/libXaw x11-libs/libXft x11-libs/libxkbfile x11-libs/libXmu x11-libs/libXrender x11-libs/libXt unicode? ( x11-apps/luit ) Xaw3d? ( x11-libs/libXaw3d ) xinerama? ( x11-libs/libXinerama ) x11-base/xorg-proto
+DESCRIPTION=Terminal Emulator for X Windows
+EAPI=8
+HOMEPAGE=https://invisible-island.net/xterm/
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=desktop flag-o-matic toolchain-funcs verify-sig xdg
+IUSE=+openpty sixel toolbar truetype unicode Xaw3d xinerama verify-sig
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
+LICENSE=MIT
+RDEPEND=kernel_linux? ( sys-libs/libutempter ) media-libs/fontconfig:1.0 >=sys-libs/ncurses-5.7-r7:= x11-apps/xmessage x11-libs/libICE x11-libs/libX11 x11-libs/libXaw x11-libs/libXft x11-libs/libxkbfile x11-libs/libXmu x11-libs/libXrender x11-libs/libXt unicode? ( x11-apps/luit ) Xaw3d? ( x11-libs/libXaw3d ) xinerama? ( x11-libs/libXinerama ) media-fonts/font-misc-misc x11-apps/rgb
+SLOT=0
+SRC_URI=https://invisible-island.net/archives/xterm/xterm-383.tgz verify-sig? ( https://invisible-island.net/archives/xterm/xterm-383.tgz.asc )
+_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=a2091f353e3c53fc242c2a380f823b8f
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index 3bd80d1bd4bf1..73da3ca0f3d74 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 15850 BLAKE2B f8a24ac4773896d3e2d3ac7daac96705bb587c68e5945981d4f8b934b213a0a634607e00cc3481f4c847f66ae537f4bfd1c12852438720d6cf5d711fe74f3237 SHA512 29367a48def7059bf0b6fab4e38cd0ba8266ac4b865394c346e798632efcf7c41364d99e462d98a52192ae8270db65e57b9f15ae208bef7ce4c3cfd98163dee1
-TIMESTAMP 2023-06-28T22:09:54Z
+TIMESTAMP 2023-06-28T22:39:57Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmScr7JfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmSctr1fFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klAp4g//VoUPmPbM08Q+hEtsQTmqyqXaGi0kpBdfDGS5g6r1tbX+7GwrRgjm7QxF
-xZFMfOqAoZkAW38ygLY1pzvcw5R9D9i43SJe/4/yD2eIbcGqB32kLXAcpv2v9dff
-kVlMmPNxLj0EUUEs9Olokr1Ky7Uc7Xj0wuuaPlnvR/iC0Wge3WdVkSOFTKFSzM/m
-6JVECD0qTwi0lWERSzjdK8JVd6Kx6NbIKBqJClA7Y7gx4UxJ6ZgGK6T6JwmOXgYk
-qvL6hV3tHFos11VTJ39RCrIXKaXWmF6lOslLIUsYQJR2bgIz9Ro6c25rtvuLiypL
-rZgaV+EXAa4/0xVXaI42JUx/rjrTxcuMuakwxipS5P2pVlzBqzuOHK7PGeKyKBHU
-mk57O6RJre8m0fryzYlYXkgVWvEAbqw31qKDa39Bw4108FTBhO2cHZE6AxRaS+Yj
-07RYKnc9yX4k6kKUYP1PFAvzLO9q+rZdsSGKuTN8iqH2ZMDNSf2ttnOD+wJsXZhv
-uOVjBkPPj6rbykfHaA7kCerLCee8DypfL4CDBoULqqk+g9MBVkI6sLw3oDP+Xz4V
-mdrdwApavUXt708LXOpetv/GzuFe66vvoYpDnNEGT++ehF+kLNzke/p2w008XpBu
-dQEUpzUNug6zCxKUHsJSrjarBQpqvsUBtHzrNANTUrRaEYfhNLU=
-=AH9H
+klBcRxAAthhyUAbis5vNSIaSSiGwr9DA9NPB/0WYCCy/njOtyJT8F/+ZfIY3dzAW
+J1eo2K5yPsPb29FQnknHvpoxA9+ljUqPf44IytkySol5Nhg9mI4h2KWm5zFE9mMj
+ua2YWO4332/fEMex0jehnQdHVftaqSkBEagQ/4wLQiZTF1VwuAyrepSaIUSGPBYJ
+ejECNasR5PhJvr4rkzRXFWNW5SzXA17ezXqLoocGxZ6US61iba0+TGqBV32CZJdu
+ubnMlllzU53do7XI34ivGDpBd4c1QYx/Y7FavaZJZtPsn6z22gBHL2J/pnhhQN8B
+LmJVUq0A7G2eHddn/dJJlxdcoqwFIgYGqETjiRuxA+tO+nz+hboplcdfFqUp35xU
+Adt3d6cEKyD4f4iXdACdIOijJde2GE7hOWkVlbTk4xUFblCLmFGycX6jWQdxjZur
+DMDICLYveMDR1OLsciLE+bWfelyEygGg7RmnrotobP/8O4uf1x/wTyEflpA5pfL2
+0YKqq5j11Ud8KR4nZAJVa2d8Ldoo3LCpw8s1JFGUrV71onZ/qfT0D+ofdH4s4CpU
+cHpg+OnA1/rICd6XdLd7b8snowWH4fmff9zOyzWs2kQ48PQcJyUyIwrmIz+GUPR4
+buaZDvQ7YkscKmrn2tK/YYg2Xt5d3N25CzCv2oQrW4GGHK/zLCA=
+=YYaA
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index ddcab8b1199f1..d15b1f000c17a 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Wed, 28 Jun 2023 22:09:51 +0000
+Wed, 28 Jun 2023 22:39:54 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 324859d077ddc..6f9e0ce3b6511 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Wed Jun 28 10:09:51 PM UTC 2023
+Wed Jun 28 10:39:54 PM UTC 2023
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index d4e2f17f7f254..e4bf83abe44d5 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Wed, 28 Jun 2023 22:15:01 +0000
+Wed, 28 Jun 2023 22:45:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 6a0ac9b477523..b17c374bf8657 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-9038323476ea44a35716b57d7fac137746bdf1b9 1687988955 2023-06-28T21:49:15+00:00
+295a950b0c90175ea9ab778b7984a46bb1fd7a46 1687991663 2023-06-28T22:34:23+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 34b3a975fdf2f..f995e28a86d45 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1687990201 Wed 28 Jun 2023 10:10:01 PM UTC
+1687992001 Wed 28 Jun 2023 10:40:01 PM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index ddcab8b1199f1..d15b1f000c17a 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Wed, 28 Jun 2023 22:09:51 +0000
+Wed, 28 Jun 2023 22:39:54 +0000
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index fcad1db6a0034..fa882ad7b270f 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/kbd/Manifest b/sys-apps/kbd/Manifest
index 930770cca553b..877ac21104726 100644
--- a/sys-apps/kbd/Manifest
+++ b/sys-apps/kbd/Manifest
@@ -1,6 +1,8 @@
 DIST kbd-2.5.1.tar.xz 1491952 BLAKE2B aab4c3d78c28709bf562b54fe94c0533d5c33185e183bf3eb944f89147b250d9df9b30b64a06eb4742feafe8c05a6aa491a7f007b4d6d9077bc19a4628ba05ae SHA512 74855f486aff5fc2f93a6cb29460a590c94eac653b001574e1b4eb1300ea99dfed9222f9e5d1d3a05a112a6880591d5c44ed6e76b8a64edf744ecb0892f562d0
 DIST kbd-2.6.0.tar.xz 1590196 BLAKE2B 9894bab607694cc60cece959573b8f13f687d47b4346fa84e57bffd2c062a5ac2830f9a6766aca70d2242f63f486c898fe5d777fc01dfabe85d004b1f29d364a SHA512 4b8cec06ea2143a285bedb95cb66c313ebac79dc3c64956f969f389186609bc1a066dbf32d6ae308e18947dcbe2f6f684f6c69d4210b40d449735e5704707b27
+DIST kbd-2.6.1.tar.xz 1591240 BLAKE2B 15c738379cfa9420e218ddbf6562e2c75b6bf5eb31ce159d798d49546991ca0c02bf9a11486d99bd2ba7d99f3bf6abb53ad799c6314df6d9ca9b1e8cf808b738 SHA512 8d7f39efa91ef16f4c0601c1744e7f00e411c121607660c8f585d3e085d8e8bea4ea095f6c7f491af763097a9844fb4a07d4b78a8358cb7caafbfda0626acf91
 EBUILD kbd-2.5.1.ebuild 2027 BLAKE2B 66c55f1296812b9a197460a8a90bf237def618d6fc9d00ad6e26ff543b1918c7274aae2627c836925099ed37645bf6fa5c05ebfc392077b265b46f0d31d0b1c9 SHA512 9734368dac398812fee31c31a29f6ec8b4819181a8a0a711ceadb64c825aaf515aa35d767185bf9379e5287facda5f53c923ef64aeb3f45ea054b5a5c97f2dd2
 EBUILD kbd-2.6.0.ebuild 2087 BLAKE2B d28a22fedf7b8cbbeca0245c825a27f23f9bf2889362737103a0b368a78c4eeb96d6381e262d83b1c2b131206f36074f1f06ca0220a855ffe81b032a3d3ffbf6 SHA512 25f67af979a43e1866e8bbc98bfa86c27f493b06933e37365321dc6bbdc8520478fa8253430a8ad125b64c67c8e5df7560ff3e047a84ff2e661403afb456077a
+EBUILD kbd-2.6.1.ebuild 2087 BLAKE2B d28a22fedf7b8cbbeca0245c825a27f23f9bf2889362737103a0b368a78c4eeb96d6381e262d83b1c2b131206f36074f1f06ca0220a855ffe81b032a3d3ffbf6 SHA512 25f67af979a43e1866e8bbc98bfa86c27f493b06933e37365321dc6bbdc8520478fa8253430a8ad125b64c67c8e5df7560ff3e047a84ff2e661403afb456077a
 EBUILD kbd-9999.ebuild 2087 BLAKE2B d28a22fedf7b8cbbeca0245c825a27f23f9bf2889362737103a0b368a78c4eeb96d6381e262d83b1c2b131206f36074f1f06ca0220a855ffe81b032a3d3ffbf6 SHA512 25f67af979a43e1866e8bbc98bfa86c27f493b06933e37365321dc6bbdc8520478fa8253430a8ad125b64c67c8e5df7560ff3e047a84ff2e661403afb456077a
 MISC metadata.xml 335 BLAKE2B 3b00a31428edc76e9a758c347107ad15e2f91a440a49e5167878555eda6dad176f8936ca22acbbecb5ff4827d8605b28db53ca990284b4e18c536a04d46616ed SHA512 86a6b134e0403abf5c22e868e2013a2051f504401d5ff8aa1ad682638d866ab8d837470ed87434286b77933483d7675646f382b15aed19772b2fff17258fc0f7
diff --git a/sys-apps/kbd/kbd-2.6.1.ebuild b/sys-apps/kbd/kbd-2.6.1.ebuild
new file mode 100644
index 0000000000000..23a50e0bfa38b
--- /dev/null
+++ b/sys-apps/kbd/kbd-2.6.1.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+if [[ ${PV} == 9999 ]] ; then
+	inherit autotools git-r3
+	EGIT_REPO_URI="https://github.com/legionus/kbd.git https://git.kernel.org/pub/scm/linux/kernel/git/legion/kbd.git"
+	EGIT_BRANCH="master"
+else
+	if [[ $(ver_cut 3) -lt 90 ]] ; then
+		SRC_URI="https://www.kernel.org/pub/linux/utils/kbd/${P}.tar.xz"
+		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	else
+		inherit autotools
+		SRC_URI="https://github.com/legionus/kbd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	fi
+fi
+
+DESCRIPTION="Keyboard and console utilities"
+HOMEPAGE="https://kbd-project.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="nls selinux pam test"
+RESTRICT="!test? ( test )"
+
+# Testsuite's Makefile.am calls missing(!)
+# ... but this seems to be consistent with the autoconf docs?
+# Needs more investigation: https://www.gnu.org/software/autoconf/manual/autoconf-2.67/html_node/autom4te-Invocation.html
+QA_AM_MAINTAINER_MODE=".*--run autom4te --language=autotest.*"
+
+DEPEND="
+	app-alternatives/gzip
+	pam? (
+		!app-misc/vlock
+		sys-libs/pam
+	)
+"
+RDEPEND="
+	${DEPEND}
+	selinux? ( sec-policy/selinux-loadkeys )
+"
+BDEPEND="
+	virtual/pkgconfig
+	test? ( dev-libs/check )
+"
+
+src_prepare() {
+	default
+
+	# Rename conflicting keymaps to have unique names, bug #293228
+	# See also https://github.com/legionus/kbd/issues/76.
+	pushd "${S}"/data/keymaps/i386 &> /dev/null || die
+	mv fgGIod/trf.map fgGIod/trf-fgGIod.map || die
+	mv olpc/es.map olpc/es-olpc.map || die
+	mv olpc/pt.map olpc/pt-olpc.map || die
+	mv qwerty/cz.map qwerty/cz-qwerty.map || die
+	popd &> /dev/null || die
+
+	if [[ ${PV} == 9999 ]] || [[ $(ver_cut 3) -ge 90 ]] ; then
+		eautoreconf
+	fi
+}
+
+src_configure() {
+	local myeconfargs=(
+		--disable-werror
+
+		$(use_enable nls)
+		$(use_enable pam vlock)
+		$(use_enable test tests)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	docinto html
+	dodoc docs/doc/*.html
+
+	# USE="test" installs .la files
+	find "${ED}" -type f -name "*.la" -delete || die
+}
diff --git a/sys-apps/locale-gen/Manifest b/sys-apps/locale-gen/Manifest
index 19d9be8e2f36e..831dc00d53480 100644
--- a/sys-apps/locale-gen/Manifest
+++ b/sys-apps/locale-gen/Manifest
@@ -1,3 +1,3 @@
 DIST locale-gen-2.23.tar.bz2 7664 BLAKE2B a529b62fbb840c9352f06e8f5c80fc764425a2619dc69cc820f550a026d391788d5e2cfeeb46a8b5b9716da63340b4fce57a5b523edd4196ee1219c1200cb752 SHA512 c1245caadb04403c535a836f19bc410d0f04b5c0e297ea5be9852e6d71e08e528071ae769d63d31a677dda8fdd618b4c4d581ed525cf8786b82d8f37636db754
 EBUILD locale-gen-2.23-r1.ebuild 897 BLAKE2B dc105737e771373a071938623ada656ada4554ef736be328f7f0fb1d337226fc3bbadf2d57aba950a3ec4339fd745506932179a4928c4a802006930e4eedbb2f SHA512 d721a154058233864de0c6fb556d278a037d2e82296481466d3be49fa9109687f5e0736de89bb9aa351b073f0324869802a7df378106deb2b9ce472349069c4c
-MISC metadata.xml 262 BLAKE2B fe330d67755784d14f5c5d664d7127d3cdb9edfab55b907ae3632f434d86323604f5095e1c1a9fbd169ae7a4cbb38f359e55f75047531786247c0674a4a53715 SHA512 3bcaca4e730edeed06fed73e79a5ce0a3358174672735ea4b27240c6c421ac9c33bc2b63a31e596fe1bbb6b1816c16cbc7ef4f258ca906ba04ea7db4aedc86b9
+MISC metadata.xml 399 BLAKE2B 9b0c4e964dbb8808d803352f78417d770e494ca88c28db4f7dbcbef8e43caadf6df701da762aa5704c15a0c685467cd4c51a9bdf3397a909a920f1a3a67ae7aa SHA512 04d82d54da06605db532ceae7a3a2e6bfc2d737d395f4c45f1d695a3b61d52717fd16db613d5b17b47e1d18e3f91327660c9bf1eeee36d3d3ebc85408d378eca
diff --git a/sys-apps/locale-gen/metadata.xml b/sys-apps/locale-gen/metadata.xml
index e9de1423720be..2b151008630f8 100644
--- a/sys-apps/locale-gen/metadata.xml
+++ b/sys-apps/locale-gen/metadata.xml
@@ -5,4 +5,8 @@
 		<email>toolchain@gentoo.org</email>
 		<name>Gentoo Toolchain Project</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="gentoo">proj/locale-gen</remote-id>
+		<remote-id type="github">gentoo/locale-gen</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/x11-terms/Manifest.gz b/x11-terms/Manifest.gz
index c2685794458a3..394f007ae9fac 100644
--- a/x11-terms/Manifest.gz
+++ b/x11-terms/Manifest.gz
diff --git a/x11-terms/xterm/Manifest b/x11-terms/xterm/Manifest
index 9eab5f09ab91a..3b0e7fd7604a1 100644
--- a/x11-terms/xterm/Manifest
+++ b/x11-terms/xterm/Manifest
@@ -6,8 +6,11 @@ DIST xterm-381.tgz 1536598 BLAKE2B 44a94e893fa8696e58e7246c2800799ca85b4f099f059
 DIST xterm-381.tgz.asc 729 BLAKE2B d6b866eb09c42dea4956bc6997f752b3a59ae0477275e5919abd9420d151cc094cc99b06088026991d76f254bc84f637dd67dc9191870cf88ba9f48a5d74651b SHA512 05217da892f6b6261c33359b1905b97b0164bbbf155be4e516cd624e5afc9dfa8b89a46f1ae302c7ed486ad466c19200becda556c35fa09fd6a932b634cb9b10
 DIST xterm-382.tgz 1536637 BLAKE2B 50e538f9ad0735da9c108aca2ccd4e5f14c3aa923fa932952098731e2c68658eaa3f5a35d65468db18b6cabef2f0da5ff8292da9d863a4254f7ca8f4d92e363d SHA512 52780430928d071a131ba9d79ca6915d9f627e82a527f5b0c1eac8e05cea62294631e4a6f27a29e5fa046e3b15c3744e532322e547f4a6a01d05779f0807b8b5
 DIST xterm-382.tgz.asc 729 BLAKE2B 08d3c637ab1d922c951abda0306e07c3ce51d41d4f916fbc01eb2975ac294417bc4f3f07ccadf7332a8c6547bd6e373bc300a3ce6e0fb21abb8a1699f8bad64e SHA512 d399cb16dcb8b0c6c6eb998d2d37c445079d57d46e5ec3e8ca94479443a817419dc1051181b31e8f478ab8910773477de19d6b783439454fb259f135390a8bd1
+DIST xterm-383.tgz 1538968 BLAKE2B 9d9e0aff91b829b8e3d7dfcf0ad461d4f823545ebb7d0a4a1130c339afbea76f60fb2e2f514ec05256fa6e5a5f137333c4fabe7bea6eb7aa1c59ecff93a77b77 SHA512 68befcf821a752992d82c48c2fabd86953185c691b5f16d6dcc8427156469bf0790737b12d3b57e70fe52e8ddf7139380b30c46d7724b961b7c35c3a0efa097f
+DIST xterm-383.tgz.asc 729 BLAKE2B 144f78cde591454e09da11e98ba4b455faddf8dc2cba403c28cc02a9b9bd49e296be473d5404cb98a6ae420efd3f851bb5307f3a16cdcc9abe9ed93add4fece2 SHA512 5ec5ac94ac031a91d0ddabeb09afb1a72bf3f926f6fe7d840000729194923a7495463c0ff91f63a2bc920703ba07c0bb1b21a05c35a539a7b948eb42c574e358
 EBUILD xterm-379.ebuild 2923 BLAKE2B 19dba7f16c7fc600cf62d4117795727e6151a97e8e9d1b2c549ff99d983bbe4502a0984f0f98a5bd00c1d58b8f50f01308fe51b2d610725fd7368f833ca2e562 SHA512 a100938b7c97751b4064a2b0db5363d85fad53c42fd0493484541ee34974fc13a6215687cee0d908f096ac241189fa04aa6c9d9e4b0b2136f2867eb5923424d0
 EBUILD xterm-380.ebuild 2930 BLAKE2B 6bb426538a1dec8b3cc0f161c7d4171f88d44c2ad4aa23707f3cf7c5783d5a6c120e20b25d5ea024d0c948cd94b0d6ee5d88fdb503b7220f2ba4565f3c3e8e1d SHA512 5ad65ecefa828c2d1e5aefc1da96d326d6a1a433e77f2958726c2cccc95aa1e0ab7106381d93de0f5a6256f7a912461388f994aee5efaed8b7444558e924663c
 EBUILD xterm-381.ebuild 2930 BLAKE2B 6bb426538a1dec8b3cc0f161c7d4171f88d44c2ad4aa23707f3cf7c5783d5a6c120e20b25d5ea024d0c948cd94b0d6ee5d88fdb503b7220f2ba4565f3c3e8e1d SHA512 5ad65ecefa828c2d1e5aefc1da96d326d6a1a433e77f2958726c2cccc95aa1e0ab7106381d93de0f5a6256f7a912461388f994aee5efaed8b7444558e924663c
 EBUILD xterm-382.ebuild 2930 BLAKE2B 6bb426538a1dec8b3cc0f161c7d4171f88d44c2ad4aa23707f3cf7c5783d5a6c120e20b25d5ea024d0c948cd94b0d6ee5d88fdb503b7220f2ba4565f3c3e8e1d SHA512 5ad65ecefa828c2d1e5aefc1da96d326d6a1a433e77f2958726c2cccc95aa1e0ab7106381d93de0f5a6256f7a912461388f994aee5efaed8b7444558e924663c
+EBUILD xterm-383.ebuild 2930 BLAKE2B 6bb426538a1dec8b3cc0f161c7d4171f88d44c2ad4aa23707f3cf7c5783d5a6c120e20b25d5ea024d0c948cd94b0d6ee5d88fdb503b7220f2ba4565f3c3e8e1d SHA512 5ad65ecefa828c2d1e5aefc1da96d326d6a1a433e77f2958726c2cccc95aa1e0ab7106381d93de0f5a6256f7a912461388f994aee5efaed8b7444558e924663c
 MISC metadata.xml 552 BLAKE2B 1de52230aa9b681cee30dd4ee4651521bf9474cb2a99168fd6c8f13e0918cf185dbddd3dc6f97e0c81118680294e9c4d74137378763b021a07d8ce0a1430e18c SHA512 019a08f2f03a270da7a33bf1b0e9bb42864b806990884b9f2c19110238ad5d5fd18bc896e9fa7cde130b4ccf3f7003db43f6b485caf5b021f5d5e36f279f9d36
diff --git a/x11-terms/xterm/xterm-383.ebuild b/x11-terms/xterm/xterm-383.ebuild
new file mode 100644
index 0000000000000..175692654251a
--- /dev/null
+++ b/x11-terms/xterm/xterm-383.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/thomasdickey.asc
+inherit desktop flag-o-matic toolchain-funcs verify-sig xdg
+
+DESCRIPTION="Terminal Emulator for X Windows"
+HOMEPAGE="https://invisible-island.net/xterm/"
+SRC_URI="https://invisible-island.net/archives/${PN}/${P}.tgz"
+SRC_URI+=" verify-sig? ( https://invisible-island.net/archives/${PN}/${P}.tgz.asc )"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="+openpty sixel toolbar truetype unicode Xaw3d xinerama"
+
+DEPEND="
+	kernel_linux? ( sys-libs/libutempter )
+	media-libs/fontconfig:1.0
+	>=sys-libs/ncurses-5.7-r7:=
+	x11-apps/xmessage
+	x11-libs/libICE
+	x11-libs/libX11
+	x11-libs/libXaw
+	x11-libs/libXft
+	x11-libs/libxkbfile
+	x11-libs/libXmu
+	x11-libs/libXrender
+	x11-libs/libXt
+	unicode? ( x11-apps/luit )
+	Xaw3d? ( x11-libs/libXaw3d )
+	xinerama? ( x11-libs/libXinerama )"
+RDEPEND="${DEPEND}
+	media-fonts/font-misc-misc
+	x11-apps/rgb"
+DEPEND+=" x11-base/xorg-proto"
+BDEPEND="
+	virtual/pkgconfig
+	verify-sig? ( sec-keys/openpgp-keys-thomasdickey )
+"
+
+DOCS=( README{,.i18n} ctlseqs.txt )
+
+src_configure() {
+	DEFAULTS_DIR="${EPREFIX}"/usr/share/X11/app-defaults
+
+	# bug #454736
+	# Workaround for ncurses[tinfo] until upstream fixes their buildsystem using
+	# something sane like pkg-config or ncurses5-config and stops guessing libs
+	# Everything gets linked against ncurses anyways, so don't shout
+	append-libs $($(tc-getPKG_CONFIG) --libs ncurses)
+
+	local myeconfargs=(
+		--disable-full-tgetent
+		--disable-imake
+		--disable-setgid
+		--disable-setuid
+		--enable-256-color
+		--enable-broken-osc
+		--enable-broken-st
+		--enable-dabbrev
+		--enable-exec-xterm
+		--enable-i18n
+		--enable-load-vt-fonts
+		--enable-logging
+		--enable-screen-dumps
+		--enable-warnings
+		--enable-wide-chars
+		--libdir="${EPREFIX}"/etc
+		--with-app-defaults="${DEFAULTS_DIR}"
+		--with-icon-theme=hicolor
+		--with-icondir="${EPREFIX}"/usr/share/icons
+		--with-utempter
+		--with-x
+		$(use_enable openpty)
+		$(use_enable sixel sixel-graphics)
+		$(use_enable toolbar)
+		$(use_enable truetype freetype)
+		$(use_enable unicode luit)
+		$(use_enable unicode mini-luit)
+		$(use_with Xaw3d)
+		$(use_with xinerama)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	docinto html
+	dodoc xterm.log.html
+	sed -i -e 's/_48x48//g' *.desktop || die
+	domenu *.desktop
+
+	# Fix permissions -- it grabs them from live system, and they can
+	# be suid or sgid like they were in pre-unix98 pty or pre-utempter days,
+	# respectively (#69510).
+	# (info from Thomas Dickey) - Donnie Berkholz <spyderous@gentoo.org>
+	fperms 0755 /usr/bin/xterm
+
+	# restore the navy blue
+	sed -i -e 's:blue2$:blue:' "${D}${DEFAULTS_DIR}"/XTerm-color || die
+}