Fixed for parmetis-3.2, bug #399483

Package-Manager: portage-2.1.10.44/cvs/Linux x86_64

6 files changed, 38 insertions, 202 deletions

diff --git a/sci-libs/cholmod/ChangeLog b/sci-libs/cholmod/ChangeLog
index 1aedf7903248..854e1754ef81 100644
--- a/sci-libs/cholmod/ChangeLog
+++ b/sci-libs/cholmod/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-libs/cholmod
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/cholmod/ChangeLog,v 1.27 2012/01/26 19:40:13 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/cholmod/ChangeLog,v 1.28 2012/03/13 04:15:24 bicatali Exp $
+
+  13 Mar 2012; Sébastien Fabbro <bicatali@gentoo.org> -cholmod-1.7.1.ebuild,
+  -cholmod-1.7.3.ebuild, cholmod-1.7.4.ebuild,
+  +files/cholmod-1.7.4-parmetis32.patch:
+  Fixed for parmetis-3.2, bug #399483
 
   26 Jan 2012; Justin Lecher <jlec@gentoo.org> cholmod-1.7.4.ebuild,
   +files/cholmod-1.7.4-debug.patch, metadata.xml:
diff --git a/sci-libs/cholmod/Manifest b/sci-libs/cholmod/Manifest
index 6ed92eed2699..0e781ebea534 100644
--- a/sci-libs/cholmod/Manifest
+++ b/sci-libs/cholmod/Manifest
@@ -1,23 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
 
 AUX cholmod-1.7.4-debug.patch 435 RMD160 696dc5db2d80e80d94c084ba507e358b617a2464 SHA1 af150f7a80c181879f9e8248dadd20e3e370fdec SHA256 826b6e7f5fe50501ce7542bf264e043a454b1be268351a9de33546ef6e7344fc
+AUX cholmod-1.7.4-parmetis32.patch 702 RMD160 649c49630eb52d344f3b36742e99bf738844749e SHA1 b50f2901c5bd69c7a8183f3552b0c44eb32aac3c SHA256 fb8f2950c908d21ee649c16f8e26bbe5e37284c1417cf9b7f22e6f82532944f8
 DIST CHOLMOD-1.6.0.tar.gz 1092883 RMD160 0c0b8b6f9e9bab2d95791c4ca12d0d8cc692c0e5 SHA1 be19fa1ac19d190e9f3aa1aee7ba88a7ce0111db SHA256 6e13d49c5452cd99e5eb828d50a55dc56d399751fe5dee82b0a5a3dbefd24e0e
-DIST CHOLMOD-1.7.1.tar.gz 1110783 RMD160 a7dba8e0e383d7591d765c7feae669864bbf2a5c SHA1 f6f731466f6bc5c2892618261439c608b8eb4939 SHA256 4b974f794b5027c7575482ccb90a1638f22e2553594d808ff567dc42acc050ba
-DIST CHOLMOD-1.7.3.tar.gz 1180532 RMD160 434dca8d923721d89421d7c4c674aa3fb2335c34 SHA1 c85ce011da25337f53c0a5b11e329d855698caa0 SHA256 f89b3a0db56add3f78139db258a7868a72ccb8d57361ef6645e6a47db7ce9680
 DIST CHOLMOD-1.7.4.tar.gz 1169002 RMD160 88ac3bc3bed3d241d893ede7b42bd67a9c230149 SHA1 7b960f22126addb2e6e92159f8bfcc72733d16d4 SHA256 0cefc540d4e341afd614dfc107fe9f38afb504df6566e8d2cd209ae3321afbaf
 DIST cholmod-1.6.0-autotools.patch.bz2 5388 RMD160 4c835c95f8d64a2032b37ee136e4d4faf70586e8 SHA1 4593f97658fc841e939bc697125748d4106f6d93 SHA256 141762b6657924f52a557d8d79ea672dcc16a3f08022ac6b4f2ff3f5c895798e
 DIST cholmod-1.7.0-autotools.patch.bz2 5534 RMD160 883ba50e6516f7666dc2933470d1c76f14ce5424 SHA1 0c15bc824b590d096998417f07b1849cc6f645fb SHA256 901b83939ce09a51baa9431639d4fbebde1bfd70998b4b66d2753a91daed931c
 EBUILD cholmod-1.6.0-r1.ebuild 2691 RMD160 e70d9e58c6e78573c4394a5c171eef2f672a41d5 SHA1 db4aaf8d740d61356e27c137080506a9d74b688c SHA256 c948a19b7417aa5fd2f418c7af5670921b4163cfd37beccc6725a2ae2f74754d
-EBUILD cholmod-1.7.1.ebuild 2762 RMD160 d1156091c2a16a3887f4068c3bc71bdc9354ef0f SHA1 681d9bb4ba27c11f867ca051d9cd5211ea8d56b7 SHA256 4b7f5e3c411b48f4a3bbc43c8861f9a17b2a4eb6f04db5fcce30ed6366fe3d01
-EBUILD cholmod-1.7.3.ebuild 2762 RMD160 c1a39eaab49e5895c12cb5bfe04615edf4ca523d SHA1 32ff3030cd7d369966a6442d1ecf05daac9931f7 SHA256 0f69bae76cf10e69a851d3e4281e6b7029784d8e52dec61b4ad7f03aa7efb47e
-EBUILD cholmod-1.7.4.ebuild 2740 RMD160 9ec2cf486c90a5494b00f476a24fb14777825f0b SHA1 fc094fe524a5ac0a0187a2343e856b4f9704377f SHA256 419b8de2d82648b692d1a26af4f7b1033bac3997ce789276e464aceb1ba905c0
-MISC ChangeLog 3799 RMD160 1f0e29383524be92824313c9781756bfcf68b6e8 SHA1 57ea615ef3de9d80fcc794fe81b2a5388ab56f65 SHA256 1c9ab32d3c320eee5a80a937c332daaf3e380129b8a2f37f8eaf5b6eb123d6eb
+EBUILD cholmod-1.7.4.ebuild 2882 RMD160 136c074188fc45ff72e48d62b46b381896c46db7 SHA1 b224dccbc72c815390198815282fc44da1d01158 SHA256 a1b99ba10901716c7d3ec4030e72a004f0c57c050bf59f128323f49bbaa781e7
+MISC ChangeLog 4008 RMD160 034689102dc8d756d8aff479b924bc49e0c4e797 SHA1 40f760fa975c32041e6bb299c6fcd659683721ca SHA256 de70537980c683040b4b9522886f595161e31e98748fcf5f21f84dc8b2288510
 MISC metadata.xml 556 RMD160 656e8301677eeaee1a79e5f8e41236d5f8d7e4e8 SHA1 2040fdb1bc8f9af670996923d98f78f75047ca43 SHA256 78c2d935d95a8f99377aa3af3e2efd41e2afd3f6afa4874fac3505d109e20803
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEAREKAAYFAk8hrCoACgkQgAnW8HDreRZ4qgCeLgToUiBgfezIwO1oEPG+fDSX
-c74AnAi55wOWOj1vi9cNo6pCTgE1F044
-=x19l
+iEYEARECAAYFAk9eyfIACgkQ1ycZbhPLE2Bs4QCfcY95BctDdnaBWV6FRIMrLMTp
+2cIAoJLduwwlaRiNqvu2KJ5hFyjmhhJq
+=TBVj
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/cholmod/cholmod-1.7.1.ebuild b/sci-libs/cholmod/cholmod-1.7.1.ebuild
deleted file mode 100644
index c51f465961dd..000000000000
--- a/sci-libs/cholmod/cholmod-1.7.1.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/cholmod/cholmod-1.7.1.ebuild,v 1.4 2010/12/25 18:49:44 bicatali Exp $
-
-EAPI=2
-inherit eutils autotools
-
-MY_PN=CHOLMOD
-PPV=1.7.0
-
-DESCRIPTION="Sparse Cholesky factorization and update/downdate library"
-HOMEPAGE="http://www.cise.ufl.edu/research/sparse/cholmod"
-SRC_URI="http://www.cise.ufl.edu/research/sparse/${PN}/${MY_PN}-${PV}.tar.gz
-	mirror://gentoo/${PN}-${PPV}-autotools.patch.bz2"
-
-LICENSE="LGPL-2.1 GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
-IUSE="doc metis minimal static-libs +supernodal"
-
-RDEPEND="supernodal? ( virtual/lapack )
-	sci-libs/amd
-	sci-libs/colamd
-	metis? ( sci-libs/camd
-			 sci-libs/ccolamd
-			 || ( sci-libs/metis sci-libs/parmetis ) )"
-
-DEPEND="${RDEPEND}
-	supernodal? ( dev-util/pkgconfig )
-	metis? ( dev-util/pkgconfig )"
-
-S="${WORKDIR}/${MY_PN}"
-
-src_prepare() {
-	cd "${WORKDIR}"
-	epatch "${WORKDIR}"/${PN}-${PPV}-autotools.patch
-	cd "${S}"
-	# We need to take care of cholmod.h here as well depending on
-	# the USE flags, otherwise the installed file will reference
-	# headers that we may not have included.
-	if use minimal; then
-		sed -i '/^#define CHOLMOD_/{N;
-		s:\(#define\) \(CHOLMOD_CONFIG_H\)\n:\1 \2\n\1 NMODIFY 1\n\1 NMATRIXOPS 1\n:}' \
-		Include/cholmod_config.h
-	fi
-
-	if ! use supernodal; then
-		sed -i '/^#define CHOLMOD_/{N;
-		s:\(#define\) \(CHOLMOD_CONFIG_H\)\n:\1 \2\n\1 NSUPERNODAL 1\n:}' \
-		Include/cholmod_config.h
-	fi
-
-	if ! use metis; then
-		sed -i '/^#define CHOLMOD_/{N;
-		s:\(#define\) \(CHOLMOD_CONFIG_H\)\n:\1 \2\n\1 NPARTITION 1\n:}' \
-		Include/cholmod_config.h
-	fi
-	eautoreconf
-}
-
-src_configure() {
-	local lapack_libs=no
-	local blas_libs=no
-	if use supernodal; then
-		blas_libs=$(pkg-config --libs blas)
-		lapack_libs=$(pkg-config --libs lapack)
-	fi
-	econf \
-		--with-blas="${blas_libs}" \
-		--with-lapack="${lapack_libs}" \
-		$(use_enable supernodal mod-supernodal) \
-		$(use_enable !minimal mod-modify) \
-		$(use_enable !minimal mod-matrixops) \
-		$(use_enable metis mod-partition) \
-		$(use_enable static-libs static)
-}
-
-src_test() {
-	if ! use supernodal || ! use metis || use minimal; then
-		ewarn "According to your useflags, some modules were not built on"
-		ewarn "purpose. This can cause the tests included with Cholmod"
-		ewarn "to fail. Rebuild with USE=\"supernodal metis -minimal\""
-		ewarn "if you care."
-	fi
-	cd "${S}"/Demo
-	emake test || die "emake test failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc README.txt Doc/ChangeLog || die "dodoc failed"
-	if use doc; then
-		dodoc Doc/UserGuide.pdf || die "pdf install failed"
-	fi
-}
diff --git a/sci-libs/cholmod/cholmod-1.7.3.ebuild b/sci-libs/cholmod/cholmod-1.7.3.ebuild
deleted file mode 100644
index 6f8a2bace3ce..000000000000
--- a/sci-libs/cholmod/cholmod-1.7.3.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/cholmod/cholmod-1.7.3.ebuild,v 1.1 2011/02/23 19:53:33 bicatali Exp $
-
-EAPI=2
-inherit eutils autotools
-
-MY_PN=CHOLMOD
-PPV=1.7.0
-
-DESCRIPTION="Sparse Cholesky factorization and update/downdate library"
-HOMEPAGE="http://www.cise.ufl.edu/research/sparse/cholmod"
-SRC_URI="http://www.cise.ufl.edu/research/sparse/${PN}/${MY_PN}-${PV}.tar.gz
-	mirror://gentoo/${PN}-${PPV}-autotools.patch.bz2"
-
-LICENSE="LGPL-2.1 GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
-IUSE="doc metis minimal static-libs +supernodal"
-
-RDEPEND="supernodal? ( virtual/lapack )
-	sci-libs/amd
-	sci-libs/colamd
-	metis? ( sci-libs/camd
-			 sci-libs/ccolamd
-			 || ( sci-libs/metis sci-libs/parmetis ) )"
-
-DEPEND="${RDEPEND}
-	supernodal? ( dev-util/pkgconfig )
-	metis? ( dev-util/pkgconfig )"
-
-S="${WORKDIR}/${MY_PN}"
-
-src_prepare() {
-	cd "${WORKDIR}"
-	epatch "${WORKDIR}"/${PN}-${PPV}-autotools.patch
-	cd "${S}"
-	# We need to take care of cholmod.h here as well depending on
-	# the USE flags, otherwise the installed file will reference
-	# headers that we may not have included.
-	if use minimal; then
-		sed -i '/^#define CHOLMOD_/{N;
-		s:\(#define\) \(CHOLMOD_CONFIG_H\)\n:\1 \2\n\1 NMODIFY 1\n\1 NMATRIXOPS 1\n:}' \
-		Include/cholmod_config.h
-	fi
-
-	if ! use supernodal; then
-		sed -i '/^#define CHOLMOD_/{N;
-		s:\(#define\) \(CHOLMOD_CONFIG_H\)\n:\1 \2\n\1 NSUPERNODAL 1\n:}' \
-		Include/cholmod_config.h
-	fi
-
-	if ! use metis; then
-		sed -i '/^#define CHOLMOD_/{N;
-		s:\(#define\) \(CHOLMOD_CONFIG_H\)\n:\1 \2\n\1 NPARTITION 1\n:}' \
-		Include/cholmod_config.h
-	fi
-	eautoreconf
-}
-
-src_configure() {
-	local lapack_libs=no
-	local blas_libs=no
-	if use supernodal; then
-		blas_libs=$(pkg-config --libs blas)
-		lapack_libs=$(pkg-config --libs lapack)
-	fi
-	econf \
-		--with-blas="${blas_libs}" \
-		--with-lapack="${lapack_libs}" \
-		$(use_enable supernodal mod-supernodal) \
-		$(use_enable !minimal mod-modify) \
-		$(use_enable !minimal mod-matrixops) \
-		$(use_enable metis mod-partition) \
-		$(use_enable static-libs static)
-}
-
-src_test() {
-	if ! use supernodal || ! use metis || use minimal; then
-		ewarn "According to your useflags, some modules were not built on"
-		ewarn "purpose. This can cause the tests included with Cholmod"
-		ewarn "to fail. Rebuild with USE=\"supernodal metis -minimal\""
-		ewarn "if you care."
-	fi
-	cd "${S}"/Demo
-	emake test || die "emake test failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc README.txt Doc/ChangeLog || die "dodoc failed"
-	if use doc; then
-		dodoc Doc/UserGuide.pdf || die "pdf install failed"
-	fi
-}
diff --git a/sci-libs/cholmod/cholmod-1.7.4.ebuild b/sci-libs/cholmod/cholmod-1.7.4.ebuild
index 37167c6aac71..fc1043bbe1ae 100644
--- a/sci-libs/cholmod/cholmod-1.7.4.ebuild
+++ b/sci-libs/cholmod/cholmod-1.7.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/cholmod/cholmod-1.7.4.ebuild,v 1.2 2012/01/26 19:40:13 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/cholmod/cholmod-1.7.4.ebuild,v 1.3 2012/03/13 04:15:24 bicatali Exp $
 
 EAPI=4
 
@@ -44,6 +44,10 @@ src_prepare() {
 	epatch "${WORKDIR}"/${PN}-${PPV}-autotools.patch
 	cd "${S}"
 	use debug && epatch "${FILESDIR}"/${P}-debug.patch
+	# bug #399483 does not build with parmetis-3.2
+	has_version "=sci-libs/parmetis-3.2*" && \
+		epatch "${FILESDIR}"/${P}-parmetis32.patch
+
 	# We need to take care of cholmod.h here as well depending on
 	# the USE flags, otherwise the installed file will reference
 	# headers that we may not have included.
diff --git a/sci-libs/cholmod/files/cholmod-1.7.4-parmetis32.patch b/sci-libs/cholmod/files/cholmod-1.7.4-parmetis32.patch
new file mode 100644
index 000000000000..6b50ae8bcea7
--- /dev/null
+++ b/sci-libs/cholmod/files/cholmod-1.7.4-parmetis32.patch
@@ -0,0 +1,20 @@
+diff -Nur CHOLMOD.orig/Partition/cholmod_metis.c CHOLMOD/Partition/cholmod_metis.c
+--- CHOLMOD.orig/Partition/cholmod_metis.c	2012-03-13 03:57:37.000000000 +0000
++++ CHOLMOD/Partition/cholmod_metis.c	2012-03-13 04:02:22.000000000 +0000
+@@ -216,6 +216,7 @@
+     int Opt [8], nn, csp ;
+     size_t n1 ;
+     DEBUG (Int nsep) ;
++    float ubfactor = 1.05;
+ 
+     /* ---------------------------------------------------------------------- */
+     /* check inputs */
+@@ -370,7 +371,7 @@
+ #endif
+ 
+     nn = n ;
+-    METIS_NodeComputeSeparator (&nn, Mp, Mi, Mnw, Mew, Opt, &csp, Mpart) ;
++    METIS_NodeComputeSeparator (&nn, Mp, Mi, Mnw, Mew, &ubfactor, Opt, &csp, Mpart) ;
+     n = nn ;
+     csep = csp ;
+