[gentoo-commits] proj/sci:master commit in: sci-libs/votca-tools/

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

commit:     33ef80d5033a5e8c39978cd7911ad1efe8b4aede
Author:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 12 13:59:54 2011 +0000
Commit:     Christoph Junghans <kleiner_otti <AT> gmx <DOT> de>
CommitDate: Sat Feb 12 14:05:20 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=33ef80d5

[sci-libs/votca-tools] version bump

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

---
 sci-libs/votca-tools/ChangeLog                     |    8 +++++++-
 ...ools-9999.ebuild => votca-tools-1.1_rc1.ebuild} |   12 +++++++-----
 sci-libs/votca-tools/votca-tools-9999.ebuild       |   12 +++++++-----
 3 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/sci-libs/votca-tools/ChangeLog b/sci-libs/votca-tools/ChangeLog
index 603c4b7..b335a8b 100644
--- a/sci-libs/votca-tools/ChangeLog
+++ b/sci-libs/votca-tools/ChangeLog
@@ -1,7 +1,13 @@
 # ChangeLog for sci-libs/votca-tools
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*votca-tools-1.1_rc1 (12 Feb 2011)
+
+  12 Feb 2011; Christoph Junghans <kleiner_otti@gmx.de>
+  +votca-tools-1.1_rc1.ebuild:
+  Version bump
+
   17 Dec 2010; Christoph Junghans <kleiner_otti@gmx.de> 
   votca-tools-9999.ebuild:
   using autotools-utils eclass

diff --git a/sci-libs/votca-tools/votca-tools-9999.ebuild b/sci-libs/votca-tools/votca-tools-1.1_rc1.ebuild
similarity index 84%
copy from sci-libs/votca-tools/votca-tools-9999.ebuild
copy to sci-libs/votca-tools/votca-tools-1.1_rc1.ebuild
index dc396ee..ad2a6d6 100644
--- a/sci-libs/votca-tools/votca-tools-9999.ebuild
+++ b/sci-libs/votca-tools/votca-tools-1.1_rc1.ebuild
@@ -8,6 +8,7 @@ inherit eutils autotools-utils
 
 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="fftw? ( sci-libs/fftw:3.0 )
 	boost? ( dev-libs/boost )"
 
 DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
+	doc? ( app-doc/doxygen[-nodot] )
 	>=app-text/txt2tags-2.5
 	dev-util/pkgconfig"
 
@@ -43,10 +44,11 @@ src_prepare() {
 		rm -rf src/libboost
 	else
 		#fix a qa issue ../../config is not support as m4 dir
-		mkdir -p src/libboost/config
+		mkdir -p src/libboost/config || die
 		sed -i 's@\.\./\.\./config@config@' \
 			src/libboost/configure.ac \
-			src/libboost/Makefile.am
+			src/libboost/Makefile.am || \
+			die "sed of libboost configure.ac and Makefile.am failed"
 	fi
 	eautoreconf || die "eautoreconf failed"
 }
@@ -59,12 +61,12 @@ src_configure() {
 		$(use_with gsl)
 		$(use_with fftw)
 	)
-	autotools-utils_src_configure
+	autotools-utils_src_configure || die
 }
 
 src_install() {
 	DOCS=(${AUTOTOOLS_BUILD_DIR}/CHANGELOG NOTICE)
-	autotools-utils_src_install
+	autotools-utils_src_install || die
 	if use doc; then
 		cd share/doc
 		doxygen || die

diff --git a/sci-libs/votca-tools/votca-tools-9999.ebuild b/sci-libs/votca-tools/votca-tools-9999.ebuild
index dc396ee..ad2a6d6 100644
--- a/sci-libs/votca-tools/votca-tools-9999.ebuild
+++ b/sci-libs/votca-tools/votca-tools-9999.ebuild
@@ -8,6 +8,7 @@ inherit eutils autotools-utils
 
 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="fftw? ( sci-libs/fftw:3.0 )
 	boost? ( dev-libs/boost )"
 
 DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
+	doc? ( app-doc/doxygen[-nodot] )
 	>=app-text/txt2tags-2.5
 	dev-util/pkgconfig"
 
@@ -43,10 +44,11 @@ src_prepare() {
 		rm -rf src/libboost
 	else
 		#fix a qa issue ../../config is not support as m4 dir
-		mkdir -p src/libboost/config
+		mkdir -p src/libboost/config || die
 		sed -i 's@\.\./\.\./config@config@' \
 			src/libboost/configure.ac \
-			src/libboost/Makefile.am
+			src/libboost/Makefile.am || \
+			die "sed of libboost configure.ac and Makefile.am failed"
 	fi
 	eautoreconf || die "eautoreconf failed"
 }
@@ -59,12 +61,12 @@ src_configure() {
 		$(use_with gsl)
 		$(use_with fftw)
 	)
-	autotools-utils_src_configure
+	autotools-utils_src_configure || die
 }
 
 src_install() {
 	DOCS=(${AUTOTOOLS_BUILD_DIR}/CHANGELOG NOTICE)
-	autotools-utils_src_install
+	autotools-utils_src_install || die
 	if use doc; then
 		cd share/doc
 		doxygen || die