proj/gentoo: Initial commit

This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.

This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.

Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.

Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed

6 files changed, 870 insertions, 0 deletions

diff --git a/sci-libs/cbflib/files/0.9.0-Makefile.patch b/sci-libs/cbflib/files/0.9.0-Makefile.patch
new file mode 100644
index 000000000000..914152c9e9e0
--- /dev/null
+++ b/sci-libs/cbflib/files/0.9.0-Makefile.patch
@@ -0,0 +1,104 @@
+diff --git a/Makefile_LINUX_gcc42 b/Makefile_LINUX_gcc42
+index 52c5286..5c894a0 100644
+--- a/Makefile_LINUX_gcc42
++++ b/Makefile_LINUX_gcc42
+@@ -250,7 +250,10 @@
+ 
+ 
+ # Version string
+-VERSION = 0.9.0
++MAJOR = 0
++MINOR = 9
++MICRO = 0
++VERSION = ${MAJOR}.${MINOR}.${MICRO}
+ 
+ 
+ #
+@@ -282,7 +285,7 @@ SHAR	= /usr/bin/shar
+ #
+ # Program to use to create archives
+ #
+-AR	= /usr/bin/ar
++AR	= ar
+ 
+ #
+ # Program to use to add an index to an archive
+@@ -292,13 +295,13 @@ RANLIB  = /usr/bin/ranlib
+ #
+ # Program to use to decompress a data file
+ #
+-DECOMPRESS = /usr/bin/bunzip2
++DECOMPRESS = bunzip2
+ 
+ 
+ #
+ # Program to use to compress a data file
+ #
+-COMPRESS = /usr/bin/bzip2
++COMPRESS = bzip2
+ 
+ #
+ # Program to use to generate a signature
+@@ -486,9 +489,9 @@ F90SOURCE = $(SRC)/fcb_atol_wcnt.f90     \
+ 		    $(SRC)/fcb_read_image.f90    \
+ 		    $(SRC)/fcb_read_line.f90     \
+ 		    $(SRC)/fcb_read_xds_i2.f90   \
+-		    $(SRC)/fcb_skip_whitespace.f90 \
+-		    $(EXAMPLES)/test_fcb_read_image.f90 \
+-		    $(EXAMPLES)/test_xds_binary.f90
++		    $(SRC)/fcb_skip_whitespace.f90
++#		    $(EXAMPLES)/test_fcb_read_image.f90 \
++#		    $(EXAMPLES)/test_xds_binary.f90
+ 		    
+ 		   
+ #
+@@ -663,7 +666,7 @@ all::	$(BIN)/test_xds_binary   \
+ 		$(BIN)/test_fcb_read_image
+ endif
+ 
+-shared:	$(SOLIB)/libcbf.so $(SOLIB)/libfcb.so $(SOLIB)/libimg.so
++shared:	$(SOLIB)/libcbf.so.${VERSION} $(SOLIB)/libfcb.so.${VERSION} $(SOLIB)/libimg.so.${VERSION}
+ 
+ javawrapper: shared $(JAVADIR) $(JAVADIR)/cbflib-$(VERSION).jar $(SOLIB)/libcbf_wrap.so
+ 
+@@ -846,10 +849,11 @@ ifneq ($(RANLIB),)
+ 	$(RANLIB) $@
+ endif
+ 
+-$(SOLIB)/libcbf.so: $(SOURCE) $(HEADERS) $(COMMONDEP) $(SOLIB)
++$(SOLIB)/libcbf.so.${VERSION}: $(SOURCE) $(HEADERS) $(COMMONDEP) $(SOLIB)
+ 	$(CC) $(CFLAGS) $(SOCFLAGS) $(INCLUDES) $(WARNINGS) -c $(SOURCE)
+ 	mv *.o $(SOLIB)
+-	$(CC) -o $@ $(SOLIB)/*.o $(SOLDFLAGS) $(EXTRALIBS)
++	$(CC) $(LDFLAGS) -Wl,-soname,libcbf.so.$(VERSION) $(SOCFLAGS) $(SOLDFLAGS) -o $@ $(SOLIB)/*.o $(EXTRALIBS)
++	ln -sf libcbf.so.$(VERSION) $(SOLIB)/libcbf.so
+ 
+ #
+ # IMG library
+@@ -862,9 +866,10 @@ ifneq ($(RANLIB),)
+ endif
+ 	rm img.o
+ 	
+-$(SOLIB)/libimg.so: $(SOURCE) $(HEADERS) $(COMMONDEP) $(SOLIB)
++$(SOLIB)/libimg.so.${VERSION}: $(SOURCE) $(HEADERS) $(COMMONDEP) $(SOLIB)
+ 	$(CC) $(CFLAGS) $(SOCFLAGS) $(INCLUDES) $(WARNINGS) -c $(EXAMPLES)/img.c
+-	$(CC) -o $@ img.o $(SOLDFLAGS)
++	$(CC) $(LDFLAGS) -Wl,-soname,libimg.so.$(VERSION) $(SOCFLAGS) $(SOLDFLAGS) -o $@ img.o
++	ln -sf libimg.so.$(VERSION) $(SOLIB)/libimg.so
+ 	rm img.o
+ 
+ #
+@@ -888,10 +893,11 @@ else
+ 	echo "Define F90C to build $(LIB)/libfcb.a"
+ endif
+ 
+-$(SOLIB)/libfcb.so: $(F90SOURCE) $(HEADERS) $(COMMONDEP) $(SOLIB)
++$(SOLIB)/libfcb.so.${VERSION}: $(F90SOURCE) $(HEADERS) $(COMMONDEP) $(SOLIB)
+ ifneq ($(F90C),)
+ 	$(F90C) $(F90FLAGS) $(SOCFLAGS) $(INCLUDES) $(WARNINGS) -c $(F90SOURCE)
+-	$(F90C) $(F90FLAGS) -o $@ *.o $(SOLDFLAGS)
++	$(F90C) $(LDFLAGS) -Wl,-soname,libfcb.so.$(VERSION) $(SOCFLAGS) $(SOLDFLAGS) $(F90FLAGS) -o $@ *.o
++	ln -sf libfcb.so.$(VERSION) $(SOLIB)/libfcb.so
+ 	rm *.o
+ else
+ 	echo "Define F90C to build $(SOLIB)/libfcb.so"
diff --git a/sci-libs/cbflib/files/0.9.0-python.patch b/sci-libs/cbflib/files/0.9.0-python.patch
new file mode 100644
index 000000000000..b18d019ff8e2
--- /dev/null
+++ b/sci-libs/cbflib/files/0.9.0-python.patch
@@ -0,0 +1,16 @@
+diff --git a/pycbf/setup.py b/pycbf/setup.py
+index 0763f06..7fe9ccc 100644
+--- a/pycbf/setup.py
++++ b/pycbf/setup.py
+@@ -9,9 +9,9 @@ from distutils.core import setup, Extension
+ e = Extension('_pycbf',
+               sources = ["pycbf_wrap.c","../src/cbf_simple.c"],
+          extra_compile_args=["-g"],
+-         library_dirs=["../lib/"],
++         library_dirs=["../solib/"],
+          libraries=["cbf"],
+          include_dirs = ["../include"] )
+             
+ # Build it
+-setup(name="_pycbf",ext_modules=[e],)
++setup(name="_pycbf",ext_modules=[e],py_modules=["pycbf"],)
diff --git a/sci-libs/cbflib/files/0.9.2.10-Makefile.patch b/sci-libs/cbflib/files/0.9.2.10-Makefile.patch
new file mode 100644
index 000000000000..9c72300873fc
--- /dev/null
+++ b/sci-libs/cbflib/files/0.9.2.10-Makefile.patch
@@ -0,0 +1,269 @@
+ Makefile_LINUX_gcc42 | 93 ++++++++++++++++++++++++++++------------------------
+ 1 file changed, 50 insertions(+), 43 deletions(-)
+
+diff --git a/Makefile_LINUX_gcc42 b/Makefile_LINUX_gcc42
+index 0aa639a..071863d 100644
+--- a/Makefile_LINUX_gcc42
++++ b/Makefile_LINUX_gcc42
+@@ -250,7 +250,11 @@
+ 
+ 
+ # Version string
+-VERSION = 0.9.2
++MAJOR = 0
++MINOR = 9
++MICRO = 3
++VERSION = ${MAJOR}.${MINOR}.${MICRO}
++
+ 
+ 
+ #
+@@ -297,12 +301,12 @@ SHAR	= /usr/bin/shar
+ #
+ # Program to use to create archives
+ #
+-AR	= /usr/bin/ar
++AR	?= ar
+ 
+ #
+ # Program to use to add an index to an archive
+ #
+-RANLIB  = /usr/bin/ranlib
++RANLIB  ?= ranlib
+ 
+ #
+ # Program to use to decompress a data file
+@@ -313,7 +317,7 @@ DECOMPRESS = bunzip2
+ #
+ # Program to use to compress a data file
+ #
+-COMPRESS = /usr/bin/bzip2
++COMPRESS = bzip2
+ 
+ #
+ # Program to use to generate a signature
+@@ -410,12 +414,12 @@ SETUP_PY = setup.py
+ #  with gcc version 4.2
+ #
+ #########################################################
+-CC	= gcc
+-C++	= g++
+-CFLAGS  = -g -O2 -Wall -D_USE_XOPEN_EXTENDED -fno-strict-aliasing
+-F90C = gfortran
+-F90FLAGS = -g -fno-range-check
+-F90LDFLAGS = 
++CC	?= gcc
++CXX	?= g++
++CFLAGS  += -Wall -D_USE_XOPEN_EXTENDED -fno-strict-aliasing
++FC ?= gfortran
++FCFLAGS += -g -fno-range-check
++LDFLAGS += 
+ SOCFLAGS = -fPIC
+ SOLDFLAGS = -shared -Wl,-rpath,$(INSTALLDIR)/lib
+ JAVAINCLUDES = -I$(JDKDIR)/include -I$(JDKDIR)/include/linux
+@@ -425,7 +429,7 @@ M4FLAGS = -Dfcb_bytes_in_rec=131072
+ TIME = time
+ 
+ ifneq ($(NOFORTRAN),)
+-F90C =
++FC =
+ endif
+ 
+ #
+@@ -491,9 +495,9 @@ RTLPEXPORTS = export LD_LIBRARY_PATH=$(PWD)/solib:$(PWD)/lib;\
+ .m4.f90:
+ 		m4 -P $(M4FLAGS) $< > $@
+ 
+-ifneq ($(F90C),)
++ifneq ($(FC),)
+ .f90.o:
+-		$(F90C) $(F90FLAGS) -c $< -o $@
++		$(FC) $(FCFLAGS) -c $< -o $@
+ endif
+ 
+ 
+@@ -701,7 +705,7 @@ default:
+ #
+ # Compile the library and examples
+ #
+-all::	$(BIN) $(SOURCE) $(F90SOURCE) $(HEADERS) $(HDF5)\
++all::	$(BIN) $(SOURCE) $(F90SOURCE) $(HEADERS) \
+ 		symlinksdone             \
+ 		$(REGEXDEP)              \
+ 		$(LIB)/libcbf.a          \
+@@ -725,12 +729,12 @@ all::	$(BIN) $(SOURCE) $(F90SOURCE) $(HEADERS) $(HDF5)\
+ 		$(BIN)/tiff2cbf
+ 
+ 
+-ifneq ($(F90C),)
++ifneq ($(FC),)
+ all::	$(BIN)/test_xds_binary   \
+ 		$(BIN)/test_fcb_read_image
+ endif
+ 
+-shared:	$(SOLIB)/libcbf.so $(SOLIB)/libfcb.so $(SOLIB)/libimg.so
++shared:	$(SOLIB)/libcbf.so.${VERSION} $(SOLIB)/libfcb.so.${VERSION} $(SOLIB)/libimg.so.${VERSION}
+ 
+ javawrapper: shared $(JCBF) $(JCBF)/cbflib-$(VERSION).jar $(SOLIB)/libcbf_wrap.so
+ 
+@@ -969,7 +973,7 @@ $(SRC)/cbf_stx.c: $(SRC)/cbf.stx.y
+ #
+ # CBF library
+ #
+-$(LIB)/libcbf.a: $(SOURCE) $(HEADERS) $(COMMONDEP) $(LIB) $(HDF5)
++$(LIB)/libcbf.a: $(SOURCE) $(HEADERS) $(COMMONDEP) $(LIB)
+ 	$(CC) $(CFLAGS) $(NOLLFLAG) $(NOREGEXFLAG) $(PYCIFRWFLAG) $(INCLUDES) $(WARNINGS) -c $(SOURCE)
+ 	$(AR) cr $@ *.o
+ 	mv *.o $(LIB)
+@@ -977,10 +981,11 @@ ifneq ($(RANLIB),)
+ 	$(RANLIB) $@
+ endif
+ 
+-$(SOLIB)/libcbf.so: $(SOURCE) $(HEADERS) $(COMMONDEP) $(SOLIB) $(HDF5)
+-	$(CC) $(CFLAGS) $(NOLLFLAG) $(NOREGEXFLAG) $(PYCIFRWFLAG) $(SOCFLAGS) $(INCLUDES) $(WARNINGS) -c $(SOURCE)
+-	$(CC) -o $@ *.o $(SOLDFLAGS) $(EXTRALIBS) $(HDF5SOLIBS)
+-	rm *.o
++$(SOLIB)/libcbf.so.${VERSION}: $(SOURCE) $(HEADERS) $(COMMONDEP) $(SOLIB)
++	$(CC) $(CFLAGS) $(NOREGEXFLAG) $(SOCFLAGS) $(INCLUDES) $(WARNINGS) -c $(SOURCE)
++	mv *.o $(SOLIB)
++	$(CC) $(LDFLAGS) -Wl,-soname,libcbf.so.$(VERSION) $(SOCFLAGS) $(SOLDFLAGS) -o $@ $(SOLIB)/*.o $(EXTRALIBS) $(HDF5SOLIBS)
++	ln -sf libcbf.so.$(VERSION) $(SOLIB)/libcbf.so
+ 
+ #
+ # IMG library
+@@ -993,9 +998,10 @@ ifneq ($(RANLIB),)
+ endif
+ 	rm img.o
+ 	
+-$(SOLIB)/libimg.so: $(SOURCE) $(HEADERS) $(COMMONDEP) $(SOLIB)
+-	$(CC) $(CFLAGS) $(NOLLFLAG) $(NOREGEXFLAG) $(SOCFLAGS) $(INCLUDES) $(WARNINGS) -c $(EXAMPLES)/img.c
+-	$(CC) -o $@ img.o $(SOLDFLAGS)
++$(SOLIB)/libimg.so.${VERSION}: $(SOURCE) $(HEADERS) $(COMMONDEP) $(SOLIB)
++	$(CC) $(CFLAGS) $(NOREGEXFLAG) $(SOCFLAGS) $(INCLUDES) $(WARNINGS) -c $(EXAMPLES)/img.c
++	$(CC) $(LDFLAGS) -Wl,-soname,libimg.so.$(VERSION) $(SOCFLAGS) $(SOLDFLAGS) -o $@ img.o -lm
++	ln -sf libimg.so.$(VERSION) $(SOLIB)/libimg.so
+ 	rm img.o
+ 
+ #
+@@ -1007,25 +1013,26 @@ CBF_IMG_LIBS:  $(LIB)/libcbf.a $(LIB)/libimg.a
+ #
+ # FCB library
+ #
+-$(LIB)/libfcb.a: $(F90SOURCE) $(COMMONDEP) $(LIB) $(HDF5)
+-ifneq ($(F90C),)
+-	$(F90C) $(F90FLAGS) -c $(F90SOURCE)
++$(LIB)/libfcb.a: $(F90SOURCE) $(COMMONDEP) $(LIB)
++ifneq ($(FC),)
++	$(FC) $(FCFLAGS) -c $(F90SOURCE)
+ 	$(AR) cr $@ *.o
+ ifneq ($(RANLIB),)
+ 	$(RANLIB) $@
+ endif
+ 	rm *.o
+ else
+-	echo "Define F90C to build $(LIB)/libfcb.a"
++	echo "Define FC to build $(LIB)/libfcb.a"
+ endif
+ 
+-$(SOLIB)/libfcb.so: $(F90SOURCE) $(HEADERS) $(COMMONDEP) $(SOLIB)
+-ifneq ($(F90C),)
+-	$(F90C) $(F90FLAGS) $(SOCFLAGS) $(INCLUDES) $(WARNINGS) -c $(F90SOURCE)
+-	$(F90C) $(F90FLAGS) -o $@ *.o $(SOLDFLAGS)
++$(SOLIB)/libfcb.so.${VERSION}: $(F90SOURCE) $(HEADERS) $(COMMONDEP) $(SOLIB)
++ifneq ($(FC),)
++	$(FC) $(FCFLAGS) $(SOCFLAGS) $(INCLUDES) $(WARNINGS) -c $(F90SOURCE)
++	$(FC) $(LDFLAGS) -Wl,-soname,libfcb.so.$(VERSION) $(SOCFLAGS) $(SOLDFLAGS) $(FCFLAGS) -o $@ *.o
++	ln -sf libfcb.so.$(VERSION) $(SOLIB)/libfcb.so
+ 	rm *.o
+ else
+-	echo "Define F90C to build $(SOLIB)/libfcb.so"
++	echo "Define FC to build $(SOLIB)/libfcb.so"
+ endif
+ 
+ 
+@@ -1183,7 +1190,7 @@ $(BIN)/cbf_template_t: $(DECTRIS_EXAMPLES)/cbf_template_t.c \
+ # testcell example program
+ #
+ $(BIN)/testcell: $(LIB)/libcbf.a $(EXAMPLES)/testcell.C
+-	$(C++) $(CFLAGS) $(NOLLFLAG) $(NOREGEXFLAG) $(INCLUDES) $(WARNINGS) \
++	$(CXX) $(CFLAGS) $(NOLLFLAG) $(NOREGEXFLAG) $(INCLUDES) $(WARNINGS) \
+ 			  $(EXAMPLES)/testcell.C -L$(LIB) \
+ 		  -lcbf $(EXTRALIBS) $(HDF5LIBS) -o $@
+ 
+@@ -1191,7 +1198,7 @@ $(BIN)/testcell: $(LIB)/libcbf.a $(EXAMPLES)/testcell.C
+ # cif2c example program
+ #
+ $(BIN)/cif2c: $(LIB)/libcbf.a $(EXAMPLES)/cif2c.c
+-	$(C++) $(CFLAGS) $(NOLLFLAG) $(NOREGEXFLAG) $(INCLUDES) $(WARNINGS) \
++	$(CXX) $(CFLAGS) $(NOLLFLAG) $(NOREGEXFLAG) $(INCLUDES) $(WARNINGS) \
+ 			  $(EXAMPLES)/cif2c.c -L$(LIB) \
+ 		  -lcbf $(EXTRALIBS) $(HDF5LIBS) -o $@
+ 
+@@ -1199,7 +1206,7 @@ $(BIN)/cif2c: $(LIB)/libcbf.a $(EXAMPLES)/cif2c.c
+ # sauter_test example program
+ #
+ $(BIN)/sauter_test: $(LIB)/libcbf.a $(EXAMPLES)/sauter_test.C
+-	$(C++) $(CFLAGS) $(NOLLFLAG) $(NOREGEXFLAG) $(INCLUDES) $(WARNINGS) \
++	$(CXX) $(CFLAGS) $(NOLLFLAG) $(NOREGEXFLAG) $(INCLUDES) $(WARNINGS) \
+ 			  $(EXAMPLES)/sauter_test.C -L$(LIB) \
+ 		  -lcbf $(EXTRALIBS) $(HDF5LIBS) -o $@
+ 
+@@ -1253,19 +1260,19 @@ $(BIN)/testflatpacked: $(LIB)/libcbf.a $(EXAMPLES)/testflatpacked.c
+ 			  $(EXAMPLES)/testflatpacked.c -L$(LIB) \
+ 		  -lcbf $(EXTRALIBS) $(HDF5LIBS) -o $@
+ 
+-ifneq ($(F90C),)
++ifneq ($(FC),)
+ #
+ # test_xds_binary example program
+ #
+ $(BIN)/test_xds_binary: $(LIB)/libfcb.a $(EXAMPLES)/test_xds_binary.f90
+-	$(F90C) $(F90FLAGS) $(F90LDFLAGS) $(EXAMPLES)/test_xds_binary.f90 \
++	$(FC) $(FCFLAGS) $(LDFLAGS) $(EXAMPLES)/test_xds_binary.f90 \
+ 		-L$(LIB) -lfcb -o $@
+ 
+ #
+ # test_fcb_read_image example program
+ #
+ $(BIN)/test_fcb_read_image: $(LIB)/libfcb.a $(EXAMPLES)/test_fcb_read_image.f90
+-	$(F90C) $(F90FLAGS) $(F90LDFLAGS) $(EXAMPLES)/test_fcb_read_image.f90 \
++	$(FC) $(FCFLAGS) $(LDFLAGS) $(EXAMPLES)/test_fcb_read_image.f90 \
+ 		-L$(LIB) -lfcb -o $@
+ endif
+ 
+@@ -1520,7 +1527,7 @@ basic:	$(BIN)/makecbf $(BIN)/img2cif $(BIN)/cif2cbf $(TESTINPUT_BASIC)
+ #
+ # Extra Tests
+ #
+-ifneq ($(F90C),)
++ifneq ($(FC),)
+ extra:	$(BIN)/convert_image $(BIN)/convert_minicbf $(BIN)/cif2cbf $(BIN)/testcell \
+ 	$(BIN)/testreals $(BIN)/testflat $(BIN)/testflatpacked \
+ 	$(BIN)/test_xds_binary $(BIN)/test_fcb_read_image $(BIN)/convert_minicbf \
+@@ -1582,7 +1589,7 @@ endif
+ 	-cmp testflatin.cbf testflatout.cbf
+ 	$(TIME) $(BIN)/testflatpacked
+ 	-cmp testflatpackedin.cbf testflatpackedout.cbf
+-ifneq ($(F90C),)
++ifneq ($(FC),)
+ 	echo testflatout.cbf | $(TIME) $(BIN)/test_xds_binary > test_xds_bin_testflatout.out
+ 	-$(DIFF) test_xds_bin_testflatout.out test_xds_bin_testflatout_orig.out
+ 	echo testflatpackedout.cbf | $(TIME) $(BIN)/test_xds_binary > test_xds_bin_testflatpackedout.out
+@@ -1599,7 +1606,7 @@ endif
+ 	$(TIME) $(BIN)/cif2cbf -I 4 -C 100. -L 0. -e n -c b -i XRD1621.cbf -o XRD1621_I4encbC100.cbf
+ 	-$(DIFF) XRD1621_I4encbC100.cbf XRD1621_I4encbC100_orig.cbf
+ 
+-ifneq ($(F90C),)
++ifneq ($(FC),)
+ extra_sigs_only:	$(BIN)/convert_image $(BIN)/convert_minicbf $(BIN)/cif2cbf $(BIN)/testcell \
+ 	$(BIN)/testreals $(BIN)/testflat $(BIN)/testflatpacked \
+ 	$(BIN)/test_xds_binary $(BIN)/test_fcb_read_image $(BIN)/convert_minicbf \
+@@ -1650,7 +1657,7 @@ endif
+ 	-cmp testflatin.cbf testflatout.cbf
+ 	$(TIME) $(BIN)/testflatpacked
+ 	-cmp testflatpackedin.cbf testflatpackedout.cbf
+-ifneq ($(F90C),)
++ifneq ($(FC),)
+ 	echo testflatout.cbf | $(TIME) $(BIN)/test_xds_binary | \
+ 	$(SIGNATURE) | $(DIFF) - test_xds_bin_testflatout_orig.out$(SEXT)
+ 	echo testflatpackedout.cbf | $(TIME) $(BIN)/test_xds_binary | \
diff --git a/sci-libs/cbflib/files/0.9.2.2-Makefile.patch b/sci-libs/cbflib/files/0.9.2.2-Makefile.patch
new file mode 100644
index 000000000000..a25760307275
--- /dev/null
+++ b/sci-libs/cbflib/files/0.9.2.2-Makefile.patch
@@ -0,0 +1,150 @@
+From 44e303d998c72d5d502705895a536b3657a7c4c5 Mon Sep 17 00:00:00 2001
+Message-Id: <44e303d998c72d5d502705895a536b3657a7c4c5.1323790511.git.jlec@gentoo.org>
+From: Justin Lecher <jlec@gentoo.org>
+Date: Tue, 13 Dec 2011 16:10:43 +0100
+Subject: [PATCH] 0.9.0 Makefile.patch
+
+Conflicts:
+
+	Makefile_LINUX_gcc42
+---
+ Makefile_LINUX_gcc42 |   63 ++++++++++++++++++++++++++-----------------------
+ 1 files changed, 33 insertions(+), 30 deletions(-)
+
+diff --git a/Makefile_LINUX_gcc42 b/Makefile_LINUX_gcc42
+index a74be5f..1cfb066 100644
+--- a/Makefile_LINUX_gcc42
++++ b/Makefile_LINUX_gcc42
+@@ -250,7 +250,10 @@
+ 
+ 
+ # Version string
+-VERSION = 0.9.2
++MAJOR = 0
++MINOR = 9
++MICRO = 2
++VERSION = ${MAJOR}.${MINOR}.${MICRO}
+ 
+ 
+ #
+@@ -290,7 +293,7 @@ SHAR	= /usr/bin/shar
+ #
+ # Program to use to create archives
+ #
+-AR	= /usr/bin/ar
++AR	= ar
+ 
+ #
+ # Program to use to add an index to an archive
+@@ -300,13 +303,13 @@ RANLIB  = /usr/bin/ranlib
+ #
+ # Program to use to decompress a data file
+ #
+-DECOMPRESS = /usr/bin/bunzip2
++DECOMPRESS = bunzip2
+ 
+ 
+ #
+ # Program to use to compress a data file
+ #
+-COMPRESS = /usr/bin/bzip2
++COMPRESS = bzip2
+ 
+ #
+ # Program to use to generate a signature
+@@ -509,21 +512,18 @@ SOURCE   =  $(SRC)/cbf.c               \
+ 
+ 
+ F90SOURCE = $(SRC)/fcb_atol_wcnt.f90     \
+-			$(SRC)/fcb_ci_strncmparr.f90 \
+-			$(SRC)/fcb_exit_binary.f90   \
+-			$(SRC)/fcb_nblen_array.f90   \
+-			$(SRC)/fcb_next_binary.f90   \
+-			$(SRC)/fcb_open_cifin.f90    \
+-			$(SRC)/fcb_packed.f90        \
+-			$(SRC)/fcb_read_bits.f90     \
+-			$(SRC)/fcb_read_byte.f90     \
+-			$(SRC)/fcb_read_image.f90    \
+-			$(SRC)/fcb_read_line.f90     \
+-			$(SRC)/fcb_read_xds_i2.f90   \
+-			$(SRC)/fcb_skip_whitespace.f90 \
+-			$(EXAMPLES)/test_fcb_read_image.f90 \
+-			$(EXAMPLES)/test_xds_binary.f90
+-			
++		    $(SRC)/fcb_ci_strncmparr.f90 \
++		    $(SRC)/fcb_exit_binary.f90   \
++		    $(SRC)/fcb_nblen_array.f90   \
++		    $(SRC)/fcb_next_binary.f90   \
++		    $(SRC)/fcb_open_cifin.f90    \
++		    $(SRC)/fcb_packed.f90        \
++		    $(SRC)/fcb_read_bits.f90     \
++		    $(SRC)/fcb_read_byte.f90     \
++		    $(SRC)/fcb_read_image.f90    \
++		    $(SRC)/fcb_read_line.f90     \
++		    $(SRC)/fcb_read_xds_i2.f90   \
++		    $(SRC)/fcb_skip_whitespace.f90
+ 		   
+ #
+ # Header files
+@@ -701,7 +701,7 @@ all::	$(BIN)/test_xds_binary   \
+ 		$(BIN)/test_fcb_read_image
+ endif
+ 
+-shared:	$(SOLIB)/libcbf.so $(SOLIB)/libfcb.so $(SOLIB)/libimg.so
++shared:	$(SOLIB)/libcbf.so.${VERSION} $(SOLIB)/libfcb.so.${VERSION} $(SOLIB)/libimg.so.${VERSION}
+ 
+ javawrapper: shared $(JCBF) $(JCBF)/cbflib-$(VERSION).jar $(SOLIB)/libcbf_wrap.so
+ 
+@@ -915,25 +915,27 @@ ifneq ($(RANLIB),)
+ 	$(RANLIB) $@
+ endif
+ 
+-$(SOLIB)/libcbf.so: $(SOURCE) $(HEADERS) $(COMMONDEP) $(SOLIB)
+-	$(CC) $(CFLAGS) $(NOLLFLAG) $(PYCIFRWFLAG) $(SOCFLAGS) $(INCLUDES) $(WARNINGS) -c $(SOURCE)
+-	$(CC) -o $@ *.o $(SOLDFLAGS) $(EXTRALIBS)
+-	rm *.o
++$(SOLIB)/libcbf.so.${VERSION}: $(SOURCE) $(HEADERS) $(COMMONDEP) $(SOLIB)
++	$(CC) $(CFLAGS) $(SOCFLAGS) $(INCLUDES) $(WARNINGS) -c $(SOURCE)
++	mv *.o $(SOLIB)
++	$(CC) $(LDFLAGS) -Wl,-soname,libcbf.so.$(VERSION) $(SOCFLAGS) $(SOLDFLAGS) -o $@ $(SOLIB)/*.o $(EXTRALIBS)
++	ln -sf libcbf.so.$(VERSION) $(SOLIB)/libcbf.so
+ 
+ #
+ # IMG library
+ #
+ $(LIB)/libimg.a: $(EXAMPLES)/img.c $(HEADERS) $(COMMONDEP) $(LIB)
+-	$(CC) $(CFLAGS) $(NOLLFLAG) $(INCLUDES) $(WARNINGS) -c $(EXAMPLES)/img.c
++	$(CC) $(CFLAGS) $(INCLUDES) $(WARNINGS) -c $(EXAMPLES)/img.c
+ 	$(AR) cr $@ img.o
+ ifneq ($(RANLIB),)
+ 	$(RANLIB) $@
+ endif
+ 	rm img.o
+ 	
+-$(SOLIB)/libimg.so: $(SOURCE) $(HEADERS) $(COMMONDEP) $(SOLIB)
+-	$(CC) $(CFLAGS) $(NOLLFLAG) $(SOCFLAGS) $(INCLUDES) $(WARNINGS) -c $(EXAMPLES)/img.c
+-	$(CC) -o $@ img.o $(SOLDFLAGS)
++$(SOLIB)/libimg.so.${VERSION}: $(SOURCE) $(HEADERS) $(COMMONDEP) $(SOLIB)
++	$(CC) $(CFLAGS) $(SOCFLAGS) $(INCLUDES) $(WARNINGS) -c $(EXAMPLES)/img.c
++	$(CC) $(LDFLAGS) -Wl,-soname,libimg.so.$(VERSION) $(SOCFLAGS) $(SOLDFLAGS) -o $@ img.o
++	ln -sf libimg.so.$(VERSION) $(SOLIB)/libimg.so
+ 	rm img.o
+ 
+ #
+@@ -957,10 +959,11 @@ else
+ 	echo "Define F90C to build $(LIB)/libfcb.a"
+ endif
+ 
+-$(SOLIB)/libfcb.so: $(F90SOURCE) $(HEADERS) $(COMMONDEP) $(SOLIB)
++$(SOLIB)/libfcb.so.${VERSION}: $(F90SOURCE) $(HEADERS) $(COMMONDEP) $(SOLIB)
+ ifneq ($(F90C),)
+ 	$(F90C) $(F90FLAGS) $(SOCFLAGS) $(INCLUDES) $(WARNINGS) -c $(F90SOURCE)
+-	$(F90C) $(F90FLAGS) -o $@ *.o $(SOLDFLAGS)
++	$(F90C) $(LDFLAGS) -Wl,-soname,libfcb.so.$(VERSION) $(SOCFLAGS) $(SOLDFLAGS) $(F90FLAGS) -o $@ *.o
++	ln -sf libfcb.so.$(VERSION) $(SOLIB)/libfcb.so
+ 	rm *.o
+ else
+ 	echo "Define F90C to build $(SOLIB)/libfcb.so"
+-- 
+1.7.8
+
diff --git a/sci-libs/cbflib/files/0.9.2.3-Makefile.patch b/sci-libs/cbflib/files/0.9.2.3-Makefile.patch
new file mode 100644
index 000000000000..b7c504225218
--- /dev/null
+++ b/sci-libs/cbflib/files/0.9.2.3-Makefile.patch
@@ -0,0 +1,150 @@
+From 44e303d998c72d5d502705895a536b3657a7c4c5 Mon Sep 17 00:00:00 2001
+Message-Id: <44e303d998c72d5d502705895a536b3657a7c4c5.1323790511.git.jlec@gentoo.org>
+From: Justin Lecher <jlec@gentoo.org>
+Date: Tue, 13 Dec 2011 16:10:43 +0100
+Subject: [PATCH] 0.9.0 Makefile.patch
+
+Conflicts:
+
+	Makefile_LINUX_gcc42
+---
+ Makefile_LINUX_gcc42 |   63 ++++++++++++++++++++++++++-----------------------
+ 1 files changed, 33 insertions(+), 30 deletions(-)
+
+diff --git a/Makefile_LINUX_gcc42 b/Makefile_LINUX_gcc42
+index a74be5f..1cfb066 100644
+--- a/Makefile_LINUX_gcc42
++++ b/Makefile_LINUX_gcc42
+@@ -250,7 +250,10 @@
+ 
+ 
+ # Version string
+-VERSION = 0.9.2
++MAJOR = 0
++MINOR = 9
++MICRO = 3
++VERSION = ${MAJOR}.${MINOR}.${MICRO}
+ 
+ 
+ #
+@@ -290,7 +293,7 @@ SHAR	= /usr/bin/shar
+ #
+ # Program to use to create archives
+ #
+-AR	= /usr/bin/ar
++AR	= ar
+ 
+ #
+ # Program to use to add an index to an archive
+@@ -300,13 +303,13 @@ RANLIB  = /usr/bin/ranlib
+ #
+ # Program to use to decompress a data file
+ #
+-DECOMPRESS = /usr/bin/bunzip2
++DECOMPRESS = bunzip2
+ 
+ 
+ #
+ # Program to use to compress a data file
+ #
+-COMPRESS = /usr/bin/bzip2
++COMPRESS = bzip2
+ 
+ #
+ # Program to use to generate a signature
+@@ -509,21 +512,18 @@ SOURCE   =  $(SRC)/cbf.c               \
+ 
+ 
+ F90SOURCE = $(SRC)/fcb_atol_wcnt.f90     \
+-			$(SRC)/fcb_ci_strncmparr.f90 \
+-			$(SRC)/fcb_exit_binary.f90   \
+-			$(SRC)/fcb_nblen_array.f90   \
+-			$(SRC)/fcb_next_binary.f90   \
+-			$(SRC)/fcb_open_cifin.f90    \
+-			$(SRC)/fcb_packed.f90        \
+-			$(SRC)/fcb_read_bits.f90     \
+-			$(SRC)/fcb_read_byte.f90     \
+-			$(SRC)/fcb_read_image.f90    \
+-			$(SRC)/fcb_read_line.f90     \
+-			$(SRC)/fcb_read_xds_i2.f90   \
+-			$(SRC)/fcb_skip_whitespace.f90 \
+-			$(EXAMPLES)/test_fcb_read_image.f90 \
+-			$(EXAMPLES)/test_xds_binary.f90
+-			
++		    $(SRC)/fcb_ci_strncmparr.f90 \
++		    $(SRC)/fcb_exit_binary.f90   \
++		    $(SRC)/fcb_nblen_array.f90   \
++		    $(SRC)/fcb_next_binary.f90   \
++		    $(SRC)/fcb_open_cifin.f90    \
++		    $(SRC)/fcb_packed.f90        \
++		    $(SRC)/fcb_read_bits.f90     \
++		    $(SRC)/fcb_read_byte.f90     \
++		    $(SRC)/fcb_read_image.f90    \
++		    $(SRC)/fcb_read_line.f90     \
++		    $(SRC)/fcb_read_xds_i2.f90   \
++		    $(SRC)/fcb_skip_whitespace.f90
+ 		   
+ #
+ # Header files
+@@ -701,7 +701,7 @@ all::	$(BIN)/test_xds_binary   \
+ 		$(BIN)/test_fcb_read_image
+ endif
+ 
+-shared:	$(SOLIB)/libcbf.so $(SOLIB)/libfcb.so $(SOLIB)/libimg.so
++shared:	$(SOLIB)/libcbf.so.${VERSION} $(SOLIB)/libfcb.so.${VERSION} $(SOLIB)/libimg.so.${VERSION}
+ 
+ javawrapper: shared $(JCBF) $(JCBF)/cbflib-$(VERSION).jar $(SOLIB)/libcbf_wrap.so
+ 
+@@ -915,25 +915,27 @@ ifneq ($(RANLIB),)
+ 	$(RANLIB) $@
+ endif
+ 
+-$(SOLIB)/libcbf.so: $(SOURCE) $(HEADERS) $(COMMONDEP) $(SOLIB)
+-	$(CC) $(CFLAGS) $(NOLLFLAG) $(NOREGEXFLAG) $(PYCIFRWFLAG) $(SOCFLAGS) $(INCLUDES) $(WARNINGS) -c $(SOURCE)
+-	$(CC) -o $@ *.o $(SOLDFLAGS) $(EXTRALIBS)
+-	rm *.o
++$(SOLIB)/libcbf.so.${VERSION}: $(SOURCE) $(HEADERS) $(COMMONDEP) $(SOLIB)
++	$(CC) $(CFLAGS) $(NOREGEXFLAG) $(SOCFLAGS) $(INCLUDES) $(WARNINGS) -c $(SOURCE)
++	mv *.o $(SOLIB)
++	$(CC) $(LDFLAGS) -Wl,-soname,libcbf.so.$(VERSION) $(SOCFLAGS) $(SOLDFLAGS) -o $@ $(SOLIB)/*.o $(EXTRALIBS)
++	ln -sf libcbf.so.$(VERSION) $(SOLIB)/libcbf.so
+ 
+ #
+ # IMG library
+ #
+ $(LIB)/libimg.a: $(EXAMPLES)/img.c $(HEADERS) $(COMMONDEP) $(LIB)
+-	$(CC) $(CFLAGS) $(NOLLFLAG) $(NOREGEXFLAG) $(INCLUDES) $(WARNINGS) -c $(EXAMPLES)/img.c
++	$(CC) $(CFLAGS) $(NOREGEXFLAG) $(INCLUDES) $(WARNINGS) -c $(EXAMPLES)/img.c
+ 	$(AR) cr $@ img.o
+ ifneq ($(RANLIB),)
+ 	$(RANLIB) $@
+ endif
+ 	rm img.o
+ 	
+-$(SOLIB)/libimg.so: $(SOURCE) $(HEADERS) $(COMMONDEP) $(SOLIB)
+-	$(CC) $(CFLAGS) $(NOLLFLAG) $(NOREGEXFLAG) $(SOCFLAGS) $(INCLUDES) $(WARNINGS) -c $(EXAMPLES)/img.c
+-	$(CC) -o $@ img.o $(SOLDFLAGS)
++$(SOLIB)/libimg.so.${VERSION}: $(SOURCE) $(HEADERS) $(COMMONDEP) $(SOLIB)
++	$(CC) $(CFLAGS) $(SOCFLAGS) $(NOREGEXFLAG) $(INCLUDES) $(WARNINGS) -c $(EXAMPLES)/img.c
++	$(CC) $(LDFLAGS) -Wl,-soname,libimg.so.$(VERSION) $(SOCFLAGS) $(SOLDFLAGS) -o $@ img.o -lm
++	ln -sf libimg.so.$(VERSION) $(SOLIB)/libimg.so
+ 	rm img.o
+ 
+ #
+@@ -957,10 +959,11 @@ else
+ 	echo "Define F90C to build $(LIB)/libfcb.a"
+ endif
+ 
+-$(SOLIB)/libfcb.so: $(F90SOURCE) $(HEADERS) $(COMMONDEP) $(SOLIB)
++$(SOLIB)/libfcb.so.${VERSION}: $(F90SOURCE) $(HEADERS) $(COMMONDEP) $(SOLIB)
+ ifneq ($(F90C),)
+ 	$(F90C) $(F90FLAGS) $(SOCFLAGS) $(INCLUDES) $(WARNINGS) -c $(F90SOURCE)
+-	$(F90C) $(F90FLAGS) -o $@ *.o $(SOLDFLAGS)
++	$(F90C) $(LDFLAGS) -Wl,-soname,libfcb.so.$(VERSION) $(SOCFLAGS) $(SOLDFLAGS) $(F90FLAGS) -o $@ *.o
++	ln -sf libfcb.so.$(VERSION) $(SOLIB)/libfcb.so
+ 	rm *.o
+ else
+ 	echo "Define F90C to build $(SOLIB)/libfcb.so"
+-- 
+1.7.8
+
diff --git a/sci-libs/cbflib/files/cbflib-0.9.3.3-unbundle.patch b/sci-libs/cbflib/files/cbflib-0.9.3.3-unbundle.patch
new file mode 100644
index 000000000000..ef24c4b94b22
--- /dev/null
+++ b/sci-libs/cbflib/files/cbflib-0.9.3.3-unbundle.patch
@@ -0,0 +1,181 @@
+ CMakeLists.txt | 118 +++------------------------------------------------------
+ 1 file changed, 6 insertions(+), 112 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 75054d6..15bab99 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -279,7 +279,7 @@ project (CBFlib C CXX Fortran)
+ enable_testing()
+ set (CBF_CMAKE_DEBUG "ON")
+ 
+-set(CMAKE_C_FLAGS "-Wall -fno-strict-aliasing")
++set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -fno-strict-aliasing")
+ 
+ #
+ #  User setable parameters
+@@ -530,42 +530,6 @@ find_package(ZLIB)
+ 
+ 
+ 
+-#Load external packages in build directory at cmake time
+-add_subdirectory(${CBF__EXTERNAL_PACKAGES}  "${CBF__EXT_PKG}")
+-
+-find_file(CBF_EXT_PKG_BLD_RUNNING cbf_ext_pkg_build_running "${CBF__EXT_PKG}")
+-if (${CBF_EXT_PKG_BLD_RUNNING} STREQUAL "CBF_EXT_PKG_BLD_RUNNING-NOTFOUND")
+-  file(WRITE "${CBF__EXT_PKG}/cbf_ext_pkg_build_running" "cbf_ext_pkg_build_running")
+-  CBF_DEBUG_MESSAGE("CMAKE_COMMAND:        ${CMAKE_COMMAND}")
+-  CBF_DEBUG_MESSAGE("CBFlib_SOURCE_DIR:    ${CBFlib_SOURCE_DIR} ")
+-  execute_process(
+-    COMMAND ${CMAKE_COMMAND} ${CBFlib_SOURCE_DIR}
+-    RESULT_VARIABLE CBF_BUILD_RESULT)
+-  CBF_DEBUG_MESSAGE("CBF_BUILD_RESULT: ${CBF_BUILD_RESULT}")
+-  execute_process(
+-    COMMAND ${CMAKE_COMMAND} --build ${CBFlib_BINARY_DIR} --target HDF5
+-    RESULT_VARIABLE CBF_BUILD_RESULT)
+-  CBF_DEBUG_MESSAGE("CBF_BUILD_RESULT: ${CBF_BUILD_RESULT}")
+-  execute_process(
+-    COMMAND ${CMAKE_COMMAND} --build ${CBFlib_BINARY_DIR} --target TIFF
+-    RESULT_VARIABLE CBF_BUILD_RESULT)
+-  CBF_DEBUG_MESSAGE("CBF_BUILD_RESULT: ${CBF_BUILD_RESULT}")
+-  file(REMOVE "${CBF__EXT_PKG}/cbf_ext_pkg_build_running")
+-endif (${CBF_EXT_PKG_BLD_RUNNING} STREQUAL "CBF_EXT_PKG_BLD_RUNNING-NOTFOUND")
+-
+-
+-file(GLOB CBF_HDF5_LIBRARY_PATH "${CMAKE_CURRENT_BINARY_DIR}/lib/*hdf5*")
+-CBF_DEBUG_MESSAGE( "CBF_HDF5_LIBRARY_PATH:  ${CBF_HDF5_LIBRARY_PATH}")
+-file(GLOB CBF_TIFF_LIBRARY_PATH "${CMAKE_CURRENT_BINARY_DIR}/lib/*tif*")
+-CBF_DEBUG_MESSAGE( "CBF_TIFF_LIBRARY_PATH: ${CBF_TIFF_LIBRARY_PATH}")
+-
+-if ("|${CBF_HDF5_LIBRARY_PATH}|" STREQUAL "||" OR "|${CBF_TIFF_LIBRARY_PATH}|" STREQUAL "||")
+-  MESSAGE(STATUS "Must build external packages in ${CBF__EXT_PKG}")
+-  MESSAGE(STATUS "Then rerun cmake")
+-  MESSAGE(WARNING "Finishing run to make Makefiles")
+-endif ("|${CBF_HDF5_LIBRARY_PATH}|" STREQUAL "||" OR "|${CBF_TIFF_LIBRARY_PATH}|" STREQUAL "||")
+-
+-
+ #
+ # Data Directories
+ #
+@@ -579,35 +543,6 @@ set(CBF_DATAURLBASE	"http://downloads.sf.net/cbflib")
+ set(CBF_DATAURLI  "${CBF_DATAURLBASE}/CBFlib_${CBF_VERSION}_Data_Files_Input.tar.gz")
+ set(CBF_DATAURLO  "${CBF_DATAURLBASE}/CBFlib_${CBF_VERSION}_Data_Files_Output.tar.gz")
+ set(CBF_DATAURLS  "${CBF_DATAURLBASE}/CBFlib_${CBF_VERSION}_Data_Files_Output_Sigs_Only.tar.gz")
+-#
+-# Load and unpack the Data Files
+-#
+-CBF_LOAD_TARBALL(${CBF__DATA} ${CBF_DATADIRI} ${CBF_DATAURLI})
+-CBF_LOAD_TARBALL(${CBF__DATA} ${CBF_DATADIRO} ${CBF_DATAURLO})
+-CBF_LOAD_TARBALL(${CBF__DATA} ${CBF_DATADIRS} ${CBF_DATAURLS})
+-#
+-# Verify the checksums
+-#
+-file(GLOB CBF_DATADIRI_FILES "${CBF_DATADIRI}/*")
+-file(GLOB CBF_DATADIRO_FILES "${CBF_DATADIRO}/*")
+-foreach(loop_file ${CBF_DATADIRI_FILES} )
+-  if (NOT "${loop_file}" MATCHES "[*.]md5")
+-    file(MD5 "${loop_file}" loop_file_md5)
+-    file(STRINGS "${loop_file}.md5" loop_file_md5_orig LIMIT_COUNT 1)
+-    if (NOT ("${loop_file_md5}" STREQUAL "${loop_file_md5_orig}"))
+-      message(WARNINH "loop_file: ${loop_file}:|${loop_file_md5}|${loop_file_md5_orig}|")
+-    endif (NOT ("${loop_file_md5}" STREQUAL "${loop_file_md5_orig}"))
+-  endif (NOT "${loop_file}" MATCHES "[*.]md5")
+-endforeach(loop_file)
+-foreach(loop_file ${CBF_DATADIRO_FILES} )
+-  if (NOT "${loop_file}" MATCHES "[*.]md5")
+-    file(MD5 "${loop_file}" loop_file_md5)
+-    file(STRINGS "${loop_file}.md5" loop_file_md5_orig LIMIT_COUNT 1)
+-    if (NOT ("${loop_file_md5}" STREQUAL "${loop_file_md5_orig}"))
+-      message(WARNING "loop_file: ${loop_file}:|${loop_file_md5}|${loop_file_md5_orig}|")
+-    endif (NOT ("${loop_file_md5}" STREQUAL "${loop_file_md5_orig}"))
+-  endif (NOT "${loop_file}" MATCHES "[*.]md5")
+-endforeach(loop_file)
+ 
+ 
+ #
+@@ -775,7 +710,7 @@ add_library(cbf_shared SHARED  ${CBF_C_SOURCES})
+ set_target_properties(cbf_shared PROPERTIES OUTPUT_NAME "cbf")
+ set_target_properties(cbf_shared PROPERTIES LINKER_LANGUAGE C)
+ set_target_properties(cbf_shared PROPERTIES SOVERSION "${CBF_APIVERSION}")
+-target_link_libraries(cbf_shared ${CBF_HDF5_LIBRARY_PATH})
++target_link_libraries(cbf_shared hdf5)
+ 
+ #
+ # Build the static and shared IMG libraries
+@@ -791,7 +726,7 @@ set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CBFlib_BINARY_DIR}/solib")
+ add_library(img_shared SHARED  ${CBF__EXAMPLES}/img.c)
+ set_target_properties(img_shared PROPERTIES OUTPUT_NAME "img")
+ set_target_properties(img_shared PROPERTIES LINKER_LANGUAGE C)
+-target_link_libraries(img_shared ${CBF_HDF5_LIBRARY_PATH})
++target_link_libraries(img_shared hdf5 m )
+ 
+ 
+ #
+@@ -829,26 +764,6 @@ target_link_libraries(fcb_shared ${CBF_HDF5_LIBRARY_PATH})
+ #
+ #  C and C++ examples
+ #
+-CBF_ADD_C_EXAMPLE(convert_image "${CBF__EXAMPLES}" "" "img_static")
+-CBF_ADD_C_EXAMPLE(convert_minicbf "${CBF__EXAMPLES}" "" "")
+-CBF_ADD_C_EXAMPLE(makecbf "${CBF__EXAMPLES}" "" "img_static")
+-CBF_ADD_C_EXAMPLE(adscimg2cbf "${CBF__EXAMPLES}" "${CBF__EXAMPLES}/adscimg2cbf_sub.c" "")
+-CBF_ADD_C_EXAMPLE(cbf2adscimg "${CBF__EXAMPLES}" "${CBF__EXAMPLES}/cbf2adscimg_sub.c" "")
+-CBF_ADD_C_EXAMPLE(cbf_tail "${CBF__EXAMPLES}" "" "")
+-CBF_ADD_C_EXAMPLE(changtestcompression "${CBF__EXAMPLES}" "" "")
+-CBF_ADD_C_EXAMPLE(img2cif "${CBF__EXAMPLES}" "" "img_static")
+-CBF_ADD_C_EXAMPLE(cif2cbf "${CBF__EXAMPLES}" "" "")
+-CBF_ADD_C_EXAMPLE(cbf2nexus "${CBF__EXAMPLES}" "" "")
+-CBF_ADD_C_EXAMPLE(minicbf2nexus "${CBF__EXAMPLES}" "" "")
+-CBF_ADD_C_EXAMPLE(cbf_template_t "${CBF__DECTRIS_EXAMPLES}" "" "")
+-CBF_ADD_CXX_EXAMPLE(testcell "${CBF__EXAMPLES}" "" "")
+-CBF_ADD_CXX_EXAMPLE(sauter_test "${CBF__EXAMPLES}" "" "")
+-CBF_ADD_C_EXAMPLE(sequence_match "${CBF__EXAMPLES}" "" "")
+-CBF_ADD_C_EXAMPLE(tiff2cbf "${CBF__EXAMPLES}" "${CBF__EXT_PKG}/${CBF_TIFF}/libtiff/tif_sprint.c" "${CBF_TIFF_LIBRARY_PATH}")
+-CBF_ADD_C_EXAMPLE(testulp "${CBF__EXAMPLES}" "" "")
+-CBF_ADD_C_EXAMPLE(testhdf5 "${CBF__EXAMPLES}" "" "")
+-CBF_ADD_C_EXAMPLE(testtree "${CBF__EXAMPLES}" "" "")
+-CBF_ADD_C_EXAMPLE(testalloc "${CBF__EXAMPLES}" "" "")
+ 
+ 
+ 
+@@ -876,26 +791,9 @@ target_link_libraries(test_xds_binary     fcb_static)
+ #
+ # install
+ #
+-install (TARGETS makecbf DESTINATION bin)
+-install (TARGETS img2cif DESTINATION bin)
+-install (TARGETS cif2cbf DESTINATION bin)
+-install (TARGETS adscimg2cbf DESTINATION bin)
+-install (TARGETS cbf2adscimg DESTINATION bin)
+-install (TARGETS changtestcompression DESTINATION bin)
+-install (TARGETS convert_image DESTINATION bin)
+-install (TARGETS convert_minicbf DESTINATION bin)
+-install (TARGETS minicbf2nexus DESTINATION bin)
+-install (TARGETS cbf_template_t DESTINATION bin)
+-install (TARGETS testcell DESTINATION bin)
+-install (TARGETS sauter_test DESTINATION bin)
+-install (TARGETS sequence_match DESTINATION bin)
+-install (TARGETS tiff2cbf DESTINATION bin)
+-install (TARGETS cbf_static DESTINATION lib)
+-install (TARGETS cbf_shared DESTINATION lib)
+-install (TARGETS fcb_static DESTINATION lib)
+-install (TARGETS fcb_shared DESTINATION lib)
+-install (TARGETS img_static DESTINATION lib)
+-install (TARGETS img_shared DESTINATION lib)
++install (TARGETS cbf_shared DESTINATION lib${LIB_SUFFIX})
++install (TARGETS fcb_shared DESTINATION lib${LIB_SUFFIX})
++install (TARGETS img_shared DESTINATION lib${LIB_SUFFIX})
+ install (DIRECTORY ${CBF__INCLUDE}/ DESTINATION include/cbflib FILES_MATCHING PATTERN "*.h")
+ install (DIRECTORY ${CBF__BIN_INCLUDE}/* DESTINATION include/cbflib FILES_MATCHING PATTERN "*.h")
+ 
+@@ -914,10 +812,6 @@ endif ()
+ #
+ # tests  -- to be extended
+ #
+-add_test(NAME cbftest_makecbf
+-  COMMAND ${CMAKE_COMMAND}
+-    -DCMD1=$<TARGET_FILE:makecbf> -DARG11=${CBF_DATADIRI}/example.mar2300 -DARG12=makecbf.cbf
+-    -P ${CMAKE_CURRENT_SOURCE_DIR}/runcommands.cmake)
+ add_test(cbftest_testalloc ${VALGRIND_COMMAND} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/testalloc)
+ add_test(cbftest_testhdf5 ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/testhdf5)
+ add_test(cbftest_testtree ${VALGRIND_COMMAND} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/testtree)