1 |
commit: a57dee12f49e88bf428e6a5e5bd68ce2b6398b13 |
2 |
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Aug 10 04:03:36 2019 +0000 |
4 |
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Aug 10 04:05:37 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a57dee12 |
7 |
|
8 |
sci-libs/cctbx: Remove |
9 |
|
10 |
Closes: https://bugs.gentoo.org/639760 |
11 |
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> |
12 |
|
13 |
sci-libs/cctbx/Manifest | 1 - |
14 |
sci-libs/cctbx/cctbx-2010.03.29.2334-r7.ebuild | 189 -------- |
15 |
sci-libs/cctbx/files/2010.03.29.2334-boost.patch | 516 --------------------- |
16 |
sci-libs/cctbx/files/2010.03.29.2334-clipper.patch | 77 --- |
17 |
sci-libs/cctbx/files/2010.03.29.2334-flags.patch | 94 ---- |
18 |
.../files/2010.03.29.2334-format-security.patch | 117 ----- |
19 |
sci-libs/cctbx/files/2010.03.29.2334-gcc-4.6.patch | 29 -- |
20 |
sci-libs/cctbx/files/2010.03.29.2334-gcc-4.7.patch | 154 ------ |
21 |
sci-libs/cctbx/files/2010.03.29.2334-soname.patch | 123 ----- |
22 |
.../files/2010.03.29.2334-tst_server.py.patch | 15 - |
23 |
sci-libs/cctbx/metadata.xml | 20 - |
24 |
11 files changed, 1335 deletions(-) |
25 |
|
26 |
diff --git a/sci-libs/cctbx/Manifest b/sci-libs/cctbx/Manifest |
27 |
deleted file mode 100644 |
28 |
index ddab059a5f1..00000000000 |
29 |
--- a/sci-libs/cctbx/Manifest |
30 |
+++ /dev/null |
31 |
@@ -1 +0,0 @@ |
32 |
-DIST cctbx-2010.03.29.2334.tar.gz 15570372 BLAKE2B ad0b98fa27b8b13af7a1f41ee3764ce558afc4d53b8e7605c169ed86a9b0dd0e86ad58a72eec6dc570bdbf6574dcee25ca357633d727a36ed36f00186c9cc503 SHA512 7aafd647db49925fc1df16a9ccb4f8caf040b4d73e9601731eb3da3051467c3005fb2cc95b498501c899cd1bd378e6a6135cffe734cb4f93eccacbc13575b2c8 |
33 |
|
34 |
diff --git a/sci-libs/cctbx/cctbx-2010.03.29.2334-r7.ebuild b/sci-libs/cctbx/cctbx-2010.03.29.2334-r7.ebuild |
35 |
deleted file mode 100644 |
36 |
index 5ac1e461f68..00000000000 |
37 |
--- a/sci-libs/cctbx/cctbx-2010.03.29.2334-r7.ebuild |
38 |
+++ /dev/null |
39 |
@@ -1,189 +0,0 @@ |
40 |
-# Copyright 1999-2015 Gentoo Foundation |
41 |
-# Distributed under the terms of the GNU General Public License v2 |
42 |
- |
43 |
-EAPI=5 |
44 |
- |
45 |
-PYTHON_COMPAT=( python2_7 ) |
46 |
- |
47 |
-inherit eutils fortran-2 multilib prefix python-single-r1 toolchain-funcs |
48 |
- |
49 |
-MY_PV="${PV//./_}" |
50 |
- |
51 |
-DESCRIPTION="Computational Crystallography Toolbox" |
52 |
-HOMEPAGE="http://cctbx.sourceforge.net/" |
53 |
-SRC_URI="http://cci.lbl.gov/cctbx_build/results/${MY_PV}/${PN}_bundle.tar.gz -> ${P}.tar.gz" |
54 |
- |
55 |
-LICENSE="cctbx-2.0" |
56 |
-SLOT="0" |
57 |
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux" |
58 |
-IUSE="+minimal openmp threads" |
59 |
- |
60 |
-REQUIRED_USE=" |
61 |
- ${PYTHON_REQUIRED_USE} |
62 |
- ?? ( openmp threads )" |
63 |
- |
64 |
-RDEPEND=" |
65 |
- ${PYTHON_DEPS} |
66 |
- >=dev-libs/boost-1.48[python,${PYTHON_USEDEP}] |
67 |
- sci-libs/clipper |
68 |
- sci-libs/fftw:3.0= |
69 |
- !minimal? ( |
70 |
- sci-chemistry/cns |
71 |
- sci-chemistry/shelx )" |
72 |
-DEPEND="${RDEPEND} |
73 |
- !prefix? ( >=dev-util/scons-1.2[${PYTHON_USEDEP}] )" |
74 |
- |
75 |
-S="${WORKDIR}" |
76 |
-MY_S="${WORKDIR}"/cctbx_sources |
77 |
-MY_B="${WORKDIR}"/cctbx_build |
78 |
- |
79 |
-pkg_setup() { |
80 |
- use openmp && FORTRAN_NEED_OPENMP="1" |
81 |
- if use openmp && ! tc-has-openmp; then |
82 |
- ewarn "You are using gcc and OpenMP is only available with gcc >= 4.2 and icc" |
83 |
- ewarn "If you want to build ${PN} with OpenMP, abort now," |
84 |
- ewarn "and switch CC to an OpenMP capable compiler" |
85 |
- FORTRAN_NEED_OPENMP=1 |
86 |
- fi |
87 |
- fortran-2_pkg_setup |
88 |
- python-single-r1_pkg_setup |
89 |
-} |
90 |
- |
91 |
-src_prepare() { |
92 |
- local opts |
93 |
- local optsld |
94 |
- |
95 |
- epatch \ |
96 |
- "${FILESDIR}"/${PV}-tst_server.py.patch \ |
97 |
- "${FILESDIR}"/${PV}-boost.patch \ |
98 |
- "${FILESDIR}"/${PV}-clipper.patch \ |
99 |
- "${FILESDIR}"/${PV}-flags.patch \ |
100 |
- "${FILESDIR}"/${PV}-soname.patch \ |
101 |
- "${FILESDIR}"/${PV}-gcc-4.6.patch \ |
102 |
- "${FILESDIR}"/${PV}-gcc-4.7.patch \ |
103 |
- "${FILESDIR}"/${PV}-format-security.patch |
104 |
- |
105 |
- eprefixify "${MY_S}"/scitbx/libtbx_refresh.py |
106 |
- |
107 |
- rm -rvf "${MY_S}/boost" "${MY_S}/PyCifRW" >> "${T}"/clean.log || die |
108 |
- if ! use prefix; then |
109 |
- rm -rvf "${MY_S}/scons" >> "${T}"/clean.log || die |
110 |
- echo "import os, sys; os.execvp('scons', sys.argv)" > "${MY_S}"/libtbx/command_line/scons.py || die |
111 |
- fi |
112 |
- |
113 |
- find "${MY_S}/clipper" -name "*.h" -print -delete >> "${T}"/clean.log || die |
114 |
- |
115 |
- sed \ |
116 |
- -e "/LIBS/s:boost_python:boost_python-$(echo ${EPYTHON} | sed 's/python//'):g" \ |
117 |
- -i "${MY_S}"/boost_adaptbx/SConscript "${MY_S}"/scitbx/boost_python/SConscript || die |
118 |
-} |
119 |
- |
120 |
-src_configure() { |
121 |
- local compiler |
122 |
- local myconf |
123 |
- |
124 |
- myconf="${MY_S}/libtbx/configure.py" |
125 |
- |
126 |
- compiler=$(expr match "$(tc-getCC)" '.*\([a-z]cc\)') |
127 |
- myconf="${myconf} --compiler=${compiler}" |
128 |
- |
129 |
- # Additional USE flag usage |
130 |
- myconf="${myconf} --enable-openmp-if-possible=$(usex openmp true false)" |
131 |
- |
132 |
- use threads && USEthreads="--enable-boost-threads" |
133 |
- |
134 |
- myconf="${myconf} ${USE_threads} --scan-boost --use_environment_flags" |
135 |
- |
136 |
- mkdir "${MY_B}" && myconf="${myconf} --current_working_directory=${MY_B}" |
137 |
- cd "${MY_B}" |
138 |
- |
139 |
- myconf="${myconf} --build=release fftw3tbx rstbx smtbx mmtbx clipper_adaptbx fable" |
140 |
- einfo "configuring with ${python} ${myconf}" |
141 |
- |
142 |
- ${EPYTHON} ${myconf} || die "configure failed" |
143 |
-} |
144 |
- |
145 |
-src_compile() { |
146 |
- local makeopts_exp |
147 |
- |
148 |
- cd "${MY_B}" |
149 |
- |
150 |
- makeopts_exp=${MAKEOPTS/j/j } |
151 |
- makeopts_exp=${makeopts_exp%-l[0-9]*} |
152 |
- |
153 |
- source setpaths_all.sh |
154 |
- |
155 |
- einfo "compiling with libtbx.scons ${makeopts_exp}" |
156 |
- libtbx.scons ${makeopts_exp} .|| die "make failed" |
157 |
-} |
158 |
- |
159 |
-src_test(){ |
160 |
- source "${MY_B}"/setpaths_all.sh |
161 |
- libtbx.python $(libtbx.show_dist_paths boost_adaptbx)/tests/tst_rational.py && \ |
162 |
- libtbx.python ${SCITBX_DIST}/run_tests.py ${MAKEOPTS_EXP} && \ |
163 |
- libtbx.python ${CCTBX_DIST}/run_tests.py ${MAKEOPTS_EXP} \ |
164 |
- || die "test failed" |
165 |
-} |
166 |
- |
167 |
-src_install(){ |
168 |
- local lib baselib |
169 |
-# find cctbx_build/ -type f \( -name "*.py" -o -name "*sh" \) -exec \ |
170 |
-# sed -e "s:${MY_S}:${EPREFIX}/usr/$(get_libdir)/cctbx/cctbx_sources:g" \ |
171 |
-# -e "s:${MY_B}:${EPREFIX}/usr/$(get_libdir)/cctbx/cctbx_build:g" \ |
172 |
-# -i '{}' \; || die "Fail to correct path" |
173 |
- |
174 |
- sed \ |
175 |
- -e "s:${MY_B}:${EPREFIX}/usr:g" \ |
176 |
- -e "s:${MY_S}:${EPREFIX}/$(python_get_sitedir):g" \ |
177 |
- -i "${MY_B}/libtbx_env" || die |
178 |
- |
179 |
- insinto /usr/share/cctbx |
180 |
- doins "${MY_B}/libtbx_env" || die |
181 |
- |
182 |
- ebegin "removing unnessary files" |
183 |
- rm -r "${S}"/cctbx_sources/{clipper,ccp4io,ucs-fonts,TAG} || die "failed to remove uneeded scons" |
184 |
- find -O3 "${S}" -type f \ |
185 |
- \( -name "*conftest*" -o -name "*.o" -o -name "*.c" -o -name "*.f" -o -name "*.cpp" -o \ |
186 |
- -name "*.pyc" -o -name "SCons*" -o -name "Makefile" -o -name "config.log" \) -delete \ |
187 |
- -print >> "${T}"/clean.log || die |
188 |
- find "${S}" -type d -empty -delete -print >> "${T}"/clean.log || die |
189 |
- find "${MY_B}" -maxdepth 1 -type f -delete -print >> "${T}"/clean.log || die |
190 |
- eend |
191 |
- |
192 |
- dobin "${MY_B}"/bin/* |
193 |
- rm -vrf "${MY_B}/bin" >> "${T}"/clean.log || die |
194 |
- dolib.so "${MY_B}"/lib/lib* |
195 |
- mv "${ED}"/usr/$(get_libdir)/libscitbx_min{,i}pack.so || die |
196 |
- rm -vf "${MY_B}"/lib/lib* >> "${T}"/clean.log || die |
197 |
- |
198 |
- for lib in "${ED}"/usr/$(get_libdir)/*.so; do |
199 |
- baselib=$(basename ${lib}) |
200 |
- mv ${lib}{,.0.0} || die |
201 |
- dosym ${baselib}.0.0 /usr/$(get_libdir)/${baselib} |
202 |
- done |
203 |
- |
204 |
- insinto /usr/include |
205 |
- doins -r "${MY_B}"/include/* || die |
206 |
- rm -rvf "${MY_B}/include" >> "${T}"/clean.log || die |
207 |
- |
208 |
- insinto /usr/libexec/${PN} |
209 |
- doins -r "${MY_B}"/* || die |
210 |
- find "${ED}"/usr/libexec/${PN} -type f -exec chmod 755 '{}' \; |
211 |
- |
212 |
- cd "${MY_S}" |
213 |
- python_domodule * "${MY_B}"/lib/* |
214 |
- rm -rvf "${MY_B}/lib" >> "${T}"/clean.log || die |
215 |
- |
216 |
- sed \ |
217 |
- -e "/PYTHONPATH/s:${MY_S}:$(python_get_sitedir):g" \ |
218 |
- -e "/PYTHONPATH/s:${MY_B}:$(python_get_sitedir):g" \ |
219 |
- -e "/LD_LIBRARY_PATH/s:${MY_B}/lib:${EPREFIX}/usr/$(get_libdir):g" \ |
220 |
- -e "/PATH/s:${MY_B}/bin:${EPREFIX}/usr/bin:g" \ |
221 |
- -e "/PATH/s:${MY_B}/exe:${EPREFIX}/usr/bin:g" \ |
222 |
- -e "/exec/s:${MY_S}:$(python_get_sitedir):g" \ |
223 |
- -e "/LIBTBX_BUILD/s:${MY_B}:${EPREFIX}/usr/share/cctbx:g" \ |
224 |
- -e "s:${MY_B}/exe_dev/:${EPREFIX}/usr/libexec/${PN}/exe_dev/:g" \ |
225 |
- -i "${ED}"/usr/bin/* || die |
226 |
- |
227 |
- python_optimize |
228 |
-} |
229 |
|
230 |
diff --git a/sci-libs/cctbx/files/2010.03.29.2334-boost.patch b/sci-libs/cctbx/files/2010.03.29.2334-boost.patch |
231 |
deleted file mode 100644 |
232 |
index 5b4439ee678..00000000000 |
233 |
--- a/sci-libs/cctbx/files/2010.03.29.2334-boost.patch |
234 |
+++ /dev/null |
235 |
@@ -1,516 +0,0 @@ |
236 |
-From 7e77ff8694b87e95efe56ed961fbc8dd30d8c238 Mon Sep 17 00:00:00 2001 |
237 |
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <gentoo@××××××××××.pl> |
238 |
-Date: Sun, 4 Jul 2010 12:21:10 +0200 |
239 |
-Subject: [PATCH] Unbundle boost. |
240 |
- |
241 |
---- |
242 |
- work/cctbx_sources/boost_adaptbx/SConscript | 260 ------------------------- |
243 |
- work/cctbx_sources/cbflib_adaptbx/SConscript | 1 - |
244 |
- work/cctbx_sources/cctbx/SConscript | 1 - |
245 |
- work/cctbx_sources/clipper_adaptbx/SConscript | 1 - |
246 |
- work/cctbx_sources/fable/SConscript | 1 - |
247 |
- work/cctbx_sources/fable/libtbx_config | 2 +- |
248 |
- work/cctbx_sources/fftw3tbx/SConscript | 1 - |
249 |
- work/cctbx_sources/gltbx/SConscript | 1 - |
250 |
- work/cctbx_sources/iotbx/SConscript | 2 - |
251 |
- work/cctbx_sources/mmtbx/SConscript | 1 - |
252 |
- work/cctbx_sources/omptbx/libtbx_config | 2 +- |
253 |
- work/cctbx_sources/rstbx/SConscript | 1 - |
254 |
- work/cctbx_sources/scitbx/SConscript | 1 - |
255 |
- work/cctbx_sources/scitbx/libtbx_config | 2 +- |
256 |
- work/cctbx_sources/scitbx/libtbx_refresh.py | 3 +- |
257 |
- work/cctbx_sources/smtbx/SConscript | 1 - |
258 |
- work/cctbx_sources/spotfinder/SConscript | 1 - |
259 |
- work/cctbx_sources/tntbx/SConscript | 1 - |
260 |
- 18 files changed, 4 insertions(+), 279 deletions(-) |
261 |
- |
262 |
-diff --git a/work/cctbx_sources/boost_adaptbx/SConscript b/work/cctbx_sources/boost_adaptbx/SConscript |
263 |
-index 0701816..9f8cbf9 100644 |
264 |
---- a/work/cctbx_sources/boost_adaptbx/SConscript |
265 |
-+++ b/work/cctbx_sources/boost_adaptbx/SConscript |
266 |
-@@ -8,39 +8,9 @@ import string |
267 |
- import sys, os |
268 |
- op = os.path |
269 |
- Import("env_base", "env_etc") |
270 |
--env_etc.boost_dist = libtbx.env.dist_path("boost") |
271 |
--env_etc.boost_include = env_etc.boost_dist |
272 |
- env_etc.boost_adaptbx_dist = libtbx.env.dist_path("boost_adaptbx") |
273 |
- env_etc.boost_adaptbx_include = os.path.dirname(env_etc.boost_adaptbx_dist) |
274 |
- |
275 |
--def build_boost_thread(): |
276 |
-- if (not libtbx.env.build_options.enable_boost_threads): |
277 |
-- return |
278 |
-- if (sys.platform == "win32"): s = "win32" |
279 |
-- else: s = "pthread" |
280 |
-- join = os.path.join |
281 |
-- src = join("libs", "thread", "src", s) |
282 |
-- prefix = "#" + join(os.path.basename(env_etc.boost_dist), src) |
283 |
-- source = [] |
284 |
-- for node in sorted(os.listdir(join(env_etc.boost_dist, src))): |
285 |
-- if (not node.lower().endswith(".cpp")): continue |
286 |
-- source.append(join(prefix, node)) |
287 |
-- env = env_base.Clone( |
288 |
-- SHLINKFLAGS=env_etc.shlinkflags) |
289 |
-- env.Append(SHCXXFLAGS=["-DBOOST_THREAD_BUILD_DLL"]) |
290 |
-- env_etc.include_registry.append( |
291 |
-- env=env, |
292 |
-- paths=[env_etc.boost_include]) |
293 |
-- darwin_shlinkcom(env_etc, env, |
294 |
-- lo="boost/libs/thread/src/libboost_thread.lo", |
295 |
-- dylib="lib/libboost_thread.dylib") |
296 |
-- env.Repository(os.path.dirname(env_etc.boost_dist)) |
297 |
-- env.SharedLibrary( |
298 |
-- target='#lib/boost_thread', |
299 |
-- source=source) |
300 |
-- |
301 |
--build_boost_thread() |
302 |
-- |
303 |
- if (not env_etc.no_boost_python): |
304 |
- env_etc.cxxflags_bpl_defines_base = [ |
305 |
- "-DBOOST_PYTHON_MAX_BASES=2"] |
306 |
-@@ -64,12 +34,10 @@ if (not env_etc.no_boost_python): |
307 |
- ' /manifest ${TARGET}.manifest']) |
308 |
- Export("env_no_includes_boost_python_ext") |
309 |
- env_pure_boost_python_ext = env_no_includes_boost_python_ext.Clone() |
310 |
-- env_etc.include_registry.set_boost_dir_name(env_etc.boost_dist) |
311 |
- env_etc.include_registry.append( |
312 |
- env=env_pure_boost_python_ext, |
313 |
- paths=[ |
314 |
- "#include", |
315 |
-- env_etc.boost_include, |
316 |
- env_etc.python_include]) |
317 |
- env_boost_python_ext = env_pure_boost_python_ext.Clone() |
318 |
- env_etc.include_registry.prepend( |
319 |
-@@ -113,234 +81,6 @@ if (not env_etc.no_boost_python): |
320 |
- target="tests/tst_optional_copy", |
321 |
- source="tests/tst_optional_copy.cpp") |
322 |
- |
323 |
-- import os, os.path |
324 |
-- env = env_base.Clone(LIBS=env_etc.libs_python) |
325 |
-- env.Append(LIBPATH=env_etc.libpath_python) |
326 |
-- env.Append(SHCXXFLAGS=env_etc.cxxflags_bpl_defines_base) |
327 |
-- env.Append(SHCXXFLAGS=["-DBOOST_PYTHON_SOURCE"]) |
328 |
-- if (libtbx.env.build_options.boost_python_bool_int_strict): |
329 |
-- env.Append(SHCXXFLAGS=["-DBOOST_PYTHON_BOOL_INT_STRICT"]) |
330 |
-- env.Replace(SHLINKFLAGS=env_etc.shlinkflags) |
331 |
-- env.Append(CXXFLAGS=env_etc.cxxflags_bpl_defines_base) |
332 |
-- env.Append(CXXFLAGS="-DBOOST_PYTHON_SOURCE") |
333 |
-- env.Replace(LINKFLAGS=env_etc.shlinkflags) |
334 |
-- env_etc.include_registry.append( |
335 |
-- env=env, |
336 |
-- paths=[env_etc.boost_include, env_etc.python_include]) |
337 |
-- |
338 |
-- darwin_shlinkcom(env_etc, env, |
339 |
-- lo="boost/libs/python/src/libboost_python.lo", |
340 |
-- dylib="lib/libboost_python.dylib") |
341 |
-- |
342 |
-- # fixed list of file names introduced 2009-09-29, due to major changes in |
343 |
-- # boost/libs/python/build/Jamfile.v2 svn rev. 56305 (new Python 3 support) |
344 |
-- bpl_dll_sources = """\ |
345 |
--numeric.cpp |
346 |
--list.cpp |
347 |
--long.cpp |
348 |
--dict.cpp |
349 |
--tuple.cpp |
350 |
--str.cpp |
351 |
--slice.cpp |
352 |
--converter/from_python.cpp |
353 |
--converter/registry.cpp |
354 |
--converter/type_id.cpp |
355 |
--object/enum.cpp |
356 |
--object/class.cpp |
357 |
--object/function.cpp |
358 |
--object/inheritance.cpp |
359 |
--object/life_support.cpp |
360 |
--object/pickle_support.cpp |
361 |
--errors.cpp |
362 |
--module.cpp |
363 |
--converter/builtin_converters.cpp |
364 |
--converter/arg_to_python_base.cpp |
365 |
--object/iterator.cpp |
366 |
--object/stl_iterator.cpp |
367 |
--object_protocol.cpp |
368 |
--object_operators.cpp |
369 |
--wrapper.cpp |
370 |
--import.cpp |
371 |
--exec.cpp |
372 |
--object/function_doc_signature.cpp |
373 |
--""".splitlines() |
374 |
-- prefix = "#"+os.path.join( |
375 |
-- os.path.basename(env_etc.boost_dist), "libs", "python", "src") |
376 |
-- bpl_dll_sources = [os.path.join(prefix, path) for path in bpl_dll_sources] |
377 |
-- # |
378 |
-- env.Repository(os.path.dirname(env_etc.boost_dist)) |
379 |
-- if (env_etc.static_bpl): |
380 |
-- env.StaticLibrary(target="#lib/boost_python", source=bpl_dll_sources) |
381 |
-- else: |
382 |
-- env.SharedLibrary(target="#lib/boost_python", source=bpl_dll_sources) |
383 |
-- if (int(ARGUMENTS.get("boost_python_tests", 0))): |
384 |
-- warn_if_unexpected_md5_hexdigest( |
385 |
-- path=libtbx.env.under_dist("boost", "libs/python/test/Jamfile.v2"), |
386 |
-- expected_md5_hexdigests=[ |
387 |
-- "c7a3dd81bf730635146f5c908ac982eb", # svn revision 39065M |
388 |
-- "d40aac0029bcd28f6e205ae3b30a1284", # svn revision 40216 |
389 |
-- "b79f016d3ec10cf1625a9e006e605428", # svn revision 40714 |
390 |
-- "f948983d970fd47e83a3a785bb54520a", # svn revision 41550 |
391 |
-- "c3d84006331d534840c42ab956fdfa05", # svn revision 50367M |
392 |
-- "cedfd061d767a27413ef4a75ee0e446f", # svn revision 56310 |
393 |
-- "e5507482a1937825e4c9f3ffe555fc59", # svn revision 59331 |
394 |
-- ]) |
395 |
-- bpl_tests = Split(""" |
396 |
--staticmethod |
397 |
--shared_ptr |
398 |
--enable_shared_from_this |
399 |
--andreas_beyer |
400 |
--polymorphism |
401 |
--polymorphism2 |
402 |
--auto_ptr |
403 |
--minimal |
404 |
--args |
405 |
--numpy |
406 |
--enum |
407 |
--exception_translator |
408 |
--test_pointer_adoption |
409 |
--operators |
410 |
--callbacks |
411 |
--defaults |
412 |
--object |
413 |
--list |
414 |
--long |
415 |
--dict |
416 |
--tuple |
417 |
--str |
418 |
--virtual_functions |
419 |
--back_reference |
420 |
--implicit |
421 |
--data_members |
422 |
--ben_scott1 |
423 |
--bienstman1 |
424 |
--bienstman2 |
425 |
--bienstman3 |
426 |
--multi_arg_constructor |
427 |
--extract |
428 |
--opaque |
429 |
--pickle1 |
430 |
--pickle2 |
431 |
--pickle3 |
432 |
--pickle4 |
433 |
--nested |
434 |
--docstring |
435 |
--pytype_function |
436 |
--bienstman4 |
437 |
--bienstman5 |
438 |
--test_builtin_converters,builtin_converters_ext,test_builtin_converters |
439 |
--cltree,cltree,test_cltree |
440 |
--m1,m1,newtest |
441 |
--m2,m2,newtest |
442 |
--iterator,iterator_ext,iterator |
443 |
--input_iterator,input_iterator,iterator |
444 |
--crossmod_exception_a,crossmod_exception_a,crossmod_exception |
445 |
--crossmod_exception_b,crossmod_exception_b,crossmod_exception |
446 |
--vector_indexing_suite |
447 |
--return_arg |
448 |
--keywords,keywords,keywords_test |
449 |
--properties |
450 |
--map_indexing_suite;int_map_indexing_suite;a_map_indexing_suite,map_indexing_suite_ext,map_indexing_suite |
451 |
--injected |
452 |
--slice |
453 |
--const_argument |
454 |
--raw_ctor |
455 |
--pointer_vector |
456 |
--wrapper_held_type |
457 |
--polymorphism2_auto_ptr |
458 |
--stl_iterator |
459 |
--voidptr |
460 |
--crossmod_opaque_a,crossmod_opaque_a,crossmod_opaque |
461 |
--crossmod_opaque_b,crossmod_opaque_b,crossmod_opaque |
462 |
--""") |
463 |
--# non-portable tests are not included above: |
464 |
--# calling_conventions |
465 |
--# calling_conventions_mf |
466 |
--# |
467 |
-- Import("env_boost_python_ext") |
468 |
-- test_dir = libtbx.env.under_dist("boost", "libs/python/test") |
469 |
-- prefix = "#"+os.path.join( |
470 |
-- os.path.basename(env_etc.boost_dist), "libs", "python", "test") |
471 |
-- all_tst = [] |
472 |
-- for bpl_test in bpl_tests: |
473 |
-- flds = bpl_test.split(",") |
474 |
-- assert len(flds) in (1,3) |
475 |
-- if (len(flds) == 1): |
476 |
-- src = bpl_test |
477 |
-- pyd = bpl_test + "_ext" |
478 |
-- tst = bpl_test |
479 |
-- else: |
480 |
-- src = flds[0] |
481 |
-- pyd = flds[1] |
482 |
-- tst = flds[2] |
483 |
-- env = env_pure_boost_python_ext.Clone() |
484 |
-- env.Repository(os.path.dirname(env_etc.boost_dist)) |
485 |
-- ok = True |
486 |
-- source = [] |
487 |
-- for s in src.split(";"): |
488 |
-- cpp = "%s.cpp" % s |
489 |
-- file_name = os.path.join(test_dir, cpp) |
490 |
-- if (not os.path.isfile(file_name)): |
491 |
-- print "Warning: source file not available:", show_string(file_name) |
492 |
-- ok = False |
493 |
-- else: |
494 |
-- source.append(os.path.join(prefix, cpp)) |
495 |
-- if (ok): |
496 |
-- if (not tst in all_tst): |
497 |
-- all_tst.append(tst) |
498 |
-- env.SharedLibrary(target="#lib/%s" % pyd, source=source) |
499 |
-- all_tst = [os.path.join(test_dir, tst+".py") for tst in all_tst] |
500 |
-- # |
501 |
-- if (sys.platform == "linux2"): |
502 |
-- base_lib = libtbx.env.under_build(path="base/lib") |
503 |
-- if (os.path.isdir(base_lib)): |
504 |
-- env_prog = env.Clone() |
505 |
-- env_prog.Append(LIBPATH=[base_lib]) |
506 |
-- env_prog.Append(LIBS=[ |
507 |
-- "-lpython%d.%d" % sys.version_info[:2], |
508 |
-- "-lpthread", |
509 |
-- "-lutil", |
510 |
-- "-ldl"]) |
511 |
-- exe = env_prog.Program( |
512 |
-- target="boost/libs/python/test/exec_dynamic", |
513 |
-- source=[os.path.join(prefix, "exec.cpp")]) |
514 |
-- libtbx.env.write_dispatcher_in_bin( |
515 |
-- source_file=exe[0].get_abspath(), |
516 |
-- target_file="boost_libs_python_test_exec_dynamic") |
517 |
-- all_tst.append("$ boost_libs_python_test_exec_dynamic %s" |
518 |
-- % show_string(os.path.join(test_dir, "exec.py"))) |
519 |
-- # |
520 |
-- if (os.name != "nt"): |
521 |
-- env.SharedLibrary( |
522 |
-- target="#lib/boost_adaptbx_char_array_ext", |
523 |
-- source=["char_array_ext.cpp"]) |
524 |
-- all_tst.append( |
525 |
-- libtbx.env.under_dist("boost_adaptbx", "tests/tst_char_array.py")) |
526 |
-- # |
527 |
-- if (os.name == "nt"): |
528 |
-- boost_python_run_tests = \ |
529 |
-- "%s\\boost_python_run_tests.bat" % libtbx.env.build_path |
530 |
-- f = open(boost_python_run_tests, "w") |
531 |
-- for tst in all_tst: |
532 |
-- if (tst.startswith("$ ")): |
533 |
-- print >> f, 'call %s' % tst[2:] |
534 |
-- else: |
535 |
-- print >> f, 'call libtbx.python %s' % show_string(tst) |
536 |
-- f.close() |
537 |
-- else: |
538 |
-- boost_python_run_tests = \ |
539 |
-- "%s/boost_python_run_tests.csh" % libtbx.env.build_path |
540 |
-- f = open(boost_python_run_tests, "w") |
541 |
-- print >> f, "#! /bin/csh -f" |
542 |
-- print >> f, "set verbose" |
543 |
-- for tst in all_tst: |
544 |
-- if (tst.startswith("$ ")): |
545 |
-- print >> f, tst[2:] |
546 |
-- else: |
547 |
-- print >> f, 'libtbx.python "%s"' % show_string(tst) |
548 |
-- f.close() |
549 |
-- os.chmod(boost_python_run_tests, 0755) |
550 |
-- |
551 |
- def write_type_id_eq_h(): |
552 |
- unsigned_types = [ |
553 |
- "unsigned short", |
554 |
-diff --git a/work/cctbx_sources/cbflib_adaptbx/SConscript b/work/cctbx_sources/cbflib_adaptbx/SConscript |
555 |
-index 78c1297..dffc247 100644 |
556 |
---- a/work/cctbx_sources/cbflib_adaptbx/SConscript |
557 |
-+++ b/work/cctbx_sources/cbflib_adaptbx/SConscript |
558 |
-@@ -14,7 +14,6 @@ env_etc.cbflib_common_includes = [ |
559 |
- env_etc.libtbx_include, |
560 |
- env_etc.scitbx_include, |
561 |
- env_etc.boost_adaptbx_include, |
562 |
-- env_etc.boost_include, |
563 |
- env_etc.cbflib_dist, # for the adaptor cpp files |
564 |
- env_etc.cbflib_include[0], # for the cbflib c-files |
565 |
- env_etc.cbflib_include[1], # for the cbflib c-files |
566 |
-diff --git a/work/cctbx_sources/cctbx/SConscript b/work/cctbx_sources/cctbx/SConscript |
567 |
-index 6ec7c93..2dfb442 100644 |
568 |
---- a/work/cctbx_sources/cctbx/SConscript |
569 |
-+++ b/work/cctbx_sources/cctbx/SConscript |
570 |
-@@ -10,7 +10,6 @@ env_etc.cctbx_common_includes = [ |
571 |
- env_etc.scitbx_include, |
572 |
- env_etc.chiltbx_include, |
573 |
- env_etc.omptbx_include, |
574 |
-- env_etc.boost_include, |
575 |
- ] |
576 |
- |
577 |
- env = env_base.Clone( |
578 |
-diff --git a/work/cctbx_sources/fable/SConscript b/work/cctbx_sources/fable/SConscript |
579 |
-index bf8e198..b6acccf 100644 |
580 |
---- a/work/cctbx_sources/fable/SConscript |
581 |
-+++ b/work/cctbx_sources/fable/SConscript |
582 |
-@@ -13,7 +13,6 @@ if (not env_etc.no_boost_python): |
583 |
- env_etc.libtbx_include, |
584 |
- env_etc.fable_include, |
585 |
- env_etc.boost_adaptbx_include, |
586 |
-- env_etc.boost_include, |
587 |
- env_etc.python_include]) |
588 |
- env.SharedLibrary( |
589 |
- target="#lib/fable_ext", |
590 |
-diff --git a/work/cctbx_sources/fable/libtbx_config b/work/cctbx_sources/fable/libtbx_config |
591 |
-index d456588..f00ae86 100644 |
592 |
---- a/work/cctbx_sources/fable/libtbx_config |
593 |
-+++ b/work/cctbx_sources/fable/libtbx_config |
594 |
-@@ -1,4 +1,4 @@ |
595 |
- { |
596 |
-- "modules_required_for_build": ["boost"], |
597 |
-+ "modules_required_for_build": [], |
598 |
- "modules_required_for_use": ["boost_adaptbx"], |
599 |
- } |
600 |
-diff --git a/work/cctbx_sources/fftw3tbx/SConscript b/work/cctbx_sources/fftw3tbx/SConscript |
601 |
-index ecc3a03..4fc1ec1 100755 |
602 |
---- a/work/cctbx_sources/fftw3tbx/SConscript |
603 |
-+++ b/work/cctbx_sources/fftw3tbx/SConscript |
604 |
-@@ -8,7 +8,6 @@ env_etc.fftw3tbx_dist = libtbx.env.dist_path("fftw3tbx") |
605 |
- env_etc.fftw3tbx_common_includes = [ |
606 |
- env_etc.libtbx_include, |
607 |
- env_etc.scitbx_include, |
608 |
-- env_etc.boost_include, |
609 |
- ] |
610 |
- |
611 |
- base_include = libtbx.env.under_build("base/include") |
612 |
-diff --git a/work/cctbx_sources/gltbx/SConscript b/work/cctbx_sources/gltbx/SConscript |
613 |
-index 56a7115..f6214a4 100644 |
614 |
---- a/work/cctbx_sources/gltbx/SConscript |
615 |
-+++ b/work/cctbx_sources/gltbx/SConscript |
616 |
-@@ -7,7 +7,6 @@ env_etc.gltbx_common_includes = [ |
617 |
- env_etc.libtbx_include, |
618 |
- env_etc.gltbx_include, |
619 |
- env_etc.scitbx_include, |
620 |
-- env_etc.boost_include, |
621 |
- ] |
622 |
- |
623 |
- if (not env_etc.no_boost_python): |
624 |
-diff --git a/work/cctbx_sources/iotbx/SConscript b/work/cctbx_sources/iotbx/SConscript |
625 |
-index df17856..c5cf7da 100644 |
626 |
---- a/work/cctbx_sources/iotbx/SConscript |
627 |
-+++ b/work/cctbx_sources/iotbx/SConscript |
628 |
-@@ -10,7 +10,6 @@ env_etc.iotbx_common_includes = [ |
629 |
- env_etc.iotbx_include, |
630 |
- env_etc.cctbx_include, |
631 |
- env_etc.scitbx_include, |
632 |
-- env_etc.boost_include, |
633 |
- env_etc.boost_adaptbx_include, |
634 |
- ] |
635 |
- |
636 |
-@@ -37,7 +36,6 @@ if (not env_etc.no_boost_python): |
637 |
- env_etc.include_registry.append( |
638 |
- env=env, |
639 |
- paths=[env_etc.libtbx_include, |
640 |
-- env_etc.boost_include, |
641 |
- env_etc.python_include]) |
642 |
- env.SharedLibrary( |
643 |
- target="#lib/iotbx_wildcard_ext", |
644 |
-diff --git a/work/cctbx_sources/mmtbx/SConscript b/work/cctbx_sources/mmtbx/SConscript |
645 |
-index 0532878..9bcaeb2 100755 |
646 |
---- a/work/cctbx_sources/mmtbx/SConscript |
647 |
-+++ b/work/cctbx_sources/mmtbx/SConscript |
648 |
-@@ -10,7 +10,6 @@ env_etc.mmtbx_common_includes = [ |
649 |
- env_etc.mmtbx_include, |
650 |
- env_etc.cctbx_include, |
651 |
- env_etc.scitbx_include, |
652 |
-- env_etc.boost_include, |
653 |
- ] |
654 |
- |
655 |
- if (not env_etc.no_boost_python): |
656 |
-diff --git a/work/cctbx_sources/omptbx/libtbx_config b/work/cctbx_sources/omptbx/libtbx_config |
657 |
-index d456588..f00ae86 100644 |
658 |
---- a/work/cctbx_sources/omptbx/libtbx_config |
659 |
-+++ b/work/cctbx_sources/omptbx/libtbx_config |
660 |
-@@ -1,4 +1,4 @@ |
661 |
- { |
662 |
-- "modules_required_for_build": ["boost"], |
663 |
-+ "modules_required_for_build": [], |
664 |
- "modules_required_for_use": ["boost_adaptbx"], |
665 |
- } |
666 |
-diff --git a/work/cctbx_sources/rstbx/SConscript b/work/cctbx_sources/rstbx/SConscript |
667 |
-index 2213c2f..232b5d7 100644 |
668 |
---- a/work/cctbx_sources/rstbx/SConscript |
669 |
-+++ b/work/cctbx_sources/rstbx/SConscript |
670 |
-@@ -11,7 +11,6 @@ env_etc.rstbx_common_includes = [ |
671 |
- env_etc.scitbx_include, |
672 |
- env_etc.chiltbx_include, |
673 |
- env_etc.omptbx_include, |
674 |
-- env_etc.boost_include, |
675 |
- ] |
676 |
- |
677 |
- env = env_base.Clone(SHLINKFLAGS=env_etc.shlinkflags) |
678 |
-diff --git a/work/cctbx_sources/scitbx/SConscript b/work/cctbx_sources/scitbx/SConscript |
679 |
-index f30b9db..10e0967 100644 |
680 |
---- a/work/cctbx_sources/scitbx/SConscript |
681 |
-+++ b/work/cctbx_sources/scitbx/SConscript |
682 |
-@@ -9,7 +9,6 @@ env_etc.scitbx_common_includes = [ |
683 |
- env_etc.scitbx_include, |
684 |
- env_etc.omptbx_include, |
685 |
- env_etc.boost_adaptbx_include, |
686 |
-- env_etc.boost_include, |
687 |
- ] |
688 |
- |
689 |
- SConscript("error/SConscript") |
690 |
-diff --git a/work/cctbx_sources/scitbx/libtbx_config b/work/cctbx_sources/scitbx/libtbx_config |
691 |
-index 87cc3c7..d147819 100644 |
692 |
---- a/work/cctbx_sources/scitbx/libtbx_config |
693 |
-+++ b/work/cctbx_sources/scitbx/libtbx_config |
694 |
-@@ -1,4 +1,4 @@ |
695 |
- { |
696 |
-- "modules_required_for_build": ["boost"], |
697 |
-+ "modules_required_for_build": [], |
698 |
- "modules_required_for_use": ["boost_adaptbx", "omptbx"], |
699 |
- } |
700 |
-diff --git a/work/cctbx_sources/scitbx/libtbx_refresh.py b/work/cctbx_sources/scitbx/libtbx_refresh.py |
701 |
-index 10d4ee0..c8374b2 100644 |
702 |
---- a/work/cctbx_sources/scitbx/libtbx_refresh.py |
703 |
-+++ b/work/cctbx_sources/scitbx/libtbx_refresh.py |
704 |
-@@ -13,8 +13,7 @@ if (self.env.is_ready_for_build()): |
705 |
- generate_all.refresh(array_family=os.path.dirname(target_dir)) |
706 |
- # |
707 |
- warn_if_unexpected_md5_hexdigest( |
708 |
-- path=self.env.under_dist( |
709 |
-- module_name="boost", path="boost/random/mersenne_twister.hpp"), |
710 |
-+ path="@GENTOO_PORTAGE_EPREFIX@/usr/include/boost/random/mersenne_twister.hpp", |
711 |
- expected_md5_hexdigests=[ |
712 |
- "a2533c79a21f0f773f2e0d29a37371b0", # CVS revision 1.21 |
713 |
- "378432b5b280c9c0c894f7c80f0dad92", # CVS revision 1.20 |
714 |
-diff --git a/work/cctbx_sources/smtbx/SConscript b/work/cctbx_sources/smtbx/SConscript |
715 |
-index f5031ee..02f81a4 100644 |
716 |
---- a/work/cctbx_sources/smtbx/SConscript |
717 |
-+++ b/work/cctbx_sources/smtbx/SConscript |
718 |
-@@ -7,7 +7,6 @@ env_etc.smtbx_common_includes = [ |
719 |
- env_etc.cctbx_include, |
720 |
- env_etc.scitbx_include, |
721 |
- env_etc.chiltbx_include, |
722 |
-- env_etc.boost_include, |
723 |
- ] |
724 |
- |
725 |
- env = env_base.Clone( |
726 |
-diff --git a/work/cctbx_sources/spotfinder/SConscript b/work/cctbx_sources/spotfinder/SConscript |
727 |
-index 1d280d4..9dc9195 100644 |
728 |
---- a/work/cctbx_sources/spotfinder/SConscript |
729 |
-+++ b/work/cctbx_sources/spotfinder/SConscript |
730 |
-@@ -13,7 +13,6 @@ env_etc.spotfinder_common_includes = [ |
731 |
- env_etc.iotbx_include, |
732 |
- os.path.dirname(env_etc.spotfinder_dist), |
733 |
- env_etc.boost_adaptbx_include, |
734 |
-- env_etc.boost_include, |
735 |
- env_etc.annlib_dist, |
736 |
- env_etc.annlib_include[0], |
737 |
- env_etc.annlib_include[1], |
738 |
-diff --git a/work/cctbx_sources/tntbx/SConscript b/work/cctbx_sources/tntbx/SConscript |
739 |
-index e773186..ee29f10 100755 |
740 |
---- a/work/cctbx_sources/tntbx/SConscript |
741 |
-+++ b/work/cctbx_sources/tntbx/SConscript |
742 |
-@@ -10,7 +10,6 @@ env_etc.tntbx_common_includes = [ |
743 |
- env_etc.tntbx_include, |
744 |
- env_etc.tntbx_tnt_include, |
745 |
- env_etc.scitbx_include, |
746 |
-- env_etc.boost_include, |
747 |
- ] |
748 |
- |
749 |
- Import("env_base", "env_etc") |
750 |
--- |
751 |
-1.7.1.1 |
752 |
|
753 |
diff --git a/sci-libs/cctbx/files/2010.03.29.2334-clipper.patch b/sci-libs/cctbx/files/2010.03.29.2334-clipper.patch |
754 |
deleted file mode 100644 |
755 |
index 8830dd8a054..00000000000 |
756 |
--- a/sci-libs/cctbx/files/2010.03.29.2334-clipper.patch |
757 |
+++ /dev/null |
758 |
@@ -1,77 +0,0 @@ |
759 |
-diff --git a/cctbx_sources/clipper_adaptbx/SConscript b/cctbx_sources/clipper_adaptbx/SConscript |
760 |
-index 9cce49e..1046ed0 100644 |
761 |
---- a/cctbx_sources/clipper_adaptbx/SConscript |
762 |
-+++ b/cctbx_sources/clipper_adaptbx/SConscript |
763 |
-@@ -1,56 +1,13 @@ |
764 |
- import libtbx.load_env |
765 |
- Import("env_base", "env_etc") |
766 |
- |
767 |
--env_etc.clipper_dist = libtbx.env.dist_path("clipper") |
768 |
--env_etc.clipper_include = env_etc.clipper_dist |
769 |
-- |
770 |
- env = env_base.Clone( |
771 |
- SHLINKFLAGS=env_etc.shlinkflags, |
772 |
- LIBS=env_etc.libm) |
773 |
--env.Prepend(CPPPATH=[env_etc.clipper_include]) |
774 |
-- |
775 |
--if (env_etc.static_libraries): builder = env.StaticLibrary |
776 |
--else: builder = env.SharedLibrary |
777 |
--builder(target='#lib/clipper', |
778 |
-- source = ["../clipper/clipper/core/"+file_name for file_name in """ |
779 |
-- atomsf.cpp |
780 |
-- cell.cpp |
781 |
-- clipper_memory.cpp |
782 |
-- clipper_message.cpp |
783 |
-- clipper_stats.cpp |
784 |
-- clipper_types.cpp |
785 |
-- clipper_util.cpp |
786 |
-- container.cpp |
787 |
-- container_hkl.cpp |
788 |
-- container_map.cpp |
789 |
-- container_types.cpp |
790 |
-- coords.cpp |
791 |
-- derivs.cpp |
792 |
-- hkl_compute.cpp |
793 |
-- hkl_data.cpp |
794 |
-- hkl_datatypes.cpp |
795 |
-- hkl_info.cpp |
796 |
-- hkl_lookup.cpp |
797 |
-- hkl_operators.cpp |
798 |
-- map_interp.cpp |
799 |
-- map_utils.cpp |
800 |
-- nxmap.cpp |
801 |
-- nxmap_operator.cpp |
802 |
-- ramachandran.cpp |
803 |
-- resol_basisfn.cpp |
804 |
-- resol_fn.cpp |
805 |
-- resol_targetfn.cpp |
806 |
-- rotation.cpp |
807 |
-- spacegroup.cpp |
808 |
-- spacegroup_data.cpp |
809 |
-- symop.cpp |
810 |
-- xmap.cpp |
811 |
--""".split()]) |
812 |
--# fftmap_sparse.cpp |
813 |
--# fftmap.cpp |
814 |
- |
815 |
- env_exe = env.Clone() |
816 |
--env_exe.Prepend(LIBS=["clipper"]) |
817 |
-+env_exe.Prepend(LIBS=["clipper-minimol","clipper-mmdb","clipper-cns","clipper-cif","clipper-contrib","clipper-ccp4","clipper-phs","clipper-core"]) |
818 |
-+env_exe.Prepend(SHLINKFLAGS=["-Wl,--as-needed"]) |
819 |
- |
820 |
- exe = env_exe.Program( |
821 |
- target='#exe_dev/'+env["PROGPREFIX"]+'clipper.symtest' |
822 |
-@@ -76,12 +33,10 @@ if (hasattr(env_etc, "cctbx_include")): |
823 |
- env_etc.include_registry.append( |
824 |
- env=env_clipper_boost_python_ext, |
825 |
- paths=[ |
826 |
-- env_etc.clipper_include, |
827 |
- env_etc.libtbx_include, |
828 |
- env_etc.cctbx_include, |
829 |
- env_etc.scitbx_include, |
830 |
- env_etc.boost_adaptbx_include, |
831 |
-- env_etc.boost_include, |
832 |
- env_etc.python_include]) |
833 |
- Export("env_clipper_boost_python_ext") |
834 |
-- SConscript("clipper/SConscript") |
835 |
-+ |
836 |
|
837 |
diff --git a/sci-libs/cctbx/files/2010.03.29.2334-flags.patch b/sci-libs/cctbx/files/2010.03.29.2334-flags.patch |
838 |
deleted file mode 100644 |
839 |
index 8a803323471..00000000000 |
840 |
--- a/sci-libs/cctbx/files/2010.03.29.2334-flags.patch |
841 |
+++ /dev/null |
842 |
@@ -1,94 +0,0 @@ |
843 |
-diff --git a/cctbx_sources/libtbx/SConscript b/cctbx_sources/libtbx/SConscript |
844 |
-index 16d22b6..f85b664 100644 |
845 |
---- a/cctbx_sources/libtbx/SConscript |
846 |
-+++ b/cctbx_sources/libtbx/SConscript |
847 |
-@@ -5,6 +5,7 @@ from libtbx.str_utils import show_string |
848 |
- from libtbx.path import norm_join, full_command_path |
849 |
- import platform |
850 |
- import sys, os |
851 |
-+import SCons.Util |
852 |
- |
853 |
- if (hasattr(Environment, "Clone")): |
854 |
- Environment.Copy = Environment.Clone # XXX backward compatibility 2008_03_30 |
855 |
-@@ -132,9 +133,7 @@ if (env_etc.compiler == "unix_icpc"): |
856 |
- static_exe = libtbx.env.build_options.static_exe |
857 |
- |
858 |
- def gcc_common_warn_options(): |
859 |
-- result = ["-Wall", "-Wno-sign-compare", "-Wno-unknown-pragmas"] |
860 |
-- if (env_etc.gcc_version >= 40000): |
861 |
-- result.append("-Winit-self") |
862 |
-+ result = [""] |
863 |
- return result |
864 |
- |
865 |
- def enable_more_warnings(env): |
866 |
-@@ -355,16 +354,22 @@ else: |
867 |
- cc = env_etc.compiler.replace("unix_", "") |
868 |
- cxx = cc.replace("gcc", "g++") |
869 |
- env_etc.gcc_version = libtbx.env_config.get_gcc_version(command_name=cc) |
870 |
-+# linkerflags = os.environ.get("LDFLAGS") |
871 |
-+# link_flags=env_etc.ldflags |
872 |
-+ link_flags=os.environ.get("LDFLAGS") |
873 |
-+ linker_options=SCons.Util.CLVar(os.environ['LDFLAGS']) |
874 |
- env_base.Replace( |
875 |
- CC=cc, |
876 |
- SHCC=cc, |
877 |
- CXX=cxx, |
878 |
- LINK=cxx, |
879 |
-+ LINKFLAGS=linker_options, |
880 |
- SHCXX=cxx, |
881 |
- SHLINK=cxx, |
882 |
- SHLIBSUFFIX=env_etc.shlibsuffix, |
883 |
- ) |
884 |
-- env_etc.c_link = cc |
885 |
-+# linkerflags = env_etc.ldflags |
886 |
-+# env_etc.c_link = cc + " " + linkerflags |
887 |
- env_etc.ccflags_base = [ |
888 |
- "-fPIC", |
889 |
- "-fno-strict-aliasing"] |
890 |
-@@ -380,7 +385,7 @@ else: |
891 |
- warn_options = gcc_common_warn_options() + ["-Werror"] |
892 |
- env_etc.ccflags_base.extend(warn_options) |
893 |
- if (libtbx.env.build_options.optimization): |
894 |
-- opts = ["-DNDEBUG", "-O3", "-ffast-math"] |
895 |
-+ opts = ["-DNDEBUG"] |
896 |
- if (env_etc.gcc_version >= 40300): |
897 |
- opts.append("-fno-associative-math") |
898 |
- opts.append("-ftrapping-math") |
899 |
-@@ -401,6 +406,7 @@ else: |
900 |
- env_base.Prepend(LINKFLAGS=["-static"]) |
901 |
- static_exe = None |
902 |
- env_etc.shlinkflags = ["-shared"] |
903 |
-+ env_etc.shlinkflags.append(linker_options) |
904 |
- env_etc.shlinkflags_bpl = env_etc.shlinkflags |
905 |
- if (libtbx.env.build_options.mode == "profile"): |
906 |
- env_base.Prepend(LINKFLAGS=["-pg"]) |
907 |
-diff --git a/cctbx_sources/libtbx/env_config.py b/cctbx_sources/libtbx/env_config.py |
908 |
-index ca510b9..68c58ea 100644 |
909 |
---- a/cctbx_sources/libtbx/env_config.py |
910 |
-+++ b/cctbx_sources/libtbx/env_config.py |
911 |
-@@ -1608,6 +1608,7 @@ class build_options: |
912 |
- self.env_cxxflags = "" |
913 |
- self.env_cflags = "" |
914 |
- self.env_cppflags = "" |
915 |
-+ self.env_ldflags = "" |
916 |
- flg = os.environ.get("CXXFLAGS") |
917 |
- if flg is not None: |
918 |
- self.env_cxxflags = flg |
919 |
-@@ -1617,6 +1618,9 @@ class build_options: |
920 |
- flg = os.environ.get("CPPFLAGS") |
921 |
- if flg is not None: |
922 |
- self.env_cppflags = flg |
923 |
-+ flg = os.environ.get("LDFLAGS") |
924 |
-+ if flg is not None: |
925 |
-+ self.env_ldflags = flg |
926 |
- |
927 |
- def report(self, f=None): |
928 |
- if (f is None): f = sys.stdout |
929 |
-@@ -1640,6 +1644,7 @@ class build_options: |
930 |
- print >>f, " CXXFLAGS = ", self.env_cxxflags |
931 |
- print >>f, " CFLAGS = ", self.env_cflags |
932 |
- print >>f, " CPPFLAGS = ", self.env_cppflags |
933 |
-+ print >>f, " LDFLAGS = ", self.env_ldflags |
934 |
- |
935 |
- class include_registry: |
936 |
- |
937 |
|
938 |
diff --git a/sci-libs/cctbx/files/2010.03.29.2334-format-security.patch b/sci-libs/cctbx/files/2010.03.29.2334-format-security.patch |
939 |
deleted file mode 100644 |
940 |
index 057c135f995..00000000000 |
941 |
--- a/sci-libs/cctbx/files/2010.03.29.2334-format-security.patch |
942 |
+++ /dev/null |
943 |
@@ -1,117 +0,0 @@ |
944 |
- cctbx_sources/scitbx/lbfgsb/raw.h | 54 +++++++++++++++++++-------------------- |
945 |
- 1 file changed, 27 insertions(+), 27 deletions(-) |
946 |
- |
947 |
-diff --git a/cctbx_sources/scitbx/lbfgsb/raw.h b/cctbx_sources/scitbx/lbfgsb/raw.h |
948 |
-index 21afed7..5b15055 100644 |
949 |
---- a/cctbx_sources/scitbx/lbfgsb/raw.h |
950 |
-+++ b/cctbx_sources/scitbx/lbfgsb/raw.h |
951 |
-@@ -853,7 +853,7 @@ namespace raw { |
952 |
- if (iprint >= 99) { |
953 |
- printf(" LINE SEARCH%12d times; norm of step = %.15G\n", |
954 |
- iback, xstep); |
955 |
-- printf(fmt_2001, iter,f,sbgnrm); |
956 |
-+ printf("%s %i %f %f", fmt_2001, iter,f,sbgnrm); |
957 |
- if (iprint > 100) { |
958 |
- write_ref1(" X =", x); |
959 |
- write_ref1(" G =", g); |
960 |
-@@ -862,7 +862,7 @@ namespace raw { |
961 |
- else if (iprint > 0) { |
962 |
- int imod = iter % iprint; |
963 |
- if (imod == 0) { |
964 |
-- printf(fmt_2001, iter,f,sbgnrm); |
965 |
-+ printf("%s %i %f %f", fmt_2001, iter,f,sbgnrm); |
966 |
- } |
967 |
- } |
968 |
- if (iprint >= 1) { |
969 |
-@@ -967,9 +967,9 @@ namespace raw { |
970 |
- " 2 rounding error dominate computation.\n"; |
971 |
- if (task.substr(0,5) == "ERROR") goto lbl_999; |
972 |
- if (iprint >= 0) { |
973 |
-- printf(fmt_3003); |
974 |
-- printf(fmt_3004); |
975 |
-- printf(fmt_3005, n,iter,nfgv,nintol,nskip,nact,sbgnrm,f); |
976 |
-+ printf("%s", fmt_3003); |
977 |
-+ printf("%s", fmt_3004); |
978 |
-+ printf("%s %i %i %i %i %i %i %f %f", fmt_3005, n,iter,nfgv,nintol,nskip,nact,sbgnrm,f); |
979 |
- if (iprint >= 100) { |
980 |
- write_ref1(" X =", x); |
981 |
- } |
982 |
-@@ -977,40 +977,40 @@ namespace raw { |
983 |
- } |
984 |
- lbl_999: |
985 |
- if (iprint >= 0) { |
986 |
-- printf(fmt_3009, task.c_str()); |
987 |
-+ printf("%s %s", fmt_3009, task.c_str()); |
988 |
- if (info != 0) { |
989 |
-- if (info == -1) printf(fmt_9011); |
990 |
-- if (info == -2) printf(fmt_9012); |
991 |
-- if (info == -3) printf(fmt_9013); |
992 |
-- if (info == -4) printf(fmt_9014); |
993 |
-- if (info == -5) printf(fmt_9015); |
994 |
-+ if (info == -1) printf("%s", fmt_9011); |
995 |
-+ if (info == -2) printf("%s", fmt_9012); |
996 |
-+ if (info == -3) printf("%s", fmt_9013); |
997 |
-+ if (info == -4) printf("%s", fmt_9014); |
998 |
-+ if (info == -5) printf("%s", fmt_9015); |
999 |
- if (info == -6) { |
1000 |
- printf(" Input nbd(%12d) is invalid.\n", k); |
1001 |
- } |
1002 |
- if (info == -7) { |
1003 |
- printf(" l(%12d) > u(%12d). No feasible solution.\n", k, k); |
1004 |
- } |
1005 |
-- if (info == -8) printf(fmt_9018); |
1006 |
-- if (info == -9) printf(fmt_9019); |
1007 |
-+ if (info == -8) printf("%s", fmt_9018); |
1008 |
-+ if (info == -9) printf("%s", fmt_9019); |
1009 |
- } |
1010 |
-- if (iprint >= 1) printf(fmt_3007, cachyt,sbtime,lnscht); |
1011 |
-- printf(fmt_3008, time); |
1012 |
-+ if (iprint >= 1) printf("%s %f %f %f", fmt_3007, cachyt,sbtime,lnscht); |
1013 |
-+ printf("%s %f", fmt_3008, time); |
1014 |
- if (iprint >= 1) { |
1015 |
- if (info == -4 || info == -9) { |
1016 |
-- printf(fmt_3002, |
1017 |
-+ printf("%s %i %i %i %i %s %i %f %f", fmt_3002, |
1018 |
- iter,nfgv,nint,nact,word.c_str(),iback,stp,xstep); // itfile |
1019 |
- } |
1020 |
-- printf(fmt_3009, task.c_str()); // itfile |
1021 |
-+ printf("%s %s", fmt_3009, task.c_str()); // itfile |
1022 |
- if (info != 0) { |
1023 |
-- if (info == -1) printf(fmt_9011); // itfile |
1024 |
-- if (info == -2) printf(fmt_9012); // itfile |
1025 |
-- if (info == -3) printf(fmt_9013); // itfile |
1026 |
-- if (info == -4) printf(fmt_9014); // itfile |
1027 |
-- if (info == -5) printf(fmt_9015); // itfile |
1028 |
-- if (info == -8) printf(fmt_9018); // itfile |
1029 |
-- if (info == -9) printf(fmt_9019); // itfile |
1030 |
-+ if (info == -1) printf("%s", fmt_9011); // itfile |
1031 |
-+ if (info == -2) printf("%s", fmt_9012); // itfile |
1032 |
-+ if (info == -3) printf("%s", fmt_9013); // itfile |
1033 |
-+ if (info == -4) printf("%s", fmt_9014); // itfile |
1034 |
-+ if (info == -5) printf("%s", fmt_9015); // itfile |
1035 |
-+ if (info == -8) printf("%s", fmt_9018); // itfile |
1036 |
-+ if (info == -9) printf("%s", fmt_9019); // itfile |
1037 |
- } |
1038 |
-- printf(fmt_3008, time); // itfile |
1039 |
-+ printf("%s %f", fmt_3008, time); // itfile |
1040 |
- } |
1041 |
- } |
1042 |
- } |
1043 |
-@@ -3902,7 +3902,7 @@ namespace raw { |
1044 |
- " refresh the lbfgs memory and restart the iteration.\n"; |
1045 |
- if (info != 0) { |
1046 |
- // singular triangular system detected; refresh the lbfgs memory. |
1047 |
-- if(iprint >= 1) printf(fmt_1005); |
1048 |
-+ if(iprint >= 1) printf("%s", fmt_1005); |
1049 |
- info = 0; |
1050 |
- col = 0; |
1051 |
- head = 1; |
1052 |
-@@ -3968,7 +3968,7 @@ namespace raw { |
1053 |
- if (info != 0) { |
1054 |
- // singular triangular system detected; |
1055 |
- // refresh the lbfgs memory and restart the iteration. |
1056 |
-- if(iprint >= 1) printf(fmt_1005); |
1057 |
-+ if(iprint >= 1) printf("%s", fmt_1005); |
1058 |
- info = 0; |
1059 |
- col = 0; |
1060 |
- head = 1; |
1061 |
|
1062 |
diff --git a/sci-libs/cctbx/files/2010.03.29.2334-gcc-4.6.patch b/sci-libs/cctbx/files/2010.03.29.2334-gcc-4.6.patch |
1063 |
deleted file mode 100644 |
1064 |
index e54cfa16838..00000000000 |
1065 |
--- a/sci-libs/cctbx/files/2010.03.29.2334-gcc-4.6.patch |
1066 |
+++ /dev/null |
1067 |
@@ -1,29 +0,0 @@ |
1068 |
- cctbx_sources/scitbx/array_family/detail/misc.h | 1 + |
1069 |
- .../scitbx/fortran_io/details/istream_scanner.h | 2 +- |
1070 |
- 2 files changed, 2 insertions(+), 1 deletions(-) |
1071 |
- |
1072 |
-diff --git a/cctbx_sources/scitbx/array_family/detail/misc.h b/cctbx_sources/scitbx/array_family/detail/misc.h |
1073 |
-index 6ed881e..d7f7f52 100644 |
1074 |
---- a/cctbx_sources/scitbx/array_family/detail/misc.h |
1075 |
-+++ b/cctbx_sources/scitbx/array_family/detail/misc.h |
1076 |
-@@ -2,6 +2,7 @@ |
1077 |
- #define SCITBX_ARRAY_FAMILY_MISC_H |
1078 |
- |
1079 |
- #include <scitbx/array_family/type_traits.h> |
1080 |
-+#include <memory> |
1081 |
- |
1082 |
- namespace scitbx { namespace af { |
1083 |
- |
1084 |
-diff --git a/cctbx_sources/scitbx/fortran_io/details/istream_scanner.h b/cctbx_sources/scitbx/fortran_io/details/istream_scanner.h |
1085 |
-index 8a0ac25..03a0e20 100644 |
1086 |
---- a/cctbx_sources/scitbx/fortran_io/details/istream_scanner.h |
1087 |
-+++ b/cctbx_sources/scitbx/fortran_io/details/istream_scanner.h |
1088 |
-@@ -32,7 +32,7 @@ class istream_scanner |
1089 |
- } |
1090 |
- |
1091 |
- private: |
1092 |
-- mutable std::basic_istream<CharType> &input; |
1093 |
-+ std::basic_istream<CharType> &input; |
1094 |
- mutable value_t current; |
1095 |
- }; |
1096 |
- |
1097 |
|
1098 |
diff --git a/sci-libs/cctbx/files/2010.03.29.2334-gcc-4.7.patch b/sci-libs/cctbx/files/2010.03.29.2334-gcc-4.7.patch |
1099 |
deleted file mode 100644 |
1100 |
index 96cb21531bb..00000000000 |
1101 |
--- a/sci-libs/cctbx/files/2010.03.29.2334-gcc-4.7.patch |
1102 |
+++ /dev/null |
1103 |
@@ -1,154 +0,0 @@ |
1104 |
- .../scitbx/math/boost_python/distributions.cpp | 60 +++++++++++++------ |
1105 |
- cctbx_sources/scitbx/rigid_body/spatial_lib.h | 1 + |
1106 |
- cctbx_sources/scitbx/rigid_body/tardy.h | 4 +- |
1107 |
- .../refinement/boost_python/weighting_schemes.cpp | 4 +- |
1108 |
- .../smtbx/structure_factors/direct/standard_xray.h | 4 +- |
1109 |
- 5 files changed, 48 insertions(+), 25 deletions(-) |
1110 |
- |
1111 |
-diff --git a/cctbx_sources/scitbx/math/boost_python/distributions.cpp b/cctbx_sources/scitbx/math/boost_python/distributions.cpp |
1112 |
-index a676798..68818e7 100644 |
1113 |
---- a/cctbx_sources/scitbx/math/boost_python/distributions.cpp |
1114 |
-+++ b/cctbx_sources/scitbx/math/boost_python/distributions.cpp |
1115 |
-@@ -59,29 +59,51 @@ namespace { |
1116 |
- { |
1117 |
- typedef Distribution wt; |
1118 |
- |
1119 |
-+ #define NEW_MEMBER(name) \ |
1120 |
-+ static FloatType name(wt const &self) { \ |
1121 |
-+ return boost::math::name(self); \ |
1122 |
-+ } |
1123 |
-+ |
1124 |
-+ NEW_MEMBER(mean); |
1125 |
-+ NEW_MEMBER(median); |
1126 |
-+ NEW_MEMBER(mode); |
1127 |
-+ NEW_MEMBER(variance); |
1128 |
-+ NEW_MEMBER(standard_deviation); |
1129 |
-+ NEW_MEMBER(skewness); |
1130 |
-+ NEW_MEMBER(kurtosis); |
1131 |
-+ |
1132 |
-+ #undef NEW_MEMBER |
1133 |
-+ |
1134 |
-+ #define NEW_MEMBER(name) \ |
1135 |
-+ static FloatType name(wt const &self, FloatType arg) { \ |
1136 |
-+ return boost::math::name(self, arg); \ |
1137 |
-+ } |
1138 |
-+ |
1139 |
-+ NEW_MEMBER(pdf); |
1140 |
-+ NEW_MEMBER(cdf); |
1141 |
-+ NEW_MEMBER(quantile); |
1142 |
-+ |
1143 |
-+ #undef NEW_MEMBER |
1144 |
-+ |
1145 |
-+ static scitbx::af::shared<FloatType> quantiles(wt const &self, std::size_t n) { |
1146 |
-+ return scitbx::math::quantiles<FloatType>(self, n); |
1147 |
-+ } |
1148 |
-+ |
1149 |
- static void |
1150 |
- wrap() |
1151 |
- { |
1152 |
- using namespace boost::python; |
1153 |
-- def("mean", (FloatType(*)(wt const&)) boost::math::mean); |
1154 |
-- def("median", (FloatType(*)(wt const&)) boost::math::median); |
1155 |
-- def("mode", (FloatType(*)(wt const&)) boost::math::mode); |
1156 |
-- def("variance", (FloatType(*)(wt const&)) boost::math::variance); |
1157 |
-- def("standard_deviation", |
1158 |
-- (FloatType(*)(wt const&)) boost::math::standard_deviation); |
1159 |
-- def("skewness", (FloatType(*)(wt const&)) boost::math::skewness); |
1160 |
-- def("kurtosis", (FloatType(*)(wt const&)) boost::math::kurtosis); |
1161 |
-- def("pdf", (FloatType(*)(wt const&, FloatType const&)) boost::math::pdf); |
1162 |
-- def("cdf", (FloatType(*)(wt const&, FloatType const&)) boost::math::cdf); |
1163 |
-- def("quantile", (FloatType(*)(wt const&, FloatType const&)) |
1164 |
-- boost::math::quantile); |
1165 |
-- def("quantiles", |
1166 |
--#if BOOST_WORKAROUND(__EDG_VERSION__, BOOST_TESTED_AT(306)) |
1167 |
-- (scitbx::af::shared<FloatType>(*)(wt const&, std::size_t)) quantiles |
1168 |
--#else |
1169 |
-- quantiles<FloatType, wt> |
1170 |
--#endif |
1171 |
-- ); |
1172 |
-+ def("mean" , mean); |
1173 |
-+ def("median" , median); |
1174 |
-+ def("mode" , mode); |
1175 |
-+ def("variance" , variance); |
1176 |
-+ def("standard_deviation", standard_deviation); |
1177 |
-+ def("skewness" , skewness); |
1178 |
-+ def("kurtosis" , kurtosis); |
1179 |
-+ def("pdf" , pdf); |
1180 |
-+ def("cdf" , cdf); |
1181 |
-+ def("quantile" , quantile); |
1182 |
-+ def("quantiles" , quantiles); |
1183 |
- } |
1184 |
- }; |
1185 |
- |
1186 |
-diff --git a/cctbx_sources/scitbx/rigid_body/spatial_lib.h b/cctbx_sources/scitbx/rigid_body/spatial_lib.h |
1187 |
-index a084f0f..e377292 100755 |
1188 |
---- a/cctbx_sources/scitbx/rigid_body/spatial_lib.h |
1189 |
-+++ b/cctbx_sources/scitbx/rigid_body/spatial_lib.h |
1190 |
-@@ -2,6 +2,7 @@ |
1191 |
- #define SCITBX_RIGID_BODY_SPATIAL_LIB_H |
1192 |
- |
1193 |
- #include <scitbx/rotr3.h> |
1194 |
-+#include <scitbx/rigid_body/matrix_helpers.h> |
1195 |
- #include <scitbx/array_family/versa_matrix.h> |
1196 |
- |
1197 |
- namespace scitbx { namespace rigid_body { |
1198 |
-diff --git a/cctbx_sources/scitbx/rigid_body/tardy.h b/cctbx_sources/scitbx/rigid_body/tardy.h |
1199 |
-index 104f16b..a8f76cc 100755 |
1200 |
---- a/cctbx_sources/scitbx/rigid_body/tardy.h |
1201 |
-+++ b/cctbx_sources/scitbx/rigid_body/tardy.h |
1202 |
-@@ -346,7 +346,7 @@ namespace tardy { |
1203 |
- unsigned nb = this->bodies_size(); |
1204 |
- af::shared<af::small<ft, 7> > result((af::reserve(nb))); |
1205 |
- af::shared<af::small<ft, 6> > |
1206 |
-- tau_array = f_ext_as_tau(f_ext_array().const_ref()); |
1207 |
-+ tau_array = this->f_ext_as_tau(f_ext_array().const_ref()); |
1208 |
- for(unsigned ib=0;ib<nb;ib++) { |
1209 |
- result.push_back( |
1210 |
- this->bodies[ib]->joint->tau_as_d_e_pot_d_q(tau_array[ib])); |
1211 |
-@@ -379,7 +379,7 @@ namespace tardy { |
1212 |
- qdd_array() |
1213 |
- { |
1214 |
- if (!qdd_array_) { |
1215 |
-- qdd_array_ = forward_dynamics_ab( |
1216 |
-+ qdd_array_ = this->forward_dynamics_ab( |
1217 |
- /*tau_array*/ af::const_ref<af::small<ft, 6> >(0, 0), |
1218 |
- f_ext_array().const_ref(), |
1219 |
- /*grav_accn*/ af::const_ref<ft>(0, 0)); |
1220 |
-diff --git a/cctbx_sources/smtbx/refinement/boost_python/weighting_schemes.cpp b/cctbx_sources/smtbx/refinement/boost_python/weighting_schemes.cpp |
1221 |
-index ce0c27b..904e8d7 100644 |
1222 |
---- a/cctbx_sources/smtbx/refinement/boost_python/weighting_schemes.cpp |
1223 |
-+++ b/cctbx_sources/smtbx/refinement/boost_python/weighting_schemes.cpp |
1224 |
-@@ -25,9 +25,9 @@ namespace smtbx { namespace refinement { namespace least_squares { |
1225 |
- : base_t(name, boost::python::no_init) |
1226 |
- { |
1227 |
- using namespace boost::python; |
1228 |
-- def("__call__", &wt::operator(), |
1229 |
-+ this->def("__call__", &wt::operator(), |
1230 |
- (arg("fo_sq"), arg("sigma"), arg("fc_sq"))); |
1231 |
-- def("__call__", weights, |
1232 |
-+ this->def("__call__", weights, |
1233 |
- (arg("fo_sq"), arg("sigmas"), arg("fc_sq"))); |
1234 |
- } |
1235 |
- }; |
1236 |
-diff --git a/cctbx_sources/smtbx/structure_factors/direct/standard_xray.h b/cctbx_sources/smtbx/structure_factors/direct/standard_xray.h |
1237 |
-index 5e2df76..911bfde 100644 |
1238 |
---- a/cctbx_sources/smtbx/structure_factors/direct/standard_xray.h |
1239 |
-+++ b/cctbx_sources/smtbx/structure_factors/direct/standard_xray.h |
1240 |
-@@ -161,7 +161,7 @@ namespace smtbx { namespace structure_factors { namespace direct { |
1241 |
- for (int k=0; k < hr_ht.groups.size(); ++k) { |
1242 |
- hr_ht_group<float_type> const &g = hr_ht.groups[k]; |
1243 |
- float_type hrx = g.hr * scatterer.site; |
1244 |
-- complex_type f = exp_i_2pi(hrx + g.ht); |
1245 |
-+ complex_type f = this->exp_i_2pi(hrx + g.ht); |
1246 |
- if (scatterer.flags.use_u_aniso()) { |
1247 |
- float_type dw = debye_waller_factor_u_star(g.hr, scatterer.u_star); |
1248 |
- f *= dw; |
1249 |
-@@ -336,7 +336,7 @@ namespace smtbx { namespace structure_factors { namespace direct { |
1250 |
- for (int k=0; k < hr_ht.groups.size(); ++k) { |
1251 |
- hr_ht_group<float_type> const &g = hr_ht.groups[k]; |
1252 |
- float_type hrx = g.hr * scatterer.site; |
1253 |
-- complex_type f = exp_i_2pi(hrx + g.ht); |
1254 |
-+ complex_type f = this->exp_i_2pi(hrx + g.ht); |
1255 |
- float_type fa = f.real(), fb = f.imag(); |
1256 |
- if (scatterer.flags.use_u_aniso()) { |
1257 |
- float_type dw = debye_waller_factor_u_star(g.hr, scatterer.u_star); |
1258 |
|
1259 |
diff --git a/sci-libs/cctbx/files/2010.03.29.2334-soname.patch b/sci-libs/cctbx/files/2010.03.29.2334-soname.patch |
1260 |
deleted file mode 100644 |
1261 |
index 2c0efcabeb1..00000000000 |
1262 |
--- a/sci-libs/cctbx/files/2010.03.29.2334-soname.patch |
1263 |
+++ /dev/null |
1264 |
@@ -1,123 +0,0 @@ |
1265 |
-diff --git a/cctbx_sources/ccp4io_adaptbx/SConscript b/cctbx_sources/ccp4io_adaptbx/SConscript |
1266 |
-index 4ff2232..2ee3991 100644 |
1267 |
---- a/cctbx_sources/ccp4io_adaptbx/SConscript |
1268 |
-+++ b/cctbx_sources/ccp4io_adaptbx/SConscript |
1269 |
-@@ -40,6 +40,7 @@ def replace_printf(file_name): |
1270 |
- |
1271 |
- env = env_base.Clone( |
1272 |
- SHLINKFLAGS=env_etc.shlinkflags) |
1273 |
-+env.Append(SHLINKFLAGS=["-Wl,-soname,libccp4io.so.0.0"]) |
1274 |
- env.Append(CCFLAGS=env_etc.ccp4io_defines) |
1275 |
- env.Append(SHCCFLAGS=env_etc.ccp4io_defines) |
1276 |
- env_etc.include_registry.append( |
1277 |
-diff --git a/cctbx_sources/cctbx/SConscript b/cctbx_sources/cctbx/SConscript |
1278 |
-index 6ec7c93..7f2e788 100644 |
1279 |
---- a/cctbx_sources/cctbx/SConscript |
1280 |
-+++ b/cctbx_sources/cctbx/SConscript |
1281 |
-@@ -15,6 +15,7 @@ env_etc.cctbx_common_includes = [ |
1282 |
- |
1283 |
- env = env_base.Clone( |
1284 |
- SHLINKFLAGS=env_etc.shlinkflags) |
1285 |
-+env.Append(SHLINKFLAGS=["-Wl,-soname,libcctbx.so.0.0"]) |
1286 |
- env_etc.include_registry.append( |
1287 |
- env=env, |
1288 |
- paths=env_etc.cctbx_common_includes) |
1289 |
-diff --git a/cctbx_sources/iotbx/mtz/SConscript b/cctbx_sources/iotbx/mtz/SConscript |
1290 |
-index c0a4bb0..d3c1e45 100644 |
1291 |
---- a/cctbx_sources/iotbx/mtz/SConscript |
1292 |
-+++ b/cctbx_sources/iotbx/mtz/SConscript |
1293 |
-@@ -6,6 +6,7 @@ ccp4io_lib = getattr(env_etc, "ccp4io_lib", "cmtz") |
1294 |
- env.Prepend(LIBS=["cctbx", ccp4io_lib]+env_etc.libm) |
1295 |
- env.Append(CXXFLAGS=env_etc.ccp4io_defines) |
1296 |
- env.Append(SHCXXFLAGS=env_etc.ccp4io_defines) |
1297 |
-+env.Append(SHLINKFLAGS=["-Wl,-soname,libiotbx_mtz.so.0.0"]) |
1298 |
- env_etc.enable_more_warnings(env=env) |
1299 |
- if (env_etc.static_libraries): builder = env.StaticLibrary |
1300 |
- else: builder = env.SharedLibrary |
1301 |
-diff --git a/cctbx_sources/iotbx/pdb/SConscript b/cctbx_sources/iotbx/pdb/SConscript |
1302 |
-index c1415c8..9e1af8d 100644 |
1303 |
---- a/cctbx_sources/iotbx/pdb/SConscript |
1304 |
-+++ b/cctbx_sources/iotbx/pdb/SConscript |
1305 |
-@@ -2,6 +2,7 @@ Import("env_base", "env_etc") |
1306 |
- |
1307 |
- env = env_base.Clone( |
1308 |
- SHLINKFLAGS=env_etc.shlinkflags) |
1309 |
-+env.Append(SHLINKFLAGS=["-Wl,-soname,libiotbx_pdb.so.0.0"]) |
1310 |
- env_etc.enable_more_warnings(env=env) |
1311 |
- env_etc.include_registry.append( |
1312 |
- env=env, |
1313 |
-diff --git a/cctbx_sources/mmtbx/masks/SConscript b/cctbx_sources/mmtbx/masks/SConscript |
1314 |
-index e70ab3c..cf2f530 100755 |
1315 |
---- a/cctbx_sources/mmtbx/masks/SConscript |
1316 |
-+++ b/cctbx_sources/mmtbx/masks/SConscript |
1317 |
-@@ -17,7 +17,9 @@ builder( |
1318 |
- target="#lib/mmtbx_masks", |
1319 |
- source=lib_sources) |
1320 |
- |
1321 |
--env = env.Clone() |
1322 |
-+env = env.Clone( |
1323 |
-+ SHLINKFLAGS=env_etc.shlinkflags) |
1324 |
-+env.Append(SHLINKFLAGS=["-Wl,-soname,libmmtbx_masks.so.0.0"]) |
1325 |
- env.Prepend(LIBS=["mmtbx_masks", "iotbx_pdb", "cctbx_sgtbx_asu"]) |
1326 |
- env.Program( target = "tst_mask", source="tst_mask.cpp") |
1327 |
- |
1328 |
-diff --git a/cctbx_sources/omptbx/SConscript b/cctbx_sources/omptbx/SConscript |
1329 |
-index 43aac91..ce4b4f3 100644 |
1330 |
---- a/cctbx_sources/omptbx/SConscript |
1331 |
-+++ b/cctbx_sources/omptbx/SConscript |
1332 |
-@@ -7,6 +7,7 @@ env_etc.omptbx_include = os.path.dirname(env_etc.omptbx_dist) |
1333 |
- |
1334 |
- env = env_base.Clone( |
1335 |
- SHLINKFLAGS=env_etc.shlinkflags) |
1336 |
-+env.Append(SHLINKFLAGS=["-Wl,-soname,libomptbx.so.0.0"]) |
1337 |
- env_etc.include_registry.append( |
1338 |
- env=env, |
1339 |
- paths=[env_etc.omptbx_include]) |
1340 |
-diff --git a/cctbx_sources/rstbx/SConscript b/cctbx_sources/rstbx/SConscript |
1341 |
-index 2213c2f..cae7542 100644 |
1342 |
---- a/cctbx_sources/rstbx/SConscript |
1343 |
-+++ b/cctbx_sources/rstbx/SConscript |
1344 |
-@@ -15,6 +15,7 @@ env_etc.rstbx_common_includes = [ |
1345 |
- ] |
1346 |
- |
1347 |
- env = env_base.Clone(SHLINKFLAGS=env_etc.shlinkflags) |
1348 |
-+env.Append(SHLINKFLAGS=["-Wl,-soname,librstbx.so.0.0"]) |
1349 |
- env.Append(LIBS=["cctbx"] + env_etc.libm) |
1350 |
- env_etc.include_registry.append( |
1351 |
- env=env, |
1352 |
-diff --git a/cctbx_sources/scitbx/boost_python/SConscript b/cctbx_sources/scitbx/boost_python/SConscript |
1353 |
-index 6f221d0..c4698d8 100644 |
1354 |
---- a/cctbx_sources/scitbx/boost_python/SConscript |
1355 |
-+++ b/cctbx_sources/scitbx/boost_python/SConscript |
1356 |
-@@ -4,6 +4,7 @@ Import("env_scitbx_boost_python_ext") |
1357 |
- env = env_base.Clone( |
1358 |
- SHLINKFLAGS=env_etc.shlinkflags) |
1359 |
- env_etc.enable_more_warnings(env=env) |
1360 |
-+env.Append(SHLINKFLAGS=["-Wl,-soname,libscitbx_boost_python.so.0.0"]) |
1361 |
- env.Append(CXXFLAGS=env_etc.cxxflags_bpl_defines_base) |
1362 |
- env.Append(SHCXXFLAGS=env_etc.cxxflags_bpl_defines_base) |
1363 |
- env.Append(LIBS=["boost_python"]) |
1364 |
-diff --git a/cctbx_sources/scitbx/minpack/SConscript b/cctbx_sources/scitbx/minpack/SConscript |
1365 |
-index 7c325cb..cc23a04 100644 |
1366 |
---- a/cctbx_sources/scitbx/minpack/SConscript |
1367 |
-+++ b/cctbx_sources/scitbx/minpack/SConscript |
1368 |
-@@ -3,6 +3,7 @@ Import("env_base", "env_etc") |
1369 |
- env = env_base.Clone( |
1370 |
- SHLINKFLAGS=env_etc.shlinkflags) |
1371 |
- env_etc.enable_more_warnings(env=env) |
1372 |
-+env.Append(SHLINKFLAGS=["-Wl,-soname,libscitbx_minipack.so.0.0"]) |
1373 |
- env_etc.include_registry.append( |
1374 |
- env=env, |
1375 |
- paths=env_etc.scitbx_common_includes) |
1376 |
-diff --git a/cctbx_sources/scitbx/slatec/SConscript b/cctbx_sources/scitbx/slatec/SConscript |
1377 |
-index ca9b6da..9c79d47 100644 |
1378 |
---- a/cctbx_sources/scitbx/slatec/SConscript |
1379 |
-+++ b/cctbx_sources/scitbx/slatec/SConscript |
1380 |
-@@ -3,6 +3,7 @@ Import("env_base", "env_etc") |
1381 |
- env = env_base.Clone( |
1382 |
- SHLINKFLAGS=env_etc.shlinkflags) |
1383 |
- env_etc.enable_more_warnings(env=env) |
1384 |
-+env.Append(SHLINKFLAGS=["-Wl,-soname,libscitbx_slatec.so.0.0"]) |
1385 |
- env.Append(LIBS=env_etc.libm) |
1386 |
- if (env_etc.static_libraries): builder = env.StaticLibrary |
1387 |
- else: builder = env.SharedLibrary |
1388 |
|
1389 |
diff --git a/sci-libs/cctbx/files/2010.03.29.2334-tst_server.py.patch b/sci-libs/cctbx/files/2010.03.29.2334-tst_server.py.patch |
1390 |
deleted file mode 100644 |
1391 |
index f6509260d31..00000000000 |
1392 |
--- a/sci-libs/cctbx/files/2010.03.29.2334-tst_server.py.patch |
1393 |
+++ /dev/null |
1394 |
@@ -1,15 +0,0 @@ |
1395 |
-diff --git a/mmtbx/monomer_library/tst_server.py b/mmtbx/monomer_library/tst_server.py |
1396 |
-index 519d203..91ba783 100644 |
1397 |
---- cctbx_sources/mmtbx/monomer_library/tst_server.py |
1398 |
-+++ cctbx_sources/mmtbx/monomer_library/tst_server.py |
1399 |
-@@ -86,8 +86,8 @@ def exercise(): |
1400 |
- for base_code in ["A", "C", "G"]: |
1401 |
- rna_atoms = srv.get_comp_comp_id_direct(base_code+"r").atom_dict() |
1402 |
- dna_atoms = srv.get_comp_comp_id_direct(base_code+"d").atom_dict() |
1403 |
-- for as,bs,c in [(rna_atoms,dna_atoms,"d"), (dna_atoms,rna_atoms,"r")]: |
1404 |
-- for a in as.keys(): |
1405 |
-+ for as_,bs,c in [(rna_atoms,dna_atoms,"d"), (dna_atoms,rna_atoms,"r")]: |
1406 |
-+ for a in as_.keys(): |
1407 |
- b = bs.get(a, None) |
1408 |
- if (b is None): |
1409 |
- print "Not in %s: %s" % (base_code+c, a) |
1410 |
|
1411 |
diff --git a/sci-libs/cctbx/metadata.xml b/sci-libs/cctbx/metadata.xml |
1412 |
deleted file mode 100644 |
1413 |
index d9a96052956..00000000000 |
1414 |
--- a/sci-libs/cctbx/metadata.xml |
1415 |
+++ /dev/null |
1416 |
@@ -1,20 +0,0 @@ |
1417 |
-<?xml version="1.0" encoding="UTF-8"?> |
1418 |
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
1419 |
-<pkgmetadata> |
1420 |
- <maintainer type="project"> |
1421 |
- <email>sci-chemistry@g.o</email> |
1422 |
- <name>Gentoo Chemistry Project</name> |
1423 |
- </maintainer> |
1424 |
- <longdescription> |
1425 |
- The Computational Crystallography Toolbox (cctbx) is being developed |
1426 |
- as the open source component of the PHENIX system. The goal of |
1427 |
- the PHENIX project is to advance automation of macromolecular structure |
1428 |
- determination. PHENIX depends on the cctbx, but not vice versa. This |
1429 |
- hierarchical approach enforces a clean design as a reusable library. |
1430 |
- The cctbx is therefore also useful for small-molecule crystallography |
1431 |
- and even general scientific applications. |
1432 |
- </longdescription> |
1433 |
- <upstream> |
1434 |
- <remote-id type="sourceforge">cctbx</remote-id> |
1435 |
- </upstream> |
1436 |
-</pkgmetadata> |