13 files changed, 6 insertions, 568 deletions
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 1f35c999a814..3791493fbe50 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/gupnp-tools/Manifest b/net-misc/gupnp-tools/Manifest
index f61fde1403d6..863592931d50 100644
--- a/net-misc/gupnp-tools/Manifest
+++ b/net-misc/gupnp-tools/Manifest
@@ -1,5 +1,3 @@
-DIST gupnp-tools-0.10.3.tar.xz 180596 BLAKE2B 26140962cc24cda867465a4f94d251a26849db544fe1cb017ca86e6208f037b09e772109bfac150a9f6db845d1212af5a5c624d81958816349b3c60e45b80933 SHA512 a95a169c65e50d9953b79b96b92abbad709adc0bf74db47abaa529bd7989ebe2d41ae30ab340d09e5a727b61200d55a6d34b04d6981327b920d23a7c916babbe
 DIST gupnp-tools-0.12.0.tar.xz 181736 BLAKE2B aa33ab97ece72f9baebda4db20a0f72d995017ff45abf0e2da0ae4644d6ede6309b7aa2172c75607a4caf4fbcc65b5e88d1766a8819af96ffe054c83ef87ec77 SHA512 e9c4882f910adee6021433904b78bad89abf4a0d978e24b61cc1c07736e27f0d7e79592e18bbbae8fa13a65f86e72cb8bd7783d74140c6f5d3c65fea4f57da30
-EBUILD gupnp-tools-0.10.3-r1.ebuild 697 BLAKE2B 7eb16387dec65f3f118a110b44d825ac75d192c1276be340e931f1a607c9493407710f65063952236653148ff54490ec7b3ff2373a61cbabf6e7bbc7e71f0fe8 SHA512 de47cf559adf46a4c6277a8e7895b8096a90312083dd93069a2523b95789a0f35075672899e58f02a81711c3e7c797e2406d915697aba839bf6f0eb1854f2f2f
 EBUILD gupnp-tools-0.12.0-r1.ebuild 700 BLAKE2B 5d6b24d53d7e6c280823384511c3277b251bcf23033a6764efea2f30eb3dfccbcb696a5023546e367393afca4e7989208fbfa3b72cd75789fbfcac3f666b32a6 SHA512 e4fb14973414bfc7a22aa7a21f7f247a4f898d433c15255fb47a8fce28505648a26f822b355c74760541c1a0fee3a520cc1896f502e688e5853d929eef40fb42
 MISC metadata.xml 352 BLAKE2B 0847258ecdc48f7f07000a47067e9437fbd7082a8ffff8d8cd3bc7a3ade5a52d9f082dec3cf04ece3835be9904c294b9d523e595e6d7fa9477796dbf1230f234 SHA512 65fda0d85f721fbfcb890f15b8f12ccdc7931017585675716bc0020f81ab37249b5f890b334318c9dc1c5fc0f9a4ba69171312899e3f4714ecce0602cc7f095a
diff --git a/net-misc/gupnp-tools/gupnp-tools-0.10.3-r1.ebuild b/net-misc/gupnp-tools/gupnp-tools-0.10.3-r1.ebuild
deleted file mode 100644
index 8061aeac2537..000000000000
--- a/net-misc/gupnp-tools/gupnp-tools-0.10.3-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit gnome.org meson xdg
-
-DESCRIPTION="Collection of developer-oriented UPnP tools"
-HOMEPAGE="https://wiki.gnome.org/Projects/GUPnP"
-
-LICENSE="GPL-2+ LGPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-
-RDEPEND="
-	>=net-libs/gssdp-1.2.0:0=
-	>=net-libs/gupnp-1.4.0:0=
-	>=net-libs/libsoup-2.42:2.4
-	>=net-libs/gupnp-av-0.5.5:0=
-	>=x11-libs/gtk+-3.10:3
-	>=dev-libs/glib-2.24:2
-	>=dev-libs/libxml2-2.4:2
-	x11-libs/gtksourceview:4
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-src_configure() {
-	local emesonargs=(
-		-Dav-tools=true
-	)
-	meson_src_configure
-}
diff --git a/net-misc/kafkacat/Manifest b/net-misc/kafkacat/Manifest
index a454a023648c..4ddba67ac485 100644
--- a/net-misc/kafkacat/Manifest
+++ b/net-misc/kafkacat/Manifest
@@ -1,5 +1,5 @@
 DIST kafkacat-1.5.0.tar.gz 124682 BLAKE2B 392689ded1cd07268bba572273b2b18dbac0d0f4c2daf87c0a4c5fbbff2568df7ec5ca7b64aed34caa851b5e9b8629e246f9d19087496a882b8b55b2e2138f78 SHA512 57f75b26ef32df244043fa9fc17dc2d6fd93daeea4bc389aa78356ea6e45dea780ff9c3462ed27d2a7798560a21eef04f098bf7766c7305bcee4573f557651ad
 DIST kcat-1.7.1.tar.gz 142699 BLAKE2B 2736d284d9f1f940688a3605db3a966ddee0cb26cc271d0d288f5910a86b8d494e207757d5d35e445ea99bb4a0a218715401815167734eee3942d7de6573baaf SHA512 07aa442a840819ca8d1ab20d86fe9d07afee0e4fa546b033ceb0c1c526f3fb5d9fbd2c34c29460d3439c5046b836605150dc76e85072d9516d82b9a193a0a3cd
 EBUILD kafkacat-1.5.0.ebuild 667 BLAKE2B 912e8c4ee0f788eed5024f008031db1bdf47fa46909f9b5a7b8e1c84ede1cf2724796fda1e2ddcf3ecee3fcceddf00cd872795fceab8b7a4d84da9ea07a58efb SHA512 a69fd7fe4268b5e42c2da2e058f10fa53975b45fa56675e2be9756a84bc0dcf8137f0f020dd11d4ec282198c9ab24e18fe21cd692ba10452736b86c0aa390187
-EBUILD kafkacat-1.7.1.ebuild 926 BLAKE2B 2c94586bcc367ec1dad014dd558e5e4aa3c91179aed1b788013bfe2876e5f26e878b1ea89fdff5fae8a84b106b15dafeea2c7242cc46e6f0b0c991181fcc15f4 SHA512 b9e5f72baeec5d3bfadef7dfd462bfda2b9daece230fb26e521057506677a8104c6c0f5d6e2496315d1d6675107a6fca1297db0bc2b625ab84fa89e6aae1ff0c
+EBUILD kafkacat-1.7.1.ebuild 925 BLAKE2B 091029254c4bc44042b466118e59d82e83b6ca1b7adb81870dc34ab9feaf54c87c2891b77b33bc77d243456e1a041d0bdd946d7c40de76931766a5b930faf0f7 SHA512 8c0dc83980eab43c6a34df23047a7a50098ada50c2cf23cb0eda9be69823b996e4e2fc1a91c18920aef4da06c6297ac1cb372bb408c39db8d94335ddea89448d
 MISC metadata.xml 468 BLAKE2B a9a00808af0af8c2a3183f35ccef3edd15c2772d99c3c01e2a0da115dafe46c89449d1dbe7119e08c294c7d53372ac4a6dc31d5cc956c66b73350143472af09b SHA512 d1cdf304cc2cca1744e2092b50db577b981d8684ebfa4a4d099bd84bada67e00558c439d9a735bc43247db598fa34e0419dd3fcaae94ae68246baf003bbffca8
diff --git a/net-misc/kafkacat/kafkacat-1.7.1.ebuild b/net-misc/kafkacat/kafkacat-1.7.1.ebuild
index ec9435f80a3b..b0c95f3ca2f5 100644
--- a/net-misc/kafkacat/kafkacat-1.7.1.ebuild
+++ b/net-misc/kafkacat/kafkacat-1.7.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/edenhill/kcat/archive/${PV}.tar.gz -> ${MY_PN}-${PV}
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="+avro +json"
 
 DEPEND=">=dev-libs/librdkafka-0.9.4
diff --git a/net-misc/mobile-broadband-provider-info/Manifest b/net-misc/mobile-broadband-provider-info/Manifest
index ed7f6e02aee5..5ebfd4184aeb 100644
--- a/net-misc/mobile-broadband-provider-info/Manifest
+++ b/net-misc/mobile-broadband-provider-info/Manifest
@@ -1,5 +1,3 @@
-DIST mobile-broadband-provider-info-20220725.tar.xz 85184 BLAKE2B 1b36b2cf8f0a66755a7cd10090531efd2c5094e5d611247af748f0923fd76b5e1ce20c31ce16be2b0bad5bd64e44e72eeeec7123435366186e31c7da9e66343a SHA512 335b3a5598144f4b11eab2d924b4671055c414664c783507fb8aa0ee20769dca640d03e559e7f55741b38652590812e777b663264d6dcafd24407cfaeb5bc24d
 DIST mobile-broadband-provider-info-20221107.tar.xz 85416 BLAKE2B 91772a7f16fbba8d477abd623e4902e1aa2317ba0e226ab493ca8cc94bd6dc4c68ea61fc2f3d8f1f4c6bbfce2d7b27dc9dcfa3d35df6a9c9370b9c4ff277318f SHA512 e72fc1c78dd1bf991fc29ba952757af9c38d11e3e918662ce6380337c75eaa56fe33705f6d1eb78627378e1575b4102dceaa68e5e035c62c02e60570752f3e86
-EBUILD mobile-broadband-provider-info-20220725.ebuild 507 BLAKE2B 8db65fc32a0ac10bf81b6b56c2af9363af57ddefc158c90a54c35be6b410d2851a39231c5f2e0f0382338905b2e54983005d67a6bd565dc6a53ffaed9201cb7c SHA512 f0af591423af0a89248c6aa972e2043067abb407710180f3f7b89cdd242d0a06b21b2042d0d17770b633d062acb8aab494ce15f1ef7b36999500836fef45ac49
 EBUILD mobile-broadband-provider-info-20221107.ebuild 488 BLAKE2B 412a87ce704d84c711295ef2eb551d61d7a5228535ccf0127edb5734c234084391fd06cf56d4f74b6e97c6aba73ba285101f50288b57054a05a140bc5f5258a3 SHA512 a12cab7fe9065286e27398e090f48a7cc674cd9f3bab7ae34330ba7b57e036548e8db146701c4a1e513c96f7ec180e7a0157aaf5c6697156a4a535e95682e5bc
 MISC metadata.xml 371 BLAKE2B 0bebc02fecc2a73323bb775ef52ccad19b856e70beb7202a588d128d3abc8fd77fa0937cc3ae897596c29dca0d3ce0e0d2ef88b3528ac90a07db4de1e0b97a46 SHA512 3b3eb4caef7124cb52d7a42d4abffcafc7b0f480546a57fd568b7ac98e22b217105f0699c4ab0c9ee3d004e6e392ad1da4213bfb61f0d04440058c717b75917f
diff --git a/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20220725.ebuild b/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20220725.ebuild
deleted file mode 100644
index d2bb879094ad..000000000000
--- a/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20220725.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit gnome.org
-
-DESCRIPTION="Database of mobile broadband service providers"
-HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager/MobileBroadband"
-
-LICENSE="CC-PD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test ) test" # bug #856436
-
-BDEPEND="
-	dev-libs/libxslt
-	test? ( dev-libs/libxml2 )
-"
-
-DOCS=( README )
diff --git a/net-misc/mosh/Manifest b/net-misc/mosh/Manifest
index 1a27e636a18f..c7baec8045a0 100644
--- a/net-misc/mosh/Manifest
+++ b/net-misc/mosh/Manifest
@@ -3,5 +3,5 @@ AUX mosh-1.3.2-bind-misinterpret.patch 432 BLAKE2B 81bda9f9a2d63ed2f5298b399ec92
 DIST mosh-1.3.2.tar.gz 359574 BLAKE2B 0b7290da0c5e5af0bfed58594095cb2649fec049fda7c495df326742176033d1716752451d2a9f11ba2c2957e8b8fecd5caa4e8962c8597e8dd67d1de7582ec5 SHA512 f400e8fe7ba2ab7362311fc12a00ec69587505f901988aeee500fc68d38a388218500a3f602111c883ff23a9d43572114fcf0a8bf505df203691e5b597615769
 DIST mosh-1.4.0.tar.gz 399624 BLAKE2B a122b859f1c626ed231b6b1bb484eacfa7c76da0f764394e9c42596c5d89cc3a40beae3076f95b07e73aa590422b1397f17ce1583f68436dff6b74233d609839 SHA512 7ea895a3fb86e0e94ddf2d86660ca42e9a8954cebee2b2b86952e4db4475a450fdadbfe415872908494c8900f4f42a4fb861c49308d08185037d21b9359df758
 EBUILD mosh-1.3.2-r3.ebuild 1507 BLAKE2B 10115565942c1b4bb81a7a87416e0219ccc0e9ed35c448c55c78a658da28946057f68075482c156b24c468450ed20523db5b53e66559a11d9d384ba3aa6adcd0 SHA512 af52e3002f15884a7c11d045c1d9e2a068ebdac8b3a4623d11242881a6502998032d9e6bff2699e5e2fa5d3ea7d4bfdfe1eeb6284757592bfa3b7c6eca638f8d
-EBUILD mosh-1.4.0.ebuild 1951 BLAKE2B d01b4b9b6f0c0935962341f215c66c4282fa437ab82a800c6a66aafd0ea352a3eb29a82568ed2873d33ad2a8c735087cdc7c53591aa97ca372e665820d85fc23 SHA512 2733e9c2d3c9686762e13afdfa9d8b00f09eed8735a9528bd9ad963c8c9d1730fb68a4b0de2919c847be7e63588e70830a17011788d2161d207440d9b84a8b86
+EBUILD mosh-1.4.0.ebuild 1944 BLAKE2B d665e2e71fb5414d802d7dd8c6523caa210c973c741e3ade9cd3f7c9170b7fe489a73e35d07e1d45726dedf4b1e86d4a2bf8f12743af536497639dd7dd42bcad SHA512 8a3aac4184ed5d9871e471a875d9f2bc81c3a4204489dedaf6528b75eb820502588ac88a413e9b7ab85b28ec6f86022158444a77fcfb941bd8943500208a03e3
 MISC metadata.xml 1308 BLAKE2B dd0adee201ba12f75e60f781f6642921c2bb64c19b8defb6cd175d48090c7ee083ae6dbcb73c87c080fdd47b28569adbfb3fe64dd2b6ed7d11b3d66be40e2205 SHA512 ef68cfe26d69a3ffa088d6b1efc142861f90d224d41f6b5e2c2536932ddeff6d1d036de0778d164d35a38c9d470d28ee761be08528c7f23a48072cf5d77a5f09
diff --git a/net-misc/mosh/mosh-1.4.0.ebuild b/net-misc/mosh/mosh-1.4.0.ebuild
index 289455b3b6e6..e15c2b02f5b0 100644
--- a/net-misc/mosh/mosh-1.4.0.ebuild
+++ b/net-misc/mosh/mosh-1.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -15,7 +15,7 @@ S="${WORKDIR}"/${MY_P}
 LICENSE="GPL-3"
 SLOT="0"
 if [[ ${PV} != *_rc* ]] ; then
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 fi
 IUSE="+client examples +hardened nettle +server syslog ufw +utempter"
 
diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest
index 22dfccb8a86c..13642fdb5d50 100644
--- a/net-misc/networkmanager/Manifest
+++ b/net-misc/networkmanager/Manifest
@@ -2,10 +2,8 @@ AUX 01-org.freedesktop.NetworkManager.settings.modify.system.rules 265 BLAKE2B 0
 AUX 10-openrc-status-r4 1182 BLAKE2B ab6f3e8340c3c53f5df667395489071c42320040a90356c94bca15c45a4d66c5e3e0870a17cda6531a98adee4ec92ca886f9be298765f1afbca864786abb495e SHA512 b1f0cd7eaeb13af9ab1ce192fd3f47e52d505c4ad5a0888af1ad2598701a034231c03f5346441f44443daca84f2089cb68e08c2876396be0e668c484c3d331ec
 AUX conf.d.NetworkManager 230 BLAKE2B 987b6b39c6c8b14a788575241575f9a0761f320117ad8c70ff084e88f3282c2d384f49042beecdbf876a534e49d26b9ff8e385cd2f301a056a0ba3c45d5e04fc SHA512 f8c9331834cbc66ab0e4e6f4a120fde6a08a435d680a1e1087718fdbb2b9843a313e7ec30b7008822999dafd98e152aa7d2a96f87320ba9c91c3adb63e0b7c9a
 AUX init.d.NetworkManager-r2 1880 BLAKE2B d765a298955cdcf0c62518488fc9f02f97c31ee645c7b15ed73914397e02266e1b72a32af1d9f8007ae81119e9223b3e41184aa58b9fa328ed72e0ebec91acd8 SHA512 f06e7e6b6ebeb991471cf6e71c44687210a115fd008505ebe01de1b52a059952c2b191789d217412ae30daaaecf8bc028c89daf536af793eac23cfcd62ba9ad4
-DIST NetworkManager-1.40.2.tar.xz 6585760 BLAKE2B 12bd809e0d5140ecb1f52f61680fbd21044350d0c265bfff2ac812f977a7db5c5342a0302b6f02b057ce675ab917f449106e4bb1bb9b1d187066e076785ed951 SHA512 b79119d11ad98262a22a3f78a7dfa979a7890682f97ed8154552f7ceb964402fc9c2dcda082bf80ba45d7f717f541d3145e40f7f6c4fbb8f2858272cc9505761
 DIST NetworkManager-1.40.6.tar.xz 6596776 BLAKE2B 32e2a496d68d183a44a15f9ecfef18f5c7fcbc7ba5e27e0eb62825edb0ebbcf8ec34dcdd6d4da953aa46029d7063197f549cae13eb3622dd1f52c92aa5961941 SHA512 cd8ced0598ea4224cfde23a157108c872bb3935e539029571110b6a0bb4bf3637ad8e3afe8e5f162890ed557e8b42a803bc4e18db00e1de840dd0fa20643e036
 DIST NetworkManager-1.40.8.tar.xz 6518080 BLAKE2B 90a65dde96b3127a5438aa4add47e66887c940a86598109bde74f9bc56d317c41f835858a0b2ea89dca228f7fcc43e811b20e0d4528018ebe95947114f405cb4 SHA512 1c3f986c0f37160fced3cc790f6e569ae2185aec2bb2b5ef9635848ba493d4e920cc7ea83cd34a8df7bc12902d071238f9ae6aeb7721658ac54ba862f7c822ef
-EBUILD networkmanager-1.40.2.ebuild 12490 BLAKE2B b3d81d5bb1a99c214195939d024014027deac7d14672f47aff691fdd51ff0cf30109660f4d32fe459e33afa3453b20cd9ce74bcc5918ffb28a826ae8065b044b SHA512 a2c9aed9f711bb1e3345115e72a3d297e1e7cc2c79635f718c3cb45ace4587bdcc64fdfb11398eab32adccba1e487af17081e9e96b62e00ce1ce43466c249abe
 EBUILD networkmanager-1.40.6.ebuild 12529 BLAKE2B 6e84177d759c8f40fa273b5a5d45a6b17efa345d7cb081492064b60dd98ef7b03a33c6b92064c95644afd4e44ff81f7179f00957821eca39c5d57f54ddb3cd16 SHA512 03237e960c02a3edd9b1798863f780acd96822ecb79c0d74081d6e411d6abf2bdc7d0e6cb08beba46fb20db4584783261da1720f7e1124290ad47e8702165faa
 EBUILD networkmanager-1.40.8.ebuild 12535 BLAKE2B 121488dea0a92b9e720e556fa51188b5005f2a20426c75615ca70cf78ea61e5fb5c7db244a6602dc62fd212c266a3401419422e407f81ef2f4bf72593e25f568 SHA512 419e4932a983ba0e4473af16b790d4d815d7697d29be5aea26d2a9f32f23d65df15060d77b56cb64934ad2a35d901e75b1f77d1c1b70710d16f20932a5208d3b
 MISC metadata.xml 2430 BLAKE2B 564983bc42e2b87533286f90ad5e3988356169cf65436ec853a63183ae1086e5672afd7552c9a06fd17018158bab09acaedf015998eb4d10a9c11db1897b49a4 SHA512 39ae015637e571dc8268c750a6cf56c185a0716113670f58e4d33848c7d6c33b8decba6201a0600ab689d2bcc7d44a123003bcfc8696fd8b46eea376b498d6e2
diff --git a/net-misc/networkmanager/networkmanager-1.40.2.ebuild b/net-misc/networkmanager/networkmanager-1.40.2.ebuild
deleted file mode 100644
index e7f593a72f24..000000000000
--- a/net-misc/networkmanager/networkmanager-1.40.2.ebuild
+++ /dev/null
@@ -1,415 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-GNOME_ORG_MODULE="NetworkManager"
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit gnome.org linux-info meson-multilib python-any-r1 readme.gentoo-r1 systemd toolchain-funcs udev vala virtualx
-
-DESCRIPTION="A set of co-operative tools that make networking simple and straightforward"
-HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0"
-
-IUSE="audit bluetooth +concheck connection-sharing debug dhclient dhcpcd elogind gnutls +gtk-doc +introspection iptables iwd psl libedit lto +nss nftables +modemmanager ofono ovs policykit +ppp resolvconf selinux syslog systemd teamd test +tools vala +wext +wifi"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
-	bluetooth? ( modemmanager )
-	connection-sharing? ( || ( iptables nftables ) )
-	gtk-doc? ( introspection )
-	iwd? ( wifi )
-	vala? ( introspection )
-	wext? ( wifi )
-	^^ ( gnutls nss )
-	?? ( elogind systemd )
-	?? ( dhclient dhcpcd )
-	?? ( syslog systemd )
-"
-
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ppc ppc64 ~riscv ~sparc x86"
-
-COMMON_DEPEND="
-	sys-apps/util-linux[${MULTILIB_USEDEP}]
-	elogind? ( >=sys-auth/elogind-219 )
-	>=virtual/libudev-175:=[${MULTILIB_USEDEP}]
-	sys-apps/dbus
-	net-libs/libndp
-	systemd? ( >=sys-apps/systemd-209:0= )
-	>=dev-libs/glib-2.40:2[${MULTILIB_USEDEP}]
-	introspection? ( >=dev-libs/gobject-introspection-0.10.3:= )
-	selinux? (
-		sec-policy/selinux-networkmanager
-		sys-libs/libselinux
-	)
-	audit? ( sys-process/audit )
-	teamd? (
-		>=dev-libs/jansson-2.7:=
-		>=net-misc/libteam-1.9
-	)
-	policykit? ( >=sys-auth/polkit-0.106 )
-	nss? ( >=dev-libs/nss-3.11:=[${MULTILIB_USEDEP}] )
-	gnutls? (
-		>=net-libs/gnutls-2.12:=[${MULTILIB_USEDEP}]
-	)
-	ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] )
-	modemmanager? (
-		net-misc/mobile-broadband-provider-info
-		>=net-misc/modemmanager-0.7.991:0=
-	)
-	bluetooth? ( >=net-wireless/bluez-5 )
-	ofono? ( net-misc/ofono )
-	dhclient? ( >=net-misc/dhcp-4[client] )
-	dhcpcd? ( >=net-misc/dhcpcd-9.3.3 )
-	ovs? ( >=dev-libs/jansson-2.7:= )
-	resolvconf? ( virtual/resolvconf )
-	connection-sharing? (
-		net-dns/dnsmasq[dbus,dhcp]
-		iptables? ( net-firewall/iptables )
-		nftables? ( net-firewall/nftables )
-	)
-	psl? ( net-libs/libpsl )
-	concheck? ( net-misc/curl )
-	tools? (
-		>=dev-libs/newt-0.52.15
-		libedit? ( dev-libs/libedit )
-		!libedit? ( sys-libs/readline:= )
-	)
-"
-RDEPEND="${COMMON_DEPEND}
-	acct-group/plugdev
-	|| (
-		net-misc/iputils[arping(+)]
-		net-analyzer/arping
-	)
-	wifi? (
-		!iwd? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] )
-		iwd? ( net-wireless/iwd )
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	>=sys-kernel/linux-headers-3.18
-	net-libs/libndp[${MULTILIB_USEDEP}]
-	ppp? ( elibc_musl? ( net-libs/ppp-defs ) )
-"
-BDEPEND="
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	gtk-doc? (
-		dev-util/gtk-doc
-		app-text/docbook-xml-dtd:4.1.2
-	)
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-	introspection? (
-		$(python_gen_any_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]')
-		dev-lang/perl
-		dev-libs/libxslt
-	)
-	vala? ( $(vala_depend) )
-	test? (
-		>=dev-libs/jansson-2.7
-		$(python_gen_any_dep '
-			dev-python/dbus-python[${PYTHON_USEDEP}]
-			dev-python/pygobject:3[${PYTHON_USEDEP}]')
-	)
-"
-
-python_check_deps() {
-	if use introspection; then
-		python_has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" || return
-	fi
-	if use test; then
-		python_has_version "dev-python/dbus-python[${PYTHON_USEDEP}]" &&
-		python_has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]"
-	fi
-}
-
-sysfs_deprecated_check() {
-	ebegin "Checking for SYSFS_DEPRECATED support"
-
-	if { linux_chkconfig_present SYSFS_DEPRECATED_V2; }; then
-		eerror "Please disable SYSFS_DEPRECATED_V2 support in your kernel config and recompile your kernel"
-		eerror "or NetworkManager will not work correctly."
-		eerror "See https://bugs.gentoo.org/333639 for more info."
-		die "CONFIG_SYSFS_DEPRECATED_V2 support detected!"
-	fi
-	eend $?
-}
-
-pkg_pretend() {
-	if use kernel_linux; then
-		get_version
-		if linux_config_exists; then
-			sysfs_deprecated_check
-		else
-			ewarn "Was unable to determine your kernel .config"
-			ewarn "Please note that if CONFIG_SYSFS_DEPRECATED_V2 is set in your kernel .config, NetworkManager will not work correctly."
-			ewarn "See https://bugs.gentoo.org/333639 for more info."
-		fi
-	fi
-}
-
-pkg_setup() {
-	if use connection-sharing; then
-		if kernel_is lt 5 1; then
-			CONFIG_CHECK="~NF_NAT_IPV4 ~NF_NAT_MASQUERADE_IPV4"
-		else
-			CONFIG_CHECK="~NF_NAT ~NF_NAT_MASQUERADE"
-		fi
-		linux-info_pkg_setup
-	fi
-
-	if use introspection || use test; then
-		python-any-r1_pkg_setup
-	fi
-
-	# bug 809695
-	if tc-is-clang && use lto; then
-		eerror "Clang does not support -flto-partition"
-		die "Please use gcc or turn off USE=lto flag when building with clang"
-	fi
-}
-
-src_prepare() {
-	DOC_CONTENTS="To modify system network connections without needing to enter the
-		root password, add your user account to the 'plugdev' group."
-
-	default
-	use vala && vala_setup
-
-	sed -i \
-		-e 's#/usr/bin/sed#/bin/sed#' \
-		data/84-nm-drivers.rules \
-		|| die
-}
-
-meson_nm_program() {
-	usex "$1" "-D${2:-$1}=$3" "-D${2:-$1}=no"
-}
-
-meson_nm_native_program() {
-	multilib_native_usex "$1" "-D${2:-$1}=$3" "-D${2:-$1}=no"
-}
-
-multilib_src_configure() {
-	local emesonargs=(
-		--localstatedir="${EPREFIX}/var"
-
-		-Dsystemdsystemunitdir=$(systemd_get_systemunitdir)
-		-Dsystem_ca_path=/etc/ssl/certs
-		-Dudev_dir=$(get_udevdir)
-		-Ddbus_conf_dir=/usr/share/dbus-1/system.d
-		-Dkernel_firmware_dir=/lib/firmware
-		-Diptables=/sbin/iptables
-		-Dnft=/sbin/nft
-		-Ddnsmasq=/usr/sbin/dnsmasq
-
-		-Ddist_version=${PVR}
-		$(meson_native_use_bool policykit polkit)
-		$(meson_native_use_bool policykit config_auth_polkit_default)
-		-Dmodify_system=true
-		-Dpolkit_agent_helper_1=/usr/lib/polkit-1/polkit-agent-helper-1
-		$(meson_native_use_bool selinux)
-		$(meson_native_use_bool systemd systemd_journal)
-		-Dhostname_persist=gentoo
-		-Dlibaudit=$(multilib_native_usex audit)
-
-		$(meson_native_use_bool wext)
-		$(meson_native_use_bool wifi)
-		$(meson_native_use_bool iwd)
-		$(meson_native_use_bool ppp)
-		-Dpppd=/usr/sbin/pppd
-		$(meson_native_use_bool modemmanager modem_manager)
-		$(meson_native_use_bool ofono)
-		$(meson_native_use_bool concheck)
-		$(meson_native_use_bool teamd teamdctl)
-		$(meson_native_use_bool ovs)
-		$(meson_native_use_bool tools nmcli)
-		$(meson_native_use_bool tools nmtui)
-		$(meson_native_use_bool tools nm_cloud_setup)
-		$(meson_native_use_bool bluetooth bluez5_dun)
-		-Debpf=true
-
-		-Dconfig_wifi_backend_default=$(multilib_native_usex iwd iwd default)
-		-Dconfig_plugins_default=keyfile
-		-Difcfg_rh=false
-		-Difupdown=false
-
-		$(meson_nm_native_program resolvconf "" /sbin/resolvconf)
-		-Dnetconfig=no
-		-Dconfig_dns_rc_manager_default=auto
-
-		$(meson_nm_program dhclient "" /sbin/dhclient)
-		-Ddhcpcanon=no
-		$(meson_nm_program dhcpcd "" /sbin/dhcpcd)
-
-		$(meson_native_use_bool introspection)
-		$(meson_native_use_bool vala vapi)
-		$(meson_native_use_bool gtk-doc docs)
-		-Dtests=$(multilib_native_usex test)
-		$(meson_native_true firewalld_zone)
-		-Dmore_asserts=0
-		$(meson_use debug more_logging)
-		-Dvalgrind=no
-		-Dvalgrind_suppressions=
-		-Dld_gc=false
-		$(meson_native_use_bool psl libpsl)
-		-Dqt=false
-
-		$(meson_use lto b_lto)
-	)
-
-	if multilib_is_native_abi && use systemd; then
-		emesonargs+=( -Dsession_tracking_consolekit=false )
-		emesonargs+=( -Dsession_tracking=systemd )
-		emesonargs+=( -Dsuspend_resume=systemd )
-	elif multilib_is_native_abi && use elogind; then
-		emesonargs+=( -Dsession_tracking_consolekit=false )
-		emesonargs+=( -Dsession_tracking=elogind )
-		emesonargs+=( -Dsuspend_resume=elogind )
-	else
-		emesonargs+=( -Dsession_tracking_consolekit=false )
-		emesonargs+=( -Dsession_tracking=no )
-		emesonargs+=( -Dsuspend_resume=auto )
-	fi
-
-	if multilib_is_native_abi && use syslog; then
-		emesonargs+=( -Dconfig_logging_backend_default=syslog )
-	elif multilib_is_native_abi && use systemd; then
-		emesonargs+=( -Dconfig_logging_backend_default=journal )
-	else
-		emesonargs+=( -Dconfig_logging_backend_default=default )
-	fi
-
-	if multilib_is_native_abi && use dhclient; then
-		emesonargs+=( -Dconfig_dhcp_default=dhclient )
-	elif multilib_is_native_abi && use dhcpcd; then
-		emesonargs+=( -Dconfig_dhcp_default=dhcpcd )
-	else
-		emesonargs+=( -Dconfig_dhcp_default=internal )
-	fi
-
-	if use nss; then
-		emesonargs+=( -Dcrypto=nss )
-	else
-		emesonargs+=( -Dcrypto=gnutls )
-	fi
-
-	if use tools ; then
-		emesonargs+=( -Dreadline=$(usex libedit libedit libreadline) )
-	else
-		emesonargs+=( -Dreadline=none )
-	fi
-
-	# Same hack as net-dialup/pptpd to get proper plugin dir for ppp, bug #519986
-	if use ppp; then
-		local PPPD_VER=`best_version net-dialup/ppp`
-		PPPD_VER=${PPPD_VER#*/*-} #reduce it to ${PV}-${PR}
-		PPPD_VER=${PPPD_VER%%[_-]*} # main version without beta/pre/patch/revision
-		emesonargs+=( -Dpppd_plugin_dir=/usr/$(get_libdir)/pppd/${PPPD_VER} )
-	fi
-
-	meson_src_configure
-}
-
-multilib_src_test() {
-	if use test && multilib_is_native_abi; then
-		python_setup
-		virtx meson_src_test
-	fi
-}
-
-multilib_src_install() {
-	meson_src_install
-	if ! multilib_is_native_abi; then
-		rm -r "${ED}"/{etc,usr/{bin,lib/NetworkManager,share},var} || die
-	fi
-}
-
-multilib_src_install_all() {
-	! use systemd && readme.gentoo_create_doc
-
-	newinitd "${FILESDIR}/init.d.NetworkManager-r2" NetworkManager
-	newconfd "${FILESDIR}/conf.d.NetworkManager" NetworkManager
-
-	# Need to keep the /etc/NetworkManager/dispatched.d for dispatcher scripts
-	keepdir /etc/NetworkManager/dispatcher.d
-
-	# Provide openrc net dependency only when nm is connected
-	exeinto /etc/NetworkManager/dispatcher.d
-	newexe "${FILESDIR}/10-openrc-status-r4" 10-openrc-status
-	sed -e "s:@EPREFIX@:${EPREFIX}:g" \
-		-i "${ED}/etc/NetworkManager/dispatcher.d/10-openrc-status" || die
-
-	keepdir /etc/NetworkManager/system-connections
-	chmod 0600 "${ED}"/etc/NetworkManager/system-connections/.keep* # bug #383765, upstream bug #754594
-
-	# Allow users in plugdev group to modify system connections
-	insinto /usr/share/polkit-1/rules.d/
-	doins "${FILESDIR}"/01-org.freedesktop.NetworkManager.settings.modify.system.rules
-
-	insinto /usr/lib/NetworkManager/conf.d #702476
-	doins "${S}"/examples/nm-conf.d/31-mac-addr-change.conf
-
-	if use iwd; then
-		# This goes to $nmlibdir/conf.d/ and $nmlibdir is '${prefix}'/lib/$PACKAGE, thus always lib, not get_libdir
-		cat <<-EOF > "${ED}"/usr/lib/NetworkManager/conf.d/iwd.conf || die
-		[device]
-		wifi.backend=iwd
-		EOF
-	fi
-
-	mv "${ED}"/usr/share/doc/{NetworkManager/examples/,${PF}} || die
-	rmdir "${ED}"/usr/share/doc/NetworkManager || die
-
-	# Empty
-	rmdir "${ED}"/var{/lib{/NetworkManager,},} || die
-}
-
-pkg_postinst() {
-	udev_reload
-
-	systemd_reenable NetworkManager.service
-	! use systemd && readme.gentoo_print_elog
-
-	if [[ -e "${EROOT}/etc/NetworkManager/nm-system-settings.conf" ]]; then
-		ewarn "The ${PN} system configuration file has moved to a new location."
-		ewarn "You must migrate your settings from ${EROOT}/etc/NetworkManager/nm-system-settings.conf"
-		ewarn "to ${EROOT}/etc/NetworkManager/NetworkManager.conf"
-		ewarn
-		ewarn "After doing so, you can remove ${EROOT}/etc/NetworkManager/nm-system-settings.conf"
-	fi
-
-	# NM fallbacks to plugin specified at compile time (upstream bug #738611)
-	# but still show a warning to remember people to have cleaner config file
-	if [[ -e "${EROOT}/etc/NetworkManager/NetworkManager.conf" ]]; then
-		if grep plugins "${EROOT}/etc/NetworkManager/NetworkManager.conf" | grep -q ifnet; then
-			ewarn
-			ewarn "You seem to use 'ifnet' plugin in ${EROOT}/etc/NetworkManager/NetworkManager.conf"
-			ewarn "Since it won't be used, you will need to stop setting ifnet plugin there."
-			ewarn
-		fi
-	fi
-
-	# NM shows lots of errors making nmcli almost unusable, bug #528748 upstream bug #690457
-	if grep -r "psk-flags=1" "${EROOT}"/etc/NetworkManager/; then
-		ewarn "You have psk-flags=1 setting in above files, you will need to"
-		ewarn "either reconfigure affected networks or, at least, set the flag"
-		ewarn "value to '0'."
-	fi
-
-	if use dhclient || use dhcpcd; then
-		ewarn "You have enabled USE=dhclient and/or USE=dhcpcd, but NetworkManager since"
-		ewarn "version 1.20 defaults to the internal DHCP client. If the internal client"
-		ewarn "works for you, and you're happy with, the alternative USE flags can be"
-		ewarn "disabled. If you want to use dhclient or dhcpcd, then you need to tweak"
-		ewarn "the main.dhcp configuration option to use one of them instead of internal."
-	fi
-}
-
-pkg_postrm() {
-	udev_reload
-}
diff --git a/net-misc/rygel/Manifest b/net-misc/rygel/Manifest
index 5ad7047aa656..b45f59061221 100644
--- a/net-misc/rygel/Manifest
+++ b/net-misc/rygel/Manifest
@@ -1,5 +1,3 @@
-DIST rygel-0.40.4.tar.xz 1696492 BLAKE2B 9e22390b379b2e09abb2685b0c2a00bc03ae3668d4c6d5ed432dd9c5cefdf07a00370bc5a9a96bc542d14f48dfdcdf4db3647365833942d1d81dc377d0440705 SHA512 5e4003af9c0dc8a4b948cc63a12ec3f61c9e9f4f8007b196f9ce988c85e2fea7ec0a6c1e4217c59a770ca179b4ad8bba2e01aa99459a4e1179b9bc5db22ea0f8
 DIST rygel-0.42.0.tar.xz 1699676 BLAKE2B d3a324baba0b649c0b215e897a23cc963575c2c8b71f7f993fa4a544435a38c921115a5cc3c5ad1db45769d27db6d901a196210cbff540684b55b19aeb53aab1 SHA512 78dd253ad5f4e3dd5ac8db38f5f160a84878c868c445795e676b20e1cba2dd08e6b757f6473d6db5175dca4e9de4d7bb5143acc467cda2a5691e18c654c17dfa
-EBUILD rygel-0.40.4.ebuild 2167 BLAKE2B e0ae1ea263fcfb805566cec724a01124b8faf707b899f1121ed9271fa2f9a03c7a8eec2f0c69204f9cf291c552fde118e182e33764242b4431bf6cbca6c7e0be SHA512 2be12c543ced037e3a224f1b945b9d48eac1a70c566888e09844500fb3496813593da85dc9f1140f9e77e1e3325ab5ede391772e8dac0a9cc8fef6f3841dc1ae
 EBUILD rygel-0.42.0.ebuild 2265 BLAKE2B 99eaa06d99447fa5561eeaf88c145e2d7a56169a9a4d78fd535741e8113d144c4f3acc691861d78ca3511ee8e196cc6affaad4131e01349acd48211c90252d50 SHA512 1e7e52e786bb9307f1a1eb8efafa828fd25b78f396da6abbc0494bfe7b9ff4b73d5aa0e2306a37447aebbf63036c71925c16f2168027a2155088aa0502dc35e9
 MISC metadata.xml 518 BLAKE2B 789b1e692571138dfd93f177e22ae1f86ed20a96652c31d5012b4e691b101408eb6162e401be9661f23b8239a304e854044485a8de6f2e1db7b8ecd1e801dabc SHA512 7f956f2a41c6de314dbfc2f3b17de68857474fcbfb4fc43f3019cc713d899ebbb17fcddc613bae43e441242f6e730ddb188cf09a40bd22080e665e6f32212a63
diff --git a/net-misc/rygel/rygel-0.40.4.ebuild b/net-misc/rygel/rygel-0.40.4.ebuild
deleted file mode 100644
index c3f72b1a5e97..000000000000
--- a/net-misc/rygel/rygel-0.40.4.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome.org meson systemd vala xdg
-
-DESCRIPTION="Rygel is an open source UPnP/DLNA MediaServer"
-HOMEPAGE="https://wiki.gnome.org/Projects/Rygel"
-
-LICENSE="LGPL-2.1+ CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="gtk gtk-doc +introspection +sqlite tracker test transcode"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	>=dev-libs/glib-2.56.0:2
-	>=dev-libs/libgee-0.8:0.8
-	>=dev-libs/libxml2-2.7:2
-	>=media-libs/gstreamer-1.12:1.0
-	>=media-libs/gst-plugins-base-1.12:1.0
-	media-libs/gstreamer-editing-services:1.0
-	>=media-libs/gupnp-dlna-0.9.4:2.0=
-	>=media-libs/libmediaart-0.7:2.0[vala]
-	media-plugins/gst-plugins-soup:1.0
-	>=net-libs/gssdp-1.1.0:0=[vala]
-	>=net-libs/gupnp-1.1.0:0=[vala]
-	>=net-libs/gupnp-av-0.12.8:=
-	>=net-libs/libsoup-2.44:2.4
-	>=sys-apps/util-linux-2.20
-	x11-misc/shared-mime-info
-	introspection? ( >=dev-libs/gobject-introspection-1.33.4:= )
-	sqlite? (
-		>=dev-db/sqlite-3.5:3
-		dev-libs/libunistring:=
-		x11-libs/gdk-pixbuf:2
-	)
-	tracker? ( app-misc/tracker:3= )
-	transcode? (
-		media-libs/gst-plugins-bad:1.0
-		media-plugins/gst-plugins-twolame:1.0
-		media-plugins/gst-plugins-libav:1.0
-	)
-	gtk? ( >=x11-libs/gtk+-3.22:3 )
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	$(vala_depend)
-	>=sys-devel/gettext-0.19.7
-	virtual/pkgconfig
-"
-# Maintainer only
-#   app-text/docbook-xsl-stylesheets
-#	>=dev-lang/vala-0.36
-#   dev-libs/libxslt
-
-src_prepare() {
-	vala_src_prepare
-	default
-	# Disable test triggering call to gst-plugins-scanner which causes
-	# sandbox issues when plugins such as clutter are installed
-	#sed -e 's/return rygel_playbin_renderer_test_main (argv, argc);/return 0;/' \
-	#	-i tests/rygel-playbin-renderer-test.c || die
-
-	#default
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use gtk-doc api-docs)
-		-Dsystemd-user-units-dir=$(systemd_get_userunitdir)
-		-Dplugins=gst-launch$(use sqlite && echo ",lms,media-export")$(use tracker && echo ",tracker3")
-		-Dengines=gstreamer
-		-Dexamples=false
-		$(meson_use test tests)
-		-Dgstreamer=enabled
-		$(meson_feature gtk)
-		$(meson_feature introspection)
-	)
-	meson_src_configure
-}