gentoo resync : 25.11.2020

3 files changed, 47 insertions, 6 deletions

diff --git a/dev-python/miniupnpc/Manifest b/dev-python/miniupnpc/Manifest
index 374f9d5d5d6f..4b22ed9e6601 100644
--- a/dev-python/miniupnpc/Manifest
+++ b/dev-python/miniupnpc/Manifest
@@ -1,4 +1,8 @@
 AUX miniupnpc-2.0.20171102-shared-lib.patch 1220 BLAKE2B 97fa99582f7992587e5f13e7569b7d6709cef8cc627d984c6a3ddef3265a6d069e3ae4a371e35804982ff9e5cd41b795a69576223b3a4ec8c591032f2f2f99f4 SHA512 bb099cee440b318ac12f68d810e2a7848df0150ecce01ba05e8f60cdff8fa0efb61ddc958586ffecf1bd9b0c15ea41954a6170e59028a24eb5a225e8fffdea33
-DIST miniupnpc-2.1.20191224.tar.gz 94740 BLAKE2B 85c0b3eb678685bc7192dbee9440ec5f5be80cbac4d6a4e0a6473662c66f05ef512322cd535a142ffe16d3099a86f78ea70645a7eb2979c373e7a486aeab0cd5 SHA512 d362f914ce9177c1bc46f1f3ae59069c61c0c9c1b6ea7e78003d6b46445d3550835ffc541c2649b5fbc997d035357b461148edb3648135f33d0ce98b54961917
-EBUILD miniupnpc-2.1.20191224.ebuild 741 BLAKE2B 7a10b4c13fb48b8a3ac67f1f85415bb73a03453447210e251ba5197c6af0fb8fad7cf006f40a609f9b95157ee882f09c049aa1644840660714c33b002abb8a84 SHA512 e4c3eed34a629410f236d7d7cdca9d2d4d8aa95b939d108990cf33381f7822096dc1c6f023a8070bd89bd9cf79a3115d95d2d1f2a43a511f0fa75f3ee01c709c
+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 906 BLAKE2B 7719aef18f2ed3829e8005d67c6e6b3c381cf6de6c5012c5a2ca1a543057bb6a21aadafb04708a45814a28675582bbc0fa0fe899c1ac3c2fd0d1d5ced4d712ac SHA512 ca4c2772c17e29910d8cb90c2b5c9f611a395645f813b4daf81ea3cc8448e357c8082c669fc4500d67f92c35a998f5eced9defde665db117b2bc6e096069bbbb
+EBUILD miniupnpc-2.2.0.ebuild 910 BLAKE2B 590fca42dd99e1160c081fb36605cd9b4a8ae36c75b2e4bc90c9314524c0f8323ca129c3eb098f439f2f37476e8b89f7efa08ac93df568a83870cae12a6d9e25 SHA512 f0c00f3509b5e5479dd964282bbdcb960def37519725acc65a8d1f3da178970465299d87def8602d4290eae481a466df93107758e3234494c05addf34a230b43
 MISC metadata.xml 243 BLAKE2B 997913e51bb9c2ba601c78673246d3845d1078f5be11ff209532c5afc9f433d4cfe7a0066ba23677d23ffe368d7ee718df71d28301d45c0473f50e931f674165 SHA512 ded2bb7e056d9081e11b0470aa2874fbe9b5e63f0178bec611291f639763a9bd85a076dbc526e01df1403dea4d0eb28913addb346b676084e690e063b68eca28
diff --git a/dev-python/miniupnpc/miniupnpc-2.1.20191224.ebuild b/dev-python/miniupnpc/miniupnpc-2.1.20201016.ebuild
index 5e1d489b2e1e..e2122994dfda 100644
--- a/dev-python/miniupnpc/miniupnpc-2.1.20191224.ebuild
+++ b/dev-python/miniupnpc/miniupnpc-2.1.20201016.ebuild
@@ -5,11 +5,12 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
 
-inherit distutils-r1
+inherit distutils-r1 verify-sig
 
 DESCRIPTION="Python bindings for UPnP client library"
 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,8 +18,10 @@ KEYWORDS="amd64 ppc ppc64 x86"
 IUSE=""
 
 RDEPEND=">=net-libs/miniupnpc-${PV}:0="
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
+BDEPEND="verify-sig? ( app-crypt/openpgp-keys-miniupnp )"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/miniupnp.asc
 
 PATCHES=(
 	"${FILESDIR}"/miniupnpc-2.0.20171102-shared-lib.patch
diff --git a/dev-python/miniupnpc/miniupnpc-2.2.0.ebuild b/dev-python/miniupnpc/miniupnpc-2.2.0.ebuild
new file mode 100644
index 000000000000..c64ff7be3356
--- /dev/null
+++ b/dev-python/miniupnpc/miniupnpc-2.2.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
+
+inherit distutils-r1 verify-sig
+
+DESCRIPTION="Python bindings for UPnP client library"
+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"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND=">=net-libs/miniupnpc-${PV}:0="
+DEPEND="${RDEPEND}"
+BDEPEND="verify-sig? ( app-crypt/openpgp-keys-miniupnp )"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/miniupnp.asc
+
+PATCHES=(
+	"${FILESDIR}"/miniupnpc-2.0.20171102-shared-lib.patch
+)
+
+# DOCS are installed by net-libs/miniupnpc.
+DOCS=()
+
+# Example test command:
+# python -c 'import miniupnpc; u = miniupnpc.UPnP(); u.discover(); u.selectigd(); print(u.externalipaddress())'