version bump

(Portage version: 2.1.9.25/cvs/Linux i686)

4 files changed, 90 insertions, 82 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/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
+}