academic/ViennaRNA: Updated to version 2.5.0

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

2 files changed, 28 insertions, 23 deletions

diff --git a/academic/ViennaRNA/ViennaRNA.SlackBuild b/academic/ViennaRNA/ViennaRNA.SlackBuild
index a1b82f6eef..68465ebbaa 100644
--- a/academic/ViennaRNA/ViennaRNA.SlackBuild
+++ b/academic/ViennaRNA/ViennaRNA.SlackBuild
@@ -25,7 +25,7 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=ViennaRNA
-VERSION=${VERSION:-2.4.18}
+VERSION=${VERSION:-2.5.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -105,24 +105,23 @@ find -L . \
 # - SVM Z-score filter in RNALfold
 # - GNU Scientific Library for RNApvmin
 
-cluster=""       ; [ "${CLUSTER:-yes}" != "no" ]      && cluster="--with-cluster"
-kinwalker=""     ; [ "${KINWALKER:-yes}" != "no" ]       && kinwalker="--with-kinwalker"
+cluster=""       ; [ "${CLUSTER:-yes}" != "no" ]        && cluster="--with-cluster"
+kinwalker=""     ; [ "${KINWALKER:-yes}" != "no" ]      && kinwalker="--with-kinwalker"
 # Default enabled features:
-forester=""      ; [ "${FORESTER:-yes}" != "yes" ]     && forester="--without-forester"
-kinfold=""       ; [ "${KINFOLD:-yes}" != "yes" ]     && kinwalk="--without-kinfold"
-rnalocmin=""     ; [ "${RNALOCMIN:-yes}" != "yes" ]     && rnalocmin="--without-rnalocmin"
-perl=""          ; [ "${PERL:-yes}" != "yes" ]     && perl="--without-perl"
-
-python3=""       ; [ "${PYTHON3:-yes}" != "yes" ]     && python3="--without-python3"
-swig=""          ; [ "${SWIG:-yes}" != "yes" ]     && swig="--without-swig"
-simd=""          ; [ "${SIMD:-yes}" != "yes" ]     && simd="--disable-simd"
-lto=""           ; [ "${LTO:-yes}" != "yes" ]      && lto="--disable-lto"
-openmp=""        ; [ "${OPENMP:-yes}" != "yes" ]      && openmp="--disable-openmp"
-pthreads=""      ; [ "${PTHREADS:-yes}" != "yes" ]     && pthreads="--disable-pthreads"
-svm=""           ; [ "${SVM:-yes}" != "yes" ]      && svm="--without-svm"
-gsl=""           ; [ "${GSL:-yes}" != "yes" ]      && gsl="--without-gsl"
-# Default to python3 (above) only;
-python=""        ; [ "${PYTHON:-no}" != "yes" ]     && python="--without-python"
+forester=""      ; [ "${FORESTER:-yes}" != "no" ]       && forester="--with-forester"
+kinfold=""       ; [ "${KINFOLD:-yes}" != "no" ]        && kinwalk="--with-kinfold"
+rnalocmin=""     ; [ "${RNALOCMIN:-yes}" != "no" ]      && rnalocmin="--with-rnalocmin"
+perl=""          ; [ "${PERL:-yes}" != "no" ]           && perl="--with-perl"
+# python = python3
+python=""        ; [ "${PYTHON:-yes}" != "no" ]         && python="--with-python"
+swig=""          ; [ "${SWIG:-yes}" != "no" ]           && swig="--with-swig"
+simd=""          ; [ "${SIMD:-yes}" != "no" ]           && simd="--enable-simd"
+lto=""           ; [ "${LTO:-yes}" != "no" ]            && lto="--enable-lto"
+openmp=""        ; [ "${OPENMP:-yes}" != "no" ]         && openmp="--enable-openmp"
+pthreads=""      ; [ "${PTHREADS:-yes}" != "no" ]       && pthreads="--enable-pthreads"
+svm=""           ; [ "${SVM:-yes}" != "no" ]            && svm="--with-svm"
+gsl=""           ; [ "${GSL:-yes}" != "no" ]            && gsl="--with-gsl"
+json=""          ; [ "${JSON:-yes}" != "no" ]           && json="--with-json"
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -132,6 +131,11 @@ CXXFLAGS="$SLKCFLAGS" \
   --mandir=/usr/man \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
   --build=$ARCH-slackware-linux \
+  --with-python2=no \
+  --with-doc=no \
+  $cluster \
+  $kinwalker \
+  $forester \
   $cluster \
   $kinwalker \
   $forester \
@@ -139,14 +143,15 @@ CXXFLAGS="$SLKCFLAGS" \
   $rnalocmin \
   $perl \
   $python \
-  $python3 \
   $swig \
   $simd \
   $lto \
   $openmp \
   $pthreads \
   $svm \
-  $gsl || exit 1
+  $gsl \
+  $json \
+  || exit 1
 
 make
 make install DESTDIR=$PKG
diff --git a/academic/ViennaRNA/ViennaRNA.info b/academic/ViennaRNA/ViennaRNA.info
index d87661b196..f4a91c9d7e 100644
--- a/academic/ViennaRNA/ViennaRNA.info
+++ b/academic/ViennaRNA/ViennaRNA.info
@@ -1,8 +1,8 @@
 PRGNAM="ViennaRNA"
-VERSION="2.4.18"
+VERSION="2.5.0"
 HOMEPAGE="https://www.tbi.univie.ac.at/RNA"
-DOWNLOAD="https://www.tbi.univie.ac.at/RNA/download/sourcecode/2_4_x/ViennaRNA-2.4.18.tar.gz"
-MD5SUM="902ac85cff08fc4b7d89a63786a18ca3"
+DOWNLOAD="https://www.tbi.univie.ac.at/RNA/download/sourcecode/2_5_x/ViennaRNA-2.5.0.tar.gz"
+MD5SUM="48be55f33d08d01b4778ab78eec51a69"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""