gentoo auto-resync : 30:08:2022 - 04:47:47

author: V3n3RiX <venerix@koprulu.sector> 2022-08-30 04:47:47 +0100
committer: V3n3RiX <venerix@koprulu.sector> 2022-08-30 04:47:47 +0100
commit: 048bd060badd229e3bb596029874760a86d27060 (patch)
tree: 255c77a2abedb5474cd77d0b3cac24551de7771d
parent: 8993ea73a9714d22178ba6ada8c04be83cd71ec7 (diff)
179 files changed, 1690 insertions, 3606 deletions
diff --git a/Manifest b/Manifest
index 454faa33ea9b..65659881a46c 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29587 BLAKE2B ea233781b1b382912693a5bcf0339b35f223be0be986afeba0d3edde54946543c6e255830055c6adc7375424198e437ff36f75df38fa118a4b7fa115bc5893c4 SHA512 e04d4d3b32fbc61414d5a63668674a6778c05ae1170f9a142627ed92826dc82b6dd737eebb2b6c8f2cde946129921a4aab9b2361d482d242656519aa84886f9b
-TIMESTAMP 2022-08-29T21:09:46Z
+MANIFEST Manifest.files.gz 29602 BLAKE2B 7a098ddd36cedd0ee65ccc6f18fa1327c083fd8e1064c6f57b3b1921e2ec33f3ff3ec14a7eaae61c12eca141c3d95c86b0e2d44017c10a9b1eb60d4064b175a2 SHA512 bc3aaefddb85a100f07da82c16e9c2d5eb48dac5381c7e8ffa286702fadff1d3b363e5a5e448971310e2c9b318084aeef1e450a36a58ce86ae4d77979596e62e
+TIMESTAMP 2022-08-30T03:09:42Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmMNKxpfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmMNf3ZfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBtDhAAjzfSQSYdenWljZLY3RymbINAAqEOoUBAM/vQfvxR4cBwW0wqrUHNRpxT
-m5QPWzo8tQREh07mpVJsUPQaHzPANJR1wi5Ds+QN8C+j9PX+4ddlrnJYId1R6bao
-csOrHzxZw2Ex3I0Yyj2UEARcb/wy9NcUrOGqGAeiKwMtBgpkWFAIBFx8hfQhDAM7
-N2ieolxqadDfkkW6/J7DCpz4rYHd8+lwaO92q372g19K1oQFvRgTMpsmEruBO5M5
-VNlim/OIIAH6xe0wg5HH1m4BRXNdCDuVoQgks1M9f9Gk0Z/SEPJ/Kguuv5jfejhV
-v/RZjXYkd2elzH37PC40H1Vn6T6x0HBMJwOIfTfs1LszoEqR/rSmDsjzHGXkExW+
-BrfatHSxI+AaxuQNRsUGvrzcFzosOR5WM6pPiIX2SGmfmWpgtoQ1sYnNJsYf9IgZ
-CwLCZedd5YvZVXgsDlsSnuF5lZpVOLUfHRvi6QTbsb/Z5JfkqAYv1JGwgRrtPaKN
-LLGdhEy084gf9ol22dff3+fURHwrigvAMxC94n+NuH8K+zShLPPfdfY5QETlh+JW
-wTSj4H5MoGCPOdGmpKDxDOjITZhg1iIFpOxwNNinsz3fDmrsoB8rBIMeP0uA9vtf
-UCjRwLIAfm7PTOYAeiiwuwsDqGdIQMpqtunBxwn8wV1jgW15+v8=
-=gOLA
+klDdoBAAhXuDQlqhTqKD+ipQB4UDfro9768cLj6EUzyabHJZ5Fe/cs8sTx8t22MR
+j2+iTuY4L0vFf/MXHMzZ1+QuaztzLnsFDS25w4upkpx60c8NcNilYXblKe8Nwmek
+YXxOxD6J/yDlVzTE/obv7Qbm+bb4CEuPQgjn2/GP1he3nHk2EXYklT4t/RS95jh9
+D9MwDroLmpgXRAmjOeargjNIbdPlj5A7yVP3q1Lf+nzqqIEfCCVhYcD5fyEljtm6
+yZRakDUillCAiFdanAij6YbbpoZoJ0p6IkHTIUjEhuW7i4Szt2VaaOQ03fS7hWDq
+lZ3uUJTx3sCBKlpvUggfdFDoawMV+gmBragCZw7eXt/NCPCZGDVCcNWLBXjcvpGH
+01opXL3rlE/SZfazS+HyyhbZMSUAT4qZ42N0WEWmpvAPlO5Kz/wCErAvC4mFJAiP
+hevMehknoIuQLlJBacOA1tHjCe6tYmUlhXHxwz+FDE+7Y7ZlhMnAQvbQ+J16qENt
+WUJvnHPrv62FVnaPjgMcya/4JANS1gF/r3pq2UgSYn/RCeCXkuVcUWul5KbIeZXZ
+RU7dtV/5RHvTAEB31onzdZf4GBvfVA+lEu2uXni3Q2C31NlfplmNwzWKfhmMfzOe
+a3kflZN8zZy4dBp9fE37v7BBqacgG6enQpnzM7ewbCI+/jkNf8w=
+=m0d3
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index c0f3bbbed1ad..d44fb84305a7 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-accessibility/Manifest.gz b/app-accessibility/Manifest.gz
index 33a6c00e2794..05a3c7ac33e1 100644
--- a/app-accessibility/Manifest.gz
+++ b/app-accessibility/Manifest.gz
diff --git a/app-accessibility/espeakup/Manifest b/app-accessibility/espeakup/Manifest
index d5fee003ca1d..22402bb23207 100644
--- a/app-accessibility/espeakup/Manifest
+++ b/app-accessibility/espeakup/Manifest
@@ -1,9 +1,6 @@
 AUX espeakup.confd 256 BLAKE2B 1fc5aed1a603d19a7dcddaae05eb00dfe8651993c1f31dfb5a7db0737c24cc75f284dd313b7e1abd2c2841d408f7a719124aac91eb974a5b1e9ae00be4abf6a3 SHA512 aebd97c63dbeae5025bf54f39bb3e7d97822a2b1b369e40b013c5c7da2eba968adf48800f62ef14541ca22ed3f3dfcbdb63b2a3d7f45975ae8bddfea0a42d931
 AUX espeakup.initd 399 BLAKE2B 5fbc9c7f723519493829cd853232f959488dda14f1807344b20b424cc81aa5fda17b3431e8ef760c5011ad1bad78bffa87d861e45b8e008d4972ceb2087ae452 SHA512 034d880dc58523f4185137181109e4331549689ddcb271a0a307cc4a71987c1a8878287bb6da547d0e0c53c7559a5f14d6e61a16db8e893e7da2781f1cab73dd
-AUX espeakup.rc 284 BLAKE2B 9cbc247d542afa3ed7cc8be816a96cca7673b5af0f30f91c91ecde838b31311371b69ad02d195fbc41973d58844eefd997b83aa5f329bd3f1ec9d74ada55e05a SHA512 411e984074260d1a5e7cbf80ff4db7e16d7b5cca48a5e82491bc775c962636da1cefc79527921d8546056b969b8368a6c157833e27bb0e4e6aae48596225b747
-DIST espeakup-0.80.tar.gz 39626 BLAKE2B f36d9776b954e73fd2bc33c7ba97dd323184480549b667ac2afc4dc40a8b98089b8ced16e8b1cb33e6b4c586df27a8d6f782236ef8770bc98a530665e257edcf SHA512 1b7e2bd46c3c13a5305746d2d2810ec94a8660f561e4f679ee4779be1b22178f8ac7de42d626d649710509f7b087b9a2f94608bde203d1bcd6d353229ed9ff83
 DIST espeakup-0.90.tar.gz 25170 BLAKE2B f91a70bad0d985d313852b9e5f72dea4330ab23050ca6904ae5895d513088031f34d878cd64d97dcf2cf02dddc3e9fdabd0826cac98634829019ed3267e27bd8 SHA512 0731835a04063c5eac8ed0ed37cd92cc5d2dd1c58cbd94e158b7dfbb7bc0e2f84a6484fffd9009bf2920652a36fb737044b2e1fb67fb1679ee7150855bc9a15e
-EBUILD espeakup-0.80.ebuild 1788 BLAKE2B 104c80fd5c5ce820a4d4a467ef86c05f4e38d21753837d29812e8c2c7b1d1ab4d1787eca01cf79eb490b8eff918c401e9c835b6fba69ee1b45e328e1167c5e5c SHA512 4d5bbcc7df2febd0fb4bc90f07e678518b30a8212a9483d6161713e32491d849921dcaee1dd959c6925d82595e993ed6a07539de9ffc9b85d0d977d250941787
 EBUILD espeakup-0.90.ebuild 1570 BLAKE2B 284bb4b404ebf0b67018223552ce6590119beb15f38d45d1f2ab710f270ecf6b2716d3847d63c097542a1fc49e220826aeb70143d6fdac6fc5c463983389eefe SHA512 88a88613502acf52a008cac26eabe4296e38359677da5803c323dd19e30fae3422a86f340517340dd75675533392bf3fbca457f690112d1759dc3951f821ff2d
 EBUILD espeakup-9999.ebuild 1402 BLAKE2B 1fda1833c49a314413fe60c537d3101e8a1230a727bc8f9a627414935266cd9372c62b943497bd6ca4ffe11bd0c49325de2f4d62bfe1e92d9147138438f9ca4d SHA512 bab74d580b835c764a78ff1d237493e0b3a8b8834af5537deea4643ce3d4c0b8c7053a3ca64b346749839b1d04cf34c98741242c109e478037ee49987fe67449
 MISC metadata.xml 604 BLAKE2B bd610ade0064025744641858af26947682b042d4872847d6150a2112b4dec2cc5dff3468d5442b9ce7bfd2981351ed5b86c083a67990981ebbdd7707f76b380b SHA512 d15cce58fdaf12d6cf33100c91d0f4d95b9df08ff4433f559e425a5b59fa9ccdcab06a3af870b1d805c32fdcef7ef065d11a63b15999798bb4250b09618d9a21
diff --git a/app-accessibility/espeakup/espeakup-0.80.ebuild b/app-accessibility/espeakup/espeakup-0.80.ebuild
deleted file mode 100644
index df2921d1d681..000000000000
--- a/app-accessibility/espeakup/espeakup-0.80.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/williamh/espeakup.git"
-	inherit git-r3
-else
-	EGIT_COMMIT=v${PV}
-	SRC_URI="https://github.com/williamh/espeakup/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 x86"
-	inherit vcs-snapshot
-fi
-
-inherit linux-info
-
-DESCRIPTION="espeakup is a small lightweight connector for espeak and speakup"
-HOMEPAGE="https://github.com/williamh/espeakup"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE=""
-
-COMMON_DEPEND="|| (
-	app-accessibility/espeak[portaudio]
-	app-accessibility/espeak[pulseaudio] )"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}"
-
-CONFIG_CHECK="~SPEAKUP ~SPEAKUP_SYNTH_SOFT"
-ERROR_SPEAKUP="CONFIG_SPEAKUP is not enabled in this kernel!"
-ERROR_SPEAKUP_SYNTH_SOFT="CONFIG_SPEAKUP_SYNTH_SOFT is not enabled in this kernel!"
-
-pkg_setup() {
-	if kernel_is -ge 2 6 37; then
-		check_extra_config
-	elif ! has_version app-accessibility/speakup; then
-		ewarn "Cannot find speakup on your system."
-		ewarn "Please upgrade your kernel to 2.6.37 or later and enable the"
-		ewarn "CONFIG_SPEAKUP and CONFIG_SPEAKUP_SYNTH_SOFT options"
-		ewarn "or install app-accessibility/speakup."
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX=/usr install
-	einstalldocs
-	newconfd "${FILESDIR}"/espeakup.confd espeakup
-	newinitd "${FILESDIR}"/espeakup.rc espeakup
-}
-
-pkg_postinst() {
-	elog "To get espeakup to start automatically, it is currently recommended"
-	elog "that you add it to the default run level, by giving the following"
-	elog "command as root."
-	elog
-	elog "rc-update add espeakup default"
-	elog
-	elog "You can also set a default voice now for espeakup."
-	elog "See /etc/conf.d/espeakup for how to do this."
-}
diff --git a/app-accessibility/espeakup/files/espeakup.rc b/app-accessibility/espeakup/files/espeakup.rc
deleted file mode 100644
index 2989a970874b..000000000000
--- a/app-accessibility/espeakup/files/espeakup.rc
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-command=/usr/bin/espeakup
-command_args="${espeakup_opts:-${ESPEAKUP_OPTS}}"
-pidfile=/run/espeakup.pid
-
-depend() {
-	after modules
-	use alsasound pulseaudio
-}
diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index b0eae63142cf..f42fb2840f0a 100644
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
diff --git a/app-arch/unzip/Manifest b/app-arch/unzip/Manifest
index b58821d15089..e1757785d44f 100644
--- a/app-arch/unzip/Manifest
+++ b/app-arch/unzip/Manifest
@@ -6,5 +6,5 @@ DIST unzip60.tar.gz 1376845 BLAKE2B 5016d300b4452018a391f4ebc03c6960c068df400a04
 DIST unzip_6.0-26.debian.tar.xz 23708 BLAKE2B 7655396df2f8c4443bbd37a2fab590f1e66b3b8531871a6d95f281ac702e64a0e602f2412a58ff2addf4ce9cae8d146af650a18b02919d120c9db6c49df480b5 SHA512 9a56e400ad0984f87c7ee0548429349be549e35a3cae4c9acb88a8fb97a1d1fbd116cfa3292622ad8b2c67ffe79ae268861ddec1269993ba98f1a6a411b7611f
 DIST unzip_6.0-27.debian.tar.xz 24980 BLAKE2B e53a96f12af0cf5227600c73a35003484fca5de138cd37991eb1eb25b97b80371c3a566d989feeb04deb1a93acd9444253b091cd7e920b23520c87c5f5a94eeb SHA512 e1e605f023c7b314a6c5b2857a3bd630350df2d7e4bf6bb38ab8594f967336384666b4db8afad931251b85261ee4e2c38d78641c74ac7e5fd02523f26e92ddb2
 EBUILD unzip-6.0_p26.ebuild 2816 BLAKE2B 35b6b47a5700352e3755d1b58ccf7db9dfec22f66d13241b2442102895513a81e291bcfe95c2139146c3fb67309df5cea9dbce90ccd5383378e14cd9d7d0bb71 SHA512 669885c0afcbf3ae574bc37791be3da75659fd756f225e53b93bc724321458724f81c5962f995a4570738d3b803c8acc72140e6c64af7f8c7b7b823094380a39
-EBUILD unzip-6.0_p27.ebuild 2814 BLAKE2B 98fc6c254161be3de03272319c0a0bd318e0ba5836f196e6b2b7d13938a560c7bd6170fdd4a4afc82c3c7889c6c963b8a51f48157297fa48e0f7b7319768a248 SHA512 6a8d1631a94c70f8e25be1d74c3c3ac6fa5d124a86354d961dddc462aafc7447feace34aac813c3e730f28312a8a0c45d606b700a5c83f5955a992be97eda487
+EBUILD unzip-6.0_p27.ebuild 2812 BLAKE2B 4b220808c34c0af816f9d12bcb59c5afe5f5bcd258b802a41eed4b8fd46c37609a2da398f16fc9e7d3262d035c89006749f9125af8314d7e86bff8249332a239 SHA512 e15842220cc30c18ea935316b5153a82d8d99065e642ae7232cc04de39383c07d96f4038af63c6584d119ec7ce6219d7521f5a5e9a96165959c9241a7fde0532
 MISC metadata.xml 587 BLAKE2B c2190274c146c5587ac7d6adf786fd98db897aa5a62433afdde4953d3a7ae4a6022837ee6b06f3e216633f5710ab89cccd2000504481094b5871b79300424957 SHA512 75b014ae98951f4484eaa909af92eac9ee955bf5f4ba6795a4bb40a5e40036ba4909a42471ccd2916dd4c9a33a500054590faec39faf9d4049f9c74201884c56
diff --git a/app-arch/unzip/unzip-6.0_p27.ebuild b/app-arch/unzip/unzip-6.0_p27.ebuild
index bfa8c139f8c9..332f575d7f5b 100644
--- a/app-arch/unzip/unzip-6.0_p27.ebuild
+++ b/app-arch/unzip/unzip-6.0_p27.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/infozip/${MY_P}.tar.gz
 
 LICENSE="Info-ZIP"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="bzip2 natspec unicode"
 
 DEPEND="bzip2? ( app-arch/bzip2 )
diff --git a/app-dicts/Manifest.gz b/app-dicts/Manifest.gz
index 8f4d41ee81de..59845275e09a 100644
--- a/app-dicts/Manifest.gz
+++ b/app-dicts/Manifest.gz
diff --git a/app-dicts/aspell-da/Manifest b/app-dicts/aspell-da/Manifest
index c91594c4235e..76a147dbf7e3 100644
--- a/app-dicts/aspell-da/Manifest
+++ b/app-dicts/aspell-da/Manifest
@@ -1,3 +1,5 @@
 DIST aspell-da-4.0.tar.gz 4208911 BLAKE2B 828176450a1d6e5e2e9b07d16c785239a012fc8382d92fcddf6dec812abbf49048b2f1c15de6655e09d74d2f65cd1a43939b3bee8f036ccfdd441f66b5ea259e SHA512 bbc0c4cc0202f989770d84ac9b5ff688b4c8bf0fef7128c36e54c7e4d09e8233eeee986def9a5d75c05d2599eaf96db4be212f6dc758bd23f723f611bf545ba5
+DIST aspell-da-4.1.tar.gz 4239148 BLAKE2B 21c30ec4576b73964d434217eb0212bc2e15774b42d7b4cbc9be37ae97eef42eb66821e22690b2b1d72c91d0240f2152acd1383038426ab65c030bc7f74379f1 SHA512 88a3a60db9be45f3235d75db0f946a5d7da0c2cfcf847ad2672c7b0e243454dce56f5f37d0652c6f2b9aeb08edbbefb80c4f45c909e5ba33aec2714f83fac7c3
 EBUILD aspell-da-4.0.ebuild 448 BLAKE2B 122178a52be12fd9b2e9d3c9ed8c4e6f345c35b9dd4629d3483723e5e8a6cb0d2321af04035c7b614d0059e74aa66d97e9ecc8de016d7dc9fc71211ad81a59aa SHA512 e3a832d942be4ac23dde982a2aa59cba6d144ab2d13893f8c144e868c7287b72745465ae7327b3020438e305b16025ac2003ac92d74394903adad28dd9e7aad9
+EBUILD aspell-da-4.1.ebuild 455 BLAKE2B 22677c6069ea70d722417262460ce82baeaa228ef08baed2449c6aba65cbf108dcb5128ed452657fcab9ddbcbec8c08bdf3c24bfd9a277341e7a10153944ba55 SHA512 79ba6a15b5e6fd6b3afea99b5f69aa03708818acccdc92e51bd59f491c5f0b87a09161730d9523472b96182002ff27569258af60267e1312877b0e7e2635ad62
 MISC metadata.xml 275 BLAKE2B 5ea4d40b14cc5ef65beaed8b1e6fba240963d79a9295621e0ec49d8e2a5577dc44770ebdea263723703611df01545780051e8cba4f2c4b6394c44db2abce3cde SHA512 c3dba23dbeb92f784a10f132881fd91e83a7bdc6a313ad5dff7da6e91ad72975a1b6fb5a85f3adef4abb746dd7f0fe7af81b8176ebf9ca495259ec04a29cbd8a
diff --git a/app-dicts/aspell-da/aspell-da-4.1.ebuild b/app-dicts/aspell-da/aspell-da-4.1.ebuild
new file mode 100644
index 000000000000..26c8f5f9d04d
--- /dev/null
+++ b/app-dicts/aspell-da/aspell-da-4.1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ASPELL_LANG="Danish"
+
+inherit aspell-dict-r1
+
+HOMEPAGE="https://github.com/mortenivar/aspell-da"
+SRC_URI="https://github.com/mortenivar/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${P}"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-macos"
diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index ca8cbb7591a7..6c2b62538888 100644
--- a/app-office/Manifest.gz
+++ b/app-office/Manifest.gz
diff --git a/app-office/sc-im/Manifest b/app-office/sc-im/Manifest
new file mode 100644
index 000000000000..ba02e2b6af15
--- /dev/null
+++ b/app-office/sc-im/Manifest
@@ -0,0 +1,3 @@
+DIST sc-im-0.8.2.tar.gz 1619617 BLAKE2B 1957b79749012b5e8b24e26f3cde63c84bf971d2183791f986c98ec823a9ab74bf8a126dcdb2a58920af07e068520ebd7efe9c9394235c5a58670f120495e980 SHA512 ae02fd31eb7254208de26802ed6d8b21d77ce2d6997f4a2de5bd2f0a002c763f67f53e6c8e49d66ded096ecd8bf50b1117015e9a0356eaf11c3caef22cf4552c
+EBUILD sc-im-0.8.2.ebuild 3960 BLAKE2B 4aafd50d8576ceed91e491d620953d3e7aa525fd57d51271a53b78c498872a7283629969954547714b3a05421b4a18eb5994c6db55b21c2c1e2caee38b408458 SHA512 e10ece28c2683d1d51af1a0efdc8d565a9159f3c01bb5980c96b605db74653cf0fa80291bf384bd0934f155adba2923b0231bf2f1b898fd69e9ea42190d7eb1c
+MISC metadata.xml 974 BLAKE2B 2e46ac845ba9978e8b646007003dcf2b53844e5dd2a86f4cbdf812d58850e41f3636ba2807503aa56d6c69a8e04033d868534415c7fd71d424444af1eea392a9 SHA512 1f66c4340b79c43daca9d66be2b3e20e59405fc501a793d0159cbe40e7f541af79b036f53905bca0ea8001a14a9f4d17cb3fd060ce95cfbbc0b0ef9c8e521dff
diff --git a/app-office/sc-im/metadata.xml b/app-office/sc-im/metadata.xml
new file mode 100644
index 000000000000..8f4ac17a19b5
--- /dev/null
+++ b/app-office/sc-im/metadata.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person" proxied="yes">
+		<email>efe.izbudak@metu.edu.tr</email>
+		<name>Efe İzbudak</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<use>
+		<flag name="plots">Add <pkg>sci-visualization/gnuplot</pkg> for plotting support</flag>
+		<flag name="xls">Add xls support</flag>
+		<flag name="xlsx">Add xlsx support</flag>
+		<flag name="ods">Add ods import support</flag>
+		<flag name="X">Use <pkg>x11-misc/xclip</pkg> for clipboard copy/paste</flag>
+		<flag name="tmux">Use <pkg>app-misc/tmux</pkg> for clipboard copy/paste</flag>
+		<flag name="wayland">Use <pkg>gui-apps/wl-clipboard</pkg> for clipboard copy/paste</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">andmarti1424/sc-im</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-office/sc-im/sc-im-0.8.2.ebuild b/app-office/sc-im/sc-im-0.8.2.ebuild
new file mode 100644
index 000000000000..bed8ce296550
--- /dev/null
+++ b/app-office/sc-im/sc-im-0.8.2.ebuild
@@ -0,0 +1,141 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-1 luajit )
+
+inherit lua-single toolchain-funcs flag-o-matic
+
+DESCRIPTION="Spreadsheet Calculator Improvised -- An ncurses spreadsheet program for terminal"
+HOMEPAGE="https://github.com/andmarti1424/sc-im"
+SRC_URI="https://github.com/andmarti1424/sc-im/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${P}/src"
+
+LICENSE="BSD-4"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="X plots wayland xls xlsx lua ods tmux"
+REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
+
+DEPEND="
+	sys-libs/ncurses:=
+
+	lua? (
+		${LUA_DEPS}
+	)
+	ods? (
+		dev-libs/libxml2
+		dev-libs/libzip
+	)
+	plots? ( sci-visualization/gnuplot )
+	tmux? ( app-misc/tmux )
+	wayland? ( gui-apps/wl-clipboard )
+	X? ( x11-misc/xclip )
+	xls? (
+		dev-libs/libxls
+	)
+	xlsx? (
+		dev-libs/libxlsxwriter
+		dev-libs/libxml2
+		dev-libs/libzip
+	)
+"
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+pkg_setup() {
+	CONFLICTING=$(usex tmux "tmux " "")$(usex wayland "wayland " "")$(usex X "X" "")
+	if ( use tmux && ( use wayland || use X ) ) ; then
+		elog "Conflicting flags for clipboard support are set: ${CONFLICTING}"
+		elog "tmux support has been preferred."
+	elif ( use wayland && use X ) ; then
+		elog "Conflicting flags for clipboard support are set: ${CONFLICTING}"
+		elog "Wayland support has been preferred."
+	fi
+
+	# Run lua setup
+	lua-single_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# Clean Makefile from all sorts of flag / lib setting
+	sed -i -e '/CFLAGS +=\|LDLIBS +=/d' Makefile \
+		|| die "sed fix failed. Uh-oh..."
+	# Also clean the now useless comments and logic
+	sed -i -e '/#\|if\|else/d' Makefile \
+		|| die "sed fix failed. Uh-oh..."
+}
+
+src_configure() {
+	tc-export CC PKG_CONFIG
+
+	LDLIBS="-lm"
+
+	# default flags that dont need optional dependencies
+	append-cflags -Wall -g \
+		-DNCURSES \
+		-D_XOPEN_SOURCE_EXTENDED -D_GNU_SOURCE \
+		'-DSNAME=\"sc-im\"' \
+		'-DHELP_PATH=\"/usr/share/sc-im\"' \
+		'-DLIBDIR=\"/usr/share/doc/sc-im\"' \
+		'-DDFLT_PAGER=\"less\"' \
+		'-DDFLT_EDITOR=\"vim\"' \
+		-DUSECOLORS \
+		'-DHISTORY_FILE=\"sc-iminfo\"' \
+		'-DHISTORY_DIR=\".cache\"' \
+		'-DCONFIG_FILE=\"scimrc\"' \
+		'-DCONFIG_DIR=\".config/sc-im\"' \
+		'-DINS_HISTORY_FILE=\"sc-iminfo\"' \
+		-DUNDO \
+		-DMAXROWS=65536 \
+		-DUSELOCALE \
+		-DMOUSE \
+		'-DDEFAULT_OPEN_FILE_UNDER_CURSOR_CMD=\""scopen"\"' \
+		-DAUTOBACKUP \
+		-DHAVE_PTHREAD
+
+	# setting default clipboard commands
+	if use tmux ; then
+		append-cflags '-DDEFAULT_COPY_TO_CLIPBOARD_CMD=\""tmux load-buffer"\"'
+		append-cflags '-DDEFAULT_PASTE_FROM_CLIPBOARD_CMD=\""tmux show-buffer"\"'
+	elif use wayland ; then
+		append-cflags '-DDEFAULT_COPY_TO_CLIPBOARD_CMD=\""wl-copy <"\"'
+		append-cflags '-DDEFAULT_PASTE_FROM_CLIPBOARD_CMD=\""wl-paste"\"'
+	elif use X ; then
+		append-cflags '-DDEFAULT_COPY_TO_CLIPBOARD_CMD=\""xclip -i -selection clipboard <"\"'
+		append-cflags '-DDEFAULT_PASTE_FROM_CLIPBOARD_CMD=\""xclip -o -selection clipboard"\"'
+	fi
+
+	# optional feature dependency
+	use plots && append-cflags -DGNUPLOT
+	if use xls; then
+		append-cflags -DXLS $(${PKG_CONFIG} --cflags libxls)
+		LDLIBS+=" $(${PKG_CONFIG} --libs libxls)"
+	fi
+	if use xlsx || use ods ; then
+		append-cflags -DODS -DXLSX $(${PKG_CONFIG} --cflags libxml-2.0 libzip)
+		LDLIBS+=" -DODS -DXLSX $(${PKG_CONFIG} --libs libxml-2.0 libzip)"
+	fi
+	if use xlsx ; then
+		append-cflags -DXLSX_EXPORT $(${PKG_CONFIG} --cflags xlsxwriter)
+		LDLIBS+=" -DXLSX_EXPORT $(${PKG_CONFIG} --libs xlsxwriter)"
+	fi
+	if use lua ; then
+		append-cflags -DXLUA $(${PKG_CONFIG} --cflags lua)
+		LDLIBS+=" -DXLUA $(${PKG_CONFIG} --libs lua) -rdynamic"
+	fi
+	append-cflags $(${PKG_CONFIG} --cflags ncursesw) || append-cflags $(${PKG_CONFIG} --cflags ncurses)
+	LDLIBS+=" $(${PKG_CONFIG} --libs ncursesw)" || LDLIBS+=" $(${PKG_CONFIG} --libs ncurses)"
+}
+
+src_compile() {
+	emake LDLIBS="${LDLIBS}" CFLAGS="${CFLAGS}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" prefix="/usr" install
+	einstalldocs
+}
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index b922f155e9ef..f8cc75915826 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/dotconf/Manifest b/dev-libs/dotconf/Manifest
index 6ea41d034570..990c04d5cea3 100644
--- a/dev-libs/dotconf/Manifest
+++ b/dev-libs/dotconf/Manifest
@@ -1,4 +1,3 @@
 DIST dotconf-1.3.tar.gz 333301 BLAKE2B df3f4c9bc4539ed5b21bd4d6059bd911bb319d9dbe4f48c6d45c34559eaaa646abea847f6d0b35678c12d9b5e89e2f112047557d458be608215d76bb50af004c SHA512 ced0e66f70d11a309e77add1bfac1da8e85dcbe193633bd4bd1ae4bfd043b66880406e93ec18327b8c5d3de8d4bfc5278db6e5cb39b030ee1dabfa1ce267a98e
-EBUILD dotconf-1.3-r1.ebuild 648 BLAKE2B ba6a92aa94c89a3ed304aed18475d9d417bb680b658e9a67c7de6b005fa35438c1fa83990a0b3031a3f9b72f43254607649b7ac581180123b5666f85246678ec SHA512 b138e5343c0a2046c2551f9c9f71b13eb691dbfa1f040e637e446ee74f54786e55da03710cb4390b726edbf8fc19f8d7f0fb8c0014e221d05498c3f070b1a980
 EBUILD dotconf-1.3-r2.ebuild 626 BLAKE2B a599bf3b0b61378b4802522789d3bca3d678690f4e9612648cc71a48e6d193c8b7bbe25625d72b198a0bba1d6049dcbfea9823d48109650caf794d52839333e7 SHA512 2abb3034d41581504fd6215949e1dbd4c03f292c635812ba95f56aabe605ee2f7fad5a63d064e20c54c8d8b1a63fc5b289424d151861136db6dbafccca570b79
 MISC metadata.xml 445 BLAKE2B 2c3daf69f3893a6cef9c473c24b8a998fc566c1e0fff66ce5e9d780859bd1cdae789616b443f007903e6dd1372fd8494307680fbcf775863adcab5437b933b0f SHA512 46c77d13292b855f78b096d42406733af924d90ed8687ea4fa541902084367d1c830ee4500f03bc1662c545922c32ac136d4f08ec06d51da05dc88ef7689459d
diff --git a/dev-libs/dotconf/dotconf-1.3-r1.ebuild b/dev-libs/dotconf/dotconf-1.3-r1.ebuild
deleted file mode 100644
index 8aee7539c6b2..000000000000
--- a/dev-libs/dotconf/dotconf-1.3-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="dot.conf configuration file parser"
-HOMEPAGE="https://github.com/williamh/dotconf"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-DEPEND=">=sys-devel/autoconf-2.58"
-RDEPEND=""
-
-src_configure() {
-	econf --disable-static
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)"
-}
-
-pkg_postinst() {
-	ewarn 'This version requires that you run revdep-rebuild after'
-	ewarn 'the upgrade.'
-}
diff --git a/dev-libs/intel-compute-runtime/Manifest b/dev-libs/intel-compute-runtime/Manifest
index 9c0595365d71..9976c3bffbef 100644
--- a/dev-libs/intel-compute-runtime/Manifest
+++ b/dev-libs/intel-compute-runtime/Manifest
@@ -3,8 +3,10 @@ DIST intel-compute-runtime-22.29.23750.tar.gz 5613298 BLAKE2B 7c662c85732d2053d6
 DIST intel-compute-runtime-22.30.23789.tar.gz 5625283 BLAKE2B 0a59926453ae8a58afbd49a40d8b94ac9171d23a141f967c6d908b26ab66decbd082d42fe6e75bf9fd2b4327cbe5b4c71f6ef390a8a62435c06b749078d67cd4 SHA512 8f2caee7376a9a489efc7ee5b907786d1fc04ed3143dfc66e28069f4d19c13393c64cf6ea0159ce269ee2198dadddd7ef967a11efac90e616ce1f1c996b07153
 DIST intel-compute-runtime-22.31.23852.tar.gz 5644386 BLAKE2B 90eb629187d0aba7a713c600234f18a5472d7ad4e9a7c1130e61011970a9247165f17dab936abb875ee4dd9b4ba167135d158a1b19fce9f20d2bd1c23c9d065b SHA512 66fae1c0e3173f45f0565906d455d4511d40bc392a966625f60315e6a72daa30c741dddc799c50b8e020092577af6aa03810cd5a5e3e729ab19815cdb5e6a27a
 DIST intel-compute-runtime-22.32.23937.tar.gz 5656306 BLAKE2B 82cc631b69d24d2b845d6c9abc0525f06de8314c7915e651db3c800527244c94104eea6083acdde194cc51f9a68bdfcd39f3f4d296c96338e9f05c05d71cc21c SHA512 729d29c09624ae81ca1e8a455d4e3665fcb31cac87e9776730c038a3393e91e1a00e2079e2587adf4b9ab1797179f49fafd48ac5b855dab722837f1f3b77e0f0
+DIST intel-compute-runtime-22.34.24023.tar.gz 5696775 BLAKE2B 8a70751b54e2aaea51eb69d45ef1bed09198023b72b34354cbd87f73a91481f4c7c5a4e5d23815b8ab3d05d4525cb08136929c4b9c0c69b6bcb917b560d88c49 SHA512 592dbf4bad4898c2a5d7a95cd7f41d23cf2f7ab97a33d55f2322b8243a88a3b61ea28d0af1d853324456c5919082fa236fee5fa9cbfcebf248a791617e1533ad
 EBUILD intel-compute-runtime-22.29.23750-r1.ebuild 1982 BLAKE2B 20c0fda1c683d65e213d3f492b392a1826cb6f3eeca283819edc68eccea16530812ab6d636dc876cd4d3f814c76bd51baa97f64c979e04a430f6e04478170842 SHA512 9216c791966c11977c4f9ab3d7a280158f620c28fefbd2e0ab8c4086bbc09d93f331e090bd2a6e64b7f6f1af1154c0f25279b32e82b6a6e02e09bddaf2d3ac94
 EBUILD intel-compute-runtime-22.30.23789.ebuild 1983 BLAKE2B 3099d855a211d6893f216fec029f7aa78ca31460dedcfb19f1a1449549ad4ceae714b179b893a2b47b5d501dfa754cbb9d244a393cfccc5a0badffa069a2e423 SHA512 b24d315de1ddacb1a2999ec5f7e0971ab6313b5dd84a1ac5fefcf1827f5ccc054eb3a6ab10ca40d807445e13c981a0ad5269804523f3051d83bc5000f9f5245f
 EBUILD intel-compute-runtime-22.31.23852.ebuild 1983 BLAKE2B 3099d855a211d6893f216fec029f7aa78ca31460dedcfb19f1a1449549ad4ceae714b179b893a2b47b5d501dfa754cbb9d244a393cfccc5a0badffa069a2e423 SHA512 b24d315de1ddacb1a2999ec5f7e0971ab6313b5dd84a1ac5fefcf1827f5ccc054eb3a6ab10ca40d807445e13c981a0ad5269804523f3051d83bc5000f9f5245f
 EBUILD intel-compute-runtime-22.32.23937.ebuild 1983 BLAKE2B 3099d855a211d6893f216fec029f7aa78ca31460dedcfb19f1a1449549ad4ceae714b179b893a2b47b5d501dfa754cbb9d244a393cfccc5a0badffa069a2e423 SHA512 b24d315de1ddacb1a2999ec5f7e0971ab6313b5dd84a1ac5fefcf1827f5ccc054eb3a6ab10ca40d807445e13c981a0ad5269804523f3051d83bc5000f9f5245f
+EBUILD intel-compute-runtime-22.34.24023.ebuild 1983 BLAKE2B 3099d855a211d6893f216fec029f7aa78ca31460dedcfb19f1a1449549ad4ceae714b179b893a2b47b5d501dfa754cbb9d244a393cfccc5a0badffa069a2e423 SHA512 b24d315de1ddacb1a2999ec5f7e0971ab6313b5dd84a1ac5fefcf1827f5ccc054eb3a6ab10ca40d807445e13c981a0ad5269804523f3051d83bc5000f9f5245f
 MISC metadata.xml 1429 BLAKE2B 6c2fde2fda8cd6b9d707c400c5b4d38e3d74dd73617faa9dd80f84100d499182ea959e695a473d32307914e76a26bae531a92677f0e4bedbdf05fc1cbd3095ff SHA512 ac61568ad36df6f6c8470b43f32d048930e4a569ec86d58ff563a86ae748f6bddb8700de487e4967da4998160f1c01517be0817cccc445a821984aff36617b6d
diff --git a/dev-libs/intel-compute-runtime/intel-compute-runtime-22.34.24023.ebuild b/dev-libs/intel-compute-runtime/intel-compute-runtime-22.34.24023.ebuild
new file mode 100644
index 000000000000..af9f16456a1e
--- /dev/null
+++ b/dev-libs/intel-compute-runtime/intel-compute-runtime-22.34.24023.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CMAKE_BUILD_TYPE="Release"
+MY_PN="${PN/intel-/}"
+MY_P="${MY_PN}-${PV}"
+
+inherit cmake flag-o-matic
+
+DESCRIPTION="Intel Graphics Compute Runtime for oneAPI Level Zero and OpenCL Driver"
+HOMEPAGE="https://github.com/intel/compute-runtime"
+SRC_URI="https://github.com/intel/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+l0 +vaapi"
+
+RDEPEND=">=media-libs/gmmlib-22.1.7:="
+
+DEPEND="
+	${DEPEND}
+	>=dev-libs/intel-metrics-library-0_pre20220526:=
+	dev-libs/libnl:3
+	dev-libs/libxml2:2
+	>=dev-util/intel-graphics-compiler-1.0.11485
+	>=dev-util/intel-graphics-system-controller-0.8.0:=
+	media-libs/mesa
+	>=virtual/opencl-3
+	l0? ( >=dev-libs/level-zero-1.8.5:= )
+	vaapi? (
+		x11-libs/libdrm[video_cards_intel]
+		x11-libs/libva
+	)
+"
+
+BDEPEND="virtual/pkgconfig"
+
+DOCS=( "README.md" "FAQ.md" )
+
+PATCHES=( "${FILESDIR}/${PN}-22.24.23453-remove-fortify-sources.patch" )
+
+src_prepare() {
+	# Remove '-Werror' from default
+	sed -e '/Werror/d' -i CMakeLists.txt || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	# See https://github.com/intel/compute-runtime/issues/531
+	filter-flags -flto=* -flto
+
+	local mycmakeargs=(
+		-DCCACHE_ALLOWED="OFF"
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
+		-DCMAKE_INSTALL_LIBDIR="$(get_libdir)"
+		-DBUILD_WITH_L0="$(usex l0)"
+		-DDISABLE_LIBVA="$(usex !vaapi)"
+		-DNEO__METRICS_LIBRARY_INCLUDE_DIR="${ESYSROOT}/usr/include"
+		-DKHRONOS_GL_HEADERS_DIR="${ESYSROOT}/usr/include"
+		-DOCL_ICD_VENDORDIR="${EPREFIX}/etc/OpenCL/vendors"
+		-DSUPPORT_DG1="ON"
+		-Wno-dev
+
+		# See https://github.com/intel/intel-graphics-compiler/issues/204
+		# -DNEO_DISABLE_BUILTINS_COMPILATION="ON"
+
+		# If enabled, tests are automatically run during
+		# the compile phase and we cannot run them because
+		# they require permissions to access the hardware.
+		-DSKIP_UNIT_TESTS="1"
+	)
+
+	cmake_src_configure
+}
diff --git a/dev-libs/libxlsxwriter/Manifest b/dev-libs/libxlsxwriter/Manifest
new file mode 100644
index 000000000000..ed606011aa30
--- /dev/null
+++ b/dev-libs/libxlsxwriter/Manifest
@@ -0,0 +1,3 @@
+DIST libxlsxwriter-1.1.4.tar.gz 20442200 BLAKE2B 38308dd8e954820b6debf15bc884effd583c0e0fa1667ed4451085ff8cf1bf4101807110873a501617785763886c107c19ab30c16390b5fb608f52b2736465be SHA512 fad36f7882fcb21b87e13cf603022cfad3f14e6f955a06e2771712facd0fe12f83f4d1655dc1a744724bda1ac83af7e7bf1393457c5507d8983f63002ab294b5
+EBUILD libxlsxwriter-1.1.4.ebuild 1043 BLAKE2B ab85b1f43163662c721c2092190cfa6aebaf7cb8cbe46f46325410acf13b5aaaf18615204e36a09f6c9add6bcb2077c0b8a60b02bd0fa629eb3beb53961a4b83 SHA512 f6ce8cabce1adc0e6a98efa679e229aaa67d7aa47ee40777d290c1742f797e5b2185cb5c89bc145c0890d512c2105fec6405b107e27cdcd0dd63eef69ee0fb9a
+MISC metadata.xml 579 BLAKE2B 0c3294a1f69d9cc7e3e95a37f2708ce4672cc931f28cdded82aadc9cdffb323ac4bd7518c61fee57ad30022617acb572625f3b6b0972fd903a1ae3afcf98aee1 SHA512 83d288575e27337692c3cd94bad56d8e2882240343b739eeed72742bd82e9177c45a81ef94ebab9e035b99431ecc2cf21723e408a90fa6b5f551e8a7f1f17a0d
diff --git a/dev-libs/libxlsxwriter/libxlsxwriter-1.1.4.ebuild b/dev-libs/libxlsxwriter/libxlsxwriter-1.1.4.ebuild
new file mode 100644
index 000000000000..c31861ee337b
--- /dev/null
+++ b/dev-libs/libxlsxwriter/libxlsxwriter-1.1.4.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake plocale
+
+DESCRIPTION="Libxlsxwriter is a C library for creating Excel XLSX files"
+HOMEPAGE="https://libxlsxwriter.github.io/"
+SRC_URI="https://github.com/jmcnamara/libxlsxwriter/archive/RELEASE_${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-RELEASE_${PV}"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="openssl"
+
+DEPEND="
+	sys-libs/zlib[minizip]
+	openssl? ( dev-libs/openssl:= )
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	DOUBLEFUNCTION=OFF
+	for x in $(plocale_get_locales); do
+		if ! [[ "${x}" =~ ^en* ]]; then
+			#non-english locale detected; apply double function fix
+			DOUBLEFUNCTION=ON
+			break
+		fi
+	done
+	local mycmakeargs=(
+		-DCMAKE_BUILD_TYPE=Release
+		-DUSE_OPENSSL_MD5="$(usex openssl)"
+		-DUSE_SYSTEM_MINIZIP="ON"
+		-DUSE_DTOA_LIBRARY=${DOUBLEFUNCTION}
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	dodoc CONTRIBUTING.md License.txt Readme.md Changes.txt
+	dodoc -r docs examples
+}
diff --git a/dev-libs/libxlsxwriter/metadata.xml b/dev-libs/libxlsxwriter/metadata.xml
new file mode 100644
index 000000000000..6a9883e0d995
--- /dev/null
+++ b/dev-libs/libxlsxwriter/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person" proxied="yes">
+		<email>efe.izbudak@metu.edu.tr</email>
+		<name>Efe İzbudak</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<use>
+		<flag name="openssl">Use <pkg>dev-libs/openssl</pkg> for MD5 digest</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">jmcnamara/libxlsxwriter</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest
index 05329e3e6383..ae6bf97307b9 100644
--- a/dev-libs/openssl/Manifest
+++ b/dev-libs/openssl/Manifest
@@ -1,27 +1,15 @@
 AUX gentoo.config-1.0.2 5302 BLAKE2B b699533ed86c48c0d033092b4d901de837a6a495113925099d82cd2f768b521073a3caad06921e2f8d3ecdf4c4ef617ed9b9aba119d4a910b72f9c086b9fd21f SHA512 f8653c57ef8e3a3b3b762f66ef556c0012dfc8b997f0bdbe504f92d0901c0dc9fefa2c3e8244175d802fb83437533b7928b6db38b93fdd5a8ffefa79414106a1
 AUX openssl-1.1.0j-parallel_install_fix.patch 515 BLAKE2B a1bcffce4dc9e0566e21e753cf1a18ee6eac92aca5880c50b33966d8ecb391f7430e1db6ea5a30ee4e3a9d77fb9e5542e864508b01c325011e368165e079a96c SHA512 0badd29ec8cffd95b2b69a4b8f8eecfc9ea0c00a812b298a650ee353e3965147fd2da1f9058d2d51744838f38168257b89aaf317287c55a7b76f16a69c781828
 AUX openssl-1.1.1i-riscv32.patch 2557 BLAKE2B 97e51303706ee96d3fae46959b91d1021dcbb3efa421866f6e09bbee6287aae95c6f5d9498bd9d8974b0de747ef696242691cfebec90b31dc9e2cc31b41b81ec SHA512 f75ae1034bb9dda7f4959e8a5d6d0dae21200723d82aebfbea58bd1d7775ef4042e49fdf49d5738771d79d764e44a1b6e0da341d210ea51d21516bb3874b626a
-AUX openssl-1.1.1p-fix-test-build.patch 1502 BLAKE2B 4efa53e6130217af2a4db1c099dd3e5e6158f591e71ab18fcb857a8e293fe7ae7e10d02e43f9671293ee258e095005aa72ed62d96c20fdb9b5b412d557e6d183 SHA512 4b6eeae26393799711c122d64b6a19fda290b18b558274c2461b08563591fa9cb0649b95e0c6eb91f2085a1ed7872eb82f8ad8acb1a4f0d6b466d3033da99343
 AUX openssl-3.0.5-test-memcmp.patch 581 BLAKE2B 83dd0d05c73185f759e06dc352d196c22cd2359111170523a56f2a1f2b92c769245cda126fc44604f00060995ac4d35d8f573e0c841c8ef23f8d85b598ad08ee SHA512 9e9adde007e48f8af696af82bfeab56bc97a86204efd5fd27f92608afc521cd72f3cb5358b981a35e190b9fd2e02bd6eb499354549300de01fed69ee4f122093
 DIST openssl-1.0.2-patches-1.5.tar.xz 12404 BLAKE2B 6c1b8c28f339f539b2ab8643379502a24cf62bffde00041dce54d5dd9e8d2620b181362ee5464b0ab32ba4948e209697bfabadbea2944a409a1009100d298f24 SHA512 5725e2d9d1ee8cc074bcef3bed61c71bdab2ff1c114362110c3fb8da11ad5bc8f2ff28e90a293f5f3a5cf96ecda54dffdb7ab3fb3f8b23ef6472250dc3037659
 DIST openssl-1.0.2t-bindist-1.0.tar.xz 13872 BLAKE2B b2aade96a6e0ca6209a39e205b1c838de945903fcf959c62cc29ddcd1a0cb360fc5db234df86860a6a4c096f5ecc237611e4c2946b986a5500c24ba93c208ef4 SHA512 a48a7efb9b973b865bcc5009d450b428ed6b4b95e4cefe70c51056e47392c8a7bec58215168d8b07712419dc74646c2bd2fd23bcfbba2031376e292249a6b1b6
 DIST openssl-1.0.2u.tar.gz 5355412 BLAKE2B b2ff2a10e5851af5aca4093422a9a072c794e87b997263826c1c35910c040f695fac63decac5856cb49399ed03d410f97701d9fd4e1ebfbcacd8f3a74ce8bf57 SHA512 c455bb309e20e2c2d47fdc5619c734d107d5c8c38c1409903ce979acc120b0d5fa0312917c0aa0d630e402d092a703d4249643f36078e8528a3cafc9dac6ab32
-DIST openssl-1.1.1n.tar.gz 9850712 BLAKE2B af530258d9f7ca4f1bd1c6c344eb385e766e465c9341dd08797676165f67bbb82d3fd549ed7559dc12fb8c9c4db5e04fa6ec7ab729ec1467f5e8bce469ff5398 SHA512 1937796736613dcf4105a54e42ecb61f95a1cea74677156f9459aea0f2c95159359e766089632bf364ee6b0d28d661eb9957bce8fecc9d2436378d8d79e8d0a4
-DIST openssl-1.1.1n.tar.gz.asc 488 BLAKE2B 8fc18fdc884473dc4c243499cc3528691a9ecc184e39e8d942450d41c42d22a96398036ae804af23c4f28d082c62f5babaa275ceb2e13b33b5acfd59a802c186 SHA512 24abc3d187cabed830dcd3189a34c2dc29e0b8013a607011a0e85cc68f0ec48c1de14a005053a4de3a4013cfa9658016ac65cfb8cfac58da55231371926beeda
-DIST openssl-1.1.1o-test-fixes-expiry.patch.xz 6180 BLAKE2B 23ef36d7bd05c98f7fab6de25681a53fa7a558d114548836b6cd90a57c4f4e45dc9fb622936053608b463320605b7df60db2d2caf3811b249f6ead3791a1c081 SHA512 577aec97fb31cd9efe3b30d82c560d3e7da57ae52c4de0f86e951b777a673830baaadcc5eb366c523024d37405531c6d32de26bbbc1e77df15c7822c72e937e6
-DIST openssl-1.1.1o.tar.gz 9856386 BLAKE2B 5bd355fd17adf43ba4e3bf1a8036ceb724edd4f4ab80dc25aecc3d2647372e9db2bc12e2b89791fc4b6f7fd95a7b68e00490d09ca6518d25ab990ee27798e641 SHA512 75b2f1499cb4640229eb6cd35d85cbff2e19db17b959ac4d04b60f1b395b73567f9003521452a0fcfeea9b31b26de0a7bccf476ecf9caae02298f3647cfb7e23
-DIST openssl-1.1.1o.tar.gz.asc 488 BLAKE2B a03a967e7e2124d1a76ad7765e2f48065f40d32ba102a433be603ee8f86b26a2d246dcb97a95bd694ef3005889ce4f1951f76d39fe1d683f92da1aa3023e9c2d SHA512 da6d88de7c1cd807b6089d50f8bb102c317c0b45ca26e517e3e400c5c65f787d94a1ee522af76279e93790a7fb491348cf25ffcfd66ecb9a9d35209328cb221e
-DIST openssl-1.1.1p.tar.gz 9860217 BLAKE2B 4354753a5e52393c9cc4569954c2cac6d89a1e204fa4f9ca00a60492782d29f8952fb92664cdbb3576c6443d3cb2eacebea51db584738589f3598b40df579b12 SHA512 203470b1cd37bdbfabfec5ef37fc97c991d9943f070c988316f6396b09dae7cea16ac884bd8646dbf7dd1ed40ebde6bdfa5700beee2d714d07c97cc70b4e48d9
-DIST openssl-1.1.1p.tar.gz.asc 488 BLAKE2B e68c8a4c992c2448b48428137f61f91fb89e4814f6e80c5525cea695bcf898326eca729f31b953fbd7ff51b448004101ca78abfbd3138ec2389596faa3eafc2f SHA512 c85d65df1ed0f1ae87b799d794ea43e32c8ecaf85caf6e36fbbd4a890ef1d47710380d3846296e0124898680be66113a959ad974e0448bc00d1253794dc48972
 DIST openssl-1.1.1q.tar.gz 9864061 BLAKE2B fc8fd6a62dc291d0bda328a051e253175fb04442cc4b8f45d67c3a5027748a0fc5fb372d0483bc9024ae0bff119c4fac8f1e982a182612427696d6d09f5935f5 SHA512 cb9f184ec4974a3423ef59c8ec86b6bf523d5b887da2087ae58c217249da3246896fdd6966ee9c13aea9e6306783365239197e9f742c508a0e35e5744e3e085f
 DIST openssl-1.1.1q.tar.gz.asc 833 BLAKE2B 9311abf47469c3802a84dc9b7427a168ba7717496960e6f84b04e4d9263dea1168493082937a06bcb6ef4169b2ed9b2f36084bbac15b5f7ca5b4c41041c4bab6 SHA512 03a41f29d1713c47bb300e01e36dbd048074076a6a3b9913e2fc9a1b56b726c038978f99e86f9a3e4ea39f72bd82a15965842f6d94210fa9d3474f6f0f68559e
 DIST openssl-3.0.5.tar.gz 15074407 BLAKE2B 7bf89e042417c003ef02a8bb1278590a52ce4a3d50f66795c66b750f90248840edb0d3352811caaaaff708c7e65b77384142e316916a6c311f1d2b4747f44816 SHA512 782b0df3d0252468aa696bd74a3b661810499819c0df849aa9698ba0e06a845820dc856aac650fced4be234f1271e576d4317ac3ab1406cf0ffe087d695d20fe
 DIST openssl-3.0.5.tar.gz.asc 862 BLAKE2B 24f1839227be7acec45eb6b748cea7be0b5e66b5cf745814861f7290670733936bf1af2c1dc9357439b31a2ca28f418880d63726d4be6fa994902ac95b51e401 SHA512 516da9ef291601400576adaba7271854af3caa23dc1d70116004360f580e4c28fe61d51e86477d341e4c5bf0ca5f98db8264581ed6cc2c8df124da83ad3e40be
 EBUILD openssl-1.0.2u-r1.ebuild 9933 BLAKE2B 5ad3b7befdf48c6ddaa7c849b3970730b8b693ba722beb012d89d41bb3af98e4037b811587072ec5dd2b70e5eb3683ce5800907d2ae8cc4e03886da15720a627 SHA512 20aa5cecdaf61e66a126125da6d17696b47891f01939c6932d0b9ecd89a211fded135c0fbfa7eaff5d7cf46433c4b356961baf5fb325c698743b8862c7fef284
-EBUILD openssl-1.1.1n.ebuild 9296 BLAKE2B 49772a36ac8fcb336c1b4b6effa42447c0d2b5d4fcdb018ec852f2a79d7e48e026b4c313b76d2adaefdb38f1277d5d972af1c9bfa9b1ff44ff29df7a23ab4438 SHA512 cfd85bf40c59048231d5a302ebefb1ca9888e6f619c91ac28b4e7c26a1f4cff3e2c3a652bdf8cf8cb113347b0bf49db7ad82e76908fbd4e149f1ed971dba298b
-EBUILD openssl-1.1.1o-r1.ebuild 10144 BLAKE2B 037eb29b40857eef4c2631912a6f60f9a7499dd7de402464d9cb3070d1247d3637aec4f1b2f45d1db7aa7b2c9d2832c2f4142cadef01706d087bfda9bd749fcf SHA512 b866690093cbf04de142cc27d29129fcfa4ffe93c9a167f76853eabeb957b35d6c50c42b7b77b89d3d301630eddc2100c78d7b61421dbf47eea7180d7ce3f0b6
-EBUILD openssl-1.1.1o.ebuild 10079 BLAKE2B 60f51f6b8f18b4ea8704c5d7e0cf9603fed7246c20daaa7cd29589fb5c92ff78cac6993bcbea08f156562dd981a2040be633276200840cc14787c73dd75268ad SHA512 d15574f89b552c8bd2a14591e6200431567e48ae889ebc0358ad92aa00fe79e45bba41e68581c6eeea9168a200374328d11a4b9ed881591c27ce29ce78402444
-EBUILD openssl-1.1.1p.ebuild 10051 BLAKE2B 758761b4a8e708e660f03e098eed362dfcdd197855a2ffe6492491408debc9d71b10968789e51b4e0feb6f66a73b809ee60b3c9a91b430253972519ed4a8395d SHA512 95014d8bbe6159bb50357d97797d809b06a30746e0e04873c62dd030ed2ff08a9ec19b97b0b81e5bf5402576b07641160ff7832149789d93bfaf6f65cd4b86b7
-EBUILD openssl-1.1.1q.ebuild 10054 BLAKE2B a6d6f79f18648050307750348e70262adbc25d749742433ca62b238ec6e088c5cf3d80b292bf7026b6bd0efd02ef4a1713ba5b90040e8bd55525ef90e6ef9cc9 SHA512 a147bb27df1ce5cdd88d8aac8bff2b99e64fa7f4dcc0dca1f6bfcb18d10440b3542700858c92c1b8daa7e4ed9ec9826ba2382bc5745cea0e2ad364438fa07aea
+EBUILD openssl-1.1.1q.ebuild 10053 BLAKE2B 0e97d8e9991226160be73ffc34f6a95128a0ec8a8e2ff53cef04a37724ce12176d6b9dc4a6f91b796f695e3cdde559c12d30da6068320d5c11f128adad4c29bc SHA512 9c63bd78525df187318262040d9e365382c4738a53ad84e9b7c0e671ce43f1e863af614de08be4cb46e9b54295cc050b92ad6de331798ac7f11824b9a8fbcc0e
 EBUILD openssl-3.0.5.ebuild 9330 BLAKE2B 29509af43dc5c4bbc79320be5bda40794233e6ee79c3aa3d2e3ea039d57b4b86eca99d8bde59ea35eb8d1391a37e562a8fd2ca6286445faa5683405ebc41a8c0 SHA512 33d611151e2f80d6eb492329a91f37a149cf7b48b1d72cdb5ea9e1255fa6bd9ae56e7855ceed0387443568303506d04a5c92c1b00ea5564bb81eead9ecfd50b2
 MISC metadata.xml 1664 BLAKE2B cf9d4613e5387e7ec0787b1a6c137baa71effb8458fa63b5dea0be4d5cf7c8607257262dbf89dcc0c3db7b17b10232d32902b7569827bd4f2717b3ef7dffaaa9 SHA512 01deef1de981201c14101630d2a4ae270abcac9a4b27b068359d76f63aeb6075aceb33db60175c105294cb7045aae389168f4cf1edf0f6e3656ccc2fe92e9c92
diff --git a/dev-libs/openssl/files/openssl-1.1.1p-fix-test-build.patch b/dev-libs/openssl/files/openssl-1.1.1p-fix-test-build.patch
deleted file mode 100644
index 5dca6926dd8f..000000000000
--- a/dev-libs/openssl/files/openssl-1.1.1p-fix-test-build.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-https://github.com/openssl/openssl/issues/18619
-https://github.com/openssl/openssl/pull/18634
-https://github.com/openssl/openssl/commit/665ab12ed3f0d78e7cb6a55cdd2b83a2fe150232
-
-From 665ab12ed3f0d78e7cb6a55cdd2b83a2fe150232 Mon Sep 17 00:00:00 2001
-From: Bernd Edlinger <bernd.edlinger@hotmail.de>
-Date: Fri, 17 Jun 2022 10:25:24 +0200
-Subject: [PATCH] Fix compile issues in test/v3ext.c with no-rfc3779
-
-There are no ASIdentifiers if OPENSSL_NO_RFC3779 is defined,
-therefore the test cannot be compiled.
-
-Reviewed-by: Matt Caswell <matt@openssl.org>
-Reviewed-by: Tomas Mraz <tomas@openssl.org>
-Reviewed-by: Paul Dale <pauli@openssl.org>
-(Merged from https://github.com/openssl/openssl/pull/18634)
-
-(cherry picked from commit b76efe61ea9710a8f69e1cb8caf1aeb2ba6f1ebe)
----
- test/v3ext.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/test/v3ext.c b/test/v3ext.c
-index e96b6f79b58f..a2adb1a9f0ef 100644
---- a/test/v3ext.c
-+++ b/test/v3ext.c
-@@ -37,6 +37,7 @@ static int test_pathlen(void)
-     return ret;
- }
- 
-+#ifndef OPENSSL_NO_RFC3779
- static int test_asid(void)
- {
-     ASN1_INTEGER *val1 = NULL, *val2 = NULL;
-@@ -113,6 +114,7 @@ static int test_asid(void)
-     ASIdentifiers_free(asid4);
-     return testresult;
- }
-+#endif /* OPENSSL_NO_RFC3779 */
- 
- OPT_TEST_DECLARE_USAGE("cert.pem\n")
- 
-@@ -127,6 +129,8 @@ int setup_tests(void)
-         return 0;
- 
-     ADD_TEST(test_pathlen);
-+#ifndef OPENSSL_NO_RFC3779
-     ADD_TEST(test_asid);
-+#endif /* OPENSSL_NO_RFC3779 */
-     return 1;
- }
-
diff --git a/dev-libs/openssl/openssl-1.1.1n.ebuild b/dev-libs/openssl/openssl-1.1.1n.ebuild
deleted file mode 100644
index 5cfa2b82bf24..000000000000
--- a/dev-libs/openssl/openssl-1.1.1n.ebuild
+++ /dev/null
@@ -1,298 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit flag-o-matic toolchain-funcs multilib-minimal verify-sig
-
-MY_P=${P/_/-}
-
-DESCRIPTION="full-strength general purpose cryptography library (including SSL and TLS)"
-HOMEPAGE="https://www.openssl.org/"
-SRC_URI="mirror://openssl/source/${MY_P}.tar.gz
-	verify-sig? ( mirror://openssl/source/${MY_P}.tar.gz.asc )"
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/openssl.org.asc
-
-LICENSE="openssl"
-SLOT="0/1.1" # .so version of libssl/libcrypto
-[[ "${PV}" = *_pre* ]] || \
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE="+asm rfc3779 sctp cpu_flags_x86_sse2 sslv3 static-libs test tls-compression tls-heartbeat vanilla verify-sig weak-ssl-ciphers"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=app-misc/c_rehash-1.7-r1
-	tls-compression? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	>=dev-lang/perl-5
-	sctp? ( >=net-misc/lksctp-tools-1.0.12 )
-	test? (
-		sys-apps/diffutils
-		sys-devel/bc
-		kernel_linux? ( sys-process/procps )
-	)
-	verify-sig? ( sec-keys/openpgp-keys-openssl )"
-PDEPEND="app-misc/ca-certificates"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.1.0j-parallel_install_fix.patch #671602
-	"${FILESDIR}"/${PN}-1.1.1i-riscv32.patch
-)
-
-S="${WORKDIR}/${MY_P}"
-
-# force upgrade to prevent broken login, bug 696950
-RDEPEND+=" !<net-misc/openssh-8.0_p1-r3"
-
-MULTILIB_WRAPPED_HEADERS=(
-	usr/include/openssl/opensslconf.h
-)
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} == binary ]] && return
-
-	# must check in pkg_setup; sysctl don't work with userpriv!
-	if use test && use sctp; then
-		# test_ssl_new will fail with "Ensure SCTP AUTH chunks are enabled in kernel"
-		# if sctp.auth_enable is not enabled.
-		local sctp_auth_status=$(sysctl -n net.sctp.auth_enable 2>/dev/null)
-		if [[ -z "${sctp_auth_status}" ]] || [[ ${sctp_auth_status} != 1 ]]; then
-			die "FEATURES=test with USE=sctp requires net.sctp.auth_enable=1!"
-		fi
-	fi
-}
-
-src_prepare() {
-	# allow openssl to be cross-compiled
-	cp "${FILESDIR}"/gentoo.config-1.0.2 gentoo.config || die
-	chmod a+rx gentoo.config || die
-
-	# keep this in sync with app-misc/c_rehash
-	SSL_CNF_DIR="/etc/ssl"
-
-	# Make sure we only ever touch Makefile.org and avoid patching a file
-	# that gets blown away anyways by the Configure script in src_configure
-	rm -f Makefile
-
-	if ! use vanilla ; then
-		if [[ $(declare -p PATCHES 2>/dev/null) == "declare -a"* ]] ; then
-			[[ ${#PATCHES[@]} -gt 0 ]] && eapply "${PATCHES[@]}"
-		fi
-	fi
-
-	eapply_user #332661
-
-	if use test && use sctp && has network-sandbox ${FEATURES}; then
-		ebegin "Disabling test '80-test_ssl_new.t' which is known to fail with FEATURES=network-sandbox"
-		rm test/recipes/80-test_ssl_new.t || die
-		eend $?
-	fi
-
-	# make sure the man pages are suffixed #302165
-	# don't bother building man pages if they're disabled
-	# Make DOCDIR Gentoo compliant
-	sed -i \
-		-e '/^MANSUFFIX/s:=.*:=ssl:' \
-		-e '/^MAKEDEPPROG/s:=.*:=$(CC):' \
-		-e $(has noman FEATURES \
-			&& echo '/^install:/s:install_docs::' \
-			|| echo '/^MANDIR=/s:=.*:='${EPREFIX}'/usr/share/man:') \
-		-e "/^DOCDIR/s@\$(BASENAME)@&-${PVR}@" \
-		Configurations/unix-Makefile.tmpl \
-		|| die
-
-	# quiet out unknown driver argument warnings since openssl
-	# doesn't have well-split CFLAGS and we're making it even worse
-	# and 'make depend' uses -Werror for added fun (#417795 again)
-	[[ ${CC} == *clang* ]] && append-flags -Qunused-arguments
-
-	append-flags -fno-strict-aliasing
-	append-flags $(test-flags-CC -Wa,--noexecstack)
-	append-cppflags -DOPENSSL_NO_BUF_FREELISTS
-
-	# Prefixify Configure shebang (#141906)
-	sed \
-		-e "1s,/usr/bin/env,${EPREFIX}&," \
-		-i Configure || die
-	# Remove test target when FEATURES=test isn't set
-	if ! use test ; then
-		sed \
-			-e '/^$config{dirs}/s@ "test",@@' \
-			-i Configure || die
-	fi
-
-	if use prefix && [[ ${CHOST} == *-solaris* ]] ; then
-		# use GNU ld full option, not to confuse it on Solaris
-		sed -i \
-			-e 's/-Wl,-M,/-Wl,--version-script=/' \
-			-e 's/-Wl,-h,/-Wl,--soname=/' \
-			Configurations/10-main.conf || die
-
-		# fix building on Solaris 10
-		# https://github.com/openssl/openssl/issues/6333
-		sed -i \
-			-e 's/-lsocket -lnsl -ldl/-lsocket -lnsl -ldl -lrt/' \
-			Configurations/10-main.conf || die
-	fi
-
-	# The config script does stupid stuff to prompt the user.  Kill it.
-	sed -i '/stty -icanon min 0 time 50; read waste/d' config || die
-	./config --test-sanity || die "I AM NOT SANE"
-
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	unset APPS #197996
-	unset SCRIPTS #312551
-	unset CROSS_COMPILE #311473
-
-	tc-export CC AR RANLIB RC
-
-	use_ssl() { usex $1 "enable-${2:-$1}" "no-${2:-$1}" " ${*:3}" ; }
-	echoit() { echo "$@" ; "$@" ; }
-
-	local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal")
-
-	# See if our toolchain supports __uint128_t.  If so, it's 64bit
-	# friendly and can use the nicely optimized code paths. #460790
-	local ec_nistp_64_gcc_128
-	# Disable it for now though #469976
-	# echo "__uint128_t i;" > "${T}"/128.c
-	# if ${CC} ${CFLAGS} -c "${T}"/128.c -o /dev/null >&/dev/null ; then
-	# 	ec_nistp_64_gcc_128="enable-ec_nistp_64_gcc_128"
-	# fi
-
-	local sslout=$(./gentoo.config)
-	einfo "Use configuration ${sslout:-(openssl knows best)}"
-	local config="Configure"
-	[[ -z ${sslout} ]] && config="config"
-
-	# "disable-deprecated" option breaks too many consumers.
-	# Don't set it without thorough revdeps testing.
-	# Make sure user flags don't get added *yet* to avoid duplicated
-	# flags.
-	CFLAGS= LDFLAGS= echoit \
-	./${config} \
-		${sslout} \
-		$(use cpu_flags_x86_sse2 || echo "no-sse2") \
-		enable-camellia \
-		enable-ec \
-		enable-ec2m \
-		enable-sm2 \
-		enable-srp \
-		$(use elibc_musl && echo "no-async") \
-		${ec_nistp_64_gcc_128} \
-		enable-idea \
-		enable-mdc2 \
-		enable-rc5 \
-		$(use_ssl sslv3 ssl3) \
-		$(use_ssl sslv3 ssl3-method) \
-		$(use_ssl asm) \
-		$(use_ssl rfc3779) \
-		$(use_ssl sctp) \
-		$(use_ssl tls-compression zlib) \
-		$(use_ssl tls-heartbeat heartbeats) \
-		$(use_ssl weak-ssl-ciphers) \
-		--prefix="${EPREFIX}"/usr \
-		--openssldir="${EPREFIX}"${SSL_CNF_DIR} \
-		--libdir=$(get_libdir) \
-		shared threads \
-		|| die
-
-	# Clean out hardcoded flags that openssl uses
-	local DEFAULT_CFLAGS=$(grep ^CFLAGS= Makefile | LC_ALL=C sed \
-		-e 's:^CFLAGS=::' \
-		-e 's:\(^\| \)-fomit-frame-pointer::g' \
-		-e 's:\(^\| \)-O[^ ]*::g' \
-		-e 's:\(^\| \)-march=[^ ]*::g' \
-		-e 's:\(^\| \)-mcpu=[^ ]*::g' \
-		-e 's:\(^\| \)-m[^ ]*::g' \
-		-e 's:^ *::' \
-		-e 's: *$::' \
-		-e 's: \+: :g' \
-		-e 's:\\:\\\\:g'
-	)
-
-	# Now insert clean default flags with user flags
-	sed -i \
-		-e "/^CFLAGS=/s|=.*|=${DEFAULT_CFLAGS} ${CFLAGS}|" \
-		-e "/^LDFLAGS=/s|=[[:space:]]*$|=${LDFLAGS}|" \
-		Makefile || die
-}
-
-multilib_src_compile() {
-	# depend is needed to use $confopts; it also doesn't matter
-	# that it's -j1 as the code itself serializes subdirs
-	emake -j1 depend
-	emake all
-}
-
-multilib_src_test() {
-	emake -j1 test
-}
-
-multilib_src_install() {
-	# We need to create $ED/usr on our own to avoid a race condition #665130
-	if [[ ! -d "${ED}/usr" ]]; then
-		# We can only create this directory once
-		mkdir "${ED}"/usr || die
-	fi
-
-	emake DESTDIR="${D}" install
-
-	# This is crappy in that the static archives are still built even
-	# when USE=static-libs.  But this is due to a failing in the openssl
-	# build system: the static archives are built as PIC all the time.
-	# Only way around this would be to manually configure+compile openssl
-	# twice; once with shared lib support enabled and once without.
-	if ! use static-libs; then
-		rm "${ED}"/usr/$(get_libdir)/lib{crypto,ssl}.a || die
-	fi
-}
-
-multilib_src_install_all() {
-	# openssl installs perl version of c_rehash by default, but
-	# we provide a shell version via app-misc/c_rehash
-	rm "${ED}"/usr/bin/c_rehash || die
-
-	dodoc CHANGES* FAQ NEWS README doc/*.txt doc/${PN}-c-indent.el
-
-	# create the certs directory
-	keepdir ${SSL_CNF_DIR}/certs
-
-	# Namespace openssl programs to prevent conflicts with other man pages
-	cd "${ED}"/usr/share/man || die
-	local m d s
-	for m in $(find . -type f | xargs grep -L '#include') ; do
-		d=${m%/*} ; d=${d#./} ; m=${m##*/}
-		[[ ${m} == openssl.1* ]] && continue
-		[[ -n $(find -L ${d} -type l) ]] && die "erp, broken links already!"
-		mv ${d}/{,ssl-}${m}
-		# fix up references to renamed man pages
-		sed -i '/^[.]SH "SEE ALSO"/,/^[.]/s:\([^(, ]*(1)\):ssl-\1:g' ${d}/ssl-${m}
-		ln -s ssl-${m} ${d}/openssl-${m}
-		# locate any symlinks that point to this man page ... we assume
-		# that any broken links are due to the above renaming
-		for s in $(find -L ${d} -type l) ; do
-			s=${s##*/}
-			rm -f ${d}/${s}
-			# We don't want to "|| die" here
-			ln -s ssl-${m} ${d}/ssl-${s}
-			ln -s ssl-${s} ${d}/openssl-${s}
-		done
-	done
-	[[ -n $(find -L ${d} -type l) ]] && die "broken manpage links found :("
-
-	dodir /etc/sandbox.d #254521
-	echo 'SANDBOX_PREDICT="/dev/crypto"' > "${ED}"/etc/sandbox.d/10openssl
-
-	diropts -m0700
-	keepdir ${SSL_CNF_DIR}/private
-}
-
-pkg_postinst() {
-	ebegin "Running 'c_rehash ${EROOT}${SSL_CNF_DIR}/certs/' to rebuild hashes #333069"
-	c_rehash "${EROOT}${SSL_CNF_DIR}/certs" >/dev/null
-	eend $?
-}
diff --git a/dev-libs/openssl/openssl-1.1.1o-r1.ebuild b/dev-libs/openssl/openssl-1.1.1o-r1.ebuild
deleted file mode 100644
index 0e55dcc43e49..000000000000
--- a/dev-libs/openssl/openssl-1.1.1o-r1.ebuild
+++ /dev/null
@@ -1,338 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/openssl.org.asc
-inherit edo flag-o-matic toolchain-funcs multilib-minimal verify-sig
-
-MY_P=${P/_/-}
-DESCRIPTION="Full-strength general purpose cryptography library (including SSL and TLS)"
-HOMEPAGE="https://www.openssl.org/"
-SRC_URI="mirror://openssl/source/${MY_P}.tar.gz
-	https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-test-fixes-expiry.patch.xz
-	verify-sig? ( mirror://openssl/source/${MY_P}.tar.gz.asc )"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="openssl"
-SLOT="0/1.1" # .so version of libssl/libcrypto
-if [[ ${PV} != *_pre* ]] ; then
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-fi
-IUSE="+asm rfc3779 sctp cpu_flags_x86_sse2 sslv3 static-libs test tls-compression tls-heartbeat vanilla verify-sig weak-ssl-ciphers"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=app-misc/c_rehash-1.7-r1
-	tls-compression? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	>=dev-lang/perl-5
-	sctp? ( >=net-misc/lksctp-tools-1.0.12 )
-	test? (
-		sys-apps/diffutils
-		sys-devel/bc
-		kernel_linux? ( sys-process/procps )
-	)
-	verify-sig? ( sec-keys/openpgp-keys-openssl )"
-PDEPEND="app-misc/ca-certificates"
-
-# force upgrade to prevent broken login, bug #696950
-RDEPEND+=" !<net-misc/openssh-8.0_p1-r3"
-
-MULTILIB_WRAPPED_HEADERS=(
-	usr/include/openssl/opensslconf.h
-)
-
-PATCHES=(
-	# General patches which are suitable to always apply
-	# If they're Gentoo specific, add to USE=-vanilla logic in src_prepare!
-	"${FILESDIR}"/${PN}-1.1.0j-parallel_install_fix.patch #671602
-	"${FILESDIR}"/${PN}-1.1.1i-riscv32.patch
-	"${WORKDIR}"/${P}-test-fixes-expiry.patch
-)
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} == binary ]] && return
-
-	# must check in pkg_setup; sysctl doesn't work with userpriv!
-	if use test && use sctp; then
-		# test_ssl_new will fail with "Ensure SCTP AUTH chunks are enabled in kernel"
-		# if sctp.auth_enable is not enabled.
-		local sctp_auth_status=$(sysctl -n net.sctp.auth_enable 2>/dev/null)
-		if [[ -z "${sctp_auth_status}" ]] || [[ ${sctp_auth_status} != 1 ]]; then
-			die "FEATURES=test with USE=sctp requires net.sctp.auth_enable=1!"
-		fi
-	fi
-}
-
-src_unpack() {
-	# Can delete this once test fix patch is dropped
-	if use verify-sig ; then
-		# Needed for downloaded patch (which is unsigned, which is fine)
-		verify-sig_verify_detached "${DISTDIR}"/${P}.tar.gz{,.asc}
-	fi
-
-	default
-}
-
-src_prepare() {
-	# Allow openssl to be cross-compiled
-	cp "${FILESDIR}"/gentoo.config-1.0.2 gentoo.config || die
-	chmod a+rx gentoo.config || die
-
-	# Keep this in sync with app-misc/c_rehash
-	SSL_CNF_DIR="/etc/ssl"
-
-	# Make sure we only ever touch Makefile.org and avoid patching a file
-	# that gets blown away anyways by the Configure script in src_configure
-	rm -f Makefile
-
-	if ! use vanilla ; then
-		PATCHES+=(
-			# Add patches which are Gentoo-specific customisations here
-		)
-	fi
-
-	default
-
-	if use test && use sctp && has network-sandbox ${FEATURES}; then
-		einfo "Disabling test '80-test_ssl_new.t' which is known to fail with FEATURES=network-sandbox ..."
-		rm test/recipes/80-test_ssl_new.t || die
-	fi
-
-	# - Make sure the man pages are suffixed (bug #302165)
-	# - Don't bother building man pages if they're disabled
-	# - Make DOCDIR Gentoo compliant
-	sed -i \
-		-e '/^MANSUFFIX/s:=.*:=ssl:' \
-		-e '/^MAKEDEPPROG/s:=.*:=$(CC):' \
-		-e $(has noman FEATURES \
-			&& echo '/^install:/s:install_docs::' \
-			|| echo '/^MANDIR=/s:=.*:='${EPREFIX}'/usr/share/man:') \
-		-e "/^DOCDIR/s@\$(BASENAME)@&-${PVR}@" \
-		Configurations/unix-Makefile.tmpl \
-		|| die
-
-	# Quiet out unknown driver argument warnings since openssl
-	# doesn't have well-split CFLAGS and we're making it even worse
-	# and 'make depend' uses -Werror for added fun (bug #417795 again)
-	tc-is-clang && append-flags -Qunused-arguments
-
-	# We really, really need to build OpenSSL w/ strict aliasing disabled.
-	# It's filled with violations and it *will* result in miscompiled
-	# code. This has been in the ebuild for > 10 years but even in 2022,
-	# it's still relevant:
-	# - https://github.com/llvm/llvm-project/issues/55255
-	# - https://github.com/openssl/openssl/issues/18225
-	# Don't remove the no strict aliasing bits below!
-	filter-flags -fstrict-aliasing
-	append-flags -fno-strict-aliasing
-
-	append-cppflags -DOPENSSL_NO_BUF_FREELISTS
-
-	append-flags $(test-flags-CC -Wa,--noexecstack)
-
-	# Prefixify Configure shebang (bug #141906)
-	sed \
-		-e "1s,/usr/bin/env,${EPREFIX}&," \
-		-i Configure || die
-
-	# Remove test target when FEATURES=test isn't set
-	if ! use test ; then
-		sed \
-			-e '/^$config{dirs}/s@ "test",@@' \
-			-i Configure || die
-	fi
-
-	if use prefix && [[ ${CHOST} == *-solaris* ]] ; then
-		# use GNU ld full option, not to confuse it on Solaris
-		sed -i \
-			-e 's/-Wl,-M,/-Wl,--version-script=/' \
-			-e 's/-Wl,-h,/-Wl,--soname=/' \
-			Configurations/10-main.conf || die
-
-		# fix building on Solaris 10
-		# https://github.com/openssl/openssl/issues/6333
-		sed -i \
-			-e 's/-lsocket -lnsl -ldl/-lsocket -lnsl -ldl -lrt/' \
-			Configurations/10-main.conf || die
-	fi
-
-	# The config script does stupid stuff to prompt the user.  Kill it.
-	sed -i '/stty -icanon min 0 time 50; read waste/d' config || die
-	./config --test-sanity || die "I AM NOT SANE"
-
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	# bug #197996
-	unset APPS
-	# bug #312551
-	unset SCRIPTS
-	# bug #311473
-	unset CROSS_COMPILE
-
-	tc-export AR CC CXX RANLIB RC
-
-	use_ssl() { usex $1 "enable-${2:-$1}" "no-${2:-$1}" " ${*:3}" ; }
-
-	local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal")
-
-	# See if our toolchain supports __uint128_t.  If so, it's 64bit
-	# friendly and can use the nicely optimized code paths, bug #460790.
-	local ec_nistp_64_gcc_128
-
-	# Disable it for now though (bug #469976)
-	# echo "__uint128_t i;" > "${T}"/128.c
-	# if ${CC} ${CFLAGS} -c "${T}"/128.c -o /dev/null >&/dev/null ; then
-	# 	ec_nistp_64_gcc_128="enable-ec_nistp_64_gcc_128"
-	# fi
-
-	local sslout=$(./gentoo.config)
-	einfo "Use configuration ${sslout:-(openssl knows best)}"
-	local config="Configure"
-	[[ -z ${sslout} ]] && config="config"
-
-	# "disable-deprecated" option breaks too many consumers.
-	# Don't set it without thorough revdeps testing.
-	# Make sure user flags don't get added *yet* to avoid duplicated
-	# flags.
-	local myeconfargs=(
-		${sslout}
-
-		$(use cpu_flags_x86_sse2 || echo "no-sse2")
-		enable-camellia
-		enable-ec
-		enable-ec2m
-		enable-sm2
-		enable-srp
-		$(use elibc_musl && echo "no-async")
-		${ec_nistp_64_gcc_128}
-		enable-idea
-		enable-mdc2
-		enable-rc5
-		$(use_ssl sslv3 ssl3)
-		$(use_ssl sslv3 ssl3-method)
-		$(use_ssl asm)
-		$(use_ssl rfc3779)
-		$(use_ssl sctp)
-		$(use test || echo "no-tests")
-		$(use_ssl tls-compression zlib)
-		$(use_ssl tls-heartbeat heartbeats)
-		$(use_ssl weak-ssl-ciphers)
-
-		--prefix="${EPREFIX}"/usr
-		--openssldir="${EPREFIX}"${SSL_CNF_DIR}
-		--libdir=$(get_libdir)
-
-		shared
-		threads
-	)
-
-	CFLAGS= LDFLAGS= edo ./${config} "${myeconfargs[@]}"
-
-	# Clean out hardcoded flags that openssl uses
-	local DEFAULT_CFLAGS=$(grep ^CFLAGS= Makefile | LC_ALL=C sed \
-		-e 's:^CFLAGS=::' \
-		-e 's:\(^\| \)-fomit-frame-pointer::g' \
-		-e 's:\(^\| \)-O[^ ]*::g' \
-		-e 's:\(^\| \)-march=[^ ]*::g' \
-		-e 's:\(^\| \)-mcpu=[^ ]*::g' \
-		-e 's:\(^\| \)-m[^ ]*::g' \
-		-e 's:^ *::' \
-		-e 's: *$::' \
-		-e 's: \+: :g' \
-		-e 's:\\:\\\\:g'
-	)
-
-	# Now insert clean default flags with user flags
-	sed -i \
-		-e "/^CFLAGS=/s|=.*|=${DEFAULT_CFLAGS} ${CFLAGS}|" \
-		-e "/^LDFLAGS=/s|=[[:space:]]*$|=${LDFLAGS}|" \
-		Makefile || die
-}
-
-multilib_src_compile() {
-	# depend is needed to use $confopts; it also doesn't matter
-	# that it's -j1 as the code itself serializes subdirs
-	emake -j1 depend
-
-	emake all
-}
-
-multilib_src_test() {
-	emake -j1 test
-}
-
-multilib_src_install() {
-	# We need to create ${ED}/usr on our own to avoid a race condition (bug #665130)
-	dodir /usr
-
-	emake DESTDIR="${D}" install
-
-	# This is crappy in that the static archives are still built even
-	# when USE=static-libs. But this is due to a failing in the openssl
-	# build system: the static archives are built as PIC all the time.
-	# Only way around this would be to manually configure+compile openssl
-	# twice; once with shared lib support enabled and once without.
-	if ! use static-libs; then
-		rm "${ED}"/usr/$(get_libdir)/lib{crypto,ssl}.a || die
-	fi
-}
-
-multilib_src_install_all() {
-	# openssl installs perl version of c_rehash by default, but
-	# we provide a shell version via app-misc/c_rehash
-	rm "${ED}"/usr/bin/c_rehash || die
-
-	dodoc CHANGES* FAQ NEWS README doc/*.txt doc/${PN}-c-indent.el
-
-	# Create the certs directory
-	keepdir ${SSL_CNF_DIR}/certs
-
-	# Namespace openssl programs to prevent conflicts with other man pages
-	cd "${ED}"/usr/share/man || die
-	local m d s
-	for m in $(find . -type f | xargs grep -L '#include') ; do
-		d=${m%/*}
-		d=${d#./}
-		m=${m##*/}
-
-		[[ ${m} == openssl.1* ]] && continue
-
-		[[ -n $(find -L ${d} -type l) ]] && die "erp, broken links already!"
-
-		mv ${d}/{,ssl-}${m} || die
-
-		# Fix up references to renamed man pages
-		sed -i '/^[.]SH "SEE ALSO"/,/^[.]/s:\([^(, ]*(1)\):ssl-\1:g' ${d}/ssl-${m} || die
-		ln -s ssl-${m} ${d}/openssl-${m}
-
-		# Locate any symlinks that point to this man page
-		# We assume that any broken links are due to the above renaming
-		for s in $(find -L ${d} -type l) ; do
-			s=${s##*/}
-
-			rm -f ${d}/${s}
-
-			# We don't want to "|| die" here
-			ln -s ssl-${m} ${d}/ssl-${s}
-			ln -s ssl-${s} ${d}/openssl-${s}
-		done
-	done
-	[[ -n $(find -L ${d} -type l) ]] && die "broken manpage links found :("
-
-	# bug #254521
-	dodir /etc/sandbox.d
-	echo 'SANDBOX_PREDICT="/dev/crypto"' > "${ED}"/etc/sandbox.d/10openssl
-
-	diropts -m0700
-	keepdir ${SSL_CNF_DIR}/private
-}
-
-pkg_postinst() {
-	ebegin "Running 'c_rehash ${EROOT}${SSL_CNF_DIR}/certs/' to rebuild hashes (bug #333069)"
-	c_rehash "${EROOT}${SSL_CNF_DIR}/certs" >/dev/null
-	eend $?
-}
diff --git a/dev-libs/openssl/openssl-1.1.1o.ebuild b/dev-libs/openssl/openssl-1.1.1o.ebuild
deleted file mode 100644
index 730dfb22685e..000000000000
--- a/dev-libs/openssl/openssl-1.1.1o.ebuild
+++ /dev/null
@@ -1,318 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit edo flag-o-matic toolchain-funcs multilib-minimal verify-sig
-
-MY_P=${P/_/-}
-
-DESCRIPTION="full-strength general purpose cryptography library (including SSL and TLS)"
-HOMEPAGE="https://www.openssl.org/"
-SRC_URI="mirror://openssl/source/${MY_P}.tar.gz
-	https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-test-fixes-expiry.patch.xz
-	verify-sig? ( mirror://openssl/source/${MY_P}.tar.gz.asc )"
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/openssl.org.asc
-
-LICENSE="openssl"
-SLOT="0/1.1" # .so version of libssl/libcrypto
-[[ "${PV}" = *_pre* ]] || \
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE="+asm rfc3779 sctp cpu_flags_x86_sse2 sslv3 static-libs test tls-compression tls-heartbeat vanilla verify-sig weak-ssl-ciphers"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=app-misc/c_rehash-1.7-r1
-	tls-compression? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	>=dev-lang/perl-5
-	sctp? ( >=net-misc/lksctp-tools-1.0.12 )
-	test? (
-		sys-apps/diffutils
-		sys-devel/bc
-		kernel_linux? ( sys-process/procps )
-	)
-	verify-sig? ( sec-keys/openpgp-keys-openssl )"
-PDEPEND="app-misc/ca-certificates"
-
-S="${WORKDIR}/${MY_P}"
-
-# force upgrade to prevent broken login, bug 696950
-RDEPEND+=" !<net-misc/openssh-8.0_p1-r3"
-
-MULTILIB_WRAPPED_HEADERS=(
-	usr/include/openssl/opensslconf.h
-)
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.1.0j-parallel_install_fix.patch #671602
-	"${FILESDIR}"/${PN}-1.1.1i-riscv32.patch
-	"${WORKDIR}"/${P}-test-fixes-expiry.patch
-)
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} == binary ]] && return
-
-	# must check in pkg_setup; sysctl don't work with userpriv!
-	if use test && use sctp; then
-		# test_ssl_new will fail with "Ensure SCTP AUTH chunks are enabled in kernel"
-		# if sctp.auth_enable is not enabled.
-		local sctp_auth_status=$(sysctl -n net.sctp.auth_enable 2>/dev/null)
-		if [[ -z "${sctp_auth_status}" ]] || [[ ${sctp_auth_status} != 1 ]]; then
-			die "FEATURES=test with USE=sctp requires net.sctp.auth_enable=1!"
-		fi
-	fi
-}
-
-src_unpack() {
-	# Can delete this once test fix patch is dropped
-	if use verify-sig ; then
-		# Needed for downloaded patch (which is unsigned, which is fine)
-		verify-sig_verify_detached "${DISTDIR}"/${P}.tar.gz{,.asc}
-	fi
-
-	default
-}
-
-src_prepare() {
-	# allow openssl to be cross-compiled
-	cp "${FILESDIR}"/gentoo.config-1.0.2 gentoo.config || die
-	chmod a+rx gentoo.config || die
-
-	# keep this in sync with app-misc/c_rehash
-	SSL_CNF_DIR="/etc/ssl"
-
-	# Make sure we only ever touch Makefile.org and avoid patching a file
-	# that gets blown away anyways by the Configure script in src_configure
-	rm -f Makefile
-
-	if ! use vanilla ; then
-		if [[ $(declare -p PATCHES 2>/dev/null) == "declare -a"* ]] ; then
-			[[ ${#PATCHES[@]} -gt 0 ]] && eapply "${PATCHES[@]}"
-		fi
-	fi
-
-	eapply_user #332661
-
-	if use test && use sctp && has network-sandbox ${FEATURES}; then
-		ebegin "Disabling test '80-test_ssl_new.t' which is known to fail with FEATURES=network-sandbox"
-		rm test/recipes/80-test_ssl_new.t || die
-		eend $?
-	fi
-
-	# make sure the man pages are suffixed #302165
-	# don't bother building man pages if they're disabled
-	# Make DOCDIR Gentoo compliant
-	sed -i \
-		-e '/^MANSUFFIX/s:=.*:=ssl:' \
-		-e '/^MAKEDEPPROG/s:=.*:=$(CC):' \
-		-e $(has noman FEATURES \
-			&& echo '/^install:/s:install_docs::' \
-			|| echo '/^MANDIR=/s:=.*:='${EPREFIX}'/usr/share/man:') \
-		-e "/^DOCDIR/s@\$(BASENAME)@&-${PVR}@" \
-		Configurations/unix-Makefile.tmpl \
-		|| die
-
-	# quiet out unknown driver argument warnings since openssl
-	# doesn't have well-split CFLAGS and we're making it even worse
-	# and 'make depend' uses -Werror for added fun (#417795 again)
-	[[ ${CC} == *clang* ]] && append-flags -Qunused-arguments
-
-	# We really, really need to build OpenSSL w/ strict aliasing disabled.
-	# It's filled with violations and it *will* result in miscompiled
-	# code. This has been in the ebuild for > 10 years but even in 2022,
-	# it's still relevant:
-	# - https://github.com/llvm/llvm-project/issues/55255
-	# - https://github.com/openssl/openssl/issues/18225
-	# Don't remove the no strict aliasing bits below!
-	filter-flags -fstrict-aliasing
-	append-flags -fno-strict-aliasing
-
-	append-cppflags -DOPENSSL_NO_BUF_FREELISTS
-
-	append-flags $(test-flags-CC -Wa,--noexecstack)
-
-	# Prefixify Configure shebang (#141906)
-	sed \
-		-e "1s,/usr/bin/env,${EPREFIX}&," \
-		-i Configure || die
-	# Remove test target when FEATURES=test isn't set
-	if ! use test ; then
-		sed \
-			-e '/^$config{dirs}/s@ "test",@@' \
-			-i Configure || die
-	fi
-
-	if use prefix && [[ ${CHOST} == *-solaris* ]] ; then
-		# use GNU ld full option, not to confuse it on Solaris
-		sed -i \
-			-e 's/-Wl,-M,/-Wl,--version-script=/' \
-			-e 's/-Wl,-h,/-Wl,--soname=/' \
-			Configurations/10-main.conf || die
-
-		# fix building on Solaris 10
-		# https://github.com/openssl/openssl/issues/6333
-		sed -i \
-			-e 's/-lsocket -lnsl -ldl/-lsocket -lnsl -ldl -lrt/' \
-			Configurations/10-main.conf || die
-	fi
-
-	# The config script does stupid stuff to prompt the user.  Kill it.
-	sed -i '/stty -icanon min 0 time 50; read waste/d' config || die
-	./config --test-sanity || die "I AM NOT SANE"
-
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	unset APPS #197996
-	unset SCRIPTS #312551
-	unset CROSS_COMPILE #311473
-
-	tc-export CC AR RANLIB RC
-
-	use_ssl() { usex $1 "enable-${2:-$1}" "no-${2:-$1}" " ${*:3}" ; }
-
-	local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal")
-
-	# See if our toolchain supports __uint128_t.  If so, it's 64bit
-	# friendly and can use the nicely optimized code paths. #460790
-	local ec_nistp_64_gcc_128
-	# Disable it for now though #469976
-	# echo "__uint128_t i;" > "${T}"/128.c
-	# if ${CC} ${CFLAGS} -c "${T}"/128.c -o /dev/null >&/dev/null ; then
-	# 	ec_nistp_64_gcc_128="enable-ec_nistp_64_gcc_128"
-	# fi
-
-	local sslout=$(./gentoo.config)
-	einfo "Use configuration ${sslout:-(openssl knows best)}"
-	local config="Configure"
-	[[ -z ${sslout} ]] && config="config"
-
-	# "disable-deprecated" option breaks too many consumers.
-	# Don't set it without thorough revdeps testing.
-	# Make sure user flags don't get added *yet* to avoid duplicated
-	# flags.
-	CFLAGS= LDFLAGS= edo ./${config} \
-		${sslout} \
-		$(use cpu_flags_x86_sse2 || echo "no-sse2") \
-		enable-camellia \
-		enable-ec \
-		enable-ec2m \
-		enable-sm2 \
-		enable-srp \
-		$(use elibc_musl && echo "no-async") \
-		${ec_nistp_64_gcc_128} \
-		enable-idea \
-		enable-mdc2 \
-		enable-rc5 \
-		$(use_ssl sslv3 ssl3) \
-		$(use_ssl sslv3 ssl3-method) \
-		$(use_ssl asm) \
-		$(use_ssl rfc3779) \
-		$(use_ssl sctp) \
-		$(use test || echo "no-tests") \
-		$(use_ssl tls-compression zlib) \
-		$(use_ssl tls-heartbeat heartbeats) \
-		$(use_ssl weak-ssl-ciphers) \
-		--prefix="${EPREFIX}"/usr \
-		--openssldir="${EPREFIX}"${SSL_CNF_DIR} \
-		--libdir=$(get_libdir) \
-		shared threads
-
-	# Clean out hardcoded flags that openssl uses
-	local DEFAULT_CFLAGS=$(grep ^CFLAGS= Makefile | LC_ALL=C sed \
-		-e 's:^CFLAGS=::' \
-		-e 's:\(^\| \)-fomit-frame-pointer::g' \
-		-e 's:\(^\| \)-O[^ ]*::g' \
-		-e 's:\(^\| \)-march=[^ ]*::g' \
-		-e 's:\(^\| \)-mcpu=[^ ]*::g' \
-		-e 's:\(^\| \)-m[^ ]*::g' \
-		-e 's:^ *::' \
-		-e 's: *$::' \
-		-e 's: \+: :g' \
-		-e 's:\\:\\\\:g'
-	)
-
-	# Now insert clean default flags with user flags
-	sed -i \
-		-e "/^CFLAGS=/s|=.*|=${DEFAULT_CFLAGS} ${CFLAGS}|" \
-		-e "/^LDFLAGS=/s|=[[:space:]]*$|=${LDFLAGS}|" \
-		Makefile || die
-}
-
-multilib_src_compile() {
-	# depend is needed to use $confopts; it also doesn't matter
-	# that it's -j1 as the code itself serializes subdirs
-	emake -j1 depend
-	emake all
-}
-
-multilib_src_test() {
-	emake -j1 test
-}
-
-multilib_src_install() {
-	# We need to create $ED/usr on our own to avoid a race condition #665130
-	if [[ ! -d "${ED}/usr" ]]; then
-		# We can only create this directory once
-		mkdir "${ED}"/usr || die
-	fi
-
-	emake DESTDIR="${D}" install
-
-	# This is crappy in that the static archives are still built even
-	# when USE=static-libs.  But this is due to a failing in the openssl
-	# build system: the static archives are built as PIC all the time.
-	# Only way around this would be to manually configure+compile openssl
-	# twice; once with shared lib support enabled and once without.
-	if ! use static-libs; then
-		rm "${ED}"/usr/$(get_libdir)/lib{crypto,ssl}.a || die
-	fi
-}
-
-multilib_src_install_all() {
-	# openssl installs perl version of c_rehash by default, but
-	# we provide a shell version via app-misc/c_rehash
-	rm "${ED}"/usr/bin/c_rehash || die
-
-	dodoc CHANGES* FAQ NEWS README doc/*.txt doc/${PN}-c-indent.el
-
-	# create the certs directory
-	keepdir ${SSL_CNF_DIR}/certs
-
-	# Namespace openssl programs to prevent conflicts with other man pages
-	cd "${ED}"/usr/share/man || die
-	local m d s
-	for m in $(find . -type f | xargs grep -L '#include') ; do
-		d=${m%/*} ; d=${d#./} ; m=${m##*/}
-		[[ ${m} == openssl.1* ]] && continue
-		[[ -n $(find -L ${d} -type l) ]] && die "erp, broken links already!"
-		mv ${d}/{,ssl-}${m}
-		# fix up references to renamed man pages
-		sed -i '/^[.]SH "SEE ALSO"/,/^[.]/s:\([^(, ]*(1)\):ssl-\1:g' ${d}/ssl-${m}
-		ln -s ssl-${m} ${d}/openssl-${m}
-		# locate any symlinks that point to this man page ... we assume
-		# that any broken links are due to the above renaming
-		for s in $(find -L ${d} -type l) ; do
-			s=${s##*/}
-			rm -f ${d}/${s}
-			# We don't want to "|| die" here
-			ln -s ssl-${m} ${d}/ssl-${s}
-			ln -s ssl-${s} ${d}/openssl-${s}
-		done
-	done
-	[[ -n $(find -L ${d} -type l) ]] && die "broken manpage links found :("
-
-	dodir /etc/sandbox.d #254521
-	echo 'SANDBOX_PREDICT="/dev/crypto"' > "${ED}"/etc/sandbox.d/10openssl
-
-	diropts -m0700
-	keepdir ${SSL_CNF_DIR}/private
-}
-
-pkg_postinst() {
-	ebegin "Running 'c_rehash ${EROOT}${SSL_CNF_DIR}/certs/' to rebuild hashes #333069"
-	c_rehash "${EROOT}${SSL_CNF_DIR}/certs" >/dev/null
-	eend $?
-}
diff --git a/dev-libs/openssl/openssl-1.1.1p.ebuild b/dev-libs/openssl/openssl-1.1.1p.ebuild
deleted file mode 100644
index fef3fdf53f3f..000000000000
--- a/dev-libs/openssl/openssl-1.1.1p.ebuild
+++ /dev/null
@@ -1,337 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/openssl.org.asc
-inherit edo flag-o-matic toolchain-funcs multilib-minimal verify-sig
-
-MY_P=${P/_/-}
-DESCRIPTION="Full-strength general purpose cryptography library (including SSL and TLS)"
-HOMEPAGE="https://www.openssl.org/"
-SRC_URI="mirror://openssl/source/${MY_P}.tar.gz
-	verify-sig? ( mirror://openssl/source/${MY_P}.tar.gz.asc )"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="openssl"
-SLOT="0/1.1" # .so version of libssl/libcrypto
-if [[ ${PV} != *_pre* ]] ; then
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-fi
-IUSE="+asm rfc3779 sctp cpu_flags_x86_sse2 sslv3 static-libs test tls-compression tls-heartbeat vanilla verify-sig weak-ssl-ciphers"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=app-misc/c_rehash-1.7-r1
-	tls-compression? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	>=dev-lang/perl-5
-	sctp? ( >=net-misc/lksctp-tools-1.0.12 )
-	test? (
-		sys-apps/diffutils
-		sys-devel/bc
-		kernel_linux? ( sys-process/procps )
-	)
-	verify-sig? ( sec-keys/openpgp-keys-openssl )"
-PDEPEND="app-misc/ca-certificates"
-
-# force upgrade to prevent broken login, bug #696950
-RDEPEND+=" !<net-misc/openssh-8.0_p1-r3"
-
-MULTILIB_WRAPPED_HEADERS=(
-	usr/include/openssl/opensslconf.h
-)
-
-PATCHES=(
-	# General patches which are suitable to always apply
-	# If they're Gentoo specific, add to USE=-vanilla logic in src_prepare!
-	"${FILESDIR}"/${PN}-1.1.0j-parallel_install_fix.patch #671602
-	"${FILESDIR}"/${PN}-1.1.1i-riscv32.patch
-	"${FILESDIR}"/${P}-fix-test-build.patch
-)
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} == binary ]] && return
-
-	# must check in pkg_setup; sysctl doesn't work with userpriv!
-	if use test && use sctp; then
-		# test_ssl_new will fail with "Ensure SCTP AUTH chunks are enabled in kernel"
-		# if sctp.auth_enable is not enabled.
-		local sctp_auth_status=$(sysctl -n net.sctp.auth_enable 2>/dev/null)
-		if [[ -z "${sctp_auth_status}" ]] || [[ ${sctp_auth_status} != 1 ]]; then
-			die "FEATURES=test with USE=sctp requires net.sctp.auth_enable=1!"
-		fi
-	fi
-}
-
-src_unpack() {
-	# Can delete this once test fix patch is dropped
-	if use verify-sig ; then
-		# Needed for downloaded patch (which is unsigned, which is fine)
-		verify-sig_verify_detached "${DISTDIR}"/${P}.tar.gz{,.asc}
-	fi
-
-	default
-}
-
-src_prepare() {
-	# Allow openssl to be cross-compiled
-	cp "${FILESDIR}"/gentoo.config-1.0.2 gentoo.config || die
-	chmod a+rx gentoo.config || die
-
-	# Keep this in sync with app-misc/c_rehash
-	SSL_CNF_DIR="/etc/ssl"
-
-	# Make sure we only ever touch Makefile.org and avoid patching a file
-	# that gets blown away anyways by the Configure script in src_configure
-	rm -f Makefile
-
-	if ! use vanilla ; then
-		PATCHES+=(
-			# Add patches which are Gentoo-specific customisations here
-		)
-	fi
-
-	default
-
-	if use test && use sctp && has network-sandbox ${FEATURES}; then
-		einfo "Disabling test '80-test_ssl_new.t' which is known to fail with FEATURES=network-sandbox ..."
-		rm test/recipes/80-test_ssl_new.t || die
-	fi
-
-	# - Make sure the man pages are suffixed (bug #302165)
-	# - Don't bother building man pages if they're disabled
-	# - Make DOCDIR Gentoo compliant
-	sed -i \
-		-e '/^MANSUFFIX/s:=.*:=ssl:' \
-		-e '/^MAKEDEPPROG/s:=.*:=$(CC):' \
-		-e $(has noman FEATURES \
-			&& echo '/^install:/s:install_docs::' \
-			|| echo '/^MANDIR=/s:=.*:='${EPREFIX}'/usr/share/man:') \
-		-e "/^DOCDIR/s@\$(BASENAME)@&-${PVR}@" \
-		Configurations/unix-Makefile.tmpl \
-		|| die
-
-	# Quiet out unknown driver argument warnings since openssl
-	# doesn't have well-split CFLAGS and we're making it even worse
-	# and 'make depend' uses -Werror for added fun (bug #417795 again)
-	tc-is-clang && append-flags -Qunused-arguments
-
-	# We really, really need to build OpenSSL w/ strict aliasing disabled.
-	# It's filled with violations and it *will* result in miscompiled
-	# code. This has been in the ebuild for > 10 years but even in 2022,
-	# it's still relevant:
-	# - https://github.com/llvm/llvm-project/issues/55255
-	# - https://github.com/openssl/openssl/issues/18225
-	# Don't remove the no strict aliasing bits below!
-	filter-flags -fstrict-aliasing
-	append-flags -fno-strict-aliasing
-
-	append-cppflags -DOPENSSL_NO_BUF_FREELISTS
-
-	append-flags $(test-flags-CC -Wa,--noexecstack)
-
-	# Prefixify Configure shebang (bug #141906)
-	sed \
-		-e "1s,/usr/bin/env,${BROOT}&," \
-		-i Configure || die
-
-	# Remove test target when FEATURES=test isn't set
-	if ! use test ; then
-		sed \
-			-e '/^$config{dirs}/s@ "test",@@' \
-			-i Configure || die
-	fi
-
-	if use prefix && [[ ${CHOST} == *-solaris* ]] ; then
-		# use GNU ld full option, not to confuse it on Solaris
-		sed -i \
-			-e 's/-Wl,-M,/-Wl,--version-script=/' \
-			-e 's/-Wl,-h,/-Wl,--soname=/' \
-			Configurations/10-main.conf || die
-
-		# fix building on Solaris 10
-		# https://github.com/openssl/openssl/issues/6333
-		sed -i \
-			-e 's/-lsocket -lnsl -ldl/-lsocket -lnsl -ldl -lrt/' \
-			Configurations/10-main.conf || die
-	fi
-
-	# The config script does stupid stuff to prompt the user.  Kill it.
-	sed -i '/stty -icanon min 0 time 50; read waste/d' config || die
-	./config --test-sanity || die "I AM NOT SANE"
-
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	# bug #197996
-	unset APPS
-	# bug #312551
-	unset SCRIPTS
-	# bug #311473
-	unset CROSS_COMPILE
-
-	tc-export AR CC CXX RANLIB RC
-
-	use_ssl() { usex $1 "enable-${2:-$1}" "no-${2:-$1}" " ${*:3}" ; }
-
-	local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal")
-
-	# See if our toolchain supports __uint128_t.  If so, it's 64bit
-	# friendly and can use the nicely optimized code paths, bug #460790.
-	local ec_nistp_64_gcc_128
-
-	# Disable it for now though (bug #469976)
-	# echo "__uint128_t i;" > "${T}"/128.c
-	# if ${CC} ${CFLAGS} -c "${T}"/128.c -o /dev/null >&/dev/null ; then
-	# 	ec_nistp_64_gcc_128="enable-ec_nistp_64_gcc_128"
-	# fi
-
-	local sslout=$(./gentoo.config)
-	einfo "Use configuration ${sslout:-(openssl knows best)}"
-	local config="Configure"
-	[[ -z ${sslout} ]] && config="config"
-
-	# "disable-deprecated" option breaks too many consumers.
-	# Don't set it without thorough revdeps testing.
-	# Make sure user flags don't get added *yet* to avoid duplicated
-	# flags.
-	local myeconfargs=(
-		${sslout}
-
-		$(use cpu_flags_x86_sse2 || echo "no-sse2")
-		enable-camellia
-		enable-ec
-		enable-ec2m
-		enable-sm2
-		enable-srp
-		$(use elibc_musl && echo "no-async")
-		${ec_nistp_64_gcc_128}
-		enable-idea
-		enable-mdc2
-		enable-rc5
-		$(use_ssl sslv3 ssl3)
-		$(use_ssl sslv3 ssl3-method)
-		$(use_ssl asm)
-		$(use_ssl rfc3779)
-		$(use_ssl sctp)
-		$(use test || echo "no-tests")
-		$(use_ssl tls-compression zlib)
-		$(use_ssl tls-heartbeat heartbeats)
-		$(use_ssl weak-ssl-ciphers)
-
-		--prefix="${EPREFIX}"/usr
-		--openssldir="${EPREFIX}"${SSL_CNF_DIR}
-		--libdir=$(get_libdir)
-
-		shared
-		threads
-	)
-
-	CFLAGS= LDFLAGS= edo ./${config} "${myeconfargs[@]}"
-
-	# Clean out hardcoded flags that openssl uses
-	local DEFAULT_CFLAGS=$(grep ^CFLAGS= Makefile | LC_ALL=C sed \
-		-e 's:^CFLAGS=::' \
-		-e 's:\(^\| \)-fomit-frame-pointer::g' \
-		-e 's:\(^\| \)-O[^ ]*::g' \
-		-e 's:\(^\| \)-march=[^ ]*::g' \
-		-e 's:\(^\| \)-mcpu=[^ ]*::g' \
-		-e 's:\(^\| \)-m[^ ]*::g' \
-		-e 's:^ *::' \
-		-e 's: *$::' \
-		-e 's: \+: :g' \
-		-e 's:\\:\\\\:g'
-	)
-
-	# Now insert clean default flags with user flags
-	sed -i \
-		-e "/^CFLAGS=/s|=.*|=${DEFAULT_CFLAGS} ${CFLAGS}|" \
-		-e "/^LDFLAGS=/s|=[[:space:]]*$|=${LDFLAGS}|" \
-		Makefile || die
-}
-
-multilib_src_compile() {
-	# depend is needed to use $confopts; it also doesn't matter
-	# that it's -j1 as the code itself serializes subdirs
-	emake -j1 depend
-
-	emake all
-}
-
-multilib_src_test() {
-	emake -j1 test
-}
-
-multilib_src_install() {
-	# We need to create ${ED}/usr on our own to avoid a race condition (bug #665130)
-	dodir /usr
-
-	emake DESTDIR="${D}" install
-
-	# This is crappy in that the static archives are still built even
-	# when USE=static-libs. But this is due to a failing in the openssl
-	# build system: the static archives are built as PIC all the time.
-	# Only way around this would be to manually configure+compile openssl
-	# twice; once with shared lib support enabled and once without.
-	if ! use static-libs; then
-		rm "${ED}"/usr/$(get_libdir)/lib{crypto,ssl}.a || die
-	fi
-}
-
-multilib_src_install_all() {
-	# openssl installs perl version of c_rehash by default, but
-	# we provide a shell version via app-misc/c_rehash
-	rm "${ED}"/usr/bin/c_rehash || die
-
-	dodoc CHANGES* FAQ NEWS README doc/*.txt doc/${PN}-c-indent.el
-
-	# Create the certs directory
-	keepdir ${SSL_CNF_DIR}/certs
-
-	# Namespace openssl programs to prevent conflicts with other man pages
-	cd "${ED}"/usr/share/man || die
-	local m d s
-	for m in $(find . -type f | xargs grep -L '#include') ; do
-		d=${m%/*}
-		d=${d#./}
-		m=${m##*/}
-
-		[[ ${m} == openssl.1* ]] && continue
-
-		[[ -n $(find -L ${d} -type l) ]] && die "erp, broken links already!"
-
-		mv ${d}/{,ssl-}${m} || die
-
-		# Fix up references to renamed man pages
-		sed -i '/^[.]SH "SEE ALSO"/,/^[.]/s:\([^(, ]*(1)\):ssl-\1:g' ${d}/ssl-${m} || die
-		ln -s ssl-${m} ${d}/openssl-${m}
-
-		# Locate any symlinks that point to this man page
-		# We assume that any broken links are due to the above renaming
-		for s in $(find -L ${d} -type l) ; do
-			s=${s##*/}
-
-			rm -f ${d}/${s}
-
-			# We don't want to "|| die" here
-			ln -s ssl-${m} ${d}/ssl-${s}
-			ln -s ssl-${s} ${d}/openssl-${s}
-		done
-	done
-	[[ -n $(find -L ${d} -type l) ]] && die "broken manpage links found :("
-
-	# bug #254521
-	dodir /etc/sandbox.d
-	echo 'SANDBOX_PREDICT="/dev/crypto"' > "${ED}"/etc/sandbox.d/10openssl
-
-	diropts -m0700
-	keepdir ${SSL_CNF_DIR}/private
-}
-
-pkg_postinst() {
-	ebegin "Running 'c_rehash ${EROOT}${SSL_CNF_DIR}/certs/' to rebuild hashes (bug #333069)"
-	c_rehash "${EROOT}${SSL_CNF_DIR}/certs" >/dev/null
-	eend $?
-}
diff --git a/dev-libs/openssl/openssl-1.1.1q.ebuild b/dev-libs/openssl/openssl-1.1.1q.ebuild
index 0fc7c1126680..50ffbb8a79f0 100644
--- a/dev-libs/openssl/openssl-1.1.1q.ebuild
+++ b/dev-libs/openssl/openssl-1.1.1q.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
 LICENSE="openssl"
 SLOT="0/1.1" # .so version of libssl/libcrypto
 if [[ ${PV} != *_pre* ]] ; then
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 fi
 IUSE="+asm rfc3779 sctp cpu_flags_x86_sse2 sslv3 static-libs test tls-compression tls-heartbeat vanilla verify-sig weak-ssl-ciphers"
 RESTRICT="!test? ( test )"
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 1d921229e8f3..8bd9f965a0d1 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index 1d6c2324db1d..6cf0271c7fd5 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -8,33 +8,18 @@ AUX cmake-3.19.1-darwin-gcc.patch 433 BLAKE2B 72fb716af3d24d2723a06f0c2351d16af2
 AUX cmake-3.5.2-FindQt4.patch 1585 BLAKE2B 8cfda84c419515be57f65be7b4b22d7937b656eb7f58d61c7d9e30db9dac36e934f2a529b4ea20d69c5f8a653c727bae34374ebcb7f5017fd70df41abd538164 SHA512 bab8960bfea3c29416bdc8f39c7dee59b89bd7951752401f24eeb9161ac7bc2c6dd200cb62c6b9f964d763b5d257a94d8b04dc7090d6fa947a04f2d0c2e8c479
 AUX cmake-3.9.0_rc2-FindPythonInterp.patch 1458 BLAKE2B a70945921738f00952b40a73d9ea26ecc86614aa3f12c94226aac4710dd0b9723c365b6f5def965069a54919bab13a33490facc6c5e64fad69d2e05a97d2812f SHA512 8adcb75cc035f64521e85229eb8dfa1e627326f8e189f66b707b3a0448ed3ae6acf306643026f7cbc7b924edcef73cad7a107d83162b4ca46bd6bbdc7a58af12
 AUX cmake.vim 217 BLAKE2B 5d2cf8b4101a7204fd27a9f21d82fea4d86fc4eeed54e062b543452dc574e73d1c80167c83eb482d9eec310950ac811ba35d3eeb97b51958f12f3adf575ddbe7 SHA512 2f7e9e949f8f3030a0dfcef56f4effea703ee60555c22f6a2d1dfeaf3334f33a3e88910c666f704e4ab60cde4ebb509c7d85d812a3c1627010e52fc757f15cdf
-DIST cmake-3.22.2.tar.gz 9779456 BLAKE2B 5f1c76344fe2d6fba012b0d745dc990ec1ed4bf32c99beac1e538f4b83c1d695aee757d2780e635b67c0a185935a6a70b344a733259e3a91d01c4b83e94e2730 SHA512 86e95f9ce773bcc7513a1c3901561a1b09d06830936b8b1d44e075fe3bac55cfa636eccdedfa94a9939f5e12eb965224559fac30a17c64314ee023acb2a3e53f
 DIST cmake-3.22.4.tar.gz 9781548 BLAKE2B d07172091c8ff695f9af398321e4bf7b64643e9186c4e882c5fb15ae1026a306bce61b6f410a858ab580c5d8ea7b9d03c901e2c3ac1e6cf841b6ad969261b96f SHA512 4fc04ec3077b261fe252d26d18e81271975db0bb237686c0e0e774d180e6c7fdfb0275092c21569674ad0ca53218a8c6c5638a5fe5c46a988362b0083e3d40c4
 DIST cmake-3.22.6.tar.gz 9785574 BLAKE2B 7098bd32e6e5297ad27822a5e8358e0af2d916047af2e6e6bdb0b1c8e8b461c3588b8d174d6f7722a51748d47a761893108cfada9b7c19667f3143cdc5618cd3 SHA512 097e04c6f106c6020b8f145c822727a4cc79aaa234c77a9550208b5fe7787b68488dc18e5fcae0f111e20f8492294766ff396933bee687ee8ddb7bb94b71dcf8
-DIST cmake-3.23.1-SHA-256.txt 1452 BLAKE2B 8cce350435aeffdb7b903d87be611ed0362f601f7cfcff96f444859e40227b46e03baac6427587cafec79e9e1c8ab7ac4ee3dc915131c13badf2bcac99e1e8b7 SHA512 fd2dec42f51344a15d1a8e6afd35e96399765c5283925c4708aed5fa84117d0415ef014652cc740600bf75265baadac0559b6b8b1a0e60342a6e88eb61cbb4e5
-DIST cmake-3.23.1-SHA-256.txt.asc 833 BLAKE2B 28ce9f5c99b263895ad19f9df43050156ad399846daf03be96b9c4439c41d57e9c26244ab872692e98db321ba919639881d68b81237a9f443316cfa0aea1b8af SHA512 55b1808668b17a3bee0055e3736b6312e3260297ee02137e6bd90ba7a75d2a3e094e06fbe16cd299325f0c191a5f5924fadd075e5edbe3275933356df7b11b12
-DIST cmake-3.23.1.tar.gz 9982020 BLAKE2B a51eedeb78657caf86409ea8bdf4e61b09c66c6a0f3102c9b9ed42976a239f9c4561d7168b4bb24152b80cd773505166ca87e241dad3b36919b5e26573fb149e SHA512 94893f888c0cbfc58e54a0bd65d6c0697fe4a0e95c678b7cb35e7dc8854d57eb360bfc952750f97983348817f847f6df85903f21a5857b1a3880b2a7eb6cc029
-DIST cmake-3.23.2-SHA-256.txt 1452 BLAKE2B 7871939af36eafe321b835e0b34b58149227f757530465b20170a286946cc342a1fb5f3c98d5a5e9d16487931cbc3d005437c94af51b6622166092caed31f7e1 SHA512 4c96cbb45b92a5a72476d232b3c6747be418850a2fc993f2daeb22dcc4d50bcc57c747cdaec65382a3dee5f57823dbf2e06ca2b32f025fd21afec34ac4462656
-DIST cmake-3.23.2-SHA-256.txt.asc 833 BLAKE2B eaa699b3a46d0d638a426b91e54aec07fb608650f089d83fb145f3f4689edfe8b970a9e7b653746a86ed8e4d866703b51730bca6a4537d9aa90104639bbb989c SHA512 2face6d9e4556f41b3c858b30ab3fadaf931b0e110a5bfadc4ce54cb66d56039d9f129637dd9ba2135f2361384d841916da1319c2cb41a9050dc9053b44eb28e
-DIST cmake-3.23.2.tar.gz 9987716 BLAKE2B 6930deab4849eeb4451297006d7ace37483c4b9b66ddbfaf78b2393da670aa95e054b61f59763efb719a4a30342270c1fc13d298f90caff58b9b3fde97ff1c31 SHA512 0925adf973d642fd76d4089b61b3882babb0a85050c4c57d5f5f3bd6b17564a9feb0beed236cd636e25f69072fa30b67ea3f80932380b6b6576f2dd78b8e6931
 DIST cmake-3.23.3-SHA-256.txt 1452 BLAKE2B aa2e2dfb2757210688a5a9131ca1fffdf6617a52219d373fd908c08e52b7d77f0e980086561a083cabaf8d9f3e24b15064bb74ad2737fcbfe11c8aba5814eb4e SHA512 22808c050e8927867fc5d2daa6999d9eed53e99015f89d1f5bef61397d1b2a9888728e86fdca8716c47f8133e02b3fa726d0cc97c0bb4ab5f5ff16a1fc0ae82f
 DIST cmake-3.23.3-SHA-256.txt.asc 833 BLAKE2B 10f61d7cfaa5c86d0e372f33d9ba0dbe7ae9cbfe17669107167b3ae72d0e337c63fb1c27a528dcda804323a1f0d4843b630e15427c33e0f5d5c568e27cea769d SHA512 75ff4b25fdd71bc05a7d6fec3c72ec5b8d6ed7ac980d533e6c820855c74a1a58f52d53c1a454dffe1a15568445c4c1c805891997e5709567c9e7709ba1c5e4d9
 DIST cmake-3.23.3.tar.gz 9988050 BLAKE2B 55105ce380e5e9f1839fc38cc0eaefe505d58bffa60feab9813a36c7cac92f4fb6aa6b6aaad899f1e8d58cfa5ececb9e7335a470244ccc06848d833b1eddf224 SHA512 75f86abe60ef28ba9bd06546c0c24578921621fb4be942171e629366a759cf1469e430945addc85f8ce977920883c063ed26de1b78fd24dfd98d0eb604800632
-DIST cmake-3.24.0-SHA-256.txt 1646 BLAKE2B f41c0e2f280258c79c0d269a8249dc2a5e6615f50277f452f0b5b71f106f1cbcbb272bce4f28580f422cd8f294d040135abcd0d0a1e00cec3c3d3ceaef99286d SHA512 c1a0d16ba46dad95aacdf5e0985df1b75294e2fa664d15a8eabeae126b7e1517ce303c44746a58d339d2622d4dc8be263bd332af5b804ac614e64a2e633f6ec9
-DIST cmake-3.24.0-SHA-256.txt.asc 833 BLAKE2B 828f1130930635ad78b6829d8cb1780d9fb9a45edf1650e19a2869d18fd3225d869c664d28775a9b29934f1e3958dae542de3a37e5e3aa965b1704c512b2ee86 SHA512 dc0c495892716643f6ce1015240c373c6145ef070b35f7229d8f109a9bf4c771b49da6672ba765f69c293ed438e26afcab4bb6fa8a3c36f8b4ac91b49b6782bb
-DIST cmake-3.24.0-docs.tar.xz 490472 BLAKE2B f7dcbee55473add99406d8956657098f78e49eb30df96d73dfc8affc2ee4aca19159956189511e1cea821974e4741fd7b1c5d28f6e8f9cc31ace80c6c504b27d SHA512 dc69388e8ab20eae3c447e95f7d1b0c153a537ae81d18ac4dc4117a7df5348a2a9f35ce8c6c18c3fabe34f7d9ce3dc3f90f2323789c65c089679abe9e359f1f6
-DIST cmake-3.24.0.tar.gz 10395167 BLAKE2B 72b75e3fa4ae1710f5e5d1ac4e356a723ec1b197c9121cd73273f079f7eb31e61fbd5acab228e9b5696c4f8ab85213da4a6cf8e35068f3ca776082742084ae6d SHA512 91507fc0643f2de20e37cd8d6a539d8cb38a80b604bf77de8e88c8446b6d7b6d02b7329d58966dc2412c6c75edcb9dfbdae02fe84965fefeb7ca47f87631fe17
 DIST cmake-3.24.1-SHA-256.txt 1646 BLAKE2B 0b72b78803e6b6e8055f68895203bcf8e4dfd0fdac43113bcece89d022ae38428c8363e12182f23954ae529a3e98d64c16770ad53f597a6d4100a72053ce10f5 SHA512 6302a8f3370f94415af6a2a1852b15f56fb58a67f895b3d99c6f2a084dd99437a94cf48bccdebed5b96e20aa9f52daff87e1037f1c62aff21b7a138f051375cc
 DIST cmake-3.24.1-SHA-256.txt.asc 833 BLAKE2B 2e77922c732e654b40a40043b85ec4794886107cc09765d0a80ea05efad08711046bafd5ae341fb16904129cc7af75e6f4d2d1103e767a9147cca6a6a975b1fd SHA512 b04a73cc483d51d5eafab7153b53e366220db2bad4b1d78fea9aec82e667434b8a27ae522be96b5f6a38e43c84aa3475f86c55c088a6149b03ec98c682b3cc4a
 DIST cmake-3.24.1-docs.tar.xz 491808 BLAKE2B 5bafdcb5b705581fbb63e9733d37ca10b8fa1803ea471afb723e26421989cb3b204952640438db11425e3bb536267bbb3e0bb6e618bee2cd4662517201aa1196 SHA512 8181dd4cbf066d42af620ee265cbd6eac0d2edf744706ec63909ac819458c1dd3f118129f54255e1f27a61af6a0ae4d72a2dc066ca5fd3e747962b9a8b3f9bee
 DIST cmake-3.24.1.tar.gz 10392868 BLAKE2B 628e2610c01af8e03eb7a201ae56a6e909c63314a993d2066f363d6181cfd2d0a0e5c09e9f74ad5ae3d226e15c2b04be250dc9bf1a273158fa3073bcc05c3a8e SHA512 67bfafcf9ceba617d7ebbb0ac88b689a2d90ab51fea4a83bd073ee082fb55de8962ce7fb283f3db5f455d286f2199843ffa595a1de207d4fa3e4472d951eb289
-EBUILD cmake-3.22.2.ebuild 7052 BLAKE2B b0c8b15546a0216be79e66918de373cf6eb45eb080fb2871aa543f7518f71876bc79df21e894cfdfbe921718bf30d2915c9242a03cbcc4f19b955a2f2b9d8d85 SHA512 d2627f09f761e83363ef1a0a960dc4660d71160a47329f141cca9c9d0404d784719b258123db1716aec885d091f55206cc85f732b4235f0d19bee4e4e5c28d33
 EBUILD cmake-3.22.4.ebuild 6819 BLAKE2B 80a67b691859734df593dc01add20acedfc991b0beba716690258fde46d9d3477a578bbe18eaae87744024093f1e9dc214cbc032e1a5c29ee980517ba668e00e SHA512 0b92fe74c7b0f62db3b107c9a1e5ae750e1f9fa013ae34e874564470a01148df750da7bcff0bfb465c094d547e926cb3bc27633837e23de24a07fba2a3bbb409
 EBUILD cmake-3.22.6.ebuild 6827 BLAKE2B c219b7191f3562325b33d75c3958cdf291ada8a892212e6b132ecd43fb77437465462dd4a6adc3958faff0b01a5ead7c0edf6011a0f232cc37d69045d8b6f60a SHA512 d3e5f98312456305149800f784362c37f69b1d50ff09088b474edd450046def404d6fedc02220674caf78bfc118fc5c710c9e85a98d5e13ef81801183fccba8d
-EBUILD cmake-3.23.1.ebuild 7794 BLAKE2B e891b0a6ca8cf3335a46178040a6d28534277ad9c5ba830ce30d37e59afe92bc147e4bc2fac1a49b9674e7f3fc3bc936453a831a34ccb5e4546fb96ba63de857 SHA512 2fba10f3ba197d9ad36a503c7fad84916716399320b5bfeabf439cab06cfbe0640479a9bd85a5ab3ac341c5a53d74bfa7ef2ea967198073e0cd215e8fff93fc5
-EBUILD cmake-3.23.2.ebuild 7794 BLAKE2B e891b0a6ca8cf3335a46178040a6d28534277ad9c5ba830ce30d37e59afe92bc147e4bc2fac1a49b9674e7f3fc3bc936453a831a34ccb5e4546fb96ba63de857 SHA512 2fba10f3ba197d9ad36a503c7fad84916716399320b5bfeabf439cab06cfbe0640479a9bd85a5ab3ac341c5a53d74bfa7ef2ea967198073e0cd215e8fff93fc5
 EBUILD cmake-3.23.3.ebuild 7794 BLAKE2B e891b0a6ca8cf3335a46178040a6d28534277ad9c5ba830ce30d37e59afe92bc147e4bc2fac1a49b9674e7f3fc3bc936453a831a34ccb5e4546fb96ba63de857 SHA512 2fba10f3ba197d9ad36a503c7fad84916716399320b5bfeabf439cab06cfbe0640479a9bd85a5ab3ac341c5a53d74bfa7ef2ea967198073e0cd215e8fff93fc5
-EBUILD cmake-3.24.0.ebuild 8834 BLAKE2B 5abfce57dc418fe4cfeb30cc02db6da256f2750c255bc9a348e157473257b889f07b658bbade12c0fa3804ae9551d8ef0e90a605a39ab43928483433660476a5 SHA512 ffb1afb51a83b2d24b3cb4092ab43329a1bfe00ac3fafbf2e62713de7aa51d5e9eb5325e4edd0763ce041d18faddccf422f08edd4fadf2984d15fbacdca3791d
 EBUILD cmake-3.24.1.ebuild 8817 BLAKE2B 06ac24772d2c04132c85a6b6823771eaf1c1b44d6bc77ac891a0b29725d57576e4c23ca54ee7ae54ff6cf20f403909b6f890fe469fca6d5a8a2e350524f8dec6 SHA512 c945fa714a256b0a3e6d8ea713b55ea0f914f37d6776428bb89fd30c0341711130c5bf795f8c8ec3e6c4c9c103be8e93737b86e6528b6d1efe301cb600d40a84
 EBUILD cmake-9999.ebuild 8817 BLAKE2B 06ac24772d2c04132c85a6b6823771eaf1c1b44d6bc77ac891a0b29725d57576e4c23ca54ee7ae54ff6cf20f403909b6f890fe469fca6d5a8a2e350524f8dec6 SHA512 c945fa714a256b0a3e6d8ea713b55ea0f914f37d6776428bb89fd30c0341711130c5bf795f8c8ec3e6c4c9c103be8e93737b86e6528b6d1efe301cb600d40a84
 MISC metadata.xml 456 BLAKE2B 2dc475cae4d2f65744e25381b1e4fe8b6399225380d0f9fa81870813221d180b1c4b538c3f9249f80e921a1db8afab7071db206898fdec294372811dc456d1f5 SHA512 347c1e13f459dfb9bec9d52ce556526eb74e6c432ff28aed28f05dc17bba17934fff1ce2fc27765b390bb55aaa7b02d0800939eb4382eba6c4b85a62ec136f5a
diff --git a/dev-util/cmake/cmake-3.22.2.ebuild b/dev-util/cmake/cmake-3.22.2.ebuild
deleted file mode 100644
index 4f6802639a27..000000000000
--- a/dev-util/cmake/cmake-3.22.2.ebuild
+++ /dev/null
@@ -1,232 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CMAKE_MAKEFILE_GENERATOR="emake" # TODO RunCMake.LinkWhatYouUse fails consistently w/ ninja
-CMAKE_REMOVE_MODULES_LIST=( none )
-inherit bash-completion-r1 cmake elisp-common flag-o-matic multiprocessing \
-	toolchain-funcs virtualx xdg-utils
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="Cross platform Make"
-HOMEPAGE="https://cmake.org/"
-SRC_URI="https://cmake.org/files/v$(ver_cut 1-2)/${MY_P}.tar.gz"
-
-LICENSE="CMake"
-SLOT="0"
-[[ "${PV}" = *_rc* ]] || \
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc emacs ncurses qt5 test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=app-arch/libarchive-3.3.3:=
-	app-crypt/rhash
-	>=dev-libs/expat-2.0.1
-	>=dev-libs/jsoncpp-1.9.2-r2:0=
-	>=dev-libs/libuv-1.10.0:=
-	>=net-misc/curl-7.21.5[ssl]
-	sys-libs/zlib
-	virtual/pkgconfig
-	emacs? ( >=app-editors/emacs-23.1:* )
-	ncurses? ( sys-libs/ncurses:0= )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-	)
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	doc? (
-		dev-python/requests
-		dev-python/sphinx
-	)
-	test? ( app-arch/libarchive[zstd] )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-SITEFILE="50${PN}-gentoo.el"
-
-PATCHES=(
-	# prefix
-	"${FILESDIR}"/${PN}-3.16.0_rc4-darwin-bundle.patch
-	"${FILESDIR}"/${PN}-3.14.0_rc3-prefix-dirs.patch
-	"${FILESDIR}"/${PN}-3.19.1-darwin-gcc.patch
-
-	# handle gentoo packaging in find modules
-	"${FILESDIR}"/${PN}-3.17.0_rc1-FindBLAS.patch
-	# Next patch needs to be reworked
-	#"${FILESDIR}"/${PN}-3.17.0_rc1-FindLAPACK.patch
-	"${FILESDIR}"/${PN}-3.5.2-FindQt4.patch
-
-	# respect python eclasses
-	"${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch
-	"${FILESDIR}"/${PN}-3.9.0_rc2-FindPythonInterp.patch
-
-	"${FILESDIR}"/${PN}-3.18.0-filter_distcc_warning.patch # bug 691544
-
-	# upstream fixes (can usually be removed with a version bump)
-)
-
-cmake_src_bootstrap() {
-	# disable running of cmake in bootstrap command
-	sed -i \
-		-e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \
-		bootstrap || die "sed failed"
-
-	# execinfo.h on Solaris isn't quite what it is on Darwin
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		sed -i -e 's/execinfo\.h/blablabla.h/' \
-			Source/kwsys/CMakeLists.txt || die
-	fi
-
-	# bootstrap script isn't exactly /bin/sh compatible
-	tc-env_build ${CONFIG_SHELL:-sh} ./bootstrap \
-		--prefix="${T}/cmakestrap/" \
-		--parallel=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)") \
-		|| die "Bootstrap failed"
-}
-
-cmake_src_test() {
-	# fix OutDir and SelectLibraryConfigurations tests
-	# these are altered thanks to our eclass
-	sed -i -e 's:^#_cmake_modify_IGNORE ::g' \
-		"${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \
-		|| die
-
-	pushd "${BUILD_DIR}" > /dev/null
-
-	local ctestargs
-	[[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure"
-
-	# Excluded tests:
-	#    BootstrapTest: we actually bootstrap it every time so why test it.
-	#    BundleUtilities: bundle creation broken
-	#    CMakeOnly.AllFindModules: pthread issues
-	#    CTest.updatecvs: fails to commit as root
-	#    Fortran: requires fortran
-	#    RunCMake.CompilerLauncher: also requires fortran
-	#    RunCMake.CPack_RPM: breaks if app-arch/rpm is installed because
-	#        debugedit binary is not in the expected location
-	#    RunCMake.CPack_DEB: breaks if app-arch/dpkg is installed because
-	#        it can't find a deb package that owns libc
-	#    RunCMake.{IncompatibleQt,ObsoleteQtMacros}: Require Qt4
-	#    TestUpload: requires network access
-	"${BUILD_DIR}"/bin/ctest \
-		-j "$(makeopts_jobs "${MAKEOPTS}" 999)" \
-		--test-load "$(makeopts_loadavg)" \
-		${ctestargs} \
-		-E "(BootstrapTest|BundleUtilities|ConfigSources|CMakeOnly.AllFindModules|CPackComponentsDEB-components-depend2|CompileOptions|CTest.UpdateCVS|DependencyGraph|Fortran|RunCMake.CompilerLauncher|RunCMake.IncompatibleQt|RunCMake.ObsoleteQtMacros|RunCMake.PrecompileHeaders|RunCMake.CPack_(DEB|RPM)|TestUpload)" \
-		|| die "Tests failed"
-
-	popd > /dev/null
-}
-
-src_prepare() {
-	cmake_src_prepare
-
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		# disable Xcode hooks, bug #652134
-		sed -i -e 's/cm\(\|Global\|Local\)XCode[^.]\+\.\(cxx\|h\)//' \
-			Source/CMakeLists.txt || die
-		sed -i -e '/define CMAKE_USE_XCODE/s/XCODE/NO_XCODE/' \
-			-e '/cmGlobalXCodeGenerator.h/d' \
-			Source/cmake.cxx || die
-		# disable isysroot usage with GCC, we've properly instructed
-		# where things are via GCC configuration and ldwrapper
-		sed -i -e '/cmake_gnu_set_sysroot_flag/d' \
-			Modules/Platform/Apple-GNU-*.cmake || die
-		# disable isysroot usage with clang as well
-		sed -i -e '/_SYSROOT_FLAG/d' \
-			Modules/Platform/Apple-Clang.cmake || die
-		# don't set a POSIX standard, system headers don't like that, #757426
-		sed -i -e 's/^#if !defined(_WIN32) && !defined(__sun)/& \&\& !defined(__APPLE__)/' \
-			Source/cmLoadCommandCommand.cxx \
-			Source/cmStandardLexer.h \
-			Source/cmSystemTools.cxx \
-			Source/cmTimestamp.cxx
-		sed -i -e 's/^#if !defined(_POSIX_C_SOURCE) && !defined(_WIN32) && !defined(__sun)/& \&\& !defined(__APPLE__)/' \
-			Source/cmStandardLexer.h
-	fi
-
-	# Add gcc libs to the default link paths
-	sed -i \
-		-e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \
-		-e "$(usex prefix-guest "s|@GENTOO_HOST@||" "/@GENTOO_HOST@/d")" \
-		-e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \
-		Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed"
-	if ! has_version -b \>=${CATEGORY}/${PN}-3.4.0_rc1 || ! cmake --version &>/dev/null ; then
-		CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
-		cmake_src_bootstrap
-	fi
-}
-
-src_configure() {
-	# Fix linking on Solaris
-	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lsocket -lnsl
-
-	local mycmakeargs=(
-		-DCMAKE_USE_SYSTEM_LIBRARIES=ON
-		-DCMAKE_DOC_DIR=/share/doc/${PF}
-		-DCMAKE_MAN_DIR=/share/man
-		-DCMAKE_DATA_DIR=/share/${PN}
-		-DSPHINX_MAN=$(usex doc)
-		-DSPHINX_HTML=$(usex doc)
-		-DBUILD_CursesDialog="$(usex ncurses)"
-		-DBUILD_TESTING=$(usex test)
-	)
-	use qt5 && mycmakeargs+=( -DBUILD_QtDialog=ON )
-
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-	use emacs && elisp-compile Auxiliary/cmake-mode.el
-}
-
-src_test() {
-	virtx cmake_src_test
-}
-
-src_install() {
-	cmake_src_install
-
-	if use emacs; then
-		elisp-install ${PN} Auxiliary/cmake-mode.el Auxiliary/cmake-mode.elc
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-
-	insinto /usr/share/vim/vimfiles/syntax
-	doins Auxiliary/vim/syntax/cmake.vim
-
-	insinto /usr/share/vim/vimfiles/indent
-	doins Auxiliary/vim/indent/cmake.vim
-
-	insinto /usr/share/vim/vimfiles/ftdetect
-	doins "${FILESDIR}/${PN}.vim"
-
-	dobashcomp Auxiliary/bash-completion/{${PN},ctest,cpack}
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-	if use qt5; then
-		xdg_icon_cache_update
-		xdg_desktop_database_update
-		xdg_mimeinfo_database_update
-	fi
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-	if use qt5; then
-		xdg_icon_cache_update
-		xdg_desktop_database_update
-		xdg_mimeinfo_database_update
-	fi
-}
diff --git a/dev-util/cmake/cmake-3.23.1.ebuild b/dev-util/cmake/cmake-3.23.1.ebuild
deleted file mode 100644
index 1f441d341fb6..000000000000
--- a/dev-util/cmake/cmake-3.23.1.ebuild
+++ /dev/null
@@ -1,261 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# TODO RunCMake.LinkWhatYouUse fails consistently w/ ninja
-# ... but seems fine as of 3.22.3?
-# TODO ... but bootstrap sometimes(?) fails with ninja now. bug #834759.
-CMAKE_MAKEFILE_GENERATOR="emake"
-CMAKE_REMOVE_MODULES_LIST=( none )
-inherit bash-completion-r1 cmake elisp-common flag-o-matic multiprocessing \
-	toolchain-funcs virtualx xdg-utils
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="Cross platform Make"
-HOMEPAGE="https://cmake.org/"
-if [[ ${PV} == 9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://gitlab.kitware.com/cmake/cmake.git"
-else
-	SRC_URI="https://cmake.org/files/v$(ver_cut 1-2)/${MY_P}.tar.gz"
-	if [[ ${PV} != *_rc* ]] ; then
-		VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/bradking.asc
-		inherit verify-sig
-
-		SRC_URI+=" verify-sig? (
-			https://github.com/Kitware/CMake/releases/download/v$(ver_cut 1-3)/${MY_P}-SHA-256.txt
-			https://github.com/Kitware/CMake/releases/download/v$(ver_cut 1-3)/${MY_P}-SHA-256.txt.asc
-		)"
-
-		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-		BDEPEND="verify-sig? ( sec-keys/openpgp-keys-bradking )"
-	fi
-fi
-
-LICENSE="CMake"
-SLOT="0"
-IUSE="doc emacs ncurses qt5 test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=app-arch/libarchive-3.3.3:=
-	app-crypt/rhash
-	>=dev-libs/expat-2.0.1
-	>=dev-libs/jsoncpp-1.9.2-r2:0=
-	>=dev-libs/libuv-1.10.0:=
-	>=net-misc/curl-7.21.5[ssl]
-	sys-libs/zlib
-	virtual/pkgconfig
-	emacs? ( >=app-editors/emacs-23.1:* )
-	ncurses? ( sys-libs/ncurses:0= )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-	)
-"
-DEPEND="${RDEPEND}"
-BDEPEND+="
-	doc? (
-		dev-python/requests
-		dev-python/sphinx
-	)
-	test? ( app-arch/libarchive[zstd] )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-SITEFILE="50${PN}-gentoo.el"
-
-PATCHES=(
-	# prefix
-	"${FILESDIR}"/${PN}-3.16.0_rc4-darwin-bundle.patch
-	"${FILESDIR}"/${PN}-3.14.0_rc3-prefix-dirs.patch
-	"${FILESDIR}"/${PN}-3.19.1-darwin-gcc.patch
-
-	# handle gentoo packaging in find modules
-	"${FILESDIR}"/${PN}-3.17.0_rc1-FindBLAS.patch
-	# Next patch needs to be reworked
-	#"${FILESDIR}"/${PN}-3.17.0_rc1-FindLAPACK.patch
-	"${FILESDIR}"/${PN}-3.5.2-FindQt4.patch
-
-	# respect python eclasses
-	"${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch
-	"${FILESDIR}"/${PN}-3.9.0_rc2-FindPythonInterp.patch
-
-	"${FILESDIR}"/${PN}-3.18.0-filter_distcc_warning.patch # bug 691544
-
-	# upstream fixes (can usually be removed with a version bump)
-)
-
-cmake_src_bootstrap() {
-	# disable running of cmake in bootstrap command
-	sed -i \
-		-e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \
-		bootstrap || die "sed failed"
-
-	# execinfo.h on Solaris isn't quite what it is on Darwin
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		sed -i -e 's/execinfo\.h/blablabla.h/' \
-			Source/kwsys/CMakeLists.txt || die
-	fi
-
-	# bootstrap script isn't exactly /bin/sh compatible
-	tc-env_build ${CONFIG_SHELL:-sh} ./bootstrap \
-		--prefix="${T}/cmakestrap/" \
-		--parallel=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)") \
-		|| die "Bootstrap failed"
-}
-
-src_unpack() {
-	if [[ ${PV} == 9999 ]] ; then
-		git-r3_src_unpack
-	elif ! use verify-sig || [[ ${PV} == *_rc ]] ; then
-		default
-	else
-		cd "${DISTDIR}" || die
-
-		# See https://mgorny.pl/articles/verify-sig-by-example.html#verifying-using-a-checksum-file-with-a-detached-signature
-		verify-sig_verify_detached ${MY_P}-SHA-256.txt{,.asc}
-		verify-sig_verify_unsigned_checksums ${MY_P}-SHA-256.txt sha256 ${MY_P}.tar.gz
-
-		cd "${WORKDIR}" || die
-
-		default
-	fi
-}
-
-src_prepare() {
-	cmake_src_prepare
-
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		# disable Xcode hooks, bug #652134
-		sed -i -e 's/cm\(\|Global\|Local\)XCode[^.]\+\.\(cxx\|h\)//' \
-			Source/CMakeLists.txt || die
-		sed -i -e '/define CMAKE_USE_XCODE/s/XCODE/NO_XCODE/' \
-			-e '/cmGlobalXCodeGenerator.h/d' \
-			Source/cmake.cxx || die
-		# disable isysroot usage with GCC, we've properly instructed
-		# where things are via GCC configuration and ldwrapper
-		sed -i -e '/cmake_gnu_set_sysroot_flag/d' \
-			Modules/Platform/Apple-GNU-*.cmake || die
-		# disable isysroot usage with clang as well
-		sed -i -e '/_SYSROOT_FLAG/d' \
-			Modules/Platform/Apple-Clang.cmake || die
-		# don't set a POSIX standard, system headers don't like that, #757426
-		sed -i -e 's/^#if !defined(_WIN32) && !defined(__sun)/& \&\& !defined(__APPLE__)/' \
-			Source/cmLoadCommandCommand.cxx \
-			Source/cmStandardLexer.h \
-			Source/cmSystemTools.cxx \
-			Source/cmTimestamp.cxx
-		sed -i -e 's/^#if !defined(_POSIX_C_SOURCE) && !defined(_WIN32) && !defined(__sun)/& \&\& !defined(__APPLE__)/' \
-			Source/cmStandardLexer.h
-	fi
-
-	# Add gcc libs to the default link paths
-	sed -i \
-		-e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \
-		-e "$(usex prefix-guest "s|@GENTOO_HOST@||" "/@GENTOO_HOST@/d")" \
-		-e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \
-		Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed"
-
-	if ! has_version -b \>=${CATEGORY}/${PN}-3.13 || ! cmake --version &>/dev/null ; then
-		CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
-		cmake_src_bootstrap
-	fi
-}
-
-src_configure() {
-	# Fix linking on Solaris
-	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lsocket -lnsl
-
-	local mycmakeargs=(
-		-DCMAKE_USE_SYSTEM_LIBRARIES=ON
-		-DCMAKE_DOC_DIR=/share/doc/${PF}
-		-DCMAKE_MAN_DIR=/share/man
-		-DCMAKE_DATA_DIR=/share/${PN}
-		-DSPHINX_MAN=$(usex doc)
-		-DSPHINX_HTML=$(usex doc)
-		-DBUILD_CursesDialog="$(usex ncurses)"
-		-DBUILD_TESTING=$(usex test)
-	)
-	use qt5 && mycmakeargs+=( -DBUILD_QtDialog=ON )
-
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-	use emacs && elisp-compile Auxiliary/cmake-mode.el
-}
-
-src_test() {
-	# fix OutDir and SelectLibraryConfigurations tests
-	# these are altered thanks to our eclass
-	sed -i -e 's:^#_cmake_modify_IGNORE ::g' \
-		"${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \
-		|| die
-
-	pushd "${BUILD_DIR}" > /dev/null || die
-
-	# Excluded tests:
-	#    BootstrapTest: we actualy bootstrap it every time so why test it.
-	#    BundleUtilities: bundle creation broken
-	#    CMakeOnly.AllFindModules: pthread issues
-	#    CTest.updatecvs: which fails to commit as root
-	#    Fortran: requires fortran
-	#    RunCMake.CompilerLauncher: also requires fortran
-	#    RunCMake.CPack_RPM: breaks if app-arch/rpm is installed because
-	#        debugedit binary is not in the expected location
-	#    RunCMake.CPack_DEB: breaks if app-arch/dpkg is installed because
-	#        it can't find a deb package that owns libc
-	#    TestUpload, which requires network access
-	#    RunCMake.CMP0125, known failure reported upstream (bug #829414)
-	local myctestargs=(
-		--output-on-failure
-		-E "(BootstrapTest|BundleUtilities|CMakeOnly.AllFindModules|CompileOptions|CTest.UpdateCVS|Fortran|RunCMake.CompilerLauncher|RunCMake.CPack_(DEB|RPM)|TestUpload|RunCMake.CMP0125)" \
-	)
-
-	virtx cmake_src_test
-}
-
-src_install() {
-	cmake_src_install
-
-	if use emacs; then
-		elisp-install ${PN} Auxiliary/cmake-mode.el Auxiliary/cmake-mode.elc
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-
-	insinto /usr/share/vim/vimfiles/syntax
-	doins Auxiliary/vim/syntax/cmake.vim
-
-	insinto /usr/share/vim/vimfiles/indent
-	doins Auxiliary/vim/indent/cmake.vim
-
-	insinto /usr/share/vim/vimfiles/ftdetect
-	doins "${FILESDIR}/${PN}.vim"
-
-	dobashcomp Auxiliary/bash-completion/{${PN},ctest,cpack}
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-	if use qt5; then
-		xdg_icon_cache_update
-		xdg_desktop_database_update
-		xdg_mimeinfo_database_update
-	fi
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-	if use qt5; then
-		xdg_icon_cache_update
-		xdg_desktop_database_update
-		xdg_mimeinfo_database_update
-	fi
-}
diff --git a/dev-util/cmake/cmake-3.23.2.ebuild b/dev-util/cmake/cmake-3.23.2.ebuild
deleted file mode 100644
index 1f441d341fb6..000000000000
--- a/dev-util/cmake/cmake-3.23.2.ebuild
+++ /dev/null
@@ -1,261 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# TODO RunCMake.LinkWhatYouUse fails consistently w/ ninja
-# ... but seems fine as of 3.22.3?
-# TODO ... but bootstrap sometimes(?) fails with ninja now. bug #834759.
-CMAKE_MAKEFILE_GENERATOR="emake"
-CMAKE_REMOVE_MODULES_LIST=( none )
-inherit bash-completion-r1 cmake elisp-common flag-o-matic multiprocessing \
-	toolchain-funcs virtualx xdg-utils
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="Cross platform Make"
-HOMEPAGE="https://cmake.org/"
-if [[ ${PV} == 9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://gitlab.kitware.com/cmake/cmake.git"
-else
-	SRC_URI="https://cmake.org/files/v$(ver_cut 1-2)/${MY_P}.tar.gz"
-	if [[ ${PV} != *_rc* ]] ; then
-		VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/bradking.asc
-		inherit verify-sig
-
-		SRC_URI+=" verify-sig? (
-			https://github.com/Kitware/CMake/releases/download/v$(ver_cut 1-3)/${MY_P}-SHA-256.txt
-			https://github.com/Kitware/CMake/releases/download/v$(ver_cut 1-3)/${MY_P}-SHA-256.txt.asc
-		)"
-
-		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-		BDEPEND="verify-sig? ( sec-keys/openpgp-keys-bradking )"
-	fi
-fi
-
-LICENSE="CMake"
-SLOT="0"
-IUSE="doc emacs ncurses qt5 test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=app-arch/libarchive-3.3.3:=
-	app-crypt/rhash
-	>=dev-libs/expat-2.0.1
-	>=dev-libs/jsoncpp-1.9.2-r2:0=
-	>=dev-libs/libuv-1.10.0:=
-	>=net-misc/curl-7.21.5[ssl]
-	sys-libs/zlib
-	virtual/pkgconfig
-	emacs? ( >=app-editors/emacs-23.1:* )
-	ncurses? ( sys-libs/ncurses:0= )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-	)
-"
-DEPEND="${RDEPEND}"
-BDEPEND+="
-	doc? (
-		dev-python/requests
-		dev-python/sphinx
-	)
-	test? ( app-arch/libarchive[zstd] )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-SITEFILE="50${PN}-gentoo.el"
-
-PATCHES=(
-	# prefix
-	"${FILESDIR}"/${PN}-3.16.0_rc4-darwin-bundle.patch
-	"${FILESDIR}"/${PN}-3.14.0_rc3-prefix-dirs.patch
-	"${FILESDIR}"/${PN}-3.19.1-darwin-gcc.patch
-
-	# handle gentoo packaging in find modules
-	"${FILESDIR}"/${PN}-3.17.0_rc1-FindBLAS.patch
-	# Next patch needs to be reworked
-	#"${FILESDIR}"/${PN}-3.17.0_rc1-FindLAPACK.patch
-	"${FILESDIR}"/${PN}-3.5.2-FindQt4.patch
-
-	# respect python eclasses
-	"${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch
-	"${FILESDIR}"/${PN}-3.9.0_rc2-FindPythonInterp.patch
-
-	"${FILESDIR}"/${PN}-3.18.0-filter_distcc_warning.patch # bug 691544
-
-	# upstream fixes (can usually be removed with a version bump)
-)
-
-cmake_src_bootstrap() {
-	# disable running of cmake in bootstrap command
-	sed -i \
-		-e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \
-		bootstrap || die "sed failed"
-
-	# execinfo.h on Solaris isn't quite what it is on Darwin
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		sed -i -e 's/execinfo\.h/blablabla.h/' \
-			Source/kwsys/CMakeLists.txt || die
-	fi
-
-	# bootstrap script isn't exactly /bin/sh compatible
-	tc-env_build ${CONFIG_SHELL:-sh} ./bootstrap \
-		--prefix="${T}/cmakestrap/" \
-		--parallel=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)") \
-		|| die "Bootstrap failed"
-}
-
-src_unpack() {
-	if [[ ${PV} == 9999 ]] ; then
-		git-r3_src_unpack
-	elif ! use verify-sig || [[ ${PV} == *_rc ]] ; then
-		default
-	else
-		cd "${DISTDIR}" || die
-
-		# See https://mgorny.pl/articles/verify-sig-by-example.html#verifying-using-a-checksum-file-with-a-detached-signature
-		verify-sig_verify_detached ${MY_P}-SHA-256.txt{,.asc}
-		verify-sig_verify_unsigned_checksums ${MY_P}-SHA-256.txt sha256 ${MY_P}.tar.gz
-
-		cd "${WORKDIR}" || die
-
-		default
-	fi
-}
-
-src_prepare() {
-	cmake_src_prepare
-
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		# disable Xcode hooks, bug #652134
-		sed -i -e 's/cm\(\|Global\|Local\)XCode[^.]\+\.\(cxx\|h\)//' \
-			Source/CMakeLists.txt || die
-		sed -i -e '/define CMAKE_USE_XCODE/s/XCODE/NO_XCODE/' \
-			-e '/cmGlobalXCodeGenerator.h/d' \
-			Source/cmake.cxx || die
-		# disable isysroot usage with GCC, we've properly instructed
-		# where things are via GCC configuration and ldwrapper
-		sed -i -e '/cmake_gnu_set_sysroot_flag/d' \
-			Modules/Platform/Apple-GNU-*.cmake || die
-		# disable isysroot usage with clang as well
-		sed -i -e '/_SYSROOT_FLAG/d' \
-			Modules/Platform/Apple-Clang.cmake || die
-		# don't set a POSIX standard, system headers don't like that, #757426
-		sed -i -e 's/^#if !defined(_WIN32) && !defined(__sun)/& \&\& !defined(__APPLE__)/' \
-			Source/cmLoadCommandCommand.cxx \
-			Source/cmStandardLexer.h \
-			Source/cmSystemTools.cxx \
-			Source/cmTimestamp.cxx
-		sed -i -e 's/^#if !defined(_POSIX_C_SOURCE) && !defined(_WIN32) && !defined(__sun)/& \&\& !defined(__APPLE__)/' \
-			Source/cmStandardLexer.h
-	fi
-
-	# Add gcc libs to the default link paths
-	sed -i \
-		-e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \
-		-e "$(usex prefix-guest "s|@GENTOO_HOST@||" "/@GENTOO_HOST@/d")" \
-		-e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \
-		Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed"
-
-	if ! has_version -b \>=${CATEGORY}/${PN}-3.13 || ! cmake --version &>/dev/null ; then
-		CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
-		cmake_src_bootstrap
-	fi
-}
-
-src_configure() {
-	# Fix linking on Solaris
-	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lsocket -lnsl
-
-	local mycmakeargs=(
-		-DCMAKE_USE_SYSTEM_LIBRARIES=ON
-		-DCMAKE_DOC_DIR=/share/doc/${PF}
-		-DCMAKE_MAN_DIR=/share/man
-		-DCMAKE_DATA_DIR=/share/${PN}
-		-DSPHINX_MAN=$(usex doc)
-		-DSPHINX_HTML=$(usex doc)
-		-DBUILD_CursesDialog="$(usex ncurses)"
-		-DBUILD_TESTING=$(usex test)
-	)
-	use qt5 && mycmakeargs+=( -DBUILD_QtDialog=ON )
-
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-	use emacs && elisp-compile Auxiliary/cmake-mode.el
-}
-
-src_test() {
-	# fix OutDir and SelectLibraryConfigurations tests
-	# these are altered thanks to our eclass
-	sed -i -e 's:^#_cmake_modify_IGNORE ::g' \
-		"${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \
-		|| die
-
-	pushd "${BUILD_DIR}" > /dev/null || die
-
-	# Excluded tests:
-	#    BootstrapTest: we actualy bootstrap it every time so why test it.
-	#    BundleUtilities: bundle creation broken
-	#    CMakeOnly.AllFindModules: pthread issues
-	#    CTest.updatecvs: which fails to commit as root
-	#    Fortran: requires fortran
-	#    RunCMake.CompilerLauncher: also requires fortran
-	#    RunCMake.CPack_RPM: breaks if app-arch/rpm is installed because
-	#        debugedit binary is not in the expected location
-	#    RunCMake.CPack_DEB: breaks if app-arch/dpkg is installed because
-	#        it can't find a deb package that owns libc
-	#    TestUpload, which requires network access
-	#    RunCMake.CMP0125, known failure reported upstream (bug #829414)
-	local myctestargs=(
-		--output-on-failure
-		-E "(BootstrapTest|BundleUtilities|CMakeOnly.AllFindModules|CompileOptions|CTest.UpdateCVS|Fortran|RunCMake.CompilerLauncher|RunCMake.CPack_(DEB|RPM)|TestUpload|RunCMake.CMP0125)" \
-	)
-
-	virtx cmake_src_test
-}
-
-src_install() {
-	cmake_src_install
-
-	if use emacs; then
-		elisp-install ${PN} Auxiliary/cmake-mode.el Auxiliary/cmake-mode.elc
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-
-	insinto /usr/share/vim/vimfiles/syntax
-	doins Auxiliary/vim/syntax/cmake.vim
-
-	insinto /usr/share/vim/vimfiles/indent
-	doins Auxiliary/vim/indent/cmake.vim
-
-	insinto /usr/share/vim/vimfiles/ftdetect
-	doins "${FILESDIR}/${PN}.vim"
-
-	dobashcomp Auxiliary/bash-completion/{${PN},ctest,cpack}
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-	if use qt5; then
-		xdg_icon_cache_update
-		xdg_desktop_database_update
-		xdg_mimeinfo_database_update
-	fi
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-	if use qt5; then
-		xdg_icon_cache_update
-		xdg_desktop_database_update
-		xdg_mimeinfo_database_update
-	fi
-}
diff --git a/dev-util/cmake/cmake-3.24.0.ebuild b/dev-util/cmake/cmake-3.24.0.ebuild
deleted file mode 100644
index 3b075816e4cf..000000000000
--- a/dev-util/cmake/cmake-3.24.0.ebuild
+++ /dev/null
@@ -1,292 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Generate using https://github.com/thesamesam/sam-gentoo-scripts/blob/main/niche/generate-cmake-docs
-# Set to 1 if prebuilt, 0 if not
-# (the construct below is to allow overriding from env for script)
-CMAKE_DOCS_PREBUILT=${CMAKE_DOCS_PREBUILT:-1}
-CMAKE_DOCS_PREBUILT_DEV=sam
-CMAKE_DOCS_VERSION=$(ver_cut 1-3)
-# Default to generating docs (inc. man pages) if no prebuilt; overridden later
-# See bug #784815
-CMAKE_DOCS_USEFLAG="+doc"
-
-# TODO RunCMake.LinkWhatYouUse fails consistently w/ ninja
-# ... but seems fine as of 3.22.3?
-# TODO ... but bootstrap sometimes(?) fails with ninja now. bug #834759.
-CMAKE_MAKEFILE_GENERATOR="emake"
-CMAKE_REMOVE_MODULES_LIST=( none )
-inherit bash-completion-r1 cmake elisp-common flag-o-matic multiprocessing \
-	toolchain-funcs virtualx xdg-utils
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="Cross platform Make"
-HOMEPAGE="https://cmake.org/"
-if [[ ${PV} == 9999 ]] ; then
-	CMAKE_DOCS_PREBUILT=0
-
-	EGIT_REPO_URI="https://gitlab.kitware.com/cmake/cmake.git"
-	inherit git-r3
-else
-	SRC_URI="https://cmake.org/files/v$(ver_cut 1-2)/${MY_P}.tar.gz"
-
-	if [[ ${CMAKE_DOCS_PREBUILT} == 1 ]] ; then
-		SRC_URI+=" !doc? ( https://dev.gentoo.org/~${CMAKE_DOCS_PREBUILT_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${CMAKE_DOCS_VERSION}-docs.tar.xz )"
-	fi
-
-	if [[ ${PV} != *_rc* ]] ; then
-		VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/bradking.asc
-		inherit verify-sig
-
-		SRC_URI+=" verify-sig? (
-			https://github.com/Kitware/CMake/releases/download/v$(ver_cut 1-3)/${MY_P}-SHA-256.txt
-			https://github.com/Kitware/CMake/releases/download/v$(ver_cut 1-3)/${MY_P}-SHA-256.txt.asc
-		)"
-
-		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-		BDEPEND="verify-sig? ( sec-keys/openpgp-keys-bradking )"
-	fi
-fi
-
-[[ ${CMAKE_DOCS_PREBUILT} == 1 ]] && CMAKE_DOCS_USEFLAG="doc"
-
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="CMake"
-SLOT="0"
-IUSE="${CMAKE_DOCS_USEFLAG} emacs ncurses qt5 test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=app-arch/libarchive-3.3.3:=
-	app-crypt/rhash
-	>=dev-libs/expat-2.0.1
-	>=dev-libs/jsoncpp-1.9.2-r2:0=
-	>=dev-libs/libuv-1.10.0:=
-	>=net-misc/curl-7.21.5[ssl]
-	sys-libs/zlib
-	virtual/pkgconfig
-	emacs? ( >=app-editors/emacs-23.1:* )
-	ncurses? ( sys-libs/ncurses:0= )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-	)
-"
-DEPEND="${RDEPEND}"
-BDEPEND+="
-	doc? (
-		dev-python/requests
-		dev-python/sphinx
-	)
-	test? ( app-arch/libarchive[zstd] )
-"
-
-SITEFILE="50${PN}-gentoo.el"
-
-PATCHES=(
-	# Prefix
-	"${FILESDIR}"/${PN}-3.16.0_rc4-darwin-bundle.patch
-	"${FILESDIR}"/${PN}-3.14.0_rc3-prefix-dirs.patch
-	"${FILESDIR}"/${PN}-3.19.1-darwin-gcc.patch
-
-	# Handle gentoo packaging in find modules
-	"${FILESDIR}"/${PN}-3.17.0_rc1-FindBLAS.patch
-	# Next patch needs to be reworked
-	#"${FILESDIR}"/${PN}-3.17.0_rc1-FindLAPACK.patch
-	"${FILESDIR}"/${PN}-3.5.2-FindQt4.patch
-
-	# Respect python eclasses
-	"${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch
-	"${FILESDIR}"/${PN}-3.9.0_rc2-FindPythonInterp.patch
-
-	"${FILESDIR}"/${PN}-3.18.0-filter_distcc_warning.patch # bug 691544
-
-	# upstream fixes (can usually be removed with a version bump)
-)
-
-cmake_src_bootstrap() {
-	# disable running of cmake in bootstrap command
-	sed -i \
-		-e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \
-		bootstrap || die "sed failed"
-
-	# execinfo.h on Solaris isn't quite what it is on Darwin
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		sed -i -e 's/execinfo\.h/blablabla.h/' \
-			Source/kwsys/CMakeLists.txt || die
-	fi
-
-	# bootstrap script isn't exactly /bin/sh compatible
-	tc-env_build ${CONFIG_SHELL:-sh} ./bootstrap \
-		--prefix="${T}/cmakestrap/" \
-		--parallel=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)") \
-		|| die "Bootstrap failed"
-}
-
-src_unpack() {
-	if [[ ${PV} == 9999 ]] ; then
-		git-r3_src_unpack
-	elif ! use verify-sig || [[ ${PV} == *_rc* ]] ; then
-		default
-	else
-		cd "${DISTDIR}" || die
-
-		# See https://mgorny.pl/articles/verify-sig-by-example.html#verifying-using-a-checksum-file-with-a-detached-signature
-		verify-sig_verify_detached ${MY_P}-SHA-256.txt{,.asc}
-		verify-sig_verify_unsigned_checksums ${MY_P}-SHA-256.txt sha256 ${MY_P}.tar.gz
-
-		cd "${WORKDIR}" || die
-
-		default
-	fi
-}
-
-src_prepare() {
-	cmake_src_prepare
-
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		# Disable Xcode hooks, bug #652134
-		sed -i -e 's/cm\(\|Global\|Local\)XCode[^.]\+\.\(cxx\|h\)//' \
-			Source/CMakeLists.txt || die
-		sed -i -e '/define CMAKE_USE_XCODE/s/XCODE/NO_XCODE/' \
-			-e '/cmGlobalXCodeGenerator.h/d' \
-			Source/cmake.cxx || die
-
-		# Disable isysroot usage with GCC, we've properly instructed
-		# where things are via GCC configuration and ldwrapper
-		sed -i -e '/cmake_gnu_set_sysroot_flag/d' \
-			Modules/Platform/Apple-GNU-*.cmake || die
-		# Disable isysroot usage with clang as well
-		sed -i -e '/_SYSROOT_FLAG/d' \
-			Modules/Platform/Apple-Clang.cmake || die
-		# Don't set a POSIX standard, system headers don't like that, #757426
-		sed -i -e 's/^#if !defined(_WIN32) && !defined(__sun)/& \&\& !defined(__APPLE__)/' \
-			Source/cmLoadCommandCommand.cxx \
-			Source/cmStandardLexer.h \
-			Source/cmSystemTools.cxx \
-			Source/cmTimestamp.cxx
-		sed -i -e 's/^#if !defined(_POSIX_C_SOURCE) && !defined(_WIN32) && !defined(__sun)/& \&\& !defined(__APPLE__)/' \
-			Source/cmStandardLexer.h
-	fi
-
-	# Add gcc libs to the default link paths
-	sed -i \
-		-e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \
-		-e "$(usex prefix-guest "s|@GENTOO_HOST@||" "/@GENTOO_HOST@/d")" \
-		-e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \
-		Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed"
-
-	if ! has_version -b \>=${CATEGORY}/${PN}-3.13 || ! cmake --version &>/dev/null ; then
-		CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
-		cmake_src_bootstrap
-	fi
-}
-
-src_configure() {
-	# Fix linking on Solaris
-	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lsocket -lnsl
-
-	# ODR warnings, bug #858335
-	# https://gitlab.kitware.com/cmake/cmake/-/issues/20740
-	filter-lto
-
-	local mycmakeargs=(
-		-DCMAKE_USE_SYSTEM_LIBRARIES=ON
-		-DCMAKE_DOC_DIR=/share/doc/${PF}
-		-DCMAKE_MAN_DIR=/share/man
-		-DCMAKE_DATA_DIR=/share/${PN}
-		-DSPHINX_MAN=$(usex doc)
-		-DSPHINX_HTML=$(usex doc)
-		-DBUILD_CursesDialog="$(usex ncurses)"
-		-DBUILD_TESTING=$(usex test)
-	)
-	use qt5 && mycmakeargs+=( -DBUILD_QtDialog=ON )
-
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-	use emacs && elisp-compile Auxiliary/cmake-mode.el
-}
-
-src_test() {
-	# Fix OutDir and SelectLibraryConfigurations tests
-	# these are altered thanks to our eclass
-	sed -i -e 's:^#_cmake_modify_IGNORE ::g' \
-		"${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \
-		|| die
-
-	pushd "${BUILD_DIR}" > /dev/null || die
-
-	# Excluded tests:
-	#    BootstrapTest: we actualy bootstrap it every time so why test it.
-	#    BundleUtilities: bundle creation broken
-	#    CMakeOnly.AllFindModules: pthread issues
-	#    CTest.updatecvs: which fails to commit as root
-	#    Fortran: requires fortran
-	#    RunCMake.CompilerLauncher: also requires fortran
-	#    RunCMake.CPack_RPM: breaks if app-arch/rpm is installed because
-	#        debugedit binary is not in the expected location
-	#    RunCMake.CPack_DEB: breaks if app-arch/dpkg is installed because
-	#        it can't find a deb package that owns libc
-	#    TestUpload, which requires network access
-	#    RunCMake.CMP0125, known failure reported upstream (bug #829414)
-	local myctestargs=(
-		--output-on-failure
-		-E "(BootstrapTest|BundleUtilities|CMakeOnly.AllFindModules|CompileOptions|CTest.UpdateCVS|Fortran|RunCMake.CompilerLauncher|RunCMake.CPack_(DEB|RPM)|TestUpload|RunCMake.CMP0125)" \
-	)
-
-	virtx cmake_src_test
-}
-
-src_install() {
-	cmake_src_install
-
-	# If USE=doc, there'll be newly generated docs which we install instead.
-	if ! use doc && [[ ${CMAKE_DOCS_PREBUILT} == 1 ]] ; then
-		doman "${WORKDIR}"/${PN}-${CMAKE_DOCS_VERSION}-docs/man*/*.[0-8]
-	fi
-
-	if use emacs; then
-		elisp-install ${PN} Auxiliary/cmake-mode.el Auxiliary/cmake-mode.elc
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-
-	insinto /usr/share/vim/vimfiles/syntax
-	doins Auxiliary/vim/syntax/cmake.vim
-
-	insinto /usr/share/vim/vimfiles/indent
-	doins Auxiliary/vim/indent/cmake.vim
-
-	insinto /usr/share/vim/vimfiles/ftdetect
-	doins "${FILESDIR}/${PN}.vim"
-
-	dobashcomp Auxiliary/bash-completion/{${PN},ctest,cpack}
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-
-	if use qt5; then
-		xdg_icon_cache_update
-		xdg_desktop_database_update
-		xdg_mimeinfo_database_update
-	fi
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-
-	if use qt5; then
-		xdg_icon_cache_update
-		xdg_desktop_database_update
-		xdg_mimeinfo_database_update
-	fi
-}
diff --git a/dev-util/ctags/Manifest b/dev-util/ctags/Manifest
index dd89c1a1f5bc..441d012ec3c2 100644
--- a/dev-util/ctags/Manifest
+++ b/dev-util/ctags/Manifest
@@ -1,6 +1,8 @@
 DIST ctags-20190331.tar.gz 1537104 BLAKE2B 354ddf48cdc9421e70d9d37ec7251e51f7f78564dc4f6236d12e2e18519369c39c22585830fd301b7eff4898d550b824776541198b8c4a31425711776b14fde4 SHA512 414faef7628ecaa66fcd5f172781a32194e1d58637dded1f7e55c138239ad777796bb1510bd447af3ad8243b7178e6f4859139305b0c0efe298182408f34524c
 DIST ctags-20211017.0.tar.gz 2542128 BLAKE2B cade7149cb2fd0645f9b7ecd37c8b9acdeae7037fde2bb74aa94d67f04963327429b83dcf5cd658f082bd8ce4c407f69f4924da5f768bec029b4075997bbd882 SHA512 85bfb4d40c1d9045b4ba4dc280ee7108ee2fd4572c92794d5bdc854f3511dad1ecf282428e61161773f7bfaca725d774593a0e83fc767a1bb2e12b229a19bec0
+DIST ctags-20220828.0.tar.gz 2952276 BLAKE2B 2ec3a01646cfb89446604af65387bb5cbf17188177505000f5803a9a535f59799961e8144d3ab36b23114fc093cb487589f52e7186b60041ff3bf2a439f77dab SHA512 4c1289dab24edded85c7ae31c06b0cad5b8f08f7f709a0bdacdf5f9d8ccf722c820d6fef6d46298bb06c48256e80f594dbf2456b91d1c50b3509ce4d3fe3ae9c
 EBUILD ctags-20190331-r1.ebuild 1797 BLAKE2B c7ec6c31a22292ba12294a35749d31b8f36b9ca125a88e1f39db750d2a943c416ff2c7aa675f03d260b0d772c1d9970d5442baa49d390d761d1610af4a9a3d50 SHA512 b6aa285fa71b532584b992bd420b82e3b0bc707691964848b905bcdfba8688544cf8177644ba38a0317bd629d49f80b5bead255b74518c9790f48bac706a6373
 EBUILD ctags-20211017.0.ebuild 1989 BLAKE2B 54966ffe1608682ec7bcb0ba6cc576a4de08b0cd4a9b5194ac27ea9c4afc57695668f24dbb8fcf13f1b3bf07307ae4925802c57bfcee5dded1ca9b6be078eaf2 SHA512 53a1f1f37df002e452e436a41c3d7a9572720fde6c2d5471798fe0ba4a6eaa684d34decfa81ae4a9e0428319fd59cae683fac76ca4a84190ff429a46a2eb09bd
-EBUILD ctags-99999999.ebuild 1982 BLAKE2B ebd632cb7092de1a21ad6b55537ddc81d4afd2b1a8c5227ff395d8cbfe1af25ab340be5e6df4b6005fc8090e1d48a047c0c5b3d959132eb604f461a5093c63a7 SHA512 305f7f0d340c88ce7c632d7fcc81af22d95d3ea9c839e2ce7027af4df630ca2c34afecd10da0d06f40574e340472779114219c2b8c0a5c06f7d749c1cfa0a245
+EBUILD ctags-20220828.0.ebuild 2230 BLAKE2B 431d2a4b061d952456105ad19e02cc869cc2d0a3022541a2eeb38919cf91a0790efaa74d1656422f493f4b837f7f7bb1829094c5d0ec1775bb5691c37b1b863e SHA512 4ac94523968a500e47dd93a6d2fca36f60e924e726eea0552abbeb9468c9556a13ff809db9e0997b5cca097c5fb0ffd62a4e27a1f7d20605449ca937547c60af
+EBUILD ctags-99999999.ebuild 2230 BLAKE2B 431d2a4b061d952456105ad19e02cc869cc2d0a3022541a2eeb38919cf91a0790efaa74d1656422f493f4b837f7f7bb1829094c5d0ec1775bb5691c37b1b863e SHA512 4ac94523968a500e47dd93a6d2fca36f60e924e726eea0552abbeb9468c9556a13ff809db9e0997b5cca097c5fb0ffd62a4e27a1f7d20605449ca937547c60af
 MISC metadata.xml 584 BLAKE2B 13de5ebe8bea2b413552eb85af3d3a42c453ad8d7f808b21a5b016bbd3e7890ceabdb924e817c4d841ed2862b7f9dcecad03f7f22c7b738db1c4f88d784fc80d SHA512 c4930de987c3d846c4761d66a191ae2b2800b32234f63ebafee140920faa408cec1b22032c72da01ade807a4187f482bedad3e22058fdffc0af56aabd1deea8f
diff --git a/dev-util/ctags/ctags-20220828.0.ebuild b/dev-util/ctags/ctags-20220828.0.ebuild
new file mode 100644
index 000000000000..ceadc8424f8a
--- /dev/null
+++ b/dev-util/ctags/ctags-20220828.0.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+inherit autotools python-any-r1
+
+DESCRIPTION="Exuberant Ctags creates tags files for code browsing in editors"
+HOMEPAGE="https://ctags.io/ https://github.com/universal-ctags/ctags"
+
+if [[ ${PV} == *99999999* ]] ; then
+	EGIT_REPO_URI="https://github.com/universal-ctags/ctags"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/universal-ctags/ctags/archive/refs/tags/p5.9.${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}"/${PN}-p5.9.${PV}
+
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="json pcre test xml yaml"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	json? ( dev-libs/jansson:= )
+	pcre? ( dev-libs/libpcre2 )
+	xml? ( dev-libs/libxml2:2 )
+	yaml? ( dev-libs/libyaml )
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	dev-python/docutils
+	virtual/pkgconfig
+	test? ( ${PYTHON_DEPS} )
+"
+IDEPEND="app-eselect/eselect-ctags"
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	# Ignore check-genfile test (calls git which errors out)
+	sed -i 's/man-test check-genfile/man-test/' makefiles/testing.mak || die
+
+	default
+
+	#./misc/dist-test-cases > makefiles/test-cases.mak || die
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable json) \
+		$(use_enable pcre pcre2) \
+		$(use_enable xml) \
+		$(use_enable yaml) \
+		--disable-etags \
+		--enable-tmpdir="${EPREFIX}"/tmp
+}
+
+src_install() {
+	emake prefix="${ED}"/usr mandir="${ED}"/usr/share/man install
+
+	# Namepace collision with X/Emacs-provided /usr/bin/ctags -- we
+	# rename ctags to exuberant-ctags (Mandrake does this also).
+	mv "${ED}"/usr/bin/{ctags,exuberant-ctags} || die
+	mv "${ED}"/usr/share/man/man1/{ctags,exuberant-ctags}.1 || die
+}
+
+pkg_postinst() {
+	eselect ctags update
+
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		elog "You can set the version to be started by ${EROOT}/usr/bin/ctags through"
+		elog "the ctags eselect module. \"man ctags.eselect\" for details."
+	fi
+}
+
+pkg_postrm() {
+	eselect ctags update
+}
diff --git a/dev-util/ctags/ctags-99999999.ebuild b/dev-util/ctags/ctags-99999999.ebuild
index 3b3948787072..ceadc8424f8a 100644
--- a/dev-util/ctags/ctags-99999999.ebuild
+++ b/dev-util/ctags/ctags-99999999.ebuild
@@ -1,38 +1,46 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-inherit autotools
+PYTHON_COMPAT=( python3_{8..11} )
+inherit autotools python-any-r1
 
 DESCRIPTION="Exuberant Ctags creates tags files for code browsing in editors"
 HOMEPAGE="https://ctags.io/ https://github.com/universal-ctags/ctags"
+
 if [[ ${PV} == *99999999* ]] ; then
-	inherit git-r3
 	EGIT_REPO_URI="https://github.com/universal-ctags/ctags"
+	inherit git-r3
 else
 	SRC_URI="https://github.com/universal-ctags/ctags/archive/refs/tags/p5.9.${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/${PN}-p5.9.${PV}"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	S="${WORKDIR}"/${PN}-p5.9.${PV}
+
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="GPL-2+"
 SLOT="0"
-IUSE="json xml yaml"
+IUSE="json pcre test xml yaml"
+RESTRICT="!test? ( test )"
 
 DEPEND="
 	json? ( dev-libs/jansson:= )
+	pcre? ( dev-libs/libpcre2 )
 	xml? ( dev-libs/libxml2:2 )
 	yaml? ( dev-libs/libyaml )
 "
-RDEPEND="
-	${DEPEND}
-	app-eselect/eselect-ctags
-"
+RDEPEND="${DEPEND}"
 BDEPEND="
 	dev-python/docutils
 	virtual/pkgconfig
+	test? ( ${PYTHON_DEPS} )
 "
+IDEPEND="app-eselect/eselect-ctags"
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
 
 src_prepare() {
 	# Ignore check-genfile test (calls git which errors out)
@@ -48,6 +56,7 @@ src_prepare() {
 src_configure() {
 	econf \
 		$(use_enable json) \
+		$(use_enable pcre pcre2) \
 		$(use_enable xml) \
 		$(use_enable yaml) \
 		--disable-etags \
@@ -57,7 +66,7 @@ src_configure() {
 src_install() {
 	emake prefix="${ED}"/usr mandir="${ED}"/usr/share/man install
 
-	# namepace collision with X/Emacs-provided /usr/bin/ctags -- we
+	# Namepace collision with X/Emacs-provided /usr/bin/ctags -- we
 	# rename ctags to exuberant-ctags (Mandrake does this also).
 	mv "${ED}"/usr/bin/{ctags,exuberant-ctags} || die
 	mv "${ED}"/usr/share/man/man1/{ctags,exuberant-ctags}.1 || die
@@ -66,8 +75,8 @@ src_install() {
 pkg_postinst() {
 	eselect ctags update
 
-	if [[ -z "$REPLACING_VERSIONS" ]]; then
-		elog "You can set the version to be started by /usr/bin/ctags through"
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		elog "You can set the version to be started by ${EROOT}/usr/bin/ctags through"
 		elog "the ctags eselect module. \"man ctags.eselect\" for details."
 	fi
 }
diff --git a/dev-util/devhelp/Manifest b/dev-util/devhelp/Manifest
index 1334fb46070c..9625321a39e6 100644
--- a/dev-util/devhelp/Manifest
+++ b/dev-util/devhelp/Manifest
@@ -1,6 +1,9 @@
 AUX 41.2-meson-0.61.patch 1775 BLAKE2B b169bd8ea9d84c074426219fcf9b2a37557490c1dc3a2e647016b6c46d2ecbc02000f9595da9375cf9a4b00d22c95ad831ef72fceb3192030bcefcdc073afe8c SHA512 50500f5ddaf5eafb1299f24d1b1dba4b0808c9a140f1d7c0748cc73d8da25e0a444bcd1a1293c331158a3f0f96af1ab9cb27c37498437f0bdbffb191d93777ac
 AUX 41.2-optional-introspection.patch 1196 BLAKE2B 85c451d943b23c0d0c26268b4a32ac177c9dba3b048446c0e3eb3c47fbe23e54602d3d5d5f3a72f76d8f8dc6382b4d9499a0b8c2b2d20bf9553334e205b12a27 SHA512 10aec862a82af083cadc4b182ac1e69566f4a3f9f4114fdefecf414b380a348c62edd4fefdf833300d2e2233454e17ee1092e228683f6fd30d02e2f9db3b6ef7
 AUX 41.2-webkitgtk40.patch 1174 BLAKE2B 9c93f1d8b214f8569f560de51d3e8f308e2ecb4dd00f8dc1e4daef5eef87a785289c1ab53b94de0e8e75493015fa13669c1a7b0cdfe7750617275fa13e830a47 SHA512 22b45421fe5e0e312cff0128f98fce32f76a15b5316ca8a4065db3a300dc0e12e04ac2a0a6c47e47ca7ff49c4a4e0c2e0a4accd10981f05eb6bf312860da0138
+AUX 41.3-webkitgtk40.patch 1005 BLAKE2B 59b4d5d197be0837f166ddebbaa63abd235934398b6df3c7a715ce05a13c006e20fe83ab91604ac2fce2a737e46812011f8dac7158b2b77cf1f85742a949ca17 SHA512 8afaea3f0ae6ebb64b5ea4518f091aee6fa90f63badbcfaef5d06d411300d93027c8e64ce3f3e4fcee7e7a31c53627afeaf0ce1c83797fd348163277a88726c5
 DIST devhelp-41.2.tar.xz 1455736 BLAKE2B c531af6cded6c9624581e4d14fb4d7713afbdcf173ec2a82e49789af1752568790dc346cc0293eddc68c0943fec4f742de726953de34441771711a938ba858fa SHA512 99a75ff19bf1b4613c312921452f190334e3e2036c28cda070169e3d1d352a5d2e7a56a393326efd679076257412e281dc94b628429119fcad58060d1a88ea98
+DIST devhelp-41.3.tar.xz 2303068 BLAKE2B 1c08931897a7cd1d15028d9394479297d6fffc48412aa31cc739380405b8588fec47fddbea803c80d44eb23d2fa84d5f9a42aa8b061859d459e450ccd76ee82d SHA512 91251f1d8c0380f16768a1fed2d0a0a19935a646613a966c48ae70e52bfe8b6aa0c683d2b371d9e25dfdfcaeac687ea2c83c2bfd5f4f35394bb4576e6f98b48d
 EBUILD devhelp-41.2.ebuild 1987 BLAKE2B 6a1fce0b8bf95a811b8e19133779ba29ec708f9f19c7da726c6a4eaa75b300d8d1a885de8b7a01cfb7507f7684325200b435210e88656de508089f4a1e2a1017 SHA512 223d44651c3e98b1837e4012ad4bec4144d440e780b9cdb548e96656934b1cea06808aa0902d2aa37379e66c9485fa9d999f53c4c1c0cee8d94b1144fae9f0fa
+EBUILD devhelp-41.3.ebuild 1949 BLAKE2B 3f7b01682a51ad0bb559c9fc9bfbb1b313a710ab1a8808dc3f9a62ac478e1d07b728817944d9dfdcfc0654316ae0a17432f098510ff89171345105a3edfa1507 SHA512 494515f891dc4c2d12e6c76e73262ac7216252dc64def2220879048eeb727d71ac6b2cd2147a45f8905959fa6772fe28de5ae96e96149269a38f1034557f9b87
 MISC metadata.xml 338 BLAKE2B 50e6d39aa8a020fad15ddf7fe529f56c440696730b7400135d5ce97694d15feb64a1bd02bb156b21faf7e6fb1772e10f5c90ddaf0cf62dd19bbe8cf8af8462fa SHA512 5a00a79928fadab11128ec6d73fa4f119c9a93b69ddc0ac4832d94a1d72b6e1eb1e5c128839281c4ec272b5fe6ec6608ef1b344d6a7f8b46ea59989bca5dc8a6
diff --git a/dev-util/devhelp/devhelp-41.3.ebuild b/dev-util/devhelp/devhelp-41.3.ebuild
new file mode 100644
index 000000000000..b9eb3583a6e9
--- /dev/null
+++ b/dev-util/devhelp/devhelp-41.3.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit gnome.org gnome2-utils meson python-single-r1 xdg
+
+DESCRIPTION="An API documentation browser for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Devhelp"
+
+LICENSE="GPL-3+ CC-BY-SA-4.0"
+SLOT="0/3-6" # subslot = 3-(libdevhelp-3 soname version)
+KEYWORDS="~amd64 ~arm ~ppc64 ~sparc ~x86"
+IUSE="+gedit gtk-doc +introspection"
+REQUIRED_USE="gedit? ( ${PYTHON_REQUIRED_USE} ) gtk-doc? ( introspection )"
+
+DEPEND="
+	>=dev-libs/glib-2.64:2
+	>=x11-libs/gtk+-3.22:3[introspection?]
+	>=net-libs/webkit-gtk-2.26:4[introspection?]
+	gnome-base/gsettings-desktop-schemas
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+"
+RDEPEND="${DEPEND}
+	gedit? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			app-editors/gedit[introspection(+),python,${PYTHON_SINGLE_USEDEP}]
+			dev-python/pygobject:3[${PYTHON_USEDEP}]
+		')
+	)
+"
+# libxml2 required for glib-compile-resources
+BDEPEND="
+	${PYTHON_DEPS}
+	dev-libs/libxml2:2
+	dev-util/glib-utils
+	dev-util/itstool
+	gtk-doc? ( >=dev-util/gi-docgen-2021.6 )
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/41.2-optional-introspection.patch
+	"${FILESDIR}"/${PV}-webkitgtk40.patch
+)
+
+pkg_setup() {
+	use gedit && python-single-r1_pkg_setup
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dflatpak_build=false
+		$(meson_use gtk-doc gtk_doc)
+		$(meson_use introspection)
+		-Dplugin_emacs=true
+		$(meson_use gedit plugin_gedit)
+		-Dplugin_vim=true
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	if use gtk-doc; then
+		mkdir -p "${ED}"/usr/share/gtk-doc/html/ || die
+		mv "${ED}"/usr/share/doc/devhelp-3 "${ED}"/usr/share/gtk-doc/html/ || die
+	fi
+	use gedit && python_optimize "${ED}"/usr/$(get_libdir)/gedit/plugins
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/dev-util/devhelp/files/41.3-webkitgtk40.patch b/dev-util/devhelp/files/41.3-webkitgtk40.patch
new file mode 100644
index 000000000000..bd798e8ce7cf
--- /dev/null
+++ b/dev-util/devhelp/files/41.3-webkitgtk40.patch
@@ -0,0 +1,34 @@
+From bdb13ad7f18c90d6409da713ac49dc3995d2dfe2 Mon Sep 17 00:00:00 2001
+From: Mart Raudsepp <leio@gentoo.org>
+Date: Sun, 3 Oct 2021 23:52:27 +0300
+Subject: [PATCH] build: Don't automagically depend on webkit2gtk-4.1
+
+That's the libsoup3 using webkit-gtk SLOT that we don't have. Patch it out,
+so it wouldn't be picked up automagically once it's added or comes from some
+overlay.
+
+This reverts commit f9d52aad23914df9dcb404723d1c99cf7b4e1eca.
+---
+ meson.build | 4 ----
+ 1 file changed, 4 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index 307a351a..64dc385a 100644
+--- a/meson.build
++++ b/meson.build
+@@ -46,12 +46,8 @@ lt_revision = 3
+ lt_age = 0
+ LIBDEVHELP_LT_VERSION = '@0@.@1@.@2@'.format(lt_current, lt_revision, lt_age)
+ 
+-webkit_dep = dependency('webkit2gtk-4.1', required : false)
+-webkit_abi = '4.1'
+-if not webkit_dep.found()
+   webkit_abi = '4.0'
+   webkit_dep = dependency('webkit2gtk-4.0')
+-endif
+ 
+ LIBDEVHELP_PUBLIC_DEPS = [
+   dependency('gio-2.0', version: '>= 2.64'),
+-- 
+2.35.1
+
diff --git a/dev-util/scap-driver/Manifest b/dev-util/scap-driver/Manifest
index 89d16eecb186..688e20d2125c 100644
--- a/dev-util/scap-driver/Manifest
+++ b/dev-util/scap-driver/Manifest
@@ -1,3 +1,4 @@
+AUX 0.29.3-fix-kmod-build-on-5.18+.patch 2363 BLAKE2B 8e5a89b68fb67076d01a7dc295157d2f2542a2db84460a35ed3162b77ff860097f1761317b93dec6aa0d6294b4414e445fd2c94df700bb5d738210982174f595 SHA512 f7c1e57cb05de1a97a3332055f6d6f74a637f38281a4e98b202cf84c9dd02b90e0b4fee3dbc44653760231ce55ad396aec3018b3b239249b6a37b018f672fba4
 DIST falcosecurity-libs-e5c53d648f3c4694385bbe488e7d47eaa36c229a.tar.gz 816972 BLAKE2B b47ae6a7677935500ebdab8aea7f4c49ef50b7175ec097e7213a1f041ac2b5aa642379924927ec12c84271016e9ab9d191c0c1d4ffacd6ade58b7a03c37f9221 SHA512 65e5916e5f9507fd867a5e9ba3b2670a1b73b7672a22479d3019e948a52ad74441d7e2ce1c74ebd0fdbd1ce66808efa49f285bd5180bceae9d4e6730a60787ce
-EBUILD scap-driver-0.29.3.ebuild 1757 BLAKE2B 1490fd0fb697c08e0ec71485fbc9e0f9de996cf2caf50b5a53505ccdabb5c4a5d9833d1edfc75b274bfbe028ac0198b4c73a16c5cef0a909074ec9a59b4f3b90 SHA512 07a85a6d23085036f42c2b549ae3b33e0cc87f7b0d82ffac0744f6c0cb7d6f8ec20d3736de16ce9e14752b577dd724ebf4c92fd17ace2a56a7c424b9354fbf75
+EBUILD scap-driver-0.29.3.ebuild 1820 BLAKE2B 1294e946005f0e9c29ed71ecdbd54e05f63535e8a6c70ef92c58fa1659aa58a69fe6c151a72bb25d53d3b6e59af962b29040490ea6b853c187717311f9ae1124 SHA512 770c9142d3ea4956ada90533a7c70a38d91d42b8b9710a088cbeacca82a6c2953a19a8373825a0b79c2a40dca985d8cd5db2e861e5521c3bf61411a6a953714f
 MISC metadata.xml 494 BLAKE2B d0bc754d3af2488b9dc7672fc63e962f4c885d88a819e4332bd1c25f84c967e2e1cd8489122490a864cbfd930225b3dc28c8bfad4426750c030dce6ef5a08b4e SHA512 b77b7c103cfb606333814af210a0fae1f7956ddd9d3c3a044b0bebf42553f5ffe99d04549fb9c5e40fce33e9d23761830b4944b2cd83bd8ca2193f9b7da60fc0
diff --git a/dev-util/scap-driver/files/0.29.3-fix-kmod-build-on-5.18+.patch b/dev-util/scap-driver/files/0.29.3-fix-kmod-build-on-5.18+.patch
new file mode 100644
index 000000000000..974b561df47f
--- /dev/null
+++ b/dev-util/scap-driver/files/0.29.3-fix-kmod-build-on-5.18+.patch
@@ -0,0 +1,63 @@
+
+Bug: https://bugs.gentoo.org/866113
+Source: https://github.com/falcosecurity/libs/pull/411/commits/36e945af4feb31c8b875f7d4624592b0c1ff929d
+
+From 36e945af4feb31c8b875f7d4624592b0c1ff929d Mon Sep 17 00:00:00 2001
+From: Federico Di Pierro <nierro92@gmail.com>
+Date: Mon, 20 Jun 2022 14:26:39 +0200
+Subject: [PATCH] fix(driver): fixed kmod build on linux kernels >= 5.18.
+
+Signed-off-by: Federico Di Pierro <nierro92@gmail.com>
+---
+ driver/main.c | 14 +++++++++-----
+ 1 file changed, 9 insertions(+), 5 deletions(-)
+
+diff --git a/driver/main.c b/driver/main.c
+index 6b5ae461a..e606cc2f8 100644
+--- a/driver/main.c
++++ b/driver/main.c
+@@ -70,8 +70,9 @@ MODULE_AUTHOR("the Falco authors");
+     #define TRACEPOINT_PROBE(probe, args...) static void probe(void *__data, args)
+ #endif
+ 
+-#ifndef pgprot_encrypted
+-#define pgprot_encrypted(x) (x)
++// Allow build even on arch where PAGE_ENC is not implemented
++#ifndef _PAGE_ENC
++#define _PAGE_ENC 0
+ #endif
+ 
+ struct ppm_device {
+@@ -1217,8 +1218,9 @@ static int ppm_mmap(struct file *filp, struct vm_area_struct *vma)
+ 
+ 			pfn = vmalloc_to_pfn(vmalloc_area_ptr);
+ 
++			pgprot_val(vma->vm_page_prot) = pgprot_val(PAGE_SHARED) | _PAGE_ENC;
+ 			ret = remap_pfn_range(vma, useraddr, pfn,
+-					      PAGE_SIZE, pgprot_encrypted(PAGE_SHARED));
++					      PAGE_SIZE, vma->vm_page_prot);
+ 			if (ret < 0) {
+ 				pr_err("remap_pfn_range failed (1)\n");
+ 				goto cleanup_mmap;
+@@ -1255,8 +1257,9 @@ static int ppm_mmap(struct file *filp, struct vm_area_struct *vma)
+ 			while (mlength > 0) {
+ 				pfn = vmalloc_to_pfn(vmalloc_area_ptr);
+ 
++				pgprot_val(vma->vm_page_prot) = pgprot_val(PAGE_SHARED) | _PAGE_ENC;
+ 				ret = remap_pfn_range(vma, useraddr, pfn,
+-						      PAGE_SIZE, pgprot_encrypted(PAGE_SHARED));
++						      PAGE_SIZE, vma->vm_page_prot);
+ 				if (ret < 0) {
+ 					pr_err("remap_pfn_range failed (1)\n");
+ 					goto cleanup_mmap;
+@@ -1277,8 +1280,9 @@ static int ppm_mmap(struct file *filp, struct vm_area_struct *vma)
+ 			while (mlength > 0) {
+ 				pfn = vmalloc_to_pfn(vmalloc_area_ptr);
+ 
++				pgprot_val(vma->vm_page_prot) = pgprot_val(PAGE_SHARED) | _PAGE_ENC;
+ 				ret = remap_pfn_range(vma, useraddr, pfn,
+-						      PAGE_SIZE, pgprot_encrypted(PAGE_SHARED));
++						      PAGE_SIZE, vma->vm_page_prot);
+ 				if (ret < 0) {
+ 					pr_err("remap_pfn_range failed (1)\n");
+ 					goto cleanup_mmap;
diff --git a/dev-util/scap-driver/scap-driver-0.29.3.ebuild b/dev-util/scap-driver/scap-driver-0.29.3.ebuild
index 518e80e54462..4857fc219e82 100644
--- a/dev-util/scap-driver/scap-driver-0.29.3.ebuild
+++ b/dev-util/scap-driver/scap-driver-0.29.3.ebuild
@@ -24,6 +24,8 @@ RDEPEND="!<dev-util/sysdig-${PV}[modules]"
 
 CONFIG_CHECK="HAVE_SYSCALL_TRACEPOINTS ~TRACEPOINTS"
 
+PATCHES=( "${FILESDIR}"/${PV}-fix-kmod-build-on-5.18+.patch )
+
 src_configure() {
 	local mycmakeargs=(
 		# we will use linux-mod, so just pretend to use bundled deps
diff --git a/dev-util/strace/Manifest b/dev-util/strace/Manifest
index 946b55a80b80..cd1af9b0a3b4 100644
--- a/dev-util/strace/Manifest
+++ b/dev-util/strace/Manifest
@@ -5,5 +5,5 @@ DIST strace-5.19.tar.xz 2353276 BLAKE2B 44b9a87f36e66481d8ac2107efbc389fa64c47b2
 EBUILD strace-5.17.ebuild 2448 BLAKE2B 99b2514d006878e750d31ea9711581fb5d1980f3091c7ded5d3ac129054f3793bc22ec00657d95ea4f7ac00bf2f6df76f79ba8bbbfc1ce0dd3fb741fe5d9e104 SHA512 496610adfb263912392935a7fea69f79ac98f0339a91719221b615a4ba1e330b6fe9159663f7e9bdc8e3bb58031a62a5c472bf934630cddc851bed65c5e57633
 EBUILD strace-5.18.ebuild 2447 BLAKE2B 88535b5906a24d4b2ccf26777e4a9fddc382187721598b44a6092e6ca7087601e2895575ba0046bd78c1caeeeface1dc52883b7fb30e266129b40bb5ea19b8df SHA512 c29e74848ff20d686ff02acbec5e08a9ad55d5f1970bc30779fde8e609ba88688fee69d6a63e6607c1da32b53676995f29adea9e81498e3feeaeaa0bb7fe6b16
 EBUILD strace-5.19.ebuild 2449 BLAKE2B 6979cd6b69d0785a51f86b7d7e3d630787fcb1682729f61bc2d060288c544ee153f348bdd602f4d3b4233f901fe1827df344d6df959c7b1a3d4d552852313df2 SHA512 1a5c4222702252bee1aa36dd31b80969a56b092cea4a8ba374349229d1a84a99ace9faa7e502e1466a4258983d2201f6733956bfe9785b946524c667b1ec757a
-EBUILD strace-9999.ebuild 2455 BLAKE2B 5bdb3970d1c9f4f3eea496c22d051d4b02448492fc5c20ab8ef424d65ddf94cbe989f585c4f3245ad8220d05f1234d51ba8ce49ad68b04e590aff54ca08c4dac SHA512 dd9f3f5fab44c96131f0e15bd343d92b4b636dd7a13742661133a56104f424663d526e7a2b98917239849da95affaab33621fd867aa73519e3cf5d058711c7f5
+EBUILD strace-9999.ebuild 2442 BLAKE2B 6cb1e240ee130494e165598f3ab853c0f2541365533ec5ee2b2e17bdc4e7b235ab32e2095699a69f461c2818c653975085604304d875134f1b9958ad11b44e49 SHA512 9a94e1bdeb02a857cba180f2ee23bd0b7c8031f5a533ce496396ed7011e85ae7ac6c96dd6919dab4e8ae70a8cf6c37ec5e07ad142e6f60d86899db7c6fe4a0a3
 MISC metadata.xml 779 BLAKE2B 89b4360e876fbb34a7a766a57ba9ca088a5e03e9ef66fdbe0a2b15df4cfb625daba11dc76920dec405b97cb87df49fd3c9edc0e184e73262b14b616af36fa4dd SHA512 88b2d94fd6efebaa617c8344bff3997f31c6262b9376cbce014bf7f6225f02bd8ee7bcaf98df4477435319bbb92addcdb6756e5d37a137a863f0bef1ecc5fced
diff --git a/dev-util/strace/strace-9999.ebuild b/dev-util/strace/strace-9999.ebuild
index edcd42346ba7..49ada010927a 100644
--- a/dev-util/strace/strace-9999.ebuild
+++ b/dev-util/strace/strace-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit autotools flag-o-matic toolchain-funcs
+inherit autotools edo flag-o-matic toolchain-funcs
 
 if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/strace/strace.git"
@@ -45,16 +45,15 @@ PATCHES=(
 src_prepare() {
 	default
 
-	eautoreconf
-
 	if [[ ! -e configure ]] ; then
 		# git generation
 		sed /autoreconf/d -i bootstrap || die
-		./bootstrap || die
-		eautoreconf
+		edo ./bootstrap
 		[[ ! -e CREDITS ]] && cp CREDITS{.in,}
 	fi
 
+	eautoreconf
+
 	# Stub out the -k test since it's known to be flaky. bug #545812
 	sed -i '1iexit 77' tests*/strace-k.test || die
 }
diff --git a/games-fps/Manifest.gz b/games-fps/Manifest.gz
index c98e19a64265..7818fb6fa2bf 100644
--- a/games-fps/Manifest.gz
+++ b/games-fps/Manifest.gz
diff --git a/games-fps/alephone-durandal/Manifest b/games-fps/alephone-durandal/Manifest
new file mode 100644
index 000000000000..10671a39311b
--- /dev/null
+++ b/games-fps/alephone-durandal/Manifest
@@ -0,0 +1,3 @@
+DIST Marathon2-20220115-Data.zip 29710307 BLAKE2B eadf9dac7ad9bedec5b4484c74b5bc4c342223d209af0a4ce90c58649833642c8127a7c21ec87efe1d6229018d6b1002ca1a63b5ed8634103547796e1750c559 SHA512 3f259a865bd9d3709fdc79722e5b0cffd3ddfec981310a00898d2a1348c6b2ffcee0fe36a8ef2da26f235e800703e24ab8f33fbfb3ed8f96a6fc46f84808700f
+EBUILD alephone-durandal-20220115.ebuild 890 BLAKE2B 8cd86943fcc9c7e9465b964286761a59a60e6a31d67fecfd88ea7ae0aebd5b32e1098525fc66c99b47b355349b5c84abc61f73f7964fc18727be38c6bf8b7295 SHA512 61c3e01b32fe0a07ef74b5f1de57d56bdde1d8bb73f0d98e3ba13c49a08cfdc327531785144f9718efe863b72a32906fa851fed1d40e2cf0d8ad062e675284d9
+MISC metadata.xml 510 BLAKE2B 585a78c69b8ffff8640baa9eb39fe66a3115cc004da917eeb37573b1ae816e399a63ed5f043d547bcd7e59499c670e5063da56356e00c78cc22df039f11d8a09 SHA512 95337185f46c35a2f8022a1acc00bbebc8174472bcda28dae1a58acd2c314081a0451ef9a6a348390ac908eb249ede97721cf43b21f8ff1984e74f1ea63a6f5e
diff --git a/games-fps/alephone-durandal/alephone-durandal-20220115.ebuild b/games-fps/alephone-durandal/alephone-durandal-20220115.ebuild
new file mode 100644
index 000000000000..3815c515b226
--- /dev/null
+++ b/games-fps/alephone-durandal/alephone-durandal-20220115.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop
+
+DESCRIPTION="Aleph One - Marathon 2 (Durandal)"
+HOMEPAGE="http://marathon.sourceforge.net/"
+SRC_URI="https://github.com/Aleph-One-Marathon/alephone/releases/download/release-${PV}/Marathon2-${PV}-Data.zip"
+S="${WORKDIR}/Marathon 2"
+
+LICENSE="bungie-marathon"
+SLOT="0"
+KEYWORDS="~amd64"
+RESTRICT="mirror"
+
+RDEPEND="games-fps/alephone"
+BDEPEND="app-arch/unzip"
+
+MY_NAME="durandal"
+MY_DIR="/usr/share/alephone-${MY_NAME}"
+
+src_install() {
+	insinto "${MY_DIR}"
+	doins -r *
+
+	make_desktop_entry "alephone.sh ${MY_NAME}" "${DESCRIPTION}"
+
+	# Make sure the extra dirs exist in case the user wants to add some data
+	keepdir "${MY_DIR}"/{Scripts,"Physics Models",Textures,Themes}
+}
+
+pkg_postinst() {
+	elog "To play this scenario, run:"
+	elog "alephone.sh ${MY_NAME}"
+}
diff --git a/games-fps/alephone-durandal/metadata.xml b/games-fps/alephone-durandal/metadata.xml
new file mode 100644
index 000000000000..2a5f1108e681
--- /dev/null
+++ b/games-fps/alephone-durandal/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>Matt.Jolly@footclan.ninja</email>
+		<name>Matt Jolly</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">Aleph-One-Marathon/alephone</remote-id>
+		<remote-id type="sourceforge">marathon</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/games-fps/alephone-infinity/Manifest b/games-fps/alephone-infinity/Manifest
new file mode 100644
index 000000000000..4f75eeaa9361
--- /dev/null
+++ b/games-fps/alephone-infinity/Manifest
@@ -0,0 +1,3 @@
+DIST MarathonInfinity-20220115-Data.zip 32203483 BLAKE2B c00e1ff6b4fc053e9df7f15711a73fd46f8e978714a7755137d1d9228a11715f5f3f161af17c1bd9d8bb9b6aaa4ae8292f5d007223c0c14b9a37a5f3e466675c SHA512 b37865f9f8e7ec14995e3ef5df8c3b3a8badc12fc1dc2388beaad90863e40f4fc589a08482e11a9ab21b7b1659c2248a340083ae0d0166689a4377a07d3c03ae
+EBUILD alephone-infinity-20220115.ebuild 900 BLAKE2B 610cecae473bb5216da717ff7f052f4ffdee1507ce9601836bc2ac4489839725eddb443ecf325bcea284913cfcebcd05dc01743b6baf8c6ece0a652f71cc5da9 SHA512 ff056ce38f86babfcd10b7d9261f6b3f834e902ed352e93d2002e1919bc0b07756c61469a7d79ce96a428d7e89e8868b3e585da22fceef2f5356d66793f8e0fc
+MISC metadata.xml 510 BLAKE2B 585a78c69b8ffff8640baa9eb39fe66a3115cc004da917eeb37573b1ae816e399a63ed5f043d547bcd7e59499c670e5063da56356e00c78cc22df039f11d8a09 SHA512 95337185f46c35a2f8022a1acc00bbebc8174472bcda28dae1a58acd2c314081a0451ef9a6a348390ac908eb249ede97721cf43b21f8ff1984e74f1ea63a6f5e
diff --git a/games-fps/alephone-infinity/alephone-infinity-20220115.ebuild b/games-fps/alephone-infinity/alephone-infinity-20220115.ebuild
new file mode 100644
index 000000000000..2b0f0b0b8319
--- /dev/null
+++ b/games-fps/alephone-infinity/alephone-infinity-20220115.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop
+
+DESCRIPTION="Aleph One - Marathon Infinity"
+HOMEPAGE="http://marathon.sourceforge.net/"
+SRC_URI="https://github.com/Aleph-One-Marathon/alephone/releases/download/release-${PV}/MarathonInfinity-${PV}-Data.zip"
+S="${WORKDIR}/Marathon Infinity"
+
+LICENSE="bungie-marathon"
+SLOT="0"
+KEYWORDS="~amd64"
+RESTRICT="mirror"
+
+RDEPEND="games-fps/alephone"
+BDEPEND="app-arch/unzip"
+
+MY_NAME="infinity"
+MY_DIR="/usr/share/alephone-${MY_NAME}"
+
+src_install() {
+	insinto "${MY_DIR}"
+	doins -r *
+
+	make_desktop_entry "alephone.sh ${MY_NAME}" "${DESCRIPTION}"
+
+	# Make sure the extra dirs exist in case the user wants to add some data
+	keepdir "${MY_DIR}"/{Scripts,"Physics Models",Textures,Themes}
+}
+
+pkg_postinst() {
+	elog "To play this scenario, run:"
+	elog "alephone.sh ${MY_NAME}"
+}
diff --git a/games-fps/alephone-infinity/metadata.xml b/games-fps/alephone-infinity/metadata.xml
new file mode 100644
index 000000000000..2a5f1108e681
--- /dev/null
+++ b/games-fps/alephone-infinity/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>Matt.Jolly@footclan.ninja</email>
+		<name>Matt Jolly</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">Aleph-One-Marathon/alephone</remote-id>
+		<remote-id type="sourceforge">marathon</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/games-fps/alephone-marathon/Manifest b/games-fps/alephone-marathon/Manifest
new file mode 100644
index 000000000000..e22fc9834102
--- /dev/null
+++ b/games-fps/alephone-marathon/Manifest
@@ -0,0 +1,3 @@
+DIST Marathon-20220115-Data.zip 26473230 BLAKE2B d6a917c0e884d128af11a56473cd4ec0022ca373c4c1e33f39b58ed24cd65a3cb40efd3e874f9ef64be6d3bf39206cd3a51310719223788d240747670075f697 SHA512 dd1eaaafcffe03b66244497c69044a3cabb8348186f1023dd08444a519a6fca59330bc5daf4950967482a12167059055d577e8211f3a70c92f512f74c8415bc8
+EBUILD alephone-marathon-20220115.ebuild 881 BLAKE2B 75551d5e841db81fb50863f94d6b7b0b412b12ef11a1007ef1b1e9f7f0cb4067021381f66b677a790308760fc2a70c3c89aded41844315137cddae5e786d7ca1 SHA512 356372d486e8a25aacb0059c9c32af41ebca53e761ddcc1ccfdba17d2b0d1aedc0e66db2d51d3433b10ce168dcf064407e0a18499c0f222dc65aead8561ef3ac
+MISC metadata.xml 510 BLAKE2B 585a78c69b8ffff8640baa9eb39fe66a3115cc004da917eeb37573b1ae816e399a63ed5f043d547bcd7e59499c670e5063da56356e00c78cc22df039f11d8a09 SHA512 95337185f46c35a2f8022a1acc00bbebc8174472bcda28dae1a58acd2c314081a0451ef9a6a348390ac908eb249ede97721cf43b21f8ff1984e74f1ea63a6f5e
diff --git a/games-fps/alephone-marathon/alephone-marathon-20220115.ebuild b/games-fps/alephone-marathon/alephone-marathon-20220115.ebuild
new file mode 100644
index 000000000000..a1a96ad86ae5
--- /dev/null
+++ b/games-fps/alephone-marathon/alephone-marathon-20220115.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop
+
+DESCRIPTION="Aleph One - Marathon (M1A1)"
+HOMEPAGE="http://marathon.sourceforge.net/"
+SRC_URI="https://github.com/Aleph-One-Marathon/alephone/releases/download/release-${PV}/Marathon-${PV}-Data.zip"
+S="${WORKDIR}/Marathon"
+
+LICENSE="bungie-marathon"
+SLOT="0"
+KEYWORDS="~amd64"
+RESTRICT="mirror"
+
+RDEPEND="games-fps/alephone"
+BDEPEND="app-arch/unzip"
+
+MY_NAME="marathon"
+MY_DIR="/usr/share/alephone-${MY_NAME}"
+
+src_install() {
+	insinto "${MY_DIR}"
+	doins -r *
+
+	make_desktop_entry "alephone.sh ${MY_NAME}" "${DESCRIPTION}"
+
+	# Make sure the extra dirs exist in case the user wants to add some data
+	keepdir "${MY_DIR}"/{Scripts,"Physics Models",Textures,Themes}
+}
+
+pkg_postinst() {
+	elog "To play this scenario, run:"
+	elog "alephone.sh ${MY_NAME}"
+}
diff --git a/games-fps/alephone-marathon/metadata.xml b/games-fps/alephone-marathon/metadata.xml
new file mode 100644
index 000000000000..2a5f1108e681
--- /dev/null
+++ b/games-fps/alephone-marathon/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>Matt.Jolly@footclan.ninja</email>
+		<name>Matt Jolly</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">Aleph-One-Marathon/alephone</remote-id>
+		<remote-id type="sourceforge">marathon</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/games-fps/alephone/Manifest b/games-fps/alephone/Manifest
new file mode 100644
index 000000000000..59beb0d6d58a
--- /dev/null
+++ b/games-fps/alephone/Manifest
@@ -0,0 +1,5 @@
+AUX alephone.sh 486 BLAKE2B ed0a60d272e7894ec64ce6f5a727dd4cd129ae8e582f72c74d2177cf22e2be18ee72d0988204fb65650da2c0e3890c9640844bea2f8091b32d24dfb80537dd8e SHA512 4eaf345bec8daecba38125a4bceef2d20985b1653550f935af20a28ec59f8615bf14d9254257e56d006affa24d63a3859e3270f416fcfb318dc688fefa2aff3b
+DIST release-20220115.tar.gz 6487243 BLAKE2B 7c304d28e826e2b3b32427661d3e85ff5ec41e6200d98468edeb5ea11a751fbbd333b72e3efe0937bc496088e36560351f810a6471d92cb684b0bf6adceabf68 SHA512 53d9c602af58f56b5236ca9a539ffac47abe8350b3d228345348e63648a5ef343335be9b0a3366a201807b3e3aa013dc360a38c3e7b47f4a6da2a696ec6ea646
+EBUILD alephone-20220115.ebuild 2203 BLAKE2B 48cdaf7c9a634881c8d0d04e2497af3407a1004df94f84d0af19bce0c1ba0c109c6d6f3ca90ae3d19c3a36c57d39f6f7589fb1304606e9c7488195db50c61e71 SHA512 e27bca5564e1c2062dc259fcbfce5d49c7d6fe7aed4b69a3843f10911f1d15582b062b1b710abec876068d8bbbac97a0ab96a2a804e10ec8114f1dcfcfa13190
+EBUILD alephone-9999.ebuild 2203 BLAKE2B 48cdaf7c9a634881c8d0d04e2497af3407a1004df94f84d0af19bce0c1ba0c109c6d6f3ca90ae3d19c3a36c57d39f6f7589fb1304606e9c7488195db50c61e71 SHA512 e27bca5564e1c2062dc259fcbfce5d49c7d6fe7aed4b69a3843f10911f1d15582b062b1b710abec876068d8bbbac97a0ab96a2a804e10ec8114f1dcfcfa13190
+MISC metadata.xml 599 BLAKE2B fec1ac113594c4548d8cc07eda9a63bc49c345fb0c08ee0622d3de2c1f15b25f8f4a1c4f33770685a479417136a2aa5f66f3f8ee7e7b4ff91e4f3fb97c05eddb SHA512 42faf1057312f77764da14f535dacc06f1029524b4c92db915bcd353d529334614545bff73ee9c36ffc6955f78f451063fee03660a9d615f0b00a023cea1aefc
diff --git a/games-fps/alephone/alephone-20220115.ebuild b/games-fps/alephone/alephone-20220115.ebuild
new file mode 100644
index 000000000000..9bddbbc0d931
--- /dev/null
+++ b/games-fps/alephone/alephone-20220115.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools optfeature prefix xdg
+
+DESCRIPTION="An enhanced version of the game engine from the classic Mac game, Marathon"
+HOMEPAGE="http://source.bungie.org/"
+if [[ ${PV} = 9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/Aleph-One-Marathon/alephone/"
+	EGIT_SUBMODULES=() # Upstream includes game data as submodules, we only want the engine
+else
+	SRC_URI="https://github.com/Aleph-One-Marathon/alephone/archive/refs/tags/release-${PV}.tar.gz"
+	S="${WORKDIR}/${PN}-release-${PV}"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="GPL-3+ BitstreamVera OFL-1.1"
+SLOT="0"
+
+IUSE="alsa curl speex upnp"
+
+# ffmpeg covers most audio/video use cases and the package doesn't configure with alternatives enabled (media-libs/smpeg)
+# When resolved upstream, !ffmpeg ( media-libs/libmad media-libs/libsndfile media-libs/libvorbis media-libs/smpeg )
+# with an appropriate REQUIRED_USE may be added.
+# See https://github.com/Aleph-One-Marathon/alephone/issues/85
+RDEPEND="
+	dev-libs/boost:=
+	dev-libs/zziplib:=
+	media-libs/libpng
+	media-libs/libsdl2
+	media-libs/sdl2-image[png]
+	media-libs/sdl2-net
+	media-libs/sdl2-ttf
+	media-video/ffmpeg:=[mp3,vorbis]
+	sys-libs/zlib
+	virtual/opengl
+	virtual/glu
+	alsa? ( media-libs/alsa-lib )
+	curl? ( net-misc/curl )
+	speex? ( media-libs/speex )
+	upnp? ( net-libs/miniupnpc )
+"
+
+DEPEND="
+	${RDEPEND}
+"
+
+BDEPEND="
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--enable-lua \
+		--enable-opengl \
+		--with-ffmpeg \
+		--without-mad \
+		--without-smpeg \
+		--without-sndfile \
+		--without-vorbis \
+		$(use_with alsa) \
+		$(use_with curl) \
+		$(use_with speex) \
+		$(use_with upnp miniupnpc)
+}
+
+src_install() {
+	default
+	prefixify_ro "${FILESDIR}"/${PN}.sh
+	dobin "${T}"/${PN}.sh
+	doman docs/${PN}.6
+	docinto html/
+	dodoc docs/*.html
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	optfeature_header "Install game data:"
+	optfeature "Marathon data files" games-fps/alephone-marathon
+	optfeature "Marathon 2 Durandal data files" games-fps/alephone-durandal
+	optfeature "Marathon: Infinity data files" games-fps/alephone-infinity
+}
diff --git a/games-fps/alephone/alephone-9999.ebuild b/games-fps/alephone/alephone-9999.ebuild
new file mode 100644
index 000000000000..9bddbbc0d931
--- /dev/null
+++ b/games-fps/alephone/alephone-9999.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools optfeature prefix xdg
+
+DESCRIPTION="An enhanced version of the game engine from the classic Mac game, Marathon"
+HOMEPAGE="http://source.bungie.org/"
+if [[ ${PV} = 9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/Aleph-One-Marathon/alephone/"
+	EGIT_SUBMODULES=() # Upstream includes game data as submodules, we only want the engine
+else
+	SRC_URI="https://github.com/Aleph-One-Marathon/alephone/archive/refs/tags/release-${PV}.tar.gz"
+	S="${WORKDIR}/${PN}-release-${PV}"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="GPL-3+ BitstreamVera OFL-1.1"
+SLOT="0"
+
+IUSE="alsa curl speex upnp"
+
+# ffmpeg covers most audio/video use cases and the package doesn't configure with alternatives enabled (media-libs/smpeg)
+# When resolved upstream, !ffmpeg ( media-libs/libmad media-libs/libsndfile media-libs/libvorbis media-libs/smpeg )
+# with an appropriate REQUIRED_USE may be added.
+# See https://github.com/Aleph-One-Marathon/alephone/issues/85
+RDEPEND="
+	dev-libs/boost:=
+	dev-libs/zziplib:=
+	media-libs/libpng
+	media-libs/libsdl2
+	media-libs/sdl2-image[png]
+	media-libs/sdl2-net
+	media-libs/sdl2-ttf
+	media-video/ffmpeg:=[mp3,vorbis]
+	sys-libs/zlib
+	virtual/opengl
+	virtual/glu
+	alsa? ( media-libs/alsa-lib )
+	curl? ( net-misc/curl )
+	speex? ( media-libs/speex )
+	upnp? ( net-libs/miniupnpc )
+"
+
+DEPEND="
+	${RDEPEND}
+"
+
+BDEPEND="
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--enable-lua \
+		--enable-opengl \
+		--with-ffmpeg \
+		--without-mad \
+		--without-smpeg \
+		--without-sndfile \
+		--without-vorbis \
+		$(use_with alsa) \
+		$(use_with curl) \
+		$(use_with speex) \
+		$(use_with upnp miniupnpc)
+}
+
+src_install() {
+	default
+	prefixify_ro "${FILESDIR}"/${PN}.sh
+	dobin "${T}"/${PN}.sh
+	doman docs/${PN}.6
+	docinto html/
+	dodoc docs/*.html
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	optfeature_header "Install game data:"
+	optfeature "Marathon data files" games-fps/alephone-marathon
+	optfeature "Marathon 2 Durandal data files" games-fps/alephone-durandal
+	optfeature "Marathon: Infinity data files" games-fps/alephone-infinity
+}
diff --git a/games-fps/alephone/files/alephone.sh b/games-fps/alephone/files/alephone.sh
new file mode 100644
index 000000000000..3bb51c26b67c
--- /dev/null
+++ b/games-fps/alephone/files/alephone.sh
@@ -0,0 +1,28 @@
+#!/usr/bin/env bash
+
+DIR=$(dirname "${0}")
+CMD=$(basename "${0}")
+ALEPHONE=${CMD%%.sh}
+
+if [[ -z "${1}" ]]
+then
+	echo "Usage: ${0} SCENARIO FLAGS"
+	echo "Where SCENARIO is one of:"
+	for d in @GENTOO_PORTAGE_EPREFIX@/usr/share/alephone-*
+	do
+		echo "  ${d##*/alephone-}"
+	done
+	exit 2
+fi
+
+DATA="@GENTOO_PORTAGE_EPREFIX@/usr/share/alephone-${1}"
+
+shift
+
+# kill ARTS, because we're just that nice
+if artsshell terminate 2> /dev/null
+then
+	sleep 2
+fi
+
+"${DIR}"/"${ALEPHONE}" "$@" "${DATA}"
diff --git a/games-fps/alephone/metadata.xml b/games-fps/alephone/metadata.xml
new file mode 100644
index 000000000000..62d4b84ac671
--- /dev/null
+++ b/games-fps/alephone/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
+	<maintainer type="person" proxied="yes">
+		<email>Matt.Jolly@footclan.ninja</email>
+		<name>Matt Jolly</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">Aleph-One-Marathon/alephone</remote-id>
+		<remote-id type="sourceforge">marathon</remote-id>
+		<bugs-to>https://github.com/Aleph-One-Marathon/alephone/issues</bugs-to>
+	</upstream>
+</pkgmetadata>
diff --git a/games-server/Manifest.gz b/games-server/Manifest.gz
index c8fd079a654b..9f3f0e0d521f 100644
--- a/games-server/Manifest.gz
+++ b/games-server/Manifest.gz
diff --git a/games-server/bedrock-server/Manifest b/games-server/bedrock-server/Manifest
index 37442518c030..97e3133134f4 100644
--- a/games-server/bedrock-server/Manifest
+++ b/games-server/bedrock-server/Manifest
@@ -1,9 +1,7 @@
 AUX bedrock-server.confd 317 BLAKE2B 47308c295519e0c92653a738aafd3044120c8f86d70050d639a0a1b05cf3cc1c8858bab713cc3b63cabb61c821d8292e95c9011c7af6593a4d8070722733f49d SHA512 9f6300b46680663b5a58a9b873fbbfd912c04fb3272a5528b64b6a32e5492ff1b66e9eafea65d17ff36defa006727b307ac130461846cd6742512bad3061db58
 AUX bedrock-server.initd-r4 1944 BLAKE2B 9870b09a447588ed0dbfe49bdeee928d54e8ea788a50dc834ea761ef8dcbf21696214ff3370f43de3218e202a5ad786b972c77a679a7cd0d2d1ef38f43db67de SHA512 3281e15bf7a4b87cd1b53b755c1695d77f2de0b7ea23ebdedf0bea60013c5d79f563fdbab3de421bfa50c3d2f24e93c39f49525d8157ca9e649d206a1cb80dfd
-DIST bedrock-server-1.19.10.03.zip 73426046 BLAKE2B 8c8c25d0e811509329d3c1ade0e442804ed221530b5a915c0d41e58f249dd2b7863bb2d87d1d871635d2b1468ee0dc6c42727e70013164c2e65fb7f13fc5988f SHA512 f1afffc34a2c4cf4c1ee16cee3dd067c5544ae3ec4337cb26c5047cecbe1c1b9baf6a98d915b3c20629223c27b222e37c1c5e762fe90bcb9fec2ec7990dcafbe
-DIST bedrock-server-1.19.11.01.zip 73425893 BLAKE2B 06f10a24db3205da7f2c83f4646610fb66743145cf9afd1d6d7e0c973c9151aedb335364ceb57dc83f26ebd9640ddb863f46724fe6dc581a75b1b1649ec59cbd SHA512 10c74dc3c511310814b3f28ac55a80b63a476f01259b351e95f3b3bc095441175af2076aa97846c51599a896c08c2d3d202ede417c487482c912e254dfaa1fa5
 DIST bedrock-server-1.19.20.02.zip 75658923 BLAKE2B f137320f5785ddbdd1f4ff550f99448ad70455c0ab70bc8d9ec48c15487503313dd0e887cd8b9a4a1a73b5af82af0b548a6cd13180fdbbd3fb53291f3c5c6ee7 SHA512 f82e50e9180dadab76152bc7860c0306d3ee68091f39345749e4c4268b5c6d53692188373bb366a053abc352b50b1508eab8d662b10fe7ce96cf91485596c1d2
-EBUILD bedrock-server-1.19.10.03.ebuild 1086 BLAKE2B 6febd87ffdf800926bc5232e8b99ac06dc6bc07f9e1ec597e2bef3852b8f422dcebc0d229f6c2e7a6a190475b82227dcc0f860b9b04f53c1fea9cbe6dea5ba43 SHA512 4c8cc6accca6c7ed66737ce01f4f5c5acb583ef2ddd26c1f0563f98bd500f7c3d762cccdef000a4ba70d3ff9783ca5d777e3927ca100e55d0d09984a553e3f6b
-EBUILD bedrock-server-1.19.11.01.ebuild 1087 BLAKE2B 9eaedd798a626d59330e6002c3b85c352825314b4d6f86ef4e8f1cfb06e6585e13731e20e37dd87311f3a00ddfcf28993f767b9e6b5ad043c44e2d0bcbb31bfc SHA512 dbc2691ccb190433c75a1cf5632e2fbeb158b9c8719b496c36134a8bafe53bd27c38701c68d5304994b45e071973143be1dfaa4dd9b007774100f32a03513d1f
-EBUILD bedrock-server-1.19.20.02.ebuild 1087 BLAKE2B 9eaedd798a626d59330e6002c3b85c352825314b4d6f86ef4e8f1cfb06e6585e13731e20e37dd87311f3a00ddfcf28993f767b9e6b5ad043c44e2d0bcbb31bfc SHA512 dbc2691ccb190433c75a1cf5632e2fbeb158b9c8719b496c36134a8bafe53bd27c38701c68d5304994b45e071973143be1dfaa4dd9b007774100f32a03513d1f
+DIST bedrock-server-1.19.21.01.zip 75658119 BLAKE2B 96aabcc9a7aa1ba815a23b4bdc65e1465afcca5f59ebe24feaa06c88520da3473fffdca707d0af4d4b2467a872fc5e7556e6d90f07f310cd958bdae1b94dde7c SHA512 98b6fbeda45945786a69aa78fa2bec896766abbc8e88aa2b08e039df3b9760a2daeaeeeaa5529f840ba6020f51e8f33511f0c34dba83f63d199387fe3c2a47ca
+EBUILD bedrock-server-1.19.20.02.ebuild 1086 BLAKE2B 6febd87ffdf800926bc5232e8b99ac06dc6bc07f9e1ec597e2bef3852b8f422dcebc0d229f6c2e7a6a190475b82227dcc0f860b9b04f53c1fea9cbe6dea5ba43 SHA512 4c8cc6accca6c7ed66737ce01f4f5c5acb583ef2ddd26c1f0563f98bd500f7c3d762cccdef000a4ba70d3ff9783ca5d777e3927ca100e55d0d09984a553e3f6b
+EBUILD bedrock-server-1.19.21.01.ebuild 1087 BLAKE2B 9eaedd798a626d59330e6002c3b85c352825314b4d6f86ef4e8f1cfb06e6585e13731e20e37dd87311f3a00ddfcf28993f767b9e6b5ad043c44e2d0bcbb31bfc SHA512 dbc2691ccb190433c75a1cf5632e2fbeb158b9c8719b496c36134a8bafe53bd27c38701c68d5304994b45e071973143be1dfaa4dd9b007774100f32a03513d1f
 MISC metadata.xml 676 BLAKE2B ae3d24e16c5da237df029cc571c6f7099c0e292524633990f92a16075a901191b0aade76429014bb02c95d8032b08436d79599eaafa4fea16345e63dd9180b94 SHA512 df3a66bb13e34ed64a3c5a7974a1aa6b5b4d8b9589a4f9bc08ac74a6cf6f7f8886373963b4d5532a3ca86a2ca48bd7a6f58500622741109273e8ec670ca290f7
diff --git a/games-server/bedrock-server/bedrock-server-1.19.10.03.ebuild b/games-server/bedrock-server/bedrock-server-1.19.10.03.ebuild
deleted file mode 100644
index 520bc15c7abd..000000000000
--- a/games-server/bedrock-server/bedrock-server-1.19.10.03.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="The official bedrock (non-java) based server for the sandbox video game"
-HOMEPAGE="https://www.minecraft.net/"
-SRC_URI="https://minecraft.azureedge.net/bin-linux/${P}.zip"
-S="${WORKDIR}"
-
-LICENSE="Mojang"
-SLOT="0"
-KEYWORDS="-* amd64"
-
-RDEPEND="
-	acct-group/bedrock
-	acct-user/bedrock
-	app-misc/dtach
-	dev-libs/openssl:0/1.1
-	sys-libs/zlib
-"
-
-BDEPEND="app-arch/unzip"
-
-RESTRICT="bindist mirror"
-
-DOCS=(
-	"bedrock_server_how_to.html"
-	"release-notes.txt"
-)
-
-QA_PREBUILT="opt/bedrock-server/bedrock_server"
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	exeinto /opt/bedrock-server
-	doexe bedrock_server
-
-	insinto /opt/bedrock-server
-	doins {allowlist,permissions}.json server.properties
-	doins -r {behavior,resource}_packs definitions structures
-
-	dodir /opt/bin
-	dosym ../bedrock-server/bedrock_server /opt/bin/bedrock-server
-
-	newinitd "${FILESDIR}"/bedrock-server.initd-r4 bedrock-server
-	newconfd "${FILESDIR}"/bedrock-server.confd bedrock-server
-
-	einstalldocs
-}
diff --git a/games-server/bedrock-server/bedrock-server-1.19.20.02.ebuild b/games-server/bedrock-server/bedrock-server-1.19.20.02.ebuild
index 16dd14a8e660..520bc15c7abd 100644
--- a/games-server/bedrock-server/bedrock-server-1.19.20.02.ebuild
+++ b/games-server/bedrock-server/bedrock-server-1.19.20.02.ebuild
@@ -10,7 +10,7 @@ S="${WORKDIR}"
 
 LICENSE="Mojang"
 SLOT="0"
-KEYWORDS="-* ~amd64"
+KEYWORDS="-* amd64"
 
 RDEPEND="
 	acct-group/bedrock
diff --git a/games-server/bedrock-server/bedrock-server-1.19.11.01.ebuild b/games-server/bedrock-server/bedrock-server-1.19.21.01.ebuild
index 16dd14a8e660..16dd14a8e660 100644
--- a/games-server/bedrock-server/bedrock-server-1.19.11.01.ebuild
+++ b/games-server/bedrock-server/bedrock-server-1.19.21.01.ebuild
diff --git a/games-server/minecraft-server/Manifest b/games-server/minecraft-server/Manifest
index 37b30e098812..392302aed236 100644
--- a/games-server/minecraft-server/Manifest
+++ b/games-server/minecraft-server/Manifest
@@ -3,10 +3,6 @@ AUX minecraft-server-bin 427 BLAKE2B b02c5d3ee1256cc41b5e369cc0ed2f082e8045c1189
 AUX minecraft-server.confd-r1 528 BLAKE2B 77155dc2d0878495419d141feeafcd34bb04a82859f7dbf3e637975b3c9ded4e034dbd7cc4c8b20eb7155a0621927e97f67d8a26890f90b5825512317ed3570c SHA512 caf5afe59b0efd57034585b255a3b3f4ca14f752f9961f4b438bb6bc0b7b096e8cb76883d1aa26a2b57725338808cb2961f86bc15293ed515b0dd3e61a18cf11
 AUX minecraft-server.initd-r5 2014 BLAKE2B f38e398a0772918349797c9ffa46ee6ac0a14bbd48cdfe61ba88c54785f290f6f4643498bec5aac8943f45b5e4cc9c1af4af99577284c87442d73b827e141ab7 SHA512 b49f615d823e35545797d21430f33674f1345a059279dcaccd2a4a91d63a4b90b278739827c6af2c57de083c440f84edce684d28d6eb04d5a8d1f7e5699ea658
 AUX minecraft-server.service 530 BLAKE2B 37b68213b4f15199ef999aff45b0ff0b2b12c8485c75871fbd034b167c440640ad4542daaf73c99fa63152d7fcf086d26f7241622f186ed48a59fafce8f72671 SHA512 b33926d866ad73d108bf6cabb9981fc072ae899ac4284c7e3219a08f3d2cd01197f2325b7051b071cee6c238ea8f9fd37b3eba956367504079de1a2bc8b047de
-DIST minecraft-server-1.19.1.jar 45609936 BLAKE2B 2d9fae53c78dbab85d768577f98f8ad9eeda6ee57c87a0585a706e209a6d7c8c4c30c84ba39ae4041e4753b511e9f35e48d441f6f4b00a83c5e27965aa62554d SHA512 9ba0605e29d0923170512412ec91e1656d4ddf7420a25f5b031c6e84551feb837398402171fea4f26123a72f0965bdba26bddb2626df51e71168408ecb081044
 DIST minecraft-server-1.19.2.jar 45609512 BLAKE2B bf754085c86903e601e529651c2442ae933cbb53582e7fc917d21f454f49a2c5fa66a75e24736ab5c9e4c24e5172dfa9780c7f16b2d801cd36bbb0e3f4f088ba SHA512 4af9474416abd22ccfe42a230b7ffff6a1fb82cdc7aa5994f6788223ab12149a26bcf76443752e7ce8c2fc3fef0535f704bdba786a95210fb4bac1b45b72a8c9
-DIST minecraft-server-1.19.jar 45538778 BLAKE2B 1f71b5f80746394fd747f6fecbdcecfb125f893dfc51aaf153150a16aa77894b6e8487dfd7b8f87000ff12f49135caa07221a2b885481ae20f54fa2cb4d6d1c8 SHA512 46db739cc49f5f3a31478467c0a470e35ef4c61e5030a9617f32da32efc45e290a2771d9b729b5272b1b6176cc5ca6675100f7fa1ba6e510a68b6cb96c7c88a8
-EBUILD minecraft-server-1.19.1.ebuild 1167 BLAKE2B 4c8b58891f27bda4b300727c0acca33c362cffcbcec0bfcfdb0dba0344a93f0dd8692953e8367ba3b7a83af1229d2c3e015e0a66f2f8e242335b40b5e5ef9b5a SHA512 5b1e174d735f014d1b24e27010838803f24495d5d7247fb921edca37debc171326acd9f44a08c40beef19ac1b8e9616b229ff3749fb8ec3ceb640d0fbac0b532
-EBUILD minecraft-server-1.19.2.ebuild 1167 BLAKE2B eabfb93edf65e8436e670c6afea400d1f6c144c14452815e1d40b381611faeb6913d6346f5dd3b2422d445aa50506727e4688ac42238ed61a0d88fefe778a9ee SHA512 ae9b8dca9752ac485c1d532970d5ed70aa978d082f110afb2c4ca21f8b2f3a9bf895ce2fc7edc4f27f499e6d9822bfbd74273612f61169d1db0e135737377a83
-EBUILD minecraft-server-1.19.ebuild 1166 BLAKE2B 8fbbc8205b8af725739aec461f891454852be963b5adfad88b4f762495d8d2f756ab4f6287db989833a4c7f59e0137a9305f11c07b5430fbdcb51db988ab0675 SHA512 d3ec698af5edafb48117efdcc8d56f1877fe8b2df103ed2f28e6c19c42f3d9b2a7184c944278143c8f286c8542e22727dff7a0cf24a171ade8551336f4163adb
+EBUILD minecraft-server-1.19.2.ebuild 1166 BLAKE2B d04dd80ddf5f58203d529ca7d580187374a6b63abbbaa22ca96a7a1380de61497208883ec87a279320ebe573927fe7357a1cbd242610bfe836e400e6f6b7b1de SHA512 70771caea56693698e23aba3018b83cf23fe0f31ff1884da1ae5cee3568c3f3484eff37df7fdf97df71fadc67e9ddc07b0395745befa9fd0db7840a2a49c6135
 MISC metadata.xml 935 BLAKE2B 7147903a9b3a7405889a8ef3282569aa953574339af51aa27d1deea266795546defd6ff89e93aee06c82f2b5bee34a8aa3a9756f4fdf2bac0ff5565a7165e17b SHA512 46d768d34f586b1e148657f108b4a852dd6708d340a53c5b6fedbfe4dc4770f44313510a04d58ccdb59b13257a7d30801c38c6fa94dcbb16e3d438179fd6b3d4
diff --git a/games-server/minecraft-server/minecraft-server-1.19.1.ebuild b/games-server/minecraft-server/minecraft-server-1.19.1.ebuild
deleted file mode 100644
index e90f1ac555f0..000000000000
--- a/games-server/minecraft-server/minecraft-server-1.19.1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-EGIT_COMMIT="8399e1211e95faa421c1507b322dbeae86d604df"
-README_GENTOO_SUFFIX="-r1"
-
-inherit readme.gentoo-r1 java-pkg-2 systemd
-
-DESCRIPTION="The official server for the sandbox video game"
-HOMEPAGE="https://www.minecraft.net/"
-SRC_URI="https://launcher.mojang.com/v1/objects/${EGIT_COMMIT}/server.jar -> ${P}.jar"
-S="${WORKDIR}"
-
-LICENSE="Mojang"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-RESTRICT="bindist mirror"
-
-RDEPEND="
-	acct-group/minecraft
-	acct-user/minecraft
-	app-misc/dtach
-	|| (
-		dev-java/openjdk:17
-		dev-java/openjdk-bin:17
-	)
-"
-
-src_unpack() {
-	cp "${DISTDIR}/${A}" "${WORKDIR}" || die
-}
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	newbin "${FILESDIR}"/minecraft-server-bin minecraft-server
-
-	java-pkg_newjar minecraft-server-${PV}.jar minecraft-server.jar
-
-	newinitd "${FILESDIR}"/minecraft-server.initd-r5 minecraft-server
-	newconfd "${FILESDIR}"/minecraft-server.confd-r1 minecraft-server
-	systemd_newunit "${FILESDIR}"/minecraft-server.service minecraft-server@.service
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/games-server/minecraft-server/minecraft-server-1.19.2.ebuild b/games-server/minecraft-server/minecraft-server-1.19.2.ebuild
index 142e35774045..d2d9d0e502be 100644
--- a/games-server/minecraft-server/minecraft-server-1.19.2.ebuild
+++ b/games-server/minecraft-server/minecraft-server-1.19.2.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}"
 
 LICENSE="Mojang"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 RESTRICT="bindist mirror"
 
 RDEPEND="
diff --git a/games-server/minecraft-server/minecraft-server-1.19.ebuild b/games-server/minecraft-server/minecraft-server-1.19.ebuild
deleted file mode 100644
index fe7bf46b2e2a..000000000000
--- a/games-server/minecraft-server/minecraft-server-1.19.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-EGIT_COMMIT="e00c4052dac1d59a1188b2aa9d5a87113aaf1122"
-README_GENTOO_SUFFIX="-r1"
-
-inherit readme.gentoo-r1 java-pkg-2 systemd
-
-DESCRIPTION="The official server for the sandbox video game"
-HOMEPAGE="https://www.minecraft.net/"
-SRC_URI="https://launcher.mojang.com/v1/objects/${EGIT_COMMIT}/server.jar -> ${P}.jar"
-S="${WORKDIR}"
-
-LICENSE="Mojang"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-RESTRICT="bindist mirror"
-
-RDEPEND="
-	acct-group/minecraft
-	acct-user/minecraft
-	app-misc/dtach
-	|| (
-		dev-java/openjdk:17
-		dev-java/openjdk-bin:17
-	)
-"
-
-src_unpack() {
-	cp "${DISTDIR}/${A}" "${WORKDIR}" || die
-}
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	newbin "${FILESDIR}"/minecraft-server-bin minecraft-server
-
-	java-pkg_newjar minecraft-server-${PV}.jar minecraft-server.jar
-
-	newinitd "${FILESDIR}"/minecraft-server.initd-r5 minecraft-server
-	newconfd "${FILESDIR}"/minecraft-server.confd-r1 minecraft-server
-	systemd_newunit "${FILESDIR}"/minecraft-server.service minecraft-server@.service
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/gui-apps/Manifest.gz b/gui-apps/Manifest.gz
index 1e7dd44c937a..b059efab479f 100644
--- a/gui-apps/Manifest.gz
+++ b/gui-apps/Manifest.gz
diff --git a/gui-apps/waybar/Manifest b/gui-apps/waybar/Manifest
index afdb6aa07f61..9edc78f579de 100644
--- a/gui-apps/waybar/Manifest
+++ b/gui-apps/waybar/Manifest
@@ -1,6 +1,7 @@
+AUX waybar-0.9.13-libcxx-build.patch 1193 BLAKE2B 71ca297fd87a5b6fcdf5dcaa11de100b2b953e4973c537169c32ca82efdd651cdb5cc22e41bcbc5e18f6b07f4733755f1588a456f47788201ba5368daa1bc356 SHA512 18b7a7ef2d2fd18c5364a5da972a0cd2aef35be05495f365c21fbe368d8d7147bf92db1c4c14373e8cfde8b1a8f71783b527759e982a1ced753f8c9c6a783b0c
 DIST waybar-0.9.12.tar.gz 183392 BLAKE2B 697a2fce74af8337dfbfc8d8823cf4f2acfda6a0dd009cea03ec2b79358a80db0935418436a51e375be2f702e2d53f9f3403ab01cb1e91e246c7e4cc01effdf5 SHA512 c035140ca0d47ae2cbc0313e25dc206c116b5b6f7a4e6192c7d40a9bd0ef18b8bfafdc8aeea2a85d670dccceda1e3942b6b3e3a451f51a6e68d25edf0ccb1b05
 DIST waybar-0.9.13.tar.gz 198160 BLAKE2B 222863b1048d2833be393875cad947647eccde3fcae335c48d4606843b3b9445717c18955351c56779196afaf9a5333ae7f718ea590521a79359372450d494a9 SHA512 d0a87044bcccdd16b1bbb20de750804c06335f11e638d37b5b80b72233e513378ba521f5c9d2c121a78a206877487628a6562cb080dd43eadae27e52d4cf6349
 EBUILD waybar-0.9.12.ebuild 1686 BLAKE2B 74268b2f60c60b2e549f7c2d6fb6c4716ba904851cd3209710e0ceb909c164ba138001a37be8dfa469ce6a30a978bec84ca923167296bdc1fa06c32a1ba4950d SHA512 6e8e552d54d7cd4791dc4a42e18db655b578be3ee9d4ac5dad9406ad0b9ed15dea8c4b6101c0de0b0a24443f6d2e24dd140f054dd56704be82709d3d0501b78f
-EBUILD waybar-0.9.13.ebuild 1686 BLAKE2B 74268b2f60c60b2e549f7c2d6fb6c4716ba904851cd3209710e0ceb909c164ba138001a37be8dfa469ce6a30a978bec84ca923167296bdc1fa06c32a1ba4950d SHA512 6e8e552d54d7cd4791dc4a42e18db655b578be3ee9d4ac5dad9406ad0b9ed15dea8c4b6101c0de0b0a24443f6d2e24dd140f054dd56704be82709d3d0501b78f
+EBUILD waybar-0.9.13.ebuild 1738 BLAKE2B ea4c1d9f2d46f0f6e8379152f62b0e8bc34456ba2cb7f83c408627874e4d349d10c5201bba32b39a3b11eb97d9dc64b91a6b103bd651978e03d4bb2740e4cc8a SHA512 76033a85795bb6969e9539713244ad2beb38630eb506ee8080cd4e14c3fcffc58062497f16272c4c4647ceea5f3d71d5dcf664d189e50f822ccc2a990b4e8ec6
 EBUILD waybar-9999.ebuild 1632 BLAKE2B a3b478c3aab3a41e0df3d06d93bc76d3fe20f187b29c9d56e61535a0cf5b0ff2a93bc40d0d90bfc88b800ee28ac7829422482728b0edb2ca0501a36d3a97228d SHA512 708c52f2030a5c72aa4c56bd0e1871633bb3641bfe3b77d518c2ac7907966663c4dcac1fccfc6ab4e16e27a96f41d09658911fae4fdf259ac822c069c62630c4
 MISC metadata.xml 1101 BLAKE2B 4eaa3e0ff4a70904ca17fcf69f47198532bff43a18283ca9ec85c71336d711d8a1ae4f3e7d8bf5f63b7334d0c4a6b3d5d189d8bfa10989e0e7fabbc90cf4c69d SHA512 4bb81f1bdcc5cf8f2ba1a092230e852ca14305a1a40cf778d5b39057984c74fb683deae4b6f3d5520d94b4a0f53c0b2b0a7f76f865e59f5de725d7226cccba09
diff --git a/gui-apps/waybar/files/waybar-0.9.13-libcxx-build.patch b/gui-apps/waybar/files/waybar-0.9.13-libcxx-build.patch
new file mode 100644
index 000000000000..ad24e22fc437
--- /dev/null
+++ b/gui-apps/waybar/files/waybar-0.9.13-libcxx-build.patch
@@ -0,0 +1,36 @@
+https://github.com/Alexays/Waybar/commit/d25278f710a4932798c98141bcf5b482de0e9166
+
+From: Jan Beich <jbeich@FreeBSD.org>
+Date: Mon, 23 May 2022 16:23:00 +0000
+Subject: [PATCH] fix(upower): add missing include for libc++
+
+In file included from src/modules/upower/upower.cpp:1:
+include/modules/upower/upower.hpp:25:16: error: no template named 'unordered_map' in namespace 'std'
+  typedef std::unordered_map<std::string, UpDevice *> Devices;
+          ~~~~~^
+In file included from src/modules/upower/upower_tooltip.cpp:1:
+include/modules/upower/upower_tooltip.hpp:13:16: error: no template named 'unordered_map' in namespace 'std'
+  typedef std::unordered_map<std::string, UpDevice*> Devices;
+          ~~~~~^
+--- a/include/modules/upower/upower.hpp
++++ b/include/modules/upower/upower.hpp
+@@ -5,6 +5,7 @@
+ #include <iostream>
+ #include <map>
+ #include <string>
++#include <unordered_map>
+ 
+ #include "ALabel.hpp"
+ #include "glibconfig.h"
+--- a/include/modules/upower/upower_tooltip.hpp
++++ b/include/modules/upower/upower_tooltip.hpp
+@@ -2,6 +2,8 @@
+ 
+ #include <libupower-glib/upower.h>
+ 
++#include <unordered_map>
++
+ #include "gtkmm/box.h"
+ #include "gtkmm/label.h"
+ #include "gtkmm/window.h"
+
diff --git a/gui-apps/waybar/waybar-0.9.13.ebuild b/gui-apps/waybar/waybar-0.9.13.ebuild
index 6fbac657f700..c4886a844841 100644
--- a/gui-apps/waybar/waybar-0.9.13.ebuild
+++ b/gui-apps/waybar/waybar-0.9.13.ebuild
@@ -57,6 +57,10 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-libcxx-build.patch
+)
+
 src_configure() {
 	local emesonargs=(
 		$(meson_feature mpd)
diff --git a/licenses/Manifest.gz b/licenses/Manifest.gz
index eadb233da8d0..064346d706ce 100644
--- a/licenses/Manifest.gz
+++ b/licenses/Manifest.gz
diff --git a/licenses/bungie-marathon b/licenses/bungie-marathon
new file mode 100644
index 000000000000..e449a0df08b6
--- /dev/null
+++ b/licenses/bungie-marathon
@@ -0,0 +1,14 @@
+From the original Marathon Trilogy Box Set License:
+
+(c) 1997 Bungie Software Products Corporation
+All Rights Reserved. PO Box 7877, Chicago, IL 60680-7877
+Marathon is a trademark of Bungie Software Products Corporation
+All other trademarks are the properties of their respective owners.
+
+From http://trilogyrelease.bungie.org/faq.html
+
+Q: Hey, I thought Marathon needed serial numbers!
+A: The versions released with the Trilogy Box Set were stripped of the serial number code. These will work fine - as long as you're not trying to play with folks who are using older versions.
+
+Q: Wow... can I do whatever I want with this stuff?
+A: NO. Bungie still holds the copyrights to these files. They're allowing them to be distributed for free (mostly because you can't buy them any more) - but they're still Bungie's intellectual property. You can't, for example, sell them.
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index eb8e20ede8f2..eddc25801f96 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/ampache_browser/Manifest b/media-libs/ampache_browser/Manifest
index 254e4ba4deb4..4fd4166256a1 100644
--- a/media-libs/ampache_browser/Manifest
+++ b/media-libs/ampache_browser/Manifest
@@ -1,5 +1,5 @@
 DIST ampache_browser-1.0.3.tar.gz 73608 BLAKE2B 057143939fba168e55e450bf7a702eb9f0093432191de5103117b0bd661618704183d40bf468aea08368cab2f0a3eab63c7ca016a305793cf922d03f02380058 SHA512 3179aa78983b9f630ce33f0b6ae6db7581262f5d93f300e94325f8d868c1a7ac614892974ed95a0f45eeaf72c739e4a4a0ba6a2886f003912da74e846d81ea9c
 DIST ampache_browser-1.0.4.tar.gz 73653 BLAKE2B dc3d264c65b8b9a6fda434fdf5c8f4effe142f77f2138c4033cba935aec1d173cc75d2c5d8a74e977c9f838c8170f77c6c5d9bcad9064319038cd581e934bcc2 SHA512 6b6240e0f4fcf1f16439505e3e0bb32f628ea903a02eeb89b575ac7acd7b57b06af25ee9454c5ffe869d5659852105eb0e415099ff84acc2f9dd3d825b5e62d7
 EBUILD ampache_browser-1.0.3.ebuild 614 BLAKE2B 6ee8de40294482f5d8759565ba93d0f0d7c420d52e11479860e0683f1c968fe571131b95645762b8c047e90406c0211b452152078fc4d58cd17f013204c0a305 SHA512 2d0e0a2a198cecf02cd74e0618e505b4cd39ae9e7580914c28049d2cc1550c1ce3ef1cbfce615e42fffdbabac107ba882c1e06bf302acd11171efac82da1c2c4
-EBUILD ampache_browser-1.0.4.ebuild 632 BLAKE2B b0c627f148fabfedca42847f8096659f8cac6ee1774910e52a4c4505c2520ab77e692306b222c8da2a0e3212c65f67b021d1077f02b7d0a6190eef9e4687ee61 SHA512 6bfadc384a0e6250316c533667e03b617f811b5b962a3b80a66457485581dd91af51d076d9f0bd254fda4ed757611624d6c9389e10703cc71cb0f8f4c20a765d
+EBUILD ampache_browser-1.0.4.ebuild 630 BLAKE2B 6b544496cb4bb6d721043a7fa7c0b8e61c16990c7684d914995b516e9c25644e3497bc4872be2e5efccb6125d45e34666186e97aad0e7e5821ba89c849bbc80c SHA512 482bfe82087865fe04f7b3d0d8841d3c906e1f4707855eb7e2712d1912b54b6147c7b8f21594ede4330f04ee0b5e40a52fb07901bab9684258d42bbb31c90b9c
 MISC metadata.xml 500 BLAKE2B 9fa6175e5bd94abd07d8ef2eb25bcb825bda7f4029ad7319f7838f4ac67ab9fd8cc5bfa3ee73f2e859927a647ce90131f91134315c5f82360e24ae3f996654eb SHA512 2c1a8e1ad4010812d6bf2a726b9810eae6796c1f90020f80301af4e39f8dd55ff6bbbb3f6bb02b8b9e3a4f1d758739ce7b5ba76a68dc5efdac1a02435427813a
diff --git a/media-libs/ampache_browser/ampache_browser-1.0.4.ebuild b/media-libs/ampache_browser/ampache_browser-1.0.4.ebuild
index 5e64cd59b2fe..8649dc997988 100644
--- a/media-libs/ampache_browser/ampache_browser-1.0.4.ebuild
+++ b/media-libs/ampache_browser/ampache_browser-1.0.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ampache-browser/ampache_browser/archive/v${PV}.tar.g
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv x86"
 IUSE="debug nls"
 
 RDEPEND="dev-qt/qtconcurrent:5
diff --git a/media-libs/libcanberra/Manifest b/media-libs/libcanberra/Manifest
index ffa321dcbdf7..2af6d3b95e51 100644
--- a/media-libs/libcanberra/Manifest
+++ b/media-libs/libcanberra/Manifest
@@ -2,4 +2,5 @@ AUX libcanberra-0.30-wayland.patch 2382 BLAKE2B bc2be1eb32541c80483538b8e3105f28
 AUX libcanberra-gtk-module.sh 275 BLAKE2B d7f863f77983d4144035eefc7ce3abb4eb411ecc3aac5f5737b7ce0f44e42cf713b963a17c6a6afdaa95833eedaa510ccd9371056c2c6f0e805febf16c245e36 SHA512 6c945211ad9d461e5bdac209c83e0fc0c714eb194f6d57e4f18db1d904528fe845cd628572d0ab9eb4d53005c00073b376b6d718bcd0cddaeee83dc90042643d
 DIST libcanberra-0.30.tar.xz 318960 BLAKE2B c90c6863738b103c256eeb0907060a0f74b73ef50ac0728d2114aa558a7a1ad7cbae4184860573d3fac0032eba77327a4de94c459b99a81c3dc19da0e98adfda SHA512 f7543582122256826cd01d0f5673e1e58d979941a93906400182305463d6166855cb51f35c56d807a56dc20b7a64f7ce4391368d24990c1b70782a7d0b4429c2
 EBUILD libcanberra-0.30-r6.ebuild 2493 BLAKE2B fb1d1d99a5dba9186b2944ca58f812fde2fc8e41c775f0bb126aae2b8b98d1ee0043cf24ab4496e49c39054fa57dbe8dec81cf558391a55ffbe54af28abd685b SHA512 93c16fa19212600f28eaa7e006e83025bc533284224ba58f1fbb6c70417d2586fe2a53ce628328bb7698b31464d0d2f8c7dfe438bc8ec7757e13aacd017e26ab
+EBUILD libcanberra-0.30-r7.ebuild 2488 BLAKE2B 8b33b01fba90c4c8623daf291d6a67c79d3bf13b7d9f6e21be6d690045964cdad767892cc9a8c41298492b55258f0128a874d110167f31acb125dec333e70e20 SHA512 056a92c8a79f86152cadf65f2271a97bf780e50d30d4ce9d62dcc9ca12c99475096a95ed440babcce032e4ed7a48a96d9716bbdf241db80cb7c37cc2594e023f
 MISC metadata.xml 1743 BLAKE2B 3fc8e1231f2344d0d291573a6a42014035a12fe1ac9f69a3015236758b3f3a4ecb759ccb63e93f89037ab29ab87f405106b7fb9ba2b0966b3e5fb24c2046d340 SHA512 85f363f3f9cc6f47a876bce81675ee29e5bf61014f3c6a6f1ddacddbf24d1c3d9b1b3e3a38308fdb4fc67eed0fe01d5f78e94c55cc0369ffa7b862ac13cd6b40
diff --git a/media-libs/libcanberra/libcanberra-0.30-r7.ebuild b/media-libs/libcanberra/libcanberra-0.30-r7.ebuild
new file mode 100644
index 000000000000..9cd8f36ea291
--- /dev/null
+++ b/media-libs/libcanberra/libcanberra-0.30-r7.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit multilib-minimal systemd
+
+DESCRIPTION="Portable sound event library"
+HOMEPAGE="http://0pointer.de/lennart/projects/libcanberra/"
+SRC_URI="http://0pointer.de/lennart/projects/${PN}/${P}.tar.xz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+IUSE="alsa gnome gstreamer gtk2 +gtk3 oss pulseaudio +sound tdb udev"
+
+DEPEND="
+	dev-libs/libltdl:0[${MULTILIB_USEDEP}]
+	media-libs/libvorbis[${MULTILIB_USEDEP}]
+	alsa? (
+		media-libs/alsa-lib:=[${MULTILIB_USEDEP}]
+		udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] ) )
+	gstreamer? ( media-libs/gstreamer:1.0[${MULTILIB_USEDEP}] )
+	gtk2? (
+		>=dev-libs/glib-2.32:2[${MULTILIB_USEDEP}]
+		>=x11-libs/gtk+-2.20.0:2[${MULTILIB_USEDEP}]
+		x11-libs/libX11[${MULTILIB_USEDEP}] )
+	gtk3? (
+		>=dev-libs/glib-2.32:2[${MULTILIB_USEDEP}]
+		x11-libs/gtk+:3[X,${MULTILIB_USEDEP}]
+		x11-libs/libX11[${MULTILIB_USEDEP}] )
+	pulseaudio? ( media-libs/libpulse[${MULTILIB_USEDEP}] )
+	tdb? ( sys-libs/tdb:=[${MULTILIB_USEDEP}] )
+"
+RDEPEND="${DEPEND}
+	gnome? (
+		gnome-base/dconf
+		gnome-base/gsettings-desktop-schemas )
+	sound? ( x11-themes/sound-theme-freedesktop )" # Required for index.theme wrt #323379
+BDEPEND="
+	app-arch/xz-utils
+	virtual/pkgconfig
+"
+
+REQUIRED_USE="udev? ( alsa )"
+
+PATCHES=(
+	# gtk: Don't assume all GdkDisplays are GdkX11Displays: broadway/wayland (from 'master')
+	"${FILESDIR}/${PN}-0.30-wayland.patch"
+)
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf \
+		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
+		$(use_enable alsa) \
+		$(use_enable oss) \
+		$(use_enable pulseaudio pulse) \
+		$(use_enable gstreamer) \
+		$(use_enable gtk2 gtk) \
+		$(use_enable gtk3) \
+		$(use_enable tdb) \
+		$(use_enable udev) \
+		--disable-lynx \
+		--disable-gtk-doc \
+		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
+
+	if multilib_is_native_abi; then
+		ln -s "${S}"/gtkdoc/html gtkdoc/html || die
+	fi
+}
+
+multilib_src_install() {
+	# Disable parallel installation until bug #253862 is solved
+	emake DESTDIR="${D}" -j1 install
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -type f -name '*.la' -delete || die
+
+	# This is needed for desktops different than GNOME, bug #520550
+	exeinto /etc/X11/xinit/xinitrc.d
+	newexe "${FILESDIR}"/libcanberra-gtk-module.sh 40-libcanberra-gtk-module
+}
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index ddd00c0479c6..5f5c0faff36e 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 294b1d3fbc07..a601cec3fcc7 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Mon, 29 Aug 2022 21:09:42 +0000
+Tue, 30 Aug 2022 03:09:35 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index 329bd39a28aa..032e3ed2a00c 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 524322 BLAKE2B 3983f62074c223717c76ae7cd44857f5de5972e245bd5f084c8632e144cf7a950ad3ddd53324db99f9b82eb9e76e49cd3a84bf1f531314d7660db91335a05cb9 SHA512 9b6be0313a2999bb5ad817a373c95ecf8d02d687a3d707b14136357c7bc684ea302f0ccdb228be1e52484b458ecca78cec7150915afe09c096106aa055c4eae2
-TIMESTAMP 2022-08-29T21:09:46Z
+TIMESTAMP 2022-08-30T03:09:41Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmMNKxpfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmMNf3VfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klAEhxAAlHcuI+bMBaIaIuNiwvagmObzI/shu06RdnYb28XNeL9xUlbbEQP4gc0T
-doSzRgxpjJcR/0B+bWe9kxWr0MmV8+noL2S7h4oLvJ0/lhxQXfAmNxvI96ldyn22
-K+mXBJ4r06vUIB7UeZqlzFGyW1jFf68MYIPKjTg65USNPfaf0c2op1dZNM/26H3V
-n5WPhyo8gfJKdgPefUAZiZYpvg9vkamaVaTKvJC1+SS+qmptw9AyWnn59niHYIj6
-La11U21QLuuJ8XSZg2mBGp+5KGD/juhaTTG3KYz7fxFttKG2WSnt8nP1OiUZ8e5B
-qcvsUZnp8d7rkpuE9I016V4Dy4NGIHuwwcXyudLPfF3Pj6UP/5KJD5a3om2F1mNy
-7T6TaZ7UFm4bkcGUb6YpXYqTiRLjRSoy/MQbv/HcBos56WIa6xSIqXDjyotH8tdv
-9WoKLovXi6pRdtitZsLa/cBgcdSIokFyhRFPQ2aaMd9PvZIeh39uLFdwTtfZfZfN
-JaHRb7NrbN+MK9d5vipL/MWzeUUut12LKbXj1BOh5eK+MLM3ncHd0//37PLNIo8D
-39f8CMOz18NHkrJVvlIopKx++zgK0vh92RmDsHYz/9ZSzafzqfI1gm/8K4aY4tj2
-XI1WpF8AgpinPqJqAxuONBh59tcnzzI6NLxgx94u8pJCPkgr1hQ=
-=ooQB
+klDkEBAAnDjw5nBZmfiGpQCbaed+mb4ckWxA0J5STD1jZHy9gTeyoeTO+CMr/HDP
+XU/jRbVcPUc8ntxlCacZvSFOnUwfoKqL3WBQKxXkNfedUJ+A89oc2727DhGj5YUs
++R1FDv83GQNEJmofsLCeVO9gSIsPa8a9/TsVabj6XOMCw6ZjOMpp+ok4p2CSTIck
+7jDp+lIUTVw/ZQB4Adas990fvZvdpd5GDQgp4gJCqNZijZQVxf75mYIm4YsRouNk
+tT8f3cud+5aFIKlSIBZgFydFrPje/NzLIqqUV6WhNGcYYPNJbcbFDoxG/y+lA242
+/Rt/5jGEdCUXDR0jRkQQo2i++CdyKOGkHvELsvfkybio9r2jfDtJCKVjOJxKPiDP
+Y3n20WY+jCR4W6cRikeH27s3tmIlLw6Z7cQ5SJxCBAub6HCnUzOlR9U2xW33N1Pi
+aBJh5KT7he26vuhGVWTBPEElpzDQ8Pk1maAnLQpQ86YZ5QzhzyOSpLDtuKSQ1jAj
+4J+z25aTta5EVJ6IoZsuqSn3mMwTG5HtJeEX8GWPwXG9h/1mrzElmzeY2acKgpN8
+TFmdEPXWXQ8WGg5wnCkpbxSCRB6OgsLBgjthLvZWtWFbO2QpW2N3JjTtzujqscVb
+fMLIqKf3iNrsZL1Up8Mqk3pf4ouMcovef5vibvL2cnBJoEPgD6w=
+=lVkF
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index d7971aef5a24..720b4f0d825c 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Mon, 29 Aug 2022 21:09:43 +0000
+Tue, 30 Aug 2022 03:09:36 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 387d323dd67c..9ddffa7c20c1 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
diff --git a/metadata/md5-cache/app-accessibility/Manifest.gz b/metadata/md5-cache/app-accessibility/Manifest.gz
index 768b13149ff0..11d2f8d01dfb 100644
--- a/metadata/md5-cache/app-accessibility/Manifest.gz
+++ b/metadata/md5-cache/app-accessibility/Manifest.gz
diff --git a/metadata/md5-cache/app-accessibility/espeakup-0.80 b/metadata/md5-cache/app-accessibility/espeakup-0.80
deleted file mode 100644
index d0e0b494a328..000000000000
--- a/metadata/md5-cache/app-accessibility/espeakup-0.80
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst setup unpack
-DEPEND=|| ( app-accessibility/espeak[portaudio] app-accessibility/espeak[pulseaudio] )
-DESCRIPTION=espeakup is a small lightweight connector for espeak and speakup
-EAPI=6
-HOMEPAGE=https://github.com/williamh/espeakup
-INHERIT=vcs-snapshot linux-info
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=|| ( app-accessibility/espeak[portaudio] app-accessibility/espeak[pulseaudio] )
-SLOT=0
-SRC_URI=https://github.com/williamh/espeakup/archive/v0.80.tar.gz -> espeakup-0.80.tar.gz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	eqawarn	c9847c43b3253a276ae2eabddedab3d7	linux-info	56708ddc53d8b607ed88fd97a56e59dc	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961	vcs-snapshot	eab6d8533446763c2e9777d8bbd1594e
-_md5_=8eeee858b95b73e888464145f82aa477
diff --git a/metadata/md5-cache/app-arch/Manifest.gz b/metadata/md5-cache/app-arch/Manifest.gz
index d7b34d4b5964..b21ab272bd18 100644
--- a/metadata/md5-cache/app-arch/Manifest.gz
+++ b/metadata/md5-cache/app-arch/Manifest.gz
diff --git a/metadata/md5-cache/app-arch/unzip-6.0_p27 b/metadata/md5-cache/app-arch/unzip-6.0_p27
index e3b21d63ba74..e3a9f2f04b5c 100644
--- a/metadata/md5-cache/app-arch/unzip-6.0_p27
+++ b/metadata/md5-cache/app-arch/unzip-6.0_p27
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=http://www.info-zip.org/
 INHERIT=flag-o-matic multilib toolchain-funcs
 IUSE=bzip2 natspec unicode
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=Info-ZIP
 RDEPEND=bzip2? ( app-arch/bzip2 ) natspec? ( dev-libs/libnatspec )
 SLOT=0
 SRC_URI=mirror://sourceforge/infozip/unzip60.tar.gz mirror://debian/pool/main/u/unzip/unzip_6.0-27.debian.tar.xz
 _eclasses_=flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=fb2194923f081e3305642117385fc673
+_md5_=050d84e58a2cf0f53ea4963204d51139
diff --git a/metadata/md5-cache/app-dicts/Manifest.gz b/metadata/md5-cache/app-dicts/Manifest.gz
index 9fb4afb799dc..4e0eda1afcc4 100644
--- a/metadata/md5-cache/app-dicts/Manifest.gz
+++ b/metadata/md5-cache/app-dicts/Manifest.gz
diff --git a/metadata/md5-cache/app-dicts/aspell-da-4.1 b/metadata/md5-cache/app-dicts/aspell-da-4.1
new file mode 100644
index 000000000000..2df2cdfc5a20
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/aspell-da-4.1
@@ -0,0 +1,14 @@
+BDEPEND=sys-apps/which
+DEFINED_PHASES=configure install
+DEPEND=app-text/aspell
+DESCRIPTION=Aspell (Danish) language dictionary
+EAPI=8
+HOMEPAGE=https://github.com/mortenivar/aspell-da
+INHERIT=aspell-dict-r1
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-macos
+LICENSE=GPL-2
+RDEPEND=app-text/aspell
+SLOT=0
+SRC_URI=https://github.com/mortenivar/aspell-da/archive/refs/tags/4.1.tar.gz -> aspell-da-4.1.tar.gz
+_eclasses_=aspell-dict-r1	dc35762817047596da90d52917261158
+_md5_=57a57dc154090fb7641f4468e943d56d
diff --git a/metadata/md5-cache/app-office/Manifest.gz b/metadata/md5-cache/app-office/Manifest.gz
index 79e83c26d8b4..0fd0f0c11e6f 100644
--- a/metadata/md5-cache/app-office/Manifest.gz
+++ b/metadata/md5-cache/app-office/Manifest.gz
diff --git a/metadata/md5-cache/app-office/sc-im-0.8.2 b/metadata/md5-cache/app-office/sc-im-0.8.2
new file mode 100644
index 000000000000..8478f8be38f6
--- /dev/null
+++ b/metadata/md5-cache/app-office/sc-im-0.8.2
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile configure install prepare setup
+DEPEND=sys-libs/ncurses:= lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) ods? ( dev-libs/libxml2 dev-libs/libzip ) plots? ( sci-visualization/gnuplot ) tmux? ( app-misc/tmux ) wayland? ( gui-apps/wl-clipboard ) X? ( x11-misc/xclip ) xls? ( dev-libs/libxls ) xlsx? ( dev-libs/libxlsxwriter dev-libs/libxml2 dev-libs/libzip )
+DESCRIPTION=Spreadsheet Calculator Improvised -- An ncurses spreadsheet program for terminal
+EAPI=8
+HOMEPAGE=https://github.com/andmarti1424/sc-im
+INHERIT=lua-single toolchain-funcs flag-o-matic
+IUSE=X plots wayland xls xlsx lua ods tmux lua_single_target_luajit lua_single_target_lua5-1
+KEYWORDS=~amd64
+LICENSE=BSD-4
+RDEPEND=sys-libs/ncurses:= lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) ods? ( dev-libs/libxml2 dev-libs/libzip ) plots? ( sci-visualization/gnuplot ) tmux? ( app-misc/tmux ) wayland? ( gui-apps/wl-clipboard ) X? ( x11-misc/xclip ) xls? ( dev-libs/libxls ) xlsx? ( dev-libs/libxlsxwriter dev-libs/libxml2 dev-libs/libzip )
+REQUIRED_USE=lua? ( ^^ ( lua_single_target_luajit lua_single_target_lua5-1 ) )
+SLOT=0
+SRC_URI=https://github.com/andmarti1424/sc-im/archive/v0.8.2.tar.gz -> sc-im-0.8.2.tar.gz
+_eclasses_=flag-o-matic	29a755b1291d64133634d80b0328f153	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=e1a2d0938047bfce1d15a76e5b832e19
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index 9c0dd0421e20..58a7cefb7a66 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/dotconf-1.3-r1 b/metadata/md5-cache/dev-libs/dotconf-1.3-r1
deleted file mode 100644
index 2ddaced5bcdb..000000000000
--- a/metadata/md5-cache/dev-libs/dotconf-1.3-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure postinst
-DEPEND=>=sys-devel/autoconf-2.58
-DESCRIPTION=dot.conf configuration file parser
-EAPI=6
-HOMEPAGE=https://github.com/williamh/dotconf
-INHERIT=toolchain-funcs
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux
-LICENSE=LGPL-2.1
-SLOT=0
-SRC_URI=mirror://gentoo/dotconf-1.3.tar.gz
-_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=a6c60aebcb6eb5b93939b65a8740bf9a
diff --git a/metadata/md5-cache/dev-libs/intel-compute-runtime-22.34.24023 b/metadata/md5-cache/dev-libs/intel-compute-runtime-22.34.24023
new file mode 100644
index 000000000000..c0934ac8bc6f
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/intel-compute-runtime-22.34.24023
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-libs/intel-metrics-library-0_pre20220526:= dev-libs/libnl:3 dev-libs/libxml2:2 >=dev-util/intel-graphics-compiler-1.0.11485 >=dev-util/intel-graphics-system-controller-0.8.0:= media-libs/mesa >=virtual/opencl-3 l0? ( >=dev-libs/level-zero-1.8.5:= ) vaapi? ( x11-libs/libdrm[video_cards_intel] x11-libs/libva )
+DESCRIPTION=Intel Graphics Compute Runtime for oneAPI Level Zero and OpenCL Driver
+EAPI=8
+HOMEPAGE=https://github.com/intel/compute-runtime
+INHERIT=cmake flag-o-matic
+IUSE=+l0 +vaapi
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=>=media-libs/gmmlib-22.1.7:=
+SLOT=0
+SRC_URI=https://github.com/intel/compute-runtime/archive/22.34.24023.tar.gz -> intel-compute-runtime-22.34.24023.tar.gz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=e674f231bd86c35ad7f46a75f092440f
diff --git a/metadata/md5-cache/dev-libs/libxlsxwriter-1.1.4 b/metadata/md5-cache/dev-libs/libxlsxwriter-1.1.4
new file mode 100644
index 000000000000..4810c4a550c8
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libxlsxwriter-1.1.4
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=sys-libs/zlib[minizip] openssl? ( dev-libs/openssl:= )
+DESCRIPTION=Libxlsxwriter is a C library for creating Excel XLSX files
+EAPI=8
+HOMEPAGE=https://libxlsxwriter.github.io/
+INHERIT=cmake plocale
+IUSE=openssl
+KEYWORDS=~amd64
+LICENSE=BSD-2
+RDEPEND=sys-libs/zlib[minizip] openssl? ( dev-libs/openssl:= )
+SLOT=0
+SRC_URI=https://github.com/jmcnamara/libxlsxwriter/archive/RELEASE_1.1.4.tar.gz -> libxlsxwriter-1.1.4.tar.gz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	plocale	7ce00136a77130df46fbbd5966f98a61	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=e11ab52fd9517b447d5589ddea77c678
diff --git a/metadata/md5-cache/dev-libs/openssl-1.1.1n b/metadata/md5-cache/dev-libs/openssl-1.1.1n
deleted file mode 100644
index 5c312cdab56f..000000000000
--- a/metadata/md5-cache/dev-libs/openssl-1.1.1n
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=>=dev-lang/perl-5 sctp? ( >=net-misc/lksctp-tools-1.0.12 ) test? ( sys-apps/diffutils sys-devel/bc kernel_linux? ( sys-process/procps ) ) verify-sig? ( sec-keys/openpgp-keys-openssl ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=>=app-misc/c_rehash-1.7-r1 tls-compression? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-DESCRIPTION=full-strength general purpose cryptography library (including SSL and TLS)
-EAPI=7
-HOMEPAGE=https://www.openssl.org/
-INHERIT=flag-o-matic toolchain-funcs multilib-minimal verify-sig
-IUSE=+asm rfc3779 sctp cpu_flags_x86_sse2 sslv3 static-libs test tls-compression tls-heartbeat vanilla verify-sig weak-ssl-ciphers abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 verify-sig
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
-LICENSE=openssl
-PDEPEND=app-misc/ca-certificates
-RDEPEND=>=app-misc/c_rehash-1.7-r1 tls-compression? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !<net-misc/openssh-8.0_p1-r3
-RESTRICT=!test? ( test )
-SLOT=0/1.1
-SRC_URI=mirror://openssl/source/openssl-1.1.1n.tar.gz verify-sig? ( mirror://openssl/source/openssl-1.1.1n.tar.gz.asc )
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	verify-sig	0748d665fa664a87add00152ed046e16	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=19a4b0ce2d9e5558e160fdadb632126a
diff --git a/metadata/md5-cache/dev-libs/openssl-1.1.1o b/metadata/md5-cache/dev-libs/openssl-1.1.1o
deleted file mode 100644
index 1a1c6f1dfa0d..000000000000
--- a/metadata/md5-cache/dev-libs/openssl-1.1.1o
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=>=dev-lang/perl-5 sctp? ( >=net-misc/lksctp-tools-1.0.12 ) test? ( sys-apps/diffutils sys-devel/bc kernel_linux? ( sys-process/procps ) ) verify-sig? ( sec-keys/openpgp-keys-openssl ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=>=app-misc/c_rehash-1.7-r1 tls-compression? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-DESCRIPTION=full-strength general purpose cryptography library (including SSL and TLS)
-EAPI=7
-HOMEPAGE=https://www.openssl.org/
-INHERIT=edo flag-o-matic toolchain-funcs multilib-minimal verify-sig
-IUSE=+asm rfc3779 sctp cpu_flags_x86_sse2 sslv3 static-libs test tls-compression tls-heartbeat vanilla verify-sig weak-ssl-ciphers abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 verify-sig
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
-LICENSE=openssl
-PDEPEND=app-misc/ca-certificates
-RDEPEND=>=app-misc/c_rehash-1.7-r1 tls-compression? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !<net-misc/openssh-8.0_p1-r3
-RESTRICT=!test? ( test )
-SLOT=0/1.1
-SRC_URI=mirror://openssl/source/openssl-1.1.1o.tar.gz https://dev.gentoo.org/~sam/distfiles/dev-libs/openssl/openssl-1.1.1o-test-fixes-expiry.patch.xz verify-sig? ( mirror://openssl/source/openssl-1.1.1o.tar.gz.asc )
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	verify-sig	0748d665fa664a87add00152ed046e16	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=14e4cf83b4733765786175ccf2c9cad5
diff --git a/metadata/md5-cache/dev-libs/openssl-1.1.1o-r1 b/metadata/md5-cache/dev-libs/openssl-1.1.1o-r1
deleted file mode 100644
index 57f3a05cb476..000000000000
--- a/metadata/md5-cache/dev-libs/openssl-1.1.1o-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=>=dev-lang/perl-5 sctp? ( >=net-misc/lksctp-tools-1.0.12 ) test? ( sys-apps/diffutils sys-devel/bc kernel_linux? ( sys-process/procps ) ) verify-sig? ( sec-keys/openpgp-keys-openssl ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=>=app-misc/c_rehash-1.7-r1 tls-compression? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-DESCRIPTION=Full-strength general purpose cryptography library (including SSL and TLS)
-EAPI=7
-HOMEPAGE=https://www.openssl.org/
-INHERIT=edo flag-o-matic toolchain-funcs multilib-minimal verify-sig
-IUSE=+asm rfc3779 sctp cpu_flags_x86_sse2 sslv3 static-libs test tls-compression tls-heartbeat vanilla verify-sig weak-ssl-ciphers abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 verify-sig
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
-LICENSE=openssl
-PDEPEND=app-misc/ca-certificates
-RDEPEND=>=app-misc/c_rehash-1.7-r1 tls-compression? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !<net-misc/openssh-8.0_p1-r3
-RESTRICT=!test? ( test )
-SLOT=0/1.1
-SRC_URI=mirror://openssl/source/openssl-1.1.1o.tar.gz https://dev.gentoo.org/~sam/distfiles/dev-libs/openssl/openssl-1.1.1o-test-fixes-expiry.patch.xz verify-sig? ( mirror://openssl/source/openssl-1.1.1o.tar.gz.asc )
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	verify-sig	0748d665fa664a87add00152ed046e16	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=c0b27ce598ac35c854df1330371c0385
diff --git a/metadata/md5-cache/dev-libs/openssl-1.1.1p b/metadata/md5-cache/dev-libs/openssl-1.1.1p
deleted file mode 100644
index 2c17294859f9..000000000000
--- a/metadata/md5-cache/dev-libs/openssl-1.1.1p
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=>=dev-lang/perl-5 sctp? ( >=net-misc/lksctp-tools-1.0.12 ) test? ( sys-apps/diffutils sys-devel/bc kernel_linux? ( sys-process/procps ) ) verify-sig? ( sec-keys/openpgp-keys-openssl ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=>=app-misc/c_rehash-1.7-r1 tls-compression? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-DESCRIPTION=Full-strength general purpose cryptography library (including SSL and TLS)
-EAPI=8
-HOMEPAGE=https://www.openssl.org/
-INHERIT=edo flag-o-matic toolchain-funcs multilib-minimal verify-sig
-IUSE=+asm rfc3779 sctp cpu_flags_x86_sse2 sslv3 static-libs test tls-compression tls-heartbeat vanilla verify-sig weak-ssl-ciphers abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 verify-sig
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
-LICENSE=openssl
-PDEPEND=app-misc/ca-certificates
-RDEPEND=>=app-misc/c_rehash-1.7-r1 tls-compression? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !<net-misc/openssh-8.0_p1-r3
-RESTRICT=!test? ( test )
-SLOT=0/1.1
-SRC_URI=mirror://openssl/source/openssl-1.1.1p.tar.gz verify-sig? ( mirror://openssl/source/openssl-1.1.1p.tar.gz.asc )
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	29a755b1291d64133634d80b0328f153	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	1542e649be915f43f6908a9e93909961	verify-sig	0748d665fa664a87add00152ed046e16
-_md5_=0311982f1a4bd529f09f6cdbcba6fc43
diff --git a/metadata/md5-cache/dev-libs/openssl-1.1.1q b/metadata/md5-cache/dev-libs/openssl-1.1.1q
index 26282bb57285..2f53746a8292 100644
--- a/metadata/md5-cache/dev-libs/openssl-1.1.1q
+++ b/metadata/md5-cache/dev-libs/openssl-1.1.1q
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://www.openssl.org/
 INHERIT=edo flag-o-matic toolchain-funcs multilib-minimal verify-sig
 IUSE=+asm rfc3779 sctp cpu_flags_x86_sse2 sslv3 static-libs test tls-compression tls-heartbeat vanilla verify-sig weak-ssl-ciphers abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 verify-sig
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=openssl
 PDEPEND=app-misc/ca-certificates
 RDEPEND=>=app-misc/c_rehash-1.7-r1 tls-compression? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !<net-misc/openssh-8.0_p1-r3
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0/1.1
 SRC_URI=mirror://openssl/source/openssl-1.1.1q.tar.gz verify-sig? ( mirror://openssl/source/openssl-1.1.1q.tar.gz.asc )
 _eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	29a755b1291d64133634d80b0328f153	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	1542e649be915f43f6908a9e93909961	verify-sig	0748d665fa664a87add00152ed046e16
-_md5_=b0064d3e714a5598b3dd09a07b240c96
+_md5_=301e263edc9071422b2563b1f51c0f22
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index e2acb2be4657..9bd118882cc7 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/cmake-3.22.2 b/metadata/md5-cache/dev-util/cmake-3.22.2
deleted file mode 100644
index 9f39224f8a3a..000000000000
--- a/metadata/md5-cache/dev-util/cmake-3.22.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=doc? ( dev-python/requests dev-python/sphinx ) test? ( app-arch/libarchive[zstd] ) sys-devel/make test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=>=app-arch/libarchive-3.3.3:= app-crypt/rhash >=dev-libs/expat-2.0.1 >=dev-libs/jsoncpp-1.9.2-r2:0= >=dev-libs/libuv-1.10.0:= >=net-misc/curl-7.21.5[ssl] sys-libs/zlib virtual/pkgconfig emacs? ( >=app-editors/emacs-23.1:* ) ncurses? ( sys-libs/ncurses:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 )
-DESCRIPTION=Cross platform Make
-EAPI=8
-HOMEPAGE=https://cmake.org/
-INHERIT=bash-completion-r1 cmake elisp-common flag-o-matic multiprocessing toolchain-funcs virtualx xdg-utils
-IUSE=doc emacs ncurses qt5 test test
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=CMake
-RDEPEND=>=app-arch/libarchive-3.3.3:= app-crypt/rhash >=dev-libs/expat-2.0.1 >=dev-libs/jsoncpp-1.9.2-r2:0= >=dev-libs/libuv-1.10.0:= >=net-misc/curl-7.21.5[ssl] sys-libs/zlib virtual/pkgconfig emacs? ( >=app-editors/emacs-23.1:* ) ncurses? ( sys-libs/ncurses:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://cmake.org/files/v3.22/cmake-3.22.2.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	cmake	44afbf15c35884f7c840470f1cf05d0d	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	1542e649be915f43f6908a9e93909961	virtualx	644887c82aefdf12001489391fca4f02	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=e9bd0f46cca334afc0ea19d84f374bcc
diff --git a/metadata/md5-cache/dev-util/cmake-3.23.1 b/metadata/md5-cache/dev-util/cmake-3.23.1
deleted file mode 100644
index 63657a2e3508..000000000000
--- a/metadata/md5-cache/dev-util/cmake-3.23.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=verify-sig? ( sec-keys/openpgp-keys-bradking ) doc? ( dev-python/requests dev-python/sphinx ) test? ( app-arch/libarchive[zstd] ) sys-devel/make test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=app-arch/libarchive-3.3.3:= app-crypt/rhash >=dev-libs/expat-2.0.1 >=dev-libs/jsoncpp-1.9.2-r2:0= >=dev-libs/libuv-1.10.0:= >=net-misc/curl-7.21.5[ssl] sys-libs/zlib virtual/pkgconfig emacs? ( >=app-editors/emacs-23.1:* ) ncurses? ( sys-libs/ncurses:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 )
-DESCRIPTION=Cross platform Make
-EAPI=8
-HOMEPAGE=https://cmake.org/
-INHERIT=bash-completion-r1 cmake elisp-common flag-o-matic multiprocessing toolchain-funcs virtualx xdg-utils verify-sig
-IUSE=doc emacs ncurses qt5 test test verify-sig
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=CMake
-RDEPEND=>=app-arch/libarchive-3.3.3:= app-crypt/rhash >=dev-libs/expat-2.0.1 >=dev-libs/jsoncpp-1.9.2-r2:0= >=dev-libs/libuv-1.10.0:= >=net-misc/curl-7.21.5[ssl] sys-libs/zlib virtual/pkgconfig emacs? ( >=app-editors/emacs-23.1:* ) ncurses? ( sys-libs/ncurses:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://cmake.org/files/v3.23/cmake-3.23.1.tar.gz verify-sig? ( https://github.com/Kitware/CMake/releases/download/v3.23.1/cmake-3.23.1-SHA-256.txt https://github.com/Kitware/CMake/releases/download/v3.23.1/cmake-3.23.1-SHA-256.txt.asc )
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	cmake	44afbf15c35884f7c840470f1cf05d0d	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	1542e649be915f43f6908a9e93909961	verify-sig	0748d665fa664a87add00152ed046e16	virtualx	644887c82aefdf12001489391fca4f02	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=12cbf60e018a04993a61a222c7d12369
diff --git a/metadata/md5-cache/dev-util/cmake-3.23.2 b/metadata/md5-cache/dev-util/cmake-3.23.2
deleted file mode 100644
index d78bbd62ab3b..000000000000
--- a/metadata/md5-cache/dev-util/cmake-3.23.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=verify-sig? ( sec-keys/openpgp-keys-bradking ) doc? ( dev-python/requests dev-python/sphinx ) test? ( app-arch/libarchive[zstd] ) sys-devel/make test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=app-arch/libarchive-3.3.3:= app-crypt/rhash >=dev-libs/expat-2.0.1 >=dev-libs/jsoncpp-1.9.2-r2:0= >=dev-libs/libuv-1.10.0:= >=net-misc/curl-7.21.5[ssl] sys-libs/zlib virtual/pkgconfig emacs? ( >=app-editors/emacs-23.1:* ) ncurses? ( sys-libs/ncurses:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 )
-DESCRIPTION=Cross platform Make
-EAPI=8
-HOMEPAGE=https://cmake.org/
-INHERIT=bash-completion-r1 cmake elisp-common flag-o-matic multiprocessing toolchain-funcs virtualx xdg-utils verify-sig
-IUSE=doc emacs ncurses qt5 test test verify-sig
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=CMake
-RDEPEND=>=app-arch/libarchive-3.3.3:= app-crypt/rhash >=dev-libs/expat-2.0.1 >=dev-libs/jsoncpp-1.9.2-r2:0= >=dev-libs/libuv-1.10.0:= >=net-misc/curl-7.21.5[ssl] sys-libs/zlib virtual/pkgconfig emacs? ( >=app-editors/emacs-23.1:* ) ncurses? ( sys-libs/ncurses:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://cmake.org/files/v3.23/cmake-3.23.2.tar.gz verify-sig? ( https://github.com/Kitware/CMake/releases/download/v3.23.2/cmake-3.23.2-SHA-256.txt https://github.com/Kitware/CMake/releases/download/v3.23.2/cmake-3.23.2-SHA-256.txt.asc )
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	cmake	44afbf15c35884f7c840470f1cf05d0d	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	1542e649be915f43f6908a9e93909961	verify-sig	0748d665fa664a87add00152ed046e16	virtualx	644887c82aefdf12001489391fca4f02	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=12cbf60e018a04993a61a222c7d12369
diff --git a/metadata/md5-cache/dev-util/cmake-3.24.0 b/metadata/md5-cache/dev-util/cmake-3.24.0
deleted file mode 100644
index 5e17238b7d9c..000000000000
--- a/metadata/md5-cache/dev-util/cmake-3.24.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=verify-sig? ( sec-keys/openpgp-keys-bradking ) doc? ( dev-python/requests dev-python/sphinx ) test? ( app-arch/libarchive[zstd] ) sys-devel/make test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=app-arch/libarchive-3.3.3:= app-crypt/rhash >=dev-libs/expat-2.0.1 >=dev-libs/jsoncpp-1.9.2-r2:0= >=dev-libs/libuv-1.10.0:= >=net-misc/curl-7.21.5[ssl] sys-libs/zlib virtual/pkgconfig emacs? ( >=app-editors/emacs-23.1:* ) ncurses? ( sys-libs/ncurses:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 )
-DESCRIPTION=Cross platform Make
-EAPI=8
-HOMEPAGE=https://cmake.org/
-INHERIT=bash-completion-r1 cmake elisp-common flag-o-matic multiprocessing toolchain-funcs virtualx xdg-utils verify-sig
-IUSE=doc emacs ncurses qt5 test test verify-sig
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=CMake
-RDEPEND=>=app-arch/libarchive-3.3.3:= app-crypt/rhash >=dev-libs/expat-2.0.1 >=dev-libs/jsoncpp-1.9.2-r2:0= >=dev-libs/libuv-1.10.0:= >=net-misc/curl-7.21.5[ssl] sys-libs/zlib virtual/pkgconfig emacs? ( >=app-editors/emacs-23.1:* ) ncurses? ( sys-libs/ncurses:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://cmake.org/files/v3.24/cmake-3.24.0.tar.gz !doc? ( https://dev.gentoo.org/~sam/distfiles/dev-util/cmake/cmake-3.24.0-docs.tar.xz ) verify-sig? ( https://github.com/Kitware/CMake/releases/download/v3.24.0/cmake-3.24.0-SHA-256.txt https://github.com/Kitware/CMake/releases/download/v3.24.0/cmake-3.24.0-SHA-256.txt.asc )
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	cmake	44afbf15c35884f7c840470f1cf05d0d	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	1542e649be915f43f6908a9e93909961	verify-sig	0748d665fa664a87add00152ed046e16	virtualx	644887c82aefdf12001489391fca4f02	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=2bb84adf5f5a0732e6d90c8a0bf539e0
diff --git a/metadata/md5-cache/dev-util/ctags-20220828.0 b/metadata/md5-cache/dev-util/ctags-20220828.0
new file mode 100644
index 000000000000..15b0bbbbbb28
--- /dev/null
+++ b/metadata/md5-cache/dev-util/ctags-20220828.0
@@ -0,0 +1,17 @@
+BDEPEND=dev-python/docutils virtual/pkgconfig test? ( || ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install postinst postrm prepare setup
+DEPEND=json? ( dev-libs/jansson:= ) pcre? ( dev-libs/libpcre2 ) xml? ( dev-libs/libxml2:2 ) yaml? ( dev-libs/libyaml )
+DESCRIPTION=Exuberant Ctags creates tags files for code browsing in editors
+EAPI=8
+HOMEPAGE=https://ctags.io/ https://github.com/universal-ctags/ctags
+IDEPEND=app-eselect/eselect-ctags
+INHERIT=autotools python-any-r1
+IUSE=json pcre test xml yaml
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-2+
+RDEPEND=json? ( dev-libs/jansson:= ) pcre? ( dev-libs/libpcre2 ) xml? ( dev-libs/libxml2:2 ) yaml? ( dev-libs/libyaml )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/universal-ctags/ctags/archive/refs/tags/p5.9.20220828.0.tar.gz -> ctags-20220828.0.tar.gz
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=8130d73179b1bf502bcc637b6ce29cb7
diff --git a/metadata/md5-cache/dev-util/ctags-99999999 b/metadata/md5-cache/dev-util/ctags-99999999
index 14cf62e2df2a..c728d882fee2 100644
--- a/metadata/md5-cache/dev-util/ctags-99999999
+++ b/metadata/md5-cache/dev-util/ctags-99999999
@@ -1,14 +1,16 @@
-BDEPEND=dev-python/docutils virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
-DEFINED_PHASES=configure install postinst postrm prepare unpack
-DEPEND=json? ( dev-libs/jansson:= ) xml? ( dev-libs/libxml2:2 ) yaml? ( dev-libs/libyaml )
+BDEPEND=dev-python/docutils virtual/pkgconfig test? ( || ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
+DEFINED_PHASES=configure install postinst postrm prepare setup unpack
+DEPEND=json? ( dev-libs/jansson:= ) pcre? ( dev-libs/libpcre2 ) xml? ( dev-libs/libxml2:2 ) yaml? ( dev-libs/libyaml )
 DESCRIPTION=Exuberant Ctags creates tags files for code browsing in editors
 EAPI=8
 HOMEPAGE=https://ctags.io/ https://github.com/universal-ctags/ctags
-INHERIT=autotools git-r3
-IUSE=json xml yaml
+IDEPEND=app-eselect/eselect-ctags
+INHERIT=autotools python-any-r1 git-r3
+IUSE=json pcre test xml yaml
 LICENSE=GPL-2+
 PROPERTIES=live
-RDEPEND=json? ( dev-libs/jansson:= ) xml? ( dev-libs/libxml2:2 ) yaml? ( dev-libs/libyaml ) app-eselect/eselect-ctags
+RDEPEND=json? ( dev-libs/jansson:= ) pcre? ( dev-libs/libpcre2 ) xml? ( dev-libs/libxml2:2 ) yaml? ( dev-libs/libyaml )
+RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=dd6f080ac47867af5b6f5fa8f1e65960
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=8130d73179b1bf502bcc637b6ce29cb7
diff --git a/metadata/md5-cache/dev-util/devhelp-41.3 b/metadata/md5-cache/dev-util/devhelp-41.3
new file mode 100644
index 000000000000..3acad92bc586
--- /dev/null
+++ b/metadata/md5-cache/dev-util/devhelp-41.3
@@ -0,0 +1,16 @@
+BDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) dev-libs/libxml2:2 dev-util/glib-utils dev-util/itstool gtk-doc? ( >=dev-util/gi-docgen-2021.6 ) >=sys-devel/gettext-0.19.8 virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install postinst postrm preinst setup test
+DEPEND=>=dev-libs/glib-2.64:2 >=x11-libs/gtk+-3.22:3[introspection?] >=net-libs/webkit-gtk-2.26:4[introspection?] gnome-base/gsettings-desktop-schemas introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+DESCRIPTION=An API documentation browser for GNOME
+EAPI=8
+HOMEPAGE=https://wiki.gnome.org/Apps/Devhelp
+INHERIT=gnome.org gnome2-utils meson python-single-r1 xdg
+IUSE=+gedit gtk-doc +introspection python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
+KEYWORDS=~amd64 ~arm ~ppc64 ~sparc ~x86
+LICENSE=GPL-3+ CC-BY-SA-4.0
+RDEPEND=>=dev-libs/glib-2.64:2 >=x11-libs/gtk+-3.22:3[introspection?] >=net-libs/webkit-gtk-2.26:4[introspection?] gnome-base/gsettings-desktop-schemas introspection? ( >=dev-libs/gobject-introspection-1.54:= ) gedit? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) python_single_target_python3_8? ( app-editors/gedit[introspection(+),python,python_single_target_python3_8(-)] dev-python/pygobject:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( app-editors/gedit[introspection(+),python,python_single_target_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( app-editors/gedit[introspection(+),python,python_single_target_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] ) python_single_target_python3_11? ( app-editors/gedit[introspection(+),python,python_single_target_python3_11(-)] dev-python/pygobject:3[python_targets_python3_11(-)] ) )
+REQUIRED_USE=gedit? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) ) gtk-doc? ( introspection )
+SLOT=0/3-6
+SRC_URI=mirror://gnome/sources/devhelp/41/devhelp-41.3.tar.xz
+_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=3bb68bbee2bf283d9d1b5fbe90840d2e
diff --git a/metadata/md5-cache/dev-util/scap-driver-0.29.3 b/metadata/md5-cache/dev-util/scap-driver-0.29.3
index f321ff11aa8e..5984f3a9060a 100644
--- a/metadata/md5-cache/dev-util/scap-driver-0.29.3
+++ b/metadata/md5-cache/dev-util/scap-driver-0.29.3
@@ -12,4 +12,4 @@ RDEPEND=!<dev-util/sysdig-0.29.3[modules] kernel_linux? ( sys-apps/kmod[tools] d
 SLOT=0
 SRC_URI=https://github.com/falcosecurity/libs/archive/e5c53d648f3c4694385bbe488e7d47eaa36c229a.tar.gz -> falcosecurity-libs-e5c53d648f3c4694385bbe488e7d47eaa36c229a.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	linux-info	56708ddc53d8b607ed88fd97a56e59dc	linux-mod	6ff232574f0bcad33767903505553e8d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=b89fe0bc475b743dbb36e1ed036a7928
+_md5_=2752aabcc5359fdb83e67ae76d3bbee6
diff --git a/metadata/md5-cache/dev-util/strace-9999 b/metadata/md5-cache/dev-util/strace-9999
index 443a390d4934..4ee625e72622 100644
--- a/metadata/md5-cache/dev-util/strace-9999
+++ b/metadata/md5-cache/dev-util/strace-9999
@@ -4,12 +4,12 @@ DEPEND=static? ( unwind? ( sys-libs/libunwind[static-libs(+)] ) elfutils? ( dev-
 DESCRIPTION=A useful diagnostic, instructional, and debugging tool
 EAPI=8
 HOMEPAGE=https://strace.io/
-INHERIT=autotools flag-o-matic toolchain-funcs git-r3
+INHERIT=autotools edo flag-o-matic toolchain-funcs git-r3
 IUSE=aio perl selinux static unwind elfutils
 LICENSE=BSD
 PROPERTIES=live
 RDEPEND=!static? ( unwind? ( sys-libs/libunwind ) elfutils? ( dev-libs/elfutils ) selinux? ( sys-libs/libselinux ) ) perl? ( dev-lang/perl )
 REQUIRED_USE=?? ( unwind elfutils )
 SLOT=0
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	flag-o-matic	29a755b1291d64133634d80b0328f153	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=59aff10e1ea0ba02c431c42ce63c5fe3
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	29a755b1291d64133634d80b0328f153	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=566449bd0f6535fc4bea92756e6f9337
diff --git a/metadata/md5-cache/games-fps/Manifest.gz b/metadata/md5-cache/games-fps/Manifest.gz
index 5e7893b71c96..aa99fe9be173 100644
--- a/metadata/md5-cache/games-fps/Manifest.gz
+++ b/metadata/md5-cache/games-fps/Manifest.gz
diff --git a/metadata/md5-cache/games-fps/alephone-20220115 b/metadata/md5-cache/games-fps/alephone-20220115
new file mode 100644
index 000000000000..77909c4f3dcd
--- /dev/null
+++ b/metadata/md5-cache/games-fps/alephone-20220115
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install postinst postrm preinst prepare
+DEPEND=dev-libs/boost:= dev-libs/zziplib:= media-libs/libpng media-libs/libsdl2 media-libs/sdl2-image[png] media-libs/sdl2-net media-libs/sdl2-ttf media-video/ffmpeg:=[mp3,vorbis] sys-libs/zlib virtual/opengl virtual/glu alsa? ( media-libs/alsa-lib ) curl? ( net-misc/curl ) speex? ( media-libs/speex ) upnp? ( net-libs/miniupnpc )
+DESCRIPTION=An enhanced version of the game engine from the classic Mac game, Marathon
+EAPI=8
+HOMEPAGE=http://source.bungie.org/
+INHERIT=autotools optfeature prefix xdg
+IUSE=alsa curl speex upnp
+KEYWORDS=~amd64
+LICENSE=GPL-3+ BitstreamVera OFL-1.1
+RDEPEND=dev-libs/boost:= dev-libs/zziplib:= media-libs/libpng media-libs/libsdl2 media-libs/sdl2-image[png] media-libs/sdl2-net media-libs/sdl2-ttf media-video/ffmpeg:=[mp3,vorbis] sys-libs/zlib virtual/opengl virtual/glu alsa? ( media-libs/alsa-lib ) curl? ( net-misc/curl ) speex? ( media-libs/speex ) upnp? ( net-libs/miniupnpc )
+SLOT=0
+SRC_URI=https://github.com/Aleph-One-Marathon/alephone/archive/refs/tags/release-20220115.tar.gz
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	optfeature	1a2157392a869265b2afcb63a26c12ac	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=921e2d595ca374f30bc93ae1c4f0eb91
diff --git a/metadata/md5-cache/games-fps/alephone-9999 b/metadata/md5-cache/games-fps/alephone-9999
new file mode 100644
index 000000000000..4b935db94427
--- /dev/null
+++ b/metadata/md5-cache/games-fps/alephone-9999
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
+DEFINED_PHASES=configure install postinst postrm preinst prepare unpack
+DEPEND=dev-libs/boost:= dev-libs/zziplib:= media-libs/libpng media-libs/libsdl2 media-libs/sdl2-image[png] media-libs/sdl2-net media-libs/sdl2-ttf media-video/ffmpeg:=[mp3,vorbis] sys-libs/zlib virtual/opengl virtual/glu alsa? ( media-libs/alsa-lib ) curl? ( net-misc/curl ) speex? ( media-libs/speex ) upnp? ( net-libs/miniupnpc )
+DESCRIPTION=An enhanced version of the game engine from the classic Mac game, Marathon
+EAPI=8
+HOMEPAGE=http://source.bungie.org/
+INHERIT=autotools optfeature prefix xdg git-r3
+IUSE=alsa curl speex upnp
+LICENSE=GPL-3+ BitstreamVera OFL-1.1
+PROPERTIES=live
+RDEPEND=dev-libs/boost:= dev-libs/zziplib:= media-libs/libpng media-libs/libsdl2 media-libs/sdl2-image[png] media-libs/sdl2-net media-libs/sdl2-ttf media-video/ffmpeg:=[mp3,vorbis] sys-libs/zlib virtual/opengl virtual/glu alsa? ( media-libs/alsa-lib ) curl? ( net-misc/curl ) speex? ( media-libs/speex ) upnp? ( net-libs/miniupnpc )
+SLOT=0
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	optfeature	1a2157392a869265b2afcb63a26c12ac	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=921e2d595ca374f30bc93ae1c4f0eb91
diff --git a/metadata/md5-cache/games-fps/alephone-durandal-20220115 b/metadata/md5-cache/games-fps/alephone-durandal-20220115
new file mode 100644
index 000000000000..838c622d5140
--- /dev/null
+++ b/metadata/md5-cache/games-fps/alephone-durandal-20220115
@@ -0,0 +1,14 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install postinst
+DESCRIPTION=Aleph One - Marathon 2 (Durandal)
+EAPI=8
+HOMEPAGE=http://marathon.sourceforge.net/
+INHERIT=desktop
+KEYWORDS=~amd64
+LICENSE=bungie-marathon
+RDEPEND=games-fps/alephone
+RESTRICT=mirror
+SLOT=0
+SRC_URI=https://github.com/Aleph-One-Marathon/alephone/releases/download/release-20220115/Marathon2-20220115-Data.zip
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa
+_md5_=b373c7d4bbe29f57dda4ff6785c8d3e2
diff --git a/metadata/md5-cache/games-fps/alephone-infinity-20220115 b/metadata/md5-cache/games-fps/alephone-infinity-20220115
new file mode 100644
index 000000000000..c7ce82af70c9
--- /dev/null
+++ b/metadata/md5-cache/games-fps/alephone-infinity-20220115
@@ -0,0 +1,14 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install postinst
+DESCRIPTION=Aleph One - Marathon Infinity
+EAPI=8
+HOMEPAGE=http://marathon.sourceforge.net/
+INHERIT=desktop
+KEYWORDS=~amd64
+LICENSE=bungie-marathon
+RDEPEND=games-fps/alephone
+RESTRICT=mirror
+SLOT=0
+SRC_URI=https://github.com/Aleph-One-Marathon/alephone/releases/download/release-20220115/MarathonInfinity-20220115-Data.zip
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa
+_md5_=5bb0d17114e0cf7c4c12b65cb0ea0053
diff --git a/metadata/md5-cache/games-fps/alephone-marathon-20220115 b/metadata/md5-cache/games-fps/alephone-marathon-20220115
new file mode 100644
index 000000000000..52500df5edb9
--- /dev/null
+++ b/metadata/md5-cache/games-fps/alephone-marathon-20220115
@@ -0,0 +1,14 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install postinst
+DESCRIPTION=Aleph One - Marathon (M1A1)
+EAPI=8
+HOMEPAGE=http://marathon.sourceforge.net/
+INHERIT=desktop
+KEYWORDS=~amd64
+LICENSE=bungie-marathon
+RDEPEND=games-fps/alephone
+RESTRICT=mirror
+SLOT=0
+SRC_URI=https://github.com/Aleph-One-Marathon/alephone/releases/download/release-20220115/Marathon-20220115-Data.zip
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa
+_md5_=5abfa1399d16737d9c305c9a7188387a
diff --git a/metadata/md5-cache/games-server/Manifest.gz b/metadata/md5-cache/games-server/Manifest.gz
index b19e5e8ef455..99a244eff733 100644
--- a/metadata/md5-cache/games-server/Manifest.gz
+++ b/metadata/md5-cache/games-server/Manifest.gz
diff --git a/metadata/md5-cache/games-server/bedrock-server-1.19.10.03 b/metadata/md5-cache/games-server/bedrock-server-1.19.10.03
deleted file mode 100644
index 138f6f5a8301..000000000000
--- a/metadata/md5-cache/games-server/bedrock-server-1.19.10.03
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=compile install
-DESCRIPTION=The official bedrock (non-java) based server for the sandbox video game
-EAPI=8
-HOMEPAGE=https://www.minecraft.net/
-KEYWORDS=-* amd64
-LICENSE=Mojang
-RDEPEND=acct-group/bedrock acct-user/bedrock app-misc/dtach dev-libs/openssl:0/1.1 sys-libs/zlib
-RESTRICT=bindist mirror
-SLOT=0
-SRC_URI=https://minecraft.azureedge.net/bin-linux/bedrock-server-1.19.10.03.zip
-_md5_=cd327b7e06186d65483755305b81e813
diff --git a/metadata/md5-cache/games-server/bedrock-server-1.19.20.02 b/metadata/md5-cache/games-server/bedrock-server-1.19.20.02
index 62dbc0698b63..978cb7e52293 100644
--- a/metadata/md5-cache/games-server/bedrock-server-1.19.20.02
+++ b/metadata/md5-cache/games-server/bedrock-server-1.19.20.02
@@ -3,10 +3,10 @@ DEFINED_PHASES=compile install
 DESCRIPTION=The official bedrock (non-java) based server for the sandbox video game
 EAPI=8
 HOMEPAGE=https://www.minecraft.net/
-KEYWORDS=-* ~amd64
+KEYWORDS=-* amd64
 LICENSE=Mojang
 RDEPEND=acct-group/bedrock acct-user/bedrock app-misc/dtach dev-libs/openssl:0/1.1 sys-libs/zlib
 RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=https://minecraft.azureedge.net/bin-linux/bedrock-server-1.19.20.02.zip
-_md5_=aaf5f776bcbb8fa9b6ce8732514ba237
+_md5_=cd327b7e06186d65483755305b81e813
diff --git a/metadata/md5-cache/games-server/bedrock-server-1.19.11.01 b/metadata/md5-cache/games-server/bedrock-server-1.19.21.01
index 2f345d1c9330..5633c406eca5 100644
--- a/metadata/md5-cache/games-server/bedrock-server-1.19.11.01
+++ b/metadata/md5-cache/games-server/bedrock-server-1.19.21.01
@@ -8,5 +8,5 @@ LICENSE=Mojang
 RDEPEND=acct-group/bedrock acct-user/bedrock app-misc/dtach dev-libs/openssl:0/1.1 sys-libs/zlib
 RESTRICT=bindist mirror
 SLOT=0
-SRC_URI=https://minecraft.azureedge.net/bin-linux/bedrock-server-1.19.11.01.zip
+SRC_URI=https://minecraft.azureedge.net/bin-linux/bedrock-server-1.19.21.01.zip
 _md5_=aaf5f776bcbb8fa9b6ce8732514ba237
diff --git a/metadata/md5-cache/games-server/minecraft-server-1.19 b/metadata/md5-cache/games-server/minecraft-server-1.19
deleted file mode 100644
index 5142b2a51edb..000000000000
--- a/metadata/md5-cache/games-server/minecraft-server-1.19
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile install postinst preinst prepare setup unpack
-DEPEND=>=dev-java/java-config-2.2.0-r3
-DESCRIPTION=The official server for the sandbox video game
-EAPI=8
-HOMEPAGE=https://www.minecraft.net/
-INHERIT=readme.gentoo-r1 java-pkg-2 systemd
-KEYWORDS=amd64 ~arm64
-LICENSE=Mojang
-RDEPEND=acct-group/minecraft acct-user/minecraft app-misc/dtach || ( dev-java/openjdk:17 dev-java/openjdk-bin:17 ) >=dev-java/java-config-2.2.0-r3
-RESTRICT=bindist mirror
-SLOT=0
-SRC_URI=https://launcher.mojang.com/v1/objects/e00c4052dac1d59a1188b2aa9d5a87113aaf1122/server.jar -> minecraft-server-1.19.jar
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	multilib	5ca4e49abed8e3a2f7b56920eadee157	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=6ea6f9b11a94100138fdaa2a428fa7b3
diff --git a/metadata/md5-cache/games-server/minecraft-server-1.19.1 b/metadata/md5-cache/games-server/minecraft-server-1.19.1
deleted file mode 100644
index 4bf53708f5c1..000000000000
--- a/metadata/md5-cache/games-server/minecraft-server-1.19.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile install postinst preinst prepare setup unpack
-DEPEND=>=dev-java/java-config-2.2.0-r3
-DESCRIPTION=The official server for the sandbox video game
-EAPI=8
-HOMEPAGE=https://www.minecraft.net/
-INHERIT=readme.gentoo-r1 java-pkg-2 systemd
-KEYWORDS=~amd64 ~arm64
-LICENSE=Mojang
-RDEPEND=acct-group/minecraft acct-user/minecraft app-misc/dtach || ( dev-java/openjdk:17 dev-java/openjdk-bin:17 ) >=dev-java/java-config-2.2.0-r3
-RESTRICT=bindist mirror
-SLOT=0
-SRC_URI=https://launcher.mojang.com/v1/objects/8399e1211e95faa421c1507b322dbeae86d604df/server.jar -> minecraft-server-1.19.1.jar
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	multilib	5ca4e49abed8e3a2f7b56920eadee157	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=e09a1aa5dbcc9c1ee671796ae1310069
diff --git a/metadata/md5-cache/games-server/minecraft-server-1.19.2 b/metadata/md5-cache/games-server/minecraft-server-1.19.2
index 0430187cd31b..8b700ddd9f4f 100644
--- a/metadata/md5-cache/games-server/minecraft-server-1.19.2
+++ b/metadata/md5-cache/games-server/minecraft-server-1.19.2
@@ -5,11 +5,11 @@ DESCRIPTION=The official server for the sandbox video game
 EAPI=8
 HOMEPAGE=https://www.minecraft.net/
 INHERIT=readme.gentoo-r1 java-pkg-2 systemd
-KEYWORDS=~amd64 ~arm64
+KEYWORDS=amd64 ~arm64
 LICENSE=Mojang
 RDEPEND=acct-group/minecraft acct-user/minecraft app-misc/dtach || ( dev-java/openjdk:17 dev-java/openjdk-bin:17 ) >=dev-java/java-config-2.2.0-r3
 RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=https://launcher.mojang.com/v1/objects/f69c284232d7c7580bd89a5a4931c3581eae1378/server.jar -> minecraft-server-1.19.2.jar
 _eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	multilib	5ca4e49abed8e3a2f7b56920eadee157	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=834bf71bc89d90d3ec2c77225b7b3a9a
+_md5_=cb1622b4969ef95e4431746cb6004e04
diff --git a/metadata/md5-cache/gui-apps/Manifest.gz b/metadata/md5-cache/gui-apps/Manifest.gz
index 2f047552e9c4..418a5f847ae2 100644
--- a/metadata/md5-cache/gui-apps/Manifest.gz
+++ b/metadata/md5-cache/gui-apps/Manifest.gz
diff --git a/metadata/md5-cache/gui-apps/waybar-0.9.13 b/metadata/md5-cache/gui-apps/waybar-0.9.13
index 1ddf47791dc0..d8fbc56da6fd 100644
--- a/metadata/md5-cache/gui-apps/waybar-0.9.13
+++ b/metadata/md5-cache/gui-apps/waybar-0.9.13
@@ -12,4 +12,4 @@ RDEPEND=dev-cpp/cairomm:0 dev-cpp/glibmm:2 dev-cpp/gtkmm:3.0 dev-libs/glib:2 dev
 SLOT=0
 SRC_URI=https://github.com/Alexays/Waybar/archive/0.9.13.tar.gz -> waybar-0.9.13.tar.gz
 _eclasses_=meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=04019f3c63cfde9c58a8b5e29539f28d
+_md5_=c13335e08d44a4c676595afd0ef4c995
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index fe395cb652ce..657bbae968ba 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/ampache_browser-1.0.4 b/metadata/md5-cache/media-libs/ampache_browser-1.0.4
index 929c99b85053..d290bebeec1c 100644
--- a/metadata/md5-cache/media-libs/ampache_browser-1.0.4
+++ b/metadata/md5-cache/media-libs/ampache_browser-1.0.4
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=http://ampache-browser.org https://github.com/ampache-browser/ampache_browser
 INHERIT=cmake
 IUSE=debug nls
-KEYWORDS=~amd64 ~riscv ~x86
+KEYWORDS=amd64 ~riscv x86
 LICENSE=GPL-3
 RDEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5
 SLOT=0
 SRC_URI=https://github.com/ampache-browser/ampache_browser/archive/v1.0.4.tar.gz -> ampache_browser-1.0.4.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=e09f4597c0c33a87061ade82bf435215
+_md5_=979a9575965eaa9690e5d52139339d65
diff --git a/metadata/md5-cache/media-libs/libcanberra-0.30-r7 b/metadata/md5-cache/media-libs/libcanberra-0.30-r7
new file mode 100644
index 000000000000..8a9528981303
--- /dev/null
+++ b/metadata/md5-cache/media-libs/libcanberra-0.30-r7
@@ -0,0 +1,16 @@
+BDEPEND=app-arch/xz-utils virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=compile configure install test
+DEPEND=dev-libs/libltdl:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/libvorbis[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] alsa? ( media-libs/alsa-lib:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gtk2? ( >=dev-libs/glib-2.32:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/gtk+-2.20.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gtk3? ( >=dev-libs/glib-2.32:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/gtk+:3[X,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-libs/libpulse[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tdb? ( sys-libs/tdb:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+DESCRIPTION=Portable sound event library
+EAPI=7
+HOMEPAGE=http://0pointer.de/lennart/projects/libcanberra/
+INHERIT=multilib-minimal systemd
+IUSE=alsa gnome gstreamer gtk2 +gtk3 oss pulseaudio +sound tdb udev 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 ~sparc-solaris ~x86-solaris
+LICENSE=LGPL-2.1+
+RDEPEND=dev-libs/libltdl:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/libvorbis[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] alsa? ( media-libs/alsa-lib:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gtk2? ( >=dev-libs/glib-2.32:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/gtk+-2.20.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gtk3? ( >=dev-libs/glib-2.32:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/gtk+:3[X,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-libs/libpulse[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tdb? ( sys-libs/tdb:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gnome? ( gnome-base/dconf gnome-base/gsettings-desktop-schemas ) sound? ( x11-themes/sound-theme-freedesktop )
+REQUIRED_USE=udev? ( alsa )
+SLOT=0
+SRC_URI=http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.30.tar.xz
+_eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=ba0656b2e8872f91187a0339a3d163e9
diff --git a/metadata/md5-cache/net-analyzer/Manifest.gz b/metadata/md5-cache/net-analyzer/Manifest.gz
index 7b2436edcd7d..d0f24abce04e 100644
--- a/metadata/md5-cache/net-analyzer/Manifest.gz
+++ b/metadata/md5-cache/net-analyzer/Manifest.gz
diff --git a/metadata/md5-cache/net-analyzer/nagios-4.4.6 b/metadata/md5-cache/net-analyzer/nagios-4.4.6
deleted file mode 100644
index 763adbcf603f..000000000000
--- a/metadata/md5-cache/net-analyzer/nagios-4.4.6
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=The Nagios metapackage
-EAPI=7
-HOMEPAGE=https://www.nagios.org/
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~ppc ppc64 sparc x86
-LICENSE=metapackage
-RDEPEND=~net-analyzer/nagios-core-4.4.6 || ( net-analyzer/nagios-plugins net-analyzer/monitoring-plugins )
-SLOT=0
-_md5_=ee18b4dcdd87d58deb6cb5dd99d20838
diff --git a/metadata/md5-cache/net-analyzer/nagios-core-4.4.6-r3 b/metadata/md5-cache/net-analyzer/nagios-core-4.4.6-r3
deleted file mode 100644
index 1bf6098f64c0..000000000000
--- a/metadata/md5-cache/net-analyzer/nagios-core-4.4.6-r3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=acct-group/nagios acct-user/nagios virtual/mailx dev-lang/perl:= apache2? ( acct-group/apache ) lighttpd? ( acct-group/lighttpd ) web? ( app-arch/unzip ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst
-DEPEND=dev-libs/libltdl:0
-DESCRIPTION=Nagios core - monitoring daemon, web GUI, and documentation
-EAPI=8
-HOMEPAGE=https://www.nagios.org/
-INHERIT=systemd toolchain-funcs
-IUSE=apache2 classicui lighttpd +web vim-syntax
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~ppc ppc64 sparc x86
-LICENSE=GPL-2
-RDEPEND=acct-group/nagios acct-user/nagios virtual/mailx dev-lang/perl:= dev-libs/libltdl:0 web? ( media-libs/gd[jpeg,png] lighttpd? ( www-servers/lighttpd[php] ) apache2? ( || ( www-servers/apache[apache2_modules_alias,apache2_modules_cgi] www-servers/apache[apache2_modules_alias,apache2_modules_cgid] ( www-servers/apache[apache2_modules_alias] www-apache/mod_fcgid ) ) || ( dev-lang/php:*[apache2] dev-lang/php:*[cgi] dev-lang/php:*[fpm] ) ) ) vim-syntax? ( app-vim/nagios-syntax )
-REQUIRED_USE=apache2? ( !lighttpd )
-SLOT=0
-SRC_URI=mirror://sourceforge/nagios/nagios-4.4.6.tar.gz web? ( https://dev.gentoo.org/~mjo/distfiles/nagios-core-gentoo-icons-20141125.tar )
-_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=a07a1b5624ebd7439fe29576a5f64792
diff --git a/metadata/md5-cache/net-analyzer/nagios-plugins-2.3.1-r3 b/metadata/md5-cache/net-analyzer/nagios-plugins-2.3.1-r3
deleted file mode 100644
index 864fe340cb80..000000000000
--- a/metadata/md5-cache/net-analyzer/nagios-plugins-2.3.1-r3
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=nagios-dns? ( net-dns/bind-tools ) nagios-game? ( games-util/qstat ) nagios-ping? ( net-analyzer/fping ) samba? ( net-fs/samba ) ssh? ( net-misc/openssh ) snmp? ( dev-perl/Net-SNMP net-analyzer/net-snmp[-minimal] ) dev-lang/perl
-DEFINED_PHASES=configure postinst prepare
-DEPEND=ldap? ( net-nds/openldap:= ) mysql? ( dev-db/mysql-connector-c:= ) postgres? ( dev-db/postgresql:* ) ssl? ( dev-libs/openssl:0= ) radius? ( net-dialup/freeradius-client )
-DESCRIPTION=Official plugins for Nagios
-EAPI=7
-HOMEPAGE=http://nagios-plugins.org/
-IUSE=ipv6 ldap mysql nagios-dns nagios-ping nagios-game postgres radius samba selinux snmp ssh +ssl
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ppc ppc64 sparc x86
-LICENSE=GPL-2
-RDEPEND=nagios-dns? ( net-dns/bind-tools ) nagios-game? ( games-util/qstat ) nagios-ping? ( net-analyzer/fping ) samba? ( net-fs/samba ) ssh? ( net-misc/openssh ) snmp? ( dev-perl/Net-SNMP net-analyzer/net-snmp[-minimal] ) dev-lang/perl ldap? ( net-nds/openldap:= ) mysql? ( dev-db/mysql-connector-c:= ) postgres? ( dev-db/postgresql:* ) ssl? ( dev-libs/openssl:0= ) radius? ( net-dialup/freeradius-client ) !net-analyzer/monitoring-plugins selinux? ( sec-policy/selinux-nagios )
-RESTRICT=test
-SLOT=0
-SRC_URI=http://nagios-plugins.org/download/nagios-plugins-2.3.1.tar.gz
-_md5_=1aac869d2524adffb81cd181743e893e
diff --git a/metadata/md5-cache/net-analyzer/nagios-plugins-2.3.3-r3 b/metadata/md5-cache/net-analyzer/nagios-plugins-2.3.3-r3
deleted file mode 100644
index 75862b655185..000000000000
--- a/metadata/md5-cache/net-analyzer/nagios-plugins-2.3.3-r3
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=nagios-dns? ( net-dns/bind-tools ) nagios-game? ( games-util/qstat ) nagios-ping? ( net-analyzer/fping ) samba? ( net-fs/samba ) ssh? ( net-misc/openssh ) snmp? ( dev-perl/Net-SNMP net-analyzer/net-snmp[-minimal] ) dev-lang/perl
-DEFINED_PHASES=configure postinst prepare
-DEPEND=ldap? ( net-nds/openldap:= ) mysql? ( dev-db/mysql-connector-c:= ) postgres? ( dev-db/postgresql:* ) ssl? ( dev-libs/openssl:0= ) radius? ( net-dialup/freeradius-client )
-DESCRIPTION=Official plugins for Nagios
-EAPI=7
-HOMEPAGE=http://nagios-plugins.org/
-IUSE=ipv6 ldap mysql nagios-dns nagios-ping nagios-game postgres radius samba selinux snmp ssh +ssl
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=nagios-dns? ( net-dns/bind-tools ) nagios-game? ( games-util/qstat ) nagios-ping? ( net-analyzer/fping ) samba? ( net-fs/samba ) ssh? ( net-misc/openssh ) snmp? ( dev-perl/Net-SNMP net-analyzer/net-snmp[-minimal] ) dev-lang/perl ldap? ( net-nds/openldap:= ) mysql? ( dev-db/mysql-connector-c:= ) postgres? ( dev-db/postgresql:* ) ssl? ( dev-libs/openssl:0= ) radius? ( net-dialup/freeradius-client ) !net-analyzer/monitoring-plugins selinux? ( sec-policy/selinux-nagios )
-RESTRICT=test
-SLOT=0
-SRC_URI=http://nagios-plugins.org/download/nagios-plugins-2.3.3.tar.gz
-_md5_=7900d30c96b9362f90d6d4f58186c023
diff --git a/metadata/md5-cache/net-irc/Manifest.gz b/metadata/md5-cache/net-irc/Manifest.gz
index 173a9fca6dea..7cc404466ef6 100644
--- a/metadata/md5-cache/net-irc/Manifest.gz
+++ b/metadata/md5-cache/net-irc/Manifest.gz
diff --git a/metadata/md5-cache/net-irc/eggdrop-1.8.4-r1 b/metadata/md5-cache/net-irc/eggdrop-1.9.3
index e7157b59a43d..ae8064e3fd16 100644
--- a/metadata/md5-cache/net-irc/eggdrop-1.8.4-r1
+++ b/metadata/md5-cache/net-irc/eggdrop-1.9.3
@@ -1,13 +1,14 @@
 DEFINED_PHASES=compile configure install postinst
 DEPEND=dev-lang/tcl:0= ssl? ( dev-libs/openssl:0= )
 DESCRIPTION=An IRC bot extensible with C or TCL
-EAPI=7
+EAPI=8
 HOMEPAGE=https://www.eggheads.org/
+INHERIT=readme.gentoo-r1
 IUSE=debug doc ipv6 ssl static
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~mips ppc sparc x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~riscv ~sparc ~x86
 LICENSE=GPL-2+
 RDEPEND=sys-apps/gentoo-functions dev-lang/tcl:0= ssl? ( dev-libs/openssl:0= )
 SLOT=0
-SRC_URI=https://ftp.eggheads.org/pub/eggdrop/source/1.8/eggdrop-1.8.4.tar.gz
+SRC_URI=https://ftp.eggheads.org/pub/eggdrop/source/1.9/eggdrop-1.9.3.tar.gz
 _eclasses_=readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
-_md5_=71eb6153cc86af1a63fa55e665566659
+_md5_=cbcbd4a7cb8b5ed4e6c108e862535478
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index 5b567cc6d588..85b0e15cefcb 100644
--- a/metadata/md5-cache/sys-apps/Manifest.gz
+++ b/metadata/md5-cache/sys-apps/Manifest.gz
diff --git a/metadata/md5-cache/sys-apps/shadow-4.12.3 b/metadata/md5-cache/sys-apps/shadow-4.12.3
index 26dddc32b842..d403f1597189 100644
--- a/metadata/md5-cache/sys-apps/shadow-4.12.3
+++ b/metadata/md5-cache/sys-apps/shadow-4.12.3
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/shadow-maint/shadow
 INHERIT=libtool pam verify-sig
 IUSE=acl audit bcrypt cracklib nls pam selinux skey split-usr su xattr verify-sig
-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=BSD GPL-2
 RDEPEND=virtual/libcrypt:= acl? ( sys-apps/acl:0= ) audit? ( >=sys-process/audit-2.6:0= ) cracklib? ( >=sys-libs/cracklib-2.7-r3:0= ) nls? ( virtual/libintl ) pam? ( sys-libs/pam:0= ) skey? ( sys-auth/skey:0= ) selinux? ( >=sys-libs/libselinux-1.28:0= sys-libs/libsemanage:0= ) xattr? ( sys-apps/attr:0= ) !<sys-apps/man-pages-5.11-r1 !=sys-apps/man-pages-5.12-r0 !=sys-apps/man-pages-5.12-r1 nls? ( !<app-i18n/man-pages-it-5.06-r1 !<app-i18n/man-pages-ja-20180315-r1 !<app-i18n/man-pages-ru-5.03.2390.2390.20191017-r1 ) pam? ( >=sys-auth/pambase-20150213 ) su? ( !sys-apps/util-linux[su(-)] )
 REQUIRED_USE=?? ( cracklib pam )
 SLOT=0/4
 SRC_URI=https://github.com/shadow-maint/shadow/releases/download/4.12.3/shadow-4.12.3.tar.xz verify-sig? ( https://github.com/shadow-maint/shadow/releases/download/4.12.3/shadow-4.12.3.tar.xz.asc )
 _eclasses_=flag-o-matic	29a755b1291d64133634d80b0328f153	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pam	e44a1dd98f13e1ad76de01e919bde1f1	toolchain-funcs	1542e649be915f43f6908a9e93909961	verify-sig	0748d665fa664a87add00152ed046e16
-_md5_=adb57d9dd57a90f743903ffba6f5edf0
+_md5_=e317c71052bd0ebd4ea7e4fe9fcdb438
diff --git a/metadata/md5-cache/sys-process/Manifest.gz b/metadata/md5-cache/sys-process/Manifest.gz
index ebbd2c1ca5ff..652a9b32f14a 100644
--- a/metadata/md5-cache/sys-process/Manifest.gz
+++ b/metadata/md5-cache/sys-process/Manifest.gz
diff --git a/metadata/md5-cache/sys-process/audit-3.0.9 b/metadata/md5-cache/sys-process/audit-3.0.9
new file mode 100644
index 000000000000..1e6e489c9d39
--- /dev/null
+++ b/metadata/md5-cache/sys-process/audit-3.0.9
@@ -0,0 +1,17 @@
+BDEPEND=python? ( dev-lang/swig ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=gssapi? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) ) sys-libs/libcap-ng >=sys-kernel/linux-headers-2.6.34 test? ( dev-libs/check )
+DESCRIPTION=Userspace utilities for storing and processing auditing records
+EAPI=8
+HOMEPAGE=https://people.redhat.com/sgrubb/audit/
+INHERIT=autotools multilib-minimal toolchain-funcs python-r1 linux-info systemd usr-ldscript
+IUSE=gssapi ldap python static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 split-usr
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=gssapi? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) ) sys-libs/libcap-ng
+REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 ) )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://people.redhat.com/sgrubb/audit/audit-3.0.9.tar.gz
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	56708ddc53d8b607ed88fd97a56e59dc	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961	usr-ldscript	5c738dce357b54d5a90e30094d2f983c
+_md5_=33ab4f16de7ee1ba242f412d59fcfa2e
diff --git a/metadata/md5-cache/x11-base/Manifest.gz b/metadata/md5-cache/x11-base/Manifest.gz
index 9ac09867c136..06da5dddfb9f 100644
--- a/metadata/md5-cache/x11-base/Manifest.gz
+++ b/metadata/md5-cache/x11-base/Manifest.gz
diff --git a/metadata/md5-cache/x11-base/xorg-drivers-21.1 b/metadata/md5-cache/x11-base/xorg-drivers-21.1
deleted file mode 100644
index 0952b21cc4d9..000000000000
--- a/metadata/md5-cache/x11-base/xorg-drivers-21.1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Meta package containing deps on all xorg drivers
-EAPI=7
-HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
-IUSE=video_cards_amdgpu video_cards_ast video_cards_dummy video_cards_fbdev video_cards_freedreno video_cards_geode video_cards_glint video_cards_i915 video_cards_intel video_cards_mga video_cards_nouveau video_cards_nv video_cards_omap video_cards_qxl video_cards_r128 video_cards_radeon video_cards_radeonsi video_cards_siliconmotion video_cards_tegra video_cards_vc4 video_cards_vesa video_cards_via video_cards_virtualbox video_cards_vmware video_cards_nvidia input_devices_elographics input_devices_evdev input_devices_joystick input_devices_libinput input_devices_vmmouse input_devices_void input_devices_synaptics input_devices_wacom
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
-LICENSE=metapackage
-PDEPEND=input_devices_elographics? ( x11-drivers/xf86-input-elographics ) input_devices_evdev? ( >=x11-base/xorg-server-21.1[udev] >=x11-drivers/xf86-input-evdev-2.10.6 ) input_devices_joystick? ( >=x11-drivers/xf86-input-joystick-1.6.3 ) input_devices_libinput? ( >=x11-base/xorg-server-21.1[udev] >=x11-drivers/xf86-input-libinput-0.27.1 ) input_devices_vmmouse? ( x11-drivers/xf86-input-vmmouse ) input_devices_void? ( x11-drivers/xf86-input-void ) input_devices_synaptics? ( x11-drivers/xf86-input-synaptics ) input_devices_wacom? ( >=x11-drivers/xf86-input-wacom-0.36.0-r2 ) video_cards_amdgpu? ( >=x11-drivers/xf86-video-amdgpu-18.0.1 ) video_cards_ast? ( x11-drivers/xf86-video-ast ) video_cards_dummy? ( x11-drivers/xf86-video-dummy ) video_cards_fbdev? ( >=x11-drivers/xf86-video-fbdev-0.5.0 ) video_cards_freedreno? ( >=x11-base/xorg-server-21.1[-minimal] ) video_cards_geode? ( x11-drivers/xf86-video-geode ) video_cards_glint? ( >=x11-drivers/xf86-video-glint-1.2.9 ) video_cards_i915? ( x11-drivers/xf86-video-intel ) video_cards_intel? ( >=x11-base/xorg-server-21.1[-minimal] ) video_cards_mga? ( >=x11-drivers/xf86-video-mga-1.6.5 ) video_cards_nouveau? ( >=x11-drivers/xf86-video-nouveau-1.0.13 ) video_cards_nv? ( >=x11-drivers/xf86-video-nv-2.1.21 ) video_cards_omap? ( >=x11-drivers/xf86-video-omap-0.4.5 ) video_cards_qxl? ( x11-drivers/xf86-video-qxl ) video_cards_nvidia? ( x11-drivers/nvidia-drivers ) video_cards_r128? ( >=x11-drivers/xf86-video-r128-6.10.2 ) video_cards_radeon? ( >=x11-drivers/xf86-video-ati-18.0.1-r1 ) video_cards_radeonsi? ( >=x11-drivers/xf86-video-ati-18.0.1-r1 ) video_cards_siliconmotion? ( >=x11-drivers/xf86-video-siliconmotion-1.7.9 ) video_cards_tegra? ( >=x11-base/xorg-server-21.1[-minimal] ) video_cards_vc4? ( >=x11-base/xorg-server-21.1[-minimal] ) video_cards_vesa? ( x11-drivers/xf86-video-vesa ) video_cards_via? ( x11-drivers/xf86-video-openchrome ) video_cards_virtualbox? ( x11-drivers/xf86-video-vboxvideo ) video_cards_vmware? ( >=x11-drivers/xf86-video-vmware-13.3.0 )
-SLOT=0
-_md5_=2ace6fb7cd43858ff211365a79b0605d
diff --git a/metadata/md5-cache/x11-base/xorg-drivers-21.1-r1 b/metadata/md5-cache/x11-base/xorg-drivers-21.1-r1
new file mode 100644
index 000000000000..309bdee71888
--- /dev/null
+++ b/metadata/md5-cache/x11-base/xorg-drivers-21.1-r1
@@ -0,0 +1,10 @@
+DEFINED_PHASES=-
+DESCRIPTION=Meta package containing deps on all xorg drivers
+EAPI=7
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
+IUSE=video_cards_amdgpu video_cards_ast video_cards_dummy video_cards_fbdev video_cards_freedreno video_cards_geode video_cards_i915 video_cards_intel video_cards_mga video_cards_nouveau video_cards_nv video_cards_omap video_cards_qxl video_cards_r128 video_cards_radeon video_cards_radeonsi video_cards_siliconmotion video_cards_tegra video_cards_vc4 video_cards_vesa video_cards_via video_cards_virtualbox video_cards_vmware video_cards_nvidia input_devices_elographics input_devices_evdev input_devices_joystick input_devices_libinput input_devices_vmmouse input_devices_void input_devices_synaptics input_devices_wacom
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
+LICENSE=metapackage
+PDEPEND=input_devices_elographics? ( x11-drivers/xf86-input-elographics ) input_devices_evdev? ( >=x11-base/xorg-server-21.1[udev] >=x11-drivers/xf86-input-evdev-2.10.6 ) input_devices_joystick? ( >=x11-drivers/xf86-input-joystick-1.6.3 ) input_devices_libinput? ( >=x11-base/xorg-server-21.1[udev] >=x11-drivers/xf86-input-libinput-0.27.1 ) input_devices_vmmouse? ( x11-drivers/xf86-input-vmmouse ) input_devices_void? ( x11-drivers/xf86-input-void ) input_devices_synaptics? ( x11-drivers/xf86-input-synaptics ) input_devices_wacom? ( >=x11-drivers/xf86-input-wacom-0.36.0-r2 ) video_cards_amdgpu? ( >=x11-drivers/xf86-video-amdgpu-18.0.1 ) video_cards_ast? ( x11-drivers/xf86-video-ast ) video_cards_dummy? ( x11-drivers/xf86-video-dummy ) video_cards_fbdev? ( >=x11-drivers/xf86-video-fbdev-0.5.0 ) video_cards_freedreno? ( >=x11-base/xorg-server-21.1[-minimal] ) video_cards_geode? ( x11-drivers/xf86-video-geode ) video_cards_i915? ( x11-drivers/xf86-video-intel ) video_cards_intel? ( >=x11-base/xorg-server-21.1[-minimal] ) video_cards_mga? ( >=x11-drivers/xf86-video-mga-1.6.5 ) video_cards_nouveau? ( >=x11-drivers/xf86-video-nouveau-1.0.13 ) video_cards_nv? ( >=x11-drivers/xf86-video-nv-2.1.21 ) video_cards_omap? ( >=x11-drivers/xf86-video-omap-0.4.5 ) video_cards_qxl? ( x11-drivers/xf86-video-qxl ) video_cards_nvidia? ( x11-drivers/nvidia-drivers ) video_cards_r128? ( >=x11-drivers/xf86-video-r128-6.10.2 ) video_cards_radeon? ( >=x11-drivers/xf86-video-ati-18.0.1-r1 ) video_cards_radeonsi? ( >=x11-drivers/xf86-video-ati-18.0.1-r1 ) video_cards_siliconmotion? ( >=x11-drivers/xf86-video-siliconmotion-1.7.9 ) video_cards_tegra? ( >=x11-base/xorg-server-21.1[-minimal] ) video_cards_vc4? ( >=x11-base/xorg-server-21.1[-minimal] ) video_cards_vesa? ( x11-drivers/xf86-video-vesa ) video_cards_via? ( x11-drivers/xf86-video-openchrome ) video_cards_virtualbox? ( x11-drivers/xf86-video-vboxvideo ) video_cards_vmware? ( >=x11-drivers/xf86-video-vmware-13.3.0 )
+SLOT=0
+_md5_=0f123fdf80c592012225a7c341cf433b
diff --git a/metadata/md5-cache/x11-base/xorg-drivers-9999 b/metadata/md5-cache/x11-base/xorg-drivers-9999
index deacec169aab..df8275388bbb 100644
--- a/metadata/md5-cache/x11-base/xorg-drivers-9999
+++ b/metadata/md5-cache/x11-base/xorg-drivers-9999
@@ -2,9 +2,9 @@ DEFINED_PHASES=-
 DESCRIPTION=Meta package containing deps on all xorg drivers
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
-IUSE=video_cards_amdgpu video_cards_ast video_cards_dummy video_cards_fbdev video_cards_freedreno video_cards_geode video_cards_glint video_cards_i915 video_cards_intel video_cards_mga video_cards_nouveau video_cards_nv video_cards_omap video_cards_qxl video_cards_r128 video_cards_radeon video_cards_radeonsi video_cards_siliconmotion video_cards_tegra video_cards_vc4 video_cards_vesa video_cards_via video_cards_virtualbox video_cards_vmware video_cards_nvidia input_devices_elographics input_devices_evdev input_devices_joystick input_devices_libinput input_devices_vmmouse input_devices_void input_devices_synaptics input_devices_wacom
+IUSE=video_cards_amdgpu video_cards_ast video_cards_dummy video_cards_fbdev video_cards_freedreno video_cards_geode video_cards_i915 video_cards_intel video_cards_mga video_cards_nouveau video_cards_nv video_cards_omap video_cards_qxl video_cards_r128 video_cards_radeon video_cards_radeonsi video_cards_siliconmotion video_cards_tegra video_cards_vc4 video_cards_vesa video_cards_via video_cards_virtualbox video_cards_vmware video_cards_nvidia input_devices_elographics input_devices_evdev input_devices_joystick input_devices_libinput input_devices_vmmouse input_devices_void input_devices_synaptics input_devices_wacom
 LICENSE=metapackage
-PDEPEND=input_devices_elographics? ( x11-drivers/xf86-input-elographics ) input_devices_evdev? ( >=x11-base/xorg-server-9999[udev] >=x11-drivers/xf86-input-evdev-2.10.6 ) input_devices_joystick? ( >=x11-drivers/xf86-input-joystick-1.6.3 ) input_devices_libinput? ( >=x11-base/xorg-server-9999[udev] >=x11-drivers/xf86-input-libinput-0.27.1 ) input_devices_vmmouse? ( x11-drivers/xf86-input-vmmouse ) input_devices_void? ( x11-drivers/xf86-input-void ) input_devices_synaptics? ( x11-drivers/xf86-input-synaptics ) input_devices_wacom? ( >=x11-drivers/xf86-input-wacom-0.36.0-r2 ) video_cards_amdgpu? ( >=x11-drivers/xf86-video-amdgpu-18.0.1 ) video_cards_ast? ( x11-drivers/xf86-video-ast ) video_cards_dummy? ( x11-drivers/xf86-video-dummy ) video_cards_fbdev? ( >=x11-drivers/xf86-video-fbdev-0.5.0 ) video_cards_freedreno? ( >=x11-base/xorg-server-9999[-minimal] ) video_cards_geode? ( x11-drivers/xf86-video-geode ) video_cards_glint? ( >=x11-drivers/xf86-video-glint-1.2.9 ) video_cards_i915? ( x11-drivers/xf86-video-intel ) video_cards_intel? ( >=x11-base/xorg-server-9999[-minimal] ) video_cards_mga? ( >=x11-drivers/xf86-video-mga-1.6.5 ) video_cards_nouveau? ( >=x11-drivers/xf86-video-nouveau-1.0.13 ) video_cards_nv? ( >=x11-drivers/xf86-video-nv-2.1.21 ) video_cards_omap? ( >=x11-drivers/xf86-video-omap-0.4.5 ) video_cards_qxl? ( x11-drivers/xf86-video-qxl ) video_cards_nvidia? ( x11-drivers/nvidia-drivers ) video_cards_r128? ( >=x11-drivers/xf86-video-r128-6.10.2 ) video_cards_radeon? ( >=x11-drivers/xf86-video-ati-18.0.1-r1 ) video_cards_radeonsi? ( >=x11-drivers/xf86-video-ati-18.0.1-r1 ) video_cards_siliconmotion? ( >=x11-drivers/xf86-video-siliconmotion-1.7.9 ) video_cards_tegra? ( >=x11-base/xorg-server-9999[-minimal] ) video_cards_vc4? ( >=x11-base/xorg-server-9999[-minimal] ) video_cards_vesa? ( x11-drivers/xf86-video-vesa ) video_cards_via? ( x11-drivers/xf86-video-openchrome ) video_cards_virtualbox? ( x11-drivers/xf86-video-vboxvideo ) video_cards_vmware? ( >=x11-drivers/xf86-video-vmware-13.3.0 )
+PDEPEND=input_devices_elographics? ( x11-drivers/xf86-input-elographics ) input_devices_evdev? ( >=x11-base/xorg-server-9999[udev] >=x11-drivers/xf86-input-evdev-2.10.6 ) input_devices_joystick? ( >=x11-drivers/xf86-input-joystick-1.6.3 ) input_devices_libinput? ( >=x11-base/xorg-server-9999[udev] >=x11-drivers/xf86-input-libinput-0.27.1 ) input_devices_vmmouse? ( x11-drivers/xf86-input-vmmouse ) input_devices_void? ( x11-drivers/xf86-input-void ) input_devices_synaptics? ( x11-drivers/xf86-input-synaptics ) input_devices_wacom? ( >=x11-drivers/xf86-input-wacom-0.36.0-r2 ) video_cards_amdgpu? ( >=x11-drivers/xf86-video-amdgpu-18.0.1 ) video_cards_ast? ( x11-drivers/xf86-video-ast ) video_cards_dummy? ( x11-drivers/xf86-video-dummy ) video_cards_fbdev? ( >=x11-drivers/xf86-video-fbdev-0.5.0 ) video_cards_freedreno? ( >=x11-base/xorg-server-9999[-minimal] ) video_cards_geode? ( x11-drivers/xf86-video-geode ) video_cards_i915? ( x11-drivers/xf86-video-intel ) video_cards_intel? ( >=x11-base/xorg-server-9999[-minimal] ) video_cards_mga? ( >=x11-drivers/xf86-video-mga-1.6.5 ) video_cards_nouveau? ( >=x11-drivers/xf86-video-nouveau-1.0.13 ) video_cards_nv? ( >=x11-drivers/xf86-video-nv-2.1.21 ) video_cards_omap? ( >=x11-drivers/xf86-video-omap-0.4.5 ) video_cards_qxl? ( x11-drivers/xf86-video-qxl ) video_cards_nvidia? ( x11-drivers/nvidia-drivers ) video_cards_r128? ( >=x11-drivers/xf86-video-r128-6.10.2 ) video_cards_radeon? ( >=x11-drivers/xf86-video-ati-18.0.1-r1 ) video_cards_radeonsi? ( >=x11-drivers/xf86-video-ati-18.0.1-r1 ) video_cards_siliconmotion? ( >=x11-drivers/xf86-video-siliconmotion-1.7.9 ) video_cards_tegra? ( >=x11-base/xorg-server-9999[-minimal] ) video_cards_vc4? ( >=x11-base/xorg-server-9999[-minimal] ) video_cards_vesa? ( x11-drivers/xf86-video-vesa ) video_cards_via? ( x11-drivers/xf86-video-openchrome ) video_cards_virtualbox? ( x11-drivers/xf86-video-vboxvideo ) video_cards_vmware? ( >=x11-drivers/xf86-video-vmware-13.3.0 )
 PROPERTIES=live
 SLOT=0
-_md5_=792d99c3aa4b7b2fd6b8eb73e2ac3880
+_md5_=c1ebddc9c554e0729cacdcc6c20147ad
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index 82247a313629..96e8a262526c 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 14053 BLAKE2B c0a5bea7cd069c2e9b07dab158b876c74e027945a8fdd50fee280ec7abb59b03a223e89d53d1563fc784c8a353890e9928577f3cf4c4daaf3eebee6f871aa5c0 SHA512 43691780e35724149b779ecf32c3d83556a2e30fb3c35c56b8841fc4c866de83cb09e4b9be3071940181a4933de197417647dd3921df2f61e100510b23a9e327
-TIMESTAMP 2022-08-29T21:09:46Z
+TIMESTAMP 2022-08-30T03:09:41Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmMNKxpfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmMNf3VfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klAc7g/+IC1uyDnsxjU3N1p3A5p45oXH5wTpfbDlw2ju02TDS4JpX6gA3FDTK8rO
-akr4az3+Mdm5AmnGVExs27j5snSA1naG2J2Vot4NZkI0C64gv2r6MusiVejIwgSl
-Y8X6cJBF9ChRDNYwQF6CuJfWqrCNfF/mMgtbZcUPS+Z8RhfEsLpxm4fg9nkjUAVi
-BBK0f+uU81m89N5UZyAR2nkLG56/yIm53PNOvor6hg5GN1Qw976u+cH1e3xxAZNt
-XLXqzmyxUXQkfaEBSGMVwrVCoQiFO5pM2NeoNwb23FFcdfnWn+1Iw48vjM8ztG4b
-QNChWrQOWAj7HJy1X98sRiWK146SmhpkoAhFfHOAxJQlm+QFGY5H9aYklap8nG1+
-NjVLyZ272o9BSiBDFDxQxTd4UFekJKVgt/RCTkktuSqxcgzb8VBJLdJcuKYRjDMg
-iq8Q42oViSKJ7sCuopG3a9OZzDE6rcT2uGxNqMNlxMgDx9oqsg4HE25H/yAQnZUQ
-7+AP96/iYZTGTZ+GHOwchCRcgSNtIBzwXA3yq30mHwo1HN3YzUboafhb3WZlsn6C
-uYqz/egXmdEPCQNqU8t/DO6fiziPcy6OnzZWSjwn0dgc5OJgBUsanDO2vEJnkaiS
-r2NfEEm/TIfVatbasPjAPUBlNDfYpXC9ToT18zrPLZzhvnwMHqs=
-=8s1Y
+klDosw/9F05u8lcAGH+748FHmF0NZEd7Osjc4VD1HDHS0XG2KknIr3lYAy/oqnn/
+4wz302dflYKozmBPESjANBeszlrFHOIN8/dNedVgGbY7AHdWdPcMlLdPjHE81/Q+
+GLv9OZsIHu7Ndr/Hajuw7t4aIXjU95uBCr9dA692N03+ATNKeC0nMj6OSyQhL4Jb
+rZNa3QP2rMzwPvrVSkz3bm4ihQmUTBfQiTbMiAVgH9+JoktfeZ4sJreMAAVOlACm
+xvlsTfFBfmpfV29trdbIN0h7GO9BU8kqjqB/RbQxA5s/xG6pyCO9yntKGWoAlfy9
+funFMkSNB8uIx9j86iYg76CyzG1W5vVT4I0lF7vFYv62GLTm9nMtEV5rcDy0yTKu
+kaSDvChcryrOxAkDb2DDqnkKdo91CtrhSva/PqXl7T9NFjruYiGupRzcFFOMuzok
+7wR8muuoDdw56SSKJdaxHWyI+jwIE1Bs4c2nW9hI2HaBAAVCBG1A82s6jrMyhMUG
+65hzqtVIhLs047SeiezwQ0fKMVcdGKc1EhOc2o0wQwk/iBJjB8U3WYPZ6LrqSmjc
+KP5cgeKzorFgRuZuk2qQtk4D5FziiV1wJhtJuvFS171R/v64Jd8J2BaEjbeQjkAm
+7LYsR4nA4oQ+5wvyCb+rnXC0YctvjQWE/XLSq7I2uG81Bq/YitQ=
+=QiBB
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index d7971aef5a24..720b4f0d825c 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Mon, 29 Aug 2022 21:09:43 +0000
+Tue, 30 Aug 2022 03:09:36 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 171841f29023..082430f09cde 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Mon Aug 29 09:09:42 PM UTC 2022
+Tue Aug 30 03:09:35 AM UTC 2022
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index a4b1bc1b2965..7dc9822dac14 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Mon, 29 Aug 2022 21:15:01 +0000
+Tue, 30 Aug 2022 03:15:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index bef39b1976b9..cd4aa017bb14 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-6de76b15984e87e28977baaa19c539a0a184ef82 1661805406 2022-08-29T20:36:46+00:00
+7ac91a209e30eadbaf72fc0b7b6647830b752875 1661824549 2022-08-30T01:55:49+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index d40fcc1d2597..e6d92c26b147 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1661807401 Mon 29 Aug 2022 09:10:01 PM UTC
+1661829001 Tue 30 Aug 2022 03:10:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 294b1d3fbc07..a601cec3fcc7 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Mon, 29 Aug 2022 21:09:42 +0000
+Tue, 30 Aug 2022 03:09:35 +0000
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 30e45a6cfe98..34ae96940981 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/nagios-core/Manifest b/net-analyzer/nagios-core/Manifest
index 3329cc46bffd..b4cd2497c396 100644
--- a/net-analyzer/nagios-core/Manifest
+++ b/net-analyzer/nagios-core/Manifest
@@ -1,8 +1,6 @@
 AUX 99_nagios4-r1.conf 309 BLAKE2B c539330d9f100045fc02d13061dd3b8e958370c8885ef8d28c38ee380b2043d86c9b0097c158dbc5d486f1c53e22ef6f52a96286d0c50d1d47d9eb025fb6b8a9 SHA512 cb93d6af5b6f43b172cec276f669ef786268c1ba51ffda994733c98a8ad5f625229aecaed68b5cb433a66257a8eb66ec16f9569aa87b6dcecf21d8339bd5fb8f
 AUX lighttpd_nagios4-r1.conf 297 BLAKE2B 8976123407c47be6023c5dae57c833f7e0b43ae2c70348dcd72b754453b5a84dd335daa222b4b75e5c19b3d5c18b64496739bdb61b8f2f67f5655b80a0ffb65f SHA512 2ef5268e9ba228d12e3dabb5a23ce73e49b7149a047acd4a2daac3cd3415b5233aaaf3b972c85780e71bd5fe3eefb6755a6222b40a509104fb318e219366867f
-DIST nagios-4.4.6.tar.gz 11333414 BLAKE2B b64d34c9267349582cb43500b7b90f7948152b5fd9b28ecb0a376d0255ec9774e693beba9205512294b07dddc4702f37d0f45b3c3fcc6abbf8e8b4d9236d0ace SHA512 6ceb582816ec741439963bde1fe8d85fa3bc4ed3c2238fb818db0c4f4224a4333d153040c11a7f4d783e919c11f9ff45907bdc478504e4155f64a4c575f80550
 DIST nagios-4.4.7.tar.gz 11340759 BLAKE2B 4316e6cfc7f576d0fe5ba075aba2931dc850c97fe84b124eceeefaa6c01563c0639c8cecf751e086d5a6f9c0a1079f7e9bd013f961956d7d59536dea4516cf86 SHA512 92adc74e687bcbbd742075c8c7222d42c90795a4eb7582e3f1f492349db8200c61f390bf3c4cab4b023c5c111353a43f5dd687b0ee5ab6a8775444e06d42517b
 DIST nagios-core-gentoo-icons-20141125.tar 40960 BLAKE2B 31c1953e1160c7c7b89606b72b1a80407e4c1b7a7938b40bd1c577cd0c309dd88ca6b775d692a9b846dbf67736537fa9c91e56aa15fdd447769608ca525bff09 SHA512 bf109879cddd6136b76baba55d0b60b2596e37431dcf5ce0905d34a9fa292ebf7e4bde82d9a084362c486e8fac344c76d88f9298b1b85541ed70ffd608493766
-EBUILD nagios-core-4.4.6-r3.ebuild 9243 BLAKE2B cdbc7b6b1f4ee156db7000d4413f33722d888c7cdb2bca0f072d189219cc677d9da6a255590b126505f9ac27329ff2361d55e5eebc47c2e553bf2200a370e36c SHA512 81b8c9af2f2b0dd9dcb362163c2bc224de97fe0327ee97b4376ddab373a1c657fe3be88bb948e0d9f6398aab6a9f79bca40e757adbc0130d473530c0f5570bed
 EBUILD nagios-core-4.4.7.ebuild 9243 BLAKE2B cdbc7b6b1f4ee156db7000d4413f33722d888c7cdb2bca0f072d189219cc677d9da6a255590b126505f9ac27329ff2361d55e5eebc47c2e553bf2200a370e36c SHA512 81b8c9af2f2b0dd9dcb362163c2bc224de97fe0327ee97b4376ddab373a1c657fe3be88bb948e0d9f6398aab6a9f79bca40e757adbc0130d473530c0f5570bed
 MISC metadata.xml 1467 BLAKE2B d5ddd6280aafd3ad3a36a408071037fa757810382761f617eb2763a20e65185b30eef94fb4cdad7d4b5e9b81b6245efacf57d4ec0003406d66ef2053f09f3708 SHA512 25d3d4d19c18b416a0902d2ff39c0ca71b2e7bcc2bac61119b9636c6462391e65b2767d8b0e794abb318b19fe1c2bcbf2c80ee8d1ea6faec3f6eb9cddf60a9cd
diff --git a/net-analyzer/nagios-core/nagios-core-4.4.6-r3.ebuild b/net-analyzer/nagios-core/nagios-core-4.4.6-r3.ebuild
deleted file mode 100644
index 9483f0dda9d3..000000000000
--- a/net-analyzer/nagios-core/nagios-core-4.4.6-r3.ebuild
+++ /dev/null
@@ -1,266 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit systemd toolchain-funcs
-
-MY_P="${PN/-core}-${PV}"
-DESCRIPTION="Nagios core - monitoring daemon, web GUI, and documentation"
-HOMEPAGE="https://www.nagios.org/"
-
-# The name of the directory into which our Gentoo icons will be
-# extracted, and also the basename of the archive containing it.
-GENTOO_ICONS="${PN}-gentoo-icons-20141125"
-SRC_URI="mirror://sourceforge/nagios/${MY_P}.tar.gz
-	web? ( https://dev.gentoo.org/~mjo/distfiles/${GENTOO_ICONS}.tar )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ppc ppc64 sparc x86"
-IUSE="apache2 classicui lighttpd +web vim-syntax"
-
-# In pkg_postinst(), we change the group of the Nagios configuration
-# directory to that of the web server user. It can't belong to both
-# apache/lighttpd groups at the same time, so we block this combination
-# for our own sanity.
-#
-# This could be made to work, but we would need a better way to allow
-# the web user read-only access to Nagios's configuration directory.
-#
-REQUIRED_USE="apache2? ( !lighttpd )"
-
-#
-# Note, we require one of the apache2 CGI modules:
-#
-#   * mod_cgi (USE=apache2_modules_cgi)
-#   * mod_cgid (USE=apache2_modules_cgid)
-#   * mod_fcgid (www-apache/mod_fcgid)
-#
-# We just don't care /which/ one. And of course PHP supports both CGI
-# (USE=cgi) and FastCGI (USE=fpm). We're pretty lenient with the
-# dependencies, and expect the user not to do anything /too/
-# stupid. (For example, installing Apache with only FastCGI support, and
-# PHP with only CGI support.)
-#
-# Another annoyance is that the upstream Makefile uses app-arch/unzip to
-# extract a snapshot of AngularJS, but that's only needed when USE=web.
-#
-MOD_ALIAS=apache2_modules_alias
-
-# The dependencies checked by the configure script. All of these are
-# also runtime dependencies; that's why ./configure checks for them.
-CONFIGURE_DEPEND="acct-group/nagios
-	acct-user/nagios
-	virtual/mailx
-	dev-lang/perl:="
-
-# In addition to the things that the ./configure script checks for,
-# we also need to be able to unzip stuff on the build host.
-#
-# We need the apache/lighttpd groups in src_install() for the things
-# installed as the --with-command-group argument, so they go here too.
-# The groups are also needed at runtime, but that is ensured by apache
-# and lighttpd themselves being in RDEPEND.
-BDEPEND="${CONFIGURE_DEPEND}
-	apache2? ( acct-group/apache )
-	lighttpd? ( acct-group/lighttpd )
-	web? ( app-arch/unzip )"
-
-# This is linked into /usr/bin/nagios{,tats}
-DEPEND="dev-libs/libltdl:0"
-
-RDEPEND="${CONFIGURE_DEPEND}
-	${DEPEND}
-	web? (
-		media-libs/gd[jpeg,png]
-		lighttpd? ( www-servers/lighttpd[php] )
-		apache2? (
-			|| (
-				www-servers/apache[${MOD_ALIAS},apache2_modules_cgi]
-				www-servers/apache[${MOD_ALIAS},apache2_modules_cgid]
-				( www-servers/apache[${MOD_ALIAS}] www-apache/mod_fcgid ) )
-			|| (
-				dev-lang/php:*[apache2]
-				dev-lang/php:*[cgi]
-				dev-lang/php:*[fpm] )
-		)
-	)
-	vim-syntax? ( app-vim/nagios-syntax )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	local myconf
-
-	if use !apache2 && use !lighttpd ; then
-		myconf="${myconf} --with-command-group=nagios"
-	else
-		if use apache2 ; then
-			myconf="${myconf} --with-command-group=apache"
-			myconf="${myconf} --with-httpd-conf=/etc/apache2/conf.d"
-		elif use lighttpd ; then
-			myconf="${myconf} --with-command-group=lighttpd"
-		fi
-	fi
-
-	# We pass "unknown" as the init type because we don't want it to
-	# guess. Later on, we'll manually install both OpenRC and systemd
-	# services.
-	econf ${myconf} \
-		--prefix="${EPREFIX}/usr" \
-		--bindir="${EPREFIX}/usr/sbin" \
-		--localstatedir="${EPREFIX}/var/lib/nagios" \
-		--sysconfdir="${EPREFIX}/etc/nagios" \
-		--libexecdir="${EPREFIX}/usr/$(get_libdir)/nagios/plugins" \
-		--with-cgibindir="${EPREFIX}/usr/$(get_libdir)/nagios/cgi-bin" \
-		--with-webdir="${EPREFIX}/usr/share/nagios/htdocs" \
-		--with-init-type="unknown"
-
-	# The paths in the web server configuration files need to match
-	# those passed to econf above.
-	cp "${FILESDIR}/99_nagios4-r1.conf" \
-		"${FILESDIR}/lighttpd_nagios4-r1.conf" \
-		"${T}/" || die "failed to create copies of web server conf files"
-
-	sed -e "s|@CGIBINDIR@|${EPREFIX}/usr/$(get_libdir)/nagios/cgi-bin|g" \
-		-e "s|@WEBDIR@|${EPREFIX}/usr/share/nagios/htdocs|" \
-		-i "${T}/99_nagios4-r1.conf" \
-		-i "${T}/lighttpd_nagios4-r1.conf" \
-		|| die "failed to substitute paths into web server conf files"
-
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" nagios
-
-	if use web; then
-		# Only compile the CGIs/HTML when USE=web is set.
-		emake CC="$(tc-getCC)" cgis html
-	fi
-}
-
-src_install() {
-	dodoc Changelog CONTRIBUTING.md README.md THANKS UPGRADING
-
-	# There is no way to install the CGIs unstripped from the top-level
-	# makefile, so descend into base/ here. The empty INSTALL_OPTS
-	# ensures that root:root: owns the nagios executables.
-	cd "${S}/base" || die
-	emake INSTALL_OPTS="" DESTDIR="${D}" install-unstripped
-	cd "${S}" || die
-
-	# Otherwise this gets installed as 770 and you get "access denied"
-	# for some reason or other when starting nagios. The permissions
-	# on nagiostats are just for consistency (these should both get
-	# fixed upstream).
-	fperms 775 /usr/sbin/nagios /usr/sbin/nagiostats
-
-	# INSTALL_OPTS are needed for most of install-basic, but we don't
-	# want them on the LIBEXECDIR, argh.
-	emake DESTDIR="${D}" install-basic
-	fowners root:root /usr/$(get_libdir)/nagios/plugins
-
-	# Don't make the configuration owned by the nagios user, because
-	# then he can edit nagios.cfg and trick nagios into running as root
-	# and doing his bidding.
-	emake INSTALL_OPTS="" DESTDIR="${D}" install-config
-
-	# No INSTALL_OPTS used in install-commandmode, thankfully.
-	emake DESTDIR="${D}" install-commandmode
-
-	# The build system installs these directories, but portage assumes
-	# that the build system doesn't know what it's doing so we have to
-	# keepdir them, too. I guess you'll have to manually re-check the
-	# upstream build system forever to see if this is still necessary.
-	keepdir /var/lib/nagios{,/archives,/rw,/spool,/spool/checkresults}
-
-	if use web; then
-		# There is no way to install the CGIs unstripped from the
-		# top-level makefile, so descend into cgi/ here. The empty
-		# INSTALL_OPTS ensures that root:root: owns the CGI executables.
-		cd "${S}/cgi" || die
-		emake INSTALL_OPTS="" DESTDIR="${D}" install-unstripped
-		cd "${S}" || die
-
-		# install-html installs the new exfoliation theme
-		emake INSTALL_OPTS="" DESTDIR="${D}" install-html
-
-		if use classicui; then
-			# This overwrites the already-installed exfoliation theme
-			emake INSTALL_OPTS="" DESTDIR="${D}" install-classicui
-		fi
-
-		# Install cute Gentoo icons (bug #388323), setting their
-		# owner, group, and mode to match those of the rest of Nagios's
-		# images.
-		insinto /usr/share/nagios/htdocs/images/logos
-		doins "${WORKDIR}/${GENTOO_ICONS}"/*.*
-	fi
-
-	# The ./configure script for nagios detects the init system on the
-	# build host, which is wrong for all sorts of reasons. We've gone
-	# to great lengths above to avoid running "install-init" -- even
-	# indirectly -- and so now we must install whatever service files
-	# we need by hand.
-	newinitd startup/openrc-init nagios
-	systemd_newunit startup/default-service nagios.service
-
-	if use web ; then
-		if use apache2 ; then
-			# Install the Nagios configuration file for Apache.
-			insinto "/etc/apache2/modules.d"
-			newins "${T}/99_nagios4-r1.conf" "99_nagios4.conf"
-		elif use lighttpd ; then
-			# Install the Nagios configuration file for Lighttpd.
-			insinto /etc/lighttpd
-			newins "${T}/lighttpd_nagios4-r1.conf" nagios.conf
-		else
-			ewarn "${CATEGORY}/${PF} only supports apache or lighttpd"
-			ewarn "out of the box. Since you are not using one of them, you"
-			ewarn "will have to configure your webserver yourself."
-		fi
-	fi
-}
-
-pkg_postinst() {
-
-	if use web; then
-		if use apache2 || use lighttpd ; then
-			if use apache2; then
-				elog "To enable the Nagios web front-end, please edit"
-				elog "${ROOT}/etc/conf.d/apache2 and add \"-D NAGIOS -D PHP\""
-				elog "to APACHE2_OPTS. Then Nagios will be available at,"
-				elog
-			elif use lighttpd; then
-				elog "To enable the Nagios web front-end, please add"
-				elog "'include \"nagios.conf\"' to the lighttpd configuration"
-				elog "file at ${ROOT}/etc/lighttpd/lighttpd.conf. Then Nagios"
-				elog "will be available at,"
-				elog
-			fi
-
-			elog "  http://localhost/nagios/"
-		fi
-	fi
-
-	elog
-	elog "If your kernel has /proc protection, nagios"
-	elog "will not be happy as it relies on accessing the proc"
-	elog "filesystem. You can fix this by adding nagios into"
-	elog "the group wheel, but this is not recomended."
-	elog
-
-	if [ -n "${REPLACING_VERSIONS}" ]; then
-		ewarn "The local state directory for nagios has changed in v4.4.5,"
-		ewarn "from ${EROOT}/var/nagios to ${EROOT}/var/lib/nagios. If you"
-		ewarn "wish to migrate your state to the new location, first stop"
-		ewarn "nagios and then run"
-		ewarn ""
-		ewarn "  diff --recursive --brief ${EROOT}/var/nagios ${EROOT}/var/lib/nagios"
-		ewarn ""
-		ewarn "to identify any files that should be moved to the new"
-		ewarn "location. They can simply be moved with \"mv\" before"
-		ewarn "restarting nagios."
-	fi
-}
diff --git a/net-analyzer/nagios-plugins/Manifest b/net-analyzer/nagios-plugins/Manifest
index ad5294f43529..d8d897f8adb2 100644
--- a/net-analyzer/nagios-plugins/Manifest
+++ b/net-analyzer/nagios-plugins/Manifest
@@ -1,10 +1,6 @@
 AUX check_smtp-implicit-tls.patch 4817 BLAKE2B 0a163150461b1c57892ae5802534ecc10cc94af93af846e07a4b66da445280a58e29841834002fcf86b2ed140ba26d420c550283edfef27c242710cf5673670e SHA512 27cb281b9e7fb4bec6250c1af41c74e39b171b05300587496e45d6f314d87557354b11837ec4348c91db92746b564e86f617ecf4f57ac002b4abd2918155f53c
 AUX define-own-mysql-port-constant.patch 3271 BLAKE2B a9776567af41b106616c10aac02042147d162a452e17480433a8fd8ffcf3ce506d6930215e8a8eaa219d7811adffbcc2b3ee6a004661ca2a1f8bdc3339bf3526 SHA512 18cb9be96b3e39a07eeb1cf6bccbbe26766ac355f4822c132253e25a6909c418071c2dc546fb60c055b78f620180035e57436a8ebb771ae1096b78d2e1c7c6ec
-DIST nagios-plugins-2.3.1.tar.gz 2833267 BLAKE2B f89eda7a29558dd33dedbf0de150b6a13ba66d213d74041d9eb8c680880b3825bcc9312d251d22f3b483a14c0de7c59d7801954e7563c16352bfc38236676863 SHA512 89208f211e51db4e0d56725a6ff6d2fcf4eb2207f877a2b8f130cda8480a70f318eceb94140eb4f2a17fe3dd967bb3615ccc366c1a531ebd4ff0a04b60c61b8a
-DIST nagios-plugins-2.3.3.tar.gz 2782610 BLAKE2B f02ded0ed6d5c649a82fe7fe06e393b404fc6e9a260365b128c114381d411d93c8980fee6da73c4d03ab73669d5b8754225ff5aa14ef4430ee0c91d8c56cb131 SHA512 2128601b1098eb82f4e7d720b96a5f92d6ad75dc181a94b25c38172767de8b72f9fece3eddb74933b1cd520928ae9416a7dc665e2f059bfe362dd74041d28cd7
 DIST nagios-plugins-2.4.0.tar.gz 2738643 BLAKE2B 695c3804aec592dad0ae1f2f19222a5ae066944de4169beba08dd1e7beee51c5082679dfc1cf5adc052758e3142f33187ebde9636af19ae313f1448867764878 SHA512 f6f4cd604d28161f36c1429dbfa8f07e9fa468d8d8c21925d53d7049f0765504cb785e1f1189a0c93aa1f0cd1fe3985409c420b7724aa39790836af5c3f725ff
-EBUILD nagios-plugins-2.3.1-r3.ebuild 2993 BLAKE2B fdfb49d287611867610decf2de17b1fcc6e070e72d32013979ca33af5279db41b998fe54c894aeceb11dc85e0c672cfc392355533a8c61bef8be91c40eac45f3 SHA512 8e57455884815ea28dc671bb35b5d580f79c5108d5ef0e486493ca2a11886ac4fb19b7e2ffdbba544cbffc073c58f5224a0b144039d3d7496c45cf8139519329
-EBUILD nagios-plugins-2.3.3-r3.ebuild 3043 BLAKE2B 81cd85e2d642195e6d02085d3758f1a39faa4fc6676c4788fb03941dbbdfc34f0c0620c47af5a3e62bf3bc693a40c5899106b6fbda0e6e2c457df9cae8fd94b2 SHA512 52f64e344951a83aff641586918279114b7f0e67d1510f02dda463ec224eefa0711b1c2b29a6d87a8e455ccdcae48f31aea1eb6f3d9e017db827a6be2db0061d
 EBUILD nagios-plugins-2.4.0-r1.ebuild 3225 BLAKE2B dda29986ebcc2340c6a1c45805ce47b2e0e3218fdcb562d03be4f06c20c26e54328ff07dc3c7e17e2467c699598e7d1b9a3e511af3b52f8ef7e88d94044aef82 SHA512 67d45f7e9cb6332a975694c3c9fd658c47667b439f7d064310e9c2d2a705d30a436ebe50efcb23c78bc1253463270d253085b97bb45cfce3426f00e5452f61b4
 EBUILD nagios-plugins-2.4.0.ebuild 3023 BLAKE2B 1cec2d601cdd63e886a41aaf0572af0383eb32c3c64658b97dad02a7320b2a094fe0c8b9767cec0508af9d654946317c3b302a6c64e7dc1d1cbdab58a6f19a14 SHA512 0915eafb1fc7c44f14a56225066fd33e307e2bbcfbfdb82a71adaedc3a7cb5fcab8c5578343cd0363d7c74277319c1bcd8f46a88fef591d04fd3243293f7a6c7
 MISC metadata.xml 1431 BLAKE2B 7a5b71bb1d5acc47492a8ac0414c5de789e2fff607a1602c8e464dd4285adb1acd71f152dc9dae18bade31623d78ca2ebe796b871f62542d2d29a75a3b5e4ce6 SHA512 5aa293f0fd8f810b3b750772e260009cbf10bb68aae1f8cbb9e02f7565204f8ae14da3f6a18db58e9fdff5fd97ba8566d07a421ff8bc35f07747338ced13b92c
diff --git a/net-analyzer/nagios-plugins/nagios-plugins-2.3.1-r3.ebuild b/net-analyzer/nagios-plugins/nagios-plugins-2.3.1-r3.ebuild
deleted file mode 100644
index a5d5583481bc..000000000000
--- a/net-analyzer/nagios-plugins/nagios-plugins-2.3.1-r3.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Official plugins for Nagios"
-HOMEPAGE="http://nagios-plugins.org/"
-SRC_URI="http://nagios-plugins.org/download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ppc ppc64 sparc x86"
-IUSE="ipv6 ldap mysql nagios-dns nagios-ping nagios-game postgres radius samba selinux snmp ssh +ssl"
-
-# Most of the plugins use automagic dependencies, i.e. the plugin will
-# get built if the binary it uses is installed. For example, check_snmp
-# will be built only if snmpget from net-analyzer/net-snmp[-minimal] is
-# installed. End result: most of our runtime dependencies are required
-# at build time as well.
-AUTOMAGIC_DEPEND="
-	nagios-dns? ( net-dns/bind-tools )
-	nagios-game? ( games-util/qstat )
-	nagios-ping? ( net-analyzer/fping )
-	samba? ( net-fs/samba )
-	ssh? ( net-misc/openssh )
-	snmp? ( dev-perl/Net-SNMP
-			net-analyzer/net-snmp[-minimal] )"
-
-# Perl really needs to run during the build...
-BDEPEND="${AUTOMAGIC_DEPEND}
-	dev-lang/perl"
-
-DEPEND="
-	ldap? ( net-nds/openldap:= )
-	mysql? ( dev-db/mysql-connector-c:= )
-	postgres? ( dev-db/postgresql:* )
-	ssl? (
-		dev-libs/openssl:0=
-	)
-	radius? ( net-dialup/freeradius-client )"
-
-# Basically everything in net-analyzer/monitoring-plugins collides with
-# nagios-plugins. Perl (from BDEPEND) is needed at runtime, too.
-RDEPEND="${BDEPEND}
-	${DEPEND}
-	!net-analyzer/monitoring-plugins
-	selinux? ( sec-policy/selinux-nagios )"
-
-# At least one test is interactive.
-RESTRICT="test"
-
-DOCS=(
-	ACKNOWLEDGEMENTS
-	AUTHORS
-	CODING
-	ChangeLog
-	FAQ
-	NEWS
-	README
-	REQUIREMENTS
-	SUPPORT
-	THANKS
-)
-
-PATCHES=( "${FILESDIR}/define-own-mysql-port-constant.patch" )
-
-src_prepare() {
-	default
-
-	# Fix the path to our perl interpreter
-	sed -i -e "1s:/usr/local/bin/perl:/usr/bin/perl:" \
-		"${S}"/plugins-scripts/*.pl \
-		|| die 'failed to fix perl interpreter path'
-}
-
-src_configure() {
-	# Use an array to prevent econf from mangling the ping args.
-	local myconf=()
-
-	if use ssl; then
-		myconf+=( $(use_with ssl openssl /usr) )
-	else
-		myconf+=( --without-openssl )
-		myconf+=( --without-gnutls )
-	fi
-
-	# The autodetection for these two commands can hang if localhost is
-	# down or ICMP traffic is filtered. Bug #468296.
-	myconf+=( --with-ping-command="/bin/ping -n -U -w %d -c %d %s" )
-
-	if use ipv6; then
-		myconf+=( --with-ping6-command="/bin/ping6 -n -U -w %d -c %d %s" )
-	fi
-
-	econf \
-		$(use_with mysql) \
-		$(use_with ipv6) \
-		$(use_with ldap) \
-		$(use_with postgres pgsql /usr) \
-		$(use_with radius) \
-		"${myconf[@]}" \
-		--libexecdir="/usr/$(get_libdir)/nagios/plugins" \
-		--sysconfdir="/etc/nagios"
-}
-
-pkg_postinst() {
-	elog "This ebuild has a number of USE flags that determine what you"
-	elog "are able to monitor. Depending on what you want to monitor, some"
-	elog "or all of these USE flags need to be set."
-	elog
-	elog "The plugins are installed in ${ROOT}/usr/$(get_libdir)/nagios/plugins"
-}
diff --git a/net-analyzer/nagios-plugins/nagios-plugins-2.3.3-r3.ebuild b/net-analyzer/nagios-plugins/nagios-plugins-2.3.3-r3.ebuild
deleted file mode 100644
index bb1f5bbbfd58..000000000000
--- a/net-analyzer/nagios-plugins/nagios-plugins-2.3.3-r3.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Official plugins for Nagios"
-HOMEPAGE="http://nagios-plugins.org/"
-SRC_URI="http://nagios-plugins.org/download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="ipv6 ldap mysql nagios-dns nagios-ping nagios-game postgres radius samba selinux snmp ssh +ssl"
-
-# Most of the plugins use automagic dependencies, i.e. the plugin will
-# get built if the binary it uses is installed. For example, check_snmp
-# will be built only if snmpget from net-analyzer/net-snmp[-minimal] is
-# installed. End result: most of our runtime dependencies are required
-# at build time as well.
-AUTOMAGIC_DEPEND="
-	nagios-dns? ( net-dns/bind-tools )
-	nagios-game? ( games-util/qstat )
-	nagios-ping? ( net-analyzer/fping )
-	samba? ( net-fs/samba )
-	ssh? ( net-misc/openssh )
-	snmp? ( dev-perl/Net-SNMP
-			net-analyzer/net-snmp[-minimal] )"
-
-# Perl really needs to run during the build...
-BDEPEND="${AUTOMAGIC_DEPEND}
-	dev-lang/perl"
-
-DEPEND="
-	ldap? ( net-nds/openldap:= )
-	mysql? ( dev-db/mysql-connector-c:= )
-	postgres? ( dev-db/postgresql:* )
-	ssl? (
-		dev-libs/openssl:0=
-	)
-	radius? ( net-dialup/freeradius-client )"
-
-# Basically everything in net-analyzer/monitoring-plugins collides with
-# nagios-plugins. Perl (from BDEPEND) is needed at runtime, too.
-RDEPEND="${BDEPEND}
-	${DEPEND}
-	!net-analyzer/monitoring-plugins
-	selinux? ( sec-policy/selinux-nagios )"
-
-# At least one test is interactive.
-RESTRICT="test"
-
-DOCS=(
-	ACKNOWLEDGEMENTS
-	AUTHORS
-	CODING
-	ChangeLog
-	FAQ
-	NEWS
-	README
-	REQUIREMENTS
-	SUPPORT
-	THANKS
-)
-
-PATCHES=(
-	"${FILESDIR}/define-own-mysql-port-constant.patch"
-	"${FILESDIR}/check_smtp-implicit-tls.patch"
-)
-
-src_prepare() {
-	default
-
-	# Fix the path to our perl interpreter
-	sed -i -e "1s:/usr/local/bin/perl:/usr/bin/perl:" \
-		"${S}"/plugins-scripts/*.pl \
-		|| die 'failed to fix perl interpreter path'
-}
-
-src_configure() {
-	# Use an array to prevent econf from mangling the ping args.
-	local myconf=()
-
-	if use ssl; then
-		myconf+=( $(use_with ssl openssl /usr) )
-	else
-		myconf+=( --without-openssl )
-		myconf+=( --without-gnutls )
-	fi
-
-	# The autodetection for these two commands can hang if localhost is
-	# down or ICMP traffic is filtered. Bug #468296.
-	myconf+=( --with-ping-command="/bin/ping -n -U -w %d -c %d %s" )
-
-	if use ipv6; then
-		myconf+=( --with-ping6-command="/bin/ping6 -n -U -w %d -c %d %s" )
-	fi
-
-	econf \
-		$(use_with mysql) \
-		$(use_with ipv6) \
-		$(use_with ldap) \
-		$(use_with postgres pgsql /usr) \
-		$(use_with radius) \
-		"${myconf[@]}" \
-		--libexecdir="/usr/$(get_libdir)/nagios/plugins" \
-		--sysconfdir="/etc/nagios"
-}
-
-pkg_postinst() {
-	elog "This ebuild has a number of USE flags that determine what you"
-	elog "are able to monitor. Depending on what you want to monitor, some"
-	elog "or all of these USE flags need to be set."
-	elog
-	elog "The plugins are installed in ${ROOT}/usr/$(get_libdir)/nagios/plugins"
-}
diff --git a/net-analyzer/nagios/Manifest b/net-analyzer/nagios/Manifest
index ff61984f1cd0..92f0479bad43 100644
--- a/net-analyzer/nagios/Manifest
+++ b/net-analyzer/nagios/Manifest
@@ -1,3 +1,2 @@
-EBUILD nagios-4.4.6.ebuild 393 BLAKE2B 6200ada14b6e43e509b775ba2e41914c19b660e152e185fb7c1e978238b179e276abb24fb2c1dfa8e5c19ab976b6faef2570fd54dd69c9d10d18d4acbd7e1387 SHA512 3287a38973570a85a4cb7fd21a696965d50265002f58be716485374bdf154301ac0a2cc9a6785b96c2d1bd45e57f1a7b88d766bd9862f9266b1eb851b2a670ca
 EBUILD nagios-4.4.7.ebuild 393 BLAKE2B a1fd423a0911c48daf7ec881bfa33300d79ccd6a1f1d2d69fd6123914d418f59a245cafa3d3b9f3a5a66953eec4e0745ca446657b5aab9092e9c36c118839cca SHA512 1639ff8068154b4aaed81f02b3d1667e843196f9a41664bfef39bf465feeab44c68fe95bfe38dcf1e128af6ed534038bd30a2c84ee0d81fabb75f38e666f8a35
 MISC metadata.xml 1111 BLAKE2B d2c8f269fe7ef92c656219c0c93efca6083c09ea1ea402ccab7cf37f415931ad5abdf46a20b568ec82883a574005a4788617c0786c20c2d326b2d481195261e0 SHA512 e6c32f8405e79a4a3cf03d21dce3539c28454d75929348efb30f5c7c2b55f5346e3cd39f9d64f4e276aaad12f1fbf274f2fc08c255c03df1a5a7f0356031d66e
diff --git a/net-analyzer/nagios/nagios-4.4.6.ebuild b/net-analyzer/nagios/nagios-4.4.6.ebuild
deleted file mode 100644
index be5cb8515d0e..000000000000
--- a/net-analyzer/nagios/nagios-4.4.6.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="The Nagios metapackage"
-HOMEPAGE="https://www.nagios.org/"
-
-LICENSE="metapackage"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ppc ppc64 sparc x86"
-IUSE=""
-
-RDEPEND="~net-analyzer/nagios-core-${PV}
-	|| ( net-analyzer/nagios-plugins net-analyzer/monitoring-plugins )"
diff --git a/net-irc/Manifest.gz b/net-irc/Manifest.gz
index 83a645bcaad4..f9c75377d81b 100644
--- a/net-irc/Manifest.gz
+++ b/net-irc/Manifest.gz
diff --git a/net-irc/eggdrop/Manifest b/net-irc/eggdrop/Manifest
index 9066097eed55..05db9a41e7d9 100644
--- a/net-irc/eggdrop/Manifest
+++ b/net-irc/eggdrop/Manifest
@@ -1,10 +1,10 @@
 AUX eggdrop-1.8.4-fix-array-bounds-warning.patch 864 BLAKE2B d35686e21c7a531b25ba6b06420dfd45914d4aff5321ccd9129239e7f66182d91800371f14c81ee4ac6eb39ad96063d7750a40a25e1eccb9dcebbe50502f0bc9 SHA512 de10ae6d6328da636afd8ec0de187b3f29677c3854e111a64df9b15c9d41ef8ec92f2efd65bc361b2fb6b879016b44e2ce9639da937370d71781aca569991d75
 AUX eggdrop-1.8.4-respect-ldflags.patch 1316 BLAKE2B 43c0ca341a328f08fe8beb735c678bcf0c8fd547acbc7c1614995d5fc75261924cb435b0c0fc4d9f94c2fee3781aba407f3cb09e26958d1e09e1338e7e1781fb SHA512 f0d7c699d648f4a89d622f3f2238b967cae7ff139f25390853b195efd3a76c74af80389c20fcd2c1203fc33d006e7e27d9bdfcab4772c7a688fce7d0649d28be
 AUX eggdrop-installer 2149 BLAKE2B a9b2d7887732f1b6cabb6998ea7c128b52308a70fc46521521d92c1c3bb9f78fd2b32866c62fd0e67b360cfb32921ea900983e2892a9e37d3316364bdaabe26f SHA512 e9a99daff0e73344ab6cf73bb28fa26309b6ec85bcb5cfb84c343fe439a7e1e927960462b5f500af077a7470809d8fe4a2771f34c0727728121d9ba06792c715
-DIST eggdrop-1.8.4.tar.gz 1784738 BLAKE2B a86cdc681ebd9c779b7da20f80ff312e4fc848e0cb0a0b9fa34941c91e1b89db1430126e3d0b94c7b4346c0bde099a6ddd343270943570744c46fc4ddd451540 SHA512 d08af09dc83045bf89eae957e7817591f16456f83ba3efe6b361fd421a3d4068348543275c26b27b006f09f06344c04cdf58ee4231f1aee0e7537ec39bc24b49
 DIST eggdrop-1.9.1.tar.gz 2271120 BLAKE2B 73fadeddcebeba5de42328f6f02c05e850e47c19812bc1a868da09f55fd1d297e3596c5a4b167806237554966e7dfbebadcee6215932c56a76b3e67a77d5ee47 SHA512 d8907d265f7e22f3bcd3e28b256c5788d5959ad11cc1425d59eb4411ebbc172fe8d90c31fd9f033369ab80cd29a36a5856f6bd32bc6c9cdfedea1d6509ea7f3b
 DIST eggdrop-1.9.2.tar.gz 2296300 BLAKE2B ed409896718e45daab2b21c25e7f1a5a2664ef8afec7127943abb3018ce963413e714618ee730ef2c49e4542c6e87377cff405ee36ce91448335adf6c7ab5a8a SHA512 67c8053a79ab5c4c418164e4e12f89a6e111b06b4e6dfdc69c52913b2f3b9a58b065a7601165112071c9ca2a778269aeb95c749a9da787c1932e6471a23146ce
-EBUILD eggdrop-1.8.4-r1.ebuild 1604 BLAKE2B 021484a3fd61e38f6dc68f4d17054935590255a05cfba9b69e912a44e90ed9fee806416c0d1b7b6953bbb4558b4ad20b2cc67ab8d5affdd91281330d919fd94c SHA512 2be5f820597450688778c9f2ae1a999f1be85dfc105ee80d66d6d182f55df32c2d6514dd4196aeec5459b3b85bad504aac4ef14369b92fbdc2f086ce61a97bbe
+DIST eggdrop-1.9.3.tar.gz 2046726 BLAKE2B 979190536c3c0718ef4b030d8f6df817b8ee823854c104b7d6f9009c10a7f8394d59afca40fc5c9778f130788fac7e14458d62d30a55413dea4653ca00c83f0a SHA512 67d6d0f798222e54e09acb319aa4926181c34b6e4cdc2cbb4fc7a8433915a7d6281904fd190fe2ee92bcc2cb99943e3fb5b9d99831cc0bfd930205e63e33d1a1
 EBUILD eggdrop-1.9.1.ebuild 1461 BLAKE2B de6dce1137ff3c735085233198bedc86587c9f1aee7b5f34e5599e988a0a389efae04433fee85b327ed61b7ab8bab5990833421fd14cb2b4925c817ed6cc81af SHA512 25331e586565fe7a7ca21e3201c9f21ead9e5e24700ab81547deee10fcb16990b34664e6b5d0008cbf7248782f8da918ab6ddfc4dc2d1fabd1f06e5559878087
 EBUILD eggdrop-1.9.2.ebuild 1465 BLAKE2B 26a777f636c80fe908edc93a7595ce2b4d4bb36a4328f9285ffb6f2d5ee18d2283ac622809678a754ac258bea6725af56c8232b3f8705188b366a62186f9b7fd SHA512 a308c437359018a1a383f1082d8268241b2e03d385c154d9e90d74aac36e932e922b3981cb399dbe93acd85de7d7503ca35cdecb85f23f641325f235463a0169
+EBUILD eggdrop-1.9.3.ebuild 1465 BLAKE2B 7150b2c731e8e520504a0962382374d1c668179dc20b7fc5da26ac5f3051c0721004db6bb99f7cb16eb6c9f4ed24c897b88182c3a231805c81da38681e7dafa1 SHA512 f0bcac77db4e12e952dc5af71100364dcbe192f0f7708239db0e3875ef98e1a5397bc6c19baee4036bddfb3b5344acb0401a87087810f772b1286ac99d13d231
 MISC metadata.xml 391 BLAKE2B 0d25698de67e0c9276e04b4de933fd3f2d4ac74915074e11f034392debff1c120b038525cd32b9d02f7ad27418617230add5558b7fe2a9069b94918830bcb219 SHA512 729cd651c3516681bce295292e513a47c178e4ea3893bc083a8d96fcfe969fd8da96fc3347e37591d31a5fe03fb2dbef52e1599950833933622976f78492d293
diff --git a/net-irc/eggdrop/eggdrop-1.8.4-r1.ebuild b/net-irc/eggdrop/eggdrop-1.9.3.ebuild
index e1c6469a9632..9114a4dc8c97 100644
--- a/net-irc/eggdrop/eggdrop-1.8.4-r1.ebuild
+++ b/net-irc/eggdrop/eggdrop-1.9.3.ebuild
@@ -1,15 +1,17 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit readme.gentoo-r1
 
+MY_P="${PN}-${PV/_rc/rc}"
 DESCRIPTION="An IRC bot extensible with C or TCL"
 HOMEPAGE="https://www.eggheads.org/"
-SRC_URI="https://ftp.eggheads.org/pub/eggdrop/source/${PV:0:3}/${P}.tar.gz"
+SRC_URI="https://ftp.eggheads.org/pub/eggdrop/source/${PV:0:3}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
 
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ppc sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~riscv ~sparc ~x86"
 LICENSE="GPL-2+"
 SLOT="0"
 IUSE="debug doc ipv6 ssl static"
@@ -23,13 +25,6 @@ RDEPEND="
 	${DEPEND}
 "
 
-PATCHES=(
-	# https://github.com/eggheads/eggdrop/pull/986
-	"${FILESDIR}/${P}-respect-ldflags.patch"
-	# https://github.com/eggheads/eggdrop/pull/841
-	"${FILESDIR}/${P}-fix-array-bounds-warning.patch"
-)
-
 DOCS=( AUTHORS FEATURES INSTALL NEWS README THANKS UPGRADING )
 
 src_configure() {
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 2f394a6e7017..5b94e44fa367 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/package.mask b/profiles/package.mask
index e081bb867239..99160babb5b5 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -33,6 +33,17 @@
 
 #--- END OF EXAMPLES ---
 
+# Matt Turner <mattst88@gentoo.org> (2022-08-29)
+# Unpatched security vulerabilities. Bug #857780.
+# Removal on 2022-09-29.
+=x11-base/xorg-server-1.20*
+=x11-base/xorg-drivers-1.20*
+
+# Matt Turner <mattst88@gentoo.org> (2022-08-29)
+# Fails to build with xorg-server-21. Bug #828426.
+# Removal on 2022-09-29.
+x11-drivers/xf86-video-glint
+
 # Hans de Graaff <graaff@gentoo.org) (2022-08-27)
 # No longer maintained upstream and more modern alternatives such as
 # www-servers/puma are available.
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 9d405370128e..b89b0d748239 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -1007,6 +1007,13 @@ app-office/lyx:rcs - Add support for revision control via dev-vcs/rcs
 app-office/lyx:rtf - Add support for RTF import/export packages
 app-office/magicpoint:contrib - Install additional contributed scripts
 app-office/mdbtools:glib - Use functions provided by dev-libs/glib, not built-in
+app-office/sc-im:X - Use x11-misc/xclip for clipboard copy/paste
+app-office/sc-im:ods - Add ods import support
+app-office/sc-im:plots - Add sci-visualization/gnuplot for plotting support
+app-office/sc-im:tmux - Use app-misc/tmux for clipboard copy/paste
+app-office/sc-im:wayland - Use gui-apps/wl-clipboard for clipboard copy/paste
+app-office/sc-im:xls - Add xls support
+app-office/sc-im:xlsx - Add xlsx support
 app-office/scribus:boost - Enable support for Boost based enhancement
 app-office/scribus:hunspell - Enable support for spell checking with app-text/hunspell
 app-office/scribus:minimal - Don't install headers (only required for e.g. plug-in developers)
@@ -2072,6 +2079,7 @@ dev-libs/libverto:libevent - Support event loops using dev-libs/libevent
 dev-libs/libverto:tevent - Support event loops using sys-libs/tevent
 dev-libs/libvoikko:expvfst - Enable experimental features of VFST morphology backend
 dev-libs/libvoikko:hfst - Enable HFST morphology backend
+dev-libs/libxlsxwriter:openssl - Use dev-libs/openssl for MD5 digest
 dev-libs/libxmlb:stemmer - Enable language stemming support
 dev-libs/libzia:ftdi - Enable support for FTDI USB chips
 dev-libs/libzip:mbedtls - Use net-libs/mbedtls as TLS provider
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index b74749d66fc5..97bdeb4d4c96 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/shadow/Manifest b/sys-apps/shadow/Manifest
index b5107aac76b6..b4e5b90ef0b4 100644
--- a/sys-apps/shadow/Manifest
+++ b/sys-apps/shadow/Manifest
@@ -8,5 +8,5 @@ DIST shadow-4.11.1.tar.xz 1656584 BLAKE2B d459a1e0ffb342b6b455caf65e6af60b32eee7
 DIST shadow-4.12.3.tar.xz 1747620 BLAKE2B 63b10d75a11d419156a996b8acf1bebbfab28999c2ab796e6625c028882073d4021806d8b56224190886c076a1205955e7797cb6f797ef73af3a8a33ac34bf2f SHA512 0529889258f54e7634762dc154aa680d55f8c5f1654afadd1b7431cfbb890a3b1ba27c7ff4b7c45986e4ee2289946db2e420b23ed13e4e5b15800a1fb3a013bc
 DIST shadow-4.12.3.tar.xz.asc 488 BLAKE2B b23525c3303f78df9d046c0225ed3ee1715cb000650630daae8b41fb71413daa45b5fe39a98fc640aaafa0f219fbaf9e065afa6b44f051373fb1967358ccc43d SHA512 d3f294d86c0e2174c88809810a801737c01cd01f9cadbe7b1ae382b2745d86e2e30c0718fa6489c2abb65500ed94c8ac1961d05243b5a1800c966384c69281c9
 EBUILD shadow-4.11.1.ebuild 6247 BLAKE2B 1aa58e8496f45bfa85c1d9a9893eeb31629ea6709b81451e68a42369f7bfb293c538bc1b2d458afbd30a7c9511d88c8f977c7ec4283b38553de454f5b1712ef1 SHA512 021974ec33b5cc1d512a6c1626b7e71787b30ecf331aa9aba214b1f37a2ea8ef02f53dcc186ee2ccdd304845af3f5ae8526da5073611f90e26cb45840ed2aed6
-EBUILD shadow-4.12.3.ebuild 6490 BLAKE2B 1ce1ede7b3cf2554f67e7d93e02067595e8aac753670ffcf28983534829f0ee39a171f247acc163eb97807bd4cc6bf03dc267659533f3fdb8d95ab0c06c6cc39 SHA512 d232f6ffc9d35186eb98a53a1cd8f444f6c5029c745acc3aeaba48705373a3fe9f374b95805bf1ea186fc12f96879cd9a06a7fa441120917b17f65e79a4c14dd
+EBUILD shadow-4.12.3.ebuild 6489 BLAKE2B 8a4336ae4200b6ab561c879fd06402f894843f3ffe488a1a263f3c4c4a9e3edaa981462fcb58106887aff06fadeef337a0b29369ee5002b6fa0249d31dbb41aa SHA512 1febf288f9f9dface818ff92fb0208da08c5e4b7ad5ba5b2d2520ad89c911d9773938aa5bbfd6454024883b2cefd5d5b2467cb3aea8ca01d3e0f93be72f5a95f
 MISC metadata.xml 606 BLAKE2B 2b14042f4702a908f8250c3fb6499ea33d8a8c44072707aa44881a36e3cc710256a821f8cd82c5214b32e9f5632745db4fdf00dd722f6fb7401e2f6b0bfbb4fd SHA512 694e039ae781982e8cbe6670b4e9c93b43455715ce4b9830a5fa61e6bf3eb91abcc284bf29c64fab055ba9754edaeab5d2da8140dbb2794fc1f534e2ccbb2b16
diff --git a/sys-apps/shadow/shadow-4.12.3.ebuild b/sys-apps/shadow/shadow-4.12.3.ebuild
index e3760212af13..2ea78c00a110 100644
--- a/sys-apps/shadow/shadow-4.12.3.ebuild
+++ b/sys-apps/shadow/shadow-4.12.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI+=" verify-sig? ( https://github.com/shadow-maint/shadow/releases/downloa
 LICENSE="BSD GPL-2"
 # Subslot is for libsubid's SONAME.
 SLOT="0/4"
-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"
 IUSE="acl audit bcrypt cracklib nls pam selinux skey split-usr su xattr"
 # Taken from the man/Makefile.am file.
 LANGS=( cs da de es fi fr hu id it ja ko pl pt_BR ru sv tr zh_CN zh_TW )
diff --git a/sys-process/Manifest.gz b/sys-process/Manifest.gz
index 61eab80c7525..89f4125f6f11 100644
--- a/sys-process/Manifest.gz
+++ b/sys-process/Manifest.gz
diff --git a/sys-process/audit/Manifest b/sys-process/audit/Manifest
index 372e09da0568..c6da6418ea0d 100644
--- a/sys-process/audit/Manifest
+++ b/sys-process/audit/Manifest
@@ -8,9 +8,11 @@ AUX auditd-init.d-2.4.3 2054 BLAKE2B 20e68ab676c925b8567a7e9a12d2ac055fd90477cbb
 DIST audit-3.0.6.tar.gz 1190011 BLAKE2B 93a7efad1cbea6771a73222b05aacbabc4ac61d1efb9fc2532607a94804bcac6512d0be2f4d89aa62d94fb85ba5818ffae4bf0a72676e8d549ddbec766e83e9c SHA512 74734e1b1fddea086db9c5dc8c4b7817917fdf17bc7ca4e5b440aae975484d020a17c3f485f6a37b6b150a307d809e50d559d31a8cbd6f1e554933719551bcd1
 DIST audit-3.0.7.tar.gz 1180226 BLAKE2B 706db746fb779913619da794bab24a9e890e1655bbd0abb007cbc909b32ab1d643e93953a23ef864d5e189f3447a7ddb4dca1478144cdc226f5a5594545bd28f SHA512 b5662b32082fc2ac54e247aa0db5442d76afa30134ebba1d624a17004e9ccf6856bb75344af4ce9d9a0a66c03e1c6f18b7d45658d7df13ea71af0c8362e08d70
 DIST audit-3.0.8.tar.gz 1182432 BLAKE2B 38a35a7540e608127cfc54a2de2cb12df8c29e778799ca53318824c84565a67b7ea131f9bba455fa469ce9139a27908738f571a6e383ce9a3274f70c09d27ec7 SHA512 8379bf425d68381d182300e628e42de8460d2f3e15b2395e10880f94b9989656852a50a9bece75b632ec8a04c40c9e666ff4c9d6b25ace3a8f50d2011506afab
+DIST audit-3.0.9.tar.gz 1210655 BLAKE2B a6b17ee61f506878cd70827b6ca2040762c762f10bdab7a253300d926cda59b300571c6df0e852ffb56db94620868de7dd22267ba1e8d1281e4ae1f702914b23 SHA512 5219eb0b41746eca3406008a97731c0083e7be50ec88563a39537de22cb69fe88490f5fe5a11535930f360b11a62538e2ff6cbe39e059cd760038363954ef4d6
 DIST audit-3.0.tar.gz 1109442 BLAKE2B f9c94f7163522068f5f37163a242cb913acc87b5465f7f8550fad27ac1dc673fd7a98e208bd5e6fb136eac1fdadd659e599e7722426937481bbf8c66d86a1617 SHA512 b82ec73c85a8ebb5108b526673d6fe08cbe0b51376788f3ea6ed5747c4612158462893e719496dffbd723f833f84383a2d1d55fd78a3ed985ecfd19545060c88
 EBUILD audit-3.0-r1.ebuild 4193 BLAKE2B b80c5342026738e6ca0c6cd3fc15970a636d78b5d8d5fb41e2d85e40aae61a830d60335aa04953790ffbb32fd7ecea26668f12e90d00e9e54fc55651ea2506e3 SHA512 756b57242b3538abed90030601f617083583a9099fb147b033307077201731d9a88c592df44c43d9555226c43358eceaa7e37fb7623b20117972c3e9d07171ee
 EBUILD audit-3.0.6-r1.ebuild 4134 BLAKE2B c66951f7b6352064199e019ddd3c3a1c4579866105839478ad361b3aa4109b1449aa7e3c38fbdaf14806c16a359154d6e8df1662558623c82e38c1bfd1ced8aa SHA512 17953316937cd12d5d37cfc37d5e58159f183ab422489c48859f586e675df806b9508eaa5a4166629d0a303fdf163b2a84f071c795501a9d9839b2ba02abc9ea
 EBUILD audit-3.0.7-r1.ebuild 4162 BLAKE2B 5bed15175ff989f34cc1a65981dda6e8550f1e395ddedf07d90b4f74e1ad2264c6f4d42b7881d295327152f59ee77422f036d9cd442e643fce8a94f10774564c SHA512 51fa4a90fbdd49c7c1d102a57caa8925551efc3ea87ae9f50326ee4f8ff71be500889f9657444ffe82eaefde6da4a9511d993090253b0aa77e8e30b2f1da55a1
 EBUILD audit-3.0.8.ebuild 4599 BLAKE2B efff1705308c4becea3333796ef1c9b3f95bcc10df383085b7faf4867f43e4d5ac75f324109a475893eedcf24cd0691e5154ff06dc9f828b7ed6b00d93b03206 SHA512 9de53cd51187216f01efedb8f0701630fe8bb292359a5aa649745bcbb5c71fe23a032c1b54d9804c3ac0c9fc36b724c37b71d638600f7355d0ab7b12df891905
+EBUILD audit-3.0.9.ebuild 4604 BLAKE2B 6af96e8d798c8381908230070fb3a8a5bf3f657afb8f70a5bf0e79f3fad5315abea66a79ec4b20ca96ead4d989bbda8b239360a611ff23178aa81766d9090cda SHA512 53bdfe078c72cb197a7831e905b114fac417abea473f3c754786636c48acfec492a5a45667c7a7265e4c7cfcbc1b5bc0096c18020fd1c154ec3b0c8ed5fce584
 MISC metadata.xml 457 BLAKE2B 2d18aba4c1e67e285691ed949808ebe7de2fddecb008eb16c1f8615d16e044fcfe3e81cceb30d325c4338462872fd2c436625a0d4eeefffd51cd074b1b5b4514 SHA512 809ea56f90880760e4b7ed180930af44f68b1ce5457fce2063969feebb22f02c8156bcc248cb885878e4d98848a2a5e91c194ac6f9fd54d8a88501e0c2d25ea9
diff --git a/sys-process/audit/audit-3.0.9.ebuild b/sys-process/audit/audit-3.0.9.ebuild
new file mode 100644
index 000000000000..f681e7805fbb
--- /dev/null
+++ b/sys-process/audit/audit-3.0.9.ebuild
@@ -0,0 +1,177 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# As with sys-libs/libcap-ng, same maintainer in Fedora as upstream, so
+# check Fedora's packaging (https://src.fedoraproject.org/rpms/audit/tree/rawhide)
+# on bumps (or if hitting a bug) to see what they've done there.
+
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit autotools multilib-minimal toolchain-funcs python-r1 linux-info systemd usr-ldscript
+
+DESCRIPTION="Userspace utilities for storing and processing auditing records"
+HOMEPAGE="https://people.redhat.com/sgrubb/audit/"
+SRC_URI="https://people.redhat.com/sgrubb/audit/${P}.tar.gz"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="gssapi ldap python static-libs test"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="gssapi? ( virtual/krb5 )
+	ldap? ( net-nds/openldap:= )
+	python? ( ${PYTHON_DEPS} )
+	sys-libs/libcap-ng"
+DEPEND="${RDEPEND}
+	>=sys-kernel/linux-headers-2.6.34
+	test? ( dev-libs/check )"
+BDEPEND="python? ( dev-lang/swig )"
+
+CONFIG_CHECK="~AUDIT"
+
+PATCHES=(
+	# See bug #836702 before removing / verify builds fine w/ USE=python
+	# with latest kernel headers.
+	"${FILESDIR}"/${PN}-3.0.8-linux-headers-5.17.patch
+	"${FILESDIR}"/${PN}-3.0.8-musl-malloc.patch
+)
+
+src_prepare() {
+	# audisp-remote moved in multilib_src_install_all
+	sed -i \
+		-e "s,/sbin/audisp-remote,${EPREFIX}/usr/sbin/audisp-remote," \
+		audisp/plugins/remote/au-remote.conf || die
+
+	# Disable installing sample rules so they can be installed as docs.
+	echo -e '%:\n\t:' | tee rules/Makefile.{am,in} >/dev/null || die
+
+	default
+	eautoreconf
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--sbindir="${EPREFIX}"/sbin
+		$(use_enable gssapi gssapi-krb5)
+		$(use_enable ldap zos-remote)
+		$(use_enable static-libs static)
+		--enable-systemd
+		--without-golang
+		--without-python
+		--without-python3
+	)
+
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+
+	if multilib_is_native_abi && use python; then
+		python_configure() {
+			mkdir -p "${BUILD_DIR}" || die
+			pushd "${BUILD_DIR}" &>/dev/null || die
+
+			ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" --with-python3
+
+			popd &>/dev/null || die
+		}
+
+		python_foreach_impl python_configure
+	fi
+}
+
+src_configure() {
+	tc-export_build_env BUILD_{CC,CPP}
+
+	local -x CC_FOR_BUILD="${BUILD_CC}"
+	local -x CPP_FOR_BUILD="${BUILD_CPP}"
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_compile() {
+	if multilib_is_native_abi; then
+		default
+
+		local native_build="${BUILD_DIR}"
+
+		python_compile() {
+			emake -C "${BUILD_DIR}"/bindings/swig top_builddir="${native_build}"
+			emake -C "${BUILD_DIR}"/bindings/python/python3 top_builddir="${native_build}"
+		}
+
+		use python && python_foreach_impl python_compile
+	else
+		emake -C common
+		emake -C lib
+		emake -C auparse
+	fi
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi; then
+		emake DESTDIR="${D}" initdir="$(systemd_get_systemunitdir)" install
+
+		local native_build="${BUILD_DIR}"
+
+		python_install() {
+			emake -C "${BUILD_DIR}"/bindings/swig DESTDIR="${D}" top_builddir="${native_build}" install
+			emake -C "${BUILD_DIR}"/bindings/python/python3 DESTDIR="${D}" top_builddir="${native_build}" install
+			python_optimize
+		}
+
+		use python && python_foreach_impl python_install
+
+		# Things like shadow use this so we need to be in /
+		gen_usr_ldscript -a audit auparse
+	else
+		emake -C lib DESTDIR="${D}" install
+		emake -C auparse DESTDIR="${D}" install
+	fi
+}
+
+multilib_src_install_all() {
+	dodoc AUTHORS ChangeLog README* THANKS
+	docinto contrib
+	dodoc contrib/avc_snap
+	docinto contrib/plugin
+	dodoc contrib/plugin/*
+	docinto rules
+	dodoc rules/*rules
+
+	newinitd "${FILESDIR}"/auditd-init.d-2.4.3 auditd
+	newconfd "${FILESDIR}"/auditd-conf.d-2.1.3 auditd
+
+	if [[ -f "${ED}"/sbin/audisp-remote ]] ; then
+		dodir /usr/sbin
+		mv "${ED}"/{sbin,usr/sbin}/audisp-remote || die
+	fi
+
+	# Gentoo rules
+	insinto /etc/audit
+	newins "${FILESDIR}"/audit.rules-2.1.3 audit.rules
+	doins "${FILESDIR}"/audit.rules.stop*
+
+	# audit logs go here
+	keepdir /var/log/audit
+
+	find "${ED}" -type f -name '*.la' -delete || die
+
+	# Security
+	lockdown_perms "${ED}"
+}
+
+pkg_postinst() {
+	lockdown_perms "${EROOT}"
+}
+
+lockdown_perms() {
+	# Upstream wants these to have restrictive perms.
+	# Should not || die as not all paths may exist.
+	local basedir="${1}"
+	chmod 0750 "${basedir}"/sbin/au{ditctl,ditd,report,search,trace} 2>/dev/null
+	chmod 0750 "${basedir}"/var/log/audit 2>/dev/null
+	chmod 0640 "${basedir}"/etc/audit/{auditd.conf,audit*.rules*} 2>/dev/null
+}
diff --git a/x11-base/Manifest.gz b/x11-base/Manifest.gz
index a2292ecceb29..f51527f9244c 100644
--- a/x11-base/Manifest.gz
+++ b/x11-base/Manifest.gz
diff --git a/x11-base/xorg-drivers/Manifest b/x11-base/xorg-drivers/Manifest
index 037cc1bb8e1e..70af8257c1be 100644
--- a/x11-base/xorg-drivers/Manifest
+++ b/x11-base/xorg-drivers/Manifest
@@ -1,4 +1,4 @@
 EBUILD xorg-drivers-1.20-r2.ebuild 3663 BLAKE2B 8bea6180884af5bface58cb832be4aedebd3246aa04ac425202611d70ffeb6373a191f92bd626c86161f5e0916b4b094275c824063254c2f0e9765c25ba3ac4b SHA512 8598f1dbc448d42daf1eb738a9ac42701f19777f585529e7af7c9c761eabf0ac19e41af0374297e186e0bf363be409ef13937a12ece193237c160af671cd70dd
-EBUILD xorg-drivers-21.1.ebuild 3576 BLAKE2B 89adb683ffd87be4daf1a7a09dac2553b30d8e630c6bb3de7b7d25bc7072180abf765a17d03e2f9c314b6ddf36446bb253031bef0c31b69fa30f4382237086fd SHA512 4d055a6a0f23ccfbdcda6b6470f152af95f6b898456369313cf1f87071a987d5d8e885546eee0a3ba3c07cc5b9288fbf99f8173b8d8cf1fbc4253492da65d687
-EBUILD xorg-drivers-9999.ebuild 3583 BLAKE2B fe6634c6cf708ea6df20f2ffa86ae0377998dbe49f75446774840065c4b8a3ff7b3915bd41e66319a0be7faaf2fe4d3b6fdb3e9dad687d4b9b3636c37fba7e65 SHA512 96527e4ad0dac9936a2055d2670385467706ec2293c76ccb1db15c3c0bd06af8aeb2f2531501d9bfb5979411467bd4f65ac314c36bc6f1046b740e975a0a4b4a
+EBUILD xorg-drivers-21.1-r1.ebuild 3488 BLAKE2B 624ba80df6e272d7f43b05b541d26542d2f0e02751a5746711fdcdea0663bdc954578363cfc3cba1f4d379cf5797aed889d8f3ada373cddb1ea7cd3daf7e9459 SHA512 a38ff88b547a017399dcac45a5f323d2fb83815c0fb93861f11b11d1540c61826c63700c5caa31226c7338bdd602fc89a861d3bac544592a1e96034822ed2fed
+EBUILD xorg-drivers-9999.ebuild 3495 BLAKE2B e34995df2d2a723e95e9afc8a7d11f31540dfebcab4e2305372edb8e6e06c0109ea6b3e5683fe15bf96adab8cbeaee41ad471ba17b4b0114a2d997fa98b8e8fd SHA512 c91c85f8415140271ad7ab12cf5af14f7ecba39e13bbc51c4a8bc9de0caeba0e4bbdf1da5a5b6f3acc36bc2e5605a64cc6224a4954be0151b6ae6a8f9d63c77b
 MISC metadata.xml 235 BLAKE2B 5ed3cd35ac32a5cdd6ac490bafdbc1cd03fc8c6bdbc8194ba7f4a34151a24c4ade7a80705d92348d6d13a9579d18b19ec40a353bf014dc02f98980bfa03d3574 SHA512 3fe78f6dd92b87b30ed02aef15ed72ec5cb62f4c6568dd9b98dcb2f11a4b9ce93955e34c62112a310b4c4a51f87e0e31e31ae5af140e1054c127d3cd344d7267
diff --git a/x11-base/xorg-drivers/xorg-drivers-21.1.ebuild b/x11-base/xorg-drivers/xorg-drivers-21.1-r1.ebuild
index 163d558097d3..7d3be634d955 100644
--- a/x11-base/xorg-drivers/xorg-drivers-21.1.ebuild
+++ b/x11-base/xorg-drivers/xorg-drivers-21.1-r1.ebuild
@@ -32,7 +32,6 @@ IUSE_VIDEO_CARDS="
 	video_cards_fbdev
 	video_cards_freedreno
 	video_cards_geode
-	video_cards_glint
 	video_cards_i915
 	video_cards_intel
 	video_cards_mga
@@ -77,7 +76,6 @@ PDEPEND="
 	video_cards_fbdev?         ( >=x11-drivers/xf86-video-fbdev-0.5.0 )
 	video_cards_freedreno?     ( >=x11-base/xorg-server-${PV}[-minimal] )
 	video_cards_geode?         ( x11-drivers/xf86-video-geode )
-	video_cards_glint?         ( >=x11-drivers/xf86-video-glint-1.2.9 )
 	video_cards_i915?          ( x11-drivers/xf86-video-intel )
 	video_cards_intel?         ( >=x11-base/xorg-server-${PV}[-minimal] )
 	video_cards_mga?           ( >=x11-drivers/xf86-video-mga-1.6.5 )
diff --git a/x11-base/xorg-drivers/xorg-drivers-9999.ebuild b/x11-base/xorg-drivers/xorg-drivers-9999.ebuild
index 2cb3e4fb15a3..8a6b8c72c182 100644
--- a/x11-base/xorg-drivers/xorg-drivers-9999.ebuild
+++ b/x11-base/xorg-drivers/xorg-drivers-9999.ebuild
@@ -32,7 +32,6 @@ IUSE_VIDEO_CARDS="
 	video_cards_fbdev
 	video_cards_freedreno
 	video_cards_geode
-	video_cards_glint
 	video_cards_i915
 	video_cards_intel
 	video_cards_mga
@@ -77,7 +76,6 @@ PDEPEND="
 	video_cards_fbdev?         ( >=x11-drivers/xf86-video-fbdev-0.5.0 )
 	video_cards_freedreno?     ( >=x11-base/xorg-server-${PV}[-minimal] )
 	video_cards_geode?         ( x11-drivers/xf86-video-geode )
-	video_cards_glint?         ( >=x11-drivers/xf86-video-glint-1.2.9 )
 	video_cards_i915?          ( x11-drivers/xf86-video-intel )
 	video_cards_intel?         ( >=x11-base/xorg-server-${PV}[-minimal] )
 	video_cards_mga?           ( >=x11-drivers/xf86-video-mga-1.6.5 )
author	V3n3RiX <venerix@koprulu.sector>	2022-08-30 04:47:47 +0100
committer	V3n3RiX <venerix@koprulu.sector>	2022-08-30 04:47:47 +0100
commit	048bd060badd229e3bb596029874760a86d27060 (patch)
tree	255c77a2abedb5474cd77d0b3cac24551de7771d
parent	8993ea73a9714d22178ba6ada8c04be83cd71ec7 (diff)