sci-libs/cbflib: Version BUmp, fixes compilation problems, #444236

Package-Manager: portage-2.2.0_alpha166/cvs/Linux x86_64
Manifest-Sign-Key: 0x70EB7916

5 files changed, 348 insertions, 9 deletions

diff --git a/sci-libs/cbflib/ChangeLog b/sci-libs/cbflib/ChangeLog
index 68e035ce37a5..000cf7e69a00 100644
--- a/sci-libs/cbflib/ChangeLog
+++ b/sci-libs/cbflib/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-libs/cbflib
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/cbflib/ChangeLog,v 1.33 2012/12/06 08:27:07 jlec Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/cbflib/ChangeLog,v 1.34 2013/03/12 13:00:51 jlec Exp $
+
+*cbflib-0.9.2.10 (12 Mar 2013)
+
+  12 Mar 2013; Justin Lecher <jlec@gentoo.org> +files/0.9.2.10-Makefile.patch,
+  +cbflib-0.9.2.10.ebuild, metadata.xml:
+  Version BUmp, fixes compilation problems, #444236
 
   06 Dec 2012; Justin Lecher <jlec@gentoo.org> +cbflib-0.9.2.2.ebuild:
   Resurrect old version
diff --git a/sci-libs/cbflib/Manifest b/sci-libs/cbflib/Manifest
index 5f34ab29e916..78c6bb91b90c 100644
--- a/sci-libs/cbflib/Manifest
+++ b/sci-libs/cbflib/Manifest
@@ -3,20 +3,23 @@ Hash: SHA256
 
 AUX 0.9.0-Makefile.patch 3091 SHA256 361cd3c6a906f6bfe2761196e459aec2735e4bb539586b5589b1a8d2d35a02b4 SHA512 bb27a8d6c847ffb832849e230f28bd04024b5b14b2803a01cde146df778258b60962c1ea9ec46dbc366987f5ea793cab15932e9fefc617749d1e5f79134e9fc4 WHIRLPOOL 796e096fef877dc7e7168bbf28e8cdd50690f709f3a6f83f917e9575c8fb6a10240e1a326d91c7f016d36d2e7c6ff288759567db34214be42a5f758ae6d09113
 AUX 0.9.0-python.patch 574 SHA256 632e0820b0479a7f267d34ba8709b8bc828c58e3d63b45d6b78c9c86af0f4594 SHA512 816633f0f15b8d0a4475c0db36a508b320dec76b162470c73f6a931315fbbee58e12c40820e5e1e6f517e755bbb40d808161875a76691c68b74817c3c39132cf WHIRLPOOL a45a0049168e7050edaa9cb89d680020a8d776ea24b4f6a6649e59040f0d4bca969423fdde8ac53d0e649d8c6ccaabbd26a5e2da47091ee070e162fedf2a009a
+AUX 0.9.2.10-Makefile.patch 8836 SHA256 7fb3531fcccfe4896c9dd033c256d67cac20953f2cf11185901aa1cc08c18f8e SHA512 6dcded24fc58a1b60f8ffeac31ea81782b7a4be33846b3b9e4359ae8c280b59c2c10861fc1fb6de52cca099f403ad93f3d3b45a29f4f413f0d4336a308b994df WHIRLPOOL fe77c2b2012861a5d0918723f5a205d824135b9e6002a421e6655273e9b3accbffa5521db03c3456426b78026efc51660596d0f7f42463030dde19ca9284b007
 AUX 0.9.2.2-Makefile.patch 4597 SHA256 c1f13709e8f264f0eba1f08624eeced697036c1a9467b2b099a3eadb0e82a0eb SHA512 d13b5e89e5cf6cf785876311038c253d700dd7675a00e85a03095bf6fb79c3b9ce874c7f2b2bfe671b9f0a955da1ee648261370b8e22a52ca0c148a96583fa97 WHIRLPOOL 8e75f2b0f17e6c0fba5a759cdd63d9f9807af9831ca2d89a1142b6cccb2f961f9c1909655fc79817f497a824fe7b95803b7d02fed16857948ed9919b70c275a3
 AUX 0.9.2.3-Makefile.patch 4691 SHA256 4f819e20c182eccb94ab8bdbde3129375eb1caa06037b3f65270571f70b2bcbf SHA512 07336fcf5f44dff2895cdf3b7d74bf8296772acb932e78134c0b5463821e693f94f87a5885685228d177741473ca77da15157cea46eed07e46da2d6b440a010f WHIRLPOOL 89e0cc572238578114f8fae743cbfe95d782028f2a9ac2089ad3feb632d569481fcdeee4cc2ca0a886abca0cddcbdbb9951cc0873681000071164c9c22f3b998
+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.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
+EBUILD cbflib-0.9.2.10.ebuild 1468 SHA256 5e9bf830eb422733a2f308d552747e0361748e787d334d847d551ab5fd3c91c4 SHA512 a37a2e579f5290ed9e1302f384bc5aa74501a8cedea9c661d227007cb35c4056ce865202aafee187479056b29885dc6735fe5f41d1ed66bfa6f9ffd6f66bad8a WHIRLPOOL af4555d8c57e5e50e911b384428b8823d4f59fa935508bd954e0269eef4b6492ed103029b8b52440e6a986b24e31c4dc7775f0639675e76c14ca248a48f881d3
 EBUILD cbflib-0.9.2.2.ebuild 1714 SHA256 63ab98aec70efc37b3b7f20cdc02599f06a412fca67f414316966fd6649cff74 SHA512 102a3a88bcc55bba053b7d7b76657dcc9c6bc6f7bc4f2f9c96aa2021c58ef12870543470f44fe552d866650770aefa79b32dbcc9fe941055e26d8111e5cdea13 WHIRLPOOL ea1b4db76b76add23c7290ecdc3397aed196feed73a0a9e4d5b3e19feeac93a1eefbe6465a973659feb53bd006c1ae040966bc2348be6d760bc66842d74dc37e
 EBUILD cbflib-0.9.2.4.ebuild 1729 SHA256 f4268291863735fa5785681d78e0125fa1b24a8aa0a7d215f2638cbbc912e713 SHA512 d0a126104db213ddeb5f7634babd1676f6c9514910244a7ddd0d430780dd800c9984f56ba85d87101da62bb59707b9748aa0ab962e242b5247b0663817e9a7d9 WHIRLPOOL 8aca923734fbc1e30780ae147ab1500ad6460315a65d189e650a945046271a605a902b4d429d270727e3a9d41e3cc6b90cea9964379cb3ba9b2955c33bb6242c
-MISC ChangeLog 5036 SHA256 1aade9904c6a54e203b531e4eeda8a3aa1214a2c5a7a0c18c9c20d4729eecdad SHA512 bb5deb28d41d0d848c6886a68ab4140c1808616f2de2bfe646ca94aadfea3080131a6051fe7693bf4c2f04e587e55e795c98edfa40a431e2bdb9c480fe07a9d6 WHIRLPOOL 743c56c67d5cf448c026b3e5c0418acce9240899be0d126a95d43def776898700e5f2d6473b5dda8840428831036978c5ff2b52cc7236d81e59055fb4a902190
-MISC metadata.xml 815 SHA256 a1b89fcf3c9fdd677a97a76e4e886570c6f9284ee8cb34bdca51f091c13330cb SHA512 e1a7836f31c4384ef1b92dd2b49b993e0f9fa4d9d68e85e29b79bfd461472e4b2e3fea70b8e76e7e24384593727e417b0504edd09006e873f8b40167e6f2dd4a WHIRLPOOL 5f2276d1838588e5ddac1cb5fc9e81579164256e6b39b54032ddaf7e024f64696249cd303afb7c8df5ca3b4ee389c3dd0957f4e439f0bd2fc768b11e991c493c
+MISC ChangeLog 5241 SHA256 13ff23b1eccc245af9df83b66e691287ffe6280fb60963deb683e6687da96be7 SHA512 bbaef11d146b873d9a0b76a39aea7c2e286d4c1c6c23c23e906c155c42d1a59efce28d89d79c36acd361635bf31596ff084c602084e90757b3a3f61947a5ac02 WHIRLPOOL 79702576001c5b04dab096acce4bf68a92a9ffa1a78ffc65d2eae04d00fd99352f500384b33376f7aefbd3e2dcbb232ee2fb63e9f7d227c451849ebbbf7fc980
+MISC metadata.xml 817 SHA256 42b9b8d7e4b1e2138e786d223748bc243b46b61cf6feed2e4f1892bd2f033654 SHA512 4bb1216e7e7cac83a34b66fdb9c96a4e771c47d95b3830dca2ba3483cc84906887cc436ab3dbcc59fb4dcd2299a31230ad8338013c87b6d4c56ae7e6459a5b7e WHIRLPOOL e2aacad87fa57d1f4a4c555d6aec80d4c8d615576c8092ec6c28d861ad76c9a676d7b0dc2523c7fcfa73b13f3e7ddb9e3dc386bcf3d1852df07f9dc2774e50fd
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlDAVtsACgkQgAnW8HDreRZWJwCfexQIenz/xXkv7hDGbLsZ+co8
-EDAAn35ZRV88da1f8DhYAdmVPHQuHA9E
-=sw/P
+iEYEAREIAAYFAlE/JwQACgkQgAnW8HDreRa8fACeL3v9srErjvuErnt4TYEuHki2
+qs4AoMHQ+Q+jg6dpU73yiscJiy5ZOd4j
+=+Adm
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/cbflib/cbflib-0.9.2.10.ebuild b/sci-libs/cbflib/cbflib-0.9.2.10.ebuild
new file mode 100644
index 000000000000..d0e0073c2436
--- /dev/null
+++ b/sci-libs/cbflib/cbflib-0.9.2.10.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/cbflib/cbflib-0.9.2.10.ebuild,v 1.1 2013/03/12 13:00:51 jlec Exp $
+
+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}
+
+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/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/metadata.xml b/sci-libs/cbflib/metadata.xml
index ee6374a284a9..6c162bd85484 100644
--- a/sci-libs/cbflib/metadata.xml
+++ b/sci-libs/cbflib/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci</herd>
-	<longdescription>
+  <herd>sci</herd>
+  <longdescription>
 CBFLIB is a library of ANSI-C functions providing a simple mechanism
 for accessing Crystallographic Binary Files (CBF files) and Image-supporting
 CIF (imgCIF) files. The CBFLIB API is loosely based on the CIFPARSE API for