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

Package-Manager: portage-2.1.1_pre3-r1

6 files changed, 82 insertions, 16 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/Manifest b/dev-libs/tvision/Manifest
index f5fe3065532f..592237dc0810 100644
--- a/dev-libs/tvision/Manifest
+++ b/dev-libs/tvision/Manifest
@@ -1,15 +1,34 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX tvision-2.0.3-gcc4.patch 1082 RMD160 0971b4266bb7544e0233c295824179e876cd797a SHA1 1ed979e82c9d0aa9b220efe87be0d4bf0226f6db SHA256 6729dc46d3596ec372f5613d875665ca792676bc55746ff0f1e0bd2860a1d441
+MD5 3eeaa433f71715f7184ee544d2338fd9 files/tvision-2.0.3-gcc4.patch 1082
+RMD160 0971b4266bb7544e0233c295824179e876cd797a files/tvision-2.0.3-gcc4.patch 1082
+SHA256 6729dc46d3596ec372f5613d875665ca792676bc55746ff0f1e0bd2860a1d441 files/tvision-2.0.3-gcc4.patch 1082
+DIST rhtvision-2.0.1.src.tar.gz 1168371 RMD160 b40369f6f0d85f09cc80cdc16055813f7f71874f SHA1 89af3493f18de754c6816a219264d7b102cdaf36 SHA256 f9c67dc9d866ddcc028cd17c3d0293a97f9870db8b3d9fb6f8b099feb21054e8
+DIST rhtvision-2.0.3.src.tar.gz 1068752 RMD160 7c37bc1e9d27384ccb3ba8cee3a129e797790ca9 SHA1 90b5dcf1e2c140d9b392c389c9bac9aaf5129d85 SHA256 cd8eacf19b8d4302349604fb7b29729e5eea4fee652b08c2768f061e74eb7b9e
+EBUILD tvision-2.0.1.ebuild 665 RMD160 b4d625089c282697dae3f7c782539cdfbe699add SHA1 0a498bb0dc1bac1e22072ccedc3f8fd4f4858a4a SHA256 5eca7fad36450d6ad40986291b97f00874c571ed743b3ecbf49fd25bdedaac8e
 MD5 9743bef020b01addbe39d4b3e78b03ff tvision-2.0.1.ebuild 665
-MD5 80b09a2936c8052fe63a5dae4907944d ChangeLog 1275
-MD5 f48472132465aaf79f4a4a68e4879d52 tvision-2.0.3.ebuild 765
-MD5 77d7e341e8e9ec834ca7719f61b21451 files/digest-tvision-2.0.1 72
-MD5 7daddb9d361ccd75c36a648f9224cfc6 files/digest-tvision-2.0.3 72
+RMD160 b4d625089c282697dae3f7c782539cdfbe699add tvision-2.0.1.ebuild 665
+SHA256 5eca7fad36450d6ad40986291b97f00874c571ed743b3ecbf49fd25bdedaac8e tvision-2.0.1.ebuild 665
+EBUILD tvision-2.0.3.ebuild 790 RMD160 c6ea889790f66e152bef717eb4ff0a55b6c74aec SHA1 cea23ab23f184e33d103c9a0000dae6092098f99 SHA256 4737f10af6c0a1d6d451e8cefb040639b3baf1b4a4c3a6448b8f89b8defe3453
+MD5 b212afef6796bfb8978eedeab3b94ea8 tvision-2.0.3.ebuild 790
+RMD160 c6ea889790f66e152bef717eb4ff0a55b6c74aec tvision-2.0.3.ebuild 790
+SHA256 4737f10af6c0a1d6d451e8cefb040639b3baf1b4a4c3a6448b8f89b8defe3453 tvision-2.0.3.ebuild 790
+MISC ChangeLog 1430 RMD160 0d6017cab0ca53eaec8d0500b967003616559359 SHA1 6b317d7cf1f8c392f852d55deffee969f700525f SHA256 b3bb4c77f5c38033eeb5096268b8d894a6c06c7977fd3edd7c020c0b20eab4be
+MD5 ab05485ac7897bdb5e5b013aa460cf50 ChangeLog 1430
+RMD160 0d6017cab0ca53eaec8d0500b967003616559359 ChangeLog 1430
+SHA256 b3bb4c77f5c38033eeb5096268b8d894a6c06c7977fd3edd7c020c0b20eab4be ChangeLog 1430
+MD5 786e9a258b711676702e5bd54cf947bc files/digest-tvision-2.0.1 262
+RMD160 a3d7a0e7d75106ea90509eb77cad40520bb92e04 files/digest-tvision-2.0.1 262
+SHA256 2b4a7ba103f53bce6ceba4b5d38a815b0d975f7fe90f5b7cc1114a10705e416c files/digest-tvision-2.0.1 262
+MD5 f67f58b5fab5f53c676b64ae893cb786 files/digest-tvision-2.0.3 262
+RMD160 5b1a9a24aa45db71edbe0f32b6b5baf336fa8dcf files/digest-tvision-2.0.3 262
+SHA256 508e02f0edd0160cfa848ed85953aa247da2df0ccdf73bff0d0fdde1ed3b7973 files/digest-tvision-2.0.3 262
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
+Version: GnuPG v1.4.4 (GNU/Linux)
 
-iD8DBQFDGVdImdTrptrqvGERApApAJ4nCrAal+7MAuBnkiyBwX2Yv24GHQCfatfG
-U121NPWDbTSTPEx4r26KTUI=
-=0dsJ
+iD8DBQFEzQ6DamhnQswr0vIRAvzPAJ90AvEqRPArJBEDq42zVYH9DhUXOACePlYc
+LlMezqMTf6jnDD69X86uJzE=
+=EE49
 -----END PGP SIGNATURE-----
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
 }