Fix for GCC 4.4 compatibility (#275808 by Joost Ruis), stop calling ldconfig during installation, and remove older version

(Portage version: 2.2_rc33/cvs/Linux i686)

5 files changed, 56 insertions, 47 deletions

diff --git a/dev-libs/tvision/ChangeLog b/dev-libs/tvision/ChangeLog
index 031e49e48302..14f618ea2ae0 100644
--- a/dev-libs/tvision/ChangeLog
+++ b/dev-libs/tvision/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for dev-libs/tvision
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/tvision/ChangeLog,v 1.23 2007/11/02 14:26:09 beandog Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/tvision/ChangeLog,v 1.24 2009/07/04 19:16:04 truedfx Exp $
+
+*tvision-2.1.0_pre2-r2 (04 Jul 2009)
+
+  04 Jul 2009; Harald van Dijk <truedfx@gentoo.org>
+  -tvision-2.1.0_pre1.ebuild, +tvision-2.1.0_pre2-r2.ebuild,
+  -files/tvision-2.1.0_pre1-gcc41.patch,
+  +files/tvision-2.1.0_pre2-gcc44.patch,
+  +files/tvision-2.1.0_pre2-ldconfig.patch:
+  Fix for GCC 4.4 compatibility (#275808 by Joost Ruis), stop calling
+  ldconfig during installation, and remove older version
 
   02 Nov 2007; Steve Dibb <beandog@gentoo.org> tvision-2.1.0_pre2-r1.ebuild:
   amd64 stable, bug 194496
diff --git a/dev-libs/tvision/files/tvision-2.1.0_pre1-gcc41.patch b/dev-libs/tvision/files/tvision-2.1.0_pre1-gcc41.patch
deleted file mode 100644
index 8ef9b79c104b..000000000000
--- a/dev-libs/tvision/files/tvision-2.1.0_pre1-gcc41.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- tvision/include/compatlayer.h
-+++ tvision/include/compatlayer.h
-@@ -812,10 +812,6 @@
-    #define _GNU_SOURCE
-    #define CLY_getline getline
-   #endif
--  // Avoid including libintl.h, we have the prototypes
--  // This is a temporal workaround.
--  #undef  _LIBINTL_H
--  #define _LIBINTL_H 1
-  #endif
- 
-  /* Solaris using gcc but not glibc */
---- tvision/include/tv/inputln.h
-+++ tvision/include/tv/inputln.h
-@@ -201,7 +201,7 @@
-      { return name; }
- 
- protected:
-- TInputLine::TInputLine(StreamableInit) :
-+ TInputLine(StreamableInit) :
-    TInputLineBaseT<char,TDrawBuffer>(streamableInit) {}
- 
- public:
---- tvision/classes/tinputli.cc
-+++ tvision/classes/tinputli.cc
-@@ -75,9 +75,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, TValidator *aValid) :
-   TInputLineBase(bounds,aMaxLen,aValid)
-@@ -656,3 +653,5 @@
-  return True;
- }
- 
-+template class TInputLineBaseT<char,TDrawBuffer>;
-+template class TInputLineBaseT<uint16,TDrawBufferU16>;
diff --git a/dev-libs/tvision/files/tvision-2.1.0_pre2-gcc44.patch b/dev-libs/tvision/files/tvision-2.1.0_pre2-gcc44.patch
new file mode 100644
index 000000000000..40911f3a3e29
--- /dev/null
+++ b/dev-libs/tvision/files/tvision-2.1.0_pre2-gcc44.patch
@@ -0,0 +1,21 @@
+--- tvision/classes/ipstream.cc
++++ tvision/classes/ipstream.cc
+@@ -19,6 +19,7 @@
+  *
+  */
+ #include <assert.h>
++#include <stdio.h>
+ #define Uses_string
+ #define Uses_TStreamable
+ #define Uses_TStreamableClass
+--- tvision/include/tv/textdev.h
++++ tvision/include/tv/textdev.h
+@@ -16,6 +16,8 @@
+ #if defined( Uses_TTextDevice ) && !defined( __TTextDevice )
+ #define __TTextDevice
+ 
++#include <stdio.h>
++
+ class TRect;
+ class TScrollBar;
+ 
diff --git a/dev-libs/tvision/files/tvision-2.1.0_pre2-ldconfig.patch b/dev-libs/tvision/files/tvision-2.1.0_pre2-ldconfig.patch
new file mode 100644
index 000000000000..6d7d94fe8a0d
--- /dev/null
+++ b/dev-libs/tvision/files/tvision-2.1.0_pre2-ldconfig.patch
@@ -0,0 +1,15 @@
+--- tvision/config.pl
++++ tvision/config.pl
+@@ -1193,12 +1193,6 @@
+     $rep.="\t".GenInstallFiles('0644',"$makeDir/$ver",'$(libdir)');
+     $stripDebug=($OSf eq 'Darwin') ? '-S' : '--strip-debug';
+     $rep.="\tstrip $stripDebug \$(libdir)/$ver\n" unless $conf{'debugInfo'} eq 'yes';
+-    # FreeBSD: merge data from libdir.
+-    # Darwin: doesn't have ldconfig.
+-    if ($OSf ne 'Darwin')
+-      {
+-       $rep.=($OSf eq 'FreeBSD') ? "\t-ldconfig -m \$(libdir)\n" : "\t-ldconfig\n";
+-      }
+    }
+  if ($internac)
+    {
diff --git a/dev-libs/tvision/tvision-2.1.0_pre1.ebuild b/dev-libs/tvision/tvision-2.1.0_pre2-r2.ebuild
index f9830ed87ab6..c7809e6c501a 100644
--- a/dev-libs/tvision/tvision-2.1.0_pre1.ebuild
+++ b/dev-libs/tvision/tvision-2.1.0_pre2-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/tvision/tvision-2.1.0_pre1.ebuild,v 1.4 2006/09/16 20:20:04 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/tvision/tvision-2.1.0_pre2-r2.ebuild,v 1.1 2009/07/04 19:16:04 truedfx Exp $
 
 inherit eutils multilib
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/tvision/rhtvision_${PV/_pre/-}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
 S=${WORKDIR}/${PN}
@@ -19,6 +19,11 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	epatch "${FILESDIR}"/${P}-gcc41.patch
+	epatch "${FILESDIR}"/${P}-outb.patch
+	epatch "${FILESDIR}"/${P}-underflow.patch
+	epatch "${FILESDIR}"/${P}-asneeded.patch
+	epatch "${FILESDIR}"/${P}-gcc44.patch
+	epatch "${FILESDIR}"/${P}-ldconfig.patch
 }
 
 src_compile() {