From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id A6717138247 for ; Mon, 6 Jan 2014 18:33:23 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B06BEE0B4B; Mon, 6 Jan 2014 18:33:21 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9CFECE0B42 for ; Mon, 6 Jan 2014 18:33:20 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9A22033F711 for ; Mon, 6 Jan 2014 18:33:19 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 7809BE5539 for ; Mon, 6 Jan 2014 18:33:17 +0000 (UTC) From: "Justin Lecher" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Justin Lecher" Message-ID: <1389031193.9c6e622f1fef336d50457597c17671f0d3065e70.jlec@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/metadata.xml sci-mathematics/petsc/petsc-3.3_p5.ebuild sci-mathematics/petsc/petsc-3.4.2.ebuild X-VCS-Directories: sci-mathematics/petsc/ X-VCS-Committer: jlec X-VCS-Committer-Name: Justin Lecher X-VCS-Revision: 9c6e622f1fef336d50457597c17671f0d3065e70 X-VCS-Branch: master Date: Mon, 6 Jan 2014 18:33:17 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 1c656979-6656-4ddd-86f3-7eda3f4a8f04 X-Archives-Hash: fe977551f31e506c719fc02d22761d66 commit: 9c6e622f1fef336d50457597c17671f0d3065e70 Author: Justin Lecher gentoo org> AuthorDate: Mon Jan 6 17:59:53 2014 +0000 Commit: Justin Lecher gentoo org> CommitDate: Mon Jan 6 17:59:53 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=9c6e622f sci-mathematics/petsc: Punt base.eclass Package-Manager: portage-2.2.8 --- sci-mathematics/petsc/ChangeLog | 6 +- sci-mathematics/petsc/metadata.xml | 2 + sci-mathematics/petsc/petsc-3.3_p5.ebuild | 223 ------------------------------ sci-mathematics/petsc/petsc-3.4.2.ebuild | 22 +-- 4 files changed, 18 insertions(+), 235 deletions(-) diff --git a/sci-mathematics/petsc/ChangeLog b/sci-mathematics/petsc/ChangeLog index d2c6a94..f963803 100644 --- a/sci-mathematics/petsc/ChangeLog +++ b/sci-mathematics/petsc/ChangeLog @@ -1,7 +1,11 @@ # ChangeLog for sci-mathematics/petsc -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 06 Jan 2014; Justin Lecher -petsc-3.3_p5.ebuild, + petsc-3.4.2.ebuild, metadata.xml: + Punt base.eclass + 22 Feb 2013; Justin Lecher metadata.xml: Drop unused local USE-description: 'metis' diff --git a/sci-mathematics/petsc/metadata.xml b/sci-mathematics/petsc/metadata.xml index eb753da..a22c6dc 100644 --- a/sci-mathematics/petsc/metadata.xml +++ b/sci-mathematics/petsc/metadata.xml @@ -8,6 +8,8 @@ Make scalars complex Use suitesparse (sci-libs/suitesparse) including cholmod (sci-libs/cholmod) for sparse factorization Use superlu (sci-libs/superlu) for preconditioning + PLEASE FIX MY DESCRIPTION + PLEASE FIX MY DESCRIPTION diff --git a/sci-mathematics/petsc/petsc-3.3_p5.ebuild b/sci-mathematics/petsc/petsc-3.3_p5.ebuild deleted file mode 100644 index e0a1340..0000000 --- a/sci-mathematics/petsc/petsc-3.3_p5.ebuild +++ /dev/null @@ -1,223 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=4 - -inherit base flag-o-matic fortran-2 toolchain-funcs versionator - -MY_P="${PN}-$(replace_version_separator _ -)" - -DESCRIPTION="Portable, Extensible Toolkit for Scientific Computation" -HOMEPAGE="http://www.mcs.anl.gov/petsc/" -SRC_URI="http://ftp.mcs.anl.gov/pub/petsc/release-snapshots/${MY_P}.tar.gz" - -LICENSE="petsc" -SLOT="0" -KEYWORDS="~x86 ~amd64" -IUSE="afterimage complex-scalars cxx debug doc - fortran hdf5 hypre mpi sparse superlu threads X" -# Failed: boost imagemagick metis - -# hypre and superlu curretly exclude each other due to missing linking to hypre -# if both are enabled -REQUIRED_USE=" - hypre? ( cxx mpi ) - hdf5? ( mpi ) - afterimage? ( X ) - ^^ ( hypre superlu ) -" -# imagemagick? ( X ) - -RDEPEND=" - virtual/blas - virtual/lapack - afterimage? ( media-libs/libafterimage ) - hdf5? ( sci-libs/hdf5[mpi?] ) - hypre? ( >=sci-libs/hypre-2.8.0b[mpi?] ) - mpi? ( virtual/mpi[cxx?,fortran?] ) - sparse? ( sci-libs/suitesparse >=sci-libs/cholmod-1.7.0 ) - superlu? ( sci-libs/superlu ) - X? ( x11-libs/libX11 ) -" -# boost? ( dev-libs/boost ) -# metis? ( sci-libs/parmetis ) -# imagemagick? ( media-gfx/imagemagick ) - -DEPEND="${RDEPEND} - virtual/pkgconfig - dev-util/cmake -" -# cmake is used for parralel building -# in some configuration setups, legacy build is used (slow) - -S="${WORKDIR}/${MY_P}" - -PATCHES=( - "${FILESDIR}"/${P%_*}-configure-pic.patch - "${FILESDIR}"/${P%_*}-disable-rpath.patch - "${FILESDIR}"/${P%_*}-fix-complex-threads.patch -) - -src_configure() { - # petsc uses --with-blah=1 and --with-blah=0 to en/disable options - petsc_enable() { - use "$1" && echo "--with-${2:-$1}=1" || echo "--with-${2:-$1}=0" - } - # add external library: - # petsc_with use_flag libname libdir - # petsc_with use_flag libname include linking_libs - petsc_with() { - local myuse p=${2:-${1}} - if use ${1}; then - myuse="--with-${p}=1" - if [[ $# -ge 4 ]]; then - myuse="${myuse} --with-${p}-include=${EPREFIX}${3}" - shift 3 - myuse="${myuse} --with-${p}-lib=$@" - else - myuse="${myuse} --with-${p}-dir=${EPREFIX}${3:-/usr}" - fi - else - myuse="--with-${p}=0" - fi - echo ${myuse} - } - - # select between configure options depending on use flag - petsc_select() { - use "$1" && echo "--with-$2=$3" || echo "--with-$2=$4" - } - - local mylang - local myopt - - use cxx && mylang="cxx" || mylang="c" - use debug && myopt="debug" || myopt="opt" - - # environmental variables expected by petsc during build - export PETSC_DIR="${S}" - export PETSC_ARCH="linux-gnu-${mylang}-${myopt}" - - if use debug; then - strip-flags - filter-flags -O* - fi - - # C Support on Cxx builds is enabled if possible - # i.e. when not using complex scalars - # (no complex type for both available at the same time) - - if use threads; then - ewarn "Threads support may be incomplete on $PN-3.3 release and is not officially supported." - ewarn "Upstream recommends not to enable threads support for production runs." - fi - - # run petsc configure script - econf \ - scrollOutput=1 \ - CFLAGS="${CFLAGS}" \ - CXXFLAGS="${CXXFLAGS}" \ - LDFLAGS="${LDFLAGS}" \ - --with-shared-libraries \ - --with-single-library \ - --with-clanguage=${mylang} \ - $(use cxx && ! use complex-scalars && echo "with-c-support=1") \ - --with-petsc-arch=${PETSC_ARCH} \ - --with-precision=double \ - --with-gnu-compilers \ - --with-blas-lapack-lib="$($(tc-getPKG_CONFIG) --libs lapack)" \ - $(petsc_enable debug debugging) \ - $(petsc_enable mpi) \ - $(petsc_select mpi cc mpicc $(tc-getCC)) \ - $(petsc_select mpi cxx mpicxx $(tc-getCXX)) \ - $(petsc_enable fortran) \ - $(use fortran && echo "$(petsc_select mpi fc mpif77 $(tc-getF77))") \ - $(petsc_enable mpi mpi-compilers) \ - $(petsc_enable threads pthread) \ - $(petsc_enable threads pthreadclasses) \ - $(petsc_select complex-scalars scalar-type complex real) \ - --with-windows-graphics=0 \ - --with-matlab=0 \ - --with-cmake=cmake \ - $(petsc_with afterimage afterimage \ - /usr/include/libAfterImage -lAfterImage) \ - $(petsc_with hdf5) \ - $(petsc_with hypre hypre \ - /usr/include/hypre -lHYPRE) \ - $(petsc_with sparse cholmod) \ - $(petsc_with superlu superlu \ - /usr/include/superlu -lsuperlu) \ - $(petsc_with X x) \ - $(petsc_with X x11) \ - --with-imagemagick=0 \ - --with-python=0 \ - --with-scotch=0 - -# not yet tested: -# python bindings, sctotch, netcdf, scalapack -# non-working: -# fftw: no mpi-implementaion available in gentoo - -# failed dependencies, perhaps fixed in upstream soon: -# $(petsc_with metis parmetis) \ # needs metis too (>=5.0.2) -# $(petsc_with boost) \ -# $(petsc_with imagemagick imagemagick \ -# /usr/include/ImageMagick $($(tc-getPKG_CONFIG) --libs MagickCore)) \ -} - -src_install() { - # petsc install structure is very different from - # installing headers to /usr/include/petsc and lib to /usr/lib - # it also installs many unneeded executables and scripts - # so manual install is easier than cleanup after "emake install" - insinto /usr/include/${PN} - doins include/*.h* - insinto /usr/include/${PN}/${PETSC_ARCH}/include - doins ${PETSC_ARCH}/include/* - if use fortran; then - insinto /usr/include/${PN}/finclude - doins include/finclude/*.h - fi - if ! use mpi ; then - insinto /usr/include/${PN}/mpiuni - doins include/mpiuni/*.h - fi - insinto /usr/include/${PN}/conf - doins conf/{variables,rules,test} - insinto /usr/include/${PN}/${PETSC_ARCH}/conf - doins ${PETSC_ARCH}/conf/{petscrules,petscvariables,RDict.db} - insinto /usr/include/${PN}/petsc-private - doins include/petsc-private/*.h - - # fix configuration files: replace ${S} by installed location - sed -i \ - -e "s:${S}::g" \ - "${ED}"/usr/include/${PN}/${PETSC_ARCH}/include/petscconf.h \ - "${ED}"/usr/include/${PN}/${PETSC_ARCH}/conf/petscvariables || die - sed -i \ - -e "s:usr/lib:usr/$(get_libdir):g" \ - "${ED}"/usr/include/${PN}/${PETSC_ARCH}/include/petscconf.h || die - - # add information about installation directory and - # PETSC_ARCH to environmental variables - cat >> 99petsc <<- EOF - PETSC_ARCH=${PETSC_ARCH} - PETSC_DIR=${EPREFIX}/usr/include/${PN} - EOF - doenvd 99petsc - - dolib.so ${PETSC_ARCH}/lib/*.so - - if use doc ; then - einfo "installing documentation (this could take a while)" - dodoc docs/manual.pdf - dohtml -r docs/*.html docs/changes docs/manualpages - fi -} - -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=53386" -} diff --git a/sci-mathematics/petsc/petsc-3.4.2.ebuild b/sci-mathematics/petsc/petsc-3.4.2.ebuild index 1d8462f..5263263 100644 --- a/sci-mathematics/petsc/petsc-3.4.2.ebuild +++ b/sci-mathematics/petsc/petsc-3.4.2.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ EAPI=5 -inherit base flag-o-matic fortran-2 toolchain-funcs versionator +inherit eutils flag-o-matic fortran-2 toolchain-funcs versionator MY_P="${PN}-$(replace_version_separator _ -)" @@ -64,9 +64,9 @@ MAKEOPTS="${MAKEOPTS} -j1" S="${WORKDIR}/${MY_P}" -PATCHES=( - "${FILESDIR}"/${P%_*}-disable-rpath.patch -) +src_prepare() { + epatch "${FILESDIR}"/${P%_*}-disable-rpath.patch +} src_configure() { # petsc uses --with-blah=1 and --with-blah=0 to en/disable options @@ -160,12 +160,12 @@ src_configure() { $(petsc_with X x) \ $(petsc_with X x11) \ $(petsc_with scotch ptscotch \ - /usr/include/scotch \ - [-lptesmumps,-lptscotch,-lptscotcherr,-lscotch,-lscotcherr]) \ + /usr/include/scotch \ + [-lptesmumps,-lptscotch,-lptscotcherr,-lscotch,-lscotcherr]) \ $(petsc_with mumps scalapack \ - /usr/include/scalapack -lscalapack) \ + /usr/include/scalapack -lscalapack) \ $(petsc_with mumps mumps \ - /usr/include \ + /usr/include \ [-lcmumps,-ldmumps,-lsmumps,-lzmumps,-lmumps_common,-lpord]) \ --with-imagemagick=0 \ --with-python=0 \ @@ -206,9 +206,9 @@ src_install() { insinto /usr/include/${PN}/petsc-private doins include/petsc-private/*.h - # fix configuration files: replace ${S} by installed location + # fix configuration files: replace "${S}" by installed location sed -i \ - -e "s:${S}::g" \ + -e "s:"${S}"::g" \ "${ED}"/usr/include/${PN}/${PETSC_ARCH}/include/petscconf.h \ "${ED}"/usr/include/${PN}/${PETSC_ARCH}/conf/petscvariables || die sed -i \