From ed53083be2355f4b63ab29b0badff8d4030e5473 Mon Sep 17 00:00:00 2001
From: Achim Gsell <achim.gsell@psi.ch>
Date: Wed, 20 Apr 2016 14:26:12 +0200
Subject: [PATCH 01/19] Libraries/tiff/build: - don't buid shared libs - jpeg
 support disabled - compile with PIC

---
 Libraries/tiff/build | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Libraries/tiff/build b/Libraries/tiff/build
index 29e2c92..015dce2 100755
--- a/Libraries/tiff/build
+++ b/Libraries/tiff/build
@@ -3,6 +3,9 @@
 pbuild::configure() {
 	"${MODULE_SRCDIR}"/configure \
 		--prefix="${PREFIX}" \
+		--with-pic=yes \
+		--disable-shared \
+		--disable-jpeg \
 		|| exit 1
 }
 

From a4c5fbc0bdbf40787314798a0256c1b342fa0fac Mon Sep 17 00:00:00 2001
From: Achim Gsell <achim.gsell@psi.ch>
Date: Wed, 20 Apr 2016 14:27:16 +0200
Subject: [PATCH 02/19] Libraries/tiff/modulefile - use module-xxx procedures

---
 Libraries/tiff/modulefile | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/Libraries/tiff/modulefile b/Libraries/tiff/modulefile
index 9880839..b547c01 100644
--- a/Libraries/tiff/modulefile
+++ b/Libraries/tiff/modulefile
@@ -1,15 +1,13 @@
 #%Module1.0
 
-set whatis	"set of C functions that support the manipulation of TIFF image files."
-set url		"http://www.libtiff.org/"
-set license	"BSD-like, see: http://libtiff.org/misc.html"
-set maintainer	"Achim Gsell <achim.gsell@psi.ch>"
+module-whatis		"set of C functions that support the manipulation of TIFF image files."
+module-url		"http://www.remotesensing.org/libtiff/"
+module-license		"BSD-like, see: http://libtiff.org/misc.html"
+module-maintainer	"Achim Gsell <achim.gsell@psi.ch>"
 
-set help	"
+module-help	"
 This software provides support for the Tag Image File Format (TIFF), a
 widely used format for storing image data. The latest version of the TIFF
 specification is available on-line in several different formats, as are a
 number of Technical Notes (TTN's).
 "
- 
-source		$env(PSI_LIBMODULES)

From e93f9ab39610b511644cd0dd5a640a4122e8710b Mon Sep 17 00:00:00 2001
From: Achim Gsell <achim.gsell@psi.ch>
Date: Wed, 20 Apr 2016 14:27:53 +0200
Subject: [PATCH 03/19] MPI/hdf5/build - thread-safe enabled

---
 MPI/hdf5/build | 1 +
 1 file changed, 1 insertion(+)

diff --git a/MPI/hdf5/build b/MPI/hdf5/build
index 061d7fb..f963ce3 100755
--- a/MPI/hdf5/build
+++ b/MPI/hdf5/build
@@ -15,6 +15,7 @@ pbuild::configure() {
 		--enable-cxx \
 		--enable-fortran \
 		--enable-unsupported \
+		--enable-threadsafe \
 		--with-pic \
 		|| exit 1
 }

From 4a9bfd10f026b93d3ffd38aac37e07f27c55c97b Mon Sep 17 00:00:00 2001
From: Achim Gsell <achim.gsell@psi.ch>
Date: Wed, 20 Apr 2016 14:30:06 +0200
Subject: [PATCH 04/19] Tools/emacs/build - ${COMPILER} removed from
 build-dependencies - build dependencies 'libungif' and 'tiff' are independend
 from OS

---
 Tools/emacs/build | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/Tools/emacs/build b/Tools/emacs/build
index 68a3700..8eb4948 100755
--- a/Tools/emacs/build
+++ b/Tools/emacs/build
@@ -2,12 +2,11 @@
 
 module use 'Libraries'
 
-build_dependencies="${COMPILER} libungif tiff"
+build_dependencies="libungif tiff"
 
 case ${OS} in
 Darwin )
-	configure_args='--with-ns'
-	build_dependencies="libungif tiff"
+	configure_args='--with-ns --with-jpeg=no'
 	CC=''
 	CXX=''
 	COMPILER=''

From 0ea0d6ce7f5704453dd639f61397ca237b5f7799 Mon Sep 17 00:00:00 2001
From: Achim Gsell <achim.gsell@psi.ch>
Date: Wed, 20 Apr 2016 14:38:55 +0200
Subject: [PATCH 05/19] Tools/emacs/with_modules - added

---
 Tools/emacs/with_modules | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 Tools/emacs/with_modules

diff --git a/Tools/emacs/with_modules b/Tools/emacs/with_modules
new file mode 100644
index 0000000..352ad07
--- /dev/null
+++ b/Tools/emacs/with_modules
@@ -0,0 +1,2 @@
+libungif/4.1.4
+tiff/4.0.6

From fbfd33caf197ca43de29533cd4163dc955c049ce Mon Sep 17 00:00:00 2001
From: Achim Gsell <achim.gsell@psi.ch>
Date: Wed, 20 Apr 2016 14:52:43 +0200
Subject: [PATCH 06/19] cleanup

---
 HDF5/build_all_variants | 26 --------------------------
 MPI/hdf5/compiler       |  5 -----
 MPI/hdf5/mpi            |  3 ---
 MPI/hdf5/versions       |  3 ---
 4 files changed, 37 deletions(-)
 delete mode 100755 HDF5/build_all_variants
 delete mode 100644 MPI/hdf5/compiler
 delete mode 100644 MPI/hdf5/mpi
 delete mode 100644 MPI/hdf5/versions

diff --git a/HDF5/build_all_variants b/HDF5/build_all_variants
deleted file mode 100755
index 88d48a6..0000000
--- a/HDF5/build_all_variants
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/bash
-
-declare -r basedir=$(dirname $0)
-source '../../config/Pmodules.conf'
-
-declare -r recipe="${basedir}/$1/build"
-shift
-
-if [[ ! -x "${recipe}" ]]; then
-	echo "Error: no recipe to build '$1'!"
-	exit 1
-fi
-
-for cc in "${COMPILER_VERSIONS[@]}"; do
-	for mpi in "${MPI_VERSIONS[@]}"; do
-		for hdf5 in "${HDF5_VERSIONS[@]}"; do
-			"${recipe}" "$@" --with=$cc --with=$mpi --with=$hdf5 || {
-				echo "Oops: build failed for:"
-				echo "        compile: $cc"
-				echo "        mpi:     $mpi"
-				echo "        hdf5:    $hdf5"
-				exit 1
-			}
-		done
-	done
-done
diff --git a/MPI/hdf5/compiler b/MPI/hdf5/compiler
deleted file mode 100644
index 1986855..0000000
--- a/MPI/hdf5/compiler
+++ /dev/null
@@ -1,5 +0,0 @@
-gcc/4.7.4
-gcc/4.8.4
-gcc/4.9.2
-gcc/5.2.0
-intel/15.3
diff --git a/MPI/hdf5/mpi b/MPI/hdf5/mpi
deleted file mode 100644
index b6de205..0000000
--- a/MPI/hdf5/mpi
+++ /dev/null
@@ -1,3 +0,0 @@
-openmpi/1.6.5
-openmpi/1.8.4
-mpich/3.1.4
diff --git a/MPI/hdf5/versions b/MPI/hdf5/versions
deleted file mode 100644
index ff0c739..0000000
--- a/MPI/hdf5/versions
+++ /dev/null
@@ -1,3 +0,0 @@
-1.8.12
-1.8.14
-1.8.15.1

From 581be1c7b93e98670c28bb219c2d94015d10407c Mon Sep 17 00:00:00 2001
From: Achim Gsell <achim.gsell@psi.ch>
Date: Wed, 20 Apr 2016 14:54:15 +0200
Subject: [PATCH 07/19] Compiler/openmpi/1.x/variants: - updated

---
 Compiler/openmpi/1.10/variants | 13 +++++++++----
 Compiler/openmpi/1.8/variants  | 22 ++++++++++++++--------
 2 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/Compiler/openmpi/1.10/variants b/Compiler/openmpi/1.10/variants
index 3ce0ed6..aaff380 100644
--- a/Compiler/openmpi/1.10/variants
+++ b/Compiler/openmpi/1.10/variants
@@ -1,4 +1,9 @@
-:Linux:Darwin:	unstable	gcc/4.8.5
-:Linux:Darwin:	unstable	gcc/4.9.3
-:Linux:Darwin:	unstable	gcc/5.2.0
-:Linux:		unstable	intel/15.3
+# comment
+1.10.0	Linux,Darwin	deprecated	gcc/4.8.4
+1.10.0	Linux,Darwin	deprecated	gcc/4.9.2
+1.10.0	Linux,Darwin	deprecated	gcc/4.9.3
+1.10.2	Linux,Darwin	unstable	gcc/4.8.5
+1.10.2	Linux,Darwin	unstable	gcc/4.9.3
+1.10.2	Linux,Darwin	unstable	gcc/5.2.0
+1.10.2	Linux,Darwin	unstable	gcc/5.3.0
+1.10.2	Linux		unstable	intel/15.3
diff --git a/Compiler/openmpi/1.8/variants b/Compiler/openmpi/1.8/variants
index 108db59..744cacf 100644
--- a/Compiler/openmpi/1.8/variants
+++ b/Compiler/openmpi/1.8/variants
@@ -1,8 +1,14 @@
-1.8.2,1.8.4,1.8.8	stable	    Linux,Darwin	gcc/4.7.4
-1.8.2,1.8.4,1.8.8	stable	    Linux,Darwin	gcc/4.8.3
-1.8.2,1.8.4,1.8.8	stable	    Linux,Darwin	gcc/4.8.4
-1.8.2,1.8.4,1.8.8	unstable    Linux,Darwin	gcc/4.8.5
-1.8.2,1.8.4,1.8.8	stable	    Linux,Darwin 	gcc/4.9.2
-1.8.2,1.8.4,1.8.8	unstable    Linux,Darwin	gcc/4.9.3
-
-
+# comment
+1.8.2	Linux,Darwin	stable		gcc/4.7.4
+1.8.2	Linux,Darwin	stable		gcc/4.8.3
+1.8.2	Linux,Darwin	stable		gcc/4.8.4
+1.8.2	Linux,Darwin	stable		gcc/4.9.2
+1.8.4	Linux,Darwin	stable		gcc/4.7.4
+1.8.4	Linux,Darwin	stable		gcc/4.8.3
+1.8.4	Linux,Darwin	stable		gcc/4.8.4
+1.8.4	Linux,Darwin	stable		gcc/4.9.2
+1.8.8	Linux,Darwin	deprecated	gcc/4.8.4
+1.8.8	Linux,Darwin	unstable	gcc/4.8.5
+1.8.8	Linux,Darwin	unstable	gcc/4.9.3
+1.8.8	Linux,Darwin	deprecated	gcc/5.2.0
+1.8.8	Linux,Darwin	unstable	gcc/5.3.0

From 1327e0bd41cd84c1e257fc645026a3a13972162e Mon Sep 17 00:00:00 2001
From: Achim Gsell <achim.gsell@psi.ch>
Date: Wed, 20 Apr 2016 14:54:48 +0200
Subject: [PATCH 08/19] MPI/hdf5/1.10/variants: - added

---
 MPI/hdf5/1.10/variants | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 MPI/hdf5/1.10/variants

diff --git a/MPI/hdf5/1.10/variants b/MPI/hdf5/1.10/variants
new file mode 100644
index 0000000..edc2286
--- /dev/null
+++ b/MPI/hdf5/1.10/variants
@@ -0,0 +1,4 @@
+1.10.0	Linux,Darwin	unstable	gcc/4.8.5 openmpi/1.10.2
+1.10.0	Linux,Darwin	unstable	gcc/4.9.3 openmpi/1.10.2
+1.10.0	Linux,Darwin	unstable	gcc/5.3.0 openmpi/1.10.2
+

From b69addaefbd747f2e9c0615c07d24dab9a125004 Mon Sep 17 00:00:00 2001
From: Achim Gsell <achim.gsell@psi.ch>
Date: Wed, 20 Apr 2016 14:56:58 +0200
Subject: [PATCH 09/19] Tools/git/build: - doc files updated

---
 Tools/git/build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Tools/git/build b/Tools/git/build
index c2c89f5..2340561 100755
--- a/Tools/git/build
+++ b/Tools/git/build
@@ -33,7 +33,7 @@ pbuild::install() {
 
 pbuild::add_to_group 'Tools'
 pbuild::set_runtime_dependencies 'Tcl' 'Tk'
-pbuild::set_docfiles 'COPYING' 'README'
+pbuild::set_docfiles 'COPYING' 'README.md'
 pbuild::make_all
 
 # Local Variables:

From 9aa15165af5d04317b284dc2202e3a37f576a00a Mon Sep 17 00:00:00 2001
From: Achim Gsell <achim.gsell@psi.ch>
Date: Wed, 20 Apr 2016 14:58:21 +0200
Subject: [PATCH 10/19] Programming/gcc/with_modules-{4.8.5,5.3.0} - added

---
 Programming/gcc/with_modules-4.8.5 | 3 +++
 Programming/gcc/with_modules-5.3.0 | 3 +++
 2 files changed, 6 insertions(+)
 create mode 100644 Programming/gcc/with_modules-4.8.5
 create mode 100644 Programming/gcc/with_modules-5.3.0

diff --git a/Programming/gcc/with_modules-4.8.5 b/Programming/gcc/with_modules-4.8.5
new file mode 100644
index 0000000..1b560bd
--- /dev/null
+++ b/Programming/gcc/with_modules-4.8.5
@@ -0,0 +1,3 @@
+gmp/6.0.0
+mpfr/3.1.3
+mpc/1.0.3
diff --git a/Programming/gcc/with_modules-5.3.0 b/Programming/gcc/with_modules-5.3.0
new file mode 100644
index 0000000..1b560bd
--- /dev/null
+++ b/Programming/gcc/with_modules-5.3.0
@@ -0,0 +1,3 @@
+gmp/6.0.0
+mpfr/3.1.3
+mpc/1.0.3

From 4207911754d8b0c473f9a3e4fea34090f584b6fd Mon Sep 17 00:00:00 2001
From: Achim Gsell <achim.gsell@psi.ch>
Date: Wed, 20 Apr 2016 14:59:33 +0200
Subject: [PATCH 11/19] bin/manage_variants - reviewed

---
 bin/manage_variants | 28 ++++++++++++++++++++--------
 1 file changed, 20 insertions(+), 8 deletions(-)

diff --git a/bin/manage_variants b/bin/manage_variants
index 68e5cd4..8b14331 100755
--- a/bin/manage_variants
+++ b/bin/manage_variants
@@ -6,11 +6,23 @@ declare variants=$2
 
 declare -r OS=$(uname -s)
 
-while read versions release oss dependencies; do
-      	 [[ "${oss}" =~ "${OS}" ]] || continue
-	 versions_a=( ${versions//,/ } )
-	 dependencies_a=( ${dependencies//,/ } )
-	 for version in "${versions_a[@]}"; do
-	         "${buildblock}"  "${version}" --release=${release} "${dependencies_a[@]/#/--with=}"
-	 done
-done < "${variants}"
\ No newline at end of file
+# File format example
+# 1.10.2	Linux,Darwin	unstable	gcc/4.8.5
+declare -a toks=()
+declare version=''
+declare oss=''
+declare release=''
+declare -a dependencies=()
+
+while read -a toks; do
+	# skip comment and empty line
+	(( ${#toks[@]} == 0 )) && continue
+	[[ "${toks[0]:0:1}" == "#" ]] && continue
+	version=${toks[0]}
+	oss=${toks[1]}
+	release=${toks[2]}
+	dependencies=( ${toks[@]:3} )
+
+	[[ "${oss}" =~ "${OS}" ]] || continue
+	"${buildblock}"  "${version}" --release=${release} "${dependencies[@]/#/--with=}"
+done < "${variants}"

From 8709b4cddb801e4c0dcfad1ff74c072918471650 Mon Sep 17 00:00:00 2001
From: Achim Gsell <achim.gsell@psi.ch>
Date: Wed, 20 Apr 2016 18:52:12 +0200
Subject: [PATCH 12/19] MPI/hdf5: variants for 1.8 added

---
 MPI/hdf5/1.8/variants | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 MPI/hdf5/1.8/variants

diff --git a/MPI/hdf5/1.8/variants b/MPI/hdf5/1.8/variants
new file mode 100644
index 0000000..eeb6551
--- /dev/null
+++ b/MPI/hdf5/1.8/variants
@@ -0,0 +1,35 @@
+hdf5/1.8.12	Linux,Darwin	stable		gcc/4.7.4 openmpi/1.6.5
+hdf5/1.8.12	Linux,Darwin	stable		gcc/4.7.4 openmpi/1.8.2
+hdf5/1.8.12	Linux,Darwin	stable		gcc/4.7.4 openmpi/1.8.4
+hdf5/1.8.12	Linux,Darwin	stable		gcc/4.8.3 openmpi/1.6.5
+hdf5/1.8.12	Linux,Darwin	stable		gcc/4.8.3 openmpi/1.8.2
+hdf5/1.8.12	Linux,Darwin	stable		gcc/4.8.3 openmpi/1.8.4
+hdf5/1.8.12	Linux,Darwin	stable		gcc/4.8.4 openmpi/1.6.5
+hdf5/1.8.12	Linux,Darwin	stable		gcc/4.8.4 openmpi/1.8.2
+hdf5/1.8.12	Linux,Darwin	stable		gcc/4.8.4 openmpi/1.8.4
+hdf5/1.8.12	Linux,Darwin	stable		gcc/4.9.2 openmpi/1.6.5
+hdf5/1.8.12	Linux,Darwin	stable		gcc/4.9.2 openmpi/1.8.2
+hdf5/1.8.12	Linux,Darwin	stable		gcc/4.9.2 openmpi/1.8.4
+hdf5/1.8.14	Linux,Darwin	stable		gcc/4.7.4 openmpi/1.6.5
+hdf5/1.8.14	Linux,Darwin	stable		gcc/4.7.4 openmpi/1.8.2
+hdf5/1.8.14	Linux,Darwin	stable		gcc/4.7.4 openmpi/1.8.4
+hdf5/1.8.14	Linux,Darwin	stable		gcc/4.8.3 openmpi/1.6.5
+hdf5/1.8.14	Linux,Darwin	stable		gcc/4.8.3 openmpi/1.8.2
+hdf5/1.8.14	Linux,Darwin	stable		gcc/4.8.3 openmpi/1.8.4
+hdf5/1.8.14	Linux,Darwin	stable		gcc/4.8.4 openmpi/1.6.5
+hdf5/1.8.14	Linux,Darwin	stable		gcc/4.8.4 openmpi/1.8.2
+hdf5/1.8.14	Linux,Darwin	stable		gcc/4.8.4 openmpi/1.8.4
+hdf5/1.8.14	Linux,Darwin	stable		gcc/4.8.4 openmpi/1.8.8
+hdf5/1.8.14	Linux,Darwin	stable		gcc/4.9.2 openmpi/1.6.5
+hdf5/1.8.14	Linux,Darwin	stable		gcc/4.9.2 openmpi/1.8.2
+hdf5/1.8.14	Linux,Darwin	stable		gcc/4.9.2 openmpi/1.8.4
+hdf5/1.8.15.1	Linux,Darwin	stable		gcc/5.2.0 openmpi/1.8.8
+hdf5/1.8.16	Linux,Darwin	unstable	gcc/4.8.5 openmpi/1.8.2
+hdf5/1.8.16	Linux,Darwin	unstable	gcc/4.8.5 openmpi/1.8.4
+hdf5/1.8.16	Linux,Darwin	unstable	gcc/4.8.5 openmpi/1.8.8
+hdf5/1.8.16	Linux,Darwin	unstable	gcc/4.9.3 openmpi/1.8.2
+hdf5/1.8.16	Linux,Darwin	unstable	gcc/4.9.3 openmpi/1.8.4
+hdf5/1.8.16	Linux,Darwin	unstable	gcc/4.9.3 openmpi/1.8.8
+hdf5/1.8.16	Linux,Darwin	unstable	gcc/5.3.0 openmpi/1.8.2
+hdf5/1.8.16	Linux,Darwin	unstable	gcc/5.3.0 openmpi/1.8.4
+hdf5/1.8.16	Linux,Darwin	unstable	gcc/5.3.0 openmpi/1.8.8

From 59f0ffa54b8547af2a28d2793ff2c46d47800ccc Mon Sep 17 00:00:00 2001
From: Achim Gsell <achim.gsell@psi.ch>
Date: Thu, 21 Apr 2016 11:56:51 +0200
Subject: [PATCH 13/19] Programming/gcc: with_modules replaced by variants

---
 Programming/gcc/4/variants         | 7 +++++++
 Programming/gcc/5/variants         | 4 ++++
 Programming/gcc/with_modules-4.8.5 | 3 ---
 Programming/gcc/with_modules-4.9.3 | 3 ---
 Programming/gcc/with_modules-5.2.0 | 3 ---
 Programming/gcc/with_modules-5.3.0 | 3 ---
 6 files changed, 11 insertions(+), 12 deletions(-)
 create mode 100644 Programming/gcc/4/variants
 create mode 100644 Programming/gcc/5/variants
 delete mode 100644 Programming/gcc/with_modules-4.8.5
 delete mode 100644 Programming/gcc/with_modules-4.9.3
 delete mode 100644 Programming/gcc/with_modules-5.2.0
 delete mode 100644 Programming/gcc/with_modules-5.3.0

diff --git a/Programming/gcc/4/variants b/Programming/gcc/4/variants
new file mode 100644
index 0000000..ee71bde
--- /dev/null
+++ b/Programming/gcc/4/variants
@@ -0,0 +1,7 @@
+4.7.4	Linux,Darwin	stable		gmp/5.1.1 mpfr/3.1.2 mpc/1.0.2
+4.8.3	Linux,Darwin	stable		gmp/5.1.1 mpfr/3.1.2 mpc/1.0.2
+4.8.4	Linux,Darwin	stable		gmp/5.1.1 mpfr/3.1.2 mpc/1.0.2
+4.8.5	Linux,Darwin	stable		gmp/6.0.0 mpfr/3.1.3 mpc/1.0.3
+4.9.0	Linux,Darwin	deprecated	gmp/5.1.1 mpfr/3.1.2 mpc/1.0.2
+4.9.2	Linux,Darwin	stable		gmp/5.1.1 mpfr/3.1.2 mpc/1.0.2
+4.9.3	Linux,Darwin	stable		gmp/6.0.0 mpfr/3.1.3 mpc/1.0.3
diff --git a/Programming/gcc/5/variants b/Programming/gcc/5/variants
new file mode 100644
index 0000000..111dcf0
--- /dev/null
+++ b/Programming/gcc/5/variants
@@ -0,0 +1,4 @@
+5.1.0	Linux,Darwin	stable		gmp/5.1.1 mpfr/3.1.2 mpc/1.0.2
+5.2.0	Linux,Darwin	stable		gmp/6.0.0 mpfr/3.1.3 mpc/1.0.3
+5.3.0	Linux,Darwin	stable		gmp/6.0.0 mpfr/3.1.3 mpc/1.0.3
+
diff --git a/Programming/gcc/with_modules-4.8.5 b/Programming/gcc/with_modules-4.8.5
deleted file mode 100644
index 1b560bd..0000000
--- a/Programming/gcc/with_modules-4.8.5
+++ /dev/null
@@ -1,3 +0,0 @@
-gmp/6.0.0
-mpfr/3.1.3
-mpc/1.0.3
diff --git a/Programming/gcc/with_modules-4.9.3 b/Programming/gcc/with_modules-4.9.3
deleted file mode 100644
index 1b560bd..0000000
--- a/Programming/gcc/with_modules-4.9.3
+++ /dev/null
@@ -1,3 +0,0 @@
-gmp/6.0.0
-mpfr/3.1.3
-mpc/1.0.3
diff --git a/Programming/gcc/with_modules-5.2.0 b/Programming/gcc/with_modules-5.2.0
deleted file mode 100644
index 1b560bd..0000000
--- a/Programming/gcc/with_modules-5.2.0
+++ /dev/null
@@ -1,3 +0,0 @@
-gmp/6.0.0
-mpfr/3.1.3
-mpc/1.0.3
diff --git a/Programming/gcc/with_modules-5.3.0 b/Programming/gcc/with_modules-5.3.0
deleted file mode 100644
index 1b560bd..0000000
--- a/Programming/gcc/with_modules-5.3.0
+++ /dev/null
@@ -1,3 +0,0 @@
-gmp/6.0.0
-mpfr/3.1.3
-mpc/1.0.3

From 07387d53f6733889de73af15ceb232a8850f0638 Mon Sep 17 00:00:00 2001
From: Achim Gsell <achim.gsell@psi.ch>
Date: Thu, 21 Apr 2016 13:53:17 +0200
Subject: [PATCH 14/19] Libraries/mpfr: use variants mechanism

---
 Libraries/mpfr/3/variants         | 3 +++
 Libraries/mpfr/with_modules-3.1.2 | 1 -
 Libraries/mpfr/with_modules-3.1.3 | 1 -
 3 files changed, 3 insertions(+), 2 deletions(-)
 create mode 100644 Libraries/mpfr/3/variants
 delete mode 100644 Libraries/mpfr/with_modules-3.1.2
 delete mode 100644 Libraries/mpfr/with_modules-3.1.3

diff --git a/Libraries/mpfr/3/variants b/Libraries/mpfr/3/variants
new file mode 100644
index 0000000..3c5abe5
--- /dev/null
+++ b/Libraries/mpfr/3/variants
@@ -0,0 +1,3 @@
+3.1.2	Linux,Darwin	stable		gmp/5.1.1
+3.1.3	Linux,Darwin	stable		gmp/6.0.0
+3.1.4	Linux,Darwin	stable		gmp/6.1.0
diff --git a/Libraries/mpfr/with_modules-3.1.2 b/Libraries/mpfr/with_modules-3.1.2
deleted file mode 100644
index 7030e3d..0000000
--- a/Libraries/mpfr/with_modules-3.1.2
+++ /dev/null
@@ -1 +0,0 @@
-gmp/5.1.1
diff --git a/Libraries/mpfr/with_modules-3.1.3 b/Libraries/mpfr/with_modules-3.1.3
deleted file mode 100644
index f4ddf98..0000000
--- a/Libraries/mpfr/with_modules-3.1.3
+++ /dev/null
@@ -1 +0,0 @@
-gmp/6.0.0

From 5b95399f0db5db903e986343aa3c5338fc3cb0da Mon Sep 17 00:00:00 2001
From: Achim Gsell <achim.gsell@psi.ch>
Date: Thu, 21 Apr 2016 13:53:50 +0200
Subject: [PATCH 15/19] Libraries/gmp: use variants mechanism

---
 Libraries/gmp/5/variants | 1 +
 Libraries/gmp/6/variants | 2 ++
 2 files changed, 3 insertions(+)
 create mode 100644 Libraries/gmp/5/variants
 create mode 100644 Libraries/gmp/6/variants

diff --git a/Libraries/gmp/5/variants b/Libraries/gmp/5/variants
new file mode 100644
index 0000000..cce472f
--- /dev/null
+++ b/Libraries/gmp/5/variants
@@ -0,0 +1 @@
+5.1.1	Linux,Darwin	stable	
diff --git a/Libraries/gmp/6/variants b/Libraries/gmp/6/variants
new file mode 100644
index 0000000..b065615
--- /dev/null
+++ b/Libraries/gmp/6/variants
@@ -0,0 +1,2 @@
+6.0.0	Linux,Darwin	stable	
+6.1.0	Linux,Darwin	unstable	

From 47aa4db007d96b8b34f3a1fb95fd641d4ce3c11c Mon Sep 17 00:00:00 2001
From: Achim Gsell <achim.gsell@psi.ch>
Date: Thu, 21 Apr 2016 14:24:02 +0200
Subject: [PATCH 16/19] Libraries/mpc: build dependencies removed from
 buildblock

---
 Libraries/mpc/build              | 1 -
 Libraries/mpc/with_modules-1.0.2 | 2 --
 Libraries/mpc/with_modules-1.0.3 | 2 --
 3 files changed, 5 deletions(-)
 delete mode 100644 Libraries/mpc/with_modules-1.0.2
 delete mode 100644 Libraries/mpc/with_modules-1.0.3

diff --git a/Libraries/mpc/build b/Libraries/mpc/build
index e28adf0..728cd08 100755
--- a/Libraries/mpc/build
+++ b/Libraries/mpc/build
@@ -14,6 +14,5 @@ declare -rx CC=gcc
 
 module use 'Libraries'
 pbuild::add_to_group 'Libraries'
-pbuild::set_build_dependencies 'gmp' 'mpfr'
 pbuild::make_all
 
diff --git a/Libraries/mpc/with_modules-1.0.2 b/Libraries/mpc/with_modules-1.0.2
deleted file mode 100644
index 2d66a14..0000000
--- a/Libraries/mpc/with_modules-1.0.2
+++ /dev/null
@@ -1,2 +0,0 @@
-gmp/5.1.1
-mpfr/3.1.2
diff --git a/Libraries/mpc/with_modules-1.0.3 b/Libraries/mpc/with_modules-1.0.3
deleted file mode 100644
index 6745bfe..0000000
--- a/Libraries/mpc/with_modules-1.0.3
+++ /dev/null
@@ -1,2 +0,0 @@
-gmp/6.0.0
-mpfr/3.1.3

From de341f9c12b7d5ad2cb5f8f28870248bbebd9776 Mon Sep 17 00:00:00 2001
From: Achim Gsell <achim.gsell@psi.ch>
Date: Thu, 21 Apr 2016 14:24:16 +0200
Subject: [PATCH 17/19] Libraries/gmp: use variants mechanism

---
 Libraries/mpc/1/variants | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 Libraries/mpc/1/variants

diff --git a/Libraries/mpc/1/variants b/Libraries/mpc/1/variants
new file mode 100644
index 0000000..11d5178
--- /dev/null
+++ b/Libraries/mpc/1/variants
@@ -0,0 +1,2 @@
+1.0.2	Linux,Darwin	stable		gmp/5.1.1 mpfr/3.1.2
+1.0.3	Linux,Darwin	stable		gmp/6.1.0 mpfr/3.1.4

From b64d199558f9eb6a8c39791db3370391810ea11b Mon Sep 17 00:00:00 2001
From: Achim Gsell <achim.gsell@psi.ch>
Date: Thu, 21 Apr 2016 14:54:02 +0200
Subject: [PATCH 18/19] Tools/git: use variants mechanism

---
 Tools/git/2/variants   | 4 ++++
 Tools/git/with_modules | 2 --
 2 files changed, 4 insertions(+), 2 deletions(-)
 create mode 100644 Tools/git/2/variants
 delete mode 100644 Tools/git/with_modules

diff --git a/Tools/git/2/variants b/Tools/git/2/variants
new file mode 100644
index 0000000..165ef52
--- /dev/null
+++ b/Tools/git/2/variants
@@ -0,0 +1,4 @@
+2.3.3	Linux,Darwin	stable		Tcl/8.6.4 Tk/8.6.4
+2.5.2	Linux,Darwin	stable		Tcl/8.6.4 Tk/8.6.4
+2.8.1	Linux,Darwin	unstable	Tcl/8.6.4 Tk/8.6.4
+
diff --git a/Tools/git/with_modules b/Tools/git/with_modules
deleted file mode 100644
index 70974ad..0000000
--- a/Tools/git/with_modules
+++ /dev/null
@@ -1,2 +0,0 @@
-Tcl/8.6.4
-Tk/8.6.4

From 107e8a1d93d6372f9fd2a2d739050b34827bd5e0 Mon Sep 17 00:00:00 2001
From: Achim Gsell <achim.gsell@psi.ch>
Date: Mon, 2 May 2016 14:20:54 +0200
Subject: [PATCH 19/19] Compiler/openmpi/build: build with sge and slurm
 support

---
 Compiler/openmpi/build | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Compiler/openmpi/build b/Compiler/openmpi/build
index e865b9f..271e5e6 100755
--- a/Compiler/openmpi/build
+++ b/Compiler/openmpi/build
@@ -7,8 +7,11 @@ pbuild::configure() {
 		--enable-mpi-cxx-seek \
 		--enable-mpi-f90 \
 		--enable-mpi-profile \
+		--enable-orterun-prefix-by-default \
 		--enable-shared \
 		--enable-smp-locks \
+		--with-sge=yes \
+		--with-slurm=yes \
 		|| exit 1
 }