revbump -> distutils-r1, deps upgraded, removed 1.6.1

Package-Manager: portage-2.1.11.63/cvs/Linux x86_64
Manifest-Sign-Key: 0xB8072B0D

4 files changed, 67 insertions, 54 deletions

diff --git a/dev-python/fabric/ChangeLog b/dev-python/fabric/ChangeLog
index 093295fb10d3..fc7ab51424e6 100644
--- a/dev-python/fabric/ChangeLog
+++ b/dev-python/fabric/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/fabric
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/fabric/ChangeLog,v 1.35 2013/06/03 06:06:11 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/fabric/ChangeLog,v 1.36 2013/06/08 14:47:17 idella4 Exp $
+
+*fabric-1.6.1-r1 (08 Jun 2013)
+
+  08 Jun 2013; Ian Delaney <idella4@gentoo.org> +fabric-1.6.1-r1.ebuild,
+  -fabric-1.6.1.ebuild:
+  revbump -> distutils-r1, deps upgraded, removed 1.6.1
 
 *fabric-1.6.1 (03 Jun 2013)
 
diff --git a/dev-python/fabric/Manifest b/dev-python/fabric/Manifest
index f269802bc4ef..45caba51f07f 100644
--- a/dev-python/fabric/Manifest
+++ b/dev-python/fabric/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX fabric-1.4.2-git_tags_docs.patch 1046 SHA256 f2158f350de5ba110cb7ffb0cafae7c1e960b9f76cde9e96c2465f7f3b262563 SHA512 006ef53206dab157b5baff48d3852b94e9966586670db872b9a7d5519a550f017897dda6e99153072dc29c6172779959e63a804e5ce8db7e7f65101c1d519be5 WHIRLPOOL ff43cae4fa8c20fa6262b849f1eb610a7f523f848cde3b5b513cb331d988ad12a255caaa175d634d18bec7fa7de8d863363cfd19f8cd242686dcddd0cef568dc
 DIST Fabric-1.1.1.tar.gz 150284 SHA256 3a3380351c01e3582c3713ff6bc63ac11db1f67ebfe96dfec2aa2721c95c4f52 SHA512 e4c21304bd1257dee6d68d4542c50bf0ae96038b1b1d38874209dc412ed5e140fbb14e7becb4e0fc59adae3b4d179b4430175217e778c83d5e512b63faf76e89 WHIRLPOOL 376b1013ca4758bb3bb27fcffd4e8bfec8c4b5d08dadb27b985cdd9a9a369d4a5fe659392d684389910cdefc18a16e5c1793ec8bc109396565165c387c99629c
 DIST Fabric-1.2.2.tar.gz 155204 SHA256 a5956c37a8c668acac16d671537fa85e648b535343c9a2c9f921bbae486d651c SHA512 44c034a144319f6d1dd57ea2de56e222c810e6dd54b2c12c89343a5f776090acad6d317c71363a540618a021c021fb96edb26c3fbc01af133223a28f268f78c1 WHIRLPOOL 053a60fa19183788bdecc9267dd1a7f15e4862862184613832f4c8cf3089f858453e83be749c212e4bf36fe6df6eed02329b3086cb0e6e9a5526d019b6fc5e94
@@ -22,6 +25,13 @@ EBUILD fabric-1.5.1.ebuild 1140 SHA256 b29189aea958144a35355885579be20ffc2f776aa
 EBUILD fabric-1.5.2.ebuild 1140 SHA256 688801516772c831a5aff3a19c89457eaf5fb33f23964bdc9aed1b48c3e49259 SHA512 5ebad81d0d74254d8259757e85ab1184b58be72e865b6e8efdc435afc5bc976610cd90b063a646839c8d403fa79e950652ad7b8a5ef6d9bf5dc417808e2c361a WHIRLPOOL c565989b38803f0c41fbb0fad7a547a97338bd52313c0c9e7c79e7ff5d0a67681c06197d4ae407ebd1915907ae2832e516eb9e9a148ab823a5c6f04f46260045
 EBUILD fabric-1.5.3.ebuild 1140 SHA256 e30fdaa57a6701a6e0b2e72f226d7c56b52f9286a9efea7552cd469f7ab15be7 SHA512 7f2f1e21566f30331934db6223611bd5b10adae2005dc58edd439efa9a06e12dfd2f03749e5e7bf3a9ec1c5c30743837eaefa4c4d1d29a1c2cef8ebb285636b4 WHIRLPOOL f8990f98e9464be4dbd045550ca09c5530a531f512b201a410be782351e0ef8b7932e9a4e526e9d04bf85914f41ee7d21b6db1b4f25094d384d29747c7d0f954
 EBUILD fabric-1.6.0-r1.ebuild 1153 SHA256 c6abb12be6ce1af02479ac8c339d23f18a0ee4407622639495f7ac5022c33284 SHA512 a1a12f777a9707371845102ea231c77f9aa08f6cdbf517d4986664afd12e0c14456b36f4cdcc3ecb5a1d74b7e6459369bef83ef99091b21790d89761be41de65 WHIRLPOOL 103aa169938abdf3cda4f6083adac7ada5d37e9327f717ce53b5d975f4e6742fb2862e08ae24a2d160f903e39f3fa73f7944f3b5c441fe0be7ff5d8ab76d97c5
-EBUILD fabric-1.6.1.ebuild 1149 SHA256 bbdcfc05fc6ed8531ae2d449f9d5601089d49eac0b71b9ec8e08b16110dfaca6 SHA512 e29f5cf99c6fe2646d8df73e83d0f2c434a1d0682cc266f32a8f38c55eba466f48c6cad1d249e1fabaa0f11d7dfa311f6f38d6a03ec4b2eff521aa6bc91303f0 WHIRLPOOL 2a28b68b1b5bf6a9a0cb53ca1a40ec2906fe2b48ec22bc21ff67945f71d5845b9bd1650d76ef2b2aef72ce48cb6a44ef6cdf658ca12a662d58b9693964c16131
-MISC ChangeLog 5434 SHA256 505d20124d07dfc7e4425e9fbc2b60a2c85db5aea10509c44caf8d5ba5a065b5 SHA512 9a19ad5828549c810284078c70420a4ae032a617108322ce67cdb1c4fe2a25c2b8d408198c5ae6e63fe3beca7f52e0750650ab48f725e0088dc636127f4e67f4 WHIRLPOOL 07b6e5b7c2f90dfbe3e8c8193879a3a84250d4a0ae54c06b0d69a285df33f02f9696e8deb1eb861508dae6052564419f26a934e1c742bb76bdc488b0c86fd0fc
+EBUILD fabric-1.6.1-r1.ebuild 1303 SHA256 f55cac6946bd332b011c7075b6d7175637070535501c37edbb3fb6eee2e7bd5a SHA512 97f342684ed90f24a0d79ceb7e94c9fc7b535671d6dec647d7964ecfe4fa89247b364de0dd713a279bcdf0d7890f5b2551daa5c8fdd3f31aafe7c9b252a1568c WHIRLPOOL 4835211671f95ae9eb936e5c7d008d738793e91c7969c95296a39f37f3980441ae578747610697415b3650dfb07b9f66afc32a8c91050c1ab62e114db2439d35
+MISC ChangeLog 5620 SHA256 ea61c2cbff1984650f2dec88c3249962133da3cb36cdbe7fc5f680227d64c77d SHA512 649e3e0e2f99fc319ea03aa25fbf639a7a5dc0b7fa9cfb4203a46c75805f99b9a8ade2553b382757e62ecfe3b42f8096c3d94d90a56cd33215097e28d9244b15 WHIRLPOOL 4b145e2cc785bca438483af218de3007108f4666b272733a4f3ceac914a3a974a8f95df2c3dba0005b5f7cc2dbad9f6b035b690bcbdcfdd7d64a563bc14c5fda
 MISC metadata.xml 229 SHA256 3e4ac13baa3ece16df4c90c93ed406e87d61bfc4bed3f78682d45ce2b1281738 SHA512 74f6424417890077621ac6955e596ccb7da7ad26ccff9d556500390a91d2a4867c01c2ab56e0538fa9145371003ad3fbf8176d377ceafc044c1ba945fe4aa52e WHIRLPOOL 0c358e551fbabc3c800d834bc0358745add73a08e6643ddbdcb9db4311b794d185549192f262565d2b25bef4e3d059599640f55499db15e39c9452fbf211a506
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iEYEAREIAAYFAlGzRAAACgkQso7CE7gHKw3clACfSVX+GPI5+y2J8CZiMvZsMECK
+z40AoMxhCFRzBLACJdbdpnh2yrsZ9Hw1
+=s7J+
+-----END PGP SIGNATURE-----
diff --git a/dev-python/fabric/fabric-1.6.1-r1.ebuild b/dev-python/fabric/fabric-1.6.1-r1.ebuild
new file mode 100644
index 000000000000..d17e91a1050d
--- /dev/null
+++ b/dev-python/fabric/fabric-1.6.1-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/fabric/fabric-1.6.1-r1.ebuild,v 1.1 2013/06/08 14:47:17 idella4 Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_5,2_6,2_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 http://pypi.python.org/pypi/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.0[${PYTHON_USEDEP}]
+	python_targets_python2_5? ( dev-python/multiprocessing[python_targets_python2_5] )
+	python_targets_python2_6? ( dev-python/multiprocessing[python_targets_python2_6] )"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? ( <dev-python/fudge-1.0 )"
+
+S="${WORKDIR}/${MY_P}"
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+src_test() {
+	local DISTUTILS_NO_PARALLEL_BUILD=1
+	distutils-r1_src_test
+}
+
+python_test() {
+	nosetests tests || die "Tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/fabric/fabric-1.6.1.ebuild b/dev-python/fabric/fabric-1.6.1.ebuild
deleted file mode 100644
index 867be3bc15f2..000000000000
--- a/dev-python/fabric/fabric-1.6.1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/fabric/fabric-1.6.1.ebuild,v 1.1 2013/06/03 06:06:11 patrick Exp $
-
-EAPI="4"
-PYTHON_DEPEND="2:2.5"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.4 3.* *-jython *-pypy-*"
-DISTUTILS_SRC_TEST="nosetests"
-
-# Requires multiprocessing package from py2.6+
-PYTHON_TESTS_RESTRICTED_ABIS="2.5"
-
-inherit distutils
-
-MY_PN="Fabric"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Fabric is a simple, Pythonic tool for remote execution and deployment."
-HOMEPAGE="http://fabfile.org http://pypi.python.org/pypi/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"
-
-RDEPEND=">=dev-python/paramiko-1.10.0"
-DEPEND="${RDEPEND}
-	dev-python/setuptools
-	doc? ( dev-python/sphinx )
-	test? ( <dev-python/fudge-1.0 )"
-
-S="${WORKDIR}/${MY_P}"
-PYTHON_MODULES="fabfile fabric"
-
-src_compile() {
-	distutils_src_compile
-
-	if use doc; then
-		emake -C docs html
-	fi
-}
-
-src_install() {
-	distutils_src_install
-
-	if use doc; then
-		dohtml -r docs/_build/html/
-	fi
-}