From 70782916356901ee3f4dd2627a060f61582382f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Gr=C3=BCning?= <bjoern@gruenings.eu>
Date: Sat, 9 Feb 2019 13:51:14 +0100
Subject: [PATCH] bump vienna_rna (#13465)

* bump vienna_rna

* remove old versions

* add run_exports
---
 recipes/viennarna/1.8.5/build.sh       |  5 ----
 recipes/viennarna/1.8.5/meta.yaml      | 28 -------------------
 recipes/viennarna/1.8.5/noinline.patch | 16 -----------
 recipes/viennarna/2.4.5/build.sh       | 26 ------------------
 recipes/viennarna/2.4.5/meta.yaml      | 37 --------------------------
 recipes/viennarna/meta.yaml            |  5 ++--
 6 files changed, 3 insertions(+), 114 deletions(-)
 delete mode 100644 recipes/viennarna/1.8.5/build.sh
 delete mode 100644 recipes/viennarna/1.8.5/meta.yaml
 delete mode 100644 recipes/viennarna/1.8.5/noinline.patch
 delete mode 100644 recipes/viennarna/2.4.5/build.sh
 delete mode 100644 recipes/viennarna/2.4.5/meta.yaml

diff --git a/recipes/viennarna/1.8.5/build.sh b/recipes/viennarna/1.8.5/build.sh
deleted file mode 100644
index a37c7e6359d40..0000000000000
--- a/recipes/viennarna/1.8.5/build.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-# ViennaRNA does not support Python 3 yet.
-./configure --prefix=$PREFIX --without-perl
-make
-make install
diff --git a/recipes/viennarna/1.8.5/meta.yaml b/recipes/viennarna/1.8.5/meta.yaml
deleted file mode 100644
index 80457c8b67aef..0000000000000
--- a/recipes/viennarna/1.8.5/meta.yaml
+++ /dev/null
@@ -1,28 +0,0 @@
-package:
-  name: viennarna
-  version: 1.8.5
-
-build:
-  number: 1
-  skip: True # [osx]
-
-source:
-  url: http://www.bioinf.uni-leipzig.de/~will/Archive/ViennaRNA-1.8.5.tar.gz
-  sha256: f4e2d94beaf77165e8321758e4ab0ad1c5d49879cefa12e48b07d09ed2d0ecf9
-  patches:
-    - noinline.patch
-
-requirements:
-  build:
-    - {{ compiler('c') }}
-  run:
-
-test:
-  commands:
-    - echo GGGUACATACGAUCCC | RNAfold
-
-about:
-  home: http://www.tbi.univie.ac.at/RNA/
-  license: MIT-like
-  license_file: COPYING
-  summary: Tools for RNA secondary structure prediction and comparison
diff --git a/recipes/viennarna/1.8.5/noinline.patch b/recipes/viennarna/1.8.5/noinline.patch
deleted file mode 100644
index 5800a6fc3062f..0000000000000
--- a/recipes/viennarna/1.8.5/noinline.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git lib/fold.c lib/fold.c
-index ff609d6..d26ce9d 100644
---- lib/fold.c
-+++ lib/fold.c
-@@ -24,11 +24,7 @@
- 
- /*@unused@*/
- static char rcsid[] UNUSED = "$Id: fold.c,v 1.38 2007/12/19 10:27:42 ivo Exp $";
--#ifdef __GNUC__
--#define INLINE inline
--#else
- #define INLINE
--#endif
- 
- #define PAREN
- 
diff --git a/recipes/viennarna/2.4.5/build.sh b/recipes/viennarna/2.4.5/build.sh
deleted file mode 100644
index 4549498932fdd..0000000000000
--- a/recipes/viennarna/2.4.5/build.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/bash
-
-## Choose extra configure options depending on the operating system
-## (mac or linux)
-##
-if [ `uname` == Darwin ] ; then
-    extra_config_options="--disable-openmp 
-                          --without-python3
-                          LDFLAGS=-Wl,-headerpad_max_install_names"
-fi
-
-## Configure and make
-./configure --prefix=$PREFIX \
-            --without-perl \
-            --with-kinwalker \
-            --with-cluster \
-            --disable-lto \
-            --without-doc \
-            --without-tutorial \
-            --without-tutorial-pdf \
-            ${extra_config_options}
-
-make -j${CPU_COUNT}
-
-## Install
-make install
diff --git a/recipes/viennarna/2.4.5/meta.yaml b/recipes/viennarna/2.4.5/meta.yaml
deleted file mode 100644
index 0a4f2cf77ae42..0000000000000
--- a/recipes/viennarna/2.4.5/meta.yaml
+++ /dev/null
@@ -1,37 +0,0 @@
-package:
-  name: viennarna
-  version: 2.4.5
-
-build:
-  number: 3
-
-source:
-  url: https://www.tbi.univie.ac.at/RNA/download/sourcecode/2_4_x/ViennaRNA-2.4.5.tar.gz
-  sha256: f79ebba9a50b51a981042139da4991b4eacbec4207f726699f8fb25876c67266
-requirements:
-  build:
-    - {{ compiler('c') }}
-    - {{ compiler('cxx') }}
-  host:
-    - zlib
-    - perl
-    - python >=3,<4  # [linux]
-  run:
-    - zlib
-    - python >=3,<4  # [linux]
-
-test:
-  commands:
-   - RNAalifold --version
-   - RNAeval    --version
-   - RNAfold    --version
-   - RNAplfold  --version
-   - RNAsubopt  --version
-   - RNAlocmin  --version
-   - kinwalker  --help >& /dev/null
-
-about:
-  home: http://www.tbi.univie.ac.at/RNA/
-  license: custom
-  license_file: COPYING
-  summary: Vienna RNA package -- RNA secondary structure prediction and comparison
diff --git a/recipes/viennarna/meta.yaml b/recipes/viennarna/meta.yaml
index a34461413041d..4292f7b85acb9 100644
--- a/recipes/viennarna/meta.yaml
+++ b/recipes/viennarna/meta.yaml
@@ -7,6 +7,9 @@ package:
 
 build:
   number: 1
+  run_exports:
+    # Ronny said VRNA is stable in x.x releases
+    - {{ pin_subpackage('viennarna', max_pin='x.x') }}
 
 source:
   url: https://www.tbi.univie.ac.at/RNA/download/sourcecode/2_4_x/ViennaRNA-{{ version }}.tar.gz
@@ -15,7 +18,6 @@ source:
 requirements:
   build:
     - {{ compiler('c') }}
-    - {{ compiler('cxx') }}
   host:
     - pkgconfig ## needed for viennarna version checks in dependent packages
     - perl
@@ -23,7 +25,6 @@ requirements:
     - zlib
   run:
     - python
-    - zlib
 
 test:
   commands: