From ba7a6d612c9b2ef6e87135be070b9d5839a30fa9 Mon Sep 17 00:00:00 2001 From: Christoph Junghans Date: Thu, 29 Jul 2010 22:25:58 +0200 Subject: [sci-physics/espresso] version bump (Portage version: 2.1.8.3/git/Linux i686) (Signed Manifest commit) --- sci-physics/espresso/ChangeLog | 7 ++ sci-physics/espresso/Manifest | 13 ++- sci-physics/espresso/espresso-2.2.0.ebuild | 101 --------------------- sci-physics/espresso/espresso-2.2.0b.ebuild | 100 ++++++++++++++++++++ .../espresso/files/espresso-2.2.0-autotools.patch | 10 -- 5 files changed, 113 insertions(+), 118 deletions(-) delete mode 100644 sci-physics/espresso/espresso-2.2.0.ebuild create mode 100644 sci-physics/espresso/espresso-2.2.0b.ebuild delete mode 100644 sci-physics/espresso/files/espresso-2.2.0-autotools.patch (limited to 'sci-physics/espresso') diff --git a/sci-physics/espresso/ChangeLog b/sci-physics/espresso/ChangeLog index 31c86c3a6..b1050df59 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.0b (29 Jul 2010) + + 29 Jul 2010; Christoph Junghans + -espresso-2.2.0.ebuild, -files/espresso-2.2.0-autotools.patch, + +espresso-2.2.0b.ebuild: + version bump + *espresso-2.2.0 (25 Jul 2010) 25 Jul 2010; Christoph Junghans diff --git a/sci-physics/espresso/Manifest b/sci-physics/espresso/Manifest index e41737b52..a449b96f8 100644 --- a/sci-physics/espresso/Manifest +++ b/sci-physics/espresso/Manifest @@ -1,15 +1,14 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -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 +DIST Espresso-2.2.0b.tar.gz 5020436 RMD160 8a2fec1956e2314aee66e382ef39824143914c81 SHA1 1670a15ea6b2e8f639c932f5d19b140c334688ee SHA256 69882313d15a186f17153a4b9784af28338254a7f6566668a3b44c326ddf29f0 +EBUILD espresso-2.2.0b.ebuild 2149 RMD160 7be9afeadb36fbc73ae697c479c73a01fbbc7332 SHA1 b4b5a1b846687e68bbca5d54a01f5f233ebe0856 SHA256 8d9f890c5dc327de4f79784ff305256a7c1e6f603efbc5a9c91c66cfcaabf707 +MISC ChangeLog 788 RMD160 216433a4029eb4218c25072459f9c932d5aced90 SHA1 372247874fd431d0688f18972cbb4b4803357b1f SHA256 ce873e080e8151b6259cbd27fe8a54e0a8f012f1e2b94361c7636669bab5cd9c MISC metadata.xml 291 RMD160 5ae1471fd0e7b60d7de7027f8b807dcd005bd0b0 SHA1 10bcd36795a8dcc9ebf5b720fe79bd42a9518b7a SHA256 112c54edd1ef7cbe34d7132ba3fd95a0728b9298eea9b2e957fa5e40962842ea -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.15 (GNU/Linux) -iEYEARECAAYFAkxMf/AACgkQy0OE/ans1/kErgCfb0L0zuM8KDO3H+8xzESQzUpN -2eEAn3LALdTcH5aN5ght73SUYXU6U029 -=M/6+ +iEYEARECAAYFAkxR49YACgkQy0OE/ans1/kPWACaAw3N5AbnhOVRkAemf04NlEyf +3EIAnRfTF8V7MwJJ7CgteR3jMCVitGwX +=P3tj -----END PGP SIGNATURE----- diff --git a/sci-physics/espresso/espresso-2.2.0.ebuild b/sci-physics/espresso/espresso-2.2.0.ebuild deleted file mode 100644 index b5c044ae4..000000000 --- a/sci-physics/espresso/espresso-2.2.0.ebuild +++ /dev/null @@ -1,101 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI="3" - -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/6/67/Espresso-${PV}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~x86 ~amd64" -IUSE="X doc examples fftw mpi packages test -tk" - -RDEPEND="dev-lang/tcl - X? ( x11-libs/libX11 ) - fftw? ( sci-libs/fftw:3.0 ) - mpi? ( virtual/mpi ) - tk? ( >=dev-lang/tk-8.4.18-r1 )" - -DEPEND="${RDEPEND} - doc? ( app-doc/doxygen - virtual/latex-base )" - -S="${WORKDIR}/${PN}-${PV:0:5}" - -src_prepare() { - 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) \ - $(use_with X x) -} - -src_compile() { - emake || die "emake failed" - if use doc; then - emake doc || die "emake doc failed" - fi -} - -src_install() { - emake DESTDIR="${D}" install || die "Installing failed" - - dodoc INSTALL README RELEASE_NOTES - - insinto /usr/share/${PN} - doins myconfig-sample.h - - if [ -f myconfig.h ]; then - save_config myconfig.h - else - save_config config/myconfig.h - fi - - if use doc; then - newdoc doc/ug/ug.pdf user_guide.pdf - dohtml -r doc/dg/html/* - newdoc doc/tutorials/tut2/tut2.pdf tutorial.pdf - fi - - if use examples; then - insinto /usr/share/${PN}/examples - doins -r samples/* - #the testsuite are also good examples - rm testsuite/Makefile* testsuite/test.sh.in - insinto /usr/share/${PN}/testsuite - doins testsuite/* - fi - - if use packages; then - insinto /usr/share/${PN}/packages - doins -r packages/* - fi -} - -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 - 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" - elog -} diff --git a/sci-physics/espresso/espresso-2.2.0b.ebuild b/sci-physics/espresso/espresso-2.2.0b.ebuild new file mode 100644 index 000000000..fa74e64e3 --- /dev/null +++ b/sci-physics/espresso/espresso-2.2.0b.ebuild @@ -0,0 +1,100 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI="3" + +inherit autotools 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/f/f3/Espresso-${PV}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~x86 ~amd64" +IUSE="X doc examples fftw mpi packages test -tk" + +RDEPEND="dev-lang/tcl + X? ( x11-libs/libX11 ) + fftw? ( sci-libs/fftw:3.0 ) + mpi? ( virtual/mpi ) + tk? ( >=dev-lang/tk-8.4.18-r1 )" + +DEPEND="${RDEPEND} + doc? ( app-doc/doxygen + virtual/latex-base )" + +#S="${WORKDIR}/${PN}-${PV:0:5}" + +src_prepare() { + 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) \ + $(use_with X x) +} + +src_compile() { + emake || die "emake failed" + if use doc; then + emake doc || die "emake doc failed" + fi +} + +src_install() { + emake DESTDIR="${D}" install || die "Installing failed" + + dodoc INSTALL README RELEASE_NOTES + + insinto /usr/share/${PN} + doins myconfig-sample.h + + if [ -f myconfig.h ]; then + save_config myconfig.h + else + save_config config/myconfig.h + fi + + if use doc; then + newdoc doc/ug/ug.pdf user_guide.pdf + dohtml -r doc/dg/html/* + newdoc doc/tutorials/tut2/tut2.pdf tutorial.pdf + fi + + if use examples; then + insinto /usr/share/${PN}/examples + doins -r samples/* + #the testsuite are also good examples + rm testsuite/Makefile* testsuite/test.sh.in + insinto /usr/share/${PN}/testsuite + doins testsuite/* + fi + + if use packages; then + insinto /usr/share/${PN}/packages + doins -r packages/* + fi +} + +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 + 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" + elog +} diff --git a/sci-physics/espresso/files/espresso-2.2.0-autotools.patch b/sci-physics/espresso/files/espresso-2.2.0-autotools.patch deleted file mode 100644 index 17940f3eb..000000000 --- a/sci-physics/espresso/files/espresso-2.2.0-autotools.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- 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 \ -- cgit v1.2.3-65-gdbad