svn commit: r371746 - head/science/py-scikit-learn

[Dmitry Sivachenko]

Author: demon
Date: Thu Oct 30 11:52:48 2014
New Revision: 371746
URL: https://svnweb.freebsd.org/changeset/ports/371746
QAT: https://qat.redports.org/buildarchive/r371746/

Log:
  Explicitly link with libblas to avoid errors like
  import sklearn.decomposition.pca
  ImportError: /usr/local/lib/libcblas.so.2: Undefined symbol "cgemv_"
  due to it trying to import pairwise_fast.so
  
  PR:             194683
  
  Update to version 0.15.2.

Modified:
  head/science/py-scikit-learn/Makefile
  head/science/py-scikit-learn/distinfo

Modified: head/science/py-scikit-learn/Makefile
==============================================================================
--- head/science/py-scikit-learn/Makefile	Thu Oct 30 11:37:21 2014	(r371745)
+++ head/science/py-scikit-learn/Makefile	Thu Oct 30 11:52:48 2014	(r371746)
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	scikit-learn
-PORTVERSION=	0.15.0
-PORTREVISION=	1
+PORTVERSION=	0.15.2
 CATEGORIES=	science python
 MASTER_SITES=	${MASTER_SITE_CHEESESHOP}
 MASTER_SITE_SUBDIR=source/s/scikit-learn
@@ -17,6 +16,7 @@ RUN_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}scipy>0.8.0:${PORTSDIR}/science/py-scipy
 
 USES=		fortran python
+USE_PYTHON=	distutils autoplist
 
 OPTIONS_SINGLE=		BLAS
 OPTIONS_SINGLE_BLAS=	CBLAS ATLAS
@@ -27,8 +27,12 @@ ATLAS_DESC=	Use math/atlas as BLAS libra
 CBLAS_LIB_DEPENDS=	libcblas.so:${PORTSDIR}/math/cblas
 ATLAS_LIB_DEPENDS=	libcblas.so:${PORTSDIR}/math/atlas
 
-LATEST_LINK=	py-${PORTNAME}
+.include <bsd.port.options.mk>
 
-USE_PYTHON=	distutils autoplist
+.if ${PORT_OPTIONS:MCBLAS}
+LDFLAGS+=	-lblas
+.endif
+
+LATEST_LINK=	py-${PORTNAME}
 
 .include <bsd.port.mk>

Modified: head/science/py-scikit-learn/distinfo
==============================================================================
--- head/science/py-scikit-learn/distinfo	Thu Oct 30 11:37:21 2014	(r371745)
+++ head/science/py-scikit-learn/distinfo	Thu Oct 30 11:52:48 2014	(r371746)
@@ -1,2 +1,2 @@
-SHA256 (scikit-learn-0.15.0.tar.gz) = 67ae5dbe5c1a28b469007708d65c59b0af192b2a9396c33d0b2629c6304e4596
-SIZE (scikit-learn-0.15.0.tar.gz) = 7026712
+SHA256 (scikit-learn-0.15.2.tar.gz) = 1a8a881f6f13edc0ac58931ce21f899eb7920af50aa08802413d1239e2aa5fa6
+SIZE (scikit-learn-0.15.2.tar.gz) = 7007922