7 files changed, 10 insertions, 60 deletions
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 09dd73a88b24..10f7d78fe71b 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/libnpupnp/Manifest b/net-libs/libnpupnp/Manifest
index 65fe147f1c0c..c25870ad6895 100644
--- a/net-libs/libnpupnp/Manifest
+++ b/net-libs/libnpupnp/Manifest
@@ -1,5 +1,3 @@
-DIST libnpupnp-4.2.2.tar.gz 544198 BLAKE2B 450b3bf3f3ef2027bf50ad339c74b20dc4f075aac5c1b2419954bd558f114ca1dd973f5c14962b046cd6e57a0256586070aab7639b7da080452406d8a0fd24bc SHA512 22262e3dcb42f8c5ceb3df6296682ba993c4f86a810aaa63c7a6b5ec277c525d3d666a58840fb40833096e4f69916d309ca549bf67a137f200a236b1f71ec1f8
 DIST libnpupnp-5.0.0.tar.gz 545368 BLAKE2B a0b83186df66ff5608a7d579d3653028497ce92536ea85abc03c73134046c4f55ad31fb849c7231cf7842a424e4f408747f7da3769aae441499fd7ec7ae2544f SHA512 325be49f64d901e67aaf3893ac91f21523e81b1810c717f70a40486dde65080620ffa38f622ec785475b181f84a6d51fad89a86e709a9bd5554f278b90ae92f9
-EBUILD libnpupnp-4.2.2.ebuild 850 BLAKE2B b05d2e16f0bd4350e700612e64dc94a3b5ac5d837dac32ce496b7cdb0d6d4a27c3db8023b53140827e207aded102ad96d24daefecf082578a078363b3900140e SHA512 f64276e9411d0c4c9d44a308023cd0399aeec0b15b614e9e61f694ed3d183956b555e3f86fae7c28538e18b6ae2d63165c6f8dcac25de2001175ce2addca8f61
-EBUILD libnpupnp-5.0.0.ebuild 852 BLAKE2B ddb1c7f5c5a03da81967eac39adf85757c7d353a4d3bdb30a8011bf3a7de1475a94fe4caf87fee2ff4f3690869a4993529065e22f94bc85ac7ec02f29c88e267 SHA512 d393e2303e54f55b601675a63a56cb76f2349b48a8b2c4db428bd2c11232621988bf32298b00caf2d276db054cd6886284012d6765f2b806be435e9cf2d3aca9
+EBUILD libnpupnp-5.0.0.ebuild 850 BLAKE2B ef0c518353ca869a56e171b36f11063acaa153a44711c460e37f77e25304aeccf961c6c8f69a20806f860711399c0514f1316876fcf38979ac7837d7ec15e973 SHA512 41dfed61f5fc31eae948fa457d9b660d6af76c2b129ebca47a14e7b9bc7d2a02c054abb87dcb50365fca0e55198a26d7a8c359f24c844ad0acf540386e584031
 MISC metadata.xml 536 BLAKE2B 10f40312537ef0896c90f23ff327c320fd6c983227f182b46fa2d2d3bbe83044894f07449c9c119c5aa89dc8a889405f14437c0a84c6c52d0116818f9d169d39 SHA512 82d22e0273ed07ff51ce763851f8ea0070e10f6665763543cf96518ab9ef53005c88588cfe3f94855da74a17eae68118d263f12478f0928aca4cad6cce849677
diff --git a/net-libs/libnpupnp/libnpupnp-4.2.2.ebuild b/net-libs/libnpupnp/libnpupnp-4.2.2.ebuild
deleted file mode 100644
index 19af384d8482..000000000000
--- a/net-libs/libnpupnp/libnpupnp-4.2.2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools
-
-DESCRIPTION="A C++ base UPnP library, derived from Portable UPnP, a.k.a libupnp"
-HOMEPAGE="https://framagit.org/medoc92/npupnp"
-SRC_URI="https://www.lesbonscomptes.com/upmpdcli/downloads/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	dev-libs/expat
-	net-libs/libmicrohttpd
-	net-misc/curl
-"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--enable-client \
-		--enable-debug \
-		--enable-device \
-		--enable-gena \
-		--enable-ipv6 \
-		--enable-optssdp \
-		--enable-reuseaddr \
-		--enable-soap \
-		--enable-ssdp \
-		--enable-tools \
-		--enable-webserver
-}
-
-src_install() {
-	default
-
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/net-libs/libnpupnp/libnpupnp-5.0.0.ebuild b/net-libs/libnpupnp/libnpupnp-5.0.0.ebuild
index e43e9d04e31f..f1e07f46c8cb 100644
--- a/net-libs/libnpupnp/libnpupnp-5.0.0.ebuild
+++ b/net-libs/libnpupnp/libnpupnp-5.0.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
@@ -11,7 +11,7 @@ SRC_URI="https://www.lesbonscomptes.com/upmpdcli/downloads/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	dev-libs/expat
diff --git a/net-libs/libupnpp/Manifest b/net-libs/libupnpp/Manifest
index 61a33ac39de0..fba5caac1c1f 100644
--- a/net-libs/libupnpp/Manifest
+++ b/net-libs/libupnpp/Manifest
@@ -1,5 +1,5 @@
-DIST libupnpp-0.21.0.tar.gz 478894 BLAKE2B 093803ff0a4a0b76272f44e470df69169053c66ae27a42b483623b50d0c2bffa61f51e0ca9a82b4fc759492640c68d0eae90cdc46a1e6e6f38f7655190e4101b SHA512 1032ef83e6880c1e4ae4903f6e175640b1d3da7090bfb04bf480f70d58436ef89e6a43886c86dcda2c4aab8370cbd0d5260601ac359a3dded0688ac2748d30fd
 DIST libupnpp-0.22.2.tar.gz 479341 BLAKE2B 5dbfa76614bb1aca1d8a3f03019ed6a95de3640a86f4ca0f3736d15fee7ccb54d454b0cb08f9595789b7478a8238410adabfdaea3a39f131094b9485a0faa701 SHA512 670f9639a4068013e1cd5cc6610e9bf38c6ab0d854079c3344525a4c5e553088a1dc49354ca33338e8d8fb487fc2c0a724f1cf3a99bf6b6f47d6a281f3a8e9e4
-EBUILD libupnpp-0.21.0.ebuild 566 BLAKE2B 84678b7cde17be4d585319edd9869d63e97317ebfd8acb21cb8d082e1eb1f748e742d970fd4169a80ac292f0147adbdd35e5b9c5b43b1fae65d572f6b77cce46 SHA512 9de74d19426ced16705557057d60759738ff829625bce0ca224f6d097036c274f0f47dc741e2e830a4667ace09648a555a25ea470fb0bf7c9fd628d7fbacd470
-EBUILD libupnpp-0.22.2.ebuild 568 BLAKE2B 764ad3121127c9b31b8f149a2d4340b1035389784692b399010daf36129388345ff5a8a150356a1ae4f9db5ca6624b7746563f0e55782b9fc09efd03e611e7fe SHA512 96639db99842044a8e4323e431a3e7efdb8aac0c6e9378136b49ef750305392a82e4a43354ba8d6308fe23395c2f6206a656756882950ec85494e09bc3d7f59a
+DIST libupnpp-0.22.4.tar.gz 481758 BLAKE2B 41da0dc744e0cddd2d322de297a87c50d975871dcc2b3c22e0381e044ea40787834442161c9bae8c2c3c89226aff7a264e172dedf3c107a8945308f915971785 SHA512 ab97a8a5903e43a138b59c9f5805b85fee07da8e73a1b205c5e57688334f3719f84b3483e6bdde461d9b201f064c4afba0f319989627939e6c9f9d6acef84f31
+EBUILD libupnpp-0.22.2.ebuild 566 BLAKE2B da165a9fc027b4b23b82b7107ffd8890938b4f74803f939f2eb4d0dbf29e3d2b71d976f884e64a5239e55f0a7873a23d01ce8e15701ba5bc60c3db93efe557c5 SHA512 dfea0fa54586ab1aaee2f168d5edba04e59d92ad4e0e5f5defb54280a25414ac13a5c856efb4d76bc55453f2300a68244052748ddd4a36a96c10d6d0259062d3
+EBUILD libupnpp-0.22.4.ebuild 568 BLAKE2B 494b9691acfb48d1b3ef23444d48f56b9bcfd1841bbe24ab06d0fb90df78f448a7ea8fe4ba6f1977cdce5a462df27b9eef330041380ef82309a5b637124b8d07 SHA512 a1fa8c97121841fdb24ebd5b4319ede3f21c2f52a858a7b72c3e675f654a402faaf2fdd7eaaeec6628f9c1b29aa64b13652fcf5d5fcf98f5acb4851afd4f05db
 MISC metadata.xml 218 BLAKE2B a724c5fc41f88a8b75cf9091c58241ae839c3d8a0275a28e4b61e76d8d51865b3dc363752961f61562b702b9e70c49643533164340360ac2d1fd41f8487d5c82 SHA512 e4a1847c2fb757c0e4fef284e730e49814e005f0fd7fcc12a3a4ed70867160635cede513455be1e88ca1b7fd8e671655ac6475be3ea8fe47d979523970ed2851
diff --git a/net-libs/libupnpp/libupnpp-0.22.2.ebuild b/net-libs/libupnpp/libupnpp-0.22.2.ebuild
index 1027290bd71a..ec0227f9ec2d 100644
--- a/net-libs/libupnpp/libupnpp-0.22.2.ebuild
+++ b/net-libs/libupnpp/libupnpp-0.22.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -8,7 +8,7 @@ SRC_URI="https://www.lesbonscomptes.com/upmpdcli/downloads/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DEPEND="
 	dev-libs/expat
diff --git a/net-libs/libupnpp/libupnpp-0.21.0.ebuild b/net-libs/libupnpp/libupnpp-0.22.4.ebuild
index 1e34570c792d..b05822c3f097 100644
--- a/net-libs/libupnpp/libupnpp-0.21.0.ebuild
+++ b/net-libs/libupnpp/libupnpp-0.22.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -8,7 +8,7 @@ SRC_URI="https://www.lesbonscomptes.com/upmpdcli/downloads/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 
 DEPEND="
 	dev-libs/expat