[gentoo-commits] repo/gentoo:master commit in: dev-python/jedi/

[Justin Lecher]

commit:     de03760169f26ea0892b975837ceeb8e833bc7ef
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Mon Nov  2 16:59:02 2015 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Tue Nov  3 17:21:17 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de037601

dev-python/jedi: Drop unnecessary deps

Package-Manager: portage-2.2.23
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>

 dev-python/jedi/jedi-0.8.1-r2.ebuild | 17 ++++++-----------
 dev-python/jedi/jedi-0.9.0.ebuild    | 10 ++++------
 2 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/dev-python/jedi/jedi-0.8.1-r2.ebuild b/dev-python/jedi/jedi-0.8.1-r2.ebuild
index 47c34d6..e85be82 100644
--- a/dev-python/jedi/jedi-0.8.1-r2.ebuild
+++ b/dev-python/jedi/jedi-0.8.1-r2.ebuild
@@ -21,23 +21,18 @@ DEPEND="
 	app-arch/xz-utils
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	doc? ( dev-python/sphinx )
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/tox[${PYTHON_USEDEP}]
-	)"
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
 
 python_test() {
-	PYTHONPATH="${PYTHONPATH%:}${PYTHONPATH+:}${S}/test" py.test test || die "Tests failed under ${EPYTHON}"
+	PYTHONPATH="${PYTHONPATH%:}${PYTHONPATH+:}${S}/test" py.test -v -v test \
+		|| die "Tests failed under ${EPYTHON}"
 }
 
-src_compile() {
-	if use doc ; then
-		emake -C docs html
-	fi
-	distutils-r1_src_compile
+python_compile_all() {
+	use doc && emake -C docs html
 }
 
 python_install_all() {
-	use doc && dohtml -r "${S}"/docs/_build/html/*
+	use doc && HTML_DOCS=( "${S}"/docs/_build/html/. )
 	distutils-r1_python_install_all
 }

diff --git a/dev-python/jedi/jedi-0.9.0.ebuild b/dev-python/jedi/jedi-0.9.0.ebuild
index 0c0b29a..4aa026e 100644
--- a/dev-python/jedi/jedi-0.9.0.ebuild
+++ b/dev-python/jedi/jedi-0.9.0.ebuild
@@ -21,13 +21,11 @@ DEPEND="
 	app-arch/xz-utils
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	doc? ( dev-python/sphinx )
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/tox[${PYTHON_USEDEP}]
-	)"
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
 
 python_test() {
-	PYTHONPATH="${PYTHONPATH%:}${PYTHONPATH+:}${S}/test" py.test test || die "Tests failed under ${EPYTHON}"
+	PYTHONPATH="${PYTHONPATH%:}${PYTHONPATH+:}${S}/test" py.test -v -v test \
+		|| die "Tests failed under ${EPYTHON}"
 }
 
 python_compile_all() {
@@ -35,6 +33,6 @@ python_compile_all() {
 }
 
 python_install_all() {
-	use doc && dohtml -r "${S}"/docs/_build/html/*
+	use doc && HTML_DOCS=( "${S}"/docs/_build/html/. )
 	distutils-r1_python_install_all
 }