gentoo resync : 04.08.2018

6 files changed, 83 insertions, 75 deletions

diff --git a/dev-python/fabric/Manifest b/dev-python/fabric/Manifest
index f9c5550a751f..41104686b0cf 100644
--- a/dev-python/fabric/Manifest
+++ b/dev-python/fabric/Manifest
@@ -1,9 +1,7 @@
-DIST Fabric-1.10.0.tar.gz 208969 BLAKE2B 08ddc1a43a34436e857595415b66d9f38d769647858d93258d454673be3be3f8da84ab3e6c89e526449cb6b89e05651ccebf65d648aaa9277337d342af7c1926 SHA512 991341dfb3f71e938c2a2e30f5bc158be84cb1600ab64c4f7c5c49decd0a38bc57615f9e07edfbed70d9ca796592d7c1a4f7f3e25a40c4d31049015df928b2e3
-DIST Fabric-1.12.0.tar.gz 232840 BLAKE2B 97d27261db631c8b4f89ba3e93a0e97aead841423d036dcdb00921b15a9b598428262de49e7ae2d0e960bf16ceb1297a526c124b2f39df9b3db4251a8af8d95b SHA512 cc07e811873c296c7e33ddadb00af3b4cbd1a87b2617b82505758e6b646e20e55edafe76cd969f3b2a7931a2deb4daefe8e44a7d6fe6ec67e5d9923d6c64e95e
 DIST Fabric-1.14.0.tar.gz 219294 BLAKE2B e4f8512fd5f84dacccdafbde51ed109fd7128954635ea67ed7461f686769c107cfa6bf0181921aea5db214ffb9fb52c7f0de88c5edbbdd63258e8c280e37c70d SHA512 3bb90597356ac033e5a9bba668ec8b080ee10cac31f54b1e89b6e2e21550ba5f2341e774ed9ff52c3a4ecbc3bae3206d155c6bfe6678576caca8e439c7810ed9
-DIST fabric-1.12.0-completion.bash 4266 BLAKE2B b691b34d3a62ab8a70d184fe89150d50a0817df0619cfcb4a82dcda485b0a77bb33b5f7e548b1c50ddf8c9c9ae48721c9621e0ca6ed4396dea2f9a0e1ae61931 SHA512 2303e3b6a71ac8f6a61ce3bd464f3c950db8374b61a6375ccc6fbb2dc815a4a44509a034788862bd361ace7c0f401533cd5cee0fb6fca8d9ff7e0ffd143706a3
 DIST fabric-1.14.0-completion.bash 4266 BLAKE2B b691b34d3a62ab8a70d184fe89150d50a0817df0619cfcb4a82dcda485b0a77bb33b5f7e548b1c50ddf8c9c9ae48721c9621e0ca6ed4396dea2f9a0e1ae61931 SHA512 2303e3b6a71ac8f6a61ce3bd464f3c950db8374b61a6375ccc6fbb2dc815a4a44509a034788862bd361ace7c0f401533cd5cee0fb6fca8d9ff7e0ffd143706a3
-EBUILD fabric-1.10.0-r1.ebuild 1732 BLAKE2B 06801d66d7eb65c9e56a061eca6c9ae4e5240bceaea5cdc2b1968b82c4a1ab5d10d1949f6e3d6f35308b6abee5523495bb5a39bc0612d991bcad291b3ee59f13 SHA512 85f076e0901ef30302da8c02d3ea6c8f90040dae611705549326725be69807611cc3e8abc36c9d5444acc47da73aa362dd6d15709c060c8225bb7dbaaf95c7d7
-EBUILD fabric-1.12.0.ebuild 2121 BLAKE2B c45c472502ca43a2830d9195a7054a0f7ed9b5a0a863515502900c154ccb0d1267eeb28b5acf2eeed78eceaa12b034f8edc659a1d6b234c809cfefaa9d763723 SHA512 8864f027b6804390a820abd0d9d9fbd7df444a3a5b250cfc63b21217a706fe231ec6a6cd9b4a06820a2260b267dd7140fb85b9836e114fd739365023361fdea8
-EBUILD fabric-1.14.0.ebuild 2121 BLAKE2B c45c472502ca43a2830d9195a7054a0f7ed9b5a0a863515502900c154ccb0d1267eeb28b5acf2eeed78eceaa12b034f8edc659a1d6b234c809cfefaa9d763723 SHA512 8864f027b6804390a820abd0d9d9fbd7df444a3a5b250cfc63b21217a706fe231ec6a6cd9b4a06820a2260b267dd7140fb85b9836e114fd739365023361fdea8
-MISC metadata.xml 309 BLAKE2B cd101ae05f7daf7c54a18766f2d93c84b4eb1fa59e01bb3afc26ce495fa234756789d1ce496f11e22880653c62ebafd4f2ce509f530438ff970f711d47ae3b5c SHA512 ca05cacf9ab4eb5814b4d311902e34ba0e788c811b59c9a687b0d320b254036a688cccc45265384523b2fc460383336d334acc860b72f78d3ec9736361bf6b24
+DIST fabric-2.2.2.tar.gz 146579 BLAKE2B b3517bc95b9b15f08091b52b7f45326aa9ff85999000dbcaf8a22cf2af84e3bf4cc4094fe1627e3c5dc86cf2d98a3ac6456488b788ca1b756af301321eeb7165 SHA512 917be063ee49f6a6b06dd1e2829f47221bf2b7a591d4fcc5175766291a2d2a5026d5a92812d11592556d2945b8668d1bef3a8c43809a6c0fae4b143a68f5eb1a
+EBUILD fabric-1.14.0-r1.ebuild 2162 BLAKE2B 36a3d0a6e660e7ef850eb87d8ff4b2b858a3db08095bc69487003e8db1976d9faa95f03365786a0353b014b0b9222447ea70394568cd9580520c98581b496a73 SHA512 d2f83cbbdc340d04e3f08809616f3e5021db7f28681ff2a27e1946c4eb2b4a4e7ff6f6c5c252e909e93d572a63a2d49497873181368231ed3001fbc6a305444f
+EBUILD fabric-1.14.0.ebuild 2163 BLAKE2B 98ef182b8a84056f297ef881a07a4062b4b0fd7c601e58de9103d4383af31ef346c6ca242cfe2677c1d0fbe2492009a3921430eec3df74373565350600d99977 SHA512 dcd699a6e9ae08cea481b354a4c1327bf1738815761fb6f856a84684e99f81cf553c31d2e7f64f906456aa4b687b11435fd93dc094dc9db45459819154a56c76
+EBUILD fabric-2.2.2.ebuild 1531 BLAKE2B e9d763d3a9ae1c128b634e4ae51488feb81f5575601d7de157dbaf4548bd2ff256c01110eb8a09f39f7c2cc33462bf8133b81949c7cc1bb1bc2bdcad016f3585 SHA512 689d0552884cc8c9545f578dceadacd2522e9a84abe0494477012e06680c6ad58534c413f5898f9eb7228f964ffda7b0b0a5c077ca2dd3fd4243f0dfb4bdf653
+MISC metadata.xml 524 BLAKE2B 9df10f0b4cbe8197f27e7b5fc67fee9d46d881ab29cd29f2255aca693b3439c49edd1145ec2442cc6d49fcb173998aef3bbd2a3f2017e1cb83fcc79f1c50c59e SHA512 1a7a207ebf6d760a6f8e150806addbc9ca6c207b0f93c13bf5525ab2868d95a2b33acee846dee25eb70af0163cb2e05323de1ac2b74155046de962a44c470413
diff --git a/dev-python/fabric/fabric-1.10.0-r1.ebuild b/dev-python/fabric/fabric-1.10.0-r1.ebuild
deleted file mode 100644
index 8fc24c231424..000000000000
--- a/dev-python/fabric/fabric-1.10.0-r1.ebuild
+++ /dev/null
@@ -1,61 +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
-
-MY_PN="Fabric"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A simple pythonic tool for remote execution and deployment"
-HOMEPAGE="http://fabfile.org https://pypi.org/project/Fabric/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc test"
-
-RDEPEND="
-	>=dev-python/paramiko-1.10[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}]
-		>=dev-python/python-docs-2.7.6-r1:2.7
-		dev-python/alabaster[${PYTHON_USEDEP}] )
-	test? ( dev-python/nose[${PYTHON_USEDEP}]
-		<dev-python/fudge-1.0[${PYTHON_USEDEP}]
-		dev-python/jinja[${PYTHON_USEDEP}] )"
-
-S="${WORKDIR}/${MY_P}"
-
-python_prepare_all() {
-	# Re-set intersphinx_mapping for doc build
-	if use doc; then
-		local PYTHON_DOC_ATOM=$(best_version --host-root dev-python/python-docs:2.7)
-		local PYTHON_DOC_VERSION="${PYTHON_DOC_ATOM#dev-python/python-docs-}"
-		local PYTHON_DOC="/usr/share/doc/python-docs-${PYTHON_DOC_VERSION}/html"
-		local PYTHON_DOC_INVENTORY="${PYTHON_DOC}/objects.inv"
-		sed  -e "s|'http://docs.python.org/2.6', None|'${PYTHON_DOC}', '${PYTHON_DOC_INVENTORY}'|" \
-			-e "s|    'www'|    #'www'|" \
-			-i sites/docs/conf.py || die
-	fi
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	if use doc; then
-		sphinx-build -b html -c sites/docs/ sites/docs/ sites/docs/html || die
-	fi
-}
-
-python_test() {
-	nosetests tests || die "Tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( sites/docs/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/fabric/fabric-1.12.0.ebuild b/dev-python/fabric/fabric-1.14.0-r1.ebuild
index 4b345890112a..f3da6f17450b 100644
--- a/dev-python/fabric/fabric-1.12.0.ebuild
+++ b/dev-python/fabric/fabric-1.14.0-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 PYTHON_COMPAT=( python2_7 )
 
@@ -24,7 +24,8 @@ KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="doc test"
 
 RDEPEND="
-	>=dev-python/paramiko-1.10[${PYTHON_USEDEP}]"
+	>=dev-python/paramiko-1.10[${PYTHON_USEDEP}]
+	<dev-python/paramiko-3.0[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	doc? (
@@ -70,5 +71,5 @@ python_test() {
 python_install_all() {
 	use doc && local HTML_DOCS=( sites/docs/html/. )
 	distutils-r1_python_install_all
-	newbashcomp "${DISTDIR}"/${P}-completion.bash  ${PN}
+	newbashcomp "${DISTDIR}"/${P}-completion.bash fab
 }
diff --git a/dev-python/fabric/fabric-1.14.0.ebuild b/dev-python/fabric/fabric-1.14.0.ebuild
index 4b345890112a..460458e98acb 100644
--- a/dev-python/fabric/fabric-1.14.0.ebuild
+++ b/dev-python/fabric/fabric-1.14.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
@@ -20,11 +20,12 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="doc test"
 
 RDEPEND="
-	>=dev-python/paramiko-1.10[${PYTHON_USEDEP}]"
+	>=dev-python/paramiko-1.10[${PYTHON_USEDEP}]
+	<dev-python/paramiko-3.0[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	doc? (
diff --git a/dev-python/fabric/fabric-2.2.2.ebuild b/dev-python/fabric/fabric-2.2.2.ebuild
new file mode 100644
index 000000000000..2ee141e59f00
--- /dev/null
+++ b/dev-python/fabric/fabric-2.2.2.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_6 )
+
+inherit distutils-r1
+
+DESCRIPTION="A simple pythonic tool for remote execution and deployment"
+HOMEPAGE="http://fabfile.org https://pypi.org/project/Fabric/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="2"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc fab2 test"
+
+RDEPEND="
+	!fab2? ( !dev-python/fabric:0 )
+	>=dev-python/cryptography-1.1[${PYTHON_USEDEP}]
+	>=dev-python/invoke-1.0[${PYTHON_USEDEP}]
+	<dev-python/invoke-2.0
+	>=dev-python/paramiko-2.4[${PYTHON_USEDEP}]"
+
+BDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? (
+		>=dev-python/alabaster-0.7[${PYTHON_USEDEP}]
+		<dev-python/alabaster-2.0[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.4[${PYTHON_USEDEP}]
+		<dev-python/sphinx-1.7[${PYTHON_USEDEP}]
+	)
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		>=dev-python/pytest-relaxed-1.1.4[${PYTHON_USEDEP}]
+	)"
+
+python_compile() {
+	if use fab2; then
+		export PACKAGE_AS_FABRIC2=1
+		ln -s fabric fabric2 || die
+	fi
+	distutils-r1_python_compile
+}
+
+python_compile_all() {
+	if use doc; then
+		sphinx-build -b html -c sites/docs/ sites/docs/ sites/docs/html || die
+	fi
+}
+
+python_test() {
+	# -p pytest_relaxed: this plugin has to be loaded explicitly
+	pytest -s -v -p pytest_relaxed.plugin || die "Tests failed"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( sites/docs/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/fabric/metadata.xml b/dev-python/fabric/metadata.xml
index 0ed9470ac422..38953b499500 100644
--- a/dev-python/fabric/metadata.xml
+++ b/dev-python/fabric/metadata.xml
@@ -1,10 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person">
+		<email>vdupras@gentoo.org</email>
+		<name>Virgil Dupras</name>
+	</maintainer>
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<use>
+		<flag name="fab2">Install as "fab2", allowing side-by-side install with fabric 1.x</flag>
+	</use>
 	<upstream>
 		<remote-id type="pypi">Fabric</remote-id>
 	</upstream>