[sci-chemistry/votca-csg] version bump

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

4 files changed, 98 insertions, 10 deletions

diff --git a/sci-chemistry/votca-csg/ChangeLog b/sci-chemistry/votca-csg/ChangeLog
index db355e8d5..1ef39392f 100644
--- a/sci-chemistry/votca-csg/ChangeLog
+++ b/sci-chemistry/votca-csg/ChangeLog
@@ -1,7 +1,13 @@
 # ChangeLog for sci-chemistry/votca-csg
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*votca-csg-1.1_rc1 (12 Feb 2011)
+
+  12 Feb 2011; Christoph Junghans <kleiner_otti@gmx.de>
+  +votca-csg-1.1_rc1.ebuild, votca-csg-9999.ebuild:
+  Version bump
+
   17 Dec 2010; Christoph Junghans <kleiner_otti@gmx.de>
   votca-csg-9999.ebuild:
   using autotools-utils eclass
diff --git a/sci-chemistry/votca-csg/Manifest b/sci-chemistry/votca-csg/Manifest
index abaa57cb0..5d0c3b35d 100644
--- a/sci-chemistry/votca-csg/Manifest
+++ b/sci-chemistry/votca-csg/Manifest
@@ -2,14 +2,20 @@
 Hash: SHA1
 
 DIST votca-csg-1.0.1.tar.gz 489464 RMD160 6ea3765b72203cf389b4ff644528fc5d551c9e44 SHA1 52becc27457fffd6ebbbcef62f6d5315fc859567 SHA256 346e94eb5e49008f11ec557fe4e48d0f2939f41139095e64af0f47514163399d
+DIST votca-csg-1.1_rc1.tar.gz 523706 RMD160 afd13e6775e7508ddaabe022e0beb361bb0c4f83 SHA1 f3945fc4cc75a5a65a088b474e02157ea6376e32 SHA256 98a5457654ec21f87189b41f1e37494512342e04b86c03768f80fc7c45d88410
 EBUILD votca-csg-1.0.1.ebuild 1825 RMD160 205a0819ba3c921fd46aab186bd181be12c75412 SHA1 f3084e61544d46c144a56088a62999bd09ec6f65 SHA256 ead0123213d40a7b62939ac28d4c8da4a21a0f99111bb24fe66ea19a88ce57a4
-EBUILD votca-csg-9999.ebuild 1762 RMD160 c81f0988662e50606ca9d1cf043dbeb247e21585 SHA1 0d142e160b466754d328e256e4637d0c0cfa138f SHA256 ad1553c6889e698ccbcf8efae19e8c6825ca7f5365fdb89ff3e1a1cd25d283a3
-MISC ChangeLog 2950 RMD160 485931774e95cfb2234f64ace35161ce7b6aa452 SHA1 9525e645c7300464a15a8e906ac632c079d810a0 SHA256 0fc14b2e56cfa98736674371ad440dcdba440f72b03f5347d1359317237bab6c
+EBUILD votca-csg-1.1_rc1.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
 MISC metadata.xml 359 RMD160 71a617c44b501ca02387ed5b51684e0b3fee26f5 SHA1 d73ab5d478376820a03dc2f6d2e21d645d20bb44 SHA256 61a7d6e6a5b612778f8926f83621f894db3c0b7d67fa7e09b04933e55d9eac0d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAk1Ai8QACgkQy0OE/ans1/l/gwCfV3lG1JR2r9C21wDW5ThH5RC/
-RkQAn0rxkRqCEdOTLZc5r6FSa9ZhnVv3
-=Xk7c
+iQEcBAEBAgAGBQJNVqEdAAoJEOeBhlrCAAWGet0H/2xaM6FPQcGBbtyQnjel4ag+
+FdryEd3NgFFKGnPfPmY3u/wNd4Vhc0yZ2nbokI2dVZgQopFgIBe8IdablJzwdw/Z
+3BI9ssUcNi2WvohLqsg3CVh5grDn1Ci4pBo8rdnbWiRqAsnoBCXfi3qT8/4AcM4W
+7kmKcnoLQM5Bv2/DveimS7wqVnbqS5LaoX3MgtrwqSP8ZZOuYC8UWMdZmhD4X+fr
+RoHAo2ap0qIxz4GHgAa1Q6HlIJvi/iOyIj230IJdINi2dECEPG2WEBjMmQStegoS
+Y2yJ3/yncOZ6cQ+JTM+tv83wPF61XOs/eoO6seu05au1Vc6VVZwxK1Ms9jOOfsg=
+=J0c+
 -----END PGP SIGNATURE-----
diff --git a/sci-chemistry/votca-csg/votca-csg-1.1_rc1.ebuild b/sci-chemistry/votca-csg/votca-csg-1.1_rc1.ebuild
new file mode 100644
index 000000000..333e454ce
--- /dev/null
+++ b/sci-chemistry/votca-csg/votca-csg-1.1_rc1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="3"
+
+inherit autotools-utils bash-completion
+
+if [ "${PV}" != "9999" ]; then
+	SRC_URI="http://votca.googlecode.com/files/${PF}.tar.gz"
+	RESTRICT="primaryuri"
+else
+	SRC_URI=""
+	inherit mercurial
+	EHG_REPO_URI="https://csg.votca.googlecode.com/hg"
+	S="${WORKDIR}/${EHG_REPO_URI##*/}"
+fi
+
+DESCRIPTION="Votca coarse-graining engine"
+HOMEPAGE="http://www.votca.org"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE="doc +gromacs static-libs"
+
+RDEPEND="=sci-libs/votca-tools-${PV}
+	gromacs? ( >=sci-chemistry/gromacs-4.0.7-r5 )
+	dev-lang/perl
+	app-shells/bash"
+
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen[-nodot] )
+	>=app-text/txt2tags-2.5
+	dev-util/pkgconfig"
+
+src_prepare() {
+	#from bootstrap.sh
+	[ -z "${PV##*9999}" ] && \
+		emake -C share/scripts/inverse -f Makefile.am.in Makefile.am
+
+	eautoreconf || die "eautoreconf failed"
+}
+
+src_configure() {
+	local libgmx
+
+	#in >gromacs-4.5 libgmx was renamed to libgromacs
+	has_version =sci-chemistry/gromacs-9999 && libgmx="libgromacs" || libgmx="libgmx"
+	#prefer gromacs double-precision if it is there
+	has_version sci-chemistry/gromacs[double-precision] && libgmx="${libgmx}_d"
+
+	myeconfargs=( ${myconf} --disable-rc-files  $(use_with gromacs libgmx $libgmx) )
+	autotools-utils_src_configure || die
+}
+
+src_install() {
+	DOCS=(README NOTICE ${AUTOTOOLS_BUILD_DIR}/CHANGELOG)
+	dobashcompletion scripts/csg-completion.bash ${PN} || die
+	autotools-utils_src_install || die
+	if use doc; then
+		cd share/doc
+		doxygen || die
+		dohtml -r html/*
+	fi
+}
+
+pkg_postinst() {
+	elog
+	elog "Please read and cite:"
+	elog "VOTCA, J. Chem. Theory Comput. 5, 3211 (2009). "
+	elog "http://dx.doi.org/10.1021/ct900369w"
+	elog
+	bash-completion_pkg_postinst
+}
diff --git a/sci-chemistry/votca-csg/votca-csg-9999.ebuild b/sci-chemistry/votca-csg/votca-csg-9999.ebuild
index 5205bc015..333e454ce 100644
--- a/sci-chemistry/votca-csg/votca-csg-9999.ebuild
+++ b/sci-chemistry/votca-csg/votca-csg-9999.ebuild
@@ -8,6 +8,7 @@ inherit autotools-utils bash-completion
 
 if [ "${PV}" != "9999" ]; then
 	SRC_URI="http://votca.googlecode.com/files/${PF}.tar.gz"
+	RESTRICT="primaryuri"
 else
 	SRC_URI=""
 	inherit mercurial
@@ -29,7 +30,7 @@ RDEPEND="=sci-libs/votca-tools-${PV}
 	app-shells/bash"
 
 DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
+	doc? ( app-doc/doxygen[-nodot] )
 	>=app-text/txt2tags-2.5
 	dev-util/pkgconfig"
 
@@ -50,13 +51,13 @@ src_configure() {
 	has_version sci-chemistry/gromacs[double-precision] && libgmx="${libgmx}_d"
 
 	myeconfargs=( ${myconf} --disable-rc-files  $(use_with gromacs libgmx $libgmx) )
-	autotools-utils_src_configure
+	autotools-utils_src_configure || die
 }
 
 src_install() {
 	DOCS=(README NOTICE ${AUTOTOOLS_BUILD_DIR}/CHANGELOG)
-	dobashcompletion scripts/csg-completion.bash ${PN}
-	autotools-utils_src_install
+	dobashcompletion scripts/csg-completion.bash ${PN} || die
+	autotools-utils_src_install || die
 	if use doc; then
 		cd share/doc
 		doxygen || die