From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1RpDUs-0004l0-MP for garchives@archives.gentoo.org; Mon, 23 Jan 2012 06:35:20 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 69FD4E0774; Mon, 23 Jan 2012 06:35:10 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 132F2E0774 for ; Mon, 23 Jan 2012 06:35:10 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 882701B4008 for ; Mon, 23 Jan 2012 06:35:09 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id E7A348004C for ; Mon, 23 Jan 2012 06:35:08 +0000 (UTC) From: "Sebastien Fabbro" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sebastien Fabbro" Message-ID: <667550afc2c913d35fff9ebba1e98f1b9adf8767.bicatali@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sci-mathematics/petsc/ X-VCS-Repository: proj/sci X-VCS-Files: sci-mathematics/petsc/ChangeLog sci-mathematics/petsc/petsc-3.1_p4.ebuild sci-mathematics/petsc/petsc-3.1_p5-r2.ebuild sci-mathematics/petsc/petsc-3.1_p7.ebuild sci-mathematics/petsc/petsc-3.1_p8-r1.ebuild sci-mathematics/petsc/petsc-3.1_p8.ebuild X-VCS-Directories: sci-mathematics/petsc/ X-VCS-Committer: bicatali X-VCS-Committer-Name: Sebastien Fabbro X-VCS-Revision: 667550afc2c913d35fff9ebba1e98f1b9adf8767 Date: Mon, 23 Jan 2012 06:35:08 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 64012f86-eb68-4dfe-90c3-f5b066f30b5d X-Archives-Hash: 8bc797974b25a4bf1ad1c4cf605754ff commit: 667550afc2c913d35fff9ebba1e98f1b9adf8767 Author: S=C3=A9bastien Fabbro gmail com> AuthorDate: Mon Jan 23 06:35:00 2012 +0000 Commit: Sebastien Fabbro gentoo org> CommitDate: Mon Jan 23 06:35:00 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/sci.git;a=3Dc= ommit;h=3D667550af switched to main tree hypre --- sci-mathematics/petsc/ChangeLog | 7 +- sci-mathematics/petsc/petsc-3.1_p4.ebuild | 134 ------------------- sci-mathematics/petsc/petsc-3.1_p5-r2.ebuild | 177 --------------------= ------ sci-mathematics/petsc/petsc-3.1_p7.ebuild | 177 --------------------= ------ sci-mathematics/petsc/petsc-3.1_p8-r1.ebuild | 4 +- sci-mathematics/petsc/petsc-3.1_p8.ebuild | 177 --------------------= ------ 6 files changed, 8 insertions(+), 668 deletions(-) diff --git a/sci-mathematics/petsc/ChangeLog b/sci-mathematics/petsc/Chan= geLog index 0604c7f..7826fc6 100644 --- a/sci-mathematics/petsc/ChangeLog +++ b/sci-mathematics/petsc/ChangeLog @@ -1,7 +1,12 @@ # ChangeLog for sci-mathematics/petsc -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ =20 + 23 Jan 2012; S=C3=A9bastien Fabbro -petsc-3.1_p4= .ebuild, + -petsc-3.1_p5-r2.ebuild, -petsc-3.1_p7.ebuild, -petsc-3.1_p8.ebuild, + petsc-3.1_p8-r1.ebuild: + switched to main tree hypre + 21 Jun 2011; Justin Lecher petsc-3.1_p4.ebuild, petsc-3.1_p5-r2.ebuild, petsc-3.1_p7.ebuild, petsc-3.1_p8.ebuild, petsc-3.1_p8-r1.ebuild, metadata.xml: diff --git a/sci-mathematics/petsc/petsc-3.1_p4.ebuild b/sci-mathematics/= petsc/petsc-3.1_p4.ebuild deleted file mode 100644 index 6adee0a..0000000 --- a/sci-mathematics/petsc/petsc-3.1_p4.ebuild +++ /dev/null @@ -1,134 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=3D3 - -inherit flag-o-matic fortran-2 toolchain-funcs - -MY_P=3D"${PN}-${PV/_/-}" - -DESCRIPTION=3D"Portable, Extensible Toolkit for Scientific Computation" -HOMEPAGE=3D"http://www.mcs.anl.gov/petsc/petsc-as/" -SRC_URI=3D"http://ftp.mcs.anl.gov/pub/petsc/release-snapshots/${MY_P}.ta= r.gz" - -LICENSE=3D"petsc" -SLOT=3D"0" -KEYWORDS=3D"~amd64 ~x86" -IUSE=3D"cxx debug doc fortran mpi static-libs X" - -RDEPEND=3D"mpi? ( virtual/mpi[cxx?,fortran?] ) - X? ( x11-libs/libX11 ) - virtual/lapack - virtual/blas" - -DEPEND=3D"${RDEPEND} - sys-devel/gcc[-nocxx,fortran?]" - -S=3D"${WORKDIR}/${MY_P}" - -src_prepare(){ - epatch "${FILESDIR}/${PN}-configure-pic.patch" - # My failed tries on the parallel build QA warnings: - # sed -i "s/-\?\(@\?\)\${OMAKE}/\1\${MAKE}/g" makefile || die "sed fail= ed" - # sed -i "s/\ make /\ ${MAKE} /g" makefile || die "sed failed" -} - -src_configure(){ - local mylang - local myopt - local myconf - - use cxx && mylang=3D"cxx" || mylang=3D"c" - use debug && myopt=3D"debug" || myopt=3D"opt" - - export PETSC_DIR=3D"${S}" || die - export PETSC_ARCH=3D"linux-gnu-${mylang}-${myopt}" || die - - if use mpi; then - ## this works independently of the used mpi implementation - ## (openmpi/mpich2) - myconf=3D"${myconf} --with-cc=3D/usr/bin/mpicc --with-cxx=3D/usr/bin/m= picxx" - myconf=3D"${myconf} --with-fc=3D/usr/bin/mpif77" - myconf=3D"${myconf} --with-mpi=3D1 --with-mpi-compilers=3D1" - - ## of openmpi is used, the following works too, but fails with mpich2 - #myconf=3D"${myconf} --with-mpi-include=3D/usr/include" - ## adding mpi libraries, -lmpi only is not sufficient if compiling - ## with g++, mpi_f77 needed when using fortran (mpi_f90 caused errors) - #myconf=3D"${myconf} --with-mpi-lib=3D[/usr/$(get_libdir)/libmpi.so" - #use cxx && myconf=3D"${myconf},/usr/$(get_libdir)/libmpi_cxx.so" - #use fortran && myconf=3D"${myconf},/usr/$(get_libdir)/libmpi_f77.so" - #myconf=3D"${myconf}]" - #myconf=3D"${myconf} --known-mpi-shared=3D1" - else - myconf=3D"${myconf} --with-cc=3D$(tc-getCC) --with-cxx=3D$(tc-getCXX)" - myconf=3D"${myconf} --with-mpi=3D0" - fi - - use X \ - && myconf=3D"${myconf} --with-X=3D1" \ - || myconf=3D"${myconf} --with-X=3D0" - use static-libs \ - && myconf=3D"${myconf} --with-shared=3D0" \ - || myconf=3D"${myconf} --with-shared=3D1" - use amd64 \ - && myconf=3D"${myconf} --with-64-bit-indices=3D1" \ - || myconf=3D"${myconf} --with-64-bit-indices=3D0" - use fortran \ - && myconf=3D"${myconf} --with-fortran=3D1" \ - || myconf=3D"${myconf} --with-fortran=3D0" - - if use debug; then - strip-flags - filter-flags -O* - myconf=3D"${myconf} --with-debugging=3D1" - else - myconf=3D"${myconf} --with-debugging=3D0" - fi - - python "${S}"/config/configure.py ${myconf} \ - CFLAGS=3D"${CFLAGS}" CXXFLAGS=3D"${CXXFLAGS}" LDFLAGS=3D"${LDFLAGS}" \ - --with-windows-graphics=3D0 --with-matlab=3D0 --with-python=3D0 \ - --with-clanguage=3D"${mylang}" --with-single-library=3D1 \ - --with-petsc-arch=3D"${PETSC_ARCH}" --with-precision=3Ddouble \ - --with-blas-lapack-lib=3D"$(pkg-config --libs lapack)" \ - || die "PETSc configuration failed" -} - -src_install(){ - insinto /usr/include/"${PN}" - doins "${S}"/include/*.h "${S}"/include/*.hh - doins "${S}/${PETSC_ARCH}"/include/*.h - - insinto /usr/include/"${PN}"/private - doins "${S}"/include/private/*.h - - # fix paths stored in petscconf.h - dosed "s:${S}:/usr:g" /usr/include/"${PN}"/petscconf.h - dosed "s:${PETSC_ARCH}/lib:$(get_libdir):g" /usr/include/"${PN}"/petscc= onf.h \ - - if ! use mpi ; then - insinto /usr/include/"${PN}"/mpiuni - doins "${S}"/include/mpiuni/*.h - fi - - if use doc ; then - dodoc docs/manual.pdf - dohtml -r docs/*.html docs/changes docs/manualpages - fi - - use static-libs \ - && dolib.a "${S}/${PETSC_ARCH}"/lib/*.a \ - || dolib.so "${S}/${PETSC_ARCH}"/lib/*.so -} - -pkg_postinst() { - elog "The petsc ebuild is still under development." - elog "Help us improve the ebuild in:" - elog "http://bugs.gentoo.org/show_bug.cgi?id=3D53386" - elog "This ebuild is known to have parallel build issues, " - elog "hopefully resolved by upstream soon." - elog "Another problem is that you can break this package by" - elog "switching your mpi implementation without rebuild petsc." -} diff --git a/sci-mathematics/petsc/petsc-3.1_p5-r2.ebuild b/sci-mathemati= cs/petsc/petsc-3.1_p5-r2.ebuild deleted file mode 100644 index f3165c2..0000000 --- a/sci-mathematics/petsc/petsc-3.1_p5-r2.ebuild +++ /dev/null @@ -1,177 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=3D3 - -inherit flag-o-matic fortran-2 toolchain-funcs - -MY_P=3D"${PN}-${PV/_/-}" - -DESCRIPTION=3D"Portable, Extensible Toolkit for Scientific Computation" -HOMEPAGE=3D"http://www.mcs.anl.gov/petsc/petsc-as/" -SRC_URI=3D"http://ftp.mcs.anl.gov/pub/petsc/release-snapshots/${MY_P}.ta= r.gz" - -LICENSE=3D"petsc" -SLOT=3D"0" -KEYWORDS=3D"~x86 ~amd64" -IUSE=3D"cxx debug doc fortran hdf5 hypre metis mpi static-libs X" - -RDEPEND=3D"mpi? ( virtual/mpi[cxx?,fortran?] ) - X? ( x11-libs/libX11 ) - virtual/lapack - virtual/blas - hypre? ( >=3Dsci-mathematics/hypre-2.6.0b[static-libs=3D] ) - metis? ( sci-libs/parmetis ) - hdf5? ( sci-libs/hdf5[!mpi?] ) -" - -DEPEND=3D"${RDEPEND} - sys-devel/gcc[-nocxx,fortran?]" - -S=3D"${WORKDIR}/${MY_P}" - -if use hypre; then - use cxx || die "hypre needs cxx, please enable cxx or disable hypre use= flag" - use mpi || die "hypre needs mpi, please enable mpi or disable hypre use= flag" -fi - -src_prepare(){ - epatch "${FILESDIR}/${PN}-configure-pic.patch" - epatch "${FILESDIR}/${PN}-disable-rpath.patch" -} - -src_configure(){ - local mylang - local myopt - local myconf - - use cxx && mylang=3D"cxx" || mylang=3D"c" - use debug && myopt=3D"debug" || myopt=3D"opt" - - export PETSC_DIR=3D"${S}" || die - export PETSC_ARCH=3D"linux-gnu-${mylang}-${myopt}" || die - - myconf[10]=3D"--with-blas-lapack-lib=3D$(pkg-config --libs lapack)" - myconf[11]=3D"CFLAGS=3D${CFLAGS}" - myconf[12]=3D"CXXFLAGS=3D${CXXFLAGS}" - myconf[13]=3D"LDFLAGS=3D${LDFLAGS}" - myconf[14]=3D"--with-windows-graphics=3D0" - myconf[15]=3D"--with-matlab=3D0" - myconf[16]=3D"--with-python=3D0" - myconf[17]=3D"--with-clanguage=3D${mylang}" - myconf[18]=3D"--with-single-library=3D1" - myconf[19]=3D"--with-petsc-arch=3D${PETSC_ARCH}" - myconf[20]=3D"--with-precision=3Ddouble" - myconf[21]=3D"--with-gnu-compilers=3D1" - use amd64 \ - && myconf[22]=3D"--with-64-bit-pointers=3D1" \ - || myconf[22]=3D"--with-64-bit-pointers=3D0" - use cxx \ - && myconf[23]=3D"--with-c-support=3D1" - use amd64 \ - && myconf[24]=3D"--with-64-bit-indices=3D1" \ - || myconf[24]=3D"--with-64-bit-indices=3D0" - - if use mpi; then - myconf[30]=3D"--with-cc=3D/usr/bin/mpicc" - myconf[31]=3D"--with-cxx=3D/usr/bin/mpicxx" - use fortran && myconf[32]=3D"--with-fc=3D/usr/bin/mpif77" - myconf[33]=3D"--with-mpi=3D1" - myconf[34]=3D"--with-mpi-compilers=3D1" - else - myconf[30]=3D"--with-cc=3D$(tc-getCC)" - myconf[31]=3D"--with-cxx=3D$(tc-getCXX)" - use fortran && myconf[32]=3D"--with-fc=3D$(tc-getF77)" - myconf[33]=3D"--with-mpi=3D0" - fi - - use X \ - && myconf[40]=3D"--with-X=3D1" \ - || myconf[40]=3D"--with-X=3D0" - use static-libs \ - && myconf[41]=3D"--with-shared=3D0" \ - || myconf[41]=3D"--with-shared=3D1" - use fortran \ - && myconf[43]=3D"--with-fortran=3D1" \ - || myconf[43]=3D"--with-fortran=3D0" - - if use debug; then - strip-flags - filter-flags -O* - myconf[44]=3D"--with-debugging=3D1" - else - myconf[44]=3D"--with-debugging=3D0" - fi - - if use hypre; then - # hypre cannot handle 64 bit indices, therefore disabled - myconf[24]=3D"--with-64-bit-indices=3D0" - myconf[52]=3D"--with-hypre=3D1" - myconf[53]=3D"--with-hypre-include=3D/usr/include/hypre" - use static-libs \ - && myconf[54]=3D"--with-hypre-lib=3D/usr/$(get_libdir)/libHYPRE.a" \ - || myconf[54]=3D"--with-hypre-lib=3D/usr/$(get_libdir)/libHYPRE.so" - else - myconf[52]=3D"--with-hypre=3D0" - fi - - if use metis; then - myconf[61]=3D"--with-parmetis=3D1" - myconf[62]=3D"--with-parmetis-include=3D/usr/include/parmetis" - myconf[63]=3D"--with-parmetis-lib=3D/usr/$(get_libdir)/libparmetis.so" - else - myconf[61]=3D"--with-parmetis=3D0" - fi - - if use hdf5; then - myconf[71]=3D"--with-hdf5=3D1" - myconf[72]=3D"--with-hdf5-include=3D/usr/include" - myconf[73]=3D"--with-hdf5-lib=3D/usr/$(get_libdir)/libhdf5.so" - else - myconf[71]=3D"--with-hdf5=3D0" - fi - - myconf[81]=3D"--with-scotch=3D0" - - einfo "Configure options: ${myconf[@]}" - python "${S}/config/configure.py" "${myconf[@]}" \ - || die "PETSc configuration failed" -} - -src_install(){ - insinto /usr/include/"${PN}" - doins "${S}"/include/*.h "${S}"/include/*.hh - doins "${S}/${PETSC_ARCH}"/include/*.h - - insinto /usr/include/"${PN}"/private - doins "${S}"/include/private/*.h - - # fix paths stored in petscconf.h - dosed "s:${S}:/usr:g" /usr/include/"${PN}"/petscconf.h - dosed "s:${PETSC_ARCH}/lib:$(get_libdir):g" /usr/include/"${PN}"/petscc= onf.h \ - - if ! use mpi ; then - insinto /usr/include/"${PN}"/mpiuni - doins "${S}"/include/mpiuni/*.h - fi - - if use doc ; then - dodoc docs/manual.pdf - dohtml -r docs/*.html docs/changes docs/manualpages - fi - - use static-libs \ - && dolib.a "${S}/${PETSC_ARCH}"/lib/*.a \ - || dolib.so "${S}/${PETSC_ARCH}"/lib/*.so -} - -pkg_postinst() { - elog "The petsc ebuild is still under development." - elog "Help us improve the ebuild in:" - elog "http://bugs.gentoo.org/show_bug.cgi?id=3D53386" - elog "This ebuild is known to have parallel build issues, " - elog "hopefully resolved by upstream soon." - elog "Another problem is that you can break this package by" - elog "switching your mpi implementation without rebuild petsc." -} diff --git a/sci-mathematics/petsc/petsc-3.1_p7.ebuild b/sci-mathematics/= petsc/petsc-3.1_p7.ebuild deleted file mode 100644 index f3165c2..0000000 --- a/sci-mathematics/petsc/petsc-3.1_p7.ebuild +++ /dev/null @@ -1,177 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=3D3 - -inherit flag-o-matic fortran-2 toolchain-funcs - -MY_P=3D"${PN}-${PV/_/-}" - -DESCRIPTION=3D"Portable, Extensible Toolkit for Scientific Computation" -HOMEPAGE=3D"http://www.mcs.anl.gov/petsc/petsc-as/" -SRC_URI=3D"http://ftp.mcs.anl.gov/pub/petsc/release-snapshots/${MY_P}.ta= r.gz" - -LICENSE=3D"petsc" -SLOT=3D"0" -KEYWORDS=3D"~x86 ~amd64" -IUSE=3D"cxx debug doc fortran hdf5 hypre metis mpi static-libs X" - -RDEPEND=3D"mpi? ( virtual/mpi[cxx?,fortran?] ) - X? ( x11-libs/libX11 ) - virtual/lapack - virtual/blas - hypre? ( >=3Dsci-mathematics/hypre-2.6.0b[static-libs=3D] ) - metis? ( sci-libs/parmetis ) - hdf5? ( sci-libs/hdf5[!mpi?] ) -" - -DEPEND=3D"${RDEPEND} - sys-devel/gcc[-nocxx,fortran?]" - -S=3D"${WORKDIR}/${MY_P}" - -if use hypre; then - use cxx || die "hypre needs cxx, please enable cxx or disable hypre use= flag" - use mpi || die "hypre needs mpi, please enable mpi or disable hypre use= flag" -fi - -src_prepare(){ - epatch "${FILESDIR}/${PN}-configure-pic.patch" - epatch "${FILESDIR}/${PN}-disable-rpath.patch" -} - -src_configure(){ - local mylang - local myopt - local myconf - - use cxx && mylang=3D"cxx" || mylang=3D"c" - use debug && myopt=3D"debug" || myopt=3D"opt" - - export PETSC_DIR=3D"${S}" || die - export PETSC_ARCH=3D"linux-gnu-${mylang}-${myopt}" || die - - myconf[10]=3D"--with-blas-lapack-lib=3D$(pkg-config --libs lapack)" - myconf[11]=3D"CFLAGS=3D${CFLAGS}" - myconf[12]=3D"CXXFLAGS=3D${CXXFLAGS}" - myconf[13]=3D"LDFLAGS=3D${LDFLAGS}" - myconf[14]=3D"--with-windows-graphics=3D0" - myconf[15]=3D"--with-matlab=3D0" - myconf[16]=3D"--with-python=3D0" - myconf[17]=3D"--with-clanguage=3D${mylang}" - myconf[18]=3D"--with-single-library=3D1" - myconf[19]=3D"--with-petsc-arch=3D${PETSC_ARCH}" - myconf[20]=3D"--with-precision=3Ddouble" - myconf[21]=3D"--with-gnu-compilers=3D1" - use amd64 \ - && myconf[22]=3D"--with-64-bit-pointers=3D1" \ - || myconf[22]=3D"--with-64-bit-pointers=3D0" - use cxx \ - && myconf[23]=3D"--with-c-support=3D1" - use amd64 \ - && myconf[24]=3D"--with-64-bit-indices=3D1" \ - || myconf[24]=3D"--with-64-bit-indices=3D0" - - if use mpi; then - myconf[30]=3D"--with-cc=3D/usr/bin/mpicc" - myconf[31]=3D"--with-cxx=3D/usr/bin/mpicxx" - use fortran && myconf[32]=3D"--with-fc=3D/usr/bin/mpif77" - myconf[33]=3D"--with-mpi=3D1" - myconf[34]=3D"--with-mpi-compilers=3D1" - else - myconf[30]=3D"--with-cc=3D$(tc-getCC)" - myconf[31]=3D"--with-cxx=3D$(tc-getCXX)" - use fortran && myconf[32]=3D"--with-fc=3D$(tc-getF77)" - myconf[33]=3D"--with-mpi=3D0" - fi - - use X \ - && myconf[40]=3D"--with-X=3D1" \ - || myconf[40]=3D"--with-X=3D0" - use static-libs \ - && myconf[41]=3D"--with-shared=3D0" \ - || myconf[41]=3D"--with-shared=3D1" - use fortran \ - && myconf[43]=3D"--with-fortran=3D1" \ - || myconf[43]=3D"--with-fortran=3D0" - - if use debug; then - strip-flags - filter-flags -O* - myconf[44]=3D"--with-debugging=3D1" - else - myconf[44]=3D"--with-debugging=3D0" - fi - - if use hypre; then - # hypre cannot handle 64 bit indices, therefore disabled - myconf[24]=3D"--with-64-bit-indices=3D0" - myconf[52]=3D"--with-hypre=3D1" - myconf[53]=3D"--with-hypre-include=3D/usr/include/hypre" - use static-libs \ - && myconf[54]=3D"--with-hypre-lib=3D/usr/$(get_libdir)/libHYPRE.a" \ - || myconf[54]=3D"--with-hypre-lib=3D/usr/$(get_libdir)/libHYPRE.so" - else - myconf[52]=3D"--with-hypre=3D0" - fi - - if use metis; then - myconf[61]=3D"--with-parmetis=3D1" - myconf[62]=3D"--with-parmetis-include=3D/usr/include/parmetis" - myconf[63]=3D"--with-parmetis-lib=3D/usr/$(get_libdir)/libparmetis.so" - else - myconf[61]=3D"--with-parmetis=3D0" - fi - - if use hdf5; then - myconf[71]=3D"--with-hdf5=3D1" - myconf[72]=3D"--with-hdf5-include=3D/usr/include" - myconf[73]=3D"--with-hdf5-lib=3D/usr/$(get_libdir)/libhdf5.so" - else - myconf[71]=3D"--with-hdf5=3D0" - fi - - myconf[81]=3D"--with-scotch=3D0" - - einfo "Configure options: ${myconf[@]}" - python "${S}/config/configure.py" "${myconf[@]}" \ - || die "PETSc configuration failed" -} - -src_install(){ - insinto /usr/include/"${PN}" - doins "${S}"/include/*.h "${S}"/include/*.hh - doins "${S}/${PETSC_ARCH}"/include/*.h - - insinto /usr/include/"${PN}"/private - doins "${S}"/include/private/*.h - - # fix paths stored in petscconf.h - dosed "s:${S}:/usr:g" /usr/include/"${PN}"/petscconf.h - dosed "s:${PETSC_ARCH}/lib:$(get_libdir):g" /usr/include/"${PN}"/petscc= onf.h \ - - if ! use mpi ; then - insinto /usr/include/"${PN}"/mpiuni - doins "${S}"/include/mpiuni/*.h - fi - - if use doc ; then - dodoc docs/manual.pdf - dohtml -r docs/*.html docs/changes docs/manualpages - fi - - use static-libs \ - && dolib.a "${S}/${PETSC_ARCH}"/lib/*.a \ - || dolib.so "${S}/${PETSC_ARCH}"/lib/*.so -} - -pkg_postinst() { - elog "The petsc ebuild is still under development." - elog "Help us improve the ebuild in:" - elog "http://bugs.gentoo.org/show_bug.cgi?id=3D53386" - elog "This ebuild is known to have parallel build issues, " - elog "hopefully resolved by upstream soon." - elog "Another problem is that you can break this package by" - elog "switching your mpi implementation without rebuild petsc." -} diff --git a/sci-mathematics/petsc/petsc-3.1_p8-r1.ebuild b/sci-mathemati= cs/petsc/petsc-3.1_p8-r1.ebuild index a187628..a01b135 100644 --- a/sci-mathematics/petsc/petsc-3.1_p8-r1.ebuild +++ b/sci-mathematics/petsc/petsc-3.1_p8-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ =20 @@ -21,7 +21,7 @@ RDEPEND=3D"mpi? ( virtual/mpi[cxx?,fortran?] ) X? ( x11-libs/libX11 ) virtual/lapack virtual/blas - hypre? ( >=3Dsci-mathematics/hypre-2.6.0b[static-libs=3D] ) + hypre? ( sci-libs/hypre[static-libs=3D] ) metis? ( sci-libs/parmetis ) hdf5? ( sci-libs/hdf5[!mpi?] ) " diff --git a/sci-mathematics/petsc/petsc-3.1_p8.ebuild b/sci-mathematics/= petsc/petsc-3.1_p8.ebuild deleted file mode 100644 index aca7776..0000000 --- a/sci-mathematics/petsc/petsc-3.1_p8.ebuild +++ /dev/null @@ -1,177 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=3D3 - -inherit flag-o-matic fortran-2 toolchain-funcs - -MY_P=3D"${PN}-${PV/_/-}" - -DESCRIPTION=3D"Portable, Extensible Toolkit for Scientific Computation" -HOMEPAGE=3D"http://www.mcs.anl.gov/petsc/petsc-as/" -SRC_URI=3D"http://ftp.mcs.anl.gov/pub/petsc/release-snapshots/${MY_P}.ta= r.gz" - -LICENSE=3D"petsc" -SLOT=3D"0" -KEYWORDS=3D"~x86 ~amd64" -IUSE=3D"cxx debug doc fortran hdf5 hypre metis mpi static-libs X" - -RDEPEND=3D"mpi? ( virtual/mpi[cxx?,fortran?] ) - X? ( x11-libs/libX11 ) - virtual/lapack - virtual/blas - hypre? ( >=3Dsci-mathematics/hypre-2.6.0b[static-libs=3D] ) - metis? ( sci-libs/parmetis ) - hdf5? ( sci-libs/hdf5[!mpi?] ) -" - -DEPEND=3D"${RDEPEND} - sys-devel/gcc[-nocxx,fortran?]" - -S=3D"${WORKDIR}/${MY_P}" - -if use hypre; then - use cxx || die "hypre needs cxx, please enable cxx or disable hypre use= flag" - use mpi || die "hypre needs mpi, please enable mpi or disable hypre use= flag" -fi - -src_prepare(){ - epatch "${FILESDIR}/${P}-configure-pic.patch" - epatch "${FILESDIR}/${PN}-disable-rpath.patch" -} - -src_configure(){ - local mylang - local myopt - local myconf - - use cxx && mylang=3D"cxx" || mylang=3D"c" - use debug && myopt=3D"debug" || myopt=3D"opt" - - export PETSC_DIR=3D"${S}" || die - export PETSC_ARCH=3D"linux-gnu-${mylang}-${myopt}" || die - - myconf[10]=3D"--with-blas-lapack-lib=3D$(pkg-config --libs lapack)" - myconf[11]=3D"CFLAGS=3D${CFLAGS}" - myconf[12]=3D"CXXFLAGS=3D${CXXFLAGS}" - myconf[13]=3D"LDFLAGS=3D${LDFLAGS}" - myconf[14]=3D"--with-windows-graphics=3D0" - myconf[15]=3D"--with-matlab=3D0" - myconf[16]=3D"--with-python=3D0" - myconf[17]=3D"--with-clanguage=3D${mylang}" - myconf[18]=3D"--with-single-library=3D1" - myconf[19]=3D"--with-petsc-arch=3D${PETSC_ARCH}" - myconf[20]=3D"--with-precision=3Ddouble" - myconf[21]=3D"--with-gnu-compilers=3D1" - use amd64 \ - && myconf[22]=3D"--with-64-bit-pointers=3D1" \ - || myconf[22]=3D"--with-64-bit-pointers=3D0" - use cxx \ - && myconf[23]=3D"--with-c-support=3D1" - use amd64 \ - && myconf[24]=3D"--with-64-bit-indices=3D1" \ - || myconf[24]=3D"--with-64-bit-indices=3D0" - - if use mpi; then - myconf[30]=3D"--with-cc=3D/usr/bin/mpicc" - myconf[31]=3D"--with-cxx=3D/usr/bin/mpicxx" - use fortran && myconf[32]=3D"--with-fc=3D/usr/bin/mpif77" - myconf[33]=3D"--with-mpi=3D1" - myconf[34]=3D"--with-mpi-compilers=3D1" - else - myconf[30]=3D"--with-cc=3D$(tc-getCC)" - myconf[31]=3D"--with-cxx=3D$(tc-getCXX)" - use fortran && myconf[32]=3D"--with-fc=3D$(tc-getF77)" - myconf[33]=3D"--with-mpi=3D0" - fi - - use X \ - && myconf[40]=3D"--with-X=3D1" \ - || myconf[40]=3D"--with-X=3D0" - use static-libs \ - && myconf[41]=3D"--with-shared=3D0" \ - || myconf[41]=3D"--with-shared=3D1" - use fortran \ - && myconf[43]=3D"--with-fortran=3D1" \ - || myconf[43]=3D"--with-fortran=3D0" - - if use debug; then - strip-flags - filter-flags -O* - myconf[44]=3D"--with-debugging=3D1" - else - myconf[44]=3D"--with-debugging=3D0" - fi - - if use hypre; then - # hypre cannot handle 64 bit indices, therefore disabled - myconf[24]=3D"--with-64-bit-indices=3D0" - myconf[52]=3D"--with-hypre=3D1" - myconf[53]=3D"--with-hypre-include=3D/usr/include/hypre" - use static-libs \ - && myconf[54]=3D"--with-hypre-lib=3D/usr/$(get_libdir)/libHYPRE.a" \ - || myconf[54]=3D"--with-hypre-lib=3D/usr/$(get_libdir)/libHYPRE.so" - else - myconf[52]=3D"--with-hypre=3D0" - fi - - if use metis; then - myconf[61]=3D"--with-parmetis=3D1" - myconf[62]=3D"--with-parmetis-include=3D/usr/include/parmetis" - myconf[63]=3D"--with-parmetis-lib=3D/usr/$(get_libdir)/libparmetis.so" - else - myconf[61]=3D"--with-parmetis=3D0" - fi - - if use hdf5; then - myconf[71]=3D"--with-hdf5=3D1" - myconf[72]=3D"--with-hdf5-include=3D/usr/include" - myconf[73]=3D"--with-hdf5-lib=3D/usr/$(get_libdir)/libhdf5.so" - else - myconf[71]=3D"--with-hdf5=3D0" - fi - - myconf[81]=3D"--with-scotch=3D0" - - einfo "Configure options: ${myconf[@]}" - python "${S}/config/configure.py" "${myconf[@]}" \ - || die "PETSc configuration failed" -} - -src_install(){ - insinto /usr/include/"${PN}" - doins "${S}"/include/*.h "${S}"/include/*.hh - doins "${S}/${PETSC_ARCH}"/include/*.h - - insinto /usr/include/"${PN}"/private - doins "${S}"/include/private/*.h - - # fix paths stored in petscconf.h - dosed "s:${S}:/usr:g" /usr/include/"${PN}"/petscconf.h - dosed "s:${PETSC_ARCH}/lib:$(get_libdir):g" /usr/include/"${PN}"/petscc= onf.h \ - - if ! use mpi ; then - insinto /usr/include/"${PN}"/mpiuni - doins "${S}"/include/mpiuni/*.h - fi - - if use doc ; then - dodoc docs/manual.pdf - dohtml -r docs/*.html docs/changes docs/manualpages - fi - - use static-libs \ - && dolib.a "${S}/${PETSC_ARCH}"/lib/*.a \ - || dolib.so "${S}/${PETSC_ARCH}"/lib/*.so -} - -pkg_postinst() { - elog "The petsc ebuild is still under development." - elog "Help us improve the ebuild in:" - elog "http://bugs.gentoo.org/show_bug.cgi?id=3D53386" - elog "This ebuild is known to have parallel build issues, " - elog "hopefully resolved by upstream soon." - elog "Another problem is that you can break this package by" - elog "switching your mpi implementation without rebuild petsc." -}