[gentoo-commits] proj/sci:master commit in: sci-chemistry/gromacs/

[Christoph Junghans]

commit:     83882644554e19ff27159bbf60c8b0304c04724b
Author:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 30 21:00:31 2012 +0000
Commit:     Christoph Junghans <kleiner_otti <AT> gmx <DOT> de>
CommitDate: Fri Nov 30 21:00:31 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=83882644

sync with gx86

Package-Manager: portage-2.2.0_alpha143

---
 sci-chemistry/gromacs/ChangeLog               |    3 +++
 sci-chemistry/gromacs/gromacs-4.6.9999.ebuild |   17 ++++++++++++-----
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/sci-chemistry/gromacs/ChangeLog b/sci-chemistry/gromacs/ChangeLog
index 00923e8..2c90bf5 100644
--- a/sci-chemistry/gromacs/ChangeLog
+++ b/sci-chemistry/gromacs/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  30 Nov 2012; Christoph Junghans <ottxor@g.o> gromacs-4.6.9999.ebuild:
+  sync with gx86
+
   27 Nov 2012; Christoph Junghans <ottxor@g.o> gromacs-4.6.9999.ebuild,
   metadata.xml:
   added openmm support

diff --git a/sci-chemistry/gromacs/gromacs-4.6.9999.ebuild b/sci-chemistry/gromacs/gromacs-4.6.9999.ebuild
index 9b7b66f..f9efa61 100644
--- a/sci-chemistry/gromacs/gromacs-4.6.9999.ebuild
+++ b/sci-chemistry/gromacs/gromacs-4.6.9999.ebuild
@@ -5,6 +5,7 @@
 EAPI=5
 
 TEST_PV="4.0.4"
+MANUAL_PV="4.6-beta1"
 
 #to find external blas/lapack
 CMAKE_MIN_VERSION="2.8.5-r2"
@@ -24,7 +25,9 @@ if [[ $PV = *9999* ]]; then
 	inherit git-2
 	PDEPEND="doc? ( ~app-doc/gromacs-manual-${PV} )"
 else
-	SRC_URI="${SRC_URI} ftp://ftp.gromacs.org/pub/${PN}/${P}.tar.gz"
+	S="${WORKDIR}/${P//_/-}"
+	SRC_URI="${SRC_URI} ftp://ftp.gromacs.org/pub/${PN}/${P//_/-}.tar.gz
+		doc? (  ftp://ftp.gromacs.org/pub/manual/gromacs-manual-${MANUAL_PV}.pdf )"
 fi
 
 ACCE_IUSE="fkernels power6 sse2 sse41 avx128fma avx256"
@@ -212,10 +215,14 @@ src_install() {
 	dodoc AUTHORS INSTALL* README*
 	if use doc; then
 		dohtml -r "${ED}usr/share/gromacs/html/"
-		insinto /usr/share/gromacs
-		doins "admin/programs.txt"
-		ls -1 "${ED}"/usr/bin | sed -e '/_d$/d' > "${T}"/programs.list
-		doins "${T}"/programs.list
+		if [[ $PV = *9999* ]]; then
+			insinto /usr/share/gromacs
+			doins "admin/programs.txt"
+			ls -1 "${ED}"/usr/bin | sed -e '/_d$/d' > "${T}"/programs.list
+			doins "${T}"/programs.list
+		else
+			dodoc "${DISTDIR}/gromacs-manual-${MANUAL_PV}.pdf"
+		fi
 	fi
 	rm -rf "${ED}usr/share/gromacs/html/"
 }