[gentoo-commits] proj/sci:master commit in: app-doc/gromacs-manual/

["Christoph Junghans" <kleiner_otti@gmx.de>]

commit:     6bb45ca97b5bf1b6f258f73c59986c13966843b5
Author:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
AuthorDate: Thu Oct  4 14:29:30 2012 +0000
Commit:     Christoph Junghans <kleiner_otti <AT> gmx <DOT> de>
CommitDate: Thu Oct  4 14:29:30 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=6bb45ca9

live ebuild update

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

---
 app-doc/gromacs-manual/ChangeLog                   |    9 +++++++--
 ...-9999.ebuild => gromacs-manual-4.6.9999.ebuild} |   17 +++++++++++------
 app-doc/gromacs-manual/gromacs-manual-9999.ebuild  |   17 +++++++++++------
 3 files changed, 29 insertions(+), 14 deletions(-)

diff --git a/app-doc/gromacs-manual/ChangeLog b/app-doc/gromacs-manual/ChangeLog
index b9f148f..338a2e3 100644
--- a/app-doc/gromacs-manual/ChangeLog
+++ b/app-doc/gromacs-manual/ChangeLog
@@ -1,7 +1,13 @@
 # ChangeLog for app-doc/gromacs-manual
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*gromacs-manual-4.6.9999 (04 Oct 2012)
+
+  04 Oct 2012; Christoph Junghans <ottxor@gentoo.org>
+  +gromacs-manual-4.6.9999.ebuild, gromacs-manual-9999.ebuild:
+  live ebuild update
+
   25 Jun 2011; Justin Lecher <jlec@gentoo.org> gromacs-manual-9999.ebuild:
   Merged
 
@@ -17,4 +23,3 @@
   26 Aug 2010; Christoph Junghans <kleiner_otti@gmx.de>
   +gromacs-manual-9999.ebuild, +metadata.xml:
   initial commit
-

diff --git a/app-doc/gromacs-manual/gromacs-manual-9999.ebuild b/app-doc/gromacs-manual/gromacs-manual-4.6.9999.ebuild
similarity index 75%
copy from app-doc/gromacs-manual/gromacs-manual-9999.ebuild
copy to app-doc/gromacs-manual/gromacs-manual-4.6.9999.ebuild
index c9f9883..43597e9 100644
--- a/app-doc/gromacs-manual/gromacs-manual-9999.ebuild
+++ b/app-doc/gromacs-manual/gromacs-manual-4.6.9999.ebuild
@@ -1,11 +1,15 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
 EAPI=4
 
 EGIT_REPO_URI="git://git.gromacs.org/manual"
-EGIT_BRANCH="master"
+if [[ ${PV} = 9999 ]]; then
+	EGIT_BRANCH="master"
+else
+	EGIT_BRANCH="release-4-6"
+fi
 
 inherit cmake-utils git-2
 
@@ -21,15 +25,16 @@ IUSE=""
 DEPEND="
 	~sci-chemistry/gromacs-${PV}
 	dev-texlive/texlive-latex
-	sys-apps/coreutils
-	app-shells/tcsh"
+	sys-apps/coreutils"
 RDEPEND=""
 
 src_prepare() {
 	local progs
 	progs=$(tr '\n' ' ' <${EROOT}usr/share/gromacs/programs.list) || die
-	sed -i "s/^\(PROGRAMS\).*/\1='${progs}'/" mkman || die
-	sed -i "s@^\(INSTALLED.*=\).*@\1${EROOT}usr/bin/g_options@" mkoptions || die
+	sed \
+		-e "s/^\(PROGRAMS\).*/\1='${progs}'/" \
+		-e "/^INSTALLED_OPTIONS_PROGRAM_NAME/s!=.*!=${EROOT}usr/bin/g_options!"	\
+		-i mkman || die "sed of mkman failed"
 	sed \
 		-e "s!\${GMXSRC}/admin/\(programs.txt\)!${EROOT}usr/share/gromacs/\1!" \
 		-e "s!\${GMXSRC}/share/html!${EROOT}usr/share/doc/gromacs-${PV}/html!" \

diff --git a/app-doc/gromacs-manual/gromacs-manual-9999.ebuild b/app-doc/gromacs-manual/gromacs-manual-9999.ebuild
index c9f9883..43597e9 100644
--- a/app-doc/gromacs-manual/gromacs-manual-9999.ebuild
+++ b/app-doc/gromacs-manual/gromacs-manual-9999.ebuild
@@ -1,11 +1,15 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
 EAPI=4
 
 EGIT_REPO_URI="git://git.gromacs.org/manual"
-EGIT_BRANCH="master"
+if [[ ${PV} = 9999 ]]; then
+	EGIT_BRANCH="master"
+else
+	EGIT_BRANCH="release-4-6"
+fi
 
 inherit cmake-utils git-2
 
@@ -21,15 +25,16 @@ IUSE=""
 DEPEND="
 	~sci-chemistry/gromacs-${PV}
 	dev-texlive/texlive-latex
-	sys-apps/coreutils
-	app-shells/tcsh"
+	sys-apps/coreutils"
 RDEPEND=""
 
 src_prepare() {
 	local progs
 	progs=$(tr '\n' ' ' <${EROOT}usr/share/gromacs/programs.list) || die
-	sed -i "s/^\(PROGRAMS\).*/\1='${progs}'/" mkman || die
-	sed -i "s@^\(INSTALLED.*=\).*@\1${EROOT}usr/bin/g_options@" mkoptions || die
+	sed \
+		-e "s/^\(PROGRAMS\).*/\1='${progs}'/" \
+		-e "/^INSTALLED_OPTIONS_PROGRAM_NAME/s!=.*!=${EROOT}usr/bin/g_options!"	\
+		-i mkman || die "sed of mkman failed"
 	sed \
 		-e "s!\${GMXSRC}/admin/\(programs.txt\)!${EROOT}usr/share/gromacs/\1!" \
 		-e "s!\${GMXSRC}/share/html!${EROOT}usr/share/doc/gromacs-${PV}/html!" \