From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 69F981385CF for ; Mon, 21 Jan 2013 19:19:46 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4FAB5E05B1; Mon, 21 Jan 2013 19:19:44 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id CD7F1E05B1 for ; Mon, 21 Jan 2013 19:19:43 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9343533DB37 for ; Mon, 21 Jan 2013 19:19:42 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 12B4DE4073 for ; Mon, 21 Jan 2013 19:19:40 +0000 (UTC) From: "Christoph Junghans" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Christoph Junghans" Message-ID: <1358795946.9fb6a24873dd383c200a69cdf539828c3d4c853b.ottxor@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sci-chemistry/gromacs/ X-VCS-Repository: proj/sci X-VCS-Files: sci-chemistry/gromacs/ChangeLog sci-chemistry/gromacs/gromacs-4.6.9999.ebuild X-VCS-Directories: sci-chemistry/gromacs/ X-VCS-Committer: ottxor X-VCS-Committer-Name: Christoph Junghans X-VCS-Revision: 9fb6a24873dd383c200a69cdf539828c3d4c853b X-VCS-Branch: master Date: Mon, 21 Jan 2013 19:19:40 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 6524a492-8fa8-492a-9f2d-4422b1880ff6 X-Archives-Hash: 52d0dec876384a9b81d786d87cdf0a8a commit: 9fb6a24873dd383c200a69cdf539828c3d4c853b Author: Christoph Junghans gentoo org> AuthorDate: Mon Jan 21 19:19:06 2013 +0000 Commit: Christoph Junghans gentoo org> CommitDate: Mon Jan 21 19:19:06 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=9fb6a248 fixed sci-chemistry/gromacs[test] Package-Manager: portage-2.2.0_alpha158 --- sci-chemistry/gromacs/ChangeLog | 3 ++ sci-chemistry/gromacs/gromacs-4.6.9999.ebuild | 46 ++++++++++++++++--------- 2 files changed, 33 insertions(+), 16 deletions(-) diff --git a/sci-chemistry/gromacs/ChangeLog b/sci-chemistry/gromacs/ChangeLog index 9b0b7e4..a4af5c4 100644 --- a/sci-chemistry/gromacs/ChangeLog +++ b/sci-chemistry/gromacs/ChangeLog @@ -2,6 +2,9 @@ # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 21 Jan 2013; Christoph Junghans gromacs-4.6.9999.ebuild: + fixed sci-chemistry/gromacs[test] + 21 Jan 2013; Alexey Shvetsov gromacs-4.6.9999.ebuild: [sci-chemistry/gromacs] Drop restrict test for 4.6 diff --git a/sci-chemistry/gromacs/gromacs-4.6.9999.ebuild b/sci-chemistry/gromacs/gromacs-4.6.9999.ebuild index 60d3f85..9f12410 100644 --- a/sci-chemistry/gromacs/gromacs-4.6.9999.ebuild +++ b/sci-chemistry/gromacs/gromacs-4.6.9999.ebuild @@ -11,8 +11,6 @@ CMAKE_MAKEFILE_GENERATOR="ninja" inherit bash-completion-r1 cmake-utils eutils multilib toolchain-funcs -SRC_URI="test? ( http://${PN}.googlecode.com/files/regressiontests-${TEST_PV}.tar.gz )" - if [[ $PV = *9999* ]]; then EGIT_REPO_URI="git://git.gromacs.org/gromacs.git https://gerrit.gromacs.org/gromacs.git @@ -22,9 +20,9 @@ if [[ $PV = *9999* ]]; then inherit git-2 PDEPEND="doc? ( ~app-doc/${PN}-manual-${PV} )" else - S="${WORKDIR}/${P//_/-}" - SRC_URI="${SRC_URI} ftp://ftp.gromacs.org/pub/${PN}/${P//_/-}.tar.gz - doc? ( ftp://ftp.gromacs.org/pub/manual/${PN}-manual-${MANUAL_PV}.pdf )" + SRC_URI="ftp://ftp.gromacs.org/pub/${PN}/${P}.tar.gz + doc? ( ftp://ftp.gromacs.org/pub/manual/manual-${MANUAL_PV}.pdf -> ${PN}-manual-${MANUAL_PV}.pdf ) + test? ( http://${PN}.googlecode.com/files/regressiontests-${TEST_PV}.tar.gz )" fi ACCE_IUSE="sse2 sse41 avx128fma avx256" @@ -65,7 +63,8 @@ REQUIRED_USE=" || ( single-precision double-precision ) cuda? ( single-precision ) openmm? ( single-precision ) - mkl? ( !blas !fftw !lapack )" + mkl? ( !blas !fftw !lapack ) + !openmm" #broken, but https://gerrit.gromacs.org/#/c/2087/ pkg_pretend() { [[ $(gcc-version) == "4.1" ]] && die "gcc 4.1 is not supported by gromacs" @@ -73,6 +72,20 @@ pkg_pretend() { die "Please switch to an openmp compatible compiler" } +src_unpack() { + if [[ ${PV} != *9999 ]]; then + default + else + git-2_src_unpack + if use test; then + EGIT_REPO_URI="git://git.gromacs.org/regressiontests.git" \ + EGIT_BRANCH="master" EGIT_NOUNPACK="yes" EGIT_COMMIT="master" \ + EGIT_SOURCEDIR="${WORKDIR}/regressiontests"\ + git-2_src_unpack + fi + fi +} + src_prepare() { #notes/todos # -on apple: there is framework support @@ -84,10 +97,12 @@ src_prepare() { use single-precision && GMX_DIRS+=" float" use double-precision && GMX_DIRS+=" double" - for x in ${GMX_DIRS}; do - mkdir -p "${WORKDIR}/${P}_${x}" || die - use test && cp -r "${WORKDIR}"/regressiontests-master "${WORKDIR}/${P}_${x}" - done + if use test; then + for x in ${GMX_DIRS}; do + mkdir -p "${WORKDIR}/${P}_${x}" || die + cp -al "${WORKDIR}/regressiontests"* "${WORKDIR}/${P}_${x}/tests" || die + done + fi if use openmm; then sed -i '/option.*GMX_OPENMM/s/^#//' src/contrib/CMakeLists.txt || die @@ -133,12 +148,13 @@ src_configure() { $(cmake-utils_use lapack GMX_EXTERNAL_LAPACK) $(cmake-utils_use openmp GMX_OPENMP) $(cmake-utils_use offensive GMX_COOL_QUOTES) - $(cmake-utils_use test BUILD_TESTING) -DGMX_DEFAULT_SUFFIX=off -DGMX_ACCELERATION="$acce" -DGMXLIB="$(get_libdir)" -DGMX_VMD_PLUGIN_PATH="${EPREFIX}/usr/$(get_libdir)/vmd/plugins/*/molfile/" -DGMX_PREFIX_LIBMD=ON + -DGMX_X86_AVX_GCC_MASKLOAD_BUG=OFF + -DGMX_USE_GCC44_BUG_WORKAROUND=OFF ${extra} ) @@ -154,6 +170,7 @@ src_configure() { [[ ${x} = "double" ]] && use cuda && cuda="-DGMX_GPU=OFF" mycmakeargs=( ${mycmakeargs_pre[@]} ${p} -DGMX_MPI=OFF $(cmake-utils_use threads GMX_THREAD_MPI) ${cuda} -DGMX_OPENMM=OFF + "$(use test && echo -DREGRESSIONTEST_PATH="${WORKDIR}/${P}_${x}/tests")" -DGMX_BINARY_SUFFIX="${suffix}" -DGMX_LIBS_SUFFIX="${suffix}" ) BUILD_DIR="${WORKDIR}/${P}_${x}" cmake-utils_src_configure if [[ ${x} = float ]] && use openmm; then @@ -192,11 +209,8 @@ src_compile() { src_test() { for x in ${GMX_DIRS}; do - local oldpath="${PATH}" - export PATH="${WORKDIR}/${P}_${x}/src/kernel:${S}-{x}/src/tools:${PATH}" - cd "${WORKDIR}/${P}_${x}" - emake -j1 tests || die "${x} Precision test failed" - export PATH="${oldpath}" + BUILD_DIR="${WORKDIR}/${P}_${x}"\ + cmake-utils_src_make check done }