Use vcs-snapshot.eclass to avoid variable shuffling, depend on sphinx for docs, fix double html in docs' install path, drop unnecessary die

Package-Manager: portage-2.2.0_alpha104/cvs/Linux x86_64

3 files changed, 33 insertions, 21 deletions

diff --git a/dev-python/fabric/ChangeLog b/dev-python/fabric/ChangeLog
index 2f77d8d74195..2e0084468bbd 100644
--- a/dev-python/fabric/ChangeLog
+++ b/dev-python/fabric/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-python/fabric
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/fabric/ChangeLog,v 1.22 2012/05/10 23:31:35 neurogeek Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/fabric/ChangeLog,v 1.23 2012/05/15 18:44:15 xarthisius Exp $
+
+*fabric-1.4.2-r1 (15 May 2012)
+
+  15 May 2012; Kacper Kowalik <xarthisius@gentoo.org> +fabric-1.4.2-r1.ebuild,
+  -fabric-1.4.2.ebuild:
+  Use vcs-snapshot.eclass to avoid variable shuffling, depend on sphinx for
+  docs, fix double html in docs' install path, drop unnecessary die
 
 *fabric-1.4.2 (10 May 2012)
 
diff --git a/dev-python/fabric/Manifest b/dev-python/fabric/Manifest
index 6e4f31a469cd..93a67169b5aa 100644
--- a/dev-python/fabric/Manifest
+++ b/dev-python/fabric/Manifest
@@ -1,23 +1,33 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX fabric-1.4.2-git_tags_docs.patch 1046 RMD160 dabe89fcd69ae9c05b0aa6f23086f0e2dcb4b921 SHA1 d2841a9e45a5153ae67ffab7e1f4d6889e6ad259 SHA256 f2158f350de5ba110cb7ffb0cafae7c1e960b9f76cde9e96c2465f7f3b262563
 DIST Fabric-1.1.1.tar.gz 150284 RMD160 e9ddbbc9e5e6fc4c2c1cdd17007a03feda867855 SHA1 2dff0d0300d26ee65728689781eb176cbcb0bb15 SHA256 3a3380351c01e3582c3713ff6bc63ac11db1f67ebfe96dfec2aa2721c95c4f52
 DIST Fabric-1.2.2.tar.gz 155204 RMD160 06b5d71bac702baf8b0eaa660ab0da1c1ababa57 SHA1 be992e7aaed6be73cd44ce2f13ce0e0d8fb17bc1 SHA256 a5956c37a8c668acac16d671537fa85e648b535343c9a2c9f921bbae486d651c
 DIST Fabric-1.4.0.tar.gz 178745 RMD160 270c6bc3ca64b7a9299447d475a09069e2715302 SHA1 29025b2aed438046c5ed7bb443a2045e9e4a5605 SHA256 d8a35bd3cda109e99fda5196ccf7a386cc41bf56252e17513260c740a3106f95
 DIST Fabric-1.4.1.tar.gz 181048 RMD160 38e894d040646b5cbde69b5d0b45fcce97c6b0a4 SHA1 ae77c928e2d6f90808b7fb3129335e661e5581a7 SHA256 3f08cee87cd69c6ef3f79b0051bb2cf4a2346986f2cb53117cba72771b371a74
-DIST Fabric-1.4.2.tar.gz 194062 RMD160 09a3ee30c218dfc4f20e72c738ab4b6a2a3753fb SHA1 32f2b3d983b43ae2d6449aae878cc7cb4c229401 SHA256 a2052fefd10b7f433b9598a409b19eb6581656807a7a02fbaf94b6b61e7173a2
+DIST fabric-1.4.2.tar.gz 194062 RMD160 09a3ee30c218dfc4f20e72c738ab4b6a2a3753fb SHA1 32f2b3d983b43ae2d6449aae878cc7cb4c229401 SHA256 a2052fefd10b7f433b9598a409b19eb6581656807a7a02fbaf94b6b61e7173a2
 EBUILD fabric-1.1.1.ebuild 813 RMD160 f67928ac5ddd45ce3f6ee087cbc7215339223546 SHA1 ab62106e63d4994a1333f2852665869b97ea9bd1 SHA256 1fcde4726685748b777b46bba5bd5927e647c82e3fdff10d6f541082ecb13763
 EBUILD fabric-1.2.2.ebuild 967 RMD160 fbad7885d3f12da931c5aae8e777ccce9950e359 SHA1 6175520591da1ccd092eb1e66b9714ff2f0c75ea SHA256 b93bdeb420e2e9e1e8e8933c1847b5d9063152a7fb99da8ad720fa0b5f13657b
 EBUILD fabric-1.4.0.ebuild 828 RMD160 cf44fa4804b323747ab7442bee9e534616cbb791 SHA1 3e5370933ce1aeea3114f78efdc745c852bb0e8f SHA256 4726d3930a45d7665e243f35e1a70f492fa8365aba0f754af5c60a1575dd0466
 EBUILD fabric-1.4.1.ebuild 832 RMD160 08103c42cff91975e03e50f5d2c8147b5e48abf4 SHA1 fc177b691c46779567b8941b2ac28cc1ae161c11 SHA256 1dc2e45de8473d5e665c310edca36066cd0abf0b5e79fc28abb89f623d3f1f56
-EBUILD fabric-1.4.2.ebuild 1227 RMD160 b92f956c981d1984190b73909187e0d26b075516 SHA1 a97819de87f24753ded442302f0ede13570c6819 SHA256 06a75f0cb87a38711e4d0e4673603cf01fabf4bf8a63c10a02de25d6d273685f
-MISC ChangeLog 3697 RMD160 f703a97affe69a21c15f19b5245d82a468dbf3c4 SHA1 b531ecc02d02b59f8a347e12b175c66fc8bdf127 SHA256 2f78a3ac52ff14c91b9b518ac7d619c6012c84dc5ef202cf2659fa0d32b751fd
+EBUILD fabric-1.4.2-r1.ebuild 1136 RMD160 000a1d4b68ac4ae0c620932d8c8b4907dd6dd9ff SHA1 0f883cf025af4f3cd697f52b12af8a34fc665613 SHA256 4f02124ea3ddfef981cb98ca5b5d3a3b096e9dc3dfed9ebd82121a7525f35ba0
+MISC ChangeLog 3978 RMD160 1825aaa23985965f58544f8e1a0de23d6f0aad94 SHA1 7d5151f7d7be8182cb403bb6ea578c4b935127d1 SHA256 14e5ec5cff68e0af5e508294fafc93f62eef8076489b03ac97669d7a66a6657d
 MISC metadata.xml 229 RMD160 995358a6704c3ec8e530d36e817c3ef2002d7a0b SHA1 d7d25644d27f69d44308d343619a9384dd3a2194 SHA256 3e4ac13baa3ece16df4c90c93ed406e87d61bfc4bed3f78682d45ce2b1281738
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk+sF4wACgkQdIssYB9vBoOzLQCfWzwaEk+mn26U4zG+koPcnKpW
-Ja8An2KE7fknMDA8/pcnBkhyldxJ5iA6
-=57NG
+iQIcBAEBCAAGBQJPsqQJAAoJEF0huFKJUZL5gNIP/2K/XEPtGltoIhpJOE2b+/3z
+mYQA5zz/VPA+J/qZoKnzBOKdmXFbA1UcF3/mOx0GftPkohyfT6OpcX/772uI3P6u
+UHbPF/R7/v46kVDbmPL+kFmH6DB4/1e8Ad5ANqwLnrd4wZ6oJ5uqmmzR0Pzx0J1r
+vXNfvjlGGewfJOMpH1o4Zpy2xOdzBXxWR2I2UUTV3g0LnwwNv03btX1d2/jK10tb
+6gYdT25uV/nM7q1ycvzb7oJwb223gZp2LhuWzPbHQNWl9bESmX3ULdL5E1eirgiE
+HDRvo4ho2psljOGJZ7i87mbFwMvrTzMQ6gp4el3iPz/3BDE0VgryWQ+KcaKccZY3
+1WLvC7jA7OGFr1UyW3dKyRiDL1UoyKRttQvt8QxLm/aH1fMCttU/51L369rSA3aO
+28TFAF8rbKmMNiC2LFBemoa/eNqaYxBQePih2cUf4zaDppy7FY4s4moGsshH/YrF
+c61JRGhVVp7B5MFf8o8y7+L7cXIG4nF6NU/vorVod4YCiAggcm+NbNzxsf5KGEUA
+fzYFDt8+Usr+crGCookSwCojBCWFahHC+hkzinHxf2DnKMydHH/qLPl4RG+NLz74
+Vt6kjvQhHOiYpW5NGP2ZFVsqkbB4hpJsJ0FZ6BgWNySy+T326+HAPsRFlNSTT9rN
+Q13jo5YvuDTHEeea+UYV
+=Cju6
 -----END PGP SIGNATURE-----
diff --git a/dev-python/fabric/fabric-1.4.2.ebuild b/dev-python/fabric/fabric-1.4.2-r1.ebuild
index 104655d4c597..0074809d725f 100644
--- a/dev-python/fabric/fabric-1.4.2.ebuild
+++ b/dev-python/fabric/fabric-1.4.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/fabric/fabric-1.4.2.ebuild,v 1.1 2012/05/10 23:31:35 neurogeek Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/fabric/fabric-1.4.2-r1.ebuild,v 1.1 2012/05/15 18:44:15 xarthisius Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2:2.5"
@@ -8,15 +8,11 @@ SUPPORT_PYTHON_ABIS="1"
 RESTRICT_PYTHON_ABIS="2.4 3.* *-jython"
 #DISTUTILS_SRC_TEST="nosetests"
 
-inherit distutils eutils
-
-MY_PN="Fabric"
-MY_P="${MY_PN}-${PV}"
-GIT_HASH_TAG="3a4006e"
+inherit distutils eutils vcs-snapshot
 
 DESCRIPTION="Fabric is a simple, Pythonic tool for remote execution and deployment."
 HOMEPAGE="http://fabfile.org http://pypi.python.org/pypi/Fabric"
-SRC_URI="http://github.com/${PN}/${PN}/tarball/${PV} -> ${MY_P}.tar.gz"
+SRC_URI="http://github.com/${PN}/${PN}/tarball/${PV} -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -25,14 +21,13 @@ IUSE="doc"
 
 RDEPEND=">=dev-python/ssh-1.7.14"
 DEPEND="${RDEPEND}
-		dev-python/setuptools"
+	dev-python/setuptools
+	doc? ( dev-python/sphinx )"
 #		test? ( dev-python/fudge )"
 
 # Tests broken.
 RESTRICT="test"
 
-S="${WORKDIR}/${PN}-${PN}-${GIT_HASH_TAG}"
-
 PYTHON_MODULES="fabfile fabric"
 
 src_prepare() {
@@ -44,7 +39,7 @@ src_compile() {
 	distutils_src_compile
 
 	if use doc; then
-		emake -C docs html || die "Couldn't make docs"
+		emake -C docs html
 	fi
 }
 
@@ -52,6 +47,6 @@ src_install() {
 	distutils_src_install
 
 	if use doc; then
-		dohtml -r docs/_build/html
+		dohtml -r docs/_build/html/
 	fi
 }