gentoo resync : 10.11.2017

6 files changed, 48 insertions, 88 deletions

diff --git a/dev-python/miniupnpc/Manifest b/dev-python/miniupnpc/Manifest
index fb2df4987b59..f1b57dc6f21c 100644
--- a/dev-python/miniupnpc/Manifest
+++ b/dev-python/miniupnpc/Manifest
@@ -1,13 +1,9 @@
-AUX 0001-Link-Python-module-against-the-shared-library.patch 707 SHA256 16a223d7dd5cd3507e11782934699540c687c2bed28d582cab177ab3f9b49e98 SHA512 ac0dc69cafc857d2a5490f8d6b3f2db877c9b8e498c771b4afb1bcfa129279ffe61c5f28ba5af1cedba6d5bfbef5803ebfca7bfe2ed55c4aacaf693119f53d00 WHIRLPOOL 2bb2df815f80f1c077110adc44c4e450c89e7e2b4bf80a66526c146e536ba7744088707e7035fb68532bde571b439967e784d3c334057f936b35d5e6ad2415b3
 AUX miniupnpc-1.9.20150917-shared-lib.patch 723 SHA256 101388a2cd63c16e7bc39f2bc2547b12a1a92e05af995648c5cb383f92ae3b6c SHA512 2a74eb019b5da38468d917f62b86a95b636f1e7375285af17e12556dec04026209cf384aa154e31a23fd86a2888dc340dee8e4bd6184779101bf290d340186f1 WHIRLPOOL 9683a1705ebf50bcf83f464a8bc0c90fc628045e9a3f129fcd753bc6283828b328694f63ac27545859628ffa7fe0bf1d161cf0a44121a82688ef3c16c1ad59ce
-DIST miniupnpc-1.8.tar.gz 70624 SHA256 bc5f73c7b0056252c1888a80e6075787a1e1e9112b808f863a245483ff79859c SHA512 8eedac9ad473fc952ca8896fe534d6da6b1b234e8b6f35f721394d4c71aca84ed287ca6c4f0455b50d97a45e4cd34e27d99a6813386e0864781364aa607e13d4 WHIRLPOOL 5b76ccbb5ed7daa9bb0d481b424b7c31a5f6dc85c5c812ba10175a29aefc0d3924f3db2aa8c3529d1241be59d67d1d4c702d27aad2de8c8a07fecf3857d73169
-DIST miniupnpc-1.9.20151008.tar.gz 83538 SHA256 e444ac3b587ce82709c4d0cfca1fe71f44f9fc433e9f946b12b9e1bfe667a633 SHA512 b13e6044184f47d0f9e78c4c97d2887ab763121b2b21c86652bf3ea1b05335cfbcfd91eecb8d1dcfb5530f2528e6cf3e9c49c742d5e771dba68a774d2c2ad4ca WHIRLPOOL 839b531eb6cae7ada0bbaa0c4230a1f6889f6a288a114262bf6e27aa27638800636127fea3066427fb030e8f449794681d2bffeb8e2d30876d8ef9e4a3ade3cc
-DIST miniupnpc-2.0.20161216.tar.gz 85780 SHA256 01e14408d6fc628de9afabc4417b84adeaba4c0ec517e7b8e278cb2993dafd3e SHA512 ed1413fa6cd8eeb0d01e595e5470b255b1119a9bcf28da17765a4a3f0eb2b514409a9bfe9cd041274761b61441389c290754055ff07d599bb653a4efe47e920f WHIRLPOOL fde2dc16f5cfd6e7d066ec49646ac79b6d262988afe928d80aaf47f6b7f868a272ac46d3136c56ed8373e800d1538fe4dd6c34255080e2bd01cc0cb8b56e37fc
+AUX miniupnpc-2.0.20171102-shared-lib.patch 1220 SHA256 44e651a4221c3ccd228a6000772ec2234a1f76dac2a47d8578a8c7b49ff0cd90 SHA512 bb099cee440b318ac12f68d810e2a7848df0150ecce01ba05e8f60cdff8fa0efb61ddc958586ffecf1bd9b0c15ea41954a6170e59028a24eb5a225e8fffdea33 WHIRLPOOL 2c1ccdd4bf44fa58a74dffb412eee8b9effe6e4bacfd03c3b6f36939f86e05cfd978544008c82ffcde0112b3ea32ed4032a76927d7f8bf4703d0fd6c1bfad5ad
 DIST miniupnpc-2.0.20170509.tar.gz 86055 SHA256 d3c368627f5cdfb66d3ebd64ca39ba54d6ff14a61966dbecb8dd296b7039f16a SHA512 71ec052ef6c8ad0d529e467ddae6eae19a93b9816174eeac753aa90e036cc2f00cf7e8d1cdb188ef8280849a988fe2995e37b63f8e2a361e021c1d1b306bff6f WHIRLPOOL 86c1a7a1d8800dbc0d1eccad66a5cb61a59af38989ca79c3b8df926ed12d9c7760d0b5d0e59d5d3190b45c7801a76c3e209f156836277992131c587b97c1a48c
-EBUILD miniupnpc-1.8.ebuild 575 SHA256 d5d4edbf0bc67caf7b16801e6cc0a310f6da9fe52129b6160e5060062f022546 SHA512 5f7d32e2c60a0fd9b995d94dafb88eb7d99b2bb5077529a6a26dc156b750f0027bc40409847854559eb96fb422bace982258b0833a1008e79bc563a08b435c7c WHIRLPOOL 46021fe6ca9b95433d7f195176b750c40e33315570b6102bb5f9b4b4b32b919a1be6e380af9f54085c1f735bec890dbb6e479b3eb2cf2d80407737fe3fc2f41d
-EBUILD miniupnpc-1.9.20151008.ebuild 561 SHA256 1e6d7fec2489f4be49d94a6cbc83c07ad458f7dab2dec7c3e0a2388a20474645 SHA512 54cb341f5ef4217e3281f0f5aaafb096adc4e38a84e0fcae5b893d0701d2d70542d1bb9d9772f98f2cf6672e5c36ff90f069afcde6d63505d77b6c8e1f4aaa6b WHIRLPOOL d31e0a8c48f03c909830ac82d1bca2f18a5ece00ad3bdae6d4e9c0c6501220539071700e02afd64436c063555553c8f6f332941e5006507ae8c6492067a567b2
-EBUILD miniupnpc-2.0.20161216.ebuild 714 SHA256 8e930e6a2d1a5774328789cf50b75f9ffa86c6edf071910438933d6f49e57eed SHA512 22a6a47c6f235b8717e188a3051e67057b7d2d9caa3d711ed56800ee9b6cc98dac19f1722e03a163deeddaaab7494a74c0b81b8704fe200225535391653c3e53 WHIRLPOOL d5b62acda838b618a8d56f2e4e062d38c6293f3d82c2ff7c147031ad8bf1721978f4bbf7c287b69a60e48df9252337415c51f416075b52e021e4dc30bc580deb
+DIST miniupnpc-2.0.20171102.tar.gz 86363 SHA256 148517020581260c8a2fa532224870bc53e59004777affcaf27ef636a72825d4 SHA512 5af68a58bef587ea5cc405155b1aca4438de3b56d5fb7e11945edd79e5cbdbf44c708b7f1ad3c3fde6bf4710de69782acf30cfcce327c5a906f4eb8f76a6ba37 WHIRLPOOL 80a9d0e487ddb2ac69af8e738144e74985c5b5acf8c4b7736121e58dbd04eaa38d90853e375334d7f05011b6134536e776757737f549410a6291941b0e47bf1e
 EBUILD miniupnpc-2.0.20170509.ebuild 714 SHA256 d57f906935dfedc8f318612e0d8a15a997a82c672aab21c4f15cc9ac4f3fdd0e SHA512 a145554f2dc93f098f6a4bf70f2505d8878de57ceb44fa74c894bbd1a6f7d27e57b2ed2f2e2d1144503444a1c25ef72a244139748db7dc5877888d785c1f330d WHIRLPOOL 3fa02d3e6d399b55c4f0e487336608c102a91e578f370ceda842a610a7b8379365c7970919bff0031e9ec4202e7451b7fe2b831154c29de38cc3b7829a877934
+EBUILD miniupnpc-2.0.20171102.ebuild 759 SHA256 0dbe36bc9bf07c1d01cbed469e6815e9310c8ce2d9b7954653984eb481567b3d SHA512 9cee2e5c32c934a5b63a5c38b74605cfb48b58ddd9d6afac1544f7a79b8e5543fa63f606c662e29224ca838779a9e139967ce61fad19ba3424656d4191840f1f WHIRLPOOL 941d7ce3fb1e1eaff8223f85002e69fe5ed23440bbc973af72ec1db70336f675a5b1051ff3916b5e1fabb45e429aec2cf74e47ac621191e73cf1be61880baf4d
 MISC ChangeLog 2944 SHA256 1b6f4082c25955afbf1d52639544498eb5bb0a2ba28161fea94c2299418f7261 SHA512 773140e9ccb0b4cc7dc7c3b4a7386782e4ce430ecb078c70fb01013d5b2f4703bcc101e2ff8a6dbd5e27ba33eac3f16af5cab12dfab54551e1efc8f543043da1 WHIRLPOOL bbc14617332c605a14de04ff775bfa6f6a4760167ad7ea05c16e5378ab7b08c28cf75374a0cc7325bb47e96c505b060dba94c801b2deb61bc11d13a68c633d8e
 MISC ChangeLog-2015 2738 SHA256 49bbe8764172112a232edcc5af555fc8f642a191f1342c78d849eab4f6426cd9 SHA512 c6b64c9d83de74c8c17c1886dfd50e23fbd3a8a9ce06216fdedd4643d78cdc76e425d9a81c32c59ec64d275662d80724af812543f91afff913ed92f847e0029f WHIRLPOOL 3f2596450dfb0fd1728e3b679a4eafe5981bd397a897fd1a8317107a14cb828b14f9757dba30eb738a5d36e20c85918b89ab633b414f3f7c679baff4e72ac7d6
 MISC metadata.xml 243 SHA256 a90d5777b80d7ed5f0f322ff9cafae7a96dd513f4af28b60e36c060305157906 SHA512 ded2bb7e056d9081e11b0470aa2874fbe9b5e63f0178bec611291f639763a9bd85a076dbc526e01df1403dea4d0eb28913addb346b676084e690e063b68eca28 WHIRLPOOL 10702c61e2ae8d5ddb862621065c0ed6b1d05b4a4ff0a30407d29edca19629cead238e10a9f1889f4c41f64d7ef88f0031f746a2e5d9502ca7b088c2039f5751
diff --git a/dev-python/miniupnpc/files/0001-Link-Python-module-against-the-shared-library.patch b/dev-python/miniupnpc/files/0001-Link-Python-module-against-the-shared-library.patch
deleted file mode 100644
index d9e6c4317ed3..000000000000
--- a/dev-python/miniupnpc/files/0001-Link-Python-module-against-the-shared-library.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 34da047ae5b945a43430f59efe0efefdd8f1ba55 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Wed, 3 Aug 2011 08:28:31 +0200
-Subject: [PATCH] Link Python module against the shared library.
-
----
- setup.py |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/setup.py b/setup.py
-index ca31f96..f5aef19 100644
---- a/setup.py
-+++ b/setup.py
-@@ -10,6 +10,6 @@ from distutils.core import setup, Extension
- setup(name="miniupnpc", version="1.5",
-       ext_modules=[
- 	         Extension(name="miniupnpc", sources=["miniupnpcmodule.c"],
--			           extra_objects=["libminiupnpc.a"])
-+			           libraries=["miniupnpc"])
- 			 ])
- 
--- 
-1.7.6
-
diff --git a/dev-python/miniupnpc/files/miniupnpc-2.0.20171102-shared-lib.patch b/dev-python/miniupnpc/files/miniupnpc-2.0.20171102-shared-lib.patch
new file mode 100644
index 000000000000..f3245cb4b355
--- /dev/null
+++ b/dev-python/miniupnpc/files/miniupnpc-2.0.20171102-shared-lib.patch
@@ -0,0 +1,41 @@
+From 7a61313dda299b16c4af3260ae5c11ce5945ed97 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Sun, 5 Nov 2017 09:24:00 +0100
+Subject: [PATCH] Link against the shared library
+
+---
+ setup.py | 10 +---------
+ 1 file changed, 1 insertion(+), 9 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index b84146f..73b05b7 100644
+--- a/setup.py
++++ b/setup.py
+@@ -13,13 +13,6 @@ from setuptools.command import build_ext
+ import subprocess
+ import os
+ 
+-EXT = ['libminiupnpc.a']
+-
+-class make_then_build_ext(build_ext.build_ext):
+-      def run(self):
+-            subprocess.check_call([os.environ.get('MAKE', 'make')] + EXT)
+-            build_ext.build_ext.run(self)
+-
+ setup(name="miniupnpc",
+       version=open('VERSION').read().strip(),
+       author='Thomas BERNARD',
+@@ -27,9 +20,8 @@ setup(name="miniupnpc",
+       license=open('LICENSE').read(),
+       url='http://miniupnp.free.fr/',
+       description='miniUPnP client',
+-      cmdclass={'build_ext': make_then_build_ext},
+       ext_modules=[
+          Extension(name="miniupnpc", sources=["miniupnpcmodule.c"],
+-                   extra_objects=EXT)
++                   libraries=['miniupnpc'])
+       ])
+ 
+-- 
+2.15.0.rc2
+
diff --git a/dev-python/miniupnpc/miniupnpc-1.8.ebuild b/dev-python/miniupnpc/miniupnpc-1.8.ebuild
deleted file mode 100644
index df6787d09fa1..000000000000
--- a/dev-python/miniupnpc/miniupnpc-1.8.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=(python2_7 pypy)
-
-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}"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/0001-Link-Python-module-against-the-shared-library.patch
-)
-
-# DOCS are installed by net-libs/miniupnpc.
-DOCS=()
diff --git a/dev-python/miniupnpc/miniupnpc-1.9.20151008.ebuild b/dev-python/miniupnpc/miniupnpc-1.9.20151008.ebuild
deleted file mode 100644
index a35212d5abbe..000000000000
--- a/dev-python/miniupnpc/miniupnpc-1.9.20151008.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=(python2_7 pypy)
-
-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=()
diff --git a/dev-python/miniupnpc/miniupnpc-2.0.20161216.ebuild b/dev-python/miniupnpc/miniupnpc-2.0.20171102.ebuild
index e52f6d8e51d7..c3659faf80f3 100644
--- a/dev-python/miniupnpc/miniupnpc-2.0.20161216.ebuild
+++ b/dev-python/miniupnpc/miniupnpc-2.0.20171102.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5} pypy{,3} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
 
 inherit distutils-r1
 
@@ -17,10 +17,11 @@ KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND=">=net-libs/miniupnpc-${PV}:0="
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
 
 PATCHES=(
-	"${FILESDIR}"/miniupnpc-1.9.20150917-shared-lib.patch
+	"${FILESDIR}"/miniupnpc-2.0.20171102-shared-lib.patch
 )
 
 # DOCS are installed by net-libs/miniupnpc.