Make it gold resistant, #369849

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

5 files changed, 81 insertions, 13 deletions

diff --git a/sci-mathematics/4ti2/4ti2-1.3.2-r1.ebuild b/sci-mathematics/4ti2/4ti2-1.3.2-r1.ebuild
new file mode 100644
index 000000000000..0d95a4899a10
--- /dev/null
+++ b/sci-mathematics/4ti2/4ti2-1.3.2-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2011 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.1 2011/06/03 08:31:33 jlec Exp $
+
+EAPI=4
+
+inherit autotools autotools-utils
+
+DESCRIPTION="Software package for algebraic, geometric and combinatorial problems"
+HOMEPAGE="http://www.4ti2.de/"
+SRC_URI="http://4ti2.de/version_${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="static-libs"
+
+DEPEND="
+	sci-mathematics/glpk[gmp]
+	dev-libs/gmp[-nocxx]"
+RDEPEND="${DEPEND}"
+
+AUTOTOOLS_IN_SOURCE_BUILD=1
+
+PATCHES=( "${FILESDIR}"/${P}-gold.patch )
+
+src_prepare() {
+	autotools-utils_src_prepare
+	eautoreconf
+}
diff --git a/sci-mathematics/4ti2/4ti2-1.3.2.ebuild b/sci-mathematics/4ti2/4ti2-1.3.2.ebuild
index 3d86b60ccd78..65d27d1c8c32 100644
--- a/sci-mathematics/4ti2/4ti2-1.3.2.ebuild
+++ b/sci-mathematics/4ti2/4ti2-1.3.2.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 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.ebuild,v 1.3 2010/11/21 17:46:59 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/4ti2/4ti2-1.3.2.ebuild,v 1.4 2011/06/03 08:31:33 jlec Exp $
 
-EAPI="3"
+EAPI=3
 
 inherit autotools-utils
 
-DESCRIPTION="software package for algebraic, geometric and combinatorial problems"
-HOMEPAGE="http://www.4ti2.de"
+DESCRIPTION="Software package for algebraic, geometric and combinatorial problems"
+HOMEPAGE="http://www.4ti2.de/"
 SRC_URI="http://4ti2.de/version_${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/sci-mathematics/4ti2/ChangeLog b/sci-mathematics/4ti2/ChangeLog
index 49027557b27c..0b366642500d 100644
--- a/sci-mathematics/4ti2/ChangeLog
+++ b/sci-mathematics/4ti2/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-mathematics/4ti2
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/4ti2/ChangeLog,v 1.3 2010/11/21 17:46:59 maekke Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/4ti2/ChangeLog,v 1.4 2011/06/03 08:31:33 jlec Exp $
+
+*4ti2-1.3.2-r1 (03 Jun 2011)
+
+  03 Jun 2011; Justin Lecher <jlec@gentoo.org> 4ti2-1.3.2.ebuild,
+  +4ti2-1.3.2-r1.ebuild, +files/4ti2-1.3.2-gold.patch:
+  Make it gold resistant, #369849
 
   21 Nov 2010; Markus Meier <maekke@gentoo.org> 4ti2-1.3.2.ebuild:
   x86 stable, bug #346079
diff --git a/sci-mathematics/4ti2/Manifest b/sci-mathematics/4ti2/Manifest
index fe3f4fbd2592..55ee0d701482 100644
--- a/sci-mathematics/4ti2/Manifest
+++ b/sci-mathematics/4ti2/Manifest
@@ -1,14 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX 4ti2-1.3.2-gold.patch 966 RMD160 29aab8aa4e7f60d1671e24f1c4423282acf4ab22 SHA1 56d508636e59a0d135680b2095a9f1d8862c84e4 SHA256 ef27c3acb27b3cfed6d351662b633bac9c301bb11e5da4479f08b160d05baabc
 DIST 4ti2-1.3.2.tar.gz 4658600 RMD160 e3c5994f458912553988cd113fb9ce1f51c17fe6 SHA1 bb0bddb3a9de6f6ceeee7e296b5315b8b7e59ea5 SHA256 30f15696105b5cfa0784d2f7f9a310ef67d616d2367e064c85ba36ec9a20a066
-EBUILD 4ti2-1.3.2.ebuild 564 RMD160 6e1c0b341cfffe34f0ce36662b79225c7b96d4c2 SHA1 a843d8855789cd4ec50edd835567a7a106afa633 SHA256 b3cf13ca2be336153e4e94e29d8c81808f92bc784d042bc7d716336c5d762aee
-MISC ChangeLog 1036 RMD160 ca4c7590d1632d6463dd0d79ab20073f9a6d9db9 SHA1 0a2b342909eb739bc312b250c84e10c17ee01318 SHA256 8be06c3937cdf7788c271a88b4c24788bf442017cd7a28f4e5ae733a78c005a1
+EBUILD 4ti2-1.3.2-r1.ebuild 711 RMD160 a5a88bc6550c8569c0b0e0ec00260c2a1361a20f SHA1 c860d144e5cafa5b20a0b4416136fde3fe6afa9a SHA256 dbae52ed28e02b84368ac70f50bb4d453b05800a282a0a92bd4e875aafd03736
+EBUILD 4ti2-1.3.2.ebuild 561 RMD160 d9a04280930d63ba76c24d638e1baf6649ae49e5 SHA1 52314f2490b6f20d0975a20381e0f5607befc41a SHA256 fe40033c10f820a5cfac4c3a93d47ff9b1edce6b1209aac1576070789444cfa6
+MISC ChangeLog 1220 RMD160 93758525d093628ec1a2eb33f7632155f70d7084 SHA1 63eb16a3c766052523e5daf00436e953b97cd17c SHA256 0e757f2944b6af8aa827e2fd0068f0c9c14ad47f44c5453baf5876f17fd1d679
 MISC metadata.xml 426 RMD160 ef501b7737209ac4e49a8011f6d0778cc316f32f SHA1 a8fc342f767cb21a539261f32d51e42d4785fd4b SHA256 53c6fa4c1747a7089fca2db2d100fec2a592a254c37b081535d7d436b0fd8e8f
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAkzpWtcACgkQkKaRLQcq0GJfOwCfUbmnQW9F0rkt3A/IesRgvWt6
-vucAnRTejEeZCRvIH1nzl/uP0RjFr3Od
-=hZSf
+iEYEARECAAYFAk3om+wACgkQgAnW8HDreRbjzQCgm2YwEstx8V8NDLTrPVXkspDv
+jfkAoIpg/BC91j1wTv54/eR4nD6Qj/9C
+=mKq/
 -----END PGP SIGNATURE-----
diff --git a/sci-mathematics/4ti2/files/4ti2-1.3.2-gold.patch b/sci-mathematics/4ti2/files/4ti2-1.3.2-gold.patch
new file mode 100644
index 000000000000..6da08f434654
--- /dev/null
+++ b/sci-mathematics/4ti2/files/4ti2-1.3.2-gold.patch
@@ -0,0 +1,30 @@
+ m4/glpk-check.m4         |    2 +-
+ 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
++++ b/src/groebner/Makefile.am
+@@ -269,7 +269,7 @@ lib4ti2int64_la_SOURCES = $(lib4ti2sources)
+ # Arbitrary precision flags.
+ # 4ti2 uses GMP (GLPL), an arbitrary precision arithmetic library.
+ if HAVE_GMP_WITH_CXX
+-4ti2gmp_LDADD = lib4ti2gmp.la
++4ti2gmp_LDADD = lib4ti2gmp.la -lgmp
+ 4ti2gmp_CPPFLAGS = -D_4ti2_GMP_ $(GMP_CFLAGS)
+ 4ti2gmp_SOURCES = $(4ti2sources)
+ lib4ti2gmp_la_CPPFLAGS = -D_4ti2_GMP_