Version Bump
authorJustin Lecher <jlec@gentoo.org>
Sat, 26 Jun 2010 10:53:30 +0000 (10:53 +0000)
committerJustin Lecher <jlec@gentoo.org>
Sat, 26 Jun 2010 10:53:30 +0000 (10:53 +0000)
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

sci-physics/abinit/ChangeLog
sci-physics/abinit/Manifest
sci-physics/abinit/abinit-6.0.4.ebuild [new file with mode: 0644]
sci-physics/abinit/files/6.0.4-change-default-directories.patch [new file with mode: 0644]
sci-physics/abinit/files/6.0.4-test.patch [new file with mode: 0644]
sci-physics/abinit/metadata.xml

index c976b6c98c9cba2ba4bba7a4bf7ee59e2cbe6ee2..9b3fc95a62d3125038d586560a0874359001361b 100644 (file)
@@ -1,6 +1,13 @@
 # ChangeLog for sci-physics/abinit
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/abinit/ChangeLog,v 1.10 2009/12/18 01:26:24 markusle Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/abinit/ChangeLog,v 1.11 2010/06/26 10:53:30 jlec Exp $
+
+*abinit-6.0.4 (26 Jun 2010)
+
+  26 Jun 2010; Justin Lecher <jlec@gentoo.org>
+  +files/6.0.4-change-default-directories.patch, +files/6.0.4-test.patch,
+  +abinit-6.0.4.ebuild, metadata.xml:
+  Version Bump
 
 *abinit-5.4.4-r1 (18 Dec 2009)
 
index a7e8fa24f01e14304cd43734d0071e0495113efd..d44b4d035e8d3488df60b28fede2b0dbd534d9b0 100644 (file)
@@ -1,10 +1,24 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 5.2.3-fix-64bit-detection.patch 492 RMD160 286765a4fb7b06afd9f829799ad9cd9811711d32 SHA1 dc1c2691212da8b0e62407f0cfb82a83740deb86 SHA256 414be70962e0bdaffc51f9aacce5f5e171e046d7aeacf26d2706961c02501138
 AUX 5.3.4-change-default-directories.patch 1550 RMD160 02abf8695d4a12b0d47b96f86fedb05f65f0fde8 SHA1 03c6200cbe0458040cd3f7af42a28515b4c17b57 SHA256 3d493ed6f49924c248694d0de5aa0c66ac693b4ce5c6b3ce892471c9b2d7fbf7
+AUX 6.0.4-change-default-directories.patch 1304 RMD160 3ba313c2923f817d31eb9b78ce8fa97b03bce762 SHA1 4f8c26defac7afa1eb12848d664acb1faf4626c2 SHA256 0533a0d011c1f1c5e6137d72887097b60ee9304a29c212e34144c77f3d5a91af
+AUX 6.0.4-test.patch 798 RMD160 09afbfcca296f54daef19e01014ba1ed4002b598 SHA1 b530a14b8dd1398b826c5ca8356501b3574f17b0 SHA256 51a75f8152a9fe22073194cfbfaee286b5edeeec3d4a1bdde186b9b8e2d19e93
 AUX abinit-5.4.4-test.patch 925 RMD160 f2ae2995c013ddd25479f952c9a892af1aec77d5 SHA1 12c2b4c7d678363e80067a7f73cbd397ddf91c86 SHA256 482caa37b8e3cfb42bcffe8c998fa94798906e23da5974707e5666c16a77771b
 DIST abinit-5.3.4.tar.gz 28292542 RMD160 7a4bf36e755d56ab8b85f0a609b847c582ff38c9 SHA1 e310ef7c7a6c6edfdfc9007d34ccdde881be71bb SHA256 5f173483d798c99687d3706f110a98c7d4d8639e4222e7e3fb628d7cc6bf9ea1
 DIST abinit-5.4.4.tar.gz 33830853 RMD160 2b4859ef616f416c31a4bd99118010665952588e SHA1 8b6aed103990cd97b7c06a2f1554370bb43146fd SHA256 9f8edc734a5285fccd92e9f93ade465348f54f9b31ba682614f4f4ae13fcd0b5
+DIST abinit-6.0.4.tar.gz 40546752 RMD160 2e0b554fa762a4ebd6d3d91e4d87cacbe533d20b SHA1 4321a78c2e4c0e9f944ed7e3e5566d73d19065ab SHA256 c612f6f3646facb8a439e24cb00ff181f6bc93b374a150422af983e537a1b49d
 EBUILD abinit-5.3.4.ebuild 2411 RMD160 019034070111714d8350d03120002f87ed8b9cb4 SHA1 7a960e629fa7edc2bc3dfc93386cb26424ee1597 SHA256 04a1139eb8b19e50e782e622a15002d96b0ec7e04f614be0b61e7ebfea5af135
 EBUILD abinit-5.4.4-r1.ebuild 2690 RMD160 63d6e3f443285d0e5541934fd6719f9181032be2 SHA1 92eb3e245cdd0fe950ac66e908843353099fd733 SHA256 70bd6931078f01901ced49a27b3966e03c31ad657d827befb2e71721d91a58ea
 EBUILD abinit-5.4.4.ebuild 2777 RMD160 c84b0d707185913c5133f79d344153ae34dc5097 SHA1 3f48507edf453cc2f061890a40b4023d4ee8fbde SHA256 25c404075fb5fd3e509daed8762e33c96661012485999895879a266dac703b90
-MISC ChangeLog 2452 RMD160 1bf58a6bc841c12045eceb709851eebf20c35546 SHA1 2dc0d971506936e6185cfeed54bc62c2e2f56678 SHA256 e035c12bf9b05ae1470d59127548430082bebde63ab255766d1a5b69efd0c619
-MISC metadata.xml 256 RMD160 c1dd75e3f77bae7a5bd165e4d4592520e5f9f3ed SHA1 d0bd0c0728a0932c75ba6ee62a3610b0e948ddcf SHA256 1a34797175a4f62913c4dee4631b5141b08ddab164776021e52167239e16e1d8
+EBUILD abinit-6.0.4.ebuild 2803 RMD160 329b341a84936bbf977dbce6cefc88cfcb24f6c9 SHA1 8489c4fae9a24e766d0eaed7efc7d9771fb8504b SHA256 06c460c9da4805b922fbaf4824e69531dd740ffc3d9e9aba7552580b185de9c9
+MISC ChangeLog 2652 RMD160 1b081bd4ead51f06ee802dd1ec215ac81d9e6e68 SHA1 01ed79689102accf2286158d909ba4fa8ab4c660 SHA256 cd2b8f99aaaece419bd22470f8e87b0f2d9f4be44a9e439a3124f99d778a5c23
+MISC metadata.xml 317 RMD160 8ddde8a8b700606001c8696da118429bcdf5675c SHA1 012bb07586bb4a9bc3abb3300352d8305e6be0b1 SHA256 3cf4ec6ae09941bacb3952010b44cf6c7d2b3103e55c4c09e9e95537b4981b5c
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.15 (GNU/Linux)
+
+iEYEARECAAYFAkwl3DAACgkQgAnW8HDreRbXuQCfZDPHNVY/EAEccUuGa3r55lNb
+vqcAmgJLAc52fCl/imNn3KMliT34GNJ+
+=96gG
+-----END PGP SIGNATURE-----
diff --git a/sci-physics/abinit/abinit-6.0.4.ebuild b/sci-physics/abinit/abinit-6.0.4.ebuild
new file mode 100644 (file)
index 0000000..6047a38
--- /dev/null
@@ -0,0 +1,106 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/abinit/abinit-6.0.4.ebuild,v 1.1 2010/06/26 10:53:30 jlec Exp $
+
+EAPI="3"
+
+inherit fortran toolchain-funcs
+
+DESCRIPTION="Find total energy, charge density and electronic structure using density functional theory"
+HOMEPAGE="http://www.abinit.org/"
+SRC_URI="http://ftp.abinit.org/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="debug mpi plugins test"
+
+RDEPEND="
+       virtual/blas
+       virtual/lapack"
+DEPEND="${RDEPEND}"
+
+# F90 code, g77 won't work
+FORTRAN="gfortran ifc"
+
+pkg_setup() {
+       fortran_pkg_setup
+
+       # Doesn't compile with gcc-4.0, only >=4.1
+       local diemsg="Requires gcc-4.1 or newer"
+       if [[ "${FORTRANC}" = "gfortran" ]]; then
+               if [[ $(gcc-major-version) -eq 4 ]] \
+                       && [[ $(gcc-minor-version) -lt 1  ]]; then
+                               die "${diemsg}"
+               fi
+       fi
+}
+
+src_prepare() {
+       epatch "${FILESDIR}"/${PV}-change-default-directories.patch
+#      epatch "${FILESDIR}"/5.2.3-fix-64bit-detection.patch
+       epatch "${FILESDIR}"/${PV}-test.patch
+
+       # bug #223111: Our eautoreconf directory detection breaks
+       sed -i -e "s:@abinit_srcdir@/::" Makefile.am
+
+       # bug #223111: libtool 2.2 fix (taken from bug #230271)
+       if [ -f "${EPREFIX}/usr/share/aclocal/ltsugar.m4" ]; then
+               cat "${EPREFIX}/usr/share/aclocal/ltsugar.m4" >> config/m4/libtool.m4
+               cat "${EPREFIX}/usr/share/aclocal/ltversion.m4" >> config/m4/libtool.m4
+               cat "${EPREFIX}/usr/share/aclocal/lt~obsolete.m4" >> config/m4/libtool.m4
+               cat "${EPREFIX}/usr/share/aclocal/ltoptions.m4" >> config/m4/libtool.m4
+       fi
+
+       # Yea for breaking compatibility with no ChangeLog entry in 2.60
+       if has_version '>=sys-devel/autoconf-2.60'; then
+               sed -i -e "s:_AC_SRCPATHS:_AC_SRCDIRS:g" config/scripts/make-macros-autotools
+       fi
+
+       eautoreconf
+}
+
+src_configure() {
+       econf \
+               --disable-config-file \
+               $(use_enable mpi) \
+               $(use_enable plugins all-plugins) \
+               $(use_enable netcdf) \
+               $(use_enable debug) \
+               --with-cc-optflags="${CFLAGS}" \
+               --with-fc-optflags="${FFLAGS}" \
+               FC="${FORTRANC}" \
+               CC="$(tc-getCC)" \
+               LD="$(tc-getLD)"
+}
+
+src_test() {
+       einfo "The tests take quite a while, on the order of 2-3 hours"
+       einfo "on a dual Athlon 2000+."
+       cd "${S}"/tests
+       emake tests_min || die
+
+       local REPORT
+       for REPORT in $(find . -name *fl*); do
+               elog "Results for ${REPORT%%/*} tests"
+               while read line; do
+                       elog "${line}"
+               done \
+                       < <(cat ${REPORT} )
+       done
+}
+
+src_install() {
+       emake DESTDIR="${D}" install || die "install failed"
+
+       dodoc KNOWN_PROBLEMS README || die
+
+       mv "${ED}"usr/share/doc/abinit/manpages/abinit.1 "${ED}"/usr/share/man/man1/
+       mv "${ED}"usr/share/doc/abinit{,-${PVR}}
+}
+
+pkg_postinst() {
+       if use test; then
+               elog "The test results will be installed as summary_tests.tar.gz."
+       fi
+}
diff --git a/sci-physics/abinit/files/6.0.4-change-default-directories.patch b/sci-physics/abinit/files/6.0.4-change-default-directories.patch
new file mode 100644 (file)
index 0000000..938edbf
--- /dev/null
@@ -0,0 +1,29 @@
+diff --git a/config/m4/conf-init.m4 b/config/m4/conf-init.m4
+index 3a20c30..8e84730 100644
+--- a/config/m4/conf-init.m4
++++ b/config/m4/conf-init.m4
+@@ -315,15 +315,15 @@ AC_DEFUN([ABI_INIT_INSTALL_DIRS],[
+   fi
+ 
+   dnl Set-up all directory names
+-  abinit_bindir="${abinit_prefix}/abinit/${ABINIT_VERSION_BASE}/bin"
+-  abinit_chkdir="${abinit_prefix}/abinit/${ABINIT_VERSION_BASE}/tests"
+-  abinit_datdir="${abinit_prefix}/abinit"
+-  abinit_docdir="${abinit_prefix}/abinit/${ABINIT_VERSION_BASE}/doc"
+-  abinit_incdir="${abinit_prefix}/abinit/${ABINIT_VERSION_BASE}/include"
+-  abinit_libdir="${abinit_prefix}/abinit/${ABINIT_VERSION_BASE}/lib"
+-  abinit_mandir="${abinit_prefix}/abinit/man"
+-  abinit_rundir="${abinit_prefix}/abinit/bin"
+-  abinit_wwwdir="${abinit_prefix}/abinit/${ABINIT_VERSION_BASE}/www"
++  abinit_bindir="${abinit_prefix}/bin"
++  abinit_chkdir="${abinit_prefix}/share/abinit/tests"
++  abinit_datdir="${abinit_prefix}/share/abinit"
++  abinit_docdir="${abinit_prefix}/share/doc/abinit-${ABINIT_VERSION_BASE}"
++  abinit_incdir="${includedir}/abinit"
++  abinit_libdir="${libdir}"
++  abinit_mandir="${abinit_prefix}/share/man/man"
++  abinit_rundir="${abinit_prefix}/bin"
++  abinit_wwwdir="${abinit_prefix}/share/abinit/www"
+ 
+   dnl Substitute all variables
+   AC_SUBST(abinit_prefix)
diff --git a/sci-physics/abinit/files/6.0.4-test.patch b/sci-physics/abinit/files/6.0.4-test.patch
new file mode 100644 (file)
index 0000000..aaa7f9e
--- /dev/null
@@ -0,0 +1,26 @@
+diff --git a/tests/Scripts/wrap-parallel-tests.sh b/tests/Scripts/wrap-parallel-tests.sh
+index 91d1ef9..b199627 100755
+--- a/tests/Scripts/wrap-parallel-tests.sh
++++ b/tests/Scripts/wrap-parallel-tests.sh
+@@ -22,7 +22,7 @@ set -e
+ 
+ # Init
+ my_name="wrap-parallel-tests"
+-my_cnffile="./tests.env"
++my_cnffile="../tests/tests.env"
+ paral_sets="A B C D E F G H I J K L M N O P R T U V X Y"
+ #mpiio_sets="A"
+ mpiio_sets="A P Q R T X Y"
+diff --git a/tests/Scripts/wrap-standard-tests.sh b/tests/Scripts/wrap-standard-tests.sh
+index 1b9fd72..26caff6 100755
+--- a/tests/Scripts/wrap-standard-tests.sh
++++ b/tests/Scripts/wrap-standard-tests.sh
+@@ -3,7 +3,7 @@
+ #
+ 
+ my_name="wrap-standard-tests"
+-my_cnffile="tests.env"
++my_cnffile="../tests/tests.env"
+ 
+ # Check arguments
+ if test "${#}" -lt "1"; then
index 56668dc0efbdd2f40333534b53c37c6ae2bf63cd..d7c16aaf672b34dbf187961bf65ca9a3489362bc 100644 (file)
@@ -6,4 +6,7 @@
 <email>dberkholz@gentoo.org</email>
 <name>Donnie Berkholz</name>
 </maintainer>
+<use>
+  <flag name='plugins'>Build all plugins</flag>
+</use>
 </pkgmetadata>