diff options
| -rw-r--r-- | sci-libs/scotch/ChangeLog | 6 | ||||
| -rw-r--r-- | sci-libs/scotch/metadata.xml | 20 | ||||
| -rw-r--r-- | sci-libs/scotch/scotch-5.1.11.ebuild | 15 | ||||
| -rw-r--r-- | sci-libs/scotch/scotch-5.1.7.ebuild | 21 |
4 files changed, 35 insertions, 27 deletions
diff --git a/sci-libs/scotch/ChangeLog b/sci-libs/scotch/ChangeLog index f4fc48983512..1870a53c41c3 100644 --- a/sci-libs/scotch/ChangeLog +++ b/sci-libs/scotch/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sci-libs/scotch # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/scotch/ChangeLog,v 1.5 2011/05/17 10:08:20 xarthisius Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/scotch/ChangeLog,v 1.6 2011/06/26 10:08:23 jlec Exp $ + + 26 Jun 2011; Justin Lecher <jlec@gentoo.org> scotch-5.1.7.ebuild, + scotch-5.1.11.ebuild, metadata.xml: + Removed suspect RDEPEND 17 May 2011; Kacper Kowalik <xarthisius@gentoo.org> files/Makefile.inc.in: Fix underlinking wrt #367495. Thanks to Diego Elio Pettenò diff --git a/sci-libs/scotch/metadata.xml b/sci-libs/scotch/metadata.xml index 62e57c71e0d2..cd485f5a4712 100644 --- a/sci-libs/scotch/metadata.xml +++ b/sci-libs/scotch/metadata.xml @@ -1,16 +1,16 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<herd>sci</herd> -<maintainer> - <email>patrick@gentoo.org</email> - <name>Patrick Lauer</name> -</maintainer> -<maintainer> - <email>oli.borm@web.de</email> - <name>Oliver Borm</name> -</maintainer> -<longdescription lang='en'> + <herd>sci</herd> + <maintainer> + <email>patrick@gentoo.org</email> + <name>Patrick Lauer</name> + </maintainer> + <maintainer> + <email>oli.borm@web.de</email> + <name>Oliver Borm</name> + </maintainer> + <longdescription lang="en"> SCOTCH is a software package and libraries for graph, mesh and hypergraph partitioning, static mapping, and sparse matrix block ordering. diff --git a/sci-libs/scotch/scotch-5.1.11.ebuild b/sci-libs/scotch/scotch-5.1.11.ebuild index 2943168ac01e..8a7055d9c454 100644 --- a/sci-libs/scotch/scotch-5.1.11.ebuild +++ b/sci-libs/scotch/scotch-5.1.11.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/scotch/scotch-5.1.11.ebuild,v 1.2 2011/03/15 16:58:35 bicatali Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/scotch/scotch-5.1.11.ebuild,v 1.3 2011/06/26 10:08:23 jlec Exp $ EAPI=4 @@ -20,10 +20,11 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="doc examples mpi static-libs" -DEPEND="sys-devel/bison +RDEPEND=" sys-libs/zlib mpi? ( virtual/mpi )" -RDEPEND="${DEPEND}" +DEPEND="${RDEPEND} + sys-devel/bison" S="${WORKDIR}/${MYP}/src" @@ -37,9 +38,11 @@ make_shared_lib() { } src_prepare() { - epatch "${FILESDIR}"/metis-header.patch - epatch "${FILESDIR}"/respect-ldflags.patch - sed -e "s/@CFLAGS@/${CFLAGS}/" \ + epatch \ + "${FILESDIR}"/metis-header.patch \ + "${FILESDIR}"/respect-ldflags.patch + sed \ + -e "s/@CFLAGS@/${CFLAGS}/" \ -e "s/@CC@/$(tc-getCC)/" \ -e "s/@AR@/$(tc-getAR)/" \ -e "s/@RANLIB@/$(tc-getRANLIB)/" \ diff --git a/sci-libs/scotch/scotch-5.1.7.ebuild b/sci-libs/scotch/scotch-5.1.7.ebuild index a2cb7475df72..d29b1aa5a872 100644 --- a/sci-libs/scotch/scotch-5.1.7.ebuild +++ b/sci-libs/scotch/scotch-5.1.7.ebuild @@ -1,12 +1,12 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/scotch/scotch-5.1.7.ebuild,v 1.1 2010/01/15 22:43:52 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/scotch/scotch-5.1.7.ebuild,v 1.2 2011/06/26 10:08:23 jlec Exp $ -EAPI="2" +EAPI=3 inherit eutils -DESCRIPTION="Software package and libraries for graph partitioning, static mapping, and sparse matrix block ordering" +DESCRIPTION="Software for graph, mesh and hypergraph partitioning" HOMEPAGE="http://www.labri.u-bordeaux.fr/perso/pelegrin/scotch/" SRC_URI="http://gforge.inria.fr/frs/download.php/23390/${PN}_${PV}.tgz" @@ -15,15 +15,16 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="mpi" -DEPEND="sys-devel/bison - mpi? ( virtual/mpi )" -RDEPEND="${DEPEND}" +RDEPEND="mpi? ( virtual/mpi )" +DEPEND="${RDEPEND} + sys-devel/bison" S=${WORKDIR}"/scotch_5.1/src" src_prepare() { - epatch "${FILESDIR}"/shared-libs_${PV}.patch - epatch "${FILESDIR}"/metis-header.patch + epatch \ + "${FILESDIR}"/shared-libs_${PV}.patch \ + "${FILESDIR}"/metis-header.patch } src_configure() { @@ -32,7 +33,7 @@ src_configure() { src_compile() { emake -j1 || die "make failed" - use mpi && (emake -j1 ptscotch || die "make failed") + use mpi && emake -j1 ptscotch || die "make failed" } src_install() { |