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

["Christoph Junghans" <kleiner_otti@gmx.de>]

commit:     88a171154693840dd63fe9a5550803878985ab69
Author:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 19 16:54:58 2011 +0000
Commit:     Christoph Junghans <kleiner_otti <AT> gmx <DOT> de>
CommitDate: Sat Feb 19 17:13:14 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=88a17115

[sci-chemistry/votca-csg] version bump

(Portage version: 2.1.9.25/git/Linux i686, signed Manifest commit with key C2000586)

---
 sci-chemistry/votca-csg/ChangeLog                  |    6 ++++++
 ...tca-csg-1.1_rc2.ebuild => votca-csg-1.1.ebuild} |   17 ++++++++++++-----
 sci-chemistry/votca-csg/votca-csg-9999.ebuild      |   17 ++++++++++++-----
 3 files changed, 30 insertions(+), 10 deletions(-)

diff --git a/sci-chemistry/votca-csg/ChangeLog b/sci-chemistry/votca-csg/ChangeLog
index 1ef3939..94711e6 100644
--- a/sci-chemistry/votca-csg/ChangeLog
+++ b/sci-chemistry/votca-csg/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*votca-csg-1.1 (19 Feb 2011)
+
+  19 Feb 2011; Christoph Junghans <ottxor@gentoo.org>
+  -votca-csg-1.1_rc2.ebuild, +votca-csg-1.1.ebuild:
+  Version bump
+
 *votca-csg-1.1_rc1 (12 Feb 2011)
 
   12 Feb 2011; Christoph Junghans <kleiner_otti@gmx.de>

diff --git a/sci-chemistry/votca-csg/votca-csg-1.1_rc2.ebuild b/sci-chemistry/votca-csg/votca-csg-1.1.ebuild
similarity index 78%
rename from sci-chemistry/votca-csg/votca-csg-1.1_rc2.ebuild
rename to sci-chemistry/votca-csg/votca-csg-1.1.ebuild
index 333e454..91671bf 100644
--- a/sci-chemistry/votca-csg/votca-csg-1.1_rc2.ebuild
+++ b/sci-chemistry/votca-csg/votca-csg-1.1.ebuild
@@ -6,14 +6,17 @@ EAPI="3"
 
 inherit autotools-utils bash-completion
 
+MANUAL_PV=1.1
 if [ "${PV}" != "9999" ]; then
-	SRC_URI="http://votca.googlecode.com/files/${PF}.tar.gz"
+	SRC_URI="http://votca.googlecode.com/files/${PF}.tar.gz
+		doc? ( http://votca.googlecode.com/files/votca-manual-${MANUAL_PV}.pdf )"
 	RESTRICT="primaryuri"
 else
 	SRC_URI=""
 	inherit mercurial
 	EHG_REPO_URI="https://csg.votca.googlecode.com/hg"
 	S="${WORKDIR}/${EHG_REPO_URI##*/}"
+	PDEPEND="doc? ( =app-doc/votca-manual-${PV} )"
 fi
 
 DESCRIPTION="Votca coarse-graining engine"
@@ -36,8 +39,9 @@ DEPEND="${RDEPEND}
 
 src_prepare() {
 	#from bootstrap.sh
-	[ -z "${PV##*9999}" ] && \
-		emake -C share/scripts/inverse -f Makefile.am.in Makefile.am
+	if [ -z "${PV##*9999}" ]; then
+		emake -C share/scripts/inverse -f Makefile.am.in Makefile.am || die
+	fi
 
 	eautoreconf || die "eautoreconf failed"
 }
@@ -59,9 +63,12 @@ src_install() {
 	dobashcompletion scripts/csg-completion.bash ${PN} || die
 	autotools-utils_src_install || die
 	if use doc; then
-		cd share/doc
+		if [ -n "${PV##*9999}" ]; then
+			dodoc "${WORKDIR}/votca-manual-${MANUAL_PV}.pdf" || die
+		fi
+		cd share/doc || die
 		doxygen || die
-		dohtml -r html/*
+		dohtml -r html/* || die
 	fi
 }
 

diff --git a/sci-chemistry/votca-csg/votca-csg-9999.ebuild b/sci-chemistry/votca-csg/votca-csg-9999.ebuild
index 333e454..91671bf 100644
--- a/sci-chemistry/votca-csg/votca-csg-9999.ebuild
+++ b/sci-chemistry/votca-csg/votca-csg-9999.ebuild
@@ -6,14 +6,17 @@ EAPI="3"
 
 inherit autotools-utils bash-completion
 
+MANUAL_PV=1.1
 if [ "${PV}" != "9999" ]; then
-	SRC_URI="http://votca.googlecode.com/files/${PF}.tar.gz"
+	SRC_URI="http://votca.googlecode.com/files/${PF}.tar.gz
+		doc? ( http://votca.googlecode.com/files/votca-manual-${MANUAL_PV}.pdf )"
 	RESTRICT="primaryuri"
 else
 	SRC_URI=""
 	inherit mercurial
 	EHG_REPO_URI="https://csg.votca.googlecode.com/hg"
 	S="${WORKDIR}/${EHG_REPO_URI##*/}"
+	PDEPEND="doc? ( =app-doc/votca-manual-${PV} )"
 fi
 
 DESCRIPTION="Votca coarse-graining engine"
@@ -36,8 +39,9 @@ DEPEND="${RDEPEND}
 
 src_prepare() {
 	#from bootstrap.sh
-	[ -z "${PV##*9999}" ] && \
-		emake -C share/scripts/inverse -f Makefile.am.in Makefile.am
+	if [ -z "${PV##*9999}" ]; then
+		emake -C share/scripts/inverse -f Makefile.am.in Makefile.am || die
+	fi
 
 	eautoreconf || die "eautoreconf failed"
 }
@@ -59,9 +63,12 @@ src_install() {
 	dobashcompletion scripts/csg-completion.bash ${PN} || die
 	autotools-utils_src_install || die
 	if use doc; then
-		cd share/doc
+		if [ -n "${PV##*9999}" ]; then
+			dodoc "${WORKDIR}/votca-manual-${MANUAL_PV}.pdf" || die
+		fi
+		cd share/doc || die
 		doxygen || die
-		dohtml -r html/*
+		dohtml -r html/* || die
 	fi
 }