Fix out of source build, #399521

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

4 files changed, 73 insertions, 22 deletions

diff --git a/sci-libs/colamd/ChangeLog b/sci-libs/colamd/ChangeLog
index ff9e5d5707e5..87464ef97466 100644
--- a/sci-libs/colamd/ChangeLog
+++ b/sci-libs/colamd/ChangeLog
@@ -1,6 +1,10 @@
 # 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.24 2012/01/21 09:13:23 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/colamd/ChangeLog,v 1.25 2012/01/21 10:03:46 jlec Exp $
+
+  21 Jan 2012; Justin Lecher <jlec@gentoo.org> colamd-2.7.4.ebuild,
+  +files/colamd-2.7.4-autotools.patch:
+  Fix out of source build, #399521
 
   21 Jan 2012; Kacper Kowalik <xarthisius@gentoo.org> colamd-2.7.4.ebuild:
   Readd AUTOTOOLS_IN_SOURCE_BUILD=1, drop quotes
diff --git a/sci-libs/colamd/Manifest b/sci-libs/colamd/Manifest
index 1f48ea24e5e4..3f7cfd15b769 100644
--- a/sci-libs/colamd/Manifest
+++ b/sci-libs/colamd/Manifest
@@ -1,29 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 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
 DIST COLAMD-2.7.1.tar.gz 55906 RMD160 04acdf4a2d9d16050258a973213686a94544277a SHA1 263803878f8d9abdfa5dd6d5209c73414d99d350 SHA256 b6362c7c8454a5ef305443d44fa4a7d6a3ad19e9b2431c8356a266fd258f35af
 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.4.ebuild 891 RMD160 5527284e7d68c6484027b07df677581a271ff116 SHA1 2721f87b2d4686009199580dc690a01c9892cafa SHA256 a742bac6d9db6d1cf0e9d87d28cfca83b6fd907f523bb3a1923607043fd95dcf
-MISC ChangeLog 3059 RMD160 d188c79ad898e8a0a019497ec0db8afcead9b434 SHA1 cec51bf5ee8c279cbca642c7d1035d7d29db255c SHA256 9cdb78d9d12eb80c55e75b2587b069578103cfefde6c4b1189c2d29229cb41fd
+EBUILD colamd-2.7.4.ebuild 825 RMD160 05ce972035b4d6ec5d31565d5978685dfbe0e648 SHA1 498465ea33b66fb3b60deb6c07a5130c92f28eae SHA256 d133b65549f9e7b224b8884bbb375ca89e15ba9fd2a19b23c5c50fa85622803b
+MISC ChangeLog 3196 RMD160 4bc483890f0fb5fbee68a9e67a91360d96374a0b SHA1 f11e5e9890996b628ac6f39a12eac5886788344f SHA256 dc2542e56fb37a23c892b2452291dcbde5b740c0ec2631774c7a1920cbf6537f
 MISC metadata.xml 852 RMD160 1f2a2bbf103cff3cca06563b6127fceb7570c3bc SHA1 644c28adbd46e7b6f2c91b21b6c021b49b1ebe24 SHA256 2796d9ee5fa245bb7cbbcc0709210a7bc318ee5e2d1aa0b0f9192484caeb1bad
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBCAAGBQJPGoG9AAoJEF0huFKJUZL5yqYP/jMO9u1avaxAb0g7NU+Syrb5
-GT4icoI9L3NDSHx7jPIpjg4j1/PAvc7J30VI5Yz2jFyIgag7XE6zzv57dWIHFcYk
-eARbPzXHz8UsaSBQb0esSzlBsrfCBmvYCereyXyiBH9idB28xgRwlqZXw2FYsQi9
-uLi7lC48YW6C19ytj6mmC4przqsmTLJ6lnX07geh47n30pPI6MhA8oAfB4aNTt2l
-YyxtRHbdtuFnhuuniSrhDo+zFjgS8xyQyiY48BQqFxNX8Wv3HH01jJuQW7ym+hm8
-Ny1bhalgpWxlHpFzTemTZteKoB98u4Q07cgr8D+7nQw4KqyyhDynvCEO6pOA1PnE
-R+bdAPCL+jpKpNlrN0WYcE+KrfZxIrlN7W5JStaBmawatgepMXJv5JZHme/R2DXO
-HchE/5+BtaeYWgxjP9bv3AzsgvkYsZFP+ohrzAgVzYq62RVbptNYYvOgep0YgsWz
-IXmLFZPkauNqMt2TdQtflN3Gs/qtoYLB/NyscgZd2wbHvPtqAyYDGeN3plHGD806
-a9e/mAlzTVGpi5Ppl7ngVT9efoai2rLItGii9KicyEJg/APrsL4pMCDgCW6Lnhiu
-GWEz/VyO9P8pu6+VoeaxoPtpfBI5oRxA/AjD19PhVoUGbpFB1+H2KK2F1ylRDLbm
-JvfuyvnPuG1SNbQC9n2q
-=mYjX
+iEYEAREKAAYFAk8ajY4ACgkQgAnW8HDreRbvJwCeJwwHKy6qn6PM9equzaSyQoNB
+I80An0uXDqseubTRzl9S0V/3yxqReBoI
+=AxwZ
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/colamd/colamd-2.7.4.ebuild b/sci-libs/colamd/colamd-2.7.4.ebuild
index a40a8249b0c4..4bae997961b0 100644
--- a/sci-libs/colamd/colamd-2.7.4.ebuild
+++ b/sci-libs/colamd/colamd-2.7.4.ebuild
@@ -1,15 +1,13 @@
 # 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.4.ebuild,v 1.2 2012/01/21 09:13:23 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/colamd/colamd-2.7.4.ebuild,v 1.3 2012/01/21 10:03:46 jlec Exp $
 
 EAPI=4
 
-AUTOTOOLS_AUTORECONF=yes
-AUTOTOOLS_IN_SOURCE_BUILD=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"
@@ -23,7 +21,7 @@ DEPEND="sci-libs/ufconfig"
 RDEPEND="${DEPEND}"
 
 DOCS=( README.txt Doc/ChangeLog )
-PATCHES=( "${FILESDIR}"/${PN}-2.7.1-autotools.patch )
+PATCHES=( "${FILESDIR}"/${P}-autotools.patch )
 
 # Needs manual inspection of the result, useless.
 RESTRICT="test"
diff --git a/sci-libs/colamd/files/colamd-2.7.4-autotools.patch b/sci-libs/colamd/files/colamd-2.7.4-autotools.patch
new file mode 100644
index 000000000000..f58464cd987f
--- /dev/null
+++ b/sci-libs/colamd/files/colamd-2.7.4-autotools.patch
@@ -0,0 +1,58 @@
+--- Makefile.am 	1970-01-01 01:00:00.000000000 +0100
++++ Makefile.am	2008-01-29 19:06:31.000000000 +0000
+@@ -0,0 +1,3 @@
++SUBDIRS = Source Demo
++include_HEADERS = $(top_srcdir)/Include/colamd.h
++EXTRA_DIST = README.txt
+--- configure.ac 	1970-01-01 01:00:00.000000000 +0100
++++ configure.ac	2008-01-29 19:06:31.000000000 +0000
+@@ -0,0 +1,12 @@
++#                                               -*- Autoconf -*-
++AC_PREREQ(2.59)
++AC_INIT(colamd, 2.7.1, davis@cise.ufl.edu)
++AM_INIT_AUTOMAKE([foreign])
++AC_PROG_INSTALL
++AC_PROG_LIBTOOL
++AC_CHECK_LIB(m, sqrt)
++AC_CHECK_HEADER( UFconfig.h )
++AC_OUTPUT(
++    Makefile \
++    Demo/Makefile \
++    Source/Makefile)
+--- Source/Makefile.am 	1970-01-01 01:00:00.000000000 +0100
++++ Source/Makefile.am	2008-01-29 19:06:31.000000000 +0000
+@@ -0,0 +1,11 @@
++AM_CFLAGS = -I$(top_srcdir)/Include
++lib_LTLIBRARIES = libcolamd.la
++noinst_LTLIBRARIES = libcolamdi.la libcolamdl.la
++
++libcolamdl_la_SOURCES = colamd.c
++libcolamdl_la_CPPFLAGS = -DDLONG
++
++libcolamdi_la_SOURCES = colamd.c
++
++libcolamd_la_SOURCES = colamd_global.c
++libcolamd_la_LIBADD = libcolamdi.la libcolamdl.la
+--- Demo/Makefile.am 	1970-01-01 01:00:00.000000000 +0100
++++ Demo/Makefile.am	2008-01-29 19:06:31.000000000 +0000
+@@ -0,0 +1,20 @@
++LDADD = $(top_builddir)/Source/libcolamd.la
++AM_CPPFLAGS = -I$(top_srcdir)/Include
++
++check_PROGRAMS = colamd_example colamd_l_example
++colamd_example_SOURCES = colamd_example.c
++colamd_l_example_SOURCES = colamd_l_example.c
++colamd_l_example_CPPFLAGS = $(AM_CPPFLAGS) -DDLONG
++
++check-local: $(check_PROGRAMS)
++	@for i in $(check_PROGRAMS); do \
++		echo "Testing $$i"; \
++		./$$i > my_$$i.out; \
++		if ! diff $(srcdir)/$$i.out my_$$i.out; then \
++			echo "Testing $$i failed"; \
++			exit 1; \
++		fi \
++	done;
++
++clean-local:
++	rm -f my*.out