From 87661c2a0bbd4c473cc5c4ef80c44b5cc1fac3e0 Mon Sep 17 00:00:00 2001
From: Virgil Dupras <vdupras@gentoo.org>
Date: Thu, 2 Aug 2018 08:36:04 -0400
Subject: dev-python/fabric: bump to 2.2.2

Also, fix broken test dependencies

Package-Manager: Portage-2.3.44, Repoman-2.3.10
---
 dev-python/fabric/Manifest            |  2 +-
 dev-python/fabric/fabric-2.2.1.ebuild | 62 -----------------------------------
 dev-python/fabric/fabric-2.2.2.ebuild | 62 +++++++++++++++++++++++++++++++++++
 3 files changed, 63 insertions(+), 63 deletions(-)
 delete mode 100644 dev-python/fabric/fabric-2.2.1.ebuild
 create mode 100644 dev-python/fabric/fabric-2.2.2.ebuild

diff --git a/dev-python/fabric/Manifest b/dev-python/fabric/Manifest
index 2b5d632e8d23..02debd8aa5a4 100644
--- a/dev-python/fabric/Manifest
+++ b/dev-python/fabric/Manifest
@@ -1,3 +1,3 @@
 DIST Fabric-1.14.0.tar.gz 219294 BLAKE2B e4f8512fd5f84dacccdafbde51ed109fd7128954635ea67ed7461f686769c107cfa6bf0181921aea5db214ffb9fb52c7f0de88c5edbbdd63258e8c280e37c70d SHA512 3bb90597356ac033e5a9bba668ec8b080ee10cac31f54b1e89b6e2e21550ba5f2341e774ed9ff52c3a4ecbc3bae3206d155c6bfe6678576caca8e439c7810ed9
 DIST fabric-1.14.0-completion.bash 4266 BLAKE2B b691b34d3a62ab8a70d184fe89150d50a0817df0619cfcb4a82dcda485b0a77bb33b5f7e548b1c50ddf8c9c9ae48721c9621e0ca6ed4396dea2f9a0e1ae61931 SHA512 2303e3b6a71ac8f6a61ce3bd464f3c950db8374b61a6375ccc6fbb2dc815a4a44509a034788862bd361ace7c0f401533cd5cee0fb6fca8d9ff7e0ffd143706a3
-DIST fabric-2.2.1.tar.gz 145848 BLAKE2B 8717a2df6d6bac41db3923e85045e1248e4376784ecf35ef3c0dc4e44a6698266305463f535d8998e489e056a158835597ae9117af2de7e6a22e2437c21217dc SHA512 51e570f1a94131e59c0e2b28c7d56e92e3230acdcb5be7c9e1ef96031988aff853ab7f91082ba468f75bf8eaa83ba826372f522ee336dcf1f2665e8222831d87
+DIST fabric-2.2.2.tar.gz 146579 BLAKE2B b3517bc95b9b15f08091b52b7f45326aa9ff85999000dbcaf8a22cf2af84e3bf4cc4094fe1627e3c5dc86cf2d98a3ac6456488b788ca1b756af301321eeb7165 SHA512 917be063ee49f6a6b06dd1e2829f47221bf2b7a591d4fcc5175766291a2d2a5026d5a92812d11592556d2945b8668d1bef3a8c43809a6c0fae4b143a68f5eb1a
diff --git a/dev-python/fabric/fabric-2.2.1.ebuild b/dev-python/fabric/fabric-2.2.1.ebuild
deleted file mode 100644
index 00240b6a9c12..000000000000
--- a/dev-python/fabric/fabric-2.2.1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# 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[${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/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
+}
-- 
cgit v1.2.3-65-gdbad