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

[Christoph Junghans]

commit:     791b1a7e08cd16a7f36b7494e50e462dbb28f27c
Author:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 30 05:27:53 2013 +0000
Commit:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
CommitDate: Wed Jan 30 05:27:53 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=791b1a7e

clean up + merge csg-{manual,tutorials}

Package-Manager: portage-2.2.0_alpha161

---
 sci-chemistry/votca-csg/ChangeLog             |    5 ++-
 sci-chemistry/votca-csg/votca-csg-9999.ebuild |   43 +++++++++++++++++++-----
 2 files changed, 38 insertions(+), 10 deletions(-)

diff --git a/sci-chemistry/votca-csg/ChangeLog b/sci-chemistry/votca-csg/ChangeLog
index bd1f2d3..0e965ae 100644
--- a/sci-chemistry/votca-csg/ChangeLog
+++ b/sci-chemistry/votca-csg/ChangeLog
@@ -1,7 +1,10 @@
 # ChangeLog for sci-chemistry/votca-csg
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  30 Jan 2013; Christoph Junghans <ottxor@g.o> votca-csg-9999.ebuild:
+  clean up + merge csg-{manual,tutorials}
+
   31 Dec 2012; Christoph Junghans <ottxor@g.o> votca-csg-9999.ebuild:
   update EHG_REPO_URI
 

diff --git a/sci-chemistry/votca-csg/votca-csg-9999.ebuild b/sci-chemistry/votca-csg/votca-csg-9999.ebuild
index 10953bc..2a3c943 100644
--- a/sci-chemistry/votca-csg/votca-csg-9999.ebuild
+++ b/sci-chemistry/votca-csg/votca-csg-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 inherit bash-completion-r1 cmake-utils multilib
 
@@ -17,8 +17,6 @@ else
 	SRC_URI=""
 	inherit mercurial
 	EHG_REPO_URI="https://code.google.com/p/votca.csg/"
-	PDEPEND="${PDEPEND} doc? ( =app-doc/${PN}-manual-${PV} )
-		examples? ( =sci-chemistry/${PN}-tutorials-${PV} )"
 fi
 
 DESCRIPTION="Votca coarse-graining engine"
@@ -29,17 +27,38 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-macos"
 
 RDEPEND="=sci-libs/votca-tools-${PV}
-	gromacs? ( sci-chemistry/gromacs )
+	gromacs? ( sci-chemistry/gromacs:= )
 	dev-lang/perl
 	app-shells/bash"
 
 DEPEND="${RDEPEND}
-	doc? ( || ( <app-doc/doxygen-1.7.6.1[-nodot] >=app-doc/doxygen-1.7.6.1[dot] ) )
+	doc? (
+		|| ( <app-doc/doxygen-1.7.6.1[-nodot] >=app-doc/doxygen-1.7.6.1[dot] )
+		dev-texlive/texlive-latexextra
+		virtual/latex-base
+		dev-tex/pgf
+	)
 	>=app-text/txt2tags-2.5
 	virtual/pkgconfig"
 
 DOCS=( README NOTICE )
 
+src_unpack() {
+	if [[ ${PV} != *9999 ]]; then
+		default
+	else
+		mercurial_src_unpack
+		use doc && mercurial_fetch \
+			https://code.google.com/p/votca.csg-manual/ \
+			votca.csg-manual \
+			"${WORKDIR}/manual"
+		use examples && mercurial_fetch \
+			https://code.google.com/p/votca.csg-tutorials/ \
+			votca.csg-tutorials \
+			"${WORKDIR}/${PN}-tutorials"
+	fi
+}
+
 src_configure() {
 	local GMX_DEV="OFF" GMX_DOUBLE="OFF" extra
 
@@ -56,6 +75,7 @@ src_configure() {
 		$(cmake-utils_use_with gromacs GMX)
 		-DWITH_GMX_DEVEL="${GMX_DEV}"
 		-DGMX_DOUBLE="${GMX_DOUBLE}"
+		-DCMAKE_INSTALL_RPATH="\\\$ORIGIN/../$(get_libdir)"
 		${extra}
 		-DWITH_RC_FILES=OFF
 		-DLIB=$(get_libdir)
@@ -67,17 +87,22 @@ src_install() {
 	newbashcomp scripts/csg-completion.bash ${PN}
 	cmake-utils_src_install
 	if use doc; then
-		if [ -n "${PV##*9999}" ]; then
+		if [[ ${PV} = *9999* ]]; then
+			pushd "${WORKDIR}"/manual
+			emake PATH="${PATH}:${ED}/usr/bin"
+			newdoc manual.pdf "${PN}-manual-${PV}.pdf"
+			popd > /dev/null
+		else
 			dodoc "${DISTDIR}/${PN}-manual-${PV}.pdf"
 		fi
 		cd "${CMAKE_BUILD_DIR}" || die
 		emake html
 		dohtml -r share/doc/html/*
 	fi
-	if use examples && [ -n "${PV##*9999}" ]; then
+	if use examples; then
 		insinto "/usr/share/doc/${PF}/tutorials"
 		docompress -x "/usr/share/doc/${PF}/tutorials"
-		doins -r "${WORKDIR}/${PN}-tutorials-${PV}"/*
+		doins -r "${WORKDIR}/${PN}"-tutorials*/*
 	fi
 }