Merge updates from master

22 files changed, 6 insertions, 488 deletions

diff --git a/dev-python/netlib/Manifest b/dev-python/netlib/Manifest
deleted file mode 100644
index 93019bedeff1..000000000000
--- a/dev-python/netlib/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST netlib-0.10.1.tar.gz 299633 BLAKE2B b03e1586c2e062843644b15f6bfc58f53d5c2c6af3ab5479c2400fbc4552dfccfbe9a7ee932d04a6306069e6284abd07d5b3702c602212722f137dff801d384a SHA512 56df59b94b6dcd61809f7319dcfd6807294d0dd1011d64d6b26beb50e3217052a96b267f1facacf46cbd0379a29df7ad5f68ee025b64b7e8fbfd31a9b4d06469
-DIST netlib-0.10.tar.gz 60256 BLAKE2B ee4319f5c060a7c668a0a950c411547c3e21c34bd3fc262a8cc939c32e5dc4529feab3797a822c7dd196a2e66472dca0ce9af6deeac735e1eda308e58f3cd84f SHA512 e6897a1ba28942eb30f19b4876bf1fcc03a83ec619e162ee09d9c3ad3348cfaebf9b413fdc4c534c56342270c0c767f16b63b79efe51d6589e864e9b51742f4a
-DIST netlib-0.11.1.tar.gz 43539 BLAKE2B 5cc49aec0be3eabb4d3fbc301cb14083a2a3c2726a6a4abd05d24153886d45a79b58a8a73300a74ca02a6586bfec6cc246ae2e10a9df00a74b4ea50d426a0d85 SHA512 1682bd73d0ff592ad8ec4a79c1f4acd1267440ad0d120a5693f66fd94bfa10b40fdec69b4d43052952a3ecf64d27cb928fd3e5747f54acc419e50c3e1d3b4fbe
-DIST netlib-0.11.2.tar.gz 43569 BLAKE2B 2705d503aba01b78177cb8cd35c814adbad21e413e47f31bacb0d6063b1ef7e3be7fc9548bb64ba4ab0d62de3177da7c077a96e0dda5bd96478311b6bda2f4b7 SHA512 ef1b489c5affb4bd7d840af955c50fe6c180b179ebe0a4c67f8005a4e02f03e1ff0d47f3b40da9aae7fc7bc179f82203a4ab43798406a917ab1a1b29eebe5443
-DIST netlib-0.12.0.tar.gz 53923 BLAKE2B 2099043a8c25a80de5c7fa300d8d754359f2d503d1ce3ee74d077f6cb531917aa148c36677d417b81c79ed95764f8ab92ed49357bb8f269ba1e64af031159c48 SHA512 18a716e084eed577d7731a44cebbcfffcb58140ae808273d683df7f95818fdc990e817fe57ad43a5b439766e022c4b8398f85c3a694f29556856a658a86ac90d
diff --git a/dev-python/netlib/metadata.xml b/dev-python/netlib/metadata.xml
deleted file mode 100644
index 0bfdb3b09754..000000000000
--- a/dev-python/netlib/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>radhermit@gentoo.org</email>
-    <name>Tim Harder</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">netlib</remote-id>
-    <remote-id type="github">cortesi/netlib</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/netlib/netlib-0.10.1.ebuild b/dev-python/netlib/netlib-0.10.1.ebuild
deleted file mode 100644
index 9f5c850535a2..000000000000
--- a/dev-python/netlib/netlib-0.10.1.ebuild
+++ /dev/null
@@ -1,29 +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
-
-DESCRIPTION="Collection of network utility classes used by pathod and mitmproxy"
-HOMEPAGE="https://github.com/cortesi/netlib/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND=">dev-python/pyasn1-0.1.2[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-0.12[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? (
-		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
-		>=dev-python/nose-1.3.0[${PYTHON_USEDEP}]
-		www-servers/pathod[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests -v || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/netlib/netlib-0.10.ebuild b/dev-python/netlib/netlib-0.10.ebuild
deleted file mode 100644
index 30d678a37f9f..000000000000
--- a/dev-python/netlib/netlib-0.10.ebuild
+++ /dev/null
@@ -1,29 +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
-
-DESCRIPTION="Collection of network utility classes used by pathod and mitmproxy"
-HOMEPAGE="https://github.com/cortesi/netlib/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND=">dev-python/pyasn1-0.1.2[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-0.12[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? (
-		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
-		>=dev-python/nose-1.3.0[${PYTHON_USEDEP}]
-		www-servers/pathod[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests -v || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/netlib/netlib-0.11.1.ebuild b/dev-python/netlib/netlib-0.11.1.ebuild
deleted file mode 100644
index aec31955ed61..000000000000
--- a/dev-python/netlib/netlib-0.11.1.ebuild
+++ /dev/null
@@ -1,30 +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
-
-DESCRIPTION="Collection of network utility classes used by pathod and mitmproxy"
-HOMEPAGE="https://github.com/cortesi/netlib/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND=">=dev-python/pyasn1-0.1.7[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-0.14[${PYTHON_USEDEP}]
-	>=dev-python/passlib-1.6.2[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? (
-		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
-		>=dev-python/nose-1.3.0[${PYTHON_USEDEP}]
-		www-servers/pathod[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests -v || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/netlib/netlib-0.11.2.ebuild b/dev-python/netlib/netlib-0.11.2.ebuild
deleted file mode 100644
index 0c08e722b36c..000000000000
--- a/dev-python/netlib/netlib-0.11.2.ebuild
+++ /dev/null
@@ -1,30 +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="Collection of network utility classes used by pathod and mitmproxy"
-HOMEPAGE="https://github.com/cortesi/netlib/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND=">=dev-python/pyasn1-0.1.7[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-0.14[${PYTHON_USEDEP}]
-	>=dev-python/passlib-1.6.2[${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_test() {
-	nosetests -v || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/netlib/netlib-0.12.0.ebuild b/dev-python/netlib/netlib-0.12.0.ebuild
deleted file mode 100644
index 0c08e722b36c..000000000000
--- a/dev-python/netlib/netlib-0.12.0.ebuild
+++ /dev/null
@@ -1,30 +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="Collection of network utility classes used by pathod and mitmproxy"
-HOMEPAGE="https://github.com/cortesi/netlib/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND=">=dev-python/pyasn1-0.1.7[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-0.14[${PYTHON_USEDEP}]
-	>=dev-python/passlib-1.6.2[${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_test() {
-	nosetests -v || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/ruamel-std-pathlib/ruamel-std-pathlib-0.6.3.ebuild b/dev-python/ruamel-std-pathlib/ruamel-std-pathlib-0.6.3.ebuild
index 742c3574f6e2..c9e2b1556ab8 100644
--- a/dev-python/ruamel-std-pathlib/ruamel-std-pathlib-0.6.3.ebuild
+++ b/dev-python/ruamel-std-pathlib/ruamel-std-pathlib-0.6.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://bitbucket.org/${MY_PN/.//}/get/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm64"
+KEYWORDS="amd64 ~arm64 ~x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/ruamel-yaml/ruamel-yaml-0.15.35.ebuild b/dev-python/ruamel-yaml/ruamel-yaml-0.15.35.ebuild
index 3d2552d1e803..3f6c6bd5f58a 100644
--- a/dev-python/ruamel-yaml/ruamel-yaml-0.15.35.ebuild
+++ b/dev-python/ruamel-yaml/ruamel-yaml-0.15.35.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://bitbucket.org/${MY_PN/.//}/get/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm64"
+KEYWORDS="amd64 ~arm64 ~x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/eclass/unpacker.eclass b/eclass/unpacker.eclass
index 41aa3ef43da7..370f0a9c59ab 100644
--- a/eclass/unpacker.eclass
+++ b/eclass/unpacker.eclass
@@ -339,6 +339,7 @@ _unpacker() {
 	a=$(find_unpackable_file "${a}")
 
 	# first figure out the decompression method
+	local comp=""
 	case ${m} in
 	*.bz2|*.tbz|*.tbz2)
 		local bzcmd=${PORTAGE_BZIP2_COMMAND:-$(type -P pbzip2 || type -P bzip2)}
@@ -353,11 +354,10 @@ _unpacker() {
 	*.lz)
 		: ${UNPACKER_LZIP:=$(type -P plzip || type -P pdlzip || type -P lzip)}
 		comp="${UNPACKER_LZIP} -dc" ;;
-	*)	comp="" ;;
 	esac
 
 	# then figure out if there are any archiving aspects
-	arch=""
+	local arch=""
 	case ${m} in
 	*.tgz|*.tbz|*.tbz2|*.txz|*.tar.*|*.tar)
 		arch="tar --no-same-owner -xof" ;;
diff --git a/net-proxy/mitmproxy/Manifest b/net-proxy/mitmproxy/Manifest
index 6de72da0f04f..6ff5004dcc48 100644
--- a/net-proxy/mitmproxy/Manifest
+++ b/net-proxy/mitmproxy/Manifest
@@ -1,4 +1 @@
-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
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="
diff --git a/profiles/base/make.defaults b/profiles/base/make.defaults
index 8966740a2cc6..975c2a938902 100644
--- a/profiles/base/make.defaults
+++ b/profiles/base/make.defaults
@@ -94,7 +94,7 @@ LCD_DEVICES="bayrad cfontz cfontz633 glk hd44780 lb216 lcdm001 mtxorb ncurses te
 
 # Miroslav Šulc <fordfrog@gentoo.org> (19 Nov 2008)
 # Netbeans modules/clusters
-NETBEANS="apisupport cnd groovy gsf harness ide identity j2ee java mobility nb php profiler soa visualweb webcommon websvccommon xml"
+NETBEANS_MODULES="apisupport cnd groovy gsf harness ide identity j2ee java mobility nb php profiler soa visualweb webcommon websvccommon xml"
 
 # Manuel Rüger <mrueg@gentoo.org> (09 Sep 2015)
 # Default Ruby build target(s)
diff --git a/www-servers/pathod/Manifest b/www-servers/pathod/Manifest
deleted file mode 100644
index ce9ebbfbf3db..000000000000
--- a/www-servers/pathod/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST pathod-0.10.tar.gz 245837 BLAKE2B b4284f1db594b245e948eddbee0d6a65848bf02ede4fe2f56b86b61fe2d71b53401eec81ad5651c6fd893af5ee2254ac8c07979d8d234153c26ef2d6a039ca72 SHA512 c096268cdd459ffaf2ced67699be57bdcdc51db271ce141734d4984795d045ef24a7301f18d67af9b48d802b5107d246ec891b5eed5dace52d0835c2c7dbb336
-DIST pathod-0.11.1.tar.gz 271616 BLAKE2B bcb6eebf8c1772a3761b9de1d14a69aa39b46e87dac603cb6f5ab88969b8a8836f98c2144b99c1ccaee9583765457e25fe7060d3bb14c00778632a0023139a8a SHA512 8fa4957bd7f25492a9db58eec7e83a67cd998bda17f93224435ef3f75ed6723bec96d24e20956069d148af3708d81f04d9089c2302d260d3ba95c1993ee0954e
-DIST pathod-0.12.0.tar.gz 228515 BLAKE2B 9706697f47bf53100d40b3d869ca4138fc37af0c558a9d08ab15596637b9b2802de876c2a35d101d774196b4612247aecd5611da3e7b9a624b07e5b4fef253c4 SHA512 5273736b972670e009d24b610ff1e43d1296ae5e5a42e360fdd7ea3aa355016c02ceccd8b6d342e99b754b5fbd9f7beca92852607b9dd3af9d395128453fd0af
diff --git a/www-servers/pathod/metadata.xml b/www-servers/pathod/metadata.xml
deleted file mode 100644
index 68ff95d14148..000000000000
--- a/www-servers/pathod/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>radhermit@gentoo.org</email>
-		<name>Tim Harder</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="pypi">pathod</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/www-servers/pathod/pathod-0.10.ebuild b/www-servers/pathod/pathod-0.10.ebuild
deleted file mode 100644
index d87e7bd29861..000000000000
--- a/www-servers/pathod/pathod-0.10.ebuild
+++ /dev/null
@@ -1,26 +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
-
-DESCRIPTION="A collection of tools for testing and torturing HTTP clients and servers"
-HOMEPAGE="http://pathod.net/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND=">=dev-python/netlib-${PV}[${PYTHON_USEDEP}]
-	>=dev-python/requests-1.1.0[${PYTHON_USEDEP}]
-	dev-python/flask[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? ( >=dev-python/nose-1.3.0[${PYTHON_USEDEP}] )"
-
-python_test() {
-	nosetests -v || die "Tests fail with ${EPYTHON}"
-}
diff --git a/www-servers/pathod/pathod-0.11.1.ebuild b/www-servers/pathod/pathod-0.11.1.ebuild
deleted file mode 100644
index d368b1becdf6..000000000000
--- a/www-servers/pathod/pathod-0.11.1.ebuild
+++ /dev/null
@@ -1,36 +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
-
-DESCRIPTION="A collection of tools for testing and torturing HTTP clients and servers"
-HOMEPAGE="http://pathod.net/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND=">=dev-python/netlib-${PV}[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.4.1[${PYTHON_USEDEP}]
-	>=dev-python/flask-0.10.1[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? ( >=dev-python/nose-1.3.0[${PYTHON_USEDEP}] )"
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-
-	# remove bundled netlib
-	rm -r netlib || die
-
-	# remove unnecessary pip dep
-	sed -i '/pip/d' setup.py || die
-}
-
-python_test() {
-	nosetests -v || die "Tests fail with ${EPYTHON}"
-}
diff --git a/www-servers/pathod/pathod-0.12.0.ebuild b/www-servers/pathod/pathod-0.12.0.ebuild
deleted file mode 100644
index e6d9ff95ef0f..000000000000
--- a/www-servers/pathod/pathod-0.12.0.ebuild
+++ /dev/null
@@ -1,34 +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
-
-DESCRIPTION="A collection of tools for testing and torturing HTTP clients and servers"
-HOMEPAGE="http://pathod.net/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND=">=dev-python/netlib-${PV}[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.4.1[${PYTHON_USEDEP}]
-	>=dev-python/flask-0.10.1[${PYTHON_USEDEP}]
-	dev-python/pyparsing[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? ( >=dev-python/nose-1.3.0[${PYTHON_USEDEP}] )"
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-
-	# remove unnecessary pip dep
-	sed -i '/pip/d' setup.py || die
-}
-
-python_test() {
-	nosetests -v || die "Tests fail with ${EPYTHON}"
-}