Backport the distutils-r1 conversion, as required by dev-python/fabric.

Package-Manager: portage-2.2.1/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!

4 files changed, 66 insertions, 19 deletions

diff --git a/dev-python/fudge/ChangeLog b/dev-python/fudge/ChangeLog
index 51a9dafce869..750f5338f122 100644
--- a/dev-python/fudge/ChangeLog
+++ b/dev-python/fudge/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/fudge
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/fudge/ChangeLog,v 1.8 2013/09/01 10:04:43 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/fudge/ChangeLog,v 1.9 2013/09/01 10:11:19 mgorny Exp $
+
+*fudge-0.9.6-r1 (01 Sep 2013)
+
+  01 Sep 2013; Michał Górny <mgorny@gentoo.org> +fudge-0.9.6-r1.ebuild,
+  fudge-1.0.3-r2.ebuild:
+  Backport the distutils-r1 conversion, as required by dev-python/fabric.
 
 *fudge-1.0.3-r2 (01 Sep 2013)
 
diff --git a/dev-python/fudge/Manifest b/dev-python/fudge/Manifest
index 0faa2712ef7d..132d950555c2 100644
--- a/dev-python/fudge/Manifest
+++ b/dev-python/fudge/Manifest
@@ -3,26 +3,27 @@ Hash: SHA256
 
 DIST fudge-0.9.6.tar.gz 81653 SHA256 34690c4692e8717f4d6a2ab7d841070c93c8d0ea0d2615b47064e291f750b1a0 SHA512 69b2fa5bdd678779c0a8d9863a67e1e6724828720d2764f9f8958bc3598dcf39b22f9827efccb03014961d27d6e214c2125f639bab200b63c824c2306e3bb617 WHIRLPOOL 176df990c9adebe2d4f969603e48b2f1a797cf9935de3daeab98c078314a3fd88a19affdff5b784db5d570a3264f8cc849305b2e4761a7128c2cca7eed79062f
 DIST fudge-1.0.3.tar.gz 87558 SHA256 f8c8bfb3c0199dd06108c0c5a80e3645c7a071e0917b1a3bc73c761800809251 SHA512 7bbbcf517b2570fae20b882467aa7b739fcc9db2cd4fd2c363536da1a2bdd7c016417f42dcdb27c8422213c847eed7d8a90fd9d43eade2a238e5fc62630d5a6a WHIRLPOOL 9e02ea4d849e364ac979bf41c6fc626cdebf4b60186d9b63afe5dafa85ee4c73a9cdfbbc9762dd994e6b909f86f27caf4abe9f44394e203cbe900149f90f7960
+EBUILD fudge-0.9.6-r1.ebuild 1046 SHA256 f8644397befc4bdc9256963b62526d961cea54ddf7e67396eecd67856551457e SHA512 2aa872971c257b9cca2a0a946ffe8c1f1f24d60ec216f4e5260deaa2006d4a203949fc0811fcbed392f8e166873d58c45396bb855de1573d8d9f23e050a78bd9 WHIRLPOOL 7e5272c577241c3b154c4bce7587f5f9cf33f9c93394a32109bddd70695fdd3d6ecbf2eb55ed3134ead47d0f57336e254c1d923c05550c024df25330b5c1018f
 EBUILD fudge-0.9.6.ebuild 1354 SHA256 b9902cbfdd2b267bce4d0e7da9acdc0751aa65c8b30aaedef76b631e1313cf4a SHA512 37b74466c6bf93c9681265f5aec8a91a8c50c0305061f5a1bba1ae970a3587c3c269e268b2a80690d6f728ea1799d1481b6ff8bf4152505b6e93a7d44117346e WHIRLPOOL 6cc8a889ace393ac890d9af86e21807f1ca769ae1fc32f9d763e3bf4f015c190655f461164d575ea2c3dfb3cac642eeaba3db8763f99a7cf899735a9df011c2f
-EBUILD fudge-1.0.3-r2.ebuild 1058 SHA256 2b07eba37080af05c6cbf0015403ac0088df8a32927bf20e7a28734bedb87b59 SHA512 7b47950b570beaecbd7e48a4879279292f7f02f77c15da903c093d0fbc7e9f0df8796b423c473628400e185a7c9744e37c88834c1f6bf9486e3fc5eb30e5ae98 WHIRLPOOL 6df079ed6c46f649b181a2068b43cf8a05e812061b6d52879e4bc1187557de33b68b4ef2085b091982e521b4fe343ab258d3b07dc72a2ba866b948ca15e3b0da
-MISC ChangeLog 1528 SHA256 f0d8997c6a8858b7422c66b55e7ff0312001ae16b9d45a88e3004c70b23b3ed7 SHA512 c3c579af9a3b6918bf6a4d838027cb2cb843505cf6d7358907bc53d499574f186ca49a71574dbc4d887e71d9bfa65c60d399c33f52d9cf18463bd62f7db62ffd WHIRLPOOL 36310d95090eb66ab308d4758d571f9399ba5e9b6839a7d67a08bd7d1cf953c77dd155f7ca1c95e7f92a7c3e65032565ff851154885489161b27ba9cb2a8d68d
+EBUILD fudge-1.0.3-r2.ebuild 1046 SHA256 1f813739b8c7e8d5ce6be316d7aff41bf48e3d6560d6357e84cf200d8aec0d65 SHA512 994c37b51d288218cb4cc4a749b87de5a4e233db65b6268cde4d32642b00392d695d8e553f3c49c97073055101e732bcc970eed24d80f7973b22322f90c5daac WHIRLPOOL 1efbe476ecc5629593d137be37cddb91151a55fd7ebb94f2e45565b1991b4075eb2b621ce6d5154aadf84e57958760cd5927560258ebd96fcd5fe0a9893347ad
+MISC ChangeLog 1733 SHA256 96e2585a1f9dad01436d52aa8e66522b4b4efe201e5a00b18cbccd0606fbcc6b SHA512 391b189ed54693572bceb971339d5bb5acc56f7effe639858f207a3fbaee65657e97a59e4e6adbb58322af258d985ab5871947c4e0938e6e55237786edd07f00 WHIRLPOOL 633d45faa153d894adc50359c02c4a8a92765b77b772bd4d20a7b038044266d882ba9778b87c606815db372b5f967fcd256b98c5230b2d6ebf85fc768c1efc09
 MISC metadata.xml 228 SHA256 768704275b25109de824ec3e86a53b3e8bd3b51929c9be2a66fd52595b653acb SHA512 94bb6ac2b8de3ea7fa396a5dee59c993d8614cdc97990192a50dc2903e3af669de6a83873be82ba01d72c14c91cd1913b9c729721a9ce47edde7e8a389ce4649 WHIRLPOOL 3f9607a81bf8f28bd9fe8f91cdd73fcbc281a5e126834d1f600d82ffd9ae696297ba24069604167c922568c0e662286fc099554cc4d946f9cd79edabe338ec85
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.21 (GNU/Linux)
 
-iQJ8BAEBCABmBQJSIxFRXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJSIxLdXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOHI4P/1DiBitkxxwutgHNwU4khnLl
-BLx/wN9DYO455fZPgWroFwJTFMn0hA3R2Vols2mjbpw5M8g4nZNo90KO/Pe4v6Lt
-wAkd8kXtlm4zQu65ri0/e5hqKcTVqxyAsSuteZwplB3UhnStmL0sqZR7ssbFcOGv
-FEVhwWgpu2AvmA+EFgbxJ9a+3GRY2U7K56Rj5BcddAd5cFKF19fJDl0wXUND/z5b
-K1C57pZYxuNxuZ4Sc5H8jkiStWDnoYJZq7POCgTXHc/Uq7a16ehge/HNyXbfQ8JK
-Ow0zCccZtVJKJ50mj/d8gYPoZ/LnAjSGTMyIJx85E2zHKLO8Cl1fSJzqKgPYS6xl
-+r1Bv4tkA+miCsOKOH3vb5urWgfKSWPNLQaqCiRfqVU/BJBfx0b3LKOPEb/e9GLa
-tFlO213R/Hm7utBYoDCp32w/jIag4ZBI4ae2vo+zqjNSaGVo9KPFlmpdxwi55XVR
-Qp+s5kHeS/XEhosL5vHeSd1EkgD20vuXR91ULxoM6QMZIds1GzYM9ngpipasPvBQ
-wfacK1N4ayTtZjGSPXOSiFTiKOjJ0R+8Gpg9XFf7W5SCONHv6pkGl7qLXcT4ERY5
-XWIF1T/2DAuYv7at6VapC/44I5PxkvnnVi/x7Qkut28Te9oZ7zYmPImdAslv/Ajx
-l/OUOtTxmL+rF2wkuBTh
-=oXFo
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZO9+EP/AyQw7L/lytpAH99ZU/dbxLr
+loao+SoEDnP/Dd6BaEwZ/HcNUiXuLxPdMGYUM8RcnJymH9prNWHzhdg9YajU59H7
+tWejIln0m3L4xCYPb8KmkywUi7MNUADRfuR5rMDSN8+PlCqpNSwEoamlYGdQn+lO
+5whOUbM1dJqw0NUbLE3aOK1mZgMRLwCZOSC2GEmzA6HtatpGsE+JPZZdaKL1Rqm3
+KqcrI8pz1ZQ36/lN6NFMEGP8jxYJjAmeb5WSvq6a2A8wp99b1gUszUBhm0iRP715
+1ii/7O9QyI0cCXTKyQKYxkgB6HLJP6HlvneZZ32FnimF+UygbRARgh4HNbXJNkUH
+W/ffs7lUq7zJ3dppa0hEEXtK/RiyoO+mvec4+E7TJzoAns02VQPdR3QkeLXTAmKP
+O07VjZeltO+hMtlsPEtBoQGb6yxmdKxuNLqamNQJQaVk8Uzl2pOqGiXXZ3jm+GsP
+S9IXccY5g+hV3AkSchvBZ05NMr4s0Rd+KktuBbEo7QWykAe+jL+MeR2KsCDDTnNu
+tfqc42rmyzf642QNtYwXzYfwEYP5IxV+/0XPYbhnc57gNym3PjVtnjqLcB11Fey5
+VPA0MX4XCm1T/Il1VvQf16uRzP5DQ37epRXn1MFrdVl+8ZNpCz1RabT/ap+AvRBz
+Gw9DUbtVuEdtQ0k3Pkdp
+=2kdN
 -----END PGP SIGNATURE-----
diff --git a/dev-python/fudge/fudge-0.9.6-r1.ebuild b/dev-python/fudge/fudge-0.9.6-r1.ebuild
new file mode 100644
index 000000000000..2badfa03d9a8
--- /dev/null
+++ b/dev-python/fudge/fudge-0.9.6-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/fudge/fudge-0.9.6-r1.ebuild,v 1.1 2013/09/01 10:11:19 mgorny Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} pypy2_0 )
+
+inherit distutils-r1
+
+DESCRIPTION="Replace real objects with fakes (mocks, stubs, etc) while testing"
+HOMEPAGE="http://farmdev.com/projects/fudge/ http://pypi.python.org/pypi/fudge"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+RDEPEND=""
+DEPEND="doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+python_prepare_all() {
+	find -name "._*" -delete || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	nosetests -w "${BUILD_DIR}"/lib \
+		|| die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/fudge/fudge-1.0.3-r2.ebuild b/dev-python/fudge/fudge-1.0.3-r2.ebuild
index 7f1c7a4e9d6c..0010fc7a6c69 100644
--- a/dev-python/fudge/fudge-1.0.3-r2.ebuild
+++ b/dev-python/fudge/fudge-1.0.3-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/fudge/fudge-1.0.3-r2.ebuild,v 1.1 2013/09/01 10:04:43 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/fudge/fudge-1.0.3-r2.ebuild,v 1.2 2013/09/01 10:11:19 mgorny Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} pypy2_0 )
@@ -30,7 +30,7 @@ python_compile_all() {
 }
 
 python_test() {
-	nosetests -w "${BUILD_DIR}"/lib/${PN}/tests \
+	nosetests -w "${BUILD_DIR}"/lib \
 		|| die "Tests fail with ${EPYTHON}"
 }