Cleanup ebuild. Add missing deps for setuptools and nose.

Package-Manager: portage-2.2.0_alpha171/cvs/Linux x86_64
Manifest-Sign-Key: 0x0BBEEA1FEA4843A4

3 files changed, 25 insertions, 21 deletions

diff --git a/dev-python/encore/ChangeLog b/dev-python/encore/ChangeLog
index c778e4dc6edf..2d56ffd98fa3 100644
--- a/dev-python/encore/ChangeLog
+++ b/dev-python/encore/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/encore
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/encore/ChangeLog,v 1.2 2013/04/05 14:19:00 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/encore/ChangeLog,v 1.3 2013/04/05 18:17:20 floppym Exp $
+
+  05 Apr 2013; Mike Gilbert <floppym@gentoo.org> encore-0.3.ebuild:
+  Cleanup ebuild. Add missing deps for setuptools and nose.
 
 *encore-0.3 (05 Apr 2013)
 
diff --git a/dev-python/encore/Manifest b/dev-python/encore/Manifest
index d6d07f64fa08..ee64b6b41778 100644
--- a/dev-python/encore/Manifest
+++ b/dev-python/encore/Manifest
@@ -4,13 +4,13 @@ Hash: SHA256
 DIST encore-0.2.tar.gz 99153 SHA256 945508b9b2205648bc011e21979bfe5a0dac3ddda2b8d7cf882e23f47a62319b SHA512 f17aeffd431a7919f1fe605eb919a0a174c37fd3803d6c14eb206126319965cf22b2d001950c82aa96640aa831851dc7803fd3f361012abfbbe08f02533e73ce WHIRLPOOL 8a2406b45ce0ea27d1245b238b23ecaf50e8c8d39f18ffccb54dbe04c710339bdc2687563d213e83af10e1c7c1cbfa0151b511f7c36328a228d2153e4181ed2c
 DIST encore-0.3.tar.gz 104057 SHA256 994a564140327a2caf9147407d42c249e1b10ccce76b506bbe3016fd76c14261 SHA512 d5ba216cc7cb3181b20d7cf4362def8a52f7d940380791c863b7e6b9f8c35f8c6eee1d2d3c9dd81fa593db92ccb22e6980e4e3582ce0be029a4511b11b9fe16b WHIRLPOOL 3a0e20b09dd4e47eb2ec015cc89c9123804a8c6ed9d8a31a4c60c913099741047c92663d34698835dc40d3d75055fababf789231e348139be35c1923e2403ea3
 EBUILD encore-0.2.ebuild 1072 SHA256 55629cd5a625d0e67cf222c9ae3f324a7a5113815f0fac261e10f9e45b903691 SHA512 928fb43c1c8debbd01ed4404b0b269b226ddccf6fe1b61951e83307d217e1896c92fc029b6f0b162023b6d11c7a60fe94ad2c3ba4851976661a7899f419ae20f WHIRLPOOL 9c7d973e359393192c1e8db69f90367af67c75c20aa04339132dd96cb1c64a739c518d8b44bc225d07f502d67eb9d43485bec680098269b0607e60205219592a
-EBUILD encore-0.3.ebuild 1338 SHA256 4eb56a40e1db3b1b1802cdeed64b52fa48083affcc1d6cf3c29a614f4699f004 SHA512 fdf5252bafcf5e6a4fd91d804033442bc2416fdc7409b98a33f1d739ef0e9469165de19d133aa74f90d2cf0d3a3538540b0e011a7806d6220d2295b50f4826b1 WHIRLPOOL 9bd5d5ca32ccfd6c25dabb9e6eeb0c5179bd166c12abac1c8a7ab6b60fb062b1e5eb9d25547b85f6112d68f1797adfb2769de9d50561ca076f94e87c01e88946
-MISC ChangeLog 447 SHA256 05e9849ea5ca8e4cc586a5b4440488cac77f8bf4a039fb9b017670897e6bdb1a SHA512 bd350006bd93049fb7fb156567aa8bfd6522d3b4bab1861484e85d24a6c801665185d0990847387e8065e4c7b848b45e1c3ae85b23654435d0f2ffd454f30a0a WHIRLPOOL d35afd09080428a0b576eee0fff6bcddb2808746157c3b81f25d0f1e730726fd99b6c0e7a2c00e01a4206ac9d702d87087fc49e3676d4c05e3cab86c98d0ee8d
+EBUILD encore-0.3.ebuild 1157 SHA256 41899e020149988d6b159847cc2ffa1e36ed93da7ffd4b2dccdfdd4c34ddb72d SHA512 f8bb9b933e2e2ea3a75cfbc48af1a287294be360c20dfe979558c0b556a0c77b73178611f615679564566745dd58f169e5bf2642c6e8dde8d067dc046cfdcb7f WHIRLPOOL 469b7df230a88e74b2521b39eb960caab23832f46cd1b1625a943b3a00eeccbc81f4e7c6be07ab2485dabac86c42ea83e201be047703deb233ef2a11693ef640
+MISC ChangeLog 576 SHA256 f8cdc0930d6d207fa9b38d08c24c0d80b53a771f85ee197e5417ddcd519791da SHA512 8aa5c5009d6778324ab347ff21a1489b92aadd0bf963ad0ddef045e161095c60afdc436bc05393244a8ecd01b05a185ddc02f7688f1373ecf752d92a7f87db76 WHIRLPOOL 6e7306be1a3d6867b8f54918ecd2154dfeb2d5ea825f65f978ff340fbd8633397993289959f34a1ee3e145441ca1f39a3d83624bb3e9c2bba865514cc26f1706
 MISC metadata.xml 537 SHA256 01ed938d22551bc7f18da9b16cdf1edbbe095dca4f4bf47c57da90e0b3f18536 SHA512 1bfecc8377a19207b7106db770dec435b4da233b5267a8e2ff1eec489c96fe9eb8582d9f8d3d6b3b53997f294ddd7569f3233bee793bb497f40f6e20e895661d WHIRLPOOL c4f3be3a67d287455fc578e2eb6c716593f67df24dedb860fae6543760355986eddc045b06f35eb14191fa89c93bb11f4b4e42330c5d02903ebd35fefa6363ae
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlFe3WIACgkQso7CE7gHKw0tZwCgpcsj+lK/njXU1YL3BeO94IT3
-LF0Anjzfr3p8UAdlIAQ8CHdoCN8vCFIT
-=pOar
+iF4EAREIAAYFAlFfFTEACgkQC77qH+pIQ6T5HAD/VzMGUViMS48j8w18Y9p4Jgoa
+xujmLZ+DuOueqphdCFwA/iZ9PjmXYB9RrL4t8MVVkNfCHQQiI6ZFm1iue1FLLE+G
+=UMLE
 -----END PGP SIGNATURE-----
diff --git a/dev-python/encore/encore-0.3.ebuild b/dev-python/encore/encore-0.3.ebuild
index 3fd635dd9367..708439c1b270 100644
--- a/dev-python/encore/encore-0.3.ebuild
+++ b/dev-python/encore/encore-0.3.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/encore/encore-0.3.ebuild,v 1.1 2013/04/05 14:19:00 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/encore/encore-0.3.ebuild,v 1.2 2013/04/05 18:17:20 floppym Exp $
 
 EAPI=5
 
@@ -18,30 +18,31 @@ KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples test"
 
 RDEPEND=""
-DEPEND="doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( dev-python/futures[${PYTHON_USEDEP}] )"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+		dev-python/futures[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+	)"
 
-DOCS="dataflow.txt"
-
-python_prepare_all() {
-	# use of port 8080 is highly prone to prior use on testing
-	sed -e 's:self.port = 8080:self.port = 8020:' \
-		 -i encore/storage/tests/static_url_store_test.py || die
-}
+DOCS=( dataflow.txt )
 
 python_compile_all() {
-	use doc && PYTHONPATH="$(ls -1d ${S}/build*/lib | head -n1)" \
-		emake -C docs html
+	use doc && emake -C docs html
 }
 
 python_test() {
-	# as set for py2.6 in 0.2, likely due to tests coded to import only unittest
-	[[ "${EPYTHON:6:3}" = '2.6' ]] && return
+	if [[ ${EPYTHON} == python2.6 ]]; then
+		ewarn "Tests disabled for ${EPYTHON}"
+		return 0
+	fi
 	nosetests || die
 }
 
 python_install_all() {
-	find -name "*LICENSE*.txt" -delete
+	distutils-r1_python_install_all
+
 	use doc && dohtml -r docs/build/html/*
 
 	if use examples; then