gcc3 fixes

11 files changed, 345 insertions, 488 deletions

diff --git a/dev-util/rhide/ChangeLog b/dev-util/rhide/ChangeLog
index 026fbb9d8b0d..5526bbacd686 100644
--- a/dev-util/rhide/ChangeLog
+++ b/dev-util/rhide/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-util/rhide
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/dev-util/rhide/ChangeLog,v 1.3 2002/08/21 12:23:34 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/rhide/ChangeLog,v 1.4 2002/09/22 07:14:06 azarah Exp $
+
+*rhide-1.5_pre-r1 (22 Sep 2002)
+
+  22 Sep 2002; Martin Schlemmer <azarah@gentoo.org> rhide-1.5_pre-r1 :
+
+  Update snapshot.  Patch to work with gdb-5.2.1.  Patch tvision to compile
+  with gcc-3.1 and later.
 
   21 Aug 2002; Martin Schlemmer <azarah@gentoo.org> rhide-1.5_pre :
 
diff --git a/dev-util/rhide/files/digest-rhide-1.4.9-r1 b/dev-util/rhide/files/digest-rhide-1.4.9-r1
deleted file mode 100644
index df7ab642653b..000000000000
--- a/dev-util/rhide/files/digest-rhide-1.4.9-r1
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 a7a48298b60b0e9da62c447a2f08f30c rhide-1.4.9.tar.gz 860812
-MD5 3557caa365500399a586094dcee6a971 rhtvision-1.1.3b.src.tar.gz 766465
-MD5 90e90f330eb38c6f7a580be94d18b79d setedit-0.4.41.tar.gz 1110097
-MD5 9511b69b6b5a3b38c62ad207b3c94673 gdb-5.0.tar.gz 12299318
diff --git a/dev-util/rhide/files/digest-rhide-1.5_pre b/dev-util/rhide/files/digest-rhide-1.5_pre-r1
index 3a3ee014f090..17c763d817a1 100644
--- a/dev-util/rhide/files/digest-rhide-1.5_pre
+++ b/dev-util/rhide/files/digest-rhide-1.5_pre-r1
@@ -1,4 +1,4 @@
-MD5 3cb1bae57fbcf698c77ba1397c8a4928 rhide-1.5pre-20020726.tar.gz 968298
+MD5 29b77ba1bb28825746c782c85fb3ba9a rhide-1.5pre-20020825.tar.gz 997704
 MD5 26a3040fc6adf966718bbef0be593f56 rhtvision-1.1.4.src.tar.gz 777576
 MD5 649cce68ea455ae4555a99a688864d36 setedit-0.4.57.tar.gz 1629956
-MD5 afb7d18f72be812ef405f6b271a36e03 gdb-5.2.tar.gz 14695979
+MD5 e9766842f1bbc6c2353de1410d8c0de0 gdb-5.2.1.tar.gz 14715792
diff --git a/dev-util/rhide/files/rhide-1.4.9-makefile.diff b/dev-util/rhide/files/rhide-1.4.9-makefile.diff
deleted file mode 100644
index 6fcd5279d2e3..000000000000
--- a/dev-util/rhide/files/rhide-1.4.9-makefile.diff
+++ /dev/null
@@ -1,47 +0,0 @@
---- makefile.src.orig	Fri Oct 26 01:57:35 2001
-+++ makefile.src	Fri Oct 26 01:57:46 2001
-@@ -191,8 +191,8 @@
- 	   -o -name "$(name)") -print)

- endif

- 

--mark.copyright: $(copyrite.exe)

--	$(copyrite.exe) $(Markfiles)

-+mark.copyright: $(copyrite_exe)

-+	$(./copyrite_exe) $(Markfiles)

- 

- _languages.src: $(addsuffix .po,$(LANGUAGES))

- 

---- common.mak.orig	Mon Sep  3 12:36:41 2001
-+++ common.mak	Fri Oct 26 01:52:40 2001
-@@ -126,8 +126,8 @@
- update_src_file=echo
- update_gpr_file=echo
- 
--ifeq ($(copyrite.exe),)
--export copyrite.exe:=$(top_obj_dir)/copyrite.exe
-+ifeq ($(copyrite_exe),)
-+export copyrite_exe:=$(top_obj_dir)/copyrite_exe
- endif
- 
- ifneq ($(strip $(rhide_OS)),DJGPP)
-@@ -264,10 +264,10 @@
- 	  check_src_files
- 
- ifneq ($(strip $(gpr2mak)),)
--%.mak: %.gpr $(copyrite.exe)
-+%.mak: %.gpr $(copyrite_exe)
- 	@$(update_gpr_file) $(notdir $<) > /dev/null
- 	@$(gpr2mak) -d -r- -o - $(notdir $<) > __tmp__.mak
--	@$(copyrite.exe) __tmp__.mak > /dev/null
-+	@$(copyrite_exe) __tmp__.mak > /dev/null
- 	@$(move-if-change) __tmp__.mak $@ > /dev/null
- 	@touch -r $@ $(notdir $<)
- 	@rm -f __tmp__.mak
-@@ -346,6 +346,6 @@
- 
- install:: all install.data install.info install.doc install.bin
- 
--$(copyrite.exe):: $(RHIDESRC)/copyrite.c
-+$(copyrite_exe):: $(RHIDESRC)/copyrite.c
- 	gcc -o $@ -s -O $<
- 
diff --git a/dev-util/rhide/files/rhide-1.5_pre-gdb521-IS_FP_REGNUM.patch b/dev-util/rhide/files/rhide-1.5_pre-gdb521-IS_FP_REGNUM.patch
new file mode 100644
index 000000000000..4049a5e73d77
--- /dev/null
+++ b/dev-util/rhide/files/rhide-1.5_pre-gdb521-IS_FP_REGNUM.patch
@@ -0,0 +1,22 @@
+--- rhide-1.5pre-20020825/librhgdb/regs.c.orig	Mon Aug 26 02:20:10 2002
++++ rhide-1.5pre-20020825/librhgdb/regs.c	Tue Aug 27 18:37:38 2002
+@@ -4,6 +4,10 @@
+ #include <librhgdb.h>
+ #include <rhgdbint.h>
+ 
++#ifndef FP_REGNUM_P
++# define FP_REGNUM_P(n)	(FP0_REGNUM <= (n) && (n) < (FP0_REGNUM + 8))
++#endif
++
+ int
+ register_count()
+ {
+@@ -13,7 +17,7 @@
+ int
+ is_float_reg(int num)
+ {
+-  return IS_FP_REGNUM(num);
++  return FP_REGNUM_P(num);
+ }
+ 
+ const char *
diff --git a/dev-util/rhide/files/rhide-1.5_pre-gdb521-REGISTER_NAMES.patch b/dev-util/rhide/files/rhide-1.5_pre-gdb521-REGISTER_NAMES.patch
new file mode 100644
index 000000000000..26ba47bcc592
--- /dev/null
+++ b/dev-util/rhide/files/rhide-1.5_pre-gdb521-REGISTER_NAMES.patch
@@ -0,0 +1,16 @@
+--- rhide-1.5pre-20020825/librhgdb/regs.c.orig	Mon Aug 26 01:54:34 2002
++++ rhide-1.5pre-20020825/librhgdb/regs.c	Mon Aug 26 02:04:38 2002
+@@ -16,12 +16,10 @@
+   return IS_FP_REGNUM(num);
+ }
+ 
+-static char *register_names[] = REGISTER_NAMES;
+-
+ const char *
+ register_name(int num)
+ {
+-  return register_names[num];
++  return REGISTER_NAME(num);
+ }
+ 
+ unsigned long
diff --git a/dev-util/rhide/files/setedit-0.4.41.diff b/dev-util/rhide/files/setedit-0.4.41.diff
deleted file mode 100644
index d1b3d5a48853..000000000000
--- a/dev-util/rhide/files/setedit-0.4.41.diff
+++ /dev/null
@@ -1,230 +0,0 @@
-diff -uN --recursive setedit/include/ced_clas.h setedit.new/include/ced_clas.h
---- setedit/include/ced_clas.h	Sat Oct 30 15:58:58 1999
-+++ setedit.new/include/ced_clas.h	Thu Oct 25 20:37:20 2001
-@@ -261,9 +261,9 @@
-     static unsigned editorFlags;
-     static unsigned fromFlags;
-     static unsigned whereFlags;
--    static char near findStr[maxFindStrLen];
--    static char near replaceStr[maxReplaceStrLen];
--    static TCEditor * near clipboard;
-+    static char findStr[maxFindStrLen];
-+    static char replaceStr[maxReplaceStrLen];
-+    static TCEditor * clipboard;
-     static TCommandSet cmdsAux;     // This is used to quickly enable/disable all the
-                                     // editor commands when it get/releases the focus
-     uchar lockCount;
-@@ -590,8 +590,8 @@
- 
- private:
- 
--    static const char * near clipboardTitle;
--    static const char * near untitled;
-+    static const char * clipboardTitle;
-+    static const char * untitled;
- 
-     SetDefStreamMembersNoConst(TCEditWindow)
- };
-diff -uN --recursive setedit/include/ceditint.h setedit.new/include/ceditint.h
---- setedit/include/ceditint.h	Sun Sep 26 22:27:24 1999
-+++ setedit.new/include/ceditint.h	Thu Oct 25 21:31:02 2001
-@@ -6,6 +6,8 @@
- // International support from TV
- #include <intl.h>
- 
-+#include <ucdefs.h>
-+
- #ifndef HAVE_INTL_SUPPORT
- #define NO_INTL_SUP
- #endif
-@@ -44,7 +46,7 @@
- 
- // PCRE support
- #if defined(HAVE_PCRE_LIB)
--#define SUP_PCRE
-+#define SUP_PCRE
- #endif
- 
- #ifdef HAVE_PCRE206
-diff -uN --recursive setedit/infview/inf.cc setedit.new/infview/inf.cc
---- setedit/infview/inf.cc	Mon Oct 18 00:34:49 1999
-+++ setedit.new/infview/inf.cc	Thu Oct 25 20:37:20 2001
-@@ -206,6 +206,7 @@
- #define Uses_TSOSSortedListBox
- #include <inf.h>
- 
-+#include <ucdefs.h>
- #include <ctype.h>
- 
- #ifndef Linux
-diff -uN --recursive setedit/infview/infbase.cc setedit.new/infview/infbase.cc
---- setedit/infview/infbase.cc	Sun Dec 19 16:35:11 1999
-+++ setedit.new/infview/infbase.cc	Thu Oct 25 21:36:10 2001
-@@ -1596,15 +1596,13 @@
- }
- 
- #ifndef __DJGPP__
--extern "C" long __filelength(int fhandle);
--/* Allready defined in bc.cc of TVision for non-djgpp platforms
- long filelength(int fhandle)
- {
-  long p=lseek (fhandle,0,SEEK_CUR); // They doesn't have tell!!!
-  long ret=lseek(fhandle,0,SEEK_END);
-  lseek(fhandle,p,SEEK_SET);
-  return ret;
--}*/
-+}
- #endif
- 
- FILE *TInfFile::fOpen(char *Nombre)
-diff -uN --recursive setedit/infview/manview.cc setedit.new/infview/manview.cc
---- setedit/infview/manview.cc	Wed Sep 29 00:50:25 1999
-+++ setedit.new/infview/manview.cc	Thu Oct 25 20:37:20 2001
-@@ -14,6 +14,7 @@
- #define Uses_TEvent
- 
- #include <tv.h>
-+#include <ucdefs.h>
- 
- #define Uses_TEnhancedText
- #define Uses_TManPageView
-diff -uN --recursive setedit/mainsrc/ceditor.cc setedit.new/mainsrc/ceditor.cc
---- setedit/mainsrc/ceditor.cc	Thu Dec 30 01:13:26 1999
-+++ setedit.new/mainsrc/ceditor.cc	Thu Oct 25 21:39:24 2001
-@@ -11580,6 +11580,9 @@
- }
- #endif
- 
-+#ifndef __DJGPP__
-+long filelength(int fhandle);
-+#endif
- 
- static
- FILE *ExpandToTempIfNeeded(FILE *f, char *&temp, char *name)
-diff -uN --recursive setedit/mainsrc/loaddefl.cc setedit.new/mainsrc/loaddefl.cc
---- setedit/mainsrc/loaddefl.cc	Sat Sep 25 17:49:06 1999
-+++ setedit.new/mainsrc/loaddefl.cc	Thu Oct 25 21:19:04 2001
-@@ -1,5 +1,6 @@
- #include <stdio.h>
- #include <string.h>
-+#include <ucdefs.h>
- 
- #define Uses_TSOSStringCollection
- #define Uses_TCEditor_External
-diff -uN --recursive setedit/mainsrc/loadfunc.cc setedit.new/mainsrc/loadfunc.cc
---- setedit/mainsrc/loadfunc.cc	Sun Feb 14 22:59:22 1999
-+++ setedit.new/mainsrc/loadfunc.cc	Thu Oct 25 21:19:28 2001
-@@ -6,6 +6,8 @@
- #include <stdio.h>
- #include <tv.h>
- 
-+#include <ucdefs.h>
-+
- #include <pathtool.h>
- 
- int isValidForFile(int c);
-diff -uN --recursive setedit/mainsrc/pmacros.cc setedit.new/mainsrc/pmacros.cc
---- setedit/mainsrc/pmacros.cc	Wed Sep  8 01:01:40 1999
-+++ setedit.new/mainsrc/pmacros.cc	Thu Oct 25 21:20:33 2001
-@@ -3,6 +3,7 @@
- #include <stdio.h>
- #include <string.h>
- #include <ctype.h>
-+#include <ucdefs.h>
- 
- #define Uses_TPMCollection
- #define Uses_MsgBox
-diff -uN --recursive setedit/setedit/edprj.cc setedit.new/setedit/edprj.cc
---- setedit/setedit/edprj.cc	Sun Jan  2 21:35:30 2000
-+++ setedit.new/setedit/edprj.cc	Thu Oct 25 21:39:40 2001
-@@ -649,7 +649,10 @@
-     LoadEditorDesktop(0);
- }
- 
--
-+#ifndef __DJGPP__
-+long filelength(int fhandle);
-+#endif
-+    
- // That's the interface with the SDG module.
- // These routines must provide the buffers with sources from the project
- 
-diff -uN --recursive setedit/setedit/loadcle.cc setedit.new/setedit/loadcle.cc
---- setedit/setedit/loadcle.cc	Sun Nov 21 23:26:09 1999
-+++ setedit.new/setedit/loadcle.cc	Thu Oct 25 21:18:36 2001
-@@ -2,15 +2,16 @@
-    see copyrigh file for details */
- #include <ceditint.h>
- #include <stdio.h>
-+#include <stdlib.h>
- #include <string.h>
- #include <ctype.h>
- 
- #define Uses_TStringCollection
- #include <tv.h>
- 
--#ifdef SUP_PCRE
-+#ifdef SUP_PCRE
- #include <pcre.h>
--#endif
-+#endif
- #include <dyncat.h>
- #include <loadcle.h>
- 
-@@ -337,7 +338,7 @@
-  buf[len]=0;
- }
- #else
--static pcre *PCRECompileRegEx(char *) {return 0;}
-+static pcre *PCRECompileRegEx(char *, int &) {return 0;}
- int CLEDoSearch(char *, int , pcre *) {return 0;}
- void CLEGetMatch(int , char *, int ) {}
- #endif
-diff -uN --recursive setedit/setedit/menuload.cc setedit.new/setedit/menuload.cc
---- setedit/setedit/menuload.cc	Tue Jul 27 01:51:28 1999
-+++ setedit.new/setedit/menuload.cc	Thu Oct 25 21:19:56 2001
-@@ -10,6 +10,7 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
-+#include <ucdefs.h>
- 
- #define Uses_TMenu
- #define Uses_TMenuItem
-diff -uN --recursive setedit/settvuti/tnocastc.cc setedit.new/settvuti/tnocastc.cc
---- setedit/settvuti/tnocastc.cc	Fri Dec  3 01:52:56 1999
-+++ setedit.new/settvuti/tnocastc.cc	Thu Oct 25 20:37:20 2001
-@@ -14,6 +14,7 @@
- #include <settvuti.h>
- 
- #include <ctype.h>
-+#include <ucdefs.h>
- 
- #define shiftKeys (char)(event.keyDown.shiftState & 0xFF)
-
-diff -uN --recursive setedit/sdg/txhgen.cc setedit.new/sdg/txhgen.cc
---- setedit/sdg/txhgen.cc.orig      Thu Oct 25 22:02:32 2001
-+++ setedit.new/sdg/txhgen.cc   Thu Oct 25 22:02:59 2001
-@@ -30,6 +30,7 @@
- #endif
- #include <stdlib.h>
- #include <unistd.h>
-+#include <ucdefs.h>
- 
- #define Uses_TNoCaseSOSStringCollection
- #define Uses_TNCSAssociative
-
-diff -uN --recursive setedit/mainsrc/loadshl.cc setedit.new/mainsrc/loadshl.cc
---- setedit/mainsrc/loadshl.cc	Fri Dec  3 01:52:38 1999
-+++ setedit.new/mainsrc/loadshl.cc	Fri Oct 26 01:47:32 2001
-@@ -1047,8 +1047,8 @@
- // Dummies
- static void PCREInitCompiler() {}
- static void PCREStopCompiler() {}
--static pcre *PCRECompileRegEx(char *) { return 0; }
--static int PCREDoSearch(char *, int , pcre *) {}
-+static pcre *PCRECompileRegEx(char *) { return 0; }
-+static int PCREDoSearch(char *, int , pcre *) { return 0; }
- #endif
- /********************** End Regular expressions file matching stuff *****************/
- 
diff --git a/dev-util/rhide/files/tvision-1.1.3b.diff b/dev-util/rhide/files/tvision-1.1.3b.diff
deleted file mode 100644
index 55259c175f8d..000000000000
--- a/dev-util/rhide/files/tvision-1.1.3b.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -uN --recursive tvision.orig/include/tv/ttypes.h tvision/include/tv/ttypes.h
---- tvision.orig/include/tv/ttypes.h	Thu Oct 25 23:04:17 2001
-+++ tvision/include/tv/ttypes.h	Thu Oct 25 23:05:10 2001
-@@ -6,6 +6,8 @@
- #if !defined( __TTYPES_H )
- #define __TTYPES_H
- 
-+#include <compatlayer.h>
-+
- const char EOS = '\0';
- 
- enum StreamableInit { streamableInit };
-
diff --git a/dev-util/rhide/files/tvision-1.1.4-gcc31-filebuf.patch b/dev-util/rhide/files/tvision-1.1.4-gcc31-filebuf.patch
new file mode 100644
index 000000000000..d4aa79b708c9
--- /dev/null
+++ b/dev-util/rhide/files/tvision-1.1.4-gcc31-filebuf.patch
@@ -0,0 +1,214 @@
+--- classes/fpbase.cc	Tue Oct  9 19:05:52 2001
++++ tvision/classes/fpbase.cc	Thu Jun  6 21:30:20 2002
+@@ -22,7 +22,7 @@
+ 
+ fpbase::fpbase()
+ {
+- buf=new filebuf();
++ buf=new CLY_filebuf();
+  pstream::init(buf);
+ }
+ 
+@@ -34,7 +34,7 @@
+ 
+ fpbase::fpbase( const char *name, CLY_OpenModeT omode, int prot )
+ {
+- buf=new filebuf();
++ buf=new CLY_filebuf();
+  open(name,omode,prot);
+  pstream::init(buf);
+ }
+@@ -94,3 +94,50 @@
+  return buf;
+ }
+ 
++#ifdef CLY_DefineSpecialFileBuf
++// gcc 3.1 specific
++CLY_filebuf *CLY_filebuf::open(FILE *f, ios_base::openmode mode)
++{
++ CLY_filebuf *ret=NULL;
++ if (!this->is_open())
++   {
++    _M_file.sys_open(f,mode);
++    if (this->is_open())
++      {
++       _M_allocate_internal_buffer();
++       _M_mode=mode;
++       
++       // For time being, set both (in/out) sets  of pointers.
++       _M_set_indeterminate();
++       if ((mode & ios_base::ate) &&
++           this->seekoff(0,ios_base::end,mode)<0)
++          this->close();
++       ret=this;
++      }
++   }
++ return ret;
++}
++
++CLY_filebuf *CLY_filebuf::open(int h, ios_base::openmode mode)
++{
++ CLY_filebuf *ret=NULL;
++ if (!this->is_open())
++   {
++    _M_file.sys_open(h,mode,false);
++    if (this->is_open())
++      {
++       _M_allocate_internal_buffer();
++       _M_mode=mode;
++       
++       // For time being, set both (in/out) sets  of pointers.
++       _M_set_indeterminate();
++       if ((mode & ios_base::ate) &&
++           this->seekoff(0,ios_base::end,mode)<0)
++          this->close();
++       ret=this;
++      }
++   }
++ return ret;
++}
++#endif // CLY_DefineSpecialFileBuf
++
+--- include/tv/fpbase.h	Tue Oct  9 19:06:00 2001
++++ tvision/include/tv/fpbase.h	Thu Jun  6 21:30:20 2002
+@@ -13,6 +13,11 @@
+ and not a filebuf. This is much more convenient to make the code
+ compilable with gcc 3.x without breaking compatibility.
+ 
++SET: Added a filebuf wrapper to get access to protected members needed
++to open associate a filebuf with a C stream/file handle. Andris proposed
++this idea. This is needed for gcc 3.1 and we don't know how long this
++trick will be used.
++
+  *
+  *
+  */
+@@ -28,6 +33,23 @@
+ #if defined( Uses_fpbase ) && !defined( __fpbase )
+ #define __fpbase
+ 
++#ifdef CLY_DefineSpecialFileBuf
++class CLY_filebuf: public std::filebuf
++{
++public:
++ CLY_filebuf() : std::filebuf() {};
++ CLY_filebuf(FILE *f, std::ios_base::openmode mode)
++   { open(f,mode); };
++ CLY_filebuf(int h, std::ios_base::openmode mode)
++   { open(h,mode); };
++
++ CLY_filebuf *open(FILE *f, std::ios_base::openmode);
++ CLY_filebuf *open(int h, std::ios_base::openmode);
++ std::filebuf *open(const char *file, std::ios_base::openmode mode)
++   { return std::filebuf::open(file,mode); };
++};
++#endif
++
+ class fpbase : virtual public pstream
+ {
+ 
+@@ -49,7 +71,7 @@
+ 
+ private:
+ 
+-    CLY_std(filebuf) *buf;
++    CLY_filebuf *buf;
+ 
+ };
+ 
+--- include/compatlayer.h	Wed Feb  6 15:35:38 2002
++++ tvision/include/compatlayer.h	Mon Jun 24 16:54:15 2002
+@@ -117,6 +117,7 @@
+ #undef DIRSEPARATOR
+ #undef DIRSEPARATOR_
+ #undef CLY_ISOCpp98
++#undef CLY_filebuf
+ #undef CLY_OpenModeT
+ #undef CLY_StreamPosT
+ #undef CLY_StreamOffT
+@@ -133,6 +134,7 @@
+ #undef CreateStrStream
+ #undef GetStrStream
+ #undef UsingNamespaceStd
++#undef CLY_HiddenDifferent
+ 
+ #ifdef TVComp_GCC
+ /* GNU C is supported for various OSs: */
+@@ -225,6 +231,15 @@
+     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
++  // gcc 3.1 needs a special filebuf
++  #if __GNUC_MINOR__<1
++   #define CLY_filebuf       std::filebuf
++   #define CLY_NewFBFromFD(f) new CLY_filebuf(fdopen(f,"rb+"),ios::in|ios::out|ios::binary)
++  #else
++   #undef  CLY_DefineSpecialFileBuf
++   #define CLY_DefineSpecialFileBuf 1
++   #define CLY_NewFBFromFD(f) new CLY_filebuf(f,ios::in|ios::out|ios::binary)
++  #endif
+   #define CLY_ISOCpp98 1
+   #define CLY_OpenModeT      std::ios::openmode
+   #define CLY_StreamPosT     std::streampos
+@@ -246,7 +242,9 @@
+   #define CLY_StreamOffT     std::streamoff
+   #define CLY_IOSSeekDir     std::ios::seekdir
+   #define CLY_FBOpenProtDef  0
+-  #define CLY_NewFBFromFD(f) new filebuf(fdopen(f,"rb+"),ios::in|ios::out|ios::binary)
++  #ifndef CLY_NewFBFromFD
++   #define CLY_NewFBFromFD(f) new filebuf(fdopen(f,"rb+"),ios::in|ios::out|ios::binary)
++  #endif
+   #define CLY_PubSetBuf(a,b) pubsetbuf(a,b)
+   #define CLY_FBOpen(a,b,c)  open(a,b)
+   #define CLY_IOSBin         std::ios::binary
+@@ -252,6 +266,7 @@
+   #undef  IOSTREAM_HEADER
+   #define IOSTREAM_HEADER <iostream>
+  #else
++  #define CLY_filebuf        filebuf
+   #define CLY_OpenModeT      int
+   #define CLY_StreamPosT     streampos
+   #define CLY_StreamOffT     streamoff
+@@ -272,7 +271,9 @@
+   #define CLY_StreamOffT     streamoff
+   #define CLY_IOSSeekDir     ios::seek_dir
+   #define CLY_FBOpenProtDef  filebuf::openprot
+-  #define CLY_NewFBFromFD(f) new filebuf(f)
++  #ifndef CLY_NewFBFromFD
++   #define CLY_NewFBFromFD(f) new filebuf(f)
++  #endif
+   #define CLY_PubSetBuf(a,b) setbuf(a,b)
+   #define CLY_HaveFBAttach   1
+   # CLY_FBOpen(a,b,c)  open(a,b,c)
+@@ -373,6 +388,7 @@
+ 
+  /* Win32/Cygwin -- OH! */
+  #ifdef TVCompf_Cygwin
++  #define CLY_HiddenDifferent 1
+   #define CLY_Have_UGID 1
+   #undef  FA_ARCH
+   #undef  FA_DIREC
+@@ -525,6 +543,7 @@
+  /* Common to all UNIX systems */
+  #ifdef TVOS_UNIX
+   /* Filesystem */
++  #define CLY_HiddenDifferent 1
+   #define CLY_Have_UGID 1
+   #undef  FA_ARCH
+   #undef  FA_DIREC
+@@ -830,6 +849,7 @@
+   #define Uses_CLY_IfStreamGetLine 1
+  #endif
+ 
++ #define CLY_filebuf        filebuf
+  #define CLY_OpenModeT      int
+  #define CLY_StreamPosT     streampos
+  #define CLY_StreamOffT     streamoff
+@@ -1040,6 +1076,7 @@
+  #define IfStreamGetLine(istream,buffer,size) \
+          istream.getline(buffer,size)
+ 
++ #define CLY_filebuf        filebuf
+  #define CLY_OpenModeT      int
+  #define CLY_StreamPosT     streampos
+  #define CLY_StreamOffT     streamoff
diff --git a/dev-util/rhide/rhide-1.4.9-r1.ebuild b/dev-util/rhide/rhide-1.4.9-r1.ebuild
deleted file mode 100644
index c44190991f88..000000000000
--- a/dev-util/rhide/rhide-1.4.9-r1.ebuild
+++ /dev/null
@@ -1,162 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/rhide/rhide-1.4.9-r1.ebuild,v 1.5 2002/08/16 04:04:42 murphy Exp $
-
-TVISIONVER="1.1.3b"
-SETEDITVER="0.4.41"
-# RHIDE is _very_ picky about the GDB used, so dont put GDB in DEPEND
-GDBVER="5.0"
-
-S=${WORKDIR}/${P}
-DESCRIPTION="RHIDE is a console IDE for various languages."
-SRC_URI="http://download.sourceforge.net/rhide/${P}.tar.gz
-	 http://download.sourceforge.net/setedit/rhtvision-${TVISIONVER}.src.tar.gz
-	 http://download.sourceforge.net/setedit/setedit-${SETEDITVER}.tar.gz
-	 ftp://ftp.gnu.org/gnu/gdb/gdb-${GDBVER}.tar.gz"
-HOMEPAGE="http://www.rhide.com/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 sparc sparc64"
-
-# Ugly I know, but the build fails if teTeX not installed
-DEPEND="dev-libs/libpcre
-	sys-apps/texinfo
-	sys-devel/gettext
-	sys-libs/gpm
-	sys-libs/zlib
-	app-text/tetex"
-
-
-src_unpack() {
-
-	unpack ${A}
-
-	cd ${S}/../tvision/
-	patch -p1 <${FILESDIR}/tvision-${TVISIONVER}.diff || die
-
-	cd ${S}/../setedit/
-	patch -p1 <${FILESDIR}/setedit-${SETEDITVER}.diff || die
-
-	cd ${S}
-	patch <${FILESDIR}/rhide-1.4.9-makefile.diff || die
-}
-
-src_compile() {
-
-	# Most of these use a _very_ lame build system,
-	# so please no comments ;/
-
-# ************* TVision *************
-
-	cd ${WORKDIR}/tvision/
-
-	DUMMYFLAGS=""
-
-	./configure --prefix=/usr \
-		--fhs \
-		--cflags='${DUMMYFLAGS}' \
-		--cxxflags='${DUMMYFLAGS}' || die
-	
-	# Only build the static libs
-	cp Makefile Makefile.orig
-	sed -e 's/all: static-lib dynamic-lib/all: static-lib/'	\
-		Makefile.orig >Makefile
-
-	# -j breaks build
-	make || die
-
-	# Fix include problem
-	cp ${WORKDIR}/tvision/include/tv/* ${WORKDIR}/tvision/include
-	
-
-# ************* SetEdit *************
-
-	cd ${WORKDIR}/setedit/
-
-	./configure --prefix=/usr \
-		--fhs \
-		--libset || die
-
-	# Fix CFLAGS and CXXFLAGS
-	cd ${WORKDIR}/setedit/makes
-	cp rhide.env rhide.env.orig
-	sed -e "s:${CFLAGS}::g" \
-		-e "s:${CXXFLAGS}::g" \
-		rhide.env.orig >rhide.env
-	make clean || die
-	make force-patch || die
-	cd ${WORKDIR}/setedit/
-
-	# -j breaks build
-	make || die
-
-	# Make the docs
-	cd ${WORKDIR}/setedit/doc
-	make || die
-
-
-# ************* RHIDE ***************
-
-	cd ${S}
-
-	# Fix CXXFLAGS
-	cp rhide.mak rhide.mak.orig
-	sed -e 's:-O2:$(CXXFLAGS):' rhide.mak.orig >rhide.mak
-	cp rhide_.mak rhide_.mak.orig
-	sed -e 's:-O2:$(CXXFLAGS):' rhide_.mak.orig >rhide_.mak
-	cp gpr2mak.mak gpr2mak.mak.orig
-	sed -e 's:-O2:$(CXXFLAGS):' gpr2mak.mak.orig >gpr2mak.mak
-	cp gprexp.mak gprexp.mak.orig
-	sed -e 's:-O2:$(CXXFLAGS):' gprexp.mak.orig >gprexp.mak
-
-	export RHIDESRC="`pwd`"
-	export SETSRC="${RHIDESRC}/../setedit"
-	export SETOBJ="${RHIDESRC}/../setedit/makes"
-	export TVSRC="${RHIDESRC}/../tvision"
-	export TVOBJ="${RHIDESRC}/../tvision/linux"
-
-	# -j breaks build
-	make prefix=/usr \
-		install_docdir=share/doc/${PF} \
-		install_infodir=share/info \
-		|| die
-
-	# Update and Fix DIR entry in .info files
-	cd ${S}/share/setedit/
-	sed -e 's:editor.inf:setedit.inf:g' \
-		${WORKDIR}/setedit/doc/editor.inf > \
-		setedit.inf || die
-	sed -e	's:infeng.inf:infview.inf:g' \
-		${WORKDIR}/setedit/doc/infeng.inf > \
-		infview.inf || die
-	cd ${S}
-
-	# Update setedit macro's
-	cp -f ${WORKDIR}/setedit/cfgfiles/*.pmc ${S}/share/setedit
-}
-
-src_install() {
-
-	make prefix=${D}/usr \
-		install_docdir=share/doc/${PF} \
-		install_infodir=share/info \
-		install || die
-
-	# Fix .info files
-	for file in ${D}/usr/share/info/*.inf ; do
-		mv ${file} ${file}o
-	done
-
-	doman ${WORKDIR}/setedit/doc/{infview.1,setedit.1}
-
-	# Install default CFG file and fix the paths
-	cd ${D}/usr/share/rhide
-	sed -e 's:/usr/local/share:/usr/share:g' \
-		rhide_.env >rhide.env
-	echo 'INFOPATH=/usr/share/info' >> rhide.env
-
-	# Install env file
-	insinto /etc/env.d
-	doins ${FILESDIR}/80rhide
-}
diff --git a/dev-util/rhide/rhide-1.5_pre.ebuild b/dev-util/rhide/rhide-1.5_pre-r1.ebuild
index 9b697cdfc39e..3dafd3a6a233 100644
--- a/dev-util/rhide/rhide-1.5_pre.ebuild
+++ b/dev-util/rhide/rhide-1.5_pre-r1.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/dev-util/rhide/rhide-1.5_pre.ebuild,v 1.3 2002/08/21 22:42:48 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/rhide/rhide-1.5_pre-r1.ebuild,v 1.1 2002/09/22 07:14:06 azarah Exp $
 
-SNAPSHOT="20020726"
+SNAPSHOT="20020825"
 TVISIONVER="1.1.4"
 SETEDITVER="0.4.57"
 # RHIDE is _very_ picky about the GDB used, so dont put GDB in DEPEND
-GDBVER="5.2"
+GDBVER="5.2.1"
 
 DESCRIPTION="RHIDE is a console IDE for various languages."
 if [ -z "${SNAPSHOT}" ] ; then
@@ -14,7 +14,8 @@ if [ -z "${SNAPSHOT}" ] ; then
 	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 else
 	S="${WORKDIR}/${P/_}-${SNAPSHOT}"
-	SRC_URI="http://rhide.sourceforge.net/snapshots/${P/_}-${SNAPSHOT}.tar.gz"
+	SRC_URI="http://rhide.sourceforge.net/snapshots/${P/_}-${SNAPSHOT}.tar.gz
+		mirror://gentoo/${P/_}-${SNAPSHOT}.tar.gz"
 fi
 SRC_URI="${SRC_URI}
 	mirror://sourceforge/setedit/rhtvision-${TVISIONVER}.src.tar.gz
@@ -27,19 +28,38 @@ LICENSE="GPL-2"
 KEYWORDS="x86"
 
 DEPEND="virtual/glibc
-	app-text/recode
-	dev-libs/libpcre
-	sys-apps/bzip2
-	sys-apps/texinfo
-	sys-devel/gettext
-	sys-libs/gpm
-	sys-libs/zlib"
-#	app-text/tetex"
+	app-text/tetex
+	>=app-text/recode-3.6
+	>=dev-libs/libpcre-2.0.6
+	>=sys-apps/bzip2-1.0.1
+	>=sys-apps/texinfo-4.1
+	>=sys-devel/gettext-0.11.0
+	>=sys-devel/perl-5.6
+	>=sys-libs/zlib-1.1.4
+	>=sys-libs/gpm-1.20.0
+	>=sys-libs/ncurses-5.2
+	X? ( virtual/x11 )"
 
 RDEPEND="${DEPEND}
 	X? ( x11-terms/eterm )"
 
 
+src_unpack() {
+	
+	unpack ${A}
+
+	cd ${S}
+	# Get it to compile with gdb-5.2.1
+	# <azarah@gentoo.org> (22 Sep 2002)
+	patch -p1 < ${FILESDIR}/${P}-gdb521-IS_FP_REGNUM.patch || die
+	patch -p1 < ${FILESDIR}/${P}-gdb521-REGISTER_NAMES.patch || die
+
+	cd ${WORKDIR}/tvision
+	# Get tvision-1.1.4 to compile with gcc-3.1 or later
+	# <azarah@gentoo.org> (22 Sep 2002)
+	patch -p1 < ${FILESDIR}/tvision-1.1.4-gcc31-filebuf.patch || die
+}
+
 src_compile() {
 	
 	# Most of these use a _very_ weird build systems,
@@ -57,9 +77,7 @@ src_compile() {
 		--cxxflags='${DUMMYFLAGS}' || die
 	
 	# Only build the static libs
-	cp Makefile Makefile.orig
-	sed -e 's/all: static-lib dynamic-lib/all: static-lib/'	\
-		Makefile.orig >Makefile
+	perl -pi -e 's/all: static-lib dynamic-lib/all: static-lib/' Makefile
 	
 	# -j breaks build
 	make || die
@@ -84,19 +102,26 @@ src_compile() {
 # ************* RHIDE ***************
 	
 	cd ${S}
+
+	addpredict "/usr/share/rhide"
+
+	# Update snapshot version
+	if [ -n "${SNAPSHOT}" ]
+	then
+		perl -pi -e "s|1998-11-29|${SNAPSHOT}|" ${S}/idemain.cc
+	fi
 	
 	# Fix invalid "-O2" in CFLAGS and CXXFLAGS
-	cp configure configure.orig
-	sed -e 's:CFLAGS="-g -O2":CFLAGS="-g":' \
-	    -e 's:CFLAGS="-O2":CFLAGS="":' \
-	    configure.orig > configure
-	cp libgdb/makefile.src libgdb/makefile.src.orig
-	sed -e 's:-O2::g' libgdb/makefile.src.orig > \
-		libgdb/makefile.src
+	for x in configure $(find . -name '*.mak') $(find . -name 'makefile.src')
+	do
+		if [ -f ${x} ]
+		then
+			perl -pi -e 's:-O2::g' ${x}
+		fi
+	done
 
 	# Fix a dependency due to a broken .mak file
-	cp rh_comm.mak rh_comm.mak.orig
-	sed -e 's:../../../../::g' rh_comm.mak.orig > rh_comm.mak
+	perl -pi -e 's:../../../../::g' rh_comm.mak
 
 	export RHIDESRC="${S}"
 	export SETSRC="${WORKDIR}/setedit"
@@ -107,14 +132,36 @@ src_compile() {
 
 	econf || die
 	
+	#
+	# *** DETECT XFREE86 with tvision-2.0 ***
+	#
+	# None of these packages have any way to specify XFree86 support,
+	# thus we check if tvision compiled with xfree support or not.
+	#
+	# If it did compile with xfree support, we need to get rhide to link
+	# against libX11 ...
+	#
+	local myLDFLAGS=""
+	local have_xfree="$(gawk '/HAVE_X11/ { if (/yes/) print "Have XFree86" }' \
+	                    ${WORKDIR}/tvision/configure.cache)"
+
+	if [ "${have_xfree}" = "Have XFree86" ]
+	then
+		einfo "Compiling with XFree86 support..."
+		myLDFLAGS="-L/usr/X11R6/lib -lX11"
+	else
+		einfo "Compiling without XFree86 support..."
+	fi
+	#
+	# *** DETECT XFREE86 ***
+	#
+		
+	# -j breaks build
 	make prefix=/usr \
 		install_docdir=share/doc/${PF} \
 		install_infodir=share/info \
-		|| die
+		LDFLAGS="${LDFLAGS} ${myLDFLAGS}" || die
 	
-	# -j breaks build
-	make || die
-
 	# Update and Fix DIR entry in .info files
 	cd ${S}/share/setedit/
 	sed -e 's:editor.inf:setedit.info:g' \
@@ -128,6 +175,10 @@ src_compile() {
 }
 
 src_install() {
+
+	# Dont error out on sandbox violations.  I should really
+	# try to track this down, but its a bit tougher than usually.
+	addpredict "/:/usr/share/rhide:/libide:/libtvuti:/librhuti"
 	
 	make prefix=${D}/usr \
 		install_docdir=share/doc/${PF} \
@@ -137,7 +188,10 @@ src_install() {
 	# Fix .info files
 	for file in ${D}/usr/share/info/*.inf
 	do
-		mv ${file} ${file}o
+		if [ -f ${file} ]
+		then
+			mv -f ${file} ${file}o
+		fi
 	done
 
 	# Install the manpages