Merge branch 'marbre-scikit_learn'

* marbre-scikit_learn:
  sci-libs/scikits_learn: Add missing dies
  sci-libs/scikits_learn: Add missing dependency on virtual/blas
  sci-libs/scikits_learn: Add missing dependency on virtual/cblas

5 files changed, 42 insertions, 23 deletions

diff --git a/sci-libs/scikits_learn/scikits_learn-0.14.1.ebuild b/sci-libs/scikits_learn/scikits_learn-0.14.1.ebuild
index 0fc4c83bea1f..0b2c98365ec2 100644
--- a/sci-libs/scikits_learn/scikits_learn-0.14.1.ebuild
+++ b/sci-libs/scikits_learn/scikits_learn-0.14.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -25,12 +25,16 @@ RDEPEND="
 	sci-libs/scikits[${PYTHON_USEDEP}]
 	dev-python/numpy[lapack,${PYTHON_USEDEP}]
 	sci-libs/scipy[${PYTHON_USEDEP}]
-	dev-python/matplotlib[${PYTHON_USEDEP}]"
+	dev-python/matplotlib[${PYTHON_USEDEP}]
+	virtual/blas
+	virtual/cblas"
 DEPEND="
 	dev-python/cython[${PYTHON_USEDEP}]
 	dev-python/numpy[lapack,${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	sci-libs/scipy[${PYTHON_USEDEP}]
+	virtual/blas
+	virtual/cblas
 	doc? (
 		dev-python/sphinx[${PYTHON_USEDEP}]
 		dev-python/matplotlib[${PYTHON_USEDEP}] )
@@ -69,15 +73,15 @@ python_compile() {
 
 python_compile_all() {
 	if use doc; then
-		cd "${S}/doc"
+		cd "${S}/doc" || die
 		local d="${BUILD_DIR}"/lib
 		ln -s "${S}"/sklearn/datasets/{data,descr,images} \
-			"${d}"/sklearn/datasets
+			"${d}"/sklearn/datasets || die
 		VARTEXFONTS="${T}"/fonts \
 			MPLCONFIGDIR="${BUILD_DIR}" \
 			PYTHONPATH="${d}" \
 			emake html
-		rm -r "${d}"/sklearn/datasets/{data,desr,images}
+		rm -r "${d}"/sklearn/datasets/{data,desr,images} || die
 	fi
 }
 
diff --git a/sci-libs/scikits_learn/scikits_learn-0.15.1.ebuild b/sci-libs/scikits_learn/scikits_learn-0.15.1.ebuild
index 76b1f1a2a839..c50ed8aa6c91 100644
--- a/sci-libs/scikits_learn/scikits_learn-0.15.1.ebuild
+++ b/sci-libs/scikits_learn/scikits_learn-0.15.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -26,12 +26,16 @@ RDEPEND="
 	dev-python/nose[${PYTHON_USEDEP}]
 	dev-python/numpy[lapack,${PYTHON_USEDEP}]
 	sci-libs/scikits[${PYTHON_USEDEP}]
-	sci-libs/scipy[${PYTHON_USEDEP}]"
+	sci-libs/scipy[${PYTHON_USEDEP}]
+	virtual/blas
+	virtual/cblas"
 DEPEND="
 	dev-python/cython[${PYTHON_USEDEP}]
 	dev-python/numpy[lapack,${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	sci-libs/scipy[${PYTHON_USEDEP}]
+	virtual/blas
+	virtual/cblas
 	doc? (
 		dev-python/joblib[${PYTHON_USEDEP}]
 		dev-python/matplotlib[${PYTHON_USEDEP}]
@@ -69,15 +73,15 @@ python_compile() {
 
 python_compile_all() {
 	if use doc; then
-		cd "${S}/doc"
+		cd "${S}/doc" || die
 		local d="${BUILD_DIR}"/lib
 		ln -s "${S}"/sklearn/datasets/{data,descr,images} \
-			"${d}"/sklearn/datasets
+			"${d}"/sklearn/datasets || die
 		VARTEXFONTS="${T}"/fonts \
 			MPLCONFIGDIR="${BUILD_DIR}" \
 			PYTHONPATH="${d}" \
 			emake html
-		rm -r "${d}"/sklearn/datasets/{data,desr,images}
+		rm -r "${d}"/sklearn/datasets/{data,desr,images} || die
 	fi
 }
 
diff --git a/sci-libs/scikits_learn/scikits_learn-0.15.2.ebuild b/sci-libs/scikits_learn/scikits_learn-0.15.2.ebuild
index 76b1f1a2a839..c50ed8aa6c91 100644
--- a/sci-libs/scikits_learn/scikits_learn-0.15.2.ebuild
+++ b/sci-libs/scikits_learn/scikits_learn-0.15.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -26,12 +26,16 @@ RDEPEND="
 	dev-python/nose[${PYTHON_USEDEP}]
 	dev-python/numpy[lapack,${PYTHON_USEDEP}]
 	sci-libs/scikits[${PYTHON_USEDEP}]
-	sci-libs/scipy[${PYTHON_USEDEP}]"
+	sci-libs/scipy[${PYTHON_USEDEP}]
+	virtual/blas
+	virtual/cblas"
 DEPEND="
 	dev-python/cython[${PYTHON_USEDEP}]
 	dev-python/numpy[lapack,${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	sci-libs/scipy[${PYTHON_USEDEP}]
+	virtual/blas
+	virtual/cblas
 	doc? (
 		dev-python/joblib[${PYTHON_USEDEP}]
 		dev-python/matplotlib[${PYTHON_USEDEP}]
@@ -69,15 +73,15 @@ python_compile() {
 
 python_compile_all() {
 	if use doc; then
-		cd "${S}/doc"
+		cd "${S}/doc" || die
 		local d="${BUILD_DIR}"/lib
 		ln -s "${S}"/sklearn/datasets/{data,descr,images} \
-			"${d}"/sklearn/datasets
+			"${d}"/sklearn/datasets || die
 		VARTEXFONTS="${T}"/fonts \
 			MPLCONFIGDIR="${BUILD_DIR}" \
 			PYTHONPATH="${d}" \
 			emake html
-		rm -r "${d}"/sklearn/datasets/{data,desr,images}
+		rm -r "${d}"/sklearn/datasets/{data,desr,images} || die
 	fi
 }
 
diff --git a/sci-libs/scikits_learn/scikits_learn-0.16.1.ebuild b/sci-libs/scikits_learn/scikits_learn-0.16.1.ebuild
index f4fd867256c0..46432a12aa6e 100644
--- a/sci-libs/scikits_learn/scikits_learn-0.16.1.ebuild
+++ b/sci-libs/scikits_learn/scikits_learn-0.16.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -26,12 +26,15 @@ RDEPEND="
 	dev-python/nose[${PYTHON_USEDEP}]
 	dev-python/numpy[lapack,${PYTHON_USEDEP}]
 	sci-libs/scikits[${PYTHON_USEDEP}]
-	sci-libs/scipy[${PYTHON_USEDEP}]"
+	sci-libs/scipy[${PYTHON_USEDEP}]
+	virtual/blas
+	virtual/cblas"
 DEPEND="
 	dev-python/cython[${PYTHON_USEDEP}]
 	dev-python/numpy[lapack,${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	sci-libs/scipy[${PYTHON_USEDEP}]
+	virtual/cblas
 	doc? (
 		dev-python/joblib[${PYTHON_USEDEP}]
 		dev-python/matplotlib[${PYTHON_USEDEP}]
@@ -69,7 +72,7 @@ python_compile() {
 
 python_compile_all() {
 	if use doc; then
-		cd "${S}/doc"
+		cd "${S}/doc" || die
 		local d="${BUILD_DIR}"/lib
 		ln -s "${S}"/sklearn/datasets/{data,descr,images} \
 			"${d}"/sklearn/datasets
@@ -77,7 +80,7 @@ python_compile_all() {
 			MPLCONFIGDIR="${BUILD_DIR}" \
 			PYTHONPATH="${d}" \
 			emake html
-		rm -r "${d}"/sklearn/datasets/{data,desr,images}
+		rm -r "${d}"/sklearn/datasets/{data,desr,images} || die
 	fi
 }
 
diff --git a/sci-libs/scikits_learn/scikits_learn-0.17.ebuild b/sci-libs/scikits_learn/scikits_learn-0.17.ebuild
index 987724461b1c..b7c3bcdde597 100644
--- a/sci-libs/scikits_learn/scikits_learn-0.17.ebuild
+++ b/sci-libs/scikits_learn/scikits_learn-0.17.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -27,6 +27,8 @@ RDEPEND="
 	>=dev-python/numpy-1.6.1[lapack,${PYTHON_USEDEP}]
 	sci-libs/scikits[${PYTHON_USEDEP}]
 	>=sci-libs/scipy-0.9[${PYTHON_USEDEP}]
+	virtual/blas
+	virtual/cblas
 	virtual/python-funcsigs[${PYTHON_USEDEP}]
 	"
 DEPEND="
@@ -34,6 +36,8 @@ DEPEND="
 	dev-python/numpy[lapack,${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	sci-libs/scipy[${PYTHON_USEDEP}]
+	virtual/blas
+	virtual/cblas
 	doc? (
 		dev-python/joblib[${PYTHON_USEDEP}]
 		dev-python/matplotlib[${PYTHON_USEDEP}]
@@ -77,15 +81,15 @@ python_compile() {
 
 python_compile_all() {
 	if use doc; then
-		cd "${S}/doc"
+		cd "${S}/doc" || die
 		local d="${BUILD_DIR}"/lib
 		ln -s "${S}"/sklearn/datasets/{data,descr,images} \
-			"${d}"/sklearn/datasets
+			"${d}"/sklearn/datasets || die
 		VARTEXFONTS="${T}"/fonts \
 			MPLCONFIGDIR="${BUILD_DIR}" \
 			PYTHONPATH="${d}" \
 			emake html
-		rm -r "${d}"/sklearn/datasets/{data,desr,images}
+		rm -r "${d}"/sklearn/datasets/{data,desr,images} || die
 	fi
 }