From 7a2a4a48ec639b1c65f2518d30e87f2e1c4932c2 Mon Sep 17 00:00:00 2001 From: Justin Bronder Date: Mon, 29 Nov 2010 16:14:20 +0000 Subject: cleanup Package-Manager: portage-2.1.9.24/cvs/Linux x86_64 --- sys-cluster/mpich2/ChangeLog | 6 +- sys-cluster/mpich2/Manifest | 16 ++- sys-cluster/mpich2/metadata.xml | 1 - sys-cluster/mpich2/mpich2-1.0.8.ebuild | 222 --------------------------------- 4 files changed, 17 insertions(+), 228 deletions(-) delete mode 100644 sys-cluster/mpich2/mpich2-1.0.8.ebuild (limited to 'sys-cluster') diff --git a/sys-cluster/mpich2/ChangeLog b/sys-cluster/mpich2/ChangeLog index 81886a281592..2e1a03a7c007 100644 --- a/sys-cluster/mpich2/ChangeLog +++ b/sys-cluster/mpich2/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-cluster/mpich2 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-cluster/mpich2/ChangeLog,v 1.65 2010/11/26 16:02:47 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/mpich2/ChangeLog,v 1.66 2010/11/29 16:14:20 jsbronder Exp $ + + 29 Nov 2010; Justin Bronder -mpich2-1.0.8.ebuild, + metadata.xml: + cleanup 26 Nov 2010; Jeroen Roovers mpich2-1.2.1_p1-r1.ebuild: Stable for HPPA (bug #324417). diff --git a/sys-cluster/mpich2/Manifest b/sys-cluster/mpich2/Manifest index 8456bfee8f25..e730279b8682 100644 --- a/sys-cluster/mpich2/Manifest +++ b/sys-cluster/mpich2/Manifest @@ -1,3 +1,6 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX 0001-MPD_CONF_FILE-should-be-readable.patch 1496 RMD160 33b8db14ab69293a53ecb0192ea7a2a568ee422e SHA1 88cb1d7cc60a1eb7a2a7ea07c8058ebb3318c734 SHA256 747462d1d2272291fd956631cee4170112523027e2b89d4f2abf6d618cc004aa AUX 0002-mpd_conf_file-search-order.patch 3882 RMD160 90bf46695398bea605002826c7d9b85c7f07e5e9 SHA1 9f20b59f853e13d81f6227ddb16535d76ec4bab3 SHA256 a56c943e68e0bcf69900ae76cb4df73ef19d60f0e9e16e6d75d48b2651324b33 AUX 0003-Fix-pkgconfig-for-mpich2-ch3-v1.2.1.patch 1510 RMD160 8bcd0ec310bcbc13bfd3d0200c1b9f5a88fc4677 SHA1 949da42c2fa90c4a298dc37e0994e97317ae75e9 SHA256 84896b8c127a872fac3a99e9acdb41a2a051275399b186b54349a72d478acb00 @@ -10,9 +13,14 @@ AUX mpich2-1.0.8-py26.patch 1341 RMD160 51d9b6ebb1fcce06cabb7ef201ffefcd97e39e3e AUX mpich2-1.0.8-site-packages-py.patch 7534 RMD160 93b2cab20620da379615eaf3bfc7279384987722 SHA1 706313c20e1d4d6a4a060c8ac36befdb5ee3b926 SHA256 a857e7c0effa7cdd62c1bc1bd054b4746764246410062d373e7e0892bcd20df8 AUX mpich2-1.2.1-fix-missing-libs.patch 1825 RMD160 aec1251aa66f0d63c5848920c63339d5558a0f61 SHA1 d70695c63d891a32a98324ffd236f8751465fe98 SHA256 f645d00fc6adeef553517078dcc3313cbabfbf8069ad5a76e2570d183b2d824b AUX mpich2.envd 45 RMD160 e29a0d617bbc15cc42d3088f8a79c1c715b353fa SHA1 765b885d0e1d65fe7ba845cf72e3e923613d6514 SHA256 d6f128f84e1d015922af42e1280586b84737740b2517cc0b35f498b571f252f9 -DIST mpich2-1.0.8.tar.gz 17237476 RMD160 646cf50fbdc60a49809f4d0a6bcaf2835844db1f SHA1 41d6f6ce1034ecec5c14fb03592730ae2dd071e5 SHA256 7551ce20f3ef366567c566d08782323360b5dbd2d15d816e41c10b5f96eaf369 DIST mpich2-1.2.1p1.tar.gz 18014859 RMD160 810cc486b65e4bcf977ac8d96ccbbcea87e0cbaa SHA1 26bd5620b45bc654aa3945755d11450be63d650c SHA256 a55d1682ee0b5ebbacc047f60620ed291e0a9b3ded3eaeb6a2c81a1598c4c964 -EBUILD mpich2-1.0.8.ebuild 6043 RMD160 1b3bab7d26b9dbb4bec6c8768384eebbbdd9b1a0 SHA1 6b362515fd2afeff899d3bf42bd639fe2bdddf81 SHA256 0d82f061af8a8247af27107e7dc9e20fa296699c18021ac2a4b182c946ab5cd6 EBUILD mpich2-1.2.1_p1-r1.ebuild 4918 RMD160 82cd192b8160291470feaec62f9bdc821c506178 SHA1 40d06d6ac024a1796670bedddb672243a30a07eb SHA256 0f0790d69f4422aca0d933fdb7404bcc1d8b0a1f1ebf6aeb5bc4d57fc2c7b690 -MISC ChangeLog 13073 RMD160 9b2d4e198a00ddf18b7b90f0f124044950ffb726 SHA1 6970673d37684d29ace2ef1de13b4fa21eb51bb1 SHA256 dfac7566d45fc297507728b56208e2190027d740701a497ec0964a3b01d84576 -MISC metadata.xml 465 RMD160 6713e2a2a175fb1df56564287115fbce70015fb5 SHA1 d583272c733b7d4f86dc116ee236aca863a15f6f SHA256 61bab1db8344a5bb647398329227b5346bc54aa5589120c8a63be109cca7f04e +MISC ChangeLog 13181 RMD160 c56d6a20f558022689cfd22c328d914ddc178224 SHA1 3b8524df268f6585fe0b73a21901b980a92b18cc SHA256 f62f3e967fc69765c3596eb56f76959d9652d47ab568a245f16400554bc1bb7d +MISC metadata.xml 420 RMD160 930e2ff21815f000e213b80bb98074dd7594bafb SHA1 7ef0b850e21959933db71dfa8c57ff9349e37762 SHA256 c6dfa7e480cb95bb9b6bcb3fdbb89836795f8872ff9b098de85ec6e9ec0a1c34 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.16 (GNU/Linux) + +iEYEARECAAYFAkzz0WIACgkQ4MrvBE1wQ8mITACgp2kdfh1YLKhD8qaL053zhNXr +ghgAn0okZ3ZHSxGO93TtNJ9LZ9IPVr6g +=7Jqy +-----END PGP SIGNATURE----- diff --git a/sys-cluster/mpich2/metadata.xml b/sys-cluster/mpich2/metadata.xml index 8dedc0a08578..7958de4efeeb 100644 --- a/sys-cluster/mpich2/metadata.xml +++ b/sys-cluster/mpich2/metadata.xml @@ -7,7 +7,6 @@ Justin Bronder - Add pvfs2 support Enable romio, a high-performance portable MPI-IO implementation Enable MPI_THREAD_MULTIPLE diff --git a/sys-cluster/mpich2/mpich2-1.0.8.ebuild b/sys-cluster/mpich2/mpich2-1.0.8.ebuild deleted file mode 100644 index e28116a1d0a4..000000000000 --- a/sys-cluster/mpich2/mpich2-1.0.8.ebuild +++ /dev/null @@ -1,222 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-cluster/mpich2/mpich2-1.0.8.ebuild,v 1.14 2010/06/14 21:44:05 arfrever Exp $ - -EAPI=1 -inherit python eutils fortran autotools - -DESCRIPTION="MPICH2 - A portable MPI implementation" -HOMEPAGE="http://www.mcs.anl.gov/research/projects/mpich2/index.php" -SRC_URI="http://www.mcs.anl.gov/research/projects/mpich2/downloads/tarballs/${PV}/${P}.tar.gz" - -LICENSE="as-is" -SLOT="0" -KEYWORDS="amd64 ppc ppc64 x86" -IUSE="+cxx debug doc fortran pvfs2 threads romio mpi-threads" - -COMMON_DEPEND="dev-lang/perl - >=dev-lang/python-2.3 - romio? ( net-fs/nfs-utils ) - pvfs2? ( >=sys-cluster/pvfs2-2.7.0 ) - dev-libs/libaio - !media-sound/mpd - !sys-cluster/mpiexec - !sys-cluster/openmpi - !sys-cluster/lam-mpi - !sys-cluster/mpich" - -DEPEND="${COMMON_DEPEND} - sys-devel/libtool" - -RDEPEND="${COMMON_DEPEND} - net-misc/openssh" - -pkg_setup() { - if [ -n "${MPICH_CONFIGURE_OPTS}" ]; then - elog "User-specified configure options are ${MPICH_CONFIGURE_OPTS}." - else - elog "User-specified configure options are not set." - elog "If needed, see the docs and set MPICH_CONFIGURE_OPTS." - fi - - if use fortran ; then - FORTRAN="g77 gfortran ifort ifc" - fortran_pkg_setup - fi - - if use mpi-threads && ! use threads; then - die "USE=mpi-threads requires USE=threads" - fi - - MPD_CONF_FILE_DIR=/etc/${PN} -} - -src_unpack() { - unpack ${A} - cd "${S}" - - # A lot of these patches touch Makefile.in and configure files. - # While it would be nice to regenerate everything, mpich2 uses - # simplemake instead of automake, so we're doing this for now - # and hoping for a receptive upstream. - - # #220877 - sed -i 's/-fpic/-fPIC/g' \ - $(grep -lr -e '-fpic' "${S}/") || die "failed to change -fpic to -fPIC" - - # Put python files in site-packages where they belong. - # This isn't the prettiest little patch, but it does - # move python files out of /usr/bin/ - epatch "${FILESDIR}"/${P}-site-packages-py.patch - - # Respect the env var MPD_CONF_FILE - # TODO: Send upstream - epatch "${FILESDIR}"/${P}-mpdconf-env.patch - - # Fix gforker instal-alt - # TODO: Send upstream - epatch "${FILESDIR}"/${P}-gforker-install-alt-fix.patch - - # We need f90 to include the directory with mods, and to - # fix hardcoded paths for src_test() - sed -i \ - -e "s,F90FLAGS\( *\)=,F90FLAGS\1?=," \ - -e "s,\$(bindir)/,${S}/bin/,g" \ - -e "s,@MPIEXEC@,${S}/bin/mpiexec,g" \ - $(find ./test/ -name 'Makefile.in') || die - - # 254167, I'm pretty sure they meant srcdir in the path to remove files. - # TODO: Send upstream - sed -i 's:scrdir:srcdir:g' "${S}"/src/pm/mpd/Makefile.in || die - - # #257821, fix the pkgconfig file. - # TODO: Send upstream - epatch "${FILESDIR}"/${P}-pkgconfig.patch - - if ! use romio; then - # These tests in errhan/ rely on MPI::File ...which is in romio - echo "" > test/mpi/errors/cxx/errhan/testlist - fi - - # #269856, detect python 2.6 - # TODO: Send upstream - epatch "${FILESDIR}"/${P}-py26.patch - pushd "${S}"/src/pm/mpd >/dev/null || die "Missing src/pm/mpd" - cat aclocal_mpd.m4 "${S}"/confdb/aclocal_subcfg.m4 > aclocal.m4 - AT_M4DIR=${S}/confdb eautoreconf - popd >/dev/null -} - -src_compile() { - local c="${MPICH_CONFIGURE_OPTS} --enable-sharedlibs=gcc" - local romio_conf - - # The configure statements can be somewhat confusing, as they - # don't all show up in the top level configure, however, they - # are picked up in the children directories. - - use debug && c="${c} --enable-g=all --enable-debuginfo" - - if use threads ; then - c="${c} --with-thread-package=pthreads" - else - c="${c} --with-thread-package=none" - fi - - # enable f90 support for appropriate compilers - case "${FORTRANC}" in - gfortran|if*) - c="${c} --enable-f77 --enable-f90";; - g77) - c="${c} --enable-f77 --disable-f90";; - esac - - if use mpi-threads; then - c="${c} --enable-threads=multiple" - else - c="${c} --enable-threads=single" - fi - - if use pvfs2; then - # nfs and ufs are defaults in 1.0.8 at least. - romio_conf="--with-file-system=pvfs2+nfs+ufs --with-pvfs2=/usr" - fi - - c="${c} --sysconfdir=/etc/${PN}" - econf ${c} ${romio_conf} \ - --docdir=/usr/share/doc/${PF} \ - --with-pm=mpd:gforker \ - --disable-mpe \ - $(use_enable romio) \ - $(use_enable cxx) \ - || die - # Oh, the irony. - # http://www.mcs.anl.gov/research/projects/mpich2/support/index.php?s=faqs#parmake - # https://trac.mcs.anl.gov/projects/mpich2/ticket/297 - emake -j1 || die -} - -src_test() { - local rc - - cp "${FILESDIR}"/mpd.conf "${T}"/mpd.conf || die - chmod 600 "${T}"/mpd.conf - export MPD_CONF_FILE="${T}/mpd.conf" - "${S}"/bin/mpd --daemon --pid="${T}"/mpd.pid - - make \ - CC="${S}"/bin/mpicc \ - CXX="${S}"/bin/mpicxx \ - FC="${S}"/bin/mpif77 \ - F90="${S}"/bin/mpif90 \ - F90FLAGS="${F90FLAGS} -I${S}/src/binding/f90/" \ - testing - rc=$? - - "${S}"/bin/mpdallexit || kill $(<"${T}"/mpd.pid) - return ${rc} -} - -src_install() { - emake DESTDIR="${D}" install || die - - dodir ${MPD_CONF_FILE_DIR} - insinto ${MPD_CONF_FILE_DIR} - doins "${FILESDIR}"/mpd.conf || die - - dodir /usr/share/doc/${PF} - dodoc COPYRIGHT README README.romio README.testing \ - CHANGES README.developer RELEASE_NOTES || die - newdoc src/pm/mpd/README README.mpd || die - - if ! use doc; then - rm -rf "${D}"/usr/share/doc/www* - else - dodir /usr/share/doc/${PF}/www - mv "${D}"/usr/share/doc/www*/* "${D}"/usr/share/doc/${PF}/www/ - fi - - cp "${FILESDIR}"/${PN}.envd "${T}"/ - sed -i "s,@MPD_CONF_FILE_DIR@,${MPD_CONF_FILE_DIR}," \ - "${T}"/${PN}.envd - - ln -s ../$(get_libdir)/python$(python_get_version)/site-packages/mpich2/mpdgdbdrv.py \ - "${D}"/usr/bin/mpdgdbdrv.py - newenvd "${FILESDIR}"/${PN}.envd 25mpich2 -} - -pkg_postinst() { - # Here so we can play with ebuild commands as a normal user - chown root:root "${ROOT}"${MPD_CONF_FILE_DIR}/mpd.conf - chmod 600 "${ROOT}"${MPD_CONF_FILE_DIR}/mpd.conf - - python_mod_optimize $(python_get_sitedir)/${PN} - elog "" - elog "MPE2 has been removed from this ebuild and now stands alone" - elog "as sys-cluster/mpe2." - elog "" -} - -pkg_postrm() { - python_mod_cleanup $(python_get_sitedir)/${PN} -} -- cgit v1.2.3-65-gdbad