Backported autotools changes from 2.7.4

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

3 files changed, 20 insertions, 34 deletions

diff --git a/sci-libs/colamd/ChangeLog b/sci-libs/colamd/ChangeLog
index 74563f3ea1fb..bf65f5544938 100644
--- a/sci-libs/colamd/ChangeLog
+++ b/sci-libs/colamd/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sci-libs/colamd
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/colamd/ChangeLog,v 1.26 2012/01/21 19:29:36 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/colamd/ChangeLog,v 1.27 2012/05/08 17:17:38 bicatali Exp $
+
+  08 May 2012; Sébastien Fabbro <bicatali@gentoo.org> colamd-2.7.3.ebuild:
+  Backported autotools changes from 2.7.4
 
   21 Jan 2012; Kacper Kowalik <xarthisius@gentoo.org> colamd-2.7.4.ebuild:
   Explicitly call autoreconf via autotools-utils.eclass
diff --git a/sci-libs/colamd/Manifest b/sci-libs/colamd/Manifest
index 90ea50673534..4527a4d4823d 100644
--- a/sci-libs/colamd/Manifest
+++ b/sci-libs/colamd/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 AUX colamd-2.7.1-autotools.patch 1789 RMD160 a8a868a2cb241aa87c5e4fd8e96e11571150732c SHA1 0c1a3c429f929b77998aec88dd5c4f5169547f9a SHA256 e0a0804e346ba86811c03901cb94afd1e44b62485be3283263c77af9622d158e
 AUX colamd-2.7.4-autotools.patch 1787 RMD160 66b173d186645f2db28809de9a2fe5bda1fbfd7b SHA1 b0e05d772dc29530006db33b877e00dcaf7b5424 SHA256 7a38062ef80cc49bccd7912b4cf29ee78f8374fcd7e064a7706710f93ad82232
@@ -7,24 +7,14 @@ DIST COLAMD-2.7.1.tar.gz 55906 RMD160 04acdf4a2d9d16050258a973213686a94544277a S
 DIST COLAMD-2.7.3.tar.gz 55151 RMD160 f88a93b336bac9cfd6bade68b16d4c4c89bcaa96 SHA1 75d490967b180c86cc33e04daeebf217ed179987 SHA256 5535061fd834f881ff270c6a8bd19e689cb85b213fe0fe6380529224cd7e1ece
 DIST COLAMD-2.7.4.tar.gz 55241 RMD160 947a32276c666b99421edc423fe3cef8e5f5d5b7 SHA1 2d72ffb3018f580ce8ed99ab7bcb7cb7b37e41b5 SHA256 1df73da9b915d6c79be08554250459bee0393794d2acab6d5c2cd50b186e7304
 EBUILD colamd-2.7.1.ebuild 941 RMD160 cee32f1db23b249a2fa323b71803b014438ada08 SHA1 0d43495ce54a0e53bd1c3f0d01aeacf0b1bdf65e SHA256 20b581d4076e3103a106e466a56112268f1c764b8196dee35a6b6055360529ab
-EBUILD colamd-2.7.3.ebuild 932 RMD160 93cbc70e2a16a371d07ea3593b63243b0f9af4c5 SHA1 10edab97031c27761a6c78cd7121eaf506733476 SHA256 03b5ade5c422380cd0e41aa140b57856d3d140c00c6dd065481eb405ccda54b6
+EBUILD colamd-2.7.3.ebuild 858 RMD160 a834b3ce5eaae3554325b775877f0bbe1d77aaea SHA1 625891c41bb37cac2c200980b02c958d6ceec1d4 SHA256 b2b40a7227b85aadd121f973bdfd9c03c6d1739746d9f26bf26643f7e1797883
 EBUILD colamd-2.7.4.ebuild 855 RMD160 62fd97b8fc0d001a39a44cba0cd660af8983ea0a SHA1 c4506d10719ed6f350161078b40a920426a5ebaf SHA256 a12d657cc48748a6e234f413559ba3db2790c48051e5b8347ed5621a12e50d03
-MISC ChangeLog 3334 RMD160 b962d65d073413f665a986b8bad83d6500452f64 SHA1 5958d22de7f1c03202325c65c9a77092f2aedf9a SHA256 eefd202a143aa31f35df4a21580c039cc685c73b88d0cddb20d4902d2602b925
+MISC ChangeLog 3451 RMD160 aaba9a13ac1cb5fe9df3c03b0c0422b9e7ccd208 SHA1 64971e9e94572c321e3970e2a6b8f5c97b6c7cfd SHA256 93064f7773d254b738cfc16e87a067103522b09115866e7bf13e6ac12e69536a
 MISC metadata.xml 852 RMD160 1f2a2bbf103cff3cca06563b6127fceb7570c3bc SHA1 644c28adbd46e7b6f2c91b21b6c021b49b1ebe24 SHA256 2796d9ee5fa245bb7cbbcc0709210a7bc318ee5e2d1aa0b0f9192484caeb1bad
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBCAAGBQJPGxIqAAoJEF0huFKJUZL5j54P/jiD9hQsv/FVpI4bKkzC+RWL
-Y23bYTkcI2A1VG97GFLurDw3aSuh5xtDo9bMR9gjE5wLRla/4/HlV0CzN+4Wuu/r
-KtlwqQt3/yQB7dYqtbXZ4E95l72c6BlmEwMptZMfnVQJddgOlJQ1Gx7thqX64y3Z
-OPg3ta7C8Cy0zBmPyEKac9S3I/BosapFxdqFk0Kh2LKVAKZP0n8beB1nhB+wlrxC
-ysS+f1W++WJAVtb/UoWpi1IixhrIS4uivTqaIqw5U6hKoI+nhk46a5txDlQhc2sF
-5tj2wE/xacZ+A2c01G2VIckP2Fq2fRMInAyAxM2xuC8uwt1XOqDtpV+h0E5XaQps
-yCxneycPFp1oxoGo0DLXoM7gZGzwmWgOdGldZbXpZd76bxFKcrTNchQiUvIhndWF
-bm2lNVQLfn2gF7y+94d7HqxkNzVnN4TVWFjglC546+z4SP8rMZKx4HGJ/kbWKPGb
-06FV8a5aRIh/CDEETZXIKn3ii/fchLpubrhBg2uZQ7+94KKz2fFRkIJjYHUjL3pT
-zUfmqQWTQ4M5Jg+98d9UAF9gkYJ1s47jLYMxljo9RPSLuxocVcJV9aVD4ial/s7I
-tgQs9s2/spU3iyLIATUxDXxNB+RZT1E9fAAyf5VDmfoKhuf3t2qiNf9t2NYO8bX7
-jXinbTggkSGbrt64QjuM
-=bUV8
+iEYEARECAAYFAk+pVToACgkQ1ycZbhPLE2CqvwCeIvR2EwlDGq0MTpj2XJ1KI9ia
+G1kAoJEYE8qZybW8lZVU7TSjFjJVliYD
+=QsP+
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/colamd/colamd-2.7.3.ebuild b/sci-libs/colamd/colamd-2.7.3.ebuild
index f964c0567bf2..4dd0c309cff7 100644
--- a/sci-libs/colamd/colamd-2.7.3.ebuild
+++ b/sci-libs/colamd/colamd-2.7.3.ebuild
@@ -1,12 +1,15 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/colamd/colamd-2.7.3.ebuild,v 1.7 2011/12/26 12:33:25 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/colamd/colamd-2.7.3.ebuild,v 1.8 2012/05/08 17:17:38 bicatali Exp $
 
 EAPI=4
 
-inherit autotools-utils eutils
+AUTOTOOLS_AUTORECONF=1
+
+inherit autotools-utils
 
 MY_PN=COLAMD
+
 DESCRIPTION="Column approximate minimum degree ordering algorithm"
 HOMEPAGE="http://www.cise.ufl.edu/research/sparse/colamd/"
 SRC_URI="http://www.cise.ufl.edu/research/sparse/${PN}/${MY_PN}-${PV}.tar.gz"
@@ -19,20 +22,10 @@ IUSE="static-libs"
 DEPEND="sci-libs/ufconfig"
 RDEPEND="${DEPEND}"
 
-# Needs manual inspection of the result, useless.
-RESTRICT="test"
-
 DOCS=( README.txt Doc/ChangeLog )
+PATCHES=( "${FILESDIR}"/${PN}-2.7.1-autotools.patch )
 
-S="${WORKDIR}/${MY_PN}"
-
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.7.1-autotools.patch
-)
+# Needs manual inspection of the result, useless.
+RESTRICT="test"
 
-src_prepare() {
-	autotools-utils_src_prepare
-	eautoreconf
-}
+S=${WORKDIR}/${MY_PN}