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 | e79893cb5bd8f5c7acdb910dee0c3d2eaa08d476 (patch) | |
| tree | 956a02f25b5e12ed478cb222f2f9d99dad814226 /sci-libs/cctbx | |
| parent | Marked stable on AMD64 as requested by David Flogeras in bug #432994. (diff) | |
| download | gentoo-2-e79893cb5bd8f5c7acdb910dee0c3d2eaa08d476.tar.gz gentoo-2-e79893cb5bd8f5c7acdb910dee0c3d2eaa08d476.tar.bz2 gentoo-2-e79893cb5bd8f5c7acdb910dee0c3d2eaa08d476.zip | |
sci-libs/cctbx: Use bundled scons on prefix, #391377
(Portage version: 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/cctbx-2010.03.29.2334-r6.ebuild | 13 |
2 files changed, 12 insertions, 6 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/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() { |