gentoo resync : 06.05.2018

5 files changed, 2 insertions, 92 deletions

diff --git a/dev-python/miniupnpc/Manifest b/dev-python/miniupnpc/Manifest
index aecc27b6b212..ef230e6c8294 100644
--- a/dev-python/miniupnpc/Manifest
+++ b/dev-python/miniupnpc/Manifest
@@ -1,11 +1,6 @@
-AUX miniupnpc-1.9.20150917-shared-lib.patch 723 BLAKE2B 0f88b59fb039802c2d7b8177d831933e13bacf84b26523ceb1146cfb34103d961847ef983d25371aa9a97dd30e9b46aaf9640205856c290490cfa156f4522741 SHA512 2a74eb019b5da38468d917f62b86a95b636f1e7375285af17e12556dec04026209cf384aa154e31a23fd86a2888dc340dee8e4bd6184779101bf290d340186f1
 AUX miniupnpc-2.0.20171102-shared-lib.patch 1220 BLAKE2B 97fa99582f7992587e5f13e7569b7d6709cef8cc627d984c6a3ddef3265a6d069e3ae4a371e35804982ff9e5cd41b795a69576223b3a4ec8c591032f2f2f99f4 SHA512 bb099cee440b318ac12f68d810e2a7848df0150ecce01ba05e8f60cdff8fa0efb61ddc958586ffecf1bd9b0c15ea41954a6170e59028a24eb5a225e8fffdea33
-DIST miniupnpc-2.0.20170509.tar.gz 86055 BLAKE2B 7da640c4baac58aa26965a670877953b4c2d27aff08b604366bad6913b30c152d52120099f37c6250eeed97396ff412a4dd6000179070a82eebd3c052596b0d0 SHA512 71ec052ef6c8ad0d529e467ddae6eae19a93b9816174eeac753aa90e036cc2f00cf7e8d1cdb188ef8280849a988fe2995e37b63f8e2a361e021c1d1b306bff6f
-DIST miniupnpc-2.0.20171212.tar.gz 86607 BLAKE2B fce582c4125192f74f6ffb174295020af1c9b574b2094f5565a5e49641820a2d9cef719de59cb94bfd207182505237c22cf58425e1a7b47f5dfe2eb84c07d3c5 SHA512 d25708f4e2ef7311878ba6d17cb506f4bfe5c9cc6b7a79e4168f143ca9da8b96beb018c42dd735f0b23806668eba2308b7de26d1b506d91c23f79c7ed77399a0
-DIST miniupnpc-2.0.20180203.tar.gz 86772 BLAKE2B 6959d7033f12d3cbe52bbe1ec2178c068a448441d22501f44a7228b2050b53ff5e955d390ff03071e6f34df2a652040bf5ab23c59aca16dc4379e380dd46fea8 SHA512 b8ebf02ed01c5217a789397b7c224ba21d233cb544ccdfd907fb9c6f49adae6864eb17963b9b9f654ecf3fde864c191fd7d00c5cf614771a7137a030f341f226
 DIST miniupnpc-2.0.20180222.tar.gz 87018 BLAKE2B 656ae02ac6e462084252d95e579972d2bbaec24cf44b5910d4fc1a956723a8ed8fecaa428aea361a7ec8a3ff60b82e0d9468ac21d251c16ac8c2b52eafec6ab3 SHA512 0cceeedff6c584d2d7037ff91fbba0fe580fabfda810b9a9ed7c8d8495445339e3ff115d63d4429bcd3eff2b13b123e1bd5855ff1bc9dcd986b968a82c368591
-EBUILD miniupnpc-2.0.20170509.ebuild 714 BLAKE2B c5de8d25eb9c8219ac4d124c53a8af8f62b88ace08d12084a0110571ec00b2518c3a163c54dd6b2ff3fcc215449fce8b0ffa58549c7458259ad57bf86bc6da94 SHA512 a145554f2dc93f098f6a4bf70f2505d8878de57ceb44fa74c894bbd1a6f7d27e57b2ed2f2e2d1144503444a1c25ef72a244139748db7dc5877888d785c1f330d
-EBUILD miniupnpc-2.0.20171212.ebuild 757 BLAKE2B f0b24778ea05968421c18f0da2c2e44b4fe22446fd1189a8b2b672a3939171aba0342f390561583f1ce64f79c2164bc1eab543656c1290c1795eac576aef0e5a SHA512 ef1e1fbaa80d4c26240063e73a9da5e28be195faad1816587f3f92268d6128ebf602285dc1b987db0a328748a63d3f49d59e54a4a5680c6e986c5ce970b2d73d
-EBUILD miniupnpc-2.0.20180203.ebuild 759 BLAKE2B a7eb0f7a95739c12bc7d598af88739fbb8ea89b653880f90ff93b4512270caea1beff3db54b364458ee899f533f2fd30d508bed7d1e626306735b46f48418850 SHA512 21446a2e52a00e5671cf7270d07eff3a797b14afc97573dd06caedb123d1b825e31e269f3144fb1004ea69c73fcf6cbb85d499c37420801467442b6e3577ad71
+DIST miniupnpc-2.0.20180503.tar.gz 88207 BLAKE2B 1d6c6396e805eae3c53263a6856cc119033a645da29471b31705fdee8465808361057804496821f845112fb8490d351f67a5d5c9e1fef522fc6e6df8d4ac34c1 SHA512 68dcf76fe62223de80610afd392f14f46af2465796c3d4d46daa0c6f1f7e99034368b2484e260e718d42eef480644a684e83d4c0f32a6108fdd544cfc48443a3
 EBUILD miniupnpc-2.0.20180222.ebuild 756 BLAKE2B 56fffa8b370768c2d0ec74a744a79e522dbe5ae5eadf0c58c1e21b39772941323d3f8b35d37c2f33e7b91ea94acdcdad800c00c4bb1ee07b0805bb7c8cae5047 SHA512 285f2327fbc98a1408e59ca0263e9eae46021f9ae47f4c176142594018fc70b337c1eee3cafde5f3dc32cd56e7e10e70504fd740c692aa48644b0e6ae0e3597c
+EBUILD miniupnpc-2.0.20180503.ebuild 759 BLAKE2B a7eb0f7a95739c12bc7d598af88739fbb8ea89b653880f90ff93b4512270caea1beff3db54b364458ee899f533f2fd30d508bed7d1e626306735b46f48418850 SHA512 21446a2e52a00e5671cf7270d07eff3a797b14afc97573dd06caedb123d1b825e31e269f3144fb1004ea69c73fcf6cbb85d499c37420801467442b6e3577ad71
 MISC metadata.xml 243 BLAKE2B 997913e51bb9c2ba601c78673246d3845d1078f5be11ff209532c5afc9f433d4cfe7a0066ba23677d23ffe368d7ee718df71d28301d45c0473f50e931f674165 SHA512 ded2bb7e056d9081e11b0470aa2874fbe9b5e63f0178bec611291f639763a9bd85a076dbc526e01df1403dea4d0eb28913addb346b676084e690e063b68eca28
diff --git a/dev-python/miniupnpc/files/miniupnpc-1.9.20150917-shared-lib.patch b/dev-python/miniupnpc/files/miniupnpc-1.9.20150917-shared-lib.patch
deleted file mode 100644
index 086c0926651b..000000000000
--- a/dev-python/miniupnpc/files/miniupnpc-1.9.20150917-shared-lib.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From cd8787999bf4c4b89601f6338ce765ea6229232c Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Thu, 1 Oct 2015 18:49:26 +0200
-Subject: [PATCH] Use shared library when linking Python extensions
-
----
- miniupnpc/setup.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/miniupnpc/setup.py b/miniupnpc/setup.py
-index 049f670..2533ed4 100644
---- a/setup.py
-+++ b/setup.py
-@@ -19,6 +19,6 @@ setup(name="miniupnpc",
-       description='miniUPnP client',
-       ext_modules=[
-          Extension(name="miniupnpc", sources=["miniupnpcmodule.c"],
--                   extra_objects=["libminiupnpc.a"])
-+                   libraries=["miniupnpc"])
-       ])
- 
--- 
-2.6.0
-
diff --git a/dev-python/miniupnpc/miniupnpc-2.0.20170509.ebuild b/dev-python/miniupnpc/miniupnpc-2.0.20170509.ebuild
deleted file mode 100644
index d1cda6440d24..000000000000
--- a/dev-python/miniupnpc/miniupnpc-2.0.20170509.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python bindings for UPnP client library"
-HOMEPAGE="http://miniupnp.free.fr/"
-SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE=""
-
-RDEPEND=">=net-libs/miniupnpc-${PV}:0="
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/miniupnpc-1.9.20150917-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())'
diff --git a/dev-python/miniupnpc/miniupnpc-2.0.20171212.ebuild b/dev-python/miniupnpc/miniupnpc-2.0.20171212.ebuild
deleted file mode 100644
index 292c63ed647a..000000000000
--- a/dev-python/miniupnpc/miniupnpc-2.0.20171212.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python bindings for UPnP client library"
-HOMEPAGE="http://miniupnp.free.fr/"
-SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
-IUSE=""
-
-RDEPEND=">=net-libs/miniupnpc-${PV}:0="
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-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())'
diff --git a/dev-python/miniupnpc/miniupnpc-2.0.20180203.ebuild b/dev-python/miniupnpc/miniupnpc-2.0.20180503.ebuild
index dd70b6c5a34d..dd70b6c5a34d 100644
--- a/dev-python/miniupnpc/miniupnpc-2.0.20180203.ebuild
+++ b/dev-python/miniupnpc/miniupnpc-2.0.20180503.ebuild