version bump

Package-Manager: portage-2.2.0_alpha93/cvs/Linux i686

3 files changed, 34 insertions, 28 deletions

diff --git a/sci-physics/espresso/ChangeLog b/sci-physics/espresso/ChangeLog
index 4df572ce4f90..ead069aeaca2 100644
--- a/sci-physics/espresso/ChangeLog
+++ b/sci-physics/espresso/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-physics/espresso
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/espresso/ChangeLog,v 1.5 2012/02/23 17:04:57 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/espresso/ChangeLog,v 1.6 2012/03/22 03:45:19 ottxor Exp $
+
+*espresso-3.1.0 (22 Mar 2012)
+
+  22 Mar 2012; Christoph Junghans <ottxor@gentoo.org> -espresso-3.0.2.ebuild,
+  +espresso-3.1.0.ebuild:
+  version bump
 
   23 Feb 2012; Kacper Kowalik <xarthisius@gentoo.org> espresso-3.0.2.ebuild:
   Fix dependency on app-doc/doxygen wrt converting useflag 'nodot' to 'dot'.
diff --git a/sci-physics/espresso/Manifest b/sci-physics/espresso/Manifest
index 850d45e957ad..c0cc062b3333 100644
--- a/sci-physics/espresso/Manifest
+++ b/sci-physics/espresso/Manifest
@@ -1,24 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
-DIST espresso-3.0.2.tar.gz 6694706 RMD160 1a66eacf78babae960e484db0c923d55b366f519 SHA1 695115971e48f5b469c53abbc3468d8b5ba0bd2e SHA256 e5287ef3f9402ac57e65713875bb12b5c834388a35911a7893c491534195ac1e
-EBUILD espresso-3.0.2.ebuild 2355 RMD160 76ebaa721ecfdfecbdd8e402c0c787b8b3e476e7 SHA1 eb623c7acfeb418bdbbb4a3318847dabb63ec1ab SHA256 a98af8d2b87dc3b3c635fc13abd7c75c51daf279a4c513e88f66a82bc7cd37e3
-MISC ChangeLog 1043 RMD160 1e2af2ef18462d2131cacba24b5aa4ea92316860 SHA1 8291ccd9545bd93424fc0656e466cb8c16208577 SHA256 c4c3719affcc252a85eddc6ef5f3d151edd3eb851705004e412db76abddc0dde
+DIST espresso-3.1.0.tar.gz 8999207 RMD160 ff10d59710385ebf533e8986e22174c2d17e6351 SHA1 7ea63e10b5303509c10264063c4eca8ce59f0251 SHA256 72a8b9711a95b32cf6361d8f3b2712a37bcade592996686f5cec1506fe82f1e6
+EBUILD espresso-3.1.0.ebuild 2480 RMD160 d6b704729bdbdfff0a59fd726b3f1770dde420cb SHA1 e0f9803f3af19539cdc1e3c6871721bb69c8727c SHA256 a751679b6aeb28c530c9966ad485eab83ab8e5a850738a054deb94519132fed8
+MISC ChangeLog 1190 RMD160 edd17422523bf3dc9816efe977541cef4349351f SHA1 6bca9e6568266764548a271361a708a6684f32e1 SHA256 ad8f461a99b535713e8e926a45652625c1f6e6d58e0387146d4a7cc7672aecb2
 MISC metadata.xml 389 RMD160 08e804cac435b4a6211c2828e85aa782c693c60d SHA1 db8aa56bf3a00be84202c908510469e2b6dce189 SHA256 2e3930885bef14d1e5669744db5e5f8a489a6f75e3b6c6861665a94c0fa07b29
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCAAGBQJPRnG/AAoJEF0huFKJUZL5WCwP/1uwDvN2dmO+aGQW9uHbq0I0
-6hW72RNDaxd7c8oIXcPwum9VAI86skyuCEoPj/tZpcTVdxYsY3sJmEkfgBK5c/d4
-z9l7cxB2jG5h7pcBnBI/gfg8/9cRuHGYVme2wR1roF4XeX2VCFahtsZMzn9uoQrD
-nsBNysgLoxgojH1ihxkst1PHI1RuGfdfSiI+ngCy6Z8arRzZahR9KWyDv9T9lJPK
-jfMotnhlxgTyVe7juDcwgqNfZ4CdaCAe0VURpfd3c7xM1G8croy/1GDuy1kOahvL
-gaO18tfUYaFYtxI1PRwIE+K1Cffvg2xEx8IqjF6xj6oPRUdLU6JAMsdRwkIJMVy5
-ep3xa6lhB0NS4eTvjWDLqjoMfI8z3cWy4yi4x5J4eqZ34eIKuMoHkGThJtaCYEYZ
-Xk6Uh3UDqHXAdGor0P0MI2qw4BWKta2Dm1FwOTIlBEfB5juW/EEMUsezM2C/iQOu
-LsrDia9hbHcfs8SezUs/g3kLwLg6UgFILhAuwg1q3cz6DxjzfWusGLxgW0zTMYbB
-3Mdx8Evfiw1spI8RqoLUJF0QMu7uDRmwNuXowTSa98714sXRJKX7wfE4OiE601xm
-9jNbdIPZKHbifTe+U799weCElQJu8BjJkld7QZDYTSdzAXqsjUi6gH2xK+Kx2ly3
-WsbrLwlxvJtuD4JEpH1O
-=oeYN
+iQEcBAEBAgAGBQJPaqBWAAoJEOeBhlrCAAWGI08IAJe6d4fds/9sVqEE9uId6eXH
+Qc5R7VtNunS7qAVpz/r3vwvNEekc2t9MOQpT5M5gDKAn+QZHxNtUM7E9Nzecv38f
+pH6eeGgaXEQrqRIDq22cAmnKvLK8uRZcG2I6o1JssY/jjp4sPOSNrVYtMBhQvhRQ
+xOEeGfJUXrOwC/pWkJ25QTOqCCmenogNOvcbvsAdXGn+ZJZbZ/WqhsgI/5l8TW13
+3aIPbdqWOYKvarAtQDpOjDst2FEhccmVYphB9WEvWB1kOdRRqwsyg5dgY+VOR4bE
+zazqEYcZEzvRMB3S8UpD2+IIau8eFSXQ6+P6+YbRrIzfHRa0I6M1kp8BqN8PE2I=
+=nPsa
 -----END PGP SIGNATURE-----
diff --git a/sci-physics/espresso/espresso-3.0.2.ebuild b/sci-physics/espresso/espresso-3.1.0.ebuild
index 3fa1fc0264f5..6f06b12c6b90 100644
--- a/sci-physics/espresso/espresso-3.0.2.ebuild
+++ b/sci-physics/espresso/espresso-3.1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/espresso/espresso-3.0.2.ebuild,v 1.2 2012/02/23 17:04:57 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/espresso/espresso-3.1.0.ebuild,v 1.1 2012/03/22 03:45:19 ottxor Exp $
 
 EAPI=4
 
@@ -9,7 +9,7 @@ inherit autotools-utils savedconfig
 DESCRIPTION="Extensible Simulation Package for Research on Soft matter"
 HOMEPAGE="http://www.espressomd.org"
 
-if [ "${PV%9999}" != "${PV}" ]; then
+if [[ ${PV} = 9999 ]]; then
 	EGIT_REPO_URI="git://git.savannah.nongnu.org/espressomd.git"
 	EGIT_BRANCH="master"
 	inherit git-2
@@ -33,8 +33,9 @@ RDEPEND="
 	X? ( x11-libs/libX11 )"
 
 DEPEND="${RDEPEND}
+	dev-lang/python
 	doc? (
-		|| ( <app-doc/doxygen-1.7.6.1[-nodot] >=app-doc/doxygen-1.7.6.1[dot] )
+		app-doc/doxygen[-nodot]
 		virtual/latex-base )"
 
 DOCS=( AUTHORS NEWS README ChangeLog )
@@ -57,10 +58,13 @@ src_configure() {
 
 src_compile() {
 	autotools-utils_src_compile
-	use doc && autotools-utils_src_compile doc
+	use doc && autotools-utils_src_compile ug doxygen tutorials
+	[[ ${PV} = 9999 ]] && use doc && autotools-utils_src_compile dg
 }
 
 src_install() {
+	local i
+
 	autotools-utils_src_install
 
 	insinto /usr/share/${PN}
@@ -69,11 +73,13 @@ src_install() {
 	save_config ${AUTOTOOLS_BUILD_DIR}/src/myconfig-final.h
 
 	if use doc; then
-		local where="."
-		[ "${PV%9999}" != "${PV}" ] && where="${AUTOTOOLS_BUILD_DIR}"
-		newdoc ${where}/doc/ug/ug.pdf user_guide.pdf
-		dohtml -r ${AUTOTOOLS_BUILD_DIR}/doc/dg/html/*
-		newdoc ${where}/doc/tutorials/tut2/tut2.pdf tutorial.pdf
+		[[ ${PV} = 9999 ]] && \
+			newdoc ${AUTOTOOLS_BUILD_DIR}/doc/dg/dg.pdf developer_guide.pdf
+		newdoc ${AUTOTOOLS_BUILD_DIR}/doc/ug/ug.pdf user_guide.pdf
+		dohtml -r ${AUTOTOOLS_BUILD_DIR}/doc/doxygen/html/*
+		for i in ${AUTOTOOLS_BUILD_DIR}/doc/tutorials/*/[0-9]*.pdf; do
+			newdoc ${i} tutorial_${i##*/}
+		done
 	fi
 
 	if use examples; then