From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1Rvwxl-00009d-D9 for garchives@archives.gentoo.org; Fri, 10 Feb 2012 20:20:57 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6B071E06D6; Fri, 10 Feb 2012 20:20:50 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 23EFDE06D6 for ; Fri, 10 Feb 2012 20:20:50 +0000 (UTC) Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5F2031B4005 for ; Fri, 10 Feb 2012 20:20:49 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 2264) id 369D02004B; Fri, 10 Feb 2012 20:20:48 +0000 (UTC) From: "Justin Lecher (jlec)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, jlec@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in sci-libs/cctbx: ChangeLog cctbx-2010.03.29.2334-r6.ebuild X-VCS-Repository: gentoo-x86 X-VCS-Files: ChangeLog cctbx-2010.03.29.2334-r6.ebuild X-VCS-Directories: sci-libs/cctbx X-VCS-Committer: jlec X-VCS-Committer-Name: Justin Lecher Content-Type: text/plain; charset=utf8 Message-Id: <20120210202048.369D02004B@flycatcher.gentoo.org> Date: Fri, 10 Feb 2012 20:20:48 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: d0fa3b80-165a-4fe9-95e1-d6da9c2c82e7 X-Archives-Hash: 0a884a4b1059de248bda6c1ae3cf6982 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 =20 (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/Cha= ngeLog?rev=3D1.22&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/cctbx/Cha= ngeLog?rev=3D1.22&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/cctbx/Cha= ngeLog?r1=3D1.21&r2=3D1.22 Index: ChangeLog =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D 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 + +cctbx-2010.03.29.2334-r6.ebuild: + Add fixes for boost-1.48 and its PyABI specific libs, #401393 =20 *cctbx-2010.03.29.2334-r5 (04 Dec 2011) =20 1.1 sci-libs/cctbx/cctbx-2010.03.29.2334-r6.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/cctbx/cct= bx-2010.03.29.2334-r6.ebuild?rev=3D1.1&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/cctbx/cct= bx-2010.03.29.2334-r6.ebuild?rev=3D1.1&content-type=3Dtext/plain Index: cctbx-2010.03.29.2334-r6.ebuild =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D # 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-r= 6.ebuild,v 1.1 2012/02/10 20:20:48 jlec Exp $ EAPI=3D"3" PYTHON_DEPEND=3D"2" inherit eutils fortran-2 prefix python toolchain-funcs MY_PV=3D"${PV//./_}" DESCRIPTION=3D"Computational Crystallography Toolbox" HOMEPAGE=3D"http://cctbx.sourceforge.net/" SRC_URI=3D"http://cci.lbl.gov/cctbx_build/results/${MY_PV}/${PN}_bundle.t= ar.gz -> ${P}.tar.gz" LICENSE=3D"cctbx-2.0" SLOT=3D"0" KEYWORDS=3D"~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux" IUSE=3D"+minimal openmp threads" RDEPEND=3D" virtual/fortran >dev-libs/boost-1.48[python] sci-libs/clipper sci-libs/fftw !minimal? ( sci-chemistry/cns sci-chemistry/shelx )" DEPEND=3D"${RDEPEND} >=3Ddev-util/scons-1.2" S=3D"${WORKDIR}" MY_S=3D"${WORKDIR}"/cctbx_sources MY_B=3D"${WORKDIR}"/cctbx_build pkg_setup() { use openmp && FORTRAN_NEED_OPENMP=3D"1" fortran-2_pkg_setup if use openmp && ! tc-has-openmp; then ewarn "You are using gcc and OpenMP is only available with gcc >=3D 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/SCo= nscript || die echo "import os, sys; os.execvp('scons', sys.argv)" > "${MY_S}"/libtbx/c= ommand_line/scons.py } src_configure() { local compiler local myconf myconf=3D"${MY_S}/libtbx/configure.py" compiler=3D$(expr match "$(tc-getCC)" '.*\([a-z]cc\)') myconf=3D"${myconf} --compiler=3D${compiler}" # Additional USE flag usage check_use openmp myconf=3D"${myconf} --enable-openmp-if-possible=3D${USE_openmp}" use threads && USEthreads=3D"--enable-boost-threads" && \ ewarn "If using boost threads openmp support is disabled" myconf=3D"${myconf} ${USE_threads} --scan-boost --use_environment_flags" mkdir "${MY_B}" && myconf=3D"${myconf} --current_working_directory=3D${M= Y_B}" cd "${MY_B}" myconf=3D"${myconf} --build=3Drelease 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=3D${MAKEOPTS/j/j } makeopts_exp=3D${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 "faile= d 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.l= og" \) -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=3D$(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 ch= iltbx clipper_adaptbx crys3d fable fftw3tbx gltbx iotbx libtbx mmtbx ompt= bx rstbx scitbx smtbx spotfinder tntbx } pkg_postrm () { python_mod_cleanup boost_adaptbx cbflib_adaptbx ccp4io_adaptbx cctbx chi= ltbx clipper_adaptbx crys3d fable fftw3tbx gltbx iotbx libtbx mmtbx omptb= x 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 }