16 files changed, 35 insertions, 280 deletions
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 5759b4597ad9..497848e3c5c3 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/google-apitools/Manifest b/dev-python/google-apitools/Manifest
index 0cfb7328861a..2c5fbb193504 100644
--- a/dev-python/google-apitools/Manifest
+++ b/dev-python/google-apitools/Manifest
@@ -1,3 +1,5 @@
+DIST google-apitools-0.5.16.tar.gz 405331 BLAKE2B 9bd086a68e5787f6dcd426887bb5e0af23ac985f851471da61567266fe52dc254054f0f2fb49e08b461c9281a32c25a764a7b751e10fe6ccca13c2758cdc4637 SHA512 cda60ec21622368c67cc47900218ceaa4137e6d602ee5196f59dac82aa87d35382785323971cc7e4aedf9d69e0a1baf8017c5d941d05171df9e1d5eea15570eb
 DIST google-apitools-0.5.4.tar.gz 255413 BLAKE2B 549aca8a2ef41f5f6de408efcd9ad3dc3c27fb9d0ce6c2c93794bd89355b0ed19499ad602aa79cac88d4aacf3c4e2820accbeb3e9c156caf3466bc36d5b0a7ec SHA512 63953a3ce4e7485344f54434ae4e6de75e4ca1ca380858143735b02560a5ac808d5f2ffed346b09402c156632a34ea1ded27d152538a98ec40981230f7d38764
+EBUILD google-apitools-0.5.16.ebuild 772 BLAKE2B cc645f6a373240dfd8d9eb5ecd3206604e99cec1477b54b0e343732b99a5e0e4ea8f21577d4c6498a1e9a7a8486cf3f82693233e7463b6737cbe540224ddd8ad SHA512 025f4583be50f927853dd96e2b6f22f840c6cb4301636297c3eb3917065509a2cdfd49b89a03b9caf0cab56ac517187b8cbb91759a329acb6a85869437a5f7f3
 EBUILD google-apitools-0.5.4.ebuild 770 BLAKE2B f073c844f94e9cf8527e5d3ae847e084ddac6499796cbdac32a8adc4b70751e20e3a16bf7453f985a70f62d5b7699a8be522162a92ba8e14d6cae13ebf3baa01 SHA512 5b441733cc1930ecc8cb571b87f78b13b848700fe299e64b0b4fa6ae10b7b4d74490aad4687bf306aec8212468654fd9fed0be66a64f90fb13ce4318fa9feb2f
 MISC metadata.xml 330 BLAKE2B cea2ae09b3468b95764b84c8891b9840e918db4961a77f4d514a4c15a33248a011b79f235728883e31a968c69a07c436a31a282f1e4a2baed2cbb2c7ba3c4982 SHA512 a4b6c01f3d8c411c5e96b911585770af30c8a1f262e92bf01748447111798a8e6ede7aa5979f16c3cf7068b3f158842023546e234049e2345f1a2f2891e51296
diff --git a/dev-python/google-apitools/google-apitools-0.5.16.ebuild b/dev-python/google-apitools/google-apitools-0.5.16.ebuild
new file mode 100644
index 000000000000..389a7b7a8dba
--- /dev/null
+++ b/dev-python/google-apitools/google-apitools-0.5.16.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python library to manipulate Google APIs"
+HOMEPAGE="https://github.com/google/apitools"
+SRC_URI="https://github.com/google/apitools/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+RDEPEND=">=dev-python/httplib2-0.8[${PYTHON_USEDEP}]
+	>=dev-python/oauth2client-1.5.2[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/google-apputils-0.4.0[${PYTHON_USEDEP}]
+	>=dev-python/python-gflags-3.0.6[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	>=dev-python/setuptools-18.5[${PYTHON_USEDEP}]"
+
+S="${WORKDIR}/apitools-${PV}"
diff --git a/dev-python/miniupnpc/Manifest b/dev-python/miniupnpc/Manifest
index 6cef2d0ef948..310b32b0501b 100644
--- a/dev-python/miniupnpc/Manifest
+++ b/dev-python/miniupnpc/Manifest
@@ -1,9 +1,7 @@
 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.20171102.tar.gz 86363 BLAKE2B 755cc85bbac7f7c9b480612c12c46c09eaa7089dc9f458027805ffb4836631efafbead4bbb5e5313d1267e3110bc4b24c726c34250da3afd1ab0f1f96d53a654 SHA512 5af68a58bef587ea5cc405155b1aca4438de3b56d5fb7e11945edd79e5cbdbf44c708b7f1ad3c3fde6bf4710de69782acf30cfcce327c5a906f4eb8f76a6ba37
 DIST miniupnpc-2.0.20171212.tar.gz 86607 BLAKE2B fce582c4125192f74f6ffb174295020af1c9b574b2094f5565a5e49641820a2d9cef719de59cb94bfd207182505237c22cf58425e1a7b47f5dfe2eb84c07d3c5 SHA512 d25708f4e2ef7311878ba6d17cb506f4bfe5c9cc6b7a79e4168f143ca9da8b96beb018c42dd735f0b23806668eba2308b7de26d1b506d91c23f79c7ed77399a0
 EBUILD miniupnpc-2.0.20170509.ebuild 714 BLAKE2B c5de8d25eb9c8219ac4d124c53a8af8f62b88ace08d12084a0110571ec00b2518c3a163c54dd6b2ff3fcc215449fce8b0ffa58549c7458259ad57bf86bc6da94 SHA512 a145554f2dc93f098f6a4bf70f2505d8878de57ceb44fa74c894bbd1a6f7d27e57b2ed2f2e2d1144503444a1c25ef72a244139748db7dc5877888d785c1f330d
-EBUILD miniupnpc-2.0.20171102.ebuild 759 BLAKE2B e212f55992753b9ab838cf5085b1f5ddadd8bbb37080d26b0599070674a3be1a16b4e2a01dfe7f3b17b55392df118f989ddc58b7dd085a189aca29f4e5dff37f SHA512 9cee2e5c32c934a5b63a5c38b74605cfb48b58ddd9d6afac1544f7a79b8e5543fa63f606c662e29224ca838779a9e139967ce61fad19ba3424656d4191840f1f
 EBUILD miniupnpc-2.0.20171212.ebuild 759 BLAKE2B e212f55992753b9ab838cf5085b1f5ddadd8bbb37080d26b0599070674a3be1a16b4e2a01dfe7f3b17b55392df118f989ddc58b7dd085a189aca29f4e5dff37f SHA512 9cee2e5c32c934a5b63a5c38b74605cfb48b58ddd9d6afac1544f7a79b8e5543fa63f606c662e29224ca838779a9e139967ce61fad19ba3424656d4191840f1f
 MISC metadata.xml 243 BLAKE2B 997913e51bb9c2ba601c78673246d3845d1078f5be11ff209532c5afc9f433d4cfe7a0066ba23677d23ffe368d7ee718df71d28301d45c0473f50e931f674165 SHA512 ded2bb7e056d9081e11b0470aa2874fbe9b5e63f0178bec611291f639763a9bd85a076dbc526e01df1403dea4d0eb28913addb346b676084e690e063b68eca28
diff --git a/dev-python/miniupnpc/miniupnpc-2.0.20171102.ebuild b/dev-python/miniupnpc/miniupnpc-2.0.20171102.ebuild
deleted file mode 100644
index c3659faf80f3..000000000000
--- a/dev-python/miniupnpc/miniupnpc-2.0.20171102.ebuild
+++ /dev/null
@@ -1,31 +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}
-	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/protobuf-python/Manifest b/dev-python/protobuf-python/Manifest
index a3d697e81a8f..1ae25fd264ef 100644
--- a/dev-python/protobuf-python/Manifest
+++ b/dev-python/protobuf-python/Manifest
@@ -3,7 +3,7 @@ DIST protobuf-3.1.0.tar.gz 4051503 BLAKE2B af93f125a6b7b3e0be6f50ff5eaabe0db21f6
 DIST protobuf-3.3.0.tar.gz 4336596 BLAKE2B 381b2961fe1de8a86225903d0cfe4c98c238336b8782e5191c57c6fcf60cf321f39163d50864bf9c119a90bd7796269dc7e34168a158f7affa7fa295ce5deae0 SHA512 0734a55ae92f0539dfb507e174539d290fd8e93633c1edd8810e0d51c37e67254337b75fc5ba9450316f6416e1f8f8cfb59415864657b55f2a1696fbcdfe7636
 DIST protobuf-3.4.1.tar.gz 4490100 BLAKE2B e2bc1ef2ee1a0af44830b3c65a6c9e73883fe6ec0d07f6a6136f5564f0e85306005440ca6f8c4eb834c7c70f909792c9e2457a761f10f95431981263a9acd7a3 SHA512 471e52198fa878a79183dc8fbc39d9c65239be4d9dff799e12281ee9b1af61a427584534b1baae1773bc6e4c86467f89ca2e7911a21effd86bc5f40cc7d94c34
 EBUILD protobuf-python-3.1.0.ebuild 1300 BLAKE2B 3161e68c237802ad81cf3ec7fe435d13d8cf53d2bfee81c90b13ad9353cffafedbd67a1e432ca5109c3051feaa297fdd257bf6f92e10d77119e71712e0236c89 SHA512 b58a5cb40d85289e8f4e491a71d4887131df1fdeda67d2602298c5e3129255b1cc9f8cf2ea390d6072f57746a77bbc23f6aa013fa0b34dcda0ee09b1ffbf1d3b
-EBUILD protobuf-python-3.3.0-r1.ebuild 1424 BLAKE2B 323a207e6188dc5e93fbe78d8b0321299adce5c173cd681d4887e2c571778e3c4bf3e07520b25346d8f8222d1b4002ce6f92b742a7a01b1375aa27e06e384301 SHA512 e418df42b58de1efef38f54cfa6ff0818d1349d314003759d6f921a03ede7aa45083014955933f21d416d70e551a9525408abafa773934ebf074c9cfdf55e61f
+EBUILD protobuf-python-3.3.0-r1.ebuild 1424 BLAKE2B 67b847ee6872f1953f75668c573bd769ab93be8d6a8d35e850cbfec6f724dac7b3affeffbd6c30c36623a6dde12513c7f61c8807c7fbf6a3d10a05e54f44ac12 SHA512 0c0a60fe63e116c30412ecc7092207f8ffb1d3a07a63813669eb9497b14152114fac40986bf108fca38aefaae1203b071a49591894870a5d30a30e38e6c0e910
 EBUILD protobuf-python-3.3.0.ebuild 1273 BLAKE2B f6c0c22aec41805c3491d23fcbe89687989483813d809ce484f4a0993be4bcd532e43d78c3da27f669844b007215316c749b7c64b0f2c4d9adab89527c55506e SHA512 5f9d1d730877b24133839ccb669416df55e178c5af94a76261445a15b8e15ec4735724d531d2f8ca972ab759a34718974b5636c6f4ac6056348a1386c3b52d4e
 EBUILD protobuf-python-3.4.1.ebuild 1250 BLAKE2B b531ad3c2ace5bf9a2ca33b04d7b0f977b78fa47a3f0486183e938a85cf2583c06698160996946c80e093d3f7b9abac4cb66ffed9167875a37d0268b7ad72d07 SHA512 a82b7e00afb6408dfeaf3c70fe5df077792daadca9e0de3b30689fd5ef49405e81f615fa2e586f14548715e189bc9db1a013b69bc17b599a0119801f74857d14
 MISC metadata.xml 609 BLAKE2B 788caedfdc3ee2ae24ab9f650d5bb0e0a61a3c49bc10fae0c2a4229a99eab9188ae949128c815bf40f9ea2306379dd9f76b1a72ceba06cbf5bb9481d05ffb61c SHA512 8766a0489a3233173a980c7b49b2a8024c582c06f4366f188264ba032d4df5171b14b9b68b98d911dea30e5188a6b80f04cc17cb6d074fdc46eb5588e5ce0f29
diff --git a/dev-python/protobuf-python/protobuf-python-3.3.0-r1.ebuild b/dev-python/protobuf-python/protobuf-python-3.3.0-r1.ebuild
index ec1907817312..a70b39fe2bc7 100644
--- a/dev-python/protobuf-python/protobuf-python-3.3.0-r1.ebuild
+++ b/dev-python/protobuf-python/protobuf-python-3.3.0-r1.ebuild
@@ -24,12 +24,12 @@ IUSE=""
 # In case of using the (linked) cpp implementation we should be fine with the same subslot.
 RDEPEND="${PYTHON_DEPS}
 	dev-python/namespace-google[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
 	!<dev-libs/protobuf-3[python(-)]
 	~dev-libs/protobuf-${PV}"
 
 DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]"
+	dev-python/setuptools[${PYTHON_USEDEP}]"
 
 PATCHES=( "${FILESDIR}/${PN}-3.0.0_beta3-link-against-installed-lib.patch" )
 
diff --git a/dev-python/pyblake2/Manifest b/dev-python/pyblake2/Manifest
index c75cbaea56dd..ec71a3150cc1 100644
--- a/dev-python/pyblake2/Manifest
+++ b/dev-python/pyblake2/Manifest
@@ -1,7 +1,5 @@
 DIST pyblake2-0.9.3.tar.gz 130641 BLAKE2B 5165f104b5d6bc10bf8b72177b4ad08db55e1a92ad1f04efae2c3d73b6f3f52a0962cfb23832a5f5c1ed9d75c7c3a04be9c37643e381abfc7a2f843fefb43151 SHA512 6336a7f7e79bd3e6ff7f8ff4d279ae170e86f1464b9fa9e7ea7f0dbbac6fcc044caf225111e065f9cd9cdeea0f81fae8d373e1f65be3e418929f53fad063205e
-DIST pyblake2-1.0.1.tar.gz 128037 BLAKE2B cdee6ea650b152ba8d41698b6c08e95a33b4ccf209df3829038f39845a8734f31810e5362b41519ce4196edc2daeea8656e7df414fb06dc52afdfea01f1f689b SHA512 66311aa1cd60942d395c1cd8b996f66f1cb2380f36be471244152a885cee115a8e341a34309520d8b1254eb30d5e1b39b83f89d7eace9353c8ee9e919f4a3881
 DIST pyblake2-1.1.0.tar.gz 125855 BLAKE2B 46af4c24882040bbdd221f90e06652918798e4555c0a7307a596ca4c9ed3147f00297269a44d174782c2b0402eac03ecf5387b1c5a16efb57d036730b58b2630 SHA512 e13c7e4f3a35155cbf531e337895349ec01f0ac36908a4e746cecec063601adfc8a73a7961a9c310d01d3231f44f08d2cc92e891e9cb87659bc7170b9fee6102
 EBUILD pyblake2-0.9.3-r1.ebuild 1485 BLAKE2B 9249f9d8c7802c08c01e726f552532bdcf6fc072f5f826f919d8c3411bf2e7e80ba780f4b7a517e9609dcc98f9e9f1105134df19f36e52660f409197887d6f4e SHA512 840f62b6ea7355b97f7898f94ef88392f0dff8e909a5383a5d601d6c5a013a1cb9119e6af92033e6d28bcc62a7745f0ea98377a18c63e6d1ee3ed75045cf5749
-EBUILD pyblake2-1.0.1.ebuild 1471 BLAKE2B 294227a89b8516d8362e67ff714bcbef947e80eff9a06ee56a60464d4889d33eb15a28a943f94490f9dcfb38c86c01ca7b5dba47e31a92ec617fd39c8799f913 SHA512 c687fbce7c0b625fa1d03cb5a63a494baf1f3fb0a3471875a7fc91c84ef5e50946ef90119f916d0219683f2864662a7c52be564fe739ca0f269961c926116511
 EBUILD pyblake2-1.1.0.ebuild 783 BLAKE2B c034ef54bab98ba4460f09a29d2ea50405d3f16e32452877d0e91de31bc4996cdafa9d8a31bbbc6eeca0cca10b7796e24d0a4b4b5c95f764a8ca14fa185d61ec SHA512 fc1d0fdeaf357d634cc42ddf7127c795aa92ee3dfdc9fcb2e51df73afa1b4a022f22b1bfb92e05915f8d0d0bec345d75cfba443d63cd8691bf61edd54791b579
 MISC metadata.xml 452 BLAKE2B b5539d95846469f07dc0ec47d4c34f4ae7fa950c58d728f5ba92efb3f74d849598af1eeb7c3d3ab90a41591746e94b3d4c3ea5330c423fb340cbec4a1da28e80 SHA512 28acd5472435f8832eb8cb7587e651f428309e9a37c17cad378fe8f01c47896115c4d42ace1c6125eb99ddd30de562d42503b6dac42432b55b37775cdde7c1ff
diff --git a/dev-python/pyblake2/pyblake2-1.0.1.ebuild b/dev-python/pyblake2/pyblake2-1.0.1.ebuild
deleted file mode 100644
index 6fa0b27728e1..000000000000
--- a/dev-python/pyblake2/pyblake2-1.0.1.ebuild
+++ /dev/null
@@ -1,52 +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 )
-inherit distutils-r1 flag-o-matic toolchain-funcs
-
-DESCRIPTION="BLAKE2 hash function extension module"
-HOMEPAGE="https://github.com/dchest/pyblake2 https://pypi.python.org/pypi/pyblake2"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-# pyblake2 itself allows more licenses but blake2 allows the following three
-LICENSE="|| ( CC0-1.0 openssl Apache-2.0 )"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-blake2_impl() {
-	local code='
-#if defined(__XOP__)
-	HAVE_XOP
-#elif defined(__AVX__)
-	HAVE_AVX
-#elif defined(__SSSE3__)
-	HAVE_SSSE3
-#elif defined(__SSE2__)
-	HAVE_SSE2
-#endif
-'
-	local res=$($(tc-getCC) -E -P ${CFLAGS} - <<<"${code}")
-
-	case ${res} in
-		*HAVE_XOP*)    echo XOP;;
-		# this does not actually do anything but implicitly enabled SSE4.1...
-		*HAVE_AVX*)    echo AVX;;
-		*HAVE_SSSE3*)  echo SSSE3;;
-		# note: SSE2 is 2.5x slower than pure REGS, so we ignore it
-		#*HAVE_SSE2*)  echo SSE2;;
-		*)             echo REGS;;
-	esac
-}
-
-python_prepare_all() {
-	# uncomment the implementation of choice
-	sed -i -e "/BLAKE2_COMPRESS_$(blake2_impl)/s:^#::" setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	"${EPYTHON}" test/test.py || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/pygit2/Manifest b/dev-python/pygit2/Manifest
index 5bb701971f35..bd8e8189b6df 100644
--- a/dev-python/pygit2/Manifest
+++ b/dev-python/pygit2/Manifest
@@ -1,9 +1,6 @@
 AUX pygit2-0.25.1-cffi-1.10.patch 2309 BLAKE2B 99584632af0f26ef92ada55fc0f8b3fb31c7bbd6a1c74211c991db8ec7f792b5d74c551a5e0d457512ed156a5536ab2b25f8b21994706ebf7c7af3234b3faa95 SHA512 adcd46ccf81d01afe5d959e50f0acaae392fc2422a7e0582a9d065d860c2d0d9245505ce5c156136921f48c126a3741bb65be5a021b53116ccf5f0f1451c00f3
-AUX pygit2-0.26.1-internet-tests.patch 5484 BLAKE2B 6b2d9462add5dea62e33da13aa0de137d1004b17b820796e78154944883e43a941527f344a1ea57469029228e5b9be3585fce76eea95e773cb46cab770f69c06 SHA512 2fa9fd5cbc726bba25b4163fb446c97161194e62b7711989cd676a5ad0b641174923bae5d8a72758262736b54ad3e217f295b39f60e6cf052945379fc3822184
 DIST pygit2-0.25.1.tar.gz 456580 BLAKE2B b7a9ce90076f2475df41f2e5ee8cbf7cb2ca68553076ae05cb2e8bdd68067f7373e33dfb03cadf90b7f410b5d5989b902b545fddbb1e3a9f17eb17d50692e982 SHA512 19908c874d5c2469609a54893f37367480d27ff03583c38b474ebb125dc9db95dc60776a120bb05662938d6eb62d4bcef24f684688e97e3453ccc27e015736cd
-DIST pygit2-0.26.1.tar.gz 458526 BLAKE2B 703093a5a292e92c90987785065f3a1590addc09d72311f75b22caf6fe1a17be8fb16cf777189835204cb7dc4d2066e841d3d4327e2cc040c312e22a4c75a8ee SHA512 23585bc0f41458442889b5434347cbc11d6c729898864262426f84e5b9239164bb58c6e910d2381b25f1b8be271674c1a6960630a504c40accdd30e487d27a7d
 DIST pygit2-0.26.3.tar.gz 462080 BLAKE2B b3c4b9b8a6aeba22a70a8d2ef1393dace3a065a3625ee3574058e333bca4ba1d60223939f412eecf5ae9d93a81fb81c4a536af46aa047c2c82a48bd81afe4cf9 SHA512 6f727686221d4e8c348f836b7ad278b48a4b971a121b9953c2cf7163bf093936d838aaf83e9edb8628757624ab27e8345a2fb29eb1a79a30e06c0ab0a77e4cc6
 EBUILD pygit2-0.25.1.ebuild 699 BLAKE2B 88dd65d7ad660682316bf3d85aa83e8c9c6d091e24cb28888a194cb77afe9713fd921363f9e8f263cf2de558cdeb5a40ca6f1152c2e82dc24030fa5a7710bf03 SHA512 5f55fd77acb4ddbf3fdb8d7d56dba9e3882dfe30a271cb5f0bb1a8dc89ee65172fd66ab0f46c543c8722af020be751055c37589e6d9b91f1cefb6d22b4e0f72c
-EBUILD pygit2-0.26.1.ebuild 694 BLAKE2B 48a8f3a97d7cbab3a2e97fb8868e5f7d98763482a9dd80252f75ee83c11996c7331da7ad56f71327852804055f40b08ba679a1377b1e0d471bdef6ab589ebeed SHA512 df7a9b2c20d352c626562c38e966065c4d33550def9806ab2abb73ed5ba4112bb3b6b9a8a87ef5e712a19ca4082d7e31253db6ebcc1d31ee2d17943bfe4f4928
 EBUILD pygit2-0.26.3.ebuild 631 BLAKE2B 0f4903e3613c3ce410c919c17c0a7686996c408e29519a505fa38825bfdbfcbf777c8c419288441801ca6a5123d9c5e9e185ff9fa7945ce58144afded00b5dcb SHA512 b07ec6e01ef855ade0bff6848224e278cd30a991f9c15bba5e9ae2476791a5f941cdd5d51294d412ea1186cc2748fe2a13a3233e01ff54cda88fc5c72ec2d927
 MISC metadata.xml 489 BLAKE2B 3733ff314640ab2cbfa07e0ea67041ddb3635b51d339070abe97c95b5b358851b412cca5d8996dc1f25abb986a03095f19e8a50cbaeab7eb156c6b9107108cf6 SHA512 d20b7ebbdb3ea2ec72c3c5ded9874b7506b3ddabb43dbf329891478fcf5d7c4b9487ab0675d735733f463dd897dd5cdcc28080ad597f4f838bbcaa565c26915e
diff --git a/dev-python/pygit2/files/pygit2-0.26.1-internet-tests.patch b/dev-python/pygit2/files/pygit2-0.26.1-internet-tests.patch
deleted file mode 100644
index 6b96eb40f3b1..000000000000
--- a/dev-python/pygit2/files/pygit2-0.26.1-internet-tests.patch
+++ /dev/null
@@ -1,133 +0,0 @@
-From 24a929d003f1b6b4899f41cb227293e8c4b62eb7 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Tue, 21 Nov 2017 17:53:48 +0100
-Subject: [PATCH] Disable tests requiring network access
-
----
- test/test_credentials.py | 3 +++
- test/test_repository.py  | 1 +
- test/test_submodule.py   | 4 ++++
- 3 files changed, 8 insertions(+)
-
-diff --git a/test/test_credentials.py b/test/test_credentials.py
-index 7921a41..e60383a 100644
---- a/test/test_credentials.py
-+++ b/test/test_credentials.py
-@@ -70,39 +70,42 @@ class CredentialCreateTest(utils.NoRepoTestCase):
-         username = "git"
-  
-         cred = KeypairFromAgent(username)
-         self.assertEqual((username, None, None, None), cred.credential_tuple)
- 
- 
- class CredentialCallback(utils.RepoTestCase):
-+    @unittest.skip('requires Internet access')
-     def test_callback(self):
-         class MyCallbacks(pygit2.RemoteCallbacks):
-             @staticmethod
-             def credentials(url, username, allowed):
-                 self.assertTrue(allowed & GIT_CREDTYPE_USERPASS_PLAINTEXT)
-                 raise Exception("I don't know the password")
- 
-         url = "https://github.com/github/github"
-         remote = self.repo.create_remote("github", url)
- 
-         self.assertRaises(Exception, lambda: remote.fetch(callbacks=MyCallbacks()))
- 
-+    @unittest.skip('requires Internet access')
-     def test_bad_cred_type(self):
-         class MyCallbacks(pygit2.RemoteCallbacks):
-             @staticmethod
-             def credentials(url, username, allowed):
-                 self.assertTrue(allowed & GIT_CREDTYPE_USERPASS_PLAINTEXT)
-                 return Keypair("git", "foo.pub", "foo", "sekkrit")
- 
-         url = "https://github.com/github/github"
-         remote = self.repo.create_remote("github", url)
-         self.assertRaises(TypeError, lambda: remote.fetch(callbacks=MyCallbacks()))
- 
- class CallableCredentialTest(utils.RepoTestCase):
- 
-+    @unittest.skip('requires Internet access')
-     def test_user_pass(self):
-         credentials = UserPass("libgit2", "libgit2")
-         callbacks = pygit2.RemoteCallbacks(credentials=credentials)
- 
-         url = "https://bitbucket.org/libgit2/testgitrepository.git"
-         remote = self.repo.create_remote("bb", url)
-         remote.fetch(callbacks=callbacks)
-diff --git a/test/test_repository.py b/test/test_repository.py
-index 941851b..33f0571 100644
---- a/test/test_repository.py
-+++ b/test/test_repository.py
-@@ -569,14 +569,15 @@ class CloneRepositoryTest(utils.NoRepoTestCase):
-             return repo.remotes.create("custom_remote", url)
- 
-         repo = clone_repository(url, repo_path, repository=create_repository, remote=create_remote)
-         self.assertFalse(repo.is_empty)
-         self.assertTrue('refs/remotes/custom_remote/master' in repo.listall_references())
-         self.assertIsNotNone(repo.remotes["custom_remote"])
- 
-+    @unittest.skip('requires Internet access')
-     def test_clone_with_credentials(self):
-         repo = clone_repository(
-             "https://bitbucket.org/libgit2/testgitrepository.git",
-             self._temp_dir, callbacks=pygit2.RemoteCallbacks(credentials=pygit2.UserPass("libgit2", "libgit2")))
- 
-         self.assertFalse(repo.is_empty)
- 
-diff --git a/test/test_submodule.py b/test/test_submodule.py
-index f123b8b..df44e16 100644
---- a/test/test_submodule.py
-+++ b/test/test_submodule.py
-@@ -49,14 +49,15 @@ class SubmoduleTest(utils.SubmoduleRepoTestCase):
-         self.assertIsNotNone(s)
- 
-     def test_listall_submodules(self):
-         submodules = self.repo.listall_submodules()
-         self.assertEqual(len(submodules), 1)
-         self.assertEqual(submodules[0], SUBM_PATH)
- 
-+    @unittest.skip('requires Internet access')
-     def test_submodule_open(self):
-         s = self.repo.lookup_submodule(SUBM_PATH)
-         self.repo.init_submodules()
-         self.repo.update_submodules()
-         r = s.open()
-         self.assertIsNotNone(r)
-         self.assertEqual(str(r.head.target), SUBM_HEAD_SHA)
-@@ -69,28 +70,31 @@ class SubmoduleTest(utils.SubmoduleRepoTestCase):
-         s = self.repo.lookup_submodule(SUBM_PATH)
-         self.assertEqual(SUBM_PATH, s.path)
- 
-     def test_url(self):
-         s = self.repo.lookup_submodule(SUBM_PATH)
-         self.assertEqual(SUBM_URL, s.url)
- 
-+    @unittest.skip('requires Internet access')
-     def test_init_and_update(self):
-         subrepo_file_path = os.path.join(self.repo_path, 'submodule', 'setup.py')
-         self.assertFalse(os.path.exists(subrepo_file_path))
-         self.repo.init_submodules()
-         self.repo.update_submodules()
-         self.assertTrue(os.path.exists(subrepo_file_path))
- 
-+    @unittest.skip('requires Internet access')
-     def test_specified_update(self):
-         subrepo_file_path = os.path.join(self.repo_path, 'submodule', 'setup.py')
-         self.assertFalse(os.path.exists(subrepo_file_path))
-         self.repo.init_submodules(submodules=['submodule'])
-         self.repo.update_submodules(submodules=['submodule'])
-         self.assertTrue(os.path.exists(subrepo_file_path))
- 
-+    @unittest.skip('requires Internet access')
-     def test_oneshot_update(self):
-         subrepo_file_path = os.path.join(self.repo_path, 'submodule', 'setup.py')
-         self.assertFalse(os.path.exists(subrepo_file_path))
-         self.repo.update_submodules(init=True)
-         self.assertTrue(os.path.exists(subrepo_file_path))
- 
- if __name__ == '__main__':
--- 
-2.15.0
-
diff --git a/dev-python/pygit2/pygit2-0.26.1.ebuild b/dev-python/pygit2/pygit2-0.26.1.ebuild
deleted file mode 100644
index d121e89b7219..000000000000
--- a/dev-python/pygit2/pygit2-0.26.1.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=( python2_7 python3_{4,5,6} )
-
-inherit distutils-r1 eapi7-ver
-
-DESCRIPTION="Python bindings for libgit2"
-HOMEPAGE="https://github.com/libgit2/pygit2 https://pypi.python.org/pypi/pygit2"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2-with-linking-exception"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	=dev-libs/libgit2-$(ver_cut 1-2)*
-	>=dev-python/cffi-1.0:=[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/pygit2-0.26.1-internet-tests.patch
-)
-
-python_test() {
-	esetup.py test --args='-v'
-}
diff --git a/dev-python/pymountboot/Manifest b/dev-python/pymountboot/Manifest
index 23a63d70c0a2..f6e952b0d0bd 100644
--- a/dev-python/pymountboot/Manifest
+++ b/dev-python/pymountboot/Manifest
@@ -1,6 +1,4 @@
-DIST pymountboot-0.2.1.tar.bz2 4075 BLAKE2B ee8195536b9aeeb6e628242852c167c7a923342a8ace26c4b40c0a43d41c8630f097958697e72be8cfd9d76852087f74f49e6bce8a4806984f6b25be2f7ce0c3 SHA512 e21f73d832b69bc458a3f220f099bf6a8eabb21c0159b230969f4342e83874bac3983ef6bba19975b17e5185bdeb5cc42c6778f982f4fd4551a077039a2b6a0c
 DIST pymountboot-0.2.2.tar.bz2 4098 BLAKE2B bbfbe631313189e6aef684ff29e73fcf2dcbbb998528103afe9c89e517e5a6c13bf6e05ced7c2eb05f668e0cc269212618b648043b65fb95da2e1b46c37476ac SHA512 bb6ec0772300b2edf9864a09ff64f67ad99f0cd29b009793e1b2a590be48146640c927b5772023d27e68fc2fba51652a55ab66d1cf875dd9b4134f043ac353c9
-EBUILD pymountboot-0.2.1.ebuild 461 BLAKE2B 4eee37783b627c42ea0951817384e8a71575f55b59b69c36801ddf2a4415baac30102854266a768f6356891e774b1d44523f6aa5b94215c44a49777187ec1383 SHA512 d0d6123990ab19dd28d0c066c5bddd079ab6a7494ae0a2f9e31b5b7a073c08b45ae3b1621629b12e57ba089f9f1d3b34eded94b8e8d85db06e94caa2bea229c2
 EBUILD pymountboot-0.2.2.ebuild 600 BLAKE2B 898387af21a770c019ab471d2bd87f76324347f9b5c143cba00bf83fd83909bb308cd9458fa9898f0b624ccbe6a79c3fa517931da711bd0bbf79ced1d2065e9c SHA512 540f0ddae0944f8663ca802b530b23718c08cb0839ce0c0759ece91ea8f1d265f7929a3b8526ad2c92ca260ca83b723618efa2845ed2a9bc486386c027be3bf5
 EBUILD pymountboot-9999.ebuild 725 BLAKE2B 7d269d71fca86676a1dd78a33605ddcee852ac3ad28fd6b126c311f12334833fced52715e7db8bb57031bc8e818a609e5cc895dcd652592ab4eaa1c54a4748cb SHA512 e34f603432578895bfa4380aca112d5d76551acf6fcac3c7cf3aa39ec001958211351f53dea5c41b886382db2b572d9b9ec1d163599b3a9279c668cb43c7f4a7
 MISC metadata.xml 539 BLAKE2B 0ab0699ff77f99bb28bfc66ddfad742f877f256a597305b3ce4d4a462c865696a7c466e32e0f68eccb138d367c5d360880372a5816683fb49d1063a5c55d9249 SHA512 d95f758cbce79b166abc9cf68c5605e03a4b5f168a25e46016c812e667bed8ce40a146beeb02ea236890f081154e2239e87386ccb37aa29acbb134fdf7704756
diff --git a/dev-python/pymountboot/pymountboot-0.2.1.ebuild b/dev-python/pymountboot/pymountboot-0.2.1.ebuild
deleted file mode 100644
index f862ee2ca314..000000000000
--- a/dev-python/pymountboot/pymountboot-0.2.1.ebuild
+++ /dev/null
@@ -1,19 +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="Python extension module to (re)mount /boot"
-HOMEPAGE="https://bitbucket.org/mgorny/pymountboot/"
-SRC_URI="https://www.bitbucket.org/mgorny/${PN}/downloads/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=sys-apps/util-linux-2.20"
-DEPEND="${RDEPEND}"
diff --git a/dev-python/pyrsistent/Manifest b/dev-python/pyrsistent/Manifest
index ec5fd2664280..5c90f1698c80 100644
--- a/dev-python/pyrsistent/Manifest
+++ b/dev-python/pyrsistent/Manifest
@@ -3,5 +3,5 @@ DIST pyrsistent-0.12.1.tar.gz 94031 BLAKE2B 162c3c1bbb8738cca06e9b2822ecbfc06c24
 DIST pyrsistent-0.13.0.tar.gz 96326 BLAKE2B 47388d7d48841c3a093c5309e20e92619b16c9f7c59a47929b8504a7e6aed803cb1fa07260ef8fbc5ebb4b243a52329a5a9976ca947c00243fc5dd3bc9e34e8a SHA512 6bfb657841382c4ad402c383cae5092b83e93a3dde0b905f6cb8ca8a50b8acbe0f3241e9cc50cb83892c0d59b13145764faa2a3db1eabecbe6606a35d07bb5ff
 EBUILD pyrsistent-0.12.0.ebuild 919 BLAKE2B bdd5df9d48994800478eb1df184be8002110285b6a945e29b02237c429a11636338aaa22bf5263b1e7830222051575514347344e268b986039d9739bb1412802 SHA512 bf6b3827ca3ec28a28cd04e2ea3dede70f0a678860203d1edc79b513411557b7998b226edfff4364d991aa39c6b61ac5f42d909384ca41dfc73a9374fa501ce7
 EBUILD pyrsistent-0.12.1.ebuild 919 BLAKE2B bdd5df9d48994800478eb1df184be8002110285b6a945e29b02237c429a11636338aaa22bf5263b1e7830222051575514347344e268b986039d9739bb1412802 SHA512 bf6b3827ca3ec28a28cd04e2ea3dede70f0a678860203d1edc79b513411557b7998b226edfff4364d991aa39c6b61ac5f42d909384ca41dfc73a9374fa501ce7
-EBUILD pyrsistent-0.13.0.ebuild 913 BLAKE2B 67224c34284f15fface32aae04a38c3f28024ef3d1b94ed7d2ced750480bd2caa699ac262b10e61907d732c29e314d29f48828d9401a071b54b018104b17365f SHA512 9b6e26a65a91ea5cad906f2976b569e8ff87658a34c0feadee368f02241728bad0b8a104392a7691679d7f2e2cd224829ad331311559368a2b11c7155cf94dda
+EBUILD pyrsistent-0.13.0.ebuild 912 BLAKE2B 5c977d1ac807d385b039287c84b6098d21cab68ffdb5267db7bb9464d623f557e1588f3734ca5ea4374506e6e44f9184a69f6795c2b03fe38edeeaa0a6e2750f SHA512 89ae8ed3601e5f0573eb10211149e6319e4e397bbd92834343725f7a64c63ab2e64e59d6c32b089a5d0476619d77987ffda22c4de257e12aa8a0877efc7ca620
 MISC metadata.xml 521 BLAKE2B 0081a54c9db451d020647e808b80c47e590530bc952c40d3dc6c11e187cb6ff4c644c9c8c448b206ef3036a3a0ae07760e23ba88d41938667b0a83ab2299cd9d SHA512 16d13966bbf6d52360d9438a56a949e6e31a9d2ace85e319db27be14f85c8446ee28e00c6bafc9232b3608e3a209396dc601cb3ce193d3cb4e8284cc8b3cfef1
diff --git a/dev-python/pyrsistent/pyrsistent-0.13.0.ebuild b/dev-python/pyrsistent/pyrsistent-0.13.0.ebuild
index 4c543724f9cb..a3ae27aee016 100644
--- a/dev-python/pyrsistent/pyrsistent-0.13.0.ebuild
+++ b/dev-python/pyrsistent/pyrsistent-0.13.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 RDEPEND="