diff options
author | Justin Lecher (jlec) <jlec@j-schmitz.net> | 2009-10-28 21:35:03 +0100 |
---|---|---|
committer | Justin Lecher (jlec) <jlec@j-schmitz.net> | 2009-10-28 21:35:22 +0100 |
commit | 40da501bcc0b22a1830a54a63bee6690ef3a67ce (patch) | |
tree | 349873089c32336861da2b62b44051f647386d18 | |
parent | fix for bug 290754 (diff) | |
download | sci-40da501bcc0b22a1830a54a63bee6690ef3a67ce.tar.gz sci-40da501bcc0b22a1830a54a63bee6690ef3a67ce.tar.bz2 sci-40da501bcc0b22a1830a54a63bee6690ef3a67ce.zip |
fix for bug 289032
(Portage version: 2.2_rc46/git/Linux x86_64)
(Signed Manifest commit)
-rw-r--r-- | sci-libs/cctbx/ChangeLog | 4 | ||||
-rw-r--r-- | sci-libs/cctbx/Manifest | 14 | ||||
-rw-r--r-- | sci-libs/cctbx/cctbx-2009.09.28.1034.ebuild | 5 |
3 files changed, 21 insertions, 2 deletions
diff --git a/sci-libs/cctbx/ChangeLog b/sci-libs/cctbx/ChangeLog index 3f709398c..ac45d4201 100644 --- a/sci-libs/cctbx/ChangeLog +++ b/sci-libs/cctbx/ChangeLog @@ -2,6 +2,10 @@ # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 28 Oct 2009; Justin Lecher (jlec) <jlec@j-schmitz.net> + cctbx-2009.09.28.1034.ebuild: + fix for bug 289032 + *cctbx-2009.09.28.1034 (11 Oct 2009) 11 Oct 2009; Justin Lecher (jlec) <jlec@j-schmitz.net> diff --git a/sci-libs/cctbx/Manifest b/sci-libs/cctbx/Manifest index 6b9f62305..15bb3ab4e 100644 --- a/sci-libs/cctbx/Manifest +++ b/sci-libs/cctbx/Manifest @@ -1,8 +1,18 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX 2009.02.15.2320-sandbox-violations-chmod.patch 467 RMD160 11a55d71c9a238cf8c40f1760344c27c65a53922 SHA1 03ce887b4ddaf72310986d97c8add9a7a73c6fb0 SHA256 1c79b9f3bb0215dca39def9b6ba0bdb678022b51345da1567d0f4952951bdcd1 DIST cctbx-2009.02.15.2320.tar.gz 12800622 RMD160 8d95db0054e8ba9378e46e9d5d2d7b333418eeb4 SHA1 1d3e5aad9d1c4fd6617295fc3346c079e7c758d9 SHA256 336946867246ed3cf7f697dc9bf0cc21443b7fb9600b24696b4d8d3cb5773200 DIST cctbx-2009.09.28.1034.tar.gz 14359425 RMD160 04b932f6dd2665ffd2aa1a21462993ddf0f2e9c4 SHA1 47a529fa596eddc04c93673da16a688617ce07dd SHA256 1714c7a7985c1709baa9786e12dcc24f0073b76e020d194be24fbbf5b4c8504e EBUILD cctbx-2009.02.15.2320-r2.ebuild 4644 RMD160 6ea87345c030c9c2ec512ac8be9b8c580cb2caa9 SHA1 614dce37aee6ac67b689e50a510dccd3bb81fe59 SHA256 7977fcdf1cac193e7b236ad771dfb047ecf4c2ef77b34aab18d0f1fc894ddeec EBUILD cctbx-2009.02.15.2320-r3.ebuild 5686 RMD160 7ccf97179ee2540a89052200750675e588075e77 SHA1 8e77b701ab656793b704dc747cf6555b39b34257 SHA256 9d987f67fa1fa2eec9a2b0dfa2784170afe871c97bc94eb3ef1bd600ef0c3d3b -EBUILD cctbx-2009.09.28.1034.ebuild 5687 RMD160 f3bee8d4b39cb82f16f2a536bfcc0d1e878128b0 SHA1 34715892ac4d2d4dcef5139475a7ec88752e41ed SHA256 763ba7237247d87a137686b14e62ee94247a98aca7b015886d1c4e5b585651d7 -MISC ChangeLog 1807 RMD160 e9e011e4ac6482d3efe4130f8959c3e73362358c SHA1 879af48a729f88b5b49cf40c2da63ccf8f900bda SHA256 7622dd891ba98b522f427956766f6b1f59a6d838616d39f1b2647ec0bf09d90c +EBUILD cctbx-2009.09.28.1034.ebuild 5777 RMD160 b13fdb88c4d32d0f393a1f9a61a74ae73aa98d0a SHA1 75adbb573431c23e4e96dd3ef3eca7a3d93abd20 SHA256 88640e98694c2bc554bb0ffd18b4120dcfff6e3167bc5b7063765be9d07f69ea +MISC ChangeLog 1918 RMD160 9d599a132e5d8aaa8bb772d12d284fd5b53c16ce SHA1 e24f79df0bb14b39cd631493297dc16e722772e4 SHA256 5db999ba5abcaa642e58cfa3d8497279186e0091e019c33e9190d4f1134565d0 MISC metadata.xml 438 RMD160 79ad38c94abc71ba32abccdcd670f2f6802c2df3 SHA1 1ebbff28f7e4d135b26b951b6111f6803f78413c SHA256 94d589a2836bffe732cdf993e9b38afc1cde4683a5e5669c44daf6b69595e8da +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.11 (GNU/Linux) + +iEYEARECAAYFAkroqvYACgkQgAnW8HDreRa6sQCdFnYjCFPF6vk/G/LkGfVbpsbg +d5QAoItsV9u70uG5WUNl4BZ2bZ4l1xLm +=Wqjg +-----END PGP SIGNATURE----- diff --git a/sci-libs/cctbx/cctbx-2009.09.28.1034.ebuild b/sci-libs/cctbx/cctbx-2009.09.28.1034.ebuild index 2c086e02c..bd63fb9b3 100644 --- a/sci-libs/cctbx/cctbx-2009.09.28.1034.ebuild +++ b/sci-libs/cctbx/cctbx-2009.09.28.1034.ebuild @@ -26,6 +26,7 @@ MY_S="${WORKDIR}"/cctbx_sources MY_B="${WORKDIR}"/cctbx_build pkg_setup() { + python_version if use openmp && [[ $(tc-getCC)$ == *gcc* ]] && ( [[ $(gcc-major-version)$(gcc-minor-version) -lt 42 ]] || @@ -164,6 +165,10 @@ src_install(){ newins "${MY_B}"/setpaths.csh 30cctbx.csh || \ die + sed \ + -e "s:python${PYVER}:python:g"\ + -i "${MY_B}"/setpaths* || die + cat >> "${T}"/30cctbx <<- EOF LDPATH="/usr/$(get_libdir)/${PN}/cctbx_build/lib" EOF |