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

Package-Manager: portage-2.2_rc33/cvs/Linux i686

6 files changed, 70 insertions, 51 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/Manifest b/dev-libs/tvision/Manifest
index 58d9e0a64bc4..f27d72690be8 100644
--- a/dev-libs/tvision/Manifest
+++ b/dev-libs/tvision/Manifest
@@ -1,11 +1,21 @@
-AUX tvision-2.1.0_pre1-gcc41.patch 1158 RMD160 fccfc47e6eda64dcc5437d8c4c5100ad179fe0f3 SHA1 c9ae33bf012197765519b1374739b2cc9f65b180 SHA256 bd90ca3e6e0dbfa656c605f31e274d3aec03f08feb8c96428b2665c3698f9ff9
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX tvision-2.1.0_pre2-asneeded.patch 1908 RMD160 68717afca8d429e28affa47bdaea56eec6e1a6da SHA1 68dd11db66f31c608fd9a9e279a6a0633c58430f SHA256 122c7418b699850c96264def2f1d06970fa741a9b5b95e5fb3a6279debf9f275
 AUX tvision-2.1.0_pre2-gcc41.patch 265 RMD160 019f11f30b1c05d1db25047bf57f260755562873 SHA1 20d7858ef1f78c8664db763410f1be76a728bf41 SHA256 793a9468a9dfaa6f5361c840fd251dc8b3b021af3a8d30b3c2468dc63c3d99f8
+AUX tvision-2.1.0_pre2-gcc44.patch 438 RMD160 b7bf2cdf8864b100f31db2bbbfde075f917f55a6 SHA1 4c7f1f770ce5d192562f5e2fb0af30778e330d1f SHA256 d9eff264614455977f57c01f1a7ba910e7cb52b01fc3006af2cfad8bd3e8616c
+AUX tvision-2.1.0_pre2-ldconfig.patch 522 RMD160 b0d28e6df875a3cd0dc1d9d675e4ded243a30b88 SHA1 b1bdda17fe43c756e2ffddbc52c4c437d65e5cc1 SHA256 d4e49210ec46268e0dbcfaa50a37cd1148b2a51a9f56ae80e25ce6ff9543ce3e
 AUX tvision-2.1.0_pre2-outb.patch 954 RMD160 08ac4d75b9549179182a5e8334a402d7f9627451 SHA1 16bcabf554ca776b81fec550133ec3faf639e708 SHA256 37f615cbd8921425cad25c3762258de5f6f2e928cf29664ddb932e4b7a769fd6
 AUX tvision-2.1.0_pre2-underflow.patch 279 RMD160 8c58f17ad1a54137995b986c449506885085b3ef SHA1 9e1aa9234255b5acf94331c603b7e944816551bb SHA256 17c559af76e266d9571bc3f811922ab2a15935b0f0213b03a7f2f12862506a9e
-DIST rhtvision_2.1.0-1.tar.gz 1088801 RMD160 f1bf444f9471c028feeffedb41b06174d25570ee SHA1 884ec2019a3794a03a9944c50d9e323e9f6f112c SHA256 e479fa8bd3a4a600ad4f3b3d9785f834f888d45d61c1e34722bf1a41420aaf1a
 DIST rhtvision_2.1.0-2.tar.gz 1590449 RMD160 e1b27322a9b75e20d13682e4895e05cf369e3017 SHA1 01f56f5158dd0469ef3e9341cc4a076501192443 SHA256 fef19d839069dea2cd5459f24a190883a3b2b600a60d6f7823f456d8e6889412
-EBUILD tvision-2.1.0_pre1.ebuild 845 RMD160 287bacc551b1aea0ec8ea829f6bfc087f380a38c SHA1 c3207eee8d961f3d65bced556a8df3e43954ff3a SHA256 6f1f0d88e2680dcd7e8abeece7037cda230d0e145256f6d26095792798a0fa37
 EBUILD tvision-2.1.0_pre2-r1.ebuild 968 RMD160 4da6c6fe89b431f84a304618f552a30b3d054a07 SHA1 4fe8edbf19f7ff6b43c1f140f4f970d3ee1754be SHA256 25b5d8db0da9da4e8b5788416cf1064e3bc3514cf304518ead07f409c092e13c
-MISC ChangeLog 3353 RMD160 e31f8a293e5a6632018c6c0b57d19ee49777690a SHA1 e53ce9036a9994d6d27d022a915438b57c098e85 SHA256 c5efc4540a000493c7edb7739cb38ac6bc90d95961ab1e19eedf1de29e9d797f
+EBUILD tvision-2.1.0_pre2-r2.ebuild 1052 RMD160 f37b6c00f16b3d38720a2f46173192a6509f3ed9 SHA1 8af3429695adef396eeea20d0cbc7d207fe58f31 SHA256 4cecac0954756ad433480131545b11721986c8fd257973a69f6f133639624661
+MISC ChangeLog 3758 RMD160 9f1b95eb7c25ca6507bf04f7c695851bac49d4fa SHA1 4aed7e8d41cdca03df159cdcf60e03e008e0afc5 SHA256 662f4379416767b42a8b74e47556b43ccae7e913e192b4d07af735e0a9d89b4a
 MISC metadata.xml 250 RMD160 61af8ec7e1bf9941d107eff4cc6a639874a6f198 SHA1 7ea68a3bd071637e4a49b61b2f7e35f3277545ef SHA256 aec181c304bce77cce8f1dc110e0203bc06b7c524ab40b1aac19a6f72aefdfde
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.12 (GNU/Linux)
+
+iEYEARECAAYFAkpPqtYACgkQwnQyISwouHwc5ACgwTSGWEB3rW/xJ5sEwZW6/I0m
+OIIAoI3ShCHmMCKgochMWgsJRNgVwuqh
+=DLug
+-----END PGP SIGNATURE-----
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() {