gentoo resync : 25.11.2020

3 files changed, 75 insertions, 5 deletions

diff --git a/net-libs/miniupnpc/Manifest b/net-libs/miniupnpc/Manifest
index b3af941a3299..dab3a77f6c20 100644
--- a/net-libs/miniupnpc/Manifest
+++ b/net-libs/miniupnpc/Manifest
@@ -1,3 +1,7 @@
-DIST miniupnpc-2.1.20191224.tar.gz 94740 BLAKE2B 85c0b3eb678685bc7192dbee9440ec5f5be80cbac4d6a4e0a6473662c66f05ef512322cd535a142ffe16d3099a86f78ea70645a7eb2979c373e7a486aeab0cd5 SHA512 d362f914ce9177c1bc46f1f3ae59069c61c0c9c1b6ea7e78003d6b46445d3550835ffc541c2649b5fbc997d035357b461148edb3648135f33d0ce98b54961917
-EBUILD miniupnpc-2.1.20191224.ebuild 1323 BLAKE2B 28df43609d2274aae43c47ec35fcd5f813ced3935eca25b3f700ae91f0293a1df9fd4f39559fd41296bbc676ed0e263e448c1953fef7dad902379a347d5a1df1 SHA512 465c177828696c55f15983fdb49b330c4f1e6c19c47961f112ca24813a01a2c339f2af0091bd36daa974cd875ec449b4dedf695a10ce4fab318bdacd1cfea6e9
+DIST miniupnpc-2.1.20201016.tar.gz 97682 BLAKE2B 2c98f71ff7262a24a69a9a4af411dbeb58c20ec4181bca8bbdd61c628bf5bd49f7e9b763b73ffb5d3508b5b545a0c918828ead2a376b57b8ea5051cd7b8e9c13 SHA512 d619f7e205cac68137020fab31e8bdaeebd09eeaca5e42e1e03a9e0085a64d635ec896862a488b0d57798d1e6ce96e2ba5652f60c0b8df9fc866eea90baea152
+DIST miniupnpc-2.1.20201016.tar.gz.sig 543 BLAKE2B b8ddcadb58e7b8dc4646ea1ac4e10331fe70a5b9a27902dd5ad09ac306605160b63f2e21d96eda4aa0f77485800cb9c5aa110f215dbe3536a9f6ec1c4a5e9ed9 SHA512 fb7886d4198bd2ae1eeff293152ff509e7ebe6ff0f9b3c20d5824f7ca9f65091a61db2bc0a8ac9fb0449994aba594cff3bf6c556876dbb47d593ecf8b7b26d10
+DIST miniupnpc-2.2.0.tar.gz 98348 BLAKE2B 3464dc7f0b5416b558d0dd49121f3b851d9808a516c19d4f99fdb205e20149f27ef495d9f8da09ad3a28656580bfc16d1cf99ef993e41e9600cfe427b4a776d2 SHA512 b5bb674f162cae3d9e0205a9cdf6acc1fb334ab8ac5330be924411a8fd46833fb916d09f947d1e40d05224df7df1ecf6d812037185690e5022287c2024eb183f
+DIST miniupnpc-2.2.0.tar.gz.sig 543 BLAKE2B c75dbc54debc77e63ea3534f8f424a3904131893fc31d6485163ee6ecdafdab02fc0db8e290d28c834ac0efc5a37c34cbca7f14e1c78f859d22abc4e0b2ae48f SHA512 54f8cccea5886e06fbdaa04d270c12bd95d219be0b275491d9168f1089b1efe96e8a6f30ebf428091a3bae4bc349c0b8c94a22e94d56845a0a8b9724b1f9f74d
+EBUILD miniupnpc-2.1.20201016.ebuild 1523 BLAKE2B 53a24a8767c864c6b82f54f2822e79b9670f632a872fb10f798af381001ea65d4a7de3f2f11dd8e6c5d82eab943f3b1a69fc7953868b2578fbf33dce0e253114 SHA512 2b60ca7a7b798953a969f28aef2a325175bff279996edc332423a9088f620c295c2879377cae3859244deafd7e9fa5c23cf6c28a487b8725723bff4e330ae061
+EBUILD miniupnpc-2.2.0.ebuild 1532 BLAKE2B f2addd212049fc794f7d63e9d77ccf703bb1943662d475eb5bfd5c3fb9ef29327400d1628ff33eb5e2f280294668dfae6e5a1a6468f5605edf8f702820818376 SHA512 3635df1e464624500593db7ddcbd9744027b4867e17cdb930b36f142f610e5e5c6c6294786bbd57c1792f51a38bb676467f65b3d4d55f0e83cdd925b211b4aa8
 MISC metadata.xml 243 BLAKE2B 997913e51bb9c2ba601c78673246d3845d1078f5be11ff209532c5afc9f433d4cfe7a0066ba23677d23ffe368d7ee718df71d28301d45c0473f50e931f674165 SHA512 ded2bb7e056d9081e11b0470aa2874fbe9b5e63f0178bec611291f639763a9bd85a076dbc526e01df1403dea4d0eb28913addb346b676084e690e063b68eca28
diff --git a/net-libs/miniupnpc/miniupnpc-2.1.20191224.ebuild b/net-libs/miniupnpc/miniupnpc-2.1.20201016.ebuild
index 7c74096859fc..939ae17cc4ef 100644
--- a/net-libs/miniupnpc/miniupnpc-2.1.20191224.ebuild
+++ b/net-libs/miniupnpc/miniupnpc-2.1.20201016.ebuild
@@ -3,11 +3,12 @@
 
 EAPI=7
 
-inherit toolchain-funcs
+inherit toolchain-funcs verify-sig
 
 DESCRIPTION="UPnP client library and a simple UPnP client"
 HOMEPAGE="http://miniupnp.free.fr/"
-SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz"
+SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz
+	verify-sig? ( http://miniupnp.free.fr/files/${P}.tar.gz.sig )"
 
 LICENSE="BSD"
 SLOT="0/17"
@@ -15,7 +16,11 @@ KEYWORDS="amd64 arm arm64 hppa ~mips ppc ppc64 s390 sparc x86"
 IUSE="ipv6 kernel_linux static-libs"
 
 RDEPEND=""
-DEPEND="kernel_linux? ( sys-apps/lsb-release sys-apps/which )"
+BDEPEND="
+	kernel_linux? ( sys-apps/lsb-release sys-apps/which )
+	verify-sig? ( app-crypt/openpgp-keys-miniupnp )"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/miniupnp.asc
 
 src_prepare() {
 	eapply_user
diff --git a/net-libs/miniupnpc/miniupnpc-2.2.0.ebuild b/net-libs/miniupnpc/miniupnpc-2.2.0.ebuild
new file mode 100644
index 000000000000..9e79fd0ac53e
--- /dev/null
+++ b/net-libs/miniupnpc/miniupnpc-2.2.0.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs verify-sig
+
+DESCRIPTION="UPnP client library and a simple UPnP client"
+HOMEPAGE="http://miniupnp.free.fr/"
+SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz
+	verify-sig? ( http://miniupnp.free.fr/files/${P}.tar.gz.sig )"
+
+LICENSE="BSD"
+SLOT="0/17"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="ipv6 kernel_linux static-libs"
+
+RDEPEND=""
+BDEPEND="
+	kernel_linux? ( sys-apps/lsb-release sys-apps/which )
+	verify-sig? ( app-crypt/openpgp-keys-miniupnp )"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/miniupnp.asc
+
+src_prepare() {
+	eapply_user
+
+	# These bins are not installed, upnpc-static requires building static lib
+	sed -i -e '/EXECUTABLES =/s/ upnpc-static listdevices//' Makefile || die
+	# Prevent gzipping manpage.
+	sed -i -e '/gzip/d' Makefile || die
+
+	if ! use static-libs; then
+		sed -i \
+			-e '/FILESTOINSTALL =/s/ $(LIBRARY)//' \
+			-e '/$(INSTALL) -m 644 $(LIBRARY) $(DESTDIR)$(INSTALLDIRLIB)/d' \
+			Makefile || die
+	fi
+}
+
+# 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 upnpc-shared $(usex static-libs upnpc-static '')
+}
+
+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
+}