3 files changed, 47 insertions, 28 deletions

diff --git a/science/py-mlpy/Makefile b/science/py-mlpy/Makefile
index 9f659425cc82..663e6d076722 100644
--- a/science/py-mlpy/Makefile
+++ b/science/py-mlpy/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	mlpy
-PORTVERSION=	2.1.0
-PORTREVISION=	2
+PORTVERSION=	2.2.1
 CATEGORIES=	science python
 MASTER_SITES=	https://mlpy.fbk.eu/download/src/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/science/py-mlpy/distinfo b/science/py-mlpy/distinfo
index b78f07a3967a..6a21c68aba56 100644
--- a/science/py-mlpy/distinfo
+++ b/science/py-mlpy/distinfo
@@ -1,3 +1,3 @@
-MD5 (MLPY-2.1.0.tar.gz) = 3419f96a66e872210e48471e0795d267
-SHA256 (MLPY-2.1.0.tar.gz) = 435d5802a94024330c70379cd14267e6f73013b4b6c1df0144ad358c0db721b5
-SIZE (MLPY-2.1.0.tar.gz) = 153360
+MD5 (MLPY-2.2.1.tar.gz) = 2c4e9b00031f98a1be9ac86e312ff0f8
+SHA256 (MLPY-2.2.1.tar.gz) = aaf19b24a2f5a77809ca5239cc99b0724a972ac00530d510cca6568232e7b832
+SIZE (MLPY-2.2.1.tar.gz) = 169313
diff --git a/science/py-mlpy/pkg-plist b/science/py-mlpy/pkg-plist
index c37467b686a0..189886471226 100644
--- a/science/py-mlpy/pkg-plist
+++ b/science/py-mlpy/pkg-plist
@@ -1,19 +1,7 @@
-bin/irelief-sigma
-bin/srda-landscape
-bin/svm-landscape
-bin/fda-landscape
-bin/knn-landscape
-bin/pda-landscape
-bin/dlda-landscape
-bin/borda
-bin/canberra
-bin/canberraq
+bin/mlpy-test
 %%PYTHON_SITELIBDIR%%/mlpy/__init__.py
 %%PYTHON_SITELIBDIR%%/mlpy/__init__.pyc
 %%PYTHON_SITELIBDIR%%/mlpy/__init__.pyo
-%%PYTHON_SITELIBDIR%%/mlpy/_bmetrics.py
-%%PYTHON_SITELIBDIR%%/mlpy/_bmetrics.pyc
-%%PYTHON_SITELIBDIR%%/mlpy/_bmetrics.pyo
 %%PYTHON_SITELIBDIR%%/mlpy/_borda.py
 %%PYTHON_SITELIBDIR%%/mlpy/_borda.pyc
 %%PYTHON_SITELIBDIR%%/mlpy/_borda.pyo
@@ -32,13 +20,18 @@ bin/canberraq
 %%PYTHON_SITELIBDIR%%/mlpy/_dlda.py
 %%PYTHON_SITELIBDIR%%/mlpy/_dlda.pyc
 %%PYTHON_SITELIBDIR%%/mlpy/_dlda.pyo
-%%PYTHON_SITELIBDIR%%/mlpy/_dwt.so
 %%PYTHON_SITELIBDIR%%/mlpy/_dtw.py
 %%PYTHON_SITELIBDIR%%/mlpy/_dtw.pyc
 %%PYTHON_SITELIBDIR%%/mlpy/_dtw.pyo
+%%PYTHON_SITELIBDIR%%/mlpy/_dwt.py
+%%PYTHON_SITELIBDIR%%/mlpy/_dwt.pyc
+%%PYTHON_SITELIBDIR%%/mlpy/_dwt.pyo
 %%PYTHON_SITELIBDIR%%/mlpy/_dwtfs.py
 %%PYTHON_SITELIBDIR%%/mlpy/_dwtfs.pyc
 %%PYTHON_SITELIBDIR%%/mlpy/_dwtfs.pyo
+%%PYTHON_SITELIBDIR%%/mlpy/_elasticnet.py
+%%PYTHON_SITELIBDIR%%/mlpy/_elasticnet.pyc
+%%PYTHON_SITELIBDIR%%/mlpy/_elasticnet.pyo
 %%PYTHON_SITELIBDIR%%/mlpy/_extend.py
 %%PYTHON_SITELIBDIR%%/mlpy/_extend.pyc
 %%PYTHON_SITELIBDIR%%/mlpy/_extend.pyo
@@ -57,12 +50,27 @@ bin/canberraq
 %%PYTHON_SITELIBDIR%%/mlpy/_irelief.py
 %%PYTHON_SITELIBDIR%%/mlpy/_irelief.pyc
 %%PYTHON_SITELIBDIR%%/mlpy/_irelief.pyo
+%%PYTHON_SITELIBDIR%%/mlpy/_kernel.py
+%%PYTHON_SITELIBDIR%%/mlpy/_kernel.pyc
+%%PYTHON_SITELIBDIR%%/mlpy/_kernel.pyo
+%%PYTHON_SITELIBDIR%%/mlpy/_kmeans.py
+%%PYTHON_SITELIBDIR%%/mlpy/_kmeans.pyc
+%%PYTHON_SITELIBDIR%%/mlpy/_kmeans.pyo
 %%PYTHON_SITELIBDIR%%/mlpy/_kmedoids.py
 %%PYTHON_SITELIBDIR%%/mlpy/_kmedoids.pyc
 %%PYTHON_SITELIBDIR%%/mlpy/_kmedoids.pyo
 %%PYTHON_SITELIBDIR%%/mlpy/_knn.py
 %%PYTHON_SITELIBDIR%%/mlpy/_knn.pyc
+%%PYTHON_SITELIBDIR%%/mlpy/_lars.py
+%%PYTHON_SITELIBDIR%%/mlpy/_lars.pyc
+%%PYTHON_SITELIBDIR%%/mlpy/_lars.pyo
 %%PYTHON_SITELIBDIR%%/mlpy/_knn.pyo
+%%PYTHON_SITELIBDIR%%/mlpy/_metrics.py
+%%PYTHON_SITELIBDIR%%/mlpy/_metrics.pyc
+%%PYTHON_SITELIBDIR%%/mlpy/_metrics.pyo
+%%PYTHON_SITELIBDIR%%/mlpy/_minkowski.py
+%%PYTHON_SITELIBDIR%%/mlpy/_minkowski.pyc
+%%PYTHON_SITELIBDIR%%/mlpy/_minkowski.pyo
 %%PYTHON_SITELIBDIR%%/mlpy/_pda.py
 %%PYTHON_SITELIBDIR%%/mlpy/_pda.pyc
 %%PYTHON_SITELIBDIR%%/mlpy/_pda.pyo
@@ -72,25 +80,37 @@ bin/canberraq
 %%PYTHON_SITELIBDIR%%/mlpy/_resampling.py
 %%PYTHON_SITELIBDIR%%/mlpy/_resampling.pyc
 %%PYTHON_SITELIBDIR%%/mlpy/_resampling.pyo
+%%PYTHON_SITELIBDIR%%/mlpy/_ridgeregression.py
+%%PYTHON_SITELIBDIR%%/mlpy/_ridgeregression.pyc
+%%PYTHON_SITELIBDIR%%/mlpy/_ridgeregression.pyo
+%%PYTHON_SITELIBDIR%%/mlpy/_spectralreg.py
+%%PYTHON_SITELIBDIR%%/mlpy/_spectralreg.pyc
+%%PYTHON_SITELIBDIR%%/mlpy/_spectralreg.pyo
 %%PYTHON_SITELIBDIR%%/mlpy/_srda.py
 %%PYTHON_SITELIBDIR%%/mlpy/_srda.pyc
 %%PYTHON_SITELIBDIR%%/mlpy/_srda.pyo
 %%PYTHON_SITELIBDIR%%/mlpy/_svm.py
 %%PYTHON_SITELIBDIR%%/mlpy/_svm.pyc
 %%PYTHON_SITELIBDIR%%/mlpy/_svm.pyo
-%%PYTHON_SITELIBDIR%%/mlpy/_uwt.so
-%%PYTHON_SITELIBDIR%%/mlpy/canberracore.so
+%%PYTHON_SITELIBDIR%%/mlpy/_uwt.py
+%%PYTHON_SITELIBDIR%%/mlpy/_uwt.pyc
+%%PYTHON_SITELIBDIR%%/mlpy/_uwt.pyo
+%%PYTHON_SITELIBDIR%%/mlpy/canberra.so
 %%PYTHON_SITELIBDIR%%/mlpy/cwb.so
-%%PYTHON_SITELIBDIR%%/mlpy/dtwcore.so
+%%PYTHON_SITELIBDIR%%/mlpy/dtw.so
+%%PYTHON_SITELIBDIR%%/mlpy/dwt.so
+%%PYTHON_SITELIBDIR%%/mlpy/elasticnet.so
+%%PYTHON_SITELIBDIR%%/mlpy/fssun.so
+%%PYTHON_SITELIBDIR%%/mlpy/hc.so
 %%PYTHON_SITELIBDIR%%/mlpy/gslpy.so
-%%PYTHON_SITELIBDIR%%/mlpy/hccore.so
+%%PYTHON_SITELIBDIR%%/mlpy/kmeans.so
+%%PYTHON_SITELIBDIR%%/mlpy/kernel.so
+%%PYTHON_SITELIBDIR%%/mlpy/knn.so
 %%PYTHON_SITELIBDIR%%/mlpy/misc.so
-%%PYTHON_SITELIBDIR%%/mlpy/nncore.so
 %%PYTHON_SITELIBDIR%%/mlpy/peaksd.so
-%%PYTHON_SITELIBDIR%%/mlpy/progressbar.py
-%%PYTHON_SITELIBDIR%%/mlpy/progressbar.pyc
-%%PYTHON_SITELIBDIR%%/mlpy/progressbar.pyo
-%%PYTHON_SITELIBDIR%%/mlpy/svmcore.so
+%%PYTHON_SITELIBDIR%%/mlpy/spectralreg.so
+%%PYTHON_SITELIBDIR%%/mlpy/svm.so
+%%PYTHON_SITELIBDIR%%/mlpy/uwt.so
 %%PYTHON_SITELIBDIR%%/mlpy/version.py
 %%PYTHON_SITELIBDIR%%/mlpy/version.pyc
 %%PYTHON_SITELIBDIR%%/mlpy/version.pyo