[gentoo-commits] proj/sci:master commit in: dev-python/testpath/

[Justin Lecher]

commit:     78cbe3b4245289371362ac9bb909e491ad27ca75
Author:     Marius Brehler <marbre <AT> linux <DOT> sungazer <DOT> de>
AuthorDate: Wed Sep 23 06:44:44 2015 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Wed Sep 23 06:44:44 2015 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=78cbe3b4

dev-python/testpath: Replace symlink

 dev-python/testpath/testpath-0.2.ebuild  | 55 +++++++++++++++++++++++++++++++-
 dev-python/testpath/testpath-9999.ebuild | 13 ++------
 2 files changed, 57 insertions(+), 11 deletions(-)

diff --git a/dev-python/testpath/testpath-0.2.ebuild b/dev-python/testpath/testpath-0.2.ebuild
deleted file mode 120000
index 07bd68e..0000000
--- a/dev-python/testpath/testpath-0.2.ebuild
+++ /dev/null
@@ -1 +0,0 @@
-testpath-9999.ebuild
\ No newline at end of file

diff --git a/dev-python/testpath/testpath-0.2.ebuild b/dev-python/testpath/testpath-0.2.ebuild
new file mode 100644
index 0000000..df61d95
--- /dev/null
+++ b/dev-python/testpath/testpath-0.2.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python{3_3,3_4} )
+
+inherit distutils-r1
+
+DESCRIPTION="Test utilities for code working with files and commands"
+HOMEPAGE="http://jupyter.org"
+SRC_URI="https://github.com/jupyter/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64 ~x86"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="doc test"
+
+DEPEND="
+	test? (
+		dev-python/pathlib[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	"
+
+PATCHES=(
+	"${FILESDIR}/${P}"-setup.py.patch
+	)
+
+python_prepare_all() {
+	# Prevent un-needed download during build
+	if use doc; then
+		sed -e "/^    'sphinx.ext.intersphinx',/d" -i doc/conf.py || die
+	fi
+
+distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C doc html
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( doc/_build/html/. )
+	distutils-r1_python_install_all
+	}
+
+python_test() {
+	distutils_install_for_testing
+	cd "${TEST_DIR}"/lib || die
+	cp -r "${S}"/tests "${TEST_DIR}"/lib/ || die
+	py.test || die
+}

diff --git a/dev-python/testpath/testpath-9999.ebuild b/dev-python/testpath/testpath-9999.ebuild
index 395bfd7..61ceb0c 100644
--- a/dev-python/testpath/testpath-9999.ebuild
+++ b/dev-python/testpath/testpath-9999.ebuild
@@ -5,18 +5,11 @@
 EAPI=5
 PYTHON_COMPAT=( python2_7 python{3_3,3_4} )
 
-inherit distutils-r1
+inherit distutils-r1 git-r3
 
 DESCRIPTION="Test utilities for code working with files and commands"
 HOMEPAGE="http://jupyter.org"
-
-if [ ${PV} == "9999" ] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/jupyter/${PN}.git git://github.com/jupyter/${PN}.git"
-else
-	SRC_URI="https://github.com/jupyter/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
+EGIT_REPO_URI="https://github.com/jupyter/${PN}.git git://github.com/jupyter/${PN}.git"
 
 LICENSE="BSD"
 SLOT="0"
@@ -31,7 +24,7 @@ DEPEND="
 	"
 
 PATCHES=(
-	"${FILESDIR}/${P}"-setup.py.patch
+	"${FILESDIR}/${PN}"-0.2-setup.py.patch
 	)
 
 python_prepare_all() {