Added a gcc-4.4 patch in order to build cgal-python

Package-Manager: portage-2.2_rc38/cvs/Linux x86_64

4 files changed, 43 insertions, 7 deletions

diff --git a/sci-mathematics/cgal/ChangeLog b/sci-mathematics/cgal/ChangeLog
index 9868480ddb53..b19b4e84504a 100644
--- a/sci-mathematics/cgal/ChangeLog
+++ b/sci-mathematics/cgal/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-mathematics/cgal
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/cgal/ChangeLog,v 1.3 2009/08/12 20:27:00 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/cgal/ChangeLog,v 1.4 2009/08/12 21:29:10 bicatali Exp $
+
+  12 Aug 2009; Sébastien Fabbro <bicatali@gentoo.org> cgal-3.3.1.ebuild,
+  +files/cgal-3.3.1-gcc44.patch:
+  Added a gcc-4.4 patch in order to build cgal-python
 
   12 Aug 2009; Sébastien Fabbro <bicatali@gentoo.org> cgal-3.3.1.ebuild:
   Fixed a sed line
diff --git a/sci-mathematics/cgal/Manifest b/sci-mathematics/cgal/Manifest
index 54bd209ae082..43e400b887e0 100644
--- a/sci-mathematics/cgal/Manifest
+++ b/sci-mathematics/cgal/Manifest
@@ -1,16 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX cgal-3.3.1-gcc44.patch 1323 RMD160 83b187a7367eb1a240ad23c9c7173857ed4bcd69 SHA1 58537d80a7324f620075a7ec8830aa9275992678 SHA256 60d134c5abde6f9bc01a8dfcd7d4b275039e1727c049245b9e80ad5bca9e23de
 AUX cgal-3.3.1-qt.patch 2029 RMD160 340035482282e118b72adfdd45945b82bc951175 SHA1 3b19e7d0d3ef92526ecc54daa6a5676a9ca9cf9a SHA256 9177a289eddd4356f79baecb19e20c126462c585314ee67512eb116accf32f94
 AUX cgal-3.3.1-rpath.patch 5043 RMD160 3eae61377d17487576ffb06b7ba3928ac5e1358f SHA1 8b241d9523bb464c0ac774a50ef878872135a7a4 SHA256 d9559cf91ca90dad8cb4a4b13f0b624da84205ae563fb10a9f471d43a4d20d49
 DIST CGAL-3.3.1.tar.gz 8593200 RMD160 e2c2e785a7c61bc9b651903df539bb00ce689b07 SHA1 b17b12fdf106003e1257e1465b0ba1d17e6cefb9 SHA256 c6e4e5a284ccb07b38321cd265f07a0cb8eaa4df67efb7f40f70a311cae00d37
-EBUILD cgal-3.3.1.ebuild 2764 RMD160 5a4cace0d10c4137d6abdfc546701493a3aaf945 SHA1 98911c65b719a3b3b9fae38e715568fc19f54a7f SHA256 1dfd5549589941dea2cac2885f95a81dc69923e38ec60b108cb5d661f4141f93
-MISC ChangeLog 677 RMD160 ab8957c23a43371b889d1da1663680769a92957b SHA1 f47263ee34b5ebd03983e438b8d6782cb1317959 SHA256 4deeaa00351f1ee594ea9a29bd4fa9c85d6b0f047601785017f1c895eefe9e14
+EBUILD cgal-3.3.1.ebuild 2803 RMD160 e4b0d366a9f0e9314288ee30cebfd3108a595a6f SHA1 ca92ee7a70950cbb694cadd1944335e1cfa80196 SHA256 5bf77a95bc52e14a538a6d1a38b8ce2ac29e78d3c5f2e251f0adcd8e411e1688
+MISC ChangeLog 839 RMD160 ade2d82ec9320429ef5ea73921e6c3a9997dc633 SHA1 dc4644c1c76ced3d40c114a7e3ea639d3acb5594 SHA256 52756fe9cd399dd487538ddf3884b25b1d356a8ba3878b2f07d609ec66eb6e37
 MISC metadata.xml 1025 RMD160 da14e8b7ef6f3ce0aa192b47bbd509a66b5c07af SHA1 449624b3734ca4c2b5da1e3018536d8fe8580b5e SHA256 29cf5a72c2119df2fbb5b0ca0bb8f3abd1779e8b0ac31e99408cc0895ade515b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkqDJaMACgkQ1ycZbhPLE2Cz6ACdHcurXNKpBTwTW40ozCbltYdr
-79cAn2yhMVDzsdixq0T7wvS1W+7dX2Ou
-=jAhI
+iEYEARECAAYFAkqDNDMACgkQ1ycZbhPLE2BVoQCfehNvt1nB2/uQY8+xiCs8Plia
+z14Anj5S2jth+7HZ0VwCxKuzEHSawxW0
+=tJj4
 -----END PGP SIGNATURE-----
diff --git a/sci-mathematics/cgal/cgal-3.3.1.ebuild b/sci-mathematics/cgal/cgal-3.3.1.ebuild
index 6ee20eaf9e79..432a12c6fcce 100644
--- a/sci-mathematics/cgal/cgal-3.3.1.ebuild
+++ b/sci-mathematics/cgal/cgal-3.3.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/cgal/cgal-3.3.1.ebuild,v 1.3 2009/08/12 20:27:00 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/cgal/cgal-3.3.1.ebuild,v 1.4 2009/08/12 21:29:10 bicatali Exp $
 
 EAPI=2
 
@@ -34,6 +34,7 @@ src_prepare() {
 	epatch "${FILESDIR}"/${P}-rpath.patch
 	# a patch from debian on missing qt headers
 	epatch "${FILESDIR}"/${P}-qt.patch
+	epatch "${FILESDIR}"/${P}-gcc44.patch
 	# sed for blas and lapack gentoo style
 	sed -e 's:Intel MKL:Gentoo BLAS-LAPACK:' \
 		-e "s:^LIBS.=.*:LIBS=$(pkg-config --libs-only-l lapack | sed 's/-l//g'):" \
diff --git a/sci-mathematics/cgal/files/cgal-3.3.1-gcc44.patch b/sci-mathematics/cgal/files/cgal-3.3.1-gcc44.patch
new file mode 100644
index 000000000000..3707bd83d67c
--- /dev/null
+++ b/sci-mathematics/cgal/files/cgal-3.3.1-gcc44.patch
@@ -0,0 +1,30 @@
+--- include/CGAL/Lazy_exact_nt.h.orig	2009-08-12 22:17:43.000000000 +0100
++++ include/CGAL/Lazy_exact_nt.h	2009-08-12 22:19:06.000000000 +0100
+@@ -329,11 +329,11 @@
+ struct Lazy_exact_Min : public Lazy_exact_binary<ET>
+ {
+   Lazy_exact_Min (const Lazy_exact_nt<ET> &a, const Lazy_exact_nt<ET> &b)
+-    : Lazy_exact_binary<ET>((min)(a.approx(), b.approx()), a, b) {}
++    : Lazy_exact_binary<ET>((CGAL::min)(a.approx(), b.approx()), a, b) {}
+ 
+   void update_exact()
+   {
+-    this->et = new ET((min)(this->op1.exact(), this->op2.exact()));
++    this->et = new ET((CGAL::min)(this->op1.exact(), this->op2.exact()));
+     if (!this->approx().is_point()) this->approx() = CGAL_NTS to_interval(*(this->et));
+     this->prune_dag();
+   }
+@@ -344,11 +344,11 @@
+ struct Lazy_exact_Max : public Lazy_exact_binary<ET>
+ {
+   Lazy_exact_Max (const Lazy_exact_nt<ET> &a, const Lazy_exact_nt<ET> &b)
+-    : Lazy_exact_binary<ET>((max)(a.approx(), b.approx()), a, b) {}
++    : Lazy_exact_binary<ET>((CGAL::max)(a.approx(), b.approx()), a, b) {}
+ 
+   void update_exact()
+   {
+-    this->et = new ET((max)(this->op1.exact(), this->op2.exact()));
++    this->et = new ET((CGAL::max)(this->op1.exact(), this->op2.exact()));
+     if (!this->approx().is_point()) this->approx() = CGAL_NTS to_interval(*(this->et));
+     this->prune_dag();
+   }