gentoo auto-resync : 27:08:2023 - 16:00:10

107 files changed, 739 insertions, 576 deletions

diff --git a/Manifest b/Manifest
index 9f0ad0316465..4c81a8e2b126 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29292 BLAKE2B dbbe2b627822f7679b7665e02387afe19241a659211c798a592da3dacbfe0d748af070c6e3802ee9e299ca020d756b554fa2bebbd66beffc143ae8f478118b7d SHA512 a8e759d78bead0b958723e7b7d852144e1c8f90b6261212711f97dd8b86a105827f05192e744f0f51fdef282edc71a4745ceef1b6530fb93c02c4eeb8eae3d65
-TIMESTAMP 2023-08-27T08:09:59Z
+MANIFEST Manifest.files.gz 29288 BLAKE2B bbb10d30081032b3ea9900ffb931fba395a9ba6fed1f1c85e289aff5ec1624710700e9758fb6c4b02f0099965b0225a35386dfbfbfb00f597e30e4376b4468cf SHA512 1a32925f5cb3d4224e066419249ef7a29e9f7febc230224ad40308f7d9386a69fe0201ef9c663a291ed7c185389ee8c020fdd1fb4943329ce59432575d2b9b37
+TIMESTAMP 2023-08-27T14:10:01Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmTrBNdfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmTrWTlfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCHdQ/+P37uJGhIuPh36TE81YXz6pJdsglagEO+zu4JHm9rvaoCN5AQEM1oI2IQ
-9t85/n5d9V3CpR83U7p8+2VrxW7lnHGq1llTvI5/Fssmnyp4BeDC/zqtdBZQddsX
-HctBBjhAVTKVM+WbnX21CYxS/i85Q+rscmqviqmcps9Tolqtg5SkIcGVWQ4KieH8
-coxGRK43UQ0jWZtFLqtUZ8w7TQYJgA6p+g+/B1b2WRQgXsJWty3hnqL9Sp0MPIzo
-JEu2wqg4HWoFBZDQOaiC4OyDAjT5lt5tWAERYSfqTPPOroYAVhPdXwLShzk23W7I
-98RApzAEIx8n0t99gZeYYCv9J+HAfC48TynaKmnsNGx/3j8Asjl6TGPFALidxLQ/
-iRAEaXWFyg/7+hbOWzeHICJUGUrrKMfnOZa0szuG8kDqDew+4x/JePsydk9jSYDu
-izHPGSB7NiMzij/8vhvNcRrpYknG6kyqQEmBC+6sqh7acwK24mnNzsSYLjdhwVzJ
-JPcR24+MYLmF8XytBeh2DtAocSzk0rKm91GlFZCpKOWzK/uSefbge0uhNHF0/7Xw
-+7ivhnqzVvRhxXo6tVTvkHnPl/thEENeD8/mNBEuRP9RhtsRiabmbrM6DYmXAw+J
-Ey5vwJzzq85E0jOKIfrU+zwodYqcVOvl6trm6VeoBu10Lh21aHc=
-=lpdn
+klALQg//ZPQW62+UJdcOWoX8E86KibXIEKIYmbg5XgF9rrh50hevlzyntHpqHS6m
+tCrXx5Tn7FqrQSZCUQnbS2ebRcZ/o4gLYb6L7TskQsPiKa4qwDopj+Op4E/hcg+5
+LTnc0Aob5ZJgOBWbInU/KTcHE/QDOXT70A1XHjFYnmsDHUQZimrUQntBjfZyJQJF
+o14JAIgkwIwPk2ZRXbCXPihbwH7g791BQC1YUscZ/cc5fP+R7U8bObR7yKqjqrot
+KVDc/JkyVdE7RQfajyLGLeIIcasBkbM4G4t86B7SmFVsDvbO/qu3hzxRT6djTgvr
+pkOYoUqh5lRCA0Kb/Eqc9halqINNBsKD5m/Qw6VmqKxhw++HoZYFawhGHgtAF++0
+Ti33fVcNBfMZfjxoaadgxCkH6pBL2JRRUxG/GiPbJ5IukuT6HJh5CZCwa2GFnGJA
+ANQD7z7AqKAnWHPhJxEANm3gkJMz+6UX0IWY3Xjh243MeyZJpvDHeQxjTkyZIiNU
+bwNng/tC4bd+vW3MrOFhQU/ZB1tPoOHQLdwYNp4kOupra/kCcsn/WifLxd1PnrSl
+CgGgs05emGm9DK0etggyW2eKQGGTZliKoZMgPTYGuw5G1BMrcxEI4+1xml53EdMv
+awEU8NpvGDEOEAiqAok0DSH4CEA9R8u4IGRa+VIaoHLBinqUvnI=
+=XtOB
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index cd52439dc0a1..5d04c2b36b4f 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 2284cc02ef2c..892051a821a7 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/paper-clip/Manifest b/app-text/paper-clip/Manifest
index d7e956cdad40..73f9453e7aef 100644
--- a/app-text/paper-clip/Manifest
+++ b/app-text/paper-clip/Manifest
@@ -1,4 +1,4 @@
 DIST paper-clip-3.2.tar.gz 196899 BLAKE2B d089185db9557431c22ed64b63155920c60795315fad1901b0a5ce5fd0230b7246d375a10a8ce150ad4fdce16f9062aa4770601b741189b877e57d4fe948d7a2 SHA512 6a08fe04f3431d7444ba67da34b60d56b7cf065199fceef7086ad3f181f18c703b8d011e6dbef39942011e7f92e3728f1f1a5164a575bab43b370fca9c4fdb98
-EBUILD paper-clip-3.2.ebuild 1338 BLAKE2B 4c3179bf984acdbb4ede6c38cf9bd843f077f6fc64494e28e2ddbae21ad16082567f1dee34bb20ea26ffa0f19522eb217d6da3ddb740e306178f03dbc664474b SHA512 211a908965f3be900477c9acfa6eb467169d049c6933217626307bb4ed7df3a12edb18aa5ca986397c98111e952dab3aa4398b93ca8daf43856ffa7ceb3211bc
-EBUILD paper-clip-9999.ebuild 1338 BLAKE2B 4c3179bf984acdbb4ede6c38cf9bd843f077f6fc64494e28e2ddbae21ad16082567f1dee34bb20ea26ffa0f19522eb217d6da3ddb740e306178f03dbc664474b SHA512 211a908965f3be900477c9acfa6eb467169d049c6933217626307bb4ed7df3a12edb18aa5ca986397c98111e952dab3aa4398b93ca8daf43856ffa7ceb3211bc
+EBUILD paper-clip-3.2-r1.ebuild 1382 BLAKE2B 12662c41f9864a9e64cc00a7e4b165c0bb1895a58f4a6973bff12223e85b7c053673dd545fd8b07c661ec834edaacb6b5f6f00ee9329d65016b28bdc7bbaff90 SHA512 fabb15a34e83d8b0aa264e8adc8fb2af294fd5631f666127e6a6eca8e7c1463762e096f9df8029f8fb620adbb972109909fbba64b5d4bcdb45b6666ccd27553c
+EBUILD paper-clip-9999.ebuild 1382 BLAKE2B 12662c41f9864a9e64cc00a7e4b165c0bb1895a58f4a6973bff12223e85b7c053673dd545fd8b07c661ec834edaacb6b5f6f00ee9329d65016b28bdc7bbaff90 SHA512 fabb15a34e83d8b0aa264e8adc8fb2af294fd5631f666127e6a6eca8e7c1463762e096f9df8029f8fb620adbb972109909fbba64b5d4bcdb45b6666ccd27553c
 MISC metadata.xml 413 BLAKE2B 66acd49c6583aec7c89aa17de477237b5214aefc73b4814eb8170f1af322fd3d1565557060e2fc63027740457c84131e9d6d4be0f1dd4d531ac7da79429e0c91 SHA512 69d713bd2b11742920a25f5db125de72bb44403a049a1969e988b124d2d88ea36d6ac04a8b2091380f9208ad4407f354322e307a433bb58c413353069eb8cccc
diff --git a/app-text/paper-clip/paper-clip-3.2.ebuild b/app-text/paper-clip/paper-clip-3.2-r1.ebuild
index 869320a239bb..2dc0892a58ef 100644
--- a/app-text/paper-clip/paper-clip-3.2.ebuild
+++ b/app-text/paper-clip/paper-clip-3.2-r1.ebuild
@@ -28,9 +28,9 @@ RDEPEND="
 	app-text/poppler:=[cairo,introspection]
 	dev-libs/glib:2
 	dev-libs/gobject-introspection
-	dev-libs/libportal:=
+	dev-libs/libportal:=[gtk,introspection,vala]
 	gui-libs/gtk:4
-	gui-libs/libadwaita:1
+	gui-libs/libadwaita:1[introspection,vala]
 "
 DEPEND="
 	${RDEPEND}
diff --git a/app-text/paper-clip/paper-clip-9999.ebuild b/app-text/paper-clip/paper-clip-9999.ebuild
index 869320a239bb..2dc0892a58ef 100644
--- a/app-text/paper-clip/paper-clip-9999.ebuild
+++ b/app-text/paper-clip/paper-clip-9999.ebuild
@@ -28,9 +28,9 @@ RDEPEND="
 	app-text/poppler:=[cairo,introspection]
 	dev-libs/glib:2
 	dev-libs/gobject-introspection
-	dev-libs/libportal:=
+	dev-libs/libportal:=[gtk,introspection,vala]
 	gui-libs/gtk:4
-	gui-libs/libadwaita:1
+	gui-libs/libadwaita:1[introspection,vala]
 "
 DEPEND="
 	${RDEPEND}
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index df1ca1b3692f..d6ef2ed5d839 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/json-c/Manifest b/dev-libs/json-c/Manifest
index 73723079131f..ecf2e2f011df 100644
--- a/dev-libs/json-c/Manifest
+++ b/dev-libs/json-c/Manifest
@@ -1,4 +1,6 @@
 DIST json-c-0.16.tar.gz 351916 BLAKE2B 11457fa39330338c85bfdfb0dd38fc703ad6942e730ba090c9fe017dfb81ef905d7b1bb1c768b9b51f6445a8cf3cf4007d7740be3a9878f8062edc62ba554c66 SHA512 255cff99033340b2c2678255d41dae7808f83ed0c102e693d2d9e186bd1f21dd1385fcaa360c0fc087a00965a9567fbda733370e6b518a9be2f1bb0a80439151
+DIST json-c-0.17.tar.gz 390045 BLAKE2B 26be25141447f2b652fa09d7096141a8bf7992469bcc53b275c1bc0108fc36a8898a8185c381218d3146d00fa03bdd0b837be073410fc93af943b5f083dbaa69 SHA512 4cbedd559502bf9014cfcd1d0bb8bb80d2abac4e969d95d4170123cd9cbafb0756b913fdbb83f666d14f674d6539a60ed1c5d0eb03c36b8037a2e00dc1636e19
 EBUILD json-c-0.16-r1.ebuild 1015 BLAKE2B eedc8461e221573689072f789e5585f58389befcda995650cc14ea1f37eaf1205702052b2faeebdf4d6083d99173c8072d3b82d5d0452de25860695f8183da4d SHA512 66cb5b5aa00a6f44334e0bdb7081d746e87fda879b1b3bbc5fd0d9ba37523ec2e461eb010b195bc4bcfffbedf0fe0c27363de0a99252690a621b167f1c9626a2
-EBUILD json-c-9999.ebuild 982 BLAKE2B be8f7be7c17ad3adcab6623ab5440d402fcd2aa7f7d71aac45aaf4934c8812788381f84e7d978f68463a7a54b51793a0fa2c18927cd41f441dabaa6182780e75 SHA512 7b0314afa5373240e2f064959f03abb0514f7ac96385ce893133028087398934c8b1f1c01cc8a71717f7df88f7ddf60116816817f3df4badc7fcb389394d37c2
+EBUILD json-c-0.17.ebuild 1133 BLAKE2B dcb8b9b308adc022c71d8b81d794c90a6743b078eac1df544b8b444e9d79bbe9f07efda22e8cca89a4791605ba9282563434b098842220e8c49c3034331c2d89 SHA512 84f5f2f72453b7ad8a68fbab962c35c5d7086b926e5f8d5b68d32d74071bb5ef90f12e5a4ac26a6d71cdb8f3df3734fe4c68a20c949bf4e4e7986c4bfa16b4b6
+EBUILD json-c-9999.ebuild 1214 BLAKE2B af6f1dbfba3d9c60706d96b3247e0cb6b050f1ba9ff607e93ab1b5d4b3d637603beffd289148b70c6234134dcf65d11340d44435892b6d165c5c8c41103c623d SHA512 aa8f87c111619248d56279908039e168783e7adaca98d3e7533cd5eb05c8eacbc6309e523043f3175afbbd1388a62b5227d2f4e26ab4c43728375150e1bfbb95
 MISC metadata.xml 1011 BLAKE2B d9f64f6e06a3b1a5bb315e35590426e9e87d777bf2fe73a7f8c57e6730ce99236d071d7d9ddf190e654e39e91d4134fdd07689afa958d6aec69dc5a787e95bf8 SHA512 731afa46afd8fdd519425c1a58f791f4d999333e726426770a0f37e552d640d4a198f6b2eb859dca3c4aca21f3e1fc8ad147de0e07efcede14b5d791b66e4e72
diff --git a/dev-libs/json-c/json-c-0.17.ebuild b/dev-libs/json-c/json-c-0.17.ebuild
new file mode 100644
index 000000000000..9d4e9b6e31a6
--- /dev/null
+++ b/dev-libs/json-c/json-c-0.17.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake-multilib
+
+DESCRIPTION="A JSON implementation in C"
+HOMEPAGE="https://github.com/json-c/json-c/wiki"
+SRC_URI="https://s3.amazonaws.com/json-c_releases/releases/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/5"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="cpu_flags_x86_rdrand static-libs threads"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/json-c/config.h
+)
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		# apps are not installed, so disable unconditionally.
+		# https://github.com/json-c/json-c/blob/json-c-0.17-20230812/apps/CMakeLists.txt#L119...L121
+		-DBUILD_APPS=OFF
+		-DBUILD_STATIC_LIBS=$(usex static-libs)
+		-DDISABLE_EXTRA_LIBS=ON
+		-DDISABLE_WERROR=ON
+		-DENABLE_RDRAND=$(usex cpu_flags_x86_rdrand)
+		-DENABLE_THREADING=$(usex threads)
+	)
+
+	cmake_src_configure
+}
+
+multilib_src_test() {
+	multilib_is_native_abi && cmake_src_test
+}
+
+multilib_src_install_all() {
+	HTML_DOCS=( "${S}"/doc/html/. )
+	einstalldocs
+}
diff --git a/dev-libs/json-c/json-c-9999.ebuild b/dev-libs/json-c/json-c-9999.ebuild
index d1cd5a7aa95a..57cba100cf9c 100644
--- a/dev-libs/json-c/json-c-9999.ebuild
+++ b/dev-libs/json-c/json-c-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit cmake-multilib git-r3
+inherit cmake-multilib git-r3 multibuild
 
 DESCRIPTION="A JSON implementation in C"
 HOMEPAGE="https://github.com/json-c/json-c/wiki"
@@ -21,11 +21,14 @@ MULTILIB_WRAPPED_HEADERS=(
 
 multilib_src_configure() {
 	local mycmakeargs=(
-		-DDISABLE_WERROR=ON
+		# apps are not installed, so disable unconditionally.
+		# https://github.com/json-c/json-c/blob/json-c-0.17-20230812/apps/CMakeLists.txt#L119...L121
+		-DBUILD_APPS=OFF
+		-DBUILD_STATIC_LIBS=$(usex static-libs)
 		-DDISABLE_EXTRA_LIBS=ON
-		-DENABLE_THREADING=$(usex threads)
+		-DDISABLE_WERROR=ON
 		-DENABLE_RDRAND=$(usex cpu_flags_x86_rdrand)
-		-DBUILD_STATIC_LIBS=$(usex static-libs)
+		-DENABLE_THREADING=$(usex threads)
 	)
 
 	cmake_src_configure
@@ -33,14 +36,18 @@ multilib_src_configure() {
 
 multilib_src_compile() {
 	cmake_src_compile
-	use doc && doxygen doc/Doxyfile
+	if use doc && multilib_is_native_abi; then
+		cmake_build doc
+	fi
 }
 
 multilib_src_test() {
 	multilib_is_native_abi && cmake_src_test
 }
 
-multilib_src_install_all() {
-	use doc && HTML_DOCS=( "${BUILD_DIR}-abi_x86_64.amd64"/doc/html/. )
-	einstalldocs
+multilib_src_install() {
+	if multilib_is_native_abi; then
+		use doc && HTML_DOCS=( "${BUILD_DIR}"/doc/html/. )
+		einstalldocs
+	fi
 }
diff --git a/dev-libs/libbpf/Manifest b/dev-libs/libbpf/Manifest
index ee1056d121bc..4cd926106a9f 100644
--- a/dev-libs/libbpf/Manifest
+++ b/dev-libs/libbpf/Manifest
@@ -1,11 +1,9 @@
 AUX libbpf-9999-paths.patch 883 BLAKE2B 663e03ae01afd7be73c281e8b83cf5534717c28f5960b4b7ca5530096840568dedf4e5f58f2139ab56c5f57382a80540294cb492f6ad619f174184172b3441af SHA512 de78131baa08874000cc52b0b21db4055246a653503301bd82c2e8f5818c955d63727d957d7834f1aed63abad42607480911fa0c2ea8d07d833ebd1f8b338039
 DIST libbpf-0.8.1.tar.gz 942702 BLAKE2B 084be7d4258500fa894560ed2e52821addcc5d150dcd77fd646271b614d788b7931271be9c3e46fdbc4ed93d053ea3e09023158a8e4a31f9452d10dcb0677b58 SHA512 e3bb602f55215a4f030e564af7321ba6338937c426fcaee478b607f88b0c773c40a0c3f59a2b345bda951a19e79061733f8a3fdc10a6292e92782e65754b584a
-DIST libbpf-1.1.0.tar.gz 2337951 BLAKE2B 70bee4e94c3b372501e1697cec6573fb3292e61236ed210bde4c3a838494cc951571d7c47720c28a47b8e038331775d66d3f4ad24423f5102e1ee708d1981f88 SHA512 751126893883c68e5472724988327e03f7f52becd472f7d6239fa838762f857e54a0347f8f824b8c32ca93b8f419310a86e1d75e3646dae72c2d2992d093b828
 DIST libbpf-1.2.0.tar.gz 999623 BLAKE2B cd10fd9133f01d3f8dbd5ed4585e5605c3b9fb0d9f6ee76a49dcb61a0555edfeb85e333f7b8eb069f47a65d0ab24dcdc33502bd660378cd662a366f10de627a4 SHA512 b5291e807a3c83cb80a47e3518a3ab5ad0b0e6157842117c0684c32e525dce0cca199c3c9028390b94a73ff968391aa023312d3b8bd7472aff1c9ee5206c424e
 DIST libbpf-1.2.2.tar.gz 1000104 BLAKE2B 45a2ceabd38b3ea55f466de68d0806df6ae802b509063ca12d670ba972bac3dc5c7e518e8c9904915dbc9877c27ea892a7b857aa03d4e86016969b2d278b0b4a SHA512 bc7620207e6f521b9b5baab00bd81346084b8eabf81bff3ec24e5367d389f2a331a0b082798f8bb5d4fea836c3c0cc961fc881abc3a4e05d91152150bdfe47be
 EBUILD libbpf-0.8.1.ebuild 1153 BLAKE2B 98da8cd35ab316a4bbf9d4e6a9c40b278ecd1385d8077a16e4582fb9a4209c40ebcf4ec9e24d3312334ace6c2f99da9732e7a9379a0dd478baa66bdd790a4793 SHA512 16a7e9a08fe9d782da9f57727b50592d42c7cfcd5cbf407197c5764e2a7175f0277a116e25379092e0f67adac353513f614d9bfe2edac2990d0fc91d5adc9a26
-EBUILD libbpf-1.1.0.ebuild 1185 BLAKE2B 57c4bfa90f1601343e66e0233c30af684c47688eda103bd2672472cf6a199f8849f0821d2e889e583dc09a4a8e36b9a9f92fb3d1abb6e2db844b5f57c3566489 SHA512 ab6998bfa3a4674c6df8ccfa0b46216779d6ea48d22f33a45836f233f3c755b714aeada2f8950814a083a1a490ca10672df60351b9c8ece555fe98a3a1bb5c27
-EBUILD libbpf-1.2.0.ebuild 1186 BLAKE2B c0d2e703bab0dafcbbe56600e44ed02dd273dba447a2f811cb2a34cb5ee050a06617fc9752d7380a5c9734bdf51e4c422e6e79e76950fd0cb44d313dfba4fedc SHA512 98021877b1452e167d2b0577b888795c45950673ebc09efabcd9722cb937f2e345ad765a5a0bb2f06a2618db47bceb1a8d5c535ffd39aeac780b4c0af429398a
+EBUILD libbpf-1.2.0.ebuild 1185 BLAKE2B 57c4bfa90f1601343e66e0233c30af684c47688eda103bd2672472cf6a199f8849f0821d2e889e583dc09a4a8e36b9a9f92fb3d1abb6e2db844b5f57c3566489 SHA512 ab6998bfa3a4674c6df8ccfa0b46216779d6ea48d22f33a45836f233f3c755b714aeada2f8950814a083a1a490ca10672df60351b9c8ece555fe98a3a1bb5c27
 EBUILD libbpf-1.2.2.ebuild 1192 BLAKE2B bd3087d68ed1e96220a836e005d3d5e82c7322159e79d3e43c2ed2d14b02d8103c024f0a43dee77383e2abfc5fb7b12bff2a7925cde32393e9a7bafc87c4c5a3 SHA512 a4623adfec492b597089d4d8a3a30e56d6ecee6065a109d3488ca2e0e719ee72b21a2acc37e75bb9acca0d28e91686b9b904af090aaad6cdb82c992cda877442
 EBUILD libbpf-9999.ebuild 1192 BLAKE2B e26a265cb13392e4e90e48ab96cabad38188e9b28ccf40e8e7b11a08117193dbe025f5ab71c09da29a7e3ab2561c154389e87be9b1a1fba8e7d57eb3105a07bb SHA512 955be1dde34476c2b66014f9b3da584ea38459105f49980e29fd943198feb3ee228a6ffb121c9bbce7c109712c37bbc8996f8cc4715eba626bd08aadaa23d7e8
 MISC metadata.xml 420 BLAKE2B c61b50bd86dd9d110c35d57a9352ca3862790460f0a6f8e4be9e4ac2eb603fe6c1d6bbe8d77e9fdf32d08e7aaf19349516f25a0fdcb29e2671d71d2c230fc1f5 SHA512 131f77e33aa5b3cbc037a297fe0ed9affbcb956b4c7ddc64889eba5f8315f5090ae4fd7a6054f8961461072ca77d13f8bc6674f3ed27372b7b96c4322c487676
diff --git a/dev-libs/libbpf/libbpf-1.1.0.ebuild b/dev-libs/libbpf/libbpf-1.1.0.ebuild
deleted file mode 100644
index a82b4169cdc1..000000000000
--- a/dev-libs/libbpf/libbpf-1.1.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 2019-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic toolchain-funcs
-
-if [[ ${PV} =~ [9]{4,} ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/libbpf/libbpf.git"
-else
-	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-fi
-S="${WORKDIR}/${P}/src"
-
-DESCRIPTION="Stand-alone build of libbpf from the Linux kernel"
-HOMEPAGE="https://github.com/libbpf/libbpf"
-
-LICENSE="GPL-2 LGPL-2.1 BSD-2"
-SLOT="0/$(ver_cut 1-2)"
-IUSE="static-libs"
-
-DEPEND="
-	sys-kernel/linux-headers
-	virtual/libelf"
-RDEPEND="${DEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/libbpf-9999-paths.patch
-)
-
-src_configure() {
-	append-cflags -fPIC
-	tc-export CC AR PKG_CONFIG
-	export LIBSUBDIR="$(get_libdir)"
-	export PREFIX="${EPREFIX}/usr"
-	export V=1
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		LIBSUBDIR="${LIBSUBDIR}" \
-		install install_uapi_headers
-
-	if ! use static-libs; then
-		find "${ED}" -name '*.a' -delete || die
-	fi
-
-	insinto /usr/$(get_libdir)/pkgconfig
-	doins ${PN}.pc
-}
diff --git a/dev-libs/libbpf/libbpf-1.2.0.ebuild b/dev-libs/libbpf/libbpf-1.2.0.ebuild
index 4494d21e0199..a82b4169cdc1 100644
--- a/dev-libs/libbpf/libbpf-1.2.0.ebuild
+++ b/dev-libs/libbpf/libbpf-1.2.0.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} =~ [9]{4,} ]]; then
 	EGIT_REPO_URI="https://github.com/libbpf/libbpf.git"
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 fi
 S="${WORKDIR}/${P}/src"
 
diff --git a/dev-libs/tinyxml/Manifest b/dev-libs/tinyxml/Manifest
index 21a8dfca9b24..25ec2428ca3b 100644
--- a/dev-libs/tinyxml/Manifest
+++ b/dev-libs/tinyxml/Manifest
@@ -1,7 +1,9 @@
 AUX Makefile-3 1054 BLAKE2B 30f94d5ec66a4ab11703c53caccec0ac34a034686dddab9595d9ca2892fbf68b603035f6b80c1d47219c7ca6aeff43830a4096ec1d36fc8d00c19468cf59c1a6 SHA512 81b05e25341095444d0112fe58840d334a14f754cdc0e907b468484655008de026a4b96947de98d009a4a54d84af121ee0a663075fe0ad727894d3aa432426e2
 AUX tinyxml-2.6.1-entity.patch 1776 BLAKE2B e8430b2fea965f351c12a0413c3bba43ce19da7e8a0973fae3c7db4b4a8978cbc8b74beb495dd9141e79e90f9ad012b6b5e738207f8075ad7001cb85b424f5be SHA512 e03f4bdfb80354c6d262abb40e6c105cb2d37530e2f1f1d865ff4fd8434320a26957fbc2379db8af1bd18cd3c8662e064e79525831a5fb9fcb4aff46f3eb0809
+AUX tinyxml-2.6.2-CVE-2021-42260.patch 795 BLAKE2B fd73783db5955da369991920b20685457eabff753bf34c342b7de8be1551cf800d36373ac68aa88f566340553b7bac0073b61d5cea70d98c9fe3a4cfe930b310 SHA512 d538d6a811dd9c576122ce2fd304404c4dec95212b423487b9734108e7538e584bea26335d25acc8e4a096602a06af3aae48e317fcf2f2f9975bc96fac85084f
 AUX tinyxml-2.6.2-defineSTL.patch 353 BLAKE2B e9a3d63283f7946e04dafa58a7eeda782b02d6d6093bae18fdec727b9e6c6722a4c610230cc43ea8142695f3a0aaa1e9bf11a8f0072ad580acb5428655a3d6e8 SHA512 52cd82ef9e8f1783b3d6042551342a8c592c447e1da352d5d017db4211144bc0a908ddbfe2a4641b3108fb8e02dc47f385a851f920532d94178314255904a6ef
 AUX tinyxml.pc.patch 383 BLAKE2B 7f13d388d80605a9576ca6c6dca263d9d1afe87026801f4a5d1db9b341b8bc763c66dfdfef924ce388b30fc453b143f01019ba676f66805fb11270c54d19ecfb SHA512 e423baf55f488fe4788234b8b19819520db3f9a43e677c34dd0bb9250c187c349b796a5c2749b5bee35d468b8676ccc8db7eab8a1094c36f65f63e128572b860
 DIST tinyxml_2_6_2.tar.gz 210124 BLAKE2B 84d4ad0174eb38583a4488523410105928b9797f09a2ef84b41156580a40cc11d1d09e28e67512494bd02d7a7e0b208aa6c1ce3383bec12de606491214c16a77 SHA512 133b5db06131a90ad0c2b39b0063f1c8e65e67288a7e5d67e1f7d9ba32af10dc5dfa0462f9723985ee27debe8f09a10a25d4b5a5aaff2ede979b1cebe8e59d56
 EBUILD tinyxml-2.6.2-r4.ebuild 1562 BLAKE2B da540b4a34aceadf5d7d6cfd465d1b4902863cfc1337793b3fbb0eb0b35d78f51a64bef8d724b14661416d21017fe0702e2821f3f086fc608b7e4e5a74189e7d SHA512 7f3bf0d6033a5950ba5085ec2c292b70eda2050e632c4d0fd2fac51a1f1271fe787a99a5b304a3f657afa2890a34152cba0cf6dce773546e64b2097ac97adcc3
+EBUILD tinyxml-2.6.2-r5.ebuild 1614 BLAKE2B 9816e8eb0bb8950d5e04e2d174c69b4a3d126735e4f17b9aaccd7adf6937f379331b560b0bd603c967faa092e5be94ee781b69682486e561d9bf5cef3ebc7c1b SHA512 ec761f07f045440595fc2c8561cbe275a8ed1d3520a1c4215327bf9b5b127678b1c728924272d9e714954fb0a388b696b3bfe37bd73981fa41cc06a190cb854c
 MISC metadata.xml 406 BLAKE2B a9c50ef75e9049b1cc89df08b71e7640581c5f34fadcb0cd9fd9f29679bc3a1122db2e8fe8ad1ed738a9f4fe39771a8b4980fa4f2cb387e3e464c92a492b833c SHA512 b589dec8ab67f4e0aa9e073f55ed147ef22b08aa9adabb3270bb83d50a17da967e364ab131815c3a9ee32c8c61b0f3ec6ec6e3d7f4d8dd0fe5daaaa5420a89c0
diff --git a/dev-libs/tinyxml/files/tinyxml-2.6.2-CVE-2021-42260.patch b/dev-libs/tinyxml/files/tinyxml-2.6.2-CVE-2021-42260.patch
new file mode 100644
index 000000000000..d9eeb45c73b5
--- /dev/null
+++ b/dev-libs/tinyxml/files/tinyxml-2.6.2-CVE-2021-42260.patch
@@ -0,0 +1,23 @@
+Description: In stamp always advance the pointer if *p= 0xef
+ .
+ The current implementation only advanced if 0xef is followed
+ by two non-zero bytes. In case of malformed input (0xef should be
+ the start byte of a three byte character) this leads to an infinite
+ loop. (CVE-2021-42260)
+Origin: https://sourceforge.net/p/tinyxml/git/merge-requests/1/
+
+--- a/tinyxmlparser.cpp
++++ b/tinyxmlparser.cpp
+@@ -274,6 +274,12 @@ void TiXmlParsingData::Stamp( const char* now, TiXmlEncoding encoding )
+ 						else
+ 							{ p +=3; ++col; }	// A normal character.
+ 					}
++					else
++					{
++						// TIXML_UTF_LEAD_0 (239) is the start character of a 3 byte sequence, so
++						// there is something wrong here. Just advance the pointer to evade infinite loops
++						++p;
++					}
+ 				}
+ 				else
+ 				{
diff --git a/dev-libs/tinyxml/tinyxml-2.6.2-r5.ebuild b/dev-libs/tinyxml/tinyxml-2.6.2-r5.ebuild
new file mode 100644
index 000000000000..53f7786a222c
--- /dev/null
+++ b/dev-libs/tinyxml/tinyxml-2.6.2-r5.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic toolchain-funcs multilib
+
+DESCRIPTION="Simple and small C++ XML parser"
+HOMEPAGE="http://www.grinninglizard.com/tinyxml/index.html"
+SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV//./_}.tar.gz"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+IUSE="debug doc static-libs +stl"
+
+BDEPEND="doc? ( app-doc/doxygen )"
+
+S="${WORKDIR}/${PN}"
+
+DOCS=( "changes.txt" "readme.txt" )
+
+src_prepare() {
+	local major_v=$(ver_cut 1)
+	local minor_v=$(ver_cut 2-3)
+
+	sed -e "s:@MAJOR_V@:$major_v:" \
+		-e "s:@MINOR_V@:$minor_v:" \
+		"${FILESDIR}"/Makefile-3 > Makefile || die
+
+	eapply -p0 "${FILESDIR}"/${PN}-2.6.1-entity.patch
+	eapply -p0 "${FILESDIR}"/${PN}.pc.patch
+	eapply "${FILESDIR}"/${P}-CVE-2021-42260.patch
+
+	use debug && append-cppflags -DDEBUG
+	use stl && eapply "${FILESDIR}"/${P}-defineSTL.patch
+
+	sed -e "s:/lib:/$(get_libdir):g" -i tinyxml.pc || die # bug 738948
+	if use stl; then
+		sed -e "s/Cflags: -I\${includedir}/Cflags: -I\${includedir} -DTIXML_USE_STL=YES/g" -i tinyxml.pc || die
+	fi
+
+	if ! use static-libs; then
+		sed -e "/^all:/s/\$(name).a //" -i Makefile || die
+	fi
+
+	tc-export AR CXX RANLIB
+
+	[[ ${CHOST} == *-darwin* ]] && export LIBDIR="${EPREFIX}"/usr/$(get_libdir)
+	eapply_user
+}
+
+src_install() {
+	dolib.so *$(get_libname)*
+
+	insinto /usr/include
+	doins *.h
+
+	insinto /usr/share/pkgconfig
+	doins tinyxml.pc
+
+	einstalldocs
+
+	if use doc ; then
+		docinto html
+		dodoc -r docs/*
+	fi
+}
diff --git a/dev-ml/Manifest.gz b/dev-ml/Manifest.gz
index eca75e4110e1..2a8c48ee3895 100644
--- a/dev-ml/Manifest.gz
+++ b/dev-ml/Manifest.gz
diff --git a/dev-ml/merlin/Manifest b/dev-ml/merlin/Manifest
index 90141a4df98a..2663d66fedab 100644
--- a/dev-ml/merlin/Manifest
+++ b/dev-ml/merlin/Manifest
@@ -1,17 +1,10 @@
 AUX 50merlin-gentoo.el 169 BLAKE2B 97dca8debe038783d44200315f883f4918cee1cca9f1d53df1c70b8fbd6e922b38c43b436ac73854970f1438eb837cbcbff4e07d12054fc0d0222b5222b95970 SHA512 00db283dffe923971fe451bcbea687bf35152e9c09783d307d9dec4ac0f273d27edfcc0e1ac74db3885bdeec98e7d60f1d46fa381d3b2c813e2f55fb5d4adbb5
-DIST merlin-4.5-411.tbz 1316537 BLAKE2B 8850ea6b15819a178f763d8b55fecca9104cec5097c39afad7dc8b59543d961d7aa4a86590ebb59a3066d1f6630f11284e24835398ab967f45a52faf004477f1 SHA512 9e68ebabdc0cc398edcd255516070d6459f3bf5738c0dbe332c11c6bc4070e7bf340bc086fa2ea58597972ebe9d15860ecd0e549444809be809f0509b41652c2
-DIST merlin-4.5-412.tbz 1765436 BLAKE2B eaed065a2814f4c1bfc5337d026c7c42287b8cbbe50097415a983f7fdd7323f4c88f3b8c8cff4ca88a0813204617f39807709a6703fd618269eca6063b3c47b1 SHA512 f9edc3e1c9f753d7bacbdf1b92c118b54f9e9eff0bf752a2b44f39a2f7ecc76c4cd3bbe9227e910aea8b5ea947e8fe1b8d92ba0245fe47bc8cc2f45404cca973
-DIST merlin-4.5-413.tbz 2290507 BLAKE2B 32aeda63caec645da8043c49ceaa0ea54d095b3e286f687b5f3da1b44d54bbc291d0358768d2180825cb620a91765da83d90b645151a694a4131788ab4438fbf SHA512 b1db98c38a97ca0eef3051ab2b5d1b158e757863de6908a830308e7ea7f960eebd64b1a60bf51b10b7ea2eea3141ee0917a7c3570b63f9faa2e3f69c5d6fe0c2
-DIST merlin-4.5-414.tbz 1964688 BLAKE2B 41cb76fb367545af3b5ac7d62f5b69ae031ed99956aca947dc8b91e2fa906d500bed272f7f46a7ad9e57bf3cb5620893072b52ac7f2246d6ae3be1ae22e99406 SHA512 cc2cf2c208091b3ae435a8124617e56f2002b7091532002ab49a1f817d90a5c4f9cf0bc5741dc7f2526e0352c3ca95b42c3b3a17c6cbfb80ad73d42310a25d22
-DIST merlin-4.6-412.tbz 1767545 BLAKE2B 95b4f4e53accf55f4d2bc381779fa31bb5db39c21fa2cd8dc0b1d5b0e4a4acf484f2eb58327bce1c990cbbb2205bb87215aeba1b923ba6a62c82862d884dd410 SHA512 4362482ecd7c8af1c4e740e3816100cd5408eba3aebc01b867b45bdd1dcc237819cb0640e0f618b6ecf00aa8d55e58e55ecfeb176ed7b358c404ea71302443b0
-DIST merlin-4.6-413.tbz 2292506 BLAKE2B ec61d3b9cbfd9cddbb27fed70ebf7b69816244afb8a6c36347fbb762fc6aee1e6dd2b728db0687cd984603c3847ba3fe858b9663a7b3dcd17aedede662848299 SHA512 fe88a52c4c3c94505da142fbb7d400fce11bfafe6e47ec7cd39437308baa7122399a008bb6d0ef7b8f29636c2a51f4d49e3535136010fec198a1188293914a56
-DIST merlin-4.6-414.tbz 1969647 BLAKE2B fdb55f7ba9a597fb03bb377556238dedc2a5d60bdc772a479a9ad98c0feb243a7fc61dd47a65194ddba9afb8509858d8956a87ca5af9fc68597ba746b0d56d60 SHA512 7373fadf05c692c9f054c7fe6a7d4bdfeefe237b9df432024ef9923782ee72e09021c0c3fba869da8347728105cb2d3ff0aa94b0c5eb09811bb25aa8da9fb520
+DIST merlin-4.10-414.tbz 1989927 BLAKE2B 9a65e9c1a2d5795e1e0235d5c8b0274bd9d8ef052ed421e8809224de73f577da273c9f1ca0f071d6ea0accd349b9b6d59b2e1fb5561effe483ebb0de89a4c766 SHA512 7805b99c2a73b2e3f70d26fd7183a90f97657d66946e2a4b58563f00fd3ed8d82da1fb0597b033b8c8c9e8db415d66e51720c972d34db4b66b71bb8f0c9ee08c
 DIST merlin-4.7-412.tbz 1771126 BLAKE2B 1454873ecc1d533a5e82adaa71082339c44b93c2626d46cc5147d1b8049b397ef34e6137256560d6c9b7eaf826155e34617c071d1aae3aa3f02807e73c209cf1 SHA512 d13e307d87b4719b56397e54e6f771a3ea77a766ab38b22414c4b1d4d5828b5f790c82f28d3feaf7fe45be10abd50d9a905ece932f43fdad98c88b73b35dd936
 DIST merlin-4.7-413.tbz 2296558 BLAKE2B 2e6d9918c911eab017bb3491cab97f2b0362d13e072a0c39a6637f25d2a15ac7f3027cec51ab0d66a2239fea055f70b5b1e3294c05985faae5d11c57bff81501 SHA512 71068a6b50628c57003b29de3968e41c24b67394dcc1d1f1a0b335211e9d1ef3e527584b868514bd5489db5a130f2ff6fd145d3665a7d2bca5a117074cb08ce8
 DIST merlin-4.7-414.tbz 1976276 BLAKE2B 91fc5221b536d20174e36c4fdf4bc32f125f2af0f23c95c2e917f425826b0c58fe65b1b849eded570b8f4aece0fb00f1bdf7d0a00fa67f6c4e58892a095e1466 SHA512 c325c29bea91699739d7cb7df12876b7ffb8edf685deabb5dce5553b570a6bf8ff415c45e3295b674edbc7711f69f4be202b866d157516380f888e80dcee1082
 DIST merlin-4.9-414.tbz 1983485 BLAKE2B 1a538df53ab5c575cf217c2dc832512aa8384c0483c9a46c42b86e52c8af454c15e25d7f8a961b8e19251fc75575fb6bf09f5693d36ce0b2e5b40757bb2985ea SHA512 2199f963368597d10cc197e41ebb883f6a166018c9da3fe259c354550df41b713781003598a2fe5956b0a4ae96f8c07ba33831d3cf6f9d494b731944f87e491e
-EBUILD merlin-4.5-r3.ebuild 2175 BLAKE2B 2673f32fff876100b2a3649e169b13d28d80647c8c1d6b928a8114c4ed70c7c4312337e606cff7253ca321363e5ea296b1a4c84c0b22531a7007b9ac6771e83c SHA512 2dd3ce00635e0d8bc32e5810f8661ccc1738fa1c44d8f14257d1f5900ab863be3994d2e3bcee2eb2a83b48b5859239e98a11ff95f2b5abb920d534781004e5be
-EBUILD merlin-4.6.ebuild 2418 BLAKE2B 6742961957e55ba5f34f7af4a4a5ac1906efdc0202ee2a63da2d16e57a3858656a0261296d97b1b38afeb9b3053f10b7a736034c9df1b41bee5d19abf3184a55 SHA512 f9eb8e699d311949cda3eb381f81fdaafc1a29bedd95b31595cf8f3165760bde53f4da4c397db0da6a205bc6601c633ac4683f64712ab0037de8d1673037b52c
+EBUILD merlin-4.10.ebuild 2155 BLAKE2B 4bcfa73e369ba022deb9537855cf5f5834bc193d4c79518b138ea2edfa0212a5a0330fbee37c95e10f4ebb655730add170c9f9c22d911400fdee44b5f3cfe731 SHA512 95275341c9fba0ed8bfd944b58995e2026102bf8a26dfa291680e1c1bbaf521d60070e201741e1bc1ff630b17cdf3338111aa08aee3fe930c3d4a7f3fe007687
 EBUILD merlin-4.7-r1.ebuild 2516 BLAKE2B b65537f90d5d6033910882aa070f9e15dbbf533307d2c8f86910d063cf9e3772c1c56f6b0ed2b08b948f2e0c85d5ea451cd9a5d84dafaa15d84773846dabbb83 SHA512 e695eae2d024bc5eeedb871acea24d17faffbfcac7606e4e0c483eba5cebf2d12165135bb13119daed0a5fc0c016fe5079932eaf644995c92e539db388e4f322
 EBUILD merlin-4.9.ebuild 2155 BLAKE2B 4bcfa73e369ba022deb9537855cf5f5834bc193d4c79518b138ea2edfa0212a5a0330fbee37c95e10f4ebb655730add170c9f9c22d911400fdee44b5f3cfe731 SHA512 95275341c9fba0ed8bfd944b58995e2026102bf8a26dfa291680e1c1bbaf521d60070e201741e1bc1ff630b17cdf3338111aa08aee3fe930c3d4a7f3fe007687
 MISC metadata.xml 310 BLAKE2B f1255dfdcb6984112e896735ea40f1171a8d52149fa7e8ed279efc1fe08de9b071554f5168bc3f8c0e432bd8344c69f5c5716c5c689ff4ff4edbc27569546246 SHA512 06710c33027574e4c13259e30ca5e862b7bbda0442013676020d00dd1114e92ebee92fa19d2993fc3881c10f9db7b51dd2710fcfbcf9ca7564f8f96e5065705e
diff --git a/dev-ml/merlin/merlin-4.6.ebuild b/dev-ml/merlin/merlin-4.10.ebuild
index f7843381a666..3e4435149b42 100644
--- a/dev-ml/merlin/merlin-4.6.ebuild
+++ b/dev-ml/merlin/merlin-4.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -8,11 +8,7 @@ inherit elisp-common dune
 
 DESCRIPTION="Context sensitive completion for OCaml in Vim and Emacs"
 HOMEPAGE="https://github.com/ocaml/merlin/"
-SRC_URI="
-	https://github.com/ocaml/merlin/releases/download/v${PV}-412/${P}-412.tbz
-	https://github.com/ocaml/merlin/releases/download/v${PV}-413/${P}-413.tbz
-	https://github.com/ocaml/merlin/releases/download/v${PV}-414/${P}-414.tbz
-"
+SRC_URI="https://github.com/ocaml/merlin/releases/download/v${PV}-414/${P}-414.tbz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
@@ -21,15 +17,14 @@ IUSE="emacs +ocamlopt test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
-	>=dev-lang/ocaml-4.12:=[ocamlopt?]
+	dev-lang/ocaml:=[ocamlopt?]
 	dev-ml/csexp:=
 	>=dev-ml/yojson-2.0.0:=
 	dev-ml/menhir:=
 	>=dev-ml/dune-2.9:=
 	|| (
-		dev-lang/ocaml:0/4.12
-		dev-lang/ocaml:0/4.13
 		dev-lang/ocaml:0/4.14
+		dev-lang/ocaml:0/4.14.1
 	)
 	emacs? (
 		>=app-editors/emacs-23.1:*
@@ -51,11 +46,9 @@ SITEFILE="50${PN}-gentoo.el"
 src_unpack() {
 	default
 
-	if has_version "dev-lang/ocaml:0/4.12" ; then
-		mv ${P}-412 "${S}" || die
-	elif has_version "dev-lang/ocaml:0/4.13" ; then
-		mv ${P}-413 "${S}" || die
-	elif has_version "dev-lang/ocaml:0/4.14" ; then
+	if has_version "dev-lang/ocaml:0/4.14" ; then
+		mv ${P}-414 "${S}" || die
+	elif has_version "dev-lang/ocaml:0/4.14.1" ; then
 		mv ${P}-414 "${S}" || die
 	fi
 }
@@ -78,7 +71,7 @@ src_prepare() {
 }
 
 src_compile() {
-	dune build @install || die
+	edune build @install
 
 	if use emacs ; then
 		# iedit isn't packaged yet
diff --git a/dev-ml/merlin/merlin-4.5-r3.ebuild b/dev-ml/merlin/merlin-4.5-r3.ebuild
deleted file mode 100644
index b3cc5b868e42..000000000000
--- a/dev-ml/merlin/merlin-4.5-r3.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# TODO: vim-plugin, although it's not clear how to make it work here
-inherit elisp-common dune
-
-DESCRIPTION="Context sensitive completion for OCaml in Vim and Emacs"
-HOMEPAGE="https://github.com/ocaml/merlin"
-SRC_URI="https://github.com/ocaml/merlin/releases/download/v${PV}-411/${P}-411.tbz
-	https://github.com/ocaml/merlin/releases/download/v${PV}-412/${P}-412.tbz
-	https://github.com/ocaml/merlin/releases/download/v${PV}-413/${P}-413.tbz
-	https://github.com/ocaml/merlin/releases/download/v${PV}-414/${P}-414.tbz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64"
-IUSE="emacs +ocamlopt test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-ml/csexp:=
-	<dev-ml/yojson-2:=
-	dev-ml/menhir:=
-	>=dev-ml/dune-2.9:=
-	|| (
-		dev-lang/ocaml:0/4.11
-		dev-lang/ocaml:0/4.12
-		dev-lang/ocaml:0/4.13
-		dev-lang/ocaml:0/4.14
-	)
-	emacs? (
-		>=app-editors/emacs-23.1:*
-		app-emacs/auto-complete
-		app-emacs/company-mode
-	)
-"
-DEPEND="${RDEPEND}
-	test? ( app-misc/jq )"
-
-SITEFILE="50${PN}-gentoo.el"
-
-src_unpack() {
-	default
-
-	if has_version "dev-lang/ocaml:0/4.11" ; then
-		mv ${P}-411 "${S}" || die
-	elif has_version "dev-lang/ocaml:0/4.12" ; then
-		mv ${P}-412 "${S}" || die
-	elif has_version "dev-lang/ocaml:0/4.13" ; then
-		mv ${P}-413 "${S}" || die
-	elif has_version "dev-lang/ocaml:0/4.14" ; then
-		mv ${P}-414 "${S}" || die
-	fi
-}
-
-src_prepare() {
-	default
-
-	# Handle installation via the eclass
-	rm emacs/dune || die
-
-	# This test runs only inside a git repo,
-	# it is not included in merlin release for ocaml 4.12.
-	if [[ -f tests/test-dirs/occurrences/issue1404.t ]] ; then
-		rm tests/test-dirs/occurrences/issue1404.t || die
-	fi
-}
-
-src_compile() {
-	dune build @install || die
-
-	if use emacs ; then
-		# iedit isn't packaged yet
-		rm emacs/merlin-iedit.el || die
-
-		BYTECOMPFLAGS="-L emacs" elisp-compile emacs/*.el
-	fi
-}
-
-src_install() {
-	dune_src_install
-
-	if use emacs ; then
-		elisp-install ${PN} emacs/*.el{,c}
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-ml/ptime/Manifest b/dev-ml/ptime/Manifest
index e908cf8c271f..766900965679 100644
--- a/dev-ml/ptime/Manifest
+++ b/dev-ml/ptime/Manifest
@@ -1,3 +1,5 @@
 DIST ptime-1.0.0.tbz 33749 BLAKE2B 6765924f624a92c69495883accd47c66294f49e2d2841fafc66444369b97b9dceaecac0c00a14cba2e8e710bf85c6d5759f419e83d4d0a7bee56c197d06bb000 SHA512 df2410d9cc25a33083fe968a584b8fb4d68ad5c077f3356da0a20427e6cd8756a5b946b921e5cf8ed4097f2c506e93345d9dca63b113be644d5a7cc0753d1534
+DIST ptime-1.1.0.tbz 34641 BLAKE2B b4e4991921d348ffcaf9b3a6c822b5e668f0dfad804a2be56e0f1ce2ef775a892312b545d0d098c9c74c1ab6725ddcd63aa2424571f61107fe4f945c03de35b2 SHA512 309b8383f61b58840e58a82802ec8fbc61b7cc95a4590d38ad427e484cbaaf66f03fa8e6484b5b6855468a87e745aed103bf6f1041ec05062230a9fa5fb86cc6
 EBUILD ptime-1.0.0.ebuild 558 BLAKE2B ad8ce46853545c04f65e32d3c4a278ac395a2aa1b58737235faf11176704c6644435eca4ff23563ddac9a58c6ab3d2c33602ef9db5340dcc8a92d1e94930591c SHA512 6d6647456a98f8651a3573e0321e6833c744de5c6629a8026e37de1be2975d247a0085147cc932e91456d5b31b1787acf4b4a3fd8bd056e47b9c4cc742082d40
+EBUILD ptime-1.1.0.ebuild 550 BLAKE2B fc825d3fd4d756f0873fdf708d90ef20618ec131a261788875b7e72ebeb0ff59cbaac788a4cd5388bec75e508a85636c057d257086e1a618a3f67646b8154b1c SHA512 e1f9800bbfcbfc3e49644d7b51cc0e8771300b1a90cc94e4cd195a1c3601cd6ffe8958363ad5c7c12669e876fbed336826383fac0014dd41363f6fb5800858bd
 MISC metadata.xml 1341 BLAKE2B f885dc16a0d224c4885b1b6211747885d1da5de5beba2f8164d8c231e3a6b0f589ad671d0717a465a58e2887f4dda4c8952bf22def1e2df816773cc7ef992214 SHA512 3e66a629c9bdae4e1577598cec37b4111ad204960b653152d24d501ff73db90dd7bc50296b7fb5d6dcc47ffe8cc42ea048e1bdef6421abb685a28ca12a060db0
diff --git a/dev-ml/ptime/ptime-1.1.0.ebuild b/dev-ml/ptime/ptime-1.1.0.ebuild
new file mode 100644
index 000000000000..491270a410c5
--- /dev/null
+++ b/dev-ml/ptime/ptime-1.1.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit opam findlib
+
+DESCRIPTION="POSIX time for OCaml"
+HOMEPAGE="
+	https://erratique.ch/software/ptime
+	https://github.com/dbuenzli/ptime
+	https://opam.ocaml.org/packages/ptime/
+"
+SRC_URI="https://erratique.ch/software/ptime/releases/${P}.tbz"
+
+LICENSE="ISC"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+
+RDEPEND=""
+DEPEND="
+	${RDEPEND}
+	dev-ml/topkg
+"
+BDEPEND="dev-ml/ocamlbuild"
+
+OPAM_FILE=opam
+
+src_compile() {
+	ocaml pkg/pkg.ml build || die
+}
diff --git a/dev-ml/reason/Manifest b/dev-ml/reason/Manifest
index bcd543586afb..5355ec30c495 100644
--- a/dev-ml/reason/Manifest
+++ b/dev-ml/reason/Manifest
@@ -1,5 +1,3 @@
-DIST reason-3.8.2.tar.gz 1264705 BLAKE2B f82cde6c3e825e9c0e0911ed9c3f5febd0b475e7f93c8919be4a817d3ebb11193b4b827eedce3db06d343dc6c508b355b7b5a1cab612bfcb54f020ff52be7be0 SHA512 a38d4727ac9c53b8c7c1aa86b1db62ab85e149084e44ef559c5eb6e92090eca09a78f810b93f7d7d180fa8dfa40569b622fc439e0569749dc8478094404d8916
 DIST reason-3.9.0.tar.gz 668271 BLAKE2B 46c5937a16462807e653837c7359c661eeb378dcc9ca619b80d8c308e153227c9cfba9c6c1878f87e08c6ca4a026f0acf5ff8e8902765084bddfd4fbacdfd617 SHA512 0b22d21674ed9d0efcde8512476cb6274b3ef43a619c02ae448fb3bb55318af0509c7fc8fb14784411383375e020729eba4b3855569ecefb177deadf462a0de4
-EBUILD reason-3.8.2.ebuild 789 BLAKE2B d90fec5730ebb0679f8cd786e1c3b873e48ea5436eaec771a7d93c08787d6d857da31219485b187430931db4fe02b334331e4127bd3b898f05436700f0c4b7ab SHA512 907f20119bb95509a33ec81829fd12fa054ea40b885fafff042fa04d07e25cdb964ced474bf6d1ead4834521f1a7dfc2189dcb4086849eaac427cdcac8a67ca1
 EBUILD reason-3.9.0-r1.ebuild 824 BLAKE2B e52315579ce2609d855cd54329617c9063325ddd51beb6e6fb5e4fd01c9cb59f295daaabd1390cce1fd4d4555ea5f188cff240255ce217986807794bdcdfb7b8 SHA512 eda1604581fa34b6772529804a02072bd758cdb5319ae73f4090135fa426bb248a48928d03be52bc8e75a100ad44fe9733e80015493b4d3e87b3c52220166064
 MISC metadata.xml 583 BLAKE2B f5c1da34708a350aea239b28e65a07903409ca72d4fb530dc6192a820c27fa2da8f2a0fdc2f5716d4ea98b7501e963a904b7299e6f3118e92b3418afa6ae1d6b SHA512 cfcd0f1819698d0563f0b7885d8f7173554c5af1cebcd541b82c304e06806a5b8682cc8f3daf40212cd28f994ec06b6a342bd79c0c90c6726bc7bf853e3883ce
diff --git a/dev-ml/reason/reason-3.8.2.ebuild b/dev-ml/reason/reason-3.8.2.ebuild
deleted file mode 100644
index ade9712c67b7..000000000000
--- a/dev-ml/reason/reason-3.8.2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit dune
-
-DESCRIPTION="Simple, fast & type safe language that leverages JavaScript and OCaml"
-HOMEPAGE="https://reasonml.github.io"
-SRC_URI="https://github.com/reasonml/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+ocamlopt"
-
-RDEPEND="
-	dev-ml/fix:=
-	dev-ml/menhir:=
-	dev-ml/merlin-extend:=
-	dev-ml/ocaml-migrate-parsetree:=
-	dev-ml/result:=
-	dev-ml/utop:=
-"
-DEPEND="${RDEPEND}"
-
-DOCS=(
-	CODE_OF_CONDUCT.md HISTORY.md ORIGINS.md PLAN README.md
-	docs/GETTING_STARTED_CONTRIBUTING.md
-	docs/TYPE_PARAMETERS_PARSING.md
-	docs/USING_PARSER_PROGRAMMATICALLY.md
-)
-
-src_install() {
-	dune-install reason rtop
-	einstalldocs
-}
diff --git a/dev-ml/utop/Manifest b/dev-ml/utop/Manifest
index 7d14d3993952..9423fffb22ec 100644
--- a/dev-ml/utop/Manifest
+++ b/dev-ml/utop/Manifest
@@ -1,6 +1,4 @@
 AUX 50utop-gentoo.el 100 BLAKE2B eb2061a156c26f41f06076905e66212743aca67b3692c14f5347006aeda59f05d973f766fd65c97dfd14ab0dca22cac831076c7809e12d509253483cd0ab8bb4 SHA512 80ef89749dc68e7d339bc6fc63984b56913b3d94c22fa38ab82a6d4e4867ea30e94ce116d25212785d00ce721909fbda3cb3ff9e710e617e241b42f8152b18d2
-DIST utop-2.11.0.tar.gz 416351 BLAKE2B 14d407bd79f83b9b0307ec34ec9330e625e0e5fbc4b4091f98a45d90ff6225c292b6d764746273a5b7e7abda74c83852056f470d8f2f3b16fffc16569ecc6f98 SHA512 ebc27219b0345ab1478499221756806874c430f81aa9f40e7d482d0fd948750919d631b6159faec19fef0d23d14e6a115e6b21a5aa724ce1534e000e5d35bdae
 DIST utop-2.12.1.tar.gz 416596 BLAKE2B a8a31c91fd4f989e3d89bc736caa7b611ba0ccc2de905adcd1cf59fff87770d5a00c2d7a43462940269ae8be2f5980fa5b8d2ec7ba547b937cc1e6a579621f2f SHA512 cc52bdb2a58141e6f7b678c93f69b0aa5ca4c628cb6841e02e6a783191a917bd838c06682d55f4f455a01a7004e43b5193d8574968b8400050b0f7b5a102ca3a
-EBUILD utop-2.11.0-r1.ebuild 1068 BLAKE2B e4f9aa5170aa046f5f07737cbca7e5dac2ab916ad41b7483fc3971cfd3430f28f6d304de4f1b496169093b2a279ba189bb07888710c1f6e60c7cdacc5f514a3e SHA512 d63f4757e29f790d84274f890ba7dcfc90e95c322fc1f94ee853c0a6de7a396ce9ab99780f891207bbf8812c45e665263b6aa4884451f5952fd44b96da0bcecf
 EBUILD utop-2.12.1.ebuild 1068 BLAKE2B e4f9aa5170aa046f5f07737cbca7e5dac2ab916ad41b7483fc3971cfd3430f28f6d304de4f1b496169093b2a279ba189bb07888710c1f6e60c7cdacc5f514a3e SHA512 d63f4757e29f790d84274f890ba7dcfc90e95c322fc1f94ee853c0a6de7a396ce9ab99780f891207bbf8812c45e665263b6aa4884451f5952fd44b96da0bcecf
 MISC metadata.xml 714 BLAKE2B cdcb086ec113872a316e1f98b53802f6faef22a718543527c5cd5d4038ac68a601bb0898532428378ce016e4d018074c043e8dafb4109ac7fcd233cabe1f3c54 SHA512 40468222a996f4b5bebf03ab5d2d7fc639ab00acba23ea98da3a4a7993864946d2327c296806e0106e5d150c90d5286629d9608bc0e04acbd94fc5fd1ba50bf4
diff --git a/dev-ml/utop/utop-2.11.0-r1.ebuild b/dev-ml/utop/utop-2.11.0-r1.ebuild
deleted file mode 100644
index 0acedbdf1fad..000000000000
--- a/dev-ml/utop/utop-2.11.0-r1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit dune elisp-common
-
-DESCRIPTION="Universal toplevel for OCaml"
-HOMEPAGE="https://github.com/ocaml-community/utop"
-SRC_URI="https://github.com/ocaml-community/utop/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="emacs +ocamlopt"
-
-ELISP_DEPEND="
-	emacs? (
-		>=app-editors/emacs-24:*
-		>=app-emacs/tuareg-mode-2.2.0
-	)
-"
-DEPEND="
-	dev-ml/lambda-term:=
-	dev-ml/logs:=
-	dev-ml/lwt:=
-	dev-ml/react:=
-	dev-ml/zed:=
-"
-RDEPEND="
-	${DEPEND}
-	${ELISP_DEPEND}
-"
-BDEPEND="
-	dev-ml/cppo
-	dev-ml/findlib
-	${ELISP_DEPEND}
-"
-
-SITEFILE="50${PN}-gentoo.el"
-
-src_compile() {
-	dune_src_compile
-
-	use emacs &&
-		BYTECOMPFLAGS="-L src/top" elisp-compile src/top/*.el
-}
-
-src_install() {
-	dune_src_install
-
-	if use emacs ; then
-		elisp-install ${PN} src/top/*.el{,c}
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index c2a0723d74bd..d7ffa78dda72 100644
--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
diff --git a/dev-ruby/http-accept/Manifest b/dev-ruby/http-accept/Manifest
index e8f85a343813..7e8fa511d583 100644
--- a/dev-ruby/http-accept/Manifest
+++ b/dev-ruby/http-accept/Manifest
@@ -1,5 +1,5 @@
 DIST http-accept-1.7.0.tar.gz 12289 BLAKE2B 5eda9bd29e2dd2b52c8f2589adf57872a80aaf93c37d28b1668dc24fc1e2fa81d00ec12766dd558691dbf3e6560bba013f456a659ead47fffd77b1565c186a7f SHA512 3502bfbd07f6bb0164843c728cd5ef27adfd675317fd60372539180de212d02d6d446cff8eb081d1cbe5a19b30d5759a55b22bc63736cea83254595bd691522f
 DIST http-accept-2.2.0.tar.gz 14174 BLAKE2B b6fd0c065a1d9c798ebee8a2f82aa45738cf98721d42d9806614fd98c8ce5d571ce06ad3292e81a972e484f55c75c0e99c5ad54f138323b180bb9292f87b3049 SHA512 341b09b3f8ba132ba9394c904bbe7c95a91fe0b39b080ae96d8228b8474f2d7de6edf4d9dce0b16783ac12aa375b0cda99be67290656f3348219f52d66b7f120
-EBUILD http-accept-1.7.0-r1.ebuild 649 BLAKE2B b3e73a72e39984e6fd4f9547d959c4ed798abcb092aa5fc0e4efe52ed43721c68e1f162b5683b17df55bd27f656c0a5b072da71218c5350b894b8485c0bec918 SHA512 10da0678d3cc805dd79d8a9b45d4ddcb5ac8666282f05477684cd2868acd7a1423c3143362adf6b8921058ab8e03bcef8427445279dfe7c8647ba4875be8a109
-EBUILD http-accept-2.2.0.ebuild 746 BLAKE2B f68a66e0dfa05a665c9b899d9fda708ff79fdffcb9030edc0b435da6e5166c9323e5a72f68981210c3ef0de5b0c5eb88d8be69aa5b2fed8a76df7df6e5412457 SHA512 29d0de6f7a69c738e41b3475134c5f7e6b7676c2eaf8a44fc1340d21f3f666cc05b25c79f1aae93c72675377fae08f0b0510c277806cfe7fc146032b882bd6cc
+EBUILD http-accept-1.7.0-r1.ebuild 656 BLAKE2B 092cad16655304e2d519a8d5cf2495ac1e6e6f2c29cdd870474f3f05ab76070b17014e089714468ada13e33e915a47a93ab1192883a2c87bde27e735bfecb276 SHA512 90a7dedea124896bf7562dcc9b5b53c64e705c3d074a9186d2e904c710a2ba3867bcd8e0d1135ce6bff2c3e76b7d1d3dfe9f082e899dade415099b942ef0e2e9
+EBUILD http-accept-2.2.0.ebuild 753 BLAKE2B df67b61ed7f28cda1c6ffee7d76b1dbd97ce013fe2aec21021e6d2940b0a30702b9694b2409a85f6377816a32459bc78146d4eab055f6b48b99a7beca7a4cdda SHA512 dc55e24ce2677300442a5a4b2f9527e0813d19f87250f4efc56f93b15c04a9a48484aa5f6f37f7d47082658e4976fcc7396a7b7757f05a87a44cd15d05fc028d
 MISC metadata.xml 347 BLAKE2B 94d85022fee1a9bba34d8d2e184cb2169dd91c680c15f1d6032d6989c22b8ec5bfc4e84c6b36452ba9fbe78f420d62bdb547fbe98e736f5830ca94126ae7a4eb SHA512 0efdea66a1d6d83efd16aba20e1dd0634bff7cc6bd5570d27a4e101a5307fb358a954b4b70253e08698afefcdff81455e2a3e3bb2f9054992354dd3a863c00ef
diff --git a/dev-ruby/http-accept/http-accept-1.7.0-r1.ebuild b/dev-ruby/http-accept/http-accept-1.7.0-r1.ebuild
index 3aed1d8587be..f33538a857c1 100644
--- a/dev-ruby/http-accept/http-accept-1.7.0-r1.ebuild
+++ b/dev-ruby/http-accept/http-accept-1.7.0-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/socketry/http-accept/archive/v${PV}.tar.gz -> ${P}.t
 
 LICENSE="MIT"
 SLOT="1"
-KEYWORDS="amd64 ~arm64 ~ppc ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc ~riscv ~x86"
 IUSE=""
 
 all_ruby_prepare() {
diff --git a/dev-ruby/http-accept/http-accept-2.2.0.ebuild b/dev-ruby/http-accept/http-accept-2.2.0.ebuild
index ae6a8daf0fed..71cebe7263b5 100644
--- a/dev-ruby/http-accept/http-accept-2.2.0.ebuild
+++ b/dev-ruby/http-accept/http-accept-2.2.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/socketry/http-accept/archive/v${PV}.tar.gz -> ${P}.t
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1)"
-KEYWORDS="amd64 ~arm64 ~ppc ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc ~riscv ~x86"
 IUSE=""
 
 all_ruby_prepare() {
diff --git a/dev-ruby/netrc/Manifest b/dev-ruby/netrc/Manifest
index 50800348ecc4..c302e5371848 100644
--- a/dev-ruby/netrc/Manifest
+++ b/dev-ruby/netrc/Manifest
@@ -1,3 +1,3 @@
 DIST netrc-0.11.0.gem 10752 BLAKE2B 40f78989c7b58b726c1f83ea7032eace74c11776b006a2f5fc9459134224cad6129b370d6da4bcdef540d75504da6d5ca5a1d6bab9c1ab8a2620b22c3933be20 SHA512 7f0df3f79d92b891d40a49e9b893ca7131077195cf15453b155e37e68e29f8cd3810ba791a06338058262c8cb8fed56c87c295e450c133b428b3398eb99e683a
-EBUILD netrc-0.11.0-r2.ebuild 743 BLAKE2B be664283d2337238383465c00feec17a4acdb129d657e029840a0c356f49428aee8b7eef5b7d9ee8958272c5eaab056dcd27ac3b5b004e45038190501db82276 SHA512 35d3de7ddade199951cd001d4d02fed7b5f3e10e67668ac8714d81a99a8401b4d66c430b8a0031e10945bbf89ff1a5e28c72613b4f04b5f256f47ce63aa331fa
+EBUILD netrc-0.11.0-r2.ebuild 750 BLAKE2B 5675f32dbcb9d04703534a75e73d35317d275751705f49207defd5e81b1c6222a67e4672fc4c7e7f88a18706b03a691ab79ec95bc98d6268f39a19b8d4bd24cd SHA512 65550d46b200b1f62bff40a7307db087f60cb36d5e46ab4e3992e8a4b458a93fdd7f8af7f9f560b7877c7e48c3c7d728ce30898410ce0a6bf6f0d579691409c4
 MISC metadata.xml 388 BLAKE2B a02bd97fc07f286ee3932834aefbeec734ed356b3b76a436ceb96d79068cebe681bb9811629ab7d61f2cfc81894b1ec2cbaa40bd0d3c1de02fb7ab48fc5da327 SHA512 170ddf5b8f74de9e0d3d715bdbc44bec7c3e6ea301beec5f286a38fcad2619cc21e1538712f96724fbb42c2aacc301ee54617ad5fbde02c3aa9634217a29abb9
diff --git a/dev-ruby/netrc/netrc-0.11.0-r2.ebuild b/dev-ruby/netrc/netrc-0.11.0-r2.ebuild
index fdc7107fb2a8..078d31217a69 100644
--- a/dev-ruby/netrc/netrc-0.11.0-r2.ebuild
+++ b/dev-ruby/netrc/netrc-0.11.0-r2.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="This library reads and writes .netrc files"
 HOMEPAGE="https://github.com/heroku/netrc"
 LICENSE="MIT"
 
-KEYWORDS="amd64 ~arm ~arm64 ~ppc x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~riscv x86"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-ruby/oauth/Manifest b/dev-ruby/oauth/Manifest
index 35e84ac5cbd4..090f3ac48dbb 100644
--- a/dev-ruby/oauth/Manifest
+++ b/dev-ruby/oauth/Manifest
@@ -1,6 +1,6 @@
 DIST oauth-0.5.14.tar.gz 68764 BLAKE2B 19c7f463d5fcba62a609355834ba93adf1efa05b2ce25fc5d9d3623da15d35a7cb54eff9201bb4f373a66629781f5937326430a7a1c9c615929bcc5bae099a67 SHA512 646ed55a602e9e7b8e8d59532c89929305abeeda6b38fc38bdf1d5e400deec7f5884d988bcbb9e3537eb3a0921dacb73cb5238af27e9885aff95b67196f62c99
 DIST oauth-0.6.2.tar.gz 81702 BLAKE2B 2775c0711beb9f3612844ae07ff59953d4db72c0f9a797c6eac49132a021a48481a13f4b1428b2037b0a04b83b5d79e621cccd4a794fe3a339a1ceb468f0b165 SHA512 22f4f734daa42339bbaed1d1d449a4591ef4404aaf8cf1753ba705735a176f6142853b2c4f5e8ff3afa3e9899163af1c5598685664326d58a5b529d94b65441f
 EBUILD oauth-0.5.14.ebuild 1302 BLAKE2B a0c37ea85360a0849f423faa66e5fcfcd33c8860f815724398bcf01c733b5457530d45ad479fddb43859687bf5f36a5b8d3eeb267db11463ffd41a543dbb789c SHA512 54a70e14f6465120482c8a947f2b23029455bbada34ccf9c5db8a011396d23a2ddd5c7f0b65dbe07620f145f0816a26016b12fd95b0a2ffcd8a2692756e1d418
-EBUILD oauth-0.6.2-r1.ebuild 1450 BLAKE2B 46097b63e42b83c3fad483b025519f4fb1db2c3399e443aacb49e376badc86c6e57519dde27a2ca535eb415d94ba2a4bb543127746fd6796ca9a22943e00fdf2 SHA512 210e6e13342d1fa31098d7ad4d62ad7f8c1c82cdf3d68960c06453e420757cefed96e3ee20eb39e4b9079eed0d4c3e9152f99b7e035bad602b4babf3fca5791d
+EBUILD oauth-0.6.2-r1.ebuild 1457 BLAKE2B 135ff26c0d94fd3ada9a55362a26f8dbfd0c69fa1926ae141d9b52c35488b4b69ac93581a6342cb84e87b6f65757b8cd51a61da62e348eed74cb3adee4f7e628 SHA512 1727a553f69bd777ce1e5b5b140d03e39518b5cf97ab0faed258e2a9cbc5c9f7bc505552a831c2b7699f0d070a5b7268b25957021e8dde4fdc975257eb2b14ed
 EBUILD oauth-0.6.2.ebuild 1403 BLAKE2B fab3d199a16196709c01ec40d9ec6e0c7a1821d3dade0dba1c9c28ad08acd380e0ff3ae20f3f7bb6a0902f51c42866609446ebab949c4d973b03a23272d3e868 SHA512 54f54853fa0a5b2fd61083f0199b4b46ba14c73c3b9e6cfc04aaa2ab8631c16d549e52a221d70d772f14dcb5c9b7685678c338858f47f5c0b7b20e0ac182c9f3
 MISC metadata.xml 336 BLAKE2B ab0fbd6793480301de481d3d1cfe9b26bfd24573f43d742c154fb4ddf4d0550663acd415dda46dbace5005085a40714fe3fdd9a84b147154c8ed3fdc47d59c02 SHA512 b99860f6b76b68cad2e0bde7a8c8d7156e4806dbed1f11f4579dfd8a89c372f7963d90b273a2ca3abbae82072aa91fba475b051b9dfaa7c557e4f36cbb5c85a6
diff --git a/dev-ruby/oauth/oauth-0.6.2-r1.ebuild b/dev-ruby/oauth/oauth-0.6.2-r1.ebuild
index 84466604d31a..7b74b5dfd58c 100644
--- a/dev-ruby/oauth/oauth-0.6.2-r1.ebuild
+++ b/dev-ruby/oauth/oauth-0.6.2-r1.ebuild
@@ -18,7 +18,7 @@ RUBY_S="${PN}-ruby-${PV}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc ~riscv ~x86"
 IUSE=""
 
 ruby_add_rdepend "
diff --git a/dev-ruby/rest-client/Manifest b/dev-ruby/rest-client/Manifest
index 5baad9d4e9f0..abe1d16ac41f 100644
--- a/dev-ruby/rest-client/Manifest
+++ b/dev-ruby/rest-client/Manifest
@@ -1,3 +1,3 @@
 DIST rest-client-2.1.0.gem 147456 BLAKE2B 602e3cea1bdb117ad8b783d30741f699b18085fd6dd4f0d26a8a8f3b658bc6f807357a7412eaae312566f1b4d5ee7e311f51d5fd4a8eb9063e8552335b019a2e SHA512 fe5d44409dfe607566b4c0324441d9a3981776699027bfbc92283b1cd425f204211fc872593cb0784e0ca7a5e061e98793540eedfeb1891d9a8afd53a5ce01de
-EBUILD rest-client-2.1.0-r1.ebuild 1248 BLAKE2B d28bf42f6c13bc9c25ffc0f0c8535347cd1c43bf77a2bf3fa6d6d353b0dbbaabc2825f9fbc75f3ccd0b74d9c1c2f07cb7f308bd400abf7e5a3e83ab51b43c3dd SHA512 6b0445f95b628d8ab1d837e0530456c4ca993caea20fbf3e61ec6dda27bce980baa7e701d515f2268cef6b7b4e9d25ed5bcec268dfc5c527f68a95c583ec590e
+EBUILD rest-client-2.1.0-r1.ebuild 1255 BLAKE2B 347279bca83d5b2447356c6600ecbc6f513701c71a6069c603bfe6e448449b04ad6de72391c4eb76e14beead0e2ecc88e8711daaeeafb6e82301447cf7d36cd3 SHA512 3fcd420f3a08ba125f043835f31c91989c9cbd94c49910feea5a89b4eebfcf3fae61a33fe9b2207d1e7d999bb7d066a9ebf06e287d0cb13478dcc020ab74b369
 MISC metadata.xml 350 BLAKE2B 0f9bc9df0eb60fb95afbfbe988a68f7f13c2bf30e12a2c0a50e752a55b60e4453782ffe56570c8bd413502a376f03b1d18652514a4048389e66f6e383e21ecdc SHA512 1088d5d495489ccc952b2a3edc4db6b5a96b237be2b06ba31775744c4d088fe16c17bea4fd933bfabd1a84cf6b68a1d7419389cb0cc94f86d3f493108a6ac3c8
diff --git a/dev-ruby/rest-client/rest-client-2.1.0-r1.ebuild b/dev-ruby/rest-client/rest-client-2.1.0-r1.ebuild
index f8909dbf533f..8ad89ea60d3d 100644
--- a/dev-ruby/rest-client/rest-client-2.1.0-r1.ebuild
+++ b/dev-ruby/rest-client/rest-client-2.1.0-r1.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://github.com/rest-client/rest-client"
 
 LICENSE="MIT"
 SLOT="2"
-KEYWORDS="amd64 ~arm64 ~ppc ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc ~riscv ~x86"
 IUSE=""
 
 ruby_add_bdepend "test? ( dev-ruby/webmock:3 )"
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index a59325892c7f..ed9a9aab746a 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/clippy/Manifest b/dev-util/clippy/Manifest
index 2795ce59ba93..23aa81740938 100644
--- a/dev-util/clippy/Manifest
+++ b/dev-util/clippy/Manifest
@@ -1,7 +1,7 @@
-DIST clippy-8.4.2.tar.gz 9893223 BLAKE2B 670fb131c2959b0ce4f3133ef38caeb7832275844b16f8582a693033f5466ad0eb98ab45ed9615e0a121ab80bf034edafe7ee816c47d767bd8a13b52f3138eac SHA512 1ee9d17ef3b85c5c10df624a6560bcacb2b5daa3d6231e457f06d9eb6e5ccf375064a46e809d851c23cb6daf7a4299d1f25be589992ef729e80f9bad41a8d7f7
 DIST clippy-8.5.2.tar.gz 10076639 BLAKE2B 2e2aca4e42757f66c9ca4725826c6cc1d611930490eed2a175ca5b56910f2c09a9d842b2a9370a64a9fdac6a6314bd4573be609d14dbf956049d9fbf49310404 SHA512 1afa6ca1a41096aa47dc2fc39ab87290b3cbf634a1632e7910a5b69d2816998fbccbca616f261a410aa146a21dd26d12b7e6812da4ec08545b1500f8b546b972
 DIST clippy-8.5.tar.gz 10068379 BLAKE2B ed7aa538997bdbfde0370f36a8980ad3ae882a2325cdc7c3b2bdba9d6a43cd9ca04ff96b94b7827e06593a15c104cdadbd2632e136eb2d68e7ed87095a9294a4 SHA512 13e2ea8642fc00b565e9a36d2d59abe5d0e11caf646199cd928184fda2de004bda9892ae8a2f91870d5ac218bb127725663b693e4d764e5b21c942bb20b8d66f
-EBUILD clippy-8.4.2.ebuild 1041 BLAKE2B 999da0b98497c71a6c4bf5056f080ed0aac38fcd6055c5a7a73d0d3e777c70d9afd0e450db6ed628fcc8fe6a50eec6691916d89deec3328cca3270f2a7f54a25 SHA512 4fcf81160bb71444d3b4829ea76b34d84340fe829efd83d0eb86bb147a99bf3b17d92c945a8748194bbbc5a32121e77ce2dd984381b3ae50f1cfc31ca077bb8b
+DIST frr-9.0.tar.gz 10332694 BLAKE2B 82221df6da189d5e687af4618af71933eb512413126dfb312bfcc663e5fc6f85e29c33da84117f40598452e6033cb24e9cba8d28f00d63fee2bf45a43babef17 SHA512 d3af6c24abbc8745f9646a22c023bd1d0e155776ffd09c9dd0b81b93c383723c9e7dd987319551db85dab5fd45d47cbcbf47a1ae1b6861cd7930bc27f18d2e25
 EBUILD clippy-8.5.2.ebuild 1042 BLAKE2B c27e6af0eeac3f71b2a143a0b9f65fe06e3357a92e8b3ccf2e0c5d54d2f22a0327001b62175e205d54f9777515bd2f5f964660e3f23271890e8f078ef7256922 SHA512 7554bceed36172c152089fd0e12750023d9cfea77fa4a9c093079500be0dac50bc452b8df260670fe10d84eb9ed4874ed46c925954c47af8aabbf673102b59e8
 EBUILD clippy-8.5.ebuild 1178 BLAKE2B b27184aeb6820bcc8ea8f6d0c682dbc10b74b566bf9b2741aa82e85e24afd69dd5b648071f9d7cf7b5f548925e33df4c37ebf4170d727d3fc3b2cd7b7735fbef SHA512 e26991b0a05493d6e6644cd3657547bd5e2509ac68f54fb14f4a43a50cb0cbe675aabde1a57193232660e7f236bec324774a2e737f02e2a0f116e44c0c09f6c8
+EBUILD clippy-9.0.ebuild 1163 BLAKE2B e845a4132c8525aeedbb8cb06b7af4ed44ca980ca9c455351cc615d18b9fc54dff7c15dc38a1a6c3fca88c93936b375a5142a4d6df65decc59e89eb0971fd987 SHA512 cc957f3a773435d2b709bae7b6cf3cb0b4a81d356162d9c8c677c81b290db687350eb3d994abc4d3d5f80b22fff66db2cb1799e0ac6789bad69e7be1daf372bd
 MISC metadata.xml 698 BLAKE2B 6d9e26fe97aec43d747a6f32f2798ac54dd90bc2455754681b9af469482cca56b0af5ef9aef37d7a499cbb645ff925c2f2310f505e6abc97f1480ba74490d99a SHA512 c22ce95c9ef7a367c3a9f0fcc937850a8caf73b59b4dfc52f22bdd8163729bb6624f518856da1d3198e29e2a0eeabbfc2e818c8f9b15b1005d133d39bbd0d4f1
diff --git a/dev-util/clippy/clippy-8.4.2.ebuild b/dev-util/clippy/clippy-9.0.ebuild
index 493997f91ac9..5c3fda52b99a 100644
--- a/dev-util/clippy/clippy-8.4.2.ebuild
+++ b/dev-util/clippy/clippy-9.0.ebuild
@@ -9,7 +9,7 @@ inherit autotools python-single-r1
 
 DESCRIPTION="Standalone clippy tool built from FRR sources"
 HOMEPAGE="https://frrouting.org/"
-SRC_URI="https://github.com/FRRouting/frr/archive/${MY_P}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/FRRouting/frr/archive/${MY_P}.tar.gz"
 S="${WORKDIR}/frr-${MY_P}"
 
 LICENSE="GPL-2"
@@ -31,6 +31,11 @@ BDEPEND="
 	sys-devel/flex
 "
 
+QA_CONFIG_IMPL_DECL_SKIP=(
+	mallinfo	# check in configure is fallback is needed
+	mallinfo2	# check in configure is fallback is needed
+)
+
 src_prepare() {
 	default
 	eautoreconf
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 339b7a1d59a3..e97f79339d21 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/sdl2-gfx/Manifest b/media-libs/sdl2-gfx/Manifest
index e588df1cdc5b..7ad2e1a3c34e 100644
--- a/media-libs/sdl2-gfx/Manifest
+++ b/media-libs/sdl2-gfx/Manifest
@@ -1,5 +1,4 @@
 AUX sdl2-gfx-1.0.4-slibtool.patch 560 BLAKE2B 421170fe30fc7ba46867cfe111fd7366b68caa5a33e9e3ed27a47ef1350858a08a3c7f05aeb79219696d428b8409dabaec339a1f7169b7d3847ca037c05804f7 SHA512 f8266c0e43f77471c8ac28e6b3815c07a3dc36fe1a05a89fa578551f038ea48839dc9602294626f7b3030e9e8aeeaa6df98b28beee15baf5a81bcb3ebfc5fbc6
 DIST SDL2_gfx-1.0.4.tar.gz 1230588 BLAKE2B a14cf8433aa171b8185aab765c934262fd4ecde4e45e9c8bdfb4aa7feb97676cd8fb5274ad0452bcf77fcc8f268254184fedc73f1c791ff42305d518d01a8cc7 SHA512 81a100d3c8c3a7c6bd37a23f1290ff10685f8e62fbecd83b0086aae4edc721483e2153cd4219fbd9168f115eea0ea6b25f9be375faf5761f0babdfb1b52fe482
 EBUILD sdl2-gfx-1.0.4-r1.ebuild 1109 BLAKE2B 031edd3703ede2402a5674648e50a9d38be42c837a6f11d752119d1099cdc86477756ead2aeeeaa54409a4d588d447a5735fbd420db21cc9f656a599db6d9874 SHA512 3debaecea6af9eff9beeb4e15343fcfce259e00c62e6216307788c3c4f82fb16f02c16a61f9b44cfe0501bed94f674a60fea0ae033eb08f9b011f3fb5e54663d
-EBUILD sdl2-gfx-1.0.4.ebuild 1107 BLAKE2B a47864b36e7b675e5fe1c2c534f6c059e3c72c3dbc560d4c013b55f81bd9ec92fdaaef1691b1b5ac9791c6c42dd1f94e43b0cd1d2b3cac8ef608fde474cb4fda SHA512 66cada8ad4cff2b44685a8fce943dbfb3c536e4a8d12c5e94c9d1feddd8c35180a4cde1ad8b5cd7f29194628f4dd9b5223712c5feebe00031fc6efc087e000bf
 MISC metadata.xml 802 BLAKE2B 6157add63c3adbf6cccd1d8cfc9cec3188e45468bb5c2fc7b3854cd5b570e5016a67d87d0c265a9d67f455e523a1d3eaa22b7aae3af93cc5ed7e26543d73f8f7 SHA512 d04bc0b8f57a8c39a56b2cbe52971ffb3b7faaf523e0ba0ad5c85c6000230382383b3fdb1eab21593ab4516f7c6ffce41e3281796ff9be4f29847cad9a83e5da
diff --git a/media-libs/sdl2-gfx/sdl2-gfx-1.0.4.ebuild b/media-libs/sdl2-gfx/sdl2-gfx-1.0.4.ebuild
deleted file mode 100644
index 915f8fbfe5b5..000000000000
--- a/media-libs/sdl2-gfx/sdl2-gfx-1.0.4.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools multilib-minimal
-
-MY_P="${P/sdl2-/SDL2_}"
-DESCRIPTION="Graphics drawing primitives library for SDL2"
-HOMEPAGE="http://www.ferzkopp.net/joomla/content/view/19/14/"
-SRC_URI="http://www.ferzkopp.net/Software/SDL2_gfx/${MY_P}.tar.gz"
-S="${WORKDIR}"/${MY_P}
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
-IUSE="doc cpu_flags_x86_mmx"
-
-DEPEND=">=media-libs/libsdl2-2.0.1-r1[video,${MULTILIB_USEDEP}]"
-RDEPEND="${DEPEND}"
-
-DOCS=( AUTHORS ChangeLog README )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.0.4-slibtool.patch
-)
-
-src_prepare() {
-	default
-	mv configure.in configure.ac || die
-	sed -i \
-		-e 's/ -O / /' \
-		configure.ac || die
-	eautoreconf
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		$(use_enable cpu_flags_x86_mmx mmx)
-		--disable-static
-	)
-
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	if use doc ; then
-		docinto html
-		dodoc -r Docs/html/*
-	fi
-
-	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
-}
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 8bce652a4871..572825f34229 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index de306912d6bb..820e5062d9aa 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Sun, 27 Aug 2023 08:09:51 +0000
+Sun, 27 Aug 2023 14:09:57 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index 828fdcf70caf..81c5d2c21244 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 546284 BLAKE2B ffce95d14dec8e0ecb1658575f411350a797650e5376e656bbe5d1c11b4e05372611ac4ca5de41270e2e69dfa9461b99f212aa044d6509bb082c7f94d92006b8 SHA512 c90fc6416d62b1b09cbafd89df9a8523e7e9eec12dd28fd39f81776bc9076c1e64fdb0203c709c330d323ea0c05daf6d59e5c469948b4d49cc6d59443f29557a
-TIMESTAMP 2023-08-27T08:09:58Z
+TIMESTAMP 2023-08-27T14:10:00Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmTrBNZfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmTrWThfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klB0Dg//T5TdTlYu0dhMggpiUD0nqmAtCuOifBgZ7LoO+Dz7zdXqNTyqXSqN9ODZ
-r3FrYejvx10J3zgr4vkmV5ltDzyFcwsQmm8MX0lKt4ZKRlePfXmrB4O4TuaJ4jgv
-HU8RcVbT2gpVDsl8OSBmZ7jH48/POdYwYpY+/WeqT+iXdDiYVnNanaTAS8uW+Z6s
-s+B/FUABA5ml2+ixTUXUas8I6eiNGzOCw08dAVy5rP7hSepeAuNu9MvCmmChK7Xq
-VwVDZ/VmpKHT43259ZRhK9sk03EUtl2cwMJgr0zCjQSWXG0dRHEHG3icuQ0gQLRF
-/P2ZbFkUMOFWTI0wewEorCwvZiEQDHFlLNs0WorqGxNUp/bqiDqUSXO2+L5WbEsg
-ssjFgY/pRQJpQbozDhCpbM3UW9dtvg8wStcJTSK+8Yx04CCdIKz7lRCifjxR8ksT
-maw9NXUoeGrHbbxgVeDIg51Or1VWncjtLcBU+tDjJ2QYseTPr4IZLN7zCK/kobws
-JyNap3AThxfdOhe076G86yqkPGKtpTUAgA29FdCmCewZdu6H31Zbc9QmyLzuGgzy
-IVBjfpkyNBejnL2s51DVirBsn8WEdWIvD3ITLc4QEyzL+1qpt1A4BauYilRlEVtg
-znOsfVEL6KUtYU5TBdNARZW0fr1tCa8MNNWorjhQ0mHxnLjvEwI=
-=CNrn
+klBFow/9Gd9hssAIDUHWYglqi/Hvur4RVeLQOWQehbBix0iqOD+hkfRUSPbr5tbL
+CiEpm/CLHpoMINTnFpr5G6yZ97MML9Tj30G7Zm/E7g9Qrh2zLDtelgYmiLzkpJbN
+Qi0s1e5ZM5QVe0g2OGRWd3T7v7FhY+IVBFun4mCgqTb9CDjKDxliPs7ug5A8kF12
+AJ/z7w2AzoykL/pTVTDyZrSsz1shLu8ZvJaHE/l5C8Ifudj1h/rvJczRsmsYGQu0
+L5LCDqGE9lGqi5GdBH1E2JVSwGp/MhaykLrrXNdzVRZIY8XWWqVzC43VvApXzVRb
+oviD+zdpAQsIhAo2lmp1+DwtiAMufkRF+8SXNxijAcJVKV8ehe1CediRf5RQOp4y
+nlAcRY1oHWQAnSy48XGzRzhOnaMy78R8cvb2JZLwrirOjK+K9QrPzkXUNu5w5fiq
+6XslajvlKmHTD2msmgkZfMr4kwKyyf71YqdBTnJgJPAqNQHEw0SusLR108L+oBpn
+wknjbvkSzd/1aP2NpuseMB9DZt8anBhVzjMYSEs6c5VxW/KksjN4smYnjCF0vm6K
+Up95xPN2imntL5cBMrDCFfOTNnuFA9dsNU+7CKQYtcUMpsrwN3x5YWZlisUleEMh
+WvbJAI8opESPtzstaKEC3PPap5GPieTcVkCVFrvUsBS6lsCMJXA=
+=WFAN
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index de306912d6bb..52c99069024a 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Sun, 27 Aug 2023 08:09:51 +0000
+Sun, 27 Aug 2023 14:09:58 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index aee309293c7c..ac1226cc31e5 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index 074ce6a1a057..8c61ecd6c735 100644
--- a/metadata/md5-cache/app-text/Manifest.gz
+++ b/metadata/md5-cache/app-text/Manifest.gz
diff --git a/metadata/md5-cache/app-text/paper-clip-3.2 b/metadata/md5-cache/app-text/paper-clip-3.2-r1
index 461d324b334c..790796252639 100644
--- a/metadata/md5-cache/app-text/paper-clip-3.2
+++ b/metadata/md5-cache/app-text/paper-clip-3.2-r1
@@ -1,6 +1,6 @@
 BDEPEND=|| ( dev-lang/vala:0.56 ) dev-libs/appstream-glib dev-util/desktop-file-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=app-text/poppler:=[cairo,introspection] dev-libs/glib:2 dev-libs/gobject-introspection dev-libs/libportal:= gui-libs/gtk:4 gui-libs/libadwaita:1
+DEPEND=app-text/poppler:=[cairo,introspection] dev-libs/glib:2 dev-libs/gobject-introspection dev-libs/libportal:=[gtk,introspection,vala] gui-libs/gtk:4 gui-libs/libadwaita:1[introspection,vala]
 DESCRIPTION=Edit the title, author, keywords and more details of PDF documents
 EAPI=8
 HOMEPAGE=https://github.com/Diego-Ivan/Paper-Clip/
@@ -8,9 +8,9 @@ IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=gnome2-utils meson vala xdg
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3+
-RDEPEND=app-text/poppler:=[cairo,introspection] dev-libs/glib:2 dev-libs/gobject-introspection dev-libs/libportal:= gui-libs/gtk:4 gui-libs/libadwaita:1
+RDEPEND=app-text/poppler:=[cairo,introspection] dev-libs/glib:2 dev-libs/gobject-introspection dev-libs/libportal:=[gtk,introspection,vala] gui-libs/gtk:4 gui-libs/libadwaita:1[introspection,vala]
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/Diego-Ivan/Paper-Clip/archive/v3.2.tar.gz -> paper-clip-3.2.tar.gz
 _eclasses_=flag-o-matic	be27a904c614cb93ae037762dc69bcc2	gnome2-utils	b0183db3b2e07b18f3b77bffec72e116	meson	08b7183c3f4811568ee93eb0f79a89fe	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	python-utils-r1	59e60e9c5cbd3f214d7f1002e798b387	toolchain-funcs	862d337d98edb576796827be2c6b11ca	vala	db97951caa799e73a831a5f48e717da8	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=1d9142b3b5d07ced75eaeabccb5edccf
+_md5_=79b5625b095bb036b93ee4b700010423
diff --git a/metadata/md5-cache/app-text/paper-clip-9999 b/metadata/md5-cache/app-text/paper-clip-9999
index e9423aa5127f..553f1d79e5d4 100644
--- a/metadata/md5-cache/app-text/paper-clip-9999
+++ b/metadata/md5-cache/app-text/paper-clip-9999
@@ -1,6 +1,6 @@
 BDEPEND=|| ( dev-lang/vala:0.56 ) dev-libs/appstream-glib dev-util/desktop-file-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
-DEPEND=app-text/poppler:=[cairo,introspection] dev-libs/glib:2 dev-libs/gobject-introspection dev-libs/libportal:= gui-libs/gtk:4 gui-libs/libadwaita:1
+DEPEND=app-text/poppler:=[cairo,introspection] dev-libs/glib:2 dev-libs/gobject-introspection dev-libs/libportal:=[gtk,introspection,vala] gui-libs/gtk:4 gui-libs/libadwaita:1[introspection,vala]
 DESCRIPTION=Edit the title, author, keywords and more details of PDF documents
 EAPI=8
 HOMEPAGE=https://github.com/Diego-Ivan/Paper-Clip/
@@ -8,8 +8,8 @@ IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=gnome2-utils meson vala xdg git-r3
 LICENSE=GPL-3+
 PROPERTIES=live
-RDEPEND=app-text/poppler:=[cairo,introspection] dev-libs/glib:2 dev-libs/gobject-introspection dev-libs/libportal:= gui-libs/gtk:4 gui-libs/libadwaita:1
+RDEPEND=app-text/poppler:=[cairo,introspection] dev-libs/glib:2 dev-libs/gobject-introspection dev-libs/libportal:=[gtk,introspection,vala] gui-libs/gtk:4 gui-libs/libadwaita:1[introspection,vala]
 RESTRICT=test
 SLOT=0
 _eclasses_=flag-o-matic	be27a904c614cb93ae037762dc69bcc2	git-r3	2358a7b20091609e24bd3a83b3ac5991	gnome2-utils	b0183db3b2e07b18f3b77bffec72e116	meson	08b7183c3f4811568ee93eb0f79a89fe	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	python-utils-r1	59e60e9c5cbd3f214d7f1002e798b387	toolchain-funcs	862d337d98edb576796827be2c6b11ca	vala	db97951caa799e73a831a5f48e717da8	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=1d9142b3b5d07ced75eaeabccb5edccf
+_md5_=79b5625b095bb036b93ee4b700010423
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index acb43d3354da..aa9114443b56 100644
--- a/metadata/md5-cache/dev-libs/Manifest.gz
+++ b/metadata/md5-cache/dev-libs/Manifest.gz
diff --git a/metadata/md5-cache/dev-libs/json-c-0.17 b/metadata/md5-cache/dev-libs/json-c-0.17
new file mode 100644
index 000000000000..c0bdecfc7888
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/json-c-0.17
@@ -0,0 +1,13 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A JSON implementation in C
+EAPI=8
+HOMEPAGE=https://github.com/json-c/json-c/wiki
+INHERIT=cmake-multilib
+IUSE=cpu_flags_x86_rdrand static-libs threads abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+LICENSE=MIT
+SLOT=0/5
+SRC_URI=https://s3.amazonaws.com/json-c_releases/releases/json-c-0.17.tar.gz
+_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=28d6d0cbef18fdf56d078bff84507c92
diff --git a/metadata/md5-cache/dev-libs/json-c-9999 b/metadata/md5-cache/dev-libs/json-c-9999
index af188564ac53..0b4823749abb 100644
--- a/metadata/md5-cache/dev-libs/json-c-9999
+++ b/metadata/md5-cache/dev-libs/json-c-9999
@@ -3,10 +3,10 @@ DEFINED_PHASES=compile configure install prepare test unpack
 DESCRIPTION=A JSON implementation in C
 EAPI=8
 HOMEPAGE=https://github.com/json-c/json-c/wiki
-INHERIT=cmake-multilib git-r3
+INHERIT=cmake-multilib git-r3 multibuild
 IUSE=cpu_flags_x86_rdrand doc static-libs threads abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 LICENSE=MIT
 PROPERTIES=live
 SLOT=0/5
 _eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	git-r3	2358a7b20091609e24bd3a83b3ac5991	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=aad0e4dceee61c65914998ba76d1e88e
+_md5_=5c6034c3d07700764f98cddbb6e8e5a1
diff --git a/metadata/md5-cache/dev-libs/libbpf-1.1.0 b/metadata/md5-cache/dev-libs/libbpf-1.1.0
deleted file mode 100644
index f97a4e6344f2..000000000000
--- a/metadata/md5-cache/dev-libs/libbpf-1.1.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=configure install
-DEPEND=sys-kernel/linux-headers virtual/libelf
-DESCRIPTION=Stand-alone build of libbpf from the Linux kernel
-EAPI=8
-HOMEPAGE=https://github.com/libbpf/libbpf
-INHERIT=flag-o-matic toolchain-funcs
-IUSE=static-libs
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=GPL-2 LGPL-2.1 BSD-2
-RDEPEND=sys-kernel/linux-headers virtual/libelf
-SLOT=0/1.1
-SRC_URI=https://github.com/libbpf/libbpf/archive/v1.1.0.tar.gz -> libbpf-1.1.0.tar.gz
-_eclasses_=flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=eff4f944b0d854972c804b1fd3b9af6c
diff --git a/metadata/md5-cache/dev-libs/libbpf-1.2.0 b/metadata/md5-cache/dev-libs/libbpf-1.2.0
index bbf5a2f7a23f..9d06bc9afdf6 100644
--- a/metadata/md5-cache/dev-libs/libbpf-1.2.0
+++ b/metadata/md5-cache/dev-libs/libbpf-1.2.0
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/libbpf/libbpf
 INHERIT=flag-o-matic toolchain-funcs
 IUSE=static-libs
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=GPL-2 LGPL-2.1 BSD-2
 RDEPEND=sys-kernel/linux-headers virtual/libelf
 SLOT=0/1.2
 SRC_URI=https://github.com/libbpf/libbpf/archive/v1.2.0.tar.gz -> libbpf-1.2.0.tar.gz
 _eclasses_=flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=b1935ea9e48c1b501d3b04ae256b45b8
+_md5_=eff4f944b0d854972c804b1fd3b9af6c
diff --git a/metadata/md5-cache/dev-libs/tinyxml-2.6.2-r5 b/metadata/md5-cache/dev-libs/tinyxml-2.6.2-r5
new file mode 100644
index 000000000000..f7f281294ed2
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/tinyxml-2.6.2-r5
@@ -0,0 +1,13 @@
+BDEPEND=doc? ( app-doc/doxygen )
+DEFINED_PHASES=install prepare
+DESCRIPTION=Simple and small C++ XML parser
+EAPI=8
+HOMEPAGE=http://www.grinninglizard.com/tinyxml/index.html
+INHERIT=flag-o-matic toolchain-funcs multilib
+IUSE=debug doc static-libs +stl
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+LICENSE=ZLIB
+SLOT=0
+SRC_URI=mirror://sourceforge/tinyxml/tinyxml_2_6_2.tar.gz
+_eclasses_=flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	862d337d98edb576796827be2c6b11ca
+_md5_=8b000acdee83246d5b9587d5c2f247fd
diff --git a/metadata/md5-cache/dev-ml/Manifest.gz b/metadata/md5-cache/dev-ml/Manifest.gz
index aedf5dbeafb9..3f08aa2e2954 100644
--- a/metadata/md5-cache/dev-ml/Manifest.gz
+++ b/metadata/md5-cache/dev-ml/Manifest.gz
diff --git a/metadata/md5-cache/dev-ml/merlin-4.10 b/metadata/md5-cache/dev-ml/merlin-4.10
new file mode 100644
index 000000000000..3ca4df7af372
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/merlin-4.10
@@ -0,0 +1,16 @@
+BDEPEND=!!<dev-ml/seq-0.3 test? ( app-misc/jq ) dev-lang/ocaml dev-ml/dune
+DEFINED_PHASES=compile install postinst postrm prepare test unpack
+DEPEND=dev-lang/ocaml:=[ocamlopt?] dev-ml/csexp:= >=dev-ml/yojson-2.0.0:= dev-ml/menhir:= >=dev-ml/dune-2.9:= || ( dev-lang/ocaml:0/4.14 dev-lang/ocaml:0/4.14.1 ) emacs? ( >=app-editors/emacs-23.1:* app-emacs/auto-complete app-emacs/company-mode ) >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+DESCRIPTION=Context sensitive completion for OCaml in Vim and Emacs
+EAPI=8
+HOMEPAGE=https://github.com/ocaml/merlin/
+INHERIT=elisp-common dune
+IUSE=emacs +ocamlopt test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=dev-lang/ocaml:=[ocamlopt?] dev-ml/csexp:= >=dev-ml/yojson-2.0.0:= dev-ml/menhir:= >=dev-ml/dune-2.9:= || ( dev-lang/ocaml:0/4.14 dev-lang/ocaml:0/4.14.1 ) emacs? ( >=app-editors/emacs-23.1:* app-emacs/auto-complete app-emacs/company-mode ) >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+RESTRICT=!test? ( test )
+SLOT=0/4.10
+SRC_URI=https://github.com/ocaml/merlin/releases/download/v4.10-414/merlin-4.10-414.tbz
+_eclasses_=dune	beddc7cde467b2e48afc78a87d042c01	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	elisp-common	dc179f98b2b4d9a4473fd3bdc154bbb6	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
+_md5_=f9eb680cbf5e0d792cfdd32d12b149aa
diff --git a/metadata/md5-cache/dev-ml/merlin-4.5-r3 b/metadata/md5-cache/dev-ml/merlin-4.5-r3
deleted file mode 100644
index c80ffe9ce2b3..000000000000
--- a/metadata/md5-cache/dev-ml/merlin-4.5-r3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-lang/ocaml dev-ml/dune
-DEFINED_PHASES=compile install postinst postrm prepare test unpack
-DEPEND=dev-ml/csexp:= <dev-ml/yojson-2:= dev-ml/menhir:= >=dev-ml/dune-2.9:= || ( dev-lang/ocaml:0/4.11 dev-lang/ocaml:0/4.12 dev-lang/ocaml:0/4.13 dev-lang/ocaml:0/4.14 ) emacs? ( >=app-editors/emacs-23.1:* app-emacs/auto-complete app-emacs/company-mode ) test? ( app-misc/jq ) >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
-DESCRIPTION=Context sensitive completion for OCaml in Vim and Emacs
-EAPI=8
-HOMEPAGE=https://github.com/ocaml/merlin
-INHERIT=elisp-common dune
-IUSE=emacs +ocamlopt test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=dev-ml/csexp:= <dev-ml/yojson-2:= dev-ml/menhir:= >=dev-ml/dune-2.9:= || ( dev-lang/ocaml:0/4.11 dev-lang/ocaml:0/4.12 dev-lang/ocaml:0/4.13 dev-lang/ocaml:0/4.14 ) emacs? ( >=app-editors/emacs-23.1:* app-emacs/auto-complete app-emacs/company-mode ) >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
-RESTRICT=!test? ( test )
-SLOT=0/4.5
-SRC_URI=https://github.com/ocaml/merlin/releases/download/v4.5-411/merlin-4.5-411.tbz https://github.com/ocaml/merlin/releases/download/v4.5-412/merlin-4.5-412.tbz https://github.com/ocaml/merlin/releases/download/v4.5-413/merlin-4.5-413.tbz https://github.com/ocaml/merlin/releases/download/v4.5-414/merlin-4.5-414.tbz
-_eclasses_=dune	beddc7cde467b2e48afc78a87d042c01	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	elisp-common	dc179f98b2b4d9a4473fd3bdc154bbb6	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=464fd6dd28b372dfb6408ae94afff8f6
diff --git a/metadata/md5-cache/dev-ml/merlin-4.6 b/metadata/md5-cache/dev-ml/merlin-4.6
deleted file mode 100644
index 6496061ef690..000000000000
--- a/metadata/md5-cache/dev-ml/merlin-4.6
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=!!<dev-ml/seq-0.3 test? ( app-misc/jq ) dev-lang/ocaml dev-ml/dune
-DEFINED_PHASES=compile install postinst postrm prepare test unpack
-DEPEND=>=dev-lang/ocaml-4.12:=[ocamlopt?] dev-ml/csexp:= >=dev-ml/yojson-2.0.0:= dev-ml/menhir:= >=dev-ml/dune-2.9:= || ( dev-lang/ocaml:0/4.12 dev-lang/ocaml:0/4.13 dev-lang/ocaml:0/4.14 ) emacs? ( >=app-editors/emacs-23.1:* app-emacs/auto-complete app-emacs/company-mode ) >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
-DESCRIPTION=Context sensitive completion for OCaml in Vim and Emacs
-EAPI=8
-HOMEPAGE=https://github.com/ocaml/merlin/
-INHERIT=elisp-common dune
-IUSE=emacs +ocamlopt test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=>=dev-lang/ocaml-4.12:=[ocamlopt?] dev-ml/csexp:= >=dev-ml/yojson-2.0.0:= dev-ml/menhir:= >=dev-ml/dune-2.9:= || ( dev-lang/ocaml:0/4.12 dev-lang/ocaml:0/4.13 dev-lang/ocaml:0/4.14 ) emacs? ( >=app-editors/emacs-23.1:* app-emacs/auto-complete app-emacs/company-mode ) >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
-RESTRICT=!test? ( test )
-SLOT=0/4.6
-SRC_URI=https://github.com/ocaml/merlin/releases/download/v4.6-412/merlin-4.6-412.tbz https://github.com/ocaml/merlin/releases/download/v4.6-413/merlin-4.6-413.tbz https://github.com/ocaml/merlin/releases/download/v4.6-414/merlin-4.6-414.tbz
-_eclasses_=dune	beddc7cde467b2e48afc78a87d042c01	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	elisp-common	dc179f98b2b4d9a4473fd3bdc154bbb6	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=c5e7f5180fafcd47e511fe184242cd9e
diff --git a/metadata/md5-cache/dev-ml/ptime-1.1.0 b/metadata/md5-cache/dev-ml/ptime-1.1.0
new file mode 100644
index 000000000000..daf153992128
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/ptime-1.1.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-ml/ocamlbuild dev-ml/opam-installer dev-lang/ocaml
+DEFINED_PHASES=compile install
+DEPEND=dev-ml/topkg >=dev-lang/ocaml-4:= >=dev-ml/findlib-1.0.4-r1[ocamlopt?]
+DESCRIPTION=POSIX time for OCaml
+EAPI=8
+HOMEPAGE=https://erratique.ch/software/ptime https://github.com/dbuenzli/ptime https://opam.ocaml.org/packages/ptime/
+INHERIT=opam findlib
+IUSE=+ocamlopt
+KEYWORDS=~amd64
+LICENSE=ISC
+RDEPEND=>=dev-lang/ocaml-4:= dev-lang/ocaml:=[ocamlopt?]
+SLOT=0/1.1.0
+SRC_URI=https://erratique.ch/software/ptime/releases/ptime-1.1.0.tbz
+_eclasses_=findlib	cc1c14904708a0a28bcb256b342a808c	opam	2d0e114062b346818f6d0fee5e0df656
+_md5_=c289bb59bddb4cd05b36085c50a75c08
diff --git a/metadata/md5-cache/dev-ml/reason-3.8.2 b/metadata/md5-cache/dev-ml/reason-3.8.2
deleted file mode 100644
index b34b6883d81a..000000000000
--- a/metadata/md5-cache/dev-ml/reason-3.8.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/ocaml dev-ml/dune
-DEFINED_PHASES=compile install test
-DEPEND=dev-ml/fix:= dev-ml/menhir:= dev-ml/merlin-extend:= dev-ml/ocaml-migrate-parsetree:= dev-ml/result:= dev-ml/utop:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
-DESCRIPTION=Simple, fast & type safe language that leverages JavaScript and OCaml
-EAPI=8
-HOMEPAGE=https://reasonml.github.io
-INHERIT=dune
-IUSE=+ocamlopt
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-ml/fix:= dev-ml/menhir:= dev-ml/merlin-extend:= dev-ml/ocaml-migrate-parsetree:= dev-ml/result:= dev-ml/utop:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
-SLOT=0/3.8.2
-SRC_URI=https://github.com/reasonml/reason/archive/3.8.2.tar.gz -> reason-3.8.2.tar.gz
-_eclasses_=dune	beddc7cde467b2e48afc78a87d042c01	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=4dd6f888f13064026e9b5da95a0918ab
diff --git a/metadata/md5-cache/dev-ml/utop-2.11.0-r1 b/metadata/md5-cache/dev-ml/utop-2.11.0-r1
deleted file mode 100644
index a054c789e6b4..000000000000
--- a/metadata/md5-cache/dev-ml/utop-2.11.0-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-ml/cppo dev-ml/findlib emacs? ( >=app-editors/emacs-24:* >=app-emacs/tuareg-mode-2.2.0 ) dev-lang/ocaml dev-ml/dune
-DEFINED_PHASES=compile install postinst postrm test
-DEPEND=dev-ml/lambda-term:= dev-ml/logs:= dev-ml/lwt:= dev-ml/react:= dev-ml/zed:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
-DESCRIPTION=Universal toplevel for OCaml
-EAPI=8
-HOMEPAGE=https://github.com/ocaml-community/utop
-INHERIT=dune elisp-common
-IUSE=emacs +ocamlopt
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=dev-ml/lambda-term:= dev-ml/logs:= dev-ml/lwt:= dev-ml/react:= dev-ml/zed:= emacs? ( >=app-editors/emacs-24:* >=app-emacs/tuareg-mode-2.2.0 ) >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
-SLOT=0/2.11.0
-SRC_URI=https://github.com/ocaml-community/utop/archive/2.11.0.tar.gz -> utop-2.11.0.tar.gz
-_eclasses_=dune	beddc7cde467b2e48afc78a87d042c01	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	elisp-common	dc179f98b2b4d9a4473fd3bdc154bbb6	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=bc7480bb0d681a77eb00490985db98c9
diff --git a/metadata/md5-cache/dev-ruby/Manifest.gz b/metadata/md5-cache/dev-ruby/Manifest.gz
index 994387b676be..bf34a26bc78f 100644
--- a/metadata/md5-cache/dev-ruby/Manifest.gz
+++ b/metadata/md5-cache/dev-ruby/Manifest.gz
diff --git a/metadata/md5-cache/dev-ruby/http-accept-1.7.0-r1 b/metadata/md5-cache/dev-ruby/http-accept-1.7.0-r1
index 5935b2ca9174..24eaa4d905d9 100644
--- a/metadata/md5-cache/dev-ruby/http-accept-1.7.0-r1
+++ b/metadata/md5-cache/dev-ruby/http-accept-1.7.0-r1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/socketry/http-accept
 INHERIT=ruby-fakegem
 IUSE=ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 doc test test
-KEYWORDS=amd64 ~arm64 ~ppc ~x86
+KEYWORDS=amd64 ~arm64 ~ppc ~riscv ~x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/socketry/http-accept/archive/v1.7.0.tar.gz -> http-accept-1.7.0.tar.gz
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	ruby-fakegem	5f7dd7ffeaf00a781713582bd507f80b	ruby-ng	e7004f981e452d70374b865ccff407aa	ruby-utils	69e7140043885477733c347fee4a981a	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=224eb66f4f088803da8c28aa75fa0bc9
+_md5_=7a9da6924b508c4edcf4ce2488d3022d
diff --git a/metadata/md5-cache/dev-ruby/http-accept-2.2.0 b/metadata/md5-cache/dev-ruby/http-accept-2.2.0
index f8a89b7ca258..a4024f1f04e6 100644
--- a/metadata/md5-cache/dev-ruby/http-accept-2.2.0
+++ b/metadata/md5-cache/dev-ruby/http-accept-2.2.0
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/socketry/http-accept
 INHERIT=ruby-fakegem
 IUSE=ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 doc test test
-KEYWORDS=amd64 ~arm64 ~ppc ~x86
+KEYWORDS=amd64 ~arm64 ~ppc ~riscv ~x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/socketry/http-accept/archive/v2.2.0.tar.gz -> http-accept-2.2.0.tar.gz
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	ruby-fakegem	5f7dd7ffeaf00a781713582bd507f80b	ruby-ng	e7004f981e452d70374b865ccff407aa	ruby-utils	69e7140043885477733c347fee4a981a	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=c1a9460819a1f8501d5bcc0b103d66e3
+_md5_=7f32a533fb2d851e766453d0282a6c91
diff --git a/metadata/md5-cache/dev-ruby/netrc-0.11.0-r2 b/metadata/md5-cache/dev-ruby/netrc-0.11.0-r2
index 6e7b8f97b7bf..96fd6e134b1b 100644
--- a/metadata/md5-cache/dev-ruby/netrc-0.11.0-r2
+++ b/metadata/md5-cache/dev-ruby/netrc-0.11.0-r2
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/heroku/netrc
 INHERIT=ruby-fakegem
 IUSE=ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 doc test test
-KEYWORDS=amd64 ~arm ~arm64 ~ppc x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ~riscv x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/netrc-0.11.0.gem
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	ruby-fakegem	5f7dd7ffeaf00a781713582bd507f80b	ruby-ng	e7004f981e452d70374b865ccff407aa	ruby-utils	69e7140043885477733c347fee4a981a	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=fb1ef1bcd06124a9384eb98569f1c58d
+_md5_=99375992f30421d7b0a3d6600d5dd3ac
diff --git a/metadata/md5-cache/dev-ruby/oauth-0.6.2-r1 b/metadata/md5-cache/dev-ruby/oauth-0.6.2-r1
index 781b04a53588..fe5f11731f27 100644
--- a/metadata/md5-cache/dev-ruby/oauth-0.6.2-r1
+++ b/metadata/md5-cache/dev-ruby/oauth-0.6.2-r1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/oauth-xx/oauth-ruby
 INHERIT=ruby-fakegem
 IUSE=test ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 doc test test
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=~amd64 ~ppc ~riscv ~x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby30? ( dev-ruby/snaky_hash:1[ruby_targets_ruby30(-)] >=dev-ruby/version_gem-1.1:1[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( dev-ruby/snaky_hash:1[ruby_targets_ruby31(-)] >=dev-ruby/version_gem-1.1:1[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( dev-ruby/snaky_hash:1[ruby_targets_ruby32(-)] >=dev-ruby/version_gem-1.1:1[ruby_targets_ruby32(-)] ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/oauth-xx/oauth-ruby/archive/v0.6.2.tar.gz -> oauth-0.6.2.tar.gz
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	ruby-fakegem	5f7dd7ffeaf00a781713582bd507f80b	ruby-ng	e7004f981e452d70374b865ccff407aa	ruby-utils	69e7140043885477733c347fee4a981a	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=f1596fe1566e5bf0b3011e25a0655f99
+_md5_=bc02106a46d91aba6bd85a1fdceb106c
diff --git a/metadata/md5-cache/dev-ruby/rest-client-2.1.0-r1 b/metadata/md5-cache/dev-ruby/rest-client-2.1.0-r1
index 9d3b6ed61145..831629660000 100644
--- a/metadata/md5-cache/dev-ruby/rest-client-2.1.0-r1
+++ b/metadata/md5-cache/dev-ruby/rest-client-2.1.0-r1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/rest-client/rest-client
 INHERIT=ruby-fakegem
 IUSE=test ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 doc test test
-KEYWORDS=amd64 ~arm64 ~ppc ~x86
+KEYWORDS=amd64 ~arm64 ~ppc ~riscv ~x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby30? ( >=dev-ruby/http-accept-1.7.0:1[ruby_targets_ruby30(-)] >=dev-ruby/http-cookie-1.0.2:0[ruby_targets_ruby30(-)] >=dev-ruby/mime-types-1.16:*[ruby_targets_ruby30(-)] <dev-ruby/mime-types-4:*[ruby_targets_ruby30(-)] >=dev-ruby/netrc-0.8:0[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( >=dev-ruby/http-accept-1.7.0:1[ruby_targets_ruby31(-)] >=dev-ruby/http-cookie-1.0.2:0[ruby_targets_ruby31(-)] >=dev-ruby/mime-types-1.16:*[ruby_targets_ruby31(-)] <dev-ruby/mime-types-4:*[ruby_targets_ruby31(-)] >=dev-ruby/netrc-0.8:0[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( >=dev-ruby/http-accept-1.7.0:1[ruby_targets_ruby32(-)] >=dev-ruby/http-cookie-1.0.2:0[ruby_targets_ruby32(-)] >=dev-ruby/mime-types-1.16:*[ruby_targets_ruby32(-)] <dev-ruby/mime-types-4:*[ruby_targets_ruby32(-)] >=dev-ruby/netrc-0.8:0[ruby_targets_ruby32(-)] ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/rest-client-2.1.0.gem
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	ruby-fakegem	5f7dd7ffeaf00a781713582bd507f80b	ruby-ng	e7004f981e452d70374b865ccff407aa	ruby-utils	69e7140043885477733c347fee4a981a	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=be8bebdc3a7cbc5f1d8fe780bb9dc999
+_md5_=6224e924af31d4fcda40350c008159d1
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index 6de8826279d6..9ef6b81d51a3 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/clippy-8.4.2 b/metadata/md5-cache/dev-util/clippy-9.0
index 7e80e96fced9..24cf4542d840 100644
--- a/metadata/md5-cache/dev-util/clippy-8.4.2
+++ b/metadata/md5-cache/dev-util/clippy-9.0
@@ -12,6 +12,6 @@ RDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_
 REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 )
 RESTRICT=test
 SLOT=0
-SRC_URI=https://github.com/FRRouting/frr/archive/frr-8.4.2.tar.gz -> clippy-8.4.2.tar.gz
+SRC_URI=https://github.com/FRRouting/frr/archive/frr-9.0.tar.gz
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	59e60e9c5cbd3f214d7f1002e798b387	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=e493bab721d11129b0fcaf1992d11b1f
+_md5_=22f9f478be4941954dcbd6a695f7cca3
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index a02ec628a7d2..83b18421f35a 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/sdl2-gfx-1.0.4 b/metadata/md5-cache/media-libs/sdl2-gfx-1.0.4
deleted file mode 100644
index 6a45edf8cbde..000000000000
--- a/metadata/md5-cache/media-libs/sdl2-gfx-1.0.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=media-libs/libsdl2-2.0.1-r1[video,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
-DESCRIPTION=Graphics drawing primitives library for SDL2
-EAPI=6
-HOMEPAGE=http://www.ferzkopp.net/joomla/content/view/19/14/
-INHERIT=autotools multilib-minimal
-IUSE=doc cpu_flags_x86_mmx abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 ~ppc ~ppc64 x86
-LICENSE=ZLIB
-RDEPEND=>=media-libs/libsdl2-2.0.1-r1[video,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-SLOT=0
-SRC_URI=http://www.ferzkopp.net/Software/SDL2_gfx/SDL2_gfx-1.0.4.tar.gz
-_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	eqawarn	c9847c43b3253a276ae2eabddedab3d7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=e42eed793536868dce778810b094f611
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index 60f4324f7187..891d3dea53af 100644
--- a/metadata/md5-cache/net-misc/Manifest.gz
+++ b/metadata/md5-cache/net-misc/Manifest.gz
diff --git a/metadata/md5-cache/net-misc/frr-8.4.2 b/metadata/md5-cache/net-misc/frr-8.4.2
deleted file mode 100644
index bbdc5643cf31..000000000000
--- a/metadata/md5-cache/net-misc/frr-8.4.2
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=~dev-util/clippy-8.4.2 sys-devel/flex app-alternatives/yacc doc? ( dev-python/sphinx ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 virtual/pkgconfig
-DEFINED_PHASES=compile configure install prepare setup
-DEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) acct-user/frr dev-libs/json-c:0= >=net-libs/libyang-2.0.0 sys-libs/libcap sys-libs/readline:0= virtual/libcrypt:= grpc? ( net-libs/grpc:= ) nhrp? ( net-dns/c-ares:0= ) pam? ( sys-libs/pam ) rpki? ( >=net-libs/rtrlib-0.8.0[ssh] ) snmp? ( net-analyzer/net-snmp:= ) elibc_musl? ( sys-libs/queue-standalone ) test? ( python_single_target_python3_10? ( dev-python/pytest[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pytest[python_targets_python3_11(-)] ) )
-DESCRIPTION=The FRRouting Protocol Suite
-EAPI=7
-HOMEPAGE=https://frrouting.org/
-INHERIT=autotools pam python-single-r1 systemd
-IUSE=doc fpm grpc ipv6 nhrp ospfapi pam rpki snmp test python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) acct-user/frr dev-libs/json-c:0= >=net-libs/libyang-2.0.0 sys-libs/libcap sys-libs/readline:0= virtual/libcrypt:= grpc? ( net-libs/grpc:= ) nhrp? ( net-dns/c-ares:0= ) pam? ( sys-libs/pam ) rpki? ( >=net-libs/rtrlib-0.8.0[ssh] ) snmp? ( net-analyzer/net-snmp:= ) python_single_target_python3_10? ( dev-python/ipaddr[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/ipaddr[python_targets_python3_11(-)] ) !net-misc/quagga
-REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/FRRouting/frr/archive/frr-8.4.2.tar.gz
-_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pam	b56d0c9c20fc5b553f13c8ae165a10a5	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	59e60e9c5cbd3f214d7f1002e798b387	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=cb519d1fd5153e342c493f29a4783370
diff --git a/metadata/md5-cache/net-misc/frr-9.0 b/metadata/md5-cache/net-misc/frr-9.0
new file mode 100644
index 000000000000..0a805e56fdec
--- /dev/null
+++ b/metadata/md5-cache/net-misc/frr-9.0
@@ -0,0 +1,17 @@
+BDEPEND=~dev-util/clippy-9.0 sys-devel/flex app-alternatives/yacc doc? ( dev-python/sphinx ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 virtual/pkgconfig
+DEFINED_PHASES=compile configure install prepare setup
+DEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) acct-user/frr dev-libs/json-c:0= dev-libs/protobuf-c:0= >=net-libs/libyang-2.0.0 <net-libs/libyang-2.1.111 sys-libs/libcap sys-libs/readline:0= virtual/libcrypt:= grpc? ( net-libs/grpc:= ) nhrp? ( net-dns/c-ares:0= ) pam? ( sys-libs/pam ) rpki? ( >=net-libs/rtrlib-0.8.0[ssh] ) snmp? ( net-analyzer/net-snmp:= ) elibc_musl? ( sys-libs/queue-standalone ) test? ( python_single_target_python3_10? ( dev-python/pytest[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pytest[python_targets_python3_11(-)] ) )
+DESCRIPTION=The FRRouting Protocol Suite
+EAPI=7
+HOMEPAGE=https://frrouting.org/
+INHERIT=autotools pam python-single-r1 systemd
+IUSE=doc fpm grpc ipv6 nhrp ospfapi pam rpki snmp test python_single_target_python3_10 python_single_target_python3_11
+KEYWORDS=amd64 ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) acct-user/frr dev-libs/json-c:0= dev-libs/protobuf-c:0= >=net-libs/libyang-2.0.0 <net-libs/libyang-2.1.111 sys-libs/libcap sys-libs/readline:0= virtual/libcrypt:= grpc? ( net-libs/grpc:= ) nhrp? ( net-dns/c-ares:0= ) pam? ( sys-libs/pam ) rpki? ( >=net-libs/rtrlib-0.8.0[ssh] ) snmp? ( net-analyzer/net-snmp:= ) python_single_target_python3_10? ( dev-python/ipaddr[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/ipaddr[python_targets_python3_11(-)] ) !net-misc/quagga
+REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/FRRouting/frr/archive/frr-9.0.tar.gz
+_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pam	b56d0c9c20fc5b553f13c8ae165a10a5	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	59e60e9c5cbd3f214d7f1002e798b387	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	862d337d98edb576796827be2c6b11ca
+_md5_=9a63a606378f69c29eaf259365bb4bf4
diff --git a/metadata/md5-cache/net-misc/ytmdl-2023.7.27 b/metadata/md5-cache/net-misc/ytmdl-2023.7.27
new file mode 100644
index 000000000000..c2739f84fa6f
--- /dev/null
+++ b/metadata/md5-cache/net-misc/ytmdl-2023.7.27
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.8.0-r1[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Simple app to get songs from youtube in mp3 format
+EAPI=8
+HOMEPAGE=https://ytmdl.deepjyoti30.dev/ https://github.com/deepjyoti30/ytmdl/
+INHERIT=bash-completion-r1 distutils-r1 pypi
+IUSE=python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=net-misc/yt-dlp-2022.3.8.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/PySocks[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/beautifulsoup4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/colorama[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/ffmpeg-python[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/itunespy[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyDes[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-musicbrainzngs[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyxdg[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rich[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/simber[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/spotipy[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/unidecode[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/urllib3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/youtube-search-python[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/ytmusicapi[python_targets_python3_10(-)?,python_targets_python3_11(-)?] media-libs/mutagen[python_targets_python3_10(-)?,python_targets_python3_11(-)?] net-misc/downloader-cli[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/y/ytmdl/ytmdl-2023.7.27.tar.gz
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	a93df67775ff86e107e56c6a6e68cf4e	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	59e60e9c5cbd3f214d7f1002e798b387	toolchain-funcs	862d337d98edb576796827be2c6b11ca
+_md5_=44ee7f91e8628e014804de35a67db649
diff --git a/metadata/md5-cache/sys-boot/Manifest.gz b/metadata/md5-cache/sys-boot/Manifest.gz
index a7db99509118..c86ab7fed365 100644
--- a/metadata/md5-cache/sys-boot/Manifest.gz
+++ b/metadata/md5-cache/sys-boot/Manifest.gz
diff --git a/metadata/md5-cache/sys-boot/refind-0.14.0.2 b/metadata/md5-cache/sys-boot/refind-0.14.0.2
new file mode 100644
index 000000000000..e8473feb742e
--- /dev/null
+++ b/metadata/md5-cache/sys-boot/refind-0.14.0.2
@@ -0,0 +1,14 @@
+BDEPEND=secureboot? ( app-crypt/sbsigntools )
+DEFINED_PHASES=compile install postinst prepare pretend setup
+DEPEND=sys-boot/gnu-efi
+DESCRIPTION=The UEFI Boot Manager by Rod Smith
+EAPI=8
+HOMEPAGE=https://www.rodsbooks.com/refind/
+INHERIT=toolchain-funcs secureboot
+IUSE=btrfs +ext2 +ext4 hfs +iso9660 ntfs reiserfs custom-cflags doc secureboot
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD GPL-2 GPL-3 FDL-1.3
+SLOT=0
+SRC_URI=mirror://sourceforge/project/refind/0.14.0.2/refind-src-0.14.0.2.tar.gz
+_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	secureboot	4548d1753e1d9b2313836e4e517cef82	toolchain-funcs	862d337d98edb576796827be2c6b11ca
+_md5_=40ceb06fbf771cb8761f96af1413a89f
diff --git a/metadata/md5-cache/sys-power/Manifest.gz b/metadata/md5-cache/sys-power/Manifest.gz
index cbc5c91c77c3..4737f11052ee 100644
--- a/metadata/md5-cache/sys-power/Manifest.gz
+++ b/metadata/md5-cache/sys-power/Manifest.gz
diff --git a/metadata/md5-cache/sys-power/thermald-2.5.4 b/metadata/md5-cache/sys-power/thermald-2.5.4
new file mode 100644
index 000000000000..0e1431176d2e
--- /dev/null
+++ b/metadata/md5-cache/sys-power/thermald-2.5.4
@@ -0,0 +1,14 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 virtual/pkgconfig
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-libs/dbus-glib:= dev-libs/glib:= dev-libs/libxml2:= dev-libs/libevdev sys-power/upower sys-apps/dbus:= dev-util/gtk-doc dev-util/glib-utils
+DESCRIPTION=Thermal daemon for Intel architectures
+EAPI=8
+HOMEPAGE=https://github.com/intel/thermal_daemon
+INHERIT=autotools linux-info out-of-source systemd
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=dev-libs/dbus-glib:= dev-libs/glib:= dev-libs/libxml2:= dev-libs/libevdev sys-power/upower sys-apps/dbus:=
+SLOT=0
+SRC_URI=https://github.com/intel/thermal_daemon/archive/v2.5.4.tar.gz -> thermald-2.5.4.tar.gz
+_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multilib	c19072c3cd7ac5cb21de013f7e9832e0	out-of-source	15ce2b6ae214f3abe70892ce1e517abd	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	862d337d98edb576796827be2c6b11ca
+_md5_=e2d28314bb0d80bd60e9875afb1e855a
diff --git a/metadata/md5-cache/x11-misc/Manifest.gz b/metadata/md5-cache/x11-misc/Manifest.gz
index 81439b691b1f..984c662f68a0 100644
--- a/metadata/md5-cache/x11-misc/Manifest.gz
+++ b/metadata/md5-cache/x11-misc/Manifest.gz
diff --git a/metadata/md5-cache/x11-misc/obconf-qt-0.16.3 b/metadata/md5-cache/x11-misc/obconf-qt-0.16.3
new file mode 100644
index 000000000000..1688fb935b63
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/obconf-qt-0.16.3
@@ -0,0 +1,14 @@
+BDEPEND=dev-qt/linguist-tools:5 >=dev-util/lxqt-build-tools-0.8.0 virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=dev-libs/glib:2 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libX11 x11-wm/openbox:3
+DESCRIPTION=Qt GUI Openbox Configuration Tool
+EAPI=8
+HOMEPAGE=https://lxqt.github.io/
+INHERIT=cmake xdg-utils
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
+LICENSE=GPL-2 GPL-2+
+RDEPEND=dev-libs/glib:2 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libX11 x11-wm/openbox:3
+SLOT=0
+SRC_URI=https://github.com/lxqt/obconf-qt/releases/download/0.16.3/obconf-qt-0.16.3.tar.xz
+_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=41072ffc3b16c869dd834563beccf394
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index 51ca27dc7044..af36f9614002 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-08-27T08:09:58Z
+TIMESTAMP 2023-08-27T14:10:00Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmTrBNZfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmTrWTlfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klB+/xAAlYXQbHWg6+HbLbRjXYVTRLQd8w9lUQqDGs8XFC2bq0BZaKgSEjTQD3OU
-VenNt4St0svoGI3tto7KmqRVQIQ5G8NTjEeV10TJlka+WuT9/8EqO2NyC4sqrIYp
-+a9BA0H5fZ1qSgRiMINromLEwicq3/GSVdN0OMp5R78Z4UJhm3OlXbPyYIEEsUcC
-1t74iw8dIH5GQfj0IibGCnOhUYVV1gRd6R55USOPM2nQRFruK8TD6EGNUtSymmo7
-VyjFVbA8kX7SvylERw4/DCQB/M3mhvTKDMV6VLw30jy1VPikyyCg4McfQP1dV/sg
-aCpi/4NxH97RHmuOqz578xKRBW3Ykxto1My3+ED6vCj51VgrsVtvtlzavYawTpgd
-mLBYWdW9Ru8mQ5W+XHiHaOPJ8PmbGqL5B9Sc63M7speWNNSXx84n+7joLdrpR8xC
-Ovf1DaisTtgXtlrqQfkpuelcpv57rrlXn1VJ9UHPLg25ppfg6sA3jmCYMa4MVu0l
-80JEbo+stP7I54dMDct6AszemMa0ESUXBWRfqrmKtDkFDfxuGIjL5aQN1SmhuZ4A
-2ut1XM879SIGhpIFSG2fhWtwKyFbiidV5Ys0ADIM7WryzmjTrm0R0f46PmBCrjwI
-ZpdPGlK3qHt+MgdpkoJ8TLWta8n/iirlW/mglq5icwrjRTByT8k=
-=eM0R
+klD/bQ/7B8CnSKdLJNKbgkM38uiV7AXmTtM2bTeS9jhKOe2xC5ZWlK8wQHR4xad8
+ru4MLkpKe81r/5/D24rDgWqPBVIwfCrTl+bia8SQhn+fmOnM/jaV6YNTFWkKrn0l
+hPqsB2IgudueNu9Q6RSa3bOLHsNtAkaNoITuVViZh1sJnsyKSNZDyVbu1BmkITvG
+2gggXhTx2wkPetMkPcZ3T0V+TSChGWto6dCJBkh7jA5f8HWUe9JkxpLhE2K6KY30
+OLFNy3c5/Ag/xfhsaROEEKRsCCJcIj3j8rC/lvloGuvjKA4mu+yYbdsZsC4qN9Lc
+j2simeZSnvpCKq397CU37RydnKqD00AxVvDa4OKRgpUVPwdVT/f+tGswIemLFCz7
+VZC1qorhEj+tY78Fc28byQPuuD5CM7Pek3bqwBIOKeK/Dm4txuU+iwuk3Py5o5pS
+vuAtAQ8wMVIpGP9f4PEDeOYd2f/8RsKzUFtYvIbC7qyIvDyJ5TmvyW/9xuHB1VPh
+nwiltsKtUpzlVIklxnI1XuzO0l7Qh6b5BZaCltBKPxwGeCF/YnGnxzkdaEjHU8r/
+wOKLXXjFp/D+6GofGcdqdYt1E6Hhy2AD/OZiAunzjNS1mLMOACl3eaIXkjz9dWv6
+v5L3pXKD7j+9xSl74UQeRtGk6vVu6BsLF0hFcbg96jLGwjMd2m8=
+=P/MF
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index de306912d6bb..52c99069024a 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Sun, 27 Aug 2023 08:09:51 +0000
+Sun, 27 Aug 2023 14:09:58 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 73d7badce9aa..83d138e390f6 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Sun Aug 27 08:09:51 AM UTC 2023
+Sun Aug 27 02:09:57 PM UTC 2023
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 2da340256d8e..094a3e8b1f9f 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Sun, 27 Aug 2023 08:15:01 +0000
+Sun, 27 Aug 2023 14:15:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 1ca81201c562..6c03fed7d63d 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-df05489ecb35efc2072e98aad9be044ece79b388 1693120735 2023-08-27T07:18:55+00:00
+147d15c2d13d14d939dfcd6e0798b102fda3cc8e 1693141784 2023-08-27T13:09:44+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index dd99f5be0093..c67a410a7c0b 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1693123801 Sun 27 Aug 2023 08:10:01 AM UTC
+1693145401 Sun 27 Aug 2023 02:10:01 PM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index de306912d6bb..820e5062d9aa 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Sun, 27 Aug 2023 08:09:51 +0000
+Sun, 27 Aug 2023 14:09:57 +0000
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 54cf83e9e5d7..ee0fc39c8c13 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/frr/Manifest b/net-misc/frr/Manifest
index 9d5c72507ebd..53891a71d1a7 100644
--- a/net-misc/frr/Manifest
+++ b/net-misc/frr/Manifest
@@ -1,13 +1,12 @@
 AUX frr-7.5-ipctl-forwarding.patch 731 BLAKE2B 9c97d7fdc7b7facb59a73f4b693c285ebd91cb0ba8f7fea0ef49d5eddd8660100315ca7d74ece8d553cdd8ad79a9a0b1a4c173c6dedf90e0be2bdc72d948b2be SHA512 56bdeb8a1f350fea3ad8ed0cdba28964b00384878853e584746d8ce80c6f9ea5ca5adc4539e314f7fd82203c08d5f2ce6adeec61dac9a7a28282131d0d371447
 AUX frr-8.4.1-logrotate.patch 2487 BLAKE2B f3eb9b9ce25dd9dd796668ecef5dfeb51b5f3ea3428ef4c03bd78becaf26deb5cb59aa56918fdc3c0230a8905d7edf4a12582ab4e6f7d297e3c94c62b7468b0c SHA512 8658dd1280d201d9f3a7f8caa6c5bf513133a3928ba97334202b0fed84dc03f12c82d76cbb8aeae3f363024d2373161c9bda74e1d9a27a085071c524c9941ad0
-AUX frr-8.4.2-musl-gcc12.patch 525 BLAKE2B 8aa00d5a41445e6a035e77481bf6dc3cf45380d7fe91e0d884cc32a19f3594d8822376837d87988803950ca3bb90914a387767b9d766bfb8784567c989e1160e SHA512 1d3ebc40533037aad992d64f207ecc6ebbe599bedfa3f83cd0e4820e3579daea50ffcc8376bc24154ce0fe1cac9002de6e43665f8addfdf38554e82fd502e8fe
 AUX frr-openrc-v1 7078 BLAKE2B d5c0276540fa09318f6e92575dd7e03f3bc6ebfce186d062c2d65fa49c502b3b4de0fd32914ce7c4708bb6f6188296f75d387e0384c142381bb77cfb706c7e1c SHA512 8e6f0e58863402f0169b8a7625d049bf85db60bebe40a42dfb450a1bddfcd6f8f436002de6c1ff599c8f848e4ba85a70e4058cb55a9a49fafb1e69a8e7eb9f57
 AUX frr-openrc-v2 7079 BLAKE2B abbad56f0715b79ba5ba24df373ccb8ab63caa12b04d892693b060c771d47323fd7fcebd9b5688720d4aded23fcb79a36e89a7734b315b0862d16e5ce08d8b10 SHA512 5744c433fd983a56abb8f45e34229b3ab3a03c3e9d5532e2b30a31f3e875076fb56b81a06e661dba7df9f76e463190e831c82ae79deefe1add22d7f0365098ce
 AUX frr.pam 969 BLAKE2B 227dc91f51fab504229fa5489486fed1aa393d33c024849724ea3fb934e3fd78ee6c9147240133d458ec52021f13e8a27a2d8a0b4625415007c4595222b815ee SHA512 9a169d58232eba7481aee83d92b4e104b6c4ca95e5b31befe29117fbcebc187ad87c061f37ec7c571ff5702101a329ae0c113cf714e2d0dcd39ca4212734a9ed
-DIST frr-8.4.2.tar.gz 9893223 BLAKE2B 670fb131c2959b0ce4f3133ef38caeb7832275844b16f8582a693033f5466ad0eb98ab45ed9615e0a121ab80bf034edafe7ee816c47d767bd8a13b52f3138eac SHA512 1ee9d17ef3b85c5c10df624a6560bcacb2b5daa3d6231e457f06d9eb6e5ccf375064a46e809d851c23cb6daf7a4299d1f25be589992ef729e80f9bad41a8d7f7
 DIST frr-8.5.2.tar.gz 10076639 BLAKE2B 2e2aca4e42757f66c9ca4725826c6cc1d611930490eed2a175ca5b56910f2c09a9d842b2a9370a64a9fdac6a6314bd4573be609d14dbf956049d9fbf49310404 SHA512 1afa6ca1a41096aa47dc2fc39ab87290b3cbf634a1632e7910a5b69d2816998fbccbca616f261a410aa146a21dd26d12b7e6812da4ec08545b1500f8b546b972
 DIST frr-8.5.tar.gz 10068379 BLAKE2B ed7aa538997bdbfde0370f36a8980ad3ae882a2325cdc7c3b2bdba9d6a43cd9ca04ff96b94b7827e06593a15c104cdadbd2632e136eb2d68e7ed87095a9294a4 SHA512 13e2ea8642fc00b565e9a36d2d59abe5d0e11caf646199cd928184fda2de004bda9892ae8a2f91870d5ac218bb127725663b693e4d764e5b21c942bb20b8d66f
-EBUILD frr-8.4.2.ebuild 3570 BLAKE2B b6ef8c95358d86b9f718431a973ec5ada292987acb3320d6cd1b246499f796605f93fe049f86edd41efcca9b35c220de374fe4e4d00b4908c5709caef7abec4d SHA512 db52208f81b22a3848b81042b9fcaa6740270816e7049c74bee6f83cce7a4020fdf9a80d46c899ace646b64eb3e448abb5f8f19ce3be6fff033562d404dd0f78
+DIST frr-9.0.tar.gz 10332694 BLAKE2B 82221df6da189d5e687af4618af71933eb512413126dfb312bfcc663e5fc6f85e29c33da84117f40598452e6033cb24e9cba8d28f00d63fee2bf45a43babef17 SHA512 d3af6c24abbc8745f9646a22c023bd1d0e155776ffd09c9dd0b81b93c383723c9e7dd987319551db85dab5fd45d47cbcbf47a1ae1b6861cd7930bc27f18d2e25
 EBUILD frr-8.5.2-r1.ebuild 3548 BLAKE2B 9372c8734217d6da8c6c671c816084c6b57d23584ce8c397594235937692336c306ffc35512a58e8ade7ff44cc20b490c9fae3b4c32533425e7b39cf6a9d7232 SHA512 e600c591558467b931c3edbaf9c892ed4f061b6e2816e455aba5ed2348a84a4c97990afb85677d37cbf6764c56d331e48cb799d97006c5c064088d66e40b7d08
 EBUILD frr-8.5.ebuild 3526 BLAKE2B 2210b996097b1407b908468386dc884ace2ba0ca80b1d10784ced7b0e7279052b2d7bf3d4920a01528f92674034c8666dfc4f4ec5f44b1045e3c86e858fd6bac SHA512 f01080a8bc3dc26b230ad76aea48160978d59098f1fc98c370aa5c7aa52594a7ab4fdfe3337107bc9e5964e5c9414056b40c2fd4c3b67a8359c5a0928d7801db
+EBUILD frr-9.0.ebuild 3577 BLAKE2B fc15ec8b2569f344ed86fea710d093247bb78d4b20479bb476e6b6b8468c5d544acde6112726419baf10d718274535f03b4eee263209b9100a84e77635113bc9 SHA512 31be4d68fc7e88d425614e3fe4b240bab05a3c55da8cbc3aff045428130f804689f14ab80b97d8e72e5bb9339c10d2c7ec11252ffa61786f41323af91d9bbbd7
 MISC metadata.xml 1109 BLAKE2B dca4e56f03e8e8f5ea21770d0e9b7ec96178558396b39a6d8a1ed887f9058abdda07e3a7b750c408e7227e44f71e174d50681cf29343f5c30b481eaf2cd45077 SHA512 37b3354880d810b34493b13e788c668fa64bc3f36350aa7465273bba26f1a68348dc7803a8c6528129aa86b028c992d4246411749e36b194e83800224ff23462
diff --git a/net-misc/frr/files/frr-8.4.2-musl-gcc12.patch b/net-misc/frr/files/frr-8.4.2-musl-gcc12.patch
deleted file mode 100644
index 3c9374aefd6d..000000000000
--- a/net-misc/frr/files/frr-8.4.2-musl-gcc12.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-https://github.com/FRRouting/frr/pull/12741
-
-From def86a45a473a45bf8ac39ac4b82be3d09ae9cae Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Sat, 4 Feb 2023 23:29:59 +0000
-Subject: [PATCH] pceplib: add <time.h> include for time_t
-
-Fixes build on musl. Used for time_t in the header.
-
-Bug: https://bugs.gentoo.org/862558
---- a/pceplib/pcep_utils_counters.h
-+++ b/pceplib/pcep_utils_counters.h
-@@ -30,6 +30,7 @@
- 
- #include <stdbool.h>
- #include <stdint.h>
-+#include <time.h>
- 
- #ifdef __cplusplus
- extern "C" {
-
diff --git a/net-misc/frr/frr-8.4.2.ebuild b/net-misc/frr/frr-9.0.ebuild
index b0ae3ed58713..73df8c4dd6f6 100644
--- a/net-misc/frr/frr-8.4.2.ebuild
+++ b/net-misc/frr/frr-9.0.ebuild
@@ -23,7 +23,9 @@ COMMON_DEPEND="
 	${PYTHON_DEPS}
 	acct-user/frr
 	dev-libs/json-c:0=
+	dev-libs/protobuf-c:0=
 	>=net-libs/libyang-2.0.0
+	<net-libs/libyang-2.1.111
 	sys-libs/libcap
 	sys-libs/readline:0=
 	virtual/libcrypt:=
@@ -53,7 +55,6 @@ RDEPEND="
 PATCHES=(
 	"${FILESDIR}"/${PN}-7.5-ipctl-forwarding.patch
 	"${FILESDIR}"/${PN}-8.4.1-logrotate.patch
-	"${FILESDIR}"/${PN}-8.4.2-musl-gcc12.patch
 )
 
 src_prepare() {
@@ -143,7 +144,7 @@ src_install() {
 
 	# Install init scripts
 	systemd_dounit tools/frr.service
-	newinitd "${FILESDIR}"/frr-openrc-v1 frr
+	newinitd "${FILESDIR}"/frr-openrc-v2 frr
 
 	# Conflict files, installed by net-libs/libsmi, bug #758383
 	rm "${ED}"/usr/share/yang/ietf-interfaces.yang || die
diff --git a/net-misc/ytmdl/Manifest b/net-misc/ytmdl/Manifest
index e2f8f838d46d..e645b76b6b50 100644
--- a/net-misc/ytmdl/Manifest
+++ b/net-misc/ytmdl/Manifest
@@ -1,3 +1,5 @@
 DIST ytmdl-2023.2.28.tar.gz 52281 BLAKE2B 5a9dfea6022082b976fb165ca45cb4ae13adac9308cb5671b52bd433eed4b2921bad345c3acaa10f125d06162964c55b82c44468e3d12b52c47ea63d2d1bce71 SHA512 891119c0386bd2079108b9b34f41606c2a6da21de5f574a89b95d6cb5a661611e442ffc10f6f4d94d827318568408ff8d5b58eb3eb602e64afa4efa3728b3855
+DIST ytmdl-2023.7.27.tar.gz 53737 BLAKE2B 8f01a8cd9b666904fe29871f5f595bae8dd0d29741c5e7c77886d0444a9b23fbf99e1c0efdadb3a62fa0c37425271724327ad655bd2bfb9a53b81a3cf4705289 SHA512 b300590f1aae0378c3672df24b766c6729b034711f83102881f0bd81d7d383825f3187c6f28611c38ad634542b8eb4bbe2c4fcb8a946b7eef9be492a3bfee927
 EBUILD ytmdl-2023.2.28.ebuild 1245 BLAKE2B 6a5a3f93767d8fe06d844243aeed742859b05d36e6fb34f4f9b3785d9168248ebfef07fd3ba1482863d7c6556464a39da5b4c1ee2342494d094b511322c1cfea SHA512 ca34a5fbdf8e2f967571a3e83b6f0e73a06c9930f1d11b84e349ac9d5fd537ae42a7aeadb6d3476136342085582b5344fd8b2ce3807d06221ff88256f4a004a2
+EBUILD ytmdl-2023.7.27.ebuild 1285 BLAKE2B 4f66ff47ac18acc842568785995eee1440017bdf356cf218fba815415cb655e0c1402829387e3f9e59144f0473cb74a454d010a9d2ea6fc3dad0cf77cc017b7c SHA512 d20b1ea5bd6dfc077cc22d66f3afdfd8b9f24fe0122036424f11db7b1dfa517c8581b386343a38fffc43380e2e835ad6f2a3ec70d5ea05df455185b56561b1ec
 MISC metadata.xml 450 BLAKE2B 9901cfebf346a8874315680cdef3ff19d49a84a812358aa122b99645ccde78f8c3b3ea42b1d16bdfcf9f670a694ebcbd9ce50cbcaefcef11c97eeee85264b442 SHA512 32a761ea39aaf5654523a09bfd5bfc6f4052cd35248439bb46175409085cb13b5fbb0097269785ae11df5701fa785ee564d756af5b00b4ab8112cdf3381f45e3
diff --git a/net-misc/ytmdl/ytmdl-2023.7.27.ebuild b/net-misc/ytmdl/ytmdl-2023.7.27.ebuild
new file mode 100644
index 000000000000..2f403c684fdf
--- /dev/null
+++ b/net-misc/ytmdl/ytmdl-2023.7.27.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit bash-completion-r1 distutils-r1 pypi
+
+DESCRIPTION="Simple app to get songs from youtube in mp3 format"
+HOMEPAGE="https://ytmdl.deepjyoti30.dev/
+	https://github.com/deepjyoti30/ytmdl/"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=net-misc/yt-dlp-2022.3.8.2[${PYTHON_USEDEP}]
+	dev-python/PySocks[${PYTHON_USEDEP}]
+	dev-python/beautifulsoup4[${PYTHON_USEDEP}]
+	dev-python/colorama[${PYTHON_USEDEP}]
+	dev-python/ffmpeg-python[${PYTHON_USEDEP}]
+	dev-python/itunespy[${PYTHON_USEDEP}]
+	dev-python/pyDes[${PYTHON_USEDEP}]
+	dev-python/python-musicbrainzngs[${PYTHON_USEDEP}]
+	dev-python/pyxdg[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/rich[${PYTHON_USEDEP}]
+	dev-python/simber[${PYTHON_USEDEP}]
+	dev-python/spotipy[${PYTHON_USEDEP}]
+	dev-python/unidecode[${PYTHON_USEDEP}]
+	dev-python/urllib3[${PYTHON_USEDEP}]
+	dev-python/youtube-search-python[${PYTHON_USEDEP}]
+	dev-python/ytmusicapi[${PYTHON_USEDEP}]
+	media-libs/mutagen[${PYTHON_USEDEP}]
+	net-misc/downloader-cli[${PYTHON_USEDEP}]
+"
+
+src_install() {
+	distutils-r1_src_install
+	newbashcomp ${PN}.bash ${PN}
+}
diff --git a/sys-boot/Manifest.gz b/sys-boot/Manifest.gz
index c177c474bec2..1cd219eac53d 100644
--- a/sys-boot/Manifest.gz
+++ b/sys-boot/Manifest.gz
diff --git a/sys-boot/refind/Manifest b/sys-boot/refind/Manifest
index a70f6eaf176c..970d2ef64623 100644
--- a/sys-boot/refind/Manifest
+++ b/sys-boot/refind/Manifest
@@ -1,6 +1,9 @@
 AUX refind-0.13.2-gnuefi-3.0.14.patch 2031 BLAKE2B f70d92f26eab16baaa58ffeee1294eae5833243c26ca4b22f69d41d03fcab0a11b820de6e63c3b43171e16cd5b03688b9056ecddbb89305b0d9ce69a0abca02a SHA512 9bf3fe0413fc8d9a6a3878f786cc477127fb83e8abc306c91ea26437816e662ff46d0af363296d47596e1af82b3570b070c863d57a292941da41ca31a58dca0a
+AUX refind-sbat-gentoo-0.14.0.2.csv 246 BLAKE2B 8a16eb928f587aaaa680098c660de4e0930a6cc3b5719eb5085f843933c7e3863e8ff0517a596574ffff7bc2d8a2f89f1fa3606c7c618e9ff303edac5f0f5673 SHA512 b8e1a49ed408c6e57f4c8c5a012857b6a5024463eeba33070665dcf95f310cf30d62e2767409ad19d3a41b6ab346804bc7f5d34b92d2dd35aa44406df016bb91
 DIST refind-src-0.13.2.tar.gz 4554759 BLAKE2B 2c3b1daf5fa100dcd4e1c801aa625e269ae9c1a99b567a271d7cdd30f95fa1e041e22984623b9a0e61f8af45966919f4b9f3a5b6c2026271d1bc37c6925f1e70 SHA512 e671d44385297295c143824dd95593f2e7bc8e282745d127b041a645aa27003467a3a23f368fd30297f33faa06bd914540d7bdc3c71ec42f6b7a38d7ee8e0ddb
 DIST refind-src-0.13.3.1.tar.gz 4550242 BLAKE2B ab8dd27f82954ea6f9831f827550f27b5ca426b7783e918311ba7e178fc3509698a0107f61d0394a7893318528cb3e0c8491f4522de0a4aca6a40e0749f5a6f9 SHA512 7966df5dd8dc66cc49a329ed722a567672da8e2fa3f2334d53db65357cea17cba5a4dc5459e358de1079a938da3c63dc626d096ce28b6bf1fa2964be7359dbd1
+DIST refind-src-0.14.0.2.tar.gz 4648958 BLAKE2B 02019ddb872ce44d2a2119902edebd633f925d49634e3bcc6bfb2c9dedb8ce213166909395a333d3a37e95c67720e31b1f5fcf25083801c17d645372aa54a06a SHA512 41c120c1afec37c508aa5c0ec09a6563c3047ef84932308c91701795b950431dfad17d25cf664039b490a302d475add98441b75f90ff71cadce41febedc68a9e
 EBUILD refind-0.13.2.ebuild 3732 BLAKE2B d1b19ff08c3d8a414fd605daeaca564e92f0ba3efd9180dc7e960eecabcfaf4f0fb2144d6603be97e486601b1c330129e92523ce1a41b5ca183d19c505d82495 SHA512 281213176e580222e11e33559dfb5002d9ce2de45674cd193f489f3ecdc9632abb52a05e06c07b4a1a06c8d15ff720b08e1fa382f1a58305b773a655fa53ef84
 EBUILD refind-0.13.3.1.ebuild 3732 BLAKE2B f2c79de6359ae53cbfe0ac186de6c981f2cb9b1b7fb38cd2089311f848a3b57242f0ded54aa628669c2087f3347c7c6097375aefde24e244213d90aacecc8e5d SHA512 656542681fbf69dfe70e2679ce5155aa1015ee0a7feb12b85b275245b4e89b67ffaaa5e4f3c3a644c6d380f72808fd8aebc280305b3caf444d472a0f310814c1
-MISC metadata.xml 3700 BLAKE2B a09550c178969a92b11ef722b092c418f75b3d48d53b1a4395a0c350703ff0ee0d85f2c32e4895bee9a15fefc4b43dc0e1e107a3693a1e88a3866536581a75ee SHA512 4caab08d933f006512ff2f3d98094d26c7f3b00b1141f3e1f2882de2997c0138d4a2e250e933d253fbd68b4713bdfca289216fd270401566ea3717d3fc150409
+EBUILD refind-0.14.0.2.ebuild 3851 BLAKE2B a2366f038aa68238afe6bcefbea0877e8691edcfa2130f696489d03b6c48bea26cb8499c30ff94cd1e53bff07703e4403c72afec680b0431837768d5b7ac2bbd SHA512 37566f4179fd247938ce7abf7e3b353fb993e771b362f8eab573b61743a3ce3310bab981a66a5fb91edb8e9ad860a3c1c0f0d907e713634d95ca4706a65f5aba
+MISC metadata.xml 3809 BLAKE2B bd1404862d130b7b8c78d4959ae740f5702b412a2c1111dcaa6c3e4bc6eeb7beb6de4816fb66bf07d1618574383089bf898151cdd5a9be037d8159fc36cfcd74 SHA512 47e4a5a1961048985e5f8d71aabb7ae4249fbfa565a66bf9e4ad7356e9e3a6564a40440f41b991dc9e496f91688e08c309b7ba2b70c0ea6dc751d37fad017ccf
diff --git a/sys-boot/refind/files/refind-sbat-gentoo-0.14.0.2.csv b/sys-boot/refind/files/refind-sbat-gentoo-0.14.0.2.csv
new file mode 100644
index 000000000000..1062bd271dd1
--- /dev/null
+++ b/sys-boot/refind/files/refind-sbat-gentoo-0.14.0.2.csv
@@ -0,0 +1,3 @@
+sbat,1,SBAT Version,sbat,1,https://github.com/rhboot/shim/blob/main/SBAT.md
+refind,1,Roderick W. Smith,refind,0.14.0,https://www.rodsbooks.com/refind
+refind.gentoo,1,Gentoo Linux,refind,0.14.0,https://packages.gentoo.org/packages/sys-boot/refind
diff --git a/sys-boot/refind/metadata.xml b/sys-boot/refind/metadata.xml
index c4b2438447a5..7a3d471b5fed 100644
--- a/sys-boot/refind/metadata.xml
+++ b/sys-boot/refind/metadata.xml
@@ -5,6 +5,10 @@
 		<email>sveyret@gmail.com</email>
 		<name>Stéphane Veyret</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>ceamac@gentoo.org</email>
+		<name>Viorel Munteanu</name>
+	</maintainer>
 	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
diff --git a/sys-boot/refind/refind-0.14.0.2.ebuild b/sys-boot/refind/refind-0.14.0.2.ebuild
new file mode 100644
index 000000000000..3193d0592d07
--- /dev/null
+++ b/sys-boot/refind/refind-0.14.0.2.ebuild
@@ -0,0 +1,146 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs secureboot
+
+DESCRIPTION="The UEFI Boot Manager by Rod Smith"
+HOMEPAGE="https://www.rodsbooks.com/refind/"
+SRC_URI="mirror://sourceforge/project/${PN}/${PV}/${PN}-src-${PV}.tar.gz"
+
+LICENSE="BSD GPL-2 GPL-3 FDL-1.3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+FS_USE="btrfs +ext2 +ext4 hfs +iso9660 ntfs reiserfs"
+IUSE="${FS_USE} custom-cflags doc"
+
+DEPEND="sys-boot/gnu-efi"
+
+DOCS=( README.txt )
+
+pkg_pretend() {
+	if use custom-cflags; then
+		ewarn
+		ewarn "You have enabled building with USE=custom-cflags. Be aware that"
+		ewarn "using this can result in EFI binaries that fail to run and may"
+		ewarn "fail to build at all. This is strongly advised against by upstream."
+		ewarn
+		ewarn "See https://bugs.gentoo.org/598587#c3 for more information"
+		ewarn
+	fi
+}
+
+pkg_setup() {
+	if use x86; then
+		export EFIARCH=ia32
+		export BUILDARCH=ia32
+	elif use amd64; then
+		export EFIARCH=x64
+		export BUILDARCH=x86_64
+	fi
+	secureboot_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# bug 598647 - PIE not supported
+	sed -e '/^CFLAGS/s/$/ -fno-PIE/' -i Make.common || die
+	sed -e '1 i\.NOTPARALLEL:' -i filesystems/Makefile || die
+
+	cp "${FILESDIR}"/refind-sbat-gentoo-${PV}.csv refind-sbat-gentoo.csv || die
+}
+
+src_compile() {
+	# Update fs targets depending on uses
+	local fs fs_names=()
+	for fs in ${FS_USE}; do
+		fs=${fs#+}
+		if use "${fs}"; then
+			fs_names+=(${fs})
+		fi
+	done
+	fs_names=("${fs_names[@]/%/_gnuefi}")
+
+	# Prepare flags
+	local make_flags=(
+		ARCH="${BUILDARCH}"
+		CC="$(tc-getCC)"
+		AS="$(tc-getAS)"
+		LD="$(tc-getLD)"
+		AR="$(tc-getAR)"
+		RANLIB="$(tc-getRANLIB)"
+		OBJCOPY="$(tc-getOBJCOPY)"
+		GNUEFILIB="/usr/$(get_libdir)"
+		EFILIB="/usr/$(get_libdir)"
+		EFICRT0="/usr/$(get_libdir)"
+		FILESYSTEMS="${fs_names[*]}"
+		FILESYSTEMS_GNUEFI="${fs_names[*]}"
+		REFIND_SBAT_CSV=refind-sbat-gentoo.csv
+	)
+	if use custom-cflags; then
+		make_flags=(CFLAGS="${CFLAGS} -fno-tree-loop-distribute-patterns" "${make_flags[@]}")
+	fi
+
+	emake "${make_flags[@]}" all_gnuefi
+}
+
+src_install() {
+	exeinto "/usr/$(get_libdir)/${PN}"
+	doexe refind-install
+	dosym "../$(get_libdir)/${PN}/refind-install" "/usr/sbin/refind-install"
+
+	if use doc; then
+		doman "docs/man/"*
+		DOCS+=(NEWS.txt docs/refind docs/Styles)
+	fi
+	einstalldocs
+
+	insinto "/usr/$(get_libdir)/${PN}/refind"
+	doins "refind/refind_${EFIARCH}.efi"
+	doins "refind.conf-sample"
+	doins -r images icons fonts banners
+
+	if [[ -d "drivers_${EFIARCH}" ]]; then
+		doins -r "drivers_${EFIARCH}"
+	fi
+
+	insinto "/usr/$(get_libdir)/${PN}/refind/tools_${EFIARCH}"
+	doins "gptsync/gptsync_${EFIARCH}.efi"
+
+	insinto "/etc/refind.d"
+	doins -r "keys"
+
+	dosbin "mkrlconf"
+	dosbin "mvrefind"
+	dosbin "refind-mkdefault"
+
+	secureboot_auto_sign --in-place
+}
+
+pkg_postinst() {
+	elog "rEFInd has been built and installed into ${EROOT}/usr/$(get_libdir)/${PN}"
+	elog "You will need to use the command 'refind-install' to install"
+	elog "the binaries into your EFI System Partition"
+	elog ""
+	elog "refind-install requires additional packages to be fully functional:"
+	elog " app-crypt/sbsigntools for binary signing for use with SecureBoot"
+	elog " sys-boot/efibootmgr for writing to NVRAM"
+	elog " sys-apps/gptfdisk for ESP management"
+	elog ""
+	elog "refind-mkdefault requires >=dev-lang/python-3"
+	elog ""
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		elog "A sample configuration can be found at"
+		elog "${EROOT}/usr/$(get_libdir)/${PN}/refind/refind.conf-sample"
+	else
+		if ver_test "${REPLACING_VERSIONS}" -lt "0.12.0"; then
+			ewarn "This new version uses sys-apps/gptfdisk instead of sys-block/parted"
+			ewarn "to manage ESP"
+			ewarn ""
+		fi
+		ewarn "Note that this installation will not update any EFI binaries"
+		ewarn "on your EFI System Partition - this needs to be done manually"
+	fi
+}
diff --git a/sys-power/Manifest.gz b/sys-power/Manifest.gz
index 18624f065d36..1942e3c797b7 100644
--- a/sys-power/Manifest.gz
+++ b/sys-power/Manifest.gz
diff --git a/sys-power/thermald/Manifest b/sys-power/thermald/Manifest
index 05831e74bf3b..e311494c77df 100644
--- a/sys-power/thermald/Manifest
+++ b/sys-power/thermald/Manifest
@@ -1,6 +1,8 @@
 AUX thermald 385 BLAKE2B 3ffb7f013a3c0f7fbffab5386173e157617229c9c0a36bd9e6bec1f7d7892ae6dee314be21d95000b6086d60cd51112e40b057f7e102c5c1d77d09ccb856c56d SHA512 70420ee1d41d20c2c540467865b98bf98d51f7e23b3d4c80a94e06e039dfa6fb931cafab98d2c66c8fd1f35eea4b49c0e2ddc4eea81fb7654f11c977305ca4d6
 DIST thermald-2.5.2.tar.gz 162307 BLAKE2B 884fbfb440a0b5e9d1d12bfd7b9173fd79f68b46c499e341f0afdf3d312e10bcd5956b14de7c4c8c0b4db1bc7b675025e3b108bc27cc3cbf236212d0bd642508 SHA512 50ec8c0afb62805d4a86eff91725c468c9035d4524d5d12c187c8b5bbff5a6e723ead7a32bda1a2964fa8a8a8ae437bc7c05d657ea1ac64e4a3d32e6dc0591e2
 DIST thermald-2.5.3.tar.gz 162876 BLAKE2B bfdd297ff703588433d749bb64d0a0cd803b54192e3ee87449433ba89b726836f4050bbb87b7233fe4519686fdbd9bd23408bbeb6a5c31bfdd8b07aa9b723a47 SHA512 2c46e7e02c6ee375f78c8593765f01ff3be82bda3e90c133a9680bfbe7897a3fff78679e1306ee7d76192d7f164ca0ccbfeafd240c56160cdc9c4167827d5ead
+DIST thermald-2.5.4.tar.gz 179202 BLAKE2B 945466ee90e61b4c59105f6f0d5b011b9cad9a9613ec5ac1f9e8d2ec1d75bc21e1685e7c8f165f5f4f46736d0b862a149b1e1444500d64aa1429d97db85209ac SHA512 7e73e7860ca6df22862db5fad1d8ab75361deac9cb3631da2950b02f366febd78a93c81afe93af396c9be2a809e8be8c764b0d3183b545e051f3ec7b9d9dd078
 EBUILD thermald-2.5.2.ebuild 1289 BLAKE2B 32c00a64951863d30ac38d9c544a94deb48861e7a6beeaf73ec1d520216a9e7cca9f31c5e99b33cb99bc104ae2e48307be3019b6b6da99d51feb599b7368635c SHA512 600d174fb293bfd5dfce9741af20d5d48ec7ebab5ba2f930f2e9b0c6b28225c4f645ff98e564b851e51462ed169259905a367dbbd632fba50cca344b87f211e6
 EBUILD thermald-2.5.3.ebuild 1291 BLAKE2B 2db9c83c0c8c05841c53d9b7f5cdf3db16c3a5140fb4f47ba5e982d1cf5eda93503f8e69ee82e3e16ad06973696eb2b5a8aaf11dbafc9856559e4683811fbeb2 SHA512 6a228c84039856adddea52f6d777e62110940c10b380b9b54dfdfd03d65eab9729a5f81830f4a31c23fa8b65961a04bada59326942304ad7958c4a3365ca5fe0
+EBUILD thermald-2.5.4.ebuild 1241 BLAKE2B dad19a14c6bee077b90558df19ef70e16f1ff6183c06f7847f83c1e18d301b758afc81c2cb7896056ae3b7e7da53f171d03c1ea99f1807533649cb981ce7d94c SHA512 a0a9e5b7863806ef3c3143a8e237119af33207add29ef4df70e6c3ac251ab87a64c8b28211a673ab4ec1518b6f71f7fb5d1e8e51437cd12548c4fa4add3bc365
 MISC metadata.xml 648 BLAKE2B dc9cd4601c2577a6c7df13c8511586e2fdaee12f587cf31b0abd10dc637dbec8bf0a6e17672a935738f8929d5057c8b83a4bccb551b420c5de52b63f395a39f2 SHA512 9c1d353d16359f135b32850fa9fd52023994fe4148258b05564e6bc01b5a1c93aea0588e137aa24c382ad6587e0791d31176b3dcee25970a11a0b8efa01256c3
diff --git a/sys-power/thermald/thermald-2.5.4.ebuild b/sys-power/thermald/thermald-2.5.4.ebuild
new file mode 100644
index 000000000000..2daa0c75f6aa
--- /dev/null
+++ b/sys-power/thermald/thermald-2.5.4.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools linux-info out-of-source systemd
+
+DESCRIPTION="Thermal daemon for Intel architectures"
+HOMEPAGE="https://github.com/intel/thermal_daemon"
+SRC_URI="https://github.com/intel/thermal_daemon/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-libs/dbus-glib:=
+	dev-libs/glib:=
+	dev-libs/libxml2:=
+	dev-libs/libevdev
+	sys-power/upower
+	sys-apps/dbus:="
+DEPEND="${RDEPEND}
+	dev-util/gtk-doc
+	dev-util/glib-utils"
+
+S=${WORKDIR}/thermal_daemon-${PV}
+DOCS=( thermal_daemon_usage.txt README.txt )
+
+CONFIG_CHECK="~PERF_EVENTS_INTEL_RAPL ~X86_INTEL_PSTATE ~INTEL_POWERCLAMP ~INT340X_THERMAL ~ACPI_THERMAL_REL ~INT3406_THERMAL"
+
+src_prepare() {
+	sed -i -e '/tdrundir/s@\$localstatedir/run@\$runstatedir@' \
+		configure.ac || die
+
+	default
+	eautoreconf
+}
+
+my_src_configure() {
+	ECONF_SOURCE="${S}" econf \
+		--disable-werror \
+		--runstatedir="${EPREFIX}"/run \
+		--with-dbus-power-group=wheel \
+		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
+}
+
+my_src_install_all() {
+	einstalldocs
+
+	rm -rf "${ED}"/etc/init || die
+	doinitd "${FILESDIR}"/thermald
+}
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index 48e7aa7606e9..66a731a9b18d 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/obconf-qt/Manifest b/x11-misc/obconf-qt/Manifest
index 34d051abfea3..5be5d4376e37 100644
--- a/x11-misc/obconf-qt/Manifest
+++ b/x11-misc/obconf-qt/Manifest
@@ -1,3 +1,5 @@
 DIST obconf-qt-0.16.2.tar.xz 111080 BLAKE2B 1ea6d4f5afb3e34db288bb1cfeb0c76345704b592230ebbaaff464206b13b9dfde7ff0ae07dd164e1d925e93e51a9a9bd6c571f55b81f3bbfc1537bfa620f521 SHA512 bd91a5669f07471966d296b91d78e2a40e2e3640405de2179513457088eb7d6cb063dbfaff623db6f404985734e986b52c1e3155a050f374b7afa58f7d720c0d
+DIST obconf-qt-0.16.3.tar.xz 116488 BLAKE2B 9c710ee521e014ece480ffe9b5d7f13d9ce6fc8fe164003ec8512261a884fa3e00da4720813a19c0f6bc8879c91e869d47117630b5994fabeecb7ab28888c51c SHA512 617b0b1e7ddd6efaf8f3d771fbddd88ede5fe3daf6a5c5233cffdb2cf44ecc27731c4860f38e156c49953a369f07c93db0a88c48dae83f526461da34066f6c84
 EBUILD obconf-qt-0.16.2.ebuild 884 BLAKE2B edd374cb502c89351f0f966a0b889030bbc4fa099a77cca81a0fb8873d302dde77f821b3cdb36c81503f3e90e7b98e151d0c3ac0897c0c46d5b69814790592e0 SHA512 61c91304c11da022fb1958bbd69466d92ee5f9e6f1533e093a705f177e56db4fe03c24e0de25a9741d4eccd90779049d6a14e29924e1438e1097fc73d908d4fb
+EBUILD obconf-qt-0.16.3.ebuild 887 BLAKE2B 355b22bd3d874b212700256c26632ee459196e1335b1f4c5a2a89d810e5c02b9c61d4be455e3fc2cefe74284968cfb9535c4c91f8db20e3f45fd143c2305cae8 SHA512 1b2e3892bcf51dcd16d49dd89d0862e31aca10ac46b61993406b0172c7b257a248c7276ca4503bb0e83c305eb1077b7038e848336a56667cade973abeb17b032
 MISC metadata.xml 316 BLAKE2B 9b71d1001cc8a66e8da08dc913fb593c581ff9946c5dc84cf451bba57d7f65e2ea5ada3a39af35618cbe6345293e158be54c771e41adff450ca09fdcec1355b6 SHA512 323aa61ec8010f32da3af2debc2684810e82b97816f1e7d11b3a0d8dffd164196f3cec1e56cbb6ed638913a5223354b42ab038a120110c21e9ffc2fb36cd47f5
diff --git a/x11-misc/obconf-qt/obconf-qt-0.16.3.ebuild b/x11-misc/obconf-qt/obconf-qt-0.16.3.ebuild
new file mode 100644
index 000000000000..7c66c3dd88fd
--- /dev/null
+++ b/x11-misc/obconf-qt/obconf-qt-0.16.3.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake xdg-utils
+
+DESCRIPTION="Qt GUI Openbox Configuration Tool"
+HOMEPAGE="https://lxqt.github.io/"
+
+if [[ ${PV} = *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
+else
+	SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+fi
+
+LICENSE="GPL-2 GPL-2+"
+SLOT="0"
+
+BDEPEND="
+	dev-qt/linguist-tools:5
+	>=dev-util/lxqt-build-tools-0.8.0
+	virtual/pkgconfig
+"
+RDEPEND="
+	dev-libs/glib:2
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	x11-libs/libX11
+	x11-wm/openbox:3
+"
+DEPEND="${RDEPEND}"
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}