* [gentoo-commits] gentoo-x86 commit in sci-libs/cctbx: ChangeLog cctbx-2010.03.29.2334-r6.ebuild
@ 2012-02-10 20:20 Justin Lecher (jlec)
0 siblings, 0 replies; 8+ messages in thread
From: Justin Lecher (jlec) @ 2012-02-10 20:20 UTC (permalink / raw
To: gentoo-commits
jlec 12/02/10 20:20:48
Modified: ChangeLog
Added: cctbx-2010.03.29.2334-r6.ebuild
Log:
Add fixes for boost-1.48 and its PyABI specific libs, #401393
(Portage version: 2.2.0_alpha85/cvs/Linux x86_64)
Revision Changes Path
1.22 sci-libs/cctbx/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/cctbx/ChangeLog?rev=1.22&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/cctbx/ChangeLog?rev=1.22&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/cctbx/ChangeLog?r1=1.21&r2=1.22
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-libs/cctbx/ChangeLog,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- ChangeLog 4 Dec 2011 19:03:25 -0000 1.21
+++ ChangeLog 10 Feb 2012 20:20:48 -0000 1.22
@@ -1,6 +1,12 @@
# ChangeLog for sci-libs/cctbx
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/cctbx/ChangeLog,v 1.21 2011/12/04 19:03:25 jlec Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/cctbx/ChangeLog,v 1.22 2012/02/10 20:20:48 jlec Exp $
+
+*cctbx-2010.03.29.2334-r6 (10 Feb 2012)
+
+ 10 Feb 2012; Justin Lecher <jlec@gentoo.org>
+ +cctbx-2010.03.29.2334-r6.ebuild:
+ Add fixes for boost-1.48 and its PyABI specific libs, #401393
*cctbx-2010.03.29.2334-r5 (04 Dec 2011)
1.1 sci-libs/cctbx/cctbx-2010.03.29.2334-r6.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/cctbx/cctbx-2010.03.29.2334-r6.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/cctbx/cctbx-2010.03.29.2334-r6.ebuild?rev=1.1&content-type=text/plain
Index: cctbx-2010.03.29.2334-r6.ebuild
===================================================================
# 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.1 2012/02/10 20:20:48 jlec Exp $
EAPI="3"
PYTHON_DEPEND="2"
inherit eutils fortran-2 prefix python toolchain-funcs
MY_PV="${PV//./_}"
DESCRIPTION="Computational Crystallography Toolbox"
HOMEPAGE="http://cctbx.sourceforge.net/"
SRC_URI="http://cci.lbl.gov/cctbx_build/results/${MY_PV}/${PN}_bundle.tar.gz -> ${P}.tar.gz"
LICENSE="cctbx-2.0"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
IUSE="+minimal openmp threads"
RDEPEND="
virtual/fortran
>dev-libs/boost-1.48[python]
sci-libs/clipper
sci-libs/fftw
!minimal? (
sci-chemistry/cns
sci-chemistry/shelx )"
DEPEND="${RDEPEND}
>=dev-util/scons-1.2"
S="${WORKDIR}"
MY_S="${WORKDIR}"/cctbx_sources
MY_B="${WORKDIR}"/cctbx_build
pkg_setup() {
use openmp && FORTRAN_NEED_OPENMP="1"
fortran-2_pkg_setup
if use openmp && ! tc-has-openmp; then
ewarn "You are using gcc and OpenMP is only available with gcc >= 4.2 and icc"
ewarn "If you want to build ${PN} with OpenMP, abort now,"
ewarn "and switch CC to an OpenMP capable compiler"
fi
python_set_active_version 2
}
src_prepare() {
local opts
local optsld
epatch \
"${FILESDIR}"/${PV}-tst_server.py.patch \
"${FILESDIR}"/${PV}-boost.patch \
"${FILESDIR}"/${PV}-clipper.patch \
"${FILESDIR}"/${PV}-flags.patch \
"${FILESDIR}"/${PV}-soname.patch \
"${FILESDIR}"/${PV}-gcc-4.6.patch
eprefixify "${MY_S}"/scitbx/libtbx_refresh.py
rm -rf "${MY_S}/scons" "${MY_S}/boost" "${MY_S}/PyCifRW" || die
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() {
local compiler
local myconf
myconf="${MY_S}/libtbx/configure.py"
compiler=$(expr match "$(tc-getCC)" '.*\([a-z]cc\)')
myconf="${myconf} --compiler=${compiler}"
# Additional USE flag usage
check_use openmp
myconf="${myconf} --enable-openmp-if-possible=${USE_openmp}"
use threads && USEthreads="--enable-boost-threads" && \
ewarn "If using boost threads openmp support is disabled"
myconf="${myconf} ${USE_threads} --scan-boost --use_environment_flags"
mkdir "${MY_B}" && myconf="${myconf} --current_working_directory=${MY_B}"
cd "${MY_B}"
myconf="${myconf} --build=release fftw3tbx rstbx smtbx mmtbx clipper_adaptbx fable"
einfo "configuring with ${python} ${myconf}"
$(PYTHON) ${myconf} || die "configure failed"
}
src_compile() {
local makeopts_exp
cd "${MY_B}"
makeopts_exp=${MAKEOPTS/j/j }
makeopts_exp=${makeopts_exp%-l[0-9]*}
source setpaths_all.sh
einfo "compiling with libtbx.scons ${makeopts_exp}"
libtbx.scons ${makeopts_exp} .|| die "make failed"
}
src_test(){
source "${MY_B}"/setpaths_all.sh
libtbx.python $(libtbx.show_dist_paths boost_adaptbx)/tests/tst_rational.py && \
libtbx.python ${SCITBX_DIST}/run_tests.py ${MAKEOPTS_EXP} && \
libtbx.python ${CCTBX_DIST}/run_tests.py ${MAKEOPTS_EXP} \
|| die "test failed"
}
src_install(){
local lib baselib
# find cctbx_build/ -type f \( -name "*.py" -o -name "*sh" \) -exec \
# sed -e "s:${MY_S}:${EPREFIX}/usr/$(get_libdir)/cctbx/cctbx_sources:g" \
# -e "s:${MY_B}:${EPREFIX}/usr/$(get_libdir)/cctbx/cctbx_build:g" \
# -i '{}' \; || die "Fail to correct path"
sed \
-e "s:${MY_B}:${EPREFIX}/usr:g" \
-e "s:${MY_S}:${EPREFIX}/$(python_get_sitedir):g" \
-i "${MY_B}/libtbx_env" || die
insinto /usr/share/cctbx
doins "${MY_B}/libtbx_env" || die
ebegin "removing unnessary files"
rm -r "${S}"/cctbx_sources/{clipper,ccp4io,ucs-fonts,TAG} || die "failed to remove uneeded scons"
find -O3 "${S}" -type f \
\( -name "*conftest*" -o -name "*.o" -o -name "*.c" -o -name "*.f" -o -name "*.cpp" -o \
-name "*.pyc" -o -name "SCons*" -o -name "Makefile" -o -name "config.log" \) -delete || die
find "${S}" -type d -empty -delete || die
find "${MY_B}" -maxdepth 1 -type f -delete || die
eend
dobin "${MY_B}"/bin/* || die
rm -rf "${MY_B}/bin"
dolib.so "${MY_B}"/lib/lib* || die
mv "${ED}"/usr/$(get_libdir)/libscitbx_min{,i}pack.so || die
rm -f "${MY_B}"/lib/lib*
for lib in "${ED}"/usr/$(get_libdir)/*.so; do
baselib=$(basename ${lib})
mv ${lib}{,.0.0}
dosym ${baselib}.0.0 /usr/$(get_libdir)/${baselib}
done
insinto /usr/include
doins -r "${MY_B}"/include/* || die
rm -rf "${MY_B}/include"
insinto /usr/libexec/${PN}
doins -r "${MY_B}"/* || die
find "${ED}"/usr/libexec/${PN} -type f -exec chmod 755 '{}' \;
cd "${MY_S}"
insinto $(python_get_sitedir)
doins -r * || die
exeinto $(python_get_sitedir)
doexe "${MY_B}"/lib/* || die
rm -rf "${MY_B}/lib"
sed \
-e "/PYTHONPATH/s:${MY_S}:$(python_get_sitedir):g" \
-e "/PYTHONPATH/s:${MY_B}:$(python_get_sitedir):g" \
-e "/LD_LIBRARY_PATH/s:${MY_B}/lib:${EPREFIX}/usr/$(get_libdir):g" \
-e "/PATH/s:${MY_B}/bin:${EPREFIX}/usr/bin:g" \
-e "/PATH/s:${MY_B}/exe:${EPREFIX}/usr/bin:g" \
-e "/exec/s:${MY_S}:$(python_get_sitedir):g" \
-e "/LIBTBX_BUILD/s:${MY_B}:${EPREFIX}/usr/share/cctbx:g" \
-e "s:${MY_B}/exe_dev/:${EPREFIX}/usr/libexec/${PN}/exe_dev/:g" \
-i "${ED}"/usr/bin/* || die
}
pkg_postinst () {
python_mod_optimize boost_adaptbx cbflib_adaptbx ccp4io_adaptbx cctbx chiltbx clipper_adaptbx crys3d fable fftw3tbx gltbx iotbx libtbx mmtbx omptbx rstbx scitbx smtbx spotfinder tntbx
}
pkg_postrm () {
python_mod_cleanup boost_adaptbx cbflib_adaptbx ccp4io_adaptbx cctbx chiltbx clipper_adaptbx crys3d fable fftw3tbx gltbx iotbx libtbx mmtbx omptbx rstbx scitbx smtbx spotfinder tntbx
}
check_use() {
for var in $@; do
if use ${var}; then
printf -v "USE_$var" True
else
printf -v "USE_$var" False
fi
shift
done
}
^ permalink raw reply [flat|nested] 8+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sci-libs/cctbx: ChangeLog cctbx-2010.03.29.2334-r6.ebuild
@ 2012-05-23 20:39 Agostino Sarubbo (ago)
0 siblings, 0 replies; 8+ messages in thread
From: Agostino Sarubbo (ago) @ 2012-05-23 20:39 UTC (permalink / raw
To: gentoo-commits
ago 12/05/23 20:39:10
Modified: ChangeLog cctbx-2010.03.29.2334-r6.ebuild
Log:
Stable for amd64, wrt bug #413815
(Portage version: 2.1.10.49/cvs/Linux x86_64)
Revision Changes Path
1.24 sci-libs/cctbx/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/cctbx/ChangeLog?rev=1.24&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/cctbx/ChangeLog?rev=1.24&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/cctbx/ChangeLog?r1=1.23&r2=1.24
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-libs/cctbx/ChangeLog,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- ChangeLog 10 Feb 2012 22:52:33 -0000 1.23
+++ ChangeLog 23 May 2012 20:39:09 -0000 1.24
@@ -1,6 +1,10 @@
# 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.23 2012/02/10 22:52:33 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/cctbx/ChangeLog,v 1.24 2012/05/23 20:39:09 ago Exp $
+
+ 23 May 2012; Agostino Sarubbo <ago@gentoo.org>
+ cctbx-2010.03.29.2334-r6.ebuild:
+ Stable for amd64, wrt bug #413815
10 Feb 2012; Markos Chandras <hwoarang@gentoo.org>
cctbx-2010.03.29.2334-r3.ebuild, cctbx-2010.03.29.2334-r4.ebuild,
1.3 sci-libs/cctbx/cctbx-2010.03.29.2334-r6.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/cctbx/cctbx-2010.03.29.2334-r6.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/cctbx/cctbx-2010.03.29.2334-r6.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/cctbx/cctbx-2010.03.29.2334-r6.ebuild?r1=1.2&r2=1.3
Index: cctbx-2010.03.29.2334-r6.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-libs/cctbx/cctbx-2010.03.29.2334-r6.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- cctbx-2010.03.29.2334-r6.ebuild 10 Feb 2012 22:52:33 -0000 1.2
+++ cctbx-2010.03.29.2334-r6.ebuild 23 May 2012 20:39:09 -0000 1.3
@@ -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.2 2012/02/10 22:52:33 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/cctbx/cctbx-2010.03.29.2334-r6.ebuild,v 1.3 2012/05/23 20:39:09 ago Exp $
EAPI="3"
@@ -16,7 +16,7 @@
LICENSE="cctbx-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
IUSE="+minimal openmp threads"
RDEPEND="
^ permalink raw reply [flat|nested] 8+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sci-libs/cctbx: ChangeLog cctbx-2010.03.29.2334-r6.ebuild
@ 2012-06-14 18:44 Jeff Horelick (jdhore)
0 siblings, 0 replies; 8+ messages in thread
From: Jeff Horelick (jdhore) @ 2012-06-14 18:44 UTC (permalink / raw
To: gentoo-commits
jdhore 12/06/14 18:44:19
Modified: ChangeLog cctbx-2010.03.29.2334-r6.ebuild
Log:
marked x86 per bug 413815
(Portage version: 2.2.0_alpha110/cvs/Linux i686)
Revision Changes Path
1.25 sci-libs/cctbx/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/cctbx/ChangeLog?rev=1.25&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/cctbx/ChangeLog?rev=1.25&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/cctbx/ChangeLog?r1=1.24&r2=1.25
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-libs/cctbx/ChangeLog,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- ChangeLog 23 May 2012 20:39:09 -0000 1.24
+++ ChangeLog 14 Jun 2012 18:44:19 -0000 1.25
@@ -1,6 +1,10 @@
# 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.24 2012/05/23 20:39:09 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/cctbx/ChangeLog,v 1.25 2012/06/14 18:44:19 jdhore Exp $
+
+ 14 Jun 2012; Jeff Horelick <jdhore@gentoo.org>
+ cctbx-2010.03.29.2334-r6.ebuild:
+ marked x86 per bug 413815
23 May 2012; Agostino Sarubbo <ago@gentoo.org>
cctbx-2010.03.29.2334-r6.ebuild:
1.4 sci-libs/cctbx/cctbx-2010.03.29.2334-r6.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/cctbx/cctbx-2010.03.29.2334-r6.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/cctbx/cctbx-2010.03.29.2334-r6.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/cctbx/cctbx-2010.03.29.2334-r6.ebuild?r1=1.3&r2=1.4
Index: cctbx-2010.03.29.2334-r6.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-libs/cctbx/cctbx-2010.03.29.2334-r6.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- cctbx-2010.03.29.2334-r6.ebuild 23 May 2012 20:39:09 -0000 1.3
+++ cctbx-2010.03.29.2334-r6.ebuild 14 Jun 2012 18:44:19 -0000 1.4
@@ -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.3 2012/05/23 20:39:09 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/cctbx/cctbx-2010.03.29.2334-r6.ebuild,v 1.4 2012/06/14 18:44:19 jdhore Exp $
EAPI="3"
@@ -16,7 +16,7 @@
LICENSE="cctbx-2.0"
SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux"
IUSE="+minimal openmp threads"
RDEPEND="
^ permalink raw reply [flat|nested] 8+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sci-libs/cctbx: ChangeLog cctbx-2010.03.29.2334-r6.ebuild
@ 2012-06-19 14:59 Justin Lecher (jlec)
0 siblings, 0 replies; 8+ messages in thread
From: Justin Lecher (jlec) @ 2012-06-19 14:59 UTC (permalink / raw
To: gentoo-commits
jlec 12/06/19 14:59:00
Modified: ChangeLog cctbx-2010.03.29.2334-r6.ebuild
Log:
sci-libs/cctbx: Add fix for gcc-4.7
(Portage version: 2.2.0_alpha110/cvs/Linux x86_64)
Revision Changes Path
1.26 sci-libs/cctbx/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/cctbx/ChangeLog?rev=1.26&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/cctbx/ChangeLog?rev=1.26&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/cctbx/ChangeLog?r1=1.25&r2=1.26
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-libs/cctbx/ChangeLog,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- ChangeLog 14 Jun 2012 18:44:19 -0000 1.25
+++ ChangeLog 19 Jun 2012 14:59:00 -0000 1.26
@@ -1,6 +1,10 @@
# 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.25 2012/06/14 18:44:19 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/cctbx/ChangeLog,v 1.26 2012/06/19 14:59:00 jlec Exp $
+
+ 19 Jun 2012; Justin Lecher <jlec@gentoo.org>
+ +files/2010.03.29.2334-gcc-4.7.patch, cctbx-2010.03.29.2334-r6.ebuild:
+ Add fix for gcc-4.7
14 Jun 2012; Jeff Horelick <jdhore@gentoo.org>
cctbx-2010.03.29.2334-r6.ebuild:
1.5 sci-libs/cctbx/cctbx-2010.03.29.2334-r6.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/cctbx/cctbx-2010.03.29.2334-r6.ebuild?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/cctbx/cctbx-2010.03.29.2334-r6.ebuild?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/cctbx/cctbx-2010.03.29.2334-r6.ebuild?r1=1.4&r2=1.5
Index: cctbx-2010.03.29.2334-r6.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-libs/cctbx/cctbx-2010.03.29.2334-r6.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- cctbx-2010.03.29.2334-r6.ebuild 14 Jun 2012 18:44:19 -0000 1.4
+++ cctbx-2010.03.29.2334-r6.ebuild 19 Jun 2012 14:59:00 -0000 1.5
@@ -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.4 2012/06/14 18:44:19 jdhore Exp $
+# $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 $
EAPI="3"
@@ -55,7 +55,8 @@
"${FILESDIR}"/${PV}-clipper.patch \
"${FILESDIR}"/${PV}-flags.patch \
"${FILESDIR}"/${PV}-soname.patch \
- "${FILESDIR}"/${PV}-gcc-4.6.patch
+ "${FILESDIR}"/${PV}-gcc-4.6.patch \
+ "${FILESDIR}"/${PV}-gcc-4.7.patch
eprefixify "${MY_S}"/scitbx/libtbx_refresh.py
^ permalink raw reply [flat|nested] 8+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sci-libs/cctbx: ChangeLog cctbx-2010.03.29.2334-r6.ebuild
@ 2012-09-06 9:32 Justin Lecher (jlec)
0 siblings, 0 replies; 8+ messages in thread
From: Justin Lecher (jlec) @ 2012-09-06 9:32 UTC (permalink / raw
To: gentoo-commits
jlec 12/09/06 09:32:54
Modified: ChangeLog cctbx-2010.03.29.2334-r6.ebuild
Log:
sci-libs/cctbx: Use bundled scons on prefix, #391377
(Portage version: 2.2.0_alpha124/cvs/Linux x86_64)
Revision Changes Path
1.28 sci-libs/cctbx/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/cctbx/ChangeLog?rev=1.28&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/cctbx/ChangeLog?rev=1.28&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/cctbx/ChangeLog?r1=1.27&r2=1.28
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-libs/cctbx/ChangeLog,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- ChangeLog 26 Aug 2012 09:55:45 -0000 1.27
+++ ChangeLog 6 Sep 2012 09:32:54 -0000 1.28
@@ -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,
1.6 sci-libs/cctbx/cctbx-2010.03.29.2334-r6.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/cctbx/cctbx-2010.03.29.2334-r6.ebuild?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/cctbx/cctbx-2010.03.29.2334-r6.ebuild?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/cctbx/cctbx-2010.03.29.2334-r6.ebuild?r1=1.5&r2=1.6
Index: cctbx-2010.03.29.2334-r6.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-libs/cctbx/cctbx-2010.03.29.2334-r6.ebuild,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- cctbx-2010.03.29.2334-r6.ebuild 19 Jun 2012 14:59:00 -0000 1.5
+++ cctbx-2010.03.29.2334-r6.ebuild 6 Sep 2012 09:32:54 -0000 1.6
@@ -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 @@
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 @@
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() {
^ permalink raw reply [flat|nested] 8+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sci-libs/cctbx: ChangeLog cctbx-2010.03.29.2334-r6.ebuild
@ 2012-10-18 21:38 Justin Lecher (jlec)
0 siblings, 0 replies; 8+ messages in thread
From: Justin Lecher (jlec) @ 2012-10-18 21:38 UTC (permalink / raw
To: gentoo-commits
jlec 12/10/18 21:38:46
Modified: ChangeLog cctbx-2010.03.29.2334-r6.ebuild
Log:
sci-libs/cctbx: Remove virtual/fortran and always call fortran-2_pkg_setup as intend by the updated fortran-2.eclass
(Portage version: 2.2.0_alpha141/cvs/Linux x86_64, signed Manifest commit with key 8009D6F070EB7916)
Revision Changes Path
1.29 sci-libs/cctbx/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/cctbx/ChangeLog?rev=1.29&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/cctbx/ChangeLog?rev=1.29&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/cctbx/ChangeLog?r1=1.28&r2=1.29
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-libs/cctbx/ChangeLog,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- ChangeLog 6 Sep 2012 09:32:54 -0000 1.28
+++ ChangeLog 18 Oct 2012 21:38:46 -0000 1.29
@@ -1,6 +1,10 @@
# 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.28 2012/09/06 09:32:54 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/cctbx/ChangeLog,v 1.29 2012/10/18 21:38:46 jlec Exp $
+
+ 18 Oct 2012; Justin Lecher <jlec@gentoo.org> cctbx-2010.03.29.2334-r6.ebuild:
+ Remove virtual/fortran and always call fortran-2_pkg_setup as intend by the
+ updated fortran-2.eclass
06 Sep 2012; Justin Lecher <jlec@gentoo.org> cctbx-2010.03.29.2334-r6.ebuild:
Use bundled scons on prefix, #391377
1.7 sci-libs/cctbx/cctbx-2010.03.29.2334-r6.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/cctbx/cctbx-2010.03.29.2334-r6.ebuild?rev=1.7&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/cctbx/cctbx-2010.03.29.2334-r6.ebuild?rev=1.7&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/cctbx/cctbx-2010.03.29.2334-r6.ebuild?r1=1.6&r2=1.7
Index: cctbx-2010.03.29.2334-r6.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-libs/cctbx/cctbx-2010.03.29.2334-r6.ebuild,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- cctbx-2010.03.29.2334-r6.ebuild 6 Sep 2012 09:32:54 -0000 1.6
+++ cctbx-2010.03.29.2334-r6.ebuild 18 Oct 2012 21:38:46 -0000 1.7
@@ -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.6 2012/09/06 09:32:54 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/cctbx/cctbx-2010.03.29.2334-r6.ebuild,v 1.7 2012/10/18 21:38:46 jlec Exp $
EAPI="3"
@@ -20,7 +20,6 @@
IUSE="+minimal openmp threads"
RDEPEND="
- virtual/fortran
>=dev-libs/boost-1.48[python]
sci-libs/clipper
sci-libs/fftw
^ permalink raw reply [flat|nested] 8+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sci-libs/cctbx: ChangeLog cctbx-2010.03.29.2334-r6.ebuild
@ 2012-10-19 10:36 Justin Lecher (jlec)
0 siblings, 0 replies; 8+ messages in thread
From: Justin Lecher (jlec) @ 2012-10-19 10:36 UTC (permalink / raw
To: gentoo-commits
jlec 12/10/19 10:36:38
Modified: ChangeLog cctbx-2010.03.29.2334-r6.ebuild
Log:
sci-libs/cctbx: Remove virtual/fortran and always call fortran-2_pkg_setup as intend by the updated fortran-2.eclass
(Portage version: 2.2.0_alpha141/cvs/Linux x86_64, signed Manifest commit with key 70EB7916)
Revision Changes Path
1.30 sci-libs/cctbx/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/cctbx/ChangeLog?rev=1.30&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/cctbx/ChangeLog?rev=1.30&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/cctbx/ChangeLog?r1=1.29&r2=1.30
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-libs/cctbx/ChangeLog,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- ChangeLog 18 Oct 2012 21:38:46 -0000 1.29
+++ ChangeLog 19 Oct 2012 10:36:38 -0000 1.30
@@ -1,6 +1,10 @@
# 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.29 2012/10/18 21:38:46 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/cctbx/ChangeLog,v 1.30 2012/10/19 10:36:38 jlec Exp $
+
+ 19 Oct 2012; Justin Lecher <jlec@gentoo.org> cctbx-2010.03.29.2334-r6.ebuild:
+ Remove virtual/fortran and always call fortran-2_pkg_setup as intend by the
+ updated fortran-2.eclass
18 Oct 2012; Justin Lecher <jlec@gentoo.org> cctbx-2010.03.29.2334-r6.ebuild:
Remove virtual/fortran and always call fortran-2_pkg_setup as intend by the
1.8 sci-libs/cctbx/cctbx-2010.03.29.2334-r6.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/cctbx/cctbx-2010.03.29.2334-r6.ebuild?rev=1.8&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/cctbx/cctbx-2010.03.29.2334-r6.ebuild?rev=1.8&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/cctbx/cctbx-2010.03.29.2334-r6.ebuild?r1=1.7&r2=1.8
Index: cctbx-2010.03.29.2334-r6.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-libs/cctbx/cctbx-2010.03.29.2334-r6.ebuild,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- cctbx-2010.03.29.2334-r6.ebuild 18 Oct 2012 21:38:46 -0000 1.7
+++ cctbx-2010.03.29.2334-r6.ebuild 19 Oct 2012 10:36:38 -0000 1.8
@@ -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.7 2012/10/18 21:38:46 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/cctbx/cctbx-2010.03.29.2334-r6.ebuild,v 1.8 2012/10/19 10:36:38 jlec Exp $
EAPI="3"
@@ -35,13 +35,15 @@
pkg_setup() {
use openmp && FORTRAN_NEED_OPENMP="1"
- fortran-2_pkg_setup
if use openmp && ! tc-has-openmp; then
ewarn "You are using gcc and OpenMP is only available with gcc >= 4.2 and icc"
ewarn "If you want to build ${PN} with OpenMP, abort now,"
ewarn "and switch CC to an OpenMP capable compiler"
+ FORTRAN_NEED_OPENMP=1
fi
+ fortran-2_pkg_setup
python_set_active_version 2
+ python_pkg_setup
}
src_prepare() {
^ permalink raw reply [flat|nested] 8+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sci-libs/cctbx: ChangeLog cctbx-2010.03.29.2334-r6.ebuild
@ 2015-04-22 6:58 Justin Lecher (jlec)
0 siblings, 0 replies; 8+ messages in thread
From: Justin Lecher (jlec) @ 2015-04-22 6:58 UTC (permalink / raw
To: gentoo-commits
jlec 15/04/22 06:58:03
Modified: ChangeLog
Removed: cctbx-2010.03.29.2334-r6.ebuild
Log:
Drop old
(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)
Revision Changes Path
1.38 sci-libs/cctbx/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/cctbx/ChangeLog?rev=1.38&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/cctbx/ChangeLog?rev=1.38&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/cctbx/ChangeLog?r1=1.37&r2=1.38
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-libs/cctbx/ChangeLog,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- ChangeLog 21 Apr 2015 17:50:14 -0000 1.37
+++ ChangeLog 22 Apr 2015 06:58:03 -0000 1.38
@@ -1,6 +1,9 @@
# ChangeLog for sci-libs/cctbx
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/cctbx/ChangeLog,v 1.37 2015/04/21 17:50:14 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/cctbx/ChangeLog,v 1.38 2015/04/22 06:58:03 jlec Exp $
+
+ 22 Apr 2015; Justin Lecher <jlec@gentoo.org> -cctbx-2010.03.29.2334-r6.ebuild:
+ Drop old
21 Apr 2015; Pacho Ramos <pacho@gentoo.org> cctbx-2010.03.29.2334-r7.ebuild:
x86 stable wrt bug #529534
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2015-04-22 6:58 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-10-18 21:38 [gentoo-commits] gentoo-x86 commit in sci-libs/cctbx: ChangeLog cctbx-2010.03.29.2334-r6.ebuild Justin Lecher (jlec)
-- strict thread matches above, loose matches on Subject: below --
2015-04-22 6:58 Justin Lecher (jlec)
2012-10-19 10:36 Justin Lecher (jlec)
2012-09-06 9:32 Justin Lecher (jlec)
2012-06-19 14:59 Justin Lecher (jlec)
2012-06-14 18:44 Jeff Horelick (jdhore)
2012-05-23 20:39 Agostino Sarubbo (ago)
2012-02-10 20:20 Justin Lecher (jlec)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox