Add support for USE=debug, #378525

Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64

5 files changed, 50 insertions, 23 deletions

diff --git a/sci-libs/cholmod/ChangeLog b/sci-libs/cholmod/ChangeLog
index 1e90c211f6ae..1aedf7903248 100644
--- a/sci-libs/cholmod/ChangeLog
+++ b/sci-libs/cholmod/ChangeLog
@@ -1,6 +1,10 @@
 # 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.26 2012/01/20 05:52:25 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/cholmod/ChangeLog,v 1.27 2012/01/26 19:40:13 jlec Exp $
+
+  26 Jan 2012; Justin Lecher <jlec@gentoo.org> cholmod-1.7.4.ebuild,
+  +files/cholmod-1.7.4-debug.patch, metadata.xml:
+  Add support for USE=debug, #378525
 
 *cholmod-1.7.4 (20 Jan 2012)
 
diff --git a/sci-libs/cholmod/Manifest b/sci-libs/cholmod/Manifest
index 880cc28043ed..6ed92eed2699 100644
--- a/sci-libs/cholmod/Manifest
+++ b/sci-libs/cholmod/Manifest
@@ -1,6 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
+AUX cholmod-1.7.4-debug.patch 435 RMD160 696dc5db2d80e80d94c084ba507e358b617a2464 SHA1 af150f7a80c181879f9e8248dadd20e3e370fdec SHA256 826b6e7f5fe50501ce7542bf264e043a454b1be268351a9de33546ef6e7344fc
 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
@@ -10,13 +11,13 @@ DIST cholmod-1.7.0-autotools.patch.bz2 5534 RMD160 883ba50e6516f7666dc2933470d1c
 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 2692 RMD160 da2eec2dd1fd421c6b919c97987dd31a76b5d158 SHA1 250856584a63a75bc03fdd7291de41f4c3ca50cb SHA256 fe3ece98b681ccf8eaeff7c7ecb5e80b0774d8f54556e07828da582cc1a0b5a1
-MISC ChangeLog 3646 RMD160 04defbb03cd7374c138bfd1ed72e8ed59768695c SHA1 512350046358e82b0f409ef67088f3e27fc22a24 SHA256 30e99dbd2b7fbac8a180e8952757248464c18ebfba4f8141b9bfa2943b5ab924
-MISC metadata.xml 552 RMD160 234d8a3ae181d8fa6e2cd5c9b64050c4d8ff4c92 SHA1 e79c60df8b050a50660e5e3a1f971ab6f10af4cf SHA256 d3f2b40d7d8a85e9f9d0de4c6fb9faad10ce6b6c02784470c1acba6d0f50b73d
+EBUILD cholmod-1.7.4.ebuild 2740 RMD160 9ec2cf486c90a5494b00f476a24fb14777825f0b SHA1 fc094fe524a5ac0a0187a2343e856b4f9704377f SHA256 419b8de2d82648b692d1a26af4f7b1033bac3997ce789276e464aceb1ba905c0
+MISC ChangeLog 3799 RMD160 1f0e29383524be92824313c9781756bfcf68b6e8 SHA1 57ea615ef3de9d80fcc794fe81b2a5388ab56f65 SHA256 1c9ab32d3c320eee5a80a937c332daaf3e380129b8a2f37f8eaf5b6eb123d6eb
+MISC metadata.xml 556 RMD160 656e8301677eeaee1a79e5f8e41236d5f8d7e4e8 SHA1 2040fdb1bc8f9af670996923d98f78f75047ca43 SHA256 78c2d935d95a8f99377aa3af3e2efd41e2afd3f6afa4874fac3505d109e20803
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk8ZASIACgkQ1ycZbhPLE2D62QCdEj8byuT/xcrDB14OeO2Kg+pT
-JPUAn1v0RKhvyNUIMZ+kbNnVlfX60jae
-=Bkxj
+iEYEAREKAAYFAk8hrCoACgkQgAnW8HDreRZ4qgCeLgToUiBgfezIwO1oEPG+fDSX
+c74AnAi55wOWOj1vi9cNo6pCTgE1F044
+=x19l
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/cholmod/cholmod-1.7.4.ebuild b/sci-libs/cholmod/cholmod-1.7.4.ebuild
index aa08ddbf8fe8..37167c6aac71 100644
--- a/sci-libs/cholmod/cholmod-1.7.4.ebuild
+++ b/sci-libs/cholmod/cholmod-1.7.4.ebuild
@@ -1,31 +1,35 @@
 # 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.1 2012/01/20 05:52:25 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/cholmod/cholmod-1.7.4.ebuild,v 1.2 2012/01/26 19:40:13 jlec Exp $
 
 EAPI=4
 
 AUTOTOOLS_AUTORECONF=yes
-inherit eutils autotools autotools-utils
+
+inherit autotools-utils eutils
 
 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
+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"
+IUSE="debug doc metis minimal static-libs +supernodal"
 
-RDEPEND="supernodal? ( virtual/lapack )
+RDEPEND="
 	sci-libs/amd
 	sci-libs/colamd
-	metis? ( sci-libs/camd
-			 sci-libs/ccolamd
-			 || ( sci-libs/metis sci-libs/parmetis ) )"
+	metis? (
+		sci-libs/camd
+		sci-libs/ccolamd
+		|| ( sci-libs/metis sci-libs/parmetis ) )
+	supernodal? ( virtual/lapack )"
 
 DEPEND="${RDEPEND}
 	supernodal? ( dev-util/pkgconfig )
@@ -39,6 +43,7 @@ src_prepare() {
 	cd "${WORKDIR}"
 	epatch "${WORKDIR}"/${PN}-${PPV}-autotools.patch
 	cd "${S}"
+	use debug && epatch "${FILESDIR}"/${P}-debug.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-debug.patch b/sci-libs/cholmod/files/cholmod-1.7.4-debug.patch
new file mode 100644
index 000000000000..bf434e24f267
--- /dev/null
+++ b/sci-libs/cholmod/files/cholmod-1.7.4-debug.patch
@@ -0,0 +1,17 @@
+ Include/cholmod_internal.h |    2 --
+ 1 files changed, 0 insertions(+), 2 deletions(-)
+
+diff --git a/Include/cholmod_internal.h b/Include/cholmod_internal.h
+index 36f20a2..2cd6dd2 100644
+--- a/Include/cholmod_internal.h
++++ b/Include/cholmod_internal.h
+@@ -53,9 +53,7 @@
+ #define NDEBUG
+ #endif
+ 
+-/* Uncomment this line to enable debugging.  CHOLMOD will be very slow.
+ #undef NDEBUG
+- */
+ 
+ #ifdef MATLAB_MEX_FILE
+ #include "mex.h"
diff --git a/sci-libs/cholmod/metadata.xml b/sci-libs/cholmod/metadata.xml
index eafad5c8fb54..54dd26275c31 100644
--- a/sci-libs/cholmod/metadata.xml
+++ b/sci-libs/cholmod/metadata.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci</herd>
-<longdescription lang="en">
+	<herd>sci</herd>
+	<longdescription lang="en">
   CHOLMOD is a set of ANSI C routines for sparse Cholesky
   factorization and update/downdate.
 </longdescription>
-<use>
-  <flag name='metis'>Enable the Partition module to cholmod using metis
+	<use>
+		<flag name="metis">Enable the Partition module to cholmod using metis
     (<pkg>sci-libs/metis</pkg>, <pkg>sci-libs/parmetis</pkg>)</flag>
-  <flag name='supernodal'>Enable the Supernodal module
+		<flag name="supernodal">Enable the Supernodal module
     (needs <pkg>virtual/lapack</pkg>)</flag>
-</use>
+	</use>
 </pkgmetadata>