gentoo resync 31.01.2019

6 files changed, 2 insertions, 213 deletions

diff --git a/net-proxy/mitmproxy/Manifest b/net-proxy/mitmproxy/Manifest
index 25d2a3749c42..a47830fe3e52 100644
--- a/net-proxy/mitmproxy/Manifest
+++ b/net-proxy/mitmproxy/Manifest
@@ -1,10 +1,3 @@
-AUX mitmproxy-0.10-jsbeautifier-imports.patch 1505 BLAKE2B 3575de61b375031282ce4fbcf9383667a8b29fcbadbef451f5d80917e821f689584073235112735f358230d248046a91b437cf86f7194aebe7ba084fd663ae7c SHA512 863aa8d2ae27b866b573812421d6cd3e9cf45ae70c499005e688a17f09e5a9a65ebb36a5e05599cfe76e7d4f59361c4870dfe9dc6ad764a09847180c74a292ca
-DIST mitmproxy-0.10.1.tar.gz 3426109 BLAKE2B 0e0822310d8b97041e6f25cb760297fb83a8544c24b0419d8215a7a65874a1c6763c6095c2e80b89231dc1de2a946471d6436713c092a1b95e7cb441f0617112 SHA512 2bef02f07942177044afa24749c4e8e2ba1aae5ee33e2cbffbecc557a09351865b70dc92b9acfd285716a82c84026a3eb93f889176fd288c1e8d67a415a5c79a
-DIST mitmproxy-0.11.1.tar.gz 6253324 BLAKE2B a3d3e06834a545138574246887c1ab5dab90d933b3995a613dabee2f6c55a436dfcb2220ded90ef91f5238d6bfcb10b2a1f64dcf801baa93598d6a8c13fadd1b SHA512 f265441825b22e2a7ec3c8f2f3152d123fbd6ac463fd4de0e973e24b2ab9feaf28689d3c995bb361ff06a88a6d88536b642944463573117640b1c096b79f20b1
-DIST mitmproxy-0.11.3.tar.gz 6172130 BLAKE2B 9001882db499e1e4a6ec082fef661a3369a36a218f3f19c08fc75d403b29b6aff22512c159a25250894e5419069ef662b691272eb5a7fbd23e2fb3e49d269adf SHA512 81184b3034b78d51368b4066adcc8337fc59332c80ce085c854610f70cd96531612520c1b751135e26093265c5475c8fef5fcb0908b77b5a18a5c605c0c94934
 DIST mitmproxy-4.0.4.tar.gz 27131713 BLAKE2B 2748b0f3b66e1f5840aae792a1b4cd8ef8efa3673fa24bc0c3e15474b36d68c0f6b2203cf629b6444545b8c6223752232b2ce8526290fe5d74916946e8917a03 SHA512 e08ea8b1c75a95b822c463625509037bbc8a979161cacaa1f0185f98df8d6d7e5400925365dbbe70d18751251b1005824f739a8cd035c0389f7b4aea562adfb3
-EBUILD mitmproxy-0.10.1.ebuild 1389 BLAKE2B fec1b89165a6223e24655fe4fe1623b03eb3fbfe7aa9b1922734f15dddd1bb238667bea835ef13f6996e88ee9c3fa682a579e02e17354fe9b48899bff3ba2e6d SHA512 3d0205bd73b8129a31dd70ccbc64f8b8b632e67f85cab0beabde3b92023b477470d641ece4b2ad527c9fbe0f7572972a8046adb551a67fbc8a6e7bc1df5766cb
-EBUILD mitmproxy-0.11.1.ebuild 1516 BLAKE2B e9543a5a8041a47947e8a463260d37629b7f6995a0a47bcb8a6e452167294191ca269d76e7de4b998325e844335d76fb2b3b60296bfc0f14183fc118c854c244 SHA512 f25695010fea1bbbfe139cd3f13c8be66913941f3bde96bc67b712d5ae001582a5685dba52337b9f61a50c6d3ecd92657df349d3e1153e17ca04eb1fa56aae47
-EBUILD mitmproxy-0.11.3.ebuild 1440 BLAKE2B 5a1d4efaab7ec09af0d3b72b5d2466790330d7fdb850fae973db10c518ba9557ab3fe3ac095f35bd0ae5ee23ab375b67bd01eed1208d72ea483f0da914d99658 SHA512 bb035673e7ea497660486e19547fbcd060dae5a2eeb6f181b65bcaab980c8cfd37b9f217541eb0d7cf2bf2f0983f4a4b6eaa41ad17c633dbd578faccfc7656fa
-EBUILD mitmproxy-4.0.4.ebuild 2517 BLAKE2B 8b62b47ec8127b3a48f89091de3f3dab53bde97e95d81c14285ac5d57783abebceb2e2ef4033d55fb224d45c8c1f0a538af04ca13969cdacb39d263a94da1588 SHA512 6cad8977b0ea0ed213b1c2b05f67f27b1461113d97affa3c1e10e6d3b964f87db4f422cee61a4f919a2f7a55f62935c038b63f3b5745f5ffaf7d461fbdbcc7e7
+EBUILD mitmproxy-4.0.4.ebuild 2522 BLAKE2B b6287fe9c18f33b8725944b01040800dae79ba8a81d5672e9056cb4aaf66445a96a86f1afb3fb417a4e215472a9e2a19ce8045768893353cec38ee267854e557 SHA512 63aaa26d6b3ab206b4dcc2281d69bcc17d06a7e9838c6a74c554a41142cd4ee3123e8419fa7919b075bd5a72a69ede2bf3c6ab4b32b5d6c8f7562087f87367ac
 MISC metadata.xml 318 BLAKE2B f422f86b4b441eca44aba5cbb5b26f619d779d04a9b0196c7308b38094cf7a1f71fa542dc66c431ff24922e510b30a9ca5c32dff68530f1bdbb3e64a4ebf6178 SHA512 8f7a5435cf5b7219e6f4827289dcbfb9ff4d4e5e1f70aa9694934276e9e4aa0d84a8a052c022eaa4358528b7869504037fd371d037d4e447d0d6c6536f46815f
diff --git a/net-proxy/mitmproxy/files/mitmproxy-0.10-jsbeautifier-imports.patch b/net-proxy/mitmproxy/files/mitmproxy-0.10-jsbeautifier-imports.patch
deleted file mode 100644
index bd6f65aa920e..000000000000
--- a/net-proxy/mitmproxy/files/mitmproxy-0.10-jsbeautifier-imports.patch
+++ /dev/null
@@ -1,44 +0,0 @@
---- mitmproxy-0.10/libmproxy/contrib/jsbeautifier/__init__.py
-+++ mitmproxy-0.10/libmproxy/contrib/jsbeautifier/__init__.py
-@@ -246,7 +246,7 @@
-         return sweet_code
- 
-     def unpack(self, source, evalcode=False):
--        import jsbeautifier.unpackers as unpackers
-+        from ..jsbeautifier import unpackers
-         try:
-             return unpackers.run(source, evalcode)
-         except unpackers.UnpackingError as error:
---- mitmproxy-0.10/libmproxy/contrib/jsbeautifier/unpackers/__init__.py
-+++ mitmproxy-0.10/libmproxy/contrib/jsbeautifier/unpackers/__init__.py
-@@ -7,7 +7,7 @@
- 
- import pkgutil
- import re
--from jsbeautifier.unpackers import evalbased
-+from ...jsbeautifier.unpackers import evalbased
- 
- # NOTE: AT THE MOMENT, IT IS DEACTIVATED FOR YOUR SECURITY: it runs js!
- BLACKLIST = ['jsbeautifier.unpackers.evalbased']
---- mitmproxy-0.10/libmproxy/contrib/jsbeautifier/unpackers/myobfuscate.py
-+++ mitmproxy-0.10/libmproxy/contrib/jsbeautifier/unpackers/myobfuscate.py
-@@ -40,7 +40,7 @@
- except ImportError:
-     from urllib.parse import unquote
- 
--from jsbeautifier.unpackers import UnpackingError
-+from ...jsbeautifier.unpackers import UnpackingError
- 
- PRIORITY = 1
- 
---- mitmproxy-0.10/libmproxy/contrib/jsbeautifier/unpackers/packer.py
-+++ mitmproxy-0.10/libmproxy/contrib/jsbeautifier/unpackers/packer.py
-@@ -14,7 +14,7 @@
- 
- import re
- import string
--from jsbeautifier.unpackers import UnpackingError
-+from ...jsbeautifier.unpackers import UnpackingError
- 
- PRIORITY = 1
- 
diff --git a/net-proxy/mitmproxy/mitmproxy-0.10.1.ebuild b/net-proxy/mitmproxy/mitmproxy-0.10.1.ebuild
deleted file mode 100644
index 4dc54075e1b4..000000000000
--- a/net-proxy/mitmproxy/mitmproxy-0.10.1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 versionator
-
-DESCRIPTION="An interactive, SSL-capable, man-in-the-middle HTTP proxy"
-HOMEPAGE="http://mitmproxy.org/"
-SRC_URI="http://mitmproxy.org/download/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples test"
-
-RDEPEND=">=dev-python/pillow-2.3.0[${PYTHON_USEDEP}]
-	dev-python/flask[${PYTHON_USEDEP}]
-	>=dev-python/lxml-2.3[${PYTHON_USEDEP}]
-	=dev-python/netlib-$(get_version_component_range 1-2)*[${PYTHON_USEDEP}]
-	>dev-python/pyasn1-0.1.2[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}]
-	>=dev-python/urwid-1.1[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? (
-		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
-		>=dev-python/nose-1.3.0[${PYTHON_USEDEP}]
-		=www-servers/pathod-$(get_version_component_range 1-2)*[${PYTHON_USEDEP}]
-	)"
-
-PATCHES=( "${FILESDIR}"/${PN}-0.10-jsbeautifier-imports.patch )
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-
-	# remove unwanted bytecode files
-	rm -r libmproxy/protocol || die
-}
-
-python_test() {
-	nosetests -v || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	local DOCS=( CHANGELOG CONTRIBUTORS )
-	use doc && local HTML_DOCS=( doc/. )
-	use examples && local EXAMPLES=( examples/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/net-proxy/mitmproxy/mitmproxy-0.11.1.ebuild b/net-proxy/mitmproxy/mitmproxy-0.11.1.ebuild
deleted file mode 100644
index 535d1340404d..000000000000
--- a/net-proxy/mitmproxy/mitmproxy-0.11.1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 versionator
-
-DESCRIPTION="An interactive, SSL-capable, man-in-the-middle HTTP proxy"
-HOMEPAGE="http://mitmproxy.org/"
-SRC_URI="http://mitmproxy.org/download/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples test"
-
-RDEPEND=">=dev-python/pillow-2.3.0[${PYTHON_USEDEP}]
-	>=dev-python/flask-0.10.1[${PYTHON_USEDEP}]
-	>=dev-python/lxml-3.3.6[${PYTHON_USEDEP}]
-	=dev-python/netlib-$(get_version_component_range 1-2)*[${PYTHON_USEDEP}]
-	>dev-python/pyasn1-0.1.2[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-0.14[${PYTHON_USEDEP}]
-	>=www-servers/tornado-4.0.2[${PYTHON_USEDEP}]
-	>=dev-python/urwid-1.1[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? (
-		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
-		>=dev-python/nose-1.3.0[${PYTHON_USEDEP}]
-		=www-servers/pathod-$(get_version_component_range 1-2)*[${PYTHON_USEDEP}]
-	)"
-
-#PATCHES=( "${FILESDIR}"/${PN}-0.10-jsbeautifier-imports.patch )
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-
-	# remove bundled netlib and pathod
-	rm -r libpathod netlib || die
-
-	# remove unused dep
-	sed -i '/sortedcontainers/d' setup.py || die
-}
-
-python_test() {
-	nosetests -v || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	local DOCS=( CHANGELOG CONTRIBUTORS )
-	use doc && local HTML_DOCS=( doc/. )
-	use examples && local EXAMPLES=( examples/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/net-proxy/mitmproxy/mitmproxy-0.11.3.ebuild b/net-proxy/mitmproxy/mitmproxy-0.11.3.ebuild
deleted file mode 100644
index 9020f4791c05..000000000000
--- a/net-proxy/mitmproxy/mitmproxy-0.11.3.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 versionator
-
-DESCRIPTION="An interactive, SSL-capable, man-in-the-middle HTTP proxy"
-HOMEPAGE="http://mitmproxy.org/"
-SRC_URI="http://mitmproxy.org/download/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples test"
-
-RDEPEND="
-	>=dev-python/pillow-2.3.0[${PYTHON_USEDEP}]
-	>=dev-python/flask-0.10.1[${PYTHON_USEDEP}]
-	>=dev-python/configargparse-0.9.3[${PYTHON_USEDEP}]
-	>=dev-python/lxml-3.3.6[${PYTHON_USEDEP}]
-	=dev-python/netlib-$(get_version_component_range 1-2)*[${PYTHON_USEDEP}]
-	>dev-python/pyasn1-0.1.2[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-0.14[${PYTHON_USEDEP}]
-	>=www-servers/tornado-4.0.2[${PYTHON_USEDEP}]
-	>=dev-python/urwid-1.1[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? (
-		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
-		>=dev-python/nose-1.3.0[${PYTHON_USEDEP}]
-		=www-servers/pathod-$(get_version_component_range 1-2)*[${PYTHON_USEDEP}]
-	)"
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-
-	# don't run example scripts tests
-	rm test/test_examples.py || die
-
-}
-
-python_test() {
-	nosetests -v || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	local DOCS=( CHANGELOG CONTRIBUTORS )
-	use doc && local HTML_DOCS=( doc/. )
-	use examples && local EXAMPLES=( examples/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/net-proxy/mitmproxy/mitmproxy-4.0.4.ebuild b/net-proxy/mitmproxy/mitmproxy-4.0.4.ebuild
index dd3a3a0d8083..eae990245b34 100644
--- a/net-proxy/mitmproxy/mitmproxy-4.0.4.ebuild
+++ b/net-proxy/mitmproxy/mitmproxy-4.0.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/mitmproxy/mitmproxy/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="test"
 
 RDEPEND="