Gentoo Archives: gentoo-commits

From: "Justin Lecher (jlec)" <jlec@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in sci-libs/ccp4-libs: ChangeLog ccp4-libs-6.1.3-r13.ebuild
Date: Fri, 24 May 2013 16:45:38
Message-Id: 20130524164531.22DAD2171D@flycatcher.gentoo.org
1 jlec 13/05/24 16:45:31
2
3 Modified: ChangeLog
4 Added: ccp4-libs-6.1.3-r13.ebuild
5 Log:
6 sci-libs/ccp4-libs: Drop CLIB and CLIBS from env, #414913
7
8 (Portage version: 2.2.0_alpha177/cvs/Linux x86_64, signed Manifest commit with key 8009D6F070EB7916)
9
10 Revision Changes Path
11 1.56 sci-libs/ccp4-libs/ChangeLog
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/ccp4-libs/ChangeLog?rev=1.56&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/ccp4-libs/ChangeLog?rev=1.56&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/ccp4-libs/ChangeLog?r1=1.55&r2=1.56
16
17 Index: ChangeLog
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/sci-libs/ccp4-libs/ChangeLog,v
20 retrieving revision 1.55
21 retrieving revision 1.56
22 diff -u -r1.55 -r1.56
23 --- ChangeLog 3 May 2013 16:19:50 -0000 1.55
24 +++ ChangeLog 24 May 2013 16:45:30 -0000 1.56
25 @@ -1,6 +1,11 @@
26 # ChangeLog for sci-libs/ccp4-libs
27 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
28 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/ccp4-libs/ChangeLog,v 1.55 2013/05/03 16:19:50 jlec Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/sci-libs/ccp4-libs/ChangeLog,v 1.56 2013/05/24 16:45:30 jlec Exp $
30 +
31 +*ccp4-libs-6.1.3-r13 (24 May 2013)
32 +
33 + 24 May 2013; Justin Lecher <jlec@g.o> +ccp4-libs-6.1.3-r13.ebuild:
34 + Drop CLIB and CLIBS from env, #414913
35
36 *ccp4-libs-6.1.3-r12 (03 May 2013)
37
38
39
40
41 1.1 sci-libs/ccp4-libs/ccp4-libs-6.1.3-r13.ebuild
42
43 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/ccp4-libs/ccp4-libs-6.1.3-r13.ebuild?rev=1.1&view=markup
44 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/ccp4-libs/ccp4-libs-6.1.3-r13.ebuild?rev=1.1&content-type=text/plain
45
46 Index: ccp4-libs-6.1.3-r13.ebuild
47 ===================================================================
48 # Copyright 1999-2013 Gentoo Foundation
49 # Distributed under the terms of the GNU General Public License v2
50 # $Header: /var/cvsroot/gentoo-x86/sci-libs/ccp4-libs/ccp4-libs-6.1.3-r13.ebuild,v 1.1 2013/05/24 16:45:31 jlec Exp $
51
52 EAPI=5
53
54 PYTHON_COMPAT=( python{2_6,2_7} )
55
56 inherit autotools eutils fortran-2 gnuconfig multilib python-single-r1 toolchain-funcs
57
58 SRC="ftp://ftp.ccp4.ac.uk/ccp4"
59
60 #UPDATE="04_03_09"
61 #PATCHDATE="090511"
62
63 MY_P="${P/-libs}"
64
65 PATCH_TOT="0"
66
67 DESCRIPTION="Protein X-ray crystallography toolkit - Libraries"
68 HOMEPAGE="http://www.ccp4.ac.uk/"
69 SRC_URI="${SRC}/${PV}/${MY_P}-core-src.tar.gz"
70 # patch tarball from upstream
71 [[ -n ${UPDATE} ]] && SRC_URI="${SRC_URI} ${SRC}/${PV}/updates/${P}-src-patch-${UPDATE}.tar.gz"
72 # patches created by us
73 [[ -n ${PATCHDATE} ]] && SRC_URI="${SRC_URI} http://dev.gentooexperimental.org/~jlec/science-dist/${PV}-${PATCHDATE}-updates.patch.bz2"
74
75 for i in $(seq $PATCH_TOT); do
76 NAME="PATCH${i}[1]"
77 SRC_URI="${SRC_URI}
78 ${SRC}/${PV}/patches/${!NAME}"
79 done
80
81 LICENSE="ccp4"
82 SLOT="0"
83 KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
84 IUSE=""
85
86 RDEPEND="
87 !<sci-chemistry/ccp4-6.1.3
88 !<sci-chemistry/ccp4-apps-${PV}-r10
89 app-shells/tcsh
90 dev-lang/tcl
91 >=sci-libs/cbflib-0.9.2.2
92 sci-libs/fftw:2.1
93 sci-libs/mmdb
94 sci-libs/monomer-db
95 sci-libs/ssm
96 virtual/jpeg
97 virtual/lapack
98 virtual/blas"
99 DEPEND="${RDEPEND}
100 virtual/pkgconfig"
101
102 S="${WORKDIR}/${MY_P}"
103
104 MAKEOPTS+=" -j1"
105
106 pkg_setup() {
107 fortran-2_pkg_setup
108 python-single-r1_pkg_setup
109 }
110
111 src_prepare() {
112 tc-export PKG_CONFIG RANLIB AR
113
114 sed \
115 -e "/^AR/s:ar:$(tc-getAR):g" \
116 -i lib/src/Makefile.in src/Makefile.in src/ccp4mapwish_/Makefile.in lib/ccif/Makefile.in || die
117
118 einfo "Applying upstream patches ..."
119 for patch in $(seq $PATCH_TOT); do
120 base="PATCH${patch}"
121 dir=$(eval echo \${${base}[0]})
122 p=$(eval echo \${${base}[1]})
123 pushd "${dir}" >& /dev/null
124 ccp_patch "${DISTDIR}/${p}"
125 popd >& /dev/null
126 done
127 einfo "Done."
128 echo
129
130 [[ -n ${PATCHDATE} ]] && epatch "${WORKDIR}"/${PV}-${PATCHDATE}-updates.patch
131
132 einfo "Applying Gentoo patches ..."
133 # fix buffer overflows wrt bug 339706
134 ccp_patch "${FILESDIR}"/${PV}-overflows.patch
135
136 # it tries to create libdir, bindir etc on live system in configure
137 ccp_patch "${FILESDIR}"/${PV}-dont-make-dirs-in-configure.patch
138
139 # gerror_ gets defined twice on ppc if you're using gfortran/g95
140 ccp_patch "${FILESDIR}"/6.0.2-ppc-double-define-gerror.patch
141
142 # make creation of libccif.so smooth
143 ccp_patch "${FILESDIR}"/${PV}-ccif-shared.patch
144
145 # lets try to build libmmdb seperatly
146 ccp_patch "${FILESDIR}"/${PV}-dont-build-mmdb.patch
147
148 # unbundle libjpeg and cbflib
149 ccp_patch "${FILESDIR}"/${PV}-unbundle-libs-ng2.patch
150
151 # Fix missing DESTIDR
152 # not installing during build
153 ccp_patch "${FILESDIR}"/${PV}-noinstall.patch
154 sed \
155 -e '/SHARE_INST/s:$(libdir):$(DESTDIR)/$(libdir):g' \
156 -i configure || die
157
158 # Fix upstreams code
159 ccp_patch "${FILESDIR}"/${PV}-impl-dec.patch
160
161 # use pkg-config to detect BLAS/LAPACK
162 ccp_patch "${FILESDIR}"/${PV}-lapack.patch
163
164 # proto type changing in version 0.9.2.2
165 ccp_patch "${FILESDIR}"/${PV}-cbf.patch
166
167 # proto type changing in version 0.9.2.2
168 ccp_patch "${FILESDIR}"/${PV}-no-pypath.patch
169
170 einfo "Done." # done applying Gentoo patches
171 echo
172
173 # not needed, we have it extra
174 rm -rf src/rapper/{libxml2,gc7.0} || die
175
176 sed \
177 -e "s:/usr:${EPREFIX}/usr:g" \
178 -e 's:-Wl,-rpath,$CLIB::g' \
179 -e 's: -rpath $CLIB::g' \
180 -e 's: -I${srcdir}/include/cpp_c_headers::g' \
181 -e 's:sleep 1:sleep .2:g' \
182 -i configure || die
183
184 gnuconfig_update
185
186 for i in lib/DiffractionImage src/rapper src/pisa; do
187 pushd ${i} > /dev/null
188 sed 's:-g::g' -i configure* || die
189 eautoreconf
190 popd > /dev/null
191 done
192
193 ## unbundle libssm
194 sed -e '/libdir/s:ssm::g' -i Makefile.in || die
195 find ./lib/src/mmdb ./lib/ssm ./lib/clipper ./lib/fftw lib/lapack -delete || die
196 }
197
198 src_configure() {
199 rm -rf lib/DiffractionImage/{jpg,CBFlib} || die
200
201 # Build system is broken if we set LDFLAGS
202 userldflags="${LDFLAGS}"
203 export SHARED_LIB_FLAGS="${LDFLAGS}"
204 unset LDFLAGS
205
206 # GENTOO_OSNAME can be one of:
207 # irix irix64 sunos sunos64 aix hpux osf1 linux freebsd
208 # linux_compaq_compilers linux_intel_compilers generic Darwin
209 # ia64_linux_intel Darwin_ibm_compilers linux_ibm_compilers
210 if [[ "$(tc-getFC)" = "ifort" ]]; then
211 if use ia64; then
212 GENTOO_OSNAME="ia64_linux_intel"
213 else
214 # Should be valid for x86, maybe amd64
215 GENTOO_OSNAME="linux_intel_compilers"
216 fi
217 else
218 # Should be valid for x86 and amd64, at least
219 GENTOO_OSNAME="linux"
220 fi
221
222 # Sets up env
223 ln -s \
224 ccp4.setup-bash \
225 "${S}"/include/ccp4.setup || die
226
227 # We agree to the license by emerging this, set in LICENSE
228 sed -i \
229 -e "s~^\(^agreed=\).*~\1yes~g" \
230 "${S}"/configure || die
231
232 # Fix up variables -- need to reset CCP4_MASTER at install-time
233 sed -i \
234 -e "s~^\(setenv CCP4_MASTER.*\)/.*~\1${WORKDIR}~g" \
235 -e "s~^\(export CCP4_MASTER.*\)/.*~\1${WORKDIR}~g" \
236 -e "s~^\(.*export CBIN=.*\)\$CCP4.*~\1\$CCP4/libexec/ccp4/bin/~g" \
237 -e "s~^\(.*setenv CBIN .*\)\$CCP4.*~\1\$CCP4/libexec/ccp4/bin/~g" \
238 -e "s~^\(setenv CCP4I_TCLTK.*\)/usr/local/bin~\1${EPREFIX}/usr/bin~g" \
239 "${S}"/include/ccp4.setup* || die
240
241 # Set up variables for build
242 source "${S}"/include/ccp4.setup-sh
243
244 export CC=$(tc-getCC)
245 export CXX=$(tc-getCXX)
246 export COPTIM=${CFLAGS}
247 export CXXOPTIM=${CXXFLAGS}
248 # Default to -O2 if FFLAGS is unset
249 export FC=$(tc-getFC)
250 export FOPTIM=${FFLAGS:- -O2}
251
252 export SHARE_LIB="\
253 $(tc-getCC) ${userldflags} -shared -Wl,-soname,libccp4c.so -o libccp4c.so \${CORELIBOBJS} \${CGENERALOBJS} \${CUCOBJS} \${CMTZOBJS} \${CMAPOBJS} \${CSYMOBJS} -L../ccif/ -lccif $(gcc-config -L | awk -F: '{for(i=1; i<=NF; i++) printf " -L%s", $i}') -lm && \
254 $(tc-getFC) ${userldflags} -shared -Wl,-soname,libccp4f.so -o libccp4f.so \${FORTRANLOBJS} \${FINTERFACEOBJS} -L../ccif/ -lccif -L. -lccp4c $($(tc-getPKG_CONFIG) --libs mmdb) $(gcc-config -L | awk -F: '{for(i=1; i<=NF; i++) printf " -L%s", $i}') -lstdc++ -lgfortran -lm"
255
256 # Can't use econf, configure rejects unknown options like --prefix
257 ./configure \
258 --onlylibs \
259 --with-shared-libs \
260 --with-fftw="${EPREFIX}/usr" \
261 --with-warnings \
262 --disable-cctbx \
263 --disable-clipper \
264 --disable-ssm \
265 --tmpdir="${TMPDIR}" \
266 --bindir="${EPREFIX}/usr/libexec/ccp4/bin/" \
267 --libdir="${EPREFIX}/usr/$(get_libdir)" \
268 ${GENTOO_OSNAME} || die "configure failed"
269 }
270
271 src_compile() {
272 emake DESTDIR="${D}" onlylib
273 }
274
275 src_install() {
276 # Set up variables for build
277 source "${S}"/include/ccp4.setup-sh
278
279 emake \
280 DESTDIR="${D}" \
281 includedir="${EPREFIX}/usr/include" \
282 library_includedir="${EPREFIX}/usr/include" \
283 install
284
285 sed \
286 -e "330,1000d" \
287 -i "${S}"/include/ccp4.setup-sh || die
288
289 sed \
290 -e "378,1000d" \
291 -i "${S}"/include/ccp4.setup-csh || die
292
293 sed \
294 -e "s:-${PV/-r*/}::g" \
295 -e "s:^\(.*export CCP4_MASTER=\).*:\1${EPREFIX}/usr:g" \
296 -e "s:^\(.*setenv CCP4_MASTER\).*:\1 ${EPREFIX}/usr:g" \
297 -e "s:^\(.*export CCP4=\).*CCP4_MASTER.*:\1${EPREFIX}/usr:g" \
298 -e "s:^\(.*setenv CCP4\).*CCP4_MASTER.*:\1 ${EPREFIX}/usr:g" \
299 -e "s:^\(.*export CCP4_SCR=\).*:\1${EPREFIX}/tmp:g" \
300 -e "s:^\(.*setenv CCP4_SCR \).*:\1${EPREFIX}/tmp:g" \
301 -e "s:^\(.*export BINSORT_SCR=\).*:\1${EPREFIX}/tmp:g" \
302 -e "s:^\(.*setenv BINSORT_SCR \).*:\1${EPREFIX}/tmp:g" \
303 -e "s:^\(.*export CCP4I_TOP=\).*:\1${EPREFIX}/usr/$(get_libdir)/ccp4/ccp4i:g" \
304 -e "s:^\(.*setenv CCP4I_TOP \).*:\1${EPREFIX}/usr/$(get_libdir)/ccp4/ccp4i:g" \
305 -e "s:^\(.*export CCP4I_TCLTK=\).*:\1${EPREFIX}/usr/bin:g" \
306 -e "s:^\(.*setenv CCP4I_TCLTK \).*:\1${EPREFIX}/usr/bin:g" \
307 -e "s:^\(.*export CCP4I_HELP=\).*:\1${EPREFIX}/usr/$(get_libdir)/ccp4/ccp4i/help:g" \
308 -e "s:^\(.*setenv CCP4I_HELP \).*:\1${EPREFIX}/usr/$(get_libdir)/ccp4/ccp4i/help:g" \
309 -e "s:^\(.*export CBIN=\).*:\1${EPREFIX}/usr/libexec/ccp4/bin:g" \
310 -e "s:^\(.*setenv CBIN \).*:\1${EPREFIX}/usr/libexec/ccp4/bin:g" \
311 -e "s:^\(.*export CCP4_BIN=\).*:\1${EPREFIX}/usr/libexec/ccp4/bin:g" \
312 -e "s:^\(.*setenv CCP4_BIN \).*:\1${EPREFIX}/usr/libexec/ccp4/bin:g" \
313 -e "s:^\(.*export CLIBD_MON=\).*:\1${EPREFIX}/usr/share/ccp4/data/monomers/:g" \
314 -e "s:^\(.*setenv CLIBD_MON \).*:\1${EPREFIX}/usr/share/ccp4/data/monomers/:g" \
315 -e "s:^\(.*export CLIBD=\).*:\1${EPREFIX}/usr/share/ccp4/data:g" \
316 -e "s:^\(.*setenv CLIBD \).*:\1${EPREFIX}/usr/share/ccp4/data:g" \
317 -e "s:^\(.*export CCP4_LIB=\).*:\1${EPREFIX}/usr/$(get_libdir):g" \
318 -e "s:^\(.*setenv CCP4_LIB \).*:\1${EPREFIX}/usr/$(get_libdir):g" \
319 -e "s:^\(.*export CCP4_BROWSER=\).*:\1firefox:g" \
320 -e "s:^\(.*setenv CCP4_BROWSER \).*:\1firefox:g" \
321 -e "s:^\(.*export MANPATH=\).*:\1\${MANPATH}:g" \
322 -e "s:^\(.*setenv MANPATH \).*:\1\${MANPATH}:g" \
323 -e "s:^\(.*export DBCCP4I_TOP=\).*:\1${EPREFIX}/usr/share/ccp4/dbccp4i:g" \
324 -e "s:^\(.*setenv DBCCP4I_TOP \).*:\1${EPREFIX}/usr/share/ccp4/dbccp4i:g" \
325 -e "s:^\(.*export MOLREPLIB=\).*:\1${EPREFIX}/usr/share/ccp4/data/monomers/:g" \
326 -e "s:^\(.*setenv MOLREPLIB \).*:\1${EPREFIX}/usr/share/ccp4/data/monomers/:g" \
327 -e "s:^\(.*export CDOC=\).*:\1${EPREFIX}/usr/share/doc:g" \
328 -e "s:^\(.*setenv CDOC \).*:\1${EPREFIX}/usr/share/doc:g" \
329 -e "s:^\(.*export CEXAM=\).*:\1${EPREFIX}/usr/share/doc/examples:g" \
330 -e "s:^\(.*setenv CEXAM \).*:\1${EPREFIX}/usr/share/doc/examples:g" \
331 -e "s:^\(.*export CINCL=\).*:\1${EPREFIX}/usr/share/ccp4/include:g" \
332 -e "s:^\(.*setenv CINCL \).*:\1${EPREFIX}/usr/share/ccp4/include:g" \
333 -e '/# .*LD_LIBRARY_PATH specifies/,/^$/d' \
334 -e '/CLIB=/d' \
335 -e '/CLIB /d' \
336 -e '/CLIBS=/d' \
337 -e '/CLIBS /d' \
338 -e "/alias/d" \
339 -e "/CCP4_HELPDIR/d" \
340 -e "/IMOSFLM_VERSION/d" \
341 -i "${S}"/include/ccp4.setup* || die
342
343 # Don't check for updates on every sourcing of /etc/profile
344 sed -i \
345 -e "s:\(eval python.*\):#\1:g" \
346 "${S}"/include/ccp4.setup* || die
347
348 # Libs
349 for file in "${S}"/lib/*; do
350 if [[ -d ${file} ]]; then
351 continue
352 elif [[ -x ${file} ]]; then
353 dolib.so ${file}
354 else
355 insinto /usr/$(get_libdir)
356 doins ${file}
357 fi
358 done
359
360 prune_libtool_files
361
362 sed \
363 -e 's:test "LD_LIBRARY_PATH":test "$LD_LIBRARY_PATH":g' \
364 -i "${S}"/include/ccp4.setup-sh || die
365
366 # Setup scripts
367 insinto /etc/profile.d
368 newins "${S}"/include/ccp4.setup-csh 40ccp4.setup.csh
369 newins "${S}"/include/ccp4.setup-sh 40ccp4.setup.sh
370 rm -f "${S}"/include/ccp4.setup*
371
372 # Data
373 insinto /usr/share/ccp4/data/
374 doins -r "${S}"/lib/data/{*.PARM,*.prt,*.lib,*.dic,*.idl,*.cif,*.resource,*.york,*.hist,fraglib,reference_structures}
375
376 # Environment files, setup scripts, etc.
377 rm -rf "${S}"/include/{ccp4.setup*,COPYING,cpp_c_headers} || die
378 insinto /usr/share/ccp4/
379 doins -r "${S}"/include
380
381 dodoc "${S}"/lib/data/*.doc
382 newdoc "${S}"/lib/data/README DATA-README
383 }
384
385 pkg_postinst() {
386 einfo "The Web browser defaults to firefox. Change CCP4_BROWSER"
387 einfo "in ${EPREFIX}/etc/profile.d/40ccp4.setup* to modify this."
388 }
389
390 # Epatch wrapper for bulk patching
391 ccp_patch() {
392 EPATCH_SINGLE_MSG=" ${1##*/} ..." epatch ${1}
393 }