diff --git a/Compiler/H5root/1/variants b/Compiler/H5root/1/variants
new file mode 100644
index 0000000..7edd57b
--- /dev/null
+++ b/Compiler/H5root/1/variants
@@ -0,0 +1,3 @@
+H5root/1.2.0         stable     b:autoconf/2.69 b:automake/1.14 b:libtool/2.4.2 gcc/4.7.4 hdf5_serial/1.8.12 b:H5hut_serial/1.99.13 root/5.34.19
+H5root/1.2.0         stable     b:autoconf/2.69 b:automake/1.14 b:libtool/2.4.2 gcc/4.8.3 hdf5_serial/1.8.12 b:H5hut_serial/1.99.13 root/5.34.19
+H5root/1.3.0         unstable   b:autoconf/2.69 b:automake/1.14 b:libtool/2.4.2 gcc/4.8.3 hdf5_serial/1.8.12 b:H5hut_serial/1.99.13 root/5.34.19
diff --git a/Compiler/H5root/build b/Compiler/H5root/build
index adf3b87..85a3164 100755
--- a/Compiler/H5root/build
+++ b/Compiler/H5root/build
@@ -13,7 +13,5 @@ declare JOBS=1
 pbuild::compile_in_sourcetree
 
 pbuild::add_to_group 'Compiler'
-pbuild::set_runtime_dependencies "${COMPILER}" 'hdf5_serial' 'root'
-pbuild::set_build_dependencies 'autoconf' 'automake' 'libtool' "${COMPILER}" 'hdf5_serial' 'H5hut_serial' 'root'
 pbuild::make_all
 
diff --git a/Compiler/H5root/with_modules b/Compiler/H5root/with_modules
deleted file mode 100644
index 19c356f..0000000
--- a/Compiler/H5root/with_modules
+++ /dev/null
@@ -1,4 +0,0 @@
-gcc/4.8.3
-hdf5_serial/1.8.12
-H5hut_serial/1.99.13
-root/5.34.26
diff --git a/Compiler/OpenBLAS/0/variants b/Compiler/OpenBLAS/0/variants
new file mode 100644
index 0000000..cac5861
--- /dev/null
+++ b/Compiler/OpenBLAS/0/variants
@@ -0,0 +1,5 @@
+OpenBLAS/0.2.9       stable     gcc/4.7.4
+OpenBLAS/0.2.9       stable     gcc/4.8.3
+OpenBLAS/0.2.9       stable     gcc/4.8.4
+OpenBLAS/0.2.9       stable     gcc/4.9.2
+OpenBLAS/0.2.9       unstable	gcc/6.1.0
\ No newline at end of file
diff --git a/Compiler/OpenBLAS/build b/Compiler/OpenBLAS/build
index 0f664f5..ceea8e5 100755
--- a/Compiler/OpenBLAS/build
+++ b/Compiler/OpenBLAS/build
@@ -35,7 +35,6 @@ EOF
 }
 
 pbuild::build() {
-	cd "${MODULE_SRCDIR}"
 	make
 }
 
@@ -50,8 +49,7 @@ pbuild::install() {
 }
 
 pbuild::add_to_group 'Compiler'
-pbuild::set_runtime_dependencies "${COMPILER}"
-pbuild::set_build_dependencies "${COMPILER}"
+pbuild::compile_in_sourcetree
 pbuild::set_docfiles 'LICENSE' 'README.md'
 pbuild::set_supported_compilers 'gcc' 'intel'
 pbuild::make_all
diff --git a/Compiler/OpenBLAS_OMP/0/variants b/Compiler/OpenBLAS_OMP/0/variants
new file mode 100644
index 0000000..9a31ebc
--- /dev/null
+++ b/Compiler/OpenBLAS_OMP/0/variants
@@ -0,0 +1,4 @@
+OpenBLAS_OMP/0.2.9   stable     gcc/4.7.4
+OpenBLAS_OMP/0.2.9   stable     gcc/4.8.3
+OpenBLAS_OMP/0.2.9   stable     gcc/4.8.4
+OpenBLAS_OMP/0.2.9   stable     gcc/4.9.2
\ No newline at end of file
diff --git a/Compiler/OpenBLAS_OMP/build b/Compiler/OpenBLAS_OMP/build
index 8a19ffc..60e3539 100755
--- a/Compiler/OpenBLAS_OMP/build
+++ b/Compiler/OpenBLAS_OMP/build
@@ -39,8 +39,6 @@ pbuild::install() {
 }
 
 pbuild::add_to_group 'Compiler'
-pbuild::set_runtime_dependencies "${COMPILER}"
-pbuild::set_build_dependencies "${COMPILER}"
 pbuild::set_docfiles 'LICENSE' 'README.md'
 pbuild::set_supported_compilers 'gcc'
 pbuild::make_all
diff --git a/Compiler/SuperLU/4/variants b/Compiler/SuperLU/4/variants
new file mode 100644
index 0000000..8d49c56
--- /dev/null
+++ b/Compiler/SuperLU/4/variants
@@ -0,0 +1,8 @@
+SuperLU/4.3          stable     gcc/4.7.4 b:OpenBLAS/0.2.9
+SuperLU/4.3          stable     gcc/4.8.3 b:OpenBLAS/0.2.9
+SuperLU/4.3          stable     gcc/4.8.4 b:OpenBLAS/0.2.9
+SuperLU/4.3          stable     gcc/4.9.2 b:OpenBLAS/0.2.9
+SuperLU/4.3          stable     gcc/4.9.3 b:OpenBLAS/0.2.9
+SuperLU/4.3          stable     gcc/5.3.0 b:OpenBLAS/0.2.9
+SuperLU/4.3          stable     gcc/6.1.0 b:OpenBLAS/0.2.9
+
diff --git a/Compiler/SuperLU/build b/Compiler/SuperLU/build
index 1a22d82..4e8257e 100755
--- a/Compiler/SuperLU/build
+++ b/Compiler/SuperLU/build
@@ -39,8 +39,7 @@ pbuild::install() {
 }
 
 pbuild::add_to_group 'Compiler'
-pbuild::set_runtime_dependencies "${COMPILER}"
-pbuild::set_build_dependencies "${COMPILER}" 'OpenBLAS'
+pbuild::compile_in_sourcetree
 pbuild::set_docfiles 'README'
 pbuild::make_all
 pbuild::cleanup_src
diff --git a/Compiler/UMFPACK/5/variants b/Compiler/UMFPACK/5/variants
new file mode 100644
index 0000000..34cd636
--- /dev/null
+++ b/Compiler/UMFPACK/5/variants
@@ -0,0 +1,5 @@
+UMFPACK/5.6.2        stable     gcc/4.7.4 OpenBLAS/0.2.9 
+UMFPACK/5.6.2        stable     gcc/4.8.3 OpenBLAS/0.2.9 
+UMFPACK/5.6.2        stable     gcc/4.8.4 OpenBLAS/0.2.9 
+UMFPACK/5.6.2        stable     gcc/4.9.2 OpenBLAS/0.2.9 
+UMFPACK/5.6.2        unstable   gcc/4.9.3 OpenBLAS/0.2.9 
diff --git a/Compiler/UMFPACK/build b/Compiler/UMFPACK/build
index 07c08c3..2268b34 100755
--- a/Compiler/UMFPACK/build
+++ b/Compiler/UMFPACK/build
@@ -30,13 +30,13 @@ pbuild::build() {
 }
 
 pbuild::install() {
+	cd "${MODULE_SRCDIR}/UMFPACK"
 	install -d "${PREFIX}/include"
 	install -d "${PREFIX}/lib"
 	make PREFIX="${PREFIX}" install
 }
 
 pbuild::add_to_group 'Compiler'
-pbuild::set_runtime_dependencies "${COMPILER}" 'OpenBLAS'
-pbuild::set_build_dependencies "${COMPILER}" 'OpenBLAS'
+pbuild::compile_in_sourcetree
 pbuild::make_all
-#pbuild::cleanup_src
+pbuild::cleanup_src
diff --git a/Compiler/atlas/3/variants b/Compiler/atlas/3/variants
new file mode 100644
index 0000000..3b20709
--- /dev/null
+++ b/Compiler/atlas/3/variants
@@ -0,0 +1 @@
+atlas/3.10.2         unstable   gcc/4.9.2 
diff --git a/Compiler/boost/1/variants b/Compiler/boost/1/variants
new file mode 100644
index 0000000..91baad0
--- /dev/null
+++ b/Compiler/boost/1/variants
@@ -0,0 +1,6 @@
+boost/1.55.0         stable     gcc/4.7.4 b:Python/3.4.0 
+boost/1.55.0         stable     gcc/4.8.3 b:Python/3.4.0 
+boost/1.55.0         stable     gcc/4.8.4 b:Python/3.4.0 
+boost/1.55.0         stable     gcc/4.9.2 b:Python/3.4.0 
+boost/1.58.0         unstable   gcc/4.8.4 b:Python/3.4.0 
+boost/1.58.0         unstable   gcc/4.9.3 b:Python/2.7.11
diff --git a/Compiler/boost/build b/Compiler/boost/build
index b590133..4421be6 100755
--- a/Compiler/boost/build
+++ b/Compiler/boost/build
@@ -38,7 +38,5 @@ pbuild::install() {
 }
 
 pbuild::add_to_group 'Compiler'
-pbuild::set_runtime_dependencies "${COMPILER}"
-pbuild::set_build_dependencies "${COMPILER}" 'Python'
 pbuild::make_all
 
diff --git a/Compiler/gsl/1/variants b/Compiler/gsl/1/variants
new file mode 100644
index 0000000..3769f25
--- /dev/null
+++ b/Compiler/gsl/1/variants
@@ -0,0 +1,5 @@
+gsl/1.15             stable     gcc/4.7.4 
+gsl/1.15             stable     gcc/4.8.3 
+gsl/1.15             stable     gcc/4.8.4 
+gsl/1.15             deprecated gcc/4.9.2 
+gsl/1.15             stable     gcc/4.9.3 
diff --git a/Compiler/gsl/build b/Compiler/gsl/build
index 57ebb22..b3d7d94 100755
--- a/Compiler/gsl/build
+++ b/Compiler/gsl/build
@@ -18,8 +18,6 @@ pbuild::set_docfiles \
 	'THANKS' \
 	'TODO'
 
-pbuild::set_runtime_dependencies "${COMPILER}"
-pbuild::set_build_dependencies "${COMPILER}"
 pbuild::make_all
 
 # Local Variables:
diff --git a/Compiler/hdf5_serial/1/variants b/Compiler/hdf5_serial/1/variants
new file mode 100644
index 0000000..e4e9583
--- /dev/null
+++ b/Compiler/hdf5_serial/1/variants
@@ -0,0 +1,9 @@
+hdf5_serial/1.8.12   stable     gcc/4.7.4 
+hdf5_serial/1.8.12   stable     gcc/4.8.3 
+hdf5_serial/1.8.12   stable     gcc/4.8.4 
+hdf5_serial/1.8.12   stable     gcc/4.9.2 
+hdf5_serial/1.8.14   stable     gcc/4.7.4 
+hdf5_serial/1.8.14   stable     gcc/4.8.3 
+hdf5_serial/1.8.14   stable     gcc/4.8.4 
+hdf5_serial/1.8.14   stable     gcc/4.9.2 
+hdf5_serial/1.8.15-patch1 unstable   gcc/5.2.0 
diff --git a/Compiler/hdf5_serial/build b/Compiler/hdf5_serial/build
index 07add52..2c1f42c 100755
--- a/Compiler/hdf5_serial/build
+++ b/Compiler/hdf5_serial/build
@@ -12,7 +12,5 @@ pbuild::configure() {
 }
 
 pbuild::add_to_group 'Compiler'
-pbuild::set_runtime_dependencies "${COMPILER}"
-pbuild::set_build_dependencies "${COMPILER}"
 pbuild::make_all
 
diff --git a/Compiler/openmpi/1.10/variants b/Compiler/openmpi/1.10/variants.Darwin
similarity index 100%
rename from Compiler/openmpi/1.10/variants
rename to Compiler/openmpi/1.10/variants.Darwin
diff --git a/Compiler/openmpi/1.10/variants.Linux b/Compiler/openmpi/1.10/variants.Linux
new file mode 100644
index 0000000..e5cdf8c
--- /dev/null
+++ b/Compiler/openmpi/1.10/variants.Linux
@@ -0,0 +1,9 @@
+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	stable		gcc/4.8.5
+1.10.2	Linux,Darwin	stable		gcc/4.9.3
+1.10.2	Linux,Darwin	deprecated	gcc/5.2.0
+1.10.2	Linux,Darwin	stable		gcc/5.3.0
+1.10.2	Linux,Darwin	unstable	gcc/6.1.0
+1.10.2	Linux		unstable	intel/15.3
diff --git a/Compiler/openmpi/1.6/variants b/Compiler/openmpi/1.6/variants
deleted file mode 100644
index a6b0c4c..0000000
--- a/Compiler/openmpi/1.6/variants
+++ /dev/null
@@ -1,9 +0,0 @@
-1.6.5	stable		Linux,Darwin	gcc/4.7.4
-1.6.5	stable		Linux,Darwin	gcc/4.8.3
-1.6.5	stable		Linux,Darwin	gcc/4.8.4
-1.6.5	stable		Linux,Darwin	gcc/4.8.5
-1.6.5	deprecated	Linux,Darwin	gcc/4.9.2
-1.6.5	stable		Linux,Darwin	gcc/4.9.3
-1.6.5	stable		Linux		intel/15.2
-1.6.5	stable		Linux		intel/15.3
-
diff --git a/Compiler/openmpi/1.6/variants.Darwin b/Compiler/openmpi/1.6/variants.Darwin
new file mode 100644
index 0000000..dfa076f
--- /dev/null
+++ b/Compiler/openmpi/1.6/variants.Darwin
@@ -0,0 +1,7 @@
+1.6.5	stable		gcc/4.7.4
+1.6.5	stable		gcc/4.8.3
+1.6.5	stable		gcc/4.8.4
+1.6.5	stable		gcc/4.8.5
+1.6.5	deprecated	gcc/4.9.2
+1.6.5	stable		gcc/4.9.3
+
diff --git a/Compiler/openmpi/1.6/variants.Linux b/Compiler/openmpi/1.6/variants.Linux
new file mode 100644
index 0000000..97d9698
--- /dev/null
+++ b/Compiler/openmpi/1.6/variants.Linux
@@ -0,0 +1,9 @@
+1.6.5	stable		gcc/4.7.4
+1.6.5	stable		gcc/4.8.3
+1.6.5	stable		gcc/4.8.4
+1.6.5	stable		gcc/4.8.5
+1.6.5	deprecated	gcc/4.9.2
+1.6.5	stable		gcc/4.9.3
+1.6.5	stable		intel/15.2
+1.6.5	stable		intel/15.3
+
diff --git a/Compiler/openmpi/1.8/variants b/Compiler/openmpi/1.8/variants
deleted file mode 100644
index fbb7288..0000000
--- a/Compiler/openmpi/1.8/variants
+++ /dev/null
@@ -1,17 +0,0 @@
-# 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.8.5
-1.8.2	Linux,Darwin	deprecated	gcc/4.9.2
-1.8.2	Linux,Darwin	stable		gcc/4.9.3
-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	stable		gcc/4.8.5
-1.8.8	Linux,Darwin	stable		gcc/4.9.3
-1.8.8	Linux,Darwin	deprecated	gcc/5.2.0
-1.8.8	Linux,Darwin	stable		gcc/5.3.0
-1.8.8	Linux,Darwin	unstable	gcc/6.1.0
diff --git a/Compiler/openmpi/1.8/variants.Darwin b/Compiler/openmpi/1.8/variants.Darwin
new file mode 100644
index 0000000..e945788
--- /dev/null
+++ b/Compiler/openmpi/1.8/variants.Darwin
@@ -0,0 +1,16 @@
+1.8.2	stable		gcc/4.7.4
+1.8.2	stable		gcc/4.8.3
+1.8.2	stable		gcc/4.8.4
+1.8.2	stable		gcc/4.8.5
+1.8.2	deprecated	gcc/4.9.2
+1.8.2	stable		gcc/4.9.3
+1.8.4	stable		gcc/4.7.4
+1.8.4	stable		gcc/4.8.3
+1.8.4	stable		gcc/4.8.4
+1.8.4	stable		gcc/4.9.2
+1.8.8	deprecated	gcc/4.8.4
+1.8.8	stable		gcc/4.8.5
+1.8.8	stable		gcc/4.9.3
+1.8.8	deprecated	gcc/5.2.0
+1.8.8	stable		gcc/5.3.0
+1.8.8	unstable	gcc/6.1.0
diff --git a/Compiler/openmpi/1.8/variants.Linux b/Compiler/openmpi/1.8/variants.Linux
new file mode 100644
index 0000000..27a67e8
--- /dev/null
+++ b/Compiler/openmpi/1.8/variants.Linux
@@ -0,0 +1,17 @@
+# comment
+1.8.2	stable		gcc/4.7.4
+1.8.2	stable		gcc/4.8.3
+1.8.2	stable		gcc/4.8.4
+1.8.2	stable		gcc/4.8.5
+1.8.2	deprecated	gcc/4.9.2
+1.8.2	stable		gcc/4.9.3
+1.8.4	stable		gcc/4.7.4
+1.8.4	stable		gcc/4.8.3
+1.8.4	stable		gcc/4.8.4
+1.8.4	stable		gcc/4.9.2
+1.8.8	deprecated	gcc/4.8.4
+1.8.8	stable		gcc/4.8.5
+1.8.8	stable		gcc/4.9.3
+1.8.8	deprecated	gcc/5.2.0
+1.8.8	stable		gcc/5.3.0
+1.8.8	unstable	gcc/6.1.0
diff --git a/Libraries/gmp/5/variants b/Libraries/gmp/5/variants
index cce472f..a951566 100644
--- a/Libraries/gmp/5/variants
+++ b/Libraries/gmp/5/variants
@@ -1 +1 @@
-5.1.1	Linux,Darwin	stable	
+5.1.1	stable	
diff --git a/Libraries/gmp/6/variants b/Libraries/gmp/6/variants
index 69b6344..a18f6eb 100644
--- a/Libraries/gmp/6/variants
+++ b/Libraries/gmp/6/variants
@@ -1,2 +1,2 @@
-6.0.0	Linux,Darwin	stable	
-6.1.0	Linux,Darwin	stable	
+6.0.0	stable	
+6.1.0	stable	
diff --git a/Libraries/mpc/1/variants b/Libraries/mpc/1/variants
index 11d5178..9062e76 100644
--- a/Libraries/mpc/1/variants
+++ b/Libraries/mpc/1/variants
@@ -1,2 +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
+1.0.2	stable		b:gmp/5.1.1 b:mpfr/3.1.2
+1.0.3	stable		b:gmp/6.1.0 b:mpfr/3.1.4
diff --git a/Libraries/mpfr/3/variants b/Libraries/mpfr/3/variants
index 3c5abe5..0f0939d 100644
--- a/Libraries/mpfr/3/variants
+++ b/Libraries/mpfr/3/variants
@@ -1,3 +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
+mpfr/3.1.2	stable		b:gmp/5.1.1
+mpfr/3.1.3	stable		b:gmp/6.0.0
+mpfr/3.1.4	stable		b:gmp/6.1.0
diff --git a/Libraries/mpfr/build b/Libraries/mpfr/build
index 7f6a158..65bb324 100755
--- a/Libraries/mpfr/build
+++ b/Libraries/mpfr/build
@@ -14,5 +14,4 @@ declare -rx CC=gcc
 module use 'Libraries'
 
 pbuild::add_to_group 'Libraries'
-pbuild::set_build_dependencies 'gmp'
 pbuild::make_all
diff --git a/Libraries/tiff/4/variants b/Libraries/tiff/4/variants
new file mode 100644
index 0000000..ea60f69
--- /dev/null
+++ b/Libraries/tiff/4/variants
@@ -0,0 +1 @@
+tiff/4.0.3	stable
diff --git a/Libraries/tiff/build b/Libraries/tiff/build
index 015dce2..6035cb4 100755
--- a/Libraries/tiff/build
+++ b/Libraries/tiff/build
@@ -9,6 +9,7 @@ pbuild::configure() {
 		|| exit 1
 }
 
+CC=gcc
+
 pbuild::add_to_group 'Libraries'
-pbuild::set_build_dependencies "${COMPILER}"
 pbuild::make_all
diff --git a/MPI/hdf5/1.10/variants b/MPI/hdf5/1.10/variants
index edc2286..4c9b517 100644
--- a/MPI/hdf5/1.10/variants
+++ b/MPI/hdf5/1.10/variants
@@ -1,4 +1,5 @@
-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
+1.10.0	unstable	gcc/4.8.5 openmpi/1.10.2
+1.10.0	unstable	gcc/4.9.3 openmpi/1.10.2
+1.10.0	unstable	gcc/5.3.0 openmpi/1.10.2
+1.10.0	unstable	gcc/6.1.0 openmpi/1.10.2
 
diff --git a/MPI/hdf5/1.8/variants b/MPI/hdf5/1.8/variants
index 4445b4a..437bd40 100644
--- a/MPI/hdf5/1.8/variants
+++ b/MPI/hdf5/1.8/variants
@@ -1,34 +1,34 @@
-1.8.12	Linux,Darwin	stable		gcc/4.7.4 openmpi/1.6.5
-1.8.12	Linux,Darwin	stable		gcc/4.7.4 openmpi/1.8.2
-1.8.12	Linux,Darwin	stable		gcc/4.7.4 openmpi/1.8.4
-1.8.12	Linux,Darwin	stable		gcc/4.8.3 openmpi/1.6.5
-1.8.12	Linux,Darwin	stable		gcc/4.8.3 openmpi/1.8.2
-1.8.12	Linux,Darwin	stable		gcc/4.8.3 openmpi/1.8.4
-1.8.12	Linux,Darwin	stable		gcc/4.8.4 openmpi/1.6.5
-1.8.12	Linux,Darwin	stable		gcc/4.8.4 openmpi/1.8.2
-1.8.12	Linux,Darwin	stable		gcc/4.8.4 openmpi/1.8.4
-1.8.12	Linux,Darwin	stable		gcc/4.9.2 openmpi/1.6.5
-1.8.12	Linux,Darwin	stable		gcc/4.9.2 openmpi/1.8.2
-1.8.12	Linux,Darwin	stable		gcc/4.9.2 openmpi/1.8.4
-1.8.14	Linux,Darwin	stable		gcc/4.7.4 openmpi/1.6.5
-1.8.14	Linux,Darwin	stable		gcc/4.7.4 openmpi/1.8.2
-1.8.14	Linux,Darwin	stable		gcc/4.7.4 openmpi/1.8.4
-1.8.14	Linux,Darwin	stable		gcc/4.8.3 openmpi/1.6.5
-1.8.14	Linux,Darwin	stable		gcc/4.8.3 openmpi/1.8.2
-1.8.14	Linux,Darwin	stable		gcc/4.8.3 openmpi/1.8.4
-1.8.14	Linux,Darwin	stable		gcc/4.8.4 openmpi/1.6.5
-1.8.14	Linux,Darwin	stable		gcc/4.8.4 openmpi/1.8.2
-1.8.14	Linux,Darwin	stable		gcc/4.8.4 openmpi/1.8.4
-1.8.14	Linux,Darwin	stable		gcc/4.8.4 openmpi/1.8.8
-1.8.14	Linux,Darwin	stable		gcc/4.9.2 openmpi/1.6.5
-1.8.14	Linux,Darwin	stable		gcc/4.9.2 openmpi/1.8.2
-1.8.14	Linux,Darwin	stable		gcc/4.9.2 openmpi/1.8.4
-1.8.15.1 Linux,Darwin	stable		gcc/5.2.0 openmpi/1.8.8
-1.8.16	Linux,Darwin	stable		gcc/4.8.5 openmpi/1.8.8
-1.8.16	Linux,Darwin	stable		gcc/4.8.5 openmpi/1.10.2
-1.8.16	Linux,Darwin	stable		gcc/4.9.3 openmpi/1.8.8
-1.8.16	Linux,Darwin	stable		gcc/4.9.3 openmpi/1.10.2
-1.8.16	Linux,Darwin	stable		gcc/5.3.0 openmpi/1.8.8
-1.8.16	Linux,Darwin	stable		gcc/5.3.0 openmpi/1.10.2
-1.8.16	Linux,Darwin	unstable	gcc/6.1.0 openmpi/1.8.8
-1.8.16	Linux,Darwin	unstable	gcc/6.1.0 openmpi/1.10.2
+1.8.12	stable		gcc/4.7.4 openmpi/1.6.5
+1.8.12	stable		gcc/4.7.4 openmpi/1.8.2
+1.8.12	stable		gcc/4.7.4 openmpi/1.8.4
+1.8.12	stable		gcc/4.8.3 openmpi/1.6.5
+1.8.12	stable		gcc/4.8.3 openmpi/1.8.2
+1.8.12	stable		gcc/4.8.3 openmpi/1.8.4
+1.8.12	stable		gcc/4.8.4 openmpi/1.6.5
+1.8.12	stable		gcc/4.8.4 openmpi/1.8.2
+1.8.12	stable		gcc/4.8.4 openmpi/1.8.4
+1.8.12	deprecated	gcc/4.9.2 openmpi/1.6.5
+1.8.12	deprecated	gcc/4.9.2 openmpi/1.8.2
+1.8.12	deprecated	gcc/4.9.2 openmpi/1.8.4
+1.8.14	stable		gcc/4.7.4 openmpi/1.6.5
+1.8.14	stable		gcc/4.7.4 openmpi/1.8.2
+1.8.14	stable		gcc/4.7.4 openmpi/1.8.4
+1.8.14	stable		gcc/4.8.3 openmpi/1.6.5
+1.8.14	stable		gcc/4.8.3 openmpi/1.8.2
+1.8.14	stable		gcc/4.8.3 openmpi/1.8.4
+1.8.14	stable		gcc/4.8.4 openmpi/1.6.5
+1.8.14	stable		gcc/4.8.4 openmpi/1.8.2
+1.8.14	stable		gcc/4.8.4 openmpi/1.8.4
+1.8.14	stable		gcc/4.8.4 openmpi/1.8.8
+1.8.14	deprecated	gcc/4.9.2 openmpi/1.6.5
+1.8.14	deprecated	gcc/4.9.2 openmpi/1.8.2
+1.8.14	deprecated	gcc/4.9.2 openmpi/1.8.4
+1.8.15.1 deprecated	gcc/5.2.0 openmpi/1.8.8
+1.8.16	stable		gcc/4.8.5 openmpi/1.8.8
+1.8.16	stable		gcc/4.8.5 openmpi/1.10.2
+1.8.16	stable		gcc/4.9.3 openmpi/1.8.8
+1.8.16	stable		gcc/4.9.3 openmpi/1.10.2
+1.8.16	stable		gcc/5.3.0 openmpi/1.8.8
+1.8.16	stable		gcc/5.3.0 openmpi/1.10.2
+1.8.16	unstable	gcc/6.1.0 openmpi/1.8.8
+1.8.16	unstable	gcc/6.1.0 openmpi/1.10.2
diff --git a/MPI/hdf5/build b/MPI/hdf5/build
index e26db7f..e44dbbb 100755
--- a/MPI/hdf5/build
+++ b/MPI/hdf5/build
@@ -22,8 +22,6 @@ pbuild::configure() {
 
 
 pbuild::add_to_group 'MPI'
-pbuild::set_runtime_dependencies "${COMPILER}" "${MPI}"
-#pbuild::set_build_dependencies "${COMPILER}" "${MPI}"
 pbuild::set_docfiles \
 		ACKNOWLEDGMENTS \
 		COPYING \
diff --git a/MPI/parmetis/3/variants b/MPI/parmetis/3/variants
index 784cec8..7877450 100644
--- a/MPI/parmetis/3/variants
+++ b/MPI/parmetis/3/variants
@@ -1,17 +1,19 @@
-3.2.0	Linux,Darwin	stable		gcc/4.7.4 openmpi/1.6.5
-3.2.0	Linux,Darwin	stable		gcc/4.7.4 openmpi/1.8.2
-3.2.0	Linux,Darwin	stable		gcc/4.7.4 openmpi/1.8.4
-3.2.0	Linux,Darwin	stable		gcc/4.7.4 openmpi/1.8.8
-3.2.0	Linux,Darwin	stable		gcc/4.8.3 openmpi/1.6.5
-3.2.0	Linux,Darwin	stable		gcc/4.8.3 openmpi/1.8.2
-3.2.0	Linux,Darwin	stable		gcc/4.8.3 openmpi/1.8.4
-3.2.0	Linux,Darwin	stable		gcc/4.8.4 openmpi/1.6.5
-3.2.0	Linux,Darwin	stable		gcc/4.8.4 openmpi/1.8.2
-3.2.0	Linux,Darwin	stable		gcc/4.8.4 openmpi/1.8.4
-3.2.0	Linux,Darwin	stable		gcc/4.8.5 openmpi/1.8.8
-3.2.0	Linux,Darwin	stable		gcc/4.9.2 openmpi/1.6.5
-3.2.0	Linux,Darwin	stable		gcc/4.9.2 openmpi/1.8.2
-3.2.0	Linux,Darwin	stable		gcc/4.9.2 openmpi/1.8.4
-3.2.0	Linux,Darwin	stable		gcc/4.9.3 openmpi/1.8.8
-3.2.0	Linux,Darwin	unstable	gcc/5.3.0 openmpi/1.8.8
-3.2.0	Linux,Darwin	unstable	gcc/5.3.0 openmpi/1.10.2
+3.2.0	stable		gcc/4.7.4 openmpi/1.6.5
+3.2.0	stable		gcc/4.7.4 openmpi/1.8.2
+3.2.0	stable		gcc/4.7.4 openmpi/1.8.4
+3.2.0	stable		gcc/4.7.4 openmpi/1.8.8
+3.2.0	stable		gcc/4.8.3 openmpi/1.6.5
+3.2.0	stable		gcc/4.8.3 openmpi/1.8.2
+3.2.0	stable		gcc/4.8.3 openmpi/1.8.4
+3.2.0	stable		gcc/4.8.4 openmpi/1.6.5
+3.2.0	stable		gcc/4.8.4 openmpi/1.8.2
+3.2.0	stable		gcc/4.8.4 openmpi/1.8.4
+3.2.0	stable		gcc/4.8.5 openmpi/1.8.8
+3.2.0	stable		gcc/4.9.2 openmpi/1.6.5
+3.2.0	stable		gcc/4.9.2 openmpi/1.8.2
+3.2.0	stable		gcc/4.9.2 openmpi/1.8.4
+3.2.0	stable		gcc/4.9.3 openmpi/1.8.8
+3.2.0	unstable	gcc/5.3.0 openmpi/1.8.8
+3.2.0	unstable	gcc/5.3.0 openmpi/1.10.2
+3.2.0	unstable	gcc/6.1.0 openmpi/1.8.8
+3.2.0	unstable	gcc/6.1.0 openmpi/1.10.2
diff --git a/MPI/parmetis/4/variants b/MPI/parmetis/4/variants
index 8a17dc0..3c39cce 100644
--- a/MPI/parmetis/4/variants
+++ b/MPI/parmetis/4/variants
@@ -1 +1,2 @@
-4.0.3	Linux,Darwin	unstable	gcc/5.3.0 openmpi/1.10.2 cmake
+4.0.3	unstable	gcc/5.3.0 openmpi/1.10.2 cmake
+4.0.3	unstable	gcc/6.1.0 openmpi/1.10.2 cmake
diff --git a/MX/phenix/build b/MX/phenix/build
index 100ef8d..bef16e9 100755
--- a/MX/phenix/build
+++ b/MX/phenix/build
@@ -15,6 +15,5 @@ pbuild::install() {
 
 
 pbuild::add_to_group 'MX'
-pbuild::set_build_dependencies ''
 pbuild::make_all
 
diff --git a/Programming/Python/2/variants b/Programming/Python/2/variants
index ddf75fe..dedba44 100644
--- a/Programming/Python/2/variants
+++ b/Programming/Python/2/variants
@@ -1 +1 @@
-2.7.11	Linux,Darwin	unstable	openssl/1.0.2h Tcl/8.6.4 Tk/8.6.4
+2.7.11	unstable	openssl/1.0.2h Tcl/8.6.4 Tk/8.6.4
diff --git a/Programming/gcc/4/non-dead-strip.patch b/Programming/gcc/4/non-dead-strip.patch
new file mode 100644
index 0000000..dda4e8d
--- /dev/null
+++ b/Programming/gcc/4/non-dead-strip.patch
@@ -0,0 +1,16 @@
+diff --git a/gcc/config/darwin.c b/gcc/config/darwin.c
+index 40804b8..0080299 100644
+--- a/gcc/config/darwin.c
++++ b/gcc/config/darwin.c
+@@ -1259,6 +1259,11 @@ darwin_encode_section_info (tree decl, rtx rtl, int first ATTRIBUTE_UNUSED)
+ void
+ darwin_mark_decl_preserved (const char *name)
+ {
++  /* Actually we shouldn't mark any local symbol this way, but for now
++     this only happens with ObjC meta-data.  */
++  if (darwin_label_is_anonymous_local_objc_name (name))
++    return;
++
+   fprintf (asm_out_file, "\t.no_dead_strip ");
+   assemble_name (asm_out_file, name);
+   fputc ('\n', asm_out_file);
diff --git a/Programming/gcc/4/variants b/Programming/gcc/4/variants
index 7a5148e..893a8e3 100644
--- a/Programming/gcc/4/variants
+++ b/Programming/gcc/4/variants
@@ -1,7 +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	deprecated	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
+gcc/4.7.4	stable		b:gmp/5.1.1 b:mpfr/3.1.2 b:mpc/1.0.2
+gcc/4.8.3	stable		b:gmp/5.1.1 b:mpfr/3.1.2 b:mpc/1.0.2
+gcc/4.8.4	stable		b:gmp/5.1.1 b:mpfr/3.1.2 b:mpc/1.0.2
+gcc/4.8.5	stable		b:gmp/6.0.0 b:mpfr/3.1.3 b:mpc/1.0.3
+gcc/4.9.0	deprecated	b:gmp/5.1.1 b.mpfr/3.1.2 b:mpc/1.0.2
+gcc/4.9.2	deprecated	b:gmp/5.1.1 b:mpfr/3.1.2 b:mpc/1.0.2
+gcc/4.9.3	stable		b:gmp/6.1.0 b:mpfr/3.1.4 b:mpc/1.0.3
diff --git a/Programming/gcc/5/variants b/Programming/gcc/5/variants
index 873ad2d..e71b999 100644
--- a/Programming/gcc/5/variants
+++ b/Programming/gcc/5/variants
@@ -1,4 +1,4 @@
-5.1.0	Linux,Darwin	deprecated	gmp/5.1.1 mpfr/3.1.2 mpc/1.0.2
-5.2.0	Linux,Darwin	deprecated	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
+gcc/5.1.0	deprecated	b:gmp/5.1.1 b:mpfr/3.1.2 b:mpc/1.0.2
+gcc/5.2.0	deprecated	b:gmp/6.0.0 b:mpfr/3.1.3 b:mpc/1.0.3
+gcc/5.3.0	stable		b:gmp/6.0.0 b:mpfr/3.1.3 b:mpc/1.0.3
 
diff --git a/Programming/gcc/6/variants b/Programming/gcc/6/variants
index e17362d..6dbf940 100644
--- a/Programming/gcc/6/variants
+++ b/Programming/gcc/6/variants
@@ -1 +1 @@
-6.1.0	Linux,Darwin	unstable	gmp/6.1.0 mpfr/3.1.4 mpc/1.0.3
+gcc/6.1.0	unstable	b:gmp/6.1.0 b:mpfr/3.1.4 b:mpc/1.0.3
diff --git a/Programming/gcc/build b/Programming/gcc/build
index 3dfe59d..6a81083 100755
--- a/Programming/gcc/build
+++ b/Programming/gcc/build
@@ -1,5 +1,11 @@
 #!/usr/bin/env modbuild
 
+pbuild::patch_sources_Darwin() {
+	if [[ "${V_MAJOR}" == "4" ]]; then
+		patch -p1 < "${BUILD_BLOCK_DIR}/${V_MAJOR}/non-dead-strip.patch"
+	fi
+}
+
 pbuild::configure() {
 	"${MODULE_SRCDIR}"/configure \
 		--prefix="${PREFIX}" \
@@ -10,17 +16,15 @@ pbuild::configure() {
 		--enable-lto \
 		--disable-multilib \
 		--with-pkgversion="PSI Environment Module" \
+		--with-build-config=bootstrap-debug \
 		|| exit 1
 }
 
-
 # use system gcc to compile
 declare -rx CC=gcc
 declare -rx CXX=g++
 
-module use 'Libraries'
 pbuild::add_to_group 'Programming'
-#pbuild::set_build_dependencies 'gmp' 'mpfr' 'mpc'
 pbuild::set_docfiles 'COPYING' 'COPYING.LIB' 'COPYING.RUNTIME' 'COPYING3' 'COPYING3.LIB' 'NEWS' 'README'
 pbuild::make_all
 
diff --git a/bin/manage_variants b/bin/manage_variants
index 799dcf6..200a799 100755
--- a/bin/manage_variants
+++ b/bin/manage_variants
@@ -3,14 +3,12 @@
 declare buildblock=$1
 declare variants=$2
 
-
 declare -r OS=$(uname -s)
 
 # File format example
-# 1.10.2	Linux,Darwin	unstable	gcc/4.8.5
+# 1.10.2	unstable	gcc/4.8.5
 declare -a toks=()
 declare version=''
-declare oss=''
 declare release=''
 declare -a dependencies=()
 
@@ -18,13 +16,11 @@ 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} )
+	module=${toks[0]}
+	release=${toks[1]}
+	dependencies=( ${toks[@]:2} )
 
-	[[ "${oss}" =~ "${OS}" ]] || continue
-	"${buildblock}"  "${version}" --release=${release} "${dependencies[@]/#/--with=}"
+	"${buildblock}"  "${module#*/}" --release=${release} "${dependencies[@]/#/--with=}"
 	if [[ $? != 0 ]]; then
 		echo "Failed building:  ${version} --release=${release} ${dependencies[@]/#/--with=}" 1>&2
 		exit 42