gentoo resync : 09.07.2022

3 files changed, 2 insertions, 52 deletions

diff --git a/net-libs/libnpupnp/Manifest b/net-libs/libnpupnp/Manifest
index a575fc2dcffa..8fd89f540681 100644
--- a/net-libs/libnpupnp/Manifest
+++ b/net-libs/libnpupnp/Manifest
@@ -1,5 +1,3 @@
-DIST libnpupnp-4.2.1.tar.gz 544987 BLAKE2B dee3b5ffb0a3005c1ac9a262df61c8823f59cb0e1b204776ff4f7a465b5caf226a6149315af0862b397607bd07783c2f876fd143090cc92174e081d9a4dbd585 SHA512 89c83bf05e64684432698b36a2152b4b35e8cffd7e4ef12046289533bc54f014ab0275190e98e79338efe8ebee03d6e7e20a032d1d293b2eb01bf5e0f9e6154f
 DIST libnpupnp-4.2.2.tar.gz 544198 BLAKE2B 450b3bf3f3ef2027bf50ad339c74b20dc4f075aac5c1b2419954bd558f114ca1dd973f5c14962b046cd6e57a0256586070aab7639b7da080452406d8a0fd24bc SHA512 22262e3dcb42f8c5ceb3df6296682ba993c4f86a810aaa63c7a6b5ec277c525d3d666a58840fb40833096e4f69916d309ca549bf67a137f200a236b1f71ec1f8
-EBUILD libnpupnp-4.2.1.ebuild 850 BLAKE2B b05d2e16f0bd4350e700612e64dc94a3b5ac5d837dac32ce496b7cdb0d6d4a27c3db8023b53140827e207aded102ad96d24daefecf082578a078363b3900140e SHA512 f64276e9411d0c4c9d44a308023cd0399aeec0b15b614e9e61f694ed3d183956b555e3f86fae7c28538e18b6ae2d63165c6f8dcac25de2001175ce2addca8f61
-EBUILD libnpupnp-4.2.2.ebuild 852 BLAKE2B ddb1c7f5c5a03da81967eac39adf85757c7d353a4d3bdb30a8011bf3a7de1475a94fe4caf87fee2ff4f3690869a4993529065e22f94bc85ac7ec02f29c88e267 SHA512 d393e2303e54f55b601675a63a56cb76f2349b48a8b2c4db428bd2c11232621988bf32298b00caf2d276db054cd6886284012d6765f2b806be435e9cf2d3aca9
+EBUILD libnpupnp-4.2.2.ebuild 850 BLAKE2B b05d2e16f0bd4350e700612e64dc94a3b5ac5d837dac32ce496b7cdb0d6d4a27c3db8023b53140827e207aded102ad96d24daefecf082578a078363b3900140e SHA512 f64276e9411d0c4c9d44a308023cd0399aeec0b15b614e9e61f694ed3d183956b555e3f86fae7c28538e18b6ae2d63165c6f8dcac25de2001175ce2addca8f61
 MISC metadata.xml 536 BLAKE2B 10f40312537ef0896c90f23ff327c320fd6c983227f182b46fa2d2d3bbe83044894f07449c9c119c5aa89dc8a889405f14437c0a84c6c52d0116818f9d169d39 SHA512 82d22e0273ed07ff51ce763851f8ea0070e10f6665763543cf96518ab9ef53005c88588cfe3f94855da74a17eae68118d263f12478f0928aca4cad6cce849677
diff --git a/net-libs/libnpupnp/libnpupnp-4.2.1.ebuild b/net-libs/libnpupnp/libnpupnp-4.2.1.ebuild
deleted file mode 100644
index 19af384d8482..000000000000
--- a/net-libs/libnpupnp/libnpupnp-4.2.1.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-4.2.2.ebuild b/net-libs/libnpupnp/libnpupnp-4.2.2.ebuild
index e43e9d04e31f..19af384d8482 100644
--- a/net-libs/libnpupnp/libnpupnp-4.2.2.ebuild
+++ b/net-libs/libnpupnp/libnpupnp-4.2.2.ebuild
@@ -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