summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Lecher <jlec@gentoo.org>2011-01-24 15:53:27 +0000
committerJustin Lecher <jlec@gentoo.org>2011-01-24 15:53:27 +0000
commit4f693706e1d1680286ea171c4e9dbc4a3864eeb5 (patch)
tree5b36dc027d5d7e622f2540aec48e4e8f49dc2462 /sci-libs/cctbx
parentPin gtksourceview dependency to slot 2. Clean up old revisions. (diff)
downloadhistorical-4f693706e1d1680286ea171c4e9dbc4a3864eeb5.tar.gz
historical-4f693706e1d1680286ea171c4e9dbc4a3864eeb5.tar.bz2
historical-4f693706e1d1680286ea171c4e9dbc4a3864eeb5.zip
Removed old
Package-Manager: portage-2.2.0_alpha18/cvs/Linux x86_64
Diffstat (limited to 'sci-libs/cctbx')
-rw-r--r--sci-libs/cctbx/ChangeLog6
-rw-r--r--sci-libs/cctbx/Manifest11
-rw-r--r--sci-libs/cctbx/cctbx-2010.03.29.2334-r1.ebuild201
3 files changed, 10 insertions, 208 deletions
diff --git a/sci-libs/cctbx/ChangeLog b/sci-libs/cctbx/ChangeLog
index de67059154db..87e6cfa408ca 100644
--- a/sci-libs/cctbx/ChangeLog
+++ b/sci-libs/cctbx/ChangeLog
@@ -1,6 +1,10 @@
# 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.15 2011/01/23 12:45:41 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/cctbx/ChangeLog,v 1.16 2011/01/24 15:53:27 jlec Exp $
+
+ 24 Jan 2011; Justin Lecher <jlec@gentoo.org>
+ -cctbx-2010.03.29.2334-r1.ebuild:
+ Removed old
23 Jan 2011; Thomas Kahle <tomka@gentoo.org> cctbx-2010.03.29.2334-r3.ebuild:
x86 stable per bug 351765
diff --git a/sci-libs/cctbx/Manifest b/sci-libs/cctbx/Manifest
index 444cc2e8dc57..2b58aaa08b71 100644
--- a/sci-libs/cctbx/Manifest
+++ b/sci-libs/cctbx/Manifest
@@ -7,14 +7,13 @@ AUX 2010.03.29.2334-flags.patch 3336 RMD160 fdbb0b71499e00c666629e1ff04b5bdcbe37
AUX 2010.03.29.2334-soname.patch 5177 RMD160 c6cad498c4edb7046696428008408b126efa954c SHA1 7c5d78110c4270c9ca113ae5ea77c7c2451e2b21 SHA256 dd4ea6dbf34c1b2d9572adec5a33fe6a73b1a99e8c4364123e69382bb161ce74
AUX 2010.03.29.2334-tst_server.py.patch 774 RMD160 12e1115b2ccc0b6b01b365925bf311d29ef08c7a SHA1 09549cc6103f502777acced13a3ed483d713dfc0 SHA256 df058d16d2dc5beaac9f1a1fbf2e640994c7e881d449eb01ac338dadbfb15ac3
DIST cctbx-2010.03.29.2334.tar.gz 15570372 RMD160 e543578dbe6568f5f8f80b3ce7a20b10e01193bc SHA1 1442dbd5d1ef3b91e718dce039a24fc1637104d3 SHA256 e1fae804caaf8593c7a3f32e4544046f4c00293063d9099721578cc8fbd17213
-EBUILD cctbx-2010.03.29.2334-r1.ebuild 5881 RMD160 deee9422031d740e93c4448d9b192d4a413fccc3 SHA1 3ce9443b9a3756dc090666cd947df0f6bc831b42 SHA256 a879efce871c0d3c1f4771df98e7e0a4835e0e0637605176920dcc50fde8d19c
EBUILD cctbx-2010.03.29.2334-r3.ebuild 5939 RMD160 688044529f86e8324342ed918b3e660f77695d78 SHA1 51fef6efbf8e49f02aa49fa5ae2b45de377afada SHA256 5d20f7149b72b3672b038ced1ee119aaac1a00b30fad7a09a8d66987a7e27e1e
-MISC ChangeLog 3127 RMD160 aaf72ec3d1b1d2d7ac90c4177d9c2ed53f013cb9 SHA1 5073cefe114f2349fa4dd97be57dc9f7f8e76086 SHA256 30ff7dfa4f920e185d34e472abbff4fe77d6b5e1d20e97487ab3def484d79464
+MISC ChangeLog 3224 RMD160 4aaf3695bc6cccb6672b4375973cd609c611661c SHA1 301b8c09438845d404889ef78d552d122bc6ad06 SHA256 3425d37287977db5c55231c1247cb5e7c65f2ad52ea67b6baf819c417ef255d7
MISC metadata.xml 767 RMD160 c2fc3bcc534e407e6066ee98beb6878d78a0f6e9 SHA1 a653677e160cf0726e1747b06b5d0cd95e51ac5f SHA256 ef36fc1a1d5d657ba67f88b303f08eef5a1a814d22a2091c07616dc16928e3fa
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.16 (GNU/Linux)
-iEYEARECAAYFAk08JFcACgkQnZsgo/h8kNZ7dQCgirLG0dRONkhNtsRjOC7X47A6
-sVkAnA83EcOtnL9Bx7ucMnLPspqVGrTZ
-=RE47
+iEYEARECAAYFAk09oIEACgkQgAnW8HDreRbhWwCfUEOU33zKbbSLriFvh+35tqY0
+UgQAn2eO18aJBk31cNYOKYpsP6AHKc6g
+=GbzC
-----END PGP SIGNATURE-----
diff --git a/sci-libs/cctbx/cctbx-2010.03.29.2334-r1.ebuild b/sci-libs/cctbx/cctbx-2010.03.29.2334-r1.ebuild
deleted file mode 100644
index 04a1236e87b7..000000000000
--- a/sci-libs/cctbx/cctbx-2010.03.29.2334-r1.ebuild
+++ /dev/null
@@ -1,201 +0,0 @@
-# Copyright 1999-2010 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-r1.ebuild,v 1.3 2010/12/29 15:16:29 jlec Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2"
-
-inherit eutils 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 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+minimal openmp threads"
-
-RDEPEND="
- >dev-libs/boost-1.39
- 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() {
- 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
-
- rm -rf "${MY_S}/scons"
-
- mkdir -p "${MY_S}"/scons/src/ "${MY_S}/boost"
-
- ln -sf "${EPREFIX}"/usr/$(get_libdir)/scons-* "${MY_S}"/scons/src/engine || die
-
- # Get CXXFLAGS in format suitable for substitition into SConscript
- for i in ${CXXFLAGS}; do
- opts="${opts} \"${i}\","
- done
-
- # Strip off the last comma
- opts=${opts%,}
-
- # Fix CXXFLAGS
- sed -i \
- -e "s:\"-O3\", \"-ffast-math\":${opts}:g" \
- ${MY_S}/libtbx/SConscript
-
- # Get LDFLAGS in format suitable for substitition into SConscript
- for i in ${LDFLAGS}; do
- optsld="${optsld} \"${i}\","
- done
-
- optsld=${optsld%,}
-
- # Fix LDFLAGS which should be as-needed ready
- sed -i \
- -e "s:\"-shared\":\"-shared\", ${optsld}:g" \
- ${MY_S}/libtbx/SConscript
-}
-
-src_configure() {
- local compiler
- local myconf
-
- myconf="${MY_S}/libtbx/configure.py"
-
- # Get compiler in the right way
- compiler=$(expr match "$(tc-getCC)" '.*\([a-z]cc\)')
- myconf="${myconf} --compiler=${compiler}"
-
- # Precompiling python scripts. It is done in upstreams install script.
- # Perhaps use python_mod_optimize, but as this script works we should stick to it.
- $(PYTHON -a) "${MY_S}/libtbx/command_line/py_compile_all.py"
-
- # 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"
-
- mkdir "${MY_B}" && myconf="${myconf} --current_working_directory=${MY_B}"
- cd "${MY_B}"
-
- myconf="${myconf} --build=release fftw3tbx rstbx smtbx mmtbx clipper fable"
- einfo "configuring with ${python} ${myconf}"
-
- $(PYTHON -a) ${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(){
- # This is what Bill Scott does in the fink package. Do we need this as well?
-# -e "s:prepend:append:g" \
-
- 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"
-
- ebegin "removing unnessary files"
- rm -r "${S}"/cctbx_sources/{boost,scons} || die "failed to remove uneeded scons"
- find "${S}" -type f -name "*conftest*" -delete || die "failed to remove uneeded *.o"
- find "${S}" -type f -name "*.o" -delete || die "failed to remove uneeded *.o"
- find "${S}" -type f -name "*.c" -delete || die "failed to remove uneeded *.c"
- find "${S}" -type f -name "*.f" -delete || die "failed to remove uneeded *.c"
- find "${S}" -type f -name "*.cpp" -delete || die "failed to remove uneeded *.cpp"
- find "${S}" -type f -name "*.pyc" -delete || die "failed to remove uneeded *.pyc"
- find "${S}" -type d -empty -delete || die
- eend
-
- insinto /usr/$(get_libdir)/${PN}
- doins -r cctbx_sources cctbx_build || die
-
-# fperms cannot handle wildcards
- chmod 775 "${ED}"/usr/$(get_libdir)/${PN}/cctbx_build/*sh && \
- chmod 775 "${ED}"/usr/$(get_libdir)/${PN}/cctbx_build/lib/* && \
- chmod 775 "${ED}"/usr/$(get_libdir)/${PN}/cctbx_build/scitbx/array_family/* && \
- chmod 775 "${ED}"/usr/$(get_libdir)/${PN}/cctbx_build/scitbx/serialization/* && \
- chmod 775 "${ED}"/usr/$(get_libdir)/${PN}/cctbx_build/scitbx/error/* && \
- chmod 775 "${ED}"/usr/$(get_libdir)/${PN}/cctbx_build/scitbx/fftpack/timing/* && \
- chmod 775 "${ED}"/usr/$(get_libdir)/${PN}/cctbx_build/scitbx/lbfgs/* && \
- chmod 775 "${ED}"/usr/$(get_libdir)/${PN}/cctbx_build/chiltbx/handle_test && \
- chmod 775 "${ED}"/usr/$(get_libdir)/${PN}/cctbx_build/bin/* || \
- die
-
- insinto /etc/profile.d/
- newins "${MY_B}"/setpaths.sh 30cctbx.sh || die
- newins "${MY_B}"/setpaths.csh 30cctbx.csh || die
-
- cat >> "${T}"/30cctbx <<- EOF
- LDPATH="${EPREFIX}/usr/$(get_libdir)/${PN}/cctbx_build/lib"
- EOF
-
- doenvd "${T}"/30cctbx || die
-}
-
-pkg_postinst () {
- python_need_rebuild
- python_mod_optimize /usr/$(get_libdir)/${PN}/cctbx_sources
-}
-
-pkg_postrm () {
- python_mod_cleanup /usr/$(get_libdir)/${PN}/cctbx_sources
-}
-
-check_use() {
- for var in $@; do
- if use ${var}; then
- printf -v "USE_$var" True
- else
- printf -v "USE_$var" False
- fi
- shift
- done
-}