Version bump + qa fixes (bug #392123)

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

diff --git a/sci-physics/espresso/ChangeLog b/sci-physics/espresso/ChangeLog
index 861c6461a10cc55a227f096cda95ea45b99485ca..6690906a589ae9b4e6993db671bcd28779a5b876 100644 (file)
--- a/sci-physics/espresso/ChangeLog
+++ b/sci-physics/espresso/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-physics/espresso
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/espresso/ChangeLog,v 1.3 2011/05/27 17:34:23 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/espresso/ChangeLog,v 1.4 2011/11/27 21:09:29 ottxor Exp $
+
+*espresso-3.0.2 (27 Nov 2011)
+
+  27 Nov 2011; Christoph Junghans <ottxor@gentoo.org> -espresso-3.0.1.ebuild,
+  +espresso-3.0.2.ebuild:
+  Version bump + qa fixes (bug #392123)
 
 *espresso-3.0.1 (27 May 2011)
 

diff --git a/sci-physics/espresso/Manifest b/sci-physics/espresso/Manifest
index 51d3a57abfe51635bceb3c4b96edeaa04660d334..8aeb42cb5115e39e95c4c97b52d77b0e7a33856a 100644 (file)
--- a/sci-physics/espresso/Manifest
+++ b/sci-physics/espresso/Manifest
@@ -1,18 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-DIST espresso-3.0.1.tar.gz 6709268 RMD160 8bbefe9de7a2fa15461af9c7927ba4428f0f810d SHA1 5dbdbf3431c411a2d35ce19344f0faecdfd542fa SHA256 505986c7584aa6bb6602c05dd001f2a89cec16a86105d06e7c980e391a04e0ef
-EBUILD espresso-3.0.1.ebuild 2343 RMD160 8e1b50a3e23b40dba637536e36ff66a398d2634a SHA1 560a9443710304befdfa7b70f89e7d89aa2eb549 SHA256 f1233ad626ab54454e73ad507343e9a4000dac0018075af12d6f430bf263985b
-MISC ChangeLog 652 RMD160 bbf884b3bbea8cea93a2af06ad19f884223f35c0 SHA1 6b9877e5180858060682d9a1d920da609b5194c5 SHA256 68f74ce3aa9cddebdd5d3874161a5c208bc093fabcb0cd4344a8cb22fdf9810c
+DIST espresso-3.0.2.tar.gz 6694706 RMD160 1a66eacf78babae960e484db0c923d55b366f519 SHA1 695115971e48f5b469c53abbc3468d8b5ba0bd2e SHA256 e5287ef3f9402ac57e65713875bb12b5c834388a35911a7893c491534195ac1e
+EBUILD espresso-3.0.2.ebuild 2304 RMD160 a722d20a14313c27585de094d8da958c6df24d06 SHA1 14d0f811590113d609baa91aab31a7c9536c1588 SHA256 ce2849fc5cf76d1475fdbf5c659b48bcd276a8b8f4a812a10c6feaa619ff9cc0
+MISC ChangeLog 828 RMD160 c955859f696a044bfb4f1791f425d3c27202d269 SHA1 de119a946996e54fd21153b8191bfdb371d19b69 SHA256 4a2df83f111c3bb95931a5e8c7002616b8e2549424470d881e4d4b500126c1ce
 MISC metadata.xml 389 RMD160 08e804cac435b4a6211c2828e85aa782c693c60d SHA1 db8aa56bf3a00be84202c908510469e2b6dce189 SHA256 2e3930885bef14d1e5669744db5e5f8a489a6f75e3b6c6861665a94c0fa07b29
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBAgAGBQJN3+CpAAoJEOeBhlrCAAWGRR8IALVzlaOLjvAlLOcAc/8hl3H+
-EoK185/locVf7tMGtr74Rj2EG7kMp24GBwPsGBfoWCmhgjZPO7fxxaKUHd7CliXi
-tTv6q6RBkxr36W5jPS+5m0iAzOs8WzbXqadZJwA0ScL+sEam4qBmFbR2aiFy+/NA
-y+ICxWVdBPa9eSQlOBWajZmqc5pswZd5vXKgkIWxN1Sgiya7v2+V8lmLSfP7kSkM
-xeeOI0NDS9MXtVvK3vlEwslUEhduaegP3THXd4Pjo4zC3CchYTdQAzcel5B/fos/
-BGDCEU+lQTsOCZ+6+KEFEm9NMU7A1SKh9mogcL2HOxaXMfC9/+ByFCdZIA4NPWk=
-=Fbfp
+iQEcBAEBAgAGBQJO0qcXAAoJEOeBhlrCAAWGSEkIAIcq8HIIKiy3ryWt0XjoR4Vx
+BnPxM/BhwxKB6Cci9r/Ojrdp/hmun38nvAihMvU326o9/+p+zAccDX7vFubE0UDa
+yU/MmtvHIbwDA5KGQv4COomhWYNUpuOnpvgcL0vm1LLYjGEMVU516vvJrhM6oUQo
+pfUFh2u/wTlFSscn/OrUNS9ezWJL+FkI2zXhFFkKTBRGPR99EdPrUqU2/Yw5d6V9
+b4/U4P5kpkmH+hwGlbSgW3BIsY6v70MrnnVV9MWGTow+xYBVnPsgedivhSU/5MRS
+/5aKl67Dz2XGfgC3xgkWx3MOZ5U9iuZ2ncY7+HcjrbtDZ5yr0X2brqNHo+Uvkxc=
+=xq38
 -----END PGP SIGNATURE-----

diff --git a/sci-physics/espresso/espresso-3.0.1.ebuild b/sci-physics/espresso/espresso-3.0.2.ebuild
similarity index 85%
rename from sci-physics/espresso/espresso-3.0.1.ebuild
rename to sci-physics/espresso/espresso-3.0.2.ebuild
index deeda72ca6bbc7df24f189959859d53934e45fe1..e6a1ad825c2fc253910b4e9aeecdee4219773f62 100644 (file)
--- a/sci-physics/espresso/espresso-3.0.1.ebuild
+++ b/sci-physics/espresso/espresso-3.0.2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/espresso/espresso-3.0.1.ebuild,v 1.1 2011/05/27 17:34:23 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/espresso/espresso-3.0.2.ebuild,v 1.1 2011/11/27 21:09:29 ottxor Exp $
 
-EAPI="4"
+EAPI=4
 
 inherit autotools-utils savedconfig
 
@@ -12,29 +12,33 @@ HOMEPAGE="http://www.espressomd.org"
 if [ "${PV%9999}" != "${PV}" ]; then
        EGIT_REPO_URI="git://git.savannah.nongnu.org/espressomd.git"
        EGIT_BRANCH="master"
-       inherit git
+       inherit git-2
 else
        SRC_URI="mirror://nongnu/${PN}md/${P}.tar.gz"
 fi
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~x86"
 IUSE="X doc examples fftw mpi packages test -tk"
 REQUIRED_USE="tk? ( X )"
 
 RESTRICT="tk? ( test )"
 
-RDEPEND="dev-lang/tcl
-       X? ( x11-libs/libX11 )
+RDEPEND="
+       dev-lang/tcl
        fftw? ( sci-libs/fftw:3.0 )
        mpi? ( virtual/mpi )
-       tk? ( >=dev-lang/tk-8.4.18-r1 )"
+       tk? ( >=dev-lang/tk-8.4.18-r1 )
+       X? ( x11-libs/libX11 )"
 
 DEPEND="${RDEPEND}
-       doc? ( app-doc/doxygen[-nodot]
+       doc? (
+               app-doc/doxygen[-nodot]
                virtual/latex-base )"
 
+DOCS=( AUTHORS NEWS README ChangeLog )
+
 src_prepare() {
        autotools-utils_src_prepare
        eautoreconf
@@ -53,16 +57,12 @@ src_configure() {
 
 src_compile() {
        autotools-utils_src_compile
-       if use doc; then
-               autotools-utils_src_compile doc || die "emake doc failed"
-       fi
+       use doc && autotools-utils_src_compile doc
 }
 
 src_install() {
        autotools-utils_src_install
 
-       dodoc AUTHORS NEWS README ChangeLog
-
        insinto /usr/share/${PN}
        doins ${AUTOTOOLS_BUILD_DIR}/myconfig-sample.h