deps added to build docs and a dep deleted to build docs to avoid circular dependeny for the second time, (patchable) sed statement to disable naughty downloading, build of docs corrected with einfo msg, 1 test file disabled (rmvd) for py2.6, redundant distutils-r1_python_install dropped avoiding wrongful duplication, example py modules set uncompressed

(Portage version: 2.1.11.40/cvs/Linux x86_64, signed Manifest commit with key 0xB8072B0D)

2 files changed, 47 insertions, 9 deletions

diff --git a/dev-python/pandas/ChangeLog b/dev-python/pandas/ChangeLog
index a5a75d30265a..6241e693c040 100644
--- a/dev-python/pandas/ChangeLog
+++ b/dev-python/pandas/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-python/pandas
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pandas/ChangeLog,v 1.12 2013/01/31 18:30:56 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pandas/ChangeLog,v 1.13 2013/02/07 08:52:22 idella4 Exp $
+
+  07 Feb 2013; Ian Delaney <idella4@gentoo.org> pandas-0.10.1.ebuild:
+  deps added to build docs and a dep deleted to build docs to avoid circular
+  dependeny for the second time, (patchable) sed statement to disable naughty
+  downloading, build of docs corrected with einfo msg, 1 test file disabled
+  (rmvd) for py2.6, redundant distutils-r1_python_install dropped avoiding
+  wrongful duplication, example py modules set uncompressed
 
 *pandas-0.10.1 (31 Jan 2013)
 
diff --git a/dev-python/pandas/pandas-0.10.1.ebuild b/dev-python/pandas/pandas-0.10.1.ebuild
index 69ba5cc00165..37891220c4f5 100644
--- a/dev-python/pandas/pandas-0.10.1.ebuild
+++ b/dev-python/pandas/pandas-0.10.1.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/pandas/pandas-0.10.1.ebuild,v 1.1 2013/01/31 18:30:56 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pandas/pandas-0.10.1.ebuild,v 1.2 2013/02/07 08:52:22 idella4 Exp $
 
 EAPI=5
 
@@ -25,9 +25,11 @@ DEPEND="${CDEPEND}
 		dev-python/ipython
 		dev-python/rpy
 		dev-python/sphinx[${PYTHON_USEDEP}]
-		sci-libs/scikits_statsmodels
+		sci-libs/scikits_timeseries
+		dev-python/matplotlib
 		)
 	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+# sci-libs/scikits_statsmodels invokes a circular dep, hence rm from doc? ( ), again
 RDEPEND="${CDEPEND}
 	dev-python/matplotlib
 	dev-python/pytables
@@ -40,23 +42,52 @@ RDEPEND="${CDEPEND}
 	)
 	R? ( dev-python/rpy )"
 
+src_prepare() {
+	if use doc; then
+		# Prevent un-needed download during build
+		sed -e 's:^intersphinx_mapping:#intersphinx_mapping:' \
+			-e "s:^    'statsmodels:#    'statsmodels:" \
+			-e "s:^    'python:#    'python:" \
+			-e "s:^}:#}:" \
+			-i doc/source/conf.py || die
+	fi
+
+	distutils-r1_src_prepare
+}
+
 python_compile_all() {
 	python_export_best
+
+	# To build docs the need be located in $BUILD_DIR, else PYTHONPATH points to unusable modules.
 	if use doc; then
-		cd doc
-		"${PYTHON}" make.py html || die
+		cd ${BUILD_DIR}/lib/ || die
+		cp -ar "${S}"/doc . && cd doc || die
+		PYTHONPATH=. "${PYTHON}" make.py html
 	fi
 }
 
 python_test() {
-	cd "${BUILD_DIR}"/lib* || die
-	PYTHONPATH=. MPLCONFIGDIR=. HOME=. nosetests-"${EPYTHON}" pandas || die
+	# test can't survive py2.6, alternately patch to skip under unittest2
+	if [[ ${EPYTHON} == "python2.6" ]]; then
+		rm -f $(find ${BUILD_DIR} -name test_array.py) || die
+	fi
+	cd "${BUILD_DIR}"/lib/ || die
+	PYTHONPATH=. MPLCONFIGDIR=. HOME=. nosetests -v pandas || die
 }
 
 python_install_all() {
-	distutils-r1_python_install
-	use doc && dohtml -r doc/build/html
+
+	if use doc; then
+		cd  ${BUILD_DIR}/lib/ || die
+		dohtml -r doc/build/html/
+		einfo "An initial build of docs are absent of references to scikits_statsmodels"
+		einfo "due to circular dependency. To have them included, emerge"
+		einfo "scikits_statsmodels next and re-emerge pandas with USE doc"
+	fi
+
 	if use examples; then
+		# example python modules not to be compressed
+		docompress -x /usr/share/doc/${PF}/examples
 		insinto /usr/share/doc/${PF}
 		doins -r examples
 	fi