version bump

Package-Manager: portage-2.1.9.25/cvs/Linux i686

5 files changed, 102 insertions, 93 deletions

diff --git a/sci-chemistry/votca-csg/ChangeLog b/sci-chemistry/votca-csg/ChangeLog
index 858ffb8635b3..fd404cca3a70 100644
--- a/sci-chemistry/votca-csg/ChangeLog
+++ b/sci-chemistry/votca-csg/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-chemistry/votca-csg
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/votca-csg/ChangeLog,v 1.1 2011/02/12 16:22:51 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/votca-csg/ChangeLog,v 1.2 2011/03/07 22:15:13 ottxor Exp $
+
+*votca-csg-1.1.1 (07 Mar 2011)
+
+  07 Mar 2011; Christoph Junghans <ottxor@gentoo.org> -votca-csg-1.0.1.ebuild,
+  +votca-csg-1.1.1.ebuild:
+  version bump
 
 *votca-csg-1.0.1 (12 Feb 2011)
 
diff --git a/sci-chemistry/votca-csg/Manifest b/sci-chemistry/votca-csg/Manifest
index c8cb5a843486..d544b74e38f1 100644
--- a/sci-chemistry/votca-csg/Manifest
+++ b/sci-chemistry/votca-csg/Manifest
@@ -1,18 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-DIST votca-csg-1.0.1.tar.gz 489464 RMD160 6ea3765b72203cf389b4ff644528fc5d551c9e44 SHA1 52becc27457fffd6ebbbcef62f6d5315fc859567 SHA256 346e94eb5e49008f11ec557fe4e48d0f2939f41139095e64af0f47514163399d
-EBUILD votca-csg-1.0.1.ebuild 1926 RMD160 740d68a69dffa5a56e218a257b97a30c1402939b SHA1 b6d52b08882e0a86e5fa76b56b0a38122305f3cd SHA256 4734f646d5c80f819bb01b44d44aea662bdc37af189e1012a37702b2689dd1b9
-MISC ChangeLog 379 RMD160 40fdec70de53567380823995598cb30147c160d9 SHA1 73cf01e64a27e56c9a3c34a29a349ae1ce685bee SHA256 91864320217a5e36a8083dda0d629515232680b75d43369b82c83a736a1b55ee
-MISC metadata.xml 371 RMD160 7cf35c090d5336be88bf1d697f9ed90efe6d0336 SHA1 7a20446238bcc4dd7fa6daad063be86ec7f636ac SHA256 39f5a1b9c98af3057d6161edeb6286137205e02775c15020fae57277f6894512
+DIST votca-csg-1.1.1.tar.gz 537252 RMD160 a5c721e22eeac38114e78e80d4b1d83f8c24eda9 SHA1 dd341c8c7af2a680d00474da58f65cdcf98e3f18 SHA256 636ff1ea0011491d06e76958d37936e5507e1a7be3622e99915d06597a2324dc
+DIST votca-manual-1.1.pdf 940226 RMD160 d599a9dc04005e2e87659e896e405df3fc5ba5d6 SHA1 ef48681b8d0144a8578fce546911a8880ef5990e SHA256 b361da5383e3ac6efb207823f306eb0d3ea88e37ba728a0deb278a196f187802
+EBUILD votca-csg-1.1.1.ebuild 2178 RMD160 69defc104d3551ee659b8b3e8516722650bca542 SHA1 01cc75287b8b04f125740a6160487e2ffad2832e SHA256 f725be688dadeb900aadc2361b89a7954ffe14b6a1eac2eb2a61eab567028613
+MISC ChangeLog 533 RMD160 648dd6a2f273c381fd0a3f6e0b343bd7f8fbfe49 SHA1 0931c4ab816b7faa27f678a07605ecc28405cd00 SHA256 80e58a9e2f227cba0f3575ead6ca57931ab309eb6391ddd97c54282ade3548e5
+MISC metadata.xml 377 RMD160 5866f12aa9eab307d5a7c64bae06e7e636f9b472 SHA1 79b15e0a895e4c88661d3efd952f085156ad819b SHA256 e895e5ed3781d1776210e18a708a0aeb45922dcdd00a49fe80f519acd18fdd4d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iQEcBAEBAgAGBQJNVrZlAAoJEOeBhlrCAAWG8JsH/R+haWP28iyrZKngZO8xlwQm
-/u0XZQWOGdBgtt7x5WTQjWPKcFyd8TXn2fTXH0epK1/NFhFUladc3Z4OzlBCdLKy
-JivygMOsdJTt8c5nHvDd659AoOJ0BiAmlExL3QC7ndvOel6VJ1o1hQ8oKKMYqu9N
-Zh8XleGDeHuXrZ0375CeD/oGZDxcydAuf5py9zMiCWyDToXGduXU5mRd546Qjssp
-XSgPJcLvu64M7XzRhTELv0KiVyx90Ua00lwE34Gaip1DvCT8KN4LcAOscU7qPWSM
-S/QWIIp3SG8Yd4MaZqrAplsfVenu343gCoJqJHR+Wuv+sbqos6QHyh3oyCb+iy0=
-=0QC1
+iQEcBAEBAgAGBQJNdVuTAAoJEOeBhlrCAAWGtKgH/jR8PFkE/9uBTMQrJ2plo0t5
+RnAm5Awo/oKWeEUb2MCrK/V70z2yhUx9hMZM/oYSmy1Gsak/17/+vIWP1GT+9wl5
+5vxehIM2jRdf1xtGFGaHB+Lx8MWflSU7Kjgx95xNNvu+03vBuIYHcPaUSNTkaYJz
+IQgzfdw9LbEh6u/0JeUYISC165yHaizvPKP988r75S9lwlFmQ8zNKjEqkjRvwOve
+sz4WteWnMHC6mP9ViMIeW+5o9lSAdXz2KY5gjxTTT2fbq61BA9xu9VcUsIEa+qqd
+7gglsJ2EupOJh7+nuI7IalAI3FyFijD9j9FGB6/nHgv+Url416vtTGZ2hWNdR6s=
+=0b7S
 -----END PGP SIGNATURE-----
diff --git a/sci-chemistry/votca-csg/metadata.xml b/sci-chemistry/votca-csg/metadata.xml
index 9796135c481b..4664d891702f 100644
--- a/sci-chemistry/votca-csg/metadata.xml
+++ b/sci-chemistry/votca-csg/metadata.xml
@@ -7,6 +7,6 @@
 		<name>Christoph Junghans</name>
 	</maintainer>
 	<use>
-		<flag name='gromacs'>Add support for gromacs file formats (sci-chemistry/gromacs)</flag>
+		<flag name='gromacs'>Add support for file formats from <pkg>sci-chemistry/gromacs</pkg></flag>
 	</use>
 </pkgmetadata>
diff --git a/sci-chemistry/votca-csg/votca-csg-1.0.1.ebuild b/sci-chemistry/votca-csg/votca-csg-1.0.1.ebuild
deleted file mode 100644
index 00005b6ad1ea..000000000000
--- a/sci-chemistry/votca-csg/votca-csg-1.0.1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/votca-csg/votca-csg-1.0.1.ebuild,v 1.1 2011/02/12 16:22:51 ottxor Exp $
-
-EAPI="3"
-
-inherit autotools bash-completion
-
-if [ "${PV}" != "9999" ]; then
-	SRC_URI="http://votca.googlecode.com/files/${PF}.tar.gz"
-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"
-IUSE="doc +gromacs static-libs"
-
-RDEPEND="=sci-libs/votca-tools-${PV}
-	gromacs? ( >=sci-chemistry/gromacs-4.0.7-r5	<sci-chemistry/gromacs-9999 )
-	dev-lang/perl
-	app-shells/bash
-	doc? ( >=app-text/txt2tags-2.5 )"
-
-DEPEND="${RDEPEND}
-	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 myconf="--disable-la-files --disable-rc-files"
-
-	if use gromacs; then
-		#prefer gromacs double-precision if it is there
-		if has_version sci-chemistry/gromacs[double-precision]; then
-			myconf="${myconf} --with-libgmx=libgmx_d"
-		else
-			myconf="${myconf} --with-libgmx=libgmx"
-		fi
-	else
-		myconf="${myconf} --without-libgmx"
-	fi
-
-	myconf="${myconf} $(use_enable static-libs static)"
-
-	econf ${myconf} || die "econf failed"
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die "emake install failed"
-	dodoc README NOTICE
-	if use doc; then
-		emake CHANGELOG || die "emake CHANGELOG failed"
-		dodoc CHANGELOG
-	fi
-
-	dobashcompletion scripts/csg-completion.bash ${PN}
-}
-
-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-1.1.1.ebuild b/sci-chemistry/votca-csg/votca-csg-1.1.1.ebuild
new file mode 100644
index 000000000000..6c7e4c60c43e
--- /dev/null
+++ b/sci-chemistry/votca-csg/votca-csg-1.1.1.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/votca-csg/votca-csg-1.1.1.ebuild,v 1.1 2011/03/07 22:15:13 ottxor Exp $
+
+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
+		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"
+HOMEPAGE="http://www.votca.org"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~x86"
+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
+	if [ -z "${PV##*9999}" ]; then
+		emake -C share/scripts/inverse -f Makefile.am.in Makefile.am || die
+	fi
+
+	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
+		if [ -n "${PV##*9999}" ]; then
+			dodoc "${DISTDIR}/votca-manual-${MANUAL_PV}.pdf" || die
+		fi
+		cd share/doc || die
+		doxygen || die
+		dohtml -r html/* || die
+	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
+}