From 901cb13a55bb38e11f1923118a0fb707c763848c Mon Sep 17 00:00:00 2001
From: Natasha Pavlovikj <npavlovikj2@unl.edu>
Date: Fri, 10 May 2019 23:19:08 -0500
Subject: [PATCH] Fix structure of recipe (#15249)

* Fix structure of recipe

* Add noarch
---
 recipes/cluster-picker/meta.yaml | 37 +++++++++++++++++---------------
 recipes/opsin/1.4.0/meta.yaml    | 32 +++++++++++++++++----------
 recipes/opsin/2.1.0/meta.yaml    | 34 ++++++++++++++++++-----------
 recipes/opsin/2.4.0/meta.yaml    | 33 +++++++++++++++++-----------
 4 files changed, 84 insertions(+), 52 deletions(-)

diff --git a/recipes/cluster-picker/meta.yaml b/recipes/cluster-picker/meta.yaml
index dfd44f1703392..958ffd5f08cdc 100644
--- a/recipes/cluster-picker/meta.yaml
+++ b/recipes/cluster-picker/meta.yaml
@@ -1,25 +1,22 @@
-about:
-  home: http://hiv.bio.ed.ac.uk/software.html
-  license: GPLv3
-  summary: The Cluster Picker identifies clusters in newick-formatted trees
-           containing thousands of sequences within a few minutes. Cut-offs for
-           within cluster genetic distance and bootstrap support are selected by
-           the user.
-
-requirements:
-  run:
-    - java-jdk
+{% set name = "ClusterPicker" %}
+{% set version = "1.2.3" %}
+{% set sha256 = "a8a3bb5107c54d2621b974e5953ff7f2c03352fb225954ef43533829a4d72948" %}
 
 package:
-  name: cluster-picker
-  version: 1.2.3
-
-build:
-  number: 1
+  name: "{{ name|lower }}"
+  version: "{{ version }}"
 
 source:
   url: http://hiv.bio.ed.ac.uk/clusterPicker/ClusterPicker_1.2.3.jar
-  md5: 95c19264a268f2522fccc520f52989b6
+  sha256: {{ sha256 }}
+  
+build:
+  noarch: generic
+  number: 2
+
+requirements:
+  run:
+    - openjdk  >=6
 
 test:
   commands:
@@ -27,3 +24,9 @@ test:
     - echo -e ">seq1\nATTA\n>seq2\nATTA\n>seq3\nATTA\n>seq4\nATTA" > dummy.fasta
     - echo "(((seq1:0.001,seq2:0.002):0.001,seq3:0.005):0.004,seq4:0.003):0.001;" > dummy.nwk
     - echo -e "y\ny\ny\ny\ny\n" | cluster-picker dummy.fasta dummy.nwk
+
+about:
+  home: http://hiv.bio.ed.ac.uk/software.html
+  license: GPLv3
+  license_family: GPL
+  summary: "The Cluster Picker identifies clusters in newick-formatted trees containing thousands of sequences within a few minutes."
diff --git a/recipes/opsin/1.4.0/meta.yaml b/recipes/opsin/1.4.0/meta.yaml
index d9f1362f12fad..23ee1c76300ea 100644
--- a/recipes/opsin/1.4.0/meta.yaml
+++ b/recipes/opsin/1.4.0/meta.yaml
@@ -1,22 +1,33 @@
-about:
-  home: https://bitbucket.org/dan2097/opsin/
-  license: Artistic License 2.0
-  summary: OPSIN is a Java(1.6+) library for IUPAC name-to-structure conversion offering high recall and precision on organic chemical nomenclature.
+{% set name = "opsin" %}
+{% set version = "1.4.0" %}
+{% set sha256 = "01f119afd2702390f588826bd79740eb714a68ee6229f8062f9b56490199e894" %}
+
 package:
-  name: opsin
-  version: 1.4.0
-build:
-  number: 2
+  name: "{{ name|lower }}"
+  version: "{{ version }}"
+
 source:
   url: https://bitbucket.org/dan2097/opsin/downloads/opsin-1.4.0-jar-with-dependencies.jar
+  sha256: {{ sha256 }}
+  
+build:
+  noarch: generic
+  number: 3
+
 requirements:
-  build:
   run:
-    - java-jdk  >=6
+    - openjdk  >=6
+
 test:
   commands:
     - opsin --help
     - opsin -Xms512m -Xmx1g --help
+
+about:
+  home: https://bitbucket.org/dan2097/opsin/
+  license: Artistic License 2.0
+  summary: "OPSIN is a Java(1.6+) library for IUPAC name-to-structure conversion offering high recall and precision on organic chemical nomenclature."
+
 extra:
   notes: |
     Opsin is Java program that comes with a custom wrapper shell script.
@@ -25,4 +36,3 @@ extra:
     specify these values directly after your binaries. If you have _JAVA_OPTIONS
     set globally this will take precedence.
     For example run opsin with "opsin -Xms512m -Xmx1g --help"
-
diff --git a/recipes/opsin/2.1.0/meta.yaml b/recipes/opsin/2.1.0/meta.yaml
index 0ae9c858c1acf..3c08bad9eea32 100644
--- a/recipes/opsin/2.1.0/meta.yaml
+++ b/recipes/opsin/2.1.0/meta.yaml
@@ -1,22 +1,33 @@
-about:
-  home: https://bitbucket.org/dan2097/opsin/
-  license: Artistic License 2.0
-  summary: OPSIN is a Java(1.6+) library for IUPAC name-to-structure conversion offering high recall and precision on organic chemical nomenclature.
+{% set name = "opsin" %}
+{% set version = "2.1.0" %}
+{% set sha256 = "35462464d0440019ce2da26e3b8fcbb4757997139969c1662bc1f54b760a4785" %}
+
 package:
-  name: opsin
-  version: 2.1.0
-build:
-  number: 2
+  name: "{{ name|lower }}"
+  version: "{{ version }}"
+
 source:
   url: https://bitbucket.org/dan2097/opsin/downloads/opsin-2.1.0-jar-with-dependencies.jar
+  sha256: {{ sha256 }}
+  
+build:
+  noarch: generic
+  number: 3
+
 requirements:
-  build:
   run:
-    - java-jdk  >=6
+    - openjdk  >=6
+
 test:
   commands:
     - opsin --help
     - opsin -Xms512m -Xmx1g --help
+
+about:
+  home: https://bitbucket.org/dan2097/opsin/
+  license: Artistic License 2.0
+  summary: "OPSIN is a Java(1.6+) library for IUPAC name-to-structure conversion offering high recall and precision on organic chemical nomenclature."
+
 extra:
   notes: |
     Opsin is Java program that comes with a custom wrapper shell script.
@@ -24,5 +35,4 @@ extra:
     "-Xms512m -Xmx1g" is set in the wrapper. If you want to overwrite it you can
     specify these values directly after your binaries. If you have _JAVA_OPTIONS
     set globally this will take precedence.
-    sFor example run opsin with "opsin -Xms512m -Xmx1g --help"
-
+    For example run opsin with "opsin -Xms512m -Xmx1g --help"
diff --git a/recipes/opsin/2.4.0/meta.yaml b/recipes/opsin/2.4.0/meta.yaml
index 4821633f481c4..ad51c6a7ea4b4 100644
--- a/recipes/opsin/2.4.0/meta.yaml
+++ b/recipes/opsin/2.4.0/meta.yaml
@@ -1,23 +1,33 @@
-about:
-  home: https://bitbucket.org/dan2097/opsin/
-  license: Artistic License 2.0
-  summary: OPSIN is a Java(1.6+) library for IUPAC name-to-structure conversion offering high recall and precision on organic chemical nomenclature.
+{% set name = "opsin" %}
+{% set version = "2.4.0" %}
+{% set sha256 = "3e8a276a378e09c1536f52e09dc8028d648c881277b9146c991bf6b9ec231d88" %}
+
 package:
-  name: opsin
-  version: 2.4.0
-build:
-  number: 0
+  name: "{{ name|lower }}"
+  version: "{{ version }}"
+
 source:
   url: https://bitbucket.org/dan2097/opsin/downloads/opsin-2.4.0-jar-with-dependencies.jar
-  sha256: 3e8a276a378e09c1536f52e09dc8028d648c881277b9146c991bf6b9ec231d88
+  sha256: {{ sha256 }}
+  
+build:
+  noarch: generic
+  number: 1
+
 requirements:
-  build:
   run:
     - openjdk  >=6
+
 test:
   commands:
     - opsin --help
     - opsin -Xms512m -Xmx1g --help
+
+about:
+  home: https://bitbucket.org/dan2097/opsin/
+  license: Artistic License 2.0
+  summary: "OPSIN is a Java(1.6+) library for IUPAC name-to-structure conversion offering high recall and precision on organic chemical nomenclature."
+
 extra:
   notes: |
     Opsin is Java program that comes with a custom wrapper shell script.
@@ -25,5 +35,4 @@ extra:
     "-Xms512m -Xmx1g" is set in the wrapper. If you want to overwrite it you can
     specify these values directly after your binaries. If you have _JAVA_OPTIONS
     set globally this will take precedence.
-    sFor example run opsin with "opsin -Xms512m -Xmx1g --help"
-
+    For example run opsin with "opsin -Xms512m -Xmx1g --help"