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

(Portage version: 2.1.2_pre1-r1)

4 files changed, 54 insertions, 4 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/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) \