[sci-physics/espresso] version bump

(Portage version: 2.1.8.3/git/Linux i686)
 (Signed Manifest commit)

4 files changed, 39 insertions, 18 deletions

diff --git a/sci-physics/espresso/ChangeLog b/sci-physics/espresso/ChangeLog
index ef3eeffa2..31c86c3a6 100644
--- a/sci-physics/espresso/ChangeLog
+++ b/sci-physics/espresso/ChangeLog
@@ -2,6 +2,13 @@
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*espresso-2.2.0 (25 Jul 2010)
+
+  25 Jul 2010; Christoph Junghans <kleiner_otti@gmx.de>
+  -espresso-2.1.5c.ebuild, +espresso-2.2.0.ebuild,
+  +files/espresso-2.2.0-autotools.patch:
+  Version bump
+
 *espresso-2.1.5c (24 Mar 2010)
 
   24 Mar 2010; Christoph Junghans <kleiner_otti@gmx.de>
diff --git a/sci-physics/espresso/Manifest b/sci-physics/espresso/Manifest
index 29d5c77db..e41737b52 100644
--- a/sci-physics/espresso/Manifest
+++ b/sci-physics/espresso/Manifest
@@ -1,14 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-DIST Espresso-2.1.5c.tar.gz 4936805 RMD160 a1a28bdfc5e4a9c729cb4b548233593c2147819d SHA1 2fdbc3360c90140c3b5e2e29943013db30daec81 SHA256 e570d5366479e6e159a358d3345a55b0619f9780febf00f2ede7562a4677df69
-EBUILD espresso-2.1.5c.ebuild 2084 RMD160 3841affb9a5f7e043c484b410dd36d748be94c67 SHA1 ab2ca6f3c6b1f9ea3476dd0736cd37d521f52831 SHA256 b808a83d1dcab5400cde9fdc9ed2649f83a218b2e293a2ca4d0098199d765179
-MISC ChangeLog 397 RMD160 db79f354d277fa4a36b67ec74504df9cc03821c4 SHA1 b85b28b7a4b999f9cdb5062aafa6e32ff1cd166c SHA256 b6eef9c33d6ea675cb195cb0c05fa15054dfb594ef87a18f0e9831e232ec8f14
+AUX espresso-2.2.0-autotools.patch 265 RMD160 9b7bf0947d7cf65d650bc1d15d677f2678e14d20 SHA1 b81e9db833b72da9e91fc942844da1962fe11609 SHA256 20feed8b6225ade461231768e97f05112ccc2227ff7ef2a2cb9d3c69855e74cb
+DIST Espresso-2.2.0.tar.gz 5123296 RMD160 2398803b279a6578938074e9cee604d2271af098 SHA1 3a9603cfccaea083f27598616097832edc07dc01 SHA256 88a72081532b6cecf1c80fa50a4df4aed598f6d5d138d90e48dc0c8103c2ae03
+EBUILD espresso-2.2.0.ebuild 2199 RMD160 fa2514dac1798401520587fff61e40952621df16 SHA1 524ca94de88a50cfa0e14ef3b78fe559de03a55b SHA256 8256b102a04e011ac8bf6fb3510bd429eb1666ab20b1dab4980aa29424c23ef3
+MISC ChangeLog 592 RMD160 30ee9fd5a2e54ac47bf23160adfc0e5a5340e38e SHA1 96fb9f01d809ef24e1237fbf2a6f927b4e2c202a SHA256 b2718330246f3be9587278280f454a12b52261a41370b0829b396fae86d31a3f
 MISC metadata.xml 291 RMD160 5ae1471fd0e7b60d7de7027f8b807dcd005bd0b0 SHA1 10bcd36795a8dcc9ebf5b720fe79bd42a9518b7a SHA256 112c54edd1ef7cbe34d7132ba3fd95a0728b9298eea9b2e957fa5e40962842ea
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
+Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkurGa8ACgkQy0OE/ans1/kDTgCfe/MJnwDyJNCoWDgPhPR1mtVL
-jysAnjH8ESOrySrzmJZLH9nYnpTS3qVR
-=v9XM
+iEYEARECAAYFAkxMf/AACgkQy0OE/ans1/kErgCfb0L0zuM8KDO3H+8xzESQzUpN
+2eEAn3LALdTcH5aN5ght73SUYXU6U029
+=M/6+
 -----END PGP SIGNATURE-----
diff --git a/sci-physics/espresso/espresso-2.1.5c.ebuild b/sci-physics/espresso/espresso-2.2.0.ebuild
index b6acc244c..b5c044ae4 100644
--- a/sci-physics/espresso/espresso-2.1.5c.ebuild
+++ b/sci-physics/espresso/espresso-2.2.0.ebuild
@@ -2,13 +2,13 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="2"
+EAPI="3"
 
-inherit autotools savedconfig
+inherit autotools eutils savedconfig
 
 DESCRIPTION="Extensible Simulation Package for Research on Soft matter"
 HOMEPAGE="http://www.espresso.mpg.de"
-SRC_URI="http://espressowiki.mpip-mainz.mpg.de/wiki/uploads/e/e6/Espresso-${PV}.tar.gz"
+SRC_URI="http://espressowiki.mpip-mainz.mpg.de/wiki/uploads/6/67/Espresso-${PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -28,12 +28,15 @@ DEPEND="${RDEPEND}
 S="${WORKDIR}/${PN}-${PV:0:5}"
 
 src_prepare() {
-	AT_M4DIR="config" eautoreconf
+	epatch "${FILESDIR}/${PF}-autotools.patch"
+	ln -s Makefile-am.am Makefile.am
+	eautoreconf
 	restore_config myconfig.h
 }
 
 src_configure() {
 	econf \
+		--disable-processor-optimization \
 		$(use_with fftw) \
 		$(use_with mpi) \
 		$(use_with tk) \
@@ -69,7 +72,7 @@ src_install() {
 
 	if use examples; then
 		insinto /usr/share/${PN}/examples
-		doins samples/*
+		doins -r samples/*
 		#the testsuite are also good examples
 		rm testsuite/Makefile* testsuite/test.sh.in
 		insinto /usr/share/${PN}/testsuite
@@ -84,13 +87,13 @@ src_install() {
 
 pkg_postinst() {
 	elog
-	elog Please read and cite:
-	elog ESPResSo, Comput. Phys. Commun. 174\(9\) ,704, 2006.
-	elog http://dx.doi.org/10.1016/j.cpc.2005.10.005
+	elog "Please read and cite:"
+	elog "ESPResSo, Comput. Phys. Commun. 174(9) ,704, 2006."
+	elog "http://dx.doi.org/10.1016/j.cpc.2005.10.005"
 	elog
-	elog If you need more features, change
-	elog /etc/portage/savedconfig/${CATEGORY}/"${PF}"
-	elog and reemerge with USE=savedconfig
+	elog "If you need more features, change"
+	elog "/etc/portage/savedconfig/${CATEGORY}/${PF}"
+	elog "and reemerge with USE=savedconfig"
 	elog
 	elog "For a full feature list see:"
 	elog "/usr/share/${PN}/myconfig-sample.h"
diff --git a/sci-physics/espresso/files/espresso-2.2.0-autotools.patch b/sci-physics/espresso/files/espresso-2.2.0-autotools.patch
new file mode 100644
index 000000000..17940f3eb
--- /dev/null
+++ b/sci-physics/espresso/files/espresso-2.2.0-autotools.patch
@@ -0,0 +1,10 @@
+--- scripts/Makefile.am.old	2010-07-25 19:30:55.000000000 +0200
++++ scripts/Makefile.am	2010-07-25 19:31:02.000000000 +0200
+@@ -7,7 +7,6 @@
+ 	bundle.tcl \
+ 	convertDeserno.tcl \
+ 	countBonds.tcl \
+-	init.tcl \
+ 	parallel_tempering.tcl \
+ 	pdb.tcl \
+ 	polymer.tcl \