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 D5707138247 for ; Thu, 5 Dec 2013 06:00:14 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3C900E09AA; Thu, 5 Dec 2013 06:00:12 +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 B6ED0E09AA for ; Thu, 5 Dec 2013 06:00:11 +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 6130733F2BF for ; Thu, 5 Dec 2013 06:00:09 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id A7774D06BC for ; Thu, 5 Dec 2013 06:00:06 +0000 (UTC) From: "Alexey Shvetsov" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alexey Shvetsov" Message-ID: <1386223182.41b0fdf9c8d699a403d9513dea566510c29b4b66.alexxy@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-9999.ebuild X-VCS-Directories: sci-chemistry/gromacs/ X-VCS-Committer: alexxy X-VCS-Committer-Name: Alexey Shvetsov X-VCS-Revision: 41b0fdf9c8d699a403d9513dea566510c29b4b66 X-VCS-Branch: master Date: Thu, 5 Dec 2013 06:00:06 +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: 17868116-d396-45bd-a624-8634c57f67d7 X-Archives-Hash: e427f9e62bec3cb241fe4f6d9e4cf243 commit: 41b0fdf9c8d699a403d9513dea566510c29b4b66 Author: Alexey Shvetsov gentoo org> AuthorDate: Thu Dec 5 05:59:42 2013 +0000 Commit: Alexey Shvetsov gentoo org> CommitDate: Thu Dec 5 05:59:42 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=41b0fdf9 Make gromacs 9999 build manual again Package-Manager: portage-2.2.7 --- sci-chemistry/gromacs/ChangeLog | 3 +++ sci-chemistry/gromacs/gromacs-9999.ebuild | 8 +++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/sci-chemistry/gromacs/ChangeLog b/sci-chemistry/gromacs/ChangeLog index 996e1d9..781b354 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: $ + 05 Dec 2013; Alexey Shvetsov gromacs-9999.ebuild: + Make gromacs 9999 build manual again + 05 Dec 2013; Alexey Shvetsov -Manifest, -gromacs-4.5.9999.ebuild, metadata.xml: Drop 4.5 diff --git a/sci-chemistry/gromacs/gromacs-9999.ebuild b/sci-chemistry/gromacs/gromacs-9999.ebuild index 080c1cb..20a16c6 100644 --- a/sci-chemistry/gromacs/gromacs-9999.ebuild +++ b/sci-chemistry/gromacs/gromacs-9999.ebuild @@ -66,7 +66,6 @@ REQUIRED_USE=" mkl? ( !blas !fftw !lapack )" DOCS=( AUTHORS README ) -HTML_DOCS=( "${ED}"/usr/share/gromacs/html/ ) pkg_pretend() { [[ $(gcc-version) == "4.1" ]] && die "gcc 4.1 is not supported by gromacs" @@ -205,6 +204,10 @@ src_compile() { einfo "Compiling for ${x} precision" BUILD_DIR="${WORKDIR}/${P}_${x}"\ cmake-utils_src_compile + if use doc; then + BUILD_DIR="${WORKDIR}/${P}_${x}"\ + cmake-utils_src_compile manual + fi use mpi || continue einfo "Compiling for ${x} precision with mpi" BUILD_DIR="${WORKDIR}/${P}_${x}_mpi"\ @@ -224,7 +227,7 @@ src_install() { BUILD_DIR="${WORKDIR}/${P}_${x}" \ cmake-utils_src_install if use doc; then - newdoc "${WORKDIR}"/manual/gromacs.pdf "${PN}-manual-${PV}.pdf" + newdoc "${WORKDIR}/${P}_${x}"/manual/gromacs.pdf "${PN}-manual-${PV}.pdf" fi use mpi || continue BUILD_DIR="${WORKDIR}/${P}_${x}_mpi" \ @@ -237,7 +240,6 @@ src_install() { newins "${ED}"/usr/bin/completion.zsh _${PN} fi rm -f "${ED}"usr/bin/completion.* - rm -rf "${ED}"usr/share/gromacs/html rm -f "${ED}"usr/bin/g_options* rm -f "${ED}"usr/bin/GMXRC*