[sci-chemistry/votca-csg] version bump

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

4 files changed, 42 insertions, 21 deletions

diff --git a/sci-chemistry/votca-csg/ChangeLog b/sci-chemistry/votca-csg/ChangeLog
index 1ef39392f..94711e6cb 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/Manifest b/sci-chemistry/votca-csg/Manifest
index cfed2dbdf..561662192 100644
--- a/sci-chemistry/votca-csg/Manifest
+++ b/sci-chemistry/votca-csg/Manifest
@@ -1,19 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-DIST votca-csg-1.1_rc2.tar.gz 535829 RMD160 cd17668ae35a63a5b4c3f8bd5cd85e455d3d8bd8 SHA1 5e9ea6e1d336d368b1e80d89bef7ca620132ae83 SHA256 81db7ced267da59d8059c696b1e75be07bcdcf71d5836ef669d038c4466de233
-EBUILD votca-csg-1.1_rc2.ebuild 1814 RMD160 615143a6763b321cbbd12c03eb7e6324c68f8150 SHA1 48da3351b62455d292700fe2c5ca576783551855 SHA256 90853f6f955503f308917fdc5aaf4f9678829282e25a7bab9a40faf9877db02a
-EBUILD votca-csg-9999.ebuild 1814 RMD160 615143a6763b321cbbd12c03eb7e6324c68f8150 SHA1 48da3351b62455d292700fe2c5ca576783551855 SHA256 90853f6f955503f308917fdc5aaf4f9678829282e25a7bab9a40faf9877db02a
-MISC ChangeLog 3108 RMD160 7d5790aeac9a81e27139546f217ade1e1e42fbc4 SHA1 15f3b1e6ff3eb087f7eda0b9fdcca7a6c2500278 SHA256 54d56730401566bba9c0a30c28cf2c1903fedf61cd3502378e188da138467300
+DIST votca-csg-1.1.tar.gz 536399 RMD160 2b81022adbd223e0bf8740882c4d712c673e1d1c SHA1 8d4af32aeac2af486c53341a2e09188c3e9050d6 SHA256 abaeecf32a866fd7753f035c81f8a8466f221fcfd2d4d974cfce28009fb4ad59
+DIST votca-manual-1.1.pdf 940226 RMD160 d599a9dc04005e2e87659e896e405df3fc5ba5d6 SHA1 ef48681b8d0144a8578fce546911a8880ef5990e SHA256 b361da5383e3ac6efb207823f306eb0d3ea88e37ba728a0deb278a196f187802
+EBUILD votca-csg-1.1.ebuild 2077 RMD160 1d6fdab7ab3fadb7d9ede42e730847773bc56853 SHA1 25d89544b8dfb7be9af1a488af0e87c5981eb0f3 SHA256 df9db2314287c40f65a71c8bccc80b0aadac8144e14e7c90bcc462324de09a00
+EBUILD votca-csg-9999.ebuild 2077 RMD160 1d6fdab7ab3fadb7d9ede42e730847773bc56853 SHA1 25d89544b8dfb7be9af1a488af0e87c5981eb0f3 SHA256 df9db2314287c40f65a71c8bccc80b0aadac8144e14e7c90bcc462324de09a00
+MISC ChangeLog 3260 RMD160 8ee307396f682c45d22bf239ee7257cdf5f17225 SHA1 7d413805634c322094f5bed313e2651c6df35827 SHA256 8ee217e631c70394aa95e42a684ef48c7013b0d254c9fa4c532f9a03a0d34215
 MISC metadata.xml 371 RMD160 7cf35c090d5336be88bf1d697f9ed90efe6d0336 SHA1 7a20446238bcc4dd7fa6daad063be86ec7f636ac SHA256 39f5a1b9c98af3057d6161edeb6286137205e02775c15020fae57277f6894512
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iQEcBAEBAgAGBQJNWBcSAAoJEOeBhlrCAAWGZXAIAI4QoMdCM6P9YmtJsoJWbq6Q
-sdBPdEcjZVbzkMXf8En8fJJ5ctzwr1MZIHchYtzpvwMciQDXrcnCqLx5tCITWzuT
-DNJeuebmS/MTOj+DeSuS4D6WT5IwjHE0S0pVNa7qJacHGMyzVIj08qT/d1CnFgPc
-Mg9+hP6TS642pFBcgOBK1mYDPuAdvbT/nSvnxUNzk3OAhBD3Z4MLbAS5xn3erASJ
-FfuyHZm+C8L4JVsF0NK/jw0UilQjxkrdzYA0ji2AL6H1UMOzAO6aOZ/lRDHc+63l
-+0yip6nzyuCOAa9WS8cmaeaut3otwBxtdPnp9zVHyI7cJAoFkA6hzocnEH4AsDw=
-=bbB3
+iQEcBAEBAgAGBQJNX/XiAAoJEOeBhlrCAAWGxsYH/iZfUMNY+MgbKDI1Vi049g+1
+J5RDgvOfV7kzFCJxfzCiKpI7ccdOJE4l6XJKxomgEFKSyZct1VY9vPBdzcsTfFJn
+vX1x6O/1NQAI0JY+I9zYPEzYQaasyptcz4lgdwqejLNEkJH1ZVDyltJ9cmORMNEF
+ucquaifRS30c2/fMrYhAT+wotFoyej/v9v7dPKzRXnIeOMxuZU9SOQNYTPKpF4uP
+Jzy5O4rxYM4T513MkRkMxDPivvly44zwe0dwswIdpw0oVCnACNh7S4WD/OyYWFOb
+CSlnVrEcY44qt5EVgfAvmz7kHPrZLULtyDxO8kbJ7iAfmeDhK7Q4ET4G21tt254=
+=otQ1
 -----END PGP SIGNATURE-----
diff --git a/sci-chemistry/votca-csg/votca-csg-1.1_rc2.ebuild b/sci-chemistry/votca-csg/votca-csg-1.1.ebuild
index 333e454ce..91671bfe5 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 333e454ce..91671bfe5 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
 }