diff options
author | Justin Lecher <jlec@gentoo.org> | 2010-02-06 22:59:28 +0000 |
---|---|---|
committer | Justin Lecher <jlec@gentoo.org> | 2010-02-06 22:59:28 +0000 |
commit | 9633f1a6cf82b14794f62489b824c9b83589f3d6 (patch) | |
tree | 0fa67cd5a2bc16ad68a5193a87de47ee9d581a79 /sci-chemistry/mosflm | |
parent | Bump 2.0.x series (diff) | |
download | historical-9633f1a6cf82b14794f62489b824c9b83589f3d6.tar.gz historical-9633f1a6cf82b14794f62489b824c9b83589f3d6.tar.bz2 historical-9633f1a6cf82b14794f62489b824c9b83589f3d6.zip |
Splitted mosflm from ccp4
Package-Manager: portage-2.2_rc62/cvs/Linux x86_64
Diffstat (limited to 'sci-chemistry/mosflm')
-rw-r--r-- | sci-chemistry/mosflm/ChangeLog | 11 | ||||
-rw-r--r-- | sci-chemistry/mosflm/Manifest | 16 | ||||
-rw-r--r-- | sci-chemistry/mosflm/files/7.0.6-Makefile.patch | 13 | ||||
-rw-r--r-- | sci-chemistry/mosflm/files/7.0.6-parallel.patch | 28 | ||||
-rw-r--r-- | sci-chemistry/mosflm/metadata.xml | 8 | ||||
-rw-r--r-- | sci-chemistry/mosflm/mosflm-7.0.6.ebuild | 67 |
6 files changed, 143 insertions, 0 deletions
diff --git a/sci-chemistry/mosflm/ChangeLog b/sci-chemistry/mosflm/ChangeLog new file mode 100644 index 000000000000..36923849432e --- /dev/null +++ b/sci-chemistry/mosflm/ChangeLog @@ -0,0 +1,11 @@ +# ChangeLog for sci-chemistry/mosflm +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/mosflm/ChangeLog,v 1.1 2010/02/06 22:59:27 jlec Exp $ + +*mosflm-7.0.6 (06 Feb 2010) + + 06 Feb 2010; Justin Lecher (jlec) <jlec@gentoo.org> + +files/7.0.6-Makefile.patch, +files/7.0.6-parallel.patch, + +mosflm-7.0.6.ebuild, +metadata.xml: + Splitted mosflm from ccp4 + diff --git a/sci-chemistry/mosflm/Manifest b/sci-chemistry/mosflm/Manifest new file mode 100644 index 000000000000..ba7f5edcb326 --- /dev/null +++ b/sci-chemistry/mosflm/Manifest @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +AUX 7.0.6-Makefile.patch 352 RMD160 69fd182574615b90bbeb1b633885006051e81683 SHA1 f2964f48bb4bf89880fe47f0af1bff090c59092e SHA256 d5b62b78ab3b89d36fad10e31cd5e5e8087d5dc4976ad03ef1995bea08e27ac7 +AUX 7.0.6-parallel.patch 654 RMD160 f28cdb670c3ecfcc4ec194dd44136182fbf9cf7f SHA1 bf6742b58d6e9ce67e76f38e81aeb64f88fae729 SHA256 c821e031a039502364c4ae151fd64886a6a33153e5c746d55838a99050d18c60 +DIST mosflm706.tgz 3468405 RMD160 fb0b7e51ed9845d4d17aa804cb1424e5aa0f24b8 SHA1 f9a771c3991c7ad3125a7e39d5c59b3049784f4f SHA256 5e26a49fd37749a14e7a1d1e867c1c0333db3bbcc01376fb7a516d4a67b1ebb0 +EBUILD mosflm-7.0.6.ebuild 1678 RMD160 f79080064ca29f9e976ed2a98570c38d399f1f15 SHA1 439b5dea75c91d62a7133a795e8d201efff19ee5 SHA256 d2289f305d35c9ea952bb1584fe09460703ba8bfea3e4b90a1daec019d8daf6b +MISC ChangeLog 422 RMD160 e5e8584f3cb08b10066d03112bdb759e38fc7ee1 SHA1 d8898f3734494d100027e4289cd8ffcf97f5e2df SHA256 99d9bb18076afed1aa4f58e08fb80fcbc9358f7f9ffc036a39d850b6b760a66c +MISC metadata.xml 216 RMD160 04a6fc4e2160b439296b52aa97d5b7d83af75508 SHA1 9561c9e6eada6aac9b503407917900529ce703e9 SHA256 24f5c205c2655ef27138c8aa087701626f5b4c666229c9ef7fe814e63ea2e776 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.14 (GNU/Linux) + +iEYEARECAAYFAktt9FUACgkQgAnW8HDreRbitgCfXnCHD/5sj5cWEx5kMijdAGqd +hHUAoI3CXomMXob1s8YVKx5fKJxCI36i +=uOun +-----END PGP SIGNATURE----- diff --git a/sci-chemistry/mosflm/files/7.0.6-Makefile.patch b/sci-chemistry/mosflm/files/7.0.6-Makefile.patch new file mode 100644 index 000000000000..a35232f6e8c0 --- /dev/null +++ b/sci-chemistry/mosflm/files/7.0.6-Makefile.patch @@ -0,0 +1,13 @@ +--- Makefile 2008-10-17 16:15:30.000000000 +0200 ++++ Makefile.new 2009-02-20 21:52:34.000000000 +0100 +@@ -22,7 +22,7 @@ + CBFLIBS = cbf/lib/libcbf.a + JPGLIBS = jpg/libjpeg.a + +-all: $(DPSLIBS) $(CBFLIBS) $(JPGLIBS) +- cd mosflm ; make ++all: dpslibs cbflibs ++ +make -C mosflm + + ########################################################################## + diff --git a/sci-chemistry/mosflm/files/7.0.6-parallel.patch b/sci-chemistry/mosflm/files/7.0.6-parallel.patch new file mode 100644 index 000000000000..f735c7ce5cf7 --- /dev/null +++ b/sci-chemistry/mosflm/files/7.0.6-parallel.patch @@ -0,0 +1,28 @@ +--- cbf/Makefile 2009-08-31 09:35:06.000000000 +0200 ++++ cbf/Makefile.new 2009-08-31 10:44:46.000000000 +0200 +@@ -362,6 +362,8 @@ + $(EXAMPLES)/img.h \ + $(INCLUDE)/md5.h + ++OBJ = $(subst .c,.o,$(SOURCE)) ++ + # + # Compile the library and examples + # +@@ -379,11 +381,14 @@ + $(LIB): + mkdir $(LIB) + ++ ++.c.o: $(SOURCE) $(HEADERS) ++ $(CC) $(CFLAGS) $(INCLUDES) $(WARNINGS) -c $< ++ + # + # CBF library + # +-$(LIB)/libcbf.a: $(SOURCE) $(HEADERS) $(COMMONDEP) +- $(CC) $(CFLAGS) $(INCLUDES) $(WARNINGS) -c $(SOURCE) ++$(LIB)/libcbf.a: $(OBJ) $(COMMONDEP) + $(AR) cr $@ *.o + rm *.o + if [ -f $(RANLIB) ]; then $(RANLIB) $@ ; fi diff --git a/sci-chemistry/mosflm/metadata.xml b/sci-chemistry/mosflm/metadata.xml new file mode 100644 index 000000000000..c6856dc7f2cf --- /dev/null +++ b/sci-chemistry/mosflm/metadata.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<herd>sci</herd> +<maintainer> + <email>jlec@gentoo.org</email> +</maintainer> +</pkgmetadata> diff --git a/sci-chemistry/mosflm/mosflm-7.0.6.ebuild b/sci-chemistry/mosflm/mosflm-7.0.6.ebuild new file mode 100644 index 000000000000..78f5226fd368 --- /dev/null +++ b/sci-chemistry/mosflm/mosflm-7.0.6.ebuild @@ -0,0 +1,67 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/mosflm/mosflm-7.0.6.ebuild,v 1.1 2010/02/06 22:59:27 jlec Exp $ + +EAPI="3" + +inherit fortran toolchain-funcs versionator eutils + +MY_PV="$(delete_all_version_separators)" +MY_P="${PN}${MY_PV}" + +FORTRAN="g77 gfortran ifc" + +DESCRIPTION="A program for integrating single crystal diffraction data from area detectors" +HOMEPAGE="http://www.mrc-lmb.cam.ac.uk/harry/mosflm/" +SRC_URI="${HOMEPAGE}ver${MY_PV}/build-it-yourself/${MY_P}.tgz" + +LICENSE="ccp4" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +RDEPEND=" + app-shells/tcsh + media-libs/jpeg + sci-libs/ccp4-libs + sys-libs/ncurses + x11-libs/libxdl_view" +DEPEND="${RDEPEND}" +# Needs older version as current, perhaps we can fix that next release +# sci-libs/cbflib + +S="${WORKDIR}/${MY_P}" + +src_prepare() { + rm src/dps/peak_search/dps_peaksearch +# See DEPEND +# sed -e "s:../cbf/lib/libcbf.a:/usr/$(get_libdir)/libcbf.a:g" \ + sed -e "s:../jpg/libjpeg.a:${EPREFIX}/usr/$(get_libdir)/libjpeg.a:g" \ + -i ${PN}/Makefile || die + + epatch \ + "${FILESDIR}/${PV}"-Makefile.patch \ + "${FILESDIR}/${PV}"-parallel.patch +} + +src_compile() { + emake \ + MOSHOME="${S}" \ + DPS="${S}" \ + FC=${FORTRANC} \ + FLINK=${FORTRANC} \ + CC=$(tc-getCC) \ + AR_FLAGS=vru \ + MOSLIBS='-lccp4f -lccp4c -lxdl_view -lcurses -lXt -lmmdb -lccif -lstdc++' \ + MCFLAGS="-O0 -fno-second-underscore" \ + MOSFLAGS="${FFLAGS} -fno-second-underscore" \ + FFLAGS="${FFLAGS:- -O2}" \ + CFLAGS="${CFLAGS}" \ + MOSCFLAGS="${CFLAGS}" \ + LFLAGS="${LDFLAGS}" \ + || die "emake failed" +} + +src_install() { + dobin bin/ipmosflm || die +} |