Added patch to fix compile problems with gcc4.x. This fixes bug #149299.

Package-Manager: portage-2.1.2_pre1-r1

5 files changed, 73 insertions, 7 deletions

diff --git a/dev-lang/gdl/ChangeLog b/dev-lang/gdl/ChangeLog
index dbcdeeb229c0..7fd2b244736b 100644
--- a/dev-lang/gdl/ChangeLog
+++ b/dev-lang/gdl/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-lang/gdl
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/gdl/ChangeLog,v 1.1 2005/12/21 15:32:03 markusle Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/gdl/ChangeLog,v 1.2 2006/09/29 02:51:07 markusle Exp $
+
+  29 Sep 2006; Markus Dittrich <markusle@gentoo.org>
+  +files/gdl-0.8.11-gcc4-gentoo.patch, gdl-0.8.11.ebuild:
+  Added patch to fix compile problems with gcc4.x. This fixes
+  bug #149299.
 
 *gdl-0.8.11 (21 Dec 2005)
 
diff --git a/dev-lang/gdl/Manifest b/dev-lang/gdl/Manifest
index b3254f036742..a6cd4fe090f8 100644
--- a/dev-lang/gdl/Manifest
+++ b/dev-lang/gdl/Manifest
@@ -1,4 +1,20 @@
-MD5 76b5d4d931d828ed575e0b60788daf82 gdl-0.8.11.ebuild 1348
-MD5 0698a54899bb658a30f10d4e1dbe6c8b ChangeLog 545
+AUX gdl-0.8.11-gcc4-gentoo.patch 1402 RMD160 2cb002f9cc60e5910a106dfeb0ab079dcb2f212d SHA1 4b22d29098141a26fc089dbd98b5ae0190731f7b SHA256 42765b45b82bd56c46d7d2aa1726b97f47a95f3eee37a934ac600ba2e5fba0a1
+MD5 454fd063524edae773e573b6d05b8e58 files/gdl-0.8.11-gcc4-gentoo.patch 1402
+RMD160 2cb002f9cc60e5910a106dfeb0ab079dcb2f212d files/gdl-0.8.11-gcc4-gentoo.patch 1402
+SHA256 42765b45b82bd56c46d7d2aa1726b97f47a95f3eee37a934ac600ba2e5fba0a1 files/gdl-0.8.11-gcc4-gentoo.patch 1402
+DIST gdl-0.8.11.tar.gz 827194 RMD160 f392dea396bc6ab56a2360bfda02ea684aa2ce3f SHA1 8904075d9297ea54cfbdf66cc69d55c472d784c1 SHA256 3872fdbf5ec76632cad1fe1a488728592d72244c9c0553c96f265bdc78bb5906
+EBUILD gdl-0.8.11.ebuild 1436 RMD160 76f914dc07491c604dc677d96f678dbacf472373 SHA1 1382ccbfa3fc00d4e6647fdd5a45472173c0094a SHA256 d2455f18fb24a9defce9a51c6274fc7cb6ba3352fc4420a599fa6cc31e8c6781
+MD5 a868a0639c818c59c227e0e3b951806f gdl-0.8.11.ebuild 1436
+RMD160 76f914dc07491c604dc677d96f678dbacf472373 gdl-0.8.11.ebuild 1436
+SHA256 d2455f18fb24a9defce9a51c6274fc7cb6ba3352fc4420a599fa6cc31e8c6781 gdl-0.8.11.ebuild 1436
+MISC ChangeLog 734 RMD160 1397a6314111b0277ccf7dd5c6c5b97ec4e7c23d SHA1 daee28cb5198232d1e01123d59b7bd73c0711be4 SHA256 d11a799f701b06369f668827e0ce92107eaa0acef53560cdbe0fd96fd2f3dda0
+MD5 66692304715b441031fd87bbc77e7940 ChangeLog 734
+RMD160 1397a6314111b0277ccf7dd5c6c5b97ec4e7c23d ChangeLog 734
+SHA256 d11a799f701b06369f668827e0ce92107eaa0acef53560cdbe0fd96fd2f3dda0 ChangeLog 734
+MISC metadata.xml 254 RMD160 991c43f74018cbcaaa60b41290c912a8b61091c8 SHA1 83928b80dc644941d59b64e04e0964b1c1fa3005 SHA256 80784c7acbd54102b4d3fc01c3fb2ae5862732093798671596c67a8350c25454
 MD5 041650a939ada57b9df1755a488ad1b7 metadata.xml 254
-MD5 9e1aea27a6a4b772ac1ba3079109cdc8 files/digest-gdl-0.8.11 62
+RMD160 991c43f74018cbcaaa60b41290c912a8b61091c8 metadata.xml 254
+SHA256 80784c7acbd54102b4d3fc01c3fb2ae5862732093798671596c67a8350c25454 metadata.xml 254
+MD5 073199440288ef33b12cfa2389404105 files/digest-gdl-0.8.11 232
+RMD160 292e35cfc55648a8de53e66b72dafe27af099504 files/digest-gdl-0.8.11 232
+SHA256 39765dcc3da808523684973ed19d91c504cb94003ba65181df41da0bf5b148aa files/digest-gdl-0.8.11 232
diff --git a/dev-lang/gdl/files/digest-gdl-0.8.11 b/dev-lang/gdl/files/digest-gdl-0.8.11
index 2a5543b89a12..f65456202f90 100644
--- a/dev-lang/gdl/files/digest-gdl-0.8.11
+++ b/dev-lang/gdl/files/digest-gdl-0.8.11
@@ -1 +1,3 @@
 MD5 837365b860889de03483cf84ae15b9b3 gdl-0.8.11.tar.gz 827194
+RMD160 f392dea396bc6ab56a2360bfda02ea684aa2ce3f gdl-0.8.11.tar.gz 827194
+SHA256 3872fdbf5ec76632cad1fe1a488728592d72244c9c0553c96f265bdc78bb5906 gdl-0.8.11.tar.gz 827194
diff --git a/dev-lang/gdl/files/gdl-0.8.11-gcc4-gentoo.patch b/dev-lang/gdl/files/gdl-0.8.11-gcc4-gentoo.patch
new file mode 100644
index 000000000000..5d8edea61fdc
--- /dev/null
+++ b/dev-lang/gdl/files/gdl-0.8.11-gcc4-gentoo.patch
@@ -0,0 +1,36 @@
+--- gdl-0.8.11/src/specializations.hpp	2005-10-17 04:22:04.000000000 -0400
++++ gdl-0.8.11-new/src/specializations.hpp	2006-09-28 22:04:04.000000000 -0400
+@@ -106,10 +106,10 @@
+ template<> 
+ Data_<SpDPtr>* Data_<SpDPtr>::XorOp( BaseGDL* r);
+ template<> 
+-Data_<SpDByte>* Data_<SpDPtr>::EqOp( BaseGDL* r);
+-template<> 
+-Data_<SpDByte>* Data_<SpDPtr>::NeOp( BaseGDL* r);
+-template<> 
++//Data_<SpDByte>* Data_<SpDPtr>::EqOp( BaseGDL* r);
++//template<> 
++//Data_<SpDByte>* Data_<SpDPtr>::NeOp( BaseGDL* r);
++//template<> 
+ Data_<SpDByte>* Data_<SpDPtr>::LeOp( BaseGDL* r);
+ template<> 
+ Data_<SpDByte>* Data_<SpDComplex>::LeOp( BaseGDL* r);
+@@ -237,9 +237,16 @@
+ Data_<SpDByte>* Data_<SpDComplexDbl>::LogNeg();
+ 
+ // datatypes.cpp
++template<>
++Data_<SpDString>::Data_(const dimension& dim_, BaseGDL::InitType iT);
++template<>
++Data_<SpDPtr>::Data_(const dimension& dim_, BaseGDL::InitType iT);
++template<>
++Data_<SpDObj>::Data_(const dimension& dim_, BaseGDL::InitType iT);
++
+ template<>  const SizeT Data_<SpDString>::NBytes() const;
+-template<>  const SizeT Data_<SpDObj>::NBytes() const;
+-template<>  const SizeT Data_<SpDPtr>::NBytes() const;
++//template<>  const SizeT Data_<SpDObj>::NBytes() const;
++//template<>  const SizeT Data_<SpDPtr>::NBytes() const;
+ template<>  const SizeT Data_<SpDComplex>::ToTransfer() const;
+ template<>  const SizeT Data_<SpDComplexDbl>::ToTransfer() const;
+ template<> 
diff --git a/dev-lang/gdl/gdl-0.8.11.ebuild b/dev-lang/gdl/gdl-0.8.11.ebuild
index 631be5147172..020071d433aa 100644
--- a/dev-lang/gdl/gdl-0.8.11.ebuild
+++ b/dev-lang/gdl/gdl-0.8.11.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/gdl/gdl-0.8.11.ebuild,v 1.1 2005/12/21 15:32:03 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/gdl/gdl-0.8.11.ebuild,v 1.2 2006/09/29 02:51:07 markusle Exp $
 
 inherit eutils
 
@@ -26,6 +26,13 @@ DEPEND=">=sys-libs/readline-4.3
 			dev-python/matplotlib )
 	fftw? ( sci-libs/fftw )"
 
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-gcc4-gentoo.patch
+}
+
 src_compile() {
 	econf \
 	  $(use_with python) \