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

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] proj/sci:master commit in: sci-chemistry/votca-csg/
@ 2011-03-03 21:43 Christoph Junghans
  0 siblings, 0 replies; 36+ messages in thread
From: Christoph Junghans @ 2011-03-03 21:43 UTC (permalink / raw
  To: gentoo-commits

commit:     c92b47630ac73f2c69ef9f99ede7fcc89b2ac9cd
Author:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
AuthorDate: Thu Mar  3 21:54:30 2011 +0000
Commit:     Christoph Junghans <kleiner_otti <AT> gmx <DOT> de>
CommitDate: Thu Mar  3 21:54:47 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=c92b4763

[sci-chemistry/votca-csg] switched to cmake

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

---
 sci-chemistry/votca-csg/votca-csg-9999.ebuild |   30 ++++++++----------------
 1 files changed, 10 insertions(+), 20 deletions(-)

diff --git a/sci-chemistry/votca-csg/votca-csg-9999.ebuild b/sci-chemistry/votca-csg/votca-csg-9999.ebuild
index d1b7e59..87b656e 100644
--- a/sci-chemistry/votca-csg/votca-csg-9999.ebuild
+++ b/sci-chemistry/votca-csg/votca-csg-9999.ebuild
@@ -4,7 +4,7 @@
 
 EAPI="3"
 
-inherit autotools-utils bash-completion
+inherit cmake-utils bash-completion
 
 MANUAL_PV=1.1
 if [ "${PV}" != "9999" ]; then
@@ -25,7 +25,7 @@ HOMEPAGE="http://www.votca.org"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~x86 ~amd64"
-IUSE="doc +gromacs static-libs"
+IUSE="doc +gromacs"
 
 RDEPEND="=sci-libs/votca-tools-${PV}
 	gromacs? ( >=sci-chemistry/gromacs-4.0.7-r5 )
@@ -37,35 +37,25 @@ DEPEND="${RDEPEND}
 	>=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
+	local extra="-DWITH_GMX_DEVEL=OFF"
 
-	#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"
+	use gromacs && has_version =sci-chemistry/gromacs-9999 && \
+		extra="-DWITH_GMX_DEVEL=ON"
 
-	myeconfargs=( ${myconf} --disable-rc-files  $(use_with gromacs libgmx $libgmx) )
-	autotools-utils_src_configure || die
+	mycmakeargs=( $(cmake-utils_use_with gromacs GMX) ${extra} -DWITH_RC_FILES=OFF )
+	cmake-utils_src_configure || die
 }
 
 src_install() {
-	DOCS=(README NOTICE ${AUTOTOOLS_BUILD_DIR}/CHANGELOG)
+	DOCS=(README NOTICE ${CMAKE_BUILD_DIR}/CHANGELOG)
 	dobashcompletion scripts/csg-completion.bash ${PN} || die
-	autotools-utils_src_install || die
+	cmake-utils_src_install || die
 	if use doc; then
 		if [ -n "${PV##*9999}" ]; then
 			dodoc "${DISTDIR}/votca-manual-${MANUAL_PV}.pdf" || die
 		fi
+		cd "${CMAKE_BUILD_DIR}" || die
 		cd share/doc || die
 		doxygen || die
 		dohtml -r html/* || die



^ permalink raw reply related	[flat|nested] 36+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-chemistry/votca-csg/
@ 2016-07-14 17:31 Christoph Junghans
  0 siblings, 0 replies; 36+ messages in thread
From: Christoph Junghans @ 2016-07-14 17:31 UTC (permalink / raw
  To: gentoo-commits

commit:     c91d5dc89a778e0898a812445026e5c48d5ebb8f
Author:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 14 17:18:21 2016 +0000
Commit:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
CommitDate: Thu Jul 14 17:18:21 2016 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=c91d5dc8

sci-chemistry/votca-csg: moved to gx86

 sci-chemistry/votca-csg/metadata.xml          |  16 ----
 sci-chemistry/votca-csg/votca-csg-9999.ebuild | 114 --------------------------
 2 files changed, 130 deletions(-)

diff --git a/sci-chemistry/votca-csg/metadata.xml b/sci-chemistry/votca-csg/metadata.xml
deleted file mode 100644
index 2559954..0000000
--- a/sci-chemistry/votca-csg/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>ottxor@gentoo.org</email>
-		<name>Christoph Junghans</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>sci-chemistry@gentoo.org</email>
-		<name>Gentoo Chemistry Project</name>
-	</maintainer>
-	<use>
-		<flag name="gromacs">Add support for gromacs file formats through <pkg>sci-chemistry/gromacs</pkg></flag>
-		<flag name="extras">Pull in extra applications from <pkg>sci-chemistry/votca-csg-apps</pkg></flag>
-	</use>
-</pkgmetadata>

diff --git a/sci-chemistry/votca-csg/votca-csg-9999.ebuild b/sci-chemistry/votca-csg/votca-csg-9999.ebuild
deleted file mode 100644
index 25892d7..0000000
--- a/sci-chemistry/votca-csg/votca-csg-9999.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-CMAKE_MAKEFILE_GENERATOR="ninja"
-
-inherit bash-completion-r1 cmake-utils multilib
-
-IUSE="doc examples extras +gromacs hdf5"
-PDEPEND="extras? ( =sci-chemistry/${PN}apps-${PV} )"
-if [ "${PV}" != "9999" ]; then
-	SRC_URI="https://github.com/${PN/-//}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-		doc? ( https://github.com/${PN/-//}-manual/releases/download/v1.3_rc1/${PN}-manual-${PV}.pdf )
-		examples? (	https://github.com/${PN/-//}-tutorials/archive/v${PV}.tar.gz -> ${PN}-tutorials-${PV}.tar.gz )"
-	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-macos"
-	S="${WORKDIR}/${P#votca-}"
-else
-	inherit git-r3
-	EGIT_REPO_URI="git://github.com/${PN/-//}.git https://github.com/${PN/-//}.git"
-	KEYWORDS=""
-fi
-
-DESCRIPTION="Votca coarse-graining engine"
-HOMEPAGE="http://www.votca.org"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-RDEPEND="
-	=sci-libs/votca-tools-${PV}
-	gromacs? ( sci-chemistry/gromacs:= )
-	hdf5? ( sci-libs/hdf5 )
-	dev-lang/perl
-	app-shells/bash:*"
-
-DEPEND="${RDEPEND}
-	doc? (
-		app-doc/doxygen[dot]
-		dev-texlive/texlive-latexextra
-		virtual/latex-base
-		dev-tex/pgf
-	)
-	>=app-text/txt2tags-2.5
-	virtual/pkgconfig"
-
-DOCS=( README.md NOTICE CHANGELOG.md )
-
-src_unpack() {
-	if [[ ${PV} != *9999 ]]; then
-		default
-	else
-		git-r3_src_unpack
-		if use doc; then
-			EGIT_REPO_URI="git://github.com/${PN/-//}-manual.git https://github.com/${PN/-//}-manual.git"
-			EGIT_BRANCH="master"
-			EGIT_CHECKOUT_DIR="${WORKDIR}/${PN}-manual"\
-				git-r3_src_unpack
-		fi
-		if use examples; then
-			EGIT_REPO_URI="git://github.com/${PN/-//}-tutorials.git https://github.com/${PN/-//}-tutorials.git"
-			EGIT_BRANCH="master"
-			EGIT_CHECKOUT_DIR="${WORKDIR}/${PN#votca-}-tutorials"\
-				git-r3_src_unpack
-		fi
-	fi
-}
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_with gromacs GMX)
-		$(cmake-utils_use_with hdf5 H5MD)
-		-DWITH_RC_FILES=OFF
-		-DLIB=$(get_libdir)
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	newbashcomp scripts/csg-completion.bash csg_call
-	for i in "${ED}"/usr/bin/csg_*; do
-		[[ ${i} = *csg_call ]] && continue
-		bashcomp_alias csg_call "${i##*/}"
-	done
-	if use doc; then
-		if [[ ${PV} = *9999* ]]; then
-			#we need to do that here, because we need an installed version of csg to build the manual
-			[[ ${CHOST} = *-darwin* ]] && \
-				emake -C "${WORKDIR}/${PN}"-manual PATH="${PATH}${PATH:+:}${ED}/usr/bin" DYLD_LIBRARY_PATH="${DYLD_LIBRARY_PATH}${DYLD_LIBRARY_PATH:+:}${ED}/usr/$(get_libdir)" \
-				|| emake -C "${WORKDIR}/${PN}"-manual PATH="${PATH}${PATH:+:}${ED}/usr/bin" LD_LIBRARY_PATH="${LD_LIBRARY_PATH}${LD_LIBRARY_PATH:+:}${ED}/usr/$(get_libdir)"
-			newdoc "${WORKDIR}/${PN}"-manual/manual.pdf "${PN}-manual-${PV}.pdf"
-		else
-			dodoc "${DISTDIR}/${PN}-manual-${PV}.pdf"
-		fi
-		cmake-utils_src_make -C "${BUILD_DIR}" html
-		dohtml -r "${BUILD_DIR}"/share/doc/html/*
-	fi
-	if use examples; then
-		insinto "/usr/share/doc/${PF}/tutorials"
-		docompress -x "/usr/share/doc/${PF}/tutorials"
-		rm -rf "${WORKDIR}/${PN#votca-}"-tutorials*/CMake*
-		doins -r "${WORKDIR}/${PN#votca-}"-tutorials*/*
-	fi
-}
-
-pkg_postinst() {
-	einfo
-	einfo "Please read and cite:"
-	einfo "VOTCA, J. Chem. Theory Comput. 5, 3211 (2009). "
-	einfo "http://dx.doi.org/10.1021/ct900369w"
-	einfo
-}


^ permalink raw reply related	[flat|nested] 36+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-chemistry/votca-csg/
@ 2015-11-16  4:23 Christoph Junghans
  0 siblings, 0 replies; 36+ messages in thread
From: Christoph Junghans @ 2015-11-16  4:23 UTC (permalink / raw
  To: gentoo-commits

commit:     c9bd734c4180f0fdc31922fa79f91189f88f9a2a
Author:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 16 04:22:10 2015 +0000
Commit:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
CommitDate: Mon Nov 16 04:22:10 2015 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=c9bd734c

sci-chemistry/votca-csg: update live ebuild

Package-Manager: portage-2.2.20.1

 sci-chemistry/votca-csg/ChangeLog             | 3 +++
 sci-chemistry/votca-csg/votca-csg-9999.ebuild | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/sci-chemistry/votca-csg/ChangeLog b/sci-chemistry/votca-csg/ChangeLog
index 827dd5d..d750f98 100644
--- a/sci-chemistry/votca-csg/ChangeLog
+++ b/sci-chemistry/votca-csg/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Id$
 
+  16 Nov 2015; Christoph Junghans <ottxor@gentoo.org> votca-csg-9999.ebuild:
+  sci-chemistry/votca-csg: update live ebuild
+
   24 Sep 2015; Christoph Junghans <ottxor@gentoo.org> votca-csg-9999.ebuild:
   sci-chemistry/votca-csg: sync with gx86
 

diff --git a/sci-chemistry/votca-csg/votca-csg-9999.ebuild b/sci-chemistry/votca-csg/votca-csg-9999.ebuild
index 668702c..0a099b4 100644
--- a/sci-chemistry/votca-csg/votca-csg-9999.ebuild
+++ b/sci-chemistry/votca-csg/votca-csg-9999.ebuild
@@ -31,7 +31,7 @@ SLOT="0"
 RDEPEND="
 	=sci-libs/votca-tools-${PV}
 	gromacs? ( sci-chemistry/gromacs:= )
-	hdf5? ( sci-libs/hdf5[cxx] )
+	hdf5? ( sci-libs/hdf5 )
 	dev-lang/perl
 	app-shells/bash:*"
 


^ permalink raw reply related	[flat|nested] 36+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-chemistry/votca-csg/
@ 2015-09-24  5:20 Christoph Junghans
  0 siblings, 0 replies; 36+ messages in thread
From: Christoph Junghans @ 2015-09-24  5:20 UTC (permalink / raw
  To: gentoo-commits

commit:     239fa34edcca3183dc35551fe199077be52f59cc
Author:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 24 05:18:48 2015 +0000
Commit:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
CommitDate: Thu Sep 24 05:21:14 2015 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=239fa34e

sci-chemistry/votca-csg: sync with gx86

Package-Manager: portage-2.2.20.1

 sci-chemistry/votca-csg/ChangeLog             |  3 +++
 sci-chemistry/votca-csg/votca-csg-9999.ebuild | 39 +++++++++++++++------------
 2 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/sci-chemistry/votca-csg/ChangeLog b/sci-chemistry/votca-csg/ChangeLog
index 1c1eb1d..827dd5d 100644
--- a/sci-chemistry/votca-csg/ChangeLog
+++ b/sci-chemistry/votca-csg/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Id$
 
+  24 Sep 2015; Christoph Junghans <ottxor@gentoo.org> votca-csg-9999.ebuild:
+  sci-chemistry/votca-csg: sync with gx86
+
   12 Feb 2015; Christoph Junghans <ottxor@gentoo.org> votca-csg-9999.ebuild:
   added support of hdf5, clean up
 

diff --git a/sci-chemistry/votca-csg/votca-csg-9999.ebuild b/sci-chemistry/votca-csg/votca-csg-9999.ebuild
index 7f7a214..668702c 100644
--- a/sci-chemistry/votca-csg/votca-csg-9999.ebuild
+++ b/sci-chemistry/votca-csg/votca-csg-9999.ebuild
@@ -11,14 +11,14 @@ inherit bash-completion-r1 cmake-utils multilib
 IUSE="doc examples extras +gromacs hdf5"
 PDEPEND="extras? ( =sci-chemistry/${PN}apps-${PV} )"
 if [ "${PV}" != "9999" ]; then
-	SRC_URI="http://downloads.votca.googlecode.com/hg/${P}.tar.gz
-		doc? ( http://downloads.votca.googlecode.com/hg/${PN}-manual-${PV}.pdf )
-		examples? (	http://downloads.votca.googlecode.com/hg/${PN}-tutorials-${PV}.tar.gz )"
+	SRC_URI="https://github.com/${PN/-//}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+		doc? ( https://github.com/${PN/-//}-manual/releases/download/v1.3_rc1/${PN}-manual-${PV}.pdf )
+		examples? (	https://github.com/${PN/-//}-tutorials/archive/v${PV}.tar.gz -> ${PN}-tutorials-${PV}.tar.gz )"
 	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-macos"
+	S="${WORKDIR}/${P#votca-}"
 else
-	SRC_URI=""
-	inherit mercurial
-	EHG_REPO_URI="https://code.google.com/p/votca.csg/"
+	inherit git-r3
+	EGIT_REPO_URI="git://github.com/${PN/-//}.git https://github.com/${PN/-//}.git"
 	KEYWORDS=""
 fi
 
@@ -45,21 +45,25 @@ DEPEND="${RDEPEND}
 	>=app-text/txt2tags-2.5
 	virtual/pkgconfig"
 
-DOCS=( README NOTICE )
+DOCS=( README.md NOTICE CHANGELOG.md )
 
 src_unpack() {
 	if [[ ${PV} != *9999 ]]; then
 		default
 	else
-		mercurial_src_unpack
-		use doc && mercurial_fetch \
-			https://code.google.com/p/votca.csg-manual/ \
-			votca.csg-manual \
-			"${WORKDIR}/${PN}-manual"
-		use examples && mercurial_fetch \
-			https://code.google.com/p/votca.csg-tutorials/ \
-			votca.csg-tutorials \
-			"${WORKDIR}/${PN}-tutorials"
+		git-r3_src_unpack
+		if use doc; then
+			EGIT_REPO_URI="git://github.com/${PN/-//}-manual.git https://github.com/${PN/-//}-manual.git"
+			EGIT_BRANCH="master"
+			EGIT_CHECKOUT_DIR="${WORKDIR}/${PN}-manual"\
+				git-r3_src_unpack
+		fi
+		if use examples; then
+			EGIT_REPO_URI="git://github.com/${PN/-//}-tutorials.git https://github.com/${PN/-//}-tutorials.git"
+			EGIT_BRANCH="master"
+			EGIT_CHECKOUT_DIR="${WORKDIR}/${PN#votca-}-tutorials"\
+				git-r3_src_unpack
+		fi
 	fi
 }
 
@@ -96,7 +100,8 @@ src_install() {
 	if use examples; then
 		insinto "/usr/share/doc/${PF}/tutorials"
 		docompress -x "/usr/share/doc/${PF}/tutorials"
-		doins -r "${WORKDIR}/${PN}"-tutorials*/*
+		rm -rf "${WORKDIR}/${PN#votca-}"-tutorials*/CMake*
+		doins -r "${WORKDIR}/${PN#votca-}"-tutorials*/*
 	fi
 }
 


^ permalink raw reply related	[flat|nested] 36+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-chemistry/votca-csg/
@ 2015-09-21 17:44 Justin Lecher
  0 siblings, 0 replies; 36+ messages in thread
From: Justin Lecher @ 2015-09-21 17:44 UTC (permalink / raw
  To: gentoo-commits

commit:     5f7231daec8766d699d1877f434c0a735c14622e
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 21 17:34:32 2015 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Mon Sep 21 17:34:32 2015 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=5f7231da

sci-chemistry/votca-csg: Add subslot operators

Package-Manager: portage-2.2.20.1
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>

 sci-chemistry/votca-csg/metadata.xml          | 4 ++--
 sci-chemistry/votca-csg/votca-csg-9999.ebuild | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/sci-chemistry/votca-csg/metadata.xml b/sci-chemistry/votca-csg/metadata.xml
index 8721d10..13f2288 100644
--- a/sci-chemistry/votca-csg/metadata.xml
+++ b/sci-chemistry/votca-csg/metadata.xml
@@ -7,7 +7,7 @@
 		<name>Christoph Junghans</name>
 	</maintainer>
 	<use>
-		<flag name='gromacs'>Add support for gromacs file formats through <pkg>sci-chemistry/gromacs</pkg></flag>
-		<flag name='extras'>Pull in extra applications from <pkg>sci-chemistry/votca-csg-apps</pkg></flag>
+		<flag name="gromacs">Add support for gromacs file formats through <pkg>sci-chemistry/gromacs</pkg></flag>
+		<flag name="extras">Pull in extra applications from <pkg>sci-chemistry/votca-csg-apps</pkg></flag>
 	</use>
 </pkgmetadata>

diff --git a/sci-chemistry/votca-csg/votca-csg-9999.ebuild b/sci-chemistry/votca-csg/votca-csg-9999.ebuild
index a5e4350..7f7a214 100644
--- a/sci-chemistry/votca-csg/votca-csg-9999.ebuild
+++ b/sci-chemistry/votca-csg/votca-csg-9999.ebuild
@@ -28,11 +28,12 @@ HOMEPAGE="http://www.votca.org"
 LICENSE="Apache-2.0"
 SLOT="0"
 
-RDEPEND="=sci-libs/votca-tools-${PV}
+RDEPEND="
+	=sci-libs/votca-tools-${PV}
 	gromacs? ( sci-chemistry/gromacs:= )
 	hdf5? ( sci-libs/hdf5[cxx] )
 	dev-lang/perl
-	app-shells/bash"
+	app-shells/bash:*"
 
 DEPEND="${RDEPEND}
 	doc? (


^ permalink raw reply related	[flat|nested] 36+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-chemistry/votca-csg/
@ 2015-02-12  0:44 Christoph Junghans
  0 siblings, 0 replies; 36+ messages in thread
From: Christoph Junghans @ 2015-02-12  0:44 UTC (permalink / raw
  To: gentoo-commits

commit:     214c303c7d361313ee0c5af916085d6201163d99
Author:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 12 00:43:39 2015 +0000
Commit:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
CommitDate: Thu Feb 12 00:43:39 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=214c303c

added support of hdf5, clean up

Package-Manager: portage-2.2.14

---
 sci-chemistry/votca-csg/ChangeLog             |  5 +++-
 sci-chemistry/votca-csg/votca-csg-9999.ebuild | 39 +++++++++------------------
 2 files changed, 16 insertions(+), 28 deletions(-)

diff --git a/sci-chemistry/votca-csg/ChangeLog b/sci-chemistry/votca-csg/ChangeLog
index 621aa69..b4fa4f4 100644
--- a/sci-chemistry/votca-csg/ChangeLog
+++ b/sci-chemistry/votca-csg/ChangeLog
@@ -1,7 +1,10 @@
 # ChangeLog for sci-chemistry/votca-csg
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  12 Feb 2015; Christoph Junghans <ottxor@gentoo.org> votca-csg-9999.ebuild:
+  added support of hdf5, clean up
+
   24 Oct 2014; Christoph Junghans <ottxor@gentoo.org> votca-csg-9999.ebuild:
   fixed bash-comp (bug #526320)
 

diff --git a/sci-chemistry/votca-csg/votca-csg-9999.ebuild b/sci-chemistry/votca-csg/votca-csg-9999.ebuild
index 94f2fc0..0b0b5be 100644
--- a/sci-chemistry/votca-csg/votca-csg-9999.ebuild
+++ b/sci-chemistry/votca-csg/votca-csg-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -8,7 +8,7 @@ CMAKE_MAKEFILE_GENERATOR="ninja"
 
 inherit bash-completion-r1 cmake-utils multilib
 
-IUSE="doc examples extras +gromacs"
+IUSE="doc examples extras +gromacs hdf5"
 PDEPEND="extras? ( =sci-chemistry/${PN}apps-${PV} )"
 if [ "${PV}" != "9999" ]; then
 	SRC_URI="http://downloads.votca.googlecode.com/hg/${P}.tar.gz
@@ -30,12 +30,13 @@ SLOT="0"
 
 RDEPEND="=sci-libs/votca-tools-${PV}
 	gromacs? ( sci-chemistry/gromacs:= )
+	hdf5? ( sci-libs/hdf5[cxx] )
 	dev-lang/perl
 	app-shells/bash"
 
 DEPEND="${RDEPEND}
 	doc? (
-		|| ( <app-doc/doxygen-1.7.6.1[-nodot] >=app-doc/doxygen-1.7.6.1[dot] )
+		app-doc/doxygen[dot]
 		dev-texlive/texlive-latexextra
 		virtual/latex-base
 		dev-tex/pgf
@@ -53,7 +54,7 @@ src_unpack() {
 		use doc && mercurial_fetch \
 			https://code.google.com/p/votca.csg-manual/ \
 			votca.csg-manual \
-			"${WORKDIR}/manual"
+			"${WORKDIR}/${PN}-manual"
 		use examples && mercurial_fetch \
 			https://code.google.com/p/votca.csg-tutorials/ \
 			votca.csg-tutorials \
@@ -62,23 +63,9 @@ src_unpack() {
 }
 
 src_configure() {
-	local GMX_DEV="OFF" GMX_DOUBLE="OFF" extra
-
-	if use gromacs; then
-		has_version =sci-chemistry/gromacs-9999 && GMX_DEV="ON"
-		has_version sci-chemistry/gromacs[double-precision] && GMX_DOUBLE="ON"
-	fi
-
-	#to create man pages, build tree binaries are executed (bug #398437)
-	[[ ${CHOST} = *-darwin* ]] && \
-		extra+=" -DCMAKE_BUILD_WITH_INSTALL_RPATH=OFF"
-
 	mycmakeargs=(
 		$(cmake-utils_use_with gromacs GMX)
-		-DWITH_GMX_DEVEL="${GMX_DEV}"
-		-DGMX_DOUBLE="${GMX_DOUBLE}"
-		-DCMAKE_INSTALL_RPATH="\\\$ORIGIN/../$(get_libdir)"
-		${extra}
+		$(cmake-utils_use_with hdf5 H5MD)
 		-DWITH_RC_FILES=OFF
 		-DLIB=$(get_libdir)
 	)
@@ -94,18 +81,16 @@ src_install() {
 	done
 	if use doc; then
 		if [[ ${PV} = *9999* ]]; then
-			pushd "${WORKDIR}"/manual
+			#we need to do that here, because we need an installed version of csg to build the manual
 			[[ ${CHOST} = *-darwin* ]] && \
-				export DYLD_LIBRARY_PATH="${DYLD_LIBRARY_PATH}${DYLD_LIBRARY_PATH:+:}${ED}/usr/$(get_libdir)"
-			emake PATH="${PATH}${PATH:+:}${ED}/usr/bin"
-			newdoc manual.pdf "${PN}-manual-${PV}.pdf"
-			popd > /dev/null
+				emake -C "${WORKDIR}/${PN}"-manual PATH="${PATH}${PATH:+:}${ED}/usr/bin" DYLD_LIBRARY_PATH="${DYLD_LIBRARY_PATH}${DYLD_LIBRARY_PATH:+:}${ED}/usr/$(get_libdir)" \
+				|| emake -C "${WORKDIR}/${PN}"-manual PATH="${PATH}${PATH:+:}${ED}/usr/bin" LD_LIBRARY_PATH="${LD_LIBRARY_PATH}${LD_LIBRARY_PATH:+:}${ED}/usr/$(get_libdir)"
+			newdoc "${WORKDIR}/${PN}"-manual/manual.pdf "${PN}-manual-${PV}.pdf"
 		else
 			dodoc "${DISTDIR}/${PN}-manual-${PV}.pdf"
 		fi
-		cd "${CMAKE_BUILD_DIR}" || die
-		cmake-utils_src_make html
-		dohtml -r share/doc/html/*
+		cmake-utils_src_make -C "${CMAKE_BUILD_DIR}" html
+		dohtml -r "${CMAKE_BUILD_DIR}"/share/doc/html/*
 	fi
 	if use examples; then
 		insinto "/usr/share/doc/${PF}/tutorials"


^ permalink raw reply related	[flat|nested] 36+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-chemistry/votca-csg/
@ 2014-10-24  3:33 Christoph Junghans
  0 siblings, 0 replies; 36+ messages in thread
From: Christoph Junghans @ 2014-10-24  3:33 UTC (permalink / raw
  To: gentoo-commits

commit:     0dc2db3e6d7eef70fcf8c3d174702421b5ad384a
Author:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 24 03:32:39 2014 +0000
Commit:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
CommitDate: Fri Oct 24 03:32:39 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=0dc2db3e

fixed bash-comp (bug #526320)

Package-Manager: portage-2.2.8-r2

---
 sci-chemistry/votca-csg/ChangeLog             | 3 +++
 sci-chemistry/votca-csg/votca-csg-9999.ebuild | 6 +++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/sci-chemistry/votca-csg/ChangeLog b/sci-chemistry/votca-csg/ChangeLog
index 9fff6d4..621aa69 100644
--- a/sci-chemistry/votca-csg/ChangeLog
+++ b/sci-chemistry/votca-csg/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  24 Oct 2014; Christoph Junghans <ottxor@gentoo.org> votca-csg-9999.ebuild:
+  fixed bash-comp (bug #526320)
+
   01 Sep 2014; Christoph Junghans <ottxor@gentoo.org> votca-csg-9999.ebuild:
   sync with gx86
 

diff --git a/sci-chemistry/votca-csg/votca-csg-9999.ebuild b/sci-chemistry/votca-csg/votca-csg-9999.ebuild
index 6fc1afe..94f2fc0 100644
--- a/sci-chemistry/votca-csg/votca-csg-9999.ebuild
+++ b/sci-chemistry/votca-csg/votca-csg-9999.ebuild
@@ -86,8 +86,12 @@ src_configure() {
 }
 
 src_install() {
-	newbashcomp scripts/csg-completion.bash ${PN}
 	cmake-utils_src_install
+	newbashcomp scripts/csg-completion.bash csg_call
+	for i in "${ED}"/usr/bin/csg_*; do
+		[[ ${i} = *csg_call ]] && continue
+		bashcomp_alias csg_call "${i##*/}"
+	done
 	if use doc; then
 		if [[ ${PV} = *9999* ]]; then
 			pushd "${WORKDIR}"/manual


^ permalink raw reply related	[flat|nested] 36+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-chemistry/votca-csg/
@ 2014-09-01  0:21 Christoph Junghans
  0 siblings, 0 replies; 36+ messages in thread
From: Christoph Junghans @ 2014-09-01  0:21 UTC (permalink / raw
  To: gentoo-commits

commit:     2204b05f8fb25b1a98092f8eec008efffb18b4f4
Author:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
AuthorDate: Mon Sep  1 00:21:20 2014 +0000
Commit:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
CommitDate: Mon Sep  1 00:21:28 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=2204b05f

sync with gx86

Package-Manager: portage-2.2.8-r1

---
 sci-chemistry/votca-csg/ChangeLog             |  5 ++++-
 sci-chemistry/votca-csg/votca-csg-9999.ebuild | 14 ++++++++------
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/sci-chemistry/votca-csg/ChangeLog b/sci-chemistry/votca-csg/ChangeLog
index c290cab..9fff6d4 100644
--- a/sci-chemistry/votca-csg/ChangeLog
+++ b/sci-chemistry/votca-csg/ChangeLog
@@ -1,7 +1,10 @@
 # ChangeLog for sci-chemistry/votca-csg
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  01 Sep 2014; Christoph Junghans <ottxor@gentoo.org> votca-csg-9999.ebuild:
+  sync with gx86
+
   09 Mar 2013; Christoph Junghans <ottxor@gentoo.org> votca-csg-9999.ebuild:
   fix doc build on darwin
 

diff --git a/sci-chemistry/votca-csg/votca-csg-9999.ebuild b/sci-chemistry/votca-csg/votca-csg-9999.ebuild
index 31fa847..6fc1afe 100644
--- a/sci-chemistry/votca-csg/votca-csg-9999.ebuild
+++ b/sci-chemistry/votca-csg/votca-csg-9999.ebuild
@@ -4,19 +4,22 @@
 
 EAPI=5
 
+CMAKE_MAKEFILE_GENERATOR="ninja"
+
 inherit bash-completion-r1 cmake-utils multilib
 
 IUSE="doc examples extras +gromacs"
 PDEPEND="extras? ( =sci-chemistry/${PN}apps-${PV} )"
 if [ "${PV}" != "9999" ]; then
-	SRC_URI="http://votca.googlecode.com/files/${PF}.tar.gz
-		doc? ( http://votca.googlecode.com/files/${PN}-manual-${PV}.pdf )
-		examples? (	http://votca.googlecode.com/files/${PN}-tutorials-${PV}.tar.gz )"
-	RESTRICT="primaryuri"
+	SRC_URI="http://downloads.votca.googlecode.com/hg/${P}.tar.gz
+		doc? ( http://downloads.votca.googlecode.com/hg/${PN}-manual-${PV}.pdf )
+		examples? (	http://downloads.votca.googlecode.com/hg/${PN}-tutorials-${PV}.tar.gz )"
+	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-macos"
 else
 	SRC_URI=""
 	inherit mercurial
 	EHG_REPO_URI="https://code.google.com/p/votca.csg/"
+	KEYWORDS=""
 fi
 
 DESCRIPTION="Votca coarse-graining engine"
@@ -24,7 +27,6 @@ HOMEPAGE="http://www.votca.org"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS=""
 
 RDEPEND="=sci-libs/votca-tools-${PV}
 	gromacs? ( sci-chemistry/gromacs:= )
@@ -98,7 +100,7 @@ src_install() {
 			dodoc "${DISTDIR}/${PN}-manual-${PV}.pdf"
 		fi
 		cd "${CMAKE_BUILD_DIR}" || die
-		emake html
+		cmake-utils_src_make html
 		dohtml -r share/doc/html/*
 	fi
 	if use examples; then


^ permalink raw reply related	[flat|nested] 36+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-chemistry/votca-csg/
@ 2014-02-27 23:01 Sebastien Fabbro
  0 siblings, 0 replies; 36+ messages in thread
From: Sebastien Fabbro @ 2014-02-27 23:01 UTC (permalink / raw
  To: gentoo-commits

commit:     c9c6f744a015125c960dabab5703411db11b453b
Author:     Sébastien Fabbro <bicatali <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 27 22:42:39 2014 +0000
Commit:     Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Thu Feb 27 22:42:39 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=c9c6f744

removed keywords for live ebuild

---
 sci-chemistry/votca-csg/votca-csg-9999.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-chemistry/votca-csg/votca-csg-9999.ebuild b/sci-chemistry/votca-csg/votca-csg-9999.ebuild
index 2373594..31fa847 100644
--- a/sci-chemistry/votca-csg/votca-csg-9999.ebuild
+++ b/sci-chemistry/votca-csg/votca-csg-9999.ebuild
@@ -24,7 +24,7 @@ HOMEPAGE="http://www.votca.org"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-macos"
+KEYWORDS=""
 
 RDEPEND="=sci-libs/votca-tools-${PV}
 	gromacs? ( sci-chemistry/gromacs:= )


^ permalink raw reply related	[flat|nested] 36+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-chemistry/votca-csg/
@ 2013-03-09  1:48 Christoph Junghans
  0 siblings, 0 replies; 36+ messages in thread
From: Christoph Junghans @ 2013-03-09  1:48 UTC (permalink / raw
  To: gentoo-commits

commit:     6027a394862c98038f5253db95c8f1c9541b5321
Author:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
AuthorDate: Sat Mar  9 01:48:30 2013 +0000
Commit:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
CommitDate: Sat Mar  9 01:48:30 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=6027a394

fix doc build on darwin

Package-Manager: portage-2.2.0_alpha166

---
 sci-chemistry/votca-csg/ChangeLog             |    3 +++
 sci-chemistry/votca-csg/votca-csg-9999.ebuild |    4 +++-
 2 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/sci-chemistry/votca-csg/ChangeLog b/sci-chemistry/votca-csg/ChangeLog
index 0e965ae..c290cab 100644
--- a/sci-chemistry/votca-csg/ChangeLog
+++ b/sci-chemistry/votca-csg/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  09 Mar 2013; Christoph Junghans <ottxor@gentoo.org> votca-csg-9999.ebuild:
+  fix doc build on darwin
+
   30 Jan 2013; Christoph Junghans <ottxor@gentoo.org> votca-csg-9999.ebuild:
   clean up + merge csg-{manual,tutorials}
 

diff --git a/sci-chemistry/votca-csg/votca-csg-9999.ebuild b/sci-chemistry/votca-csg/votca-csg-9999.ebuild
index 2a3c943..8c6d904 100644
--- a/sci-chemistry/votca-csg/votca-csg-9999.ebuild
+++ b/sci-chemistry/votca-csg/votca-csg-9999.ebuild
@@ -89,7 +89,9 @@ src_install() {
 	if use doc; then
 		if [[ ${PV} = *9999* ]]; then
 			pushd "${WORKDIR}"/manual
-			emake PATH="${PATH}:${ED}/usr/bin"
+			[[ ${CHOST} = *-darwin* ]] && \
+				export DYLD_LIBRARY_PATH="${DYLD_LIBRARY_PATH}${DYLD_LIBRARY_PATH:+:}${ED}/usr/$(get_libdir)"
+			emake PATH="${PATH}${PATH:+:}${ED}/usr/bin"
 			newdoc manual.pdf "${PN}-manual-${PV}.pdf"
 			popd > /dev/null
 		else


^ permalink raw reply related	[flat|nested] 36+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-chemistry/votca-csg/
@ 2013-01-30  5:28 Christoph Junghans
  0 siblings, 0 replies; 36+ messages in thread
From: Christoph Junghans @ 2013-01-30  5:28 UTC (permalink / raw
  To: gentoo-commits

commit:     791b1a7e08cd16a7f36b7494e50e462dbb28f27c
Author:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 30 05:27:53 2013 +0000
Commit:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
CommitDate: Wed Jan 30 05:27:53 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=791b1a7e

clean up + merge csg-{manual,tutorials}

Package-Manager: portage-2.2.0_alpha161

---
 sci-chemistry/votca-csg/ChangeLog             |    5 ++-
 sci-chemistry/votca-csg/votca-csg-9999.ebuild |   43 +++++++++++++++++++-----
 2 files changed, 38 insertions(+), 10 deletions(-)

diff --git a/sci-chemistry/votca-csg/ChangeLog b/sci-chemistry/votca-csg/ChangeLog
index bd1f2d3..0e965ae 100644
--- a/sci-chemistry/votca-csg/ChangeLog
+++ b/sci-chemistry/votca-csg/ChangeLog
@@ -1,7 +1,10 @@
 # ChangeLog for sci-chemistry/votca-csg
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  30 Jan 2013; Christoph Junghans <ottxor@gentoo.org> votca-csg-9999.ebuild:
+  clean up + merge csg-{manual,tutorials}
+
   31 Dec 2012; Christoph Junghans <ottxor@gentoo.org> votca-csg-9999.ebuild:
   update EHG_REPO_URI
 

diff --git a/sci-chemistry/votca-csg/votca-csg-9999.ebuild b/sci-chemistry/votca-csg/votca-csg-9999.ebuild
index 10953bc..2a3c943 100644
--- a/sci-chemistry/votca-csg/votca-csg-9999.ebuild
+++ b/sci-chemistry/votca-csg/votca-csg-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 inherit bash-completion-r1 cmake-utils multilib
 
@@ -17,8 +17,6 @@ else
 	SRC_URI=""
 	inherit mercurial
 	EHG_REPO_URI="https://code.google.com/p/votca.csg/"
-	PDEPEND="${PDEPEND} doc? ( =app-doc/${PN}-manual-${PV} )
-		examples? ( =sci-chemistry/${PN}-tutorials-${PV} )"
 fi
 
 DESCRIPTION="Votca coarse-graining engine"
@@ -29,17 +27,38 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-macos"
 
 RDEPEND="=sci-libs/votca-tools-${PV}
-	gromacs? ( sci-chemistry/gromacs )
+	gromacs? ( sci-chemistry/gromacs:= )
 	dev-lang/perl
 	app-shells/bash"
 
 DEPEND="${RDEPEND}
-	doc? ( || ( <app-doc/doxygen-1.7.6.1[-nodot] >=app-doc/doxygen-1.7.6.1[dot] ) )
+	doc? (
+		|| ( <app-doc/doxygen-1.7.6.1[-nodot] >=app-doc/doxygen-1.7.6.1[dot] )
+		dev-texlive/texlive-latexextra
+		virtual/latex-base
+		dev-tex/pgf
+	)
 	>=app-text/txt2tags-2.5
 	virtual/pkgconfig"
 
 DOCS=( README NOTICE )
 
+src_unpack() {
+	if [[ ${PV} != *9999 ]]; then
+		default
+	else
+		mercurial_src_unpack
+		use doc && mercurial_fetch \
+			https://code.google.com/p/votca.csg-manual/ \
+			votca.csg-manual \
+			"${WORKDIR}/manual"
+		use examples && mercurial_fetch \
+			https://code.google.com/p/votca.csg-tutorials/ \
+			votca.csg-tutorials \
+			"${WORKDIR}/${PN}-tutorials"
+	fi
+}
+
 src_configure() {
 	local GMX_DEV="OFF" GMX_DOUBLE="OFF" extra
 
@@ -56,6 +75,7 @@ src_configure() {
 		$(cmake-utils_use_with gromacs GMX)
 		-DWITH_GMX_DEVEL="${GMX_DEV}"
 		-DGMX_DOUBLE="${GMX_DOUBLE}"
+		-DCMAKE_INSTALL_RPATH="\\\$ORIGIN/../$(get_libdir)"
 		${extra}
 		-DWITH_RC_FILES=OFF
 		-DLIB=$(get_libdir)
@@ -67,17 +87,22 @@ src_install() {
 	newbashcomp scripts/csg-completion.bash ${PN}
 	cmake-utils_src_install
 	if use doc; then
-		if [ -n "${PV##*9999}" ]; then
+		if [[ ${PV} = *9999* ]]; then
+			pushd "${WORKDIR}"/manual
+			emake PATH="${PATH}:${ED}/usr/bin"
+			newdoc manual.pdf "${PN}-manual-${PV}.pdf"
+			popd > /dev/null
+		else
 			dodoc "${DISTDIR}/${PN}-manual-${PV}.pdf"
 		fi
 		cd "${CMAKE_BUILD_DIR}" || die
 		emake html
 		dohtml -r share/doc/html/*
 	fi
-	if use examples && [ -n "${PV##*9999}" ]; then
+	if use examples; then
 		insinto "/usr/share/doc/${PF}/tutorials"
 		docompress -x "/usr/share/doc/${PF}/tutorials"
-		doins -r "${WORKDIR}/${PN}-tutorials-${PV}"/*
+		doins -r "${WORKDIR}/${PN}"-tutorials*/*
 	fi
 }
 


^ permalink raw reply related	[flat|nested] 36+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-chemistry/votca-csg/
@ 2012-12-31  3:17 Christoph Junghans
  0 siblings, 0 replies; 36+ messages in thread
From: Christoph Junghans @ 2012-12-31  3:17 UTC (permalink / raw
  To: gentoo-commits

commit:     31fe1765fb35db0799d9c0825e13a5458d9fecfd
Author:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 31 02:13:11 2012 +0000
Commit:     Christoph Junghans <kleiner_otti <AT> gmx <DOT> de>
CommitDate: Mon Dec 31 02:13:11 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=31fe1765

update EHG_REPO_URI

Package-Manager: portage-2.2.0_alpha149

---
 sci-chemistry/votca-csg/ChangeLog             |    3 +++
 sci-chemistry/votca-csg/votca-csg-9999.ebuild |    4 +---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/sci-chemistry/votca-csg/ChangeLog b/sci-chemistry/votca-csg/ChangeLog
index 97ca527..bd1f2d3 100644
--- a/sci-chemistry/votca-csg/ChangeLog
+++ b/sci-chemistry/votca-csg/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  31 Dec 2012; Christoph Junghans <ottxor@gentoo.org> votca-csg-9999.ebuild:
+  update EHG_REPO_URI
+
   25 Jul 2012; Christoph Junghans <ottxor@gentoo.org> votca-csg-9999.ebuild:
   sync with gx86
 

diff --git a/sci-chemistry/votca-csg/votca-csg-9999.ebuild b/sci-chemistry/votca-csg/votca-csg-9999.ebuild
index cd73981..10953bc 100644
--- a/sci-chemistry/votca-csg/votca-csg-9999.ebuild
+++ b/sci-chemistry/votca-csg/votca-csg-9999.ebuild
@@ -16,9 +16,7 @@ if [ "${PV}" != "9999" ]; then
 else
 	SRC_URI=""
 	inherit mercurial
-	EHG_REPO_URI="https://csg.votca.googlecode.com/hg"
-	EHG_REVISION="default"
-	S="${WORKDIR}/${EHG_REPO_URI##*/}"
+	EHG_REPO_URI="https://code.google.com/p/votca.csg/"
 	PDEPEND="${PDEPEND} doc? ( =app-doc/${PN}-manual-${PV} )
 		examples? ( =sci-chemistry/${PN}-tutorials-${PV} )"
 fi


^ permalink raw reply related	[flat|nested] 36+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-chemistry/votca-csg/
@ 2012-07-25  1:24 Christoph Junghans
  0 siblings, 0 replies; 36+ messages in thread
From: Christoph Junghans @ 2012-07-25  1:24 UTC (permalink / raw
  To: gentoo-commits

commit:     2afc0e41b8a115da85997f57a9c7e314a27c9017
Author:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 25 01:03:47 2012 +0000
Commit:     Christoph Junghans <kleiner_otti <AT> gmx <DOT> de>
CommitDate: Wed Jul 25 01:03:47 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=2afc0e41

sync with gx86

(Portage version: 2.2.0_alpha120/git/Linux i686, unsigned Manifest commit)

---
 sci-chemistry/votca-csg/ChangeLog             |    3 +++
 sci-chemistry/votca-csg/votca-csg-9999.ebuild |   25 +++++++++++++++----------
 2 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/sci-chemistry/votca-csg/ChangeLog b/sci-chemistry/votca-csg/ChangeLog
index 78729df..97ca527 100644
--- a/sci-chemistry/votca-csg/ChangeLog
+++ b/sci-chemistry/votca-csg/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  25 Jul 2012; Christoph Junghans <ottxor@gentoo.org> votca-csg-9999.ebuild:
+  sync with gx86
+
   18 Jul 2012; Christoph Junghans <ottxor@gentoo.org> metadata.xml,
   votca-csg-9999.ebuild:
   live ebuild update

diff --git a/sci-chemistry/votca-csg/votca-csg-9999.ebuild b/sci-chemistry/votca-csg/votca-csg-9999.ebuild
index 89dda5a..cd73981 100644
--- a/sci-chemistry/votca-csg/votca-csg-9999.ebuild
+++ b/sci-chemistry/votca-csg/votca-csg-9999.ebuild
@@ -7,11 +7,11 @@ EAPI=4
 inherit bash-completion-r1 cmake-utils multilib
 
 IUSE="doc examples extras +gromacs"
-PDEPEND="extras? ( =sci-chemistry/votca-csgapps-${PV} )"
+PDEPEND="extras? ( =sci-chemistry/${PN}apps-${PV} )"
 if [ "${PV}" != "9999" ]; then
 	SRC_URI="http://votca.googlecode.com/files/${PF}.tar.gz
-		doc? ( http://votca.googlecode.com/files/votca-manual-${PV}.pdf )
-		examples? (	http://votca.googlecode.com/files/votca-tutorials-${PV}.tar.gz )"
+		doc? ( http://votca.googlecode.com/files/${PN}-manual-${PV}.pdf )
+		examples? (	http://votca.googlecode.com/files/${PN}-tutorials-${PV}.tar.gz )"
 	RESTRICT="primaryuri"
 else
 	SRC_URI=""
@@ -19,8 +19,8 @@ else
 	EHG_REPO_URI="https://csg.votca.googlecode.com/hg"
 	EHG_REVISION="default"
 	S="${WORKDIR}/${EHG_REPO_URI##*/}"
-	PDEPEND="${PDEPEND} doc? ( =app-doc/votca-csg-manual-${PV} )
-		examples? ( =sci-chemistry/votca-csg-tutorials-${PV} )"
+	PDEPEND="${PDEPEND} doc? ( =app-doc/${PN}-manual-${PV} )
+		examples? ( =sci-chemistry/${PN}-tutorials-${PV} )"
 fi
 
 DESCRIPTION="Votca coarse-graining engine"
@@ -28,7 +28,7 @@ HOMEPAGE="http://www.votca.org"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-macos"
 
 RDEPEND="=sci-libs/votca-tools-${PV}
 	gromacs? ( sci-chemistry/gromacs )
@@ -36,24 +36,29 @@ RDEPEND="=sci-libs/votca-tools-${PV}
 	app-shells/bash"
 
 DEPEND="${RDEPEND}
-	doc? ( || ( <app-doc/doxygen-1.7.6.1[-nodot] >=app-doc/doxygen-1.7.6.1[dot]	) )
+	doc? ( || ( <app-doc/doxygen-1.7.6.1[-nodot] >=app-doc/doxygen-1.7.6.1[dot] ) )
 	>=app-text/txt2tags-2.5
 	virtual/pkgconfig"
 
 DOCS=( README NOTICE )
 
 src_configure() {
-	local GMX_DEV="OFF" GMX_DOUBLE="OFF"
+	local GMX_DEV="OFF" GMX_DOUBLE="OFF" extra
 
 	if use gromacs; then
 		has_version =sci-chemistry/gromacs-9999 && GMX_DEV="ON"
 		has_version sci-chemistry/gromacs[double-precision] && GMX_DOUBLE="ON"
 	fi
 
+	#to create man pages, build tree binaries are executed (bug #398437)
+	[[ ${CHOST} = *-darwin* ]] && \
+		extra+=" -DCMAKE_BUILD_WITH_INSTALL_RPATH=OFF"
+
 	mycmakeargs=(
 		$(cmake-utils_use_with gromacs GMX)
 		-DWITH_GMX_DEVEL="${GMX_DEV}"
 		-DGMX_DOUBLE="${GMX_DOUBLE}"
+		${extra}
 		-DWITH_RC_FILES=OFF
 		-DLIB=$(get_libdir)
 	)
@@ -65,7 +70,7 @@ src_install() {
 	cmake-utils_src_install
 	if use doc; then
 		if [ -n "${PV##*9999}" ]; then
-			dodoc "${DISTDIR}/votca-manual-${PV}.pdf"
+			dodoc "${DISTDIR}/${PN}-manual-${PV}.pdf"
 		fi
 		cd "${CMAKE_BUILD_DIR}" || die
 		emake html
@@ -74,7 +79,7 @@ src_install() {
 	if use examples && [ -n "${PV##*9999}" ]; then
 		insinto "/usr/share/doc/${PF}/tutorials"
 		docompress -x "/usr/share/doc/${PF}/tutorials"
-		doins -r "${WORKDIR}/votca-tutorials-${PV}"/*
+		doins -r "${WORKDIR}/${PN}-tutorials-${PV}"/*
 	fi
 }
 


^ permalink raw reply related	[flat|nested] 36+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-chemistry/votca-csg/
@ 2012-07-18  2:53 Christoph Junghans
  0 siblings, 0 replies; 36+ messages in thread
From: Christoph Junghans @ 2012-07-18  2:53 UTC (permalink / raw
  To: gentoo-commits

commit:     702d359f7ed12fc3987a8d8c6733eb3b8deea4b8
Author:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 18 02:52:44 2012 +0000
Commit:     Christoph Junghans <kleiner_otti <AT> gmx <DOT> de>
CommitDate: Wed Jul 18 02:52:44 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=702d359f

live ebuild update

(Portage version: 2.2.0_alpha118/git/Linux i686, unsigned Manifest commit)

---
 sci-chemistry/votca-csg/ChangeLog             |    5 ++++-
 sci-chemistry/votca-csg/metadata.xml          |    1 -
 sci-chemistry/votca-csg/votca-csg-9999.ebuild |    7 +++----
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/sci-chemistry/votca-csg/ChangeLog b/sci-chemistry/votca-csg/ChangeLog
index ed1263a..78729df 100644
--- a/sci-chemistry/votca-csg/ChangeLog
+++ b/sci-chemistry/votca-csg/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  18 Jul 2012; Christoph Junghans <ottxor@gentoo.org> metadata.xml,
+  votca-csg-9999.ebuild:
+  live ebuild update
+
   24 Mar 2012; Christoph Junghans <ottxor@gentoo.org> votca-csg-9999.ebuild:
   Fixes bug #405455, again
 
@@ -154,4 +158,3 @@
   13 Dec 2009; Christoph Junghans <kleiner_otti@gmx.de>
   +votca-csg-1.0_rc1.ebuild, +metadata.xml:
   initial add bug #296707
-

diff --git a/sci-chemistry/votca-csg/metadata.xml b/sci-chemistry/votca-csg/metadata.xml
index b78ffaa..8721d10 100644
--- a/sci-chemistry/votca-csg/metadata.xml
+++ b/sci-chemistry/votca-csg/metadata.xml
@@ -8,7 +8,6 @@
 	</maintainer>
 	<use>
 		<flag name='gromacs'>Add support for gromacs file formats through <pkg>sci-chemistry/gromacs</pkg></flag>
-		<flag name='system-boost'>Use system boost (<pkg>dev-libs/boost</pkg>) instead of bundled one</flag>
 		<flag name='extras'>Pull in extra applications from <pkg>sci-chemistry/votca-csg-apps</pkg></flag>
 	</use>
 </pkgmetadata>

diff --git a/sci-chemistry/votca-csg/votca-csg-9999.ebuild b/sci-chemistry/votca-csg/votca-csg-9999.ebuild
index 2944681..89dda5a 100644
--- a/sci-chemistry/votca-csg/votca-csg-9999.ebuild
+++ b/sci-chemistry/votca-csg/votca-csg-9999.ebuild
@@ -6,7 +6,7 @@ EAPI=4
 
 inherit bash-completion-r1 cmake-utils multilib
 
-IUSE="doc examples extras +gromacs +system-boost"
+IUSE="doc examples extras +gromacs"
 PDEPEND="extras? ( =sci-chemistry/votca-csgapps-${PV} )"
 if [ "${PV}" != "9999" ]; then
 	SRC_URI="http://votca.googlecode.com/files/${PF}.tar.gz
@@ -30,7 +30,7 @@ LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~x86 ~amd64"
 
-RDEPEND="=sci-libs/votca-tools-${PV}[system-boost=]
+RDEPEND="=sci-libs/votca-tools-${PV}
 	gromacs? ( sci-chemistry/gromacs )
 	dev-lang/perl
 	app-shells/bash"
@@ -38,7 +38,7 @@ RDEPEND="=sci-libs/votca-tools-${PV}[system-boost=]
 DEPEND="${RDEPEND}
 	doc? ( || ( <app-doc/doxygen-1.7.6.1[-nodot] >=app-doc/doxygen-1.7.6.1[dot]	) )
 	>=app-text/txt2tags-2.5
-	dev-util/pkgconfig"
+	virtual/pkgconfig"
 
 DOCS=( README NOTICE )
 
@@ -51,7 +51,6 @@ src_configure() {
 	fi
 
 	mycmakeargs=(
-		$(cmake-utils_use system-boost EXTERNAL_BOOST)
 		$(cmake-utils_use_with gromacs GMX)
 		-DWITH_GMX_DEVEL="${GMX_DEV}"
 		-DGMX_DOUBLE="${GMX_DOUBLE}"



^ permalink raw reply related	[flat|nested] 36+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-chemistry/votca-csg/
@ 2012-03-24 22:46 Christoph Junghans
  0 siblings, 0 replies; 36+ messages in thread
From: Christoph Junghans @ 2012-03-24 22:46 UTC (permalink / raw
  To: gentoo-commits

commit:     447a8be03906f12aaebbef365e9321bb56221c2b
Author:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 24 22:46:12 2012 +0000
Commit:     Christoph Junghans <kleiner_otti <AT> gmx <DOT> de>
CommitDate: Sat Mar 24 22:46:12 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=447a8be0

Fixes bug #405455, again

(Portage version: 2.2.0_alpha95/git/Linux i686, unsigned Manifest commit)

---
 sci-chemistry/votca-csg/ChangeLog             |    5 ++++-
 sci-chemistry/votca-csg/votca-csg-9999.ebuild |    4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/sci-chemistry/votca-csg/ChangeLog b/sci-chemistry/votca-csg/ChangeLog
index c5c2138..ed1263a 100644
--- a/sci-chemistry/votca-csg/ChangeLog
+++ b/sci-chemistry/votca-csg/ChangeLog
@@ -1,7 +1,10 @@
 # ChangeLog for sci-chemistry/votca-csg
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  24 Mar 2012; Christoph Junghans <ottxor@gentoo.org> votca-csg-9999.ebuild:
+  Fixes bug #405455, again
+
   05 Nov 2011; Christoph Junghans <ottxor@gentoo.org> votca-csg-9999.ebuild:
   multilib support
 

diff --git a/sci-chemistry/votca-csg/votca-csg-9999.ebuild b/sci-chemistry/votca-csg/votca-csg-9999.ebuild
index 0f2173e..2944681 100644
--- a/sci-chemistry/votca-csg/votca-csg-9999.ebuild
+++ b/sci-chemistry/votca-csg/votca-csg-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -36,7 +36,7 @@ RDEPEND="=sci-libs/votca-tools-${PV}[system-boost=]
 	app-shells/bash"
 
 DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen[-nodot] )
+	doc? ( || ( <app-doc/doxygen-1.7.6.1[-nodot] >=app-doc/doxygen-1.7.6.1[dot]	) )
 	>=app-text/txt2tags-2.5
 	dev-util/pkgconfig"
 



^ permalink raw reply related	[flat|nested] 36+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-chemistry/votca-csg/
@ 2011-11-05  2:33 Christoph Junghans
  0 siblings, 0 replies; 36+ messages in thread
From: Christoph Junghans @ 2011-11-05  2:33 UTC (permalink / raw
  To: gentoo-commits

commit:     a8c4e28ae8a2a3583e2315205d5876712834a9d0
Author:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
AuthorDate: Sat Nov  5 02:33:26 2011 +0000
Commit:     Christoph Junghans <kleiner_otti <AT> gmx <DOT> de>
CommitDate: Sat Nov  5 02:33:26 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=a8c4e28a

multilib support

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

---
 sci-chemistry/votca-csg/ChangeLog             |    3 +++
 sci-chemistry/votca-csg/votca-csg-9999.ebuild |    5 ++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/sci-chemistry/votca-csg/ChangeLog b/sci-chemistry/votca-csg/ChangeLog
index a289cbc..c5c2138 100644
--- a/sci-chemistry/votca-csg/ChangeLog
+++ b/sci-chemistry/votca-csg/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  05 Nov 2011; Christoph Junghans <ottxor@gentoo.org> votca-csg-9999.ebuild:
+  multilib support
+
   03 Nov 2011; Christoph Junghans <ottxor@gentoo.org> votca-csg-9999.ebuild:
   live ebuild update
 

diff --git a/sci-chemistry/votca-csg/votca-csg-9999.ebuild b/sci-chemistry/votca-csg/votca-csg-9999.ebuild
index 8b73e8f..0f2173e 100644
--- a/sci-chemistry/votca-csg/votca-csg-9999.ebuild
+++ b/sci-chemistry/votca-csg/votca-csg-9999.ebuild
@@ -69,9 +69,8 @@ src_install() {
 			dodoc "${DISTDIR}/votca-manual-${PV}.pdf"
 		fi
 		cd "${CMAKE_BUILD_DIR}" || die
-		cd share/doc || die
-		doxygen || die
-		dohtml -r html/*
+		emake html
+		dohtml -r share/doc/html/*
 	fi
 	if use examples && [ -n "${PV##*9999}" ]; then
 		insinto "/usr/share/doc/${PF}/tutorials"



^ permalink raw reply related	[flat|nested] 36+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-chemistry/votca-csg/
@ 2011-11-05  2:33 Christoph Junghans
  0 siblings, 0 replies; 36+ messages in thread
From: Christoph Junghans @ 2011-11-05  2:33 UTC (permalink / raw
  To: gentoo-commits

commit:     ef979d46c50651e1d7ca6bf63435aecb7fd7758f
Author:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
AuthorDate: Sat Nov  5 02:27:07 2011 +0000
Commit:     Christoph Junghans <kleiner_otti <AT> gmx <DOT> de>
CommitDate: Sat Nov  5 02:27:07 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=ef979d46

multilib support

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

---
 sci-chemistry/votca-csg/votca-csg-9999.ebuild |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/sci-chemistry/votca-csg/votca-csg-9999.ebuild b/sci-chemistry/votca-csg/votca-csg-9999.ebuild
index cd1b64b..8b73e8f 100644
--- a/sci-chemistry/votca-csg/votca-csg-9999.ebuild
+++ b/sci-chemistry/votca-csg/votca-csg-9999.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=4
 
-inherit bash-completion-r1 cmake-utils
+inherit bash-completion-r1 cmake-utils multilib
 
 IUSE="doc examples extras +gromacs +system-boost"
 PDEPEND="extras? ( =sci-chemistry/votca-csgapps-${PV} )"
@@ -56,6 +56,7 @@ src_configure() {
 		-DWITH_GMX_DEVEL="${GMX_DEV}"
 		-DGMX_DOUBLE="${GMX_DOUBLE}"
 		-DWITH_RC_FILES=OFF
+		-DLIB=$(get_libdir)
 	)
 	cmake-utils_src_configure
 }



^ permalink raw reply related	[flat|nested] 36+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-chemistry/votca-csg/
@ 2011-11-03 23:51 Christoph Junghans
  0 siblings, 0 replies; 36+ messages in thread
From: Christoph Junghans @ 2011-11-03 23:51 UTC (permalink / raw
  To: gentoo-commits

commit:     dee379edcab79b47b565a31e3474caa9b166354b
Author:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
AuthorDate: Thu Nov  3 23:41:40 2011 +0000
Commit:     Christoph Junghans <kleiner_otti <AT> gmx <DOT> de>
CommitDate: Thu Nov  3 23:41:40 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=dee379ed

live ebuild update

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

---
 sci-chemistry/votca-csg/ChangeLog             |    3 +++
 sci-chemistry/votca-csg/votca-csg-9999.ebuild |    3 ++-
 2 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/sci-chemistry/votca-csg/ChangeLog b/sci-chemistry/votca-csg/ChangeLog
index 3f87b90..a289cbc 100644
--- a/sci-chemistry/votca-csg/ChangeLog
+++ b/sci-chemistry/votca-csg/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  03 Nov 2011; Christoph Junghans <ottxor@gentoo.org> votca-csg-9999.ebuild:
+  live ebuild update
+
   10 Sep 2011; Christoph Junghans <ottxor@gentoo.org> votca-csg-9999.ebuild:
   Migrate to the bash-completion-r1 eclass
 

diff --git a/sci-chemistry/votca-csg/votca-csg-9999.ebuild b/sci-chemistry/votca-csg/votca-csg-9999.ebuild
index 88f3136..cd1b64b 100644
--- a/sci-chemistry/votca-csg/votca-csg-9999.ebuild
+++ b/sci-chemistry/votca-csg/votca-csg-9999.ebuild
@@ -40,6 +40,8 @@ DEPEND="${RDEPEND}
 	>=app-text/txt2tags-2.5
 	dev-util/pkgconfig"
 
+DOCS=( README NOTICE )
+
 src_configure() {
 	local GMX_DEV="OFF" GMX_DOUBLE="OFF"
 
@@ -59,7 +61,6 @@ src_configure() {
 }
 
 src_install() {
-	DOCS=(README NOTICE ${CMAKE_BUILD_DIR}/CHANGELOG)
 	newbashcomp scripts/csg-completion.bash ${PN}
 	cmake-utils_src_install
 	if use doc; then



^ permalink raw reply related	[flat|nested] 36+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-chemistry/votca-csg/
@ 2011-09-10 15:04 Christoph Junghans
  0 siblings, 0 replies; 36+ messages in thread
From: Christoph Junghans @ 2011-09-10 15:04 UTC (permalink / raw
  To: gentoo-commits

commit:     4a871b856056a066870aeb534e364d3060f69ae6
Author:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 10 15:03:54 2011 +0000
Commit:     Christoph Junghans <kleiner_otti <AT> gmx <DOT> de>
CommitDate: Sat Sep 10 15:03:54 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=4a871b85

[sci-chemistry/votca-csg] remove obsolete bash-completion_pkg_postinst

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

---
 sci-chemistry/votca-csg/votca-csg-9999.ebuild |   11 +++++------
 1 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/sci-chemistry/votca-csg/votca-csg-9999.ebuild b/sci-chemistry/votca-csg/votca-csg-9999.ebuild
index ebe33dc..88f3136 100644
--- a/sci-chemistry/votca-csg/votca-csg-9999.ebuild
+++ b/sci-chemistry/votca-csg/votca-csg-9999.ebuild
@@ -79,10 +79,9 @@ src_install() {
 }
 
 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
+	einfo
+	einfo "Please read and cite:"
+	einfo "VOTCA, J. Chem. Theory Comput. 5, 3211 (2009). "
+	einfo "http://dx.doi.org/10.1021/ct900369w"
+	einfo
 }



^ permalink raw reply related	[flat|nested] 36+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-chemistry/votca-csg/
@ 2011-09-10 14:57 Christoph Junghans
  0 siblings, 0 replies; 36+ messages in thread
From: Christoph Junghans @ 2011-09-10 14:57 UTC (permalink / raw
  To: gentoo-commits

commit:     9b61f44c442a5b4046385a89d20b3ec99cc40e29
Author:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 10 14:56:55 2011 +0000
Commit:     Christoph Junghans <kleiner_otti <AT> gmx <DOT> de>
CommitDate: Sat Sep 10 14:56:55 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=9b61f44c

[sci-chemistry/votca-csg] Migrate to the bash-completion-r1 eclass

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

---
 sci-chemistry/votca-csg/ChangeLog             |    3 +++
 sci-chemistry/votca-csg/votca-csg-9999.ebuild |    4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/sci-chemistry/votca-csg/ChangeLog b/sci-chemistry/votca-csg/ChangeLog
index 9771664..3f87b90 100644
--- a/sci-chemistry/votca-csg/ChangeLog
+++ b/sci-chemistry/votca-csg/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  10 Sep 2011; Christoph Junghans <ottxor@gentoo.org> votca-csg-9999.ebuild:
+  Migrate to the bash-completion-r1 eclass
+
   05 Sep 2011; Christoph Junghans <ottxor@gentoo.org> votca-csg-9999.ebuild:
   update due to upstream
 

diff --git a/sci-chemistry/votca-csg/votca-csg-9999.ebuild b/sci-chemistry/votca-csg/votca-csg-9999.ebuild
index dbab6aa..ebe33dc 100644
--- a/sci-chemistry/votca-csg/votca-csg-9999.ebuild
+++ b/sci-chemistry/votca-csg/votca-csg-9999.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=4
 
-inherit bash-completion cmake-utils
+inherit bash-completion-r1 cmake-utils
 
 IUSE="doc examples extras +gromacs +system-boost"
 PDEPEND="extras? ( =sci-chemistry/votca-csgapps-${PV} )"
@@ -60,7 +60,7 @@ src_configure() {
 
 src_install() {
 	DOCS=(README NOTICE ${CMAKE_BUILD_DIR}/CHANGELOG)
-	dobashcompletion scripts/csg-completion.bash ${PN}
+	newbashcomp scripts/csg-completion.bash ${PN}
 	cmake-utils_src_install
 	if use doc; then
 		if [ -n "${PV##*9999}" ]; then



^ permalink raw reply related	[flat|nested] 36+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-chemistry/votca-csg/
@ 2011-09-05 17:13 Christoph Junghans
  0 siblings, 0 replies; 36+ messages in thread
From: Christoph Junghans @ 2011-09-05 17:13 UTC (permalink / raw
  To: gentoo-commits

commit:     840a8a0dc0dee9eb56a03674f32932447ffa7924
Author:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
AuthorDate: Mon Sep  5 17:13:34 2011 +0000
Commit:     Christoph Junghans <kleiner_otti <AT> gmx <DOT> de>
CommitDate: Mon Sep  5 17:13:34 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=840a8a0d

[sci-chemistry/votca-csg] updates

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

---
 sci-chemistry/votca-csg/ChangeLog             |    3 +++
 sci-chemistry/votca-csg/votca-csg-9999.ebuild |   11 +++++++----
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/sci-chemistry/votca-csg/ChangeLog b/sci-chemistry/votca-csg/ChangeLog
index 1d24b51..9771664 100644
--- a/sci-chemistry/votca-csg/ChangeLog
+++ b/sci-chemistry/votca-csg/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  05 Sep 2011; Christoph Junghans <ottxor@gentoo.org> votca-csg-9999.ebuild:
+  update due to upstream
+
   25 Aug 2011; Christoph Junghans <ottxor@gentoo.org> votca-csg-9999.ebuild:
   changes due to 1.2.1 release
 

diff --git a/sci-chemistry/votca-csg/votca-csg-9999.ebuild b/sci-chemistry/votca-csg/votca-csg-9999.ebuild
index 41c626c..dbab6aa 100644
--- a/sci-chemistry/votca-csg/votca-csg-9999.ebuild
+++ b/sci-chemistry/votca-csg/votca-csg-9999.ebuild
@@ -41,15 +41,18 @@ DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
 src_configure() {
-	local extra="-DWITH_GMX_DEVEL=OFF"
+	local GMX_DEV="OFF" GMX_DOUBLE="OFF"
 
-	use gromacs && has_version =sci-chemistry/gromacs-9999 && \
-		extra="-DWITH_GMX_DEVEL=ON"
+	if use gromacs; then
+		has_version =sci-chemistry/gromacs-9999 && GMX_DEV="ON"
+		has_version sci-chemistry/gromacs[double-precision] && GMX_DOUBLE="ON"
+	fi
 
 	mycmakeargs=(
 		$(cmake-utils_use system-boost EXTERNAL_BOOST)
 		$(cmake-utils_use_with gromacs GMX)
-		${extra}
+		-DWITH_GMX_DEVEL="${GMX_DEV}"
+		-DGMX_DOUBLE="${GMX_DOUBLE}"
 		-DWITH_RC_FILES=OFF
 	)
 	cmake-utils_src_configure



^ permalink raw reply related	[flat|nested] 36+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-chemistry/votca-csg/
@ 2011-08-25 20:33 Christoph Junghans
  0 siblings, 0 replies; 36+ messages in thread
From: Christoph Junghans @ 2011-08-25 20:33 UTC (permalink / raw
  To: gentoo-commits

commit:     a6f3841e3fb1cf76b9cd9ec5bae98665fad6ccdb
Author:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 25 20:33:20 2011 +0000
Commit:     Christoph Junghans <kleiner_otti <AT> gmx <DOT> de>
CommitDate: Thu Aug 25 20:33:20 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=a6f3841e

[sci-chemistry/votca-csg] changes due to 1.2.1 release

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

---
 sci-chemistry/votca-csg/ChangeLog             |    3 +++
 sci-chemistry/votca-csg/votca-csg-9999.ebuild |   20 ++++++++------------
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/sci-chemistry/votca-csg/ChangeLog b/sci-chemistry/votca-csg/ChangeLog
index fab3ab8..1d24b51 100644
--- a/sci-chemistry/votca-csg/ChangeLog
+++ b/sci-chemistry/votca-csg/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  25 Aug 2011; Christoph Junghans <ottxor@gentoo.org> votca-csg-9999.ebuild:
+  changes due to 1.2.1 release
+
   14 Aug 2011; Christoph Junghans <ottxor@gentoo.org> votca-csg-9999.ebuild,
   metadata.xml:
   renamed boost useflag to system-boost

diff --git a/sci-chemistry/votca-csg/votca-csg-9999.ebuild b/sci-chemistry/votca-csg/votca-csg-9999.ebuild
index da64ad6..41c626c 100644
--- a/sci-chemistry/votca-csg/votca-csg-9999.ebuild
+++ b/sci-chemistry/votca-csg/votca-csg-9999.ebuild
@@ -6,25 +6,21 @@ EAPI=4
 
 inherit bash-completion cmake-utils
 
-MANUAL_PV=1.2
-TUTORIAL_PV=1.2
-IUSE="doc examples +gromacs +system-boost"
+IUSE="doc examples extras +gromacs +system-boost"
+PDEPEND="extras? ( =sci-chemistry/votca-csgapps-${PV} )"
 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 )
-		examples? (	http://votca.googlecode.com/files/votca-tutorials-${TUTORIAL_PV}.tar.gz )"
+		doc? ( http://votca.googlecode.com/files/votca-manual-${PV}.pdf )
+		examples? (	http://votca.googlecode.com/files/votca-tutorials-${PV}.tar.gz )"
 	RESTRICT="primaryuri"
 else
 	SRC_URI=""
-	#make this a common use when csg-apps get released
-	IUSE="${IUSE} extras"
 	inherit mercurial
 	EHG_REPO_URI="https://csg.votca.googlecode.com/hg"
 	EHG_REVISION="default"
 	S="${WORKDIR}/${EHG_REPO_URI##*/}"
-	PDEPEND="doc? ( =app-doc/votca-csg-manual-${PV} )
-		examples? ( =sci-chemistry/votca-csg-tutorials-${PV} )
-		extras? ( =sci-chemistry/votca-csg-apps-${PV} )"
+	PDEPEND="${PDEPEND} doc? ( =app-doc/votca-csg-manual-${PV} )
+		examples? ( =sci-chemistry/votca-csg-tutorials-${PV} )"
 fi
 
 DESCRIPTION="Votca coarse-graining engine"
@@ -65,7 +61,7 @@ src_install() {
 	cmake-utils_src_install
 	if use doc; then
 		if [ -n "${PV##*9999}" ]; then
-			dodoc "${DISTDIR}/votca-manual-${MANUAL_PV}.pdf"
+			dodoc "${DISTDIR}/votca-manual-${PV}.pdf"
 		fi
 		cd "${CMAKE_BUILD_DIR}" || die
 		cd share/doc || die
@@ -75,7 +71,7 @@ src_install() {
 	if use examples && [ -n "${PV##*9999}" ]; then
 		insinto "/usr/share/doc/${PF}/tutorials"
 		docompress -x "/usr/share/doc/${PF}/tutorials"
-		doins -r "${WORKDIR}/votca-tutorials-${TUTORIAL_PV}"/*
+		doins -r "${WORKDIR}/votca-tutorials-${PV}"/*
 	fi
 }
 



^ permalink raw reply related	[flat|nested] 36+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-chemistry/votca-csg/
@ 2011-08-14 15:04 Christoph Junghans
  0 siblings, 0 replies; 36+ messages in thread
From: Christoph Junghans @ 2011-08-14 15:04 UTC (permalink / raw
  To: gentoo-commits

commit:     b7de0d7eeca355c0743608b16a80d92936646094
Author:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 14 15:03:53 2011 +0000
Commit:     Christoph Junghans <kleiner_otti <AT> gmx <DOT> de>
CommitDate: Sun Aug 14 15:03:53 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=b7de0d7e

[sci-chemistry/votca-csg] renamed boost useflag

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

---
 sci-chemistry/votca-csg/ChangeLog             |    4 ++++
 sci-chemistry/votca-csg/metadata.xml          |    4 ++--
 sci-chemistry/votca-csg/votca-csg-9999.ebuild |    8 +++++---
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/sci-chemistry/votca-csg/ChangeLog b/sci-chemistry/votca-csg/ChangeLog
index a5bf6b7..fab3ab8 100644
--- a/sci-chemistry/votca-csg/ChangeLog
+++ b/sci-chemistry/votca-csg/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  14 Aug 2011; Christoph Junghans <ottxor@gentoo.org> votca-csg-9999.ebuild,
+  metadata.xml:
+  renamed boost useflag to system-boost
+
   17 Jul 2011; Christoph Junghans <ottxor@gentoo.org> votca-csg-9999.ebuild,
   metadata.xml:
   Added IUSE=extras

diff --git a/sci-chemistry/votca-csg/metadata.xml b/sci-chemistry/votca-csg/metadata.xml
index 4251b38..b78ffaa 100644
--- a/sci-chemistry/votca-csg/metadata.xml
+++ b/sci-chemistry/votca-csg/metadata.xml
@@ -8,7 +8,7 @@
 	</maintainer>
 	<use>
 		<flag name='gromacs'>Add support for gromacs file formats through <pkg>sci-chemistry/gromacs</pkg></flag>
-		<flag name='boost'>Compile against external boost headers from <pkg>dev-libs/boost</pkg></flag>
-		<flag name='extras'>Pull in extra applications from <pkg>dev-libs/boost</pkg></flag>
+		<flag name='system-boost'>Use system boost (<pkg>dev-libs/boost</pkg>) instead of bundled one</flag>
+		<flag name='extras'>Pull in extra applications from <pkg>sci-chemistry/votca-csg-apps</pkg></flag>
 	</use>
 </pkgmetadata>

diff --git a/sci-chemistry/votca-csg/votca-csg-9999.ebuild b/sci-chemistry/votca-csg/votca-csg-9999.ebuild
index ca93f3a..da64ad6 100644
--- a/sci-chemistry/votca-csg/votca-csg-9999.ebuild
+++ b/sci-chemistry/votca-csg/votca-csg-9999.ebuild
@@ -8,6 +8,7 @@ inherit bash-completion cmake-utils
 
 MANUAL_PV=1.2
 TUTORIAL_PV=1.2
+IUSE="doc examples +gromacs +system-boost"
 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 )
@@ -15,6 +16,8 @@ if [ "${PV}" != "9999" ]; then
 	RESTRICT="primaryuri"
 else
 	SRC_URI=""
+	#make this a common use when csg-apps get released
+	IUSE="${IUSE} extras"
 	inherit mercurial
 	EHG_REPO_URI="https://csg.votca.googlecode.com/hg"
 	EHG_REVISION="default"
@@ -30,9 +33,8 @@ HOMEPAGE="http://www.votca.org"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~x86 ~amd64"
-IUSE="-boost doc examples extras +gromacs"
 
-RDEPEND="=sci-libs/votca-tools-${PV}[boost=]
+RDEPEND="=sci-libs/votca-tools-${PV}[system-boost=]
 	gromacs? ( sci-chemistry/gromacs )
 	dev-lang/perl
 	app-shells/bash"
@@ -49,7 +51,7 @@ src_configure() {
 		extra="-DWITH_GMX_DEVEL=ON"
 
 	mycmakeargs=(
-		$(cmake-utils_use boost EXTERNAL_BOOST)
+		$(cmake-utils_use system-boost EXTERNAL_BOOST)
 		$(cmake-utils_use_with gromacs GMX)
 		${extra}
 		-DWITH_RC_FILES=OFF



^ permalink raw reply related	[flat|nested] 36+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-chemistry/votca-csg/
@ 2011-07-17 13:14 Christoph Junghans
  0 siblings, 0 replies; 36+ messages in thread
From: Christoph Junghans @ 2011-07-17 13:14 UTC (permalink / raw
  To: gentoo-commits

commit:     6ac593530eeabc94308faf47e9ecf2ad6e08d112
Author:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 17 13:14:27 2011 +0000
Commit:     Christoph Junghans <kleiner_otti <AT> gmx <DOT> de>
CommitDate: Sun Jul 17 13:14:27 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=6ac59353

[sci-chemistry/votca-csg] Added IUSE=extras

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

---
 sci-chemistry/votca-csg/ChangeLog             |    4 ++++
 sci-chemistry/votca-csg/metadata.xml          |    5 +++--
 sci-chemistry/votca-csg/votca-csg-9999.ebuild |    5 +++--
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/sci-chemistry/votca-csg/ChangeLog b/sci-chemistry/votca-csg/ChangeLog
index e74f9ef..a5bf6b7 100644
--- a/sci-chemistry/votca-csg/ChangeLog
+++ b/sci-chemistry/votca-csg/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  17 Jul 2011; Christoph Junghans <ottxor@gentoo.org> votca-csg-9999.ebuild,
+  metadata.xml:
+  Added IUSE=extras
+
   17 Jul 2011; Christoph Junghans <ottxor@gentoo.org> votca-csg-9999.ebuild:
   Added IUSE=examples
 

diff --git a/sci-chemistry/votca-csg/metadata.xml b/sci-chemistry/votca-csg/metadata.xml
index 7ba3377..4251b38 100644
--- a/sci-chemistry/votca-csg/metadata.xml
+++ b/sci-chemistry/votca-csg/metadata.xml
@@ -7,7 +7,8 @@
 		<name>Christoph Junghans</name>
 	</maintainer>
 	<use>
-		<flag name='gromacs'>Add support for gromacs file formats (sci-chemistry/gromacs)</flag>
-		<flag name='boost'>Compile against external boost headers (dev-libs/boost)</flag>
+		<flag name='gromacs'>Add support for gromacs file formats through <pkg>sci-chemistry/gromacs</pkg></flag>
+		<flag name='boost'>Compile against external boost headers from <pkg>dev-libs/boost</pkg></flag>
+		<flag name='extras'>Pull in extra applications from <pkg>dev-libs/boost</pkg></flag>
 	</use>
 </pkgmetadata>

diff --git a/sci-chemistry/votca-csg/votca-csg-9999.ebuild b/sci-chemistry/votca-csg/votca-csg-9999.ebuild
index 8e017c4..ca93f3a 100644
--- a/sci-chemistry/votca-csg/votca-csg-9999.ebuild
+++ b/sci-chemistry/votca-csg/votca-csg-9999.ebuild
@@ -20,7 +20,8 @@ else
 	EHG_REVISION="default"
 	S="${WORKDIR}/${EHG_REPO_URI##*/}"
 	PDEPEND="doc? ( =app-doc/votca-csg-manual-${PV} )
-		examples? ( =sci-chemistry/votca-csg-tutorials-${PV} )"
+		examples? ( =sci-chemistry/votca-csg-tutorials-${PV} )
+		extras? ( =sci-chemistry/votca-csg-apps-${PV} )"
 fi
 
 DESCRIPTION="Votca coarse-graining engine"
@@ -29,7 +30,7 @@ HOMEPAGE="http://www.votca.org"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~x86 ~amd64"
-IUSE="-boost doc examples +gromacs"
+IUSE="-boost doc examples extras +gromacs"
 
 RDEPEND="=sci-libs/votca-tools-${PV}[boost=]
 	gromacs? ( sci-chemistry/gromacs )



^ permalink raw reply related	[flat|nested] 36+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-chemistry/votca-csg/
@ 2011-07-17 12:38 Christoph Junghans
  0 siblings, 0 replies; 36+ messages in thread
From: Christoph Junghans @ 2011-07-17 12:38 UTC (permalink / raw
  To: gentoo-commits

commit:     e3392a27d155f2d9fe4402d39a3dd84703ecc224
Author:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 17 12:38:03 2011 +0000
Commit:     Christoph Junghans <kleiner_otti <AT> gmx <DOT> de>
CommitDate: Sun Jul 17 12:38:03 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=e3392a27

[sci-chemistry/votca-csg] Added IUSE=examples

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

---
 sci-chemistry/votca-csg/ChangeLog             |    3 ++
 sci-chemistry/votca-csg/votca-csg-9999.ebuild |   28 ++++++++++++++++---------
 2 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/sci-chemistry/votca-csg/ChangeLog b/sci-chemistry/votca-csg/ChangeLog
index 940b1ba..e74f9ef 100644
--- a/sci-chemistry/votca-csg/ChangeLog
+++ b/sci-chemistry/votca-csg/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  17 Jul 2011; Christoph Junghans <ottxor@gentoo.org> votca-csg-9999.ebuild:
+  Added IUSE=examples
+
   24 Jun 2011; Justin Lecher <jlec@gentoo.org> votca-csg-9999.ebuild:
   Sort inherit and/or USE
 

diff --git a/sci-chemistry/votca-csg/votca-csg-9999.ebuild b/sci-chemistry/votca-csg/votca-csg-9999.ebuild
index 224fa2a..8e017c4 100644
--- a/sci-chemistry/votca-csg/votca-csg-9999.ebuild
+++ b/sci-chemistry/votca-csg/votca-csg-9999.ebuild
@@ -2,14 +2,16 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=3
+EAPI=4
 
 inherit bash-completion cmake-utils
 
-MANUAL_PV=1.1
+MANUAL_PV=1.2
+TUTORIAL_PV=1.2
 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 )"
+		doc? ( http://votca.googlecode.com/files/votca-manual-${MANUAL_PV}.pdf )
+		examples? (	http://votca.googlecode.com/files/votca-tutorials-${TUTORIAL_PV}.tar.gz )"
 	RESTRICT="primaryuri"
 else
 	SRC_URI=""
@@ -17,7 +19,8 @@ else
 	EHG_REPO_URI="https://csg.votca.googlecode.com/hg"
 	EHG_REVISION="default"
 	S="${WORKDIR}/${EHG_REPO_URI##*/}"
-	PDEPEND="doc? ( =app-doc/votca-csg-manual-${PV} )"
+	PDEPEND="doc? ( =app-doc/votca-csg-manual-${PV} )
+		examples? ( =sci-chemistry/votca-csg-tutorials-${PV} )"
 fi
 
 DESCRIPTION="Votca coarse-graining engine"
@@ -26,7 +29,7 @@ HOMEPAGE="http://www.votca.org"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~x86 ~amd64"
-IUSE="-boost doc +gromacs"
+IUSE="-boost doc examples +gromacs"
 
 RDEPEND="=sci-libs/votca-tools-${PV}[boost=]
 	gromacs? ( sci-chemistry/gromacs )
@@ -50,21 +53,26 @@ src_configure() {
 		${extra}
 		-DWITH_RC_FILES=OFF
 	)
-	cmake-utils_src_configure || die
+	cmake-utils_src_configure
 }
 
 src_install() {
 	DOCS=(README NOTICE ${CMAKE_BUILD_DIR}/CHANGELOG)
-	dobashcompletion scripts/csg-completion.bash ${PN} || die
-	cmake-utils_src_install || die
+	dobashcompletion scripts/csg-completion.bash ${PN}
+	cmake-utils_src_install
 	if use doc; then
 		if [ -n "${PV##*9999}" ]; then
-			dodoc "${DISTDIR}/votca-manual-${MANUAL_PV}.pdf" || die
+			dodoc "${DISTDIR}/votca-manual-${MANUAL_PV}.pdf"
 		fi
 		cd "${CMAKE_BUILD_DIR}" || die
 		cd share/doc || die
 		doxygen || die
-		dohtml -r html/* || die
+		dohtml -r html/*
+	fi
+	if use examples && [ -n "${PV##*9999}" ]; then
+		insinto "/usr/share/doc/${PF}/tutorials"
+		docompress -x "/usr/share/doc/${PF}/tutorials"
+		doins -r "${WORKDIR}/votca-tutorials-${TUTORIAL_PV}"/*
 	fi
 }
 



^ permalink raw reply related	[flat|nested] 36+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-chemistry/votca-csg/
@ 2011-06-24 17:09 Justin Lecher
  0 siblings, 0 replies; 36+ messages in thread
From: Justin Lecher @ 2011-06-24 17:09 UTC (permalink / raw
  To: gentoo-commits

commit:     991b64842c5ea6e3f3c28548ca3f4ccf0d529d54
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 24 12:36:03 2011 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Fri Jun 24 12:36:03 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=991b6484

Sort inherit and/or USE

(Portage version: 2.2.0_alpha41/git/Linux x86_64, signed Manifest commit with key 70EB7916)

---
 sci-chemistry/votca-csg/ChangeLog             |    3 +++
 sci-chemistry/votca-csg/votca-csg-9999.ebuild |    4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/sci-chemistry/votca-csg/ChangeLog b/sci-chemistry/votca-csg/ChangeLog
index b2b0694..940b1ba 100644
--- a/sci-chemistry/votca-csg/ChangeLog
+++ b/sci-chemistry/votca-csg/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  24 Jun 2011; Justin Lecher <jlec@gentoo.org> votca-csg-9999.ebuild:
+  Sort inherit and/or USE
+
   03 Jun 2011; Christoph Junghans <ottxor@gentoo.org> votca-csg-9999.ebuild:
   use default instead of tip commit
 

diff --git a/sci-chemistry/votca-csg/votca-csg-9999.ebuild b/sci-chemistry/votca-csg/votca-csg-9999.ebuild
index 8782dc4..224fa2a 100644
--- a/sci-chemistry/votca-csg/votca-csg-9999.ebuild
+++ b/sci-chemistry/votca-csg/votca-csg-9999.ebuild
@@ -2,9 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="3"
+EAPI=3
 
-inherit cmake-utils bash-completion
+inherit bash-completion cmake-utils
 
 MANUAL_PV=1.1
 if [ "${PV}" != "9999" ]; then



^ permalink raw reply related	[flat|nested] 36+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-chemistry/votca-csg/
@ 2011-06-03 21:59 Christoph Junghans
  0 siblings, 0 replies; 36+ messages in thread
From: Christoph Junghans @ 2011-06-03 21:59 UTC (permalink / raw
  To: gentoo-commits

commit:     77a57a4f36d6db3784199445c4fd10e40cf97be8
Author:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
AuthorDate: Fri Jun  3 21:54:38 2011 +0000
Commit:     Christoph Junghans <kleiner_otti <AT> gmx <DOT> de>
CommitDate: Fri Jun  3 21:54:38 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=77a57a4f

[sci-chemistry/votca-csg] use default instead of tip

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

---
 sci-chemistry/votca-csg/ChangeLog             |    3 +++
 sci-chemistry/votca-csg/votca-csg-9999.ebuild |    1 +
 2 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/sci-chemistry/votca-csg/ChangeLog b/sci-chemistry/votca-csg/ChangeLog
index 348ee7d..b2b0694 100644
--- a/sci-chemistry/votca-csg/ChangeLog
+++ b/sci-chemistry/votca-csg/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  03 Jun 2011; Christoph Junghans <ottxor@gentoo.org> votca-csg-9999.ebuild:
+  use default instead of tip commit
+
   08 Mar 2011; Christoph Junghans <ottxor@gentoo.org> -votca-csg-1.1.1.ebuild:
   InCVS
 

diff --git a/sci-chemistry/votca-csg/votca-csg-9999.ebuild b/sci-chemistry/votca-csg/votca-csg-9999.ebuild
index f131291..8782dc4 100644
--- a/sci-chemistry/votca-csg/votca-csg-9999.ebuild
+++ b/sci-chemistry/votca-csg/votca-csg-9999.ebuild
@@ -15,6 +15,7 @@ else
 	SRC_URI=""
 	inherit mercurial
 	EHG_REPO_URI="https://csg.votca.googlecode.com/hg"
+	EHG_REVISION="default"
 	S="${WORKDIR}/${EHG_REPO_URI##*/}"
 	PDEPEND="doc? ( =app-doc/votca-csg-manual-${PV} )"
 fi



^ permalink raw reply related	[flat|nested] 36+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-chemistry/votca-csg/
@ 2011-05-28 12:27 Christoph Junghans
  0 siblings, 0 replies; 36+ messages in thread
From: Christoph Junghans @ 2011-05-28 12:27 UTC (permalink / raw
  To: gentoo-commits

commit:     b436820ad96856edd00a6e4003dee0ba02242b1e
Author:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
AuthorDate: Sat May 28 12:26:50 2011 +0000
Commit:     Christoph Junghans <kleiner_otti <AT> gmx <DOT> de>
CommitDate: Sat May 28 12:27:11 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=b436820a

[sci-chemistry/votca-csg] added boost use flag

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

---
 sci-chemistry/votca-csg/metadata.xml          |    1 +
 sci-chemistry/votca-csg/votca-csg-9999.ebuild |   13 +++++++++----
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/sci-chemistry/votca-csg/metadata.xml b/sci-chemistry/votca-csg/metadata.xml
index 9796135..7ba3377 100644
--- a/sci-chemistry/votca-csg/metadata.xml
+++ b/sci-chemistry/votca-csg/metadata.xml
@@ -8,5 +8,6 @@
 	</maintainer>
 	<use>
 		<flag name='gromacs'>Add support for gromacs file formats (sci-chemistry/gromacs)</flag>
+		<flag name='boost'>Compile against external boost headers (dev-libs/boost)</flag>
 	</use>
 </pkgmetadata>

diff --git a/sci-chemistry/votca-csg/votca-csg-9999.ebuild b/sci-chemistry/votca-csg/votca-csg-9999.ebuild
index 32d0ead..f131291 100644
--- a/sci-chemistry/votca-csg/votca-csg-9999.ebuild
+++ b/sci-chemistry/votca-csg/votca-csg-9999.ebuild
@@ -25,10 +25,10 @@ HOMEPAGE="http://www.votca.org"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~x86 ~amd64"
-IUSE="doc +gromacs"
+IUSE="-boost doc +gromacs"
 
-RDEPEND="=sci-libs/votca-tools-${PV}
-	gromacs? ( >=sci-chemistry/gromacs-4.0.7-r5 )
+RDEPEND="=sci-libs/votca-tools-${PV}[boost=]
+	gromacs? ( sci-chemistry/gromacs )
 	dev-lang/perl
 	app-shells/bash"
 
@@ -43,7 +43,12 @@ src_configure() {
 	use gromacs && has_version =sci-chemistry/gromacs-9999 && \
 		extra="-DWITH_GMX_DEVEL=ON"
 
-	mycmakeargs=( $(cmake-utils_use_with gromacs GMX) ${extra} -DWITH_RC_FILES=OFF )
+	mycmakeargs=(
+		$(cmake-utils_use boost EXTERNAL_BOOST)
+		$(cmake-utils_use_with gromacs GMX)
+		${extra}
+		-DWITH_RC_FILES=OFF
+	)
 	cmake-utils_src_configure || die
 }
 



^ permalink raw reply related	[flat|nested] 36+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-chemistry/votca-csg/
@ 2011-03-10 19:51 Christoph Junghans
  0 siblings, 0 replies; 36+ messages in thread
From: Christoph Junghans @ 2011-03-10 19:51 UTC (permalink / raw
  To: gentoo-commits

commit:     6716e13868fdb685b1b323f180fdf5d00609163e
Author:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 10 19:49:45 2011 +0000
Commit:     Christoph Junghans <kleiner_otti <AT> gmx <DOT> de>
CommitDate: Thu Mar 10 19:49:45 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=6716e138

[sci-chemistry/votca-csg] updated deps

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

---
 sci-chemistry/votca-csg/votca-csg-9999.ebuild |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/sci-chemistry/votca-csg/votca-csg-9999.ebuild b/sci-chemistry/votca-csg/votca-csg-9999.ebuild
index 87b656e..32d0ead 100644
--- a/sci-chemistry/votca-csg/votca-csg-9999.ebuild
+++ b/sci-chemistry/votca-csg/votca-csg-9999.ebuild
@@ -16,7 +16,7 @@ else
 	inherit mercurial
 	EHG_REPO_URI="https://csg.votca.googlecode.com/hg"
 	S="${WORKDIR}/${EHG_REPO_URI##*/}"
-	PDEPEND="doc? ( =app-doc/votca-manual-${PV} )"
+	PDEPEND="doc? ( =app-doc/votca-csg-manual-${PV} )"
 fi
 
 DESCRIPTION="Votca coarse-graining engine"



^ permalink raw reply related	[flat|nested] 36+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-chemistry/votca-csg/
@ 2011-03-08 21:40 Christoph Junghans
  0 siblings, 0 replies; 36+ messages in thread
From: Christoph Junghans @ 2011-03-08 21:40 UTC (permalink / raw
  To: gentoo-commits

commit:     14b5e2401e7c21b0af49be2f203d89c23b5b0c6b
Author:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
AuthorDate: Tue Mar  8 21:38:07 2011 +0000
Commit:     Christoph Junghans <kleiner_otti <AT> gmx <DOT> de>
CommitDate: Tue Mar  8 21:38:07 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=14b5e240

[sci-chemistry/votca-csg] 1.1.1 InCVS

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

---
 sci-chemistry/votca-csg/ChangeLog              |    3 +
 sci-chemistry/votca-csg/votca-csg-1.1.1.ebuild |   82 ------------------------
 2 files changed, 3 insertions(+), 82 deletions(-)

diff --git a/sci-chemistry/votca-csg/ChangeLog b/sci-chemistry/votca-csg/ChangeLog
index ca4403d..348ee7d 100644
--- a/sci-chemistry/votca-csg/ChangeLog
+++ b/sci-chemistry/votca-csg/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  08 Mar 2011; Christoph Junghans <ottxor@gentoo.org> -votca-csg-1.1.1.ebuild:
+  InCVS
+
 *votca-csg-1.1.1 (03 Mar 2011)
 
   03 Mar 2011; Christoph Junghans <ottxor@gentoo.org> -votca-csg-1.1.ebuild,

diff --git a/sci-chemistry/votca-csg/votca-csg-1.1.1.ebuild b/sci-chemistry/votca-csg/votca-csg-1.1.1.ebuild
deleted file mode 100644
index d1b7e59..0000000
--- a/sci-chemistry/votca-csg/votca-csg-1.1.1.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-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 ~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
-	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
-}



^ permalink raw reply related	[flat|nested] 36+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-chemistry/votca-csg/
@ 2011-03-03 21:43 Christoph Junghans
  0 siblings, 0 replies; 36+ messages in thread
From: Christoph Junghans @ 2011-03-03 21:43 UTC (permalink / raw
  To: gentoo-commits

commit:     717e452425cfaefb63e39e0927e413d7f0843e41
Author:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
AuthorDate: Thu Mar  3 21:02:29 2011 +0000
Commit:     Christoph Junghans <kleiner_otti <AT> gmx <DOT> de>
CommitDate: Thu Mar  3 21:54:47 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=717e4524

[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 ++++++
 ...votca-csg-1.1.ebuild => votca-csg-1.1.1.ebuild} |    0
 2 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/sci-chemistry/votca-csg/ChangeLog b/sci-chemistry/votca-csg/ChangeLog
index 94711e6..ca4403d 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.1 (03 Mar 2011)
+
+  03 Mar 2011; Christoph Junghans <ottxor@gentoo.org> -votca-csg-1.1.ebuild,
+  +votca-csg-1.1.1.ebuild:
+  version bump
+
 *votca-csg-1.1 (19 Feb 2011)
 
   19 Feb 2011; Christoph Junghans <ottxor@gentoo.org>

diff --git a/sci-chemistry/votca-csg/votca-csg-1.1.ebuild b/sci-chemistry/votca-csg/votca-csg-1.1.1.ebuild
similarity index 100%
rename from sci-chemistry/votca-csg/votca-csg-1.1.ebuild
rename to sci-chemistry/votca-csg/votca-csg-1.1.1.ebuild



^ permalink raw reply related	[flat|nested] 36+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-chemistry/votca-csg/
@ 2011-02-20 13:30 Christoph Junghans
  0 siblings, 0 replies; 36+ messages in thread
From: Christoph Junghans @ 2011-02-20 13:30 UTC (permalink / raw
  To: gentoo-commits

commit:     8401c72825ada3b88457152189a6cbcbfb5b4c48
Author:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 20 13:38:58 2011 +0000
Commit:     Christoph Junghans <kleiner_otti <AT> gmx <DOT> de>
CommitDate: Sun Feb 20 13:38:58 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=8401c728

[sci-chemistry/votca-csg] fixed a typo

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

---
 sci-chemistry/votca-csg/votca-csg-1.1.ebuild  |    2 +-
 sci-chemistry/votca-csg/votca-csg-9999.ebuild |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-chemistry/votca-csg/votca-csg-1.1.ebuild b/sci-chemistry/votca-csg/votca-csg-1.1.ebuild
index 91671bf..d1b7e59 100644
--- a/sci-chemistry/votca-csg/votca-csg-1.1.ebuild
+++ b/sci-chemistry/votca-csg/votca-csg-1.1.ebuild
@@ -64,7 +64,7 @@ src_install() {
 	autotools-utils_src_install || die
 	if use doc; then
 		if [ -n "${PV##*9999}" ]; then
-			dodoc "${WORKDIR}/votca-manual-${MANUAL_PV}.pdf" || die
+			dodoc "${DISTDIR}/votca-manual-${MANUAL_PV}.pdf" || die
 		fi
 		cd share/doc || die
 		doxygen || die

diff --git a/sci-chemistry/votca-csg/votca-csg-9999.ebuild b/sci-chemistry/votca-csg/votca-csg-9999.ebuild
index 91671bf..d1b7e59 100644
--- a/sci-chemistry/votca-csg/votca-csg-9999.ebuild
+++ b/sci-chemistry/votca-csg/votca-csg-9999.ebuild
@@ -64,7 +64,7 @@ src_install() {
 	autotools-utils_src_install || die
 	if use doc; then
 		if [ -n "${PV##*9999}" ]; then
-			dodoc "${WORKDIR}/votca-manual-${MANUAL_PV}.pdf" || die
+			dodoc "${DISTDIR}/votca-manual-${MANUAL_PV}.pdf" || die
 		fi
 		cd share/doc || die
 		doxygen || die



^ permalink raw reply related	[flat|nested] 36+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-chemistry/votca-csg/
@ 2011-02-19 17:03 Christoph Junghans
  0 siblings, 0 replies; 36+ messages in thread
From: Christoph Junghans @ 2011-02-19 17:03 UTC (permalink / raw
  To: gentoo-commits

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
 }
 



^ permalink raw reply related	[flat|nested] 36+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-chemistry/votca-csg/
@ 2011-02-13 17:27 Christoph Junghans
  0 siblings, 0 replies; 36+ messages in thread
From: Christoph Junghans @ 2011-02-13 17:27 UTC (permalink / raw
  To: gentoo-commits

commit:     baa3d8dff6bd2b5a2d8ccf2f20b53a3497de5224
Author:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 13 17:38:26 2011 +0000
Commit:     Christoph Junghans <kleiner_otti <AT> gmx <DOT> de>
CommitDate: Sun Feb 13 17:38:26 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=baa3d8df

[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/metadata.xml               |   10 +++++-----
 ...csg-1.1_rc1.ebuild => votca-csg-1.1_rc2.ebuild} |    0
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/sci-chemistry/votca-csg/metadata.xml b/sci-chemistry/votca-csg/metadata.xml
index 3805e50..9796135 100644
--- a/sci-chemistry/votca-csg/metadata.xml
+++ b/sci-chemistry/votca-csg/metadata.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci</herd>
+	<herd>sci-chemistry</herd>
 	<maintainer>
-		<email>kleiner_otti@gmx.de</email>
+		<email>ottxor@gentoo.org</email>
 		<name>Christoph Junghans</name>
 	</maintainer>
-<use>
-	<flag name='gromacs'>Add support for gromacs file formats (sci-chemistry/gromacs)</flag>
-</use>
+	<use>
+		<flag name='gromacs'>Add support for gromacs file formats (sci-chemistry/gromacs)</flag>
+	</use>
 </pkgmetadata>

diff --git a/sci-chemistry/votca-csg/votca-csg-1.1_rc1.ebuild b/sci-chemistry/votca-csg/votca-csg-1.1_rc2.ebuild
similarity index 100%
rename from sci-chemistry/votca-csg/votca-csg-1.1_rc1.ebuild
rename to sci-chemistry/votca-csg/votca-csg-1.1_rc2.ebuild



^ permalink raw reply related	[flat|nested] 36+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-chemistry/votca-csg/
@ 2011-02-12 16:23 Christoph Junghans
  0 siblings, 0 replies; 36+ messages in thread
From: Christoph Junghans @ 2011-02-12 16:23 UTC (permalink / raw
  To: gentoo-commits

commit:     5aebb187440378b39048cf8a0ac4f7b19ad14aa9
Author:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 12 16:34:33 2011 +0000
Commit:     Christoph Junghans <kleiner_otti <AT> gmx <DOT> de>
CommitDate: Sat Feb 12 16:34:33 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=5aebb187

[sci-chemistry/votca-csg] 1.0.1 moved to the main tree

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

---
 sci-chemistry/votca-csg/votca-csg-1.0.1.ebuild |   80 ------------------------
 1 files changed, 0 insertions(+), 80 deletions(-)

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 21fdec3..0000000
--- 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: $
-
-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 ~amd64"
-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
-}



^ permalink raw reply related	[flat|nested] 36+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-chemistry/votca-csg/
@ 2011-02-12 14:53 Christoph Junghans
  0 siblings, 0 replies; 36+ messages in thread
From: Christoph Junghans @ 2011-02-12 14:53 UTC (permalink / raw
  To: gentoo-commits

commit:     f2e1f5aaa22ccdfc3e6449f67ac7f55f15b6f8ef
Author:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 12 15:02:53 2011 +0000
Commit:     Christoph Junghans <kleiner_otti <AT> gmx <DOT> de>
CommitDate: Sat Feb 12 15:02:53 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=f2e1f5aa

[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                  |    8 +++++++-
 ...ca-csg-9999.ebuild => votca-csg-1.1_rc1.ebuild} |    9 +++++----
 sci-chemistry/votca-csg/votca-csg-9999.ebuild      |    9 +++++----
 3 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/sci-chemistry/votca-csg/ChangeLog b/sci-chemistry/votca-csg/ChangeLog
index db355e8..1ef3939 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/votca-csg-9999.ebuild b/sci-chemistry/votca-csg/votca-csg-1.1_rc1.ebuild
similarity index 89%
copy from sci-chemistry/votca-csg/votca-csg-9999.ebuild
copy to sci-chemistry/votca-csg/votca-csg-1.1_rc1.ebuild
index 5205bc0..333e454 100644
--- a/sci-chemistry/votca-csg/votca-csg-9999.ebuild
+++ b/sci-chemistry/votca-csg/votca-csg-1.1_rc1.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

diff --git a/sci-chemistry/votca-csg/votca-csg-9999.ebuild b/sci-chemistry/votca-csg/votca-csg-9999.ebuild
index 5205bc0..333e454 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



^ permalink raw reply related	[flat|nested] 36+ messages in thread

end of thread, other threads:[~2016-07-14 17:32 UTC | newest]

Thread overview: 36+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-03-03 21:43 [gentoo-commits] proj/sci:master commit in: sci-chemistry/votca-csg/ Christoph Junghans
  -- strict thread matches above, loose matches on Subject: below --
2016-07-14 17:31 Christoph Junghans
2015-11-16  4:23 Christoph Junghans
2015-09-24  5:20 Christoph Junghans
2015-09-21 17:44 Justin Lecher
2015-02-12  0:44 Christoph Junghans
2014-10-24  3:33 Christoph Junghans
2014-09-01  0:21 Christoph Junghans
2014-02-27 23:01 Sebastien Fabbro
2013-03-09  1:48 Christoph Junghans
2013-01-30  5:28 Christoph Junghans
2012-12-31  3:17 Christoph Junghans
2012-07-25  1:24 Christoph Junghans
2012-07-18  2:53 Christoph Junghans
2012-03-24 22:46 Christoph Junghans
2011-11-05  2:33 Christoph Junghans
2011-11-05  2:33 Christoph Junghans
2011-11-03 23:51 Christoph Junghans
2011-09-10 15:04 Christoph Junghans
2011-09-10 14:57 Christoph Junghans
2011-09-05 17:13 Christoph Junghans
2011-08-25 20:33 Christoph Junghans
2011-08-14 15:04 Christoph Junghans
2011-07-17 13:14 Christoph Junghans
2011-07-17 12:38 Christoph Junghans
2011-06-24 17:09 Justin Lecher
2011-06-03 21:59 Christoph Junghans
2011-05-28 12:27 Christoph Junghans
2011-03-10 19:51 Christoph Junghans
2011-03-08 21:40 Christoph Junghans
2011-03-03 21:43 Christoph Junghans
2011-02-20 13:30 Christoph Junghans
2011-02-19 17:03 Christoph Junghans
2011-02-13 17:27 Christoph Junghans
2011-02-12 16:23 Christoph Junghans
2011-02-12 14:53 Christoph Junghans

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox