gentoo auto-resync : 22:10:2022 - 14:04:34

5 files changed, 81 insertions, 3 deletions

diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 82fe850c2407..c3bc63502826 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/libnatpmp/Manifest b/net-libs/libnatpmp/Manifest
index 91ea23563d03..deaf19ed24e0 100644
--- a/net-libs/libnatpmp/Manifest
+++ b/net-libs/libnatpmp/Manifest
@@ -1,4 +1,4 @@
 AUX libnatpmp-20150609-gentoo.patch 2811 BLAKE2B 2125f030a90a20845616d28ecbf0554953408856b8e78d61a020d7ce95c357397f50263e7838c034510221dd6627e066bed19b1c75cb468a97f2517bee79b744 SHA512 ef3717dcc5b0f83522f45d7799fdec539f6148c24ea6d2800c601a5d0847c9c26f848b9654464d23e140426b32ed3aeed0030e7ade600e974129aef729786436
 DIST libnatpmp-20150609.tar.gz 24392 BLAKE2B 0a8df6badf222328a24ae94a97386593c42bcda58cada97d37a2cf74f6f6b5e27189753590552187ed7afce66d34d204b9d18ecd38ac0bcbadf8c8129a3b44ad SHA512 e50b1f68ce9254bb2f068ddc37417a3c417b80f7b3fb3d84e3e9af4a144d89e204ab993b54c01657335e855d0124a8fcbbf96ce78db7b9ae0b03b6eb79de2e09
-EBUILD libnatpmp-20150609.ebuild 728 BLAKE2B 37767955d645126702e76fe4caab436524906138d797b257b12b17d1170f4274c94c1d001e3ecd095dc37adf0da3278a024ccfa1b9a312803ff235249e1a0458 SHA512 b89d3feadf80e57ec689bc1f3efd5fc79766c454f54d13f2c261222687b833d66fa5c6fbf6105f2a3bbb2b557fa98883ff8468a917a9c0cd2721edf223b87444
+EBUILD libnatpmp-20150609.ebuild 792 BLAKE2B fe8fcd8cd2c9339db176c34681f32482a83e990b922d7c17ce2803a4cc8cdf4f5cd5f626e63a480957e5c1a014857705d4064fccbe0428146d5b478a2bd3e87d SHA512 d67291394514570e29fa50e1ab690c511cfcdcb599a1813a4ae4d008613574d39679545815c64d89993bf0c2d9438cf8215dda3febab55e319b1f25a2014217f
 MISC metadata.xml 253 BLAKE2B abd5250029676d23201d38d764a87f155a72fdb12c27eb98faea12eb441fd986c1cf2f230265e7e7d257e5dcc81b6710ec90ebf8dbc3a6597a04c4fff95eb771 SHA512 96c2922337805fd36723b0f847b2b15365e7207a21d57f6c6ab7e3cf8ca089b781635eaaf3ef01cbe61c34ee8b3f4c1c6234242db390ccc3c3bf0b1ab660b467
diff --git a/net-libs/libnatpmp/libnatpmp-20150609.ebuild b/net-libs/libnatpmp/libnatpmp-20150609.ebuild
index 1d54c02fab04..e52252b93031 100644
--- a/net-libs/libnatpmp/libnatpmp-20150609.ebuild
+++ b/net-libs/libnatpmp/libnatpmp-20150609.ebuild
@@ -6,8 +6,12 @@ EAPI=7
 inherit toolchain-funcs
 
 DESCRIPTION="An alternative protocol to UPnP IGD specification"
-HOMEPAGE="http://miniupnp.free.fr/libnatpmp.html"
-SRC_URI="http://miniupnp.free.fr/files/download.php?file=${P}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="
+	http://miniupnp.free.fr/libnatpmp.html
+	https://miniupnp.tuxfamily.org/libnatpmp.html
+	https://github.com/miniupnp/libnatpmp/
+"
+SRC_URI="https://miniupnp.tuxfamily.org/files/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/net-libs/miniupnpc/Manifest b/net-libs/miniupnpc/Manifest
index 80af14e285e4..7b54bcffbf0c 100644
--- a/net-libs/miniupnpc/Manifest
+++ b/net-libs/miniupnpc/Manifest
@@ -2,5 +2,8 @@ AUX miniupnpc-2.2.3-drop-which.patch 1209 BLAKE2B 32ae4d0eee181cc428bc8afe6aee0e
 AUX miniupnpc-2.2.3-makefile.patch 2179 BLAKE2B 38854b992d62f219394fae19d5038dcc2f9c2249184cbeba3a4c0948a61ca2147ae2cb7df2d19e38f76e3f6bedcec8e4ffa80d6685fb2f360fc36b8590399e1b SHA512 b332363db1e8df16a86153748a69ee5499a115df215d46cc3d2012e26574991a9545e81ce966f0b051f69601639dddde10a632555075c92c06d132624936a28d
 DIST miniupnpc-2.2.3.tar.gz 101360 BLAKE2B d2a7f64d56be524c5c4aadfecd40da4e1ad040fd7eab64be5b5716cb06047e86e3ed6a9c17f697fd3210af0fb0a6ae032b6ef0a5c1f0d96a2e185db97b0d06e8 SHA512 8b9555d336d5dfe8017a16727f964cddacb3f2bf3528fe3dd2416480da5763b24e1740345e470f2123c170d79d88444e41dbbce4536e6069590925e4805bc5ee
 DIST miniupnpc-2.2.3.tar.gz.sig 543 BLAKE2B d10bcb765e0d7a1eb68dc6269080b71535fced443e801a09677872bc498c866a02f22d851db963fb126331f28d2314542507713f514560d9d6eca2262287dc8b SHA512 636ad425b430629ee91b2755b543e9754aa88e243972f47839a2ad958757a12ff598f962e9328e5ad0fa3e0b2f895854c9cb3ca099048e7c132c8ce27806986e
+DIST miniupnpc-2.2.4.tar.gz 102932 BLAKE2B ebfea3fe978280825b7beefb8fe799685a72b0a74c589f5f55c7fde3d8c0d4bbb3d50fa0ff3aed554fa1e24ada0a1ab578328373f0295020415998fe35cde0a0 SHA512 f6515bda86405114016474fef6332c0c09a56b9293cf4391113f549444bab67e7d031af7b94dacff5e7c96d6508527204498c00fb67d6067685ef606b2152595
+DIST miniupnpc-2.2.4.tar.gz.sig 543 BLAKE2B 14a1a1979e2d248bb721c66db3e28c1d6f970477e94235bdfa77763d5f9d4c0da42b23d026e861f48cc34a17e009bf8c57aacc648435ec9e31c3c4b6c3347ffb SHA512 476d1a6cfc519f82461bf4d516f73d40cc3ef27886da68d2e805a24d9c4609c53566e258bd2b622e7716f43c81c14bc0f01b189d23b46b87afc3c76d4e6fa23e
 EBUILD miniupnpc-2.2.3-r1.ebuild 1544 BLAKE2B aa215b5a60e3e1ec4bcca653b61937f3b6bdc98cbaf16b076f6b843c51c6d0c06e359b0c4d91e7abaaabaf99069d2913a381ccad0750193d6a917560b36fa97a SHA512 4f11ec9894ca27552b6753f2b735d41f69f8c2474a604cc3613478b72ecd33912b4f12a43797afcd75cc6878396e29dfb08ffa0d8bdf388d9160a41f4425d5f1
+EBUILD miniupnpc-2.2.4.ebuild 1612 BLAKE2B 3f94865f81edae9d511baf105727bfc421aa14e5294d32ecf51e61269aca8d4a9c59f0cea7630549b627554dfe718481ee7c678cc372cbd04ecd05fd366a6405 SHA512 38ac03c491924ad41456af6e709b5b56f408a7969dbbae1677e88c62a0529ee32299c8d6744f390b5680dac0a80fc7035a83d2acf4e430c1cdf18a29ed27443e
 MISC metadata.xml 330 BLAKE2B 02b7193f99aee0f3cad145954d1a6f7f9b2f63e21cc23d02ae3048d89618050a5a8df2e206d771a3d0853664d4a0de9a09f44660b108eb280618d9136d1c86be SHA512 6a395c2a579f4ce8c891261da25c031284904a8d6366733c14a201a948e6744ae0037067f178f799d6134e4be670f1be3582f257414e067de654e8050963b972
diff --git a/net-libs/miniupnpc/miniupnpc-2.2.4.ebuild b/net-libs/miniupnpc/miniupnpc-2.2.4.ebuild
new file mode 100644
index 000000000000..fa6f270a0c9b
--- /dev/null
+++ b/net-libs/miniupnpc/miniupnpc-2.2.4.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs verify-sig
+
+DESCRIPTION="UPnP client library and a simple UPnP client"
+HOMEPAGE="
+	http://miniupnp.free.fr/
+	https://miniupnp.tuxfamily.org/
+	https://github.com/miniupnp/miniupnp/
+"
+SRC_URI="
+	https://miniupnp.tuxfamily.org/files/${P}.tar.gz
+	verify-sig? (
+		https://miniupnp.tuxfamily.org/files/${P}.tar.gz.sig
+	)
+"
+
+LICENSE="BSD"
+SLOT="0/17"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="ipv6"
+
+BDEPEND="
+	kernel_linux? ( sys-apps/lsb-release )
+	verify-sig? ( sec-keys/openpgp-keys-miniupnp )
+"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/miniupnp.asc
+
+src_prepare() {
+	local PATCHES=(
+		"${FILESDIR}"/miniupnpc-2.2.3-drop-which.patch
+	)
+	default
+
+	local exprs=(
+		# These bins are not installed, upnpc-static requires building static lib
+		-e '/EXECUTABLES =/s/ upnpc-static listdevices//'
+		# Prevent gzipping manpage.
+		-e '/gzip/d'
+		# Disable installing the static library
+		-e '/FILESTOINSTALL =/s/ $(LIBRARY)//'
+		-e '/$(INSTALL) -m 644 $(LIBRARY) $(DESTDIR)$(INSTALLDIRLIB)/d'
+	)
+	sed -i "${exprs[@]}" Makefile || die
+}
+
+# Upstream cmake causes more trouble than it fixes,
+# so we'll just stay with the Makefile for now.
+
+src_compile() {
+	tc-export CC AR
+	emake build/upnpc-shared
+}
+
+src_test() {
+	emake -j1 HAVE_IPV6=$(usex ipv6) check
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		PREFIX="${EPREFIX}/usr" \
+		INSTALLDIRLIB="${EPREFIX}/usr/$(get_libdir)" \
+		install
+
+	dodoc README Changelog.txt
+}