Its not possible to compile in parallel

Package-Manager: portage-2.2_rc62/cvs/Linux x86_64

7 files changed, 30 insertions, 395 deletions

diff --git a/sci-libs/cbflib/ChangeLog b/sci-libs/cbflib/ChangeLog
index 1d36251699f7..900e77001dfc 100644
--- a/sci-libs/cbflib/ChangeLog
+++ b/sci-libs/cbflib/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sci-libs/cbflib
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/cbflib/ChangeLog,v 1.4 2010/02/06 19:35:10 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/cbflib/ChangeLog,v 1.5 2010/02/07 21:01:56 jlec Exp $
+
+*cbflib-0.8.1-r6 (07 Feb 2010)
+
+  07 Feb 2010; Justin Lecher (jlec) <jlec@gentoo.org>
+  files/0.8.1-Makefile.patch, -cbflib-0.8.1-r5.ebuild,
+  -files/0.8.1-as-needed.patch, +cbflib-0.8.1-r6.ebuild,
+  -files/0.8.1-parallel.patch, -cbflib-0.8.1-r4.ebuild:
+  Its not possible to compile in parallel
 
 *cbflib-0.8.1-r5 (06 Feb 2010)
 
diff --git a/sci-libs/cbflib/Manifest b/sci-libs/cbflib/Manifest
index 48b4a9f39e8d..9b6b8df4b5c6 100644
--- a/sci-libs/cbflib/Manifest
+++ b/sci-libs/cbflib/Manifest
@@ -1,18 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX 0.8.1-Makefile.patch 10585 RMD160 322a51e48fac428497e0774644c7678ed9641670 SHA1 cab7ebebdfb6d81faa99fa548f305bb45a90015a SHA256 6481e91c17c1d73706fe3bd54daba5eb04da268f64d40582ccebe670a1d7c9fb
-AUX 0.8.1-as-needed.patch 935 RMD160 efe63a4a3022fd9d8382e73a0d34a517d54b962b SHA1 4d4a510d09e8f9c86d5797d8ee04f6bab8a43195 SHA256 3d26e1ff43ce0e4ef89ed29c6410dfbb6bcaf88cadebb734cd30b89a0baa4d12
-AUX 0.8.1-parallel.patch 506 RMD160 40b3dcd464934a474756fe096d00112d3ab643f5 SHA1 0d06d66df0b62827fe0633988975a5dbc898b320 SHA256 8e8e0d6ecacdfd3ff5ed1200841a57600c23a5ec2d8939cfa23e3ba28110e64d
+AUX 0.8.1-Makefile.patch 1374 RMD160 aa8ed72de981d76c071ceac33fd2a97f84ce36ea SHA1 a3b504681e47e3cda617230fddc0845a313b5ada SHA256 349d4874f509046b02f7289f5f1ad34340ce4b5048f8899b171894b7e9679641
 DIST CBFlib-0.8.1.tar.gz 3532726 RMD160 e2b82cabaeb7da07ca547822f7b3ac8871f6f467 SHA1 2b17b7f79c0e32e0a5a22aa43c93c170296e6d02 SHA256 197660197d0f861da26764d67fcf92fd75cfa3ad1da30df02fb33e6d67c6b5e3
-EBUILD cbflib-0.8.1-r4.ebuild 1650 RMD160 80c8649dc2369fdfae8bb1102953c2ff7d529056 SHA1 754420445f2a8eed9a0183b0f1a70690cc0b2acc SHA256 e8b58a1577019b78543ea1b41a8c821fe88b8989f62a88bb5dafd37f1f2e143a
-EBUILD cbflib-0.8.1-r5.ebuild 1737 RMD160 4f5eb8b62cbe1a848fd8f3a78d59066f1657fa47 SHA1 520a5362cf63c03ea5d891bf0c47316875cc412c SHA256 1db07f9bfea6b4baaf11c280ac9726ea114f2226fe4692c2184a49c6eef153a7
-MISC ChangeLog 808 RMD160 3d17754119578f63d8f163de2fec971d9d90b44f SHA1 63e4bc82f8a6afd597abe47997d7c221a9f73bdf SHA256 5ff9358a512b03f74548ae97a40f00b799bf2253c293aec493dbcc6a42e11965
+EBUILD cbflib-0.8.1-r6.ebuild 1585 RMD160 1d67ef39513826e30ad28383413ec68ad957caee SHA1 952786e2f1dc41c72eeef53efebe34da5ea52a35 SHA256 5e6ccec0dfb0853ba0b6208f86b27135654d446f77465340cef1997c5fff1329
+MISC ChangeLog 1105 RMD160 0436d6d280d37f6688f60918005130b802e04dd3 SHA1 9cf1ea9b1cd85d53972753ab9a9cb446f564839a SHA256 afc3af6a47e3cd8228c75d4e4bff733d2f3ec056b07395d2b37a301012dde634
 MISC metadata.xml 872 RMD160 65a3873ad810c058abebf748ebdbc29a0da05e2d SHA1 df579c7f63aff50d1e3877013bf62e6ae9a2a438 SHA256 60351f0290d2947caddf8470468b8891dd63dd00545af8099859bde40eda1f49
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAkttxHQACgkQgAnW8HDreRZ5QQCgtPF5TCGsCs0s4hpckob41ku+
-l3oAoIlxNJDHLk3sr75UVRR+OisoweZi
-=uP8U
+iEYEARECAAYFAktvKkkACgkQgAnW8HDreRZ7agCdHxs6gHlTQ3rDPfAL7MgwXCAu
+KXcAnjKpLPgarV/rI99QV5gaZIDQ+iWh
+=1Oj4
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/cbflib/cbflib-0.8.1-r5.ebuild b/sci-libs/cbflib/cbflib-0.8.1-r5.ebuild
deleted file mode 100644
index 3e49d07fcc79..000000000000
--- a/sci-libs/cbflib/cbflib-0.8.1-r5.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/cbflib/cbflib-0.8.1-r5.ebuild,v 1.1 2010/02/06 19:35:10 jlec Exp $
-
-EAPI="3"
-
-inherit eutils flag-o-matic toolchain-funcs
-
-MY_P1="CBFlib-${PV}"
-MY_P2="CBFlib_${PV}"
-
-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? (
-#		${BASE_TEST_URI}/${MY_P2}_Data_Files_Input.tar.gz
-#		${BASE_TEST_URI}/${MY_P2}_Data_Files_Output.tar.gz
-#	)"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-#RDEPEND=""
-#DEPEND="test? ( sys-process/time )"
-
-S="${WORKDIR}/${MY_P1}"
-
-src_prepare(){
-	cp Makefile_LINUX_gcc42 Makefile
-
-	epatch "${FILESDIR}"/${PV}-Makefile.patch
-	epatch "${FILESDIR}"/${PV}-parallel.patch
-	epatch "${FILESDIR}"/${PV}-as-needed.patch
-
-	append-fflags -fno-range-check
-	append-cflags -D_USE_XOPEN_EXTENDED
-
-	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 shared || die
-}
-
-# test app is borked in this version
-# produces buffer overflows
-#src_test(){
-#	emake -j1 tests || die
-#}
-
-src_install() {
-	insinto /usr/include/${PN}
-	doins include/* || die
-
-	dolib.so solib/* || die
-}
diff --git a/sci-libs/cbflib/cbflib-0.8.1-r4.ebuild b/sci-libs/cbflib/cbflib-0.8.1-r6.ebuild
index b1fc5314f17f..00bf47bca0b0 100644
--- a/sci-libs/cbflib/cbflib-0.8.1-r4.ebuild
+++ b/sci-libs/cbflib/cbflib-0.8.1-r6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/cbflib/cbflib-0.8.1-r4.ebuild,v 1.3 2010/02/06 13:45:11 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/cbflib/cbflib-0.8.1-r6.ebuild,v 1.1 2010/02/07 21:01:56 jlec Exp $
 
 EAPI="3"
 
@@ -29,9 +29,8 @@ IUSE=""
 S="${WORKDIR}/${MY_P1}"
 
 src_prepare(){
-	cp Makefile_LINUX_gcc42 Makefile
-
 	epatch "${FILESDIR}"/${PV}-Makefile.patch
+	cp Makefile_LINUX_gcc42 Makefile
 
 	append-fflags -fno-range-check
 	append-cflags -D_USE_XOPEN_EXTENDED
@@ -44,13 +43,11 @@ src_prepare(){
 		-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 shared || die
+	emake -j1 shared || die
 }
 
 # test app is borked in this version
diff --git a/sci-libs/cbflib/files/0.8.1-Makefile.patch b/sci-libs/cbflib/files/0.8.1-Makefile.patch
index dd4c5dcba835..d3a95c316d8e 100644
--- a/sci-libs/cbflib/files/0.8.1-Makefile.patch
+++ b/sci-libs/cbflib/files/0.8.1-Makefile.patch
@@ -1,23 +1,8 @@
-sed \
--e '/rm \*\.o/d' \
--e 's:$(CC) -o $@ \*\.o $(SOLDFLAGS):$(CC) $(LDFLAGS) -o $@ *.o:g' \
--e 's:$(F90C) -o $@ \*\.o $(SOLDFLAGS):$(F90C) $(LDFLAGS) -o $@ *.o:g' \
--e '900,2000s:$(CC) $(CFLAGS) :$(CC) $(CFLAGS) $(SOCFLAGS) $(LDFLAGS) -o $@ :g' \
--e '900,2000s:$(C++) $(CFLAGS) :$(C++) $(CFLAGS) $(SOCFLAGS) $(LDFLAGS) -o $@ :g' \
--e '900,2000s:$(F90C) $(F90FLAGS) :$(F90C) $(F90FLAGS) $(SOCFLAGS) $(LDFLAGS) -o $@ :g' \
--e 's:-lcbf -lm -limg -o $@:-lcbf -lm -limg:g' \
--e 's:-lcbf -lm -o $@:-lcbf -lm:g' \
--e 's:-lfcb -o $@:-lfcb -lm:g' \
--e '900,2000s:-L$(LIB):-L$(SOLIB):g' \
--e 's|: $(LIB)/libcbf.a|: $(SOLIB)/libcbf.so|g' \
--e 's|: $(LIB)/libfcb.a|: $(SOLIB)/libfcb.so|g' \
--e 's:/usr/bin/bunzip2:/bin/bunzip2:g' \
--e 's:/usr/bin/bzip2:/bin/bunzip2:g' \
--e 's|install:  all|install:|g' \
-Makefile > Makefile.new
---- Makefile	2009-07-18 17:24:25.000000000 +0200
-+++ Makefile.new	2009-07-18 17:24:31.000000000 +0200
-@@ -288,13 +288,13 @@
+diff --git a/Makefile_LINUX_gcc42 b/Makefile_LINUX_gcc42
+index e5912ce..cfc658a 100644
+--- a/Makefile_LINUX_gcc42
++++ b/Makefile_LINUX_gcc42
+@@ -288,13 +288,13 @@ RANLIB  = /usr/bin/ranlib
  #
  # Program to use to decompress a data file
  #
@@ -29,272 +14,34 @@ Makefile > Makefile.new
  # Program to use to compress a data file
  #
 -COMPRESS = /usr/bin/bzip2
-+COMPRESS = /bin/bunzip2
++COMPRESS = /bin/bzip2
  
  #
  # Program to use to generate a signature
-@@ -702,7 +702,7 @@
- 	./.symlinks $(SLFLAGS)
- 	touch symlinksdone
- 
--install:  all $(INSTALLDIR) $(INSTALLDIR)/lib $(INSTALLDIR)/bin \
-+install: $(INSTALLDIR) $(INSTALLDIR)/lib $(INSTALLDIR)/bin \
- 		    $(INSTALLDIR)/include $(INSTALLDIR)/include/cbflib
- 		-chmod -R 755 $(INSTALLDIR)/include/cbflib
- 		-chmod 755 $(INSTALLDIR)/lib/libcbf.a
-@@ -837,15 +837,13 @@
- $(LIB)/libcbf.a: $(SOURCE) $(HEADERS) $(COMMONDEP) $(LIB)
- 	$(CC) $(CFLAGS) $(INCLUDES) $(WARNINGS) -c $(SOURCE)
- 	$(AR) cr $@ *.o
--	rm *.o
- ifneq ($(RANLIB),)
- 	$(RANLIB) $@
- endif
+@@ -844,7 +844,7 @@ endif
  
  $(SOLIB)/libcbf.so: $(SOURCE) $(HEADERS) $(COMMONDEP) $(SOLIB)
  	$(CC) $(CFLAGS) $(SOCFLAGS) $(INCLUDES) $(WARNINGS) -c $(SOURCE)
 -	$(CC) -o $@ *.o $(SOLDFLAGS)
--	rm *.o
 +	$(CC) $(LDFLAGS) -Wl,-soname,libcbf.so.0.8 $(SOCFLAGS) $(SOLDFLAGS) -o $@ *.o -lgfortran
+ 	rm *.o
  
  #
- # IMG library
-@@ -853,15 +851,13 @@
- $(LIB)/libimg.a: $(EXAMPLES)/img.c $(HEADERS) $(COMMONDEP) $(LIB)
- 	$(CC) $(CFLAGS) $(INCLUDES) $(WARNINGS) -c $(EXAMPLES)/img.c
- 	$(AR) cr $@ *.o
--	rm *.o
- ifneq ($(RANLIB),)
- 	$(RANLIB) $@
- endif
+@@ -860,7 +860,7 @@ endif
  	
  $(SOLIB)/libimg.so: $(SOURCE) $(HEADERS) $(COMMONDEP) $(SOLIB)
  	$(CC) $(CFLAGS) $(SOCFLAGS) $(INCLUDES) $(WARNINGS) -c $(EXAMPLES)/img.c
 -	$(CC) -o $@ *.o $(SOLDFLAGS)
--	rm *.o
 +	$(CC) $(LDFLAGS) -Wl,-soname,libimg.so.0.8 $(SOLDFLAGS) -o $@ *.o
+ 	rm *.o
  
  #
- # CBF and IMG libraries
-@@ -876,7 +872,6 @@
- ifneq ($(F90C),)
- 	$(F90C) $(F90FLAGS) -c $(F90SOURCE)
- 	$(AR) cr $@ *.o
--	rm *.o
- ifneq ($(RANLIB),)
- 	$(RANLIB) $@
- endif
-@@ -887,8 +882,7 @@
+@@ -887,7 +887,7 @@ endif
  $(SOLIB)/libfcb.so: $(F90SOURCE) $(HEADERS) $(COMMONDEP) $(SOLIB)
  ifneq ($(F90C),)
  	$(F90C) $(F90FLAGS) $(SOCFLAGS) $(INCLUDES) $(WARNINGS) -c $(F90SOURCE)
 -	$(F90C) -o $@ *.o $(SOLDFLAGS)
--	rm *.o
 +	$(F90C) $(LDFLAGS) -Wl,-soname,libcbf.so.0.8 $(SOLDFLAGS) -o $@ *.o
+ 	rm *.o
  else
  	echo "Define F90C to build $(SOLIB)/libfcb.so"
- endif
-@@ -914,8 +908,8 @@
- 	$(JAR) cf $@ org
- 
- $(SOLIB)/libcbf_wrap.so: $(JAVADIR)/cbflib-$(VERSION).jar $(SOLIB)/libimg.so
--	$(CC) $(CFLAGS) $(SOCFLAGS) $(INCLUDES) $(WARNINGS) $(JAVAINCLUDES) -c $(SRC)/cbf_wrap.c
--	$(CC) -o $@ *.o $(SOLDFLAGS) -L$(SOLIB) -lcbf
-+	$(CC) $(CFLAGS) $(SOCFLAGS) $(LDFLAGS) $(SOLDFLAGS) -o $@ $(SOCFLAGS) $(INCLUDES) $(WARNINGS) $(JAVAINCLUDES) -c $(SRC)/cbf_wrap.c
-+	$(CC) $(LDFLAGS) -Wl,-soname,libcbf_wrap.so.0.8 $(SOLDFLAGS) -o $@ *.o -L$(SOLIB) -lcbf
- 
- #
- # F90SOURCE
-@@ -942,131 +936,131 @@
- #
- # convert_image example program
- #
--$(BIN)/convert_image: $(LIB)/libcbf.a $(EXAMPLES)/convert_image.c $(EXAMPLES)/img.c \
-+$(BIN)/convert_image: $(SOLIB)/libcbf.so $(EXAMPLES)/convert_image.c $(EXAMPLES)/img.c \
- 					$(GOPTLIB)	$(GOPTINC)
--	$(CC) $(CFLAGS) $(INCLUDES) $(WARNINGS) \
--		      $(EXAMPLES)/convert_image.c $(EXAMPLES)/img.c $(GOPTLIB) -L$(LIB) \
--		  -lcbf -lm -o $@
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(INCLUDES) $(WARNINGS) \
-+		      $(EXAMPLES)/convert_image.c $(EXAMPLES)/img.c $(GOPTLIB) -L$(SOLIB) \
-+		  -lcbf -lm
- #
- # convert_minicbf example program
- #
--$(BIN)/convert_minicbf: $(LIB)/libcbf.a $(EXAMPLES)/convert_minicbf.c \
-+$(BIN)/convert_minicbf: $(SOLIB)/libcbf.so $(EXAMPLES)/convert_minicbf.c \
- 					$(GOPTLIB)	$(GOPTINC)
--	$(CC) $(CFLAGS) $(INCLUDES) $(WARNINGS) \
--		      $(EXAMPLES)/convert_minicbf.c $(GOPTLIB) -L$(LIB) \
--		  -lcbf -lm -o $@
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(INCLUDES) $(WARNINGS) \
-+		      $(EXAMPLES)/convert_minicbf.c $(GOPTLIB) -L$(SOLIB) \
-+		  -lcbf -lm
- 
- #
- # makecbf example program
- #
--$(BIN)/makecbf: $(LIB)/libcbf.a $(EXAMPLES)/makecbf.c $(LIB)/libimg.a
--	$(CC) $(CFLAGS) $(INCLUDES) $(WARNINGS) \
--		      $(EXAMPLES)/makecbf.c  -L$(LIB) \
--		  -lcbf -lm -limg -o $@
-+$(BIN)/makecbf: $(SOLIB)/libcbf.so $(EXAMPLES)/makecbf.c $(SOLIB)/libimg.so
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(INCLUDES) $(WARNINGS) \
-+		      $(EXAMPLES)/makecbf.c  -L$(SOLIB) \
-+		  -lcbf -lm -limg
- 
- 
- #
- # adscimg2cbf example program
- #
--$(BIN)/adscimg2cbf: $(LIB)/libcbf.a $(EXAMPLES)/adscimg2cbf.c $(EXAMPLES)/adscimg2cbf_sub.c
--	$(CC) $(CFLAGS) -D_SVID_SOURCE $(INCLUDES) $(WARNINGS) \
--		      $(EXAMPLES)/adscimg2cbf.c $(EXAMPLES)/adscimg2cbf_sub.c  -L$(LIB) \
--		  -lcbf -lm -o $@
-+$(BIN)/adscimg2cbf: $(SOLIB)/libcbf.so $(EXAMPLES)/adscimg2cbf.c $(EXAMPLES)/adscimg2cbf_sub.c
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ -D_SVID_SOURCE $(INCLUDES) $(WARNINGS) \
-+		      $(EXAMPLES)/adscimg2cbf.c $(EXAMPLES)/adscimg2cbf_sub.c  -L$(SOLIB) \
-+		  -lcbf -lm
- 
- #
- # cbf2adscimg example program
- #
--$(BIN)/cbf2adscimg: $(LIB)/libcbf.a $(EXAMPLES)/cbf2adscimg.c $(EXAMPLES)/cbf2adscimg_sub.c
--	$(CC) $(CFLAGS) -D_SVID_SOURCE $(INCLUDES) $(WARNINGS) \
--		      $(EXAMPLES)/cbf2adscimg.c $(EXAMPLES)/cbf2adscimg_sub.c  -L$(LIB) \
--		  -lcbf -lm -o $@
-+$(BIN)/cbf2adscimg: $(SOLIB)/libcbf.so $(EXAMPLES)/cbf2adscimg.c $(EXAMPLES)/cbf2adscimg_sub.c
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ -D_SVID_SOURCE $(INCLUDES) $(WARNINGS) \
-+		      $(EXAMPLES)/cbf2adscimg.c $(EXAMPLES)/cbf2adscimg_sub.c  -L$(SOLIB) \
-+		  -lcbf -lm
- 
- #
- # img2cif example program
- #
--$(BIN)/img2cif: $(LIB)/libcbf.a $(EXAMPLES)/img2cif.c $(LIB)/libimg.a \
-+$(BIN)/img2cif: $(SOLIB)/libcbf.so $(EXAMPLES)/img2cif.c $(SOLIB)/libimg.so \
- 					$(GOPTLIB) 	$(GOTPINC)
--	$(CC) $(CFLAGS) $(INCLUDES) $(WARNINGS) \
--		      $(EXAMPLES)/img2cif.c $(GOPTLIB) -L$(LIB) \
--		  -lcbf -lm -limg -o $@
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(INCLUDES) $(WARNINGS) \
-+		      $(EXAMPLES)/img2cif.c $(GOPTLIB) -L$(SOLIB) \
-+		  -lcbf -lm -limg
- 
- #
- # cif2cbf example program
- #
--$(BIN)/cif2cbf: $(LIB)/libcbf.a $(EXAMPLES)/cif2cbf.c $(LIB)/libimg.a \
-+$(BIN)/cif2cbf: $(SOLIB)/libcbf.so $(EXAMPLES)/cif2cbf.c $(SOLIB)/libimg.so \
- 					$(GOPTLIB)	$(GOPTINC)
--	$(CC) $(CFLAGS) $(INCLUDES) $(WARNINGS) \
--		      $(EXAMPLES)/cif2cbf.c $(GOPTLIB) -L$(LIB) \
--		  -lcbf -lm -limg -o $@
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(INCLUDES) $(WARNINGS) \
-+		      $(EXAMPLES)/cif2cbf.c $(GOPTLIB) -L$(SOLIB) \
-+		  -lcbf -lm -limg
- #
- # testcell example program
- #
--$(BIN)/testcell: $(LIB)/libcbf.a $(EXAMPLES)/testcell.C
--	$(C++) $(CFLAGS) $(INCLUDES) $(WARNINGS) \
--		      $(EXAMPLES)/testcell.C -L$(LIB) \
--		  -lcbf -lm -o $@
-+$(BIN)/testcell: $(SOLIB)/libcbf.so $(EXAMPLES)/testcell.C
-+	$(C++) $(CFLAGS) $(LDFLAGS) -o $@ $(INCLUDES) $(WARNINGS) \
-+		      $(EXAMPLES)/testcell.C -L$(SOLIB) \
-+		  -lcbf -lm
- 
- #
- # cif2c example program
- #
--$(BIN)/cif2c: $(LIB)/libcbf.a $(EXAMPLES)/cif2c.c
--	$(C++) $(CFLAGS) $(INCLUDES) $(WARNINGS) \
--		      $(EXAMPLES)/cif2c.c -L$(LIB) \
--		  -lcbf -lm -o $@
-+$(BIN)/cif2c: $(SOLIB)/libcbf.so $(EXAMPLES)/cif2c.c
-+	$(C++) $(CFLAGS) $(LDFLAGS) -o $@ $(INCLUDES) $(WARNINGS) \
-+		      $(EXAMPLES)/cif2c.c -L$(SOLIB) \
-+		  -lcbf -lm
- 
- #
- # sauter_test example program
- #
--$(BIN)/sauter_test: $(LIB)/libcbf.a $(EXAMPLES)/sauter_test.C
--	$(C++) $(CFLAGS) $(INCLUDES) $(WARNINGS) \
--		      $(EXAMPLES)/sauter_test.C -L$(LIB) \
--		  -lcbf -lm -o $@
-+$(BIN)/sauter_test: $(SOLIB)/libcbf.so $(EXAMPLES)/sauter_test.C
-+	$(C++) $(CFLAGS) $(LDFLAGS) -o $@ $(INCLUDES) $(WARNINGS) \
-+		      $(EXAMPLES)/sauter_test.C -L$(SOLIB) \
-+		  -lcbf -lm
- 
- #
- # testreals example program
- #
--$(BIN)/testreals: $(LIB)/libcbf.a $(EXAMPLES)/testreals.c
--	$(CC) $(CFLAGS) $(INCLUDES) $(WARNINGS) \
--		      $(EXAMPLES)/testreals.c -L$(LIB) \
--		  -lcbf -lm -o $@
-+$(BIN)/testreals: $(SOLIB)/libcbf.so $(EXAMPLES)/testreals.c
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(INCLUDES) $(WARNINGS) \
-+		      $(EXAMPLES)/testreals.c -L$(SOLIB) \
-+		  -lcbf -lm
- #
- # testflat example program
- #
--$(BIN)/testflat: $(LIB)/libcbf.a $(EXAMPLES)/testflat.c
--	$(CC) $(CFLAGS) $(INCLUDES) $(WARNINGS) \
--		      $(EXAMPLES)/testflat.c -L$(LIB) \
--		  -lcbf -lm -o $@
-+$(BIN)/testflat: $(SOLIB)/libcbf.so $(EXAMPLES)/testflat.c
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(INCLUDES) $(WARNINGS) \
-+		      $(EXAMPLES)/testflat.c -L$(SOLIB) \
-+		  -lcbf -lm
- #
- # testflatpacked example program
- #
--$(BIN)/testflatpacked: $(LIB)/libcbf.a $(EXAMPLES)/testflatpacked.c
--	$(CC) $(CFLAGS) $(INCLUDES) $(WARNINGS) \
--		      $(EXAMPLES)/testflatpacked.c -L$(LIB) \
--		  -lcbf -lm -o $@
-+$(BIN)/testflatpacked: $(SOLIB)/libcbf.so $(EXAMPLES)/testflatpacked.c
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(INCLUDES) $(WARNINGS) \
-+		      $(EXAMPLES)/testflatpacked.c -L$(SOLIB) \
-+		  -lcbf -lm
- 
- ifneq ($(F90C),)
- #
- # 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 \
--		-L$(LIB) -lfcb -o $@
-+$(BIN)/test_xds_binary: $(SOLIB)/libfcb.so $(EXAMPLES)/test_xds_binary.f90
-+	$(F90C) $(F90FLAGS) $(LDFLAGS) -o $@ $(F90LDFLAGS) $(EXAMPLES)/test_xds_binary.f90 \
-+		-L$(SOLIB) -lfcb -lm
- 
- #
- # 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 \
--		-L$(LIB) -lfcb -o $@
-+$(BIN)/test_fcb_read_image: $(SOLIB)/libfcb.so $(EXAMPLES)/test_fcb_read_image.f90
-+	$(F90C) $(F90FLAGS) $(LDFLAGS) -o $@ $(F90LDFLAGS) $(EXAMPLES)/test_fcb_read_image.f90 \
-+		-L$(SOLIB) -lfcb -lm
- endif
- 
- #
- # testcbf (C)
- #
- $(BIN)/ctestcbf: $(EXAMPLES)/testcbf.c $(LIB)/libcbf.a
--	$(CC) $(CFLAGS) $(INCLUDES) $(WARNINGS) \
--		      $(EXAMPLES)/testcbf.c -L$(LIB) \
--		  -lcbf -lm -o $@
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(INCLUDES) $(WARNINGS) \
-+		      $(EXAMPLES)/testcbf.c -L$(SOLIB) \
-+		  -lcbf -lm
- 
- #
- # testcbf (Java)
diff --git a/sci-libs/cbflib/files/0.8.1-as-needed.patch b/sci-libs/cbflib/files/0.8.1-as-needed.patch
deleted file mode 100644
index 5fc358026705..000000000000
--- a/sci-libs/cbflib/files/0.8.1-as-needed.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff --git a/Makefile_LINUX_gcc42 b/Makefile_LINUX_gcc42
-index e5912ce..20f8a4d 100644
---- a/Makefile_LINUX_gcc42
-+++ b/Makefile_LINUX_gcc42
-@@ -844,7 +845,7 @@ endif
- 
- $(SOLIB)/libcbf.so: $(SOURCE) $(HEADERS) $(COMMONDEP) $(SOLIB)
- 	$(CC) $(CFLAGS) $(SOCFLAGS) $(INCLUDES) $(WARNINGS) -c $(SOURCE)
--	$(CC) -o $@ *.o $(SOLDFLAGS)
-+	$(CC) $(SOLDFLAGS) -o $@ *.o
- 	rm *.o
- 
- #
-@@ -860,7 +861,7 @@ endif
- 	
- $(SOLIB)/libimg.so: $(SOURCE) $(HEADERS) $(COMMONDEP) $(SOLIB)
- 	$(CC) $(CFLAGS) $(SOCFLAGS) $(INCLUDES) $(WARNINGS) -c $(EXAMPLES)/img.c
--	$(CC) -o $@ *.o $(SOLDFLAGS)
-+	$(CC) $(SOLDFLAGS) -o $@ *.o
- 	rm *.o
- 
- #
-@@ -887,7 +888,7 @@ endif
- $(SOLIB)/libfcb.so: $(F90SOURCE) $(HEADERS) $(COMMONDEP) $(SOLIB)
- ifneq ($(F90C),)
- 	$(F90C) $(F90FLAGS) $(SOCFLAGS) $(INCLUDES) $(WARNINGS) -c $(F90SOURCE)
--	$(F90C) -o $@ *.o $(SOLDFLAGS)
-+	$(F90C) $(SOLDFLAGS) -o $@ *.o
- 	rm *.o
- else
- 	echo "Define F90C to build $(SOLIB)/libfcb.so"
diff --git a/sci-libs/cbflib/files/0.8.1-parallel.patch b/sci-libs/cbflib/files/0.8.1-parallel.patch
deleted file mode 100644
index e1e73d9850a2..000000000000
--- a/sci-libs/cbflib/files/0.8.1-parallel.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/Makefile_LINUX_gcc42 b/Makefile_LINUX_gcc42
-index e5912ce..be4a28a 100644
---- a/Makefile_LINUX_gcc42
-+++ b/Makefile_LINUX_gcc42
-@@ -648,7 +648,8 @@ all::	$(BIN)/test_xds_binary   \
- 		$(BIN)/test_fcb_read_image
- endif
- 
--shared:	$(SOLIB)/libcbf.so $(SOLIB)/libfcb.so $(SOLIB)/libimg.so
-+shared:	$(SOURCE) $(HEADERS) $(COMMONDEP) $(SOLIB) \
-+		$(SOLIB)/libcbf.so $(SOLIB)/libfcb.so $(SOLIB)/libimg.so
- 
- javawrapper: shared $(JAVADIR) $(JAVADIR)/cbflib-$(VERSION).jar $(SOLIB)/libcbf_wrap.so
-