gentoo resync : 30.04.2018

4 files changed, 31 insertions, 16 deletions

diff --git a/dev-python/autopep8/Manifest b/dev-python/autopep8/Manifest
index 96228b5b4fa0..5eacad54ccc4 100644
--- a/dev-python/autopep8/Manifest
+++ b/dev-python/autopep8/Manifest
@@ -1,6 +1,6 @@
 DIST autopep8-1.3.2.tar.gz 107915 BLAKE2B 3148f12616babc26415fc138d5d9e2d2a83cc735449cea54870662dabdfebfd298d96ca716ee62c9143049a2abf05e6a597b0ec6bab90c557dae63999794ea25 SHA512 cb9a5e297ce705722d5e65472dbe749e57fa12fe8dee0d4c3dc20d9e885e0d885339627667110318c89c6bf7e337203a7831c0e2217e5a5d7951edcb98d3df4f
 DIST autopep8-1.3.3.tar.gz 108639 BLAKE2B d2e6f6f334dfeb5e8ae33f4460c9344ec6b1e234e7f714c7602fae72f1ca5608e12145c40a39b14d28e1d79b0dd91855493d87947407428ba4c1d87834156626 SHA512 e327d58311f74c8bb9f18b99f8d866c071166e94f43912b35eedc6062267d4cdb5842bde7c54426c751b1bb76103ec11eb8daa682772a1f71c50962811dbc694
-EBUILD autopep8-1.3.2.ebuild 921 BLAKE2B b287d8023a618dfe8a13e400d9ab1ebd23b597613783b30a132e3f1f80270c90fcb8b555b10140ee97dd6430e30f6e90e3711a893e3b52e71844374f6ee09e8f SHA512 ceedcc6f3f9ee85979c0c0d62399824a0dadb9d8bee6f9a98c930eda2eceb96663cab03570c4f046a25e3446430c604e5cb24ae851f345ed05597969b5d27cca
-EBUILD autopep8-1.3.3.ebuild 923 BLAKE2B 112b8eb1281cb03979e2fa0e270aa92b063a462209a5262966b8348bde75d2e98edcaf09c2e08e0202fbb3ec06f0a031492f22cda9c51b4f62b406d2a288807b SHA512 245db0fa72a229902a7dfeca49a92c5f8d350ded9a3fa669e5b9a509d02d83ab0b3ae94a5e5e590835ea252864a77514893b92d7bdfced3bb552db3f9cfb8749
-EBUILD autopep8-9999.ebuild 724 BLAKE2B 889fea7b607bda634186006ab4e9f27282d24411a41012aae4a7e9af3b82284f68893f8c0b6450c32557347b60e5b0ee4b3deda165a3cb546afe142c94fdb430 SHA512 dde866daef8ddd8996df2ac0d94bef805867e7ab432a44379953fddb5cf1c2ec71ebca52d1a0f364f434d7877c1aca50010e7f7f86f9c01fa58413d80aa1d20c
+EBUILD autopep8-1.3.2.ebuild 1031 BLAKE2B 45f8abac294c798aa3af2244b4c1d9ced11a40bd3ded323f424badf45a9ed52dbd4187277998b53e23b61510506589bd54eb2fc3f015d06b39e1ccb6174cc7c1 SHA512 641e25255424065af785f502479a321c8fb3cac6bbecb853c866a5cdaa0daec0b0a003f6deebff01da85cdd962ae2894cd2ba93513f87980582f50e86850fdba
+EBUILD autopep8-1.3.3.ebuild 1033 BLAKE2B 3f2cac60bfacc5a98e76f155b241cdf25db25fa3f37f3a95fe2825af6ee8bd08aba33def7074efc5a8820a2fdb9c5b27d74eaf4f885e34afb8a545ddaa402de9 SHA512 24f73201649c098b1ff19eac425b644fb49aa812c355f984179821cf0c566d1998aed2d5a1af34cfab9e59cabad10f6d165828695de98771a0ae44dbd336de20
+EBUILD autopep8-9999.ebuild 856 BLAKE2B 3c16cdf8636d56a0009fe326ceb6c05a89f1461b3d03ac8ff5ee1e55fee00101ffba1168e6959b6d0433133bdb31919f0c30bf625b23ccfb71ba89af795eec2c SHA512 7f4233fbe157efbfb9eca28ddba4d6641ffdbe71125605a04d03b3d734242f3f79398452a2642c6c2eb24378526d5b537da77663d1e8199ae5702ed90e5757e1
 MISC metadata.xml 484 BLAKE2B e99d8c92cf8d692e645db02a59bf083c14d12ae177a5acf1248961329e79fe5f1a56af05d2a942e3d644918c9f2d6e4a24d698e18441f5a65efac87ad880bed9 SHA512 7542d6e1738ad7d333fc2ef8d6072e6963dfbc07f731f3e9137e49936165ef26145185a34cdfb6dfa5df16ac4a73bff3c8e6fde8c9f0477e1545ee5e2c6b605c
diff --git a/dev-python/autopep8/autopep8-1.3.2.ebuild b/dev-python/autopep8/autopep8-1.3.2.ebuild
index d26545d20f21..704659d6b880 100644
--- a/dev-python/autopep8/autopep8-1.3.2.ebuild
+++ b/dev-python/autopep8/autopep8-1.3.2.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
@@ -10,11 +10,16 @@ inherit distutils-r1
 
 DESCRIPTION="Automatically formats Python code to conform to the PEP 8 style guide"
 HOMEPAGE="https://github.com/hhatto/autopep8 https://pypi.org/project/autopep8/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/hhatto/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
+fi
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/autopep8/autopep8-1.3.3.ebuild b/dev-python/autopep8/autopep8-1.3.3.ebuild
index 48c985d0e5cd..86abf7bd303f 100644
--- a/dev-python/autopep8/autopep8-1.3.3.ebuild
+++ b/dev-python/autopep8/autopep8-1.3.3.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
@@ -10,11 +10,16 @@ inherit distutils-r1
 
 DESCRIPTION="Automatically formats Python code to conform to the PEP 8 style guide"
 HOMEPAGE="https://github.com/hhatto/autopep8 https://pypi.org/project/autopep8/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/hhatto/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+fi
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/autopep8/autopep8-9999.ebuild b/dev-python/autopep8/autopep8-9999.ebuild
index 9b6187b0add6..1ebdd95ae114 100644
--- a/dev-python/autopep8/autopep8-9999.ebuild
+++ b/dev-python/autopep8/autopep8-9999.ebuild
@@ -1,20 +1,25 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy pypy3 )
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} pypy{,3} )
 PYTHON_REQ_USE="threads(+)"
 
-inherit distutils-r1 git-2
+inherit distutils-r1
 
 DESCRIPTION="Automatically formats Python code to conform to the PEP 8 style guide"
 HOMEPAGE="https://github.com/hhatto/autopep8 https://pypi.org/project/autopep8/"
-SRC_URI=""
-EGIT_REPO_URI="https://github.com/hhatto/${PN}.git"
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/hhatto/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+fi
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS=""
 IUSE="test"
 
 RDEPEND="