Fix building with gcc-4 #130223 by Håvard Wall.

(Portage version: 2.1.1_pre3-r1)

5 files changed, 55 insertions, 8 deletions

diff --git a/dev-libs/tvision/ChangeLog b/dev-libs/tvision/ChangeLog
index 176cf958b520..94e84119f51d 100644
--- a/dev-libs/tvision/ChangeLog
+++ b/dev-libs/tvision/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/tvision
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/tvision/ChangeLog,v 1.9 2005/09/03 07:54:19 dragonheart Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/tvision/ChangeLog,v 1.10 2006/07/30 19:53:42 vapier Exp $
+
+  30 Jul 2006; Mike Frysinger <vapier@gentoo.org>
+  +files/tvision-2.0.3-gcc4.patch, tvision-2.0.3.ebuild:
+  Fix building with gcc-4 #130223 by Håvard Wall.
 
   03 Sep 2005; Daniel Black <dragonheart@gentoo.org> -tvision-2.0.2.ebuild,
   tvision-2.0.3.ebuild:
diff --git a/dev-libs/tvision/files/digest-tvision-2.0.1 b/dev-libs/tvision/files/digest-tvision-2.0.1
index 9e2d339a8c19..6f59299ac8dd 100644
--- a/dev-libs/tvision/files/digest-tvision-2.0.1
+++ b/dev-libs/tvision/files/digest-tvision-2.0.1
@@ -1 +1,3 @@
 MD5 409c52e8ec111a10f40b41a7fd198766 rhtvision-2.0.1.src.tar.gz 1168371
+RMD160 b40369f6f0d85f09cc80cdc16055813f7f71874f rhtvision-2.0.1.src.tar.gz 1168371
+SHA256 f9c67dc9d866ddcc028cd17c3d0293a97f9870db8b3d9fb6f8b099feb21054e8 rhtvision-2.0.1.src.tar.gz 1168371
diff --git a/dev-libs/tvision/files/digest-tvision-2.0.3 b/dev-libs/tvision/files/digest-tvision-2.0.3
index 502f4d1be7d0..f0f1bf5b80c9 100644
--- a/dev-libs/tvision/files/digest-tvision-2.0.3
+++ b/dev-libs/tvision/files/digest-tvision-2.0.3
@@ -1 +1,3 @@
 MD5 b6129f5c510ba9d28d21c9575b7e1c75 rhtvision-2.0.3.src.tar.gz 1068752
+RMD160 7c37bc1e9d27384ccb3ba8cee3a129e797790ca9 rhtvision-2.0.3.src.tar.gz 1068752
+SHA256 cd8eacf19b8d4302349604fb7b29729e5eea4fee652b08c2768f061e74eb7b9e rhtvision-2.0.3.src.tar.gz 1068752
diff --git a/dev-libs/tvision/files/tvision-2.0.3-gcc4.patch b/dev-libs/tvision/files/tvision-2.0.3-gcc4.patch
new file mode 100644
index 000000000000..13a1ddb6a26e
--- /dev/null
+++ b/dev-libs/tvision/files/tvision-2.0.3-gcc4.patch
@@ -0,0 +1,35 @@
+http://bugs.gentoo.org/130223
+
+--- include/compatlayer.h
++++ include/compatlayer.h
+@@ -324,7 +324,7 @@
+     library. GCC implemented it in version 3.0. BC++ implemented some
+     stuff in versions like BC++ 5.5. So that's a real mess. */
+  #if __GNUC__>=3
+-  #if __GNUC_MINOR__>=4
++  #if __GNUC__ >=4 || __GNUC_MINOR__>=4
+    // gcc 3.4. It have __gnu_cxx::stdio_filebuf class.
+    #define CLY_filebuf       __gnu_cxx::stdio_filebuf<char>
+    #define CLY_int_filebuf   CLY_filebuf
+--- classes/tinputli.cc
++++ classes/tinputli.cc
+@@ -85,9 +85,6 @@
+  modeOptions=defaultModeOptions;
+ }
+ 
+-template class TInputLineBaseT<char,TDrawBuffer>;
+-template class TInputLineBaseT<uint16,TDrawBufferU16>;
+-
+ template <typename T, typename D>
+ TInputLineBaseT<T,D>::TInputLineBaseT(const TRect& bounds, int aMaxLen) :
+   TInputLineBase(bounds,aMaxLen)
+@@ -97,6 +94,9 @@
+  cellSize=sizeof(T);
+ }
+ 
++template class TInputLineBaseT<char,TDrawBuffer>;
++template class TInputLineBaseT<uint16,TDrawBufferU16>;
++
+ void TInputLineBase::SetValidator(TValidator * aValidator)
+ {
+  CLY_destroy(validator);
diff --git a/dev-libs/tvision/tvision-2.0.3.ebuild b/dev-libs/tvision/tvision-2.0.3.ebuild
index 6edddc4f0b88..0b64ecb6cebf 100644
--- a/dev-libs/tvision/tvision-2.0.3.ebuild
+++ b/dev-libs/tvision/tvision-2.0.3.ebuild
@@ -1,8 +1,8 @@
-# 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-libs/tvision/tvision-2.0.3.ebuild,v 1.5 2005/09/03 07:56:35 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/tvision/tvision-2.0.3.ebuild,v 1.6 2006/07/30 19:53:42 vapier Exp $
 
-inherit flag-o-matic
+inherit eutils
 
 DESCRIPTION="Text User Interface that implements the well known CUA widgets"
 HOMEPAGE="http://tvision.sourceforge.net/"
@@ -10,17 +10,21 @@ SRC_URI="mirror://sourceforge/tvision/rhtvision-${PV}.src.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~amd64"
+KEYWORDS="amd64 ppc x86"
 IUSE=""
 
 S=${WORKDIR}/${PN}
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-gcc4.patch
+}
+
 src_compile() {
-	append-flags -fpermissive
 	./configure \
 		--prefix=/usr \
 		--fhs \
-		--no-intl \
 		|| die
 	emake || die
 }