diff options
| author |   Justin Lecher <jlec@gentoo.org> | 2012-09-06 09:32:54 +0000 |
|---|---|---|
| committer | Justin Lecher <jlec@gentoo.org> | 2012-09-06 09:32:54 +0000 |
| commit | 5e5cb18459182f7d1e4422010e7a2e1b24eb1db7 (patch) | |
| tree | 9c82d668f9ad74e1639286091d069709650d0b78 /sci-libs/cctbx | |
| parent | Marked stable on AMD64 as requested by David Flogeras in bug #432994. (diff) | |
| download | historical-5e5cb18459182f7d1e4422010e7a2e1b24eb1db7.tar.gz historical-5e5cb18459182f7d1e4422010e7a2e1b24eb1db7.tar.bz2 historical-5e5cb18459182f7d1e4422010e7a2e1b24eb1db7.zip | |
sci-libs/cctbx: Use bundled scons on prefix, #391377
Package-Manager: portage-2.2.0_alpha124/cvs/Linux x86_64
Diffstat (limited to 'sci-libs/cctbx')
| -rw-r--r-- | sci-libs/cctbx/ChangeLog | 5 | ||||
| -rw-r--r-- | sci-libs/cctbx/Manifest | 10 | ||||
| -rw-r--r-- | sci-libs/cctbx/cctbx-2010.03.29.2334-r6.ebuild | 13 |
3 files changed, 17 insertions, 11 deletions
diff --git a/sci-libs/cctbx/ChangeLog b/sci-libs/cctbx/ChangeLog index df36d94bd2c0..91abe351dee4 100644 --- a/sci-libs/cctbx/ChangeLog +++ b/sci-libs/cctbx/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for sci-libs/cctbx # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/cctbx/ChangeLog,v 1.27 2012/08/26 09:55:45 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/cctbx/ChangeLog,v 1.28 2012/09/06 09:32:54 jlec Exp $ + + 06 Sep 2012; Justin Lecher <jlec@gentoo.org> cctbx-2010.03.29.2334-r6.ebuild: + Use bundled scons on prefix, #391377 26 Aug 2012; Justin Lecher <jlec@gentoo.org> -cctbx-2010.03.29.2334-r3.ebuild, -cctbx-2010.03.29.2334-r4.ebuild, diff --git a/sci-libs/cctbx/Manifest b/sci-libs/cctbx/Manifest index 6348f8342e9f..80aa3831d927 100644 --- a/sci-libs/cctbx/Manifest +++ b/sci-libs/cctbx/Manifest @@ -9,14 +9,14 @@ AUX 2010.03.29.2334-gcc-4.7.patch 6747 SHA256 ab01875a97ece09e4d729bb435b67960ef AUX 2010.03.29.2334-soname.patch 5177 SHA256 dd4ea6dbf34c1b2d9572adec5a33fe6a73b1a99e8c4364123e69382bb161ce74 SHA512 3f62bc52c32c3573fbcd90fc49234498d7c28fc0dc7a68497041af35da46cbd9cb386b9b13ed2269a5728e87526987ac49179e38b2bcb6a355ee4c180e9f7861 WHIRLPOOL cdd533d510defea65388ccd25c63055fc2798edd4222d1aa1b0201671d2c074107a151edc5ba62b5677908d5c045f98f26cd5ae5574e9fc83919632c4258c77c AUX 2010.03.29.2334-tst_server.py.patch 774 SHA256 df058d16d2dc5beaac9f1a1fbf2e640994c7e881d449eb01ac338dadbfb15ac3 SHA512 490918c3139355ecb0430d908ccafc6d66cb25ec7df285cedbb983d80f3473425c72d0766262c557c0c783626479edd2528eaf83b1decdeba416dde193472d5a WHIRLPOOL cc15b95661d8cba66bc3e06b3589188582c5e637faa860c70a4bbc53450a02afb36ec14c51796fe34441bd74842c06c938e22258a5ea5bf3264237a7afc169bc DIST cctbx-2010.03.29.2334.tar.gz 15570372 SHA256 e1fae804caaf8593c7a3f32e4544046f4c00293063d9099721578cc8fbd17213 SHA512 7aafd647db49925fc1df16a9ccb4f8caf040b4d73e9601731eb3da3051467c3005fb2cc95b498501c899cd1bd378e6a6135cffe734cb4f93eccacbc13575b2c8 WHIRLPOOL 5954ce6ae8bd3a29deaa5d7f8b354d9468a87a01fc7d6aa9a0545e1d323b1ee209348e88270e2f50d7985b1916a7b5bf687dfdf871013d3ec35925fde253d9a0 -EBUILD cctbx-2010.03.29.2334-r6.ebuild 5959 SHA256 53a1e112d29de4b7dbecf6fc4ed7446218cc80316433556ec3d9e3df2264eeaa SHA512 f6c186bb8d11f918c55bf58c3c864b8f2757528bf5d1314b542b150183d603ca36a90f34572f6fe8cf451b27c2150e0c3d78786fceedc56659051e2d9d7de9c9 WHIRLPOOL 267180efff5b4392e1b9c53be356a13837928d64aed9ebcda6d83e0db6600832be1a02efa6a6e047659e10190b2d833980c98a0eaa328bd5566525b09d4f5dad -MISC ChangeLog 5051 SHA256 9deca3bd298fd7c46066f2de7c42c646eb146b71cc34ec7008519fc68137c49d SHA512 e332b5a432460ce0b5aca0110741e3b607bb068efbcadf100ba146f9f9de18b24a6bc9b1cbb6068c4cbbd53a17a04be324cd94547d7be5324e08a3cd2270fa21 WHIRLPOOL b6ba62c4dcd2d277d123124aa15e061f025b6a77c6dc3c4c7bbb3e493e2a216d4c5bac280a8ae4b818aa1e7a7bbabaae30c938cbecd98d178c05992d7efdc697 +EBUILD cctbx-2010.03.29.2334-r6.ebuild 6010 SHA256 ca946fcc7e453fcb290f478283c959a267ebc921672656b4ae2000e226c391d2 SHA512 984d3d2242fa7f75e0c736a955bbcaf2dde87f52efff9ef6ae6a69147d0a398886fd16aacc969a4a5283e9e7a5a79d1bd6c98f96e0864fab51cb840aaf18ee5c WHIRLPOOL 1f69686cd5cdca1872e894c74532c189bcdae5f9bb37efcccc38c32dd41a216bd8fbea787211f3dd21cae67d2bffd644545477ecf51803893f4f79a3ebd441d5 +MISC ChangeLog 5171 SHA256 ddcb8b7e695ee1833dda02b13a96a22bbf4396c0de6c51af79552a756e683f6c SHA512 152b0851c55a6e29a05e1b0b4175392b2b6bafc9bc09fc690ecfac10083141bb1c51515135e7159c0b82748bee89043a3bb006fef83ea4db96ba7c7018d86f96 WHIRLPOOL 18f4e2248e2ee918c0f93e78dfc7ffc8697922037dfbd6dedfc8c56a7306e7657815744b1426114642e3d873b5f335bf7b0cd282e7c949ed5345f611b5ac11ba MISC metadata.xml 765 SHA256 0bc826997f2850e1cdd72cc009127023696e9878caa1a615accd3205b234fc89 SHA512 3a1f6f8da7869ab6093e002135a6cfb266edbdc72d5ced047b526c27fd8e9a7330df9f5e1a7b10c0ca63f99da58cab26420dbe6899c52004f1508e48fc1b99e3 WHIRLPOOL c9aec1f4c7d8dc8f3e337ede705de7e5dd597c05e271227341b73e05105aa44a8e3cc6822216d35e7fb4f7bdce67709ee52c81cab18ba19b1271979a391202a6 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) Comment: GPGTools - http://gpgtools.org -iEYEAREIAAYFAlA58rcACgkQgAnW8HDreRZUJACfaZbkk9HufiOM7GV/5V9b3eOa -8TIAnidKhL09rnypKnvvuEFO8WiqRdz7 -=p5WP +iEYEAREIAAYFAlBIbcsACgkQgAnW8HDreRY3dQCeOXUryo2TDwcnTzkHObjrh0wG +cSEAn3lR7udWBYUOdiZYuKrEpv6xAgsJ +=OSCh -----END PGP SIGNATURE----- diff --git a/sci-libs/cctbx/cctbx-2010.03.29.2334-r6.ebuild b/sci-libs/cctbx/cctbx-2010.03.29.2334-r6.ebuild index ab3064ce2bc1..1bd6229800ec 100644 --- a/sci-libs/cctbx/cctbx-2010.03.29.2334-r6.ebuild +++ b/sci-libs/cctbx/cctbx-2010.03.29.2334-r6.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/cctbx/cctbx-2010.03.29.2334-r6.ebuild,v 1.5 2012/06/19 14:59:00 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/cctbx/cctbx-2010.03.29.2334-r6.ebuild,v 1.6 2012/09/06 09:32:54 jlec Exp $ EAPI="3" @@ -28,7 +28,7 @@ RDEPEND=" sci-chemistry/cns sci-chemistry/shelx )" DEPEND="${RDEPEND} - >=dev-util/scons-1.2" + !prefix? ( >=dev-util/scons-1.2 )" S="${WORKDIR}" MY_S="${WORKDIR}"/cctbx_sources @@ -60,14 +60,17 @@ src_prepare() { eprefixify "${MY_S}"/scitbx/libtbx_refresh.py - rm -rf "${MY_S}/scons" "${MY_S}/boost" "${MY_S}/PyCifRW" || die + rm -rf "${MY_S}/boost" "${MY_S}/PyCifRW" || die + if ! use prefix; then + rm -rvf "${MY_S}/scons" + echo "import os, sys; os.execvp('scons', sys.argv)" > "${MY_S}"/libtbx/command_line/scons.py + fi + find "${MY_S}/clipper" -name "*.h" -delete || die sed \ -e "/LIBS/s:boost_python:boost_python-${PYTHON_ABI}:g" \ -i "${MY_S}"/boost_adaptbx/SConscript "${MY_S}"/scitbx/boost_python/SConscript || die - - echo "import os, sys; os.execvp('scons', sys.argv)" > "${MY_S}"/libtbx/command_line/scons.py } src_configure() { |