From 15f24ae5a3bd2de66a1655ec7bf06be75e04fe97 Mon Sep 17 00:00:00 2001
From: Devon Ryan <dpryan79@gmail.com>
Date: Mon, 31 Dec 2018 20:47:21 +0100
Subject: [PATCH] Last updates for the year

---
 recipes/bioconductor-rgraphviz/build.sh  | 11 +++++++
 recipes/bioconductor-rgraphviz/meta.yaml | 41 ++++++++++++++++++++++++
 recipes/r-clvalid/meta.yaml              |  3 +-
 recipes/r-dnet/meta.yaml                 |  2 +-
 recipes/r-hardyweinberg/meta.yaml        |  1 -
 recipes/r-wgcna/meta.yaml                |  2 +-
 6 files changed, 55 insertions(+), 5 deletions(-)
 create mode 100644 recipes/bioconductor-rgraphviz/build.sh
 create mode 100644 recipes/bioconductor-rgraphviz/meta.yaml

diff --git a/recipes/bioconductor-rgraphviz/build.sh b/recipes/bioconductor-rgraphviz/build.sh
new file mode 100644
index 0000000000000..5ea71a1203cac
--- /dev/null
+++ b/recipes/bioconductor-rgraphviz/build.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+mv DESCRIPTION DESCRIPTION.old
+grep -v '^Priority: ' DESCRIPTION.old > DESCRIPTION
+mkdir -p ~/.R
+echo -e "CC=$CC
+FC=$FC
+CXX=$CXX
+CXX98=$CXX
+CXX11=$CXX
+CXX14=$CXX" > ~/.R/Makevars
+$R CMD INSTALL --build .
diff --git a/recipes/bioconductor-rgraphviz/meta.yaml b/recipes/bioconductor-rgraphviz/meta.yaml
new file mode 100644
index 0000000000000..1e22329830d62
--- /dev/null
+++ b/recipes/bioconductor-rgraphviz/meta.yaml
@@ -0,0 +1,41 @@
+{% set version = "2.26.0" %}
+{% set name = "Rgraphviz" %}
+{% set bioc = "3.8" %}
+
+package:
+  name: 'bioconductor-{{ name|lower }}'
+  version: '{{ version }}'
+source:
+  url:
+    - 'https://bioconductor.org/packages/{{ bioc }}/bioc/src/contrib/{{ name }}_{{ version }}.tar.gz'
+    - 'https://bioarchive.galaxyproject.org/{{ name }}_{{ version }}.tar.gz'
+    - 'https://depot.galaxyproject.org/software/bioconductor-{{ name|lower }}/bioconductor-{{ name|lower }}_{{ version }}_src_all.tar.gz'
+  md5: 148a37430c6f20d15b1564cb91796f00
+build:
+  number: 0
+  rpaths:
+    - lib/R/lib/
+    - lib/
+# Suggests: RUnit, BiocGenerics, XML
+# SystemRequirements: optionally Graphviz (>= 2.16)
+requirements:
+  host:
+    - 'bioconductor-graph >=1.60.0,<1.61.0'
+    - r-base
+  run:
+    - 'bioconductor-graph >=1.60.0,<1.61.0'
+    - r-base
+    - graphviz
+  build:
+    - {{ compiler('c') }}
+    - {{ compiler('cxx') }}
+    - automake
+    - make
+test:
+  commands:
+    - '$R -e "library(''{{ name }}'')"'
+about:
+  home: 'https://bioconductor.org/packages/{{ bioc }}/bioc/html/{{ name }}.html'
+  license: EPL
+  summary: 'Interfaces R with the AT and T graphviz library for plotting R graph objects from the graph package.'
+
diff --git a/recipes/r-clvalid/meta.yaml b/recipes/r-clvalid/meta.yaml
index 4de7543d2e602..812b1877df1ff 100644
--- a/recipes/r-clvalid/meta.yaml
+++ b/recipes/r-clvalid/meta.yaml
@@ -33,8 +33,7 @@ requirements:
 
 test:
   commands:
-    - $R -e "library('clValid')"           # [not win]
-    - "\"%R%\" -e \"library('clValid')\""  # [win]
+    - $R -e "library('clValid')"
 
 about:
   home: http://guybrock.gpbrock.net/research
diff --git a/recipes/r-dnet/meta.yaml b/recipes/r-dnet/meta.yaml
index 7708e43b9b4f9..2f58eb8131ac9 100644
--- a/recipes/r-dnet/meta.yaml
+++ b/recipes/r-dnet/meta.yaml
@@ -57,4 +57,4 @@ about:
     similarity between ontology terms (and between genes) and for calculating network
     affinity based on random walk; both can be done via high-performance parallel computing.'
   license_family: GPL2
-  license_file: '{{ environ["PREFIX"] }}\/lib\/R\/share\/licenses\/GPL-2'  # [unix]
+  license_file: '{{ environ["PREFIX"] }}/lib/R/share/licenses/GPL-2'
diff --git a/recipes/r-hardyweinberg/meta.yaml b/recipes/r-hardyweinberg/meta.yaml
index d7072c93c5128..9c169a7157dde 100644
--- a/recipes/r-hardyweinberg/meta.yaml
+++ b/recipes/r-hardyweinberg/meta.yaml
@@ -14,7 +14,6 @@ source:
 
 build:
   number: 0
-  skip: true  # [win32]
   rpaths:
     - lib/R/lib/
     - lib/
diff --git a/recipes/r-wgcna/meta.yaml b/recipes/r-wgcna/meta.yaml
index b3474200e4668..99b237d3295b7 100644
--- a/recipes/r-wgcna/meta.yaml
+++ b/recipes/r-wgcna/meta.yaml
@@ -14,7 +14,7 @@ source:
   sha256: 1b4b8d2a0b7c8c096a8b47810378fbfc475ff36f66a72f89b87e24eb3ef41666
 
 build:
-  number: 0
+  number: 1
   rpaths:
     - lib/R/lib/
     - lib/