diff options
Diffstat (limited to 'sci-chemistry/mosflm')
| -rw-r--r-- | sci-chemistry/mosflm/ChangeLog | 6 | ||||
| -rw-r--r-- | sci-chemistry/mosflm/Manifest | 15 | ||||
| -rw-r--r-- | sci-chemistry/mosflm/files/7.0.6-impl-dec.patch | 36 | ||||
| -rw-r--r-- | sci-chemistry/mosflm/mosflm-7.0.6-r2.ebuild | 6 |
4 files changed, 57 insertions, 6 deletions
diff --git a/sci-chemistry/mosflm/ChangeLog b/sci-chemistry/mosflm/ChangeLog index 931a74e5e52b..e31ea1dfe716 100644 --- a/sci-chemistry/mosflm/ChangeLog +++ b/sci-chemistry/mosflm/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sci-chemistry/mosflm # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/mosflm/ChangeLog,v 1.7 2011/01/16 12:17:22 xarthisius Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/mosflm/ChangeLog,v 1.8 2011/01/19 10:32:49 jlec Exp $ + + 19 Jan 2011; Justin Lecher <jlec@gentoo.org> +files/7.0.6-impl-dec.patch, + mosflm-7.0.6-r2.ebuild: + Fix for implicit declarations 16 Jan 2011; Kacper Kowalik <xarthisius@gentoo.org> mosflm-7.0.6-r2.ebuild: diff --git a/sci-chemistry/mosflm/Manifest b/sci-chemistry/mosflm/Manifest index 020a27d3cef1..bcbea1eee9af 100644 --- a/sci-chemistry/mosflm/Manifest +++ b/sci-chemistry/mosflm/Manifest @@ -1,6 +1,17 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX 7.0.6-Makefile.patch 352 RMD160 69fd182574615b90bbeb1b633885006051e81683 SHA1 f2964f48bb4bf89880fe47f0af1bff090c59092e SHA256 d5b62b78ab3b89d36fad10e31cd5e5e8087d5dc4976ad03ef1995bea08e27ac7 +AUX 7.0.6-impl-dec.patch 949 RMD160 e2dc1b8236a1ac72836af911d19a1ce5e1d048bf SHA1 5f51546471f5ab3530f56d0e7bbdeb6a977f91be SHA256 7c39b9d37ea4ea01668dd16ccf1b31e288bca37eaef497c5b0c725d42ebeb8b2 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-r2.ebuild 1757 RMD160 40e3aaab51e948f9b716a91ff2d74dccdf5a3502 SHA1 99b16817c023675d9442dc2918e40ce6a4fc590f SHA256 142a8a4608ce36336ae841f8eaf27840a3b170fa0a421573f9c172e79f20e28a -MISC ChangeLog 1140 RMD160 6c1cada63c20eacc084031133d522fc1f8a9f9bb SHA1 3dae32d8fc0fce856a5d658ff967f874d1d8c127 SHA256 921855745766f0baf444ca5fbfd4bec90e2f9aa710505bf9ee48f7a1fb740fe8 +EBUILD mosflm-7.0.6-r2.ebuild 1751 RMD160 b06e3c84060101c0b0be65d67efe172f88640148 SHA1 3991f41d0300a50834806ed757334c1dacfe5726 SHA256 7a120be53a7724639896b0e001cd9ee3daef004ee25e01b047c427f53269e1c3 +MISC ChangeLog 1269 RMD160 c7283da67585af38174dace959c1898b251705ca SHA1 fd6f43760068cf7726e144e7b8f45d9a7d41a419 SHA256 d04c98e54413dc2164341711416a9ece49a71a7c4905043dd93140139d4b888f MISC metadata.xml 216 RMD160 04a6fc4e2160b439296b52aa97d5b7d83af75508 SHA1 9561c9e6eada6aac9b503407917900529ce703e9 SHA256 24f5c205c2655ef27138c8aa087701626f5b4c666229c9ef7fe814e63ea2e776 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.16 (GNU/Linux) + +iEYEARECAAYFAk02vdcACgkQgAnW8HDreRZyTwCgjtL+FXuTYjIw/QxcPKl0FHTy +bM0An2bhstEu1GxDYDkYyJ0dZ8TtcNrf +=Y751 +-----END PGP SIGNATURE----- diff --git a/sci-chemistry/mosflm/files/7.0.6-impl-dec.patch b/sci-chemistry/mosflm/files/7.0.6-impl-dec.patch new file mode 100644 index 000000000000..da393eb93fe6 --- /dev/null +++ b/sci-chemistry/mosflm/files/7.0.6-impl-dec.patch @@ -0,0 +1,36 @@ +diff --git a/mosflm/bravais_fortran.c b/mosflm/bravais_fortran.c +index 3d68cad..800bd0e 100644 +--- a/mosflm/bravais_fortran.c ++++ b/mosflm/bravais_fortran.c +@@ -2,6 +2,7 @@ + #include <stdlib.h> + #include <math.h> + #include "../util/util.h" ++#include "../util/bravais.h" + + /* bravais_fortran_(): This routine converts array from FORTRAN program + to structure for call to bravais +diff --git a/mosflm/chelp.c b/mosflm/chelp.c +index b2aaefc..fa44ab0 100644 +--- a/mosflm/chelp.c ++++ b/mosflm/chelp.c +@@ -5,6 +5,7 @@ + /* modified for Linux by Joachim Meyer jmeyer@embl-heidelberg.de 1998.05.19 */ + + #include "chelp.h" ++#include <stdio.h> + + #if CALL_LIKE_HPUX + void chelp () +diff --git a/mosflm/pck.c b/mosflm/pck.c +index ec094fc..288671d 100644 +--- a/mosflm/pck.c ++++ b/mosflm/pck.c +@@ -17,6 +17,7 @@ + #include <math.h> + #include <ctype.h> + #include <string.h> ++#include <unistd.h> + + #define BYTE char + #define WORD short int diff --git a/sci-chemistry/mosflm/mosflm-7.0.6-r2.ebuild b/sci-chemistry/mosflm/mosflm-7.0.6-r2.ebuild index 1a2737281326..ba0ada1f0174 100644 --- a/sci-chemistry/mosflm/mosflm-7.0.6-r2.ebuild +++ b/sci-chemistry/mosflm/mosflm-7.0.6-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 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-r2.ebuild,v 1.4 2011/01/16 12:17:22 xarthisius Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/mosflm/mosflm-7.0.6-r2.ebuild,v 1.5 2011/01/19 10:32:49 jlec Exp $ EAPI="3" @@ -31,7 +31,6 @@ DEPEND="${RDEPEND}" S="${WORKDIR}/${MY_P}" src_prepare() { - rm src/dps/peak_search/dps_peaksearch # See DEPEND # sed -e "s:../cbf/lib/libcbf.a:${EPREFIX}/usr/$(get_libdir)/libcbf.a:g" \ sed -e "s:../jpg/libjpeg.a:-ljpeg:g" \ @@ -39,7 +38,8 @@ src_prepare() { epatch \ "${FILESDIR}/${PV}"-Makefile.patch \ - "${FILESDIR}/${PV}"-parallel.patch + "${FILESDIR}/${PV}"-parallel.patch \ + "${FILESDIR}/${PV}"-impl-dec.patch rm test.f || die } |