gentoo auto-resync : 15:11:2022 - 00:51:37

author: V3n3RiX <venerix@koprulu.sector> 2022-11-15 00:51:37 +0000
committer: V3n3RiX <venerix@koprulu.sector> 2022-11-15 00:51:37 +0000
commit: ac35def7deb4a1eecfad26f0eb5907170b2ee5d7 (patch)
tree: 37bd431de7ab2a8fca535418553ec0fcdee09394
parent: aa44121f587698ace480d5ca16ae9e64fe1b4d0b (diff)
77 files changed, 405 insertions, 1849 deletions
diff --git a/Manifest b/Manifest
index b3a19ce49ca5..5e27cf1689a8 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29609 BLAKE2B 1dd5283d5cb307dc4a4835309bd552f8375c296fd24774bf8ebe2004f2ceac23f722d9a4ce4d45b19a216f51a8388e9489a5ed4ae40f8aac655cbf79bc2092dc SHA512 4eaad0a4fd77a8b5a6721b3ac7de84f91e75f852580cb0f1042584fe911d5c7e616c1ef8225f0d3d35f8e4490f4f57d028d95ac7d194c91a0c3bb4f4a17d9b6c
-TIMESTAMP 2022-11-14T18:09:51Z
+MANIFEST Manifest.files.gz 29600 BLAKE2B 5a126b6416938e71be6b51445958fabe6597f988750f7da80e933402ded2f119f46674e8b3529e35402fce074121689a7c219a52b0f9dd5c3c2a4ed59fe65ad6 SHA512 f22cba70a0e86584cb9b27d913f01de912016b05bbe756300e4d81674a9881b8f272ddf3177d136afe68e00712acad4d64cf0c6e3ecd3a71333fa7ded735b38b
+TIMESTAMP 2022-11-15T00:09:47Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmNyhG9fFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmNy2MtfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDFAg//b8Wx91/rVmKIzxmKq6J5x4/7pnY6kRRSjSz4aOqLZ2450wJnSJPcFqwi
-hWbzvWY82vfMHPMR5KdCYSqX5OuE0mGVzSYG1QDrVWWauDTtGmikviwx87EgoR+f
-I3OzBa/2IZqCXVa8e5JLwIG2E36d2arWexC2P+EwLIKD5ZvB0QS2XLf8LZu3WOtg
-q20+pCdD3xT4ZhQzRTEgq1ksgtzwUcqAPYjpqfeP75R7AM4XBmWtJyi/AmNblGb2
-TpS5lZ+sJB7DPlpSJ3eTB4cG1Gv3N8hmS9EG3wPJrYi0MZ2dFUt/nfxDU36ArIOW
-PyXzX9wDf74Nhe0kumlY72xL1UyXHgB7yqTaRFP3b80Hp1OIYAPo+ZxgEWTRtsPd
-TeVg0CQgMit7gQ+R78JnQVGge1MNEdok5l8z7N8KwsXzgiRwZHPewv0kC/Y3g+IZ
-a7/JujSORsnxQ0CL3S+mWcRWSz+PYvOOff9mE+8yaNkew94KeiDM6angN7UrhlxB
-oAwuyIosfTzfgo69+fM7VX4wu5GMxetoB1FyhuWgha61p1PxNkgES02KQug219s3
-D1F/guy+Dz5kWSDIWXXKOGKzQF1HYTOEsEPGciNYxYY1rB5liwQfzsj8hB9BoeAM
-TqFkxBC9d/eaTRhngvCkCVi4ay2i17TXnWH0/27FIGzmh+Q8HeE=
-=42Tn
+klCwjw//b9KtuT8oCcaAGBGJUNYtvcBZs5Pz68a9XeLBLB7SzglpaAt+qL+HYR4R
+ys5wseVYvqSYcF5LJqNJwoCPtMobMTdQcMjQZvpRP8xYyaGpa7Xclav/bo8oY8lD
+TIABzNBFWj0Y11k8QBQMnZ3sXHgqxM4Chq/bsZhPs+VKu/xR0mh/X2TLSzS4vOjw
+ul10wuHzM5O2G8c0Hfh+VyMR+YTAwVfAJaOKrfUeYJ26aj0TjbC5TNORqy7Hmn2a
+cLHRNiZW255RR5WhfBimBZAWAIrjaOHSm8C2HnQyUGhCzKxsmnyBv8Qq5oCLwDJa
+7W6xUOny+7xCKw+SBkjO52ReJMFjsZNUOwzSgAyBNmmP8iJ4FcSsV+StFjZkRH1z
+y2kqG7c+aU8EbBBOPj+OpAvjPQ4aa6PNaOzIAcQi+5xSjR9nnYoeOD0yvKtMRBc9
+Kr+9TowT/ck6VUsQJnk1e7YevwKVtz7RaeOLQaOiGtbYT5Wwb73929+oUZ1gaaPI
+bw+XHF1CAS0sKv8GFi37FiPlOyl61CL1prgxYSqnX4NS6UX3cPsj70adDXspHcM3
+AJ0CkBv5qPyUKlRdIFlR3HfcxpYpZgkh6FFJwJi83dscWa7FCDJO/6IEGD722Pvn
+HbFL80thFAa/7pScN7utxD/LoZ7BPhTuMRRJ3XPoSCP84IXmpG4=
+=ttFz
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index 9c8c8e69e1be..c9f075919f64 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz
index 3ecc13035a0e..c0e81d6576a3 100644
--- a/app-emacs/Manifest.gz
+++ b/app-emacs/Manifest.gz
diff --git a/app-emacs/nagios-mode/Manifest b/app-emacs/nagios-mode/Manifest
index 1143b5244bf1..7f6bfd6a7365 100644
--- a/app-emacs/nagios-mode/Manifest
+++ b/app-emacs/nagios-mode/Manifest
@@ -1,4 +1,6 @@
 AUX 50nagios-mode-gentoo.el 195 BLAKE2B 9462de25d1de1f9c0d972841339dac53458b6534bfe76b744312b4f0af8063fcdf11fe3d404c49bdf4ede28550d0390b6e3ff1d7068c9bc8f30d4454f117bbc5 SHA512 07e3dfbf4b4142b6b6bbf4138c76b9252f94b9cc1c25f2eaeb9cfddf2294995ffd5fbf40b6bdc032320f94dc93e8463cb270ef841ee11424939dcf5889a54fe1
 DIST nagios-mode-0.3.tar.gz 7917 BLAKE2B 17f69dd9736b5a3f94a69ef2af7827503d2ee87f97346e5ead44563d1e056457bb425f0145b58246dafebbb0fd346857e5fe9aa11a616c8e6608722013a73500 SHA512 e9ff6e0684ee0f9f1919ec9dd4c8e0dfa7faab347f56724f7fe69bc366cf8d81f98c4c4245ddde95bbf9a2b9f72fec80a100c22b6b0b9e3c28c999515d0b6a50
+DIST nagios-mode-0.4.tar.xz 8844 BLAKE2B 212f61a599b29bb2d213328f269adef0fa52dcf09e3424356faf3b7fa6b86adfbcdf7f68dcf17d16532eba8e1ed8e8065c50a860833ea9f05211abb15b2affb7 SHA512 d84bf11fae5722a9af985be39205258da6548b18b9e2a8691fad93ed6b66b8fdce6dd092490a9543e1ca281b1de81b3acc4ce5f3c5b4bbe8fd7589221db18127
 EBUILD nagios-mode-0.3-r1.ebuild 433 BLAKE2B b8888ec327f1c7612598d4e8658991620a52ff32c58027ff1b717e621231f8c276b46b9738d7dbb1553742060a89c6b7e2d36c5ada4e9b0383e83a3b75379f09 SHA512 06712284fe228b6ae6abb034a4e567b91e6bcd6f3384d341ec5cb719b2022e15b7c45053b2799c4f8b9d07e44916cf8a8f860419d5b716b1273358b68827f616
-MISC metadata.xml 283 BLAKE2B 81c49021199f71096079a27f9121390fb8c1285c54b9478583ff2d647277fa106ef12456d7097c4be092fc48b514a1adcf855ca0fac911598232ef9eb7f102c0 SHA512 f32b303760addf5d4db8d18bd10fb677353cdfa4c5e545d47804ef756cf5e5a21f8b8efb631b08f802185913ceb98da820e404e06eb03d01fe9ea85c10d1ac13
+EBUILD nagios-mode-0.4.ebuild 437 BLAKE2B de7d013d39922a2d04b56bab3e0d2f17debfeb167d01c89808866eb0ef34446cc8f1354efd197f3e0c7a4edabaafb0f04d5c3f4fd6413907b8806beb8f6296f2 SHA512 90c5766d0d255f65d2dde856dab97c1cd1fe83a5da1f66314e0368b7f5d234c862e073fa35ae9b345d2e375a1bac0c1aa17d978298024862351ee28a4a24bfb9
+MISC metadata.xml 356 BLAKE2B beeff631ed33a58340567d14f47a61b575cbcf18d0152cf0305fc2a160721c986c2c61a42ce22c70e32b03c3fcb5959992acb424c164af1e572797a8d44acd3b SHA512 2a8a0507f8dfa8b7ff27c4320eccb9361a49d5621de52025ecebcc51de27c9359b7cf5c1a12743ab5f57c42fe08b701ed356611ea195555b3f422824f5d13248
diff --git a/app-emacs/nagios-mode/metadata.xml b/app-emacs/nagios-mode/metadata.xml
index 986088003fe1..53c506041584 100644
--- a/app-emacs/nagios-mode/metadata.xml
+++ b/app-emacs/nagios-mode/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+<maintainer type="person">
+  <email>mjo@gentoo.org</email>
+</maintainer>
 <maintainer type="project">
   <email>gnu-emacs@gentoo.org</email>
   <name>Gentoo GNU Emacs project</name>
diff --git a/app-emacs/nagios-mode/nagios-mode-0.4.ebuild b/app-emacs/nagios-mode/nagios-mode-0.4.ebuild
new file mode 100644
index 000000000000..ee260c178eff
--- /dev/null
+++ b/app-emacs/nagios-mode/nagios-mode-0.4.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit elisp
+
+DESCRIPTION="Major mode for editing Nagios configuration files"
+HOMEPAGE="http://michael.orlitzky.com/code/nagios-mode.xhtml"
+SRC_URI="http://michael.orlitzky.com/code/releases/${P}.tar.xz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+SITEFILE="50${PN}-gentoo.el"
+DOCS="ChangeLog README test_suite.cfg"
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 769e153c447e..d5e7375c902c 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/libdispatch/Manifest b/dev-libs/libdispatch/Manifest
index a6641e89631c..3178c94c79d4 100644
--- a/dev-libs/libdispatch/Manifest
+++ b/dev-libs/libdispatch/Manifest
@@ -1,9 +1,7 @@
 AUX libdispatch-5.3.3-musl.patch 1213 BLAKE2B 76db17275b46160840867ae2956b58f38bafa55539a0396ad910df30747a766f170cf57d7229f12d11dba7bddc37978da501335904a482c0dbc041939db169d6 SHA512 4e8f20a20454c84fcf6ba45e2560053283a4c38955151718bcc96d03f326e2d9c7b5782848acca412166675d3b5daee6369f47ba672023bb047a0c08237b1008
 AUX remove-Werror.patch 1217 BLAKE2B f7ef18089abcd11fb8ed36980e681a804649b8ad8891b97113966c099bb05178604983359b79eb853ad6256a6c116fa8fdca116b29e2d6108c2a38fff01472a1 SHA512 0c17b1b36a02b401182a91e1f751f71b343f1d61ce7340230fdb13e89354316d0f2863fc3ea2f1a33bee6033c79e30e35024519c515a03a4d88467456ef340cc
-DIST libdispatch-5.3.3.tar.gz 591794 BLAKE2B 982b99227a1292d999639e7b16c1382a38dd6799a0ea1b83dd66333d5b6388be809127565fafc7f171dab9d8aa388cf67316d7eb6fa2ae2e1b8ccf660b32f0ab SHA512 b76071e8fac19ef5aed8cb3998b903a17a4f2b9e6b992d22d394212f4d48c4a547fb7a8cf16e4ce2ef17d6b58e253c2d52c6b176c3a874132410215b73332909
-DIST libdispatch-5.5.tar.gz 592054 BLAKE2B 500ae44069063f202b48cfab2df1fb7fc012f1a1048d2460054e34f18629feefd38952d08f9de310d71774120a0516b4f9210147869e2ce34c266bf44e6fa0d7 SHA512 58ad7122d2fac7b117f4e81eec2b5c1dfdf5256865337110d660790744e83c3fea5e82fbe521b6e56fd0e2f09684e5e1475cf2cac67989a8f78dd0a284fb0d21
 DIST libdispatch-5.6.1.tar.gz 592615 BLAKE2B bbd495717456163b0740cd6bcb92d9dfa7a728b88ab6c3ec6c25bcd4bcc3575cb3eb5e93416ddf8293854c17566f4d0ef7ee4280cf15944ddf224e7439b59a5b SHA512 083a8ebdea87cc04f856db1833adcfca83b16568cff311123ccc6a835f73979ac1051f1733feacfa04155fcabc97f561738adf8e871468e808cf8048bea063b1
-EBUILD libdispatch-5.3.3-r1.ebuild 1065 BLAKE2B 34f48796234e44a1c856c7cbba8caded4998e8200ce2799820cb2cde28c72c882d459fad02723c2d77819db8be1e551a6065358811a20091d4a7ce011ea9e100 SHA512 338c0902dcf7fe48bfb8bdb26b695bc78325c737b7425ec31765e74f6ccf8d1d28e4b2a072d09436f3e85876067d0bdd665e6ee2b5cce9ab953e6b656cc8747f
-EBUILD libdispatch-5.5.ebuild 1096 BLAKE2B 9ecf38085edb6ab2a5a5117618892a1106a976cfc8735fe01ce8cba99168ce1aaf6656ec535b9429e988420f9194ed78d7f069ad7043a10d62d1d99de95f267b SHA512 eb842fd1d6908dbead8b360566d05a0b6a7818b7e28055faae20aae8dcfba3a4f835b080304b3f6d00007f7d2e0ce2b810ce528540732a9ccffc0c6f99afbaf7
+DIST libdispatch-5.7.1.tar.gz 594292 BLAKE2B 67112558b591c6c5f658f31ac7f48cea3eb84bffda0959663cac808e80b593f127fb85dc0a666a6ea636bc70649dd9a9c31cbd619fa0e41a803a2766a4740d85 SHA512 7f04c14cfba214d99ffbb1d6d5ae2d0b83a0e3d3597c886093993f55adef53995477d9d88207ad36facc67cd36c46e1380f57fdc847f9a5f079aa41b820ecf4f
 EBUILD libdispatch-5.6.1.ebuild 1093 BLAKE2B 291ae0ce82bf63958f7d3e694263e86bf33eb5c45c78b7715e510d4bd466d00fac02fa51df135a15a4ea7ae5ec773471434b969bfea93732be8e1515484de4c4 SHA512 e49c97a3b833527dd5207d19967a8d904b59a7025fd5bf335e76725d85a1fd27ad7ff642c4757877768d117ea7eb6c4b6986cbfcd788e4ec38c04c36b9a308d2
+EBUILD libdispatch-5.7.1.ebuild 1096 BLAKE2B 9ecf38085edb6ab2a5a5117618892a1106a976cfc8735fe01ce8cba99168ce1aaf6656ec535b9429e988420f9194ed78d7f069ad7043a10d62d1d99de95f267b SHA512 eb842fd1d6908dbead8b360566d05a0b6a7818b7e28055faae20aae8dcfba3a4f835b080304b3f6d00007f7d2e0ce2b810ce528540732a9ccffc0c6f99afbaf7
 MISC metadata.xml 350 BLAKE2B 179ce6945eeec3c78414fb6dd66822f26ac6b629528da5868b44d3715355ec80acb1cc5dd8357b659f31877c83bfc10ae8b236367904bbbdd36d2ec7c1458739 SHA512 64646993f5469b2573385aa94fa578ae0e7645f4c5a30b631cf1d0de9ac5ef88270ba85e95f684b884631ec21d7ef31c4d68b563923901651da2ec631b0ccff5
diff --git a/dev-libs/libdispatch/libdispatch-5.3.3-r1.ebuild b/dev-libs/libdispatch/libdispatch-5.3.3-r1.ebuild
deleted file mode 100644
index ac43a88ac6fc..000000000000
--- a/dev-libs/libdispatch/libdispatch-5.3.3-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic cmake toolchain-funcs
-
-MY_PN="swift-corelibs-${PN}"
-MY_PV="swift-${PV}-RELEASE"
-
-DESCRIPTION="A library for concurrent code execution on multicore hardware"
-HOMEPAGE="https://github.com/apple/swift-corelibs-libdispatch"
-SRC_URI="https://github.com/apple/${MY_PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc64 ~riscv x86"
-
-DEPEND="!gnustep-base/libobjc2"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	sys-devel/clang
-	sys-devel/llvm
-	virtual/pkgconfig
-"
-
-S="${WORKDIR}/${MY_PN}-${MY_PV}"
-
-PATCHES=(
-	"${FILESDIR}/remove-Werror.patch"
-	"${FILESDIR}/libdispatch-5.3.3-musl.patch"
-)
-
-src_configure () {
-	if ! tc-is-clang ; then
-		AR=llvm-ar
-		CC=${CHOST}-clang
-		CXX=${CHOST}-clang++
-		NM=llvm-nm
-		RANLIB=llvm-ranlib
-
-		strip-unsupported-flags
-	fi
-
-	export HOST_CC="$(tc-getBUILD_CC)"
-	export HOST_CXX="$(tc-getBUILD_CXX)"
-	tc-export CC CXX LD AR NM OBJDUMP RANLIB PKG_CONFIG
-
-	cmake_src_configure
-}
diff --git a/dev-libs/libdispatch/libdispatch-5.5.ebuild b/dev-libs/libdispatch/libdispatch-5.7.1.ebuild
index af88a1aec21c..af88a1aec21c 100644
--- a/dev-libs/libdispatch/libdispatch-5.5.ebuild
+++ b/dev-libs/libdispatch/libdispatch-5.7.1.ebuild
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 0e76232ca36b..2fb182dccf1d 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/logfury/Manifest b/dev-python/logfury/Manifest
index 483209814521..9b461f500245 100644
--- a/dev-python/logfury/Manifest
+++ b/dev-python/logfury/Manifest
@@ -1,3 +1,4 @@
 DIST logfury-1.0.1.gh.tar.gz 10083 BLAKE2B 81c896a0e13f22802207f5cbe53a9e1c5dac5ff3c1608471809aa11540eac8061a6f89f5af7973a310a5bd9cf96603c873e641e0ae835bdcb87566bf92f7fadb SHA512 dd00d9bddb3aa69f52b892b8025a2d226d5cd0dcad81bcd5abd701284d7cd09717576e9782deb0c209a31ee1c337394c40e76e960b5b8ade38a1c6e601374f86
+EBUILD logfury-1.0.1-r1.ebuild 770 BLAKE2B d721c16456b8c406452aa0b822f40396af82ff4ebe62f25aba025d190644627b006e318a290dc8c41769ed35702fef6eafe63103b8a733db36e1a4c30b74b52f SHA512 ed474a3251f9e5fe86c2e2fdfdf31d0071fcdbcaac482d7ddab7d1efd4e36044a63704a3650333cd0bf7266e9eadd2ef8ff6ac5dff4746f1d71e1929843b7cec
 EBUILD logfury-1.0.1.ebuild 738 BLAKE2B 688aeb1f098ebd0c15fa8adf673852b6ca1a2521163b4b1b0c7ffc11f2c9592fe923884286add884d6376e0b7f873194f99f0acfd66b23ddd8aa857ab4781049 SHA512 42d5b48470977aec0f3b13113ea0174b434fb096559fb44983ca971904f77ca1e1f10bc16a10b0d44284ee4446d387d21aa9ce60ce4f145e24788ce0bfbeacf6
 MISC metadata.xml 690 BLAKE2B d0b4e225d0efb5c391615999ff55e0c09a01179231e3ac3e6548f484271aee6b117a1e2c3055dd0659eed0042bdd91b61692147e09dedc5c45c39dca5fe83ef1 SHA512 98e1bc56f8d97fceed0d922c8355cf2763fecb75706fcc7cb19a3646f1feff4a077ddc637b211cb76c8af976b6fab97e507a1b822b3b3d8a945dbbc91012f981
diff --git a/dev-python/logfury/logfury-1.0.1-r1.ebuild b/dev-python/logfury/logfury-1.0.1-r1.ebuild
new file mode 100644
index 000000000000..dafcd44dd8b0
--- /dev/null
+++ b/dev-python/logfury/logfury-1.0.1-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+inherit distutils-r1
+
+DESCRIPTION="Boilerplate library for logging method calls"
+HOMEPAGE="
+	https://github.com/reef-technologies/logfury
+	https://pypi.org/project/logfury/"
+SRC_URI="
+	https://github.com/reef-technologies/${PN}/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="
+	test? (
+		dev-python/testfixtures[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# remove pin for old Pythons (sic!)
+	sed -i -e '/setuptools_scm/d' setup.py || die
+	distutils-r1_src_prepare
+	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+}
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 2bfa95ef0c86..438978b24fa4 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/deadbeef/Manifest b/media-sound/deadbeef/Manifest
index f862075a6ca6..6ea2bb9d4b3b 100644
--- a/media-sound/deadbeef/Manifest
+++ b/media-sound/deadbeef/Manifest
@@ -4,11 +4,9 @@ AUX deadbeef-1.9.2-drop-Werror.patch 4955 BLAKE2B 0435971de41528e20909623ff485a2
 AUX deadbeef-musl.patch 829 BLAKE2B 91294830e50ff996438563ab2b4ac4bd943d3f2c072ff5982ff810671389994b57d27d73dd61ca76ca4563974fc91254403cc946d95643941f23a808fa2f5c90 SHA512 5a7be29335f9b8a6a85dc233856346a216b1c7a0ade17f483d8c1144099e7b0ebb5a5ba531f96fa4fe6737f0971ff2bf1772edaf3739e81c54bebbdea11e6eeb
 AUX deadbeef-use-ffmpeg-plugin-for-ape-by-default.patch 492 BLAKE2B d6ed36829d7ed139c43b6aa65c940f07e3f023d0554c258a2557c528d75e85c7dd2ca57eecef56088383a3b7b0b4f12109eb899f2847b86953421e826777c954 SHA512 0cec1ae38cf48b3f2ea53f74a6348d0217b1b3f017b836489d5b520f09ad76b6526cd3add48ed23871bc86feb7f7ed697cf6a62164a202be1ecabfd947e895f6
 DIST deadbeef-1.8.8.tar.bz2 5083407 BLAKE2B 69fd2cbaf131b3e44b426163ce6a83479bb1aff0e088c4beea09d747750f6f20b1e297eab1dd1ae0446d2af0aaf28fe0cc7c9f9e3e73fe031d369ba2f5d809ca SHA512 399f0e70eca5e102a9e73ff03199c89c6f28f3e0da96e793316d1af83f00e71f09f6cc81a3fd0b0f0d52fe9e0195a3b9ffb0cf7e7708c3ea7085f33a5ec08b47
-DIST deadbeef-1.9.1.tar.bz2 5136384 BLAKE2B 6e8314728b824b182ecb356d9a9cb09364650f6ca6b5e5d2f7077fc048fe62284e4959910a4cf982fd79893c503044d02417633713d0dcf34e93128aff22692e SHA512 2f959fb139078bbde3c1183019545ed3979b3c5dfc051794ea7a5ccf166156acc8d5dface3169ec705059f487d47c9b314c5400770a7572c22fbd0b903eefc5a
 DIST deadbeef-1.9.2.tar.bz2 5105029 BLAKE2B fbf63f9df22fecacb2fadfe722856aeaa756bb75796a381822de4c033509f88680bb4ca458f4a270608396b3125911f974c283769da184401c4a152da49e2c27 SHA512 fa4298fb3a89b3891c2f0403b2c66e20f64206101ad44f53be5208a69b33d3de3e0ced329cf090c17a1a3c4f7b28920baf5f8c964df2b6bdea6095465d0a02d9
+DIST deadbeef-1.9.3.tar.bz2 5138392 BLAKE2B 3368c38246aae0ac125326b87c2f18523274564ad273c977620bc6e7af3ca50f111a03c3057ff62c068d8cc1942fb1f8b28639043bf9032e08f7ceb1dbb4b03a SHA512 54ef09b723df062bf35d435c959792247121ce0b0f0eebc568347ef8725bf3cdd7eee7b9c69f6443b0a2731354d96c33e18a9a9e7d4068d4de7733d1f77d4376
 EBUILD deadbeef-1.8.8-r3.ebuild 4014 BLAKE2B ea7c4dff97eddc3c2f0b4ad6449b3dc7cb5c0f7f9fd8cc3a03fab84bfe9838a90e104ac128156be569e3b6320c0b19743f67665d42946b59ee8822812dde6455 SHA512 88e4ff5728e22f9e3ddf9dc3789b56c146a65f99963ab09dd09b2c9fb5bc30c62d54eaa4c605fc2a01348d6b6289cb706c21186d18dd758e5e1a1cbfed10794b
-EBUILD deadbeef-1.8.8-r4.ebuild 4043 BLAKE2B 5008997377e53d221c24586054f9c541c3d36f6200b2e78d532d55704114a1d3d369144456fab685b5e5543510d7125a2db5e5fa9b55e6050ef78479ffa1a83a SHA512 c79472edef844bf8d6e8117f136ba660ec106994583c1652ee0e8936bcd993ab7d84bc36a22e515a3a77d865a667c6a254f4bc7a8e73dba374dcde437a76a41e
-EBUILD deadbeef-1.9.1-r2.ebuild 4015 BLAKE2B a0a3bb5266ce7e8d691f6a888be0e466b31fa9bbd4ce4fab77800ebd7d2c07f1fa8bb57d15e6542777d98f1dfd9ef1447774df471360fb5104ded398bd078aae SHA512 18f2ed71b40dc9c29273901b793628cccf0f8d2e54d7bc29b376d3702079d961020548d208347058cf9654e0f0d6c9ae7a547cef7f0f2194210ed5808a81bfe3
-EBUILD deadbeef-1.9.1-r3.ebuild 4071 BLAKE2B 0d33c9e8db1898d3a957dce8bbd0e8b67255f308b413cd223d07d07e702a760558414f47a19d4906a8f9136ee7feb9c537f654c5df992d29663c076b104696ff SHA512 a32d0846460d4b6ea3e5f028a3c494ebcba7ffffc91935997c9440dc539b99be574816dbc87a7719aa9583864b5ad927757770990c997d545203813ca54ca6e2
 EBUILD deadbeef-1.9.2-r1.ebuild 4191 BLAKE2B 42d24a0ceaf9867a1a7e8ba38fc500eb531ba0b865850bc4853d8fe317d337c3d6d28e9c601e0d82e73740a0643124d340c04dd27f95f7717bb00661067b1d27 SHA512 fffd91bdb425acd9ac55107f5f69f74947065332a89751154295c2d66b1b3cc4443cb0c8678242b731fd848d7e8f85ab3df3ce04a09fcb5b0d9b9adf103d2c66
+EBUILD deadbeef-1.9.3.ebuild 4010 BLAKE2B 4cd96425d689d4765b8be9771ff7261fb0d6ccc9f607de6cf0dad8e5e767be6bae6241f8205007c3deb42a11ac78e6567394dfc2c9c13391e5d9ead9b4158a46 SHA512 4578f312832a8309272b2e1d98793dd6b4db2f50cdcde13cba1f10c2ff52b2d4999f86a801f5b986a2f7834ebd3ba2c4a58fc4b396f06fda65be269a31a34720
 MISC metadata.xml 969 BLAKE2B 0f8c160dd8cf50b9d8ed80efe90575527ec0a732f1c0e3dc5c3bf8ad77cea61a81af60de3b49cb38e7fe89128db136a0e61537fdcb93a89745bd0e11b69e3e71 SHA512 4ab2ea957796b6cf15129365f10d876b794bab521861e23f0f166f413c723b34f8cac17799cfc18529498a462d7bac7f633ec33093627c4167c3f4471d43da3a
diff --git a/media-sound/deadbeef/deadbeef-1.8.8-r4.ebuild b/media-sound/deadbeef/deadbeef-1.8.8-r4.ebuild
deleted file mode 100644
index 3238d975fa3a..000000000000
--- a/media-sound/deadbeef/deadbeef-1.8.8-r4.ebuild
+++ /dev/null
@@ -1,191 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools xdg flag-o-matic toolchain-funcs plocale
-
-DESCRIPTION="DeaDBeeF is a modular audio player similar to foobar2000"
-HOMEPAGE="https://deadbeef.sourceforge.io/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="
-	GPL-2
-	LGPL-2.1
-	wavpack? ( BSD )
-"
-SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
-IUSE="aac alsa cdda converter cover dts ffmpeg flac +hotkeys lastfm mp3 musepack nls notify nullout opus oss pulseaudio sc68 shellexec +supereq threads vorbis wavpack"
-
-REQUIRED_USE="
-	|| ( alsa oss pulseaudio nullout )
-"
-
-DEPEND="
-	x11-libs/gtk+:3
-	net-misc/curl:=
-	dev-libs/jansson:=
-	aac? ( media-libs/faad2 )
-	alsa? ( media-libs/alsa-lib )
-	cdda? (
-		dev-libs/libcdio:=
-		media-libs/libcddb
-		dev-libs/libcdio-paranoia:=
-	)
-	cover? ( media-libs/imlib2[jpeg,png] )
-	dts? ( media-libs/libdca )
-	ffmpeg? ( media-video/ffmpeg:= )
-	flac? (
-		media-libs/flac:=
-		media-libs/libogg
-	)
-	mp3? ( media-sound/mpg123 )
-	musepack? ( media-sound/musepack-tools )
-	nls? ( virtual/libintl )
-	notify? (
-		sys-apps/dbus
-		dev-libs/libdispatch
-	)
-	opus? ( media-libs/opusfile )
-	pulseaudio? ( media-sound/pulseaudio )
-	vorbis? ( media-libs/libvorbis )
-	wavpack? ( media-sound/wavpack )
-	lastfm? ( dev-libs/libdispatch )
-"
-
-RDEPEND="${DEPEND}"
-BDEPEND="
-	dev-util/intltool
-	sys-devel/gettext
-	sys-devel/clang
-	sys-devel/llvm
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}/deadbeef-use-ffmpeg-plugin-for-ape-by-default.patch"
-)
-
-src_prepare() {
-	default
-
-	drop_from_linguas() {
-		sed "/${1}/d" -i "${S}/po/LINGUAS" || die
-	}
-
-	drop_and_stub() {
-		rm -rf "${1}"
-		mkdir "${1}"
-		cat > "${1}/Makefile.in" <<-EOF
-			all: nothing
-			install: nothing
-			nothing:
-		EOF
-	}
-
-	plocale_for_each_disabled_locale drop_from_linguas || die
-
-	eautopoint --force
-	eautoreconf
-
-	# Get rid of bundled gettext.
-	drop_and_stub "${S}/intl"
-
-	# Plugins that are undesired for whatever reason, candidates for unbundling and such.
-	for i in adplug alac dumb ffap mms gme mono2stereo psf shn sid soundtouch wma; do
-		drop_and_stub "${S}/plugins/${i}"
-	done
-
-	rm -rf "${S}/plugins/rg_scanner/ebur128"
-}
-
-src_configure () {
-	if ! tc-is-clang; then
-		AR=llvm-ar
-		CC=${CHOST}-clang
-		CXX=${CHOST}-clang++
-		NM=llvm-nm
-		RANLIB=llvm-ranlib
-
-		strip-unsupported-flags
-	fi
-
-	export HOST_CC="$(tc-getBUILD_CC)"
-	export HOST_CXX="$(tc-getBUILD_CXX)"
-	tc-export CC CXX LD AR NM OBJDUMP RANLIB PKG_CONFIG
-
-	local myconf=(
-		"--disable-static"
-		"--disable-staticlink"
-		"--disable-portable"
-		"--disable-rpath"
-
-		"--disable-libmad"
-		"--disable-gtk2"
-		"--disable-adplug"
-		"--disable-coreaudio"
-		"--disable-dumb"
-		"--disable-alac"
-		"--disable-ffap"
-		"--disable-gme"
-		"--disable-mms"
-		"--disable-mono2stereo"
-		"--disable-psf"
-		"--disable-rgscanner"
-		"--disable-shn"
-		"--disable-sid"
-		"--disable-sndfile"
-		"--disable-soundtouch"
-		"--disable-src"
-		"--disable-tta"
-		"--disable-vfs-zip"
-		"--disable-vtx"
-		"--disable-wildmidi"
-		"--disable-wma"
-
-		"$(use_enable alsa)"
-		"$(use_enable oss)"
-		"$(use_enable pulseaudio pulse)"
-		"$(use_enable mp3)"
-		"$(use_enable mp3 libmpg123)"
-		"$(use_enable nls)"
-		"$(use_enable vorbis)"
-		"$(use_enable threads)"
-		"$(use_enable flac)"
-		"$(use_enable supereq)"
-		"$(use_enable cdda)"
-		"$(use_enable cdda cdda-paranoia)"
-		"$(use_enable aac)"
-		"$(use_enable cover artwork)"
-		"$(use_enable cover artwork-imlib2)"
-		"$(use_enable cover artwork-network)"
-		"$(use_enable dts dca)"
-		"$(use_enable ffmpeg)"
-		"$(use_enable converter)"
-		"$(use_enable musepack)"
-		"$(use_enable notify)"
-		"$(use_enable nullout)"
-		"$(use_enable opus)"
-		"$(use_enable pulseaudio pulse)"
-		"$(use_enable sc68)"
-		"$(use_enable shellexec)"
-		"$(use_enable shellexec shellexecui)"
-		"$(use_enable lastfm lfm)"
-		"$(use_enable wavpack)"
-
-		"--enable-gtk3"
-		"--enable-vfs-curl"
-		"--enable-shared"
-		"--enable-m3u"
-		"--enable-pltbrowser"
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/media-sound/deadbeef/deadbeef-1.9.1-r2.ebuild b/media-sound/deadbeef/deadbeef-1.9.1-r2.ebuild
deleted file mode 100644
index e555833d4e50..000000000000
--- a/media-sound/deadbeef/deadbeef-1.9.1-r2.ebuild
+++ /dev/null
@@ -1,192 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools xdg flag-o-matic toolchain-funcs plocale
-
-DESCRIPTION="DeaDBeeF is a modular audio player similar to foobar2000"
-HOMEPAGE="https://deadbeef.sourceforge.io/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="
-	GPL-2
-	LGPL-2.1
-	wavpack? ( BSD )
-"
-SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
-IUSE="aac alsa cdda converter cover dts ffmpeg flac +hotkeys lastfm mp3 musepack nls notify +nullout opus oss pulseaudio sc68 shellexec +supereq threads vorbis wavpack"
-
-REQUIRED_USE="
-	|| ( alsa oss pulseaudio nullout )
-"
-
-DEPEND="
-	x11-libs/gtk+:3
-	net-misc/curl:=
-	dev-libs/jansson:=
-	aac? ( media-libs/faad2 )
-	alsa? ( media-libs/alsa-lib )
-	cdda? (
-		dev-libs/libcdio:=
-		media-libs/libcddb
-		dev-libs/libcdio-paranoia:=
-	)
-	cover? (
-		media-libs/imlib2[jpeg,png]
-	)
-	dts? ( media-libs/libdca )
-	ffmpeg? ( media-video/ffmpeg )
-	flac? (
-		media-libs/flac:=
-		media-libs/libogg
-	)
-	mp3? ( media-sound/mpg123 )
-	musepack? ( media-sound/musepack-tools )
-	nls? ( virtual/libintl )
-	notify? (
-		sys-apps/dbus
-	)
-	opus? ( media-libs/opusfile )
-	pulseaudio? ( media-sound/pulseaudio )
-	vorbis? ( media-libs/libvorbis )
-	wavpack? ( media-sound/wavpack )
-	dev-libs/libdispatch
-"
-
-RDEPEND="${DEPEND}"
-BDEPEND="
-	dev-util/intltool
-	sys-devel/gettext
-	sys-devel/clang
-	sys-devel/llvm
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}/deadbeef-use-ffmpeg-plugin-for-ape-by-default.patch"
-	"${FILESDIR}/deadbeef-musl.patch" # 870187
-)
-
-src_prepare() {
-	default
-
-	drop_from_linguas() {
-		sed "/${1}/d" -i "${S}/po/LINGUAS" || die
-	}
-
-	drop_and_stub() {
-		rm -rf "${1}"
-		mkdir "${1}"
-		cat > "${1}/Makefile.in" <<-EOF
-			all: nothing
-			install: nothing
-			nothing:
-		EOF
-	}
-
-	plocale_for_each_disabled_locale drop_from_linguas || die
-
-	eautopoint --force
-	eautoreconf
-
-	# Get rid of bundled gettext.
-	drop_and_stub "${S}/intl"
-
-	# Plugins that are undesired for whatever reason, candidates for unbundling and such.
-	for i in adplug alac dumb ffap mms gme mono2stereo psf shn sid soundtouch wma; do
-		drop_and_stub "${S}/plugins/${i}"
-	done
-
-	rm -rf "${S}/plugins/rg_scanner/ebur128"
-}
-
-src_configure () {
-	if ! tc-is-clang; then
-		AR=llvm-ar
-		CC=${CHOST}-clang
-		CXX=${CHOST}-clang++
-		NM=llvm-nm
-		RANLIB=llvm-ranlib
-
-		strip-unsupported-flags
-	fi
-
-	export HOST_CC="$(tc-getBUILD_CC)"
-	export HOST_CXX="$(tc-getBUILD_CXX)"
-	tc-export CC CXX LD AR NM OBJDUMP RANLIB PKG_CONFIG
-
-	local myconf=(
-		"--disable-static"
-		"--disable-staticlink"
-		"--disable-portable"
-		"--disable-rpath"
-
-		"--disable-libmad"
-		"--disable-gtk2"
-		"--disable-adplug"
-		"--disable-coreaudio"
-		"--disable-dumb"
-		"--disable-alac"
-		"--disable-ffap"
-		"--disable-gme"
-		"--disable-mms"
-		"--disable-mono2stereo"
-		"--disable-psf"
-		"--disable-rgscanner"
-		"--disable-shn"
-		"--disable-sid"
-		"--disable-sndfile"
-		"--disable-soundtouch"
-		"--disable-src"
-		"--disable-tta"
-		"--disable-vfs-zip"
-		"--disable-vtx"
-		"--disable-wildmidi"
-		"--disable-wma"
-
-		"$(use_enable alsa)"
-		"$(use_enable oss)"
-		"$(use_enable pulseaudio pulse)"
-		"$(use_enable mp3)"
-		"$(use_enable mp3 libmpg123)"
-		"$(use_enable nls)"
-		"$(use_enable vorbis)"
-		"$(use_enable threads)"
-		"$(use_enable flac)"
-		"$(use_enable supereq)"
-		"$(use_enable cdda)"
-		"$(use_enable cdda cdda-paranoia)"
-		"$(use_enable aac)"
-		"$(use_enable cover artwork)"
-		"$(use_enable cover artwork-network)"
-		"$(use_enable dts dca)"
-		"$(use_enable ffmpeg)"
-		"$(use_enable converter)"
-		"$(use_enable musepack)"
-		"$(use_enable notify)"
-		"$(use_enable nullout)"
-		"$(use_enable opus)"
-		"$(use_enable pulseaudio pulse)"
-		"$(use_enable sc68)"
-		"$(use_enable shellexec)"
-		"$(use_enable shellexec shellexecui)"
-		"$(use_enable lastfm lfm)"
-		"$(use_enable wavpack)"
-
-		"--enable-gtk3"
-		"--enable-vfs-curl"
-		"--enable-shared"
-		"--enable-m3u"
-		"--enable-pltbrowser"
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/media-sound/deadbeef/deadbeef-1.9.1-r3.ebuild b/media-sound/deadbeef/deadbeef-1.9.3.ebuild
index a4a08e5811cc..504808ef7c02 100644
--- a/media-sound/deadbeef/deadbeef-1.9.1-r3.ebuild
+++ b/media-sound/deadbeef/deadbeef-1.9.3.ebuild
@@ -53,7 +53,7 @@ DEPEND="
 	pulseaudio? ( media-sound/pulseaudio )
 	vorbis? ( media-libs/libvorbis )
 	wavpack? ( media-sound/wavpack )
-	dev-libs/libdispatch
+	dev-libs/libdispatch:=
 "
 
 RDEPEND="${DEPEND}"
@@ -66,8 +66,7 @@ BDEPEND="
 "
 
 PATCHES=(
-	"${FILESDIR}/deadbeef-use-ffmpeg-plugin-for-ape-by-default.patch"
-	"${FILESDIR}/deadbeef-musl.patch" # 870187
+	"${FILESDIR}/deadbeef-1.9.2-drop-Werror.patch"
 )
 
 src_prepare() {
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 875f454ca189..625f28eab084 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index d67e00912eb7..9cb60ba78458 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Mon, 14 Nov 2022 18:09:45 +0000
+Tue, 15 Nov 2022 00:09:43 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index e4842507fe3e..43d8440f4ad3 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 536244 BLAKE2B 47908e9e54099299278f14e5112b789aac78178d7406b6880e3986163e8e2aeec411757dbe131202da7291c508ea72a7d158f7fe08facf6e36a23a28a992a7d8 SHA512 ef16d73b0d889ec01efae4d55e398ba1b384a7b46066c129d82b336f46e8804d0dd1765c65c49d93842dc829696efc67759ac790655f316a70359fb8847d9e4e
-TIMESTAMP 2022-11-14T18:09:49Z
+TIMESTAMP 2022-11-15T00:09:46Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmNyhG5fFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmNy2MpfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klArYBAAtfd4L/merPVNbND0/keeGAHJKwgyB28JuGmyOcWQ990cF3L2OJ1LkLDF
-7AwMfeRa3oVVIw0bfg1iWHGnQWlwJ18sFjTHmP4ubDehgDiKf6UwGrIcybHE36vq
-9YZR4ovhb1VDWKGPhk9uQnxiCVuIXpGkfbVJuT2wF5l/MeZg06FYNz5vPNiFlP12
-3BX2YA3cjYuYZlL1/3VXhZsJ3uvl+FWEC8FH5eZo6CRgMnqrEMTlqczEoB8jXK3x
-ivs7VC5h7hiOvAK/6ZWNeIzbSux9AKNIL+eG3Z8JNU3w2lMxEgq+csYIntkCth6z
-lGVJjilAsTkBAKi8Bx4rfilyauK0N9Wm41bBackKnZH4fIYABwZ6g70H2ZqmJKd9
-UR24KQwnzXqSNBiLin+jCuzugxFfbaOhd6lYqt1YShqiHImrY7O9Z4AdibAsAENN
-0FFwxRu+i6ZBm1Mfy03B9RU9kGt8LLNdfxcoxA2HEowvIGkFRO3VGJ8XOid/ScT4
-LUYwPIiJmwJsYuOV+2RJuzd4USP9KQQMIoC0FaWf+J0ejyVKGxGUaWFY1zDv31JW
-tWgfl31NFQv3j8q6jjPdFazWODdWTisHsWvgYVmP65cPXIdapRA1IVTOShVWPcg4
-4TjSoMOOUQoKlREGEKlPpPy7TAe7+BPTsxENE4QwlKXFd5dV8+w=
-=zL/6
+klBuTg/6AwLXqFi8X9bJBr5H1H5Lu77A1tNhGCxjVjN34duwinhcdsqAHT//pX1m
+WmTDlHBzaFL1XZoIh8no4a+GRg1i5zXDhwjj+TwMomXG/RWnRLtfM1hyub5lrAUK
+Qga2fXOaGEoobZ3TsG8U7pr2gHfWURBy7R3f6Dmzm6yRrFxY4NX/cISjUAIu1/bQ
+xMV9rX69bczX89rp41Kwq12CykBXA/jbwc+L6R342mvOF6s0ZpalrIcTYbF4qcPk
+GVfw5hb6lfYoir7m3syjs5xYYCG8STFXcyipReVUSiyRGhKZqIyGV4AGGz3faKoD
+6ncebR0edTQ6Eo9ES+QVkLKJGTJyQR4CPKcssIKE6piB99ORSTZBdvFC1b02vpHd
+ooaYsr04mydaGH61Ctgdlqx/L6J1pr9hcfF/jk5EeruZTgCnWOtFr+Man8Aa12OK
+S9j/Hx9/GrFHZ2TCU7iwI8qp508Y+iXdMDxN0xHpV/ntYEJk3Ouaf8c43SW4AKg2
+vIjQ/+/abvKah5a8rGiE0xJq7sqFWmIgpG6XF27Fedjbowi/Cra9zft99+bDklda
+iX4q2/7jPNvPVMRBFx2Xn9l+bkAniW83B0gq/j6GrFQCV3mf05kYAB3y6n+LBJIX
+7BT+G6o7q4ssFcV4bC+XwQKeDjJ9/pQUb7UGzNJckRQIrA3/kfc=
+=MBlF
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index d67e00912eb7..ba4ad7bd19fb 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Mon, 14 Nov 2022 18:09:45 +0000
+Tue, 15 Nov 2022 00:09:44 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index ae61171ae273..be6dd5ac7f95 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
diff --git a/metadata/md5-cache/app-emacs/Manifest.gz b/metadata/md5-cache/app-emacs/Manifest.gz
index 7bd60a3d8286..02121fc3b5fc 100644
--- a/metadata/md5-cache/app-emacs/Manifest.gz
+++ b/metadata/md5-cache/app-emacs/Manifest.gz
diff --git a/metadata/md5-cache/app-emacs/nagios-mode-0.4 b/metadata/md5-cache/app-emacs/nagios-mode-0.4
new file mode 100644
index 000000000000..bf44da8b3dc2
--- /dev/null
+++ b/metadata/md5-cache/app-emacs/nagios-mode-0.4
@@ -0,0 +1,13 @@
+BDEPEND=>=app-editors/emacs-23.1:*
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DESCRIPTION=Major mode for editing Nagios configuration files
+EAPI=8
+HOMEPAGE=http://michael.orlitzky.com/code/nagios-mode.xhtml
+INHERIT=elisp
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+RDEPEND=>=app-editors/emacs-23.1:*
+SLOT=0
+SRC_URI=http://michael.orlitzky.com/code/releases/nagios-mode-0.4.tar.xz
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_md5_=29ffd456c054c0e3167960a95468133c
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index 48d21411de39..4f70b5990b45 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/libdispatch-5.3.3-r1 b/metadata/md5-cache/dev-libs/libdispatch-5.3.3-r1
deleted file mode 100644
index f31adb3df321..000000000000
--- a/metadata/md5-cache/dev-libs/libdispatch-5.3.3-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=sys-devel/clang sys-devel/llvm virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=!gnustep-base/libobjc2
-DESCRIPTION=A library for concurrent code execution on multicore hardware
-EAPI=7
-HOMEPAGE=https://github.com/apple/swift-corelibs-libdispatch
-INHERIT=flag-o-matic cmake toolchain-funcs
-KEYWORDS=amd64 ~arm64 ppc64 ~riscv x86
-LICENSE=Apache-2.0
-RDEPEND=!gnustep-base/libobjc2
-SLOT=0
-SRC_URI=https://github.com/apple/swift-corelibs-libdispatch/archive/swift-5.3.3-RELEASE.tar.gz -> libdispatch-5.3.3.tar.gz
-_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=4fabf47abebbf1920ffee9deb5199b4f
diff --git a/metadata/md5-cache/dev-libs/libdispatch-5.5 b/metadata/md5-cache/dev-libs/libdispatch-5.7.1
index edf62267ea18..7fc30da5ca44 100644
--- a/metadata/md5-cache/dev-libs/libdispatch-5.5
+++ b/metadata/md5-cache/dev-libs/libdispatch-5.7.1
@@ -9,6 +9,6 @@ KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=Apache-2.0
 RDEPEND=!gnustep-base/libobjc2 !sys-libs/blocksruntime
 SLOT=0
-SRC_URI=https://github.com/apple/swift-corelibs-libdispatch/archive/swift-5.5-RELEASE.tar.gz -> libdispatch-5.5.tar.gz
+SRC_URI=https://github.com/apple/swift-corelibs-libdispatch/archive/swift-5.7.1-RELEASE.tar.gz -> libdispatch-5.7.1.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=bb5558ede7fac470b4892209e2e47cb2
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index 1873fd10ea1b..6c8b12a8455b 100644
--- a/metadata/md5-cache/dev-python/Manifest.gz
+++ b/metadata/md5-cache/dev-python/Manifest.gz
diff --git a/metadata/md5-cache/dev-python/logfury-1.0.1-r1 b/metadata/md5-cache/dev-python/logfury-1.0.1-r1
new file mode 100644
index 000000000000..0cf9a2c1af1e
--- /dev/null
+++ b/metadata/md5-cache/dev-python/logfury-1.0.1-r1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/testfixtures[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) 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 ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Boilerplate library for logging method calls
+EAPI=8
+HOMEPAGE=https://github.com/reef-technologies/logfury https://pypi.org/project/logfury/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=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 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/reef-technologies/logfury/archive/v1.0.1.tar.gz -> logfury-1.0.1.gh.tar.gz
+_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=79ea4ed4e33171902156e7c08627a5c8
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index b0c032d0be89..46e8967225be 100644
--- a/metadata/md5-cache/media-sound/Manifest.gz
+++ b/metadata/md5-cache/media-sound/Manifest.gz
diff --git a/metadata/md5-cache/media-sound/deadbeef-1.8.8-r4 b/metadata/md5-cache/media-sound/deadbeef-1.8.8-r4
deleted file mode 100644
index 7d9b9eab9a8f..000000000000
--- a/metadata/md5-cache/media-sound/deadbeef-1.8.8-r4
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/intltool sys-devel/gettext sys-devel/clang sys-devel/llvm 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=x11-libs/gtk+:3 net-misc/curl:= dev-libs/jansson:= aac? ( media-libs/faad2 ) alsa? ( media-libs/alsa-lib ) cdda? ( dev-libs/libcdio:= media-libs/libcddb dev-libs/libcdio-paranoia:= ) cover? ( media-libs/imlib2[jpeg,png] ) dts? ( media-libs/libdca ) ffmpeg? ( media-video/ffmpeg:= ) flac? ( media-libs/flac:= media-libs/libogg ) mp3? ( media-sound/mpg123 ) musepack? ( media-sound/musepack-tools ) nls? ( virtual/libintl ) notify? ( sys-apps/dbus dev-libs/libdispatch ) opus? ( media-libs/opusfile ) pulseaudio? ( media-sound/pulseaudio ) vorbis? ( media-libs/libvorbis ) wavpack? ( media-sound/wavpack ) lastfm? ( dev-libs/libdispatch ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=DeaDBeeF is a modular audio player similar to foobar2000
-EAPI=7
-HOMEPAGE=https://deadbeef.sourceforge.io/
-INHERIT=autotools xdg flag-o-matic toolchain-funcs plocale
-IUSE=aac alsa cdda converter cover dts ffmpeg flac +hotkeys lastfm mp3 musepack nls notify nullout opus oss pulseaudio sc68 shellexec +supereq threads vorbis wavpack
-KEYWORDS=~amd64 ~riscv ~x86
-LICENSE=GPL-2 LGPL-2.1 wavpack? ( BSD )
-RDEPEND=x11-libs/gtk+:3 net-misc/curl:= dev-libs/jansson:= aac? ( media-libs/faad2 ) alsa? ( media-libs/alsa-lib ) cdda? ( dev-libs/libcdio:= media-libs/libcddb dev-libs/libcdio-paranoia:= ) cover? ( media-libs/imlib2[jpeg,png] ) dts? ( media-libs/libdca ) ffmpeg? ( media-video/ffmpeg:= ) flac? ( media-libs/flac:= media-libs/libogg ) mp3? ( media-sound/mpg123 ) musepack? ( media-sound/musepack-tools ) nls? ( virtual/libintl ) notify? ( sys-apps/dbus dev-libs/libdispatch ) opus? ( media-libs/opusfile ) pulseaudio? ( media-sound/pulseaudio ) vorbis? ( media-libs/libvorbis ) wavpack? ( media-sound/wavpack ) lastfm? ( dev-libs/libdispatch )
-REQUIRED_USE=|| ( alsa oss pulseaudio nullout )
-SLOT=0
-SRC_URI=mirror://sourceforge/deadbeef/deadbeef-1.8.8.tar.bz2
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	plocale	7ce00136a77130df46fbbd5966f98a61	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=3bd2021711ecd0f864f56797b1ded940
diff --git a/metadata/md5-cache/media-sound/deadbeef-1.9.1-r2 b/metadata/md5-cache/media-sound/deadbeef-1.9.1-r2
deleted file mode 100644
index 0518f4afa292..000000000000
--- a/metadata/md5-cache/media-sound/deadbeef-1.9.1-r2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/intltool sys-devel/gettext sys-devel/clang sys-devel/llvm 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=x11-libs/gtk+:3 net-misc/curl:= dev-libs/jansson:= aac? ( media-libs/faad2 ) alsa? ( media-libs/alsa-lib ) cdda? ( dev-libs/libcdio:= media-libs/libcddb dev-libs/libcdio-paranoia:= ) cover? ( media-libs/imlib2[jpeg,png] ) dts? ( media-libs/libdca ) ffmpeg? ( media-video/ffmpeg ) flac? ( media-libs/flac:= media-libs/libogg ) mp3? ( media-sound/mpg123 ) musepack? ( media-sound/musepack-tools ) nls? ( virtual/libintl ) notify? ( sys-apps/dbus ) opus? ( media-libs/opusfile ) pulseaudio? ( media-sound/pulseaudio ) vorbis? ( media-libs/libvorbis ) wavpack? ( media-sound/wavpack ) dev-libs/libdispatch dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=DeaDBeeF is a modular audio player similar to foobar2000
-EAPI=7
-HOMEPAGE=https://deadbeef.sourceforge.io/
-INHERIT=autotools xdg flag-o-matic toolchain-funcs plocale
-IUSE=aac alsa cdda converter cover dts ffmpeg flac +hotkeys lastfm mp3 musepack nls notify +nullout opus oss pulseaudio sc68 shellexec +supereq threads vorbis wavpack
-KEYWORDS=~amd64 ~riscv ~x86
-LICENSE=GPL-2 LGPL-2.1 wavpack? ( BSD )
-RDEPEND=x11-libs/gtk+:3 net-misc/curl:= dev-libs/jansson:= aac? ( media-libs/faad2 ) alsa? ( media-libs/alsa-lib ) cdda? ( dev-libs/libcdio:= media-libs/libcddb dev-libs/libcdio-paranoia:= ) cover? ( media-libs/imlib2[jpeg,png] ) dts? ( media-libs/libdca ) ffmpeg? ( media-video/ffmpeg ) flac? ( media-libs/flac:= media-libs/libogg ) mp3? ( media-sound/mpg123 ) musepack? ( media-sound/musepack-tools ) nls? ( virtual/libintl ) notify? ( sys-apps/dbus ) opus? ( media-libs/opusfile ) pulseaudio? ( media-sound/pulseaudio ) vorbis? ( media-libs/libvorbis ) wavpack? ( media-sound/wavpack ) dev-libs/libdispatch
-REQUIRED_USE=|| ( alsa oss pulseaudio nullout )
-SLOT=0
-SRC_URI=mirror://sourceforge/deadbeef/deadbeef-1.9.1.tar.bz2
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	plocale	7ce00136a77130df46fbbd5966f98a61	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=a1d4fa3a7c3b498627bf1a267cce360a
diff --git a/metadata/md5-cache/media-sound/deadbeef-1.9.1-r3 b/metadata/md5-cache/media-sound/deadbeef-1.9.3
index 6ba7734a564a..ef916c39fdec 100644
--- a/metadata/md5-cache/media-sound/deadbeef-1.9.1-r3
+++ b/metadata/md5-cache/media-sound/deadbeef-1.9.3
@@ -1,6 +1,6 @@
 BDEPEND=dev-util/intltool sys-devel/gettext sys-devel/clang sys-devel/llvm 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=x11-libs/gtk+:3 net-misc/curl:= dev-libs/jansson:= aac? ( media-libs/faad2 ) alsa? ( media-libs/alsa-lib ) cdda? ( dev-libs/libcdio:= media-libs/libcddb dev-libs/libcdio-paranoia:= ) cover? ( media-libs/imlib2[jpeg,png] ) dts? ( media-libs/libdca ) ffmpeg? ( media-video/ffmpeg ) flac? ( media-libs/flac:= media-libs/libogg ) libsamplerate? ( media-libs/libsamplerate ) mp3? ( media-sound/mpg123 ) musepack? ( media-sound/musepack-tools ) nls? ( virtual/libintl ) notify? ( sys-apps/dbus ) opus? ( media-libs/opusfile ) pulseaudio? ( media-sound/pulseaudio ) vorbis? ( media-libs/libvorbis ) wavpack? ( media-sound/wavpack ) dev-libs/libdispatch
+DEPEND=x11-libs/gtk+:3 net-misc/curl:= dev-libs/jansson:= aac? ( media-libs/faad2 ) alsa? ( media-libs/alsa-lib ) cdda? ( dev-libs/libcdio:= media-libs/libcddb dev-libs/libcdio-paranoia:= ) cover? ( media-libs/imlib2[jpeg,png] ) dts? ( media-libs/libdca ) ffmpeg? ( media-video/ffmpeg ) flac? ( media-libs/flac:= media-libs/libogg ) libsamplerate? ( media-libs/libsamplerate ) mp3? ( media-sound/mpg123 ) musepack? ( media-sound/musepack-tools ) nls? ( virtual/libintl ) notify? ( sys-apps/dbus ) opus? ( media-libs/opusfile ) pulseaudio? ( media-sound/pulseaudio ) vorbis? ( media-libs/libvorbis ) wavpack? ( media-sound/wavpack ) dev-libs/libdispatch:=
 DESCRIPTION=DeaDBeeF is a modular audio player similar to foobar2000
 EAPI=8
 HOMEPAGE=https://deadbeef.sourceforge.io/
@@ -9,9 +9,9 @@ INHERIT=autotools xdg flag-o-matic toolchain-funcs plocale
 IUSE=aac alsa cdda converter cover dts ffmpeg flac +hotkeys lastfm libsamplerate mp3 musepack nls notify +nullout opus oss pulseaudio sc68 shellexec +supereq threads vorbis wavpack
 KEYWORDS=~amd64 ~riscv ~x86
 LICENSE=GPL-2 LGPL-2.1 wavpack? ( BSD )
-RDEPEND=x11-libs/gtk+:3 net-misc/curl:= dev-libs/jansson:= aac? ( media-libs/faad2 ) alsa? ( media-libs/alsa-lib ) cdda? ( dev-libs/libcdio:= media-libs/libcddb dev-libs/libcdio-paranoia:= ) cover? ( media-libs/imlib2[jpeg,png] ) dts? ( media-libs/libdca ) ffmpeg? ( media-video/ffmpeg ) flac? ( media-libs/flac:= media-libs/libogg ) libsamplerate? ( media-libs/libsamplerate ) mp3? ( media-sound/mpg123 ) musepack? ( media-sound/musepack-tools ) nls? ( virtual/libintl ) notify? ( sys-apps/dbus ) opus? ( media-libs/opusfile ) pulseaudio? ( media-sound/pulseaudio ) vorbis? ( media-libs/libvorbis ) wavpack? ( media-sound/wavpack ) dev-libs/libdispatch
+RDEPEND=x11-libs/gtk+:3 net-misc/curl:= dev-libs/jansson:= aac? ( media-libs/faad2 ) alsa? ( media-libs/alsa-lib ) cdda? ( dev-libs/libcdio:= media-libs/libcddb dev-libs/libcdio-paranoia:= ) cover? ( media-libs/imlib2[jpeg,png] ) dts? ( media-libs/libdca ) ffmpeg? ( media-video/ffmpeg ) flac? ( media-libs/flac:= media-libs/libogg ) libsamplerate? ( media-libs/libsamplerate ) mp3? ( media-sound/mpg123 ) musepack? ( media-sound/musepack-tools ) nls? ( virtual/libintl ) notify? ( sys-apps/dbus ) opus? ( media-libs/opusfile ) pulseaudio? ( media-sound/pulseaudio ) vorbis? ( media-libs/libvorbis ) wavpack? ( media-sound/wavpack ) dev-libs/libdispatch:=
 REQUIRED_USE=|| ( alsa oss pulseaudio nullout )
 SLOT=0
-SRC_URI=mirror://sourceforge/deadbeef/deadbeef-1.9.1.tar.bz2
+SRC_URI=mirror://sourceforge/deadbeef/deadbeef-1.9.3.tar.bz2
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	plocale	7ce00136a77130df46fbbd5966f98a61	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=d054ec8f2e7d62eca2074edc4f761eb3
+_md5_=c37d017c1649f979dacacd47a4ceebaa
diff --git a/metadata/md5-cache/net-firewall/Manifest.gz b/metadata/md5-cache/net-firewall/Manifest.gz
index 9b92eb4f4531..ecffe7e26927 100644
--- a/metadata/md5-cache/net-firewall/Manifest.gz
+++ b/metadata/md5-cache/net-firewall/Manifest.gz
diff --git a/metadata/md5-cache/net-firewall/iptables-1.8.8-r4 b/metadata/md5-cache/net-firewall/iptables-1.8.8-r5
index 88fe8b522774..8d5ddf838a95 100644
--- a/metadata/md5-cache/net-firewall/iptables-1.8.8-r4
+++ b/metadata/md5-cache/net-firewall/iptables-1.8.8-r5
@@ -13,4 +13,4 @@ RDEPEND=conntrack? ( >=net-libs/libnetfilter_conntrack-1.0.6 ) netlink? ( net-li
 SLOT=0/1.8.3
 SRC_URI=https://www.netfilter.org/projects/iptables/files/iptables-1.8.8.tar.bz2
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	usr-ldscript	5c738dce357b54d5a90e30094d2f983c
-_md5_=1a6302b8eb6dd0b9b74ef1537cc5d576
+_md5_=768fb8361370c5224507816f580d10d9
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index ba30b44d42a1..30341ab145b2 100644
--- a/metadata/md5-cache/net-misc/Manifest.gz
+++ b/metadata/md5-cache/net-misc/Manifest.gz
diff --git a/metadata/md5-cache/net-misc/lldpd-1.0.16 b/metadata/md5-cache/net-misc/lldpd-1.0.16
new file mode 100644
index 000000000000..a0334928664e
--- /dev/null
+++ b/metadata/md5-cache/net-misc/lldpd-1.0.16
@@ -0,0 +1,17 @@
+BDEPEND=virtual/pkgconfig doc? ( graph? ( app-doc/doxygen[dot,doc] ) !graph? ( app-doc/doxygen ) ) 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=compile configure install postinst prepare
+DEPEND=acct-group/lldpd acct-user/lldpd dev-libs/libbsd >=dev-libs/libevent-2.1.11:= sys-libs/readline:0= seccomp? ( sys-libs/libseccomp:= ) snmp? ( net-analyzer/net-snmp:=[extensible(+)] ) xml? ( dev-libs/libxml2:= ) test? ( dev-libs/check )
+DESCRIPTION=Implementation of IEEE 802.1ab (LLDP)
+EAPI=8
+HOMEPAGE=https://lldpd.github.io/
+INHERIT=systemd bash-completion-r1 autotools tmpfiles
+IUSE=cdp doc +dot1 +dot3 edp fdp graph +lldpmed old-kernel sanitizers seccomp sonmp snmp static-libs test readline xml
+KEYWORDS=~amd64 ~x86
+LICENSE=ISC
+RDEPEND=acct-group/lldpd acct-user/lldpd dev-libs/libbsd >=dev-libs/libevent-2.1.11:= sys-libs/readline:0= seccomp? ( sys-libs/libseccomp:= ) snmp? ( net-analyzer/net-snmp:=[extensible(+)] ) xml? ( dev-libs/libxml2:= ) virtual/tmpfiles
+REQUIRED_USE=graph? ( doc ) test? ( snmp sanitizers )
+RESTRICT=!test? ( test ) test
+SLOT=0/4.9.1
+SRC_URI=https://github.com/lldpd/lldpd/releases/download/1.0.16/lldpd-1.0.16.tar.gz
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=7438828d70bca45e52bd5e66284243ec
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index 173bdedcc4bb..96cab970dccf 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/baselayout-2.7-r3 b/metadata/md5-cache/sys-apps/baselayout-2.7-r3
deleted file mode 100644
index c40cacbfe856..000000000000
--- a/metadata/md5-cache/sys-apps/baselayout-2.7-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst preinst prepare setup
-DESCRIPTION=Filesystem baselayout and init scripts
-EAPI=7
-HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
-INHERIT=multilib prefix
-IUSE=build +split-usr
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=https://gitweb.gentoo.org/proj/baselayout.git/snapshot/baselayout-2.7.tar.bz2
-_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=3e262a50832c8d1b10a37443840a9fac
diff --git a/metadata/md5-cache/sys-apps/baselayout-2.8 b/metadata/md5-cache/sys-apps/baselayout-2.8
deleted file mode 100644
index 3abf4f138d1d..000000000000
--- a/metadata/md5-cache/sys-apps/baselayout-2.8
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst preinst prepare setup
-DESCRIPTION=Filesystem baselayout and init scripts
-EAPI=7
-HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
-INHERIT=multilib prefix
-IUSE=build +split-usr
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=https://gitweb.gentoo.org/proj/baselayout.git/snapshot/baselayout-2.8.tar.bz2
-_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=40c7fbc5bcf08bafb5f9e96a2e8234a6
diff --git a/metadata/md5-cache/sys-apps/baselayout-2.8-r3 b/metadata/md5-cache/sys-apps/baselayout-2.8-r3
deleted file mode 100644
index d2af4d3a90ac..000000000000
--- a/metadata/md5-cache/sys-apps/baselayout-2.8-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst preinst prepare setup
-DESCRIPTION=Filesystem baselayout and init scripts
-EAPI=7
-HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
-INHERIT=multilib prefix
-IUSE=build +split-usr
-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=GPL-2
-RDEPEND=!sys-apps/baselayout-prefix
-SLOT=0
-SRC_URI=https://gitweb.gentoo.org/proj/baselayout.git/snapshot/baselayout-2.8.tar.bz2
-_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=799894ab634f39f52fd9431b3447c5a4
diff --git a/metadata/md5-cache/sys-apps/baselayout-2.9 b/metadata/md5-cache/sys-apps/baselayout-2.9
index bc3d5478afb4..5331bc57e06f 100644
--- a/metadata/md5-cache/sys-apps/baselayout-2.9
+++ b/metadata/md5-cache/sys-apps/baselayout-2.9
@@ -4,10 +4,10 @@ EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
 INHERIT=multilib prefix
 IUSE=build +split-usr
-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=GPL-2
 RDEPEND=!sys-apps/baselayout-prefix
 SLOT=0
 SRC_URI=https://gitweb.gentoo.org/proj/baselayout.git/snapshot/baselayout-2.9.tar.bz2
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=799894ab634f39f52fd9431b3447c5a4
+_md5_=4b1c3d63856d3f4b47f67fe2d9ed1139
diff --git a/metadata/md5-cache/sys-apps/nvme-cli-1.16 b/metadata/md5-cache/sys-apps/nvme-cli-1.16
deleted file mode 100644
index e02fc502d06e..000000000000
--- a/metadata/md5-cache/sys-apps/nvme-cli-1.16
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig virtual/pkgconfig virtual/pkgconfig
-DEFINED_PHASES=configure prepare
-DEPEND=json? ( dev-libs/json-c:= ) hugepages? ( sys-libs/libhugetlbfs ) systemd? ( sys-apps/systemd:= ) uuid? ( sys-apps/util-linux:= )
-DESCRIPTION=NVM-Express user space tooling for Linux
-EAPI=8
-HOMEPAGE=https://github.com/linux-nvme/nvme-cli
-INHERIT=systemd toolchain-funcs udev
-IUSE=hugepages +json systemd +uuid
-KEYWORDS=amd64 arm64 ppc64 ~riscv x86
-LICENSE=GPL-2
-RDEPEND=json? ( dev-libs/json-c:= ) hugepages? ( sys-libs/libhugetlbfs ) systemd? ( sys-apps/systemd:= ) uuid? ( sys-apps/util-linux:= )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/linux-nvme/nvme-cli/archive/v1.16.tar.gz -> nvme-cli-1.16.tar.gz
-_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	udev	eec0bbab06977f1cfc5597269c1fa152
-_md5_=667c97dcb204325f5c49a73304ef1cb1
diff --git a/metadata/md5-cache/sys-apps/nvme-cli-2.0 b/metadata/md5-cache/sys-apps/nvme-cli-2.0
deleted file mode 100644
index 77d34b74020f..000000000000
--- a/metadata/md5-cache/sys-apps/nvme-cli-2.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig virtual/pkgconfig
-DEFINED_PHASES=compile configure install test
-DEPEND=sys-libs/libnvme:=[json=,uuid=] hugepages? ( sys-libs/libhugetlbfs:= ) json? ( dev-libs/json-c:= ) uuid? ( sys-apps/util-linux:= )
-DESCRIPTION=NVM-Express user space tooling for Linux
-EAPI=8
-HOMEPAGE=https://github.com/linux-nvme/nvme-cli
-INHERIT=meson systemd udev
-IUSE=hugepages +json +uuid
-KEYWORDS=~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86
-LICENSE=GPL-2
-RDEPEND=sys-libs/libnvme:=[json=,uuid=] hugepages? ( sys-libs/libhugetlbfs:= ) json? ( dev-libs/json-c:= ) uuid? ( sys-apps/util-linux:= )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/linux-nvme/nvme-cli/archive/v2.0.tar.gz -> nvme-cli-2.0.tar.gz
-_eclasses_=meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	b9fc5e97e886514e5132f50465185401	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	udev	eec0bbab06977f1cfc5597269c1fa152
-_md5_=2938dac726303b4bf7040097015b678e
diff --git a/metadata/md5-cache/sys-apps/nvme-cli-2.1.1 b/metadata/md5-cache/sys-apps/nvme-cli-2.1.1
deleted file mode 100644
index 4e016548fdeb..000000000000
--- a/metadata/md5-cache/sys-apps/nvme-cli-2.1.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig virtual/pkgconfig
-DEFINED_PHASES=compile configure install test
-DEPEND=>=sys-libs/libnvme-1.1:=[json=,uuid=] hugepages? ( sys-libs/libhugetlbfs:= ) json? ( dev-libs/json-c:= ) uuid? ( sys-apps/util-linux:= )
-DESCRIPTION=NVM-Express user space tooling for Linux
-EAPI=8
-HOMEPAGE=https://github.com/linux-nvme/nvme-cli
-INHERIT=meson systemd udev
-IUSE=hugepages +json +uuid
-KEYWORDS=~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-libs/libnvme-1.1:=[json=,uuid=] hugepages? ( sys-libs/libhugetlbfs:= ) json? ( dev-libs/json-c:= ) uuid? ( sys-apps/util-linux:= )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/linux-nvme/nvme-cli/archive/v2.1.1.tar.gz -> nvme-cli-2.1.1.tar.gz
-_eclasses_=meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	b9fc5e97e886514e5132f50465185401	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	udev	eec0bbab06977f1cfc5597269c1fa152
-_md5_=d46efe0c6b7261490f613a11d08a9f10
diff --git a/metadata/md5-cache/sys-apps/ppc64-diag-2.7.9 b/metadata/md5-cache/sys-apps/ppc64-diag-2.7.9
new file mode 100644
index 000000000000..434cc06f8008
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/ppc64-diag-2.7.9
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/bison sys-devel/flex 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 prepare test
+DEPEND=virtual/libudev:= rtas? ( sys-libs/ncurses:0= sys-libs/librtas sys-libs/libservicelog >=sys-libs/libvpd-2.2.9:= )
+DESCRIPTION=Diagnostic tools for PowerLinux
+EAPI=8
+HOMEPAGE=https://github.com/power-ras/ppc64-diag
+INHERIT=autotools toolchain-funcs
+IUSE=rtas
+KEYWORDS=~ppc64
+LICENSE=GPL-2+
+RDEPEND=virtual/libudev:= rtas? ( sys-libs/ncurses:0= sys-libs/librtas sys-libs/libservicelog >=sys-libs/libvpd-2.2.9:= ) dev-lang/perl rtas? ( sys-apps/servicelog )
+SLOT=0
+SRC_URI=https://github.com/power-ras/ppc64-diag/archive/v2.7.9.tar.gz -> ppc64-diag-2.7.9.tar.gz
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=48ef471d6aa6f2cc63b23444b0eb7336
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index e597aea488e0..e0acb590daf4 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-11-14T18:09:49Z
+TIMESTAMP 2022-11-15T00:09:46Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmNyhG5fFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmNy2MtfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klC/Yw//WBbFnG42vnsMpe/sMsR6q7jJi3nKIKbYcgHeqdy7BPCEMqNYXPXk5p1W
-wmiCBTDlo7B6bLUNHZ1fowFL6tsKdIEuTSM4UoAe6zNdXU4Bn7RNq/1ZhHxYfFrG
-EQgN7tMhC8TNx3ewXM0MnbUoFpDwdpKcnb5P3+yFD1YzTi/14SeXp8HQHaXtOfgB
-xWIRnoypt7G9glNhor+U6gJrlWftC4GPoCEzFVvi6nV3i95TNMsd7AQQi/7QVkCI
-p/9faxOxxvrzsrvs6bpV1HCC4VwxB7BywAd9G0Oy+kh+L+BxVFFIpMvw38JGOhfl
-bAZD4nhbisvsZK3LMXbl/pYxhouM7GpZCJTxvUNHbHG/i0FP1qHsnEoEOAxE9Lki
-XnX00iX1OkIOv0F9m0kPAWpFy9sjfiBrQnrks+5wzO+YInna/sgz3PNOdF+kHFvX
-vHvU/pdcSaoq0e/1W2m47HlAekrsI6Rj2yAIXafkin8O5AyokDb+YCVSo6S3gTbF
-odO5+wV2TJcHIrs1AcR+Hvyo0YJHvQDwe3JySEnYccudwi2uFerfx5NlI+NYnajs
-A41j0SVcy8Zv5ENKImg0UnV1XQUrnsH2Q5IuOxxo+KtcUjKZam+pe2UezBE5DFfL
-H521OeU0/Us31dqd83BqzvyoIWiNWc1E+zKx11pQlAaeZ8tXmFY=
-=ydE+
+klAemA//c4wCDNZW8MDWCe3LffWxo70ORj45IT+W/R3ZCVVhWEhBqL3hb1empINB
+sn7IJHKQDT5EzK8ymmT3wc23rhu17p7j2Cd4s6vq+2WCB/sHaZXR+tdhHKMry92d
+r8U5ktvJNbnrmmKD+pBoMywCatD2FspEilOHNeV3QGHtPap+jfz/Siw0KQUfwIX4
+G1Ik6eJFda7iqBn7AewGIM9IY8R5Cpde9yg+QkOjo+8/kZrNqxt+/TEiMXoZ3FC7
+ICJwBEFOKifcd/UM/G8Mkkxf6m9WuMSZxTUi0+Pf8ZIpLNcVfkm0/rBbO2Feo3UN
+UiPkkyZl4Ql39Ry+6YT3PZJTqWtKiU9nAwjEprANMWWzwnsbLZjOlT7BZ1lwNWmy
+N4OrT2nsDaGMos+G3sF04tfaO7EZmbYIRwPky0Nm24dApGEF2IiRcNOl2MRJEYOQ
+tpvzVCy1b4tGHGpJdvIMQAlQU52Iihuddclr5i9nXNdXxYBnhzcLWSUDiW1TmmZ6
+jehlX30MDCb7W8YKlp1GbgJTaXy5egGZBoCeuGHXztAD60npJkc1pm8K9xkHCj5D
+eksTu3T/rWPxcjPUETXuX82oEMJajJfHcHNTkiOPT6YzcrC4u4lUE0i69fxD+zs1
+a/3OOmqv2SKQfMs4TEHV33wIcY+79M3zlSAHNL+S489ltMWZeQs=
+=zbHc
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index a2775b8e8778..ba4ad7bd19fb 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Mon, 14 Nov 2022 18:09:46 +0000
+Tue, 15 Nov 2022 00:09:44 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 4cc88f7e41d9..ddd1c7ba73fb 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Mon Nov 14 06:09:45 PM UTC 2022
+Tue Nov 15 12:09:43 AM UTC 2022
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 9d66be009c69..598a2e090a61 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Mon, 14 Nov 2022 18:15:01 +0000
+Tue, 15 Nov 2022 00:15:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index f170cafb6e0a..5805d0fc996b 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-0c77aadb983014ccf56fc464d83906c0cf3c3271 1668447492 2022-11-14T17:38:12+00:00
+a9447de567f3480711ddc6eb099b7e02ec07a2b2 1668469430 2022-11-14T23:43:50+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index f4d9e5fb0d3a..d901ee4cf214 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1668449401 Mon 14 Nov 2022 06:10:01 PM UTC
+1668471001 Tue 15 Nov 2022 12:10:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index d67e00912eb7..9cb60ba78458 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Mon, 14 Nov 2022 18:09:45 +0000
+Tue, 15 Nov 2022 00:09:43 +0000
diff --git a/net-firewall/Manifest.gz b/net-firewall/Manifest.gz
index 086252b9f7e0..41f54b2eecbc 100644
--- a/net-firewall/Manifest.gz
+++ b/net-firewall/Manifest.gz
diff --git a/net-firewall/iptables/Manifest b/net-firewall/iptables/Manifest
index 6b7068f9280f..47a99bb7cb84 100644
--- a/net-firewall/iptables/Manifest
+++ b/net-firewall/iptables/Manifest
@@ -12,5 +12,5 @@ AUX systemd/ip6tables-store.service 243 BLAKE2B 30a0d955998a2a664c6a95b8e559898a
 AUX systemd/iptables-restore.service 400 BLAKE2B cd7f700cf717a2efb6504770308f7dcb90a1968f64cca98ea5e7437cf3cf2a2e8f575e3743ac19eec8738c665f4243f537a101c00d5d1cc94648688d4e240a59 SHA512 8c005e321ad041068f243e4baa6588b24b0ffd69991f2129dfab0a34d0ebaf702ff2be8b7328126c84abdc3bbd300e1c387a690c5f6a002b50b2e9148feeb8ef
 AUX systemd/iptables-store.service 240 BLAKE2B 7ddb4425e63cd41f421767fab25a7b055087fddde5927291b3fce6e0e978f0cb3b734bcacf02f78257eec99274056b69058436a847dcb366f5fb70032e410355 SHA512 a720e92b5571a2c3427101105e95e555f3b72541a53c5daa43e361c99ca28830e9e8dd27dbd7cfed40fbbe289ed180f9be7e0f3b6b0cd19bba022a531815fd5e
 DIST iptables-1.8.8.tar.bz2 746985 BLAKE2B 0da021cc7313b86af331768904956dab3eee3de245a7b03965129f3d7f13097fc03fbb1390167dcd971eff216eabad9e59b261a9c0f54bfc48a77453aa40d164 SHA512 f21df23279a77531a23f3fcb1b8f0f8ec0c726bda236dd0e33af74b06753baff6ce3f26fb9fcceb6fada560656ba901e68fc6452eb840ac1b206bc4654950f59
-EBUILD iptables-1.8.8-r4.ebuild 4618 BLAKE2B f124e4218ddfc49e0540971666c7217b0b12e9f78b56c3408b51fd9b6e1dc6bd02a69dcd741a6dd03fec84f849041942a11c974eba7df609871ba80607687e5e SHA512 27b028bd9f0d1592a1967ec27e748ec17023330bcd24ae6429f6aba3a4fac721d9a7c8f2fe6219af84be156466778ddc37cb3b5b6bdcb9c321cd4c1628921d2e
+EBUILD iptables-1.8.8-r5.ebuild 4724 BLAKE2B c732f85da4fd0a1aed0fcf5b518e5cef2ccf9768b3e1dd536cc1a269e5f56057bfe489704aa0f43b6220f0735fc09c26b5c47a83466d6779da6d4ebdce0d7ffc SHA512 6a3b5b0bbdbf318ca9ecc9a9b6ad1af961bc576d203cbc20a37ee4250bbb87e3454dc903412631bd26f376fd5d1a47b8b6197ec15f1abdf0b10b17aa42288471
 MISC metadata.xml 1466 BLAKE2B 7378fedb44c6e6d19e508a764ec997911f966beccd40b1f93096ad3343b7cd72f9ca129e67a666c54ca4382348a448597bd607197ffe6b94669d84306c81d127 SHA512 f89038980e81bfceaf872ff1938c47e8ad12060bbe9ff48e0e9ca9dd5acc0196b2261d2b22a156cbfd7be89d1d67448969d39ff9b28efb0896702760afa14842
diff --git a/net-firewall/iptables/iptables-1.8.8-r4.ebuild b/net-firewall/iptables/iptables-1.8.8-r5.ebuild
index 7ee81eb845ac..105bbb699754 100644
--- a/net-firewall/iptables/iptables-1.8.8-r4.ebuild
+++ b/net-firewall/iptables/iptables-1.8.8-r5.ebuild
@@ -98,6 +98,10 @@ src_compile() {
 src_install() {
 	default
 
+	# Managed by eselect-iptables
+	# https://bugs.gentoo.org/881295
+	rm "${ED}/usr/bin/iptables-xml" || die
+
 	dodoc INCOMPATIBILITIES iptables/iptables.xslt
 
 	# All the iptables binaries are in /sbin, so might as well
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 60ecffaf3315..83d7df161ccb 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/lldpd/Manifest b/net-misc/lldpd/Manifest
index 5a15faa0bd14..3cd251ff0165 100644
--- a/net-misc/lldpd/Manifest
+++ b/net-misc/lldpd/Manifest
@@ -5,6 +5,8 @@ AUX lldpd.service 205 BLAKE2B 787e9d19def1d4d3cfe207e928b994d46b4fda5d2431ab147d
 AUX tmpfilesd 32 BLAKE2B ad674d771fa90bde09e231ef21358928de2f3eccdbe0e9b3e2a0c0438a55899e858c98dc3d49714ee07cec4c921d15d955fd0c34f6dfaa4f3667bc4c0e9dfcde SHA512 58b11cc9241c4da25bf53da31b1ed64a489a7bd0998bc8a395659d77975607fd6ab035ffc830ddbfe2e5be244ff7c308900358452aee728fd56a4a7d4e80ffde
 DIST lldpd-1.0.14.tar.gz 1979314 BLAKE2B 9e4dc2126eb07b09e42da07c1ddff9fd02a306404c45632cc80eb791e05cf07c0919a57fca2b91c6302ec01447213ed7f1b5a5bb14482b1f9c3a1fc501a0fdcb SHA512 268d85144fd06c70c9394acdbd92478b0ee3426beed76e48363f71e329681c57ab6bb1d7b313011e1243eeaaeb2b1f35085641bd86d6894c7d998d030d84b548
 DIST lldpd-1.0.15.tar.gz 1980892 BLAKE2B 40702bbe633e7214c73c61e3e811ebe2655480ba3ef0655371c2042798b61fb6066c0051c33fb81e80c17149a1ad94007b2d0562533d24a0d7505dc2fd5caa44 SHA512 c245421cd153be39756e15c379daa70529119a50e0db7fff82a1d7f892f527c6582783aedadf096a4e2ea6352befb7215cecae675bd605d5fcf55820a39a6791
+DIST lldpd-1.0.16.tar.gz 1967182 BLAKE2B 3a359ec6539087ab1ffa5e1f83b90cc375b047b6e404df21067621bac9c9e5bab4b04209e9111d72fc2486046fb1d4b6744c093342c908f9a6475cd0b5a33328 SHA512 4abd25d1d7325f0a963518d916139f39b9250c37dfd918819019cabaafcdbedbfa03c78da80d36a09a0f4b1d79d4ee5e8aee1d10596bcd5710cd0c1181ba27c1
 EBUILD lldpd-1.0.14.ebuild 2238 BLAKE2B c25a78e5786a2cc77119e17b09ef5ebd2e2a87b2b77a2e5767637b450cb1335bd368f00aeef02aa65cf32037537dcabcacaece05133a98ea1d9cc985415f691b SHA512 6bde251d2a12c68245f8599c5d3a77ad3bd8d21b767f25de2e4f92cc06e4a3d19487ea90f7703554d373d6d6fbecd7e0ef82ea187c826c7492387e65fd450984
 EBUILD lldpd-1.0.15-r1.ebuild 2244 BLAKE2B b958f0b2b606810739746b78db2294a33542eab45a35b4f86816c3c8e040dee1a62aa93f585639ed0e3632a44ead0bac9045dbe3e2c7723bb0980466aac775c5 SHA512 b622a74680832ccb58af43a02008352bb3079c240d8e4e770b94176d17484d24ee79bb6b4244e3ab990a60cac9d85fef70eefdee871e02e8711a2a1854eea86f
+EBUILD lldpd-1.0.16.ebuild 2332 BLAKE2B cee40e0a7692aa4c865590eb91159f15796ec7be2249af938d5920b385a5b3eb1b83363543dbcc718515e4d903246f44750a5e5500f1cf268fc07e9f3295bfd6 SHA512 c475b63c2c1ab8816b77e52b87d995f3842d555b4fc7c90a02f6cd37ff089cce1b725ce026241d1dd03d78ed10151372427ccd90b23ce663dbc7ec79a73257b4
 MISC metadata.xml 2845 BLAKE2B 30a48fae80109b4f3a2afc8ff90dd103e33ade04d9ecfbe44fc2e43cb0fd9d8f0d54ed098e28fcffedab5f4276b5719c62497d7b39d40fd75f0e12f1e0dcb439 SHA512 e96fbb704401d871d83e9f11144a9259ae5e58bfcdcc98bc08e0199998044588485118f264adafc4927ed69bba2de7fd06dc6bdd2bb3357b90d903168685451a
diff --git a/net-misc/lldpd/lldpd-1.0.16.ebuild b/net-misc/lldpd/lldpd-1.0.16.ebuild
new file mode 100644
index 000000000000..080ae10dcb2b
--- /dev/null
+++ b/net-misc/lldpd/lldpd-1.0.16.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit systemd bash-completion-r1 autotools tmpfiles
+
+DESCRIPTION="Implementation of IEEE 802.1ab (LLDP)"
+HOMEPAGE="https://lldpd.github.io/"
+SRC_URI="https://github.com/lldpd/lldpd/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0/4.9.1"
+KEYWORDS="~amd64 ~x86"
+IUSE="cdp doc +dot1 +dot3 edp fdp graph +lldpmed old-kernel sanitizers
+	seccomp sonmp snmp static-libs test readline xml"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	acct-group/lldpd
+	acct-user/lldpd
+	dev-libs/libbsd
+	>=dev-libs/libevent-2.1.11:=
+	sys-libs/readline:0=
+	seccomp? ( sys-libs/libseccomp:= )
+	snmp? ( net-analyzer/net-snmp:=[extensible(+)] )
+	xml? ( dev-libs/libxml2:= )
+"
+DEPEND="${RDEPEND}
+	test? ( dev-libs/check )
+"
+BDEPEND="virtual/pkgconfig
+	doc? (
+		graph? ( app-doc/doxygen[dot,doc] )
+		!graph? ( app-doc/doxygen )
+	)
+"
+
+REQUIRED_USE="
+	graph? ( doc )
+	test? ( snmp sanitizers )
+"
+
+# tests need root
+RESTRICT+=" test"
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--without-embedded-libevent \
+		--with-privsep-user=${PN} \
+		--with-privsep-group=${PN} \
+		--with-privsep-chroot=/run/${PN} \
+		--with-lldpd-ctl-socket=/run/${PN}.socket \
+		--with-lldpd-pid-file=/run/${PN}.pid \
+		$(use_enable cdp) \
+		$(use_enable doc doxygen-man) \
+		$(use_enable doc doxygen-pdf) \
+		$(use_enable doc doxygen-html) \
+		$(use_enable dot1) \
+		$(use_enable dot3) \
+		$(use_enable edp) \
+		$(use_enable fdp) \
+		$(use_enable graph doxygen-dot) \
+		$(use_enable lldpmed) \
+		$(use_enable old-kernel oldies) \
+		$(use_enable sonmp) \
+		$(use_enable static-libs static) \
+		$(use_with readline) \
+		$(use_enable sanitizers) \
+		$(use_with seccomp) \
+		$(use_with snmp) \
+		$(use_with xml)
+}
+
+src_compile() {
+	emake
+	use doc && emake doxygen-doc
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	find "${D}" -name '*.la' -delete || die
+
+	newinitd "${FILESDIR}"/${PN}-initd-5 ${PN}
+	newconfd "${FILESDIR}"/${PN}-confd-1 ${PN}
+	newbashcomp src/client/completion/lldpcli lldpcli
+
+	use doc && dodoc -r doxygen/html
+
+	insinto /etc
+	doins "${FILESDIR}/lldpd.conf"
+	keepdir /etc/${PN}.d
+
+	systemd_dounit "${FILESDIR}"/${PN}.service
+	newtmpfiles "${FILESDIR}"/tmpfilesd ${PN}.conf
+}
+
+pkg_postinst() {
+	tmpfiles_process ${PN}.conf
+}
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 04a892409b5b..f9642a7f0012 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/baselayout/Manifest b/sys-apps/baselayout/Manifest
index cf970648f016..05f2f294c8bd 100644
--- a/sys-apps/baselayout/Manifest
+++ b/sys-apps/baselayout/Manifest
@@ -1,9 +1,4 @@
-DIST baselayout-2.7.tar.bz2 30317 BLAKE2B 7b7c284b7d0a9608a0d03dbde0d62d793829b61d5361f5062fdeb8880a2f792c142e20acf7fa92e713e2ebb0bd1609ca65bc8a4191f2bf2c5df4f474eaeef1ee SHA512 8b28d2dc20fd5887db5c0e6b67a4217c4d0730529023fc57fb1ee95a431e1f492fb21e3e66980bef766819e9f542dc7e4ad3ae25465390194bbf970c3653c88e
-DIST baselayout-2.8.tar.bz2 30236 BLAKE2B 0bac62dd5585f1f550da8c99d06a7f8ab6cdd473b0499a8f0ac58a5c43e3883b42adb7f80c172d894fae93a6ddb6fec7a65cad9897f4a2532b481c82065ed96b SHA512 506d7cc8399b530eabc9ba2d16cbb6c024350f9487a2a9168c670cee9876f62e5a716942f698c4883013d6ccc9591c2d7fc2ac9d782f0ce8d724371ca94c739a
 DIST baselayout-2.9.tar.bz2 30200 BLAKE2B 3a997e847e853a5bcdce7eb06d50fda4727a6c408ca614bdc8dd576bfc9296d3c625c4e8791dbdb078dd5088f818e5ee98eea5d14d737f465ed225554da26180 SHA512 c07726141446c9d9202bac19642baf819b28a838814e1dd3c200d1768af64a913bd9188923029e0b0edf7e420d5aad7bdde278d6c24c4f40029fddbad28d8e02
-EBUILD baselayout-2.7-r3.ebuild 11228 BLAKE2B 347ce18e044de38deea4d85f5409bb6987a81abea68f1cf0a4fc6374c698f4b2ffebd1fbb5becb0ac0c7c1f8572be908bde71600008246c59450e07fe5d9fe28 SHA512 768412405896189e96a4ac59303bc6e96208c04d0518e0f980714d07db25389b97c4b84c2b070623765c3be6e6e609989267a306389d32da4c420dc3d329203c
-EBUILD baselayout-2.8-r3.ebuild 11826 BLAKE2B 0d606ac53b5028a2189d2b943b497990da280279aa38bdd65404c9a4c497c7dcb808fd4e9a6f058ed3edd217a24a9b81709142bfdb3398f4252acb5ae694d998 SHA512 b457cbcbdb2f4f276337b1f5da9099d40e3c4ab065e06d18f4a5cbf8b29920d7228df96d0f43c7b0ff82f0cc2c7b161543a808ba8787a6a61e02f8bbd7628896
-EBUILD baselayout-2.8.ebuild 10848 BLAKE2B 26d38e365dbf423731b1cf35fcd2efe208961ccccdafc184b2fecc78eee79a1d73f3393cde33ea4c95baa8b834514f08d936c321d7e872372c981656c6172801 SHA512 c995e87684b5fd1c66553aeb60623d713b3eeaf6719af0d237ae4f26b3ad2e3422fb27dcb0c89d6f2b4b0e03be40985804181a045457ff4178e06d910e464102
-EBUILD baselayout-2.9.ebuild 11826 BLAKE2B 0d606ac53b5028a2189d2b943b497990da280279aa38bdd65404c9a4c497c7dcb808fd4e9a6f058ed3edd217a24a9b81709142bfdb3398f4252acb5ae694d998 SHA512 b457cbcbdb2f4f276337b1f5da9099d40e3c4ab065e06d18f4a5cbf8b29920d7228df96d0f43c7b0ff82f0cc2c7b161543a808ba8787a6a61e02f8bbd7628896
+EBUILD baselayout-2.9.ebuild 11818 BLAKE2B f60a5ccef7e0e77177dc2ad7e15048e3c83bf94981f7274264c0a9d18d2ac0a102456f2c06116a6e3f39bc01a3275d702c3bf7df64a3f81ee34ef744787da321 SHA512 2b07ce978ad790e0f97021af002731015f40291f8b881c08586c856011ebde4b0e4941d7fb557ba413e3c422023412f441803e5ce8860a39e27c7193b1f69537
 EBUILD baselayout-9999.ebuild 11826 BLAKE2B 0d606ac53b5028a2189d2b943b497990da280279aa38bdd65404c9a4c497c7dcb808fd4e9a6f058ed3edd217a24a9b81709142bfdb3398f4252acb5ae694d998 SHA512 b457cbcbdb2f4f276337b1f5da9099d40e3c4ab065e06d18f4a5cbf8b29920d7228df96d0f43c7b0ff82f0cc2c7b161543a808ba8787a6a61e02f8bbd7628896
 MISC metadata.xml 383 BLAKE2B 58d0d7a9d2b0e355ca13061b798db482b1894cb805e4c7f70d9b64f301f34aa784ec56783cb670e3c35a69ad383feb3c29d0b8f8164e5e05e24908127759a4aa SHA512 49775deed8635ddd8492a86887c85043e2a16ec46508c08c9eb669eee0aa29db1974c20a338fa09703bfc73fbff29c56d043b2749c0e7046347eb8186da59193
diff --git a/sys-apps/baselayout/baselayout-2.7-r3.ebuild b/sys-apps/baselayout/baselayout-2.7-r3.ebuild
deleted file mode 100644
index 3293e119b3c9..000000000000
--- a/sys-apps/baselayout/baselayout-2.7-r3.ebuild
+++ /dev/null
@@ -1,347 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib prefix
-
-DESCRIPTION="Filesystem baselayout and init scripts"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-if [[ ${PV} = 9999 ]]; then
-	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.bz2"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="build +split-usr"
-
-pkg_setup() {
-	multilib_layout
-}
-
-riscv_compat_symlink() {
-	# Here we apply some special sauce for riscv.
-	# Two multilib layouts exist for now:
-	# 1) one level libdirs, (32bit) "lib" and (64bit) "lib64"
-	#    these are chosen by us to closely resemble other arches
-	# 2) two level libdirs, "lib64/lp64d" "lib64/lp64" "lib32/ilp32d" ...
-	#    this is the glibc/gcc default
-	# Unfortunately, the default has only one fallback, which is "lib"
-	# for both 32bit and 64bit. So things do not break in 1), we need
-	# to provide compatibility symlinks...
-
-	# This function has exactly two parameters:
-	# - the default libdir, to determine if 1) or 2) applies
-	# - the location of the symlink (which points to ".")
-
-	# Note: we call this only in the ${SYMLINK_LIB} = no codepath, since
-	# there never was a ${SYMLINK_LIB} = yes riscv profile.
-
-	case ${CHOST} in
-	riscv*)
-		# are we on a one level libdir profile? is there no symlink yet?
-		if [[ ${1} != */* && ! -L ${2} ]] ; then
-			ln -s . $2 || die "Unable to make $2 riscv compatibility symlink"
-		fi
-		;;
-	esac
-}
-
-# Create our multilib dirs - the Makefile has no knowledge of this
-multilib_layout() {
-	local dir def_libdir libdir libdirs
-	local prefix prefix_lst
-	def_libdir=$(get_abi_LIBDIR $DEFAULT_ABI)
-	libdirs=$(get_all_libdirs)
-
-	if [[ -z "${SYMLINK_LIB}" || ${SYMLINK_LIB} = no ]] ; then
-		prefix_lst=( "${EROOT}"/{,usr/,usr/local/} )
-		for prefix in "${prefix_lst[@]}"; do
-			for libdir in ${libdirs}; do
-				dir="${prefix}${libdir}"
-				if [[ -e "${dir}" ]]; then
-					[[ ! -d "${dir}" ]] &&
-						die "${dir} exists but is not a directory"
-					continue
-				fi
-				if ! use split-usr && [[ ${prefix} = ${EROOT}/ ]]; then
-					libdir="${libdir%%/*}"
-					dir="${prefix}${libdir}"
-					einfo "symlinking ${dir} to usr/${libdir}"
-					ln -s usr/${libdir} ${dir} ||
-						die "Unable to make ${dir} symlink"
-				else
-					einfo "creating directory ${dir}"
-					mkdir -p "${dir}" ||
-						die "Unable to create ${dir} directory"
-				fi
-			done
-			riscv_compat_symlink "${def_libdir}" "${prefix}${def_libdir}/${DEFAULT_ABI}"
-		done
-		return 0
-	fi
-
-	[ -z "${def_libdir}" ] &&
-		die "your DEFAULT_ABI=$DEFAULT_ABI appears to be invalid"
-
-	# figure out which paths should be symlinks and which should be directories
-	local dirs syms exp d
-	for libdir in ${libdirs} ; do
-		if use split-usr ; then
-			exp=( {,usr/,usr/local/}${libdir} )
-		else
-			exp=( {usr/,usr/local/}${libdir} )
-		fi
-		for d in "${exp[@]}" ; do
-			# most things should be dirs
-			if [ "${SYMLINK_LIB}" = "yes" ] && [ "${libdir}" = "lib" ] ; then
-				[ ! -h "${d}" ] && [ -e "${d}" ] && dirs+=" ${d}"
-			else
-				[ -h "${d}" ] && syms+=" ${d}"
-			fi
-		done
-	done
-	if [ -n "${syms}${dirs}" ] ; then
-		ewarn "Your system profile has SYMLINK_LIB=${SYMLINK_LIB:-no}, so that means you need to"
-		ewarn "have these paths configured as follows:"
-		[ -n "${dirs}" ] && ewarn "symlinks to '${def_libdir}':${dirs}"
-		[ -n "${syms}" ] && ewarn "directories:${syms}"
-		ewarn "The ebuild will attempt to fix these, but only for trivial conversions."
-		ewarn "If things fail, you will need to manually create/move the directories."
-		echo
-	fi
-
-	# setup symlinks and dirs where we expect them to be; do not migrate
-	# data ... just fall over in that case.
-	if use split-usr ; then
-		prefix_lst=( "${EROOT}"/{,usr/,usr/local/} )
-	else
-		prefix_lst=( "${EROOT}"/{usr/,usr/local/} )
-	fi
-	for prefix in "${prefix_lst[@]}"; do
-		if [ "${SYMLINK_LIB}" = yes ] ; then
-			# we need to make sure "lib" points to the native libdir
-			if [ -h "${prefix}lib" ] ; then
-				# it's already a symlink!  assume it's pointing to right place ...
-				continue
-			elif [ -d "${prefix}lib" ] ; then
-				# "lib" is a dir, so need to convert to a symlink
-				ewarn "Converting ${prefix}lib from a dir to a symlink"
-				rm -f "${prefix}lib"/.keep || die
-				if rmdir "${prefix}lib" 2>/dev/null ; then
-					ln -s ${def_libdir} "${prefix}lib" || die
-				else
-					die "non-empty dir found where we needed a symlink: ${prefix}lib"
-				fi
-			else
-				# nothing exists, so just set it up sanely
-				ewarn "Initializing ${prefix}lib as a symlink"
-				mkdir -p "${prefix}" || die
-				rm -f "${prefix}lib" || die
-				ln -s ${def_libdir} "${prefix}lib" || die
-				mkdir -p "${prefix}${def_libdir}" || die #423571
-			fi
-		else
-			# we need to make sure "lib" is a dir
-			if [ -h "${prefix}lib" ] ; then
-				# "lib" is a symlink, so need to convert to a dir
-				ewarn "Converting ${prefix}lib from a symlink to a dir"
-				rm -f "${prefix}lib" || die
-				if [ -d "${prefix}lib32" ] ; then
-					ewarn "Migrating ${prefix}lib32 to ${prefix}lib"
-					mv "${prefix}lib32" "${prefix}lib" || die
-				else
-					mkdir -p "${prefix}lib" || die
-				fi
-			elif [ -d "${prefix}lib" ] && ! has lib32 ${libdirs} ; then
-				# make sure the old "lib" ABI location does not exist; we
-				# only symlinked the lib dir on systems where we moved it
-				# to "lib32" ...
-				case ${CHOST} in
-				*-gentoo-freebsd*) ;; # We want it the other way on fbsd.
-				i?86*|x86_64*|powerpc*|sparc*|s390*)
-					if [[ -d ${prefix}lib32 && ! -h ${prefix}lib32 ]] ; then
-						rm -f "${prefix}lib32"/.keep || die
-						if ! rmdir "${prefix}lib32" 2>/dev/null ; then
-							ewarn "You need to merge ${prefix}lib32 into ${prefix}lib"
-							die "non-empty dir found where there should be none: ${prefix}lib32"
-						fi
-					fi
-					;;
-				esac
-			else
-				# nothing exists, so just set it up sanely
-				ewarn "Initializing ${prefix}lib as a dir"
-				mkdir -p "${prefix}lib" || die
-			fi
-		fi
-	done
-	if ! use split-usr ; then
-		for libdir in ${libdirs}; do
-			if [[ ! -e "${EROOT}${libdir}" ]]; then
-				ln -s usr/"${libdir}" "${EROOT}${libdir}" ||
-					die "Unable to make ${EROOT}${libdir} symlink"
-			fi
-		done
-	fi
-}
-
-pkg_preinst() {
-	# This is written in src_install (so it's in CONTENTS), but punt all
-	# pending updates to avoid user having to do etc-update (and make the
-	# pkg_postinst logic simpler).
-	rm -f "${EROOT}"/etc/._cfg????_gentoo-release || die
-
-	# We need to install directories and maybe some dev nodes when building
-	# stages, but they cannot be in CONTENTS.
-	# Also, we cannot reference $S as binpkg will break so we do this.
-	multilib_layout
-	if use build ; then
-		if use split-usr ; then
-			emake -C "${ED}/usr/share/${PN}" DESTDIR="${EROOT}" layout
-		else
-			emake -C "${ED}/usr/share/${PN}" DESTDIR="${EROOT}" layout-usrmerge
-		fi
-	fi
-	rm -f "${ED}"/usr/share/${PN}/Makefile || die
-}
-
-src_prepare() {
-	default
-	if use prefix; then
-		hprefixify -e "/EUID/s,0,${EUID}," -q '"' etc/profile
-		hprefixify etc/{env.d/50baselayout,shells} share.Linux/passwd
-		echo PATH=/usr/bin:/bin >> etc/env.d/99host
-		echo ROOTPATH=/usr/sbin:/sbin:/usr/bin:/bin >> etc/env.d/99host
-	fi
-
-	# don't want symlinked directories in PATH on systems with usr-merge
-	if ! use split-usr; then
-		sed \
-			-e 's|/usr/local/sbin:||g' \
-			-e 's|:/usr/sbin:|:|g' \
-			-e 's|:/sbin:|:|g' \
-			-e 's|:/bin:|:|g' \
-			-i etc/env.d/50baselayout || die
-	fi
-
-	# handle multilib paths.  do it here because we want this behavior
-	# regardless of the C library that you're using.  we do explicitly
-	# list paths which the native ldconfig searches, but this isn't
-	# problematic as it doesn't change the resulting ld.so.cache or
-	# take longer to generate.  similarly, listing both the native
-	# path and the symlinked path doesn't change the resulting cache.
-	local libdir ldpaths
-	for libdir in $(get_all_libdirs) ; do
-		use split-usr && ldpaths+=":${EPREFIX}/${libdir}"
-		ldpaths+=":${EPREFIX}/usr/${libdir}"
-		ldpaths+=":${EPREFIX}/usr/local/${libdir}"
-	done
-	echo "LDPATH='${ldpaths#:}'" >> etc/env.d/50baselayout
-
-	# rc-scripts version for testing of features that *should* be present
-	echo "Gentoo Base System release ${PV}" > etc/gentoo-release
-}
-
-src_install() {
-	emake \
-		OS=Linux \
-		DESTDIR="${ED}" \
-		install
-	dodoc ChangeLog
-	rm "${ED}"/etc/sysctl.d/README || die
-
-	# need the makefile in pkg_preinst
-	insinto /usr/share/${PN}
-	doins Makefile
-
-	# This is needed for https://bugs.gentoo.org/732142
-	dodir /usr/lib
-	mv "${ED}"/etc/os-release "${ED}"/usr/lib || die
-	dosym ../usr/lib/os-release /etc/os-release
-}
-
-pkg_postinst() {
-	local x
-
-	# We installed some files to /usr/share/baselayout instead of /etc to stop
-	# (1) overwriting the user's settings
-	# (2) screwing things up when attempting to merge files
-	# (3) accidentally packaging up personal files with quickpkg
-	# If they don't exist then we install them
-	for x in master.passwd passwd shadow group fstab ; do
-		[ -e "${EROOT}/etc/${x}" ] && continue
-		[ -e "${EROOT}/usr/share/baselayout/${x}" ] || continue
-		cp -p "${EROOT}/usr/share/baselayout/${x}" "${EROOT}"/etc || die
-	done
-
-	# Force shadow permissions to not be world-readable #260993
-	for x in shadow ; do
-		if [ -e "${EROOT}/etc/${x}" ] ; then
-			chmod o-rwx "${EROOT}/etc/${x}" || die
-		fi
-	done
-
-	# Take care of the etc-update for the user
-	if [ -e "${EROOT}"/etc/._cfg0000_gentoo-release ] ; then
-		mv "${EROOT}"/etc/._cfg0000_gentoo-release "${EROOT}"/etc/gentoo-release || die
-	fi
-
-	# whine about users that lack passwords #193541
-	if [[ -e "${EROOT}"/etc/shadow ]] ; then
-		local bad_users=$(sed -n '/^[^:]*::/s|^\([^:]*\)::.*|\1|p' "${EROOT}"/etc/shadow)
-		if [[ -n ${bad_users} ]] ; then
-			echo
-			ewarn "The following users lack passwords!"
-			ewarn ${bad_users}
-		fi
-	fi
-
-	# whine about users with invalid shells #215698
-	if [[ -e "${EROOT}"/etc/passwd ]] ; then
-		local bad_shells=$(awk -F: 'system("test -e ${ROOT}" $7) { print $1 " - " $7}' "${EROOT}"/etc/passwd | sort)
-		if [[ -n ${bad_shells} ]] ; then
-			echo
-			ewarn "The following users have non-existent shells!"
-			ewarn "${bad_shells}"
-		fi
-	fi
-
-	# https://bugs.gentoo.org/361349
-	if use kernel_linux; then
-		mkdir -p "${EROOT}"/run || die
-
-		local found fstype mountpoint
-		while read -r _ mountpoint fstype _; do
-		[[ ${mountpoint} = /run ]] && [[ ${fstype} = tmpfs ]] && found=1
-		done < "${ROOT}"/proc/mounts
-		[[ -z ${found} ]] &&
-			ewarn "You should reboot now to get /run mounted with tmpfs!"
-	fi
-
-	for x in ${REPLACING_VERSIONS}; do
-		if ver_test 2.4 -lt ${x}; then
-			ewarn "After updating ${EROOT}/etc/profile, please run"
-			ewarn "env-update && . /etc/profile"
-		fi
-
-		if ver_test 2.6 -lt ${x}; then
-			ewarn "Please run env-update then log out and back in to"
-			ewarn "update your path."
-		fi
-		# clean up after 2.5 typos
-		# https://bugs.gentoo.org/show_bug.cgi?id=656380
-		if [[ ${x} == 2.5 ]]; then
-			rm -fr "${EROOT}/{,usr" || die
-		fi
-	done
-
-	if [[ -e "${EROOT}"/etc/env.d/00basic ]]; then
-		ewarn "${EROOT}/etc/env.d/00basic is now ${EROOT}/etc/env.d/50baselayout"
-		ewarn "Please migrate your changes."
-	fi
-}
diff --git a/sys-apps/baselayout/baselayout-2.8-r3.ebuild b/sys-apps/baselayout/baselayout-2.8-r3.ebuild
deleted file mode 100644
index b7fc36bdb833..000000000000
--- a/sys-apps/baselayout/baselayout-2.8-r3.ebuild
+++ /dev/null
@@ -1,370 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib prefix
-
-DESCRIPTION="Filesystem baselayout and init scripts"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-if [[ ${PV} = 9999 ]]; then
-	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.bz2"
-	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
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="build +split-usr"
-
-RDEPEND="!sys-apps/baselayout-prefix"
-
-pkg_setup() {
-	multilib_layout
-}
-
-riscv_compat_symlink() {
-	# Here we apply some special sauce for riscv.
-	# Two multilib layouts exist for now:
-	# 1) one level libdirs, (32bit) "lib" and (64bit) "lib64"
-	#    these are chosen by us to closely resemble other arches
-	# 2) two level libdirs, "lib64/lp64d" "lib64/lp64" "lib32/ilp32d" ...
-	#    this is the glibc/gcc default
-	# Unfortunately, the default has only one fallback, which is "lib"
-	# for both 32bit and 64bit. So things do not break in 1), we need
-	# to provide compatibility symlinks...
-
-	# This function has exactly two parameters:
-	# - the default libdir, to determine if 1) or 2) applies
-	# - the location of the symlink (which points to ".")
-
-	# Note: we call this only in the ${SYMLINK_LIB} = no codepath, since
-	# there never was a ${SYMLINK_LIB} = yes riscv profile.
-
-	case ${CHOST} in
-	riscv*)
-		# are we on a one level libdir profile? is there no symlink yet?
-		if [[ ${1} != */* && ! -L ${2} ]] ; then
-			ln -s . $2 || die "Unable to make $2 riscv compatibility symlink"
-		fi
-		;;
-	esac
-}
-
-# Create our multilib dirs - the Makefile has no knowledge of this
-multilib_layout() {
-	local dir def_libdir libdir libdirs
-	local prefix prefix_lst
-	def_libdir=$(get_abi_LIBDIR $DEFAULT_ABI)
-	libdirs=$(get_all_libdirs)
-
-	if [[ -z "${SYMLINK_LIB}" || ${SYMLINK_LIB} = no ]] ; then
-		prefix_lst=( "${EROOT}"/{,usr/,usr/local/} )
-		for prefix in "${prefix_lst[@]}"; do
-			for libdir in ${libdirs}; do
-				dir="${prefix}${libdir}"
-				if [[ -e "${dir}" ]]; then
-					[[ ! -d "${dir}" ]] &&
-						die "${dir} exists but is not a directory"
-					continue
-				fi
-				if ! use split-usr && [[ ${prefix} = ${EROOT}/ ]]; then
-					libdir="${libdir%%/*}"
-					dir="${prefix}${libdir}"
-					einfo "symlinking ${dir} to usr/${libdir}"
-					ln -s usr/${libdir} ${dir} ||
-						die "Unable to make ${dir} symlink"
-				else
-					einfo "creating directory ${dir}"
-					mkdir -p "${dir}" ||
-						die "Unable to create ${dir} directory"
-				fi
-			done
-			riscv_compat_symlink "${def_libdir}" "${prefix}${def_libdir}/${DEFAULT_ABI}"
-		done
-		return 0
-	fi
-
-	[ -z "${def_libdir}" ] &&
-		die "your DEFAULT_ABI=$DEFAULT_ABI appears to be invalid"
-
-	# figure out which paths should be symlinks and which should be directories
-	local dirs syms exp d
-	for libdir in ${libdirs} ; do
-		if use split-usr ; then
-			exp=( {,usr/,usr/local/}${libdir} )
-		else
-			exp=( {usr/,usr/local/}${libdir} )
-		fi
-		for d in "${exp[@]}" ; do
-			# most things should be dirs
-			if [ "${SYMLINK_LIB}" = "yes" ] && [ "${libdir}" = "lib" ] ; then
-				[ ! -h "${d}" ] && [ -e "${d}" ] && dirs+=" ${d}"
-			else
-				[ -h "${d}" ] && syms+=" ${d}"
-			fi
-		done
-	done
-	if [ -n "${syms}${dirs}" ] ; then
-		ewarn "Your system profile has SYMLINK_LIB=${SYMLINK_LIB:-no}, so that means you need to"
-		ewarn "have these paths configured as follows:"
-		[ -n "${dirs}" ] && ewarn "symlinks to '${def_libdir}':${dirs}"
-		[ -n "${syms}" ] && ewarn "directories:${syms}"
-		ewarn "The ebuild will attempt to fix these, but only for trivial conversions."
-		ewarn "If things fail, you will need to manually create/move the directories."
-		echo
-	fi
-
-	# setup symlinks and dirs where we expect them to be; do not migrate
-	# data ... just fall over in that case.
-	if use split-usr ; then
-		prefix_lst=( "${EROOT}"/{,usr/,usr/local/} )
-	else
-		prefix_lst=( "${EROOT}"/{usr/,usr/local/} )
-	fi
-	for prefix in "${prefix_lst[@]}"; do
-		if [ "${SYMLINK_LIB}" = yes ] ; then
-			# we need to make sure "lib" points to the native libdir
-			if [ -h "${prefix}lib" ] ; then
-				# it's already a symlink!  assume it's pointing to right place ...
-				continue
-			elif [ -d "${prefix}lib" ] ; then
-				# "lib" is a dir, so need to convert to a symlink
-				ewarn "Converting ${prefix}lib from a dir to a symlink"
-				rm -f "${prefix}lib"/.keep || die
-				if rmdir "${prefix}lib" 2>/dev/null ; then
-					ln -s ${def_libdir} "${prefix}lib" || die
-				else
-					die "non-empty dir found where we needed a symlink: ${prefix}lib"
-				fi
-			else
-				# nothing exists, so just set it up sanely
-				ewarn "Initializing ${prefix}lib as a symlink"
-				mkdir -p "${prefix}" || die
-				rm -f "${prefix}lib" || die
-				ln -s ${def_libdir} "${prefix}lib" || die
-				mkdir -p "${prefix}${def_libdir}" || die #423571
-			fi
-		else
-			# we need to make sure "lib" is a dir
-			if [ -h "${prefix}lib" ] ; then
-				# "lib" is a symlink, so need to convert to a dir
-				ewarn "Converting ${prefix}lib from a symlink to a dir"
-				rm -f "${prefix}lib" || die
-				if [ -d "${prefix}lib32" ] ; then
-					ewarn "Migrating ${prefix}lib32 to ${prefix}lib"
-					mv "${prefix}lib32" "${prefix}lib" || die
-				else
-					mkdir -p "${prefix}lib" || die
-				fi
-			elif [ -d "${prefix}lib" ] && ! has lib32 ${libdirs} ; then
-				# make sure the old "lib" ABI location does not exist; we
-				# only symlinked the lib dir on systems where we moved it
-				# to "lib32" ...
-				case ${CHOST} in
-				*-gentoo-freebsd*) ;; # We want it the other way on fbsd.
-				i?86*|x86_64*|powerpc*|sparc*|s390*)
-					if [[ -d ${prefix}lib32 && ! -h ${prefix}lib32 ]] ; then
-						rm -f "${prefix}lib32"/.keep || die
-						if ! rmdir "${prefix}lib32" 2>/dev/null ; then
-							ewarn "You need to merge ${prefix}lib32 into ${prefix}lib"
-							die "non-empty dir found where there should be none: ${prefix}lib32"
-						fi
-					fi
-					;;
-				esac
-			else
-				# nothing exists, so just set it up sanely
-				ewarn "Initializing ${prefix}lib as a dir"
-				mkdir -p "${prefix}lib" || die
-			fi
-		fi
-	done
-	if ! use split-usr ; then
-		for libdir in ${libdirs}; do
-			if [[ ! -e "${EROOT}${libdir}" ]]; then
-				ln -s usr/"${libdir}" "${EROOT}${libdir}" ||
-					die "Unable to make ${EROOT}${libdir} symlink"
-			fi
-		done
-	fi
-}
-
-pkg_preinst() {
-	# This is written in src_install (so it's in CONTENTS), but punt all
-	# pending updates to avoid user having to do etc-update (and make the
-	# pkg_postinst logic simpler).
-	rm -f "${EROOT}"/etc/._cfg????_gentoo-release || die
-
-	# We need to install directories and maybe some dev nodes when building
-	# stages, but they cannot be in CONTENTS.
-	# Also, we cannot reference $S as binpkg will break so we do this.
-	multilib_layout
-	if use build ; then
-		if use split-usr ; then
-			emake -C "${ED}/usr/share/${PN}" DESTDIR="${EROOT}" layout
-		else
-			emake -C "${ED}/usr/share/${PN}" DESTDIR="${EROOT}" layout-usrmerge
-		fi
-	fi
-	rm -f "${ED}"/usr/share/${PN}/Makefile || die
-}
-
-src_prepare() {
-	default
-
-	# don't want symlinked directories in PATH on systems with usr-merge
-	if ! use split-usr && ! use prefix-guest; then
-		sed \
-			-e 's|:/usr/sbin:|:|g' \
-			-e 's|:/sbin:|:|g' \
-			-e 's|:/bin:|:|g' \
-			-i etc/env.d/50baselayout || die
-	fi
-
-	if use prefix; then
-		hprefixify -e "/EUID/s,0,${EUID}," -q '"' etc/profile
-		hprefixify etc/shells share.Linux/passwd
-		hprefixify -w '/PATH=/' etc/env.d/50baselayout
-		hprefixify -w 1 etc/env.d/50baselayout
-		echo PATH=/usr/sbin:/sbin:/usr/bin:/bin >> etc/env.d/99host
-
-		# change branding
-		sed -i \
-			-e '/gentoo-release/s/Gentoo Base/Gentoo Prefix Base/' \
-			-e '/make_os_release/s/${OS}/Prefix/' \
-			Makefile || die
-	fi
-
-	# handle multilib paths.  do it here because we want this behavior
-	# regardless of the C library that you're using.  we do explicitly
-	# list paths which the native ldconfig searches, but this isn't
-	# problematic as it doesn't change the resulting ld.so.cache or
-	# take longer to generate.  similarly, listing both the native
-	# path and the symlinked path doesn't change the resulting cache.
-	local libdir ldpaths
-	for libdir in $(get_all_libdirs) ; do
-		if use split-usr || use prefix-guest; then
-			ldpaths+=":${EPREFIX}/${libdir}"
-		fi
-		ldpaths+=":${EPREFIX}/usr/${libdir}"
-		ldpaths+=":${EPREFIX}/usr/local/${libdir}"
-	done
-	echo "LDPATH='${ldpaths#:}'" >> etc/env.d/50baselayout
-}
-
-src_install() {
-	emake \
-		OS=Linux \
-		DESTDIR="${ED}" \
-		install
-
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		# add SDK path which contains development manpages
-		echo "MANPATH=${EPREFIX}/MacOSX.sdk/usr/share/man" \
-			> "${ED}"/etc/env.d/98macos-sdk
-	fi
-
-	# need the makefile in pkg_preinst
-	insinto /usr/share/${PN}
-	doins Makefile
-
-	dodoc ChangeLog
-
-	# bug 858596
-	if use prefix-guest ; then
-		dodir sbin
-		cat > "${ED}"/sbin/runscript <<- EOF
-			#!/usr/bin/env sh
-			source "${EPREFIX}/lib/gentoo/functions.sh"
-
-			eerror "runscript/openrc-run not supported by Gentoo Prefix Base System release ${PV}" 1>&2
-			exit 1
-		EOF
-		chmod 755 "${ED}"/sbin/runscript || die
-		cp "${ED}"/sbin/{runscript,openrc-run} || die
-	fi
-}
-
-pkg_postinst() {
-	local x
-
-	# We installed some files to /usr/share/baselayout instead of /etc to stop
-	# (1) overwriting the user's settings
-	# (2) screwing things up when attempting to merge files
-	# (3) accidentally packaging up personal files with quickpkg
-	# If they don't exist then we install them
-	for x in master.passwd passwd shadow group fstab ; do
-		[ -e "${EROOT}/etc/${x}" ] && continue
-		[ -e "${EROOT}/usr/share/baselayout/${x}" ] || continue
-		cp -p "${EROOT}/usr/share/baselayout/${x}" "${EROOT}"/etc || die
-	done
-
-	# Force shadow permissions to not be world-readable #260993
-	for x in shadow ; do
-		if [ -e "${EROOT}/etc/${x}" ] ; then
-			chmod o-rwx "${EROOT}/etc/${x}" || die
-		fi
-	done
-
-	# Take care of the etc-update for the user
-	if [ -e "${EROOT}"/etc/._cfg0000_gentoo-release ] ; then
-		mv "${EROOT}"/etc/._cfg0000_gentoo-release "${EROOT}"/etc/gentoo-release || die
-	fi
-
-	# whine about users that lack passwords #193541
-	if [[ -e "${EROOT}"/etc/shadow ]] ; then
-		local bad_users=$(sed -n '/^[^:]*::/s|^\([^:]*\)::.*|\1|p' "${EROOT}"/etc/shadow)
-		if [[ -n ${bad_users} ]] ; then
-			echo
-			ewarn "The following users lack passwords!"
-			ewarn ${bad_users}
-		fi
-	fi
-
-	# whine about users with invalid shells #215698
-	if [[ -e "${EROOT}"/etc/passwd ]] ; then
-		local bad_shells=$(awk -F: 'system("test -e ${ROOT}" $7) { print $1 " - " $7}' "${EROOT}"/etc/passwd | sort)
-		if [[ -n ${bad_shells} ]] ; then
-			echo
-			ewarn "The following users have non-existent shells!"
-			ewarn "${bad_shells}"
-		fi
-	fi
-
-	# https://bugs.gentoo.org/361349
-	if use kernel_linux; then
-		mkdir -p "${EROOT}"/run || die
-
-		local found fstype mountpoint
-		while read -r _ mountpoint fstype _; do
-		[[ ${mountpoint} = /run ]] && [[ ${fstype} = tmpfs ]] && found=1
-		done < "${ROOT}"/proc/mounts
-		[[ -z ${found} ]] &&
-			ewarn "You should reboot now to get /run mounted with tmpfs!"
-	fi
-
-	for x in ${REPLACING_VERSIONS}; do
-		if ver_test 2.4 -lt ${x}; then
-			ewarn "After updating ${EROOT}/etc/profile, please run"
-			ewarn "env-update && . /etc/profile"
-		fi
-
-		if ver_test 2.6 -lt ${x}; then
-			ewarn "Please run env-update then log out and back in to"
-			ewarn "update your path."
-		fi
-		# clean up after 2.5 typos
-		# https://bugs.gentoo.org/show_bug.cgi?id=656380
-		if [[ ${x} == 2.5 ]]; then
-			rm -fr "${EROOT}/{,usr" || die
-		fi
-	done
-
-	if [[ -e "${EROOT}"/etc/env.d/00basic ]]; then
-		ewarn "${EROOT}/etc/env.d/00basic is now ${EROOT}/etc/env.d/50baselayout"
-		ewarn "Please migrate your changes."
-	fi
-}
diff --git a/sys-apps/baselayout/baselayout-2.8.ebuild b/sys-apps/baselayout/baselayout-2.8.ebuild
deleted file mode 100644
index 5767ed31ca80..000000000000
--- a/sys-apps/baselayout/baselayout-2.8.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
-
-inherit multilib prefix
-
-DESCRIPTION="Filesystem baselayout and init scripts"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-if [[ ${PV} = 9999 ]]; then
-	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.bz2"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="build +split-usr"
-
-pkg_setup() {
-	multilib_layout
-}
-
-riscv_compat_symlink() {
-	# Here we apply some special sauce for riscv.
-	# Two multilib layouts exist for now:
-	# 1) one level libdirs, (32bit) "lib" and (64bit) "lib64"
-	#    these are chosen by us to closely resemble other arches
-	# 2) two level libdirs, "lib64/lp64d" "lib64/lp64" "lib32/ilp32d" ...
-	#    this is the glibc/gcc default
-	# Unfortunately, the default has only one fallback, which is "lib"
-	# for both 32bit and 64bit. So things do not break in 1), we need
-	# to provide compatibility symlinks...
-
-	# This function has exactly two parameters:
-	# - the default libdir, to determine if 1) or 2) applies
-	# - the location of the symlink (which points to ".")
-
-	# Note: we call this only in the ${SYMLINK_LIB} = no codepath, since
-	# there never was a ${SYMLINK_LIB} = yes riscv profile.
-
-	case ${CHOST} in
-	riscv*)
-		# are we on a one level libdir profile? is there no symlink yet?
-		if [[ ${1} != */* && ! -L ${2} ]] ; then
-			ln -s . $2 || die "Unable to make $2 riscv compatibility symlink"
-		fi
-		;;
-	esac
-}
-
-# Create our multilib dirs - the Makefile has no knowledge of this
-multilib_layout() {
-	local dir def_libdir libdir libdirs
-	local prefix prefix_lst
-	def_libdir=$(get_abi_LIBDIR $DEFAULT_ABI)
-	libdirs=$(get_all_libdirs)
-
-	if [[ -z "${SYMLINK_LIB}" || ${SYMLINK_LIB} = no ]] ; then
-		prefix_lst=( "${EROOT}"/{,usr/,usr/local/} )
-		for prefix in "${prefix_lst[@]}"; do
-			for libdir in ${libdirs}; do
-				dir="${prefix}${libdir}"
-				if [[ -e "${dir}" ]]; then
-					[[ ! -d "${dir}" ]] &&
-						die "${dir} exists but is not a directory"
-					continue
-				fi
-				if ! use split-usr && [[ ${prefix} = ${EROOT}/ ]]; then
-					libdir="${libdir%%/*}"
-					dir="${prefix}${libdir}"
-					einfo "symlinking ${dir} to usr/${libdir}"
-					ln -s usr/${libdir} ${dir} ||
-						die "Unable to make ${dir} symlink"
-				else
-					einfo "creating directory ${dir}"
-					mkdir -p "${dir}" ||
-						die "Unable to create ${dir} directory"
-				fi
-			done
-			riscv_compat_symlink "${def_libdir}" "${prefix}${def_libdir}/${DEFAULT_ABI}"
-		done
-		return 0
-	fi
-
-	[ -z "${def_libdir}" ] &&
-		die "your DEFAULT_ABI=$DEFAULT_ABI appears to be invalid"
-
-	# figure out which paths should be symlinks and which should be directories
-	local dirs syms exp d
-	for libdir in ${libdirs} ; do
-		if use split-usr ; then
-			exp=( {,usr/,usr/local/}${libdir} )
-		else
-			exp=( {usr/,usr/local/}${libdir} )
-		fi
-		for d in "${exp[@]}" ; do
-			# most things should be dirs
-			if [ "${SYMLINK_LIB}" = "yes" ] && [ "${libdir}" = "lib" ] ; then
-				[ ! -h "${d}" ] && [ -e "${d}" ] && dirs+=" ${d}"
-			else
-				[ -h "${d}" ] && syms+=" ${d}"
-			fi
-		done
-	done
-	if [ -n "${syms}${dirs}" ] ; then
-		ewarn "Your system profile has SYMLINK_LIB=${SYMLINK_LIB:-no}, so that means you need to"
-		ewarn "have these paths configured as follows:"
-		[ -n "${dirs}" ] && ewarn "symlinks to '${def_libdir}':${dirs}"
-		[ -n "${syms}" ] && ewarn "directories:${syms}"
-		ewarn "The ebuild will attempt to fix these, but only for trivial conversions."
-		ewarn "If things fail, you will need to manually create/move the directories."
-		echo
-	fi
-
-	# setup symlinks and dirs where we expect them to be; do not migrate
-	# data ... just fall over in that case.
-	if use split-usr ; then
-		prefix_lst=( "${EROOT}"/{,usr/,usr/local/} )
-	else
-		prefix_lst=( "${EROOT}"/{usr/,usr/local/} )
-	fi
-	for prefix in "${prefix_lst[@]}"; do
-		if [ "${SYMLINK_LIB}" = yes ] ; then
-			# we need to make sure "lib" points to the native libdir
-			if [ -h "${prefix}lib" ] ; then
-				# it's already a symlink!  assume it's pointing to right place ...
-				continue
-			elif [ -d "${prefix}lib" ] ; then
-				# "lib" is a dir, so need to convert to a symlink
-				ewarn "Converting ${prefix}lib from a dir to a symlink"
-				rm -f "${prefix}lib"/.keep || die
-				if rmdir "${prefix}lib" 2>/dev/null ; then
-					ln -s ${def_libdir} "${prefix}lib" || die
-				else
-					die "non-empty dir found where we needed a symlink: ${prefix}lib"
-				fi
-			else
-				# nothing exists, so just set it up sanely
-				ewarn "Initializing ${prefix}lib as a symlink"
-				mkdir -p "${prefix}" || die
-				rm -f "${prefix}lib" || die
-				ln -s ${def_libdir} "${prefix}lib" || die
-				mkdir -p "${prefix}${def_libdir}" || die #423571
-			fi
-		else
-			# we need to make sure "lib" is a dir
-			if [ -h "${prefix}lib" ] ; then
-				# "lib" is a symlink, so need to convert to a dir
-				ewarn "Converting ${prefix}lib from a symlink to a dir"
-				rm -f "${prefix}lib" || die
-				if [ -d "${prefix}lib32" ] ; then
-					ewarn "Migrating ${prefix}lib32 to ${prefix}lib"
-					mv "${prefix}lib32" "${prefix}lib" || die
-				else
-					mkdir -p "${prefix}lib" || die
-				fi
-			elif [ -d "${prefix}lib" ] && ! has lib32 ${libdirs} ; then
-				# make sure the old "lib" ABI location does not exist; we
-				# only symlinked the lib dir on systems where we moved it
-				# to "lib32" ...
-				case ${CHOST} in
-				*-gentoo-freebsd*) ;; # We want it the other way on fbsd.
-				i?86*|x86_64*|powerpc*|sparc*|s390*)
-					if [[ -d ${prefix}lib32 && ! -h ${prefix}lib32 ]] ; then
-						rm -f "${prefix}lib32"/.keep || die
-						if ! rmdir "${prefix}lib32" 2>/dev/null ; then
-							ewarn "You need to merge ${prefix}lib32 into ${prefix}lib"
-							die "non-empty dir found where there should be none: ${prefix}lib32"
-						fi
-					fi
-					;;
-				esac
-			else
-				# nothing exists, so just set it up sanely
-				ewarn "Initializing ${prefix}lib as a dir"
-				mkdir -p "${prefix}lib" || die
-			fi
-		fi
-	done
-	if ! use split-usr ; then
-		for libdir in ${libdirs}; do
-			if [[ ! -e "${EROOT}${libdir}" ]]; then
-				ln -s usr/"${libdir}" "${EROOT}${libdir}" ||
-					die "Unable to make ${EROOT}${libdir} symlink"
-			fi
-		done
-	fi
-}
-
-pkg_preinst() {
-	# This is written in src_install (so it's in CONTENTS), but punt all
-	# pending updates to avoid user having to do etc-update (and make the
-	# pkg_postinst logic simpler).
-	rm -f "${EROOT}"/etc/._cfg????_gentoo-release || die
-
-	# We need to install directories and maybe some dev nodes when building
-	# stages, but they cannot be in CONTENTS.
-	# Also, we cannot reference $S as binpkg will break so we do this.
-	multilib_layout
-	if use build ; then
-		if use split-usr ; then
-			emake -C "${ED}/usr/share/${PN}" DESTDIR="${EROOT}" layout
-		else
-			emake -C "${ED}/usr/share/${PN}" DESTDIR="${EROOT}" layout-usrmerge
-		fi
-	fi
-	rm -f "${ED}"/usr/share/${PN}/Makefile || die
-}
-
-src_prepare() {
-	default
-	if use prefix; then
-		hprefixify -e "/EUID/s,0,${EUID}," -q '"' etc/profile
-		hprefixify etc/{env.d/50baselayout,shells} share.Linux/passwd
-		echo PATH=/usr/sbin:/sbin:/usr/bin:/bin >> etc/env.d/99host
-	fi
-
-	# don't want symlinked directories in PATH on systems with usr-merge
-	if ! use split-usr; then
-		sed \
-			-e 's|/usr/local/sbin:||g' \
-			-e 's|:/usr/sbin:|:|g' \
-			-e 's|:/sbin:|:|g' \
-			-e 's|:/bin:|:|g' \
-			-i etc/env.d/50baselayout || die
-	fi
-
-	# handle multilib paths.  do it here because we want this behavior
-	# regardless of the C library that you're using.  we do explicitly
-	# list paths which the native ldconfig searches, but this isn't
-	# problematic as it doesn't change the resulting ld.so.cache or
-	# take longer to generate.  similarly, listing both the native
-	# path and the symlinked path doesn't change the resulting cache.
-	local libdir ldpaths
-	for libdir in $(get_all_libdirs) ; do
-		use split-usr && ldpaths+=":${EPREFIX}/${libdir}"
-		ldpaths+=":${EPREFIX}/usr/${libdir}"
-		ldpaths+=":${EPREFIX}/usr/local/${libdir}"
-	done
-	echo "LDPATH='${ldpaths#:}'" >> etc/env.d/50baselayout
-}
-
-src_install() {
-	emake \
-		OS=Linux \
-		DESTDIR="${ED}" \
-		install
-
-	# need the makefile in pkg_preinst
-	insinto /usr/share/${PN}
-	doins Makefile
-
-	dodoc ChangeLog
-}
-
-pkg_postinst() {
-	local x
-
-	# We installed some files to /usr/share/baselayout instead of /etc to stop
-	# (1) overwriting the user's settings
-	# (2) screwing things up when attempting to merge files
-	# (3) accidentally packaging up personal files with quickpkg
-	# If they don't exist then we install them
-	for x in master.passwd passwd shadow group fstab ; do
-		[ -e "${EROOT}/etc/${x}" ] && continue
-		[ -e "${EROOT}/usr/share/baselayout/${x}" ] || continue
-		cp -p "${EROOT}/usr/share/baselayout/${x}" "${EROOT}"/etc || die
-	done
-
-	# Force shadow permissions to not be world-readable #260993
-	for x in shadow ; do
-		if [ -e "${EROOT}/etc/${x}" ] ; then
-			chmod o-rwx "${EROOT}/etc/${x}" || die
-		fi
-	done
-
-	# Take care of the etc-update for the user
-	if [ -e "${EROOT}"/etc/._cfg0000_gentoo-release ] ; then
-		mv "${EROOT}"/etc/._cfg0000_gentoo-release "${EROOT}"/etc/gentoo-release || die
-	fi
-
-	# whine about users that lack passwords #193541
-	if [[ -e "${EROOT}"/etc/shadow ]] ; then
-		local bad_users=$(sed -n '/^[^:]*::/s|^\([^:]*\)::.*|\1|p' "${EROOT}"/etc/shadow)
-		if [[ -n ${bad_users} ]] ; then
-			echo
-			ewarn "The following users lack passwords!"
-			ewarn ${bad_users}
-		fi
-	fi
-
-	# whine about users with invalid shells #215698
-	if [[ -e "${EROOT}"/etc/passwd ]] ; then
-		local bad_shells=$(awk -F: 'system("test -e ${ROOT}" $7) { print $1 " - " $7}' "${EROOT}"/etc/passwd | sort)
-		if [[ -n ${bad_shells} ]] ; then
-			echo
-			ewarn "The following users have non-existent shells!"
-			ewarn "${bad_shells}"
-		fi
-	fi
-
-	# https://bugs.gentoo.org/361349
-	if use kernel_linux; then
-		mkdir -p "${EROOT}"/run || die
-
-		local found fstype mountpoint
-		while read -r _ mountpoint fstype _; do
-		[[ ${mountpoint} = /run ]] && [[ ${fstype} = tmpfs ]] && found=1
-		done < "${ROOT}"/proc/mounts
-		[[ -z ${found} ]] &&
-			ewarn "You should reboot now to get /run mounted with tmpfs!"
-	fi
-
-	for x in ${REPLACING_VERSIONS}; do
-		if ver_test 2.4 -lt ${x}; then
-			ewarn "After updating ${EROOT}/etc/profile, please run"
-			ewarn "env-update && . /etc/profile"
-		fi
-
-		if ver_test 2.6 -lt ${x}; then
-			ewarn "Please run env-update then log out and back in to"
-			ewarn "update your path."
-		fi
-		# clean up after 2.5 typos
-		# https://bugs.gentoo.org/show_bug.cgi?id=656380
-		if [[ ${x} == 2.5 ]]; then
-			rm -fr "${EROOT}/{,usr" || die
-		fi
-	done
-
-	if [[ -e "${EROOT}"/etc/env.d/00basic ]]; then
-		ewarn "${EROOT}/etc/env.d/00basic is now ${EROOT}/etc/env.d/50baselayout"
-		ewarn "Please migrate your changes."
-	fi
-}
diff --git a/sys-apps/baselayout/baselayout-2.9.ebuild b/sys-apps/baselayout/baselayout-2.9.ebuild
index b7fc36bdb833..6cb197c3c6fe 100644
--- a/sys-apps/baselayout/baselayout-2.9.ebuild
+++ b/sys-apps/baselayout/baselayout-2.9.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} = 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.bz2"
-	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
 
 LICENSE="GPL-2"
diff --git a/sys-apps/nvme-cli/Manifest b/sys-apps/nvme-cli/Manifest
index 31d6a1458905..3cf80e128d81 100644
--- a/sys-apps/nvme-cli/Manifest
+++ b/sys-apps/nvme-cli/Manifest
@@ -4,14 +4,10 @@ AUX nvme-cli-2.0-bash-completions.patch 1803 BLAKE2B fd201e60a66b1fbc61f13c00246
 AUX nvme-cli-2.2-docdir.patch 552 BLAKE2B 9edb2b884ff26a227c90f13ad9e7a110c284bca27c72fe06346587aa799d7c32c0820a49b565a3c2e77dd5b5a024ad346b2f6c71bee32d10bcdc9329abe81d79 SHA512 c865d1374ebe321b5a1c36f8d0b71965521d19e5f6ab50e0977776768f8cc4a104eb7ca5ad2a07a94865d60b2fbd6618fa1744058c66e3dc65d42bed6105e10d
 DIST nvme-cli-1.16.tar.gz 598246 BLAKE2B 8aef6ae82ec9a2c67de6c69addd72c87ade6554e6d374c717f8e3c0585565974a2b2870eb172b3ebdc1ae307bd3a55a14a17d3feea8d437265db136b434b519f SHA512 c713eb15b979ad17791cf95717b42d5f638cb4803d646bca1f4825e6bb50f086226b44b108b61571709b2cb615ae6ba86dbad309f675b240ebd3968d1cf536ff
 DIST nvme-cli-2.0.tar.gz 646320 BLAKE2B 81a8161091071be4e98d4feb78b3f3edaed07262212a8950c1882e3b46f38cd82d8cd8bfec62b3971feda6e82d297338e5541c8eda33c8b6f714d3b3ce000c25 SHA512 24a00ee8e0fc963c1757797413ff5725cec18f821a714d6bbbf37906010d72934d6fdd7b466c085f13716a5279d1a7bd3254ee474e37a0ecd00a85ef23e12417
-DIST nvme-cli-2.1.1.tar.gz 674354 BLAKE2B 2cb995195328a9c91644ff32676eb3a6d9f1927a004ed75d2be0a746f45050b8ae927924a1095a787ea10618bd600133237852f56116c1db25c4eaa03ea9dab5 SHA512 61a8e7c0ae8da082ac0cda2fdf61ffe8d83ed5d4ee31640bde89fde929ba3fe6d788950bd232630af2c7fc5f3563f05f47f350e005c8556691e5aede73c88d74
 DIST nvme-cli-2.1.2.tar.gz 674414 BLAKE2B e71e32a371c2cebfd7f66539490baa8e8074c5bd21afa2470e73c763c752318ca5abc1fe1a4d3f346137dcdbb604889a23955269f209222384a629e8d6817d6a SHA512 2162a6967a221a4ae7e0261748c26a10ff43d5b592039e29578d8310cf176428d528c2d510c0b58419b70bd6d28f4d2c77f0cd27606d87079c64289d5d14f930
 DIST nvme-cli-2.2.1.gh.tar.gz 706199 BLAKE2B e0026fc2ee3edeffa18b0fc8365703e3de6f69cdd665878e8589fefa334ddb78f3fdf2768bd5a141dc27b0a7403d0fd7472db763e7e41b55a3cac314105faac3 SHA512 8efa94d49a4d443cdb0310386733e88117f17719b05044f11e63e2a09143fce55918171b457a467371263ebb2e36552558aad249ae4dbd27941af79fe9722e26
 EBUILD nvme-cli-1.16-r1.ebuild 1394 BLAKE2B bd2e45a72c07efd6e48b5872f43353817550ac4e7c4c31efc9b1b6f4e5736ac4298b2505c9d55537ecf701933bb470368a44df0587fa0a59d51a562f56273148 SHA512 63d4ef1730a6cb1fee4a331a8df795637935fc00d994f09a1d9d060d18726081ea7a2098c33187a23c4b81cec0742967fcb7ae9e1b9a107579f09a4d6ac765aa
-EBUILD nvme-cli-1.16.ebuild 1330 BLAKE2B dca5bcee7da2e65799bed14ba6eec3484b19d025061f1068d343891f2e76aa2c000c017b03bc977be76f51d9b0d38180ba7e44e6d7ce27eeed338a2b1741ba07 SHA512 44c68fa403731bd0d8f54f361e6d7b84cbb7f9222f7070ef174354c29e0314fa1007f0c1caba48e30afb607e5a6c56f355eb2d02b80079f62a8c2defc073b55f
 EBUILD nvme-cli-2.0-r1.ebuild 916 BLAKE2B 562795a3d62c792d35042187d614813605e900a7614fdbe67261541a0470671af215a12db322a6c80ddf062366239a7281bae2ba7080e717c7e3fe85de648911 SHA512 403efef199a73a7e7fc3b86612b8c2d1c5b2a5dfe9d1816651f0146fc1fe0322805e33e9ecda6db7f5ca9de4b608b853dd7d383f1cfa6a464925a4d9a4cec137
-EBUILD nvme-cli-2.0.ebuild 839 BLAKE2B 92d5d8df41fa282553ac4e0d652d047c90c327281a76282222f50cfd7b60d6b384fb3335102102d6a9873029fe54b5cb9a0848c26943dd63206b48c6cabca34f SHA512 6a84afa8302af8382e1d9c7e6b361fc4d1c287994c497a3706e34676de08bdad58f48d597087522942c7831edbc7e0213a9f4af54f59e8dff996fdd00d2332c9
-EBUILD nvme-cli-2.1.1.ebuild 845 BLAKE2B d8f1ec5ef3a4902d631f410f94b79fe2662f99b5193074cb4efef918c1f68691ef7bceabd8774e7e72239d22bf5ca4f77abacbd9a7a9aaf0fbd15207e13d9289 SHA512 577ce12620c001d90b77bcc4785a78471e4f3964369b2be36a782fc74a5885555a6d5bae8d64836a669b2054fdc87830680e985c515fc769558f8730b9c4be83
 EBUILD nvme-cli-2.1.2.ebuild 854 BLAKE2B 93f1b657ff20ab781248a048d8ae71aefc51c86e5ab555171d2b72082ce543d4623c5e8a64c346aedb49413a2905a741b1987703aeaf7ada6619fda0422dc71c SHA512 18d9b36f1a9e1c91ecee2cba888a7ecb62864261130ddcbe0c03a80bddd8f9294fe77f5b20316a4df821baee7971b88f166628f1f93f9a949cbc78ac0a5a3b4e
 EBUILD nvme-cli-2.2.1.ebuild 974 BLAKE2B 005f0d1a21c220f7ee5899494121bacc32ce5e60862e14ac1a187cbd174a4e89979da24d81c992456f6f85256567c939c9719e4f5452f156af4f979186a27c8f SHA512 7da8ed81c8842e6f96ee142accac31aaab9431979eb746dab55d28cfdccf8323d2c30eaa48f4dc7058e856752078efe59d7251999a40d711eee93c236d668215
-MISC metadata.xml 710 BLAKE2B c0e034a1cd0f8f4dd116ec716ec8f05dde352dfacde82df494c640a761d80a09683b305aa0e66819f15c363a7d50116cc1d1d216f96792b5ed190804d50cfd5a SHA512 07d939ea3961b3e4e6ebd22a596904c1b09c1afb1e3dd69c167814c58de37132f0d5eabd007d301ee9abc82048ea8b5af1bb2ac068944ff6425f035e7d79bb49
+MISC metadata.xml 617 BLAKE2B 1d1de414ebd3b5c03b3ae800dd4ba17ac1f7139142c5ab77c8e1e5bc3d2a936f20f5c874733e697128f2adebb27cb6b6f2ad136e76e56d712fe353f909bdc672 SHA512 96ae457f166961fc274dd11ac655d39d549a26366a1d6e0e0a59d9efee1ca2fe5cd168d458fa12f3ac27e646b160f2c90154372478f387f3ace09f2ff0a61840
diff --git a/sys-apps/nvme-cli/metadata.xml b/sys-apps/nvme-cli/metadata.xml
index ccf53ab56617..f9624e33a203 100644
--- a/sys-apps/nvme-cli/metadata.xml
+++ b/sys-apps/nvme-cli/metadata.xml
@@ -1,19 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>zmedico@gentoo.org</email>
-  </maintainer>
-  <maintainer type="person">
-    <name>Patrick McLean</name>
-    <email>chutzpah@gentoo.org</email>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">linux-nvme/nvme-cli</remote-id>
-  </upstream>
-  <use>
-    <flag name="json">Support JSON output via <pkg>dev-libs/json-c</pkg></flag>
-    <flag name="hugepages">Use huge pages for memory allocations via <pkg>sys-libs/libhugetlbfs</pkg></flag>
-    <flag name="uuid">UUID support via <pkg>sys-apps/util-linux</pkg></flag>
-  </use>
+	<maintainer type="project">
+		<email>base-system@gentoo.org</email>
+		<name>Gentoo Base System</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">linux-nvme/nvme-cli</remote-id>
+	</upstream>
+	<use>
+		<flag name="json">Support JSON output via <pkg>dev-libs/json-c</pkg></flag>
+		<flag name="hugepages">Use huge pages for memory allocations via <pkg>sys-libs/libhugetlbfs</pkg></flag>
+		<flag name="uuid">UUID support via <pkg>sys-apps/util-linux</pkg></flag>
+	</use>
 </pkgmetadata>
diff --git a/sys-apps/nvme-cli/nvme-cli-1.16.ebuild b/sys-apps/nvme-cli/nvme-cli-1.16.ebuild
deleted file mode 100644
index 57126d5159de..000000000000
--- a/sys-apps/nvme-cli/nvme-cli-1.16.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit systemd toolchain-funcs udev
-
-DESCRIPTION="NVM-Express user space tooling for Linux"
-HOMEPAGE="https://github.com/linux-nvme/nvme-cli"
-SRC_URI="https://github.com/linux-nvme/nvme-cli/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-RESTRICT="test"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 ~riscv x86"
-IUSE="hugepages +json systemd +uuid"
-
-RDEPEND="json? ( dev-libs/json-c:= )
-	hugepages? ( sys-libs/libhugetlbfs )
-	systemd? ( sys-apps/systemd:= )
-	uuid? ( sys-apps/util-linux:= )"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-musl-limits.patch
-)
-
-src_prepare() {
-	default
-
-	sed -e 's|^LIBUUID =|LIBUUID ?=|' \
-		-e 's|^LIBJSONC =|LIBJSONC ?=|' \
-		-e 's|^LIBHUGETLBFS =|LIBHUGETLBFS ?=|' \
-		-e 's|^HAVE_SYSTEMD =|HAVE_SYSTEMD ?=|' \
-		-e '/DESTDIROLD/d' \
-		-i Makefile || die
-}
-
-src_configure() {
-	tc-export CC
-
-	export PREFIX="${EPREFIX}/usr"
-
-	local unitdir="$(systemd_get_systemunitdir)"
-	export SYSTEMDDIR="${unitdir%/system}"
-	export UDEVDIR="${EPREFIX}$(get_udevdir)"
-
-	MAKEOPTS+=" LIBUUID=$(usex uuid 0 1)"
-	MAKEOPTS+=" LIBJSONC=$(usex json 0 1)"
-	MAKEOPTS+=" LIBHUGETLBFS=$(usex hugepages 0 1)"
-	MAKEOPTS+=" HAVE_SYSTEMD=$(usex systemd 0 1)"
-	MAKEOPTS+="  V=1"
-}
diff --git a/sys-apps/nvme-cli/nvme-cli-2.0.ebuild b/sys-apps/nvme-cli/nvme-cli-2.0.ebuild
deleted file mode 100644
index 33135e2e14ea..000000000000
--- a/sys-apps/nvme-cli/nvme-cli-2.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit meson systemd udev
-
-DESCRIPTION="NVM-Express user space tooling for Linux"
-HOMEPAGE="https://github.com/linux-nvme/nvme-cli"
-SRC_URI="https://github.com/linux-nvme/nvme-cli/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-RESTRICT="test"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
-IUSE="hugepages +json +uuid"
-
-RDEPEND="
-	sys-libs/libnvme:=[json=,uuid=]
-	hugepages? ( sys-libs/libhugetlbfs:= )
-	json? ( dev-libs/json-c:= )
-	uuid? ( sys-apps/util-linux:= )"
-
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-src_configure() {
-	local unitdir="$(systemd_get_systemunitdir)"
-	local emesonargs=(
-		-Dsystemddir=${unitdir%/system}
-		-Dudevrulesdir="${EPREFIX}"$(get_udevdir)
-	)
-	meson_src_configure
-}
diff --git a/sys-apps/nvme-cli/nvme-cli-2.1.1.ebuild b/sys-apps/nvme-cli/nvme-cli-2.1.1.ebuild
deleted file mode 100644
index 78d30a7452f5..000000000000
--- a/sys-apps/nvme-cli/nvme-cli-2.1.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit meson systemd udev
-
-DESCRIPTION="NVM-Express user space tooling for Linux"
-HOMEPAGE="https://github.com/linux-nvme/nvme-cli"
-SRC_URI="https://github.com/linux-nvme/nvme-cli/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-RESTRICT="test"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
-IUSE="hugepages +json +uuid"
-
-RDEPEND="
-	>=sys-libs/libnvme-1.1:=[json=,uuid=]
-	hugepages? ( sys-libs/libhugetlbfs:= )
-	json? ( dev-libs/json-c:= )
-	uuid? ( sys-apps/util-linux:= )"
-
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-src_configure() {
-	local unitdir="$(systemd_get_systemunitdir)"
-	local emesonargs=(
-		-Dsystemddir=${unitdir%/system}
-		-Dudevrulesdir="${EPREFIX}"$(get_udevdir)
-	)
-	meson_src_configure
-}
diff --git a/sys-apps/ppc64-diag/Manifest b/sys-apps/ppc64-diag/Manifest
index a9cc588d3019..bbffdc407316 100644
--- a/sys-apps/ppc64-diag/Manifest
+++ b/sys-apps/ppc64-diag/Manifest
@@ -3,6 +3,8 @@ AUX opal_errd.initd 374 BLAKE2B b463e484e60ea63afd2c4f27a4e8330ae6733ecd3e6925b4
 AUX rtas_errd.initd 371 BLAKE2B a5367e20d7732fc0b778349e740351fbd55049a08e456a859fc5d8a2e06418bc865b7ef5d27fb3ba420bb008ca7ee5b4781fc41393716d6e502cb691f602805b SHA512 a92128d9b5e31d1206999123734924e8e24833beba4e39b067fbb38bb16cbf174d1dbd51a1d27f294ba95da849020fd60e737ada35db98a7b6210cd06375c1de
 DIST ppc64-diag-2.7.7.tar.gz 423357 BLAKE2B b32def540811f383e401d352d17f2edce6a998a91a7b27bcab981e42469f44aaa505104ed2d2ced8a85485c0886525ff5128b36cdbad3a8eed90e8002877498c SHA512 42d94214345ab8deb7bd9ee8b145052fc2f733ba13d1567dbe6592fe9306670e3cd0ab6122e515464f7050753a992061c056e009673c7f8f6e554e9eaf75c550
 DIST ppc64-diag-2.7.8.tar.gz 424366 BLAKE2B e5e4791dffba4ede725051682019f0b75c2ee718fd33170912ccf228946fa56b4e63930a9b9c8d7e58ce27f0a18b03ea7c58ba259b781d4c40eed945e2d895a9 SHA512 1a8890624609f64eb412cabb690f30a67b7f714260de14acc195268ecbda79d6c5e7d80694dabb3ab148fc74a4df6b8e147750e869ab49f40d04742ef284398e
+DIST ppc64-diag-2.7.9.tar.gz 439622 BLAKE2B a30a94359227812254d7ae9a571e524e88eb136fad9567cc5670d85dd66fb3a0f761a58da7eeeabe22434b959fa0d73a8c5213379184432c2a5efe8f8d9c2a47 SHA512 b6756c17e67e876ad3a945d05dbd2c2523cbf121c4aa658a4edaf33775c8165ff26a252bdf812600e2d47ae69cd68f6e22c0de6f2d3994856adcd3d949322673
 EBUILD ppc64-diag-2.7.7.ebuild 1557 BLAKE2B f2625c84268207eb112f92318383567e347b4b4286da37d2c5c5e5ce24078e54430617176cb9e22f0170663e5a36d13309fd18c4c2f2e0eac6243cdc690dc225 SHA512 d4d3b3ecf072c68a2122ebeab58e724a0b497c1911591f4a5ebc30c84fad819d0f6eb5e4c5c8ba5891f1600ad936e9a6e9af77a3049710723dabfec75376050f
 EBUILD ppc64-diag-2.7.8.ebuild 1572 BLAKE2B 1d38e9dc5a739fa8791f2c515aeeb96ff6f73c4bf6a75a4c2b3278b1137775c75077be53f9c754156d9fb13787eb23d60ca8117f0fe236cdc2d6cb8ce6d4c8b1 SHA512 57a492c116173c5f909cb5c7af9792bfd3d3dca2862c35e7a807e666ca02207ac2e4e651f112cdd133ef0ffafd86135a9236fcccfa9665e437f20abc3546d3c4
-MISC metadata.xml 689 BLAKE2B 507ee6a51ec93ec2199345bee89684754bf71c7709a05989dcf4699d9c4ea0da83ed6d41f3c3e6935ae3c3e9634ee9cabc2532f70c61ca778ea2b8920085991f SHA512 474385e6f54f040377f54327946f260ab6b01d09f0cca75aae4cb19b9aee08c9a32095dd7ad09cc7d0cabc4c3c52a9d13acd68079caeb804694419a58c291653
+EBUILD ppc64-diag-2.7.9.ebuild 1717 BLAKE2B 063d59b07921903804239f55382a1ead38bc17c3119aef66c5b1164b518bee86511f8023369c05521b52e197d2ffbf55b71021518c5153f357c7264928c57667 SHA512 fa6f6a44484219601b97694491a5494928f3e738a474f1d3e533cbf85913034a2142fdf64f1acb626224d4bbcf3e9aead33bcac3e14ec3409d8581092e51799e
+MISC metadata.xml 886 BLAKE2B 85a1fa6462be80d9dec2bbb295a5e5d54cc02ea260291e4d74ad43a44e0d75417514257d00eed844833474c0acf8fc2cd0f5293494dc2ad87855f1fbc971006a SHA512 c1e15f167ea9d262610959a24047a243a2faa3176562415f144c5e4d31eaa924abb9db009c8902a7636d69dc608f8321d5556055d5f166e367a2144a7c1a93db
diff --git a/sys-apps/ppc64-diag/metadata.xml b/sys-apps/ppc64-diag/metadata.xml
index a6d327e1f5a6..3963a2f70dcb 100644
--- a/sys-apps/ppc64-diag/metadata.xml
+++ b/sys-apps/ppc64-diag/metadata.xml
@@ -1,10 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person">
+		<email>gyakovlev@gentoo.org</email>
+		<name>Georgy Yakovlev</name>
+	</maintainer>
 	<maintainer type="project">
 		<email>ppc@gentoo.org</email>
 		<name>PowerPC architecture team</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">power-ras/ppc64-diag</remote-id>
+	</upstream>
 	<use>
 		<flag name="rtas">Add support for the Run Time Abstraction Services (RTAS)</flag>
 	</use>
diff --git a/sys-apps/ppc64-diag/ppc64-diag-2.7.9.ebuild b/sys-apps/ppc64-diag/ppc64-diag-2.7.9.ebuild
new file mode 100644
index 000000000000..57a0b0068a7e
--- /dev/null
+++ b/sys-apps/ppc64-diag/ppc64-diag-2.7.9.ebuild
@@ -0,0 +1,79 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools toolchain-funcs
+
+DESCRIPTION="Diagnostic tools for PowerLinux"
+HOMEPAGE="https://github.com/power-ras/ppc64-diag"
+SRC_URI="https://github.com/power-ras/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~ppc64"
+IUSE="rtas"
+
+DEPEND="virtual/libudev:=
+	rtas? (
+		sys-libs/ncurses:0=
+		sys-libs/librtas
+		sys-libs/libservicelog
+		>=sys-libs/libvpd-2.2.9:=
+	)
+"
+
+RDEPEND="${DEPEND}
+	dev-lang/perl
+	rtas? ( sys-apps/servicelog )
+"
+
+BDEPEND="
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/fix-systemd-unit-path.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_with rtas librtas)
+	# handle ncurses[tinfo]
+	sed -e "s:-lncurses:$($(tc-getPKG_CONFIG) --libs ncurses):g" \
+		-i Makefile || die
+}
+
+src_install() {
+	default
+	newinitd "${FILESDIR}/opal_errd.initd" opal_errd
+
+	if use rtas; then
+		newinitd "${FILESDIR}/rtas_errd.initd" rtas_errd
+		keepdir /var/log/ppc64-diag/diag_disk
+	else
+		# makefile installs it unconditionally
+		rm -rf "${ED}/lib/systemd/system/rtas_errd.service" || die
+		rm -rf "${ED}/usr/lib/systemd/system/rtas_errd.service" || die
+	fi
+
+	keepdir /etc/${PN}/ses_pages
+	keepdir /var/log/ppc64_diag/diag_disk
+	keepdir /var/log/ppc64_diag
+	keepdir /var/log/opal-elog
+	keepdir /var/log/dump
+}
+
+src_test() {
+	# it assumes MKTEMP created dir in /tmp, add /var to the string.
+	# /varplatform.0x01 becomes platform.0x01, just as test expects
+	# so we sed a sed expression, don't judge me
+	sed -i 's%\/tmp/%\/var\/tmp\/%' opal_errd/tests/test-extract_opal_dump-000 || die
+	emake check
+}
diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index a31c052c9aa1..1c6b78ef776a 100644
--- a/sys-libs/Manifest.gz
+++ b/sys-libs/Manifest.gz
diff --git a/sys-libs/libnvme/Manifest b/sys-libs/libnvme/Manifest
index 8801410f8fc4..a49200fb8467 100644
--- a/sys-libs/libnvme/Manifest
+++ b/sys-libs/libnvme/Manifest
@@ -4,4 +4,4 @@ DIST libnvme-1.2.tar.gz 484397 BLAKE2B ae6b1c3aa8f45594219470059cfc8982674433772
 EBUILD libnvme-1.0.ebuild 635 BLAKE2B 1401b1c6fc3aa2133debd75fb29885ec51d28197e8b627e112f9843878e4fb20ffd60b0edb020775522ce8a44415940e940e322d3f5d9cf2136e4ed3b797a5d0 SHA512 2d86da3a07cbfe3f7fd448c43d6f840da75317c8fc49fa43cfef60cbdc4633d8f27b4a2de85f1abcd71225ae2a25cad6d6bd92c0acd820702d28e318807615f4
 EBUILD libnvme-1.1.ebuild 635 BLAKE2B 1401b1c6fc3aa2133debd75fb29885ec51d28197e8b627e112f9843878e4fb20ffd60b0edb020775522ce8a44415940e940e322d3f5d9cf2136e4ed3b797a5d0 SHA512 2d86da3a07cbfe3f7fd448c43d6f840da75317c8fc49fa43cfef60cbdc4633d8f27b4a2de85f1abcd71225ae2a25cad6d6bd92c0acd820702d28e318807615f4
 EBUILD libnvme-1.2-r1.ebuild 1212 BLAKE2B ac4760587de05238d6157bb68175427436c7ddcbd6a4b7de2bb2882e69a142ebd0a0b6d7a1c28932b75ec212f61f8c5315bf4ace6409c45f9edb1d39ea8a34bb SHA512 c91821594668e7a0454a64a1bcbebe739a642cf7fe6e6fe5e5f32ffeb027e81b55a8808cb5bb076a7f14531988d6bf1af8e20972aa324eb508715a5af6264bc5
-MISC metadata.xml 606 BLAKE2B 21a2e71c2bfe19a55a0f0e0e831ba68e55265aff3b10b2052411398ac3c15c82244228c938f3a3cbe25fae5250b975b1ff887aa630d0fe4439cd90d6426a3945 SHA512 fd02dd36539f1ee1a3c27dc92ab208ec615f79b02f3e8a3275dd7acf9e9b674a76be941dac5fd2a177b803605fb027b987f9bbe8d374b2212023efe5e08b8338
+MISC metadata.xml 509 BLAKE2B b128b0b3ca70400e116d80d860fdff08e664786346fae94bba179d366b4ef74e078f1ecfdf3dbcc00500c2d0f614a68f2fc1282eba18011ad18cdf7b1710f6a4 SHA512 bd2555619a141e44fff2aa101d7adbf0c52543dd9034149dd3b05210542bc329aa957326f42b6695d65140c19e3b791176b8b7428252ec127a0b938c790bfbd3
diff --git a/sys-libs/libnvme/metadata.xml b/sys-libs/libnvme/metadata.xml
index 702824bb9b3a..929132b037bd 100644
--- a/sys-libs/libnvme/metadata.xml
+++ b/sys-libs/libnvme/metadata.xml
@@ -1,13 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>zmedico@gentoo.org</email>
-		<name>Zac Medico</name>
-	</maintainer>
-	<maintainer type="person">
-		<name>Patrick McLean</name>
-		<email>chutzpah@gentoo.org</email>
+	<maintainer type="project">
+		<email>base-system@gentoo.org</email>
+		<name>Gentoo Base System</name>
 	</maintainer>
 	<use>
 		<flag name="json">Support JSON output via <pkg>dev-libs/json-c</pkg></flag>
author	V3n3RiX <venerix@koprulu.sector>	2022-11-15 00:51:37 +0000
committer	V3n3RiX <venerix@koprulu.sector>	2022-11-15 00:51:37 +0000
commit	ac35def7deb4a1eecfad26f0eb5907170b2ee5d7 (patch)
tree	37bd431de7ab2a8fca535418553ec0fcdee09394
parent	aa44121f587698ace480d5ca16ae9e64fe1b4d0b (diff)