diff options
| author |   Justin Lecher <jlec@gentoo.org> | 2010-02-13 23:58:56 +0000 |
|---|---|---|
| committer | Justin Lecher <jlec@gentoo.org> | 2010-02-13 23:58:56 +0000 |
| commit | 9f7dcc2affbb526929afd72b2a9769506af0772b (patch) | |
| tree | c2db2dafa29c8031f79a8f68f0dadd61c01073a8 /sci-chemistry/mosflm | |
| parent | Bump (diff) | |
| download | historical-9f7dcc2affbb526929afd72b2a9769506af0772b.tar.gz historical-9f7dcc2affbb526929afd72b2a9769506af0772b.tar.bz2 historical-9f7dcc2affbb526929afd72b2a9769506af0772b.zip | |
fix for test and don't statically link against jpeg
Package-Manager: portage-2.2_rc62/cvs/Linux x86_64
Diffstat (limited to 'sci-chemistry/mosflm')
| -rw-r--r-- | sci-chemistry/mosflm/ChangeLog | 5 | ||||
| -rw-r--r-- | sci-chemistry/mosflm/Manifest | 10 | ||||
| -rw-r--r-- | sci-chemistry/mosflm/mosflm-7.0.6-r1.ebuild (renamed from sci-chemistry/mosflm/mosflm-7.0.6.ebuild) | 7 |
3 files changed, 13 insertions, 9 deletions
diff --git a/sci-chemistry/mosflm/ChangeLog b/sci-chemistry/mosflm/ChangeLog index 36923849432e..829162c64676 100644 --- a/sci-chemistry/mosflm/ChangeLog +++ b/sci-chemistry/mosflm/ChangeLog @@ -1,6 +1,9 @@ # 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 $ +# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/mosflm/ChangeLog,v 1.2 2010/02/13 23:58:56 jlec Exp $ + + 13 Feb 2010; Justin Lecher (jlec) <jlec@gentoo.org> +mosflm-7.0.6.ebuild: + fix for test and don't statically link against jpeg *mosflm-7.0.6 (06 Feb 2010) diff --git a/sci-chemistry/mosflm/Manifest b/sci-chemistry/mosflm/Manifest index ba7f5edcb326..2b126077be00 100644 --- a/sci-chemistry/mosflm/Manifest +++ b/sci-chemistry/mosflm/Manifest @@ -4,13 +4,13 @@ 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 +EBUILD mosflm-7.0.6-r1.ebuild 1677 RMD160 d12443ca27cdc0e8e41fab6dfce6d8d721e7e416 SHA1 71ac696d24fe1f850b5a723307c766243b238b7e SHA256 c251b8c5aa18ad35f84720cd1be08f0bba27cf02ac462dfc65059e69a1146eaa +MISC ChangeLog 553 RMD160 997f523b2bd00818abf6a74836206c752b7aae5c SHA1 2de08ec62750620736d419a1f679234272110153 SHA256 c347e77fbfd8c87809a48a75d89a484f0d2a0a631761081991c1243f4861ff7b MISC metadata.xml 216 RMD160 04a6fc4e2160b439296b52aa97d5b7d83af75508 SHA1 9561c9e6eada6aac9b503407917900529ce703e9 SHA256 24f5c205c2655ef27138c8aa087701626f5b4c666229c9ef7fe814e63ea2e776 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.14 (GNU/Linux) -iEYEARECAAYFAktt9FUACgkQgAnW8HDreRbitgCfXnCHD/5sj5cWEx5kMijdAGqd -hHUAoI3CXomMXob1s8YVKx5fKJxCI36i -=uOun +iEYEARECAAYFAkt3PMYACgkQgAnW8HDreRZKsQCgwXtStZkOboX6NVRgg8uoLPs2 +VOEAoJTF8q9UCdoT39fclWc2/xVUTGXE +=61bV -----END PGP SIGNATURE----- diff --git a/sci-chemistry/mosflm/mosflm-7.0.6.ebuild b/sci-chemistry/mosflm/mosflm-7.0.6-r1.ebuild index 78f5226fd368..904bc7b8f9ac 100644 --- a/sci-chemistry/mosflm/mosflm-7.0.6.ebuild +++ b/sci-chemistry/mosflm/mosflm-7.0.6-r1.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-chemistry/mosflm/mosflm-7.0.6.ebuild,v 1.1 2010/02/06 22:59:27 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/mosflm/mosflm-7.0.6-r1.ebuild,v 1.1 2010/02/13 23:58:56 jlec Exp $ EAPI="3" @@ -35,13 +35,14 @@ 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" \ +# sed -e "s:../cbf/lib/libcbf.a:${EPREFIX}/usr/$(get_libdir)/libcbf.a:g" \ + sed -e "s:../jpg/libjpeg.a:-ljpeg:g" \ -i ${PN}/Makefile || die epatch \ "${FILESDIR}/${PV}"-Makefile.patch \ "${FILESDIR}/${PV}"-parallel.patch + rm test.f || die } src_compile() { |