Correct gold patch to fix build on Darwin targets, #408497

(Portage version: 2.2.0_alpha95/cvs/Linux x86_64)

4 files changed, 20 insertions, 25 deletions

diff --git a/sci-mathematics/4ti2/4ti2-1.3.2-r1.ebuild b/sci-mathematics/4ti2/4ti2-1.3.2-r1.ebuild
index 5d83ebc3a2dc..8410dc3be689 100644
--- a/sci-mathematics/4ti2/4ti2-1.3.2-r1.ebuild
+++ b/sci-mathematics/4ti2/4ti2-1.3.2-r1.ebuild
@@ -1,10 +1,12 @@
-# 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-mathematics/4ti2/4ti2-1.3.2-r1.ebuild,v 1.3 2011/11/14 11:26:12 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/4ti2/4ti2-1.3.2-r1.ebuild,v 1.4 2012/03/25 09:43:27 jlec Exp $
 
 EAPI=4
 
-inherit autotools autotools-utils
+AUTOTOOLS_AUTORECONF=true
+
+inherit autotools-utils
 
 DESCRIPTION="Software package for algebraic, geometric and combinatorial problems"
 HOMEPAGE="http://www.4ti2.de/"
@@ -25,6 +27,8 @@ AUTOTOOLS_IN_SOURCE_BUILD=1
 PATCHES=( "${FILESDIR}"/${P}-gold.patch )
 
 src_prepare() {
+	sed \
+		-e "s:^CXX.*$:CXX=$(tc-getCXX):g" \
+		-i m4/glpk-check.m4 || die
 	autotools-utils_src_prepare
-	eautoreconf
 }
diff --git a/sci-mathematics/4ti2/ChangeLog b/sci-mathematics/4ti2/ChangeLog
index 6ed3f0b04ea7..af647c190dda 100644
--- a/sci-mathematics/4ti2/ChangeLog
+++ b/sci-mathematics/4ti2/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-mathematics/4ti2
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/4ti2/ChangeLog,v 1.6 2011/11/14 11:26:12 flameeyes Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/4ti2/ChangeLog,v 1.7 2012/03/25 09:43:27 jlec Exp $
+
+  25 Mar 2012; Justin Lecher <jlec@gentoo.org> 4ti2-1.3.2-r1.ebuild,
+  files/4ti2-1.3.2-gold.patch, metadata.xml:
+  Correct gold patch to fix build on Darwin targets, #408497
 
   14 Nov 2011; Diego E. Pettenò <flameeyes@gentoo.org> 4ti2-1.3.2-r1.ebuild,
   4ti2-1.3.2.ebuild:
diff --git a/sci-mathematics/4ti2/files/4ti2-1.3.2-gold.patch b/sci-mathematics/4ti2/files/4ti2-1.3.2-gold.patch
index 6da08f434654..bb1e8c4aad39 100644
--- a/sci-mathematics/4ti2/files/4ti2-1.3.2-gold.patch
+++ b/sci-mathematics/4ti2/files/4ti2-1.3.2-gold.patch
@@ -2,19 +2,6 @@
  src/groebner/Makefile.am |    2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)
 
-diff --git a/m4/glpk-check.m4 b/m4/glpk-check.m4
-index a3227dd..683d55b 100644
---- a/m4/glpk-check.m4
-+++ b/m4/glpk-check.m4
-@@ -27,7 +27,7 @@ BACKUP_CXXFLAGS=${CXXFLAGS}
- BACKUP_LIBS=${LIBS}
- BACKUP_CXX=${CXX}
- 
--CXX="./libtool --mode=link ${CXX}"
-+CXX="libtool --mode=link ${CXX}"
- 
- AC_MSG_CHECKING(for GLPK)
- 
 diff --git a/src/groebner/Makefile.am b/src/groebner/Makefile.am
 index 992c4ae..ba2f463 100644
 --- a/src/groebner/Makefile.am
diff --git a/sci-mathematics/4ti2/metadata.xml b/sci-mathematics/4ti2/metadata.xml
index 5ada5f3a0bde..306b0f295d27 100644
--- a/sci-mathematics/4ti2/metadata.xml
+++ b/sci-mathematics/4ti2/metadata.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-  <email>tomka@gentoo.org</email>
-  <name>Thomas Kahle</name>
-</maintainer>
-<herd>sci-mathematics</herd>
-<longdescription lang="en">
+	<maintainer>
+		<email>tomka@gentoo.org</email>
+		<name>Thomas Kahle</name>
+	</maintainer>
+	<herd>sci-mathematics</herd>
+	<longdescription lang="en">
 4ti2 is a software package for algebraic, geometric and combinatorial problems
 on linear spaces and for toric ideals too.
 </longdescription>