sci-libs/cbflib: Clean old

Package-Manager: portage-2.2.25
Signed-off-by: Justin Lecher <jlec@gentoo.org>

8 files changed, 0 insertions, 743 deletions

diff --git a/sci-libs/cbflib/Manifest b/sci-libs/cbflib/Manifest
index 51d76249c0ee..cc5c869afd31 100644
--- a/sci-libs/cbflib/Manifest
+++ b/sci-libs/cbflib/Manifest
@@ -1,6 +1,2 @@
-DIST CBFlib-0.9.2.10.tar.gz 4898574 SHA256 e98ed35e0659ca4ebc10cb035399e8a94f30c721be734ac2bac1933ae6a1bc6f SHA512 d0d9fa6f990f3fb03733887088f409bb348462ba4e8fa0a5431ae1c1087c54e8de969790f04d90e8f23e3eaf351f3253e3ae8791058b47a6cd230b04d9c51898 WHIRLPOOL d380f5144bd497fe4635c9a78579cab58c8fe6bfc14552eabd8da27d94654af1b0be024daff1cf4dbd769291e9011a708dbbab1c9e81c35e5eeb2588a3cca17a
-DIST CBFlib-0.9.2.2.tar.gz 4549837 SHA256 ce289756d643aa2ab79fd1614183ccee7ad06f128d1d8d59c97d7c107ce5f802 SHA512 756153ba81c17ea55d1397227273bc912a4fec7fd70d0b226b2519a5a14c92b612d6421f2748583aea5d0162b1defa51740200e936ce4f23b13b1506cfa5a043 WHIRLPOOL 4b690fa5698503eb424886391752fa2f4b5dad89b184cb4390506980032141ac5c147002b0261ec2769c9ea8aba696c629883b080bc504bc58d973367e399718
 DIST CBFlib-0.9.2.4.tar.gz 4564355 SHA256 c7d11a70e6454a6801e8f30d56db6639fa814aa25775bf54109325073c4a08c1 SHA512 e1ee1fe39b3d15e5d707d973c5666f198e3c9006b4c449fa56287032661a7ecfbeadad0fda528310f9cdd9f33856004333784a840d193a5c7db6c5c071fb07e5 WHIRLPOOL ded867cda1757196ad2188eda7a1a09999411a3d1a452172880fabdc5504aa346e44b2c8c25d921f674897ec7f8edf3da4de79d4843f68ecbb72634631ea43dd
 DIST CBFlib-0.9.3.3.tar.gz 5787633 SHA256 d6c3cc2c6c0aed2a3aa7c74dc645ad223470dc76bb2181242534d4c322bb00dc SHA512 e041c26770e12e09110d7c4f39737406c6ade6cae6fa941cd31dd3b90432a034426272b8daa851a8a23baceb7189479d2d8bde882b7cfdb8ae666fadc5be57ff WHIRLPOOL 8e9e0004cdd2411c9d37b588afa274e1c2b955fe361fc3df597acc30526958d5722993f36f33672769ef55eca51b87917f57ec56528a7711a934d9f8de2b8019
-DIST CBFlib_0.9.2_Data_Files_Input.tar.gz 17102003 SHA256 4414166a5a5b5ef6e4c460bb6941bd0aca53e7a41dbc9e5bdf0c6d44cf00d5ac SHA512 86689695155b822146e8cc1e310f4820292cde28c9cc240da34ef8259c429af7b182a055e1014078081528c505b0269367cd5e6e80278a53b448f0cc0dfcc3aa WHIRLPOOL a946dce8a6fa1a90a6fb3e7ec167a2ba41fdd5ef9435f4da083f9f9a7f5dfb94a2ebef1d1c36f5332fc486452b9b26c29161c7484ba337da83c24fbcd0334126
-DIST CBFlib_0.9.2_Data_Files_Output.tar.gz 36009958 SHA256 311cebff470b7d4f94b7888252cca879e6e0745f4e2eb6fa9e21cf84f984029b SHA512 fb08cbc5a68a73089c012c4c8da2a02ed7a216e02f23f2b24ba2e4dca7af834c7200868028921540e14326ea88e48028675e1be1f2c572eb3e962a79cf892002 WHIRLPOOL 386691e706dafacb9f5ee13f74fcf0f78c3a827d434ae18602fb2a8f805c178f9883e10658ed739a35bb7ceb58b628c1a9f1bbf89144efd793d13c7a62c3d05b
diff --git a/sci-libs/cbflib/cbflib-0.9.2.10-r1.ebuild b/sci-libs/cbflib/cbflib-0.9.2.10-r1.ebuild
deleted file mode 100644
index 165e6324e889..000000000000
--- a/sci-libs/cbflib/cbflib-0.9.2.10-r1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils flag-o-matic fortran-2 toolchain-funcs
-
-MY_P1="CBFlib-${PV}"
-#MY_P2="CBFlib_${PV}"
-MY_P2="CBFlib_0.9.3"
-
-DESCRIPTION="Library providing a simple mechanism for accessing CBF files and imgCIF files"
-HOMEPAGE="http://www.bernstein-plus-sons.com/software/CBF/"
-BASE_TEST_URI="http://arcib.dowling.edu/software/CBFlib/downloads/version_${PV}/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P1}.tar.gz"
-#	test? (
-#		mirror://sourceforge/${PN}/${MY_P2}_Data_Files_Input.tar.gz
-#		mirror://sourceforge/${PN}/${MY_P2}_Data_Files_Output.tar.gz
-#	)"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-
-S=${WORKDIR}/${MY_P1}
-
-RDEPEND="sci-libs/hdf5:="
-DEPEND="${RDEPEND}"
-
-RESTRICT="test"
-
-src_prepare(){
-	rm -rf Py* drel* dRel* ply*
-	epatch "${FILESDIR}"/${PV}-Makefile.patch
-	cp Makefile_LINUX_gcc42 Makefile
-
-	append-fflags -fno-range-check
-	append-cflags -D_USE_XOPEN_EXTENDED -DCBF_DONT_USE_LONG_LONG
-
-	sed \
-		-e "s|^SOLDFLAGS.*$|SOLDFLAGS = -shared ${LDFLAGS}|g" \
-		-i Makefile || die
-	tc-export CC CXX AR RANLIB
-}
-
-src_compile() {
-	emake -j1 shared
-}
-
-src_test(){
-	emake -j1 basic
-}
-
-src_install() {
-	insinto /usr/include/${PN}
-	dosym ${PN} /usr/include/cbf
-	doins include/*.h
-
-	dolib.so solib/lib*
-
-	dodoc README
-	use doc && dohtml -r README.html html_graphics doc
-}
diff --git a/sci-libs/cbflib/cbflib-0.9.2.10.ebuild b/sci-libs/cbflib/cbflib-0.9.2.10.ebuild
deleted file mode 100644
index c84f4936d49f..000000000000
--- a/sci-libs/cbflib/cbflib-0.9.2.10.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils flag-o-matic fortran-2 toolchain-funcs
-
-MY_P1="CBFlib-${PV}"
-#MY_P2="CBFlib_${PV}"
-MY_P2="CBFlib_0.9.3"
-
-DESCRIPTION="Library providing a simple mechanism for accessing CBF files and imgCIF files"
-HOMEPAGE="http://www.bernstein-plus-sons.com/software/CBF/"
-BASE_TEST_URI="http://arcib.dowling.edu/software/CBFlib/downloads/version_${PV}/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P1}.tar.gz"
-#	test? (
-#		mirror://sourceforge/${PN}/${MY_P2}_Data_Files_Input.tar.gz
-#		mirror://sourceforge/${PN}/${MY_P2}_Data_Files_Output.tar.gz
-#	)"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-
-S=${WORKDIR}/${MY_P1}
-
-RDEPEND="sci-libs/hdf5:="
-DEPEND="${RDEPEND}"
-
-RESTRICT="test"
-
-src_prepare(){
-	rm -rf Py* drel* dRel* ply*
-	epatch "${FILESDIR}"/${PV}-Makefile.patch
-	cp Makefile_LINUX_gcc42 Makefile
-
-	append-fflags -fno-range-check
-	append-cflags -D_USE_XOPEN_EXTENDED -DCBF_DONT_USE_LONG_LONG
-
-	sed \
-		-e "s|^SOLDFLAGS.*$|SOLDFLAGS = -shared ${LDFLAGS}|g" \
-		-i Makefile || die
-	tc-export CC CXX AR RANLIB
-}
-
-src_compile() {
-	emake -j1 shared
-}
-
-src_test(){
-	emake -j1 basic
-}
-
-src_install() {
-	insinto /usr/include/${PN}
-	doins include/*.h
-
-	dolib.so solib/lib*
-
-	dodoc README
-	use doc && dohtml -r README.html html_graphics doc
-}
diff --git a/sci-libs/cbflib/cbflib-0.9.2.2.ebuild b/sci-libs/cbflib/cbflib-0.9.2.2.ebuild
deleted file mode 100644
index fe47e5422204..000000000000
--- a/sci-libs/cbflib/cbflib-0.9.2.2.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit eutils flag-o-matic fortran-2 toolchain-funcs
-
-MY_P1="CBFlib-${PV}"
-#MY_P2="CBFlib_${PV}"
-MY_P2="CBFlib_0.9.2"
-
-DESCRIPTION="Library providing a simple mechanism for accessing CBF files and imgCIF files"
-HOMEPAGE="http://www.bernstein-plus-sons.com/software/CBF/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P1}.tar.gz
-	test? (
-		mirror://sourceforge/${PN}/${MY_P2}_Data_Files_Input.tar.gz
-		mirror://sourceforge/${PN}/${MY_P2}_Data_Files_Output.tar.gz
-	)"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-
-DEPEND="virtual/fortran"
-RDEPEND="${DEPEND}"
-#test? ( sys-process/time )"
-
-S=${WORKDIR}/${MY_P1}
-
-src_prepare(){
-	rm -rf Py* drel* dRel* ply*
-	epatch "${FILESDIR}"/${PV}-Makefile.patch
-	cp Makefile_LINUX_gcc42 Makefile
-
-	append-fflags -fno-range-check
-	append-cflags -D_USE_XOPEN_EXTENDED -DCBF_DONT_USE_LONG_LONG
-
-	sed \
-		-e "s|^CC.*$|CC = $(tc-getCC)|" \
-		-e "s|^C++.*$|C++ = $(tc-getCXX)|" \
-		-e "s|C++|CXX|g" \
-		-e "s|^CFLAGS.*$|CFLAGS = ${CFLAGS}|" \
-		-e "s|^F90C.*$|F90C = $(tc-getFC)|" \
-		-e "s|^F90FLAGS.*$|F90FLAGS = ${FFLAGS}|" \
-		-e "s|^SOLDFLAGS.*$|SOLDFLAGS = -shared ${LDFLAGS}|g" \
-		-e "s| /bin| ${EPREFIX}/bin|g" \
-		-e "s|/usr|${EPREFIX}/usr|g" \
-		-i Makefile || die
-}
-
-src_compile() {
-	emake -j1 shared
-}
-
-src_test(){
-	emake -j1 basic
-}
-
-src_install() {
-	insinto /usr/include/${PN}
-	doins include/*.h
-
-	dolib.so solib/lib*
-
-	dodoc README
-	if use doc; then
-		dohtml -r README.html html_graphics doc
-	fi
-}
diff --git a/sci-libs/cbflib/files/0.9.0-Makefile.patch b/sci-libs/cbflib/files/0.9.0-Makefile.patch
deleted file mode 100644
index 914152c9e9e0..000000000000
--- a/sci-libs/cbflib/files/0.9.0-Makefile.patch
+++ /dev/null
@@ -1,104 +0,0 @@
-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
deleted file mode 100644
index b18d019ff8e2..000000000000
--- a/sci-libs/cbflib/files/0.9.0-python.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-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
deleted file mode 100644
index 9c72300873fc..000000000000
--- a/sci-libs/cbflib/files/0.9.2.10-Makefile.patch
+++ /dev/null
@@ -1,269 +0,0 @@
- 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
deleted file mode 100644
index a25760307275..000000000000
--- a/sci-libs/cbflib/files/0.9.2.2-Makefile.patch
+++ /dev/null
@@ -1,150 +0,0 @@
-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
-