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

[Christoph Junghans]

commit:     e799b7383f93488ca50c10d8f12f1a13ad913f7a
Author:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 30 02:52:30 2013 +0000
Commit:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
CommitDate: Wed Jan 30 02:52:30 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=e799b738

clean up

Package-Manager: portage-2.2.0_alpha161

---
 sci-chemistry/gromacs/ChangeLog               |    3 ++
 sci-chemistry/gromacs/gromacs-4.6.9999.ebuild |   43 +++++++++---------------
 2 files changed, 19 insertions(+), 27 deletions(-)

diff --git a/sci-chemistry/gromacs/ChangeLog b/sci-chemistry/gromacs/ChangeLog
index 4b96245..a991e3c 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: $
 
+  30 Jan 2013; Christoph Junghans <ottxor@g.o> gromacs-4.6.9999.ebuild:
+  clean up
+
   28 Jan 2013; Christoph Junghans <ottxor@g.o> gromacs-4.6.9999.ebuild:
   added app-doc/gromacs-manual in here
 

diff --git a/sci-chemistry/gromacs/gromacs-4.6.9999.ebuild b/sci-chemistry/gromacs/gromacs-4.6.9999.ebuild
index e808073..c4e0088 100644
--- a/sci-chemistry/gromacs/gromacs-4.6.9999.ebuild
+++ b/sci-chemistry/gromacs/gromacs-4.6.9999.ebuild
@@ -71,6 +71,9 @@ REQUIRED_USE="
 	mkl? ( !blas !fftw !lapack )
 	!openmm" #broken, but https://gerrit.gromacs.org/#/c/2087/
 
+DOCS=( AUTHORS INSTALL.cmake README )
+HTML_DOCS=( "${ED}"/usr/share/gromacs/html/ )
+
 pkg_pretend() {
 	[[ $(gcc-version) == "4.1" ]] && die "gcc 4.1 is not supported by gromacs"
 	use openmp && ! tc-has-openmp && \
@@ -235,43 +238,29 @@ src_install() {
 			BUILD_DIR="${WORKDIR}/${P}_openmm" \
 				DESTDIR="${D}" cmake-utils_src_make install-mdrun
 		fi
+		#manual can only be build after gromacs was installed once in image
+		if use doc && [[ $PV = *9999*  && ! -d ${WORKDIR}/manual_build ]]; then
+			mycmakeargs=( -DGMXBIN="${ED}"/usr/bin -DGMXSRC="${WORKDIR}/${P}" )
+			BUILD_DIR="${WORKDIR}"/manual_build \
+				CMAKE_USE_DIR="${WORKDIR}/manual" cmake-utils_src_configure
+			BUILD_DIR="${WORKDIR}"/manual_build cmake-utils_src_make
+			newdoc "${WORKDIR}"/manual_build/gromacs.pdf "${PN}-manual-${PV}.pdf"
+		fi
 		use mpi || continue
 		BUILD_DIR="${WORKDIR}/${P}_${x}_mpi" \
 			DESTDIR="${D}" cmake-utils_src_make install-mdrun
 	done
 
+	use doc && [[ $PV != *9999* ]] && dodoc "${DISTDIR}/${PN}-manual-${MANUAL_PV}.pdf"
 	newbashcomp "${ED}"/usr/bin/completion.bash ${PN}
 	if use zsh-completion ; then
 		insinto /usr/share/zsh/site-functions
 		newins "${ED}"/usr/bin/completion.zsh _${PN}
 	fi
-	rm -f "${ED}"/usr/bin/completion.*
-
-	cd "${S}"
-	dodoc AUTHORS INSTALL* README*
-	if use doc; then
-		dohtml -r "${ED}usr/share/gromacs/html/"
-		if [[ $PV = *9999* ]]; then
-			local progs
-			for x in "${ED}"/usr/bin/*; do
-				[[ $x = *_d ]] || progs+=" ${x##*/}"
-			done
-			sed -e "/^PROGRAMS=/s/=.*/='${progs## }'/" \
-				-e "/INSTALLED_OPTIONS_PROGRAM_NAME=/s:=.*:=${ED}/usr/bin/g_options:" \
-				-i "${WORKDIR}"/manual/mkman || die
-			mycmakeargs=( -DGMXBIN="${ED}"/usr/bin -DGMXSRC="${WORKDIR}/${P}" )
-			BUILD_DIR="${WORKDIR}"/manual_build \
-				CMAKE_USE_DIR="${WORKDIR}/manual" cmake-utils_src_configure
-			BUILD_DIR="${WORKDIR}"/manual_build cmake-utils_src_make
-			newdoc "${WORKDIR}"/manual_build/gromacs.pdf "${PN}-manual-${PV}.pdf"
-		else
-			dodoc "${DISTDIR}/${PN}-manual-${MANUAL_PV}.pdf"
-		fi
-	fi
-	rm -rf "${ED}"/usr/share/gromacs/html/
-
-	rm -f "${ED}"/usr/bin/g_options*
-	rm -f "${ED}"/usr/bin/GMXRC*
+	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*
 }
 
 pkg_postinst() {