ccp4-libs bumped to 6.1.2

7 files changed, 821 insertions, 1 deletions

diff --git a/sci-libs/ccp4-libs/ChangeLog b/sci-libs/ccp4-libs/ChangeLog
index c7ec65515..3f9143c2d 100644
--- a/sci-libs/ccp4-libs/ChangeLog
+++ b/sci-libs/ccp4-libs/ChangeLog
@@ -2,6 +2,14 @@
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*ccp4-libs-6.1.2 (29 Jul 2009)
+
+  29 Jul 2009; Justin Lecher (jlec) <jlec@j-schmitz.net>
+  +ccp4-libs-6.1.2.ebuild, +ccp4-libs-6.1.2.ebuild.save,
+  +files/6.1.2-dont-make-dirs-in-configure.patch,
+  +files/6.1.2-glibc2.10.patch, +files/6.1.2-link-proberly.patch:
+  Still not released 6.1.2
+
 *ccp4-libs-6.1.1-r7 (05 Jul 2009)
 
   05 Jul 2009; Justin Lecher (jlec) <jlec@j-schmitz.net>
diff --git a/sci-libs/ccp4-libs/Manifest b/sci-libs/ccp4-libs/Manifest
index 57a9b23cf..cb1c1a313 100644
--- a/sci-libs/ccp4-libs/Manifest
+++ b/sci-libs/ccp4-libs/Manifest
@@ -2,13 +2,19 @@ AUX 6.0.2-ppc-double-define-gerror.patch 424 RMD160 4f012233446fffa61e8d775a19a0
 AUX 6.1.1-dont-make-dirs-in-configure.patch 2866 RMD160 ba49e45ab609a42a2d93b96f55af913bf9625610 SHA1 36c9329c3768c08687ef062c9ab649d32833b422 SHA256 1b5997f17526a4fd60ffa9eccf4b765aadf3a78c9394657000e0454f364240ca
 AUX 6.1.1-glibc2.10.patch 1018 RMD160 577ee4a6174df36bb8bac82738523f5c757df4b9 SHA1 48ad6d0d024c43d64277e4decba420d51e75a510 SHA256 d2a2ddf2a66738d94723b50797e279f64c8e057a3e584e33f9eb9c8d7ea0e532
 AUX 6.1.1-link-proberly.patch 9325 RMD160 0457062deb5d71f7419d134e89d3d99989fc12b7 SHA1 c7c0453b82b85ae22ea42b562dd2d4ac95b134e7 SHA256 81c4eda497ffa3a0f2d757b7c6b3f6cc35a06ced18ebede2faa31f18667ea8b7
+AUX 6.1.2-dont-make-dirs-in-configure.patch 2866 RMD160 ba49e45ab609a42a2d93b96f55af913bf9625610 SHA1 36c9329c3768c08687ef062c9ab649d32833b422 SHA256 1b5997f17526a4fd60ffa9eccf4b765aadf3a78c9394657000e0454f364240ca
+AUX 6.1.2-glibc2.10.patch 1018 RMD160 577ee4a6174df36bb8bac82738523f5c757df4b9 SHA1 48ad6d0d024c43d64277e4decba420d51e75a510 SHA256 d2a2ddf2a66738d94723b50797e279f64c8e057a3e584e33f9eb9c8d7ea0e532
+AUX 6.1.2-link-proberly.patch 9325 RMD160 0457062deb5d71f7419d134e89d3d99989fc12b7 SHA1 c7c0453b82b85ae22ea42b562dd2d4ac95b134e7 SHA256 81c4eda497ffa3a0f2d757b7c6b3f6cc35a06ced18ebede2faa31f18667ea8b7
 AUX pass-clipper-enablevals.patch 501 RMD160 23466922268a91570b0f64cf79809b988e32689b SHA1 c254d31fe88ed1716a53bd549cf7aee537ca5204 SHA256 d476c9f231fb6cdfb5e57004b393644a88016318cdeed9c33c32de25e0d91b79
 DIST 6.1.1-090511-updates.patch.bz2 8915 RMD160 58114b0ba6d225078044a8a6f9245aab66c6b572 SHA1 15c327c0b218b542b0c3955a9e63d2c6de299f7e SHA256 c0dbbde05b72f2460ada22f556d4cfe1f286a448ceb1181fd48b758468e509ac
 DIST ccp4-6.1.1-core-src.tar.gz 246661086 RMD160 6722367727e4b6b1f8456f1458c9aac124923a89 SHA1 9141801e021f8a5107ed1e3989840e4de849b39c SHA256 56f971e05fe4543173451e48600813492fd0081b25d4a659cb0fed1fd2529407
 DIST ccp4-6.1.1-src-patch-04_03_09.tar.gz 279642 RMD160 1a7c3b6cc846d315fc577e78b4aa00ab85a3d3d2 SHA1 29dbb84f3d63fc860694473ca99cf8bb71dae18a SHA256 eb806168235b55fbafdd72591ba94d35b78cc715a56a8b90979644d420ad672a
+DIST ccp4-6.1.2-core-src.tar.gz 247203373 RMD160 d2ead65da0a2561a8a256cdaa15a6b1a02b6d49e SHA1 fe94461fcafa7074231e01221760e24bb886d605 SHA256 875137beb74cb385b89fe3e49feeda78330c175861a590ee5f7cdbec26bc0e8a
 EBUILD ccp4-libs-6.1.1-r4.ebuild 5776 RMD160 3a36e4a2fff69e2a17028c39f8849a4cfd73c64e SHA1 7693f8aa4a3e6106876e68fcdf25fada3b2e61e5 SHA256 f541ab2ffa172978b11c91c11754be4c75bb63174e2c3a4a1990f7e8fa5ddd57
 EBUILD ccp4-libs-6.1.1-r6.ebuild 5956 RMD160 88f4d6e5c9067225501f214002bc5924bc07c1a2 SHA1 8e61890578007833d8a923eeada3bdf064354056 SHA256 1e7bde2c6f9319d699cf95565aa74bd26372b9d1275fdeaaa8ee75fb4001b30a
 EBUILD ccp4-libs-6.1.1-r7.ebuild 6093 RMD160 99176fde51fd41e7b29610a15720859e97b22d01 SHA1 6a52cfb8e4cddd9454db90bb90bad600c3b753ec SHA256 2143d0c1a7905107b9699cce41d7f33a6fedc99cf9046de33d7b42ddafdfa937
 EBUILD ccp4-libs-6.1.1.ebuild 5211 RMD160 6f3705f7ab0c48bbda073eb7dc1a283b3dcaa39a SHA1 8b09909daae034fc393b49b5fda7e06a783bcd14 SHA256 e9b4a3183a8f753ced59968b261bb655c87d13ade8c9964c71f1f2948c42067e
-MISC ChangeLog 2141 RMD160 6a857cfba2a1fe8fb1c6b9a3e3c2c9e84da043aa SHA1 d0a90b7bff5a7afb45df107d20a4a2fe863509e0 SHA256 112b8a324770dd0b672315868749f265a7c684f4e3ac5185bcdf74763bad9393
+EBUILD ccp4-libs-6.1.2.ebuild 6784 RMD160 785dc7bf1ca755b66ab6dad2d2e2a3efc0bfa76d SHA1 b6df87140bb72012ca88920c6ba9f36d5a50c033 SHA256 0cc19814e23e525bb74acc921f22c0c73f9fee522a5bf323259477e0a87c454c
+MISC ChangeLog 2431 RMD160 35e051f578142a24e0c488bb79972b6ec03e8f53 SHA1 51c7326eaee4b4cec3d1f847ba92087ada731263 SHA256 df369e675d208c704403dd341ceb4ef57fb8a0e27760762cc59e6e4bce294d98
+MISC ccp4-libs-6.1.2.ebuild.save 6779 RMD160 b63cef13d5584d4318abfc2db3144c3e844316b0 SHA1 b3d2d68c38b8f4a57607d7010e5b6d9646cba1cc SHA256 b6078ff2f676f0538d3d0ed9bb260d9d5eacd98a95ee3e9f1997f845f53eb40a
 MISC metadata.xml 309 RMD160 b9d7f0a63f8fb51e9b4e2d6b4f4028541df5400c SHA1 26ee4b64e0e4d52b1afe00957d53b0cc2956da00 SHA256 04f156de856eae11c0cf8af213f74a9852213844cdd5133aa01dbe60371d57e7
diff --git a/sci-libs/ccp4-libs/ccp4-libs-6.1.2.ebuild b/sci-libs/ccp4-libs/ccp4-libs-6.1.2.ebuild
new file mode 100644
index 000000000..59d82e597
--- /dev/null
+++ b/sci-libs/ccp4-libs/ccp4-libs-6.1.2.ebuild
@@ -0,0 +1,221 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+inherit fortran eutils gnuconfig toolchain-funcs
+
+FORTRAN="g77 gfortran ifc"
+
+SRC="ftp://ftp.ccp4.ac.uk/ccp4"
+
+#UPDATE="04_03_09"
+#PATCHDATE="090511"
+
+MY_P="${P/-libs}"
+
+PATCH_TOT="0"
+# Here's a little scriptlet to generate this list from the provided
+# index.patches file
+#
+# i=1; while read -a line; do [[ ${line//#} != ${line} ]] && continue;
+# echo "PATCH${i}=( ${line[1]}"; echo "${line[0]} )"; (( i++ )); done <
+# index.patches
+#PATCH1=( src/topp_
+#topp.f-r1.16.2.5-r1.16.2.6.diff )
+#PATCH2=( .
+#configure-r1.372.2.18-r1.372.2.19.diff )
+
+DESCRIPTION="Protein X-ray crystallography toolkit"
+HOMEPAGE="http://www.ccp4.ac.uk/"
+RESTRICT="mirror"
+SRC_URI="${SRC}/${PV}/${MY_P}-core-src.tar.gz"
+#	${SRC}/${PV}/updates/${MY_P}-src-patch-${UPDATE}.tar.gz
+#	http://dev.gentooexperimental.org/~jlec/science-dist/${PV}-${PATCHDATE}-updates.patch.bz2"
+
+for i in $(seq $PATCH_TOT); do
+	NAME="PATCH${i}[1]"
+	SRC_URI="${SRC_URI}
+		${SRC}/${PV}/patches/${!NAME}"
+done
+LICENSE="ccp4"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+RDEPEND="virtual/lapack
+	virtual/blas
+	=sci-libs/fftw-2*
+	app-shells/tcsh
+	!<sci-chemistry/ccp4-6.0.99
+	sci-libs/monomer-db"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${P/-libs}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	einfo "Applying upstream patches ..."
+	for patch in $(seq $PATCH_TOT); do
+		base="PATCH${patch}"
+		dir=$(eval echo \${${base}[0]})
+		p=$(eval echo \${${base}[1]})
+		pushd "${dir}" >& /dev/null
+		ccp_patch "${DISTDIR}/${p}"
+		popd >& /dev/null
+	done
+	einfo "Done."
+	echo
+
+#	epatch "${WORKDIR}"/${PV}-${PATCHDATE}-updates.patch
+
+	einfo "Applying Gentoo patches ..."
+	# These two only needed when attempting to install outside build dir via
+	# --bindir and --libdir instead of straight copying after build
+
+	# it attempts to install some libraries during the build
+	#ccp_patch "${FILESDIR}"/${P}-install-libs-at-install-time.patch
+	# hklview/ipdisp.exe/xdlmapman/ipmosflm can't find libxdl_view
+	# without this patch when --libdir is set
+	# Rotgen still needs more patching to find it
+	#ccp_patch "${FILESDIR}"/add-xdl-libdir.patch
+
+	# it tries to create libdir, bindir etc on live system in configure
+	ccp_patch "${FILESDIR}"/${PV}-dont-make-dirs-in-configure.patch
+
+	# gerror_ gets defined twice on ppc if you're using gfortran/g95
+	ccp_patch "${FILESDIR}"/6.0.2-ppc-double-define-gerror.patch
+
+	einfo "Done." # done applying Gentoo patches
+	echo
+
+	# glibc-2.10 getline fix
+#	sed -e "s:getline:${PN/-libs}getline:g" -i lib/src/fsplit.c || die
+#	ccp_patch "${FILESDIR}"/${PV}-glibc2.10.patch
+
+	gnuconfig_update
+}
+
+src_compile() {
+	# Build system is broken if we set LDFLAGS
+	userldflags="${LDFLAGS}"
+	export SHARED_LIB_FLAGS="${LDFLAGS}"
+	unset LDFLAGS
+
+	# GENTOO_OSNAME can be one of:
+	# irix irix64 sunos sunos64 aix hpux osf1 linux freebsd
+	# linux_compaq_compilers linux_intel_compilers generic Darwin
+	# ia64_linux_intel Darwin_ibm_compilers linux_ibm_compilers
+	if [[ "${FORTRANC}" = "ifc" ]]; then
+		if use ia64; then
+			GENTOO_OSNAME="ia64_linux_intel"
+		else
+			# Should be valid for x86, maybe amd64
+			GENTOO_OSNAME="linux_intel_compilers"
+		fi
+	else
+		# Should be valid for x86 and amd64, at least
+		GENTOO_OSNAME="linux"
+	fi
+
+	# Sets up env
+	ln -s \
+		ccp4.setup-bash \
+		"${S}"/include/ccp4.setup
+
+	# We agree to the license by emerging this, set in LICENSE
+	sed -i \
+		-e "s~^\(^agreed=\).*~\1yes~g" \
+		"${S}"/configure
+
+	# Fix up variables -- need to reset CCP4_MASTER at install-time
+	sed -i \
+		-e "s~^\(setenv CCP4_MASTER.*\)/.*~\1"${WORKDIR}"~g" \
+		-e "s~^\(setenv CCP4I_TCLTK.*\)/usr/local/bin~\1/usr/bin~g" \
+		"${S}"/include/ccp4.setup*
+
+	# Set up variables for build
+	source "${S}"/include/ccp4.setup
+
+	export CC=$(tc-getCC)
+	export CXX=$(tc-getCXX)
+	export COPTIM=${CFLAGS}
+	export CXXOPTIM=${CXXFLAGS}
+	# Default to -O2 if FFLAGS is unset
+	export FC=${FORTRANC}
+	export FOPTIM=${FFLAGS:- -O2}
+#	export CCP4_SCR="${T}"
+
+	# Fix linking
+	export SHARE_LIB="\
+		$(tc-getCC) ${userldflags} -shared -Wl,-soname,libmmdb.so -o libmmdb.so \${MMDBOBJS} $(gcc-config -L | awk -F: '{for(i=1; i<=NF; i++) printf " -L%s", $i}'); \
+		$(tc-getCC) ${userldflags} -shared -Wl,-soname,libccp4c.so -o libccp4c.so \${CORELIBOBJS} \${CGENERALOBJS} \${CUCOBJS} \${CMTZOBJS} \${CMAPOBJS} \${CSYMOBJS} -lm $(gcc-config -L | awk -F: '{for(i=1; i<=NF; i++) printf " -L%s", $i}'); \
+		${FORTRANC} ${userldflags} -shared -Wl,-soname,libccp4f.so -o libccp4f.so \${FORTRANLOBJS} \${FINTERFACEOBJS} -lstdc++ -lgfortran $(gcc-config -L | awk -F: '{for(i=1; i<=NF; i++) printf " -L%s", $i}')"
+#	export SHARE_LIB="\
+#		ld -shared -soname libmmdb.so -o libmmdb.so \${MMDBOBJS} $(gcc-config -L | awk -F: '{for(i=1; i<=NF; i++) printf " -L%s", $i}'); \
+#		ld -shared -soname libccp4c.so -o libccp4c.so \${CORELIBOBJS} \${CGENERALOBJS} \${CUCOBJS} \${CMTZOBJS} \${CMAPOBJS} \${CSYMOBJS} -lm $(gcc-config -L | awk -F: '{for(i=1; i<=NF; i++) printf " -L%s", $i}'); \
+#		ld -shared -soname libccp4f.so -o libccp4f.so \${FORTRANLOBJS} \${FINTERFACEOBJS} -lstdc++ -lgfortran $(gcc-config -L | awk -F: '{for(i=1; i<=NF; i++) printf " -L%s", $i}')"
+
+	# Can't use econf, configure rejects unknown options like --prefix
+	./configure \
+		--onlylibs \
+		--with-shared-libs \
+		--with-fftw=/usr \
+		--with-warnings \
+		--disable-cctbx \
+		--disable-clipper \
+		--tmpdir="${TMPDIR}" \
+		${GENTOO_OSNAME} || die "econf failed"
+	emake -j1 onlylib || die "emake failed"
+}
+
+src_install() {
+	# Set up variables for build
+	source "${S}"/include/ccp4.setup
+
+# Only needed when using --bindir and --libdir
+	# Needed to avoid errors. Originally tried to make lib and bin
+	# in configure script, now patched out by dont-make-dirs-in-configure.patch
+#	dodir /usr/include /usr/$(get_libdir) /usr/bin
+
+#	make install || die "install failed"
+	einstall || die "install failed"
+
+	# Libs
+	for file in "${S}"/lib/*; do
+		if [[ -d ${file} ]]; then
+			continue
+		elif [[ -x ${file} ]]; then
+			dolib.so ${file} || die
+		else
+			insinto /usr/$(get_libdir)
+			doins ${file} || die
+		fi
+	done
+
+	# Bins
+	dobin bin/{automask,diff2jpeg,diffdump,printpeaks} || die
+	newbin bin/superpose superpose-ccp4 || die
+
+	# Fix libdir in all *.la files
+	sed -i \
+		-e "s:^\(libdir=\).*:\1\'/usr/$(get_libdir)\':g" \
+		"${D}"/usr/$(get_libdir)/*.la
+
+	# Data
+	insinto /usr/share/ccp4/data/
+	doins -r "${S}"/lib/data/{*.PARM,*.prt,*.lib,*.dic,*.idl,*.cif,*.resource,*.york,*.hist,fraglib,reference_structures} || die
+	dodoc "${S}"/lib/data/*.doc
+	newdoc "${S}"/lib/data/README DATA-README
+
+	# Include files
+	insinto /usr/include
+	for i in ccp4 mmdb; do
+		doins -r "${S}"/include/${i} || die
+	done
+}
+
+# Epatch wrapper for bulk patching
+ccp_patch() {
+	EPATCH_SINGLE_MSG="  ${1##*/} ..." epatch ${1}
+}
diff --git a/sci-libs/ccp4-libs/ccp4-libs-6.1.2.ebuild.save b/sci-libs/ccp4-libs/ccp4-libs-6.1.2.ebuild.save
new file mode 100644
index 000000000..7cc458e59
--- /dev/null
+++ b/sci-libs/ccp4-libs/ccp4-libs-6.1.2.ebuild.save
@@ -0,0 +1,221 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+inherit fortran eutils gnuconfig toolchain-funcs
+
+FORTRAN="g77 gfortran ifc"
+
+SRC="ftp://ftp.ccp4.ac.uk/ccp4"
+
+#UPDATE="04_03_09"
+#PATCHDATE="090511"
+
+MY_P="${P/-libs}"
+
+PATCH_TOT="0"
+# Here's a little scriptlet to generate this list from the provided
+# index.patches file
+#
+# i=1; while read -a line; do [[ ${line//#} != ${line} ]] && continue;
+# echo "PATCH${i}=( ${line[1]}"; echo "${line[0]} )"; (( i++ )); done <
+# index.patches
+#PATCH1=( src/topp_
+#topp.f-r1.16.2.5-r1.16.2.6.diff )
+#PATCH2=( .
+#configure-r1.372.2.18-r1.372.2.19.diff )
+
+DESCRIPTION="Protein X-ray crystallography toolkit"
+HOMEPAGE="http://www.ccp4.ac.uk/"
+RESTRICT="mirror"
+SRC_URI="${SRC}/${PV}/${MY_P}-core-src.tar.gz"
+#	${SRC}/${PV}/updates/${MY_P}-src-patch-${UPDATE}.tar.gz
+#	http://dev.gentooexperimental.org/~jlec/science-dist/${PV}-${PATCHDATE}-updates.patch.bz2"
+
+for i in $(seq $PATCH_TOT); do
+	NAME="PATCH${i}[1]"
+	SRC_URI="${SRC_URI}
+		${SRC}/${PV}/patches/${!NAME}"
+done
+LICENSE="ccp4"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+RDEPEND="virtual/lapack
+	virtual/blas
+	=sci-libs/fftw-2*
+	app-shells/tcsh
+	!<sci-chemistry/ccp4-6.0.99
+	sci-libs/monomer-db"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${P/-libs}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	einfo "Applying upstream patches ..."
+	for patch in $(seq $PATCH_TOT); do
+		base="PATCH${patch}"
+		dir=$(eval echo \${${base}[0]})
+		p=$(eval echo \${${base}[1]})
+		pushd "${dir}" >& /dev/null
+		ccp_patch "${DISTDIR}/${p}"
+		popd >& /dev/null
+	done
+	einfo "Done."
+	echo
+
+#	epatch "${WORKDIR}"/${PV}-${PATCHDATE}-updates.patch
+
+	einfo "Applying Gentoo patches ..."
+	# These two only needed when attempting to install outside build dir via
+	# --bindir and --libdir instead of straight copying after build
+
+	# it attempts to install some libraries during the build
+	#ccp_patch "${FILESDIR}"/${P}-install-libs-at-install-time.patch
+	# hklview/ipdisp.exe/xdlmapman/ipmosflm can't find libxdl_view
+	# without this patch when --libdir is set
+	# Rotgen still needs more patching to find it
+	#ccp_patch "${FILESDIR}"/add-xdl-libdir.patch
+
+	# it tries to create libdir, bindir etc on live system in configure
+	ccp_patch "${FILESDIR}"/${PV}-dont-make-dirs-in-configure.patch
+
+	# gerror_ gets defined twice on ppc if you're using gfortran/g95
+	ccp_patch "${FILESDIR}"/6.0.2-ppc-double-define-gerror.patch
+
+	einfo "Done." # done applying Gentoo patches
+	echo
+
+	# glibc-2.10 getline fix
+#	sed -e "s:getline:${PN/-libs}getline:g" -i lib/src/fsplit.c || die
+#	ccp_patch "${FILESDIR}"/${PV}-glibc2.10.patch
+
+	gnuconfig_update
+}
+
+src_compile() {
+	# Build system is broken if we set LDFLAGS
+	userldflags="${LDFLAGS}"
+	export SHARED_LIB_FLAGS="${LDFLAGS}"
+	unset LDFLAGS
+
+	# GENTOO_OSNAME can be one of:
+	# irix irix64 sunos sunos64 aix hpux osf1 linux freebsd
+	# linux_compaq_compilers linux_intel_compilers generic Darwin
+	# ia64_linux_intel Darwin_ibm_compilers linux_ibm_compilers
+	if [[ "${FORTRANC}" = "ifc" ]]; then
+		if use ia64; then
+			GENTOO_OSNAME="ia64_linux_intel"
+		else
+			# Should be valid for x86, maybe amd64
+			GENTOO_OSNAME="linux_intel_compilers"
+		fi
+	else
+		# Should be valid for x86 and amd64, at least
+		GENTOO_OSNAME="linux"
+	fi
+
+	# Sets up env
+	ln -s \
+		ccp4.setup-bash \
+		"${S}"/include/ccp4.setup
+
+	# We agree to the license by emerging this, set in LICENSE
+	sed -i \
+		-e "s~^\(^agreed=\).*~\1yes~g" \
+		"${S}"/configure
+
+	# Fix up variables -- need to reset CCP4_MASTER at install-time
+	sed -i \
+		-e "s~^\(setenv CCP4_MASTER.*\)/.*~\1"${WORKDIR}"~g" \
+		-e "s~^\(setenv CCP4I_TCLTK.*\)/usr/local/bin~\1/usr/bin~g" \
+		"${S}"/include/ccp4.setup*
+
+	# Set up variables for build
+	source "${S}"/include/ccp4.setup
+
+	export CC=$(tc-getCC)
+	export CXX=$(tc-getCXX)
+	export COPTIM=${CFLAGS}
+	export CXXOPTIM=${CXXFLAGS}
+	# Default to -O2 if FFLAGS is unset
+	export FC=${FORTRANC}
+	export FOPTIM=${FFLAGS:- -O2}
+#	export CCP4_SCR="${T}"
+
+	# Fix linking
+	export SHARE_LIB="\
+		$(tc-getCC) ${userldflags} -shared -Wl,-soname,libmmdb.so -o libmmdb.so \${MMDBOBJS} $(gcc-config -L | awk -F: '{for(i=1; i<=NF; i++) printf " -L%s", $i}'); \
+		$(tc-getCC) ${userldflags} -shared -Wl,-soname,libccp4c.so -o libccp4c.so \${CORELIBOBJS} \${CGENERALOBJS} \${CUCOBJS} \${CMTZOBJS} \${CMAPOBJS} \${CSYMOBJS} -lm $(gcc-config -L | awk -F: '{for(i=1; i<=NF; i++) printf " -L%s", $i}'); \
+		${FORTRANC} ${userldflags} -shared -Wl,-soname,libccp4f.so -o libccp4f.so \${FORTRANLOBJS} \${FINTERFACEOBJS} -lstdc++ -lgfortran $(gcc-config -L | awk -F: '{for(i=1; i<=NF; i++) printf " -L%s", $i}')"
+#	export SHARE_LIB="\
+#		ld -shared -soname libmmdb.so -o libmmdb.so \${MMDBOBJS} $(gcc-config -L | awk -F: '{for(i=1; i<=NF; i++) printf " -L%s", $i}'); \
+#		ld -shared -soname libccp4c.so -o libccp4c.so \${CORELIBOBJS} \${CGENERALOBJS} \${CUCOBJS} \${CMTZOBJS} \${CMAPOBJS} \${CSYMOBJS} -lm $(gcc-config -L | awk -F: '{for(i=1; i<=NF; i++) printf " -L%s", $i}'); \
+#		ld -shared -soname libccp4f.so -o libccp4f.so \${FORTRANLOBJS} \${FINTERFACEOBJS} -lstdc++ -lgfortran $(gcc-config -L | awk -F: '{for(i=1; i<=NF; i++) printf " -L%s", $i}')"
+
+	# Can't use econf, configure rejects unknown options like --prefix
+	./configure \
+		--onlylibs \
+		--with-shared-libs \
+		--with-fftw=/usr \
+		--with-warnings \
+		--disable-cctbx \
+		--disable-clipper \
+		--tmpdir="${TMPDIR}" \
+		${GENTOO_OSNAME} || die "econf failed"
+	emake -j1 onlylib || die "emake failed"
+}
+
+src_install() {
+	# Set up variables for build
+	source "${S}"/include/ccp4.setup
+
+# Only needed when using --bindir and --libdir
+	# Needed to avoid errors. Originally tried to make lib and bin
+	# in configure script, now patched out by dont-make-dirs-in-configure.patch
+#	dodir /usr/include /usr/$(get_libdir) /usr/bin
+
+#	make install || die "install failed"
+	einstall || die "install failed"
+
+	# Libs
+	for file in "${S}"/lib/*; do
+		if [[ -d ${file} ]]; then
+			continue
+		elif [[ -x ${file} ]]; then
+			dolib.so ${file} || die
+		else
+			insinto /usr/$(get_libdir)
+			doins ${file} || die
+		fi
+	done
+
+	# Bins
+	dobin bin/{automask,diff2jpeg,diffdump,printpeaks} || die
+	newbin bin/superpose superpose-ccp4 || die
+
+	# Fix libdir in all *.la files
+	sed -i \
+		-e "s:^\(libdir=\).*:\1\'/usr/$(get_libdir)\':g" \
+		"${D}"/usr/$(get_libdir)/*.la
+
+	# Data
+	insinto /usr/share/ccp4/data/
+	doins -r "${S}"/lib/data/{*.PARM,*.prt,*.lib,*.dic,*.idl,*.cif,*.resource,*.york,*.hist,fraglib,reference_structures} || die
+	dodoc "${S}"/lib/data/*.doc
+	newdoc "${S}"/lib/data/README DATA-README
+
+	# Include files
+	insinto /usr/include
+	for i in ccp4 mmdb; do
+		doins -r "${S}"/include/${i} || die
+	done
+}
+
+# Epatch wrapper for bulk patching
+ccp_patch() {
+	EPATCH_SINGLE_MSG="  ${1##*/} ..." epatch ${1}
+}
diff --git a/sci-libs/ccp4-libs/files/6.1.2-dont-make-dirs-in-configure.patch b/sci-libs/ccp4-libs/files/6.1.2-dont-make-dirs-in-configure.patch
new file mode 100644
index 000000000..583697cea
--- /dev/null
+++ b/sci-libs/ccp4-libs/files/6.1.2-dont-make-dirs-in-configure.patch
@@ -0,0 +1,87 @@
+--- ccp4-6.0.99e.orig/configure	2008-07-31 10:37:22.000000000 -0700
++++ ccp4-6.0.99e/configure	2008-07-31 10:39:18.000000000 -0700
+@@ -643,45 +643,45 @@
+ #     echo "! Beware -- the $system installation isn't properly tested." ; }
+ syswarn='echo; echo "! Beware -- the $system installation is not properly tested."'
+ 
+-if test -z "$onlylibs" ; then 
+-   for i in CCP4_SCR BINSORT_SCR; do
+-     if ( eval test -d \$$i || eval mkdir -p \$$i ) ; then :
+-     else
+-       eval echo "! No directory \$$i and can\'t create it."
+-       echo "  Check the value of $i."
+-       badvar=1
+-     fi
+-   done
+-
+-   for i in libdir bindir includedir; do
+-     if ( eval test -d \$$i || eval mkdir -p \$$i ) ; then :
+-     else
+-       eval echo "! No directory \$$i and can\'t create it."
+-       echo "  Check the argument of --$i."
+-       badvar=1
+-     fi
+-   done
+-
+-   for i in $dotsrc $dotunsupp $dotunsuppsrc $dotdeprec $dotdeprecsrc ./lib ./lib/src ./lib/data ./ccp4i/etc/unix $mosflmdir/lib $mosflmdir/bin $mosflmdir/cbf/lib ; do
+-     if test -d $i || mkdir $i; then :
+-     else
+-       eval echo "! No directory $i and can\'t create it."
+-       badvar=1
+-     fi
+-   done
+-else
+-   # Kludge to fool the "Makefile" target in the top-level CCP4
+-   # Makefile into not trying to remake src/Makefile.in
+-   for i in $srcdir/src $srcdir/lib/src ; do
+-     if test -d $i || mkdir $i; then
+-       if ! test -f $i/Makefile.in ; then
+-         echo
+-         echo "onlylibs: making dummy file $i/Makefile.in"
+-	 touch $i/Makefile.in
+-       fi
+-     fi
+-   done
+-fi
++#if test -z "$onlylibs" ; then 
++#   for i in CCP4_SCR BINSORT_SCR; do
++#     if ( eval test -d \$$i || eval mkdir -p \$$i ) ; then :
++#     else
++#       eval echo "! No directory \$$i and can\'t create it."
++#       echo "  Check the value of $i."
++#       badvar=1
++#     fi
++#   done
++#
++#   for i in libdir bindir includedir; do
++#     if ( eval test -d \$$i || eval mkdir -p \$$i ) ; then :
++#     else
++#       eval echo "! No directory \$$i and can\'t create it."
++#       echo "  Check the argument of --$i."
++#       badvar=1
++#     fi
++#   done
++#
++#   for i in $dotsrc $dotunsupp $dotunsuppsrc $dotdeprec $dotdeprecsrc ./lib ./lib/src ./lib/data ./ccp4i/etc/unix $mosflmdir/lib $mosflmdir/bin $mosflmdir/cbf/lib ; do
++#     if test -d $i || mkdir $i; then :
++#     else
++#       eval echo "! No directory $i and can\'t create it."
++#       badvar=1
++#     fi
++#   done
++#else
++#   # Kludge to fool the "Makefile" target in the top-level CCP4
++#   # Makefile into not trying to remake src/Makefile.in
++#   for i in $srcdir/src $srcdir/lib/src ; do
++#     if test -d $i || mkdir $i; then
++#       if ! test -f $i/Makefile.in ; then
++#         echo
++#         echo "onlylibs: making dummy file $i/Makefile.in"
++#	 touch $i/Makefile.in
++#       fi
++#     fi
++#   done
++#fi
+ 
+ ### sanity checks
+ 
diff --git a/sci-libs/ccp4-libs/files/6.1.2-glibc2.10.patch b/sci-libs/ccp4-libs/files/6.1.2-glibc2.10.patch
new file mode 100644
index 000000000..6e3997647
--- /dev/null
+++ b/sci-libs/ccp4-libs/files/6.1.2-glibc2.10.patch
@@ -0,0 +1,22 @@
+--- lib/ccif/configure.in	2009-06-10 13:52:59.000000000 +0200
++++ lib/ccif/configure.in.new	2009-06-10 14:04:31.000000000 +0200
+@@ -363,7 +363,7 @@
+          fi
+          SHARED_LIB_CMD='$(LD) $(SHARED_LIB_FLAGS) -shared -soname $(SHARED_LIB_NAME) \\\
+                         --whole-archive '"$SHARED_LIB_RESTRICT"' $L \\\
+-                        $(RX_LFLAG) -o $(SHARED_LIB_NAME)'
++                        $(RX_LFLAG) -o $(SHARED_LIB_NAME) -lm'
+          SHARED_LIB_EXPORTS_CMD='cp libccif-universal-ld.lis $(SHARED_LIB_EXPORTS)'
+       fi
+    ;;
+--- lib/ccif/configure	2009-06-10 14:26:58.000000000 +0200
++++ lib/ccif/configure.new	2009-06-10 14:43:31.000000000 +0200
+@@ -1807,7 +1807,7 @@
+          SHARED_LIB_CMD='$(LD) $(SHARED_LIB_CFLAGS) -shared -soname \\\
+ 				$(SHARED_LIB_NAME) \\\
+                                --whole-archive $L \\\
+-                               -o $(SHARED_LIB_NAME)'
++                               -o $(SHARED_LIB_NAME) -lm'
+          SHARED_LIB_EXPORTS_CMD=''
+       fi
+    ;;
diff --git a/sci-libs/ccp4-libs/files/6.1.2-link-proberly.patch b/sci-libs/ccp4-libs/files/6.1.2-link-proberly.patch
new file mode 100644
index 000000000..0780314f0
--- /dev/null
+++ b/sci-libs/ccp4-libs/files/6.1.2-link-proberly.patch
@@ -0,0 +1,255 @@
+--- lib/src/Makefile.in	2009-03-02 17:53:15.000000000 +0100
++++ lib/src/Makefile.in.new	2009-03-02 17:52:09.000000000 +0100
+@@ -172,9 +172,8 @@
+ 
+ ##### Makefile targets ######
+ 
+-all:  fsplit $(LMMDB) $(LC) $(LF) $(SCRIPT_MODULES)
++all:  fsplit $(LMMDB) LMMDB_SO $(LC) LC_SO $(LF) LF_SO $(SCRIPT_MODULES)
+ # maybe create shared library
+-	$(SHARE_LIB)
+ 
+ $(LC) : $(CORELIBOBJS) $(CGENERALOBJS) $(CUCOBJS) $(CMTZOBJS) $(CMAPOBJS) $(CSYMOBJS)
+ 	$(AR) $(LC) $?
+@@ -186,6 +185,27 @@
+ 	$(AR) $(LF) $(FINTERFACEOBJS)
+ 	$(RANLIB) $@
+ 
++LMMDB_SO : 
++	$(CC) $(COPTIM) -shared -Wl,-soname,libmmdb.so.0 -o libmmdb.so.0.0.0 \
++	$(MMDBOBJS) && \
++	ln -sf libmmdb.so.0.0.0 libmmdb.so.0 && \
++	ln -sf libmmdb.so.0.0.0 libmmdb.so
++
++LC_SO : 
++	$(CC) $(COPTIM) -shared -Wl,-soname,libccp4c.so.0 -o libccp4c.so.0.0.0 \
++	$(CORELIBOBJS) $(CGENERALOBJS) $(CUCOBJS) $(CMTZOBJS) $(CMAPOBJS) $(CSYMOBJS) && \
++	ln -sf libccp4c.so.0.0.0 libccp4c.so.0 && \
++	ln -sf libccp4c.so.0.0.0 libccp4c.so
++
++LF_SO : 
++	$(FC) $(FOPTIM) -shared -Wl,-soname,libccp4f.so.0 -o libccp4f.so.0.0.0 \
++	parser.dir/*.o ccplib.dir/*.o lgglib.dir/*.o plot84lib.dir/*.o \
++	libhtml.dir/*.o pxxml.dir/*.o rwbrook.dir/*.o cciflib.dir/*.o \
++	harvlib.dir/*.o keyparse.dir/*.o dna_output.dir/*.o plotsubs.dir/*.o \
++	modlib.dir/*.o fftlib.dir/*.o unix.dir/*.o pack_f.o pack_c.o $(FINTERFACEOBJS) && \
++	ln -sf libccp4f.so.0.0.0 libccp4f.so.0 && \
++	ln -sf libccp4f.so.0.0.0 libccp4f.so
++
+#@@ -186,6 +185,27 @@
+# 	$(AR) $(LF) $(FINTERFACEOBJS)
+# 	$(RANLIB) $@
+# 
+#+LMMDB_SO : 
+#+	$(CC) $(COPTIM) -shared -Wl,-soname,libmmdb.so.0 -o ../libmmdb.so.0.0.0 \
+#+	$(MMDBOBJS) && \
+#+	ln -sf libmmdb.so.0.0.0 ../libmmdb.so.0 && \
+#+	ln -sf libmmdb.so.0.0.0 ../libmmdb.so
+#+
+#+LC_SO : 
+#+	$(CC) $(COPTIM) -shared -Wl,-soname,libccp4_c.so.0 -o ../libccp4_c.so.0.0.0 \
+#+	$(CORELIBOBJS) $(CGENERALOBJS) $(CUCOBJS) $(CMTZOBJS) $(CMAPOBJS) $(CSYMOBJS) && \
+#+	ln -sf libccp4_c.so.0.0.0 ../libccp4_c.so.0 && \
+#+	ln -sf libccp4_c.so.0.0.0 ../libccp4_c.so
+#+
+#+LF_SO : 
+#+	$(FC) $(FOPTIM) -shared -Wl,-soname,libccp4_f.so.0 -o ../libccp4_f.so.0.0.0 \
+#+	parser.dir/*.o ccplib.dir/*.o lgglib.dir/*.o plot84lib.dir/*.o \
+#+	libhtml.dir/*.o pxxml.dir/*.o rwbrook.dir/*.o cciflib.dir/*.o \
+#+	harvlib.dir/*.o keyparse.dir/*.o dna_output.dir/*.o plotsubs.dir/*.o \
+#+	modlib.dir/*.o fftlib.dir/*.o unix.dir/*.o pack_f.o pack_c.o $(FINTERFACEOBJS) && \
+#+	ln -sf libccp4_f.so.0.0.0 ../libccp4_f.so.0 && \
+#+	ln -sf libccp4_f.so.0.0.0 ../libccp4_f.so
+#+
+ # cmtz library only
+ 
+ cmtz: $(LCMTZ)
+@@ -339,9 +356,7 @@
+ 	fi
+ 	cd parser.dir && \
+ 	  for i in `pwd`/*.$F; do \
+-	    $(FC) -c $(FFLAGS) $(SHARED_LIB_FFLAGS) $$i; done\
+-	  && $(AR) ../$(LF) *.o
+-	rm -f parser.dir/*.o
++	    $(FC) -c $(FFLAGS) $(SHARED_LIB_FFLAGS) $$i; done
+ parser : parser.o
+ 	$(RANLIB) $(LF)
+ 
+@@ -351,9 +366,7 @@
+ 	echo '      END' >> ccplib.dir/ccplib.$F
+ 	cd ccplib.dir && $(fsplit_dir)/fsplit $(srcdir)/ccplib.f >/dev/null && $(RMEMPTY) && \
+ 	  for i in `pwd`/*.$F; do \
+-	    $(FC) -c $(FFLAGS) $(SHARED_LIB_FFLAGS) $$i; done\
+-	  && $(AR) ../$(LF) *.o
+-	rm -f ccplib.dir/*.o
++	    $(FC) -c $(FFLAGS) $(SHARED_LIB_FFLAGS) $$i; done
+ ccplib : ccplib.o
+ 	$(RANLIB) $(LF)
+ 
+@@ -364,9 +377,7 @@
+ 	@$(SETFLAGS) ; \
+ 	cd lgglib.dir && $(fsplit_dir)/fsplit $(srcdir)/lgglib.f >/dev/null && $(RMEMPTY) && \
+ 	  for i in `pwd`/*.$F; do \
+-	    eval $(FC) -c  $${lgglib_FLAGS-"$(FFLAGS)"} $(SHARED_LIB_FFLAGS) $$i; done\
+-	  && $(AR) ../$(LF) *.o
+-	rm -f lgglib.dir/*.o
++	    eval $(FC) -c  $${lgglib_FLAGS-"$(FFLAGS)"} $(SHARED_LIB_FFLAGS) $$i; done
+ lgglib : lgglib.o
+ 	$(RANLIB) $(LF)
+ 
+@@ -376,9 +387,7 @@
+ 	echo '      END' >> plot84lib.dir/plot84lib.$F
+ 	cd plot84lib.dir && $(fsplit_dir)/fsplit $(srcdir)/plot84lib.f >/dev/null && $(RMEMPTY) && \
+ 	  for i in `pwd`/*.$F; do \
+-	    $(FC) -c $(FFLAGS) $(SHARED_LIB_FFLAGS) $$i; done\
+-	  && $(AR) ../$(LF) *.o
+-	rm -f plot84lib.dir/*.o
++	    $(FC) -c $(FFLAGS) $(SHARED_LIB_FFLAGS) $$i; done
+ plot84lib : plot84lib.o
+ 	$(RANLIB) $(LF)
+ 
+@@ -388,9 +397,7 @@
+ 	echo '      END' >> libhtml.dir/libhtml.$F
+ 	cd libhtml.dir && $(fsplit_dir)/fsplit $(srcdir)/libhtml.f >/dev/null && $(RMEMPTY) && \
+ 	  for i in `pwd`/*.$F; do \
+-	    $(FC) -c $(FFLAGS) $(SHARED_LIB_FFLAGS) $$i; done\
+-	  && $(AR) ../$(LF) *.o
+-	rm -f libhtml.dir/*.o
++	    $(FC) -c $(FFLAGS) $(SHARED_LIB_FFLAGS) $$i; done
+ libhtml : libhtml.o
+ 	$(RANLIB) $(LF)
+ 
+@@ -400,9 +407,7 @@
+ 	echo '      END' >> pxxml.dir/pxxml.$F
+ 	cd pxxml.dir && $(fsplit_dir)/fsplit $(srcdir)/pxxml.f >/dev/null && $(RMEMPTY) && \
+ 	  for i in `pwd`/*.$F; do \
+-	    $(FC) -c $(FFLAGS) $(SHARED_LIB_FFLAGS) $$i; done\
+-	  && $(AR) ../$(LF) *.o
+-	rm -f pxxml.dir/*.o
++	    $(FC) -c $(FFLAGS) $(SHARED_LIB_FFLAGS) $$i; done
+ pxxml : pxxml.o
+ 	$(RANLIB) $(LF)
+ 
+@@ -412,9 +417,7 @@
+ 	echo '      END' >> rwbrook.dir/rwbrook.$F
+ 	cd rwbrook.dir && $(fsplit_dir)/fsplit $(srcdir)/rwbrook.f >/dev/null && $(RMEMPTY) && \
+ 	  for i in `pwd`/*.$F; do \
+-	    $(FC) -c $(FFLAGS) $(SHARED_LIB_FFLAGS) $$i; done\
+-	  && $(AR) ../$(LF) *.o
+-	rm -f rwbrook.dir/*.o
++	    $(FC) -c $(FFLAGS) $(SHARED_LIB_FFLAGS) $$i; done
+ rwbrook : rwbrook.o
+ 	$(RANLIB) $(LF)
+ 
+@@ -424,9 +427,7 @@
+ 	echo '      END' >> cciflib.dir/cciflib.$F
+ 	cd cciflib.dir && $(fsplit_dir)/fsplit $(srcdir)/cciflib.f >/dev/null && $(RMEMPTY) && \
+ 	  for i in `pwd`/*.$F; do \
+-	    $(FC) -c $(FFLAGS) $(SHARED_LIB_FFLAGS) -I$(srcdir) $$i; done\
+-	  && $(AR) ../$(LF) *.o
+-	rm -f cciflib.dir/*.o
++	    $(FC) -c $(FFLAGS) $(SHARED_LIB_FFLAGS) -I$(srcdir) $$i; done
+ cciflib : cciflib.o
+ 	$(RANLIB) $(LF)
+ 
+@@ -440,9 +441,7 @@
+ 	  && $(AR) ../$(LF) *.o ; else \
+ 	cd harvlib.dir && $(fsplit_dir)/fsplit $(srcdir)/harv_dummy.f >/dev/null && $(RMEMPTY) && \
+ 	for i in `pwd`/*.$F; do \
+-	  $(FC) -c $(FFLAGS) $(SHARED_LIB_FFLAGS) -I$(srcdir) $$i; done\
+-	  && $(AR) ../$(LF) *.o ; fi
+-	rm -f harvlib.dir/*.o
++	  $(FC) -c $(FFLAGS) $(SHARED_LIB_FFLAGS) -I$(srcdir) $$i; done; fi
+ harvlib : harvlib.o
+ 	$(RANLIB) $(LF)
+ 
+@@ -452,9 +451,7 @@
+ 	echo '      END' >> keyparse.dir/keyparse.$F
+ 	cd keyparse.dir && $(fsplit_dir)/fsplit $(srcdir)/keyparse.f >/dev/null && $(RMEMPTY) && \
+ 	  for i in `pwd`/*.$F; do \
+-	    $(FC) -c $(FFLAGS) $(SHARED_LIB_FFLAGS) $$i; done\
+-	  && $(AR) ../$(LF) *.o
+-	rm -f keyparse.dir/*.o
++	    $(FC) -c $(FFLAGS) $(SHARED_LIB_FFLAGS) $$i; done
+ keyparse : keyparse.o
+ 	$(RANLIB) $(LF)
+ 
+@@ -464,9 +461,7 @@
+ 	echo '      END' >> dna_output.dir/dna_output.$F
+ 	cd dna_output.dir && $(fsplit_dir)/fsplit $(srcdir)/dna_output.f >/dev/null && $(RMEMPTY) && \
+ 	  for i in `pwd`/*.$F; do \
+-	    $(FC) -I$(srcdir) -c $(FFLAGS) $(SHARED_LIB_FFLAGS) $$i; done\
+-	  && $(AR) ../$(LF) *.o
+-	rm -f dna_output.dir/*.o
++	    $(FC) -I$(srcdir) -c $(FFLAGS) $(SHARED_LIB_FFLAGS) $$i; done
+ dna_output : dna_output.o
+ 	$(RANLIB) $(LF)
+ 
+@@ -474,10 +469,9 @@
+ #  for ipdisp. May be useful but could be moved. 
+ $(LF)(pack_c.o):   $(srcdir)/pack_c.c $(srcdir)/pack_c.h
+ 	$(CC) $(CFLAGS) $(SHARED_LIB_CFLAGS) -I$(srcdir) -c $(srcdir)/pack_c.c
+-	$(AR) $(LF) pack_c.o && rm pack_c.o
++	$(AR) $(LF) pack_c.o
+ $(LF)(pack_f.o):   $(srcdir)/pack_f.f
+-	$(FC) -c $(FFLAGS) $(SHARED_LIB_FFLAGS) $(srcdir)/pack_f.$(F) && $(AR) $(LF) pack_f.o \
+-          && rm pack_f.o
++	$(FC) -c $(FFLAGS) $(SHARED_LIB_FFLAGS) $(srcdir)/pack_f.$(F) && $(AR) $(LF) pack_f.o
+ pack:   $(LF)(pack_c.o) $(LF)(pack_f.o)
+ 	$(RANLIB) $(LF) 
+ 
+@@ -488,9 +482,7 @@
+ 	echo '      END' >> sorting_main.dir/sorting_main.$F
+ 	cd sorting_main.dir && $(fsplit_dir)/fsplit $(srcdir)/sorting_main.f >/dev/null && $(RMEMPTY) && \
+ 	  for i in `pwd`/*.$F; do \
+-	    $(FC) -c $(FFLAGS) $(SHARED_LIB_FFLAGS) $$i; done\
+-	  && $(AR) ../$(LF) *.o
+-	rm -f sorting_main.dir/*.o
++	    $(FC) -c $(FFLAGS) $(SHARED_LIB_FFLAGS) $$i; done
+ sorting_main : sorting_main.o
+ 	$(RANLIB) $(LF)
+ 
+@@ -500,9 +492,7 @@
+ 	echo '      END' >> plotsubs.dir/plotsubs.$F
+ 	cd plotsubs.dir && $(fsplit_dir)/fsplit $(srcdir)/plotsubs.f >/dev/null && $(RMEMPTY) && \
+ 	  for i in `pwd`/*.$F; do \
+-	    $(FC) -c $(FFLAGS) $(SHARED_LIB_FFLAGS) $$i; done\
+-	  && $(AR) ../$(LF) *.o
+-	rm -f plotsubs.dir/*.o
++	    $(FC) -c $(FFLAGS) $(SHARED_LIB_FFLAGS) $$i; done
+ plotsubs : plotsubs.o
+ 	$(RANLIB) $(LF)
+ 
+@@ -512,9 +502,7 @@
+ 	echo '      END' >> modlib.dir/modlib.$F
+ 	cd modlib.dir && $(fsplit_dir)/fsplit $(srcdir)/modlib.f >/dev/null && $(RMEMPTY) && \
+ 	  for i in `pwd`/*.$F; do \
+-	    $(FC) -c $(FFLAGS) $(SHARED_LIB_FFLAGS) $$i; done\
+-	  && $(AR) ../$(LF) *.o
+-	rm -f modlib.dir/*.o
++	    $(FC) -c $(FFLAGS) $(SHARED_LIB_FFLAGS) $$i; done
+ modlib : modlib.o
+ 	$(RANLIB) $(LF)
+ 
+@@ -524,9 +512,7 @@
+ 	echo '      END' >> fftlib.dir/fftlib.$F
+ 	cd fftlib.dir && $(fsplit_dir)/fsplit $(srcdir)/fftlib.f >/dev/null && $(RMEMPTY) && \
+ 	  for i in `pwd`/*.$F; do \
+-	    $(FC) -c $(FFLAGS) $(SHARED_LIB_FFLAGS) $$i; done \
+-	  && $(AR) ../$(LF) *.o
+-	rm -f fftlib.dir/*.o
++	    $(FC) -c $(FFLAGS) $(SHARED_LIB_FFLAGS) $$i; done 
+ fftlib : fftlib.o
+ 	$(RANLIB) $(LF)
+ 
+@@ -541,9 +527,7 @@
+ 	echo '      END' >> unix.dir/unix.f
+ 	cd unix.dir && $(fsplit_dir)/fsplit ../unix.f >/dev/null && $(RMEMPTY) && \
+ 	  for i in `pwd`/*.$F; do \
+-	    $(FC) -c $(FFLAGS) $(SHARED_LIB_FFLAGS) $$i; done\
+-	  && $(AR) ../$(LF) *.o
+-	rm -f unix.dir/*.o 
++	    $(FC) -c $(FFLAGS) $(SHARED_LIB_FFLAGS) $$i; done
+ unix : unix.o
+ 	$(RANLIB) $(LF)
+